Merge tag 'Hotfix-zh-165' into develop

Finish Hotfix-zh-165

src/views/deposit_commerce/components/deposit_list-detail.vue

@@ -87,7 +87,7 @@
               <div class="value">{{ details.refUseUnit }}</div>
             </el-col>
             <el-col :xs="24" :sm="24" :lg="12" class="item">
-              <div class="label">厂编号</div>
+              <div class="label">跨区厂编号</div>
               <div class="value">{{ details.refFactoryNo }}</div>
             </el-col>
             <el-col :xs="24" :sm="24" :lg="24" class="item">
@@ -146,7 +146,10 @@
             :summary-method="$getSummaries"
           >
 
-            <el-table-column
+
+              <template v-if="!isCustomer">
+
+                     <el-table-column
               align="left"
               label="厂编号"
               prop="factoryNo"
@@ -170,6 +173,8 @@
                 <span>{{scope.row.materialNumber}}</span>
               </template>
             </el-table-column>
+              </template>
+
             <el-table-column
               align="left"
               label="产品编码"

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

@@ -356,7 +356,7 @@
           </el-table-column>
           <el-table-column align="center" prop="checkTime" label="工程登录日期" show-overflow-tooltip></el-table-column>
           <el-table-column align="center" prop="recordNo" label="工程登录编号" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" prop="projectName" label="工程项目" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" prop="projectName" label="项目" show-overflow-tooltip></el-table-column>
           <el-table-column align="center" prop="useUnit" label="使用单位" show-overflow-tooltip></el-table-column>
           <el-table-column align="center" prop="organizationName" label="经销商" show-overflow-tooltip></el-table-column>
         </el-table>

src/views/supply/engin/engin_list.vue

@@ -35,7 +35,7 @@
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="单据日期" prop="date">
                 <el-date-picker
-                  v-model="screenForm.date"
+                  v-model="screenForm.orderDate"
                   type="datetimerange"
                   range-separator="至"
                   style="width: 100%;"
@@ -144,7 +144,7 @@
                 <span>{{scope.row.customerName}}</span>
               </template>
             </el-table-column>
-            <el-table-column align="left" label="项目名称" prop="projectName" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="项目类别" prop="projectName" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="使用单位" prop="useUnit" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="安装地址" prop="installAddress" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="物料编码" prop="materialNumber" min-width="120" show-overflow-tooltip>
@@ -310,6 +310,7 @@ export default {
         status: [],
         salesMan: '',
         model: '',
+        orderDate: ''
       },
       statusList: [
         { label: '已保存', value: 'SAVE' },
@@ -343,6 +344,8 @@ export default {
         projectNo: this.screenForm.enginNum,
         enginSignType: this.screenForm.loginNum,
         projectName: this.screenForm.enginName,
+        startOrderDate: this.screenForm.orderDate ? this.screenForm.orderDate[0] : '',
+        endOrderDate: this.screenForm.orderDate ? this.screenForm.orderDate[1] : '',
         startContractExpireDate: this.screenForm.date ? this.screenForm.date[0] : '',
         endContractExpireDate: this.screenForm.date ? this.screenForm.date[1] : '',
         customerKeyWord: this.screenForm.dealer,
@@ -389,6 +392,8 @@ export default {
         projectNo: this.screenForm.enginNum,
         enginSignType: this.screenForm.loginNum,
         projectName: this.screenForm.enginName,
+        startOrderDate: this.screenForm.orderDate ? this.screenForm.orderDate[0] : '',
+        endOrderDate: this.screenForm.orderDate ? this.screenForm.orderDate[1] : '',
         startContractExpireDate: this.screenForm.date ? this.screenForm.date[0] : '',
         endContractExpireDate: this.screenForm.date ? this.screenForm.date[1] : '',
         customerKeyword: this.screenForm.dealer,