From b46e36c873864f25adf1a41987f43e2e7f7b2243 Mon Sep 17 00:00:00 2001
From: zhangdi <15053473693@163.com>
Date: Mon, 9 Feb 2026 16:21:14 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E7=AE=A1=E7=90=86=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E8=81=94=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/productionManagement/WIPChange.js     |  22 ++-
 src/views/productionManagement/WIPChange.vue  |  24 ++-
 .../components/assignDaialog.vue              | 162 +++++++++---------
 .../components/taskHandleDialog.vue           |  11 +-
 .../components/taskHandleQuality.vue          |   4 +-
 5 files changed, 124 insertions(+), 99 deletions(-)

diff --git a/src/api/productionManagement/WIPChange.js b/src/api/productionManagement/WIPChange.js
index 0f2fbd3..4a009f1 100644
--- a/src/api/productionManagement/WIPChange.js
+++ b/src/api/productionManagement/WIPChange.js
@@ -12,11 +12,29 @@ export const getList = (current, size, params) => {
   });
 };
 
-// 任务完成  /disTasking/taskComplete
+// 任务处理  
 export const taskComplete = (data) => {
   return request({
     url: '/blade-desk/disTasking/taskComplete',
     method: 'post',
     data
   });
-  };
\ No newline at end of file
+};
+
+// 转派 
+export const disTechnician = (data) => {
+  return request({
+    url: '/blade-desk/disTasking/disTechnician',
+    method: 'post',
+    data
+  });
+};
+
+// 质量任务处理
+export const taskCompleteOrder = (data) => {
+  return request({
+    url: '/blade-desk/disTasking/taskCompleteOrder',
+    method: 'post',
+    data
+  });
+};
\ No newline at end of file
diff --git a/src/views/productionManagement/WIPChange.vue b/src/views/productionManagement/WIPChange.vue
index 9bbcf88..5ea69af 100644
--- a/src/views/productionManagement/WIPChange.vue
+++ b/src/views/productionManagement/WIPChange.vue
@@ -29,12 +29,18 @@
       :rowItem="rowItem"
     ></taskHandleDialog>
     <!-- 质量处理 -->
-    <taskHandleQuality v-if="isTaskHandleQuality" :showDialog="isTaskHandleQuality" @closeDialog="closeDialog"  :rowItem="rowItem"></taskHandleQuality>
+    <taskHandleQuality
+      v-if="isTaskHandleQuality"
+      :showDialog="isTaskHandleQuality"
+      @closeDialog="closeDialog"
+      :rowItem="rowItem"
+    ></taskHandleQuality>
     <!-- 转派 -->
     <assignDaialog
       v-if="isAssignShow"
       :showDialog="isAssignShow"
       @closeDialog="closeDialog"
+      :rowItem="rowItem"
     ></assignDaialog>
   </basic-container>
 </template>
