接口联调

src/api/productionManagement/reworkOrder.js

@@ -11,3 +11,12 @@ export const getList = (current, size, params) => {
     },
   });
 };
+
+// 改数接收
+export const receiveOrder = (params) => {
+  return request({
+    url: '/blade-desk/ReworkProcess/receiveOrder',
+    method: 'post',
+    data: params,
+  });
+};

src/views/productionManagement/WIPChange.vue

@@ -18,6 +18,7 @@
       <template #menu="{ row }">
         <el-button type="text" @click="assignFn(row)">转派</el-button>
         <el-button type="text" @click="handleFn(row)">处理</el-button>
+        <el-button type="text" @click="taskHandleFun(row)">质量处理</el-button>
       </template>
     </avue-crud>
     <!-- 处理 -->
@@ -27,6 +28,8 @@
       @closeDialog="closeDialog"
       :rowItem="rowItem"
     ></taskHandleDialog>
+    <!-- 质量处理 -->
+    <taskHandleQuality v-if="isTaskHandleQuality" :showDialog="isTaskHandleQuality" @closeDialog="closeDialog"  :rowItem="rowItem"></taskHandleQuality>
     <!-- 转派 -->
     <assignDaialog
       v-if="isAssignShow"
@@ -39,11 +42,13 @@
 import { status } from 'nprogress';
 import taskHandleDialog from './components/taskHandleDialog.vue';
 import assignDaialog from './components/assignDaialog.vue';
