From 70ca3f9f8a484263c07964c7f957aa8c3f6e8ef8 Mon Sep 17 00:00:00 2001
From: zhangyong <517047165@qq.com>
Date: 星期五, 24 五月 2024 11:11:03 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/HangZhouMes
---
UI-Project/src/views/Returns/returns.vue | 681 +++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 548 insertions(+), 133 deletions(-)
diff --git a/UI-Project/src/views/Returns/returns.vue b/UI-Project/src/views/Returns/returns.vue
index 8fafce3..eddab30 100644
--- a/UI-Project/src/views/Returns/returns.vue
+++ b/UI-Project/src/views/Returns/returns.vue
@@ -5,20 +5,34 @@
const router = useRouter()
import type { TableColumnCtx } from 'element-plus'
-// import { ref } from 'vue'
import { ElMessage, ElMessageBox } from 'element-plus'
const dialogFormVisible = ref(false)
+const blind = ref(false)
+const blinda = ref(false)
+const blindb = ref(false)
const add = ref(false)
const adda = ref(false)
-// const value = ref('')
+const flake = ref(false)
+const flakea = ref(false)
+// const patternHeight = ref('');
+// const patternWidth = ref('');
+// const filmsId = ref('');
+// const patternThickness = ref('');
+// const number = ref('');
+// patternHeight.value = '';
+ // patternWidth.value = '';
+ // filmsId.value = '';
+ // patternThickness.value = '';
+ // number.value = '';
import request from "@/utils/request"
-
-import { ref, onMounted } from "vue";
+const ida = ref(null);
+import { ref, onMounted, onUnmounted } from "vue";
// import http from "@/http/index";
let ruleForm = ref({
+ projectNo: '',
workstationId: '',
- patternHeigth: '',
+ patternHeight: '',
patternWidth: '',
filmsId: '',
patternThickness: '',
@@ -27,11 +41,7 @@
})
const tableDataa = ref([])
- const requestData = {
- // projectNo:"P24030805",
- state:100
- };
-
+
const tableData = reactive([]);
// let filterData = ref({
// damageDetails: {
@@ -42,8 +52,6 @@
// 鍙戦�佽幏鍙栬〃鏍兼暟鎹殑璇锋眰
const fetchTableData = async () => {
try {
- // 鍙戦�佽幏鍙栬〃鏍兼暟鎹殑璇锋眰锛屽苟绛夊緟鍝嶅簲
- // const response = await request.post("/loadGlass/optimizeProject/listByState", requestData);
const response = await request.get("/loadGlass/up-patten-usage/prioritylist");
// 妫�鏌ュ搷搴旂姸鎬�
@@ -51,45 +59,206 @@
// 鏇存柊琛ㄦ牸鏁版嵁
console.log('鎴愬姛鑾峰彇琛ㄦ牸鏁版嵁:', response.data);
tableData.splice(0, tableData.length, ...response.data);
+ window.localStorage.setItem('engineeringId', response.data[0].engineeringId)
} else {
// 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
ElMessage.error(response.msg);
}
} catch (error) {
// 澶勭悊璇锋眰澶辫触鐨勬儏鍐�
- ElMessage.error('鑾峰彇琛ㄦ牸鏁版嵁澶辫触锛岃閲嶈瘯');
+ // ElMessage.error('鑾峰彇琛ㄦ牸鏁版嵁澶辫触锛岃閲嶈瘯');
}
};
-request.get("/loadGlass/LoadGlass/list").then((res) => {
- if (res.code == 200) {
- console.log(res.data);
- tableDataa.value = res.data
- // workstationId.value = res.data[0].workstationId
- } else {
- ElMessage.warning(res.msg)
- router.push("/login")
- }
- });
+onMounted(async () => {
+ await fetchTableData();
+
+ // 璁剧疆瀹氭椂鍣ㄦ潵瀹氭湡鍒锋柊鏁版嵁
+ const intervalId = setInterval(async () => {
+ await fetchTableData();
+ }, 1000); // 姣�1绉掑埛鏂颁竴娆�
+
+ // 缁勪欢鍗歌浇鏃舵竻闄ゅ畾鏃跺櫒
+ onUnmounted(() => {
+ clearInterval(intervalId);
+ });
+});
+onMounted(async () => {
+ await fetchTableDataa();
+
+ // 璁剧疆瀹氭椂鍣ㄦ潵瀹氭湡鍒锋柊鏁版嵁
+ const intervalId = setInterval(async () => {
+ await fetchTableDataa();
+ }, 1000); // 姣�1绉掑埛鏂颁竴娆�
+
+ // 缁勪欢鍗歌浇鏃舵竻闄ゅ畾鏃跺櫒
+ onUnmounted(() => {
+ clearInterval(intervalId);
+ });
+});
+ // request.get("/loadGlass/LoadGlass/list").then((res) => {
+ // if (res.code === 200) {
+ // console.log(res.data);
+ // tableDataa.value = res.data;
+
+ // if (tableDataa.value.length === 2) {
+ // if (tableDataa.value[0].patternWidth > 0) {
+ // flake.value = true;
+ // }
+
+ // if (tableDataa.value[1].patternWidth > 0) {
+ // flakea.value = true;
+ // }
+ // }
+ // } else {
+ // ElMessage.warning(res.msg);
+ // // router.push("/login");
+ // }
+ // });
+ async function fetchTableDataa() {
+ try {
+ const res = await request.get("/loadGlass/LoadGlass/list");
+ if (res.code === 200) {
+ tableDataa.value = res.data;
+
+ // 鏍规嵁鏁版嵁鏇存柊 flake 鍜� flakea 鐨勫��
+ if (res.data.length >= 2) {
+ if (res.data[0].patternWidth > 0) {
+ flake.value = true;
+ } else {
+ flake.value = false;
+ }
+
+ if (res.data[1].patternWidth > 0) {
+ flakea.value = true;
+ } else {
+ flakea.value = false;
+ }
+ }
+ } else {
+ ElMessage.warning(res.msg);
+ }
+ } catch (error) {
+ console.error('鑾峰彇琛ㄦ牸鏁版嵁澶辫触', error);
+ // 鍙互鍦ㄨ繖閲屾坊鍔犻澶栫殑閿欒澶勭悊閫昏緫
+ }
+}
+// request.get("/loadGlass/LoadGlass/list").then((res) => {
+// window.localStorage.setItem('patternWidth', res.data.patternWidth)
+// window.localStorage.setItem('workstationId', res.data.workstationId)
+// if (res.code == 200) {
+// console.log(res.data);
+// tableDataa.value = res.data
+// console.log(res.data.patternWidth);
+
+// let workstationId = window.localStorage.getItem('workstationId')
+// let patternWidth = window.localStorage.getItem('patternWidth')
+// if (patternWidth !== '' || workstationId == '1') {
+// flake.value = true
+// } else if (patternWidth !== '' || workstationId == '2') {
+// flakea.value = true
+// }
+// } else {
+// ElMessage.warning(res.msg)
+// // router.push("/login")
+// }
+// });
//瀹氫箟鎺ユ敹鍔犺浇琛ㄥご涓嬫媺鏁版嵁
const titleSelectJson = ref({
processType: [],
})
-const getBasicData = ref({
- id: '',
- projectNo: '',
+const titleSelectJsona = ref({
+ processTypea: [],
+
})
-request.post("/loadGlass/optimizeProject/listByState", requestData)
-.then((res) => {
- if (res.code == 200) {
- titleSelectJson.value.processType = res.data;
- console.log(res.data);
- } else {
- ElMessage.warning(res.msg)
- router.push("/login")
- }
- });
-
+// const getBasicData = ref({
+// id: '',
+// projectNo: '',
+// })
+// const requestData = {
+// // projectNo:"P24030805",
+// state:100
+// };
+// request.post("/loadGlass/optimizeProject/listByState", requestData)
+// .then((res) => {
+// if (res.code == 200) {
+// titleSelectJson.value.processType = res.data;
+// console.log(res.data);
+// } else {
+// ElMessage.warning(res.msg)
+// // router.push("/login")
+// }
+// });
+ // 鍒濆璇锋眰鍙傛暟
+const requestData = {
+ state: 100
+};
+// 鍝嶅簲寮忔暟鎹�
+const selectedProjectNo = ref(''); // 褰撳墠閫変腑鐨勫伐绋嬪彿
+const selectedProjectNoa = ref(''); // 褰撳墠閫変腑鐨勫伐绋嬪彿
+const options = ref<any[]>([]); // 涓嬫媺閫夐」鍒楄〃
+
+// 璋冪敤鎺ュ彛鑾峰彇閫夐」鏁版嵁鐨勫嚱鏁�
+const fetchOptions = async (queryString: string) => {
+ try {
+ // 鍙戦�佽姹傚埌鍚庣鎺ュ彛
+ const response = await request.post('/loadGlass/optimizeProject/listByState', {
+ ...requestData,
+ query: queryString // 灏嗘煡璇㈠瓧绗︿覆浣滀负鍙傛暟浼犻��
+ });
+
+ if (response.code == 200) {
+ titleSelectJson.value.processType = response.data;
+ console.log(response.data);
+
+ } else {
+ ElMessage.warning(response.data);
+ }
+ } catch (error) {
+ console.error('Error fetching options:', error);
+ }
+};
+ // 寮�濮嬩笂鐗囦笅鎷夐��
+const fetchOptionsa = async (queryString: string) => {
+ try {
+ // 鍙戦�佽姹傚埌鍚庣鎺ュ彛
+ const response = await request.get('/loadGlass/engineering/engineering/selectTask');
+ if (response.code == 200) {
+ titleSelectJsona.value.processTypea = response.data;
+ console.log(response.data);
+
+ } else {
+ ElMessage.warning(response.data);
+ }
+ } catch (error) {
+ console.error('Error fetching options:', error);
+ }
+};
+// 澶勭悊鐢ㄦ埛杈撳叆鍙樺寲鐨勬柟娉�
+const handleInputChange = async (value: string) => {
+ if (value) {
+ await fetchOptions(value);
+ } else {
+ options.value = []; // 娓呯┖閫夐」鍒楄〃
+ }
+};
+ // 澶勭悊鐢ㄦ埛杈撳叆鍙樺寲鐨勬柟娉�
+const handleInputChangea = async (value: string) => {
+ if (value) {
+ await fetchOptionsa(value);
+ } else {
+ options.value = []; // 娓呯┖閫夐」鍒楄〃
+ }
+};
+// 鍒濆鍖栧姞杞芥暟鎹紙濡傛灉闇�瑕侊級
+onMounted(() => {
+ // 鍦ㄧ粍浠舵寕杞藉悗璋冪敤 fetchOptions('') 鏉ュ姞杞藉垵濮嬫暟鎹紙濡傛灉闇�瑕侊級
+ fetchOptions('');
+});
+onMounted(() => {
+ // 鍦ㄧ粍浠舵寕杞藉悗璋冪敤 fetchOptions('') 鏉ュ姞杞藉垵濮嬫暟鎹紙濡傛灉闇�瑕侊級
+ fetchOptionsa('');
+});
// const billall = () => {
// request.post("/loadGlass/optimizeProject/listByState", requestData)
// .then((res: any) => {
@@ -102,60 +271,115 @@
// }
const user = ref('');
// 瀹氫箟琛ㄥご涓婁紶鏁版嵁
-let titleUploadData = ref({
- projectNo:'',
-})
-// const billall = {
-// data () {
-// return {
-// form: {
-// projectNo: '',
-// },
-// billall:[],
-// }
-// },
-// methods:{
-
-// }
-// }
+// let titleUploadData = ref({
+// projectNo:'',
+// })
+const projectNo = ref('');
const workstationId = ref('');
-const patternHeigth = ref('');
+const id = ref('');
+const patternHeight = ref('');
const patternWidth = ref('');
const filmsId = ref('');
const patternThickness = ref('');
const number = ref('');
-
+// 娣诲姞
+const handleBindRack = (row) => {
+ workstationId.value = row.workstationId; // 鍋囪rackNumber鏄灦鍙峰瓧娈电殑灞炴�у悕
+ ida.value = row.id;
+ console.log(ida.value);
+ add.value = true; // 鎵撳紑缁戝畾鏋跺瓙瀵硅瘽妗�
+};
// 娣诲姞
const handleConfirm = async () => {
- try {
+ console.log(ida.value);
+ // console.log('id.value:', id.value);
+ if ((ida.value === 2 || ida.value === 4) && (parseInt(patternHeight.value, 10) >= 2700 )) {
+ try {
const response = await request.post('/loadGlass/LoadGlass/updateGlassMessage', {
+ id: workstationId.value,
workstationId: workstationId.value,
- patternHeigth: patternHeigth.value,
+ patternHeight: patternHeight.value,
patternWidth: patternWidth.value,
filmsId: filmsId.value,
patternThickness: patternThickness.value,
number: number.value
});
-
if (response.code == 200) {
// 缁戝畾鎴愬姛锛屽鐞嗛�昏緫
ElMessage.success(response.message);
+ // window.location.reload()
add.value = false;
+ tableDataa.value = response.data;
+ // patternHeight = '';
+ // patternWidth.value = '';
+ // filmsId.value = '';
+ // patternThickness.value = '';
+ // number.value = '';
+ window.localStorage.setItem('workstationId', response.data.workstationId)
+ let workstationId = window.localStorage.getItem('workstationId')
+ if (workstationId == '1') {
+ flake.value = true
+ } else if (workstationId == '2'){
+ flakea.value = true
+ }
} else {
// 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
ElMessage.error(response.msg);
}
- } catch (error) {
- // 澶勭悊閿欒
- console.error(error);
- }
-};
+ } catch (error) {
+ // 澶勭悊璇锋眰閿欒
+ console.error(error);
+ alert('璇锋眰澶辫触锛岃绋嶅悗鍐嶈瘯锛�');
+ }
+ }
+ else if( ida.value === 1 || ida.value === 3){
+ try {
+ const response = await request.post('/loadGlass/LoadGlass/updateGlassMessage', {
+ id: workstationId.value,
+ workstationId: workstationId.value,
+ patternHeight: patternHeight.value,
+ patternWidth: patternWidth.value,
+ filmsId: filmsId.value,
+ patternThickness: patternThickness.value,
+ number: number.value
+ });
+ if (response.code == 200) {
+ // 缁戝畾鎴愬姛锛屽鐞嗛�昏緫
+ ElMessage.success(response.message);
+ // window.location.reload()
+ add.value = false;
+ tableDataa.value = response.data;
+ window.localStorage.setItem('workstationId', response.data.workstationId)
+ let workstationId = window.localStorage.getItem('workstationId')
+ if (workstationId == '1') {
+ flake.value = true
+ } else if (workstationId == '2'){
+ flakea.value = true
+ }
+ } else {
+ // 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
+ ElMessage.error(response.msg);
+ }
+ } catch (error) {
+ // 澶勭悊璇锋眰閿欒
+ console.error(error);
+ alert('璇锋眰澶辫触锛岃绋嶅悗鍐嶈瘯锛�');
+ }
+ }
+ else {
+ ElMessage({
+ type: 'info',
+ message: '绗簩琛屽拰绗洓琛岀殑楂樺繀椤诲ぇ浜�2700鎵嶈兘淇濆瓨锛�',
+ })
+ }
+
+};
// 鍒犻櫎
const handleConfirma = async () => {
try {
const response = await request.post('/loadGlass/LoadGlass/updateGlassMessage', {
workstationId: workstationId.value,
- patternHeigth: 0,
+ patternHeight: 0,
patternWidth: 0,
filmsId: "",
patternThickness: 0,
@@ -166,6 +390,14 @@
// 缁戝畾鎴愬姛锛屽鐞嗛�昏緫
ElMessage.success(response.message);
adda.value = false;
+ tableDataa.value = response.data;
+ window.localStorage.setItem('workstationId', response.data.workstationId)
+ let workstationId = window.localStorage.getItem('workstationId')
+ if (workstationId == '1') {
+ flake.value = false
+ } else if (workstationId == '2'){
+ flakea.value = false
+ }
} else {
// 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
ElMessage.error(response.msg);
@@ -175,43 +407,141 @@
console.error(error);
}
};
+// 閫夋嫨宸ョ▼纭
+const handleup = async () => {
+ try {
+ const response = await request.post('/loadGlass/up-patten-usage/saveUpPattenUsage', {
+ engineerId: selectedProjectNo.value,
+ })
+ if (response.code == 200) {
+ // 缁戝畾鎴愬姛锛屽鐞嗛�昏緫
+ ElMessage.success(response.message);
+ // window.location.reload()
+ dialogFormVisible.value = false;
+ selectedProjectNo.value = ''
+ } else {
+ // 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
+ ElMessage.error(response.msg);
+ }
+}
+catch (error) {
+ // 澶勭悊閿欒
+ console.error(error);
+ }
+}
+// 寮�濮嬩笂鐗�
+const handle = async () => {
+ try {
+ const response = await request.post('/loadGlass/engineering/engineering/changeTask', {
+ engineerId: selectedProjectNoa.value,
+ state: 1,
+ })
+ if (response.code == 200) {
+ // 缁戝畾鎴愬姛锛屽鐞嗛�昏緫
+ ElMessage.success(response.message);
+ // window.location.reload()
+ blind.value = false;
+ tableData.splice(0, tableData.length, ...response.data);
+ selectedProjectNoa.value = ''
+ } else {
+ // 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
+ ElMessage.error(response.msg);
+ }
+}
+catch (error) {
+ // 澶勭悊閿欒
+ console.error(error);
+ }
+}
+// 鏆傚仠
+const handlea = async () => {
+ try {
+ let engineeringId = window.localStorage.getItem('engineeringId')
+console.log(engineeringId);
+if (engineeringId !== '') {
+ const response = await request.post('/loadGlass/engineering/engineering/changeTask', {
+ engineeringId: engineeringId,
+ state: 0,
+ })
+ if (response.code == 200) {
+ // 缁戝畾鎴愬姛锛屽鐞嗛�昏緫
+ ElMessage.success(response.message);
+ // window.location.reload()
+ blinda.value = false;
+ // tableData.value = response.data
+ // tableData.value = [];
+ tableData.splice([]);
+ } else {
+ // 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
+ ElMessage.error(response.msg);
+ }
+ }
+ else {
+ ElMessage({
+ type: 'info',
+ message: '宸ョ▼鍙蜂笉鑳戒负绌猴紒',
+ })
+ }
+}
+catch (error) {
+ // 澶勭悊閿欒
+ console.error(error);
+ }
+}
+// 鍋滄浠诲姟
+const handleb = async () => {
+ try {
+ let engineeringId = window.localStorage.getItem('engineeringId')
+console.log(engineeringId);
+if (engineeringId !== '') {
+ const response = await request.post('/loadGlass/engineering/engineering/changeTask', {
+ engineeringId: engineeringId,
+ state: 0,
+ })
+ if (response.code == 200) {
+ // 缁戝畾鎴愬姛锛屽鐞嗛�昏緫
+ ElMessage.success(response.message);
+ // window.location.reload()
+ blindb.value = false;
+ tableData.splice([]);
+
+ // 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
+ ElMessage.error(response.msg);
+ }
+ }
+ else {
+ ElMessage({
+ type: 'info',
+ message: '宸ョ▼鍙蜂笉鑳戒负绌猴紒',
+ })
+ }
+}
+catch (error) {
+ // 澶勭悊閿欒
+ console.error(error);
+ }
+}
onMounted(fetchTableData);
-interface User {
- id: string
- name: string
- amount1: string
- amount2: string
- amount3: number
-}
-
-interface SpanMethodProps {
- row: User
- column: TableColumnCtx<User>
- rowIndex: number
- columnIndex: number
-}
-
-// const objectSpanMethod = ({
-// row,
-// column,
-// rowIndex,
-// columnIndex,
-// }: SpanMethodProps) => {
-// if (columnIndex === 0) {
-// if (rowIndex % 2 === 0) {
-// return {
-// rowspan: 2,
-// colspan: 1,
-// }
-// } else {
-// return {
-// rowspan: 0,
-// colspan: 0,
-// }
-// }
-// }
-// }
-
+onMounted(fetchTableDataa);
+function getStatusText(state: number) {
+ switch (state) {
+ case 0:
+ return '绛夊緟涓�';
+ case 1:
+ return '涓婄墖涓�';
+ case 2:
+ return '涓婄墖涓�';
+ case 100:
+ return '宸插畬鎴�';
+ default:
+ return '鏈煡鐘舵��';
+ }
+}
+
+function getStatusType(state: number) {
+ // 杩欓噷鍋囪鍙湁100鏃剁被鍨嬩笉鏄痵uccess锛屽叾浠栭兘鏄痵uccess
+ return state === 100 ? 'info' : 'success'; // 鏍规嵁闇�瑕佽皟鏁寸被鍨�
+}
// const open = () => {
// ElMessageBox.confirm(
// '鏄惁鍒犻櫎璇ユ潯淇℃伅?',
@@ -235,16 +565,29 @@
// })
// })
// }
-
-
-const handleBindRack = (row) => {
- workstationId.value = row.workstationId; // 鍋囪rackNumber鏄灦鍙峰瓧娈电殑灞炴�у悕
-
- add.value = true; // 鎵撳紑缁戝畾鏋跺瓙瀵硅瘽妗�
+// 寮�濮嬩笂鐗�
+const handleBind = (row) => {
+ // engineeringId.value = row.engineeringId;
+
+ blind.value = true; // 鎵撳紑缁戝畾鏋跺瓙瀵硅瘽妗�
};
+// 鏆傚仠
+const handleBinda = (row) => {
+ // engineeringId.value = row.engineeringId;
+
+ blinda.value = true; // 鎵撳紑缁戝畾鏋跺瓙瀵硅瘽妗�
+};
+// 鍋滄浠诲姟
+const handleBindb = (row) => {
+ // engineeringId.value = row.engineeringId;
+
+ blindb.value = true; // 鎵撳紑缁戝畾鏋跺瓙瀵硅瘽妗�
+};
+
+// 鍒犻櫎
const handleBindRacka = (row) => {
workstationId.value = row.workstationId; // 鍋囪rackNumber鏄灦鍙峰瓧娈电殑灞炴�у悕
-
+
adda.value = true; // 鎵撳紑缁戝畾鏋跺瓙瀵硅瘽妗�
};
const gridOptions = reactive({
@@ -298,9 +641,10 @@
<el-button style="margin-left: 30px;margin-top: -3px;" >鎵嬪姩纭</el-button>
</div>
<el-button style="margin-top: 5px;margin-left: 15px;" id="searchButton" type="primary" @click="dialogFormVisible = true">閫夋嫨宸ョ▼</el-button>
- <el-button style="margin-top: 5px;margin-left: 20px;" id="searchButton" type="primary">寮�濮嬩笂鐗�</el-button>
- <el-button style="margin-top: 5px;margin-left: 20px;" id="searchButton" type="warning" >鏆傚仠</el-button>
- <el-button style="margin-top: 5px;margin-left: 20px;" id="searchButton" type="danger" >鍋滄浠诲姟</el-button>
+ <el-button style="margin-top: 5px;margin-left: 20px;" id="searchButton" type="primary" @click="handleBind">寮�濮嬩笂鐗�</el-button>
+ <el-button style="margin-top: 5px;margin-left: 20px;" id="searchButton" type="warning" @click="handleBinda">鏆傚仠</el-button>
+ <el-button style="margin-top: 5px;margin-left: 20px;" id="searchButton" type="danger" @click="handleBindb">鍋滄浠诲姟</el-button>
+
<el-card style="flex: 1;margin-left: 10px;margin-top: 15px;" v-loading="loading">
<div style="width: 98%; height: calc(100% - 35px); overflow-y: auto;">
<el-table
@@ -321,24 +665,89 @@
min-width="80"
prop="state"
>
- <template #default="scope">
- <el-tag type="success" >{{ scope.row.state==1?"灏辩华":"鏈氨缁�" }}</el-tag>
- </template>
-
- <!-- <el-tag type="danger" v-if="row.enableState==2">鏈氨缁�</el-tag> -->
+ <template #default="scope">
+ <el-tag :type="getStatusType(scope.row.state)">
+ {{ getStatusText(scope.row.state) }}
+ </el-tag>
+ </template>
+ <!-- <template #default="scope">
+ <el-tag type="success" >{{ scope.row.state==0?"绛夊緟涓�":"涓婄墖涓�" }}</el-tag>
+ </template> -->
</el-table-column>
</el-table>
</div>
+
</el-card>
+ <el-dialog v-model="blind" top="24vh" width="30%" title="鏄惁寮�濮嬩笂鐗囷紵" >
+ <div style="margin-left: 50px;margin-bottom: 10px;">
+ <el-form-item label="宸ョ▼鍙凤細" :required="true">
+ <el-select
+ v-model="selectedProjectNoa"
+ filterable
+ clearable
+ placeholder="璇烽�夋嫨宸ョ▼"
+ style="width: 220px"
+ @input="handleInputChangea"
+ >
+ <el-option
+ v-for="item in titleSelectJsona['processTypea']"
+ :key="item.id"
+ :label="item.engineerId"
+ :value="item.engineerId"
+ />
+ </el-select>
+ </el-form-item>
+ </div>
+ <template #footer>
+ <div id="dialog-footer">
+ <el-button type="primary" @click="handle">
+ 纭
+ </el-button>
+ <el-button @click="blind = false">鍙栨秷</el-button>
+ </div>
+ </template>
+ </el-dialog>
+ <!-- <el-dialog v-model="blind" top="30vh" width="25%" title="鏄惁寮�濮嬩笂鐗�?" >
+ <template #footer>
+ <div id="dialog-footer">
+ <el-button type="primary" @click="handle">
+ 纭
+ </el-button>
+ <el-button @click="blind = false">鍙栨秷</el-button>
+ </div>
+ </template>
+ </el-dialog> -->
+ <el-dialog v-model="blinda" top="30vh" width="25%" title="鏄惁鏆傚仠?" >
+ <template #footer>
+ <div id="dialog-footer">
+ <el-button type="primary" @click="handlea">
+ 纭
+ </el-button>
+ <el-button @click="blinda = false">鍙栨秷</el-button>
+ </div>
+ </template>
+ </el-dialog>
+ <el-dialog v-model="blindb" top="30vh" width="25%" title="鏄惁鍋滄浠诲姟?" >
+ <template #footer>
+ <div id="dialog-footer">
+ <el-button type="primary" @click="handleb">
+ 纭
+ </el-button>
+ <el-button @click="blindb = false">鍙栨秷</el-button>
+ </div>
+ </template>
+ </el-dialog>
<div id="parent">
<img src="../../assets/shangpianji.png" alt="" style="max-width: 20%;max-height: 20%;margin-top: 20px;margin-left: 500px;">
+ <div id="overlay" v-show="flake"></div>
+ <div id="overlaya" v-show="flakea"></div>
</div>
<div style="margin-top: -350px;margin-left: 650px;">
<el-table :data="tableDataa" border style="width: 60%"
:header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}"
>
<el-table-column prop="patternWidth" align="center" label="瀹�" min-width="80" />
- <el-table-column prop="patternHeigth" align="center" label="闀�" min-width="80" />
+ <el-table-column prop="patternHeight" align="center" label="楂�" min-width="80" />
<el-table-column prop="filmsId" align="center" label="鑶滅郴" min-width="80" />
<el-table-column prop="number" align="center" label="鏁伴噺" min-width="80" />
<el-table-column fixed="right" label="鎿嶄綔" align="center" width="150">
@@ -358,8 +767,8 @@
<el-col :span="6">
<div id="dt" style="font-size: 15px;">
<div>
- <el-form-item label="闀匡細" :required="true" style="width: 14vw">
- <el-input v-model="patternHeigth" autocomplete="off" />
+ <el-form-item label="楂橈細" :required="true" style="width: 14vw">
+ <el-input v-model="patternHeight" autocomplete="off" />
</el-form-item></div></div>
</el-col>
<el-col :span="9">
@@ -408,7 +817,7 @@
</div>
</template>
</el-dialog>
- <el-dialog v-model="adda" top="25vh" width="25%" title="鏄惁鍒犻櫎" >
+ <el-dialog v-model="adda" top="30vh" width="25%" title="鏄惁鍒犻櫎璇ユ潯淇℃伅?" >
<template #footer>
<div id="dialog-footer">
<el-button type="primary" @click="handleConfirma">
@@ -424,20 +833,26 @@
<el-dialog v-model="dialogFormVisible" top="24vh" width="30%" title="宸ョ▼" >
<div style="margin-left: 50px;margin-bottom: 10px;">
<el-form-item label="宸ョ▼鍙凤細" :required="true">
- <el-select v-model="getBasicData.projectNo" clearable placeholder="璇烽�夋嫨宸ョ▼" style="width: 220px"
- >
- <el-option
- v-for="item in titleSelectJson['processType']"
- :key="item.id"
- :label="item.projectNo"
- :value="item.projectNo"
- />
- </el-select>
+ <el-select
+ v-model="selectedProjectNo"
+ filterable
+ clearable
+ placeholder="璇烽�夋嫨宸ョ▼"
+ style="width: 220px"
+ @input="handleInputChange"
+ >
+ <el-option
+ v-for="item in titleSelectJson['processType']"
+ :key="item.id"
+ :label="item.projectNo"
+ :value="item.projectNo"
+ />
+ </el-select>
</el-form-item>
</div>
<template #footer>
<div id="dialog-footer">
- <el-button type="primary" @click="dialogFormVisible = false">
+ <el-button type="primary" @click="handleup">
纭
</el-button>
<el-button @click="dialogFormVisible = false">鍙栨秷</el-button>
@@ -472,8 +887,8 @@
width: 212px;
height: 15px;
background-color: #529b2e;
- margin-top: -407px;
- margin-left: 171px;
+ margin-top: -404px;
+ margin-left: 542px;
}
#overlaya{
position: absolute;
@@ -481,8 +896,8 @@
width: 212px;
height: 15px;
background-color: #529b2e;
- margin-top: -40px;
- margin-left: 167px;
+ margin-top: -38px;
+ margin-left: 537px;
}
</style>
\ No newline at end of file
--
Gitblit v1.8.0