【修改】工程订单/工程信息单

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

@@ -442,11 +442,7 @@ export default {
       // typeList: [],
       stockList: [],
       goodsList: [],
-      powerList: [
-        {label: 'A权', value: 'A权'},
-        {label: 'B权', value: 'B权'},
-        {label: 'C权', value: 'C权'},
-      ],
+      powerList: [],
       multipleSelection: [],
 
       isShowDialog: false, // 工程登录列表 - 弹窗
@@ -561,12 +557,12 @@ export default {
 
     // 获取产品大类列表
     getDictList() {
-      // getDictList({sysDictEnum: 'PRODUCT_TYPE'}).then(res => {
-      //   this.typeList = res.data;
-      // })
       getDictList({sysDictEnum: 'STOCK_ORDER'}).then(res => {
         this.stockList = res.data;
       })
+      getDictList({sysDictEnum: 'POWER_CATEGORY'}).then(res => {
+        this.powerList = res.data;
+      })
     },
 
     // 获取仓库列表
@@ -685,7 +681,6 @@ export default {
       }).then(res => {
         this.isShowDialog = false;
         let data = res.data;
-        // this.mainForm.type = data.mainId;
         this.mainForm.enginOrderNum = data.enginInfoNo;
         this.mainForm.enginName = data.projectName;
         this.mainForm.loginType = data.tradeCategory;
@@ -698,6 +693,9 @@ export default {
         this.mainForm.address = data.installAddress;
         this.mainForm.salesMan = data.serviceId;
         this.mainForm.power = data.powerCategory;
+        this.mainForm.remark = data.remark;
+        this.mainForm.greeRemark = data.geLiInerNote;
+        this.mainForm.greeReply = data.geLiNote;
 
         this.goodsList = data.items.map(item => {
           return {
@@ -854,7 +852,7 @@ export default {
             refTradeCategory: this.mainForm.loginType || '',
             refFactoryNo: this.mainForm.factoryNum || '',
             refUseUnit: this.mainForm.company || '',
-            projectNo: this.mainForm.enginNum || '',
+            refProjectNo: this.mainForm.enginNum || '',
             refLinkman: this.mainForm.contactMan || '',
             refTel: this.mainForm.tel || '',
             refPhone: this.mainForm.phone || '',
@@ -865,7 +863,7 @@ export default {
             fileNo: this.mainForm.fileNum || '',
             serviceId: this.mainForm.salesMan,
             serviceName: saleManItem ? saleManItem.nickName : goodsList[0].serviceName,
-            powerCategory: this.mainForm.power,
+            refPowerCategory: this.mainForm.power,
             items: goodsList,
           }
           if(type === 1) {

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

@@ -382,20 +382,9 @@ export default {
         enginNum: [{ required: true, message: '请输入工程编号', trigger: 'blur' }],
         loginType: [{ required: true, message: '请输入工程登录类型', trigger: 'blur' }],
       },
-      loginTypeList: [
-        {label: '工装登录', value: '工装登录'},
-        {label: '家装登录', value: '家装登录'},
-        {label: '跨区登录', value: '跨区登录'},
-      ],
-      powerList: [
-        {label: 'A权', value: 'A权'},
-        {label: 'B权', value: 'B权'},
-        {label: 'C权', value: 'C权'},
-      ],
-      machineTypeList: [
-        {label: '大机', value: '大机'},
-        {label: '小机', value: '小机'},
-      ],
+      loginTypeList: [],
+      powerList: [],
+      machineTypeList: [],
 
       typeList: [],
       salesTypeList: [],

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

@@ -25,14 +25,6 @@
             </el-date-picker>
           </el-form-item>
         </el-col>
-        <!-- <el-col :xs="24" :sm="12" :lg="8">
-          <el-form-item label="产品大类" prop="type">
-            <el-input v-model="mainForm.type" disabled v-if="listItem"></el-input>
-            <el-select v-model="mainForm.type" placeholder="选择产品大类" style="width: 100%" disabled v-else>
-              <el-option v-for="item in typeList" :key="item.dictCode" :label="item.dictValue" :value="item.dictCode"></el-option>
-            </el-select>
-          </el-form-item>
-        </el-col> -->
         <el-col :xs="24" :sm="12" :lg="8">
           <el-form-item label="销售类型" prop="saleType">
             <el-select v-model="mainForm.saleType" placeholder="选择销售类型" style="width: 100%" clearable @change="changeSaleType">
@@ -91,6 +83,33 @@
           </el-form-item>
         </el-col>
         <el-col :xs="24" :sm="12" :lg="8">
+          <el-form-item label="引用记录" prop="refCount">
+            <el-input v-model="mainForm.refCount" placeholder="请输入引用记录" :disabled="isDealer"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :xs="24" :sm="12" :lg="8">
+          <el-form-item label="第几次申报" prop="declareNo">
+            <el-input v-model="mainForm.declareNo" placeholder="请输入第几次申报" :disabled="isDealer"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :xs="24" :sm="12" :lg="8">
+          <el-form-item label="项目类型" prop="projectType">
+            <el-input v-model="mainForm.projectType" placeholder="请输入项目类型" :disabled="isDealer"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :xs="24" :sm="12" :lg="8">
+          <el-form-item label="区域" prop="regionWork">
+            <el-input v-model="mainForm.regionWork" placeholder="请输入区域"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :xs="24" :sm="12" :lg="8">
+          <el-form-item label="文件编号" prop="fileNum">
+            <el-input v-model="mainForm.fileNum" placeholder="请输入文件编号"></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :xs="24" :sm="12" :lg="8">
           <el-form-item label="联系人" prop="contactMan">
             <el-input v-model="mainForm.contactMan" placeholder="请输入联系人" :disabled="isDealer"></el-input>
           </el-form-item>
@@ -105,26 +124,16 @@
             <el-input v-model="mainForm.phone" placeholder="请输入移动电话" :disabled="isDealer"></el-input>
           </el-form-item>
         </el-col>
-        <el-col :xs="24" :sm="12" :lg="16">
+        <el-col :xs="24" :sm="24" :lg="24">
           <el-form-item label="安装地址" prop="address">
             <el-input v-model="mainForm.address" placeholder="请输入安装地址" :disabled="isDealer"></el-input>
           </el-form-item>
         </el-col>
-        <el-col :xs="24" :sm="12" :lg="8">
-          <el-form-item label="第几次申报" prop="declareNo">
-            <el-input v-model="mainForm.declareNo" placeholder="请输入第几次申报" :disabled="isDealer"></el-input>
-          </el-form-item>
-        </el-col>
-        <el-col :xs="24" :sm="12" :lg="16">
+        <el-col :xs="24" :sm="24" :lg="24">
           <el-form-item label="项目说明" prop="projectRemark">
             <el-input v-model="mainForm.projectRemark" placeholder="请输入项目说明" :disabled="isDealer"></el-input>
           </el-form-item>
         </el-col>
-        <el-col :xs="24" :sm="12" :lg="8">
-          <el-form-item label="项目类型" prop="projectType">
-            <el-input v-model="mainForm.projectType" placeholder="请输入项目类型" :disabled="isDealer"></el-input>
-          </el-form-item>
-        </el-col>
         <el-col :xs="24" :sm="24" :lg="24" v-if="!isDealer">
           <el-form-item label="格力内部备注" prop="greeRemark">
             <el-input v-model="mainForm.greeRemark" placeholder="请输入格力内部备注"></el-input>
@@ -157,11 +166,6 @@
             </el-date-picker>
           </el-form-item>
         </el-col>
-        <el-col :xs="24" :sm="12" :lg="8">
-          <el-form-item label="文件编号" prop="fileNum">
-            <el-input v-model="mainForm.fileNum" placeholder="请输入文件编号"></el-input>
-          </el-form-item>
-        </el-col>
         <el-col :xs="24" :sm="24" :lg="24" v-if="mainForm.examineRemark">
           <el-form-item label="审批说明" prop="examineRemark">
             <el-input v-model="mainForm.examineRemark" placeholder="请输入审批说明" disabled></el-input>
@@ -513,6 +517,8 @@ export default {
         projectRemark: '',
         projectType: '',
         examineRemark: '',
+        refCount: '',
+        regionWork: '',
       },
       mainFormRules: {
         // orderDate: [{ required: true, message: '请选择单据日期', trigger: 'change' }],
@@ -775,6 +781,8 @@ export default {
         this.mainForm.declareNo = data.declareNo;
         this.mainForm.projectRemark = data.buChonShuoMing;
         this.mainForm.projectType = data.govBuyType;
+        this.mainForm.refCount = data.refCount;
+        this.mainForm.regionWork = data.regionWork;
 
         let saleTypeItem = this.salesTypeList.find(o => o.id == this.mainForm.saleType);
 
@@ -884,6 +892,7 @@ export default {
         this.mainForm.phone = data.refPhone;
         this.mainForm.address = data.refInstallAddress;
         this.mainForm.declareNo = data.refDeclareNo;
+        this.mainForm.refCount = data.refCount;
         this.mainForm.greeRemark = data.geLiInerNote;
         this.mainForm.greeReply = data.note1;
         this.mainForm.remark = data.remark;
@@ -895,6 +904,7 @@ export default {
         this.mainForm.projectType = data.refProjectType;
         this.mainForm.examineRemark = data.examineNote;
         this.mainForm.loginUserId = data.loginUserId;
+        this.mainForm.regionWork = data.refRegionWork;
 
         data.items.forEach(item => {
           item.status1 = '';
@@ -1118,8 +1128,6 @@ export default {
           let saleManItem = this.mainForm.salesMan ? this.salesmanList.find(o => o.adminUserId == this.mainForm.salesMan) : '';
           let params = {
             enginOrderId: this.mainForm.orderNum,
-            // orderDate: this.mainForm.orderDate,
-            // mainId: this.mainForm.type || '',
             loginUserId: this.mainForm.loginUserId,
             refEnginRecordNo: this.mainForm.loginNum || '',
             refProjectName: this.mainForm.enginName || '',
@@ -1132,6 +1140,7 @@ export default {
             refPhone: this.mainForm.phone || '',
             refInstallAddress: this.mainForm.address || '',
             refDeclareNo: this.mainForm.declareNo || '',
+            refCount: this.mainForm.refCount || '',
             saleTypeId: this.mainForm.saleType,
             saleTypeCode: saleTypeItem.saleCode,
             saleTypeName: saleTypeItem.saleName,
@@ -1143,6 +1152,7 @@ export default {
             serviceName: saleManItem ? saleManItem.nickName : goodsList[0].serviceName,
             refProjectNote: this.mainForm.projectRemark,
             refProjectType: this.mainForm.projectType,
+            refRegionWork: this.mainForm.regionWork,
             items: goodsList,
           }