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/scMould/warehouse/Sc_MouldMoveStockRequestBillList.vue | 68 ++++++++++++++++++----------------
1 files changed, 36 insertions(+), 32 deletions(-)
diff --git a/src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillList.vue b/src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillList.vue
index 6a3b616..c608ef6 100644
--- a/src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillList.vue
+++ b/src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillList.vue
@@ -40,8 +40,8 @@
<el-form-item label="閮ㄩ棬淇℃伅" prop="HDept">
<el-input v-model="queryParams.HDept" placeholder="璇疯緭鍏ラ儴闂ㄤ俊鎭�" @keyup.enter.native="handleQuery" />
</el-form-item>
- <el-form-item label="鍣ㄥ叿浠ｇ爜" prop="HModelNumber">
- <el-input v-model="queryParams.HModelNumber" placeholder="璇疯緭鍏ュ櫒鍏蜂唬鐮�" @keyup.enter.native="handleQuery" />
+ <el-form-item label="瀹瑰櫒浠ｇ爜" prop="HModelNumber">
+ <el-input v-model="queryParams.HModelNumber" placeholder="璇疯緭鍏ュ鍣ㄤ唬鐮�" @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="寰�鏉ュ崟浣�" prop="HSupName">
<el-input v-model="queryParams.HSupName" placeholder="璇疯緭鍏ュ線鏉ュ崟浣�" @keyup.enter.native="handleQuery" />
@@ -136,8 +136,8 @@
@click="handleEdit(row = rowForm, OperationType = 1, copyType = 1)">澶嶅埗</el-button>
</el-col>
<el-col :span="1.5">
- <el-button type="primary" icon="el-icon-tickets" size="mini" :disabled="single"
- @click="handleMove(row = rowForm, OperationType = 4)">涓嬫帹锛堝櫒鍏风洿鎺ヨ皟鎷ㄥ崟锛�</el-button>
+ <el-button type="primary" icon="el-icon-tickets" size="mini"
+ @click="handlePush(row = rowForm, OperationType = 4)">涓嬫帹锛堝鍣ㄧ洿鎺ヨ皟鎷ㄥ崟锛�</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="primary" icon="el-icon-delete" size="mini" :disabled="single" @click="handleDelete">鍒犻櫎
@@ -189,14 +189,14 @@
v-if="rowHideShow" />
</el-dialog>
<!-- 缂栬緫 -->
- <el-dialog title="缂栬緫鍣ㄥ叿璋冩嫧鐢宠鍗�" :visible.sync="openEdit" width="1480px" append-to-body class="xsckdBox" @close="close">
+ <el-dialog title="缂栬緫瀹瑰櫒璋冩嫧鐢宠鍗�" :visible.sync="openEdit" width="1480px" append-to-body class="xsckdBox" @close="close">
<edit :OperationType=OperationType :linterid=this.rowForm.hmainid :HSouceBillType=this.rowForm.HSourceBillType
:copyType="copyType" @editClose="editClose" v-if="editShow" />
</el-dialog>
<!-- 涓嬫帹 -->
- <el-dialog title="涓嬫帹鍣ㄥ叿鐩存帴璋冩嫧鍗�" :visible.sync="openMove" width="1480px" append-to-body class="xsckdBox" @close="close">
- <move :OperationType='4' :propsData='moveData' :HSouceBillType=BillType
- @editClose="moveClose" v-if="moveShow" />
+ <el-dialog title="涓嬫帹瀹瑰櫒鐩存帴璋冩嫧鍗�" :visible.sync="openPush" width="1480px" append-to-body class="xsckdBox" @close="close">
+ <push :OperationType='4' :propsData='pushData' :HSouceBillType=BillType
+ @editClose="pushClose" v-if="pushShow" />
</el-dialog>
<el-dialog title="鎵撳嵃妯℃澘閫夋嫨" :visible.sync="openPrintList" width="800px" append-to-body>
<PrintList :linterid=this.rowForm.hmainid :MyMsg=this.rowForm.hmainid :Type='HModName'
@@ -211,13 +211,13 @@
import axios from 'axios'
import RowSettings from '@/views/component/rowSettings'
import Edit from '@/views/scMould/warehouse/Sc_MouldMoveStockRequestBillEdit'
-import Move from '@/views/scMould/warehouse/Sc_MouldProdMoveBillEdit'
+import Push from '@/views/scMould/warehouse/Sc_MouldProdMoveBillEdit'
import PrintList from '@/views/component/printList'
import moment from 'moment';
export default {
name: 'Sc_MouldMoveStockRequestBillList',
- components: { RowSettings, Edit, Move,PrintList },
+ components: { RowSettings, Edit, Push,PrintList },
props: {
openPage: { type: String, },
HOrgID: { type: String, },
@@ -229,9 +229,9 @@
activeSeach: '',
editShow: false,
openEdit: false,
- moveShow: false,
- openMove: false,
- moveData:'',
+ pushShow: false,
+ openPush: false,
+ pushData:'',
totalNameList: [],
tableShow: true,
openPrintList: false,
@@ -403,7 +403,7 @@
this.pageSize = 50
}
// 鍒楄〃
- axios.get(this.baseURL + '/Sc_MouldMoveStockRequestBillController/page', {
+ axios.get(this.$baseUrl + '/Sc_MouldMoveStockRequestBillController/page', {
params: {
"sWhere": this.sWhere,
"user": sessionStorage["HUserName"],
@@ -447,6 +447,8 @@
option.data = data1.data
this.dataList = option
this.DisPlay_HideColumn(this.HModName, sessionStorage["HUserName"], option, this.dataList);
+ }else{
+ this.$modal.msgError(response.data.Message);
}
}).catch(error => {
this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
@@ -454,7 +456,7 @@
},
DisPlay_HideColumn(HModName, user, option, dataOption) {
this.totalNameList = []
- axios.get(this.baseURL + '/Xt_grdAlignment_WMES/grdAlignmentWMESList', {
+ axios.get(this.$baseUrl + '/Xt_grdAlignment_WMES/grdAlignmentWMESList', {
params: {
"HModName": HModName,
"user": user,
@@ -759,6 +761,8 @@
this.tableShow = true
this.openEdit = false
this.editShow = false
+ this.openPush = false
+ this.pushShow = false
this.clearData()
this.getList()
},
@@ -775,26 +779,26 @@
this.openEdit = true
},
//鎵撳紑涓嬫帹缁勪欢寮圭獥
- handleMove() {
- if (this.rowList.length > 0) {
+ handlePush() {
+ if (this.rowList && this.rowList.length > 0) {
var dataArray = [];
var HSupTypeID_Temp = this.rowList[0].HSupTypeID
var HStockInOrgID_Temp = this.rowList[0].HSTOCKORGINID
for (var i = 0; i < this.rowList.length; i++) {
if (this.rowList[i].鍗曟嵁鐘舵�� != "宸插鏍�") {
- this.$modal.msgSuccess("涓嬫帹澶辫触锛佹墍閫夊崟鎹��" + this.rowList[i].鍗曟嵁鍙� + "銆戜笉涓哄凡瀹℃牳鐘舵��,涓嶅厑璁镐笅鎺紒")
+ this.$modal.msgError("涓嬫帹澶辫触锛佹墍閫夊崟鎹��" + this.rowList[i].鍗曟嵁鍙� + "銆戜笉涓哄凡瀹℃牳鐘舵��,涓嶅厑璁镐笅鎺紒")
return;
}
if (this.rowList[i].HQtyMust <= 0) {
- this.$modal.msgSuccess("涓嬫帹澶辫触锛佹墍閫夊崟鎹��" + this.rowList[i].鍗曟嵁鍙� + "銆戝搴斿彲涓嬫帹鏁伴噺蹇呴』澶т簬 0 锛�")
+ this.$modal.msgError("涓嬫帹澶辫触锛佹墍閫夊崟鎹��" + this.rowList[i].鍗曟嵁鍙� + "銆戝搴斿彲涓嬫帹鏁伴噺蹇呴』澶т簬 0 锛�")
return;
}
if (this.rowList[i].HSupTypeID != HSupTypeID_Temp) {
- this.$modal.msgSuccess("涓嬫帹澶辫触锛佹墍閫夊崟鎹搴斿線鏉ョ被鍨嬪繀椤讳竴鑷达紒")
+ this.$modal.msgError("涓嬫帹澶辫触锛佹墍閫夊崟鎹搴斿線鏉ョ被鍨嬪繀椤讳竴鑷达紒")
return;
}
if (this.rowList[i].HSTOCKORGINID != HStockInOrgID_Temp) {
- this.$modal.msgSuccess("涓嬫帹澶辫触锛佹墍閫夊崟鎹搴旇皟鍏ョ粍缁囧繀椤讳竴鑷达紒")
+ this.$modal.msgError("涓嬫帹澶辫触锛佹墍閫夊崟鎹搴旇皟鍏ョ粍缁囧繀椤讳竴鑷达紒")
return;
}
var temp = {
@@ -807,11 +811,11 @@
var datajson = {
"data": dataArray
};
- this.moveData = JSON.stringify(datajson)
- this.moveShow = true
- this.openMove = true
+ this.pushData = JSON.stringify(datajson)
+ this.pushShow = true
+ this.openPush = true
} else {
- layer.msg('璇烽�夋嫨鏁版嵁涓嬫帹锛�');
+ this.$modal.msgError("璇烽�夋嫨鏁版嵁涓嬫帹锛�")
}
},
//鍏抽棴缂栬緫椤甸潰
@@ -823,10 +827,10 @@
this.getList()
},
//鍏抽棴涓嬫帹椤甸潰
- moveClose(val) {
+ pushClose(val) {
this.open = val
- this.editShow = false
- this.openEdit = val
+ this.pushShow = false
+ this.openPush = val
this.clearData()
this.getList()
},
@@ -841,14 +845,14 @@
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete() {
this.$modal.confirm('纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠').then(() => {
- axios.get(this.baseURL + "/Sc_MouldMoveStockRequestBillController/GetSc_MouldMoveStockRequestBill_Delete_Json", {
+ axios.get(this.$baseUrl + "/Sc_MouldMoveStockRequestBillController/GetSc_MouldMoveStockRequestBill_Delete_Json", {
params: { 'HInterID': this.rowForm.hmainid.toString(), 'HMaker': sessionStorage["HUserName"] }
}).then(response => {
if (response.data.count == 1) {
this.getList()
this.$modal.msgSuccess("鍒犻櫎鎴愬姛")
} else {
- this.$modal.msgError("閿欒:" + result.code + result.Message);
+ this.$modal.msgError("閿欒:" + response.data.code + response.data.Message);
}
}).catch(error => {
this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
@@ -859,7 +863,7 @@
set_CheckBill(num, form) {
var InterID = form.hmainid || form.HInterID
//閫昏緫瀹℃牳鏂规硶
- axios.get(this.baseURL + "/Sc_MouldMoveStockRequestBillController/GetSc_MouldMoveStockRequestBill_Check_Json", {
+ axios.get(this.$baseUrl + "/Sc_MouldMoveStockRequestBillController/GetSc_MouldMoveStockRequestBill_Check_Json", {
params: { "HInterID": InterID, "Type": num, "HMaker": sessionStorage["HUserName"] }
}).then(response => {
let result = response.data
@@ -889,7 +893,7 @@
} else if (this.rowForm.鐘舵�� != "宸插鏍�" && !this.defaintOperationByCompanyName()) {
this.$modal.msgError("鎵撳嵃澶辫触!鍘熷洜锛氬崟鎹姸鎬佷笉涓�'宸插鏍�'鐘舵��!!");
} else {
- axios.get(this.baseURL + "/Kf_SellOutBill/CheckSellOutBill_IsExist", {
+ axios.get(this.$baseUrl + "/Kf_SellOutBill/CheckSellOutBill_IsExist", {
params: { "HInterID": this.rowForm.hmainid }
}).then(response => {
var result = response.data
--
Gitblit v1.9.1