2026-01-14

优化

src/views/modules/shopOrder/productionReport/searchSfdcRollsReport.vue

@@ -79,6 +79,23 @@
                 <el-input v-model="searchData.consumeItemNo" placeholder="请输入" clearable></el-input>
               </el-form-item>
             </el-col>
+            <el-col :span="4">
+              <el-form-item label="卷标签">
+                <el-input v-model="searchData.rollNo" placeholder="请输入" clearable></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="4">
+              <el-form-item label="标签类型">
+                <el-select v-model="searchData.rollType" placeholder="请选择" clearable style="width: 100%">
+                  <el-option label="删除卷" value="删除卷"></el-option>
+                  <el-option label="下道流转" value="下道流转"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <!-- 第三行：创建日期 -->
+          <el-row :gutter="16">
             <el-col :span="8">
               <el-form-item label="创建日期">
                 <div style="display: flex; align-items: center;">
@@ -507,13 +524,15 @@ import labelPrintTemplates from '@/mixins/labelPrintTemplates.js';
           date1:'',
           date2:'',
           userName: this.$store.state.user.name,
-          createdDate2: null,
-          createdDate3: null,
+          createdDate2: this.dayjs().format('YYYY-MM-DD'),
+          createdDate3: this.dayjs().format('YYYY-MM-DD'),
           createdOpsSeqNo: '',
           createdOpsItemNo: '',
           consumeOrderNo: '',
           consumeSeqNo: '',
           consumeItemNo: '',
+          rollNo: '',
+          rollType: '',
         },
         dataList:[],
         dataListLoading: false,
@@ -563,7 +582,7 @@ import labelPrintTemplates from '@/mixins/labelPrintTemplates.js';
             sortLv: 0,
             status: true,
             fixed: '',
-            columnWidth: 120
+            columnWidth: 180
           },
           {
             userId: this.$store.state.user.name,
@@ -961,6 +980,24 @@ import labelPrintTemplates from '@/mixins/labelPrintTemplates.js';
             fixed: '',
             columnWidth: 130
           },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 104003007,
+            serialNumber: '104003007TableSfdcRollsRollType',
+            tableId: "104003007Table",
+            tableName: "订单产出标签报表",
+            columnProp: "rollType",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "标签类型",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 80
+          },
           {
             userId: this.$store.state.user.name,
             functionId: 104003007,
@@ -995,7 +1032,7 @@ import labelPrintTemplates from '@/mixins/labelPrintTemplates.js';
         this.$nextTick(() => {
           const windowHeight = window.innerHeight;
           // 根据搜索条件展开状态动态计算
-          const headerHeight = this.searchExpanded ? 280 : 158;
+          const headerHeight = this.searchExpanded ? 332 : 158;
           this.tableHeight = windowHeight - headerHeight - 85;
         });
       },
