From a366f8e668f28a92b920838637edb108e29f0c2a Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期四, 12 九月 2024 13:39:34 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

---
 north-glass-erp/northglass-erp/src/views/pp/processCard/AddProcessCard.vue |   76 +++++++++++++++++++++++++++++++++++++-
 1 files changed, 74 insertions(+), 2 deletions(-)

diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/AddProcessCard.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/AddProcessCard.vue
index b4e0214..74b9e07 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/AddProcessCard.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/AddProcessCard.vue
@@ -99,7 +99,6 @@
 
     })
     produceList = produceList.value.concat(deepClone(res.data.data))
-    console.log(produceList)
     xGrid.value.reloadData(produceList)
     gridOptions.loading = false
   } else {
@@ -199,7 +198,7 @@
     {field: 'thickness', title: t('processCard.glassThickness'), width: '80px'},
     {field: 'weight', title: t('processCard.weight'), slots: {default: 'weight_sum'}, width: '85px'},
     {field: 'remarks', title: t('processCard.notes'),  width: '85px',filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod: filterChanged},
-    {field: 'bend_radius', title: t('order.bendRadius'),  width: '110px',filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod: filterChanged}
+    {field: 'bend_radius', title: t('order.bendRadius'),  width: '120px',filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod: filterChanged,sortable: true,}
 
   ],//琛ㄥご鎸夐挳
 
@@ -434,6 +433,75 @@
     $gridLeft.clearCheckboxRow()
     $grid.clearCheckboxRow()
   }
+}
+
+
+//鎸夌紪鍙峰垱寤烘祦绋嬪崱
+const createProcessCardNo = () => {
+  const $grid = xGrid.value
+  const checkedList = $grid.getCheckboxRecords()
+
+  if (checkedList.length === 0) {
+    ElMessage.warning(t('processCard.schedulingOk'))
+    return
+  }
+  //productionId
+  const $gridLeft = xGridLeft.value
+  const leftData = $gridLeft.getTableData().fullData
+  let index = 0
+  if (leftData.length !== 0) {
+    index = leftData[0].landingSequence + 1
+    //index = index.toString().padStart(2, '0')
+  }
+
+  let processId= null
+
+  if (maxProcseeId!== null || maxProcseeId!== undefined|| maxProcseeId!== ''){
+    if (leftData.length !== 0){
+      const str=leftData[0].processId
+      const lastThree = str.slice(-3);
+      const result =  lastThree*1 + 1;
+      processId= productionId + result.toString().padStart(3, '0')
+    }
+    else {
+      // 鎴彇鍚庝笁浣�
+      const lastThree = maxProcseeId.slice(-3);
+      const result =  lastThree*1 + 1;
+      processId= productionId + result.toString().padStart(3, '0')
+    }
+
+  }
+  else {
+
+      processId = productionId + index.toString().padStart(3, '0')
+
+
+  }
+
+
+  const regex = /^(\d+|)$/;
+  if (!regex.test(checkedNum.value)) {
+    ElMessage.warning(t('processCard.schedulingNo'))
+    return
+  }
+
+    checkedList.forEach((item) => {
+      index++
+      processId = productionId + index.toString().padStart(3, '0')
+      item.processId = processId
+      item.landingSequence = index
+      item.quantity = item.baiscQuantity
+    })
+    //鍒犻櫎key
+    checkedList.forEach((item) => {
+      delete item._X_ROW_KEY
+    })
+    $gridLeft.insertAt(checkedList)
+    $grid.remove(checkedList)
+    //娓呴櫎涓よ竟澶嶉�夋
+    $gridLeft.clearCheckboxRow()
+    $grid.clearCheckboxRow()
+
 }
 
 
@@ -807,6 +875,10 @@
             <br>
             <el-button type="primary" @click="createProcessCard">{{ $t('processCard.establishProcessCards') }}
             </el-button>
+            <br>
+            <br>
+            <el-button type="primary" @click="createProcessCardNo">鎸夊簭鍙峰垱寤�
+            </el-button>
           </el-main>
         </div>
 

--
Gitblit v1.8.0