From 9b367d37f9466b1dff327e5cf76a0d8b0e75c5ac Mon Sep 17 00:00:00 2001
From: zhangdi <1104545947@qq.com>
Date: Tue, 21 Apr 2026 11:52:52 +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

---
 .../components/mold/addMoldDailog.vue         |   3 +-
 src/views/orderManagement/planYieIdOrder.vue  |   6 +-
 .../orderManagement/sinTerYieIdOrder.vue      |   8 +-
 .../processMainte/dsPartBasicInfo.vue         |   9 +-
 .../components/processMainte/partDetails.vue  |  46 +++++++-
 .../components/outsourceDialog.vue            |  13 ++-
 .../reworkOrder/index.vue                     |   2 +
 .../basic/components/addEquipment.vue         |   8 +-
 .../basic/equipmentCapacity.vue               |  10 ++
 .../schedulingException/index.vue             |  19 ++--
 .../rbFilePreserve/index.vue                  | 106 ++++++++++--------
 11 files changed, 159 insertions(+), 71 deletions(-)

diff --git a/src/views/orderManagement/components/mold/addMoldDailog.vue b/src/views/orderManagement/components/mold/addMoldDailog.vue
index f8714fd1..e4e1e59a 100644
--- a/src/views/orderManagement/components/mold/addMoldDailog.vue
+++ b/src/views/orderManagement/components/mold/addMoldDailog.vue
@@ -340,8 +340,9 @@ export default {
         this.quaLevelList = res.data.data
       })
     },