@@ -48,7 +54,7 @@ export default {
   components: {
     taskHandleDialog,
     assignDaialog,
-    taskHandleQuality
+    taskHandleQuality,
   },
   data() {
     return {
@@ -82,7 +88,7 @@ export default {
         editBtnIcon: ' ',
         labelWidth: '200px',
         dialogWidth: 600,
-        menuWidth: 120,
+        menuWidth: 180,
         dialogClickModal: false,
         searchEnter: true,
         filterBtn: true,
@@ -224,20 +230,22 @@ export default {
       },
       isHandleShow: false,
       isAssignShow: false,
-      isTaskHandleQuality:false,
-      rowItem:{}
+      isTaskHandleQuality: false,
+      rowItem: {},
     };
   },
   mounted() {},
   methods: {
-    taskHandleFun(row){
+    taskHandleFun(row) {
       this.isTaskHandleQuality = true;
+      this.rowItem = row;
     },
     assignFn(row) {
       this.isAssignShow = true;
+      this.rowItem = row;
     },
     handleFn(row) {
-      this.rowItem = row
+      this.rowItem = row;
       this.isHandleShow = true;
     },
     closeDialog() {
@@ -246,7 +254,7 @@ export default {
       this.isTaskHandleQuality = false;
       this.onLoad(this.page, this.query);
     },
-     currentChange(currentPage) {
+    currentChange(currentPage) {
       this.page.currentPage = currentPage;
       this.onLoad(this.page, this.query);
     },
diff --git a/src/views/productionManagement/components/assignDaialog.vue b/src/views/productionManagement/components/assignDaialog.vue
index 8f34840..90dc9cf 100644
--- a/src/views/productionManagement/components/assignDaialog.vue
+++ b/src/views/productionManagement/components/assignDaialog.vue
@@ -1,87 +1,95 @@
 <template>
-    <el-dialog title="转派" append-to-body :modelValue="openShow" width="30%" @close="closeDialog">
+  <el-dialog title="转派" append-to-body :modelValue="openShow" width="30%" @close="closeDialog">
+    <el-form ref="form" :model="formData" :rules="rules" label-width="80px" class="vd-form-row">
+      <el-row>
+        <el-col :span="24">
+          <el-form-item label="调度员" prop="disAssignMan">
+            <el-select v-model="formData.disAssignMan" placeholder="请选择" clearable filterable>
+              <el-option
+                v-for="item in options"
+                :key="item.id"
+                :label="item.realName"
+                :value="item.id"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="24">
+          <el-form-item label="处理意见" prop="resolution">
+            <el-input v-model="formData.resolution" type="textarea" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
 
-        <el-form ref="form" :model="formData" :rules="rules" label-width="80px" class="vd-form-row">
-            <el-row>
-                <el-col :span="24">
-                    <el-form-item label="调度员" prop="proMan.userId">
-                        <!-- <all-user v-model="formData.proMan.userId" /> -->
-                        <el-select v-model="formData.proMan.userId" placeholder="请选择" clearable filterable>
-                            <el-option v-for="item in options" :key="item.value" :label="item.label"
-                                :value="item.value">
-                            </el-option>
-                        </el-select>
-                    </el-form-item>
-                </el-col>
-            </el-row>
-            <el-row>
-                <el-col :span="24">
-                    <el-form-item label="处理意见" prop="resolution">
-                        <el-input v-model="formData.resolution" type="textarea" />
-                    </el-form-item>
-                </el-col>
-            </el-row>
-        </el-form>
-
-        <template #footer>
-            <span class="dialog-footer">
-                <el-button @click="closeDialog">取 消</el-button>
-                <el-button type="primary" @click="submit">确 定</el-button>
-            </span>
-        </template>
-    </el-dialog>
+    <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 { setDispatch, getRoleUserList } from '@/api/processManagement/taskDispatch';
+
+import { disTechnician } from '@/api/productionManagement/WIPChange.js';
+
 export default {
-    props: {
-        showDialog: {
-            type: Boolean,
-            default: false
-        },
+  props: {
+    showDialog: {
+      type: Boolean,
+      default: false,
     },
-    data() {
-        return {
-            openShow: false,
-            formData: { proMan: {}, resolution: null, ddtIdList: [] },
-            rules: {
-                'proMan.userId': [{ required: true }]
-            },
-            options: [
-                {
-                    label: '人员一',
-                    value: 1
-                },
-                {
-                    label: '人员二',
-                    value: 2
-                }
-            ]
-        }
+    rowItem: {
+      type: Object,
+      default: () => ({}),
     },
-    mounted() {
-        this.openShow = this.showDialog
+  },
+  data() {
+    return {
+      saveLoading: false,
+      openShow: false,
+      formData: { disAssignMan: null, resolution: null, ddtIdList: [] },
+      rules: {
+        disAssignMan: [{ required: true }],
+      },
+      options: [],
+    };
+  },
+  mounted() {
+    this.openShow = this.showDialog;
+    this.getRoleUserList();
+  },
+  methods: {
+    getRoleUserList() {
+      getRoleUserList({ current: 1, size: 9999999 }).then(res => {
+        this.options = res.data.data.records;
+      });
     },
-    methods: {
-        submit() {
-            // this.$refs.form.validate((valid) => {
-            //     if (valid) {
-            //         this.formData.assignType = false;
-            //         this.$ajax
-            //             .post('dsDisTasking/disTechnician', this.formData)
-            //             .then((res) => {
-            //                 if (this.$ifAjax(res)) {
-            //                     this.$message.success(this.$t('craft.alreadyAssign'));
-            //                     this.cancel(true);
-            //                 }
-            //             });
-            //     }
-            // });
-        },
-        closeDialog() {
-            this.openShow = false
-            this.$emit('closeDialog');
+    submit() {
+      this.$refs.form.validate(valid => {
+        if (valid) {
+          let query = {
+            ddtIdList: [this.rowItem.id],
+            resolution: this.formData.resolution,
+            disAssignMan: this.formData.disAssignMan,
+          };
+          disTechnician(query).then(res => {
+            this.$message.success('操作成功');
+            this.closeDialog();
+          });
         }
-    }
-}
+      });
+    },
+    closeDialog() {
+      this.openShow = false;
+      this.$emit('closeDialog');
+    },
+  },
+};
 </script>
-<style lang="scss" scoped></style>
\ No newline at end of file
+<style lang="scss" scoped></style>
diff --git a/src/views/productionManagement/components/taskHandleDialog.vue b/src/views/productionManagement/components/taskHandleDialog.vue
index aee9539..e993e6c 100644
--- a/src/views/productionManagement/components/taskHandleDialog.vue
+++ b/src/views/productionManagement/components/taskHandleDialog.vue
@@ -22,15 +22,6 @@
         </el-col>
       </el-row>
     </el-form>
-    <!-- <el-form v-else ref="form" :model="formData" label-width="80px" class="vd-form-row">
-      <el-row>
-        <el-col :span="24">
-          <el-form-item label="处理意见" prop="handleResult">
-            <el-input v-model="formData.handleResult" type="textarea" :rows="3" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form> -->
 
     <template #footer>
       <span class="dialog-footer">
@@ -91,7 +82,7 @@ export default {
             disAssignMan: this.rowItem.disAssignMan, //调度员
           };
           taskComplete(query).then(res => {
-            this.$message.success('处理成功');
+            this.$message.success('操作成功');
             this.closeDialog(true);
           });
         }
diff --git a/src/views/productionManagement/components/taskHandleQuality.vue b/src/views/productionManagement/components/taskHandleQuality.vue
index 44f8e4b..ed079c5 100644
--- a/src/views/productionManagement/components/taskHandleQuality.vue
+++ b/src/views/productionManagement/components/taskHandleQuality.vue
@@ -7,7 +7,7 @@
     @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-form-item label="订单是否继续" prop="rsCode" label-width="120px">
         <el-radio-group v-model="formData.rsCode">
           <el-radio label="是" />
           <el-radio label="否" />
@@ -20,7 +20,7 @@
     <template #footer>
       <span class="dialog-footer">
         <el-button @click="closeDialog">取 消</el-button>
-        <el-button type="primary" @click="submit" :loading="saveLoading">修改并接收</el-button>
+        <el-button type="primary" @click="submit" :loading="saveLoading">确定</el-button>
       </span>
     </template>
   </el-dialog>