From d8ac6057eaad648687699e25a575f3b7b8c1b102 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期五, 17 十一月 2023 18:52:19 +0800
Subject: [PATCH] 	modified:   src/views/plan/customerorder/schedule-table.vue

---
 src/views/plan/customerorder/index.vue |   90 +++++++++++++++++++++++++--------------------
 1 files changed, 50 insertions(+), 40 deletions(-)

diff --git a/src/views/plan/customerorder/index.vue b/src/views/plan/customerorder/index.vue
index 12915ec..09782db 100644
--- a/src/views/plan/customerorder/index.vue
+++ b/src/views/plan/customerorder/index.vue
@@ -342,6 +342,13 @@
       showCustomerorderReturn: false,
       scheduleVisible: false,
       showDocument: false,
+      sourceIdList: [{
+        label: '澶栭儴',
+        value: '0',
+      },{
+        label: '鍐呴儴',
+        value: '1',
+      }],
       stateTagArr: [
         {
           label: '鏍囪闆朵欢寰呴��',
@@ -651,7 +658,18 @@
             minWidth: '140',
             width: '120',
             prop: 'deliveryDate',
-            label: '浜よ揣鏃堕棿',
+            label: '璁″垝浜よ揣鏃堕棿',
+            sort: true,
+            isTrue: true,
+            isSearch: true,
+            searchInfoType: 'datetimerange',
+            formatter: this.formatDutyDate
+          },
+          {
+            minWidth: '140',
+            width: '120',
+            prop: 'wantedDeliveryDate',
+            label: '瀹㈡埛鏈熸湜浜よ揣鏃堕棿',
             sort: true,
             isTrue: true,
             isSearch: true,
@@ -661,18 +679,18 @@
         ],
         toolbar: [],
         operator: [
-          {
-            text: '璁㈠崟璇存槑',
-            type: 'text',
-            size: 'small',
-            fun: this.openCustomerOrder
-          },
-          {
-            text: '鏌ョ湅搴撳瓨',
-            type: 'text',
-            size: 'small',
-            fun: this.stockHandle
-          },
+          // {
+          //   text: '璁㈠崟璇存槑',
+          //   type: 'text',
+          //   size: 'small',
+          //   fun: this.openCustomerOrder
+          // },
+          // {
+          //   text: '鏌ョ湅搴撳瓨',
+          //   type: 'text',
+          //   size: 'small',
+          //   fun: this.stockHandle
+          // },
           {
             text: '浣滃簾',
             type: 'text',
@@ -683,7 +701,6 @@
                 '01partUnCheck',
                 '02technologyUnCheck',
                 '03plan'
-                // '04planed'
               ],
               key: 'coState'
             }
@@ -692,7 +709,7 @@
         operatorConfig: {
           fixed: 'right',
           label: '鎿嶄綔',
-          width: 260,
+          width: 100,
           minWidth: 100
         }
       },
@@ -809,7 +826,7 @@
         }
       },
       immediate: true
-    }
+    },
   },
   mounted() {
     this.initQueryParams()
@@ -835,7 +852,7 @@
     }
     if (this.permissions.customerorder_submit_oa) {
       this.table.toolbar.push({
-        text: '鎻愪氦瀹℃牳',
+        text: '鎻愪氦OA瀹℃牳',
         type: 'primary',
         fun: this.auditCustomerOrder,
         disabled: false,
@@ -860,6 +877,14 @@
     }
   },
   methods: {
+    getSourceId(row, column, cellValue) {
+      this.sourceIdList.forEach((obj) => {
+        if (obj.value === cellValue) {
+          cellValue = obj.label
+        }
+      })
+      return cellValue
+    },
     getOtcPartSyncOptionList() {
       return this.otcPartSyncOptionList
     },
@@ -870,7 +895,6 @@
           prop: 'coState',
           searchInfoType: 'select',
           // propVal: '01partUnCheck'
-          propVal: '02technologyUnCheck'
         })
       )
       this.$refs.customerOrderTable.setQueryParam(queryParam)
@@ -914,6 +938,7 @@
             }
           }
           this.scheduleVisible = true
+          console.log(this.multipleSelection);
           this.$nextTick(() => {
             this.$refs.schedule.init(this.multipleSelection)
           })
@@ -1099,13 +1124,13 @@
     },
     // 浣滃簾
     cancelHandle(row) {
-      this.$confirm('鏄惁纭浣滃簾閿�鍞鍗曞彿涓�' + row.customerOrderNo + '鎻愮ず', {
+      this.$confirm('纭浣滃簾閿�鍞鍗曞彿涓恒��' + row.contractNo + '銆戠殑鏁版嵁?','鎻愮ず' , {
         confirmButtonText: '纭畾',
         cancelButtonText: '鍙栨秷',
         closeOnClickModal: false,
         type: 'warning'
       }).then(() => {
-        dropByContractNo(row.customerOrderNo).then((res) => {
+        dropByContractNo({id:row.id}).then((res) => {
           if (res.data.code === 0) {
             this.$message.success('浣滃簾鎴愬姛')
             this.getData()
@@ -1113,22 +1138,7 @@
             this.$message.error('浣滃簾澶辫触')
           }
         })
-      })
-      // .then(() => {
-      //   markPlanned([row.id], '05cancel').then((response) => {
-      //     var data = response.data
-      //     if (data.code === 0) {
-      //       this.$message.success('浣滃簾鎴愬姛')
-      //       this.getData()
-      //     } else {
-      //       this.$message.error('浣滃簾澶辫触')
-      //     }
-      //   })
-      // })
-      // .then((data) => {
-      //   this.$message.success('浣滃簾鎴愬姛')
-      //   this.getData()
-      // })
+      }).catch(()=>{ })
     },
     // 鍒犻櫎
     deleteHandle(row) {
@@ -1353,10 +1363,10 @@
                   '瀛樺湪閿�鍞鍗曞凡鍏宠仈宸ヨ壓鏂囦欢锛屽闇�鏇存敼锛岃鍏堣В闄ゅ叧鑱�'
                 )
               }
-              if (item.salesPartNo == null || item.salesPartNo === '') {
-                status = true
-                this.$message.error('瀛樺湪閿�鍞鍗曟湭缁戝畾閿�鍞欢锛岃鍏堢粦瀹�')
-              }
+              // if (item.salesPartNo == null || item.salesPartNo === '') {
+              //   status = true
+              //   this.$message.error('瀛樺湪閿�鍞鍗曟湭缁戝畾閿�鍞欢锛岃鍏堢粦瀹�')
+              // }
               if (item.partNo != firstPartNo) {
                 status = true
                 this.$message.error('璁㈠崟闆朵欢鍙蜂笉涓�鑷�')

--
Gitblit v1.9.3