+import taskHandleQuality from './components/taskHandleQuality.vue';
 import { getList, taskComplete } from '@/api/productionManagement/WIPChange.js';
 export default {
   components: {
     taskHandleDialog,
     assignDaialog,
+    taskHandleQuality
   },
   data() {
     return {
@@ -219,11 +224,15 @@ export default {
       },
       isHandleShow: false,
       isAssignShow: false,
+      isTaskHandleQuality:false,
       rowItem:{}
     };
   },
   mounted() {},
   methods: {
+    taskHandleFun(row){
+      this.isTaskHandleQuality = true;
+    },
     assignFn(row) {
       this.isAssignShow = true;
     },
@@ -234,6 +243,7 @@ export default {
     closeDialog() {
       this.isHandleShow = false;
       this.isAssignShow = false;
+      this.isTaskHandleQuality = false;
       this.onLoad(this.page, this.query);
     },
      currentChange(currentPage) {

src/views/productionManagement/components/taskHandleQuality.vue

@@ -0,0 +1,90 @@
+<template>
+  <el-dialog
+    title="质量处理"
+    append-to-body
+    :modelValue="openShow"
+    width="30%"
+    @close="closeDialog"
+  >
+    <el-form ref="form" v-model="formData" :rules="rules" label-width="80px" class="vd-form-row">
+      <el-form-item label="订单是否继续" prop="rsCode">
+        <el-radio-group v-model="formData.rsCode">
+          <el-radio label="是" />
+          <el-radio label="否" />
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="处理意见" prop="handleResult">
+        <el-input v-model="formData.handleResult" type="textarea" />
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button @click="closeDialog">取 消</el-button>
+        <el-button type="primary" @click="submit" :loading="saveLoading">修改并接收</el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+<script>
+import { getList, receiveOrder } from '@/api/productionManagement/reworkOrder';
+import { taskComplete } from '@/api/productionManagement/WIPChange.js';
+
+export default {
+  props: {
+    showDialog: {
+      type: Boolean,
+      default: false,
+    },
+    rowItem: {
+      type: Object,
+      default: () => ({}),
+    },
+  },
+  data() {
+    return {
+      saveLoading: false,
+      openShow: false,
+      formData: { rsCode: null, handleResult: '' },
+      rules: {
+        rsCode: [{ required: true, message: '请选择', trigger: 'blur' }],
+        handleResult: [{ required: true, message: '请输入', trigger: 'blur' }],
+      },
+    };
+  },
+  mounted() {
+    this.openShow = this.showDialog;
+  },
+  methods: {
+    closeDialog() {
+      this.openShow = false;
+      this.$emit('closeDialog');
+    },
+    submit() {
+      this.$refs.form.validate(valid => {
+        if (valid) {
+          this.$confirm('请确认此操作', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning',
+          })
+            .then(() => {
+              this.rowItem.rsCode = this.rowItem.rsCode;
+              this.rowItem.handleResult = this.rowItem.handleResult;
+              receiveOrder(this.rowItem).then(res => {
+                this.$message({
+                  message: '操作成功',
+                  type: 'success',
+                });
+                this.closeDialog();
+              });
+            })
+            .catch(err => {
+              this.$message.info(err.msg);
+            });
+        }
+      });
+    },
+  },
+};
+</script>
+<style lang="scss" scoped></style>

src/views/productionManagement/components/updateMakeQty.vue

@@ -0,0 +1,86 @@
+<template>
+  <el-dialog
+    title="改数接收"
+    append-to-body
+    :modelValue="openShow"
+    width="30%"
+    @close="closeDialog"
+  >
+    <el-form ref="form" v-model="formData" :rules="rules" label-width="80px" class="vd-form-row">
+      <el-form-item label="数量" prop="amount">
+        <el-input
+          v-model.number="formData.amount"
+          placeholder="请输入"
+          type="default"
+          oninput="value=value.replace(/[^\d]/g,'')"
+        />
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button @click="closeDialog">取 消</el-button>
+        <el-button type="primary" @click="submit" :loading="saveLoading">修改并接收</el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+<script>
+import { getList, receiveOrder } from '@/api/productionManagement/reworkOrder';
+
+export default {
+  props: {
+    showDialog: {
+      type: Boolean,
+      default: false,
+    },
+    itemData: {
+      type: Object,
+      default: () => ({}),
+    },
+  },
+  data() {
+    return {
+      saveLoading: false,
+      openShow: false,
+      formData: { amount: null },
+      rules: {
+        amount: [{ required: true, message: '请输入', trigger: 'blur' }],
+      },
+    };
+  },
+  mounted() {
+    this.openShow = this.showDialog;
+  },
+  methods: {
+    closeDialog() {
+      this.openShow = false;
+      this.$emit('closeDialog');
+    },
+    submit() {
+      this.$refs.form.validate(valid => {
+        if (valid) {
+          this.$confirm('请确认此操作', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning',
+          })
+            .then(() => {
+              this.itemData.amount = this.itemData.amount;
+              receiveOrder(this.rowItem).then(res => {
+                this.$message({
+                  message: '操作成功',
+                  type: 'success',
+                });
+                this.closeDialog();
+              });
+            })
+            .catch(err => {
+              this.$message.info(err.msg);
+            });
+        }
+      });
+    },
+  },
+};
+</script>
+<style lang="scss" scoped></style>

src/views/productionManagement/deductionPreserve/index.vue

@@ -117,7 +117,7 @@ export default {
             search: true,
             sortable: true,
             span: 12,
-            width: 170,
+            width: 210,
           },
 
           {

src/views/productionManagement/reworkOrder.vue

@@ -18,16 +18,29 @@
       <template #menu="{ row }">
         <!-- <el-button type="text">返工工艺</el-button> -->
         <el-button type="text" @click="receiveData(row)" v-if="row.status == 0">接收</el-button>
-        <!-- <el-button type="text" @click="finishData(row)">完成</el-button> -->
+        <el-button type="text" @click="updateData(row)">改数接收</el-button>
+        <el-button type="text" @click="finishData(row)">完成</el-button>
       </template>
     </avue-crud>
+    <!-- 改数接收 -->
+    <updateMakeQty
+      v-if="updateMakeQtyVisible"
+      ref="updateMakeQty"
+      :showDialog="updateMakeQtyVisible"
+      @close="updateMakeQtyClose"
+      :itemData="itemData"
+    ></updateMakeQty>
   </basic-container>
 </template>
 <script>
 import { getList } from '@/api/productionManagement/reworkOrder';
+import updateMakeQty from './components/updateMakeQty.vue';
 export default {
+  components: { updateMakeQty },
   data() {
     return {
+      updateMakeQtyVisible: false,
+      itemData: {},
       page: {
         pageSize: 10,
         currentPage: 1,
@@ -227,6 +240,10 @@ export default {
   },
   mounted() {},
   methods: {
+    updateData(row) {
+      this.itemData = row;
+      this.updateMakeQtyVisible = true;
+    },
     receiveData(row) {
       this.$confirm('确定接收此工单?', '提示', {
         confirmButtonText: '确认',
@@ -265,11 +282,7 @@ export default {
     },
     onLoad(page, params = {}) {
       this.loading = true;
-        getList(
+      getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
-          page.currentPage,
-          page.pageSize,
-          Object.assign(params, this.query)
-        ).then(res => {
         this.data = res.data.data.records;
         this.loading = false;
         this.page.total = res.data.data.total;