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/warehouse/barcodeMaster/Gy_BarCodeBill_JinLong.vue | 70 ++++++++++++++++++++++++++++------
1 files changed, 57 insertions(+), 13 deletions(-)
diff --git a/src/views/warehouse/barcodeMaster/Gy_BarCodeBill_JinLong.vue b/src/views/warehouse/barcodeMaster/Gy_BarCodeBill_JinLong.vue
index 9354043..d592867 100644
--- a/src/views/warehouse/barcodeMaster/Gy_BarCodeBill_JinLong.vue
+++ b/src/views/warehouse/barcodeMaster/Gy_BarCodeBill_JinLong.vue
@@ -2,15 +2,15 @@
<div style="margin: 10px;">
<div style=" margin-bottom: 10px; border-bottom: 1px solid #f6f6f6;">
<el-button type="primary" @click="onClickMethod_BarCodeProduce" :disabled="disabledFlag_BarCodeProduce">鐢熸垚</el-button>
- <!-- <el-button type="primary" @click="get_PrintReport">鎵撳嵃</el-button>
- <el-button type="primary" @click="close">閫� 鍑�</el-button> -->
+ <el-button type="primary" @click="get_PrintReport">鎵撳嵃</el-button>
+ <!-- <el-button type="primary" @click="close">閫� 鍑�</el-button> -->
</div>
<div style="margin: 10px; font-size: 28px; font-weight: bold; text-align: center;">鏉＄爜鐢熸垚</div>
<el-form :model="initMainData" label-width="80px">
<el-row>
<el-col :span="6">
<el-form-item label="鏃ユ湡">
- <el-date-picker v-model="initMainData.HDate" type="date" placeholder="閫夋嫨鏃ユ湡" value-format="yyyy-MM-ddT" style="width: 100%"> </el-date-picker>
+ <el-date-picker v-model="initMainData.HDate" type="date" placeholder="閫夋嫨鏃ユ湡" value-format="yyyy-MM-dd" style="width: 100%"> </el-date-picker>
</el-form-item>
</el-col>
<el-col :span="6">
@@ -112,7 +112,7 @@
<el-row>
<el-col :span="6">
<el-form-item label="鐢熶骇鏃ユ湡">
- <el-date-picker v-model="initMainData.HInspectionDate" type="date" placeholder="閫夋嫨鏃ユ湡" value-format="yyyy-MM-ddT" style="width: 100%"> </el-date-picker>
+ <el-date-picker v-model="initMainData.HInspectionDate" type="date" placeholder="閫夋嫨鏃ユ湡" value-format="yyyy-MM-dd" style="width: 100%"> </el-date-picker>
</el-form-item>
</el-col>
<el-col :span="6">
@@ -122,11 +122,21 @@
</el-col>
<el-col :span="6">
<el-form-item label="澶嶆鏃ユ湡">
- <el-date-picker v-model="initMainData.HReInspectionDate" type="date" placeholder="閫夋嫨鏃ユ湡" value-format="yyyy-MM-ddT" style="width: 100%" disabled> </el-date-picker>
+ <el-date-picker v-model="initMainData.HReInspectionDate" type="date" placeholder="閫夋嫨鏃ユ湡" value-format="yyyy-MM-dd" style="width: 100%" disabled> </el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-row>
+ <el-col :span="6">
+ <el-form-item label="瀹㈡埛璁㈠崟鍙�">
+ <el-input v-model="initMainData.HSeOrderBillNo" disabled></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="浜у搧鍨嬪彿">
+ <el-input v-model="initMainData.HCusModel" disabled></el-input>
+ </el-form-item>
+ </el-col>
<el-col :span="6">
<el-form-item label="缁勭粐" @change="onChangeMethod_HOrganization">
<el-select v-model="initMainData.HOrganizationID" placeholder="璇烽�夋嫨缁勭粐" style="width: 100%">
@@ -155,10 +165,10 @@
</el-form>
<!-- 鎵撳嵃寮圭獥 -->
- <!-- <el-dialog title="鎵撳嵃妯℃澘閫夋嫨" :visible.sync="openPrintList" width="800px" append-to-body>
+ <el-dialog title="鎵撳嵃妯℃澘閫夋嫨" :visible.sync="openPrintList" width="800px" append-to-body>
<PrintList :linterid="rowSel.toString()" :MyMsg="rowSel.toString()" Type="HGy_BarCodeBill"
HModName="HGy_BarCodeBill" @rowEditClose="rowSetClose" v-if="printListShow" />
- </el-dialog> -->
+ </el-dialog>
</div>
</template>
<script>
@@ -211,6 +221,9 @@
,HInspectionCycle:0 //澶嶆鍛ㄦ湡(澶�)
,HReInspectionDate:null //澶嶆鏃ユ湡
,HPOOrderBillMTO:"" //閲囪喘璺熻釜鍙�
+ ,HSeOrderBillNo:"" //瀹㈡埛璁㈠崟鍙�
+ ,HCusModel:"" //浜у搧鍨嬪彿
+ ,HMTONo:null //璁″垝璺熻釜鍙�
,HOrganizationID:0 //缁勭粐ID
,HOrganization:"" //缁勭粐鍚嶇О
@@ -270,6 +283,10 @@
],
tableData_BarCode:[], //鏉＄爜鍒楄〃table 鏁版嵁
RowIndex_BarCode:0, //鏉＄爜鍒楄〃table 琛岀储寮�
+
+ openPrintList:false, //鎵撳嵃寮圭獥鏄剧ず鏍囪
+ printListShow:false, //鎵撳嵃妯℃澘鏁版嵁鏄剧ず鏍囪
+ selectedData_BarCode:0, //鏉＄爜鍒楄〃table 閫変腑鏁版嵁闆嗗悎
};
},
async created() {
@@ -306,7 +323,7 @@
//#region 鑾峰彇缁勭粐涓嬫媺鍒楄〃鏁版嵁
async get_OrganizationList() {
- axios.get(this.baseURL + '/Web/GetOrganizations',{async:false}).then(response => {
+ axios.get(this.$baseUrl + '/Web/GetOrganizations',{async:false}).then(response => {
let result = response.data
if (result.count == 1) {
var data = result.data;
@@ -411,6 +428,13 @@
return Result = false;
}
+ var regex = /^\d{4}-\d{2}-\d{2}$/; //姝ｅ垯琛ㄨ揪寮忥細鏍￠獙 yyyy-MM-dd
+ temp = this.initMainData.HInspectionDate;
+ if(!regex.test(temp)){
+ this.$modal.msgError("璇疯缃敓浜ф棩鏈燂紒锛侊紒");
+ return Result = false;
+ }
+
// var HEndQty = this.initMainData.HEndQty;
// if (HEndQty == "") {
// this.$modal.msgError("灏惧寘鏁伴噺涓嶈兘涓虹┖锛侊紒");
@@ -455,7 +479,7 @@
, "HMaterNumber": this.initMainData.HMaterNumber
, "HMaterName": this.initMainData.HMaterName
, "HMaterModel": this.initMainData.HMaterModel
- , "HCusModel": ""
+ , "HCusModel": this.initMainData.HCusModel
, "HCusMaterName": ""
, "HEmpID": 0
, "HEmpNumber": ""
@@ -501,6 +525,8 @@
, "HInspectionCycle": this.initMainData.HInspectionCycle
, "HReInspectionDate": this.initMainData.HReInspectionDate
, "HPOOrderBillMTO": this.initMainData.HPOOrderBillMTO
+ , "HSeOrderBillNo": this.initMainData.HSeOrderBillNo
+ , "HMTONo": this.initMainData.HMTONo
}
]
@@ -520,9 +546,24 @@
},
//#endregion
+ //#region 鎵撳嵃鎸夐挳鐐瑰嚮浜嬩欢
+ get_PrintReport() {
+ if (this.selectedData_BarCode.length == 0) {
+ this.$modal.msgError("璇烽�夋嫨鏁版嵁");
+ } else {
+ this.rowSel = [];
+ for (var i = 0; i < this.selectedData_BarCode.length; i++) {
+ this.rowSel.push(this.selectedData_BarCode[i].HItemID.toString());
+ }
+ this.printListShow = true;
+ this.openPrintList = true;
+ }
+ },
+ //#endregion
+
//#region 鏉＄爜鍒楄〃澶嶉�夋閫夋嫨鐘舵�佸彉鏇寸洃鍚簨浠�
onSelectionChange_BarCode(selection){
-
+ this.selectedData_BarCode = selection;
},
//#endregion
@@ -544,7 +585,7 @@
var res = "none";
var sql = "select * from h_v_IF_POInStockBillList_Source where 1=1 and HMainID = " + HSourceInterID + " and HSubID = " + HSourceEntryID;
var ModRightNameCheck = "";
- return axios.get(this.baseURL + '/CommonModel/searchMethod', {
+ return axios.get(this.$baseUrl + '/CommonModel/searchMethod', {
async:false,
params: {
"sql": sql
@@ -614,12 +655,15 @@
this.initMainData.HSupNumber = dataArray[0].渚涘簲鍟嗕唬鐮�==null?"":dataArray[0].渚涘簲鍟嗕唬鐮�;
this.initMainData.HSupName = dataArray[0].渚涘簲鍟�==null?"":dataArray[0].渚涘簲鍟�;
this.initMainData.HBatchNo = dataArray[0].鎵瑰彿==null?"":dataArray[0].鎵瑰彿;
- this.initMainData.HQty_SourceBill = (dataArray[0].鏁伴噺 * 1) - (dataArray[0].宸茬敓鎴愭潯鐮佹暟閲� * 1);
+ this.initMainData.HQty_SourceBill = ((dataArray[0].鏁伴噺 * 1) - (dataArray[0].宸茬敓鎴愭潯鐮佹暟閲� * 1))<0?0:((dataArray[0].鏁伴噺 * 1) - (dataArray[0].宸茬敓鎴愭潯鐮佹暟閲� * 1));
this.initMainData.HReInspectionFlag = dataArray[0].澶嶆鏍囪==1?true:false;
this.initMainData.HInspectionCycle = dataArray[0].澶嶆鏍囪==1?dataArray[0].澶嶆鍛ㄦ湡:0;
this.initMainData.HInspectionDate = dataArray[0].澶嶆鏍囪==1?moment(dataArray[0].妫�楠屾棩鏈�).format('YYYY-MM-DD'):null;
this.initMainData.HReInspectionDate = dataArray[0].澶嶆鏍囪==1?moment(dataArray[0].妫�楠屾棩鏈�).add(dataArray[0].澶嶆鍛ㄦ湡,"days").format('YYYY-MM-DD') :null;
this.initMainData.HPOOrderBillMTO = dataArray[0].閲囪喘璺熻釜鍙�;
+ this.initMainData.HSeOrderBillNo = dataArray[0].瀹㈡埛璁㈠崟鍙�;
+ this.initMainData.HCusModel = dataArray[0].浜у搧鍨嬪彿;
+ this.initMainData.HMTONo = dataArray[0].璁″垝璺熻釜鍙�;
this.initMainData.HMinQty = 0;
if(this.initMainData.HMinQty>0){
this.initMainData.HBQty = (this.initMainData.HQty_SourceBill / this.initMainData.HMinQty) + (this.initMainData.HQty_SourceBill%this.initMainData.HMinQty == 0?0:1);
@@ -636,7 +680,7 @@
SaveBarCodeCreate(sMainSub, CampanyName) {
axios({
method: 'post',
- url: this.baseURL + "/Sc_BarCode/Sub_SaveBill_JinLong",
+ url: this.$baseUrl + "/Sc_BarCode/Sub_SaveBill_JinLong",
data: {
"msg": sMainSub, "CampanyName": CampanyName
},
--
Gitblit v1.9.1