From c3334e4a5563021437c4aaa65b43de60eede5dec Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期二, 07 四月 2026 14:02:55 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI
---
src/views/warehouse/transfer/Kf_MoveStockRequestBillList.vue | 35 +++++
.env.development | 7
/dev/null | 1
src/views/logistics/transportGPS/WL_YayBill.vue | 6
package.json | 44 +++---
src/views/KCGL/MoveStockBill/Kf_MoveStockBillEdit.vue | 122 +++++++++++++++----
src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue | 87 +++++++++++++
7 files changed, 240 insertions(+), 62 deletions(-)
diff --git a/.env.development b/.env.development
index e05966c..8353400 100644
--- a/.env.development
+++ b/.env.development
@@ -5,7 +5,7 @@
ENV = 'development'
# 鏅轰簯杩堟�滾-MOM绠＄悊绯荤粺/寮�鍙戠幆澧�
-VUE_APP_BASE_API = http://localhost:81/API/
+# VUE_APP_BASE_API = http://localhost:81/API/
# VUE_APP_BASE_API = 'http://47.96.97.237/API/'
# VUE_APP_BASE_API = 'http://220.189.218.155:9010/API/'
# VUE_APP_BASE_API = 'http://localhost:8082/LuBaoAPI/'
@@ -15,12 +15,11 @@
# VUE_APP_BASE_API_INNER = http://192.168.1.11/API/
# VUE_APP_BASE_API = http://61.174.29.234:8880/API/
# 瀹佹尝 鍥涚淮灏�
-# VUE_APP_BASE_API_INNER = http://192.168.0.236:9010/API/
-# VUE_APP_BASE_API = http://220.189.218.155:9010/API/
+VUE_APP_BASE_API_INNER = http://192.168.0.236:9010/API/
+VUE_APP_BASE_API = http://220.189.218.155:9010/API/
#鏉滆春
# VUE_APP_BASE_API = http://localhost:8082/API/
# 鍐呯綉鍦板潃娴嬭瘯
-VUE_APP_BASE_API_INNER = http://192.168.1.11/API/
# VUE_APP_BASE_API_INNER = http://192.168.1.11/API/
# 璺敱鎳掑姞杞�
VUE_CLI_BABEL_TRANSPILE_MODULES = true
\ No newline at end of file
diff --git a/RuoYi-Vue b/RuoYi-Vue
deleted file mode 160000
index 8a1cf9e..0000000
--- a/RuoYi-Vue
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 8a1cf9ed55747229ce4149ddacf8596fa0995814
diff --git a/package.json b/package.json
index 46204e4..2e26225 100644
--- a/package.json
+++ b/package.json
@@ -24,24 +24,34 @@
"url": "https://gitee.com/y_project/RuoYi-Vue.git"
},
"dependencies": {
+ "@claviska/jquery-minicolors": "^2.3.6",
"@riophae/vue-treeselect": "0.4.0",
"axios": "0.28.1",
+ "bwip-js": "^4.9.0",
+ "canvg": "^3.0.11",
"clipboard": "2.0.8",
"core-js": "^3.46.0",
"dayjs": "^1.11.19",
+ "dom-to-image-more": "^3.7.2",
"echarts": "5.4.0",
"element-ui": "2.15.14",
"file-saver": "2.0.5",
"fuse.js": "6.4.3",
"highlight.js": "9.18.5",
+ "jquery": "^3.7.1",
"js-beautify": "1.13.0",
"js-cookie": "3.0.1",
+ "jsbarcode": "^3.12.3",
"jsencrypt": "3.0.0-rc.1",
+ "jspdf": "^2.5.2",
+ "lodash": "^4.17.21",
"moment": "^2.30.1",
"nprogress": "0.2.0",
+ "nzh": "^1.0.14",
"print-js": "^1.6.0",
"quill": "2.0.2",
"screenfull": "5.0.2",
+ "socket.io-client": "^4.8.3",
"sortablejs": "^1.10.2",
"splitpanes": "2.4.1",
"vue": "2.6.12",
@@ -50,39 +60,29 @@
"vue-router": "3.4.9",
"vuedraggable": "2.24.3",
"vuex": "3.6.0",
- "xlsx": "^0.18.5",
- "@claviska/jquery-minicolors": "^2.3.6",
- "bwip-js": "^4.0.0",
- "canvg": "^3.0.10",
- "dom-to-image-more": "3.7.2",
- "jquery": "^3.6.0",
- "jsbarcode": "^3.11.5",
- "jspdf": "^2.5.1",
- "lodash": "^4.17.21",
- "nzh": "^1.0.8",
- "socket.io-client": "^4.8.3"
+ "xlsx": "^0.18.5"
},
"devDependencies": {
"@vue/cli-plugin-babel": "~5.0.0",
- "@vue/cli-service": "^4.5.15",
+ "@vue/cli-service": "^4.5.19",
+ "ant-design-vue": "^1.7.8",
+ "babel-loader": "^8.1.0",
"babel-plugin-dynamic-import-node": "2.3.3",
+ "bootstrap": "^3.3.7",
"chalk": "4.1.0",
"compression-webpack-plugin": "6.1.2",
+ "concurrent-tasks": "^1.0.7",
"connect": "3.6.6",
+ "copy-webpack-plugin": "^5.1.2",
+ "cross-env": "^5.0.5",
+ "less-loader": "^6.1.1",
"sass": "1.32.13",
"sass-loader": "10.1.1",
"script-ext-html-webpack-plugin": "2.1.5",
"svg-sprite-loader": "5.1.1",
- "vue-template-compiler": "2.6.12",
- "ant-design-vue": "^1.7.8",
- "babel-loader": "^8.1.0",
- "bootstrap": "^3.3.7",
- "concurrent-tasks": "^1.0.7",
- "copy-webpack-plugin": "^5.1.2",
- "cross-env": "^5.0.5",
- "less-loader": "^6.1.1",
"uglifyjs-webpack-plugin": "^2.2.0",
- "vue-ls": "^4.0.0",
+ "vue-ls": "^4.2.0",
+ "vue-template-compiler": "2.6.12",
"webpack-cli": "^4.9.1"
},
"engines": {
@@ -93,4 +93,4 @@
"> 1%",
"last 2 versions"
]
-}
\ No newline at end of file
+}
diff --git a/src/views/KCGL/MoveStockBill/Kf_MoveStockBillEdit.vue b/src/views/KCGL/MoveStockBill/Kf_MoveStockBillEdit.vue
index 1f9c725..6d6d26d 100644
--- a/src/views/KCGL/MoveStockBill/Kf_MoveStockBillEdit.vue
+++ b/src/views/KCGL/MoveStockBill/Kf_MoveStockBillEdit.vue
@@ -42,7 +42,7 @@
<el-col :span="6">
<el-form-item label="寰�鏉ュ崟浣�" prop="HSupName">
<el-input v-model="form.HSupName" placeholder="璇疯緭鍏ュ線鏉ュ崟浣�" disabled>
- <el-button slot="append" icon="el-icon-search" @click="openDataDialog(7)"></el-button>
+ <el-button slot="append" icon="el-icon-search" @click="openDataDialog(6)"></el-button>
</el-input>
</el-form-item>
</el-col>
@@ -73,7 +73,7 @@
<el-col :span="6">
<el-form-item label="閫夊崟鍙�" prop="HMainSourceBillNo">
<el-input v-model="form.HMainSourceBillNo" placeholder="璇烽�夋嫨婧愬崟" disabled>
- <el-button slot="append" icon="el-icon-search" @click="openDataDialog(null)"></el-button>
+ <el-button slot="append" icon="el-icon-search" @click="openDataDialog(11)"></el-button>
</el-input>
</el-form-item>
</el-col>
@@ -224,6 +224,8 @@
<el-table-column align="center" label="搴忓彿" type="index" width="80" />
<el-table-column align="center" label="婧愬崟鍗曞彿" width="120">
<template slot-scope="scope">
+ <!-- <el-input v-model="scope.row.HSourceBillNo" placeholder="璇烽�夋嫨婧愬崟鍗曞彿" @keyup.native.f7="openDataDialog(6, scope.row)"
+ @dblclick.native="openDataDialog(6, scope.row)" /> -->
<span>{{ scope.row.HSourceBillNo }}</span>
</template>
</el-table-column>
@@ -305,9 +307,9 @@
controls-position="right"></el-input-number>
</template>
</el-table-column>
- <el-table-column align="center" label="鍗曚环" width="120">
+ <el-table-column align="center" label="鍗曚环" width="140">
<template slot-scope="scope">
- <el-input-number v-model="scope.row.HPrice" :min="0" style="width: 90px;"
+ <el-input-number v-model="scope.row.HPrice" :min="0" style="width: 120px;"
controls-position="right"></el-input-number>
</template>
</el-table-column>
@@ -376,7 +378,7 @@
<el-input v-model="scope.row.HBatchNo" placeholder="璇疯緭鍏ユ壒娆�" />
</template>
</el-table-column>
- <el-table-column align="center" label="閲囪喘璁㈠崟鍙�" width="120">
+ <!-- <el-table-column align="center" label="閲囪喘璁㈠崟鍙�" width="120">
<template slot-scope="scope">
<span>{{ scope.row.HPOOrderBillNo }}</span>
</template>
@@ -405,7 +407,7 @@
<template slot-scope="scope">
<span>{{ scope.row.HSeOrderEntryID }}</span>
</template>
- </el-table-column>
+ </el-table-column> -->
<el-table-column align="center" label="澶囨敞" width="120">
<template slot-scope="scope">
<el-input v-model="scope.row.HRemark" placeholder="璇疯緭鍏ュ娉�" />
@@ -430,11 +432,11 @@
<!--涓氬姟鍛�-->
<GyEmployee @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyEmployeeShow" />
<!--瀹㈡埛-->
- <GyCustomer @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyCustomerShow" />
+ <GySupplier @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gySupplierShow" />
<!--浠撲綅-->銆�
<GyStockPlace @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" :openPageData="openPageData" v-if="gyStockPlaceShow" />
<!--閫夋嫨婧愬崟-->
- <HSourceReportHtml @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" :HOrgID='this.form.HOrgID' :HSouceBillType="HSouceBillType" v-if="ScICMOBillShow" />
+ <Kf_MoveStockRequestBillList @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" :HOrgID='this.form.HOrgID' v-if="Kf_MoveStockRequestBillShow" />
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="deptClickSub">纭� 瀹�</el-button>
<el-button @click="deptClose">鍙� 娑�</el-button>
@@ -458,10 +460,11 @@
import Material from '@/views/gyMaterial/GyMaterial'
import GyCustomer from '@/views/GyCustomer/index'
import HSourceReportHtml from '@/views/component/HSourceReportHtml'
+import Kf_MoveStockRequestBillList from '@/views/warehouse/transfer/Kf_MoveStockRequestBillList.vue'
export default {
name: 'MoveStockBillEdit',
- components: { Dept, Warehouse, Material, RowSettings, GyEmployee, GyCustomer, HSourceReportHtml, GyStockPlace },
+ components: { Dept, Warehouse, Material, RowSettings, GyEmployee, GySupplier, HSourceReportHtml, GyStockPlace, Kf_MoveStockRequestBillList },
props: {
OperationType: { type: Number, },
linterid: { type: Number, },
@@ -491,7 +494,7 @@
formHideDataShow: false, //琛ㄥ崟闅愯棌鍐呭鏍囪
formLoading: true, //琛ㄥ崟鍔犺浇閬僵
zzSelDis: false, //缁勭粐涓嬫媺鍒楄〃绂佺敤鏍囪
-
+
rowHideShow: false, //鍒楄缃粍浠跺鍣ㄦ樉绀烘爣璁�
openRowHide: false, //鍒楄缃粍浠舵樉绀烘爣璁�
@@ -504,7 +507,8 @@
stockPlaceShow: false, //浠撲綅鏁版嵁缁勪欢鏄剧ず鏍囪
gyEmployeeShow: false, //涓氬姟鍛樻暟鎹粍浠舵樉绀烘爣璁�
ScICMOBillShow: false, //婧愬崟鏁版嵁缁勪欢鏄剧ず鏍囪
- GyCustomerShow: false, //寰�鏉ュ崟浣嶆暟鎹粍浠舵樉绀烘爣璁�
+ gySupplierShow: false, //寰�鏉ュ崟浣嶆暟鎹粍浠舵樉绀烘爣璁�
+ Kf_MoveStockRequestBillShow: false, //閫夋嫨婧愬崟鏁版嵁缁勪欢鏄剧ず鏍囪
deptform: {}, //寮圭獥閫変腑鏁版嵁
temp: undefined, //涓存椂鍙橀噺
@@ -578,6 +582,10 @@
HRemark: "",
HManagerName:"",
HOrgID: sessionStorage["OrganizationID"] - 0,
+ HSourceBillNo: "",
+ HSourceBillType: "璋冩嫧鐢宠鍗�",
+ HSourceInterID: 0,
+ HSourceEntryID: 0,
HMaker: sessionStorage["HUserName"],
HMakeDate: new Date(),
@@ -607,7 +615,6 @@
//鏂板鑾峰彇鍗曟嵁鍙�
this.getHBillNo()
if (this.OperationType == 1) {
- this.handleAddSysZb()
}
this.$nextTick(() => {
this.formShow = true
@@ -683,7 +690,6 @@
this.form.HSCWHID= data.HSCWHID
this.form.HSCWHName= data.璋冨嚭浠撳簱
this.form.HRemark= data.琛ㄥご澶囨敞
-
this.form.HSecManagerID= data.HSecManagerID
this.form.HSecManagerName= data.楠屾敹鍛�
this.form.HKeeperID= data.HKeeperID
@@ -694,7 +700,10 @@
this.form.HInnerBillNo= data.鍐呴儴鍗曟嵁鍙�
this.form.HExplanation= data.HExplanation
this.form.HInvoiceBillNo= data.鍙戠エ缂栧彿
-
+ this.form.HSourceBillNo= data.HSourceBillNo
+ this.form.HSourceBillType= data.HSourceBillType
+ this.form.HSourceInterID= data.HSourceInterID
+ this.form.HSourceEntryID= data.HSourceEntryID
//瀛愯〃 璧嬪��
var result = response.data.data[1]
for (var i = 0; i < result.length; i++) {
@@ -783,7 +792,12 @@
//#region 鏁版嵁寮圭獥
//#region 鎵撳紑鏁版嵁鍒楄〃寮圭獥
openDataDialog(num, row) {
- if (row) {
+ if (num == 11) {
+ this.handleAddSysZb();
+ this.$nextTick(() => {
+ this.zbIndex = this.editData.length - 1;
+ });
+ }else if (row) {
this.zbIndex = row.index - 1
}
this.showReset()
@@ -811,9 +825,13 @@
}
this.gyEmployeeShow = true
this.openData = true
- }else if (num == 7){
- this.dialogTitle = '瀹㈡埛鍒楄〃'
- this.gyCustomerShow = true
+ }else if (num == 11){
+ this.dialogTitle = '璋冩嫧鐢宠鍗曞垪琛�'
+ this.Kf_MoveStockRequestBillShow = true
+ this.openData = true
+ }else if (num == 6){
+ this.dialogTitle = '渚涘簲鍟嗗垪琛�'
+ this.gySupplierShow = true
this.openData = true
} else if (num == 9) {
if(this.HSPType==1){
@@ -851,7 +869,8 @@
this.warehouseShow = false
this.materialShow = false
this.gyEmployeeShow = false
- this.GyCustomerShow = false
+ this.gySupplierShow = false
+ this.Kf_MoveStockRequestBillShow = false
},
//#endregion
//#endregion
@@ -920,10 +939,59 @@
this.editData[this.zbIndex].HTaxRate = deptRow.榛樿绋庣巼
this.materialShow = false
this.openData = false
- } else if(num == 7){
- this.form.HSupName = deptRow.瀹㈡埛鍚嶇О
+ }else if (num == 11){
+ this.form.HSourceBillNo = deptRow.鍗曟嵁鍙�
+ this.form.HSourceBillType = deptRow.HBillSubType
+ this.form.HSourceInterID = deptRow.hmainid
+ this.form.HSourceEntryID = deptRow.hsubid
+ this.form.HSupName = deptRow.寰�鏉ュ崟浣�
+ this.form.HSupID = deptRow.HSupID
+ this.form.HEmpName = deptRow.涓氬姟鍛�
+ this.form.HEmpID = deptRow.HEmpID
+ this.form.HDeptName = deptRow.閮ㄩ棬
+ this.form.HDeptID = deptRow.HDeptID
+ this.form.HWHName = deptRow.涓昏皟鍏ヤ粨搴�
+ this.form.HWHID = deptRow.涓昏皟鍏ヤ粨搴揑D
+ this.form.HSCWHName = deptRow.涓昏皟鍑轰粨搴�
+ this.form.HSCWHID = deptRow.涓昏皟鍑轰粨搴揑D
+
+ this.Kf_MoveStockRequestBillShow = false
+ this.openData = false
+ if (this.zbIndex !== null && this.editData[this.zbIndex]) {
+ this.editData[this.zbIndex].HSourceBillNo = deptRow.鍗曟嵁鍙�
+ this.editData[this.zbIndex].HSourceBillType = deptRow.HBillSubType
+ this.editData[this.zbIndex].HSourceInterID = deptRow.hmainid
+ this.editData[this.zbIndex].HSourceEntryID = deptRow.hsubid
+ this.editData[this.zbIndex].HMaterID = deptRow.HMaterID;
+ this.editData[this.zbIndex].鐗╂枡浠ｇ爜 = deptRow.鐗╂枡浠ｇ爜;
+ this.editData[this.zbIndex].鐗╂枡鍚嶇О = deptRow.鐗╂枡鍚嶇О;
+ this.editData[this.zbIndex].HUnitID = deptRow.HUnitID;
+ this.editData[this.zbIndex].瑙勬牸鍨嬪彿 = deptRow.瑙勬牸鍨嬪彿
+ this.editData[this.zbIndex].璁￠噺鍗曚綅 = deptRow.璁￠噺鍗曚綅
+ this.editData[this.zbIndex].HPropertyID = deptRow.HPropertyID
+ this.editData[this.zbIndex].HSecUnitRate = deptRow.鎹㈢畻鐜�
+ this.editData[this.zbIndex].HQtyMust = deptRow.搴旀敹鏁伴噺
+ this.editData[this.zbIndex].HQty = deptRow.瀹炴敹鏁伴噺
+ this.editData[this.zbIndex].HPrice = deptRow.鍗曚环
+ this.editData[this.zbIndex].HMoney = deptRow.閲戦
+ this.editData[this.zbIndex].HOutPrice = deptRow.璋冨嚭鍗曚环
+ this.editData[this.zbIndex].HOutMoney = deptRow.璋冨嚭閲戦
+ this.editData[this.zbIndex].HWHID = deptRow.HWHID
+ this.editData[this.zbIndex].HWHName = deptRow.璋冨叆浠撳簱
+ this.editData[this.zbIndex].HSPID = deptRow.HSPID
+ this.editData[this.zbIndex].HWHNumber = deptRow.璋冨叆浠撳簱浠ｇ爜
+ this.editData[this.zbIndex].HSPName = deptRow.浠撲綅鍚嶇О
+ this.editData[this.zbIndex].HSCWHID = deptRow.HSCWHID
+ this.editData[this.zbIndex].HSCWHName = deptRow.璋冨嚭浠撳簱
+ this.editData[this.zbIndex].HSCWHNumber = deptRow.璋冨嚭浠撳簱浠ｇ爜
+ this.editData[this.zbIndex].HSCSPID = deptRow.HSCSPID
+ this.editData[this.zbIndex].HSCSPName = deptRow.璋冨嚭浠撲綅鍚嶇О
+
+ }
+ } else if(num == 6){
+ this.form.HSupName = deptRow.渚涘簲鍟嗗悕绉�
this.form.HSupID = deptRow.HItemID
- this.gyCustomerShow = false
+ this.gySupplierShow = false
this.openData = false
}else if (num == 9){
if(this.HSPType == 1){
@@ -1078,12 +1146,12 @@
HCostPrice: 0,
HCostMoney: 0,
HSalePrice: 0,
- HSeOrderInterID: 741,
+ HSeOrderInterID: 0,
HSeOrderEntryID: 18,
- HSeOrderBillNo: 'XSFH00000747',
- HSourceInterID: 741,
- HSourceEntryID: 18,
- HSourceBillNo: 'XSFH00000747',
+ HSeOrderBillNo: '',
+ HSourceInterID: 0,
+ HSourceEntryID: 0,
+ HSourceBillNo: '',
HSourceBillType: 1402,
HRelationQty: 0,
HRelationMoney: 0,
diff --git a/src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue b/src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue
index dee3a6d..9550586 100644
--- a/src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue
+++ b/src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue
@@ -988,6 +988,11 @@
this.formShow = true
this.formLoading = false
+ // 鍔犺浇杩愯緭绾胯矾銆佽繍杈撶被鍨嬨�佽溅鍨嬪垪琛�
+ if (this.form.HContractTransportInterID) {
+ this.loadTransportData()
+ }
+
// 鍔犺浇宸蹭笂浼犵殑鏂囦欢鍒楄〃
this.getFileList();
@@ -1171,12 +1176,11 @@
this.form.HMoney = 0
return
}
- this.form.HContractTransportEntryID = response.data[0].HEntryID
this.form.HCarrierID = response.data[0].HSupID
this.form.HCarrierName = response.data[0].渚涘簲鍟嗗悕绉�
this.form.HCurID = response.data[0].甯佸埆
this.form.HCurName = response.data[0].璐у竵鍚嶇О
- this.form.HExRate = response.data[0].姹囩巼 == null ? 0 : response.data[0].姹囩巼
+ this.form.HExRate = response.data[0].姹囩巼 == null ? 0 : response.data[0].姹囩巼 - 0
this.form.HSSID = response.data[0].缁撶畻鏂瑰紡
this.form.HSSName = response.data[0].缁撶畻鏂瑰紡鍚嶇О
this.transportList = [...new Set(response.data.map(item => item.杩愯緭璺嚎鍚嶇О))]
@@ -1497,6 +1501,7 @@
var sSubStr = JSON.stringify(this.editData);
// var sMainSub = sMainStr + ';' + sSubStr + ';' + sessionStorage["HUserName"] + ';' + this.OperationType;
var sMainSub = sMainStr + ';' + sSubStr + ';' + sessionStorage["HUserName"]
+ console.log(sMainSub)
axios({
method: 'post',
url: this.baseURL + "/WLYayBillController/SaveBill",
@@ -2091,6 +2096,44 @@
});
},
+ // 鍔犺浇杩愯緭鐩稿叧鏁版嵁
+ loadTransportData() {
+ axios.get(this.$baseUrl + '/WLYayBillController/initDataForSelectContractTransportBill', {
+ params: {
+ "hmainid": this.form.HContractTransportInterID,
+ },
+ }).then(res => {
+ let response = res.data
+ if (response.code == 1) {
+ // 杩愯緭绾胯矾鍘婚噸
+ this.transportList = [...new Set(response.data.map(item => item.杩愯緭璺嚎鍚嶇О))]
+ // this.$nextTick(()=>{
+
+ // })
+ this.getTransCost('line')
+ this.getTransCost('type')
+ this.getTransCost('car')
+
+
+ // // 杩愯緭绫诲瀷鍘婚噸
+ // this.transTypeList = [...new Set(response.data.map(item => item.杩愯緭绫诲瀷))]
+
+ // // 杞﹀瀷鍘婚噸
+ // const carTypeMap = new Map()
+ // response.data.forEach(item => {
+ // const key = item.杩愯緭鏂瑰紡鍚嶇О
+ // if (!carTypeMap.has(key)) {
+ // carTypeMap.set(key, { value: item.杩愯緭鏂瑰紡鍚嶇О, id: item.杩愯緭鏂瑰紡 })
+ // }
+ // })
+ // this.HCarTypeNameList = Array.from(carTypeMap.values())
+ } else {
+ this.$modal.msgError("閿欒:" + response.data.code + response.data.Message);
+ }
+ }).catch(error => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ },
// 鑾峰彇宸蹭笂浼犳枃浠跺垪琛�
getFileList() {
},
@@ -2119,16 +2162,51 @@
transLineNameChange() {
this.form.HTransType = ''
this.form.HCarTypeName = ''
+ this.form.HCarTypeID = 0
+ this.form.HContractTransportEntryID = 0
+ this.form.HBeginAddrName = ''
+ this.form.HBeginAddr = 0
+ this.form.HEndAddrName = ''
+ this.form.HEndAddr = 0
+ this.form.HCarTypeMaxVolume = 0
+ this.form.HDistance = 0
+ this.form.HTransportTimes = ''
+ this.form.HTransportTyep = ''
+ this.form.HMoney = 0
this.transTypeList = []
this.HCarTypeNameList = []
this.getTransCost('line')
},
transTypeChange() {
this.form.HCarTypeName = ''
+ this.form.HCarTypeID = 0
+ this.form.HContractTransportEntryID = 0
+ this.form.HBeginAddrName = ''
+ this.form.HBeginAddr = 0
+ this.form.HEndAddrName = ''
+ this.form.HEndAddr = 0
+ this.form.HCarTypeMaxVolume = 0
+ this.form.HDistance = 0
+ this.form.HTransportTimes = ''
+ this.form.HTransportTyep = ''
+ this.form.HMoney = 0
this.HCarTypeNameList = []
this.getTransCost('type')
},
- transHCarChange() {
+ transHCarChange(val) {
+ this.form.HContractTransportEntryID = 0
+ this.form.HBeginAddrName = ''
+ this.form.HBeginAddr = 0
+ this.form.HEndAddrName = ''
+ this.form.HEndAddr = 0
+ this.form.HCarTypeMaxVolume = 0
+ this.form.HDistance = 0
+ this.form.HTransportTimes = ''
+ this.form.HTransportTyep = ''
+ this.form.HMoney = 0
+ let item = this.HCarTypeNameList.find(item => item.id === val);
+ this.form.HCarTypeName = item.value
+ this.form.HCarTypeID = val
this.getTransCost('car')
},
checkAndCallGetTransCost() {
@@ -2185,11 +2263,12 @@
})
this.HCarTypeNameList = Array.from(carTypeMap.values())
} else if (val == 'car') {
+ this.form.HContractTransportEntryID = response.data[0].HEntryID
this.form.HBeginAddrName = response.data[0].濮嬪彂鍦板悕绉�
this.form.HBeginAddr = response.data[0].濮嬪彂鍦�
this.form.HEndAddrName = response.data[0].鐩殑鍦板悕绉�
this.form.HEndAddr = response.data[0].鐩殑鍦�
- this.form.HCarTypeMaxVolume = response.data[0].杞﹁締鏈�澶у绉�
+ this.form.HCarTypeMaxVolume = response.data[0].杞﹀瀷鏈�澶у绉�
this.form.HDistance = response.data[0].璺濈
this.form.HTransportTimes = response.data[0].杩愯緭鏃舵晥
this.form.HTransportTyep = response.data[0].杩愯緭绫诲瀷
diff --git a/src/views/logistics/transportGPS/WL_YayBill.vue b/src/views/logistics/transportGPS/WL_YayBill.vue
index 6b42ca1..35f8fa2 100644
--- a/src/views/logistics/transportGPS/WL_YayBill.vue
+++ b/src/views/logistics/transportGPS/WL_YayBill.vue
@@ -788,9 +788,9 @@
this.sWhere += " and 鐗╂祦鐘舵�� like '%" + this.queryParams.HBillStatus + "%'";
}
- // if (this.queryParams.HOrgID) {
- // this.sWhere += " and HOrgID = '" + this.queryParams.HOrgID + "'";
- // }
+ if (this.queryParams.HOrgID) {
+ this.sWhere += " and HOrgID = '" + this.queryParams.HOrgID + "'";
+ }
console.log("swhere", this.sWhere)
this.clearData()
this.getList()
diff --git a/src/views/warehouse/transfer/Kf_MoveStockRequestBillList.vue b/src/views/warehouse/transfer/Kf_MoveStockRequestBillList.vue
index 6f508d2..338698c 100644
--- a/src/views/warehouse/transfer/Kf_MoveStockRequestBillList.vue
+++ b/src/views/warehouse/transfer/Kf_MoveStockRequestBillList.vue
@@ -227,6 +227,9 @@
export default {
name: 'Kf_MoveStockRequestBillList',
components: { RowSettings, Edit, PrintList },
+ props: {
+ openPage: { type: String },
+ },
data() {
return {
HModName: "Kf_MoveStockRequestBillList",
@@ -279,6 +282,10 @@
lastSelectedRow: null, // 涓婁竴娆￠�変腑鐨勮
selectedRow: null, // 褰撳墠閫変腑鐨勮
rowForm: {},
+ dialogTypeNum: null,
+ deptform: {}, //寮圭獥閫変腑鏁版嵁
+ openData: false, //鏁版嵁寮圭獥
+ dialogTitle: "",
// 寮瑰嚭灞傛爣棰�
title: "",
// 鏄惁鏄剧ず寮瑰嚭灞�
@@ -606,6 +613,9 @@
this.selectedRow = row; // 璁板綍褰撳墠閫変腑鐨勮
this.lastSelectedRowIndex = this.tableData.indexOf(row);
this.$refs.tableData.toggleRowSelection(row);
+ if (this.openPage) {
+ this.$emit("deptEmit", row, 11);
+ }
},
//閫変腑琛岄珮浜牱寮�
rowStyle({ row, rowIndex }) {
@@ -613,10 +623,33 @@
return { "background": "#ecf5ff" }
}
},
+ dbEmitData(deptRow, num) {
+ // num=1閮ㄩ棬 num=2鍑哄簱浠撳簱
+ if (num == 11){
+ this.editData[this.zbIndex].HSourceBillNo = deptRow.鍗曟嵁鍙�
+ this.editData[this.zbIndex].HSourceBillType = deptRow.HBillSubType
+ this.editData[this.zbIndex].HSourceInterID = deptRow.hmainid
+ this.editData[this.zbIndex].HSourceEntryID = deptRow.hsubid
+ this.gyCustomerShow = false
+ this.openData = false
+ }
+ },
+ emitData(deptRow, num) {
+ this.dialogTypeNum = num;
+ this.deptform = deptRow;
+ },
+ deptClickSub() {
+ this.dbEmitData(this.deptform, this.dialogTypeNum)
+ this.deptform = {}
+ },
//鍙屽嚮琛�
handleDblclick(row, column, cell, event) {
this.OperationType = 3
- this.handleEdit()
+ if (this.openPage) {
+ this.$emit("deptEmitDb", row, 11);
+ } else {
+ this.handleEdit(row);
+ }
},
// 澶氶�夋閫変腑鏁版嵁
handleSelectionChange(selection) {
--
Gitblit v1.9.1