修改订单批量删除逻辑/更改表单内容

zkqy-ui/src/views/orderMange/approve.vue

@@ -488,7 +488,7 @@
               {{ nickName }}
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <!-- <el-col :span="12">
             <el-form-item label="业务主管:">
               <el-input
                 v-model="formData.saleLeader"
@@ -527,45 +527,77 @@
                 disabled
               ></el-input>
             </el-form-item>
-          </el-col>
+          </el-col> -->
         </el-form>
       </el-row>
       <el-divider>审批</el-divider>
-      <el-form
-        :model="approveForm"
-        ref="approveFormRef"
-        :rules="approveRule"
-        label-width="100px"
-        :inline="false"
-        size="normal"
-      >
-        <el-form-item label="是否通过:" prop="status">
-          <el-radio v-model="approveForm.status" label="3">通过</el-radio>
-          <el-radio v-model="approveForm.status" label="1">不通过</el-radio>
-        </el-form-item>
-        <el-form-item
-          v-show="approveForm.status == '3'"
-          label="订单类型:"
+      <el-row :gutter="20">
+        <el-form
+          :model="approveForm"
+          ref="approveFormRef"
+          :rules="approveRule"
+          label-width="100px"
+          :inline="false"
           size="normal"
-          prop="orderType"
         >
-          <el-select
-            v-model="approveForm.orderType"
-            placeholder="请选择订单类型"
-            clearable
-            filterable
-          >
-            <el-option
-              v-for="item in dict.type.sales_order_type"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
+          <el-col :span="12">
+            <el-form-item label="是否通过:" prop="status">
+              <el-radio v-model="approveForm.status" label="3">通过</el-radio>
+              <el-radio v-model="approveForm.status" label="1">不通过</el-radio>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item
+              v-show="approveForm.status == '3'"
+              label="订单类型:"
+              size="normal"
+              prop="orderType"
             >
-            </el-option>
-          </el-select>
-        </el-form-item>
-      </el-form>
-
+              <el-select
+                v-model="approveForm.orderType"
+                placeholder="请选择订单类型"
+                clearable
+                filterable
+              >
+                <el-option
+                  v-for="item in dict.type.sales_order_type"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="业务主管:">
+              <el-input
+                v-model="approveForm.saleLeader"
+                size="small"
+                clearable
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="财务部:">
+              <el-input
+                v-model="approveForm.finance"
+                size="small"
+                clearable
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="生产部:">
+              <el-input
+                v-model="approveForm.production"
+                size="small"
+                clearable
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-form>
+      </el-row>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="approveConfirm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
@@ -652,6 +684,10 @@ export default {
       approveForm: {
         status: "3",
         orderType: "",
+        saleLeader: "", //业务主管
+        finance: "", //财务部
+        production: "", //生产部
+        saleApprover: "", //批准人
       },
       approveRule: {
         orderType: [
@@ -845,7 +881,14 @@ export default {
       // console.log(this.dict.type.sales_order_type);
       this.$refs["approveFormRef"].validate(async (valid) => {
         if (valid) {
-          let { status, orderType } = this.approveForm;
+          let { status, orderType, saleLeader, finance, production } =
+            this.approveForm;
+          let baseFormInfo = {
+            saleLeader,
+            finance,
+            production,
+          };
+          // baseFormInfo.saleApprover = this.nickName;
           let payload = {
             basicMap: {
               tableName: "sale_order",
@@ -864,6 +907,7 @@ export default {
             payload.commMap = {
               status,
               saleApprover: this.nickName,
+              ...baseFormInfo,
             };
           } else {
             //通过
@@ -873,6 +917,7 @@ export default {
                 status: "3",
                 orderType,
                 saleApprover: this.nickName,
+                ...baseFormInfo,
               };
             } else if (orderType == "1") {
               //库存
@@ -880,6 +925,7 @@ export default {
                 status: "5",
                 orderType,
                 saleApprover: this.nickName,
+                ...baseFormInfo,
               };
             }
           }

zkqy-ui/src/views/orderMange/index.vue

@@ -528,42 +528,7 @@
               {{ nickName }}
             </el-form-item>
           </el-col>
-          <el-col :span="12">
-            <el-form-item label="业务主管:">
-              <el-input
-                v-model="formData.saleLeader"
-                size="small"
-                clearable
-              ></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="财务部:">
-              <el-input
-                v-model="formData.finance"
-                size="small"
-                clearable
-              ></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="生产部:">
-              <el-input
-                v-model="formData.production"
-                size="small"
-                clearable
-              ></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="批准人:">
-              <el-input
-                v-model="formData.saleApprover"
-                size="small"
-                clearable
-              ></el-input>
-            </el-form-item>
-          </el-col>
+          
         </el-form>
       </el-row>
       <div slot="footer" class="dialog-footer">
@@ -1290,13 +1255,9 @@ export default {
           },
         };
         let orderRes = await delTableData(orderPayload);
-        let productRes = await delTableData(productsPayload);
-        let craftRes = await delTableData(craftPayload);
-        if (
-          orderRes.code == 200 &&
-          productRes.code == 200 &&
-          craftRes.code == 200
-        ) {
+        // let productRes = await delTableData(productsPayload);
+        // let craftRes = await delTableData(craftPayload);
+        if (orderRes.code == 200) {
           this.$message.success("删除成功");
           this.getList();
         } else {