diff --git a/src/assets/json/status.json b/src/assets/json/status.json index 20ed411..691ce79 100644 --- a/src/assets/json/status.json +++ b/src/assets/json/status.json @@ -416,11 +416,17 @@ "type": "" }, { - "name": "", + "name": "待接单", "status": 205, "color": "#f56c6c", "type": "" }, + { + "name": "待接单", + "status": 101, + "color": "#f56c6c", + "type": "" + }, { "name": "已驳回", "status": 102, diff --git a/src/views/businessManagement/ordinary.vue b/src/views/businessManagement/ordinary.vue index 568c3f1..c3670d3 100644 --- a/src/views/businessManagement/ordinary.vue +++ b/src/views/businessManagement/ordinary.vue @@ -1829,6 +1829,7 @@ export default { approveTime: moment().format('YYYY-MM-DD HH:mm:ss'), approveRemark: this.chargeForm.approveRemark } + console.log('query',this.discount) if (query.approveResult == 0) { supervisorReject(query).then(res => { if (res.data.code == 200) { @@ -1838,7 +1839,7 @@ export default { } }) } else { - if (this.discount == '') { + if (!this.discount ) { return this.$message.error("请输入折扣信息") } diff --git a/src/views/components/requestSub.vue b/src/views/components/requestSub.vue index 71b5878..35ac5e4 100644 --- a/src/views/components/requestSub.vue +++ b/src/views/components/requestSub.vue @@ -1111,10 +1111,10 @@ export default { picAttaches: item.form.picAttaches, faultDescribe: item.form.faultDescribe, submitType: 1, - createDept:item.form.createDept, - informant:item.form.informant, - informantPhone:item.form.informantPhone, - reportUnit:item.form.reportUnit, + // createDept:item.form.createDept, + // informant:item.form.informant, + // informantPhone:item.form.informantPhone, + reportUnit:item.form.informant, }) }) if(data.videoAttaches && data.picAttaches && data.videoAttaches.length + data.picAttaches.length > 3){ diff --git a/src/views/operation/hand.vue b/src/views/operation/hand.vue index a295cf6..6abebe4 100644 --- a/src/views/operation/hand.vue +++ b/src/views/operation/hand.vue @@ -807,7 +807,7 @@ export default { if (this.selectionList.length == 0) { this.$message.warning('请至少选择一条数据') } else { - let tmp = this.selectionList.filter(item => { return (item.status == 202 || item.status == 203 || item.status == 204) }) + let tmp = this.selectionList.filter(item => { return (item.status == 104||item.status == 202 || item.status == 203 || item.status == 204) }) if (tmp.length != this.selectionList.length) { this.$message.warning('请选择状态为已完成的数据') } else {