工艺问题修改

src/api/processManagement/taskProcessing.js

@@ -268,6 +268,6 @@ export const craftBatchRemoval = (params) => {
   return request({
     url: '/blade-desk/dsCraft/craftBatchRemoval',
     method: 'post',
-    data: params,
+    params: params,
   });
 }

src/views/processManagement/bathRefine/addQuantity.vue

@@ -124,7 +124,7 @@ export default {
           },
           {
             label: '作业槽',
-            prop: 'batchNo',
+            prop: 'batchNoName',
             search: false,
             sortable: true,
             overHidden: true,

src/views/processManagement/bathRefine/components/addQuantityDialog.vue

@@ -23,7 +23,14 @@
           <template #default="scope">
             <!-- prop 格式：数组名[索引].字段名 -->
             <el-form-item :prop="`tableData[${scope.$index}].wcId`" :rules="formRules.wcId">
-              <el-select v-model="scope.row.wcId" placeholder="请选择" style="width: 100%" clearable filterable @change="changeWorkCenter(scope.$index)">
+              <el-select
+                v-model="scope.row.wcId"
+                placeholder="请选择"
+                style="width: 100%"
+                clearable
+                filterable
+                @change="changeWorkCenter(scope.$index)"
+              >
                 <el-option
                   v-for="item in wcData"
                   :key="item.id"
@@ -42,9 +49,20 @@
           </template>
           <template #default="scope">
             <el-form-item :prop="`tableData[${scope.$index}].batchNo`" :rules="formRules.batchNo">
-              <el-select v-model="scope.row.batchNo" placeholder="请选择" style="width: 100%" clearable filterable>
+              <el-select
-                <el-option v-for="item in scope.row.batchNoOptions" :key="item.id" :value="item.id" :label="item.name"></el-option>
+                v-model="scope.row.batchNo"
-
+                placeholder="请选择"
+                style="width: 100%"
+                clearable
+                filterable
+                @change="changeBatchNo(scope.row, scope.$index)"
+              >
+                <el-option
+                  v-for="item in scope.row.batchNoOptions"
+                  :key="item.id"
+                  :value="item.id"
+                  :label="item.name"
+                ></el-option>
               </el-select>
             </el-form-item>
           </template>
@@ -106,7 +124,6 @@ export default {
   },
   data() {
     return {
-      
       openShow: false,
       wcData: [
         {
@@ -172,6 +189,14 @@ export default {
     }
   },
   methods: {
+    changeBatchNo(row, index) {
+      console.log('选择的槽号槽名ID:', row.batchNo, '所在行索引:', index);
+      let select = this.form.tableData[index].batchNoOptions.filter(
+        row => row.id == this.form.tableData[index].batchNo
+      );
+      console.log(select, 'select');
+      this.form.tableData[index].batchNoName = select[0].name;
+    },
     // 切换作业中心
     changeWorkCenter(index) {
       this.form.batchNo = '';
@@ -179,7 +204,7 @@ export default {
       this.form.tableData[index].batchNo = '';
       this.getTankList(this.form.tableData[index].wcId, index);
     }, // 查询作业槽下拉列表
-    getTankList(val,index) {
+    getTankList(val, index) {
       getTank({ workstationId: val ? val : '' }).then(res => {
         this.form.tableData[index].batchNoOptions = res.data.data;
       });
@@ -249,13 +274,7 @@ export default {
           add(submitData).then(res => {
             this.$message.success('提交成功');
             this.closeDialog();
-            // this.$emit('submitSuccess', submitData);
           });
-
-          // // 演示用
-          // this.$message.success('提交成功');
-          // this.closeDialog();
-          // this.$emit('submitSuccess', submitData);
         } catch (err) {
           this.$message.error('网络错误，请稍后重试');
           console.error('提交失败：', err);

src/views/processManagement/components/processMainte/reworkProcessPlanning.vue

@@ -273,11 +273,11 @@
             </template>
             <template #default="scope">
               <el-form-item
-                :prop="`tableData2[${scope.$index}].projecCode`"
+                :prop="`tableData2[${scope.$index}].projectCode`"
-                :rules="formRules2.projecCode"
+                :rules="formRules2.projectCode"
               >
                 <el-select
-                  v-model="scope.row.projecCode"
+                  v-model="scope.row.projectCode"
                   placeholder="请选择"
                   clearable
                   filterable
@@ -403,10 +403,7 @@
                   placeholder="请输入"
                   style="width: 100%"
                 ></el-input>
-                <!-- <el-select v-model="scope.row.tool" placeholder="请选择" clearable filterable>
+
-                  <el-option label="是" value="1"></el-option>
-                  <el-option label="否" value="2"></el-option>
-                </el-select> -->
               </el-form-item>
             </template>
           </el-table-column>
@@ -633,7 +630,7 @@ export default {
       },
       formRules2: {
         trialNo: [{ required: true, message: '请输入', trigger: ['change', 'submit'] }],
-        projecCode: [{ required: true, message: '请选择', trigger: ['change', 'submit'] }],
+        projectCode: [{ required: true, message: '请选择', trigger: ['change', 'submit'] }],
         projectStandard: [{ required: true, message: '请输入', trigger: ['change', 'submit'] }],
         proHours: [{ required: true, message: '请输入', trigger: ['change', 'submit'] }],
       },
@@ -682,7 +679,7 @@ export default {
     },
     // 获取检验项目名字
     projectChange(row, index) {
-      let selectName = this.projectOptions.find(item => item.id == row.projecCode);
+      let selectName = this.projectOptions.find(item => item.id == row.projectCode);
       this.form2.tableData2[index].projectName = selectName.name;
     },
     // 获取检验标准名字
@@ -837,7 +834,6 @@ export default {
               ...craft,
               label: `${craftInfo?.reworkOrder || '返工单'}`,
               children: processList.map(process => {
-                console.log(989898, process);
                 const ppsName =
                   process.processInfo.ppsName || process.processInfo.name || process.processInfo.processName || '未知工序';
 

src/views/workRate/index.vue

@@ -0,0 +1,55 @@
+<template>
+  <el-dialog title="生产监控" append-to-body :modelValue="openShow" width="30%" @close="closeDialog" fullscreen>
+    <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>
+<script>
+import { updateProcess } from '../../api/flowManagement/index';
+export default {
+  props: {
+    showDialog: {
+      type: Boolean,
+      default: false,
+    },
+  },
+  data() {
+    return {
+      openShow: false,
+    };
+  },
+  mounted() {
+    this.openShow = this.showDialog;
+  },
+  methods: {
+    closeDialog() {
+      this.openShow = false;
+      this.$emit('closeDialog');
+    },
+    submit() {
+      this.$refs.form.validate(async valid => {
+        if (valid) {
+          let params = {
+            id: this.$route.query.id,
+            approvalStatus: '',
+
+            // status: this.option.column[0].value,
+            // reason: this.option.column[1].value,
+          };
+          updateProcess(params).then(res => {
+            if (res.code == 200) {
+              this.$message.success('操作成功');
+              this.closeDialog();
+            }
+          });
+        }
+      });
+    },
+  },
+};
+</script>
+<style lang="scss" scoped></style>