From c18b61164fa4d9dcbeaa471ba3043334c576b1bc Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 28 二月 2024 17:25:18 +0800
Subject: [PATCH]  主生产计划

---
 src/views/plan/manufacturingorder/index.vue |   90 +++++++++++---------------------------------
 1 files changed, 23 insertions(+), 67 deletions(-)

diff --git a/src/views/plan/manufacturingorder/index.vue b/src/views/plan/manufacturingorder/index.vue
index bac33c6..71a087f 100644
--- a/src/views/plan/manufacturingorder/index.vue
+++ b/src/views/plan/manufacturingorder/index.vue
@@ -101,6 +101,7 @@
           </el-button> -->
 
           <el-button
+          v-if="permissions.manufacturingorder_export"
             @click="exportExcel"
             type="primary"
             style="margin-left:10px;"
@@ -108,6 +109,7 @@
             >瀵煎嚭
           </el-button>
           <el-button
+          v-if="permissions.manufacturingorder_label_print"
             @click="labelPrint"
             type="primary"
             style="margin-left:10px;"
@@ -202,10 +204,10 @@
     <el-dialog title="鏍囩鍒楄〃" :visible.sync="diaPrintTab" width="28%" top="5vh">
       <div style="width:100%;height: 400px;overflow-y: auto;">
         <div class="dia_body">
-          <el-checkbox 
+          <el-checkbox
           style="margin: 10px 5px;"
-          :indeterminate="isIndeterminate" 
-          v-model="checkAll" 
+          :indeterminate="isIndeterminate"
+          v-model="checkAll"
           @change="handleCheckAllChange">鍏ㄩ��</el-checkbox>
           <el-checkbox-group @change="changePrintCode()" v-model="checkIndexList">
             <el-card class="box-card" v-for="(item, i) in qrData" :key="i" style="margin-bottom: 15px; font-size: 16px !important;">
@@ -449,6 +451,16 @@
         // 鏍囬
         column: [
           {
+            minWidth: '120',
+            prop: 'moNo',
+            label: '杞﹂棿璁㈠崟鍙�',
+            sort: true,
+            isTrue: true,
+            isSearch: true,
+            searchInfoType: 'text',
+            render: { fun: this.addOrUpdateHandle }
+          },
+          {
             minWidth: '140',
             prop: 'state',
             label: '鐘舵��',
@@ -589,16 +601,7 @@
               return this.bomTypeDbOptions
             }
           },
-          {
-            minWidth: '120',
-            prop: 'moNo',
-            label: '杞﹂棿璁㈠崟鍙�',
-            sort: true,
-            isTrue: true,
-            isSearch: true,
-            searchInfoType: 'text',
-            render: { fun: this.addOrUpdateHandle }
-          },
+
           {
             minWidth: '120',
             prop: 'manufactureAttr',
@@ -1040,21 +1043,6 @@
   },
   created() {
     this.getManufactureAttrs()
-    /**
- * {
-            text: '鏂板',
-            type: 'primary',
-            fun: this.addOrUpdateHandle
-          },
-          {
-            text: '鎸夊鎴疯鍗曟煡璇�',
-            fun: this.getOperationTaskByCustomer
-          },
-          {
-            text: '璁㈠崟鍚堝苟',
-            fun: this.openOrderMerge
-          }
- */
     if (this.permissions.plan_manufacturingorder_add) {
       this.table.toolbar.push({
         text: '鏂板',
@@ -1068,28 +1056,6 @@
         fun: this.getOperationTaskByCustomer
       })
     }
-    // if (this.permissions.manufacturingorder_order_merge) {
-    //   this.table.toolbar.push({
-    //     text: '璁㈠崟鍚堝苟',
-    //     fun: this.openOrderMerge
-    //   })
-    // }
-
-    /**
-     * {
-          label: '鎵嬪姩鏂板',
-          command: 'MANUAL',
-          disabled: false,
-          permitArr: ['01planned', '02issued']
-        },
-        {
-          label: '鑷姩鏂板',
-          command: 'AUTO',
-          disabled: false,
-          permitArr: ['01planned', '02issued']
-        }
-     */
-
     if (this.permissions.manufacturingorder_create_task_manual) {
       this.taskTypeArr.push({
         label: '鎵嬪姩鏂板',
@@ -1106,21 +1072,7 @@
         permitArr: ['01planned', '02issued']
       })
     }
-    // 鍒濆鍖杚ueryParam
-    // this.initSearchCondition()
-    // if (!this.options.cancelRunCreated) {
-    //   this.getDataList()
-    // }
-    // const queryParam = []
-    //       queryParam.push(
-    //         Object.assign({
-    //           prop: 'state',
-    //           searchInfoType: 'select',
-    //           propVal: '01planned'
-    //         })
-    //       )
-    //   this.$refs.manufacturingOrderTable.setQueryParam(queryParam)
-    //   this.getData()
+
     this.getBomTypeDbOptions()
 
     // 杞﹂棿璁㈠崟鏄惁鍚屾IFS
@@ -1190,7 +1142,7 @@
             printable: 'printMOrder',//椤甸潰
             type: "html",//鏂囨。绫诲瀷
               maxWidth:450,
-              targetStyles:['*'],                 
+              targetStyles:['*'],
               style: `@page {
                 margin:0;
                 size: 360px 175px;
@@ -1215,7 +1167,7 @@
         console.log(data);
         let index = Number(data.qtyRequired) + Number(data.scrapQty)
         if(index>0){
-          for(var i=1;i<= index;i++){
+          for(var i=index;i>= 1;i--){
             let obj = {
               orderNo: data.customerOrderNo,
               cName: data.customerName,
@@ -1324,6 +1276,10 @@
     },
     // 鏂板 / 淇敼
     addOrUpdateHandle(row) {
+      if(!this.permissions.plan_manufacturingorder_edit && row.id!=null){
+        this.$message.error("璇ヨ鑹叉病鏈夋搷浣滄潈闄�")
+        return
+      }
       this.$router.push({
         name: 'productorderForm',
         query: { id: row == null ? null : row.id }

--
Gitblit v1.9.3