fix: 物流异常框

src/views/logisticsBill/components/ExceptionBox.vue

@@ -4,11 +4,11 @@
     append-to-body
     :close-on-click-modal="false"
     :visible.sync="visible"
-    width="50%"
-    @close="onClose"
-  >
+    width="60%"
+    :show-close="false"
+      >
     <el-row style="margin: 20px 0">
-      <el-col :span="8">经销商：{{ detail.merchantName }}</el-col>
+      <el-col :span="8" v-if="detail.merchantCheckCode">经销商：{{ detail.merchantName }}</el-col>
       <el-col :span="8">对账月份：{{ detail.autoCheckTimeSupply }}</el-col>
       <el-col v-if="detail.merchantCheckCode" :span="8">商家对账编码：{{ detail.merchantCheckCode }}</el-col>
       <el-col v-if="detail.salesCheckCode" :span="8">销司对账编码：{{ detail.salesCheckCode }}</el-col>
@@ -24,15 +24,16 @@
     />
     <el-row type="flex" style="margin: 20px 0">
       <el-col :span="2">备注： </el-col>
-      <el-col><el-input
-        v-model="comment"
-        type="textarea"
-        :rows="2"
-        placeholder="请输入备注"
-        :maxlength="-1"
-        :show-word-limit="false"
-        :autosize="{ minRows: 2, maxRows: 4 }"
-      />
+      <el-col
+        ><el-input
+          v-model="comment"
+          type="textarea"
+          :rows="2"
+          placeholder="请输入备注"
+          :maxlength="-1"
+          :show-word-limit="false"
+          :autosize="{ minRows: 2, maxRows: 4 }"
+        />
       </el-col>
     </el-row>
     <span slot="footer">
@@ -76,13 +77,13 @@ export default {
             width: 200
           },
           render: (h, { row }) => {
-            const { orderType } = row
-            const typeObj = {
-              TOB: '商家机工程机类型',
-              ALL: '所有类型，广州的订单统一 开单价',
-              TOC: '佛山销售销售订单类型公司'
-            }
-            return <div>{typeObj[orderType]}</div>
+            // const { orderType } = row
+            // const typeObj = {
+            //   TOB: '商家机工程机类型',
+            //   ALL: '所有类型，广州的订单统一 开单价',
+            //   TOC: '佛山销售销售订单类型公司'
+            // }
+            return <div>{row.orderType}</div>
           }
         },
         {
@@ -278,6 +279,7 @@ export default {
   },
   methods: {
     onClose() {
+      this.comment = ''
       this.$emit('close')
     },
     onSbumit() {
@@ -292,31 +294,39 @@ export default {
       }
 
       const list = this.recordSelected.map(k => {
-        const {
-          orderType,
-          isRealUnload,
-          isRealUpstairs,
-          unloadUpstairsCoefficient,
-          unitPrice,
-          returnOrderCost,
-          materialPrice,
-          materialNumber,
-          subsidyCoefficient,
-          orderDate,
-          coefficient
-        } = k
+        // const {
+        //   orderType,
+        //   isRealUnload,
+        //   isRealUpstairs,
+        //   unloadUpstairsCoefficient,
+        //   unitPrice,
+        //   returnOrderCost,
+        //   materialPrice,
+        //   materialNumber,
+        //   subsidyCoefficient,
+        //   orderDate,
+        //   coefficient
+        // } = k
+        // return {
+        //   orderType,
+        //   isRealUnload,
+        //   isRealUpstairs,
+        //   unloadUpstairsCoefficient,
+        //   unitPrice,
+        //   returnOrderCost,
+        //   materialPrice,
+        //   materialNumber,
+        //   subsidyCoefficient,
+        //   orderDate,
+        //   coefficient
+        // }
         return {
-          orderType,
-          isRealUnload,
-          isRealUpstairs,
-          unloadUpstairsCoefficient,
-          unitPrice,
-          returnOrderCost,
-          materialPrice,
-          materialNumber,
-          subsidyCoefficient,
-          orderDate,
-          coefficient
+          ...k,
+          isAccountChecking:k.isAccountChecking === '是' ? 1 : 0,
+          isAudit:k.isAudit === '是' ? 1 : 0,
+          isFinish:k.isFinish === '是' ? 1 : 0,
+          isUnload:k.isUnload === '是' ? 1 : 0,
+          isUpstairs:k.isUpstairs === '是' ? 1 : 0,
         }
       })
       ticketGoToReview({