liuhairui 1 år sedan
förälder
incheckning
d5cc297eee

+ 40 - 9
src/view/yunyin/shengchanguanli/components/addGongYi.vue

@@ -196,17 +196,17 @@ const add_gyzlent = async (event,id1,id2,id3) => {
     document.getElementById(id3).focus()
     cjdisplay.value = true
   }
-  if (id2 === '损耗系数' && event.key==='Tab') {
-    document.getElementById(id3).focus()
-    shxsdisplay.value = true
-    _getSH()
-  }
+  // if (id2 === '损耗系数' && event.key==='Tab') {
+  //   document.getElementById(id3).focus()
+  // }
   if (id2 === '工序损耗' &&  event.key==='Tab') {
     if(form['车间名称']){
       await getGxshList();
+      _getSH()
+      shxsdisplay.value = true
     }
   }
-  if (id2 === '工序名称' &&  event.key==='Tab') {
+  if (id2 === '工序名称' &&  event.key==='Tab' || event.key==='Enter') {
     console.log(213)
     if(form['工艺名称'] === undefined){
       form['工艺名称'] = '';
@@ -240,10 +240,21 @@ const add_gyzlent = async (event,id1,id2,id3) => {
 }
 
 const getSHListdata = ref([]);
-
+const _shdh = ref('');
+const InSH = async (value) => {
+  const response = await getLossCode({ code:form['工艺名称']});
+  console.log(response)
+  if(response.code===0){
+    form['shdh']=response.data[0].sys_bh
+    // form.工序损耗名称= node.sys_mc
+    form['工序损耗名称'] = `${response.data[0].sys_mc} ${form['工序名称']}`;
+    form.损耗系数=response.data[0].sys_rate0
+    form.难度系数=response.data[0].sys_rate1
+  }
+}
 //填充树形结构
 const _getSH = async () => {
-  const response = await getLossCode({ code: '' });
+  const response = await getLossCode({ code:'' });
   if (response.code === 0) {
     const data = response.data;
     const treeData = [];
@@ -275,6 +286,16 @@ const selectSHNode = (node,check) => {
     console.log(node.label)
   }
   if(node.level==2){
+    if(form['工艺名称'] === undefined){
+      form['工艺名称'] = '';
+    }
+    if(form['工序名称'] === undefined){
+      form['工序名称'] = '';
+    }
+
+    form['shdh']=node.sys_bh
+    // form.工序损耗名称= node.sys_mc
+    form['工序损耗名称'] = `${node.sys_mc} ${form['工序名称']}`;
     form.损耗系数=node.sys_rate0
     form.难度系数=node.sys_rate1
     shxsdisplay.value = false;
@@ -322,6 +343,8 @@ const getGxshList = async ()=>{
       message: '未获取到工序损耗'
     })
   }
+  // const response = await getLossCode({ code: WastageList_data.data });
+  // console.log(response)
   form['shdh'] = WastageList_data.data
 }
 //点击工序损耗列表数据
@@ -343,12 +366,20 @@ const selectHandle = async (node)=>{
     return false;
   }
   form['设备编号'] = []
+
   //通过车间名称查询机台
   const MachineList_jitai = await gdzl_MachineList({address:form['车间名称']});
   gdzl_MachineList_address.value = MachineList_jitai.data;
   form['shdh'] = ''
   //通过车间名称查询工序损耗
-  await getGxshList()
+  // await getGxshList()
+  if(form['工艺名称'] === undefined){
+    form['工艺名称'] = '';
+  }
+  if(form['工序名称'] === undefined){
+    form['工序名称'] = '';
+  }
+  await InSH()
 }
 
 const changeHandle = (v) => {

+ 4 - 2
src/view/yunyin/shengchanguanli/gongdanziliao.vue

@@ -542,8 +542,10 @@
                   <el-table-column type="selection" width="30" />
                   <el-table-column align="left" label="完工状态" prop="status"  width="75"/>
                   <el-table-column align="left" label="重点工序" prop="重点工序"  width="80"/>
-                  <el-table-column align="left" label="印件-工序" prop="印件-工序"  width="80"/>
+                  <el-table-column align="left" label="印件号" prop="印件号"  width="65"/>
+                  <el-table-column align="left" label="工序号" prop="工序号"  width="65"/>
                   <el-table-column align="left" label="备选工序" prop="备选工序"  width="80"/>
+                  <el-table-column align="left" label="工艺名称" prop="工艺名称"  width="150"/>
                   <el-table-column align="left" label="工序名称" prop="工序名称"  width="280"/>
                   <el-table-column align="left" label="计划产量" prop="计划产量"  width="80"/>
                   <el-table-column align="left" label="基础损耗" prop="基础损耗"  width="80"/>
@@ -556,7 +558,6 @@
                   <el-table-column align="left" label="机检_正品板" prop="机检_正品板"  width="110"/>
                   <el-table-column align="left" label="机检_次品板" prop="机检_次品板"  width="110"/>
                   <el-table-column align="left" label="机检_废检" prop="机检_废检"  width="90"/>
-                  <!--<el-table-column align="left" label="开数*联数" prop="开数*联数"  width="100"/>-->
                   <el-table-column align="center" label="开数" prop="开数"  width="45"/>
                   <el-table-column align="center" label="联数" prop="联数"  width="45"/>
                   <el-table-column align="left" label="备注" prop="备注"  width="230"/>
@@ -3114,6 +3115,7 @@ const tableRowClick = async (row) => {
   _Gd_cpdh.value = row.产品代号;
   _Gd_cpmc.value = row.产品名称;
   const workOrderListDetail_data = await workOrderListDetail({Gd_gdbh:_Gd_gdbh.value});
+  console.log(workOrderListDetail_data.data.processList)
   yjtableData.value = workOrderListDetail_data.data.printList;
   gytableData.value = workOrderListDetail_data.data.processList;
   bomtableData.value = workOrderListDetail_data.data.BOM;