From 57f3761c0b7bbe57e3c6ec826cee66f97628ab2d Mon Sep 17 00:00:00 2001
From: zhangdi <1104545947@qq.com>
Date: Wed, 25 Mar 2026 16:14:42 +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

---
 .../processManagement/procepssPlanning.vue    | 15 +++--
 src/views/processManagement/sinTer/index.vue  | 19 +++++--
 .../components/outsourceDialog.vue            |  4 +-
 .../productionMonitoring/index.vue            | 55 +++++++------------
 .../basic/components/addEquipment.vue         | 10 ++--
 .../basic/equipmentCapacity.vue               |  1 -
 6 files changed, 53 insertions(+), 51 deletions(-)

diff --git a/src/views/processManagement/procepssPlanning.vue b/src/views/processManagement/procepssPlanning.vue
index 59f2836..e12cffd 100644
--- a/src/views/processManagement/procepssPlanning.vue
+++ b/src/views/processManagement/procepssPlanning.vue
@@ -25,7 +25,7 @@
         <el-button type="primary" @click="setIndate()">有效期维护</el-button>
       </template>
       <template #partCode="scope"> 
-          <el-button type="text" @click="openPage(scope.row)">{{scope.row.partCode}}</el-button>
+          <span class="partSel" @dblclick="openPage(scope.row)">{{scope.row.partCode}}</span>
       </template>
 
       <!-- <template #menu-right="{ size }"> </template> -->