+    },
     getUser(){
-      getUserByRoleAlias({roleAlias:'保管员'}).then(res =>{
+      getUserByRoleAlias({roleAlias:'dq_custodian'}).then(res =>{
         this.keeperList = res.data.data
       })
     },
diff --git a/src/views/orderManagement/planYieIdOrder.vue b/src/views/orderManagement/planYieIdOrder.vue
index 8bbba365..067f9140 100644
--- a/src/views/orderManagement/planYieIdOrder.vue
+++ b/src/views/orderManagement/planYieIdOrder.vue
@@ -58,9 +58,9 @@
       <template #demandDate="{ row }">
         {{ row.demandDate ? row.demandDate.substring(0, 10) : '' }}
       </template>
-      <template #releaseDate="{ row }">
+      <!-- <template #releaseDate="{ row }">
         {{ row.releaseDate ? row.releaseDate.substring(0, 10) : '' }}
-      </template>
+      </template> -->
     </avue-crud>
 
     <!-- 加急 -->
@@ -532,7 +532,7 @@ export default {
           },
           {
             label: '计划员',
-            prop: 'planUserName',
+            prop: 'planUser',
             search: false,
             sortable: true,
             width: 120,
diff --git a/src/views/orderManagement/sinTerYieIdOrder.vue b/src/views/orderManagement/sinTerYieIdOrder.vue
index 49a0adb2..ba3bdb55 100644
--- a/src/views/orderManagement/sinTerYieIdOrder.vue
+++ b/src/views/orderManagement/sinTerYieIdOrder.vue
@@ -78,9 +78,9 @@
       <template #demandDate="{ row }">
         {{ row.demandDate ? row.demandDate.substring(0, 10) : '' }}
       </template>
-      <template #releaseDate="{ row }">
+      <!-- <template #releaseDate="{ row }">
         {{ row.releaseDate ? row.releaseDate.substring(0, 10) : '' }}
-      </template>
+      </template> -->
     </avue-crud>
 
     <!-- 加急 -->
@@ -538,7 +538,7 @@ export default {
           },
           {
             label: '需求数量',
-            prop: 'poQty',
+            prop: 'ypQty',
             search: false,
             sortable: true,
             width: 120,
@@ -592,7 +592,7 @@ export default {
           },
           {
             label: '计划员',
-            prop: 'planUserName',
+            prop: 'planUser',
             search: false,
             sortable: true,
             width: 120,
diff --git a/src/views/processManagement/components/processMainte/dsPartBasicInfo.vue b/src/views/processManagement/components/processMainte/dsPartBasicInfo.vue
index abb8a40e..7f14bc9c 100644
--- a/src/views/processManagement/components/processMainte/dsPartBasicInfo.vue
+++ b/src/views/processManagement/components/processMainte/dsPartBasicInfo.vue
@@ -839,11 +839,12 @@ export default {
         let selPart = this.locallyPlatedData.filter(item => {
           return item.partCode == this.formData.partCode;
         });
-        if (selPart.lenght > 0) {
-          if (this.partType == '') {
-            this.formData.goldMark = true;
+        if (selPart.length > 0) {
+            if (this.partType == '热表') {
+              this.formData.goldMark = '1';
+              // this.$set(this.formData, 'goldMark', 1);
+            }
           }
-        }
         // this.formData.isClassCake = true;
       });
     },
diff --git a/src/views/processManagement/components/processMainte/partDetails.vue b/src/views/processManagement/components/processMainte/partDetails.vue
index e2e56f2c..0c6fea14 100644
--- a/src/views/processManagement/components/processMainte/partDetails.vue
+++ b/src/views/processManagement/components/processMainte/partDetails.vue
@@ -204,7 +204,13 @@
                 <el-col :span="24">
                   <el-form-item label="工艺校验:" prop="sinTer">
                     <div style="width: 100%">
-                      <el-checkbox v-model="formData.goldMark" disabled>镀金标识</el-checkbox>
+                      <el-checkbox
+                        v-model="formData.goldMark"
+                        :true-label="'1'"
+                        :false-label="'0'"
+                        disabled
+                        >镀金标识</el-checkbox
+                      >
                       <el-checkbox
                         disabled
                         v-model="formData.markingsTest"
@@ -587,6 +593,8 @@ import {
   getVersion,
   getPlatingList,
   getProject,
+  getLocallyPlatedPartList,
+  getStandardList,
 } from '@/api/processManagement/taskProcessing';
 
 export default {
@@ -631,6 +639,7 @@ export default {
       processLevel: '1',
       rankList: [],
       rank: '2',
+      partType: '',
       priorityList: [
         {
           label: '本次使用',
@@ -795,10 +804,12 @@ export default {
       projectOptions: [],
       standardList: [], //检验标准
       tabLoading: false, //加载状态
+      locallyPlatedData: [], //获取局部镀列表数据
     };
   },
   mounted() {
     this.setCrewShow = this.isOpen;
+    this.getLocallyPlatedPartList();
     if (this.detailsType == 'processPlanning') {
       this.version = this.rowData.partVersion;
       this.partChange(this.rowData.id);
@@ -811,6 +822,13 @@ export default {
     //
   },
   methods: {
+    // 获取局部镀零件列表
+    getLocallyPlatedPartList() {
+      getLocallyPlatedPartList().then(res => {
+        this.locallyPlatedData = res.data.data;
+        console.log(res.data.data, 9898989);
+      });
+    },
     getStandardList() {
       getStandardList().then(res => {
         this.standardList = res.data.data;
@@ -934,7 +952,7 @@ export default {
         // 5. 设置选中状态
         try {
           this.$nextTick(() => {
-            this.currentNodeKey = firstChild.id
+            this.currentNodeKey = firstChild.id;
             this.$refs.tree.setCurrentKey([firstChild.id], false);
           });
         } catch (error) {
@@ -1016,6 +1034,19 @@ export default {
           } else {
             this.partType = '烧结';
           }
+
+          // 如果当前零件号在局部镀金列表里面  镀金标识禁用 this.getLocallyPlatedPartList();
+          let selPart = this.locallyPlatedData.filter(item => {
+            return item.partCode == this.formData.partCode;
+          });
+          
+
+          if (selPart.length > 0) {
+            if (this.partType == '热表') {
+              this.formData.goldMark = '1';
+              // this.$set(this.formData, 'goldMark', 1);
+            }
+          }
         });
       } else if (this.detailsType === 'taskProcessing') {
         let query_ = {};
@@ -1040,6 +1071,17 @@ export default {
               item.totalArea = (item.quota * item.area).toFixed(5); // 保留5位小数（字符串）
             });
           }
+          // 如果当前零件号在局部镀金列表里面  镀金标识禁用 this.getLocallyPlatedPartList();
+          let selPart = this.locallyPlatedData.filter(item => {
+            return item.partCode == this.formData.partCode;
+          });
+          console.log('selPart', selPart);
+          if (selPart.length > 0) {
+            if (this.partType == '热表') {
+              this.formData.goldMark = '1';
+              // this.$set(this.formData, 'goldMark', 1);
+            }
+          }
         });
       }
     },
diff --git a/src/views/productionManagement/components/outsourceDialog.vue b/src/views/productionManagement/components/outsourceDialog.vue
index b33cefc2..dd708f4d 100644
--- a/src/views/productionManagement/components/outsourceDialog.vue
+++ b/src/views/productionManagement/components/outsourceDialog.vue
@@ -18,7 +18,9 @@
       </el-form-item>
     </el-form>
     <el-table :data="outsourceData" @selection-change="handleSelectionChange">
-      <el-table-column align="center" type="selection"></el-table-column>
+      <el-table-column align="center" type="selection" :selectable="checkSelectable" >
+
+      </el-table-column>
       <el-table-column
         align="center"
         label="工序号"
@@ -77,6 +79,15 @@ export default {
     this.getListProProcess();
   },
   methods: {
+     checkSelectable(row, index) {
+      // 示例逻辑：如果 handle 值为 true (或 1, 或特定状态) 则可选
+      // 请根据实际业务逻辑调整判断条件
+      // 假设 handle 为 true 时表示可以转外协/可选
+      return row.handle === true; 
+      
+      // 如果 handle 是其他含义，例如 handle 为 'Y' 时可选：
+      // return row.handle === 'Y';
+    },
     // 获取转外协数据
     getListProProcess() {
       let params = {
diff --git a/src/views/productionManagement/reworkOrder/index.vue b/src/views/productionManagement/reworkOrder/index.vue
index ba0e72b3..9dd5c536 100644
--- a/src/views/productionManagement/reworkOrder/index.vue
+++ b/src/views/productionManagement/reworkOrder/index.vue
@@ -59,6 +59,7 @@ export default {
   components: { updateMakeQty, reworkDetails },
   data() {
     return {
+      loading:false,
       searchCode: '', //返工单号
       updateMakeQtyVisible: false,
       itemData: {},
@@ -332,6 +333,7 @@ export default {
     },
     currentChange(currentPage) {
       this.page.currentPage = currentPage;
+      
       this.onLoad(this.page, this.query);
     },
     sizeChange(pageSize) {
diff --git a/src/views/productionSchedulingPlan/basic/components/addEquipment.vue b/src/views/productionSchedulingPlan/basic/components/addEquipment.vue
index 85803399..e3674c69 100644
--- a/src/views/productionSchedulingPlan/basic/components/addEquipment.vue
+++ b/src/views/productionSchedulingPlan/basic/components/addEquipment.vue
@@ -300,11 +300,11 @@
           </template>
           <template #default="scope">
             <el-form-item
-              :prop="`tableData[${scope.$index}].equipmentSort`"
-              :rules="formRules.equipmentSort"
+              :prop="`tableData[${scope.$index}].equipOrder`"
+              :rules="formRules.equipOrder"
             >
               <el-input-number
-                v-model="scope.row.equipmentSort"
+                v-model="scope.row.equipOrder"
                 style="width: 100%"
                 :min="0"
               ></el-input-number>
@@ -398,7 +398,7 @@ export default {
           { required: true, message: '请选择设备名称/编码', trigger: ['change', 'submit'] },
         ],
         equipType: [{ required: true, message: '请选择设备类型', trigger: ['change', 'submit'] }],
-        equipmentSort: [
+        equipOrder: [
           { required: true, message: '请输入设备排序', trigger: ['change', 'submit'] },
         ],
         craftId: [{ required: true, message: '请选择工艺能力', trigger: ['change', 'submit'] }],
diff --git a/src/views/productionSchedulingPlan/basic/equipmentCapacity.vue b/src/views/productionSchedulingPlan/basic/equipmentCapacity.vue
index 1991a462..347589ce 100644
--- a/src/views/productionSchedulingPlan/basic/equipmentCapacity.vue
+++ b/src/views/productionSchedulingPlan/basic/equipmentCapacity.vue
@@ -149,6 +149,7 @@ export default {
             width: 120,
             disabled: true,
           },
+          
           // {
           //   label: '设备型号',
           //   prop: 'equipNameType',
@@ -185,6 +186,15 @@ export default {
               },
             ],
           },
+          {
+            label: '设备排序',
+            prop: 'equipOrder',
+            search: true,
+            sortable: true,
+            span: 12,
+            width: 120,
+            disabled: true,
+          },
           {
             label: '工序',
             prop: 'processName',
diff --git a/src/views/productionSchedulingPlan/schedulingException/index.vue b/src/views/productionSchedulingPlan/schedulingException/index.vue
index 6e426405..1bdab738 100644
--- a/src/views/productionSchedulingPlan/schedulingException/index.vue
+++ b/src/views/productionSchedulingPlan/schedulingException/index.vue
@@ -29,6 +29,9 @@
         >
         <el-button type="text" size="mini" @click="recoveryFn(scope.row)">恢复</el-button>
       </template>
+       <template #demandDate="{ row }">
+        {{ row.demandDate ? row.demandDate.substring(0, 10) : '' }}
+      </template>
     </avue-crud>
   </basic-container>
 </template>
@@ -191,14 +194,14 @@ export default {
             width: 150,
             span: 12,
           },
-          {
-            label: '产品型号',
-            prop: 'productType',
-            search: false,
-            sortable: true,
-            width: 150,
-            span: 12,
-          },
+          // {
+          //   label: '产品型号',
+          //   prop: 'productType',
+          //   search: false,
+          //   sortable: true,
+          //   width: 150,
+          //   span: 12,
+          // },
           {
             label: '批次号',
             prop: 'batchNo',
diff --git a/src/views/qualityManagement/inspectionArchiving/rbFilePreserve/index.vue b/src/views/qualityManagement/inspectionArchiving/rbFilePreserve/index.vue
index 31df9d6b..df6c56f8 100644
--- a/src/views/qualityManagement/inspectionArchiving/rbFilePreserve/index.vue
+++ b/src/views/qualityManagement/inspectionArchiving/rbFilePreserve/index.vue
@@ -17,8 +17,8 @@
       @size-change="sizeChange"
       @refresh-change="refreshChange"
       @on-load="onLoad"
-      :permission="getPermission"
     >
+      <!-- :permission="getPermission" -->
       <template #menu-left>
         <el-button type="primary" @click="handleAdd">新增</el-button>
       </template>
@@ -26,7 +26,9 @@
         <el-button type="primary" @click="handleImport()">导入</el-button>
       </template> -->
       <template #menu="scope">
-        <el-button type="text" @click="copyClick(scope.row)" v-if="scope.row.status == 2">复制</el-button>
+        <el-button type="text" @click="copyClick(scope.row)" v-if="scope.row.status == 2"
+          >复制</el-button
+        >
         <!-- <el-button
           type="text"
           @click="upgradedVersion(scope.row.rfpId)"
@@ -36,15 +38,24 @@
         <!--  v-if="
             (scope.row.rfpStatus == 1 || scope.row.rfpStatus == 4) && scope.row.approvalStatus != 0
           " -->
-
+        <el-button type="text" @click="rowDel(scope.row)" v-if="scope.row.status == 1"
+          >删除</el-button
+        >
         <el-button type="text" @click="updateStatus(scope.row, 2)" v-if="scope.row.status == 1"
           >发布</el-button
         >
         <el-button type="text" @click="updateStatus(scope.row, 3)" v-if="scope.row.status == 2"
           >作废</el-button
         >
-        <el-button type="text" @click="templatePreserve(scope.row)" v-if="scope.row.status != 3">维护电子档案</el-button>
-        <el-button type="text" @click="detailClick(scope.row)">电子档案详情</el-button>
+        <el-button type="text" @click="templatePreserve(scope.row)" v-if="scope.row.status == 2"
+          >维护电子档案</el-button
+        >
+        <el-button
+          type="text"
+          @click="detailClick(scope.row)"
+          v-if="scope.row.status == 2 || scope.row.status == 3"
+          >电子档案详情</el-button
+        >
       </template>
       <template #line="{ row }">
         <el-tag v-if="row.line == 1">线上</el-tag>
@@ -94,7 +105,7 @@ import {
   editRecords,
   deleteRecords,
   copyData,
-  updateStatus
+  updateStatus,
 } from '@/api/qualityManagement/inspectionArchiving/rbFilePreserve';
 import { mapGetters } from 'vuex';
 import detailRb from './detailRb2.vue';
@@ -140,9 +151,9 @@ export default {
         index: true,
         selection: false,
         viewBtn: false,
-        editBtn: true,
+        editBtn: false,
         addBtn: false,
-        delBtn: true,
+        delBtn: false,
         editBtnText: '修改',
         delBtnText: '删除',
         viewBtnText: '详情',
@@ -213,6 +224,7 @@ export default {
             span: 24,
             type: 'select',
             filterable: true,
+            hide: true,
             remote: true,
             dicUrl: `/api/blade-desk/bsProcessSet/list?name={{key}}`,
             props: {
@@ -228,6 +240,14 @@ export default {
               },
             ],
           },
+          {
+            label: '工序',
+            prop: 'ppsName',
+            search: false,
+            sortable: true,
+            filter: true,
+            span: 24,
+          },
           // {
           //   label: '线上/线下',
           //   prop: 'line',
@@ -295,33 +315,33 @@ export default {
             //   value: 'dictKey',
             // }
           },
-          {
-            label: '审批状态',
-            prop: 'approvalStatus',
-            search: true,
-            sortable: true,
-            filter: true,
-            type: 'select',
+          // {
+          //   label: '审批状态',
+          //   prop: 'approvalStatus',
+          //   search: true,
+          //   sortable: true,
+          //   filter: true,
+          //   type: 'select',
 
-            dicData: [
-              {
-                label: '新建',
-                value: 0,
-              },
-              {
-                label: '发布',
-                value: 1,
-              },
-              {
-                label: '使用中',
-                value: 2,
-              },
-              {
-                label: '废弃',
-                value: 3,
-              },
-            ],
-          },
+          //   dicData: [
+          //     {
+          //       label: '新建',
+          //       value: 0,
+          //     },
+          //     {
+          //       label: '发布',
+          //       value: 1,
+          //     },
+          //     {
+          //       label: '使用中',
+          //       value: 2,
+          //     },
+          //     {
+          //       label: '废弃',
+          //       value: 3,
+          //     },
+          //   ],
+          // },
         ],
       },
 
@@ -335,27 +355,25 @@ export default {
 
   mounted() {},
   methods: {
-    updateStatus(row,type) {
-      this.$confirm(`即将对此模板进行${type==2?'发布':'作废'}, 是否继续?`, '提示', {
+    updateStatus(row, type) {
+      this.$confirm(`即将对此模板进行${type == 2 ? '发布' : '作废'}, 是否继续?`, '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning',
       })
         .then(() => {
           updateStatus({
-            id:row.id,
-            status:type
-          }).then((res) => { 
+            id: row.id,
+            status: type,
+          }).then(res => {
             this.$message({
-              message:'操作成功',
+              message: '操作成功',
               type: 'success',
             });
-            this.onLoad(this.page, this.query)
+            this.onLoad(this.page, this.query);
           });
         })
-        .catch(() => {
-         
-        });
+        .catch(() => {});
     },
 
     // 点击导入按钮