Finish Hotfix-mo-77

src/views/supply/engin/commerce_list.vue

@@ -77,6 +77,11 @@
                 </el-select>
               </el-form-item>
             </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="规格型号" prop="model">
+                <el-input v-model="screenForm.model" placeholder="请输入规格型号"></el-input>
+              </el-form-item>
+            </el-col>
 
             <el-col :xs="24" :sm="24" :lg="12" class="tr">
               <el-form-item label="">
@@ -306,6 +311,7 @@ export default {
         examineMan: '',
         salesMan: '',
         dealer: '',
+        model: '',
       },
       statusList: [
         { label: '已保存', value: 'SAVE' },
@@ -350,6 +356,7 @@ export default {
         confirmName: this.screenForm.examineMan,
         serviceId: this.screenForm.salesMan,
         customerKeyWord: this.screenForm.dealer,
+        specification: this.screenForm.model,
         enginOrderType: 'TRADE', // TRADE=商用 HOME=家用
       }
     },
@@ -396,6 +403,7 @@ export default {
         confirmName: this.screenForm.examineMan,
         serviceId: this.screenForm.salesMan,
         customerKeyword: this.screenForm.dealer,
+        specification: this.screenForm.model,
         enginOrderType: 'TRADE', // TRADE=商用 HOME=家用
       };
       getOrderList(params).then((res) => {

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

@@ -95,7 +95,7 @@
         </el-col>
         <el-col :span="8" class="item">
           <div class="label">业务员</div>
-          <div class="value">{{detailData.serviceId}}</div>
+          <div class="value">{{detailData.serviceName}}</div>
         </el-col>
       </el-row>
     </div>

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

@@ -640,6 +640,7 @@ export default {
 
           goodsList.forEach(item => {
             delete item.productList;
+            delete item.id;
           })
 
           let saleManItem = this.mainForm.salesMan ? this.salesmanList.find(o => o.adminUserId == this.mainForm.salesMan) : '';

src/views/supply/engin/engin_list.vue

@@ -77,6 +77,11 @@
                 </el-select>
               </el-form-item>
             </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="规格型号" prop="model">
+                <el-input v-model="screenForm.model" placeholder="请输入规格型号"></el-input>
+              </el-form-item>
+            </el-col>
 
             <el-col :xs="24" :sm="24" :lg="12" class="tr">
               <el-form-item label="">
@@ -257,6 +262,7 @@ export default {
         examineMan: '',
         status: [],
         salesMan: '',
+        model: '',
       },
       statusList: [
         { label: '已保存', value: 'SAVE' },
@@ -295,6 +301,7 @@ export default {
         confirmName: this.screenForm.examineMan,
         examineStatus: this.screenForm.status.join(','),
         serviceId: this.screenForm.salesMan,
+        specification: this.screenForm.model,
       }
     },
   },
@@ -340,6 +347,7 @@ export default {
         confirmName: this.screenForm.examineMan,
         examineStatus: this.screenForm.status.join(','),
         serviceId: this.screenForm.salesMan,
+        specification: this.screenForm.model,
       };
       getEnginList(params).then((res) => {
         res.data.records.forEach(item => {

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

@@ -35,7 +35,7 @@
           </el-col>
           <el-col :span="8" class="item">
             <div class="label">业务员</div>
-            <div class="value">{{detailData.serviceName}}</div>
+            <div class="value">{{detailData.k3ServiceName}}</div>
           </el-col>
           <el-col :span="8" class="item">
             <div class="label">制单人</div>

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

@@ -26,7 +26,7 @@
         </el-col>
         <el-col :span="8" class="item">
           <div class="label">业务员</div>
-          <div class="value">{{detailData.serviceName}}</div>
+          <div class="value">{{detailData.k3ServiceName}}</div>
         </el-col>
         <el-col :span="8" class="item">
           <div class="label">制单人</div>

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

@@ -26,7 +26,7 @@
         </el-col>
         <el-col :span="8" class="item">
           <div class="label">业务员</div>
-          <div class="value">{{detailData.serviceName}}</div>
+          <div class="value">{{detailData.k3ServiceName}}</div>
         </el-col>
         <el-col :span="8" class="item">
           <div class="label">制单人</div>