Merge branch 'master' of https://git.7in6.com/Minong/mes-admin-backend-ui

src/view/yunyin/shengchanguanli/components/addGongYi.vue

@@ -57,18 +57,18 @@
             </el-select>
           </el-form-item>
           <el-form-item label="工序损耗:"  class="mab" prop="keyOrder" >
-            <el-input v-model="form['shdh']"  style="width: 10%;" id="工序损耗"  @keydown="add_gyzlent($event, '设备编号', '工序损耗', '装版工时')"/>
+            <el-input v-model="form['shdh']"  style="width: 10%;" id="工序损耗"  @keydown="add_gyzlent($event, '设备编号', '工序损耗', '损耗系数')"/>
             <el-input disabled v-model="form['工序损耗名称']"  style="width: 88.7%;margin-left: 10px"/>
           </el-form-item>
           <div style="display: flex; gap: 0px;">
             <el-form-item label="损耗系数:"  class="mab" prop="keyOrder">
-              <el-input  v-model="form['损耗系数']"  style="flex: 1;" />
+              <el-input  v-model="form['损耗系数']"  style="flex: 1;" id="损耗系数"  @keydown="add_gyzlent($event, '工序损耗', '损耗系数', '难度系数')"/>
             </el-form-item>
             <el-form-item label="难度系数"  class="mab" prop="keyOrder">
-              <el-input  v-model="form['难度系数']"  style="flex: 1;" />
+              <el-input  v-model="form['难度系数']"  style="flex: 1;" id="难度系数"  @keydown="add_gyzlent($event, '损耗系数', '难度系数', '装版工时')"/>
             </el-form-item>
             <el-form-item label="装版工时:"  class="mab" prop="keyOrder">
-              <el-input  v-model="form['装版工时']"  style="flex: 1;" id="装版工时"  @keydown="add_gyzlent($event, '工序损耗', '装版工时', '排产小时产能')"/>
+              <el-input  v-model="form['装版工时']"  style="flex: 1;" id="装版工时"  @keydown="add_gyzlent($event, '难度系数', '装版工时', '排产小时产能')"/>
             </el-form-item>
             <el-form-item label="排产小时产能:"  class="mab" prop="keyOrder" label-width=" 120px">
               <el-input  v-model="form['小时产能']"  style="flex: 1;" id="排产小时产能"  @keydown="add_gyzlent($event, '装版工时', '排产小时产能', '备注')"/>
@@ -133,18 +133,43 @@
       </el-tree>
     </el-dialog>
 
+    <!-- 新增查询标准损耗 -->
+    <el-dialog v-model="shxsdisplay" :before-close="() => shxsdisplay = false">
+      <el-form>
+        <div>
+          <!-- <el-form-item label="关键字:"  class="mab" prop="keyOrder">
+            <el-space>
+              <el-input v-model="gymc_keyword" style="width: 100%;"/>
+              <el-button @click="searchHandle(gymc_keyword)">刷新</el-button>
+            </el-space>
+          </el-form-item> -->
+          <div style="border:1px solid #eee; width:100%; height: 400px; overflow-y: auto">
+            <el-tree :data="getSHListdata" :props="defaultProps" @node-click="selectSHNode" />
+          </div>
+        </div>
+      </el-form>
+    </el-dialog>
+
   </div>
 </template>
 
 <script setup>
 import {ref, reactive,onMounted} from 'vue'
 import {
-  gdzl_MachineList, PrintDetailList, WastageList, getDepartName, capacityList, ProcessDetailAdd, workOrderListDetail,
+  gdzl_MachineList,
+  PrintDetailList,
+  WastageList,
+  getDepartName,
+  capacityList,
+  ProcessDetailAdd,
+  workOrderListDetail,
+  getLossCode,
 } from '@/api/yunyin/yunying'
 import { ElMessage } from 'element-plus'
 const form = reactive({})
 const visible = ref(false)
 const yjdisplay = ref(false)
+const shxsdisplay = ref(false)
 const cjdisplay = ref(false)
 const gxshdisplay = ref(false)
 const id = ref()
@@ -171,12 +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()
+  // }
   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['工艺名称'] = '';
@@ -209,6 +239,70 @@ 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:'' });
+  if (response.code === 0) {
+    const data = response.data;
+    const treeData = [];
+    const map = {};
+    // 构建树形结构
+    data.forEach(item => {
+      map[item.sys_bh] = { ...item, children: [], label: `${item.sys_bh}---${item.sys_mc}---${item.sys_rate0}---${item.sys_rate1}` };
+    });
+    data.forEach(item => {
+      if (item.sys_bh.length === 3) {
+        map[item.sys_bh].level = 1;
+        treeData.push(map[item.sys_bh]);
+      } else {
+        map[item.sys_bh].level = 2;
+        map[item.sys_bh.substring(0, 3)].children.push(map[item.sys_bh]);
+      }
+    });
+    getSHListdata.value = treeData;
+    shxsdisplay.value = true;
+  } else {
+    // 处理错误情况
+    console.error('获取损耗列表失败');
+  }
+};
+//损耗树形结构点击
+const selectSHNode = (node,check) => {
+  console.log(node.level)
+  if(node.level==1){
+    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;
+  }
+}
+
+
 const open = async (gdbh, gxlist) => {
   Object.keys(form).forEach(key => {
     form[key] = '';
@@ -249,6 +343,8 @@ const getGxshList = async ()=>{
       message: '未获取到工序损耗'
     })
   }
+  // const response = await getLossCode({ code: WastageList_data.data });
+  // console.log(response)
   form['shdh'] = WastageList_data.data
 }
 //点击工序损耗列表数据
@@ -270,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) => {

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;
@@ -3430,6 +3432,9 @@ const gdzl_MachineList_address = reactive({
 const _cjmc = ref(null);
 //双击修改
 const gdgyupdateCompanyFunc = async(row) => {
+  gdgydialogFormVisible.value = true
+
+  console.log(row)
   if(row['车间名称']){
     _cjmc.value = row['车间名称']
   }else{
@@ -3437,6 +3442,7 @@ const gdgyupdateCompanyFunc = async(row) => {
   }
   gdgyformData['设备编号'] = []
   //通过车间名称查询机台
+  console.log(_cjmc.value)
   const MachineList_jitai = await gdzl_MachineList({address:_cjmc.value});
   console.log(MachineList_jitai)
   if(MachineList_jitai.data === null || MachineList_jitai.data === ''){
@@ -3491,7 +3497,6 @@ const gdgyupdateCompanyFunc = async(row) => {
   gdgyformData['工序名称'] = operationName;
 
   Object.assign(gdgyformData,row);
-  gdgydialogFormVisible.value = true
 }
 
 //工艺列表修改【确定】