From a28101838d69c99d8ec30700b4d4953091562448 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Thu, 15 Jan 2026 12:54:06 +0800
Subject: [PATCH] =?UTF-8?q?2026-01-15=20=E7=89=A9=E6=96=99=E6=A1=A3?=
 =?UTF-8?q?=E6=A1=88=E7=AE=A1=E7=90=86=EF=BC=8C=E6=A0=87=E7=AD=BE=E6=A8=A1?=
 =?UTF-8?q?=E7=89=88=E8=AE=BE=E7=BD=AE=E9=A1=B5=E7=AD=BE=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E5=B7=A5=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/qc/qcPartAttribute.vue | 31 +++++++++++++++++++++---
 1 file changed, 28 insertions(+), 3 deletions(-)

diff --git a/src/views/modules/qc/qcPartAttribute.vue b/src/views/modules/qc/qcPartAttribute.vue
index 33762b5..6357af2 100644
--- a/src/views/modules/qc/qcPartAttribute.vue
+++ b/src/views/modules/qc/qcPartAttribute.vue
@@ -1251,7 +1251,7 @@
     </el-dialog>
 
     <!-- 标签模版设置新增 -->
-    <el-dialog title="标签模版设置" :close-on-click-modal="false" v-drag :visible.sync="labelTemplateModal" width="490px">
+    <el-dialog title="标签模版设置" :close-on-click-modal="false" v-drag :visible.sync="labelTemplateModal" width="380px">
       <el-form :inline="true" label-position="top" :model="labelTemplateData" style="margin-left: 7px;margin-top: -5px;">
         <el-form-item>
           <span v-if="labelTemplateDisableFlag" slot="label">标签类型</span>
@@ -1259,12 +1259,19 @@
           <el-input v-model="labelTemplateData.labelTypeTb" :disabled="labelTemplateDisableFlag" @change="labelTemplateBlur(1099)" style="width: 100px"></el-input>
           <el-input v-model="labelTemplateData.labelType" disabled style="width: 230px"></el-input>
         </el-form-item>
-        <el-form-item label=" ">
+      </el-form>
+      <el-form :inline="true" label-position="top" :model="labelTemplateData" style="margin-left: 7px;">
+        <el-form-item label="默认标识">
           <el-select v-model="labelTemplateData.defaultFlag" style="width: 100px">
             <el-option label="默认" value="1"></el-option>
             <el-option label="非默认" value="0"></el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="工序" style="margin-left: -10px">
+          <el-select v-model="labelTemplateData.operationDesc" placeholder="请选择工序" filterable clearable style="width: 230px">
+            <el-option v-for="item in operationDescList" :key="item" :label="item" :value="item"></el-option>
+          </el-select>
+        </el-form-item>
       </el-form>
       <el-footer style="height:35px;margin-top: 15px;text-align:center">
         <el-button type="primary" @click="saveLabelTemplate()">保存</el-button>
@@ -1450,6 +1457,7 @@
           partNo: '',
           labelTypeTb: '',
           labelType: '',
+          operationDesc: '',
           defaultFlag: '',
           createBy: '',
         },
@@ -1936,6 +1944,19 @@
             fixed: '',
             columnWidth: 120,
           },
+          {
+            columnProp: 'operationDesc',
+            headerAlign: "center",
+            align: "left",
+            columnLabel: '工序',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 120,
+          },
           {
             columnProp: 'defaultFlagDesc',
             headerAlign: "center",
@@ -2170,7 +2191,7 @@
       // 获取工序列表
       loadOperationDescList() {
         const params = {
-          site: this.modalData.site
+          site: this.partCurrentRow.site || this.modalData.site
         }
         getAllOperationDescList(params).then(({data}) => {
           if (data && data.code === 0) {
@@ -3065,9 +3086,11 @@
           partNo: this.partCurrentRow.partNo,
           labelTypeTb: '',
           labelType: '',
+          operationDesc: '',
           defaultFlag: '',
           createdBy: this.$store.state.user.name,
         }
+        this.loadOperationDescList()
         this.labelTemplateModal = true
         this.labelTemplateDisableFlag = false
       },
@@ -3081,8 +3104,10 @@
           partNo: row.partNo,
           labelTypeTb: row.labelTypeTb,
           labelType: row.labelType,
+          operationDesc: row.operationDesc || '',
           defaultFlag: row.defaultFlag,
         }
+        this.loadOperationDescList()
         this.labelTemplateModal = true
         this.labelTemplateDisableFlag = true
       },