【修改】bug

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

@@ -171,7 +171,7 @@
         <el-table-column align="center" label="单位" prop="unit" min-width="100" show-overflow-tooltip></el-table-column>
         <el-table-column align="center" label="单价" prop="price" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">
-            <el-input v-model="scope.row.price" size="small" type="number" v-if="listItem && !isDealer"></el-input>
+            <el-input v-model="scope.row.price" size="small" type="number" v-if="!isDealer"></el-input>
             <div v-else>{{scope.row.price}}</div>
           </template>
         </el-table-column>

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

@@ -194,7 +194,7 @@
         <el-table-column align="center" label="单位" prop="unit" min-width="100" show-overflow-tooltip></el-table-column>
         <el-table-column align="center" label="单价" prop="price" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">
-            <el-input v-model="scope.row.price" size="small" type="number" v-if="listItem && !isDealer"></el-input>
+            <el-input v-model="scope.row.price" size="small" type="number" v-if="!isDealer"></el-input>
             <div v-else>{{scope.row.price}}</div>
           </template>
         </el-table-column>

src/views/supply/purchase/components/enter_detail.vue

@@ -48,11 +48,11 @@
           show-summary
           :summary-method="$getSummaries">
           <el-table-column align="center" label="序号" type="index" width="50"></el-table-column>
-          <el-table-column align="center" label="产品编号" prop="materialCode" min-width="140" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" label="产品编号" prop="materialNumber" min-width="140" show-overflow-tooltip></el-table-column>
           <el-table-column align="center" label="产品名称" prop="materialName" min-width="140" show-overflow-tooltip></el-table-column>
           <el-table-column align="center" label="规格型号" prop="uom" min-width="200" show-overflow-tooltip></el-table-column>
           <el-table-column align="center" label="单位" prop="unit" min-width="100" show-overflow-tooltip></el-table-column>
-          <el-table-column align="right" label="数量" prop="auxUnitQty" min-width="100" show-overflow-tooltip></el-table-column>
+          <el-table-column align="right" label="数量" prop="realQty" min-width="100" show-overflow-tooltip></el-table-column>
           <el-table-column align="right" label="原币含税单价" prop="taxPrice" min-width="120" show-overflow-tooltip>
             <template slot-scope="scope">
               {{scope.row.taxPrice | numToFixed}}

src/views/supply/purchase/enter_list.vue

@@ -76,11 +76,11 @@
             <el-table-column align="center" label="供货单位" prop="supplyName" min-width="200" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="审核日期" prop="approveDate" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="备注" prop="abcdRemarks" min-width="160" show-overflow-tooltip></el-table-column>
-            <el-table-column align="center" label="产品编码" prop="materialCode" min-width="140" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" label="产品编码" prop="materialNumber" min-width="140" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="产品名称" prop="materialName" min-width="140" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="规格型号" prop="uom" min-width="200" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="单位" prop="unit" min-width="100" show-overflow-tooltip></el-table-column>
-            <el-table-column align="right" label="数量" prop="auxUnitQty" min-width="100" show-overflow-tooltip></el-table-column>
+            <el-table-column align="right" label="数量" prop="realQty" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="right" label="原币含税单价" prop="taxPrice" min-width="120" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{scope.row.taxPrice | numToFixed}}

src/views/supply/reserve/components/reserve_form.vue

@@ -58,7 +58,7 @@
     <div class="table" style="margin-top: 20px">
       <el-table :data="goodsList" element-loading-text="Loading" border fit highlight-current-row stripe max-height="400" @selection-change="tableSelectionChange">
         <el-table-column align="center" type="selection" width="55"></el-table-column>
-        <el-table-column align="center" label="销售订单号" prop="orderId" min-width="200" show-overflow-tooltip></el-table-column>
+        <el-table-column align="center" label="销售订单号" prop="mainOrderId" min-width="140" show-overflow-tooltip></el-table-column>
         <el-table-column align="center" label="订单日期" prop="orderTime" min-width="120" show-overflow-tooltip>
           <template slot-scope="scope">
             {{scope.row.orderTime | dateToDayFilter}}
@@ -89,7 +89,7 @@
           </template>
         </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 align="center" label="产品编码" prop="materialCode" min-width="140" show-overflow-tooltip>
           <template slot-scope="scope">
             <div v-if="scope.row.orderId || listItem">{{scope.row.materialCode}}</div>
             <el-select 
@@ -113,9 +113,9 @@
             </el-select>
           </template>
         </el-table-column>
-        <el-table-column align="center" label="物料代码" prop="materialOldNumber" min-width="160" show-overflow-tooltip></el-table-column>
+        <el-table-column align="center" label="物料代码" prop="materialOldNumber" min-width="140" 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>
+        <el-table-column align="center" label="规格型号" prop="specification" min-width="200" show-overflow-tooltip></el-table-column>
         <el-table-column align="center" label="单位" prop="unit" min-width="100" show-overflow-tooltip></el-table-column>
         <el-table-column align="center" label="原预留数量" prop="oldNum" min-width="100" show-overflow-tooltip></el-table-column>
         <el-table-column align="center" label="预留数量" prop="reservedNum" min-width="100" show-overflow-tooltip>

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

@@ -110,7 +110,7 @@
           </el-col>
           <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>
+              <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>
@@ -325,9 +325,9 @@ export default {
       if(!this.screenForm.orderNum) {
         return this.$errorMsg('请填写发货申请单号');
       }
-      if(!this.screenForm.dealer) {
-        return this.$errorMsg('请选择经销商');
-      }
+      // if(!this.screenForm.dealer) {
+      //   return this.$errorMsg('请选择经销商');
+      // }
       this.currentPage = 1;
       this.getGoodsList();
     },