@@ -107,7 +107,7 @@ export default {
         tip: false,
         simplePage: true,
         searchShow: true,
-        searchMenuSpan: 18,
+        searchMenuSpan: 6,
         searchIcon: true,
         searchIndex: 3,
         tree: false,
@@ -148,7 +148,7 @@ export default {
           {
             label: '零件号',
             prop: 'partCode',
-            search: false,
+            search: true,
             sortable: true,
             overHidden: true,
             width: 210,
@@ -160,7 +160,7 @@ export default {
             label: '零件名称',
             prop: 'partName',
             sortable: true,
-            search: false,
+            search: true,
             overHidden: true,
             width: 170,
             headerAlign: 'center',
@@ -348,3 +348,10 @@ export default {
   },
 };
 </script>
+<style lang="scss" scoped>
+.partSel{
+  cursor: pointer;
+  color:#284c89 !important;
+  font-weight: 600;
+}
+</style>
diff --git a/src/views/processManagement/sinTer/index.vue b/src/views/processManagement/sinTer/index.vue
index 5e7367b..2acdb8f 100644
--- a/src/views/processManagement/sinTer/index.vue
+++ b/src/views/processManagement/sinTer/index.vue
@@ -31,7 +31,8 @@
 
     <div class="form-box">
       <div v-if="isComponentOpen">
-        <div class="form-bom" ref="lineChart"></div>
+        <div v-if="dataTree.length > 0" class="form-bom" ref="lineChart"></div>
+        <el-empty v-else description="数据为空"></el-empty>
       </div>
       <div v-if="isSubOpen">
         <avue-crud
@@ -163,6 +164,7 @@ export default {
       isSubOpen: false,
       isComponentOpen: false,
       data: [],
+      dataTree: [],
     };
   },
   methods: {
@@ -190,6 +192,7 @@ export default {
         this.isSubOpen = false;
         getDsPartTree({ partCode: this.form.bujian, zPartCode: this.form.zijian }).then(res => {
           let resData = res.data.data;
+          this.dataTree = res.data.data;
           let arr = JSON.parse(JSON.stringify(resData).replace(/partName/g, 'name'));
           this.$nextTick(() => {
             this.createBarChart(arr);
@@ -201,8 +204,6 @@ export default {
         this.isComponentOpen = false;
       }
     },
-    // 获取组织树
-
     // 获取子件列表
 
     resetFn() {
@@ -240,6 +241,7 @@ export default {
               borderWidth: 2,
               borderColor: '#fff',
               borderRadius: 4, // 圆角半径，值越大圆角越明显
+              paddingLeft: 10,
             },
             // 动态计算节点大小：宽度=最长文本宽度，高度=行数*行高+内边距
             symbolSize: (val, params) => {
@@ -247,9 +249,18 @@ export default {
               const nodeName = params?.name || '未知节点';
               const childCount = params?.children?.length || 0;
               const childText = `${childCount}个子件`;
+              const nodeQuota = nodeData?.quota !== undefined ? nodeData.quota : '';
+
               // 计算文本宽度
               const textWidth = Math.max(nodeName.length * 12, childText.length * 12) + 30;
-              return [Math.max(textWidth, 100), 60]; // 高度设为60px（适配两行文本）
+              // 动态计算行数
+              let lineCount = 2; // 默认 2 行（partCode + name）
+              if (nodeQuota !== '' && nodeQuota !== null) {
+                lineCount = 3; // 有 quota 时 3 行
+              }
+              // 计算高度：每行 20px + 上下内边距 20px
+              const height = lineCount * 20 + 10;
+              return [Math.max(textWidth, 100), height]; // 高度设为60px（适配两行文本）
             },
 
             label: {
diff --git a/src/views/productionManagement/components/outsourceDialog.vue b/src/views/productionManagement/components/outsourceDialog.vue
index fdc8d00..6513332 100644
--- a/src/views/productionManagement/components/outsourceDialog.vue
+++ b/src/views/productionManagement/components/outsourceDialog.vue
@@ -142,7 +142,9 @@ export default {
         this.$message.error('当前数据列表为空');
         return;
       }
-
+      this.itemData.forEach(item=>{
+        item.runType = 1
+      })
       let query={
         workOrderRuns:this.itemData,
         workPlanRuns:this.outsourceData
diff --git a/src/views/productionManagement/productionMonitoring/index.vue b/src/views/productionManagement/productionMonitoring/index.vue
index a52f222..4616832 100644
--- a/src/views/productionManagement/productionMonitoring/index.vue
+++ b/src/views/productionManagement/productionMonitoring/index.vue
@@ -37,46 +37,22 @@
             <el-button type="text" @click="printCraftCard_new(scope.row)">流程卡</el-button>
           </el-col>
           <el-col :span="6" v-if="scope.row.runStatus === 2">
-            <el-button type="text" @click="priorityFn(scope.row)" 
-              >优先级</el-button
-            >
+            <el-button type="text" @click="priorityFn(scope.row)">优先级</el-button>
           </el-col>
-          <el-col :span="6"  v-if="[2, 3, 4, 6].includes(scope.row.runStatus)">
-            <el-button
-              type="text"
-              @click="handleBatches(scope.row)"
-             
-              >分批</el-button
-            >
+          <el-col :span="6" v-if="[2, 3, 4, 6].includes(scope.row.runStatus)">
+            <el-button type="text" @click="handleBatches(scope.row)">分批</el-button>
           </el-col>
           <el-col :span="6" v-if="scope.row.runStatus === 3 || scope.row.runStatus === 4">
-            <el-button
-              type="text"
-              @click="handleAbnormal(scope.row)"
-              
-              >异常申报</el-button
-            >
+            <el-button type="text" @click="handleAbnormal(scope.row)">异常申报</el-button>
           </el-col>
           <el-col :span="6" v-if="scope.row.runStatus <= 6 && scope.row.runStatus !== 5">
-            <el-button
-              type="text"
-              @click="handleOutsource(scope.row)"
-              
-              >转外协</el-button
-            >
+            <el-button type="text" @click="handleOutsource(scope.row)">转外协</el-button>
           </el-col>
           <el-col :span="6" v-if="scope.row.runStatus <= 6 && scope.row.runStatus !== 5">
-            <el-button
-              type="text"
-              @click="handleSintering(scope.row)"
-              
-              >转烧结</el-button
-            >
+            <el-button type="text" @click="handleSintering(scope.row)">转烧结</el-button>
           </el-col>
           <el-col :span="6" v-if="scope.row.runStatus < 15">
-            <el-button type="text" @click="handleClose(scope.row)" 
-              >关闭</el-button
-            >
+            <el-button type="text" @click="handleClose(scope.row)">关闭</el-button>
           </el-col>
         </el-row>
       </template>
@@ -191,7 +167,7 @@ export default {
       option: {
         height: 'auto',
         calcHeight: 32,
-        rowKey: 'cardNo',
+        rowKey: 'woId',
         tip: false,
         simplePage: true,
         searchShow: true,
@@ -341,7 +317,7 @@ export default {
             sortable: true,
             overHidden: true,
             width: 150,
-            searchOrder:19,
+            searchOrder: 19,
           },
           {
             label: '批次号',
@@ -350,7 +326,7 @@ export default {
             sortable: true,
             overHidden: true,
             width: 150,
-            searchOrder:18,
+            searchOrder: 18,
           },
           {
             label: '流程卡号',
@@ -359,7 +335,7 @@ export default {
             sortable: true,
             overHidden: true,
             width: 150,
-            searchOrder:20,
+            searchOrder: 20,
           },
           {
             label: '产品型号',
@@ -658,7 +634,6 @@ export default {
     handleClose(row) {
       this.itemData = [row];
       this.showClose = true;
-
     },
 
     // 转烧结
@@ -698,6 +673,14 @@ export default {
     submitPrint() {
       this.$refs.printForm.validate(valid => {
         if (valid) {
+          let ids = this.selectionList.map(item => item.woId);
+          window.open(
+            window.PROCESS_FLOW_CARD_PRINT +
+              '?wolds' +
+              ids.join(',') +
+              '&num=' +
+              this.printForm.quantity
+          );
           this.printDialog = false;
         }
       });
diff --git a/src/views/productionSchedulingPlan/basic/components/addEquipment.vue b/src/views/productionSchedulingPlan/basic/components/addEquipment.vue
index 158c063..878172f 100644
--- a/src/views/productionSchedulingPlan/basic/components/addEquipment.vue
+++ b/src/views/productionSchedulingPlan/basic/components/addEquipment.vue
@@ -113,13 +113,13 @@
           </template>
         </el-table-column>
         <el-table-column align="center" label="工序" width="150">
-          <template #header>
+          <!-- <template #header>
             <span><i style="color: red">*</i>工序</span>
-          </template>
+          </template> :rules="formRules.processId"-->
           <template #default="scope">
             <el-form-item
               :prop="`tableData[${scope.$index}].processId`"
-              :rules="formRules.processId"
+              
             >
               <el-select
                 v-model="scope.row.processId"
@@ -567,7 +567,7 @@ export default {
       this.form.tableData[index].abilityList.push({
         startNum: null,
         endNum: null,
-        standardTime: null,
+        standardProcessAbility: null,
       });
       this.onAbilityChange(index);
     },
@@ -611,7 +611,7 @@ export default {
         _select: false, // 选择状态
         partType: 0,
         standardProcessAbility: null,
-        abilityList: [{ startNum: null, endNum: null, standardTime: null }],
+        abilityList: [{ startNum: null, endNum: null, standardProcessAbility: null }],
       });
     },
 
diff --git a/src/views/productionSchedulingPlan/basic/equipmentCapacity.vue b/src/views/productionSchedulingPlan/basic/equipmentCapacity.vue
index 411703e..1991a46 100644
--- a/src/views/productionSchedulingPlan/basic/equipmentCapacity.vue
+++ b/src/views/productionSchedulingPlan/basic/equipmentCapacity.vue
@@ -372,7 +372,6 @@ export default {
       for (let i = 0; i < this.spanArr.length; i++) {
         const ele = this.spanArr[i];
         if (column.property == ele.prop) {
-          console.log(8989, column, ele);
           const _row = ele.span[rowIndex];
           // 如果 span 数据不存在或为 0，返回默认值
           if (_row === undefined || _row === 0) {