From 7b849f06f0b0986b3955c1d1d91a0b2a79fa7ea6 Mon Sep 17 00:00:00 2001
From: 陈婷婷 <506607603@qq.com>
Date: 星期二, 31 三月 2026 08:40:05 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI
---
src/views/scMould/warehouse/Sc_MouldOutRequestBillList.vue | 4
src/views/scMould/warehouse/Sc_MouldProdBackBillEdit.vue | 27 +++++++-
src/views/scMould/warehouse/Sc_MouldProdOutBillEdit.vue | 27 +++++++-
src/views/scMould/warehouse/Sc_MouldProdMoveBillList.vue | 6 +-
src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillList.vue | 2
src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillEdit.vue | 15 +++++
src/views/scMould/warehouse/Sc_MouldProdMoveBillEdit.vue | 25 +++++++-
src/views/component/printList/index.vue | 5 +
src/views/warehouse/barcodeMaster/Gy_BarCodeBill_JinLong.vue | 2
src/views/logistics/transportGPS/WL_YayBill.vue | 10 ++-
src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue | 5 +
src/views/scMould/warehouse/Sc_MouldInRequestBillEdit.vue | 16 +++++
src/views/warehouse/barcodeMaster/Gy_BarCodeBill_JinLong_AutoLogin.vue | 2
src/views/scMould/warehouse/Sc_MouldOutRequestBillEdit.vue | 16 +++++
14 files changed, 136 insertions(+), 26 deletions(-)
diff --git a/src/views/component/printList/index.vue b/src/views/component/printList/index.vue
index 788bd9d..54d0aaa 100644
--- a/src/views/component/printList/index.vue
+++ b/src/views/component/printList/index.vue
@@ -8,7 +8,7 @@
<el-table v-loading="loading" :data="printdata" ref="printTable" max-height="540"
@selection-change="handleSelectionChange" :row-class-name="rowSysIndex" border>
<el-table-column type="selection" width="55" align="center" />
- <el-table-column align="center" label="妯″潡浠ｇ爜" prop="HNumber" />
+ <el-table-column align="center" label="妯″潡浠ｇ爜" prop="HNumber" v-if="hideFlag" />
<el-table-column align="center" label="妯℃澘鍚嶇О" prop="妯℃澘鍚嶇О" />
</el-table>
</el-form>
@@ -57,7 +57,8 @@
colTitleName: '',
tableIns: null,
option: {},
- tableData: []
+ tableData: [],
+ hideFlag:false, //闅愯棌鏍囪銆傜敤浜庤缃煇浜涗笉甯屾湜鏄剧ず鐨勬爣绛� // 褰撳墠閫変腑鐨勮
}
},
created() {
diff --git a/src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue b/src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue
index a4fcc36..c17e08d 100644
--- a/src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue
+++ b/src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue
@@ -1293,6 +1293,10 @@
var existingData = this.editData || [];
var orginHQTY = 0;
+
+
+
+
// 鍒涘缓鐗╂枡ID鏄犲皠
var materialMap = {};
for (var i = 0; i < dataArray.length; i++) {
@@ -1522,6 +1526,7 @@
return null;
}
},
+ //#endregion
//#region 宸ュ叿鏍忔寜閽搷浣�
//#region 缂栬緫鎻愪氦淇濆瓨
submitForm() {
diff --git a/src/views/logistics/transportGPS/WL_YayBill.vue b/src/views/logistics/transportGPS/WL_YayBill.vue
index f0fb9a1..4a67634 100644
--- a/src/views/logistics/transportGPS/WL_YayBill.vue
+++ b/src/views/logistics/transportGPS/WL_YayBill.vue
@@ -274,7 +274,7 @@
<el-input v-model="formVolume.鍗曟嵁鍙�" placeholder="璇疯緭鍏ュ崟鎹彿" disabled />
</el-form-item>
<el-form-item label="闆跺崟鍗犵敤浣撶Н">
- <el-input-number v-model="formVolume.currentVolume" placeholder="璇疯緭鍏ラ浂鍗曞崰鐢ㄤ綋绉�" />
+ <el-input-number v-model="formVolume.currentVolume" :placeholder="`闆舵媴浣撶Н: ${formVolume.闆舵媴浣撶Н || 0}`" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@@ -860,6 +860,7 @@
HInterID: 0,
HEntryID0: 0,
currentVolume: 0,
+
鍗曟嵁鍙�: ''
}
},
@@ -895,6 +896,7 @@
cancelVolume() {
this.openVolume = false
this.resetVolume()
+ this.handleQuery()
},
//#region 缁存姢闆跺崟鍗犵敤浣撶Н鎻愪氦
set_HScatteredVolumeList() {
@@ -1352,9 +1354,9 @@
this.$refs.carDriverForm.validate((valid) => {
if (valid) {
axios({
- method: 'post',
- url: this.baseURL + "/WLYayBillController/selectDriver1",
- data: {
+ method: 'GET',
+ url: this.baseURL + "WLYayBillController/selectDriver1",
+ params: {
"CarHNumber": this.carDriverForm.CarHNumber,
"CarHName": this.carDriverForm.CarHName,
"DriverHName": this.carDriverForm.DriverHName,
diff --git a/src/views/scMould/warehouse/Sc_MouldInRequestBillEdit.vue b/src/views/scMould/warehouse/Sc_MouldInRequestBillEdit.vue
index af864ed..eb3a114 100644
--- a/src/views/scMould/warehouse/Sc_MouldInRequestBillEdit.vue
+++ b/src/views/scMould/warehouse/Sc_MouldInRequestBillEdit.vue
@@ -92,6 +92,16 @@
</el-input>
</el-form-item>
</el-col>
+ <el-col :span="6">
+ <el-form-item v-show="HIsShow" label="瀛愬崟鎹被鍨�" prop="HBillSubType">
+ <el-select v-model="form.HBillSubType" placeholder="璇烽�夋嫨瀛愬崟鎹被鍨�">
+ <el-option label="鍙戣揣" value="鍙戣揣"></el-option>
+ <el-option label="瀹㈣繑" value="瀹㈣繑"></el-option>
+ <el-option label="渚涘簲鍟嗙鍊�" value="渚涘簲鍟嗙鍊�"></el-option>
+ <el-option label="渚涘簲鍟嗚繑杩�" value="渚涘簲鍟嗚繑杩�"></el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
</el-row>
<el-row>
<el-col :span="12">
@@ -305,6 +315,7 @@
HIsShow: true,
HIsHide: false,
HModName: "Sc_MouldInRequestBill",
+ HBillSubType:'',
formShow: false,
temp: undefined,
formLoading: true,
@@ -388,6 +399,9 @@
],
HStockOrgID: [
{ required: true, message: "缁勭粐涓嶈兘涓虹┖", trigger: "blur" }
+ ],
+ HBillSubType: [
+ { required: true, message: "瀛愬崟鎹被鍨嬩笉鑳戒负绌�", trigger: "blur" }
],
HEmpName: [
{ required: true, message: "涓氬姟鍛樹笉鑳戒负绌�", trigger: "blur" }
@@ -558,6 +572,7 @@
HInterID: 0,
HDate: new Date(),
HStockOrgID:sessionStorage["OrganizationID"] - 0,
+ HBillSubType: '',
HSupTypeID:1,
HSupName:'',
HSupID:0,
@@ -787,6 +802,7 @@
, "HExplanation": data.鎽樿
, "HRemark": data.琛ㄥご澶囨敞
, "HStockOrgID": data.HStockOrgID
+ , "HBillSubType": data.瀛愬崟鎹被鍨�
, "HMaker": data.鍒跺崟浜�
, "HMakeDate": data.鍒跺崟鏃ユ湡 == null ? "" : data.鍒跺崟鏃ユ湡
diff --git a/src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillEdit.vue b/src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillEdit.vue
index 498047e..84e8091 100644
--- a/src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillEdit.vue
+++ b/src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillEdit.vue
@@ -31,6 +31,16 @@
</el-select>
</el-form-item>
</el-col>
+ <el-col :span="12">
+ <el-form-item label="瀛愬崟鎹被鍨�" prop="HBillSubType">
+ <el-select v-model="form.HBillSubType" placeholder="璇烽�夋嫨瀛愬崟鎹被鍨�">
+ <el-option label="鍙戣揣" value="鍙戣揣"></el-option>
+ <el-option label="瀹㈣繑" value="瀹㈣繑"></el-option>
+ <el-option label="渚涘簲鍟嗙鍊�" value="渚涘簲鍟嗙鍊�"></el-option>
+ <el-option label="渚涘簲鍟嗚繑杩�" value="渚涘簲鍟嗚繑杩�"></el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
</el-row>
<el-row>
<el-col :span="6">
@@ -440,6 +450,9 @@
HStockInOrgID: [
{ required: true, message: "璋冨叆缁勭粐涓嶈兘涓虹┖", trigger: "blur" }
],
+ HBillSubType: [
+ { required: true, message: "瀛愬崟鎹被鍨嬩笉鑳戒负绌�", trigger: "blur" }
+ ],
HStockOutOrgID: [
{ required: true, message: "璋冨嚭缁勭粐涓嶈兘涓虹┖", trigger: "blur" }
],
@@ -625,6 +638,7 @@
HInterID: 0,
HDate: new Date(),
HStockInOrgID:sessionStorage["OrganizationID"] - 0,
+ HBillSubType: '',
HSupTypeID:1,
HSupName:'',
HSupID:0,
@@ -865,6 +879,7 @@
, "HRemark": data.琛ㄥご澶囨敞
, "HStockInOrgID": data.HStockInOrgID
, "HStockOutOrgID": data.HStockOutOrgID
+ ,"HBillSubType": data.瀛愬崟鎹被鍨�
, "HMaker": data.鍒跺崟浜�
, "HMakeDate": data.鍒跺崟鏃ユ湡 == null ? "" : data.鍒跺崟鏃ユ湡
diff --git a/src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillList.vue b/src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillList.vue
index 16cd1c0..6c4c68e 100644
--- a/src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillList.vue
+++ b/src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillList.vue
@@ -149,7 +149,7 @@
</el-col>
<el-col :span="1.5">
<el-button type="primary" icon="el-icon-edit-outline" size="mini" :disabled="single"
- @click="set_CheckBill(2, form = rowForm)">杩斿鏍�</el-button>
+ @click="set_CheckBill(2, form = rowForm)">鍙嶅鏍�</el-button>
</el-col>
<!-- <el-col :span="1.5">
<el-button type="primary" icon="el-icon-download" size="mini" @click="handleExport">瀵煎嚭</el-button>
diff --git a/src/views/scMould/warehouse/Sc_MouldOutRequestBillEdit.vue b/src/views/scMould/warehouse/Sc_MouldOutRequestBillEdit.vue
index dd93ce1..ff7defe 100644
--- a/src/views/scMould/warehouse/Sc_MouldOutRequestBillEdit.vue
+++ b/src/views/scMould/warehouse/Sc_MouldOutRequestBillEdit.vue
@@ -92,6 +92,16 @@
</el-input>
</el-form-item>
</el-col>
+ <el-col :span="6">
+ <el-form-item v-show="HIsShow" label="瀛愬崟鎹被鍨�" prop="HBillSubType">
+ <el-select v-model="form.HBillSubType" placeholder="璇烽�夋嫨瀛愬崟鎹被鍨�">
+ <el-option label="鍙戣揣" value="鍙戣揣"></el-option>
+ <el-option label="瀹㈣繑" value="瀹㈣繑"></el-option>
+ <el-option label="渚涘簲鍟嗙鍊�" value="渚涘簲鍟嗙鍊�"></el-option>
+ <el-option label="渚涘簲鍟嗚繑杩�" value="渚涘簲鍟嗚繑杩�"></el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
</el-row>
<el-row>
<el-col :span="6">
@@ -338,6 +348,7 @@
hSupTypeList: [{name:'渚涘簲鍟�',id:1,},{name:'瀹㈡埛',id:2},{name:'杞﹂棿閮ㄩ棬',id:3}],
HSourceBillTypes:[],
addBtnShow: false,
+ HBillSubType: '',
zbIndex: null,
zbSelForm: {},//瀛愯〃閫変腑鏁版嵁
dialogTypeNum: null,//閮ㄩ棬寮圭獥1锛屼粨搴撳脊绐�2
@@ -415,6 +426,9 @@
],
HStockOrgID: [
{ required: true, message: "缁勭粐涓嶈兘涓虹┖", trigger: "blur" }
+ ],
+ HBillSubType: [
+ { required: true, message: "瀛愬崟鎹被鍨嬩笉鑳戒负绌�", trigger: "blur" }
],
HEmpName: [
{ required: true, message: "涓氬姟鍛樹笉鑳戒负绌�", trigger: "blur" }
@@ -717,6 +731,7 @@
HDate: new Date(),
HStockOrgID:sessionStorage["OrganizationID"] - 0,
HSupTypeID:1,
+ HBillSubType: '',
HSupName:'',
HSupID:0,
HDeptName: '',
@@ -946,6 +961,7 @@
, "HExplanation": data.鎽樿
, "HRemark": data.琛ㄥご澶囨敞
, "HStockOrgID": data.HStockOrgID
+ , "HBillSubType": data.瀛愬崟鎹被鍨�
, "HMaker": data.鍒跺崟浜�
, "HMakeDate": data.鍒跺崟鏃ユ湡 == null ? "" : data.鍒跺崟鏃ユ湡
diff --git a/src/views/scMould/warehouse/Sc_MouldOutRequestBillList.vue b/src/views/scMould/warehouse/Sc_MouldOutRequestBillList.vue
index a60fcac..119e219 100644
--- a/src/views/scMould/warehouse/Sc_MouldOutRequestBillList.vue
+++ b/src/views/scMould/warehouse/Sc_MouldOutRequestBillList.vue
@@ -153,7 +153,7 @@
</el-col>
<el-col :span="1.5">
<el-button type="primary" icon="el-icon-edit-outline" size="mini" :disabled="single"
- @click="set_CheckBill(2, form = rowForm)">杩斿鏍�</el-button>
+ @click="set_CheckBill(2, form = rowForm)">鍙嶅鏍�</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="primary" icon="el-icon-edit-outline" size="mini" :disabled="multiple"
@@ -161,7 +161,7 @@
</el-col>
<el-col :span="1.5">
<el-button type="primary" icon="el-icon-edit-outline" size="mini" :disabled="multiple"
- @click="set_CheckBillAll(2, ids)">杩斿鏍�(鎵归噺)</el-button>
+ @click="set_CheckBillAll(2, ids)">鍙嶅鏍�(鎵归噺)</el-button>
</el-col>
<!-- <el-col :span="1.5">
<el-button type="primary" icon="el-icon-download" size="mini" @click="handleExport">瀵煎嚭</el-button>
diff --git a/src/views/scMould/warehouse/Sc_MouldProdBackBillEdit.vue b/src/views/scMould/warehouse/Sc_MouldProdBackBillEdit.vue
index f938ab8..4ceb76d 100644
--- a/src/views/scMould/warehouse/Sc_MouldProdBackBillEdit.vue
+++ b/src/views/scMould/warehouse/Sc_MouldProdBackBillEdit.vue
@@ -114,6 +114,16 @@
<el-input v-model="form.HInnerBillNo" placeholder="璇疯緭鍏�" />
</el-form-item>
</el-col>
+ <el-col :span="6">
+ <el-form-item v-show="HIsShow" label="瀛愬崟鎹被鍨�" prop="HBillSubType">
+ <el-select v-model="form.HBillSubType" placeholder="璇烽�夋嫨瀛愬崟鎹被鍨�">
+ <el-option label="鍙戣揣" value="鍙戣揣"></el-option>
+ <el-option label="瀹㈣繑" value="瀹㈣繑"></el-option>
+ <el-option label="渚涘簲鍟嗙鍊�" value="渚涘簲鍟嗙鍊�"></el-option>
+ <el-option label="渚涘簲鍟嗚繑杩�" value="渚涘簲鍟嗚繑杩�"></el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
</el-row>
<el-row>
<el-col :span="12">
@@ -404,6 +414,7 @@
HModName: "Sc_MouldProdBackBillEdit",
formShow: false,
temp: undefined,
+ HBillSubType: '',
formLoading: true,
zzSelDis: false,
rowHideShow: false,
@@ -489,6 +500,9 @@
],
HStockOrgID: [
{ required: true, message: "缁勭粐涓嶈兘涓虹┖", trigger: "blur" }
+ ],
+ HBillSubType: [
+ { required: true, message: "瀛愬崟鎹被鍨嬩笉鑳戒负绌�", trigger: "blur" }
],
HSecManagerName: [
{ required: true, message: "楠屾敹鍛樹笉鑳戒负绌�", trigger: "blur" }
@@ -598,6 +612,7 @@
this.form.HDeptID = data.HDeptID
this.form.HDeptName = data.HDeptName
this.form.HStockOrgID = data.HStockOrgID == null ? 0 : data.HStockOrgID
+ this.form.HBillSubType = data.HBillSubType
this.ifOrganizationEdit = true
console.log(dataArray)
//瀛愯〃 璧嬪��
@@ -792,6 +807,7 @@
HInterID: 0,
HDate: new Date(),
HStockOrgID:sessionStorage["OrganizationID"] - 0,
+ HBillSubType:'',
HSupTypeID: 1,
HSupName:'',
HSupID:0,
@@ -1065,6 +1081,7 @@
, "HChecker": data[0].瀹℃牳浜�
, "HCloseMan": data[0].鍏抽棴浜�
, "HUpDater": data[0].淇敼浜�
+ ,"HBillSubType": data[0].瀛愬崟鎹被鍨�
, "HDeleteMan": data[0].浣滃簾浜�
, "HMakeDate": data[0].鍒跺崟鏃ユ湡 == null ? "" : data[0].鍒跺崟鏃ユ湡
, "HCheckDate": data[0].瀹℃牳鏃ユ湡 == null ? "" : data[0].瀹℃牳鏃ユ湡
@@ -1261,10 +1278,12 @@
}else if(!item.HWHID){
fhck = true
this.$modal.msgError("绗�" + (index + 1) + "琛岋細璋冨叆浠撳簱鏈�夋嫨锛�");
- }else if(!item.HUnitID){
- fhck = true
- this.$modal.msgError("绗�" + (index + 1) + "琛岋細璁￠噺鍗曚綅涓虹┖锛�");
- }else if(item.HQty == 0){
+ }
+ // else if(!item.HUnitID){
+ // fhck = true
+ // this.$modal.msgError("绗�" + (index + 1) + "琛岋細璁￠噺鍗曚綅涓虹┖锛�");
+ // }
+ else if(item.HQty == 0){
fhck = true
this.$modal.msgError("绗�" + (index + 1) + "琛岋細鏁伴噺涓嶈兘涓�0锛�");
}
diff --git a/src/views/scMould/warehouse/Sc_MouldProdMoveBillEdit.vue b/src/views/scMould/warehouse/Sc_MouldProdMoveBillEdit.vue
index 6c13da1..282f30d 100644
--- a/src/views/scMould/warehouse/Sc_MouldProdMoveBillEdit.vue
+++ b/src/views/scMould/warehouse/Sc_MouldProdMoveBillEdit.vue
@@ -56,6 +56,14 @@
</el-select>
</el-form-item>
</el-col>
+ <el-form-item label="瀛愬崟鎹被鍨�" prop="HBillSubType">
+ <el-select v-model="form.HBillSubType" placeholder="璇烽�夋嫨瀛愬崟鎹被鍨�">
+ <el-option label="鍙戣揣" value="鍙戣揣"></el-option>
+ <el-option label="瀹㈣繑" value="瀹㈣繑"></el-option>
+ <el-option label="渚涘簲鍟嗙鍊�" value="渚涘簲鍟嗙鍊�"></el-option>
+ <el-option label="渚涘簲鍟嗚繑杩�" value="渚涘簲鍟嗚繑杩�"></el-option>
+ </el-select>
+ </el-form-item>
</el-row>
<el-row>
<el-col :span="6">
@@ -447,6 +455,7 @@
zzSelDis: false,
rowHideShow: false,
openRowHide: false,
+ HBillSubType: '',
hSupTypeList: [{name:'渚涘簲鍟�',id:1,},{name:'瀹㈡埛',id:2},{name:'杞﹂棿閮ㄩ棬',id:3}],
HSourceBillTypes:[],
addBtnShow: false,
@@ -532,6 +541,9 @@
],
HStockOutOrgID: [
{ required: true, message: "璋冨嚭缁勭粐涓嶈兘涓虹┖", trigger: "blur" }
+ ],
+ HBillSubType: [
+ { required: true, message: "瀛愬崟鎹被鍨嬩笉鑳戒负绌�", trigger: "blur" }
],
HSecManagerName: [
{ required: true, message: "楠屾敹鍛樹笉鑳戒负绌�", trigger: "blur" }
@@ -647,6 +659,7 @@
this.form.HDeptID = data.HDeptID
this.form.HDeptName = data.HDeptName
this.form.HStockOrgID = data.HStockOutOrgID
+ this.form.HBillSubType = data.HBillSubType
this.form.HStockInOrgID = data.HStockInOrgID == null ? 0 : data.HStockInOrgID
this.form.HStockOutOrgID = data.HStockOutOrgID == null ? 0 : data.HStockOutOrgID
this.ifOrganizationEdit = true
@@ -952,6 +965,7 @@
HSupName:'',
HSupID:0,
HStockOutOrgID:sessionStorage["OrganizationID"] - 0,
+ HBillSubType: '',
HDeptName: '',
HDeptID: 0,
HWHName:'',
@@ -1137,6 +1151,7 @@
, "HInnerBillNo": data[0].鍐呴儴鍗曟嵁鍙�
, "HStockInOrgID": data[0].HStockInOrgID
, "HStockOutOrgID": data[0].HStockOutOrgID
+ , "HBillSubType": data[0].瀛愬崟鎹被鍨�
, "HMaker": data[0].鍒跺崟浜�
, "HChecker": data[0].瀹℃牳浜�
, "HCloseMan": data[0].鍏抽棴浜�
@@ -1341,10 +1356,12 @@
}else if(!item.HSCWHID){
fhck = true
this.$modal.msgError("绗�" + (index + 1) + "琛岋細璋冨嚭浠撳簱鏈�夋嫨锛�");
- }else if(!item.HUnitID){
- fhck = true
- this.$modal.msgError("绗�" + (index + 1) + "琛岋細璁￠噺鍗曚綅涓虹┖锛�");
- }else if(item.HQty == 0){
+ }
+ // else if(!item.HUnitID){
+ // fhck = true
+ // this.$modal.msgError("绗�" + (index + 1) + "琛岋細璁￠噺鍗曚綅涓虹┖锛�");
+ // }
+ else if(item.HQty == 0){
fhck = true
this.$modal.msgError("绗�" + (index + 1) + "琛岋細鏁伴噺涓嶈兘涓�0锛�");
}
diff --git a/src/views/scMould/warehouse/Sc_MouldProdMoveBillList.vue b/src/views/scMould/warehouse/Sc_MouldProdMoveBillList.vue
index 3153912..1ec9039 100644
--- a/src/views/scMould/warehouse/Sc_MouldProdMoveBillList.vue
+++ b/src/views/scMould/warehouse/Sc_MouldProdMoveBillList.vue
@@ -123,10 +123,10 @@
</el-collapse>
</el-form>
<el-row :gutter="10" class="mb8" style="margin-top: 10px;">
- <el-col :span="1.5">
+ <!-- <el-col :span="1.5">
<el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAddEdit(OperationType = 1)"
id="btn-Add">鏂板</el-button>
- </el-col>
+ </el-col> -->
<el-col :span="1.5">
<el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single"
@click="handleEdit(row = rowForm, OperationType = 2)">缂栬緫</el-button>
@@ -145,7 +145,7 @@
</el-col>
<el-col :span="1.5">
<el-button type="primary" icon="el-icon-edit-outline" size="mini" :disabled="single"
- @click="set_CheckBill(2, form = rowForm)">杩斿鏍�</el-button>
+ @click="set_CheckBill(2, form = rowForm)">鍙嶅鏍�</el-button>
</el-col>
<!-- <el-col :span="1.5">
<el-button type="primary" icon="el-icon-download" size="mini" @click="handleExport">瀵煎嚭</el-button>
diff --git a/src/views/scMould/warehouse/Sc_MouldProdOutBillEdit.vue b/src/views/scMould/warehouse/Sc_MouldProdOutBillEdit.vue
index e594156..c371703 100644
--- a/src/views/scMould/warehouse/Sc_MouldProdOutBillEdit.vue
+++ b/src/views/scMould/warehouse/Sc_MouldProdOutBillEdit.vue
@@ -114,6 +114,16 @@
<el-input v-model="form.HInnerBillNo" placeholder="璇疯緭鍏�" />
</el-form-item>
</el-col>
+ <el-col :span="6">
+ <el-form-item v-show="HIsShow" label="瀛愬崟鎹被鍨�" prop="HBillSubType">
+ <el-select v-model="form.HBillSubType" placeholder="璇烽�夋嫨瀛愬崟鎹被鍨�">
+ <el-option label="鍙戣揣" value="鍙戣揣"></el-option>
+ <el-option label="瀹㈣繑" value="瀹㈣繑"></el-option>
+ <el-option label="渚涘簲鍟嗙鍊�" value="渚涘簲鍟嗙鍊�"></el-option>
+ <el-option label="渚涘簲鍟嗚繑杩�" value="渚涘簲鍟嗚繑杩�"></el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
</el-row>
<el-row>
<el-col :span="12">
@@ -409,6 +419,7 @@
formShow: false,
temp: undefined,
formLoading: true,
+ HBillSubType: '',
zzSelDis: false,
rowHideShow: false,
openRowHide: false,
@@ -493,6 +504,9 @@
],
HStockOrgID: [
{ required: true, message: "缁勭粐涓嶈兘涓虹┖", trigger: "blur" }
+ ],
+ HBillSubType: [
+ { required: true, message: "瀛愬崟鎹被鍨嬩笉鑳戒负绌�", trigger: "blur" }
],
HSecManagerName: [
{ required: true, message: "楠屾敹鍛樹笉鑳戒负绌�", trigger: "blur" }
@@ -601,6 +615,7 @@
this.form.HSecManagerName = data.HSecManagerName
this.form.HDeptID = data.HDeptID
this.form.HDeptName = data.HDeptName
+ this.form.HBillSubType = data.HBillSubType
this.form.HStockOrgID = data.HStockOrgID == null ? 0 : data.HStockOrgID
this.ifOrganizationEdit = true
//瀛愯〃 璧嬪��
@@ -796,6 +811,7 @@
HDate: new Date(),
HStockOrgID:sessionStorage["OrganizationID"] - 0,
HSupTypeID: 1,
+ HBillSubType: '',
HSupName:'',
HSupID:0,
HDeptName: '',
@@ -978,6 +994,7 @@
, "HRemark": data[0].琛ㄥご澶囨敞
, "HInnerBillNo": data[0].鍐呴儴鍗曟嵁鍙�
, "HStockOrgID": data[0].HMainStockOrgID
+ , "HBillSubType": data[0].瀛愬崟鎹被鍨�
, "HMaker": data[0].鍒跺崟浜�
, "HChecker": data[0].瀹℃牳浜�
, "HCloseMan": data[0].鍏抽棴浜�
@@ -1261,10 +1278,12 @@
}else if(!item.HWHID){
fhck = true
this.$modal.msgError("绗�" + (index + 1) + "琛岋細璋冨叆浠撳簱鏈�夋嫨锛�");
- }else if(!item.HUnitID){
- fhck = true
- this.$modal.msgError("绗�" + (index + 1) + "琛岋細璁￠噺鍗曚綅涓虹┖锛�");
- }else if(item.HQty == 0){
+ }
+ // else if(!item.HUnitID){
+ // fhck = true
+ // this.$modal.msgError("绗�" + (index + 1) + "琛岋細璁￠噺鍗曚綅涓虹┖锛�");
+ // }
+ else if(item.HQty == 0){
fhck = true
this.$modal.msgError("绗�" + (index + 1) + "琛岋細鏁伴噺涓嶈兘涓�0锛�");
}
diff --git a/src/views/warehouse/barcodeMaster/Gy_BarCodeBill_JinLong.vue b/src/views/warehouse/barcodeMaster/Gy_BarCodeBill_JinLong.vue
index 5ce937e..64df014 100644
--- a/src/views/warehouse/barcodeMaster/Gy_BarCodeBill_JinLong.vue
+++ b/src/views/warehouse/barcodeMaster/Gy_BarCodeBill_JinLong.vue
@@ -83,7 +83,7 @@
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="鏍囧噯鍖呰鏁�">
+ <el-form-item label="鏁伴噺/绠�">
<el-input-number v-model="initMainData.HMinQty" @change="onChangeForHMinQty" />
</el-form-item>
</el-col>
diff --git a/src/views/warehouse/barcodeMaster/Gy_BarCodeBill_JinLong_AutoLogin.vue b/src/views/warehouse/barcodeMaster/Gy_BarCodeBill_JinLong_AutoLogin.vue
index 5c3d836..c968a9f 100644
--- a/src/views/warehouse/barcodeMaster/Gy_BarCodeBill_JinLong_AutoLogin.vue
+++ b/src/views/warehouse/barcodeMaster/Gy_BarCodeBill_JinLong_AutoLogin.vue
@@ -83,7 +83,7 @@
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="鏍囧噯鍖呰鏁�">
+ <el-form-item label="鏁伴噺/绠�">
<el-input-number v-model="initMainData.HMinQty" @change="onChangeForHMinQty" />
</el-form-item>
</el-col>
--
Gitblit v1.9.1