Merge tag 'Hotfix-mo-121' into develop

Finish Hotfix-mo-121

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

@@ -48,7 +48,7 @@
       <el-row :gutter="20">
         <el-col :xs="24" :sm="12" :lg="8">
           <el-form-item label="经销商编码" prop="jxsNum">
-            <el-input v-model="mainForm.jxsNum" placeholder="请输入经销商编码"></el-input>
+            <el-input v-model="mainForm.jxsNum" placeholder="选择经销商" disabled></el-input>
           </el-form-item>
         </el-col>
         <el-col :xs="24" :sm="12" :lg="8">
@@ -69,8 +69,15 @@
           </el-form-item>
         </el-col>
         <el-col :xs="24" :sm="12" :lg="8">
-          <el-form-item label="经销商名称" prop="jxsName">
-            <el-input v-model="mainForm.jxsName" placeholder="请输入经销商名称"></el-input>
+          <el-form-item label="经销商名称" prop="jxsNum">
+            <el-select v-model="mainForm.jxsNum" placeholder="选择经销商" size="small" filterable clearable style="width: 100%" @change="changeDealer" :disabled="listItem != undefined">
+              <el-option
+                v-for="item in dealerList"
+                :key="item.number"
+                :label="item.name"
+                :value="item.number">
+              </el-option>
+            </el-select>
           </el-form-item>
         </el-col>
         <el-col :xs="24" :sm="12" :lg="8">
@@ -335,7 +342,7 @@
 
 <script>
 import { getEnginDetail, getRetailProductList, addEngin, editEngin, submitEngin } from "@/api/supply/engin";
-import { getDictList, getTypeList, getSalesmanList } from '@/api/common'
+import { getDictList, getTypeList, getSalesmanList, getDealerList } from '@/api/common'
 
 export default {
   name: 'EnginForm',
@@ -398,6 +405,7 @@ export default {
       typeList: [],
       salesTypeList: [],
       salesmanList: [],
+      dealerList: [],
 
       isShowGoodsDialog: false,
       goodsScreenForm: {
@@ -423,6 +431,7 @@ export default {
     await this.getSalesmanList();
     this.getDictList();
     this.getTypeList();
+    this.getDealerList();
     if(this.listItem) {
       this.getDetail();
     }else {
@@ -492,6 +501,17 @@ export default {
       })
     },
 
+    // 获取经销商列表
+    getDealerList() {
+      getDealerList({
+        pageNum: 1,
+        pageSize: -1,
+        bindUser: false
+      }).then(res => {
+        this.dealerList = res.data.records;
+      })
+    },
+
     // 获取产品大类列表
     getDictList() {
       getDictList({sysDictEnum: 'PRODUCT_TYPE'}).then(res => {
@@ -519,6 +539,15 @@ export default {
       this.salesmanList = res.data.records;
     },
 
+    changeDealer() {
+      if(this.mainForm.jxsNum) {
+        let jxsItem = this.dealerList.find(o => o.number == this.mainForm.jxsNum);
+        this.mainForm.jxsName = jxsItem.name;
+      }else {
+        this.mainForm.jxsName = '';
+      }
+    },
+
     // 获取商品列表
     getGoodsList() {
       getRetailProductList({
@@ -727,6 +756,8 @@ export default {
                 this.$parent.getList();
               })
             }else {
+              params.customerNumber = this.mainForm.jxsNum;
+              params.customerName = this.mainForm.jxsName;
               addEngin(params).then(res => {
                 this.$successMsg('保存成功');
                 this.goBack();
@@ -736,6 +767,9 @@ export default {
           }else {
             if(this.listItem) {
               params.enginInfoId = this.listItem.enginInfoId;
+            }else {
+              params.customerNumber = this.mainForm.jxsNum;
+              params.customerName = this.mainForm.jxsName;
             }
             submitEngin(params).then(res => {
               this.$successMsg('提交审核成功');