From d3f3565b3cf2fccaf7b0f7c3554b2b904003800e Mon Sep 17 00:00:00 2001
From: zhangdi <1104545947@qq.com>
Date: Tue, 19 May 2026 10:52:44 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/basicData/ruleMaintenance.vue       |   7 +-
 src/views/flowManagement/addDialog.vue        |  50 +++-----
 .../flowManagement/managementOfKeyTasks.vue   |  72 +----------
 src/views/flowManagement/milestoneDialog.vue  | 114 +++++++++++++-----
 .../glassCakeOutbound/index.vue               |  20 +--
 .../processMainte/dsPartBasicInfo.vue         |   2 +-
 .../processMainte/reworkProcessPlanning.vue   |   2 +
 7 files changed, 128 insertions(+), 139 deletions(-)

diff --git a/src/views/basicData/ruleMaintenance.vue b/src/views/basicData/ruleMaintenance.vue
index ddd094bc..2590ffe5 100644
--- a/src/views/basicData/ruleMaintenance.vue
+++ b/src/views/basicData/ruleMaintenance.vue
@@ -18,10 +18,13 @@
       :permission="permissionList"
     >
       <template #singleArea="{ row }">
-        {{ row.lowArea + '~' + row.upArea }}
+        <span v-if="row.lowArea==0&&row.upArea==0">-</span>
+        <span v-else>{{ row.lowArea + '~' + row.upArea }}</span>
       </template>
       <template #batchArea="{ row }">
-        {{ row.singleDownArea + '~' + row.singleUpArea }}
+         <span v-if="row.singleDownArea==0&&row.singleUpArea==0">-</span>
+        <span v-else>{{ row.singleDownArea + '~' + row.singleUpArea }}</span>
+        
       </template>
       <template #menu-left>
         <el-button type="primary" v-if="permission.ruleMaintenance_add" @click="handleAdd"
diff --git a/src/views/flowManagement/addDialog.vue b/src/views/flowManagement/addDialog.vue
index a6cb4e9c..855c4502 100644
--- a/src/views/flowManagement/addDialog.vue
+++ b/src/views/flowManagement/addDialog.vue
@@ -260,19 +260,6 @@
                   :title="title"
                   :disabled="isDetail"
                 />
-                <!-- <el-select
-                  v-model="scope.row.milestoneMemo"
-                  placeholder="请选择里程碑负责人"
-                  clearable
-                  filterable
-                  @change="handleStoneListChange(scope.$index, scope.row, 'milestoneMemo')"
-                >
-                  <el-option
-                    v-for="item in memberList"
-                    :label="item.realName"
-                    :value="item.id"
-                  ></el-option>
-                </el-select> -->
               </el-form-item>
             </template>
             <template v-else>
