Finish Hotfix-mo-63

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

@@ -159,14 +159,15 @@
         <el-table-column align="center" label="单位" prop="unit" min-width="100" show-overflow-tooltip></el-table-column>
         <el-table-column align="right" label="单价" prop="price" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">
-            {{ scope.row.price | numToFixed }}
-            <!-- <el-input v-model="scope.row.price" size="small" type="number"></el-input> -->
+            <!-- {{ scope.row.price | numToFixed }} -->
+            <el-input v-model="scope.row.price" size="small" type="number"></el-input>
           </template>
         </el-table-column>
         <el-table-column align="right" label="工程登录数量" prop="enginNum" min-width="120" show-overflow-tooltip></el-table-column>
         <el-table-column align="right" label="数量" prop="qty" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">
-            {{ (scope.row.qty*100 - scope.row.directTransferQty*100 - scope.row.retiredQty*100) / 100 }}
+            <!-- {{ (scope.row.qty*100 - scope.row.directTransferQty*100 - scope.row.retiredQty*100) / 100 }} -->
+            <el-input v-model="scope.row.qty" size="small" type="number"></el-input>
           </template>
         </el-table-column>
         <el-table-column align="right" label="订单金额" prop="totalAmount" min-width="100" show-overflow-tooltip>

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

@@ -209,7 +209,7 @@
             {{scope.row.price * scope.row.qty}}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="返利钱包" prop="customerWalletId2" min-width="160" show-overflow-tooltip>
+        <el-table-column align="center" label="返利类型" prop="customerWalletId2" min-width="160" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-select v-model="scope.row.customerWalletId2" placeholder="选择返利类型" size="small" clearable @change="changeFlWallet(scope.$index)">
               <el-option

src/views/supply/pickup/components/pickup_form.vue

@@ -325,7 +325,7 @@ export default {
       this.formLoading = true;
 
       let takerName = this.pickupManList.find(o => o.id == this.mainForm.pickupMan).takerName;
-      let correspondName = this.warehouseList.find(o => o.id == this.mainForm.warehouse).name;
+      // let correspondName = this.warehouseList.find(o => o.id == this.mainForm.warehouse).name;
 
       let orderList = [];
       this.tableSelection.forEach(item => {
@@ -333,7 +333,7 @@ export default {
       });
       let params = {
         correspondId: this.mainForm.warehouse,
-        correspondName,
+        // correspondName,
         pickTime: this.mainForm.date + ' 00:00:00',
         pickStatus: Number(this.mainForm.timeSlot),
         pickType: Number(this.mainForm.pickupWay),

src/views/supply/return/components/return_form.vue

@@ -108,13 +108,13 @@
               <el-input v-model="screenForm.orderNum" placeholder="请输入发货单号"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :xs="12" :sm="6" :lg="6">
+          <!-- <el-col :xs="12" :sm="6" :lg="6">
             <el-form-item prop="dealer" label="经销商">
               <el-select v-model="screenForm.dealer" placeholder="请选择经销商" style="width: 100%;" filterable clearable>
                 <el-option :label="item.name" :value="item.id" v-for="(item, index) in dealerList" :key="index"></el-option>
               </el-select>
             </el-form-item>
-          </el-col>
+          </el-col> -->
           <el-col :xs="12" :sm="6" :lg="6">
             <el-form-item label="">
               <el-button size="small" @click="resetScreenForm">清空</el-button>
@@ -131,6 +131,8 @@
           <el-table-column align="center" label="销售类型" prop="saleTypeName" min-width="100" show-overflow-tooltip></el-table-column>
           <el-table-column align="center" label="发货仓库" prop="correspondName" min-width="100" show-overflow-tooltip></el-table-column>
           <el-table-column align="center" label="销售订单号" prop="mainOrderId" min-width="200" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" label="经销商编码" prop="customerNumber" min-width="140" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" label="经销商名称" prop="customerName" min-width="160" show-overflow-tooltip></el-table-column>
           <el-table-column align="center" label="产品编码" prop="materialCode" min-width="160" show-overflow-tooltip></el-table-column>
           <el-table-column align="center" label="产品名称" prop="materialName" min-width="160" show-overflow-tooltip></el-table-column>
           <el-table-column align="center" label="规格型号" prop="specification" min-width="160" show-overflow-tooltip></el-table-column>