From 1544dcf0a81cf0a271a78ea82c52ab952c91f8d7 Mon Sep 17 00:00:00 2001
From: 陈婷婷 <506607603@qq.com>
Date: 星期四, 27 十一月 2025 10:25:42 +0800
Subject: [PATCH] 条码生产
---
src/views/component/HSourceReportHtml/index.vue | 181 ++++++++++++++++++++++++++++-----------------
1 files changed, 113 insertions(+), 68 deletions(-)
diff --git a/src/views/component/HSourceReportHtml/index.vue b/src/views/component/HSourceReportHtml/index.vue
index b65379e..ea92640 100644
--- a/src/views/component/HSourceReportHtml/index.vue
+++ b/src/views/component/HSourceReportHtml/index.vue
@@ -2,13 +2,19 @@
<div style="padding: 10px; position: relative;">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="78px" class="searchBox">
<el-form-item label="鍗曟嵁鍙�" prop="HBillNo" style="margin-left: 100px">
- <el-input v-model="queryParams.HBillNo" placeholder="璇疯緭鍏ュ崟鎹彿" @keyup.enter.native="handleQuery" />
+ <el-input v-model="queryParams.HBillNo" placeholder="璇疯緭鍏ュ崟鎹彿" style="width: 150px" />
</el-form-item>
- <el-form-item label="閮ㄩ棬">
+ <el-form-item label="閮ㄩ棬" label-width="48px">
<el-select v-model="queryParams.HDeptName" placeholder="璇烽�夋嫨" style="width: 150px">
<el-option v-for="(item, index) in HDeptList" :key="index" :label="item.HName"
- :value="item.HName" />
+ :value="item.HItemID" />
</el-select>
+ </el-form-item>
+ <el-form-item label="娴佽浆鍗″彿" prop="HProcExchBillNo" v-if="HSouceBillType == '鐢熶骇鍏ュ簱鍗�'">
+ <el-input v-model="queryParams.HProcExchBillNo" placeholder="璇疯緭鍏ユ祦杞崱鍙�" style="width: 150px" />
+ </el-form-item>
+ <el-form-item label="鐗╂枡缂栫爜" prop="PartNumber">
+ <el-input v-model="queryParams.PartNumber" placeholder="璇疯緭鍏ョ墿鏂欑紪鐮�" style="width: 150px" />
</el-form-item>
<el-form-item label-width="78px">
<el-button type="primary" icon="el-icon-search" @click="handleQuery">
@@ -18,21 +24,33 @@
<el-collapse v-model="activeSeach">
<el-collapse-item title="鏇村" name="1">
<el-card class="box-card">
- <el-form-item label="閮ㄩ棬鍚嶇О" prop="HDepartName">
- <el-input v-model="queryParams.HDepartName" placeholder="璇疯緭鍏ラ儴闂ㄥ悕绉�"
- @keyup.enter.native="HDepartName" />
+ <el-form-item label="鐗╂枡鍚嶇О" prop="PartName">
+ <el-input v-model="queryParams.PartName" placeholder="璇疯緭鍏ョ墿鏂欏悕绉�" />
</el-form-item>
- <el-form-item label="鐗╂枡浠ｇ爜" prop="HMaterNumber">
- <el-input v-model="queryParams.HMaterNumber" placeholder="璇疯緭鍏ョ墿鏂欎唬鐮�"
- @keyup.enter.native="handleQuery" />
+ <el-form-item label="鐘舵��" prop="HBillStatus">
+ <el-select v-model="queryParams.HBillStatus" placeholder="璇烽�夋嫨">
+ <el-option label="璁″垝" value="璁″垝" />
+ <el-option label="璁″垝纭" value="璁″垝纭" />
+ <el-option label="涓嬭揪" value="涓嬭揪" />
+ <el-option label="寮�宸�" value="寮�宸�" />
+ <el-option label="瀹屽伐" value="瀹屽伐" />
+ <el-option label="缁撴" value="缁撴" />
+ <el-option label="缁撴" value="缁撶畻" />
+ </el-select>
</el-form-item>
- <el-form-item label="鐗╂枡鍚嶇О" prop="HMaterName">
- <el-input v-model="queryParams.HMaterName" placeholder="璇疯緭鍏ョ墿鏂欏悕绉�"
- @keyup.enter.native="handleQuery" />
+ <el-form-item label="棰嗘枡鐘舵��" prop="HSPickMtrlStatus" v-if="HSouceBillType == '鐢熶骇璁㈠崟'">
+ <el-select v-model="queryParams.HSPickMtrlStatus" placeholder="璇烽�夋嫨">
+ <el-option label="鏈鏂�" value="鏈鏂�" />
+ <el-option label="閮ㄥ垎棰嗘枡" value="閮ㄥ垎棰嗘枡" />
+ <el-option label="鍏ㄩ儴棰嗘枡" value="鍏ㄩ儴棰嗘枡" />
+ <el-option label="瓒呴棰嗘枡" value="瓒呴棰嗘枡" />
+ </el-select>
</el-form-item>
- <el-form-item label="浠撳簱" prop="HWHID">
- <el-input v-model="queryParams.HWHID" placeholder="璇疯緭鍏ヤ粨搴�"
- @keyup.enter.native="handleQuery" />
+ <el-form-item label="鏄惁鎺掍骇" prop="HIsScheduling" v-if="HSouceBillType == '鐢熶骇璁㈠崟'">
+ <el-select v-model="queryParams.HIsScheduling" placeholder="璇烽�夋嫨">
+ <el-option label="宸叉帓浜�" value="宸叉帓浜�" />
+ <el-option label="鏈帓浜�" value="鏈帓浜�" />
+ </el-select>
</el-form-item>
<div slot="header" class="clearfix"><span>杩囨护</span></div>
<div>
@@ -54,8 +72,7 @@
</el-select>
</el-col>
<el-col :span="11">
- <el-input v-model="queryParams.ColContent1" placeholder="璇疯緭鍏�" clearable
- @keyup.enter.native="handleQuery" />
+ <el-input v-model="queryParams.ColContent1" placeholder="璇疯緭鍏�" clearable />
</el-col>
</el-row>
</el-form-item>
@@ -166,10 +183,12 @@
queryParams: {
HBillNo: "",
HDeptName: '',
- HDepartName: "",
- HWHID: null,
- HMaterNumber: "",
- HMaterName: "",
+ HProcExchBillNo: "",
+ PartNumber: "",
+ PartName: "",
+ HBillStatus: '寮�宸�',
+ HSPickMtrlStatus: "",
+ HIsScheduling: "",
ColName1: "",
ColName2: "",
ColName: "",
@@ -266,6 +285,17 @@
if (this.pageSize == 0) {
this.pageSize = 50;
}
+ if (this.queryParams.HBillStatus &&this.HSouceBillType == '鐢熶骇璁㈠崟') {
+ this.sWhere += " and 鐘舵�� = '" + this.queryParams.HBillStatus + "'";
+ }
+ if (this.HSouceBillType == '鐢熶骇璁㈠崟') {
+ this.queryParams.HIsScheduling = '宸叉帓浜�'
+ if (sessionStorage["Organization"] == "涔濊彵鐢垫満") {
+ if (this.queryParams.HIsScheduling) {
+ this.sWhere += this.queryParams.HIsScheduling == "鏈帓浜�" ? "and 鏄惁鎺掍骇 = ''" : " and 鏄惁鎺掍骇 = '" + this.queryParams.HIsScheduling + "'"
+ }
+ }
+ }
// 鍒楄〃
axios.get(this.baseURL + "/Sc_BarCode/ReportFromBillList", {
params: {
@@ -293,6 +323,10 @@
name: data1.list[key].ColmCols,
Type: data1.list[key].ColmType,
}); //浠庢瘡涓璞′腑鎻愬彇鏁版嵁
+ var patrn = new RegExp(/^h/i);
+ if (patrn.test(data1.list[key].ColmCols)) {
+ this.titleData[key] = data1.list[key].ColmCols;
+ }
}
//鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
col.push({ type: "checkbox", fixed: "left", totalRowText: "鍚堣" });
@@ -335,45 +369,45 @@
option.data = data1.data;
var result = data1.data;
option.data = result;
- switch (this.HSouceBillType) {
- case '鐢熶骇璁㈠崟':
- this.HModName = "Sc_ICMOBill_3710";
- break;
- case '鐢熶骇姹囨姤鍗�':
- this.HModName = "Sc_ICMOReportBill_3711";
- break;
- case '閲囪喘璁㈠崟':
- this.HModName = "Cg_POOrderBill_1102";
- break;
- case '鏀舵枡閫氱煡鍗�':
- this.HModName = "Cg_POInStockBill_1103";
- break;
- case '濮斿璁㈠崟':
- this.HModName = "WW_EntrustOrderBill_1601";
- break;
- case '鐢熶骇鍏ュ簱鍗�':
- $("#HProcExchBillNoHidden").show();
- this.HModName = "ProductInBill_1202";
- break;
- case '閲囪喘鍏ュ簱鍗�':
- this.HModName = "POStockInBill_1201";
- break;
- case '閿�鍞��璐�':
- this.HModName = "SellOutBackBill_1247";
- break;
- case '鐢熶骇閫�鏂�':
- this.HModName = "MateOutBackBill_1244";
- break;
- case '宸ュ簭娴佽浆鍗�':
- this.HModName = "ProcessExchangeBill_3772";
- break;
- case '閿�鍞嚭搴撳崟':
- this.HModName = "SellOutBill_1205";
- break;
- case '棰嗘枡鍑哄簱鍗�':
- this.HModName = "MateOutBill_1204";
- break;
- }
+ switch (this.HSouceBillType) {
+ case '鐢熶骇璁㈠崟':
+ this.HModName = "Sc_ICMOBill_3710";
+ break;
+ case '鐢熶骇姹囨姤鍗�':
+ this.HModName = "Sc_ICMOReportBill_3711";
+ break;
+ case '閲囪喘璁㈠崟':
+ this.HModName = "Cg_POOrderBill_1102";
+ break;
+ case '鏀舵枡閫氱煡鍗�':
+ this.HModName = "Cg_POInStockBill_1103";
+ break;
+ case '濮斿璁㈠崟':
+ this.HModName = "WW_EntrustOrderBill_1601";
+ break;
+ case '鐢熶骇鍏ュ簱鍗�':
+ $("#HProcExchBillNoHidden").show();
+ this.HModName = "ProductInBill_1202";
+ break;
+ case '閲囪喘鍏ュ簱鍗�':
+ this.HModName = "POStockInBill_1201";
+ break;
+ case '閿�鍞��璐�':
+ this.HModName = "SellOutBackBill_1247";
+ break;
+ case '鐢熶骇閫�鏂�':
+ this.HModName = "MateOutBackBill_1244";
+ break;
+ case '宸ュ簭娴佽浆鍗�':
+ this.HModName = "ProcessExchangeBill_3772";
+ break;
+ case '閿�鍞嚭搴撳崟':
+ this.HModName = "SellOutBill_1205";
+ break;
+ case '棰嗘枡鍑哄簱鍗�':
+ this.HModName = "MateOutBill_1204";
+ break;
+ }
this.DisPlay_HideColumn(this.HModName, sessionStorage["HUserName"], option, this.dataList);
}
}).catch((error) => {
@@ -640,17 +674,28 @@
if (this.queryParams.HBillNo) {
this.sWhere += " and 鍗曟嵁鍙� like '%" + this.queryParams.HBillNo + "%'";
}
- if (this.queryParams.HDepartName) {
- this.sWhere += " and 閮ㄩ棬鍚嶇О like '%" + this.queryParams.HDepartName + "%'";
+ if (this.queryParams.HProcExchBillNo &&this.HSouceBillType == '鐢熶骇鍏ュ簱鍗�') {
+ this.sWhere += " and 娴佽浆鍗″彿 like '%" + this.queryParams.HProcExchBillNo + "%'";
}
- if (this.queryParams.HWHID) {
- this.sWhere += " and 浠撳簱 like '%" + this.queryParams.HWHID + "%'";
+ if (this.queryParams.HDeptName) {
+ this.sWhere += " and HDeptID = '" + this.queryParams.HDeptName + "'";
}
- if (this.queryParams.HMaterNumber) {
- this.sWhere += " and 鐗╂枡浠ｇ爜 like '%" + this.queryParams.HMaterNumber + "%'";
+ if (this.queryParams.PartNumber) {
+ this.sWhere += " and 鐗╂枡浠ｇ爜 like '%" + this.queryParams.PartNumber + "%'";
}
- if (this.queryParams.HMaterName) {
- this.sWhere += " and 鐗╂枡鍚嶇О like '%" + this.queryParams.HMaterName + "%'";
+ if (this.queryParams.PartName) {
+ this.sWhere += " and 鐗╂枡鍚嶇О like '%" + this.queryParams.PartName + "%'";
+ }
+ if (this.queryParams.HBillStatus &&this.HSouceBillType == '鐢熶骇璁㈠崟') {
+ this.sWhere += " and 鐘舵�� like '%" + this.queryParams.HBillStatus + "%'";
+ }
+ if (sessionStorage["Organization"] == "涔濊彵鐢垫満" && this.HSouceBillType == '鐢熶骇璁㈠崟') {
+ if (this.queryParams.HIsScheduling) {
+ this.sWhere += " and 棰嗘枡鐘舵�� like '%" + this.queryParams.HIsScheduling + "%'";
+ }
+ if (this.queryParams.HIsScheduling) {
+ this.sWhere += this.queryParams.HIsScheduling == "鏈帓浜�" ? "and 鏄惁鎺掍骇 = ''" : " and 鏄惁鎺掍骇 = '" + this.queryParams.HIsScheduling + "'"
+ }
}
this.getList();
},
--
Gitblit v1.9.1