From b3f83df85d445a69dfb065de5be767499a64c5cf Mon Sep 17 00:00:00 2001
From: 陈婷婷 <506607603@qq.com>
Date: 星期五, 23 一月 2026 09:06:20 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI
---
.env.development | 6
src/views/logistics/WayBillPaymentBill/Pay_WayBillPaymentBillEdit.vue | 340 +++++++++++++++++++++--------------------------
src/views/component/CurrencyDialog/index.vue | 5
src/views/logistics/transportGPS/WL_YayBill.vue | 21 ++
src/store/modules/permission.js | 6
src/router/index.js | 6
src/views/logistics/WayBillPaymentBill/Pay_WayBillPaymentBillList.vue | 13 +
7 files changed, 193 insertions(+), 204 deletions(-)
diff --git a/.env.development b/.env.development
index 27fa2ad..1237d97 100644
--- a/.env.development
+++ b/.env.development
@@ -5,10 +5,10 @@
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/'
+VUE_APP_BASE_API = 'http://localhost:8082/LuBaoAPI/'
#閿﹂殕
# # VUE_APP_BASE_API_INNER = 'http://192.168.1.11/API/'
# # VUE_APP_BASE_API = http://61.174.29.234:8880/API/
@@ -18,6 +18,6 @@
#鏉滆春
# 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
diff --git a/src/router/index.js b/src/router/index.js
index 178b23f..9a7d5a2 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -1823,9 +1823,9 @@
},
children: [
{
- path: "/logistics/WayBillPaymentBill/YFPayMentOtherBillTranList",
- component: () => import("@/views/logistics/WayBillPaymentBill/YF_PayMentOtherBillTranList.vue"),
- name: "yfPayMentOtherBillTranList",
+ path: "/logistics/WayBillPaymentBill/payWayBillPaymentBillList",
+ component: () => import("@/views/logistics/WayBillPaymentBill/Pay_WayBillPaymentBillList.vue"),
+ name: "payWayBillPaymentBillList",
meta: { title: "杩愬崟璐圭敤缁撶畻鍗�", activeMenu: "/logistics/WayBillPaymentBill" },
},
],
diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
index 32a61a6..a8591ae 100644
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -96,10 +96,10 @@
title: "杩愬崟璐圭敤缁撶畻鍗�",
},
component: () =>
- import("@/views/logistics/WayBillPaymentBill/YF_PayMentOtherBillTranList.vue"),
+ import("@/views/logistics/WayBillPaymentBill/Pay_WayBillPaymentBillList.vue"),
hidden: false,
- name: "yfPayMentOtherBillTranList",
- path: "YFPayMentOtherBillTranList",
+ name: "payWayBillPaymentBillList",
+ path: "PayWayBillPaymentBillList",
}
]
}
diff --git a/src/views/component/CurrencyDialog/index.vue b/src/views/component/CurrencyDialog/index.vue
index 68e2363..7a6a636 100644
--- a/src/views/component/CurrencyDialog/index.vue
+++ b/src/views/component/CurrencyDialog/index.vue
@@ -598,6 +598,11 @@
handleDblclick(row, column, cell, event) {
this.OperationType = 3
if (this.openPage) {
+ if(this.openPage='Kf_StockOutRequestBill')
+ {
+ this.$emit('deptEmitDb', row, 10)
+ }
+ else
this.$emit('deptEmitDb', row, 2)
} else {
this.handleEdit();
diff --git a/src/views/logistics/WayBillPaymentBill/YF_PayMentOtherBillTranEdit.vue b/src/views/logistics/WayBillPaymentBill/Pay_WayBillPaymentBillEdit.vue
similarity index 71%
rename from src/views/logistics/WayBillPaymentBill/YF_PayMentOtherBillTranEdit.vue
rename to src/views/logistics/WayBillPaymentBill/Pay_WayBillPaymentBillEdit.vue
index be1b4fc..5d0d4c9 100644
--- a/src/views/logistics/WayBillPaymentBill/YF_PayMentOtherBillTranEdit.vue
+++ b/src/views/logistics/WayBillPaymentBill/Pay_WayBillPaymentBillEdit.vue
@@ -23,11 +23,6 @@
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="杈呭姪瀛楁" prop="HInnerBillNo">
- <el-input v-model="form.HInnerBillNo" placeholder="璇疯緭鍏ヨ緟鍔╁瓧娈�" />
- </el-form-item>
- </el-col>
- <el-col :span="6">
<el-form-item label="涓氬姟鍛�" prop="HEmpName">
<el-input v-model="form.HEmpName" placeholder="璇疯緭鍏ヤ笟鍔″憳" disabled>
<el-button slot="append" icon="el-icon-search"
@@ -38,35 +33,16 @@
</el-row>
<el-row>
<el-col :span="6">
- <el-form-item label="淇濈鍛�" prop="HKeeperName">
- <el-input v-model="form.HKeeperName" placeholder="璇疯緭鍏ヤ繚绠″憳" disabled>
+ <el-form-item label="甯佸埆" prop="HCurName">
+ <el-input v-model="form.HCurName" placeholder="璇疯緭鍏ュ竵鍒�" disabled>
<el-button slot="append" icon="el-icon-search"
- @click="openDataDialog(4, zhiyuanType = 'baoguanyuan')"></el-button>
+ @click="openDataDialog(10, zhiyuanType = 'yewuyuan')"></el-button>
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="涓荤" prop="HMangerName">
- <el-input v-model="form.HMangerName" placeholder="璇疯緭鍏ヤ富绠�" disabled>
- <el-button slot="append" icon="el-icon-search"
- @click="openDataDialog(4, zhiyuanType = 'zhuguan')"></el-button>
- </el-input>
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="楠屾敹" prop="HSecManagerName">
- <el-input v-model="form.HSecManagerName" placeholder="璇疯緭鍏ラ獙鏀�" disabled>
- <el-button slot="append" icon="el-icon-search"
- @click="openDataDialog(4, zhiyuanType = 'yanshou')"></el-button>
- </el-input>
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="浠撳簱" prop="HWHName">
- <el-input v-model="form.HWHName" placeholder="璇疯緭鍏ヤ粨搴�" disabled>
- <el-button slot="append" icon="el-icon-search"
- @click="openDataDialog(2, ckType = 'form')"></el-button>
- </el-input>
+ <el-form-item label="姹囩巼" prop="HExRate">
+ <el-input v-model="form.HExRate" placeholder="璇疯緭鍏ユ眹鐜�" disabled />
</el-form-item>
</el-col>
</el-row>
@@ -80,8 +56,8 @@
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="寰�鏉ュ崟浣�" prop="HSupName">
- <el-input v-model="form.HSupName" placeholder="璇疯緭鍏ュ線鏉ュ崟浣�" disabled>
+ <el-form-item label="鎵胯繍鍟�" prop="HSupName">
+ <el-input v-model="form.HSupName" placeholder="璇疯緭鍏ユ壙杩愬晢" disabled>
<el-button slot="append" icon="el-icon-search"
@click="openDataDialog(6)"></el-button>
</el-input>
@@ -176,86 +152,37 @@
@selection-change="handleTableZbEdit" :row-class-name="rowSysZbIndex" show-summary border>
<el-table-column type="selection" width="55" align="center" />
<el-table-column align="center" label="搴忓彿" type="index" width="80" />
- <el-table-column align="center" label="鐗╂枡浠ｇ爜" width="120">
+ <el-table-column align="center" label="濮嬪彂鍦�" width="120">
<template slot-scope="scope">
- <el-input v-model="scope.row.鐗╂枡浠ｇ爜" placeholder="璇疯緭鍏ョ墿鏂欎唬鐮�"
- @keyup.native.f7="openDataDialog(3, scope.row)"
- @dblclick.native="openDataDialog(3, scope.row)" />
+ <el-input v-model="scope.row.HBeginAddrName" placeholder="璇疯緭鍏ュ鍙戝湴"
+ @keyup.native.f7="openDataDialog(3, scope.row, areaType = 'b')"
+ @dblclick.native="openDataDialog(3, scope.row, areaType = 'b')" />
</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.鐗╂枡鍚嶇О }}</span>
+ <el-input v-model="scope.row.HEndAddrName" placeholder="璇疯緭鍏ョ洰鐨勫湴"
+ @keyup.native.f7="openDataDialog(3, scope.row, areaType = 'e')"
+ @dblclick.native="openDataDialog(3, scope.row, areaType = 'e')" />
</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.瑙勬牸鍨嬪彿 }}</span>
+ <el-select v-model="scope.row.HTransType" placeholder="璇烽�夋嫨杩愯緭鏂瑰紡">
+ <el-option label="闆跺崟" value="闆跺崟"></el-option>
+ <el-option label="鏁磋溅" value="鏁磋溅"></el-option>
+ </el-select>
</template>
</el-table-column>
- <el-table-column align="center" label="璁￠噺鍗曚綅" width="120">
+ <el-table-column align="center" label="杩愯緭璐圭敤" width="120">
<template slot-scope="scope">
- <el-input v-model="scope.row.璁￠噺鍗曚綅" placeholder="璇疯緭鍏ヨ閲忓崟浣�"
- @keyup.native.f7="openDataDialog('鍗曚綅椤甸潰杩樻病鏈�', scope.row, dwType = 'jldw')"
- @dblclick.native="openDataDialog('鍗曚綅椤甸潰杩樻病鏈�', scope.row, dwType = 'jldw')" />
- </template>
- </el-table-column>
- <el-table-column align="center" label="浠撳簱" width="120">
- <template slot-scope="scope">
- <el-input v-model="scope.row.浠撳簱" placeholder="璇疯緭鍏ヤ粨搴�"
- @keyup.native.f7="openDataDialog(2, scope.row, ckType = 'zb')"
- @dblclick.native="openDataDialog(2, scope.row, ckType = 'zb')" />
- </template>
- </el-table-column>
- <el-table-column align="center" label="浠撲綅" width="120">
- <template slot-scope="scope">
- <el-input v-model="scope.row.浠撲綅" placeholder="璇疯緭鍏ヤ粨浣�"
- @keyup.native.f7="openDataDialog(9, scope.row)"
- @dblclick.native="openDataDialog(9, scope.row)" />
- </template>
- </el-table-column>
- <el-table-column align="center" label="搴撳瓨杈呭崟浣�" width="120">
- <template slot-scope="scope">
- <el-input v-model="scope.row.搴撳瓨杈呭崟浣�" placeholder="璇疯緭鍏ュ簱瀛樿緟鍗曚綅"
- @keyup.native.f7="openDataDialog('鍗曚綅椤甸潰杩樻病鏈�', scope.row, dwType = 'kcfdw')"
- @dblclick.native="openDataDialog('鍗曚綅椤甸潰杩樻病鏈�', scope.row, dwType = 'kcfdw')" />
- </template>
- </el-table-column>
- <el-table-column align="center" label="鍩烘湰鍗曚綅" width="120">
- <template slot-scope="scope">
- <el-input v-model="scope.row.鍩烘湰鍗曚綅" placeholder="璇疯緭鍏ュ熀鏈崟浣�"
- @keyup.native.f7="openDataDialog('鍗曚綅椤甸潰杩樻病鏈�', scope.row, dwType = 'jbdw')"
- @dblclick.native="openDataDialog('鍗曚綅椤甸潰杩樻病鏈�', scope.row, dwType = 'jbdw')" />
- </template>
- </el-table-column>
- <el-table-column align="center" label="杈呭崟浣�" width="120">
- <template slot-scope="scope">
- <el-input v-model="scope.row.杈呭崟浣�" placeholder="璇疯緭鍏ヨ緟鍗曚綅"
- @keyup.native.f7="openDataDialog('鍗曚綅椤甸潰杩樻病鏈�', scope.row, dwType = 'fdw')"
- @dblclick.native="openDataDialog('鍗曚綅椤甸潰杩樻病鏈�', scope.row, dwType = 'fdw')" />
- </template>
- </el-table-column>
- <el-table-column align="center" label="搴旀敹鏁伴噺" width="120">
- <template slot-scope="scope">
- <el-input-number v-model="scope.row.HQtyMust" :min="1" style="width: 90px;"
+ <el-input-number v-model="scope.row.HMoney" :min="0" style="width: 90px;"
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="120">
<template slot-scope="scope">
- <el-input-number v-model="scope.row.HQty" :min="1" style="width: 90px;"
- controls-position="right"></el-input-number>
- </template>
- </el-table-column>
- <el-table-column align="center" label="鍗曚环" width="120">
- <template slot-scope="scope">
- <el-input-number v-model="scope.row.HPrice" :min="0" style="width: 90px;"
- controls-position="right"></el-input-number>
- </template>
- </el-table-column>
- <el-table-column align="center" label="閲戦" width="120">
- <template slot-scope="scope">
- <span>{{ scope.row.HMoney }}</span>
+ <span>{{ scope.row.HRemark }}</span>
</template>
</el-table-column>
<el-table-column align="center" label="鎿嶄綔" width="55" fixed="right">
@@ -274,6 +201,8 @@
<GyEmployee @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyEmployeeShow" />
<GySupplier @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gySupplierShow" />
<GyStockPlace @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyStockPlaceShow" />
+ <GyCurrcy @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="currcyShow" />
+ <AreaDialog @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="areaShow" />
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="deptClickSub">纭� 瀹�</el-button>
<el-button @click="deptClose">鍙� 娑�</el-button>
@@ -290,15 +219,18 @@
import RowSettings from '@/views/component/rowSettings'
import Dept from '@/views/basic/gy/gyDepartment.vue'
import Warehouse from '@/views/basic/gyWarehouse/gyWarehouse.vue'
-import Material from '@/views/gyMaterial/GyMaterial.vue'
+// import Material from '@/views/gyMaterial/GyMaterial.vue'
import GyEmployee from '@/views/basic/gyEmployee/gyEmployee.vue'
import GySupplier from '@/views/basic/gy/gySupplier.vue'
import GyStockPlace from '@/views/basic/gyStockPlace/gyStockPlace.vue'
+// import GyCurrcy from '@/views/basic/gyCurrency/gyCurrency.vue'
+import GyCurrcy from '@/views/component/CurrencyDialog/index.vue'
+import AreaDialog from "@/views/component/AreaDialog"
import moment from 'moment';
export default {
name: 'Kf_StockOutRequestBill',
- components: { Dept, Warehouse, Material, RowSettings, GyEmployee, GySupplier, GyStockPlace },
+ components: { Dept, Warehouse, RowSettings, GyEmployee, GySupplier, GyStockPlace ,GyCurrcy, AreaDialog},
props: {
OperationType: { type: Number, },
linterid: { type: Number, },
@@ -329,6 +261,8 @@
gyEmployeeShow: false,//閿�鍞憳鏁版嵁缁勪欢
gySupplierShow: false,
gyStockPlaceShow: false,
+ currcyShow: false,
+ areaShow: false,//鍦板尯鏁版嵁缁勪欢
deptform: {},//寮圭獥閫変腑鏁版嵁
openData: false,//鏁版嵁寮圭獥
dialogTitle: '',
@@ -380,7 +314,12 @@
form: {},
// 琛ㄥ崟鏍￠獙
rules: {
-
+ HBeginAddrName: [
+ { required: true, message: "濮嬪彂鍦颁笉鑳戒负绌�", trigger: "blur" }
+ ],
+ HEndAddrName: [
+ { required: true, message: "鐩殑鍦颁笉鑳戒负绌�", trigger: "blur" }
+ ],
HDate: [
{ required: true, message: "鏃ユ湡涓嶈兘涓虹┖", trigger: "blur" }
],
@@ -455,6 +394,10 @@
},
//閮ㄩ棬寮圭獥璧嬪��
dbEmitData(deptRow, num) {
+ // console.log('dbEmitData 琚皟鐢�');
+ // console.log('num:', num, '绫诲瀷:', typeof num);
+ // console.log('褰撳墠zbIndex:', this.zbIndex);
+ // console.log('閫夋嫨鐨勬槸:', num === 3 ? '濮嬪彂鍦�' : num === 5 ? '鐩殑鍦�' : '鍏朵粬');
// num=1閮ㄩ棬 num=2鍑哄簱浠撳簱
if (deptRow.HItemID) {
if (num == 1) {
@@ -473,17 +416,26 @@
this.warehouseShow = false
this.openData = false
} else if (num == 3) {
- this.editData[this.zbIndex].HMaterID = deptRow.HItemID;
- 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].HTaxPrice = deptRow.鍚◣鎴愭湰浠�
- this.editData[this.zbIndex].HTaxRate = deptRow.榛樿绋庣巼
- this.materialShow = false
+ if (this.areaType == 'b') {
+ this.editData[this.zbIndex].HBeginAddrName = deptRow.鍦板尯鍚嶇О
+ this.editData[this.zbIndex].HBeginAddr = deptRow.HItemID
+ } else if (this.areaType == 'e') {
+ this.editData[this.zbIndex].HEndAddrName = deptRow.鍦板尯鍚嶇О
+ this.editData[this.zbIndex].HEndAddr = deptRow.HItemID
+ }
+ // this.editData[this.zbIndex].HBeginAddr = deptRow.HItemID;
+ // this.editData[this.zbIndex].HBeginAddrName = deptRow.鍦板尯鍚嶇О;
+ this.areaShow = false
this.openData = false
- } else if (num == 4) {
+ }
+ // else if (num == 5) {
+
+ // this.editData[this.zbIndex].HEndAddr = deptRow.HItemID;
+ // this.editData[this.zbIndex].HEndAddrName = deptRow.鍦板尯鍚嶇О;
+ // this.areaShow = false
+ // this.openData = false
+ // }
+ else if (num == 4) {
if (this.zhiyuanType == 'yewuyuan') {
this.form.HEmpName = deptRow.鑱屽憳鍚嶇О
this.form.HEmpID = deptRow.HItemID
@@ -508,6 +460,13 @@
this.editData[this.zbIndex].HSPID = deptRow.HMainID;
this.editData[this.zbIndex].浠撲綅 = deptRow.浠撲綅鍚嶇О;
this.gyStockPlaceShow = false
+ this.openData = false
+ }
+ else if (num == 10) {
+ this.form.HCurName = deptRow.璐у竵鍚嶇О
+ this.form.HCurID = deptRow.HItemID
+ this.form.HExRate = deptRow.姹囩巼
+ this.currcyShow = false
this.openData = false
}
} else {
@@ -539,11 +498,12 @@
HDeptID:0,
HSupID:0,
HSupName:'',
+ HCarrierID:0,
HEmpID:0,
HEmpName:'',
HCurID:0,
HCurName:'',
- HExRate:'',
+ HExRate:1,
HManagerName:'',
HManagerID:0,
HPSStyleID:0,
@@ -562,7 +522,9 @@
HCloseDate:'',
HUpDateDate:'',
HDeleteDate:'',
-
+ HCurID:0,
+ HCurName:'',
+ HExRate:1,
}
this.editData = []
this.editBtData = []
@@ -646,78 +608,61 @@
handleUpdate() {
this.reset()
let rowHmainid = this.linterid
- axios.get(this.$baseUrl + "/Kf_StockOutRequestBill/cx", {
+ axios.get(this.$baseUrl + "/Pay_WayBillPaymentBillController/Pay_WayBillPaymentBillEditList", {
params: { 'HInterID': rowHmainid }
}).then(response => {
if (response.data.count == 1) {
var result = response.data
var data = response.data.data[0]
this.allVal = data
- this.form.BillType = data.HSourceBillType
+ //this.form.BillType = data.HSourceBillType
if (this.copyType == 1) {
this.getHBillNo()
let date = new Date()
this.form.HDate = moment(date).format('YYYY-MM-DD')
} else {
- this.form.HBillNo = data.鍗曟嵁鍙�
- // this.form.HInterID = data.HInterID
- this.form.HDate = data.鏃ユ湡
- this.form.HMaker = data.鍒跺崟浜�
- this.form.HUpDater = data.淇敼浜�
- this.form.HChecker = data.瀹℃牳浜�
- this.form.HMakeDate = data.鍒跺崟鏃ユ湡
- this.form.HUpDateDate = data.淇敼鏃ユ湡
- this.form.HCheckDate = data.瀹℃牳鏃ユ湡
- this.form.HCloseMan = data.鍏抽棴浜�
- this.form.HDeleteMan = data.浣滃簾浜�
- this.form.HCloseDate = data.鍏抽棴鏃ユ湡
- this.form.HDeleteDate = data.浣滃簾鏃ユ湡
+ this.form.HBillNo = data[0].鍗曟嵁鍙�
+ this.form.HInterID = data[0].HInterID
+ this.form.HDate = data[0].鏃ユ湡
+ this.form.HMaker = data[0].鍒跺崟浜�
+ this.form.HUpDater = data[0].淇敼浜�
+ this.form.HChecker = data[0].瀹℃牳浜�
+ this.form.HMakeDate = data[0].鍒跺崟鏃ユ湡
+ this.form.HUpDateDate = data[0].淇敼鏃ユ湡
+ this.form.HCheckDate = data[0].瀹℃牳鏃ユ湡
+ this.form.HCloseMan = data[0].鍏抽棴浜�
+ this.form.HDeleteMan = data[0].浣滃簾浜�
+ this.form.HCloseDate = data[0].鍏抽棴鏃ユ湡
+ this.form.HDeleteDate = data[0].浣滃簾鏃ユ湡
}
- this.form.HAddress = data.浜よ揣鍦扮偣
- this.form.HDeptName = data.閮ㄩ棬
- this.form.HDeptID = data.HDeptID
- this.form.HSupID = data.HSupID
- this.form.HSupName = data.渚涘簲鍟�
- this.form.HEmpID = data.HEmpID
- this.form.HEmpName = data.涓氬姟鍛�
- this.form.HCurID = data.HCurID
- this.form.HCurName = data.甯佸埆
- this.form.HExRate = data.姹囩巼
- this.form.HManagerName = data.涓荤
- this.form.HManagerID = data.HManagerID
- this.form.HPSStyleID = data.HPSStyleID
- this.form.HPSStyleName = data.閲囪喘鏂瑰紡
- this.form.HSSID = data.HSSID
- this.form.HSSName = data.缁撶畻鏂瑰紡
- this.form.HLinkMan = data.鑱旂郴浜�
- this.form.HLinkPhone = data.鑱旂郴鐢佃瘽
- this.form.HInnerBillNo = data.杈呭姪瀛楁
- this.form.HRemark = data.琛ㄥご澶囨敞
- this.form.HWHName = data['浠撳簱']
- this.form.HWHID = data['HWHID']
- for (var i = 0; i < result.data.length; i++) {
+ this.form.HCarrierID = data[0].HCarrierID
+ this.form.HDeptName = data[0].閮ㄩ棬鍚嶇О
+ this.form.HDeptID = data[0].HDeptID
+ this.form.HSupID = data[0].HCarrierID
+ this.form.HSupName = data[0].渚涘簲鍟�
+ this.form.HEmpID = data[0].HEmpID
+ this.form.HEmpName = data[0].涓氬姟鍛樺悕绉�
+ this.form.HCurID = data[0].HCurID
+ this.form.HCurName = data[0].甯佸埆鍚嶇О
+ this.form.HExRate = data[0].姹囩巼
+
+
+ this.form.HRemark = data[0].琛ㄤ綋澶囨敞
+
+ for (var i = 0; i < data.length; i++) {
this.editData.push(
{
- "HMaterID": result.data[i].HMaterID,
- "鐗╂枡浠ｇ爜": result.data[i].鐗╂枡浠ｇ爜,
- "鐗╂枡鍚嶇О": result.data[i].鐗╂枡鍚嶇О,
- "瑙勬牸鍨嬪彿": result.data[i].瑙勬牸鍨嬪彿,
- "HUnitID": result.data[i].HUnitID,
- "璁￠噺鍗曚綅": result.data[i].璁￠噺鍗曚綅,
- "HQty": result.data[i].鏁伴噺,
- "HRemark": result.data[i].琛ㄤ綋澶囨敞,
- "HPrice": result.data[i].鍗曚环,
- "HMoney": result.data[i].閲戦,
- "HTaxRate": result.data[i].绋庣巼,
- "HTaxMoney": result.data[i].閲戦 * result.data[i].绋庣巼,
- "HlineTotal": result.data[i].閲戦 + result.data[i].绋庨,
- "HlineTotalBB": (result.data[i].閲戦 + result.data[i].绋庨) * result.data[i].姹囩巼, "HTaxPrice": result.data[i].鍚◣鍗曚环,
- "HDiscountRate": result.data[i].鎶樻墸鐜�,
- "HRelTaxPrice": data.瀹為檯鍚◣鍗曚环,
- "浠撳簱": data.浠撳簱,
- "HDate": moment(result.data[i].浜よ揣鏃ユ湡).format('YYYY-MM-DD'),
- "HQtyMust": data.瀹炴敹鏁伴噺,
- "HQty": data.搴旀敹鏁伴噺
+ "HBeginAddr": data[i].HBeginAddr,
+ "HBeginAddrName": data[i].濮嬪彂鍦�,
+ "HEndAddr": data[i].HEndAddr,
+ "HEndAddrName": data[i].鐩殑鍦�,
+ "HRemark": data[i].琛ㄤ綋澶囨敞,
+
+ "HMoney": data[i].杩愯緭璐圭敤,
+ "HTransType": data[i].杩愯緭鏂瑰紡,
+
+ // "HDate": moment(result.data[i].浜よ揣鏃ユ湡).format('YYYY-MM-DD'),
+
}
);
}
@@ -738,10 +683,13 @@
this.$modal.msgError("璇烽�夋嫨涓�琛屾暟鎹紪杈�!");
} else {
let obj = {
- "HMaterID": 0, "鐗╂枡浠ｇ爜": "", "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "", "HUnitID": 0, "璁￠噺鍗曚綅": "", "HWHID": 0, "浠撳簱": "",
- "HSPID": 0, "浠撲綅": "", "HSecUnitID": 0, "搴撳瓨杈呭崟浣�": "", "HBASEUNITID": 0, "鍩烘湰鍗曚綅": "",
- "HEXTAUXUNITID": 0, "杈呭崟浣�": "", "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HRemark": ""
- }
+ "HBeginAddrName": "",
+ "HBeginAddr": 0,
+ "HEndAddrName": "",
+ "HEndAddr": 0,
+ "HMoney": 0,
+ "HRemark": ""
+ };
if (index) {
this.editData.splice(index, 0, obj);
this.$set(this.editData, index, obj)
@@ -812,25 +760,31 @@
// 缂栬緫鎻愪氦淇濆瓨
submitForm() {
this.$refs["form"].validate(valid => {
+
if (valid) {
let fhck = false
- this.editData.map((item, index) => {
- if (!item.浠撳簱) {
- fhck = true
- this.$modal.msgError("绗�" + (index + 1) + "琛岋細浠撳簱鏈�夋嫨锛�");
- }
- })
+ // this.editData.map((item, index) => {
+ // if (!item.浠撳簱) {
+ // fhck = true
+ // this.$modal.msgError("绗�" + (index + 1) + "琛岋細浠撳簱鏈�夋嫨锛�");
+ // }
+ // })
this.$nextTick(() => {
if (!fhck) {
+
+
+ //this.form.HCarrierID=this.form.HSupID
+ this.form.HCarrierID=this.form.HSupID
var sMainStr = JSON.stringify(this.form);
var sSubStr = JSON.stringify(this.editData);
var sAllStr = JSON.stringify(this.allVal)
- var sMainSub = sMainStr + ';' + sSubStr + ';' + this.OperationType + ";" + sessionStorage["HUserName"] + ';' + sAllStr;
+ var refs=this.OperationType==1?"Add":"Update"
+ var sMainSub = sMainStr + ';' + sSubStr + ';' + refs + ";" + sessionStorage["HUserName"] + ';' + sAllStr;
axios({
method: 'post',
- url: this.$baseUrl + "/Kf_StockOutRequestBill/StockOutRequestBillEdit",
+ url: this.$baseUrl + "/Pay_WayBillPaymentBillController/saveBILL",
data: {
- 'sMainSub': sMainSub
+ 'msg': sMainSub
},
}).then(response => {
if (response.data.count == 1) {
@@ -873,6 +827,8 @@
this.gyEmployeeShow = false
this.gySupplierShow = false
this.gyStockPlaceShow = false
+ this.currcyShow = false
+ this.areaShow = false
},
// 鎵撳紑鏁版嵁鍒楄〃寮圭獥
openDataDialog(num, row) {
@@ -890,10 +846,16 @@
this.warehouseShow = true
this.openData = true
} else if (num == 3) {
- this.dialogTitle = '鐗╂枡鍒楄〃'
- this.materialShow = true
+ this.dialogTitle = '鍦板尯鍒楄〃'
+ this.areaShow = true
this.openData = true
- } else if (num == 4) {
+ }
+ // else if (num == 5) {
+ // this.dialogTitle = '鍦板尯鍒楄〃'
+ // this.areaShow = true
+ // this.openData = true
+ // }
+ else if (num == 4) {
this.dialogTitle = '鑱屽憳鍒楄〃'
this.gyEmployeeShow = true
this.openData = true
@@ -905,7 +867,11 @@
this.dialogTitle = '寰�鏉ュ崟浣嶅垪琛�'
this.gyStockPlaceShow = true
this.openData = true
- }
+ }else if (num == 10) {
+ this.dialogTitle = '甯佸埆鍒楄〃'
+ this.currcyShow = true
+ this.openData = true
+ }
},
}
diff --git a/src/views/logistics/WayBillPaymentBill/YF_PayMentOtherBillTranList.vue b/src/views/logistics/WayBillPaymentBill/Pay_WayBillPaymentBillList.vue
similarity index 98%
rename from src/views/logistics/WayBillPaymentBill/YF_PayMentOtherBillTranList.vue
rename to src/views/logistics/WayBillPaymentBill/Pay_WayBillPaymentBillList.vue
index 215cd36..be54acb 100644
--- a/src/views/logistics/WayBillPaymentBill/YF_PayMentOtherBillTranList.vue
+++ b/src/views/logistics/WayBillPaymentBill/Pay_WayBillPaymentBillList.vue
@@ -27,7 +27,7 @@
<el-collapse v-model="activeSeach">
<el-collapse-item title="鏇村" name="1">
<el-card class="box-card">
- <el-form-item label="閮ㄩ棬鍚嶇О" prop="HDepartName">
+ <!---- <el-form-item label="閮ㄩ棬鍚嶇О" prop="HDepartName">
<el-input v-model="queryParams.HDepartName" placeholder="璇疯緭鍏ラ儴闂ㄥ悕绉�"
@keyup.enter.native="HDepartName" />
</el-form-item>
@@ -42,7 +42,7 @@
<el-form-item label="浠撳簱" prop="HWHID">
<el-input v-model="queryParams.HWHID" placeholder="璇疯緭鍏ヤ粨搴�"
@keyup.enter.native="handleQuery" />
- </el-form-item>
+ </el-form-item> -->
<div slot="header" class="clearfix"><span>杩囨护</span></div>
<div>
<el-row>
@@ -174,7 +174,7 @@
<!-- 缂栬緫 -->
<el-dialog title="缂栬緫" :visible.sync="openEdit" width="1480px" append-to-body class="xsckdBox"
@close="close">
- <edit :OperationType="OperationType" :linterid="this.rowForm.hmainid"
+ <edit :OperationType="OperationType" :linterid="this.rowForm.hmainid || this.rowForm.HInterID"
:HSouceBillType="this.rowForm.HSourceBillType" :copyType="copyType" @editClose="editClose"
v-if="editShow" />
</el-dialog>
@@ -185,13 +185,13 @@
<script>
import axios from "axios";
import RowSettings from "@/views/component/rowSettings";
-import Edit from "@/views/warehouse/shipment/Kf_StockOutRequestBill.vue";
+import Edit from "@/views/logistics/WayBillPaymentBill/Pay_WayBillPaymentBillEdit.vue";
import PrintList from "@/views/component/printList";
import BarCodeDetail from '@/views/component/BarCodeDetail' //鏉＄爜鏄庣粏缁勪欢
import moment from "moment";
export default {
- name: "Kf_StockOutRequestBillList",
+ name: "YF_PayMentOtherBillTranList",
components: { RowSettings, Edit, PrintList, BarCodeDetail },
data() {
return {
@@ -376,9 +376,10 @@
if (this.pageSize == 0) {
this.pageSize = 50;
}
+ console.log(this.$baseUrl);
// 鍒楄〃
axios
- .get(this.$baseUrl + "/YF_PayMentOtherBillTran/YF_PayMentOtherBillMainList", {
+ .get(this.$baseUrl + "/Pay_WayBillPaymentBillController/Pay_WayBillPaymentBillList", {
params: {
sWhere: this.sWhere,
user: sessionStorage["HUserName"],
diff --git a/src/views/logistics/transportGPS/WL_YayBill.vue b/src/views/logistics/transportGPS/WL_YayBill.vue
index 98d73f9..8b25290 100644
--- a/src/views/logistics/transportGPS/WL_YayBill.vue
+++ b/src/views/logistics/transportGPS/WL_YayBill.vue
@@ -170,6 +170,10 @@
<el-button type="primary" icon="el-icon-circle-check" size="mini" :disabled="single"
@click="handleVolume(rowForm)">缁存姢闆跺崟鍗犵敤浣撶Н</el-button>
</el-col>
+ <el-col :span="1.5">
+ <el-button type="primary" icon="el-icon-circle-check" size="mini" :disabled="single"
+ @click="SelectPayWayBill()">涓嬫帹杩愬崟璐圭敤</el-button>
+ </el-col>
<el-col :span="1.5">
<el-button type="primary" icon="el-icon-edit-outline" size="mini" :disabled="single"
@click="set_CheckBill(0, form = rowForm)">瀹℃牳</el-button>
@@ -276,6 +280,13 @@
<BarCodeDetail :visible.sync="barCodeDetailShow" ref="barcodeDetail" />
<!-- 鍖呰瀹瑰櫒鍑哄叆搴撴槑缁� -->
<PackStockDetail :visible.sync="packStockDetailShow" ref="packStockDetail" />
+ <!-- 涓嬫帹 -->
+ <el-dialog title="涓嬫帹" :visible.sync="selectEdit" width="1480px" append-to-body class="xsckdBox"
+ @close="close">
+ <edit :OperationType=OperationType :linterid=this.rowForm.HInterID
+ :HEntryID=this.rowForm.HEntryID :copyType="copyType" @editClose="editClose"
+ v-if="TranEditShow" />
+ </el-dialog>
</div>
</div>
</template>
@@ -288,10 +299,9 @@
import BarCodeDetail from '@/views/component/BarCodeDetail' //鏉＄爜鏄庣粏缁勪欢
import PackStockDetail from '@/views/component/PackStockDetail' //鏉＄爜鏄庣粏缁勪欢
import Edit from '@/views/logistics/transportGPS/Add_Edit_WL_YayBill' //缂栬緫椤甸潰缁勪欢
-
+import PayMentOtherBillTranEdit from "@/views/logistics/WayBillPaymentBill/Pay_WayBillPaymentBillEdit.vue"; //缂栬緫椤甸潰缁勪欢
export default {
name: 'WL_YayBill',
- components: { RowSettings, Edit, PrintList, BarCodeDetail, PackStockDetail },
data() {
return {
baseURL: process.env.VUE_APP_BASE_API, //鍚庣鎺ュ彛鍓嶇紑(鍚庣鏈嶅姟鍣╥p鍦板潃)
@@ -785,6 +795,13 @@
})
},
//#endregion
+ //#region 涓嬫帹杩愬崟璐圭敤
+ SelectPayWayBill() {
+ this.editShow = true
+ this.openEdit = true
+ this.OperationType = 4
+ },
+ //#endregion
cancelVolume() {
this.openVolume = false
this.resetVolume()
--
Gitblit v1.9.1