diff --git a/src/views/order/base/orderManage/components/orderAdd.vue b/src/views/order/base/orderManage/components/orderAdd.vue index df3a8fb2..5c0ba6c0 100644 --- a/src/views/order/base/orderManage/components/orderAdd.vue +++ b/src/views/order/base/orderManage/components/orderAdd.vue @@ -175,16 +175,38 @@ export default { } if (this.isEdit) { //编辑 - orderUpdate({ ...this.form }).then((res) => { + orderUpdate({ + code: this.form.code, + name: this.form.name, + planQuantity: this.form.planQuantity, + planProductId: this.form.planProductId, + priority: this.form.priority, + planStartTime: this.form.planStartTime, + planFinishTime: this.form.planFinishTime, + remark: this.form.remark, + id: this.form.id, + specifications: this.form.specifications + }).then((res) => { if (res.code === 0) { this.$modal.msgSuccess("操作成功"); this.$emit('successSubmit') } }) } else { - this.form.status = 1 - this.form.triggerOrigin = 1 - orderCreate({ ...this.form }).then((res) => { + orderCreate({ + code: this.form.code, + name: this.form.name, + planQuantity: this.form.planQuantity, + planProductId: this.form.planProductId, + priority: this.form.priority, + planStartTime: this.form.planStartTime, + planFinishTime: this.form.planFinishTime, + remark: this.form.remark, + id: this.form.id, + specifications: this.form.specifications, + status: 1, + triggerOrigin: 1 + }).then((res) => { if (res.code === 0) { this.$modal.msgSuccess("操作成功"); this.$emit('successSubmit') diff --git a/src/views/order/base/orderManage/index.vue b/src/views/order/base/orderManage/index.vue index ae99032f..e64984a2 100644 --- a/src/views/order/base/orderManage/index.vue +++ b/src/views/order/base/orderManage/index.vue @@ -244,20 +244,15 @@ export default { btnName: '终止', showTip: '终止', showParam: { - type: '|', - data: [ - { - type: 'equal', - name: 'status', - value: 2 - }, - { - type: 'equal', - name: 'status', - value: 3 - } - ] - } + type: '&', + data: [ + { + type: 'equal', + name: 'status', + value: 3 + } + ] + } } : undefined, this.$auth.hasPermi('base:order-manage:cancel')