From 99d0bb96043ba5d6db66bbfb00f67ca4e09f3ffb Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期五, 07 三月 2025 09:08:33 +0800
Subject: [PATCH] 小片尺寸和成品尺寸不相同时，打印显示小片信息

---
 north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue |   39 +++++++++++++++++++++++++--------------
 1 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue b/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue
index bde8b03..816f8fc 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue
@@ -104,7 +104,7 @@
         layer= res.data.layer
 
         //娣诲姞琛ョ墖鐘舵�佸垪
-        let column = {field: 'patchStatusOther', width: 90,title: res.data.title}
+        let column = {field: 'patchStatusOther', width: 90,title: t('reportingWorks.patchCondition')}
         gridOptions.columns.push(column)
 
         const s01Values = [];
@@ -138,8 +138,6 @@
           button.name=t('basicData.review')
           titleUploadData.value.qualityInspector=user.user.userName
         }
-
-
         gridOptions.toolbarConfig.buttons.push(button)
       }
      // getQuantity()
@@ -356,7 +354,7 @@
           }else if((row.completedQuantity*1+brokenNum*1)>row.quantity*1){
             return new Error((`${row.completedQuantity}+${brokenNum}>${row.quantity}`))
           }else  if(row.quantity_card<row.completedQuantity){
-            return new Error("瀹屽伐鏁颁笉鑳藉ぇ浜庢祦绋嬪崱鏁伴噺")
+            return new Error(t('reportingWorks.pleaseNumber10'))
           }
           const completedNum =
               (row.completedQuantity === undefined || row.completedQuantity===null || row.completedQuantity==='') ? 0 : row.completedQuantity
@@ -415,7 +413,7 @@
     const $grid = xGrid.value
     if ($grid) {
       switch (code) {
-        case 'saveReportingWork':  {
+        case 'saveReportingWork':  {//淇濆瓨
           const errMap = await $grid.validate(true)
           if (errMap) {
             ElMessage.error(t('basicData.msg.checkoutLose'))
@@ -433,7 +431,7 @@
           saveReportingWork(1,'save')
           break
         }
-        case 'update':  {
+        case 'update':  {//淇敼
           //鏍规嵁琛ョ墖鐘舵�佸垽鏂槸鍚﹁兘淇敼
           // request.post(`/reportingWork/getPatchCondition/${route.query.reportingWorkId}`).then(async (res) => {
           //   if (res.code == 200) {
@@ -475,7 +473,7 @@
       }
     }
   },
-  menuClick({menu, row, column}) {
+  menuClick({menu, row, column}) {//鍙抽敭鑿滃崟
     const $grid = xGrid.value
     if ($grid) {
       switch (menu.code) {
@@ -874,6 +872,7 @@
     return item.saveFlag === 0
   })
   let process = titleUploadData.value.thisProcess
+  //鏆傛椂鍙栨秷
   for(let item of uniqueByOrderNum){
     if(!checkSameNumForId(notFinishList,item.order_number ) && (process=='澶硅兌' || process=='涓┖' || process=='鍖呰' ||process=='鎵撹兌鍜岀矘妗�')){
       ElMessage.error(`${t('reportingWorks.pleaseCheckTheOrderNumber1')}':'
@@ -1098,7 +1097,7 @@
       //璁惧涓嬫媺妗�
       titleSelectJson.value.deviceType = res.data.device
       //鐝粍涓嬫媺妗�
-      titleSelectJson.value.teamsType = res.data.teams
+      //titleSelectJson.value.teamsType = res.data.teams
       //褰撳墠娴佺▼鍗″伐搴�
       titleSelectJson.value.thisProcessType = res.data.thisProcess
       //鍘嗗彶鐝粍
@@ -1317,8 +1316,8 @@
 </script>
 
 <template>
-  <div style="height: 100%;width: 100%">
-    <div id="head" style="height: 5%;width: 100%;margin-bottom: 5px">
+  <div  style="width: 100%;height: 100%">
+    <div class="head">
       <el-input :disabled="inputDisabled" v-if="titleUploadData.reportingWorkId" v-model="titleUploadData.reportingWorkId" :placeholder="$t('reportingWorks.reportingWorkId')" style="width: 200px" />
       <el-input :disabled="inputDisabled" v-model="titleUploadData.processId" :placeholder="$t('processCard.processId')" style="width: 200px" @keyup.enter.native="getWork();getQuantity()"/>
       &nbsp;
@@ -1342,7 +1341,7 @@
       &nbsp;
       <label>{{technologicalProcess}}</label>
     </div>
-    <div style="background-color: white;margin-bottom: 5px;height: 17%;width: 100%">
+    <div class="head1">
       <el-row>
         <el-col :span="2">
           <el-text>{{$t('order.orderId')}}锛�</el-text>
@@ -1478,12 +1477,11 @@
 
       </el-row>
     </div>
-    <div class="main-div-customer" style="width: 100%;height: 70%">
+    <div class="main-table">
       <vxe-grid
           ref="xGrid"
           class="mytable-scrollbar"
           :row-class-name="changeRowClass"
-          max-height="100%"
           height="100%"
           size="small"
           v-bind="gridOptions"
@@ -1507,6 +1505,7 @@
 
 
       </vxe-grid>
+    </div>
       <el-dialog
           @opened="openedBrokenTable"
           :before-close="checkClose"
@@ -1610,12 +1609,24 @@
 
         </vxe-grid>
       </el-dialog>
-    </div>
   </div>
 </template>
 
 <style scoped>
+.head{
+  width: 100%;
+  height: 35px;
+}
+.head1{
+  width: 100%;
+  height: 105px;
+  background-color: white;
+}
 
+.main-table{
+  width: 100%;
+  height: calc(100% - 135px);
+}
 
 .processCard {
   width: 140px;

--
Gitblit v1.8.0