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

src/view/performance/12-orderAccounting/index.vue

@@ -24,7 +24,7 @@
 
               <el-button type="primary" icon="edit" class="bt"@click="handleGddy">工单打印</el-button>
 
-              <el-button type="primary" icon="edit" class="bt" @click="() => { pd_lcdlist = true; pd_lcdProductValue();}">流程单查询</el-button>
+              <el-button type="primary" icon="edit" class="bt" @click="pd_lcdlistonClick">流程单查询</el-button>
 
               <el-button type="primary" icon="edit" class="bt" @click="exportExcel">导出Excel</el-button>
 
@@ -94,7 +94,10 @@
                 <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: 20px; padding: 0">
+                  <el-input v-model="pd_lcdformData['yjno']" @keyup.enter="pd_lcdProductValue" placeholder="Enter回车"/>
+                </el-form-item>
+                <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">
@@ -251,6 +254,7 @@ export const getOrderProcessRight = (params) => {
 }
 </script>
 <script setup>
+import { ElMessage, ElMessageBox } from 'element-plus'
 import {
   Layout,
   LayoutContent,
@@ -370,7 +374,6 @@ watch(currentRow, (value, oldValue, onCleanup) => {
   date.value = value?.['date']
   yjno.value = value?.['yj_Yjno']
   jjcp_yjno.value = value?.['jjcp_yjno']
-  pd_lcdformData['gdbh'] = value?.['Gd_gdbh']
 })
 
 const cjsriqi = ref ('')
@@ -458,26 +461,45 @@ const printPageRef = ref()
 function handleGddy() {
   printPageRef.value.open(gdbh.value)
 }
+const _Gd_gdbh = ref(null)
 
+// =========== 流程单查询 ===========
 const pd_lcdlist = ref(false)
+const pd_lcdformData = reactive({
+  gdbh: '',
+  code: '',
+  name: '',
+  yjno: '',
+});
+
+// 流程单查询按钮
 const processList = ref([])
-
-const pd_lcdformData = reactive({})
-const pd_lcdProductValue = async() => {
-  _getOrderProcessLeft_list()
+const pd_lcdlistonClick = async () => {
+   _Gd_gdbh.value = currentRow.value['Gd_gdbh']
+  console.log(_Gd_gdbh)
+  if(_Gd_gdbh.value === '' || _Gd_gdbh.value === null || _Gd_gdbh.value === undefined){
+    ElMessage({type: 'warning',message: '请选择具体的工单，在进行操作'})
+    return false;
+  }else{
+    pd_lcdformData['gdbh'] = _Gd_gdbh.value;
+    pd_lcdformData['yjno'] = currentRow.value['jjcp_yjno'];
+    pd_lcdlist.value = true;
+    processList.value = []
+    _getOrderProcessLeft_list();
+  }
+}
+const pd_lcdProductValue = async () => {
+  _getOrderProcessLeft_list();
 }
 const pd_lcd_treeData = ref([])
-const _getOrderProcessLeft_list = async() => {
+const _getOrderProcessLeft_list = async() => {  
   const order = pd_lcdformData['gdbh']
-  console.log(order)
+  const yjno = pd_lcdformData['yjno']
   try {
     // 5.1流程单查询-工单工序生产进程菜单栏
-    const getOrderProcessLeft_list = await getOrderProcessLeft({
-      order: order,
-      yjno:currentRow.value['jjcp_yjno']
-    })
+    const getOrderProcessLeft_list = await getOrderProcessLeft({order: order,yjno:yjno})
     console.log(getOrderProcessLeft_list)
-    pd_lcdformData['code'] = currentRow.value['jjcp_yjno']
+    pd_lcdformData['code'] = getOrderProcessLeft_list.data.Gd_info['code']
     pd_lcdformData['name'] = getOrderProcessLeft_list.data.Gd_info['name']
     pd_lcd_treeData.value = [
       {
@@ -495,11 +517,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,
-      yjno:currentRow.value['jjcp_yjno']
-    })
+    const getOrderProcessRight_list = await getOrderProcessRight({order: order,gxNo: newData[0].value,yjno:yjno})
     processList.value = getOrderProcessRight_list.data
   } catch (error) {
     console.error(error)
@@ -509,12 +527,9 @@ const _getOrderProcessLeft_list = async() => {
 const pd_lcd_handleNodeClick = async(node) => {
   if (node.value === undefined) return
   const order = pd_lcdformData['gdbh']
+  const yjno = currentRow.value['jjcp_yjno']
   // //5.2流程单查询-获取工单工序生产进程右侧
-  const getOrderProcessRight_list = await getOrderProcessRight({
-    order: order,
-    gxNo: node.value,
-    yjno:currentRow.value['jjcp_yjno']
-  })
+  const getOrderProcessRight_list = await getOrderProcessRight({order: order,gxNo: node.value,yjno:yjno})
   console.log(getOrderProcessRight_list)
   processList.value = getOrderProcessRight_list.data
 }

src/view/yunyin/shengchanguanli/gongdanshengchan.vue

@@ -215,7 +215,7 @@
                 <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-input v-model="pd_lcdformData['yjno']" @keyup.enter="pd_lcdProductValue"/>
               </el-form-item>
               <el-form-item label="" style="margin-right: 5px; padding: 0;">
                 <el-input v-model="pd_lcdformData['code']" disabled/>
@@ -1542,6 +1542,7 @@ const pd_lcdlistonClick = async () => {
     return false;
   }else{
     pd_lcdformData['gdbh'] = _Gd_gdbh.value;
+    pd_lcdformData['yjno'] = _Gd_yjno.value;
     pd_lcdlist.value = true;
     processList.value = []
     _getOrderProcessLeft_list();
@@ -1553,15 +1554,14 @@ const pd_lcdProductValue = async () => {
 const pd_lcd_treeData = ref([]);
 const _getOrderProcessLeft_list = async () => {
   const order = pd_lcdformData['gdbh'];
+  const yjno = pd_lcdformData['yjno']
   // console.log(order)
   try {
     //5.1流程单查询-工单工序生产进程菜单栏
-    const getOrderProcessLeft_list = await getOrderProcessLeft({ order:order,yjno:_Gd_yjno.value});
+    const getOrderProcessLeft_list = await getOrderProcessLeft({ order:order,yjno:yjno});
     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'],
@@ -1576,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,yjno:_Gd_yjno.value});
+    const getOrderProcessRight_list = await getOrderProcessRight({order:order, gxNo:newData[0].value,yjno:yjno});
     processList.value = getOrderProcessRight_list.data
   } catch (error) {
     console.error(error);
@@ -1586,8 +1586,9 @@ const _getOrderProcessLeft_list = async () => {
 const pd_lcd_handleNodeClick = async (node) => {
   if (node.value === undefined) return
   const order = pd_lcdformData['gdbh'];
+  const yjno = pd_lcdformData['yjno'];
   ////5.2流程单查询-获取工单工序生产进程右侧
-  const getOrderProcessRight_list = await getOrderProcessRight({order:order, gxNo:node.value,yjno:_Gd_yjno.value});
+  const getOrderProcessRight_list = await getOrderProcessRight({order:order, gxNo:node.value,yjno:yjno});
   console.log(getOrderProcessRight_list)
   processList.value = getOrderProcessRight_list.data
 };