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

src/api/yunyin/yunying.js

@@ -539,6 +539,14 @@ export const WastageList  = (params) => {
         params
     })
 }
+//引用产品资料->工单列表
+export const WorkOrderDetailCope  = (params) => {
+    return service({
+        url: '/mes_server/work_order/WorkOrderDetailCope',
+        method: 'get',
+        params
+    })
+}
 
 /**工单生产排单(排产管理)*/
 //计划中工单
@@ -806,8 +814,8 @@ export const getOrderProcessRight = (params) => {
         method: 'get',
         params
     })
-}
-
+}
+
 //获取产品附件资料列表
 export const getAnnexTable = (params) => {
     return service({
@@ -820,18 +828,18 @@ export const getAnnexTable = (params) => {
 export const annexAdd = (formData) => {
     return service({
         url:'/mes_server/work_order/annexAdd',
-        method: 'post',
+        method: 'post',
 		data: formData
     })
-}
-//产品附件删除
+}
+//产品附件删除
 export const annexDel= (params) => {
     return service({
         url:'/mes_server/work_order/annexDel',
         method: 'get',
         params
     })
-}
+}
 //获取工单附件资料列表
 export const getGdAnnexTable = (params) => {
     return service({
@@ -844,15 +852,15 @@ export const getGdAnnexTable = (params) => {
 export const gdAnnexAdd = (formData) => {
     return service({
         url:'/mes_server/work_order/gdAnnexAdd',
-        method: 'post',
+        method: 'post',
 		data: formData
     })
-}
-//工单附件删除
+}
+//工单附件删除
 export const gdAnnexDel= (params) => {
     return service({
         url:'/mes_server/work_order/gdAnnexDel',
         method: 'get',
         params
     })
-}
+}

src/view/job/processSheet/processSheet.vue

@@ -307,6 +307,7 @@
 
 		 }
 	}
+  //在使用中的不带边框的模板
   const jsondata1= {
     "panels": [
       {
@@ -1525,6 +1526,7 @@
       }
     ]
   }
+  //带边框的模板
   const jsondata = {
     "panels": [
       {

src/view/performance/12-orderAccounting/componets/gdcjstj.vue

@@ -44,6 +44,7 @@ const props = defineProps({
 })
 const input = ref(props['gdbh'])
 
+// 按工序打印
 const handlePrint1 = async() => {
   // 引入后初始化
   hiprint.init()
@@ -101,8 +102,8 @@ const handlePrint1 = async() => {
         'mbbfl': item['target_loss_rate'],
         'sjbfl': item['actual_loss_rate'],
         'cdbl': item['超节损承担比例'],
-        'cjsje': item[''],
-        'zgqr': item[''],
+        'gxcjsje': item['工序超节损金额'].substring(0, item['工序超节损金额'].length - 2),
+        'zgqr': '',
       })),
     }
     console.log(tableData)
@@ -110,6 +111,7 @@ const handlePrint1 = async() => {
   }
 }
 
+// 按班组打印
 const handlePrint2 = async() => {
   // 引入后初始化
   hiprint.init()
@@ -139,7 +141,7 @@ const handlePrint2 = async() => {
       'clf': data['材料废'],
       'wff': data['外发废'],
       'ltcl': data['零头处理'],
-      'zcf': data[''],
+      'zcf': data['zcfp'],
       'zjf': data['工单质检废'],
       'wxs': data[''],
       'mbhgl': data['target_rate'],
@@ -159,7 +161,7 @@ const handlePrint2 = async() => {
         'wxsft': item['无形损分摊'],
         'jssl': item['节损数量'],
         'cdbl': item['超节损承担比例'],
-        'jsj': `<span style="color: red;">${item['loss'] ? item['loss'] : ''}</span>`,
+        'jsj': `<span style="color: red;">${item['节损奖'] ? item['节损奖'] : ''}</span>`,
       })),
     }
     console.log(tableData)

src/view/performance/12-orderAccounting/componets/template-bz.json

@@ -1678,7 +1678,7 @@
                         "bottom": 198.0000057220459,
                         "vCenter": 405.75,
                         "hCenter": 177.7500057220459,
-                        "fontSize": 9,
+                        "fontSize": 8,
                         "lineHeight": 18,
                         "maxRows": 21,
                         "columns": [

src/view/yunyin/shengchanguanli/gongdanziliao.vue

@@ -1275,7 +1275,7 @@ import {
   ProductInformation, TestCoefficient, capacityList,getOrderProcessRight,
   DataCorrection, U8Trial, ProcessFlow, AccountingParameter,setProductStatus,
   getProduct, getProductGy, ProductInformationEdit, workOrderListDetail, editProduct, getOrderProcessCount, StatusEdit,
-  PrintDetailDel, ProcessDetailDel,
+  PrintDetailDel, ProcessDetailDel,WorkOrderDetailCope,
   getGdAnnexTable,
   gdAnnexAdd,
   gdAnnexDel,
@@ -2693,32 +2693,39 @@ const onyycpzlclick = () => {
     ElMessage({type: 'warning',message: '请选择具体的工单后，再操作此功能'})
   }else{
     yycpzlformData['gdbh'] = _Gd_gdbh.value;
-    _ProductInformations();
+    _WorkOrderDetailCopedata();
     onyycpzllist.value = true;
   }
 };
 //引用产品资料【回车】
 const yycpzlProductValue = async () => {
-  _ProductInformations();
-};
-//引用产品资料->获取产品资料
-const _ProductInformations = async ()=>{
-  let workOrder = yycpzlformData['gdbh'];
-  const ProductInformations = await ProductInformation({workOrder:workOrder});
-  if(ProductInformations.msg === '未找到工单信息'){
-    yycpzlformData['khdh'] = '';
-    yycpzlformData['khmc'] = '';
-    yycpzlformData['cpdh'] = '';
-    yycpzlformData['cpmc'] =  '';
-    ElMessage({type: 'warning',message: '未找到工单信息'})
+  if(yycpzlformData['gdbh'] == null || yycpzlformData['gdbh'] == ''){
+    ElMessage({type: 'warning',message: '工单那不能为空'})
     return false;
-  }else{
-    yycpzlformData['gdbh'] = ProductInformations.data['工单编号'];
-    yycpzlformData['khdh'] = ProductInformations.data['客户代号'];
-    yycpzlformData['khmc'] = ProductInformations.data['客户名称'];
-    yycpzlformData['cpdh'] = ProductInformations.data['产品代号'];
-    yycpzlformData['cpmc'] = ProductInformations.data['产品名称'];
   }
+  _WorkOrderDetailCopedata();
+};
+//引用产品资料->获取产品资料
+const _WorkOrderDetailCopedata = async ()=>{
+  let search = yycpzlformData['gdbh'];
+  console.log(search)
+  // const ProductInformations = await ProductInformation({workOrder:search});
+  const WorkOrderDetailCopes = await WorkOrderDetailCope({search:search});
+  console.log(WorkOrderDetailCopes);
+  // if(ProductInformations.msg === '未找到工单信息'){
+  //   yycpzlformData['khdh'] = '';
+  //   yycpzlformData['khmc'] = '';
+  //   yycpzlformData['cpdh'] = '';
+  //   yycpzlformData['cpmc'] =  '';
+  //   ElMessage({type: 'warning',message: '未找到工单信息'})
+  //   return false;
+  // }else{
+  //   yycpzlformData['gdbh'] = ProductInformations.data['工单编号'];
+  //   yycpzlformData['khdh'] = ProductInformations.data['客户代号'];
+  //   yycpzlformData['khmc'] = ProductInformations.data['客户名称'];
+  //   yycpzlformData['cpdh'] = ProductInformations.data['产品代号'];
+  //   yycpzlformData['cpmc'] = ProductInformations.data['产品名称'];
+  // }
 }
 //引用产品资料【执行】
 const yycpzlhandleConfirm = async () => {