From de515561dfbf7625df772a80d960c682e8ba3458 Mon Sep 17 00:00:00 2001
From: zhangdi <1104545947@qq.com>
Date: Mon, 30 Mar 2026 16:52:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E8=89=BA=E7=AE=A1=E7=90=86=E9=97=AE?=
 =?UTF-8?q?=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/api/processManagement/taskProcessing.js   |  2 +-
 src/views/logisticsManagement/siteBasic.vue   | 71 ++++++++++++++-----
 .../components/addTemplateDialog.vue          | 68 +++++++++---------
 .../components/addTestDialog.vue              |  2 +-
 .../processMainte/processPlanning.vue         |  1 +
 .../processMainte/reworkProcessPlanning.vue   | 25 +++----
 6 files changed, 102 insertions(+), 67 deletions(-)

diff --git a/src/api/processManagement/taskProcessing.js b/src/api/processManagement/taskProcessing.js
index b72062e..6d76b6f 100644
--- a/src/api/processManagement/taskProcessing.js
+++ b/src/api/processManagement/taskProcessing.js
@@ -26,7 +26,7 @@ export const completeSet = params => {
 // 查询零件信息  
 export const getPartList = (current, size, params) => {
   return request({
-    url: '/blade-desk/dsPart/getPartList',
+    url: '/blade-desk/dsPart/listNew',
     method: 'get',
     params: {
       ...params,
diff --git a/src/views/logisticsManagement/siteBasic.vue b/src/views/logisticsManagement/siteBasic.vue
index b0fcb83..3898a54 100644
--- a/src/views/logisticsManagement/siteBasic.vue
+++ b/src/views/logisticsManagement/siteBasic.vue
@@ -32,8 +32,12 @@
       </template>
 
       <template #stationStatus="scope">
-        <el-tag v-if="scope.row.stationStatus == '0'" type="success" @click="handleEdit(row)">闲置</el-tag>
-        <el-tag v-if="scope.row.stationStatus == '1'" type="danger" @click="handleEdit(row)">占用</el-tag>
+        <el-tag v-if="scope.row.stationStatus == '0'" type="success" @click="handleEdit(row)"
+          >闲置</el-tag
+        >
+        <el-tag v-if="scope.row.stationStatus == '1'" type="danger" @click="handleEdit(row)"
+          >占用</el-tag
+        >
       </template>
       <template #stationPosition="scope"> {{ scope.row.stationPosition }}楼 </template>
     </avue-crud>
@@ -41,7 +45,7 @@
 </template>
 
 <script>
-import { getStationList,stationUpdate } from '@/api/logisticsManagement/siteBasic';
+import { getStationList, stationUpdate } from '@/api/logisticsManagement/siteBasic';
 export default {
   components: {},
   data() {
@@ -99,13 +103,29 @@ export default {
         align: 'center',
         column: [
           {
-            label: '站点区域',
-            prop: 'stationRegion',
+            label: '作业中心',
+            prop: 'wcName',
             search: false,
             sortable: true,
             span: 12,
             display: false,
           },
+          {
+            label: '作业中心',
+            prop: 'wcId',
+            search: true,
+            sortable: true,
+            span: 12,
+            filterable: true,
+            hide: true,
+            searchOrder: 17,
+            type: 'select',
+            dicUrl: '/api/blade-desk/BA/WorkCenter/listForSelect',
+            props: {
+              label: 'wcName',
+              value: 'id',
+            },
+          },
           {
             label: '作业中心',
             prop: 'wcName',
@@ -130,6 +150,15 @@ export default {
               value: 'id',
             },
           },
+          {
+            label: '站点区域',
+            prop: 'stationRegion',
+            search: false,
+            sortable: true,
+            span: 12,
+            display: false,
+          },
+
           {
             label: '站点名称',
             prop: 'stationName',
@@ -194,24 +223,28 @@ export default {
       // 确定新状态
       const newStatus = row.stationStatus == '0' ? '1' : '0';
       const statusText = newStatus == '0' ? '闲置' : '占用';
-      
+
       this.$confirm(`确定将站点 "${row.stationName}" 设置为${statusText}状态？`, {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning',
-      }).then(() => {
-        row.stationStatus = Number(newStatus);
-        // 调用更新接口
-         stationUpdate(row).then(() => {
-          this.$message.success('状态修改成功');
-          this.onLoad(this.page, this.query);
-         }).catch(err => {
-           this.$message.error('状态修改失败');
-           console.error(err);
-         });
-      }).catch(() => {
-        // 用户取消
-      });
+      })
+        .then(() => {
+          row.stationStatus = Number(newStatus);
+          // 调用更新接口
+          stationUpdate(row)
+            .then(() => {
+              this.$message.success('状态修改成功');
+              this.onLoad(this.page, this.query);
+            })
+            .catch(err => {
+              this.$message.error('状态修改失败');
+              console.error(err);
+            });
+        })
+        .catch(() => {
+          // 用户取消
+        });
     },
     beforeOpenFn(done, type, loading) {
       if (type == 'edit') {
diff --git a/src/views/processManagement/components/addTemplateDialog.vue b/src/views/processManagement/components/addTemplateDialog.vue
index b7367c3..79b8338 100644
--- a/src/views/processManagement/components/addTemplateDialog.vue
+++ b/src/views/processManagement/components/addTemplateDialog.vue
@@ -135,9 +135,9 @@
                 </el-form-item>
               </template>
             </el-table-column>
-            <el-table-column prop="ppsId" label="工序名称" align="left">
+            <el-table-column prop="ppsId" label="工序" align="left">
               <template #header>
-                <span><i style="color: red">*</i>工序名称</span>
+                <span><i style="color: red">*</i>工序</span>
               </template>
               <template #default="scope">
                 <el-form-item
@@ -154,7 +154,7 @@
                   >
                     <el-option
                       v-for="(item, index) in processList"
-                      :label="item.name"
+                      :label="`${item.code}-${item.name}`"
                       :value="item.id"
                     >
                     </el-option>
@@ -179,16 +179,17 @@
                     filterable
                     @change="craftChange(scope.row, scope.$index)"
                   >
-                    <el-option v-for="item in caIdList" :label="item.name" :value="item.id">
+                    <el-option
+                      v-for="item in caIdList"
+                      :label="`${item.code}-${item.name}`"
+                      :value="item.id"
+                    >
                     </el-option>
                   </el-select>
                 </el-form-item>
               </template>
             </el-table-column>
             <el-table-column prop="proDes" label="工序描述" align="left">
-              <template #header>
-                <span><i style="color: red">*</i>工序描述</span>
-              </template>
               <template #default="scope">
                 <el-form-item
                   :prop="`tableData[${scope.$index}].proDes`"
@@ -199,25 +200,6 @@
                 </el-form-item>
               </template>
             </el-table-column>
-            <!-- <el-table-column prop="workHours" label="工时(分钟)" align="left">
-              <template #header>
-                <span><i style="color: red">*</i>工时(分钟)</span>
-              </template>
-              <template #default="scope">
-                <el-form-item
-                  :prop="`tableData[${scope.$index}].workHours`"
-                  :rules="rules.tableData.workHours"
-                  label-width="0"
-                >
-                  <el-input-number
-                    v-model="scope.row.workHours"
-                    controls-position="right"
-                    :min="1"
-                    :max="10"
-                  ></el-input-number>
-                </el-form-item>
-              </template>
-            </el-table-column> -->
 
             <el-table-column prop="partName" label="主工序" align="left">
               <template #header>
@@ -244,9 +226,9 @@
             @selection-change="handleProjectSelectionChange"
           >
             <el-table-column type="selection" width="55"> </el-table-column>
-            <el-table-column prop="trialNo" label="工序号">
+            <el-table-column prop="trialNo" label="项目编码">
               <template #header>
-                <span><i style="color: red">*</i>工序号</span>
+                <span><i style="color: red">*</i>项目编码</span>
               </template>
               <template #default="scope">
                 <el-form-item
@@ -315,9 +297,6 @@
               </template>
             </el-table-column>
             <el-table-column prop="proHours" label="定额工时(分钟)">
-              <template #header>
-                <span><i style="color: red">*</i>定额工时(分钟)</span>
-              </template>
               <template #default="scope">
                 <el-form-item
                   :prop="`tableData2[${scope.$index}].proHours`"
@@ -494,7 +473,6 @@ export default {
         ppsId: [{ required: true, message: '请选择工序代码', trigger: 'blur' }],
         caId: [{ required: true, message: '请选择工艺能力', trigger: 'blur' }],
         workHours: [{ required: true, message: '请输入工时(分钟)', trigger: 'blur' }],
-        proDes: [{ required: true, message: '请输入工序描述', trigger: 'blur' }],
         isMain: [{ required: true, message: '请选择主工序', trigger: 'blur' }],
       },
 
@@ -793,7 +771,7 @@ export default {
                   message: '操作成功!',
                 });
                 this.$emit('closeDialog');
-                this.getDetail()
+                this.getDetail();
               })
               .catch(err => {
                 this.formLoading = false;
@@ -808,7 +786,7 @@ export default {
                   message: '操作成功!',
                 });
                 this.$emit('closeDialog');
-                this.getDetail()
+                this.getDetail();
               })
               .catch(err => {
                 this.formLoading = false;
@@ -895,4 +873,26 @@ export default {
     }
   }
 }
+:deep(.el-tree-node.is-current > .el-tree-node__content) {
+  background-color: rgba(40, 76, 135, 0.9) !important;
+
+  .el-tree-node__label {
+    color: #fff;
+  }
+}
+:deep(.el-tree) {
+  height: auto;
+  padding: 0px 0;
+
+  .el-tree-node__content {
+    height: 26px;
+
+    &:hover {
+      // background-color: #f5f7fa;
+    }
+  }
+  .el-tree-node__label {
+    font-size: 14px;
+  }
+}
 </style>
diff --git a/src/views/processManagement/components/addTestDialog.vue b/src/views/processManagement/components/addTestDialog.vue
index dce46e6..2d1aaa8 100644
--- a/src/views/processManagement/components/addTestDialog.vue
+++ b/src/views/processManagement/components/addTestDialog.vue
@@ -20,7 +20,7 @@
               <el-option
                 v-for="(item, index) in getPartOptions"
                 :key="index"
-                :label="item.partName"
+                :label="item.partCode"
                 :value="item.id"
               />
             </el-select>
diff --git a/src/views/processManagement/components/processMainte/processPlanning.vue b/src/views/processManagement/components/processMainte/processPlanning.vue
index 8184f62..34d7352 100644
--- a/src/views/processManagement/components/processMainte/processPlanning.vue
+++ b/src/views/processManagement/components/processMainte/processPlanning.vue
@@ -163,6 +163,7 @@
                   filterable
                   @change="processChange(scope.row, scope.$index)"
                 >
+                
                   <el-option
                     v-for="(item, index) in processSetOption"
                     :key="index"
diff --git a/src/views/processManagement/components/processMainte/reworkProcessPlanning.vue b/src/views/processManagement/components/processMainte/reworkProcessPlanning.vue
index decb76c..8df7763 100644
--- a/src/views/processManagement/components/processMainte/reworkProcessPlanning.vue
+++ b/src/views/processManagement/components/processMainte/reworkProcessPlanning.vue
@@ -141,7 +141,7 @@
                   <el-option
                     v-for="(item, index) in processSetOption"
                     :key="index"
-                    :label="item.name"
+                    :label="`${item.code}-${item.name}`"
                     :value="item.id"
                   ></el-option>
                 </el-select>
@@ -167,7 +167,7 @@
                   <el-option
                     v-for="(item, index) in craftAbilityOption"
                     :key="index"
-                    :label="item.caName"
+                    :label="`${item.caCode}-${item.caName}`"
                     :value="item.id"
                   ></el-option>
                 </el-select>
@@ -175,9 +175,6 @@
             </template>
           </el-table-column>
           <el-table-column prop="makeMemo" label="工序描述">
-            <template #header>
-              <span><i style="color: red">*</i>工序描述</span>
-            </template>
             <template #default="scope">
               <el-form-item
                 :prop="`tableData1[${scope.$index}].processInfo.makeMemo`"
@@ -302,7 +299,7 @@
                 >
                   <el-option
                     v-for="(item, index) in projectOptions"
-                    :label="item.name"
+                    :label="`${item.code}-${item.name}`"
                     :value="item.id"
                   ></el-option>
                 </el-select>
@@ -327,7 +324,7 @@
                 >
                   <el-option
                     v-for="(item, index) in standardList"
-                    :label="item.name"
+                    :label="`${item.code}-${item.name}`"
                     :value="item.id"
                   ></el-option>
                 </el-select>
@@ -639,7 +636,6 @@ export default {
         proDes: [{ required: true, message: '请选择', trigger: ['change', 'submit'] }],
         proHours: [{ required: true, message: '请输入', trigger: ['change', 'submit'] }],
         cruxProcess: [{ required: true, message: '请选择', trigger: ['change', 'submit'] }],
-        makeMemo: [{ required: true, message: '请选择', trigger: ['change', 'submit'] }],
       },
       formRules2: {
         trialNo: [{ required: true, message: '请输入', trigger: ['change', 'submit'] }],
@@ -761,7 +757,10 @@ export default {
     processChange(row, index) {
       let selectName = this.processSetOption.find(item => item.id == row.processInfo.ppsId);
       this.form1.tableData1[index].processInfo.ppsName = selectName.name;
-      if (this.form1.tableData1[index].processName&&this.form1.tableData1[index].processName.indexOf('涂色标') > -1) {
+      if (
+        this.form1.tableData1[index].processName &&
+        this.form1.tableData1[index].processName.indexOf('涂色标') > -1
+      ) {
         // tsbNum 涂色标个数  tsdNum 涂色带个数   涂箭头个数
         let sum_ = 0;
         if (this.partInfoData.tsbNum) {
@@ -914,7 +913,9 @@ export default {
               label: `${craftInfo?.reworkOrder || '返工单'}`,
               rawData: craftInfo,
               children: processList.map(process => {
-                process.processInfo.cruxProcess = process.processInfo.cruxProcess ? process.processInfo.cruxProcess : process.processInfo.isMain;
+                process.processInfo.cruxProcess = process.processInfo.cruxProcess
+                  ? process.processInfo.cruxProcess
+                  : process.processInfo.isMain;
                 const ppsName =
                   process.processInfo.ppsName ||
                   process.processInfo.name ||
@@ -931,7 +932,7 @@ export default {
 
                 return {
                   ...process,
-                  label: ppsNo+'-'+ppsName,
+                  label: ppsNo + '-' + ppsName,
                   rawData: {
                     partCode: partInfo.partCode,
                     partId: partInfo.id,
@@ -1203,7 +1204,7 @@ export default {
         processMeasuringToolDeleteIds: this.form3.deleteIds, //量具删除id
         processMoldToolDeleteIds: this.form4.deleteIds, //工装删除合集
       };
-      console.log(999999,query_)
+      console.log(999999, query_);
       reworkAuthorizedAccomplish(query_).then(res => {
         this.$message.success('保存成功');
         this.craftLoading = false;