|
|
@@ -75,7 +75,18 @@
|
|
|
</el-col>
|
|
|
<el-col :xs="24" :sm="12" :lg="8">
|
|
|
<el-form-item label="工程登录类型" prop="loginType">
|
|
|
- <el-input v-model="mainForm.loginType" placeholder="请输入工程登录类型" disabled></el-input>
|
|
|
+ <el-select style="width: 100%" v-model="mainForm.loginType" placeholder="请输入工程登录类型" disabled>
|
|
|
+ <el-option
|
|
|
+ v-for="item in [
|
|
|
+ {label:'家用', value:'HOME'},
|
|
|
+ {label:'商用', value:'TRADE'},
|
|
|
+ ]"
|
|
|
+ :key="item.value"
|
|
|
+ :label="item.label"
|
|
|
+ :value="item.value"
|
|
|
+ >
|
|
|
+ </el-option>
|
|
|
+ </el-select>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :xs="24" :sm="12" :lg="8">
|
|
|
@@ -683,7 +694,7 @@ export default {
|
|
|
// item.orderId = item.id;
|
|
|
// })
|
|
|
if (data.orders.length) {
|
|
|
- this.screenForm.type = data.orders[0].categoryId
|
|
|
+ this.screenForm.type = data.orders[0].k3CategoryId
|
|
|
}
|
|
|
this.goodsList = data.orders
|
|
|
|
|
|
@@ -887,7 +898,7 @@ export default {
|
|
|
this.mainForm.loginNum = data.refEnginRecordNo
|
|
|
this.mainForm.enginName = data.refProjectCategory
|
|
|
this.mainForm.refProjectName = data.refProjectName
|
|
|
- this.mainForm.loginType = data.refPromiseStatus
|
|
|
+ this.mainForm.loginType = data.enginOrderType
|
|
|
this.mainForm.factoryNum = data.refFactoryNo
|
|
|
this.mainForm.company = data.refUseUnit
|
|
|
this.mainForm.saleType = data.saleTypeId
|
|
|
@@ -938,8 +949,8 @@ export default {
|
|
|
}
|
|
|
let correspondName = this.warehouseList[findElem(this.warehouseList, 'id', this.screenForm.warehouse)].name
|
|
|
this.goodsList.forEach(k=>{
|
|
|
- k.categoryId = this.goodsList[0].categoryId
|
|
|
- k.categoryName = this.goodsList[0].categoryName
|
|
|
+ k.k3CategoryId = this.goodsList[0].k3CategoryId
|
|
|
+ k.k3ServiceName = this.goodsList[0].k3ServiceName
|
|
|
|
|
|
})
|
|
|
let params = {
|
Howie