生产管理

src/view/yunyin/chanpinziliao/chanpinziliao.vue

@@ -2887,7 +2887,7 @@ const addgyenterDialog = () => {
     // addgydialogFormVisible.value = false
   } else {
     ElMessage({type: 'error',message: '添加失败' })
-  } 
+  }
 }
 
 //工艺新增取消

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

@@ -89,7 +89,7 @@ const cp_print_ProductValue = async (e) => {
   }
 }
 
-//打印作业通知单->工单印件及工序列表
+//打印作业通知单->工单印件及工序列表【印件号】【终止工序号】
 const _PrintCodeList = async () => {
   const workOrder = form['gdbh'];
   const PrintCodeList_list = await PrintCodeList({workOrder:workOrder});
@@ -99,8 +99,8 @@ const _PrintCodeList = async () => {
     yjlist.value = PrintCodeList_list.data
     form['yjno'] = PrintCodeList_list.data[0].印件号;
     form['yjmc'] = PrintCodeList_list.data[0].印件名称;
-
     const res = await ProcessCodeList({workOrder:workOrder, yjno: form['yjno']});
+    form['gxh'] = res.data[0]['工序号']
     gxlist.value = res.data
   }
 }
@@ -2606,9 +2606,12 @@ hiprint.init()
 const hiprintTemplate = new hiprint.PrintTemplate({ template: jsondata })
 const _gdlx = ref('')
 const cp_print_handleConfirm = async () => {
+  if(form['yjno'] === '' || form['yjno'] === undefined){
+    ElMessage({type: 'warning',message: '印件资料为空'})
+    return false;
+  }
   let params = {};
-  //2310707
-  //2012127
+  //2310707、2012127
   params.workOrder = form['gdbh'];
   params.PrepareDocument = form['zd'];
   params.examine = form['sh'];
@@ -2616,11 +2619,18 @@ const cp_print_handleConfirm = async () => {
   params.gxh = form['gxh'];
   //调用打印接口【打印作业通知单】
   const print_PrintJobOrder = await PrintJobOrder(params);
-  console.log(print_PrintJobOrder)
-  _gdlx.value =  '★' +print_PrintJobOrder.data['工单类型']
+  // console.log(print_PrintJobOrder)
+  if(print_PrintJobOrder.msg === '未找到物料资料信息'){
+    ElMessage({type: 'warning',message: '未找到物料资料信息'})
+    return false;
+  }
+  if(print_PrintJobOrder.data['工单类型']){
+    _gdlx.value =  '★' +print_PrintJobOrder.data['工单类型']
+  }
 
-  if(print_PrintJobOrder.data === null){
-    ElMessage({type: 'error',message: print_PrintJobOrder.msg})
+  if(print_PrintJobOrder.data === null || print_PrintJobOrder.data === undefined || print_PrintJobOrder.data === ''){
+    ElMessage({type: 'error',message: print_PrintJobOrder.msg});
+    return false;
   }
   // 获取当前日期
   const today = new Date();
@@ -2638,7 +2648,6 @@ const cp_print_handleConfirm = async () => {
     "printcode":print_PrintJobOrder.data['生产批次号'],
     "dysj":currentDate,
     "scpch":print_PrintJobOrder.data['生产批次号'],
-    // "xsddh":print_PrintJobOrder.data['生产批次号'],
     "xsddh":print_PrintJobOrder.data['销售订单号'],
     "khdh":  print_PrintJobOrder.data['客户代码'],
     "khmc":  print_PrintJobOrder.data['客户名称'],
@@ -2684,7 +2693,6 @@ const cp_print_handleConfirm = async () => {
     })),
     "shr":form['sh'],
     "zdr":form['zd']
-
   }
   hiprintTemplate.print(printdata);
   // cp_print_gdlist.value = false;

src/view/yunyin/shengchanguanli/gongdanziliao.vue

@@ -118,7 +118,7 @@
                 <el-input v-model="yycpzlformData['gdbh']" @keyup.enter="yycpzlProductValue" placeholder="" style="width: 23%;" />
               </el-form-item>
               <el-form-item label="客户代号" prop="processName" class="mab">
-                <el-input v-model="yycpzlformData['khdh']" disabled  placeholder="" />
+                <el-input v-model="yycpzlformData['khdh']" disabled  placeholder="" style="width: 23%;" />
                 <el-input v-model="yycpzlformData['khmc']" disabled  placeholder="" style="width: 320px;" />
               </el-form-item>
               <el-form-item label="产品代号" prop="processName" class="mab" >
@@ -2445,7 +2445,7 @@ const addGongyiAttach = () => {
 }
 const gdzlfjxxtableColumns = ref(
     [
-      { label: '方案', prop: '方案', width: '70' },
+      { label: '方案', prop: '方案', width: '60' },
       { label: '印件号', prop: '印件号', width: '70' },
       { label: '工序号', prop: '工序号', width: '70' },
       { label: '工序名称', prop: '工序名称', width: '370' },