Merge branch 'projects/mesxc-test' into projects/mesxc-lb

Reviewed-on: #223

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
+            orderCreate({
-            this.form.triggerOrigin = 1
+              code: this.form.code,
-            orderCreate({ ...this.form }).then((res) => {
+              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')

src/views/order/base/orderManage/index.vue

@@ -244,20 +244,15 @@ export default {
             btnName: '终止',
             showTip: '终止',
             showParam: {
-              type: '|',
+                type: '&',
-              data: [
+                data: [
-                {
+                  {
-                  type: 'equal',
+                    type: 'equal',
-                  name: 'status',
+                    name: 'status',
-                  value: 2
+                    value: 3
-                },
+                  }
-                {
+                ]
-                  type: 'equal',
+              }
-                  name: 'status',
-                  value: 3
-                }
-              ]
-            }
           }
         : undefined,
       this.$auth.hasPermi('base:order-manage:cancel')