工程订单增加备注、格力力备注、跨区厂编号查询字段、增加跨区厂编号、安装日期显示

src/views/deposit_home/deposit_list.vue

@@ -179,7 +179,7 @@
                   <el-input v-model="screenForm.specification" placeholder="请输入规格型号"></el-input>
                 </el-form-item>
               </el-col>
-              <el-col :xs="24" :sm="12" :lg="6">
+              <el-col v-if="!isCustomer" :xs="24" :sm="12" :lg="6">
                 <el-form-item label="特价编号" prop="specialNo">
 
                   <el-input v-model="screenForm.specialNo" placeholder="请输入特价编号"></el-input>
@@ -188,22 +188,17 @@
               </el-col>
               <el-col :xs="24" :sm="12" :lg="6">
                 <el-form-item label="跨区厂编号" prop="refFactoryNo">
-
                   <el-input v-model="screenForm.refFactoryNo" placeholder="请输入跨区厂编号"></el-input>
-
                 </el-form-item>
-
               </el-col>
-              <el-col :xs="24" :sm="12" :lg="6">
+              <el-col v-if="!isCustomer" :xs="24" :sm="12" :lg="6">
                 <el-form-item label="格力内部备注" prop="geLiInerNote">
                   <el-input v-model="screenForm.geLiInerNote" placeholder="请输入格力内部备注"></el-input>
                 </el-form-item>
               </el-col>
-              <el-col :xs="24" :sm="12" :lg="6">
+              <el-col v-if="!isCustomer" :xs="24" :sm="12" :lg="6">
                 <el-form-item label="厂编号" prop="factoryNo">
-
                   <el-input v-model="screenForm.factoryNo" placeholder="请输入厂编号"></el-input>
-
                 </el-form-item>
               </el-col>
               <el-col :xs="24" :sm="12" :lg="6">
@@ -298,6 +293,14 @@
               min-width="160"
               show-overflow-tooltip
             />
+            <el-table-column v-if="!isCustomer" align="right" label="跨区厂编号" min-width="160" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <CopyButton :copyText="scope.row.refFactoryNo" />
+                <span>{{scope.row.refFactoryNo}}</span>
+              </template>
+            </el-table-column>
+            <el-table-column v-if="!isCustomer" align="right" label="安装日期" prop="installDate" min-width="160" show-overflow-tooltip>
+            </el-table-column>
             <el-table-column v-if="!isCustomer" align="right" label="厂编号" prop="factoryNo" min-width="160" show-overflow-tooltip>
             </el-table-column>
             <el-table-column v-if="!isCustomer" align="right" label="特价编号" prop="specialNo" min-width="160" show-overflow-tooltip>

src/views/supply/engin/home_list.vue

@@ -99,6 +99,21 @@
                 <el-input v-model="screenForm.refRegionWork" 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.remark" placeholder="备注"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col v-if="!isCustomer" :xs="24" :sm="12" :lg="6">
+              <el-form-item label="格力内部备注" prop="refRegionWork">
+                <el-input v-model="screenForm.geLiInerNote" 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.refFactoryNo" placeholder="跨区厂编号"></el-input>
+              </el-form-item>
+            </el-col>
 
             <el-col :xs="24" :sm="24" :lg="12" class="tr">
               <el-form-item label="">
@@ -165,6 +180,9 @@
             </el-table-column>
             <el-table-column align="left" label="使用单位" prop="refUseUnit" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="行业类别" prop="refTradeCategory" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="备注" prop="remark" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column v-if="!isCustomer" align="left" label="格力内部备注" prop="geLiInerNote" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="跨区厂编号" prop="refFactoryNo" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="销售类型" prop="saleTypeName" min-width="120" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="物料编码" prop="materialNumber" min-width="120" show-overflow-tooltip>
               <template slot-scope="scope">
@@ -332,7 +350,7 @@ export default {
   },
   filters: {
     statusFilter(val) {
-      let obj = that.statusList.find(o => o.value == val);
+      let obj = that.statusList.find(o => o.value === val);
       return obj ? obj.label : ''
     },
     typeFilter(val) {
@@ -366,6 +384,9 @@ export default {
         specification: '',
         customerKeyword: '',
         refRegionWork: '',
+        remark: '',
+        geLiInerNote: '',
+        refFactoryNo: ''
       },
       statusList: [
         { label: '已保存', value: 'SAVE' },
@@ -415,9 +436,15 @@ export default {
         specification: this.screenForm.specification,
         customerKeyword: this.screenForm.customerKeyword,
         refRegionWork: this.screenForm.refRegionWork,
+        remark: this.screenForm.remark,
+        geLiInerNote: this.screenForm.geLiInerNote,
+        refFactoryNo: this.screenForm.refFactoryNo,
         enginOrderType: 'HOME', // TRADE=商用 HOME=家用
       }
     },
+    isCustomer() {
+      return this.$store.getters.customerId && this.$store.getters.customerNumber
+    }
   },
 
   beforeCreate() {
@@ -475,6 +502,9 @@ export default {
         specification: this.screenForm.specification,
         customerKeyword: this.screenForm.customerKeyword,
         refRegionWork: this.screenForm.refRegionWork,
+        remark: this.screenForm.remark,
+        geLiInerNote: this.screenForm.geLiInerNote,
+        refFactoryNo: this.screenForm.refFactoryNo,
         enginOrderType: 'HOME', // TRADE=商用 HOME=家用
       };
       getOrderList(params).then((res) => {