Ver Fonte

工单超节损和工单生产排单页面流程单查询优化

zck há 1 ano atrás
pai
commit
dd0a40c23c

+ 5 - 2
src/view/performance/12-orderAccounting/index.vue

@@ -94,7 +94,7 @@
                 <el-form-item label="工单编号" style="margin-right: 20px; padding: 0">
                   <el-input v-model="pd_lcdformData['gdbh']" @keyup.enter="pd_lcdProductValue" placeholder="Enter回车"/>
                 </el-form-item>
-                <el-form-item label="" style="margin-right: 5px; padding: 0">
+                <el-form-item label="印件号" style="margin-right: 5px; padding: 0">
                   <el-input v-model="pd_lcdformData['code']" disabled/>
                 </el-form-item>
                 <el-form-item label="" style="margin-right: 5px; padding: 0">
@@ -474,9 +474,10 @@ const _getOrderProcessLeft_list = async() => {
     // 5.1流程单查询-工单工序生产进程菜单栏
     const getOrderProcessLeft_list = await getOrderProcessLeft({
       order: order,
+      yjno:currentRow.value['jjcp_yjno']
     })
     console.log(getOrderProcessLeft_list)
-    pd_lcdformData['code'] = getOrderProcessLeft_list.data.Gd_info['code']
+    pd_lcdformData['code'] = currentRow.value['jjcp_yjno']
     pd_lcdformData['name'] = getOrderProcessLeft_list.data.Gd_info['name']
     pd_lcd_treeData.value = [
       {
@@ -497,6 +498,7 @@ const _getOrderProcessLeft_list = async() => {
     const getOrderProcessRight_list = await getOrderProcessRight({
       order: order,
       gxNo: newData[0].value,
+      yjno:currentRow.value['jjcp_yjno']
     })
     processList.value = getOrderProcessRight_list.data
   } catch (error) {
@@ -511,6 +513,7 @@ const pd_lcd_handleNodeClick = async(node) => {
   const getOrderProcessRight_list = await getOrderProcessRight({
     order: order,
     gxNo: node.value,
+    yjno:currentRow.value['jjcp_yjno']
   })
   console.log(getOrderProcessRight_list)
   processList.value = getOrderProcessRight_list.data

+ 9 - 3
src/view/yunyin/shengchanguanli/gongdanshengchan.vue

@@ -214,6 +214,9 @@
               <el-form-item label="工单编号" style="margin-right: 20px; padding: 0;">
                 <el-input v-model="pd_lcdformData['gdbh']" @keyup.enter="pd_lcdProductValue"/>
               </el-form-item>
+              <el-form-item label="印件号" style="margin-right: 5px; padding: 0;">
+                <el-input v-model="pd_lcdformData['yjno']" disabled/>
+              </el-form-item>
               <el-form-item label="" style="margin-right: 5px; padding: 0;">
                 <el-input v-model="pd_lcdformData['code']" disabled/>
               </el-form-item>
@@ -1529,6 +1532,7 @@ const pd_lcdformData = reactive({
   gdbh: '',
   code: '',
   name: '',
+  yjno: '',
 });
 // 流程单查询按钮
 const processList = ref([]);
@@ -1552,10 +1556,12 @@ const _getOrderProcessLeft_list = async () => {
   // console.log(order)
   try {
     //5.1流程单查询-工单工序生产进程菜单栏
-    const getOrderProcessLeft_list = await getOrderProcessLeft({ order:order});
+    const getOrderProcessLeft_list = await getOrderProcessLeft({ order:order,yjno:_Gd_yjno.value});
     console.log(getOrderProcessLeft_list)
+    console.log(_Gd_yjno.value)
     pd_lcdformData['code'] = getOrderProcessLeft_list.data.Gd_info['code'];
     pd_lcdformData['name'] = getOrderProcessLeft_list.data.Gd_info['name'];
+    pd_lcdformData['yjno'] = _Gd_yjno.value;
     pd_lcd_treeData.value = [{
       label: order + '-' + getOrderProcessLeft_list.data.Gd_info['name'],
       // label: order + '-' + getOrderProcessLeft_list.data.Gd_info['code'] + '-' + getOrderProcessLeft_list.data.Gd_info['name'],
@@ -1570,7 +1576,7 @@ const _getOrderProcessLeft_list = async () => {
     }
     pd_lcd_treeData.value[0].children = newData;
     //5.2流程单查询-获取工单工序生产进程右侧【进入页面默认显示第一个】
-    const getOrderProcessRight_list = await getOrderProcessRight({order:order, gxNo:newData[0].value});
+    const getOrderProcessRight_list = await getOrderProcessRight({order:order, gxNo:newData[0].value,yjno:_Gd_yjno.value});
     processList.value = getOrderProcessRight_list.data
   } catch (error) {
     console.error(error);
@@ -1581,7 +1587,7 @@ const pd_lcd_handleNodeClick = async (node) => {
   if (node.value === undefined) return
   const order = pd_lcdformData['gdbh'];
   ////5.2流程单查询-获取工单工序生产进程右侧
-  const getOrderProcessRight_list = await getOrderProcessRight({order:order, gxNo:node.value});
+  const getOrderProcessRight_list = await getOrderProcessRight({order:order, gxNo:node.value,yjno:_Gd_yjno.value});
   console.log(getOrderProcessRight_list)
   processList.value = getOrderProcessRight_list.data
 };