From 4bf457a5c8433c9ec6f0ec86b2c1c20c5e667391 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期四, 16 十一月 2023 20:22:21 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/zs-mes-before

---
 src/views/plan/customerorder/index.vue |   41 ++++++++++++-----------------------------
 1 files changed, 12 insertions(+), 29 deletions(-)

diff --git a/src/views/plan/customerorder/index.vue b/src/views/plan/customerorder/index.vue
index df9636f..1c1af1d 100644
--- a/src/views/plan/customerorder/index.vue
+++ b/src/views/plan/customerorder/index.vue
@@ -67,20 +67,20 @@
               >
             </el-dropdown-menu>
           </el-dropdown>
-          <el-button
+          <!-- <el-button
             v-if="permissions.customerorder_ifs_line"
             style="margin-left:10px;"
             type="primary"
             @click="pullIfsLineNo"
             >鑾峰彇OTC琛屽彿</el-button
-          >
-          <el-button
+          > -->
+          <!-- <el-button
             v-if="permissions.customerorder_push_otc"
             style="margin-left:10px;"
             type="primary"
             @click="pushOtc"
             >鎺ㄩ�丱TC</el-button
-          >
+          > -->
           <!-- <el-button
             style="margin-left:10px;"
             type="primary"
@@ -93,13 +93,13 @@
             @click="exportStandBook"
             >瀵煎嚭鍙拌处</el-button
           > -->
-          <el-button
+          <!-- <el-button
             v-if="permissions.plan_customerorder_return"
             style="margin-left:10px;"
             type="primary"
             @click="returnOrder"
             >璁㈠崟閫�鍥�</el-button
-          >
+          > -->
         </template>
       </ttable>
 
@@ -345,11 +345,9 @@
       sourceIdList: [{
         label: '澶栭儴',
         value: '0',
-        type: 'success',
       },{
         label: '鍐呴儴',
         value: '1',
-        type: ''
       }],
       stateTagArr: [
         {
@@ -817,7 +815,7 @@
         }
       },
       immediate: true
-    }
+    },
   },
   mounted() {
     this.initQueryParams()
@@ -843,7 +841,7 @@
     }
     if (this.permissions.customerorder_submit_oa) {
       this.table.toolbar.push({
-        text: '鎻愪氦瀹℃牳',
+        text: '鎻愪氦OA瀹℃牳',
         type: 'primary',
         fun: this.auditCustomerOrder,
         disabled: false,
@@ -886,7 +884,6 @@
           prop: 'coState',
           searchInfoType: 'select',
           // propVal: '01partUnCheck'
-          propVal: ''
         })
       )
       this.$refs.customerOrderTable.setQueryParam(queryParam)
@@ -930,6 +927,7 @@
             }
           }
           this.scheduleVisible = true
+          console.log(this.multipleSelection);
           this.$nextTick(() => {
             this.$refs.schedule.init(this.multipleSelection)
           })
@@ -1115,13 +1113,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()
@@ -1129,22 +1127,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) {

--
Gitblit v1.9.3