From cfd0b53967daca92d98cd304e4d4e0577e2efbd3 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期二, 13 一月 2026 13:27:45 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI
---
src/views/warehouse/barcodeMaster/Gy_BarCodeBill_JinLong.vue | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/src/views/warehouse/barcodeMaster/Gy_BarCodeBill_JinLong.vue b/src/views/warehouse/barcodeMaster/Gy_BarCodeBill_JinLong.vue
index a7e7679..9c49619 100644
--- a/src/views/warehouse/barcodeMaster/Gy_BarCodeBill_JinLong.vue
+++ b/src/views/warehouse/barcodeMaster/Gy_BarCodeBill_JinLong.vue
@@ -128,6 +128,16 @@
</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%">
<el-option v-for="(item, index) in HOrganizationList" :key="index" :value="item.ID" :label="item.Name"></el-option>
@@ -211,6 +221,8 @@
,HInspectionCycle:0 //澶嶆鍛ㄦ湡(澶�)
,HReInspectionDate:null //澶嶆鏃ユ湡
,HPOOrderBillMTO:"" //閲囪喘璺熻釜鍙�
+ ,HSeOrderBillNo:"" //瀹㈡埛璁㈠崟鍙�
+ ,HCusModel:"" //浜у搧鍨嬪彿
,HOrganizationID:0 //缁勭粐ID
,HOrganization:"" //缁勭粐鍚嶇О
@@ -271,7 +283,7 @@
tableData_BarCode:[], //鏉＄爜鍒楄〃table 鏁版嵁
RowIndex_BarCode:0, //鏉＄爜鍒楄〃table 琛岀储寮�
- openPrintList:true, //鎵撳嵃寮圭獥鏄剧ず鏍囪
+ openPrintList:false, //鎵撳嵃寮圭獥鏄剧ず鏍囪
printListShow:false, //鎵撳嵃妯℃澘鏁版嵁鏄剧ず鏍囪
selectedData_BarCode:0, //鏉＄爜鍒楄〃table 閫変腑鏁版嵁闆嗗悎
};
@@ -459,7 +471,7 @@
, "HMaterNumber": this.initMainData.HMaterNumber
, "HMaterName": this.initMainData.HMaterName
, "HMaterModel": this.initMainData.HMaterModel
- , "HCusModel": ""
+ , "HCusModel": this.initMainData.HCusModel
, "HCusMaterName": ""
, "HEmpID": 0
, "HEmpNumber": ""
@@ -505,6 +517,7 @@
, "HInspectionCycle": this.initMainData.HInspectionCycle
, "HReInspectionDate": this.initMainData.HReInspectionDate
, "HPOOrderBillMTO": this.initMainData.HPOOrderBillMTO
+ , "HSeOrderBillNo": this.initMainData.HSeOrderBillNo
}
]
@@ -639,6 +652,8 @@
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.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);
--
Gitblit v1.9.1