@@ -1797,7 +1834,7 @@ import labelPrintTemplates from '@/mixins/labelPrintTemplates.js';
 
 /* 选项样式优化 */
 /deep/ .el-select-dropdown__item {
-  padding: 10px 20px;
+  padding: 0px 20px;
   transition: all 0.2s;
 
   &:hover {

src/views/modules/warehouse/labelTransactionLog.vue

@@ -62,11 +62,18 @@
                 <el-input v-model="searchData.partNo" clearable placeholder="请输入"></el-input>
               </el-form-item>
             </el-col>
+            <el-col :span="4">
+              <el-form-item label="物料名称">
+                <el-input v-model="searchData.partDesc" clearable placeholder="请输入"></el-input>
+              </el-form-item>
+            </el-col>
             <el-col :span="4">
               <el-form-item label="规格型号">
-                <el-input v-model="searchData.partSpec" clearable placeholder="请输入"></el-input>
+                <el-input v-model="searchData.spec" clearable placeholder="请输入"></el-input>
               </el-form-item>
             </el-col>
+          </el-row>
+          <el-row :gutter="16">
             <el-col :span="4">
               <el-form-item label="传输状态">
                 <el-select v-model="searchData.syncedFlag" placeholder="请选择" clearable style="width: 100%">
@@ -75,8 +82,6 @@
                 </el-select>
               </el-form-item>
             </el-col>
-          </el-row>
-          <el-row :gutter="16">
             <el-col :span="4">
               <el-form-item label="通知单号">
                 <el-input v-model="searchData.documentNo" clearable placeholder="请输入"></el-input>
@@ -171,6 +176,8 @@
       <el-table-column prop="rollQty" label="变动数量" header-align="center" align="right" width="100"></el-table-column>
       <el-table-column prop="batchNo" label="合约号码" header-align="center" align="left" min-width="150" show-overflow-tooltip></el-table-column>
       <el-table-column prop="partNo" label="物料编码" header-align="center" align="left" min-width="150" show-overflow-tooltip></el-table-column>
+      <el-table-column prop="partDesc" label="物料名称" header-align="center" align="left" min-width="180" show-overflow-tooltip></el-table-column>
+      <el-table-column prop="spec" label="规格型号" header-align="center" align="left" min-width="120" show-overflow-tooltip></el-table-column>
       <el-table-column prop="warehouseId" label="仓库编码" header-align="center" align="center" width="100"></el-table-column>
       <el-table-column prop="warehouseName" label="仓库名称" header-align="center" align="left" min-width="120" show-overflow-tooltip></el-table-column>
       <el-table-column prop="locationId" label="库位编码" header-align="center" align="center" width="100"></el-table-column>
@@ -217,7 +224,8 @@ export default {
         documentType: '',
         rollNo: '',
         partNo: '',
-        partSpec: '',
+        partDesc: '',
+        spec: '',
         transactionDateRange: [],
         documentNo: '',
         orderNo: '',
@@ -317,7 +325,8 @@ export default {
         documentType: this.activeTab === 'all' ? this.searchData.documentType : this.activeTab,
         rollNo: this.searchData.rollNo,
         partNo: this.searchData.partNo,
-        partSpec: this.searchData.partSpec,
+        partDesc: this.searchData.partDesc,
+        spec: this.searchData.spec,
         startDate: this.searchData.transactionDateRange && this.searchData.transactionDateRange[0] ? this.searchData.transactionDateRange[0] : '',
         endDate: this.searchData.transactionDateRange && this.searchData.transactionDateRange[1] ? this.searchData.transactionDateRange[1] : '',
         documentNo: this.searchData.documentNo,
@@ -352,7 +361,8 @@ export default {
         documentType: '',
         rollNo: '',
         partNo: '',
-        partSpec: '',
+        partDesc: '',
+        spec: '',
         transactionDateRange: [],
         documentNo: '',
         orderNo: '',

src/views/modules/yieldReport/com_process_inspection.vue

@@ -1033,6 +1033,10 @@ export default {
     buNo: {
       type: String,
       default: ''
+    },
+    rollNo: {
+      type: String,
+      default: ''
     }
   },
   data() {
@@ -1763,12 +1767,15 @@ export default {
 
     // 新增弹窗
     addModal() {
+      // 判断是否有当前卷号（排除"暂无卷号"的情况）
+      const hasCurrentRollNo = this.rollNo && this.rollNo !== '' && this.rollNo !== '暂无卷号';
+      
       this.modalData = {
         flag: '1',
         site: '',
         bu: this.userBuList.length > 0 ? this.userBuList[0].buNo : '',
-        rollNo: '',
-        seqNo: '',
+        rollNo: hasCurrentRollNo ? this.rollNo : '',
+        seqNo: hasCurrentRollNo ? '' : this.seqNo,
         orderNo: '',
         operationDesc: '',
         operationNo: '',
@@ -1794,6 +1801,17 @@ export default {
       this.operationList = []
       this.checked = false
       this.modalFlag = true
+      
+      // 打开弹窗后自动查询信息
+      this.$nextTick(() => {
+        if (hasCurrentRollNo) {
+          // 有当前卷号，通过标签号查询信息
+          this.rollNoEnter();
+        } else if (this.seqNo && this.seqNo !== '') {
+          // 没有当前卷号但有派工单号，通过派工单号查询信息
+          this.seqNoDirectSearch();
+        }
+      });
     },
 
     // BU变化事件
@@ -1955,6 +1973,38 @@ export default {
       this.seqInfoList = []
     },
 
+    // 派工单号直接查询（新增时自动调用）
+    seqNoDirectSearch() {
+      if (!this.modalData.seqNo) return;
+      
+      let tempData = {
+        bu: this.modalData.bu,
+        seqNo: this.modalData.seqNo,
+        orderNo: '',
+        sku: '',
+        partDesc: '',
+        partNo: '',
+        operationDesc: '',
+        status: ''
+      }
+      searchSeqInfo(tempData).then(({data}) => {
+        if (data && data.code === 0 && data.rows && data.rows.length > 0) {
+          // 自动选取第一条记录并赋值
+          const row = data.rows[0];
+          this.modalData.seqNo = row.seqno || row.seqNo;
+          this.modalData.orderNo = row.orderno || row.orderNo;
+          this.modalData.partNo = row.partNo;
+          this.modalData.partDesc = row.partDesc;
+          this.modalData.sku = row.sku;
+          this.modalData.operationDesc = row.operationDesc;
+          this.modalData.sjzs = row.sjzs;
+          this.getOperationList();
+        }
+      }).catch(() => {
+        // 查询失败静默处理
+      });
+    },
+
     // 无工单检验变化
     changeSpecialTask() {
       // 先重置数据

src/views/modules/yieldReport/com_produce_report_normal.vue

@@ -744,7 +744,7 @@
                           @refreshPageData="refreshPageData"></ComMalformedMaterial>
 
     <!-- 过程检验组件 -->
-    <ComProcessInspection :visible.sync="showProcessInspectionFlag" :orderNo="scheduleData.orderNo" :resourceId="scheduleData.resourceId" :seqNo="scheduleData.seqNo" :site="scheduleData.site" :buNo="scheduleData.buNo"></ComProcessInspection>
+    <ComProcessInspection :visible.sync="showProcessInspectionFlag" :orderNo="scheduleData.orderNo" :resourceId="scheduleData.resourceId" :seqNo="scheduleData.seqNo" :site="scheduleData.site" :buNo="scheduleData.buNo" :rollNo="scheduleData.rollNo"></ComProcessInspection>
 
     <!-- MRB异常单登记组件 -->
     <ComMrbRegister ref="comMrbRegister" :visible.sync="showMrbRegisterFlag" @confirmed="onMrbConfirmed"></ComMrbRegister>