From cb94238d77ce2bd7d78c5bd6b8baf49705c4af27 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期四, 11 十二月 2025 14:32:07 +0800
Subject: [PATCH] 添加 仓位 打印库位码功能 其他出库单 添加辅助属性 选择
---
src/views/warehouse/barcodeMaster/Gy_BarCodeBill.vue | 44 +++++---
src/views/basic/gyStockPlace/gyStockPlace.vue | 69 ++++++++++++-
src/views/KCGL/OtherOutBill/Kf_OtherOutBillEdit.vue | 27 +++++
src/views/component/printList/hBarPlanPrint.vue | 4
public/static/grf/库位码.grf | 93 ++++++++++++++++++
src/views/basic/gyProperty/gyPropertyList.vue | 6
src/views/warehouse/transfer/Kf_MoveStockRequestBillEdit.vue | 1
7 files changed, 215 insertions(+), 29 deletions(-)
diff --git "a/public/static/grf/\345\272\223\344\275\215\347\240\201.grf" "b/public/static/grf/\345\272\223\344\275\215\347\240\201.grf"
new file mode 100644
index 0000000..d505d0e
--- /dev/null
+++ "b/public/static/grf/\345\272\223\344\275\215\347\240\201.grf"
@@ -0,0 +1,93 @@
+锘縶
+ "Version":"6.8.2.2",
+ "Title":"1a.绠�鍗曡〃鏍�",
+ "Author":"閿愭氮鎶ヨ〃杞欢",
+ "Description":"婕旂ず涓�涓渶鍩烘湰鐨勫垪琛ㄦ姤琛ㄣ��",
+ "Font":{
+ "Name":"瀹嬩綋",
+ "Size":90000,
+ "Weight":400,
+ "Charset":134
+ },
+ "Printer":{
+ "Size":256,
+ "Width":9,
+ "Height":6,
+ "LeftMargin":0,
+ "TopMargin":0,
+ "RightMargin":0,
+ "BottomMargin":0
+ },
+ "DetailGrid":{
+ "CenterView":true,
+ "PrintAdaptMethod":"ResizeToFit",
+ "Recordset":{
+ "ConnectionString":"xml",
+ "QuerySQL":"閿�鍞嚭搴撳崟.txt",
+ "Field":[
+ {
+ "Name":"鏉＄爜缂栧彿"
+ }
+ ]
+ },
+ "Column":[
+ {
+ "Name":"鍗曟嵁鍙�",
+ "Width":8.78417
+ }
+ ],
+ "ColumnContent":{
+ "Height":3.41313,
+ "ColumnContentCell":[
+ {
+ "Column":"鍗曟嵁鍙�",
+ "FreeCell":true,
+ "Control":[
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox1",
+ "Left":0.396875,
+ "Top":0.211667,
+ "Width":8.20208,
+ "Height":2.98979
+ },
+ {
+ "Type":"Barcode",
+ "Name":"Barcode1",
+ "Left":0.211667,
+ "Top":0.396875,
+ "Width":4.39208,
+ "Height":2.59292,
+ "BarcodeType":"QRCode",
+ "Text":"[#鏉＄爜缂栧彿#]"
+ }
+ ]
+ }
+ ]
+ },
+ "ColumnTitle":{
+ "BackColor":"C0C0C0",
+ "Height":0,
+ "Font":{
+ "Name":"瀹嬩綋",
+ "Size":90000,
+ "Bold":true,
+ "Charset":134
+ },
+ "RepeatStyle":"OnPage",
+ "ColumnTitleCell":[
+ {
+ "GroupTitle":false,
+ "Column":"鍗曟嵁鍙�",
+ "BackColor":"FFFFFF",
+ "TextAlign":"MiddleCenter"
+ }
+ ]
+ }
+ },
+ "ReportHeader":[
+ {
+ "Height":0
+ }
+ ]
+}
\ No newline at end of file
diff --git a/src/views/KCGL/OtherOutBill/Kf_OtherOutBillEdit.vue b/src/views/KCGL/OtherOutBill/Kf_OtherOutBillEdit.vue
index 1a2ec36..da00d0b 100644
--- a/src/views/KCGL/OtherOutBill/Kf_OtherOutBillEdit.vue
+++ b/src/views/KCGL/OtherOutBill/Kf_OtherOutBillEdit.vue
@@ -233,7 +233,8 @@
</el-table-column>
<el-table-column align="center" label="杈呭姪灞炴��" width="120">
<template slot-scope="scope">
- <span>{{ scope.row.杈呭姪灞炴�� }}</span>
+ <el-input v-model="scope.row.杈呭姪灞炴��" placeholder="璇疯緭鍏ヨ緟鍔╁睘鎬�" @keyup.native.f7="openDataDialog(5, scope.row)"
+ @dblclick.native="openDataDialog(5, scope.row)" />
</template>
</el-table-column>
<el-table-column align="center" label="HAuxPropID" width="120">
@@ -347,6 +348,12 @@
<Warehouse @deptEmitDb="dbEmitData" @deptEmit="emitData" v-if="warehouseShow" />
<!-- 鐗╂枡 -->
<Material @deptEmitDb="dbEmitData" @deptEmit="emitData" v-if="materialShow" />
+ <GyProperty
+ @deptEmitDb="dbEmitData"
+ @deptEmit="emitData"
+ :openPage="HModName"
+ v-if="PropertyShow"
+ />
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="deptClickSub">纭� 瀹�</el-button>
<el-button @click="deptClose">鍙� 娑�</el-button>
@@ -365,10 +372,11 @@
import Dept from '@/views/component/dept'
import Warehouse from '@/views/component/warehouse'
import Material from '@/views/component/material'
+import GyProperty from "@/views/basic/gyProperty/gyPropertyList.vue";
export default {
name: 'OtherOutBillEdit',
- components: { Dept, Warehouse, Material, RowSettings },
+ components: { Dept, Warehouse, Material, RowSettings,GyProperty, },
props: {
OperationType: { type: Number, },
linterid: { type: Number, },
@@ -403,6 +411,7 @@
warehouseShow: false, //浠撳簱鏁版嵁缁勪欢鏄剧ず鏍囪
materialShow: false, //鐗╂枡鏁版嵁缁勪欢鏄剧ず鏍囪
stockPlaceShow: false, //浠撲綅鏁版嵁缁勪欢鏄剧ず鏍囪
+ PropertyShow: false, //杈呭姪灞炴�ф暟鎹暟缁勬樉绀烘爣璁�
deptform: {}, //寮圭獥閫変腑鏁版嵁
temp: undefined, //涓存椂鍙橀噺
@@ -418,6 +427,8 @@
zbIndex: null,
zbSelForm: {}, //瀛愯〃閫変腑鏁版嵁,鐢ㄤ簬瀛愯〃澶嶅埗銆佷笂绉汇�佷笅绉荤瓑鎿嶄綔
zbRow: null,
+
+ HModName: "Kf_OtherOutBillEdit",
};
},
created() {
@@ -661,6 +672,10 @@
this.dialogTitle = '浠撲綅鍒楄〃'
this.stockPlaceShow = true
this.openData = true
+ }else if(num == 5) {
+ this.dialogTitle = '杈呭姪灞炴�у垪琛�'
+ this.PropertyShow = true
+ this.openData = true
}
},
//#region 灏嗘暟鎹脊绐楀叏閮ㄥ彇娑堝姞杞�
@@ -674,6 +689,7 @@
//#region 寮圭獥鏁版嵁鍙屽嚮杩斿洖琛ㄥ崟璧嬪�间簨浠�
dbEmitData(deptRow, num) {
+ console.log(num)
if (num == 1) {
this.form.HDeptName = deptRow.閮ㄩ棬鍚嶇О //閮ㄩ棬
this.form.HDeptID = deptRow.HItemID
@@ -712,6 +728,13 @@
this.editData[this.zbIndex].HTaxRate = deptRow.榛樿绋庣巼
this.openData = false
}
+ else if (num == "gyProperty") {
+ this.editData[this.zbIndex].HPropertyID = deptRow.HItemID;
+ this.editData[this.zbIndex]["杈呭姪灞炴��"] = deptRow["杈呭姪灞炴�у悕绉�"];
+
+ this.propertyShow = false;
+ this.openData = false;
+ }
},
//#endregion
diff --git a/src/views/basic/gyProperty/gyPropertyList.vue b/src/views/basic/gyProperty/gyPropertyList.vue
index 4edeba4..43aee43 100644
--- a/src/views/basic/gyProperty/gyPropertyList.vue
+++ b/src/views/basic/gyProperty/gyPropertyList.vue
@@ -1164,9 +1164,9 @@
if (this.queryParams.HName) {
this.sWhere += " and 浠撳簱鍚嶇О like '%" + this.queryParams.HName + "%'";
}
- if (this.queryParams.HOrgID) {
- this.sWhere += " and HUSEORGID = '" + this.queryParams.HOrgID + "'";
- }
+ // if (this.queryParams.HOrgID) {
+ // this.sWhere += " and HUSEORGID = '" + this.queryParams.HOrgID + "'";
+ // }
// this.sWhere += this.addSWhereByOpenType()
// this.sWhere += this.getOrgIDByUser()
this.searchOpen = false;
diff --git a/src/views/basic/gyStockPlace/gyStockPlace.vue b/src/views/basic/gyStockPlace/gyStockPlace.vue
index 2fb5766..a743d1c 100644
--- a/src/views/basic/gyStockPlace/gyStockPlace.vue
+++ b/src/views/basic/gyStockPlace/gyStockPlace.vue
@@ -1,5 +1,5 @@
<template>
- <div style="padding: 10px;position: relative">
+ <div style="padding: 10px; position: relative">
<el-form
:model="queryParams"
ref="queryForm"
@@ -200,6 +200,16 @@
</el-collapse>
</el-form>
<el-row :gutter="10" class="mb8">
+ <el-col :span="1.5">
+ <el-button
+ type="primary"
+ icon="el-icon-plus"
+ size="mini"
+ @click="get_PrintReport"
+ id="btn-printer"
+ >搴撲綅鐮佹墦鍗�</el-button
+ >
+ </el-col>
<el-col :span="1.5">
<el-button
type="primary"
@@ -411,6 +421,22 @@
/>
</el-dialog>
</div>
+ <el-dialog
+ title="鎵撳嵃妯℃澘閫夋嫨"
+ :visible.sync="openPrintList"
+ width="800px"
+ append-to-body
+ >
+ <PrintList
+ :linterid="encodeURI(rowSel.toString())"
+ :MyMsg="rowSel.toString()"
+ Type="HGyStockPlaceBarCode"
+ HModName="HGyStockPlaceBarCode"
+ @rowEditClose="rowSetClose"
+ v-if="printListShow"
+ />
+ <!-- <div>111</div> -->
+ </el-dialog>
</div>
</template>
@@ -419,18 +445,21 @@
import RowSettings from "@/views/component/rowSettings";
import Edit from "@/views/basic/gyStockPlace/gyStockPlaceEdit";
import GyStockPlace from "@/views/basic/gyStockPlace/gyStockPlace";
+import PrintList from "@/views/component/printList";
export default {
name: "GyStockPlace",
- components: { RowSettings, Edit, GyStockPlace },
+ components: { RowSettings, Edit, GyStockPlace, PrintList },
props: {
openPage: { type: String },
},
data() {
return {
+ rowSel: [],
+ danganSelList: [],
editRef: null,
activeSeach: "",
- HModName: "Gy_Warehouse",
+ HModName: "Gy_StockPlace",
editShow: false,
openEdit: false,
totalNameList: [],
@@ -596,6 +625,33 @@
}
} catch (err) {
this.$modal.msgError(`鎺ュ彛璇锋眰澶辫触: ${err}`);
+ }
+ },
+ get_PrintReport() {
+ if (this.danganSelList.length == 0) {
+ this.$modal.msgError("璇烽�夋嫨鏁版嵁");
+ } else {
+ this.rowSel = [];
+ for (var i = 0; i < this.danganSelList.length; i++) {
+ this.rowSel.push(`'${this.danganSelList[i]['鏉＄爜缂栧彿'].toString()}'`);
+ }
+ this.printListShow = true;
+ this.openPrintList = true;
+ // axios.get(this.baseURL + "/Kf_SellOutBill/CheckSellOutBill_IsExist", {
+ // params: { HInterID: this.rowForm.hmainid },
+ // })
+ // .then((response) => {
+ // var result = response.data;
+ // if (result.count == 1) {
+ // this.printListShow = true;
+ // this.openPrintList = true;
+ // } else {
+ // this.$modal.msgError(result.code + result.Message);
+ // }
+ // })
+ // .catch((error) => {
+ // this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ // });
}
},
getSummaries(param) {
@@ -979,7 +1035,7 @@
},
//閫変腑琛岄珮浜牱寮�
rowStyle({ row, rowIndex }) {
- if (this.ids.includes(row.hmainid)) {
+ if (this.ids.includes(row.HItemID)) {
return { background: "#ecf5ff" };
}
},
@@ -994,6 +1050,9 @@
},
// 澶氶�夋閫変腑鏁版嵁
handleSelectionChange(selection) {
+ console.log(selection)
+ this.danganSelList = selection;
+
// this.rowForm = {}
if (this.openPage) {
//鍒楄〃鍗曢��
@@ -1189,7 +1248,7 @@
},
//鎵撳紑淇敼缁勪欢寮圭獥
handleEdit(row) {
- this.rowForm = row
+ this.rowForm = row;
this.$nextTick(() => {
this.openEdit = true;
this.editShow = true;
diff --git a/src/views/component/printList/hBarPlanPrint.vue b/src/views/component/printList/hBarPlanPrint.vue
index bb2b415..3418a8e 100644
--- a/src/views/component/printList/hBarPlanPrint.vue
+++ b/src/views/component/printList/hBarPlanPrint.vue
@@ -45,6 +45,10 @@
sql = "select * from h_v_IF_BarCodeBillList where hmainid in(" + this.handleMessage.linterid.toString() + ") order by hmainid desc"
}else if (this.$route.query.Type == 'HPOInStockBill') {
sql = "select * from h_v_Sc_PrintMouldProdOutBillList where hmainid=" + this.handleMessage.linterid.toString()+ " order by hmainid"
+ }else if(this.$route.query.Type == 'HGyStockPlaceBarCode') {
+ let condition = decodeURI(this.handleMessage.linterid.toString())
+ console.log(condition)
+ sql = "select * from h_v_IF_StockPlaceList where 鏉＄爜缂栧彿 in (" + condition + ") order by HItemID"
}
axios.get(this.baseURL + '/CommonModel/searchMethod', {
params: {
diff --git a/src/views/warehouse/barcodeMaster/Gy_BarCodeBill.vue b/src/views/warehouse/barcodeMaster/Gy_BarCodeBill.vue
index 0a80611..166f8e7 100644
--- a/src/views/warehouse/barcodeMaster/Gy_BarCodeBill.vue
+++ b/src/views/warehouse/barcodeMaster/Gy_BarCodeBill.vue
@@ -51,7 +51,7 @@
<el-col :span="6">
<el-form-item label="閫夊崟鍙�" prop="HSourceBillNo">
<el-input v-model="form.HSourceBillNo" placeholder="璇疯緭鍏ラ�夊崟鍙�" disabled>
- <el-button slot="append" icon="el-icon-search" @click="openDataDialog(openNum)"></el-button>
+ <el-button class="input-search-btn" slot="append" icon="el-icon-search" @click="openDataDialog(openNum)"></el-button>
</el-input>
</el-form-item>
</el-col>
@@ -93,6 +93,22 @@
show-overflow-tooltip>
<template slot-scope="scope">{{ scope.row.HMaterModel }}</template>
</el-table-column>
+
+ <el-table-column align="center" label="鏁伴噺" prop="HQty" width="120" show-overflow-tooltip>
+ <template slot-scope="scope">
+ <el-input-number v-model="scope.row.HQty" :min="0" controls-position="right"
+ style="width: 100%;" @change="editMainTable(scope.row)" />
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="鏈�灏忓寘瑁呮暟" prop="HMinQty" width="120" show-overflow-tooltip>
+ <template slot-scope="scope">
+ <el-input-number v-model="scope.row.HMinQty" :min="0" controls-position="right"
+ style="width: 100%;" @change="editMainTable(scope.row)" />
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="绠辨暟" prop="HBQty" width="120" show-overflow-tooltip>
+ <template slot-scope="scope">{{ scope.row.HBQty }}</template>
+ </el-table-column>
<el-table-column align="center" label="瀹㈡埛瑙勬牸鍨嬪彿" prop="HCusModel" width="120"
show-overflow-tooltip>
<template slot-scope="scope"><el-input v-model="scope.row.HCusModel" /></template>
@@ -126,21 +142,7 @@
<el-table-column align="center" label="璁″垝璺熻釜鍙�" prop="HMTONo" width="120" show-overflow-tooltip>
<template slot-scope="scope"><el-input v-model="scope.row.HMTONo" /></template>
</el-table-column>
- <el-table-column align="center" label="鏁伴噺" prop="HQty" width="120" show-overflow-tooltip>
- <template slot-scope="scope">
- <el-input-number v-model="scope.row.HQty" :min="0" controls-position="right"
- style="width: 100%;" @change="editMainTable(scope.row)" />
- </template>
- </el-table-column>
- <el-table-column align="center" label="鏈�灏忓寘瑁呮暟" prop="HMinQty" width="120" show-overflow-tooltip>
- <template slot-scope="scope">
- <el-input-number v-model="scope.row.HMinQty" :min="0" controls-position="right"
- style="width: 100%;" @change="editMainTable(scope.row)" />
- </template>
- </el-table-column>
- <el-table-column align="center" label="绠辨暟" prop="HBQty" width="120" show-overflow-tooltip>
- <template slot-scope="scope">{{ scope.row.HBQty }}</template>
- </el-table-column>
+
<el-table-column align="center" label="澶栫鏁�" prop="HPackQty" width="120" show-overflow-tooltip>
<template slot-scope="scope"><el-input v-model="scope.row.HPackQty" /></template>
</el-table-column>
@@ -260,7 +262,7 @@
</div>
</el-dialog>
<el-dialog title="鎵撳嵃妯℃澘閫夋嫨" :visible.sync="openPrintList" width="800px" append-to-body>
- <PrintList :linterid="rowSel.toString()" :MyMsg="rowSel.toString()" Type="HGy_BarCodeBill"
+ <PrintList :linterid="rowSel.toString()" :MyMsg="rowSel.toString()" Type="HGy_BarCodeBill"
HModName="HGy_BarCodeBill" @rowEditClose="rowSetClose" v-if="printListShow" />
<!-- <div>111</div> -->
</el-dialog>
@@ -1202,4 +1204,10 @@
},
}
};
-</script>
\ No newline at end of file
+</script>
+<style>
+ .input-search-btn {
+ background-color: rgb(24, 144, 255) !important;
+ color: #fff !important;
+ }
+</style>
\ No newline at end of file
diff --git a/src/views/warehouse/transfer/Kf_MoveStockRequestBillEdit.vue b/src/views/warehouse/transfer/Kf_MoveStockRequestBillEdit.vue
index a1d295e..2c96b12 100644
--- a/src/views/warehouse/transfer/Kf_MoveStockRequestBillEdit.vue
+++ b/src/views/warehouse/transfer/Kf_MoveStockRequestBillEdit.vue
@@ -300,7 +300,6 @@
>涓嬬Щ</el-button
>
</div>
- <!-- TODO: 鏄庣粏鍒楄〃娣诲姞杈呭姪灞炴�ч�夋嫨 -->
<el-table
:data="editData"
style="width: 100%"
--
Gitblit v1.9.1