From c880739ec4cd5ede33b31eb98ad5f7628ea288e5 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 11 十二月 2023 17:41:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/src/views/plan/customerorder/index.vue b/src/views/plan/customerorder/index.vue
index dbee1f0..63575e6 100644
--- a/src/views/plan/customerorder/index.vue
+++ b/src/views/plan/customerorder/index.vue
@@ -38,10 +38,10 @@
             </el-button>
             <el-dropdown-menu slot="dropdown">
               <el-dropdown-item
+                :key="index"
                 :command="item.command"
-                v-for="item in documentTagArr"
-                :disabled="item.disabled"
-              >
+                v-for="(item,index) in documentTagArr"
+                :disabled="item.disabled">
                 {{ item.label }}
               </el-dropdown-item>
             </el-dropdown-menu>
@@ -57,8 +57,9 @@
             </el-button>
             <el-dropdown-menu slot="dropdown">
               <el-dropdown-item
+                :key="index"
                 :command="item.command"
-                v-for="item in commitStateTagArr"
+                v-for="(item,index) in commitStateTagArr"
                 :disabled="item.disabled"
                 >{{ item.label }}</el-dropdown-item
               >
@@ -83,16 +84,15 @@
             @click="()=>exportDialogVisible=true"
             >瀵煎嚭鍙拌处</el-button
           >
-          <el-button
+          <!-- <el-button
             v-if="permissions.plan_customerorder_return"
             style="margin-left:10px;"
             type="primary"
             @click="returnOrder"
             >璁㈠崟閫�鍥�</el-button
-          >
+          > -->
         </template>
       </ttable>
-
       <!-- 寮圭獥, 鏃ユ湡閫夋嫨 -->
       <ConfirmPullCustomerorder
         v-if="showPullCustomerOrderVisible"
@@ -690,7 +690,7 @@
           //   fun: this.packageExportHandle
           // },
           {
-            text: '浣滃簾',
+            text: '鍒犻櫎',
             type: 'text',
             size: 'small',
             fun: this.cancelHandle,
@@ -835,9 +835,9 @@
     ...mapGetters(['permissions'])
   },
   watch: {
-    exportDialogVisible(newVal){
-      if(!newVal){
-        this.$refs['exportForm'].resetFields()
+    exportDialogVisible(newVal) {
+      if (!newVal) {
+        this.$refs.exportForm.resetFields()
       }
     },
     coState: {
@@ -920,14 +920,14 @@
     //   })
     // }
     if (this.permissions.customerorder_submit_oa) {
-      // this.table.toolbar.push({
-      //   text: '鎻愪氦瀹℃牳',
-      //   type: 'primary',
-      //   fun: this.auditCustomerOrder,
-      //   disabled: false,
-      //   permitArr: [],
-      //   loading: false
-      // })
+      this.table.toolbar.push({
+        text: '鎻愪氦瀹℃牳',
+        type: 'primary',
+        fun: this.auditCustomerOrder,
+        disabled: false,
+        permitArr: [],
+        loading: false
+      })
     }
     if (this.permissions.customerorder_set_salesparts) {
       this.table.toolbar.push({
@@ -954,7 +954,7 @@
       queryParam.push(
         Object.assign({
           prop: 'coState',
-          searchInfoType: 'select',
+          searchInfoType: 'select'
           // propVal: '01partUnCheck'
           // propVal: '02technologyUnCheck'
         })
@@ -975,7 +975,6 @@
     },
     // 鍒涘缓涓荤敓浜ц鍒�
     masterPlanHandle() {
-      console.log(this.multipleSelection);
       if (this.multipleSelection && this.multipleSelection.length > 0) {
         if (this.judgeCoState(this.multipleSelection)) {
           // 鍒ゆ柇涓�涓嬪墿浣欐暟閲忔槸鍚﹀ぇ浜�0
@@ -1092,7 +1091,7 @@
           let flag = true
           const ids = []
           this.multipleSelection.forEach((item) => {
-            if (item.salesPartNo != null && item.salesPartNo !== '') {
+            if (item.partNo != null && item.partNo !== '') {
               ids.push(item.id)
             } else {
               flag = false
@@ -1100,7 +1099,6 @@
           })
           if (flag) {
             checkOA(this.multipleSelection.map((e) => e.id)).then((res) => {
-              console.log(res)
               if (!res.data.data.success) {
                 this.$confirm(`${res.data.data.message}`, '鎻愮ず', {
                   confirmButtonText: '纭畾',
@@ -1149,7 +1147,6 @@
 
     // 绠辩爜淇℃伅瀵煎嚭
     packageExportHandle(row) {
-      console.log(row.otcQuantity)
       if (row.otcQuantity) {
         this.packageExport.visible = true
         this.packageExport.form = {
@@ -1186,13 +1183,13 @@
     },
     // 浣滃簾
     cancelHandle(row) {
-      this.$confirm('鏄惁纭浣滃簾閿�鍞鍗曞彿涓�' + row.customerOrderNo + '鎻愮ず', {
+      this.$confirm('纭浣滃簾id涓恒��' + row.id + '銆戠殑鏁版嵁?','鎻愮ず' , {
         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()
@@ -1578,7 +1575,6 @@
     },
     // 瀵煎嚭鍙拌处
     exportStandBook() {
-      // console.log(this.$refs.customerOrderTable.getQueryParam(),"SSS")
       // if (this.multipleSelection.length > 0) {
       //   let ids = ''
       //   this.multipleSelection.forEach((item) => {

--
Gitblit v1.9.3