Merge tag 'Hotfix-mo-72' into develop

Finish Hotfix-mo-72

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

@@ -74,9 +74,9 @@
         </el-col>
         <el-col :xs="24" :sm="12" :lg="8">
           <el-form-item label="业务员" prop="salesMan">
-            <el-select v-model="mainForm.salesMan" placeholder="选择业务员" size="small" clearable style="width: 100%">
+            <el-select v-model="mainForm.salesMan" placeholder="选择业务员" size="small" filterable clearable style="width: 100%">
               <el-option
-                v-for="item in outSalesmanList"
+                v-for="item in salesmanList"
                 :key="item.adminUserId"
                 :label="item.nickName"
                 :value="item.adminUserId">
@@ -250,7 +250,7 @@
           </template>
         </el-table-column>
 
-        <el-table-column align="center" label="业务员" prop="serviceId" min-width="160" show-overflow-tooltip>
+        <!-- <el-table-column align="center" label="业务员" prop="serviceId" min-width="160" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-select v-model="scope.row.serviceId" placeholder="选择业务员" size="small" clearable>
               <el-option
@@ -261,7 +261,7 @@
               </el-option>
             </el-select>
           </template>
-        </el-table-column>
+        </el-table-column> -->
 
         <el-table-column align="center" label="操作" width="100" fixed="right">
           <template slot-scope="scope">
@@ -769,7 +769,7 @@ export default {
             delete item.wallets;
           })
 
-          let saleManItem = this.mainForm.salesMan ? this.outSalesmanList.find(o => o.adminUserId == this.mainForm.salesMan) : '';
+          let saleManItem = this.mainForm.salesMan ? this.salesmanList.find(o => o.adminUserId == this.mainForm.salesMan) : '';
           let params = {
             enginOrderId: this.mainForm.orderNum,
             // orderDate: this.mainForm.orderDate,

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

@@ -108,7 +108,14 @@
         </el-col>
         <el-col :xs="24" :sm="12" :lg="8">
           <el-form-item label="业务员" prop="salesMan">
-            <el-input v-model="mainForm.salesMan" placeholder="请输入业务员" disabled></el-input>
+            <el-select v-model="mainForm.salesMan" placeholder="选择业务员" size="small" filterable clearable style="width: 100%">
+              <el-option
+                v-for="item in salesmanList"
+                :key="item.adminUserId"
+                :label="item.nickName"
+                :value="item.adminUserId">
+              </el-option>
+            </el-select>
           </el-form-item>
         </el-col>
         <el-col :xs="24" :sm="12" :lg="8">
@@ -217,7 +224,7 @@
 
 <script>
 import { getEnginDetail, getRetailProductList, addEngin, editEngin, submitEngin } from "@/api/supply/engin";
-import { getDictList, getTypeList } from '@/api/common'
+import { getDictList, getTypeList, getSalesmanList } from '@/api/common'
 
 export default {
   name: 'EnginForm',
@@ -266,10 +273,12 @@ export default {
       typeList: [],
       salesTypeList: [],
       retailProductList: [],
+      salesmanList: [],
     }
   },
 
-  created() {
+  async created() {
+    await this.getSalesmanList();
     this.getDictList();
     this.getTypeList();
     if(this.listItem) {
@@ -355,6 +364,16 @@ export default {
       });
     },
 
+    async getSalesmanList() {
+      const res = await getSalesmanList({
+        pageNum: 1,
+        pageSize: -1,
+        isCustomer: 0,
+        status: true,
+      });
+      this.salesmanList = res.data.records;
+    },
+
     // 获取商品列表
     getRetailProductList(index) {
       getRetailProductList({

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

@@ -80,9 +80,9 @@
         </el-col>
         <el-col :xs="24" :sm="12" :lg="8">
           <el-form-item label="业务员" prop="salesMan">
-            <el-select v-model="mainForm.salesMan" placeholder="选择业务员" size="small" clearable style="width: 100%">
+            <el-select v-model="mainForm.salesMan" placeholder="选择业务员" size="small" filterable clearable style="width: 100%">
               <el-option
-                v-for="item in outSalesmanList"
+                v-for="item in salesmanList"
                 :key="item.adminUserId"
                 :label="item.nickName"
                 :value="item.adminUserId">
@@ -272,7 +272,7 @@
           </template>
         </el-table-column>
 
-        <el-table-column align="center" label="业务员" prop="serviceId" min-width="160" show-overflow-tooltip>
+        <!-- <el-table-column align="center" label="业务员" prop="serviceId" min-width="160" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-select v-model="scope.row.serviceId" placeholder="选择业务员" size="small" clearable disabled>
               <el-option
@@ -283,7 +283,7 @@
               </el-option>
             </el-select>
           </template>
-        </el-table-column>
+        </el-table-column> -->
 
         <el-table-column align="center" label="操作" width="100" fixed="right">
           <template slot-scope="scope">
@@ -1081,7 +1081,7 @@ export default {
           })
 
           let saleTypeItem = this.salesTypeList.find(o => o.id == this.mainForm.saleType);
-          let saleManItem = this.mainForm.salesMan ? this.outSalesmanList.find(o => o.adminUserId == this.mainForm.salesMan) : '';
+          let saleManItem = this.mainForm.salesMan ? this.salesmanList.find(o => o.adminUserId == this.mainForm.salesMan) : '';
           let params = {
             enginOrderId: this.mainForm.orderNum,
             // orderDate: this.mainForm.orderDate,

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

@@ -27,9 +27,9 @@
         </el-col>
         <el-col :xs="24" :sm="12" :lg="8">
           <el-form-item label="业务员" prop="salesMan">
-            <el-select v-model="mainForm.salesMan" placeholder="选择业务员" size="small" clearable style="width: 100%">
+            <el-select v-model="mainForm.salesMan" placeholder="选择业务员" size="small" filterable clearable style="width: 100%">
               <el-option
-                v-for="item in outSalesmanList"
+                v-for="item in salesmanList"
                 :key="item.adminUserId"
                 :label="item.nickName"
                 :value="item.adminUserId">
@@ -160,7 +160,7 @@
           </template>
         </el-table-column>
 
-        <el-table-column align="center" label="业务员" prop="serviceId" min-width="160" show-overflow-tooltip>
+        <!-- <el-table-column align="center" label="业务员" prop="serviceId" min-width="160" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-select v-model="scope.row.serviceId" placeholder="选择业务员" size="small" clearable disabled>
               <el-option
@@ -171,7 +171,7 @@
               </el-option>
             </el-select>
           </template>
-        </el-table-column>
+        </el-table-column> -->
 
         <el-table-column align="center" label="操作" width="100" fixed="right">
           <template slot-scope="scope">
@@ -696,7 +696,7 @@ export default {
             delete item.wallets;
           })
 
-          let saleManItem = this.mainForm.salesMan ? this.outSalesmanList.find(o => o.adminUserId == this.mainForm.salesMan) : '';
+          let saleManItem = this.mainForm.salesMan ? this.salesmanList.find(o => o.adminUserId == this.mainForm.salesMan) : '';
           let params = {
             // theTime: this.mainForm.date + ' 00:00:00',
             // mainId: this.mainForm.type,