Finish Hotfix-zh-241

src/views/supply/engin/components/home_detail.vue

@@ -232,7 +232,7 @@
       <div class="page-footer">
         <div class="footer">
           <el-button type="success" @click="toCheckOrder">联查单据</el-button>
-          <el-button type="danger" @click="closeData" v-if=" !isDealer && detailData.examineStatus === 'SAVE' || detailData.examineStatus === 'WAIT'">关闭订单</el-button>
+          <el-button type="danger" @click="closeData" v-if=" !isDealer && (detailData.examineStatus === 'SAVE' || detailData.examineStatus === 'WAIT')">关闭订单</el-button>
           <el-button type="primary" @click="openDirectDialog" v-if="!isDealer">提前开票</el-button>
           <el-button type="primary" @click="overData" v-if="!isDealer">直调完结</el-button>
           <el-button type="primary" @click="openDeliverDialog" :disabled="detailData.directTransferStatus" v-if="!isDealer">直调发货</el-button>
@@ -445,6 +445,7 @@ export default {
       return this.detailData.examineStatus === 'OK' || this.detailData.examineStatus === 'FAIL'
     },
     isDealer() {
+      console.log(JSON.parse(localStorage.getItem("supply_user")).isCustomer,'898');
       return JSON.parse(localStorage.getItem("supply_user")).isCustomer
     },
   },

src/views/supply/engin/components/home_form.vue

@@ -1135,10 +1135,13 @@ export default {
               this.$errorMsg('请选择现金钱包');
               return;
             }
-            if(!this.goodsList[i].qty) {
+            if(type ==1){
+              if(!this.goodsList[i].qty) {
               this.$errorMsg('金额不能为0');
               return;
             }
+            }
+           
           }
 
           let goodsList = JSON.parse(JSON.stringify(this.goodsList));