Merge tag 'Hotfix-zh-121' into develop

Finish Hotfix-zh-121

src/views/supply/apply/components/engin_form.vue

@@ -398,6 +398,10 @@ export default {
         openSidebar: this.sidebar.opened
       }
     },
+    isDealer() {
+
+      return JSON.parse(localStorage.getItem("supply_user")).isCustomer
+    },
   },
 
   created() {
@@ -446,7 +450,6 @@ export default {
         this.mainForm.jxsNum = data.customerNumber;
         this.mainForm.jxsName = data.customerName;
         this.mainForm.loginNum = data.refEnginRecordNo;
-        this.mainForm.enginName = data.refProjectName;
         this.mainForm.loginType = data.enginOrderType;
         this.mainForm.factoryNum = data.refFactoryNo;
         this.mainForm.company = data.refUseUnit;
@@ -461,6 +464,7 @@ export default {
         this.mainForm.examineRemark = data.approvalRemark;
         this.mainForm.fileNo = data.fileNo
         this.mainForm.refProjectName = data.refProjectName
+         this.mainForm.enginName = data.refProjectCategory;
         this.screenForm.warehouse = data.correspondId;
         // this.screenForm.refProjectName = data.refProjectName
         this.fileList = data.fileUrl ? [{
@@ -541,6 +545,7 @@ export default {
         pageSize: 10,
         refEnginRecordNo: this.screenForm.loginNum,
         refProjectName: this.screenForm.enginName,
+        // refProjectCategory:this.screenForm.enginName,
         specification: this.screenForm.model,
         startTime: this.screenForm.date ? this.screenForm.date[0] : '',
         endTime: this.screenForm.date ? this.screenForm.date[1] : '',
@@ -662,7 +667,8 @@ export default {
       getEnginGoodsDetail({enginOrderNo}).then(res => {
         let data = res.data;
         this.mainForm.loginNum = data.refEnginRecordNo;
-        this.mainForm.enginName = data.refProjectName;
+        this.mainForm.enginName = data.refProjectCategory;
+        this.mainForm.refProjectName = data.refProjectName
         this.mainForm.loginType = data.refPromiseStatus;
         this.mainForm.factoryNum = data.refFactoryNo;
         this.mainForm.company = data.refUseUnit;
@@ -707,7 +713,8 @@ export default {
             // orderTime: this.mainForm.orderDate + ' 00:00:00',
             remark: this.mainForm.remark,
             enginOrderNo: this.mainForm.loginNum,
-            refProjectName: this.mainForm.enginName,
+            refProjectName: this.mainForm.refProjectName,
+            refProjectCategory:this.mainForm.enginName,
             enginOrderType: this.mainForm.loginType,
             refFactoryNo: this.mainForm.factoryNum,
             refUseUnit: this.mainForm.company,

src/views/supply/policy/policy_list.vue

@@ -230,6 +230,13 @@
                 </div>
               </template>
             </el-table-column>
+               <el-table-column
+              align="left"
+              label="销售类型"
+              prop="saleTypeName"
+              min-width="200"
+              show-overflow-tooltip
+            />
             <el-table-column
               align="left"
               label="销售政策编号"

src/views/supply/retail/components/retail_detail.vue

@@ -456,7 +456,7 @@ export default {
         this.detailData.retailOrderItemList.forEach(item => {
             if(item.isDirectTransfer){
 
-               this.$set(item,'adjustNum',item.refundableQty)
+               this.$set(item,'adjustNum',item.refundableQty || item.qty)
             }else{
 
               this.$set(item,'adjustNum',0)