2026-01-15

优化

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

@@ -51,19 +51,29 @@
               </el-form-item>
             </el-col>
             <el-col :span="4">
-              <el-form-item label="操作员ID">
-                <el-input v-model="searchData.operatorID" placeholder="请输入" clearable></el-input>
+              <el-form-item label="规格型号">
+                <el-input v-model="searchData.spec" placeholder="请输入" clearable></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="4">
-              <el-form-item label="加工中心">
-                <el-input v-model="searchData.workCenterNo" placeholder="请输入" clearable></el-input>
+              <el-form-item label="操作员ID">
+                <el-input v-model="searchData.operatorID" placeholder="请输入" clearable></el-input>
               </el-form-item>
             </el-col>
           </el-row>
 
           <!-- 第二行 -->
           <el-row :gutter="16">
+            <el-col :span="4">
+              <el-form-item label="加工中心编码">
+                <el-input v-model="searchData.workCenterNo" placeholder="请输入" clearable></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="4">
+              <el-form-item label="加工中心名称">
+                <el-input v-model="searchData.workCenterDesc" placeholder="请输入" clearable></el-input>
+              </el-form-item>
+            </el-col>
             <el-col :span="4">
               <el-form-item label="派工机台">
                 <el-input v-model="searchData.sResourceID" placeholder="请输入" clearable></el-input>
@@ -193,8 +203,10 @@ export default {
         operatorID: '',
         sResourceID: '',
         workCenterNo: '',
+        workCenterDesc: '',
         date1: '',
         date2: '',
+        spec: '',
         user: this.$store.state.user.name
       },
       dataList: [],
@@ -204,12 +216,12 @@ export default {
       tableHeight: 400,
       exportName: "产线产量报告" + this.dayjs().format('YYYYMMDDHHmmss'),
       columnList: [
-        { columnProp: "reportDate", columnLabel: "报告日期", columnWidth: 100, headerAlign: "center", align: "center" },
+        { columnProp: "reportDate", columnLabel: "报告日期", columnWidth: 130, headerAlign: "center", align: "center" },
         { columnProp: "workCenterNo", columnLabel: "加工中心", columnWidth: 80, headerAlign: "center", align: "left" },
         { columnProp: "workCenterDesc", columnLabel: "加工中心名称", columnWidth: 120, headerAlign: "center", align: "left" },
         { columnProp: "operatorID", columnLabel: "操作员", columnWidth: 80, headerAlign: "center", align: "left" },
         { columnProp: "operatorName", columnLabel: "姓名", columnWidth: 80, headerAlign: "center", align: "left" },
-        { columnProp: "orderNo", columnLabel: "订单号", columnWidth: 100, headerAlign: "center", align: "left" },
+        { columnProp: "orderNo", columnLabel: "订单号", columnWidth: 120, headerAlign: "center", align: "left" },
         { columnProp: "reportQty", columnLabel: "报告数量", columnWidth: 80, headerAlign: "center", align: "right" },
         { columnProp: "approveQty", columnLabel: "合格数量", columnWidth: 80, headerAlign: "center", align: "right" },
         { columnProp: "defectQty", columnLabel: "不合格数量", columnWidth: 90, headerAlign: "center", align: "right" },
@@ -223,7 +235,8 @@ export default {
         { columnProp: "seqNo", columnLabel: "报告次序", columnWidth: 80, headerAlign: "center", align: "center" },
         { columnProp: "reverseflag", columnLabel: "取消", columnWidth: 60, headerAlign: "center", align: "center" },
         { columnProp: "partNo", columnLabel: "物料编码", columnWidth: 120, headerAlign: "center", align: "left" },
-        { columnProp: "partDescription", columnLabel: "物料名称/规格", columnWidth: 200, headerAlign: "center", align: "left" },
+        { columnProp: "partDescription", columnLabel: "物料名称", columnWidth: 200, headerAlign: "center", align: "left" },
+        { columnProp: "spec", columnLabel: "规格型号", columnWidth: 100, headerAlign: "center", align: "center" },
         { columnProp: "needDate", columnLabel: "要求完工日期", columnWidth: 110, headerAlign: "center", align: "center" },
         { columnProp: "site", columnLabel: "工厂编号", columnWidth: 80, headerAlign: "center", align: "center" },
         { columnProp: "starttime", columnLabel: "开工时间", columnWidth: 140, headerAlign: "center", align: "center" },
@@ -334,8 +347,10 @@ export default {
         operatorID: '',
         sResourceID: '',
         workCenterNo: '',
+        workCenterDesc: '',
         date1: '',
         date2: '',
+        spec: '',
         user: this.$store.state.user.name
       };
       this.setDefaultDates();

src/views/modules/yieldReport/com_process_inspection.vue

@@ -239,7 +239,7 @@
             <el-input v-model="seqDetailData.operationDesc" clearable style="width: 150px"></el-input>
           </el-form-item>
           <el-form-item label=" ">
-            <el-button type="primary" @click="searchSeqInfo" style="margin-top: 24px">查询</el-button>
+            <el-button type="primary" @click="searchSeqInfo">查询</el-button>
           </el-form-item>
         </el-form>
         <el-table
@@ -1767,15 +1767,12 @@ 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: hasCurrentRollNo ? this.rollNo : '',
-        seqNo: hasCurrentRollNo ? '' : this.seqNo,
+        rollNo: '',
+        seqNo: this.seqNo || '',
         orderNo: '',
         operationDesc: '',
         operationNo: '',
@@ -1802,13 +1799,9 @@ export default {
       this.checked = false
       this.modalFlag = true
 
-      // 打开弹窗后自动查询信息
+      // 打开弹窗后自动通过派工单号查询信息
       this.$nextTick(() => {
-        if (hasCurrentRollNo) {
-          // 有当前卷号，通过标签号查询信息
-          this.rollNoEnter();
-        } else if (this.seqNo && this.seqNo !== '') {
-          // 没有当前卷号但有派工单号，通过派工单号查询信息
+        if (this.seqNo && this.seqNo !== '') {
           this.seqNoDirectSearch();
         }
       });