Merge tag 'Hotfix-zh-119' into develop

Finish Hotfix-zh-119

src/api/basic_data/dealer.js

@@ -154,3 +154,11 @@ export function getCustomerDepositDetailList(params) {
     params,
   });
 }
+//获取经销商
+export function getListCustomer(params) {
+  return request({
+    url: "/pick/listCustomer",
+    method: "get",
+    params,
+  });
+}

src/views/sales_policy/components/Examine.vue

@@ -641,6 +641,16 @@
             <span>{{ scope.row.materialNumber }}</span>
           </template>
         </el-table-column>
+                <el-table-column
+          prop="examineOrderNums"
+          label="已审订单数
+"
+          align="left"
+        >
+        <template slot-scope="scope">
+          {{scope.row.examineOrderNums | numToFixed }}
+        </template>
+        </el-table-column>
         <el-table-column
           prop="limitQty"
           label="购买量上限
@@ -648,6 +658,9 @@
 "
           align="left"
         >
+          <template slot-scope="scope">
+          {{scope.row.limitQty | numToFixed }}
+        </template>
         </el-table-column>
       </el-table>
       </div>

src/views/sales_policy/components/TabelTransfer.vue

@@ -229,6 +229,19 @@
             <span>{{ scope.row.materialNumber }}</span>
           </template>
         </el-table-column>
+
+      <el-table-column
+          prop="examineOrderNums"
+          label="已审订单数
+"
+          align="left"
+        >
+        <template slot-scope="scope">
+          {{scope.row.examineOrderNums | numToFixed }}
+        </template>
+        </el-table-column>
+
+
         <el-table-column
           prop="limitQty"
           label="购买量上限
@@ -236,6 +249,9 @@
 "
           align="left"
         >
+           <template slot-scope="scope">
+          {{scope.row.limitQty | numToFixed }}
+        </template>
         </el-table-column>
       </el-table>
       </div>

src/views/sales_policy/components/details.vue

@@ -660,6 +660,17 @@
             <span>{{ scope.row.materialNumber }}</span>
           </template>
         </el-table-column>
+              <el-table-column
+          prop="examineOrderNums"
+          label="已审订单数
+"
+          align="left"
+        >
+        <template slot-scope="scope">
+          {{scope.row.examineOrderNums | numToFixed }}
+        </template>
+        </el-table-column>
+
         <el-table-column
           prop="limitQty"
           label="购买量上限
@@ -667,6 +678,9 @@
 "
           align="left"
         >
+           <template slot-scope="scope">
+          {{scope.row.limitQty | numToFixed }}
+        </template>
         </el-table-column>
       </el-table>
       </div>

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

@@ -536,7 +536,8 @@ export default {
         item.position2 = '';
         item.status1 = '';
         item.status2 = '';
-         item.realDirectTransferQty   = item.refundableQty
+        this.$set(item,'realDirectTransferQty',item.refundableQty)
+
       })
       this.getPositionList();
     },

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

@@ -529,7 +529,8 @@ export default {
         item.position2 = '';
         item.status1 = '';
         item.status2 = '';
-        item.realDirectTransferQty   = item.refundableQty
+        this.$set(item,'realDirectTransferQty',item.refundableQty)
+
       })
       this.getPositionList();
     },

src/views/supply/pickup/check.vue

@@ -231,7 +231,7 @@ import {
   getPickupManInfo,
   checkPassword,
 } from "@/api/supply/pickup";
-import { getDealerList } from "@/api/basic_data/dealer";
+import { getDealerList, getListCustomer } from "@/api/basic_data/dealer";
 
 import PickupPrint from "@/views/supply/pickup/components/pickup_print";
 
@@ -292,7 +292,7 @@ dealerList:[],
   },
 
   created() {
-    this.getDealerList()
+    // this.getDealerList()
   },
 
   methods: {
@@ -341,9 +341,21 @@ dealerList:[],
         this.screenForm.name = res.data.takerName;
         this.screenForm.idCard = res.data.identity;
         this.screenForm.manId = res.data.id;
+        this.getListCustomer()
       });
     },
-
+    getListCustomer(){
+    getListCustomer({
+          keyword:'',
+          phone: this.screenForm.phone,
+          pageNum:1,
+          pageSize:-1
+        }).then(res=>{
+          this.dealerList = res.data.records
+          this.screenForm.customerNumber = this.dataList[0].number
+        })
+
+},
     // 查询列表
     getList() {
       if (!this.screenForm.manId) {

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

@@ -836,11 +836,18 @@ export default {
     // 打开 直调发货
     openDeliverDialog() {
       this.isShowDeliverDialog = true
-      this.goodsList = this.detailData.retailOrderItemList
-      this.goodsList.forEach(item => {
+          this.detailData.retailOrderItemList.forEach(item => {
+            if(item.isDirectTransfer){
+
+               this.$set(item,'adjustNum',item.refundableQty)
+            }else{
+
+              this.$set(item,'adjustNum',0)
 
-        item.adjustNum  = item.refundableQty
+            }
       })
+      this.goodsList = this.detailData.retailOrderItemList
+
       this.getPositionList()
     },
     // 获取虚拟仓位列表

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

@@ -453,11 +453,18 @@ export default {
     // 打开 直调发货
     openDeliverDialog() {
       this.isShowDeliverDialog = true;
-      this.goodsList = this.detailData.retailOrderItemList;
-       this.goodsList.forEach(item => {
+        this.detailData.retailOrderItemList.forEach(item => {
+            if(item.isDirectTransfer){
+
+               this.$set(item,'adjustNum',item.refundableQty)
+            }else{
+
+              this.$set(item,'adjustNum',0)
 
-        item.adjustNum  = item.refundableQty
+            }
       })
+      this.goodsList = this.detailData.retailOrderItemList;
+
       this.getPositionList();
     },