@@ -540,7 +527,7 @@ export default {
     },
     // 判断是否是审批之后和已完成之前的修改
     isStatusEdit() {
-      return this.rowItem.approvalStatus != 8 && this.approvalStatus != 1 && this.title == '修改';
+      return this.rowItem.approvalStatus != 8 && this.rowItem.approvalStatus != 1 && this.rowItem.approvalStatus != 2 && this.title == '修改';
     },
   },
   mounted() {
@@ -760,21 +747,8 @@ export default {
         const submitData = this.formatSubmitData(this.addForm);
         submitData.projectStartTime = submitData.projectStartTime + ' 00:00:00';
         submitData.projectDesiredEnd = submitData.projectDesiredEnd + ' 00:00:00';
+        console.log(this.title, 'this.title');
         if (this.title === '修改') {
-          updateProcess({
-            ...submitData,
-            approvalStatus: this.isStatusEdit ? this.rowItem.approvalStatus : 1,
-          })
-            .then(res => {
-              this.$message.success('修改成功');
-              this.handleClose(true);
-              this.loadingShow = false;
-            })
-            .catch(err => {
-              this.loadingShow = false;
-            });
-          return;
-        } else {
           if (this.isStatusEdit) {
             this.$confirm('确定要保存修改过的数据吗?', '提示', {
               confirmButtonText: '确定',
@@ -797,12 +771,15 @@ export default {
               })
               .catch(() => {});
           } else {
-            addProcess({
+            if (this.rowItem.approvalStatus == 2) {
+              this.rowItem.approvalStatus = 1;
+            }
+            updateProcess({
               ...submitData,
               approvalStatus: this.isStatusEdit ? this.rowItem.approvalStatus : 1,
             })
               .then(res => {
-                this.$message.success('提交成功');
+                this.$message.success('修改成功');
                 this.handleClose(true);
                 this.loadingShow = false;
               })
@@ -810,6 +787,19 @@ export default {
                 this.loadingShow = false;
               });
           }
+        } else {
+          addProcess({
+            ...submitData,
+            approvalStatus: this.isStatusEdit ? this.rowItem.approvalStatus : 1,
+          })
+            .then(res => {
+              this.$message.success('提交成功');
+              this.handleClose(true);
+              this.loadingShow = false;
+            })
+            .catch(err => {
+              this.loadingShow = false;
+            });
         }
       });
     },
diff --git a/src/views/flowManagement/managementOfKeyTasks.vue b/src/views/flowManagement/managementOfKeyTasks.vue
index 249e333a..f068f555 100644
--- a/src/views/flowManagement/managementOfKeyTasks.vue
+++ b/src/views/flowManagement/managementOfKeyTasks.vue
@@ -39,7 +39,7 @@
         </el-button>
         <el-button
           type="text"
-          v-if="row.approvalStatus == 1 && permissionList.deleteBtn"
+          v-if="(row.approvalStatus == 1||row.approvalStatus ==2) && permissionList.deleteBtn"
           @click="deleteRow(row)"
         >
           删除
@@ -52,75 +52,7 @@
       <template #projectDesiredEnd="scope">
         {{ scope.row.projectDesiredEnd ? scope.row.projectDesiredEnd.substring(0, 10) : '' }}
       </template>
-      <!-- 列表嵌套表格 -->
-      <!-- <template #expand="{ row }">
-        <el-table :data="row.stoneList" size="small" style="padding: 5px">
-          <el-table-column label="里程碑计划" align="center" prop="milestonePlan"></el-table-column>
-          <el-table-column
-            label="里程碑负责人"
-            align="center"
-            prop="milestoneMan"
-            width="100"
-          ></el-table-column>
-          <el-table-column
-            label="里程碑输出物"
-            align="center"
-            prop="outputMaterial"
-            width="100"
-          ></el-table-column>
-          <el-table-column label="里程碑节点" width="110" align="center" prop="milestoneNode">
-            <template #default="scope">
-              {{ scope.row.milestoneNode ? scope.row.milestoneNode.substring(0, 10) : '' }}
-            </template>
-          </el-table-column>
-          <el-table-column align="center" label="执行类型" prop="executeType">
-            <template #default="scope">
-              {{ scope.row.executeTypeText }}
-            </template>
-          </el-table-column>
-          <el-table-column align="center" label="延期时间" prop="delayTime"></el-table-column>
-          <el-table-column
-            align="center"
-            label="核查结果"
-            prop="checkResultTitle"
-          ></el-table-column>
-          <el-table-column align="center" label="核查人" prop="checkMan"></el-table-column>
-          <el-table-column align="center" label="评价等级" prop="gradeTitle"></el-table-column>
-          <el-table-column align="center" label="评价人" prop="gradeMan">
-            <template #default="scope">
-              {{ scope.row.gradeTitle == '待评价' ? '' : scope.row.gradeMan }}
-            </template>
-          </el-table-column>
-          <el-table-column
-            align="center"
-            label="业务领导评价"
-            width="150"
-            prop="evaluate"
-          ></el-table-column>
-          <el-table-column label="操作">
-            <template #default="scope">
-              <el-button
-                type="text"
-                v-if="row.approvalStatus == 3 && scope.row.checkResult == 0"
-                @click="executeRow(row, scope.row)"
-                >执行</el-button
-              >
-              <el-button
-                type="text"
-                v-if="scope.row.checkResult == 1 || scope.row.checkResult == 3"
-                @click="auditRow(row, scope.row)"
-                >核查</el-button
-              >
-              <el-button
-                type="text"
-                v-if="scope.row.gradeTitle == '待评价' && scope.row.checkResult == 2"
-                @click="examineRow(row, scope.row)"
-                >核准</el-button
-              >
-            </template>
-          </el-table-column>
-        </el-table>
-      </template> -->
+     
     </avue-crud>
     <!-- 新增弹窗 -->
     <add-dialog
diff --git a/src/views/flowManagement/milestoneDialog.vue b/src/views/flowManagement/milestoneDialog.vue
index 3a19d921..c9215122 100644
--- a/src/views/flowManagement/milestoneDialog.vue
+++ b/src/views/flowManagement/milestoneDialog.vue
@@ -1,5 +1,12 @@
 <template>
-  <el-dialog :title="title" append-to-body :modelValue="openShow" width="80%" @close="closeDialog" fullscreen>
+  <el-dialog
+    :title="title"
+    append-to-body
+    :modelValue="openShow"
+    width="80%"
+    @close="closeDialog"
+    fullscreen
+  >
     <el-form :model="detailForm" :rules="executeRules" ref="executeForm" label-width="100">
       <el-row>
         <el-col :span="6">
@@ -101,8 +108,9 @@
           <el-form-item
             label="附件:"
             v-if="subTitle == '执行' || subTitle == '核查' || subTitle == '核准'"
+            prop="attachList"
           >
-            <el-upload
+            <!-- <el-upload
               class="upload-demo"
               action="https://jsonplaceholder.typicode.com/posts/"
               :on-preview="handlePreview"
@@ -113,9 +121,32 @@
               :on-exceed="handleExceed"
               :file-list="fileList"
             >
-              <el-button size="small" type="primary">点击上传</el-button>
-              <div slot="tip" class="el-upload__tip">不能上传 exe 附件，且不超过 20M</div>
+              <el-button type="primary">点击上传</el-button>
+              <div>不能上传 exe 附件，且不超过 20M</div>
+            </el-upload> -->
+            <el-upload
+              class="upload-demo"
+              action="/api/blade-resource/oss/endpoint/put-file-attach"
+              :on-success="handleSuccess"
+              :on-remove="handleRemove"
+              multiple
+              :limit="1"
+              :on-exceed="handleExceed"
+              :file-list="fileList"
+              accept=".pdf,.doc,.docx"
+            >
+              <div>
+                <el-button type="primary">点击上传</el-button>
+                <div
+                 
+                  slot="tip"
+                  class="el-upload__tip"
+                >
+                  支持扩展名:.pdf.doc.docx
+                </div>
+              </div>
             </el-upload>
+
             <div v-if="subTitle == '核查' || subTitle == '核准'" class="attachment-list">
               <h4>附件下载</h4>
               <ul>
@@ -131,13 +162,6 @@
         </el-col>
         <el-col :span="14">
           <el-form-item label="核查人:" v-if="subTitle == '执行'">
-            <!-- <el-select v-model="detailForm.userId" clearable filterable @change="handleUserChange">
-              <el-option
-                v-for="item in memberList"
-                :label="item.realName"
-                :value="item.id"
-              ></el-option>
-            </el-select> -->
             <jhSelect
               :value="detailForm.userId"
               @input="val => (detailForm.userId = val)"
@@ -183,13 +207,6 @@
               search-key="id"
               :debounce-time="500"
             />
-            <!-- <el-select v-model="detailForm.userId" clearable filterable>
-              <el-option
-                v-for="item in memberList"
-                :label="item.realName"
-                :value="item.id"
-              ></el-option>
-            </el-select> -->
           </el-form-item>
         </el-col>
         <div v-if="subTitle == '核准'" style="color: #ffc300; margin-bottom: 10px">
@@ -232,10 +249,14 @@
 </template>
 <script>
 import { getRoleUserList } from '@/api/processManagement/taskDispatch';
-import { projectExecute, projectCheck, projectApprove,getProcessDetail } from '@/api/flowManagement/index';
+import {
+  projectExecute,
+  projectCheck,
+  projectApprove,
+  getProcessDetail,
+} from '@/api/flowManagement/index';
 import { getDictionary } from '@/api/system/dict';
 import jhSelect from '@/components/jh-select/index.vue';
-import { id } from 'element-plus/es/locales.mjs';
 export default {
   components: { jhSelect },
   props: {
@@ -261,15 +282,37 @@ export default {
       loadingShow: false,
       openShow: false,
       memberList: [],
-      executeForm: {},
+      executeForm: {
+        attachList:[]
+      },
       executeRules: {
         executeType: [{ required: true, message: '请选择执行类型', trigger: 'blur' }],
         milestoneMemo: [{ required: true, message: '请填写里程碑描述', trigger: 'blur' }],
         evolve: [{ required: true, message: '请填写里程碑进展', trigger: 'blur' }],
         lastPlan: [{ required: true, message: '请填写下一步计划', trigger: 'blur' }],
+        attachList: [
+          {required: true,
+            validator: (rule, value, callback) => {
+              // 如果 subTitle 是 '执行'，则附件必填
+              if (this.subTitle === '执行') {
+                // 检查 fileList 是否为空
+                if (!this.fileList || this.fileList.length === 0) {
+                  callback(new Error('请上传附件'));
+                } else {
+                  callback();
+                }
+              } else {
+                // 其他状态可选填或不校验
+                callback();
+              }
+            },
+            trigger: 'change',
+          },
+        ],
       },
       subTitle: '',
       executeResultList: [],
+      fileList:[],
     };
   },
   mounted() {
@@ -282,9 +325,20 @@ export default {
     this.getRoleUserList();
     this.getExecuteResult();
     this.getDetails();
-
   },
   methods: {
+    handleRemove(file, fileList) {
+      this.fileList = [];
+    },
+    handleSuccess(response, file, fileList) {
+      console.log(response.data, 'response.data.link');
+      // this.ruleForm.attachId = response.data.attachId;
+      
+      this.fileList.push(response.data.link);
+    },
+    handleExceed(files, fileList) {
+      this.$message.error('标准文件只能上传一份');
+    },
     // 获取详情数据
     getDetails() {
       getProcessDetail(this.rowItem.paId).then(res => {
@@ -293,7 +347,7 @@ export default {
           // Object.assign(this.addForm, data);
 
           this.executeForm = res.data.data;
-          
+
           // 安全地处理 memberName 回显
           if (res.data.data.memberName) {
             this.executeForm.memberName = String(res.data.data.memberName)
@@ -310,8 +364,11 @@ export default {
     executeTypeChange() {
       this.detailForm.delayTime = '';
     },
-    handleUserChange(value,item) {
-      this.detailForm.checkMan =item.realName
+    handleUserChange(value, item) {
+      if(item){
+        this.detailForm.checkMan = item.realName;
+      }
+      
     },
     getExecuteResult() {
       getDictionary({ code: 'flow_project_executeResult' }).then(res => {
@@ -339,16 +396,15 @@ export default {
               fmProjectApplication: {
                 // ...this.executeForm,
                 id: this.executeForm.id,
-
               },
-              attachList: this.existingFiles,
+              attachList: this.fileList,
             };
             query_.checkResult = 1;
             // query_.fmProjectApplication.delayTime =
             //   query_.fmProjectApplication.delayTime + ' 00:00:00';
 
-            query_.delayTime=query_.delayTime==''?null:query_.delayTime+ ' 00:00:00';
-            query_.okTime = query_.okTime==''?null:query_.okTime;
+            query_.delayTime = query_.delayTime == '' ? null : query_.delayTime + ' 00:00:00';
+            query_.okTime = query_.okTime == '' ? null : query_.okTime;
             projectExecute(query_)
               .then(res => {
                 this.$message.success('操作成功！');
diff --git a/src/views/inboundOutboundManagement/glassCakeOutbound/index.vue b/src/views/inboundOutboundManagement/glassCakeOutbound/index.vue
index e1b5dfe9..655b48a4 100644
--- a/src/views/inboundOutboundManagement/glassCakeOutbound/index.vue
+++ b/src/views/inboundOutboundManagement/glassCakeOutbound/index.vue
@@ -254,7 +254,7 @@ export default {
             width: 120,
           },
           {
-            label: "物料出库数量",
+            label: "已出库数量",
             prop: "outQty",
             search: false,
             width: 120,
@@ -307,12 +307,12 @@ export default {
             startPlaceholder: "开始时间",
             endPlaceholder: "结束时间",
           },
-          {
-            label: "预计使用时间",
-            prop: "estUseTime",
-            search: false,
-            width: 120,
-          },
+          // {
+          //   label: "预计使用时间",
+          //   prop: "estUseTime",
+          //   search: false,
+          //   width: 120,
+          // },
           {
             label: "创建时间",
             prop: "createTime",
@@ -478,6 +478,12 @@ export default {
       if(this.selectionList.length == 0){
         this.$message.error('请至少选择一条数据')
         return
+      }
+       // 【新增逻辑】检查是否包含已出库的数据 (curStatus === 1)
+      const hasOutbound = this.selectionList.some(item => item.curStatus === 1);
+      if (hasOutbound) {
+        this.$message.warning('已出库的数据不允许删除，请取消选择后重试');
+        return;
       }
       this.$confirm('确定将选择数据删除?', {
         confirmButtonText: '确定',
diff --git a/src/views/processManagement/components/processMainte/dsPartBasicInfo.vue b/src/views/processManagement/components/processMainte/dsPartBasicInfo.vue
index 7f14bc9c..11e9a65a 100644
--- a/src/views/processManagement/components/processMainte/dsPartBasicInfo.vue
+++ b/src/views/processManagement/components/processMainte/dsPartBasicInfo.vue
@@ -699,7 +699,7 @@ export default {
             search: false,
             sortable: true,
             overHidden: true,
-            cell: false,
+            cell: true,
           },
 
           {
diff --git a/src/views/processManagement/components/processMainte/reworkProcessPlanning.vue b/src/views/processManagement/components/processMainte/reworkProcessPlanning.vue
index 908a4dc9..ae788681 100644
--- a/src/views/processManagement/components/processMainte/reworkProcessPlanning.vue
+++ b/src/views/processManagement/components/processMainte/reworkProcessPlanning.vue
@@ -1251,6 +1251,8 @@ export default {
         this.$message.success('保存成功');
         this.craftLoading = false;
         this.getDetails();
+      }).catch(err => {
+        this.craftLoading = false;
       });
     },
   },