Finish Hotfix-zh-278

src/layout/components/AppMain.vue

@@ -2,7 +2,6 @@
   <section class="app-main">
     <transition name="fade-transform" mode="out-in">
     <router-view />
-    
     </transition>
   </section>
 </template>

src/views/supply/apply/engin_list.vue

@@ -120,6 +120,11 @@
                 <el-input v-model="screenForm.approvalName" placeholder="请输入审核人"></el-input>
               </el-form-item>
             </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="区域" prop="refRegionWork">
+                <el-input v-model="screenForm.refRegionWork" placeholder="请输入区域"></el-input>
+              </el-form-item>
+            </el-col>
             <el-col :xs="24" :sm="24" :lg="24" class="tr">
               <el-form-item label="">
                 <el-button @click="resetScreenForm">清空</el-button>
@@ -257,7 +262,10 @@
             <el-table-column align="left" label="表头业务员" prop="k3ServiceName" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="制单人" prop="createBy" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="制单日期" prop="createTime" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="区域" prop="refRegionWork" min-width="160" show-overflow-tooltip></el-table-column>
+
             <el-table-column align="left" label="审核人" prop="approvalName" min-width="100" show-overflow-tooltip></el-table-column>
+
             <el-table-column align="left" label="审核日期" prop="approvalTime" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="审核状态" prop="examineStatus" min-width="100" show-overflow-tooltip>
               <template slot-scope="scope">
@@ -398,7 +406,8 @@ export default {
         refUseUnit: '',
         k3ServiceId:'',
         categoryId: '',
-        approvalName:''
+        approvalName:'',
+        refRegionWork:''
       },
       statusList: [
         { label: '已保存', value: 'SAVE' },
@@ -451,7 +460,8 @@ export default {
         refEnginRecordNo: this.screenForm.refEnginRecordNo,
         refUseUnit: this.screenForm.refUseUnit,
         categoryId: this.screenForm.categoryId,
-        approvalName:this.screenForm.approvalName
+        approvalName:this.screenForm.approvalName,
+        refRegionWork:this.screenForm.refRegionWork
       }
     },
   },
@@ -525,7 +535,9 @@ export default {
         refEnginRecordNo: this.screenForm.refEnginRecordNo,
         refUseUnit: this.screenForm.refUseUnit,
         categoryId: this.screenForm.categoryId,
-        approvalName:this.screenForm.approvalName
+        approvalName:this.screenForm.approvalName,
+        refRegionWork:this.screenForm.refRegionWork
+
 
       };
       getEnginList(params).then((res) => {

src/views/supply/deliver/commerce_list.vue

@@ -85,8 +85,12 @@
                 </el-select>
               </el-form-item>
             </el-col>
-
-            <el-col :xs="24" :sm="24" :lg="12" class="tr">
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="区域" prop="refRegionWork">
+                <el-input v-model="screenForm.refRegionWork" placeholder="请输入区域"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="24" :lg="6" class="tr">
               <el-form-item label="">
                 <el-button @click="resetScreenForm">清空</el-button>
                 <el-button type="primary" @click="submitScreenForm">搜索</el-button>
@@ -212,6 +216,8 @@
             <el-table-column align="left" label="表头业务员" prop="k3ServiceName" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="制单人" prop="createBy" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="制单日期" prop="createTime" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="区域" prop="refRegionWork" min-width="160" show-overflow-tooltip></el-table-column>
+
             <el-table-column align="left" label="审核人" prop="approvalName" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="审核日期" prop="approvalTime" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="审核状态" prop="examineStatus" min-width="100" show-overflow-tooltip>
@@ -311,6 +317,7 @@ export default {
         jxsNum: '',
         status: '',
         salesMan: '',
+        refRegionWork:''
       },
       categoryList: [],
       salesmanList: [],
@@ -339,6 +346,7 @@ export default {
         startTime: this.screenForm.date ? this.screenForm.date[0] : '',
         endTime: this.screenForm.date ? this.screenForm.date[1] : '',
         categoryName: this.screenForm.type,
+        refRegionWork:this.screenForm.refRegionWork,
         serviceId: this.screenForm.salesMan,
         orderType: 3, // 2家用工程 3商用工程
       }
@@ -398,6 +406,7 @@ export default {
         customerName: this.screenForm.jxsName,
         materialName: this.screenForm.chName,
         specification: this.screenForm.model,
+        refRegionWork:this.screenForm.refRegionWork,
         startTime: this.screenForm.date ? this.screenForm.date[0] : '',
         endTime: this.screenForm.date ? this.screenForm.date[1] : '',
         categoryName: this.screenForm.type,

src/views/supply/deliver/home_list.vue

@@ -167,6 +167,8 @@
                 <span>{{scope.row.specification}}</span>
               </template>
             </el-table-column>
+            <el-table-column align="left" label="区域" prop="refRegionWork" min-width="160" show-overflow-tooltip></el-table-column>
+
             <el-table-column align="left" label="单位" prop="unit" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="right" label="数量" prop="refundableQty" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="right" label="未出库数量" prop="notOutNumber" min-width="100" show-overflow-tooltip></el-table-column>