From 41839ab44e27a646bbdb8359a6fb02130129f853 Mon Sep 17 00:00:00 2001
From: 陈婷婷 <506607603@qq.com>
Date: 星期三, 17 十二月 2025 08:53:26 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI
---
src/views/warehouse/barcodeMaster/Gy_BarCodeBill.vue | 97 +++++++++++++++++++++++++++++++++++-------------
1 files changed, 70 insertions(+), 27 deletions(-)
diff --git a/src/views/warehouse/barcodeMaster/Gy_BarCodeBill.vue b/src/views/warehouse/barcodeMaster/Gy_BarCodeBill.vue
index 0a80611..bead72d 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(null)"></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>
@@ -186,7 +188,11 @@
</el-table-column>
<el-table-column align="center" label="杈呭姪灞炴�т唬鐮�" prop="HAuxPropNumber" width="120"
show-overflow-tooltip>
- <template slot-scope="scope"><el-input v-model="scope.row.HAuxPropNumber" /></template>
+ <template slot-scope="scope">
+ <el-input v-model="scope.row.HAuxPropNumber"
+ @keyup.native.f7="openDataDialog(1, scope.row)"
+ @dblclick.native="openDataDialog(1, scope.row)" />
+ </template>
</el-table-column>
<el-table-column align="center" label="杈呭姪灞炴�у悕绉�" prop="HAuxPropName" width="120"
show-overflow-tooltip>
@@ -254,13 +260,20 @@
<el-dialog :title="dialogTitle" :visible.sync="openData" width="1280px" append-to-body @close="closeBill">
<HSourceReportHtml @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName"
:HOrgID='this.form.HOrgID' :HSouceBillType="HSouceBillType" v-if="ScICMOBillShow" />
+
+ <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>
</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>
@@ -271,10 +284,11 @@
import HSourceReportHtml from '@/views/component/HSourceReportHtml'
import PrintList from "@/views/component/printList";
import moment from 'moment';
+import GyProperty from "@/views/basic/gyProperty/gyPropertyList.vue";
export default {
name: 'Gy_BarCodeBill',
- components: { HSourceReportHtml, PrintList },
+ components: { HSourceReportHtml, PrintList, GyProperty },
props: {
OperationType: { type: Number, },
linterid: { type: Number, },
@@ -449,6 +463,7 @@
materialShow: false,//鐗╂枡鏁版嵁缁勪欢
gyEmployeeShow: false,//閿�鍞憳鏁版嵁缁勪欢
ScICMOBillShow: false,
+ propertyShow: false,
deptform: {},//寮圭獥閫変腑鏁版嵁
openData: false,//鏁版嵁寮圭獥
dialogTitle: '',
@@ -768,6 +783,17 @@
},
//寮圭獥璧嬪��
dbEmitData(deptRow, num) {
+ if(num) {
+ if(num == 'gyProperty') {
+ this.editWlxxData[this.zbIndex].HAuxPropID = deptRow.HItemID;
+ this.editWlxxData[this.zbIndex]["HAuxPropName"] = deptRow["杈呭姪灞炴�у悕绉�"];
+ this.editWlxxData[this.zbIndex]["HAuxPropNumber"] = deptRow["杈呭姪灞炴�т唬鐮�"];
+ this.propertyShow = false;
+ this.openData = false;
+ }
+
+ return
+ }
console.log(deptRow)
if (deptRow.length > 0) {
this.zbDataShow = false
@@ -1039,8 +1065,9 @@
, 'HPOOrderInterID': result.data[i].閲囪喘璁㈠崟鍐呯爜
, 'HPOOrderEntryID': result.data[i].閲囪喘璁㈠崟瀛愬唴鐮�
, 'HPOOrderBillNo': result.data[i].閲囪喘璁㈠崟鍙�
- , 'HPropertyID': result.data[i].HPropertyID
- , 'HPropertyName': result.data[i].杈呭姪灞炴��
+ , 'HAuxPropID': result.data[i].HPropertyID
+ , 'HAuxPropName': result.data[i].杈呭姪灞炴��
+ , 'HAuxPropNumber': result.data[i].杈呭姪灞炴�т唬鐮�
, 'HSecUnitID': result.data[i].HSecUnitID
, 'HSecUnitName': result.data[i].杈呭姪璁￠噺鍗曚綅
, 'HSecUnitRate': result.data[i].鎹㈢畻鐜�
@@ -1193,13 +1220,29 @@
if (row) {
this.zbIndex = row.index - 1
}
- this.showReset()
- this.HSouceBillType = this.getSupType()
- this.dialogTitle = this.getSupType() + '鍒楄〃'
- this.ScICMOBillShow = true
- this.openData = true
+ if(num) {
+ switch(num) {
+ case 1:
+ this.dialogTitle = '杈呭姪灞炴�у垪琛�'
+ this.propertyShow = true
+ this.openData = true
+ ;break;
+ }
+ }else {
+ this.showReset()
+ this.HSouceBillType = this.getSupType()
+ this.dialogTitle = this.getSupType() + '鍒楄〃'
+ this.ScICMOBillShow = true
+ this.openData = true
+ }
},
}
};
-</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
--
Gitblit v1.9.1