From 7fb0a8f0ab16c149484bf043754cd10cfa94de2f Mon Sep 17 00:00:00 2001
From: wangyi <2946747746@qq.com>
Date: 星期一, 19 一月 2026 14:48:05 +0800
Subject: [PATCH] 增加了业务员，保管员和验收员的对应的显示
---
src/views/purchase/cgPoInStockBill/cgPoInStockBill.vue | 71 ++++++++++++++++++++++++++---------
1 files changed, 52 insertions(+), 19 deletions(-)
diff --git a/src/views/purchase/cgPoInStockBill/cgPoInStockBill.vue b/src/views/purchase/cgPoInStockBill/cgPoInStockBill.vue
index 8473a9d..c76e1b7 100644
--- a/src/views/purchase/cgPoInStockBill/cgPoInStockBill.vue
+++ b/src/views/purchase/cgPoInStockBill/cgPoInStockBill.vue
@@ -15,6 +15,8 @@
type="date"
placeholder="寮�濮嬫棩鏈�"
style="width: 150px"
+ :disabled="queryParams.HInitTimeCycle != -1"
+ value-format="yyyy-MM-dd"
>
</el-date-picker>
</el-form-item>
@@ -24,6 +26,8 @@
type="date"
placeholder="缁撴潫鏃ユ湡"
style="width: 150px"
+ :disabled="queryParams.HInitTimeCycle != -1"
+ value-format="yyyy-MM-dd"
>
</el-date-picker>
</el-form-item>
@@ -253,6 +257,9 @@
>
</el-col>
<el-col :span="1.5">
+ <el-button type="primary" icon="el-icon-plus" size="mini" @click="onClickMethod_pushBarCodeProduce(row = rowForm, OperationType = 4)" :disabled="disabledFlag_pushBarCode">涓嬫帹鏉＄爜</el-button>
+ </el-col>
+ <el-col :span="1.5">
<el-button
type="primary"
icon="el-icon-edit"
@@ -457,7 +464,7 @@
}}</span>
<el-button
type="text"
- @click="handleEdit(row, (OperationType = 3), (copyType = 1))"
+ @click.stop="handleEdit(row, (OperationType = 3), (copyType = 1))"
v-else-if="column.property == '鍗曟嵁鍙�'"
>{{ row.鍗曟嵁鍙� }}</el-button
>
@@ -488,6 +495,12 @@
v-if="rowHideShow"
/>
</el-dialog>
+ <!-- 涓嬫帹鏉＄爜 -->
+ <el-dialog title="涓嬫帹鏉＄爜" :visible.sync="openFlag_pushBarCode" width="1480px" class="xsckdBox" append-to-body :before-close="close">
+ <div style="height: 70vh" v-if="openFlag_pushBarCode">
+ <iframe :src="iframeUrl" frameborder="0" width="100%" height="100%"></iframe>
+ </div>
+ </el-dialog>
<!-- 缂栬緫 -->
<el-dialog
title="缂栬緫鏀舵枡閫氱煡鍗�"
@@ -506,7 +519,7 @@
@editCloseGy="editGyClose"
v-if="editShow"
/> -->
- <div style="height: 80vh" v-if="openEdit">
+ <div style="height: 70vh" v-if="openEdit">
<iframe :src="iframeUrl" frameborder="0" width="100%" height="100%"></iframe>
</div>
</el-dialog>
@@ -621,6 +634,7 @@
HModName: "cgPoInStockBill",
editShow: false,
openEdit: false,
+ openFlag_pushBarCode: false, //涓嬫帹鏉＄爜-寮圭獥鏄剧ず鏍囪
totalNameList: [],
tableShow: true,
openPrintList: false,
@@ -658,6 +672,7 @@
{ label: "杩�30澶�", value: 29 },
{ label: "杩戝崐骞�", value: 180 },
{ label: "杩戜竴骞�", value: 365 },
+ { label: "浠绘剰闂撮殧", value: -1 },
],
hPriceTypeList: ["鎴愭湰浠�", "缁撶畻浠�"],
addBtnShow: false,
@@ -680,6 +695,7 @@
lastSelectedRowIndex: null, // 鐢ㄤ簬璁板綍涓婃鐐瑰嚮鐨勮绱㈠紩
lastSelectedRow: null, // 涓婁竴娆￠�変腑鐨勮
selectedRow: null, // 褰撳墠閫変腑鐨勮
+ disabledFlag_pushBarCode:true, //涓嬫帹鏉＄爜 鎸夐挳绂佺敤鏍囪
rowForm: {},
checkedSysZb: [],
editData: [], //鐢熶骇璧勬枡瀛愯〃
@@ -824,7 +840,7 @@
defaintOperationByCompanyName() {
var result = false;
axios
- .get(this.baseURL + "/Xt_getInfo/getCompanyName")
+ .get(this.$baseUrl + "/Xt_getInfo/getCompanyName")
.then((res) => {
var data1 = res.data;
if (data1.count == 1) {
@@ -859,6 +875,9 @@
this.getList();
},
riqiChange() {
+ if (this.queryParams.HInitTimeCycle == -1) {
+ return;
+ }
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * this.queryParams.HInitTimeCycle);
@@ -920,7 +939,7 @@
this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + this.eTime + "'";
}
try {
- let res = await axios.get(this.baseURL + "Cg_POInStockBill/page", {
+ let res = await axios.get(this.$baseUrl + "Cg_POInStockBill/page", {
params: {
sWhere: this.sWhere,
user: sessionStorage["HUserName"],
@@ -1025,7 +1044,7 @@
DisPlay_HideColumn(HModName, user, option, dataOption) {
this.totalNameList = [];
axios
- .get(this.baseURL + "/Xt_grdAlignment_WMES/grdAlignmentWMESList", {
+ .get(this.$baseUrl + "/Xt_grdAlignment_WMES/grdAlignmentWMESList", {
params: {
HModName: HModName,
user: user,
@@ -1193,6 +1212,9 @@
this.multiple = !selection.length;
if (!this.single) {
this.rowForm = selection[0];
+ this.disabledFlag_pushBarCode = false;
+ }else{
+ this.disabledFlag_pushBarCode = true;
}
},
//鎵撳紑渚ц竟鎼滅储寮圭獥
@@ -1300,7 +1322,7 @@
getOrgIDByUser() {
var res = "";
axios
- .get(this.baseURL + "/Xt_User/getOrgIDListByUser", {
+ .get(this.$baseUrl + "/Xt_User/getOrgIDListByUser", {
params: {
HModName: this.HModName,
user: sessionStorage["HUserName"],
@@ -1353,6 +1375,8 @@
close() {
this.tableShow = true;
this.openEdit = false;
+ this.openFlag_pushBarCode = false;
+ this.disabledFlag_pushBarCode = true;
this.getList();
},
//鎵撳紑鏂板缁勪欢寮圭獥
@@ -1362,6 +1386,13 @@
this.$nextTick(() => {
this.openEdit = true;
this.editShow = true;
+ });
+ },
+ //涓嬫帹鐢熸垚鏉＄爜
+ onClickMethod_pushBarCodeProduce(row, OperationType) {
+ this.iframeUrl = `/iframe/BarCode_JinLong?OperationType=${OperationType}&HSourceInterID=${row.hmainid}&HSourceEntryID=${row.hsubid}&HSourceBillType=${row.HBillType}&HSourceBillNo=${row.鍗曟嵁鍙穧`;
+ this.$nextTick(() => {
+ this.openFlag_pushBarCode = true;
});
},
//鎵撳紑淇敼缁勪欢寮圭獥
@@ -1380,27 +1411,29 @@
},
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete() {
+ console.log("this.rowForm", this.rowForm)
this.$modal
.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠")
.then(() => {
if (!this.rowForm.瀹℃牳浜�) {
axios
- .get(this.baseURL + "Cg_POInStockBill/DeltetPOInStockBill", {
+ .get(this.$baseUrl + "Cg_POInStockBill/DeltetPOInStockBill", {
params: {
- HInter: this.rowForm.hmainid.toString(),
- HsupId: this.rowForm.HsupId,
- HQty: this.rowForm.HQty,
- HSourceInterID: this.rowForm.HSourceInterID,
- HSourceEntryID: this.rowForm.HSourceEntryID,
+ HInterID: this.rowForm.hmainid.toString(),
+ HsupId: this.rowForm.HSupID,
+ HQty: this.rowForm['鏁伴噺'],
+ HSourceInterID: this.rowForm['婧愬崟涓诲唴鐮�'],
+ HSourceEntryID: this.rowForm['婧愬崟瀛愬唴鐮�'],
user: sessionStorage["HUserName"],
},
})
.then((res) => {
+
if (res.data.count == 1) {
this.handleQuery();
this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
} else {
- this.$modal.msgError("閿欒:" + result.code + result.Message);
+ this.$modal.msgError("閿欒:" + res.data.code + res.data.Message);
}
})
.catch((error) => {
@@ -1417,7 +1450,7 @@
var InterID = form.HItemID || form.HInterID || form.hmainid;
//閫昏緫瀹℃牳鏂规硶
axios
- .get(this.baseURL + "/Cg_POInStockBill/AuditCg_POInStockBill", {
+ .get(this.$baseUrl + "/Cg_POInStockBill/AuditCg_POInStockBill", {
params: {
HInterID: InterID,
IsAudit: num,
@@ -1442,7 +1475,7 @@
let HInterID = form.HItemID || form.HInterID || form.hmainid;
try {
let res = await axios.get(
- `${this.baseURL}/Cg_POInStockBill/CloseCg_POInStockBill`,
+ `${this.$baseUrl}/Cg_POInStockBill/CloseCg_POInStockBill`,
{
params: {
HInterID: HInterID,
@@ -1469,7 +1502,7 @@
let HEntryID = form.HEntryID || form.hsubid;
try {
let res = await axios.get(
- `${this.baseURL}/Cg_POInStockBill/CloseRowCg_POInStockBill`,
+ `${this.$baseUrl}/Cg_POInStockBill/CloseRowCg_POInStockBill`,
{
params: {
HInterID: HInterID,
@@ -1496,7 +1529,7 @@
let HInterID = form.HItemID || form.HInterID || form.hmainid;
try {
let res = await axios.get(
- `${this.baseURL}/Cg_POInStockBill/DropCg_POInStockBill`,
+ `${this.$baseUrl}/Cg_POInStockBill/DropCg_POInStockBill`,
{
params: {
HInterID: HInterID,
@@ -1522,7 +1555,7 @@
var InterID = form.HItemID || form.HInterID;
//閫昏緫瀹℃牳鏂规硶
axios
- .get(this.baseURL + "/Gy_Employee/StopGy_Employee", {
+ .get(this.$baseUrl + "/Gy_Employee/StopGy_Employee", {
params: {
HInterID: InterID,
IsStop: num,
@@ -1596,7 +1629,7 @@
var sMainSub = sSubStr + "&鍜�" + sessionStorage["HUserName"];
axios({
method: "post",
- url: this.baseURL + "/Gy_Source/Gy_Source_btnSave",
+ url: this.$baseUrl + "/Gy_Source/Gy_Source_btnSave",
data: {
sMainSub: sMainSub,
},
--
Gitblit v1.9.1