|
@@ -101,7 +101,7 @@
|
|
</el-col>
|
|
</el-col>
|
|
<el-col :xs="24" :sm="12" :lg="6">
|
|
<el-col :xs="24" :sm="12" :lg="6">
|
|
<el-form-item label="是否直调" prop="isDirectTransfer">
|
|
<el-form-item label="是否直调" prop="isDirectTransfer">
|
|
- <el-select v-model="screenForm.isDirectTransfer" placeholder="选择是否直" style="width: 100%">
|
|
|
|
|
|
+ <el-select v-model="screenForm.isDirectTransfer" placeholder="选择是否直" clearable style="width: 100%">
|
|
<el-option :value="null" label="默认"></el-option>
|
|
<el-option :value="null" label="默认"></el-option>
|
|
<el-option v-for="item in transfer" :key="item.value" :label="item.label" :value="item.value">
|
|
<el-option v-for="item in transfer" :key="item.value" :label="item.label" :value="item.value">
|
|
</el-option>
|
|
</el-option>
|
|
@@ -109,13 +109,11 @@
|
|
</el-form-item>
|
|
</el-form-item>
|
|
</el-col>
|
|
</el-col>
|
|
<el-col :xs="24" :sm="12" :lg="6">
|
|
<el-col :xs="24" :sm="12" :lg="6">
|
|
- <el-form-item label="是否关闭" prop="examineStatus">
|
|
|
|
- <el-select v-model="screenForm.examineStatus" placeholder="是否关闭" style="width: 100%">
|
|
|
|
- <el-option v-if="screenForm.status != 'OK'" label="是" value="CLOSE">
|
|
|
|
|
|
+ <el-form-item label="是否关闭" prop="isClose">
|
|
|
|
+ <el-select v-model="screenForm.isClose" placeholder="是否关闭" clearable style="width: 100%">
|
|
|
|
+ <el-option label="是" :value="true">
|
|
</el-option>
|
|
</el-option>
|
|
- <el-option v-else label="是" value="OK,CLOSE">
|
|
|
|
- </el-option>
|
|
|
|
- <el-option label="否" :value="null">
|
|
|
|
|
|
+ <el-option label="否" :value="false">
|
|
</el-option>
|
|
</el-option>
|
|
|
|
|
|
</el-select>
|
|
</el-select>
|
|
@@ -536,6 +534,7 @@ export default {
|
|
salesMan: '',
|
|
salesMan: '',
|
|
model: '',
|
|
model: '',
|
|
orderDate: '',
|
|
orderDate: '',
|
|
|
|
+ isClose:'',
|
|
isDirectTransfer: null,
|
|
isDirectTransfer: null,
|
|
examineStatus:''
|
|
examineStatus:''
|
|
},
|
|
},
|
|
@@ -572,16 +571,7 @@ export default {
|
|
return JSON.parse(localStorage.getItem('supply_user')).isCustomer
|
|
return JSON.parse(localStorage.getItem('supply_user')).isCustomer
|
|
},
|
|
},
|
|
exParams() {
|
|
exParams() {
|
|
- let status = ''
|
|
|
|
- if (this.screenForm.examineStatus){
|
|
|
|
- if (this.screenForm.status!='OK'){
|
|
|
|
- status += this.screenForm.status+ ',' +this.screenForm.examineStatus
|
|
|
|
- }else {
|
|
|
|
- status = this.screenForm.examineStatus
|
|
|
|
- }
|
|
|
|
- }else {
|
|
|
|
- status = this.screenForm.status
|
|
|
|
- }
|
|
|
|
|
|
+
|
|
return {
|
|
return {
|
|
enginInfoNo: this.screenForm.orderNum,
|
|
enginInfoNo: this.screenForm.orderNum,
|
|
projectNo: this.screenForm.enginNum,
|
|
projectNo: this.screenForm.enginNum,
|
|
@@ -595,7 +585,8 @@ export default {
|
|
useUnit: this.screenForm.company,
|
|
useUnit: this.screenForm.company,
|
|
createName: this.screenForm.createMan,
|
|
createName: this.screenForm.createMan,
|
|
confirmName: this.screenForm.examineMan,
|
|
confirmName: this.screenForm.examineMan,
|
|
- examineStatus: status,
|
|
|
|
|
|
+ examineStatus: this.screenForm.examineStatus,
|
|
|
|
+ isClose:this.screenForm.isClose,
|
|
serviceId: this.screenForm.salesMan,
|
|
serviceId: this.screenForm.salesMan,
|
|
specification: this.screenForm.model,
|
|
specification: this.screenForm.model,
|
|
isDirectTransfer: this.screenForm.isDirectTransfer
|
|
isDirectTransfer: this.screenForm.isDirectTransfer
|
|
@@ -652,16 +643,7 @@ export default {
|
|
// 查询列表
|
|
// 查询列表
|
|
getList() {
|
|
getList() {
|
|
this.listLoading = true
|
|
this.listLoading = true
|
|
- let status = ''
|
|
|
|
- if (this.screenForm.examineStatus ){
|
|
|
|
- if (this.screenForm.status!='OK' && this.screenForm.status){
|
|
|
|
- status += this.screenForm.status+ ',' +this.screenForm.examineStatus
|
|
|
|
- }else {
|
|
|
|
- status = this.screenForm.examineStatus
|
|
|
|
- }
|
|
|
|
- }else {
|
|
|
|
- status = this.screenForm.status
|
|
|
|
- }
|
|
|
|
|
|
+
|
|
const params = {
|
|
const params = {
|
|
pageNum: this.currentPage,
|
|
pageNum: this.currentPage,
|
|
pageSize: this.pageSize,
|
|
pageSize: this.pageSize,
|
|
@@ -677,7 +659,9 @@ export default {
|
|
useUnit: this.screenForm.company,
|
|
useUnit: this.screenForm.company,
|
|
createName: this.screenForm.createMan,
|
|
createName: this.screenForm.createMan,
|
|
confirmName: this.screenForm.examineMan,
|
|
confirmName: this.screenForm.examineMan,
|
|
- examineStatus: status,
|
|
|
|
|
|
+ examineStatus: this.screenForm.examineStatus,
|
|
|
|
+ isClose:this.screenForm.isClose,
|
|
|
|
+
|
|
serviceId: this.screenForm.salesMan,
|
|
serviceId: this.screenForm.salesMan,
|
|
specification: this.screenForm.model,
|
|
specification: this.screenForm.model,
|
|
isDirectTransfer: this.screenForm.isDirectTransfer,
|
|
isDirectTransfer: this.screenForm.isDirectTransfer,
|