From edc227277159601c5cb86829f1c5ce14cf7903a4 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期二, 24 九月 2024 10:12:55 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

---
 north-glass-erp/northglass-erp/src/views/pp/workOrder/SelectWorkOrder.vue |   59 ++++++++++++++++++++++++++++++++++++++++++++---------------
 1 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/north-glass-erp/northglass-erp/src/views/pp/workOrder/SelectWorkOrder.vue b/north-glass-erp/northglass-erp/src/views/pp/workOrder/SelectWorkOrder.vue
index e1eadfa..e4c3edd 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/workOrder/SelectWorkOrder.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/workOrder/SelectWorkOrder.vue
@@ -26,7 +26,6 @@
 const getTableRow = (row, type) => {
   switch (type) {
     case 'edit' : {
-      //alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑缂栬緫淇℃伅')
       router.push({path: '/main/workOrder/addWorkOrder', query: {orderId: row.orderId}})
       break
     }
@@ -152,7 +151,7 @@
 
 
 //鐐瑰嚮鏌ヨ
-const getWorkOrder = (isButtonDisabled) => {
+const getWorkOrder = () => {
 
   let startTime = orderInfo.workOrderDate[0]
   let endTime = orderInfo.workOrderDate[1]
@@ -247,8 +246,15 @@
     mode: 'row',
     showStatus: true
   },//琛ㄥご鍙傛暟
+  checkboxConfig: {
+    labelField: 'name',
+    checkMethod: ({ row }) => {
+      return optionVal.value === '1'
+    }
+  },
   columns: [
     {type: 'expand', fixed: "left", slots: {content: 'content'}, width: 50},
+    {type: 'checkbox', fixed: "left", title: t('basicData.check'), width: 80},
     {title: t('basicData.operate'), width: 110, slots: {default: 'button_slot'}, fixed: "left"},
     {type: 'seq', fixed: "left", title: t('basicData.Number'), width: 50},
     {field: 'orderId', title: t('order.orderId'), filters: [{data: ''}], slots: {filter: 'num1_filter'}, width: 110},
@@ -272,9 +278,9 @@
   ],//琛ㄥご鎸夐挳
   data: null,//琛ㄦ牸鏁版嵁
   toolbarConfig: {
-    // buttons: [{
-    //
-    // }],
+    buttons: [
+      {'code': 'transferOrder', 'name': t('workOrder.transferOrder'),status: 'primary'}
+    ],
     // import: false,
     // export: true,
     // print: true,
@@ -298,6 +304,23 @@
   }
 
 })
+const gridEvents = {
+  async toolbarButtonClick({code}) {
+    const $grid = xGrid.value
+    if ($grid) {
+      switch (code) {
+        case 'transferOrder':  {
+          const idList = []
+           $grid.getCheckboxRecords().forEach(item => {
+             idList.push(item.orderId)
+          })
+          router.push({path: '/main/workOrder/addWorkOrder', query: {orderId:idList.join(',')}})
+          break
+        }
+      }
+    }
+  }
+}
 
 onMounted(() => {
   getFirst()
@@ -319,7 +342,12 @@
 
         />
         &nbsp;&nbsp;
-        <el-select :default-first-option="true" ref="getSelect" style="width: 130px" v-model="optionVal" class="m-2"
+        <el-select
+            :default-first-option="true"
+            ref="getSelect" style="width: 130px"
+            v-model="optionVal"
+            class="m-2"
+            @change="getWorkOrder"
                    >
           <el-option
               v-for="item in options"
@@ -330,7 +358,7 @@
         </el-select>
         &nbsp;&nbsp;
         <el-button
-            @click="getWorkOrder(isButtonDisabled)"
+            @click="getWorkOrder"
             :disabled="isButtonDisabled"
             id="select"
             type="primary" :icon="Search">{{$t('basicData.search')}}
@@ -344,6 +372,7 @@
         class="mytable-scrollbar"
         ref="xGrid"
         v-bind="gridOptions"
+        v-on="gridEvents"
 
     >
       <!--      @toolbar-button-click="toolbarButtonClickEvent"-->
@@ -362,14 +391,14 @@
       <!--宸﹁竟鍥哄畾鏄剧ず鐨勬彃妲�-->
       <template #button_slot="{ row }">
 <!--        <el-button :class="{disable: optionVal== 0}" :disabled="optionVal == 0" @click="getTableRow(row,'edit')" link type="primary" size="small">{{$t('workOrder.transferOrder')}}</el-button>-->
-        <el-button :class="{disable: optionVal== 0}" :disabled="optionVal == 0"
-                   @click="getTableRow(row,'edit')"
-                   v-if="userStore.user.permissions.indexOf('SelectWorkOrder.edit') > -1"
-                   link
-                   type="primary"
-                   size="small">
-          {{$t('workOrder.transferOrder')}}
-        </el-button>
+<!--        <el-button :class="{disable: optionVal== 0}" :disabled="optionVal == 0"-->
+<!--                   @click="getTableRow(row,'edit')"-->
+<!--                   v-if="userStore.user.permissions.indexOf('SelectWorkOrder.edit') > -1"-->
+<!--                   link-->
+<!--                   type="primary"-->
+<!--                   size="small">-->
+<!--          {{$t('workOrder.transferOrder')}}-->
+<!--        </el-button>-->
 
         <!--        <el-button :class="{disable: optionVal== 1}" :disabled="optionVal == 1" @click="getTableRow(row,'delete')" link type="primary" size="small">{{$t('basicData.delete')}}</el-button>-->
         <el-popconfirm   @confirm="getTableRow(row,'delete')" :title="$t('searchOrder.deleteConfirm')">

--
Gitblit v1.8.0