From b0d4df5f39525ae7fe252e8ee65d85fd71dca721 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期四, 07 五月 2026 14:53:32 +0800
Subject: [PATCH] 手动下单:检验中订单撤销报错问题修复

---
 src/views/business/productOrder/components/addOrder.vue |   24 ++++++------------------
 1 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/src/views/business/productOrder/components/addOrder.vue b/src/views/business/productOrder/components/addOrder.vue
index 47d61ec..0993355 100644
--- a/src/views/business/productOrder/components/addOrder.vue
+++ b/src/views/business/productOrder/components/addOrder.vue
@@ -419,7 +419,7 @@
             <el-table-column v-if="isSpecial&&active==1" label="鎿嶄綔" width="100">
             <template slot-scope="scope">
               <el-button v-if="!scope.row.repetitionTag" size="small" type="text" @click="addProductList(productList,scope.row,scope.$index)">鎻掑叆琛�</el-button>
-              <el-button v-if="!!scope.row.repetitionTag&&scope.row.delete" size="small" type="text" @click="deleteProductList(scope.$index,productList)">鍒犻櫎</el-button>
+              <el-button style="color:#ff4949" v-if="!!scope.row.repetitionTag&&scope.row.delete" size="small" type="text" @click="deleteProductList(scope.$index,productList)">鍒犻櫎</el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -429,7 +429,7 @@
       <div v-if="selectUserDia" class="body">
         <lims-table :tableData="tableData1" :column="column1"
                     :isSelection="true" :handleSelectionChange="selectMethod"
-                    @pagination="pagination1" height="400px" key="tableData1"
+                    @pagination="pagination1" :height="400" key="tableData1"
                     :page="page1" :tableLoading="tableLoading1"></lims-table>
       </div>
       <span slot="footer" class="dialog-footer">
@@ -968,7 +968,6 @@
               return m.id === a.id&&!m.repetitionTag
             }
           })
-
           if(obj){
             a.state = obj.state
             a.section = obj.section
@@ -1695,10 +1694,10 @@
             this.$set(row, 'sectionCopy', row.section)
           }
         }
-        if (row.ask.includes('[')) {
+        if (row.ask && row.ask.includes('[')) {
           this.$set(row, 'askCopy', row.ask)
         }
-        if (row.tell.includes('[')) {
+        if (row.tell && row.tell.includes('[')) {
           this.$set(row, 'tellCopy', row.tell)
         }
         let arr = this.productList.filter(m=>m.state==1&&row.sectionCopy&&row.sectionCopy.includes(m.sectionCopy)&&m.ask&&m.sectionCopy.indexOf('[')==-1)
@@ -2028,18 +2027,12 @@
               this.$set(p, 'sectionCopy', p.section)
             }
           }
-          if (p.ask.includes('[')) {
+          if (p.ask && p.ask.includes('[')) {
             this.$set(p, 'askCopy', p.ask)
           }
-          if (p.tell.includes('[')) {
+          if (p.tell && p.tell.includes('[')) {
             this.$set(p, 'tellCopy', p.tell)
           }
-          // if (p.manHour.includes('[')) {
-          //   this.$set(p, 'manHourCopy', p.manHour)
-          // }
-          // if (p.price.includes('[')) {
-          //   this.$set(p, 'priceCopy', p.price)
-          // }
           if (p.bsm === '1' && p.sectionCopy !== '' && p.sectionCopy !== null && p.sectionCopy !== undefined && p.state === 1) {
             if (p.sectionCopy.indexOf('[') > -1) {
               p.bsmRow = this.HaveJson(p)
@@ -2072,11 +2065,6 @@
             return item
           })
         }
-        this.productList.forEach(item => {
-          if (item.id == row.id) {
-            item.state = row.state;
-          }
-        })
         this.changeProductList0()
         this.currentMethod.insProduct = this.productList0
         this.getProNum()

--
Gitblit v1.9.3