@@ -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 {
diff --git a/src/views/modules/warehouse/labelTransactionLog.vue b/src/views/modules/warehouse/labelTransactionLog.vue
index 0546351..b30659d 100644
--- a/src/views/modules/warehouse/labelTransactionLog.vue
+++ b/src/views/modules/warehouse/labelTransactionLog.vue
@@ -62,11 +62,18 @@
+
+
+
+
+
-
+
+
+
@@ -75,8 +82,6 @@
-
-
@@ -171,6 +176,8 @@
+
+
@@ -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: '',
diff --git a/src/views/modules/yieldReport/com_process_inspection.vue b/src/views/modules/yieldReport/com_process_inspection.vue
index f396365..398dd2f 100644
--- a/src/views/modules/yieldReport/com_process_inspection.vue
+++ b/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() {
// 先重置数据
diff --git a/src/views/modules/yieldReport/com_produce_report_normal.vue b/src/views/modules/yieldReport/com_produce_report_normal.vue
index 9bb9aae..9a8960d 100644
--- a/src/views/modules/yieldReport/com_produce_report_normal.vue
+++ b/src/views/modules/yieldReport/com_produce_report_normal.vue
@@ -744,7 +744,7 @@
@refreshPageData="refreshPageData">
-
+