|
|
@@ -233,8 +233,35 @@
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
+ <el-col :xs="24" :sm="12" :lg="6">
|
|
|
+ <el-form-item label="区域" prop="discriminate">
|
|
|
+ <el-select
|
|
|
+ v-model="screenForm.discriminate"
|
|
|
+ placeholder="选择区域"
|
|
|
+ clearable
|
|
|
+ filterable
|
|
|
+ style="width: 100%"
|
|
|
+ >
|
|
|
+ <el-option
|
|
|
+ label="广州"
|
|
|
+ value="GZ"
|
|
|
+ />
|
|
|
+ <el-option
|
|
|
+ label="佛山"
|
|
|
+ value="FS"
|
|
|
+ />
|
|
|
|
|
|
-
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :xs="24" :sm="12" :lg="6">
|
|
|
+ <el-form-item label="工程登录单号" prop="refEnginRecordNo">
|
|
|
+ <el-input
|
|
|
+ v-model="screenForm.refEnginRecordNo"
|
|
|
+ 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>
|
|
|
@@ -922,7 +949,9 @@ export default {
|
|
|
mainOrderId: "",
|
|
|
approvaTime: "",
|
|
|
types:'',
|
|
|
- printStatus:''
|
|
|
+ printStatus:'',
|
|
|
+ discriminate:'',
|
|
|
+ refEnginRecordNo:''
|
|
|
},
|
|
|
invoiceList:[
|
|
|
{
|
|
|
@@ -977,6 +1006,8 @@ export default {
|
|
|
materialNumber: this.screenForm.goodsCode,
|
|
|
materialOldNumber: this.screenForm.goodsOldCode,
|
|
|
specification: this.screenForm.model,
|
|
|
+ discriminate:this.screenForm.discriminate,
|
|
|
+ refEnginRecordNo:this.screenForm.refEnginRecordNo,
|
|
|
createStartTime: this.screenForm.createDate
|
|
|
? this.screenForm.createDate[0]
|
|
|
: "",
|
|
|
@@ -1108,6 +1139,8 @@ export default {
|
|
|
materialOldNumber: this.screenForm.goodsOldCode,
|
|
|
specification: this.screenForm.model,
|
|
|
printStatus:this.screenForm.printStatus,
|
|
|
+ discriminate:this.screenForm.discriminate,
|
|
|
+ refEnginRecordNo:this.screenForm.refEnginRecordNo,
|
|
|
|
|
|
createStartTime: this.screenForm.createDate
|
|
|
? this.screenForm.createDate[0]
|
howie