From 235ef3a58a45a886c2bcdcfd1c69bf3039dcacfa Mon Sep 17 00:00:00 2001
From: dytyqx <1342948614@qq.com>
Date: 星期日, 05 四月 2026 09:21:22 +0800
Subject: [PATCH] 修改直接调拨单
---
.env.development | 6
src/views/KCGL/MoveStockBill/Kf_MoveStockBillList.vue | 38 ++++--
src/views/KCGL/MoveStockBill/Kf_MoveStockBillEdit.vue | 261 ++++++++++++++++++++++++++++++++++---------
3 files changed, 234 insertions(+), 71 deletions(-)
diff --git a/.env.development b/.env.development
index f6c8b8d..ed39703 100644
--- a/.env.development
+++ b/.env.development
@@ -6,10 +6,10 @@
# 鏅轰簯杩堟�滾-MOM绠＄悊绯荤粺/寮�鍙戠幆澧�
# VUE_APP_BASE_API = http://localhost:81/API/
-VUE_APP_BASE_API = 'http://47.96.97.237/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/API/'
+VUE_APP_BASE_API = 'http://localhost:8082/API/'
#閿﹂殕
# VUE_APP_BASE_API_INNER = http://192.168.1.11/API/
# VUE_APP_BASE_API = http://61.174.29.234:8880/API/
@@ -22,4 +22,4 @@
# 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
+VUE_CLI_BABEL_TRANSPILE_MODULES = true
\ 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 4c7d2ac..1f9c725 100644
--- a/src/views/KCGL/MoveStockBill/Kf_MoveStockBillEdit.vue
+++ b/src/views/KCGL/MoveStockBill/Kf_MoveStockBillEdit.vue
@@ -19,14 +19,14 @@
</el-col>
<el-col :span="6">
<el-form-item label="鏃ユ湡" prop="HDate">
- <el-date-picker v-model="form.HDate" type="date" placeholder="閫夋嫨鏃ユ湡" value-format="yyyy-MM-ddT">
+ <el-date-picker v-model="form.HDate" type="date" placeholder="閫夋嫨鏃ユ湡" value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="涓氬姟鍛�" prop="HEmpName">
- <el-input v-model="form.HKeeperName" placeholder="璇疯緭鍏ヤ笟鍔″憳" disabled>
- <el-button slot="append" icon="el-icon-search" @click="openDataDialog(1)"></el-button>
+ <el-input v-model="form.HEmpName" placeholder="璇疯緭鍏ヤ笟鍔″憳" disabled>
+ <el-button slot="append" icon="el-icon-search" @click="openDataDialog(4,empType=1)"></el-button>
</el-input>
</el-form-item>
</el-col>
@@ -41,22 +41,22 @@
<el-row>
<el-col :span="6">
<el-form-item label="寰�鏉ュ崟浣�" prop="HSupName">
- <el-input v-model="form.HDeptName" placeholder="璇疯緭鍏ュ線鏉ュ崟浣�" disabled>
- <el-button slot="append" icon="el-icon-search" @click="openDataDialog(1)"></el-button>
+ <el-input v-model="form.HSupName" placeholder="璇疯緭鍏ュ線鏉ュ崟浣�" disabled>
+ <el-button slot="append" icon="el-icon-search" @click="openDataDialog(7)"></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(1)"></el-button>
+ <el-button slot="append" icon="el-icon-search" @click="openDataDialog(2,eHWHType=1)"></el-button>
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="璋冨嚭浠撳簱" prop="HSCWHName">
<el-input v-model="form.HSCWHName" placeholder="璇疯皟鍑轰粨搴�" disabled>
- <el-button slot="append" icon="el-icon-search" @click="openDataDialog(1)"></el-button>
+ <el-button slot="append" icon="el-icon-search" @click="openDataDialog(2,eHWHType=2)"></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(1)"></el-button>
+ <el-button slot="append" icon="el-icon-search" @click="openDataDialog(null)"></el-button>
</el-input>
</el-form-item>
</el-col>
@@ -334,8 +334,8 @@
</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)"
- @dblclick.native="openDataDialog(2, scope.row)" />
+ <el-input v-model="scope.row.HWHName" placeholder="璇疯緭鍏ヨ皟鍏ヤ粨搴�" @keyup.native.f7="openDataDialog(2, scope.row,eHWHType=3)"
+ @dblclick.native="openDataDialog(2, scope.row,eHWHType=3)" />
</template>
</el-table-column>
<el-table-column align="center" label="HSPID" width="120">
@@ -345,8 +345,8 @@
</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)"
- @dblclick.native="openDataDialog(2, scope.row)" />
+ <el-input v-model="scope.row.HSPName" placeholder="璋冨叆浠撲綅" @keyup.native.f7="openDataDialog(9, scope.row,HSPType=1)"
+ @dblclick.native="openDataDialog(9, scope.row,HSPType=1)" />
</template>
</el-table-column>
<el-table-column align="center" label="HSCWHID" width="120">
@@ -356,8 +356,8 @@
</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)"
- @dblclick.native="openDataDialog(2, scope.row)" />
+ <el-input v-model="scope.row.HSCWHName" placeholder="璇疯緭鍏ヨ皟鍑轰粨搴�" @keyup.native.f7="openDataDialog(2, scope.row,eHWHType=4)"
+ @dblclick.native="openDataDialog(2, scope.row,eHWHType=4)" />
</template>
</el-table-column>
<el-table-column align="center" label="HSCSPID" width="120">
@@ -367,8 +367,8 @@
</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)"
- @dblclick.native="openDataDialog(2, scope.row)" />
+ <el-input v-model="scope.row.HSCSPName" placeholder="璋冨嚭浠撲綅" @keyup.native.f7="openDataDialog(9, scope.row,HSPType=2)"
+ @dblclick.native="openDataDialog(9, scope.row,HSPType=2)" />
</template>
</el-table-column>
<el-table-column align="center" label="鎵规" width="120">
@@ -422,11 +422,19 @@
<!-- 鏁版嵁寮圭獥 -->
<el-dialog :title="dialogTitle" :visible.sync="openData" width="1280px" append-to-body>
<!-- 閮ㄩ棬 -->
- <Dept @deptEmitDb="dbEmitData" @deptEmit="emitData" v-if="deptShow" />
+ <Dept @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="deptShow" />
<!-- 浠撳簱 -->
- <Warehouse @deptEmitDb="dbEmitData" @deptEmit="emitData" v-if="warehouseShow" />
+ <Warehouse @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="warehouseShow" />
<!-- 鐗╂枡 -->
- <Material @deptEmitDb="dbEmitData" @deptEmit="emitData" v-if="materialShow" />
+ <Material @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="materialShow" />
+ <!--涓氬姟鍛�-->
+ <GyEmployee @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyEmployeeShow" />
+ <!--瀹㈡埛-->
+ <GyCustomer @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyCustomerShow" />
+ <!--浠撲綅-->銆�
+ <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" />
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="deptClickSub">纭� 瀹�</el-button>
<el-button @click="deptClose">鍙� 娑�</el-button>
@@ -442,13 +450,18 @@
import axios from 'axios'
import moment from 'moment';
import RowSettings from '@/views/component/rowSettings'
-import Dept from '@/views/component/dept'
-import Warehouse from '@/views/component/warehouse'
-import Material from '@/views/component/material'
+import GyEmployee from '@/views/basic/gyEmployee/gyEmployee.vue'
+import Warehouse from '@/views/basic/gyWarehouse/gyWarehouse.vue'
+import Dept from '@/views/basic/gy/gyDepartment'
+import GySupplier from '@/views/basic/gy/gySupplier.vue'
+import GyStockPlace from '@/views/basic/gyStockPlace/gyStockPlace.vue'
+import Material from '@/views/gyMaterial/GyMaterial'
+import GyCustomer from '@/views/GyCustomer/index'
+import HSourceReportHtml from '@/views/component/HSourceReportHtml'
export default {
name: 'MoveStockBillEdit',
- components: { Dept, Warehouse, Material, RowSettings },
+ components: { Dept, Warehouse, Material, RowSettings, GyEmployee, GyCustomer, HSourceReportHtml, GyStockPlace },
props: {
OperationType: { type: Number, },
linterid: { type: Number, },
@@ -462,11 +475,17 @@
organizationList: [], //椤甸潰鍒濆鍖栫粍缁囧垪琛�
sourceBillTypeList: [], //椤甸潰鍒濆鍖栨簮鍗曠被鍨嬪垪琛�
-
+ eHWHType: 0,
loading: true, // 閬僵灞�
-
+ HModName: "Kf_MoveStockBill",
addBtnShow: false, //鏂板鎸夐挳鏄剧ず鏍囪
subDisabled: false, //淇濆瓨鎸夐挳绂佺敤鏍囪
+ empType:0,
+ HSPType:0,
+ HOutMoney:0,
+ rsv:"",
+ openPageData:{}, //浼犲叆寮圭獥鐨勬暟鎹�
+ HSouceBillType:"",
formShow: false, //琛ㄥ崟鏄惁鏄剧ず鏍囪
formHideDataShow: false, //琛ㄥ崟闅愯棌鍐呭鏍囪
@@ -483,6 +502,9 @@
warehouseShow: false, //浠撳簱鏁版嵁缁勪欢鏄剧ず鏍囪
materialShow: false, //鐗╂枡鏁版嵁缁勪欢鏄剧ず鏍囪
stockPlaceShow: false, //浠撲綅鏁版嵁缁勪欢鏄剧ず鏍囪
+ gyEmployeeShow: false, //涓氬姟鍛樻暟鎹粍浠舵樉绀烘爣璁�
+ ScICMOBillShow: false, //婧愬崟鏁版嵁缁勪欢鏄剧ず鏍囪
+ GyCustomerShow: false, //寰�鏉ュ崟浣嶆暟鎹粍浠舵樉绀烘爣璁�
deptform: {}, //寮圭獥閫変腑鏁版嵁
temp: undefined, //涓存椂鍙橀噺
@@ -516,9 +538,11 @@
if ((this.OperationType == 1 && this.copyType != 1) || (!this.OperationType && !this.copyType)) {
this.handleAdd()
+ this.rsv = "Add"
}
else if (this.OperationType == 3 || this.copyType == 1) {
this.handleUpdate()
+ this.rsv = "Update"
}
},
//#endregion
@@ -528,12 +552,17 @@
this.form = {
HInterID: 0,
HBillNo: "",
- HDate: new Date(),
+ HDate: moment().format('YYYY-MM-DD'),
HInnerBillNo: "",
HSupID: 0,
HSupName: "",
HWHID: 0,
HWHName: "",
+ HSCWHName: "",
+ HLinkMan: "",
+ HLinkPhone:"",
+ HAddress:"",
+ HSCWHID: "",
HSecManagerID: 0,
HSecManagerName: "",
HKeeperID: 0,
@@ -547,6 +576,7 @@
HSourceBillType: "",
HExplanation :"",
HRemark: "",
+ HManagerName:"",
HOrgID: sessionStorage["OrganizationID"] - 0,
HMaker: sessionStorage["HUserName"],
@@ -586,6 +616,35 @@
},
//#endregion
+ getSupType() {
+ var type = this.form.HSourceBillType
+ switch (type) {
+ case '1402':
+ return "鍙戣揣閫氱煡鍗�";
+ break;
+ case '1243':
+ return "璋冩嫧鐢宠鍗�";
+ break;
+ case '3720':
+ return "鐢熶骇鐢ㄦ枡娓呭崟";
+ break;
+ case '1604':
+ return "濮斿鐢ㄦ枡娓呭崟";
+ break;
+ case '1214':
+ return "鐢熶骇鍙戞枡閫氱煡鍗�";
+ break;
+ case '3721':
+ return "鐢熶骇澶囨枡鍗�";
+ break;
+ case '1242':
+ return "鍑哄簱鐢宠鍗�";
+ break;
+ }
+ },
+ isAllEqual(array) {
+ return array.every(item => item === array[0])
+ },
//#region 缂栬緫椤甸潰鍒濆鍖�
handleUpdate() {
this.reset()
@@ -663,13 +722,13 @@
, HOutPrice: data.HOutPrice
, HOutMoney: data.HOutMoney
, HWHID: data.HWHID
- , 璋冨叆浠撳簱: data.璋冨叆浠撳簱
+ , HWHName: data.璋冨叆浠撳簱
, HSPID: data.HSPID
- , 浠撲綅鍚嶇О: data.浠撲綅鍚嶇О
+ , HSPName: data.浠撲綅鍚嶇О
, HSCWHID: data.HSCWHID
- , 璋冨嚭浠撳簱: data.璋冨嚭浠撳簱
+ , HSCWHName: data.璋冨嚭浠撳簱
, HSCSPID: data.HSCSPID
- , 璋冨嚭浠撲綅鍚嶇О: data.璋冨嚭浠撲綅鍚嶇О
+ , HSCSPName: data.璋冨嚭浠撲綅鍚嶇О
, HBatchNo:data.HBatchNo
, HPOOrderInterID: data.HPOOrderInterID
, HPOOrderEntryID: data.HPOOrderEntryID
@@ -740,17 +799,59 @@
this.dialogTitle = '鐗╂枡鍒楄〃'
this.materialShow = true
this.openData = true
- }else if (num == 4) {
- this.dialogTitle = '浠撲綅鍒楄〃'
- this.stockPlaceShow = true
+ } else if (num == 4) {
+ if(this.empType == 1){
+ this.dialogTitle = '涓氬姟鍛樺垪琛�'
+ }else if(this.empType == 2){
+ this.dialogTitle = '涓荤鍒楄〃'
+ }else if(this.empType == 3){
+ this.dialogTitle = '楠屾敹鍛樺垪琛�'
+ }else if(this.empType == 4){
+ this.dialogTitle = '淇濈鍛樺垪琛�'
+ }
+ this.gyEmployeeShow = true
this.openData = true
- }
+ }else if (num == 7){
+ this.dialogTitle = '瀹㈡埛鍒楄〃'
+ this.gyCustomerShow = true
+ this.openData = true
+ } else if (num == 9) {
+ if(this.HSPType==1){
+ if(this.editData[this.zbIndex].HWHName){
+ this.dialogTitle = '浠撲綅鍒楄〃'
+ this.openPageData.HWHName = this.editData[this.zbIndex].HWHName
+ this.gyStockPlaceShow = true
+ this.openData = true
+ }else{
+ this.$modal.msgError("璇峰厛閫夋嫨璋冨叆浠撳簱!");
+ }
+ }
+ if(this.HSPType==2){
+ if(this.editData[this.zbIndex].HSCWHName){
+ this.dialogTitle = '浠撲綅鍒楄〃'
+ this.openPageData.HWHName = this.editData[this.zbIndex].HSCWHName
+ this.gyStockPlaceShow = true
+ this.openData = true
+ }else{
+ this.$modal.msgError("璇峰厛閫夋嫨璋冨嚭浠撳簱!");
+ }
+ }
+ }else {
+ this.showReset()
+ this.HSouceBillType = this.getSupType()
+ this.dialogTitle = this.getSupType() + '鍒楄〃'
+ this.ScICMOBillShow = true
+ this.openData = true
+ }
+
},
//#region 灏嗘暟鎹脊绐楀叏閮ㄥ彇娑堝姞杞�
showReset() {
this.deptShow = false
this.warehouseShow = false
this.materialShow = false
+ this.gyEmployeeShow = false
+ this.GyCustomerShow = false
},
//#endregion
//#endregion
@@ -760,21 +861,55 @@
if (num == 1) {
this.form.HDeptName = deptRow.閮ㄩ棬鍚嶇О //閮ㄩ棬
this.form.HDeptID = deptRow.HItemID
- this.form.HEmpID = deptRow.HEmpID
- this.form.HManagerName = deptRow.璐熻矗浜�
this.openData = false
}
- else if (num == 2) { //鏀舵枡浠撳簱
- this.editData[this.zbIndex].HWHID = deptRow.HItemID;
- this.editData[this.zbIndex].鏀舵枡浠撳簱 = deptRow.浠撳簱鍚嶇О;
- this.openData = false
- }
- else if (num == 4) { //浠撲綅
- this.editData[this.zbIndex].HSPID = deptRow.HItemID;
- this.editData[this.zbIndex].浠撲綅鍚嶇О = deptRow.浠撲綅鍚嶇О;
- this.openData = false
- }
- else if (num == 3) { //鐗╂枡
+ else if (num == 2) {
+ if(this.eHWHType == 1){
+ this.form.HWHName = deptRow.浠撳簱鍚嶇О
+ this.form.HWHID = deptRow.HItemID
+ this.form.HWHNumber = deptRow.浠撳簱浠ｇ爜
+ for (let i = 0; i < this.editData.length; i++) {
+ this.editData[i].HWHID = deptRow.HItemID
+ this.editData[i].HWHNumber = deptRow.浠撳簱浠ｇ爜
+ this.editData[i].HWHName = deptRow.浠撳簱鍚嶇О
+ }
+ }else if(this.eHWHType == 2){
+ this.form.HSCWHName = deptRow.浠撳簱鍚嶇О
+ this.form.HSCWHID = deptRow.HItemID
+ this.form.HSCWHNumber = deptRow.浠撳簱浠ｇ爜
+ for (let i = 0; i < this.editData.length; i++) {
+ this.editData[i].HSCWHID = deptRow.HItemID
+ this.editData[i].HSCWHNumber = deptRow.浠撳簱浠ｇ爜
+ this.editData[i].HSCWHName = deptRow.浠撳簱鍚嶇О
+ }
+ }else if(this.eHWHType == 3){
+ this.editData[this.zbIndex].HWHID = deptRow.HItemID
+ this.editData[this.zbIndex].HWHNumber = deptRow.浠撳簱浠ｇ爜
+ this.editData[this.zbIndex].HWHName = deptRow.浠撳簱鍚嶇О
+ }else if(this.eHWHType == 4){
+ this.editData[this.zbIndex].HSCWHID = deptRow.HItemID
+ this.editData[this.zbIndex].HSCWHNumber = deptRow.浠撳簱浠ｇ爜
+ this.editData[this.zbIndex].HSCWHName = deptRow.浠撳簱鍚嶇О
+ }
+ this.warehouseShow = false
+ this.openData = false
+ } else if (num == 4) {
+ if(this.empType == 1){
+ this.form.HEmpName = deptRow.鑱屽憳鍚嶇О
+ this.form.HEmpID = deptRow.HItemID
+ }else if(this.empType == 2){
+ this.form.HMangerName = deptRow.鑱屽憳鍚嶇О
+ this.form.HMangerID = deptRow.HItemID
+ }else if(this.empType == 3){
+ this.form.HSecManagerName = deptRow.鑱屽憳鍚嶇О
+ this.form.HSecManagerID = deptRow.HItemID
+ }else if(this.empType == 4){
+ this.form.HKeeperName = deptRow.鑱屽憳鍚嶇О
+ this.form.HKeeperID = deptRow.HItemID
+ }else
+ this.gyEmployeeShow = 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.鐗╂枡鍚嶇О;
@@ -783,8 +918,26 @@
this.editData[this.zbIndex].璁￠噺鍗曚綅 = deptRow.璁￠噺鍗曚綅鍚嶇О
this.editData[this.zbIndex].HTaxPrice = deptRow.鍚◣鎴愭湰浠�
this.editData[this.zbIndex].HTaxRate = deptRow.榛樿绋庣巼
+ this.materialShow = false
this.openData = false
- }
+ } else if(num == 7){
+ this.form.HSupName = deptRow.瀹㈡埛鍚嶇О
+ this.form.HSupID = deptRow.HItemID
+ this.gyCustomerShow = false
+ this.openData = false
+ }else if (num == 9){
+ if(this.HSPType == 1){
+ this.editData[this.zbIndex].HSPID = deptRow.HItemID
+ this.editData[this.zbIndex].HSPNumber = deptRow.浠撲綅浠ｇ爜
+ this.editData[this.zbIndex].HSPName = deptRow.浠撲綅鍚嶇О
+ }else{
+ this.editData[this.zbIndex].HSCSPID = deptRow.HItemID
+ this.editData[this.zbIndex].HSCSPNumber = deptRow.浠撲綅浠ｇ爜
+ this.editData[this.zbIndex].HSCSPName = deptRow.浠撲綅鍚嶇О
+ }
+ this.gyStockPlaceShow = false
+ this.openData = false
+ }
},
//#endregion
@@ -817,19 +970,19 @@
if (valid) {
let fhck = false
this.editData.map((item, index) => {
- if (!item.鍙戣揣浠撳簱) {
- fhck = true
- this.$modal.msgError("绗�" + (index + 1) + "琛岋細鍙戣揣浠撳簱鏈�夋嫨锛�");
- }
+ // if (!item.鍙戣揣浠撳簱) {
+ // fhck = true
+ // this.$modal.msgError("绗�" + (index + 1) + "琛岋細鍙戣揣浠撳簱鏈�夋嫨锛�");
+ // }
})
this.$nextTick(() => {
if (!fhck) {
var sMainStr = JSON.stringify(this.form);
var sSubStr = JSON.stringify(this.editData);
- var sMainSub = sMainStr + ';' + sSubStr + ';' + sessionStorage["HUserName"] + ';' + this.OperationType;
+ var sMainSub = sMainStr + ';' + sSubStr + ';' + this.rsv + ';' + sessionStorage["HUserName"];
axios({
method: 'post',
- url: this.$baseUrl + "/Kf_SellOutBill/SaveSellOutBillList",
+ url: this.$baseUrl + "Kf_MoveStockBill/SaveKf_MoveStockBillMain",
data: {
'msg': sMainSub
},
diff --git a/src/views/KCGL/MoveStockBill/Kf_MoveStockBillList.vue b/src/views/KCGL/MoveStockBill/Kf_MoveStockBillList.vue
index 677aa13..041c9a2 100644
--- a/src/views/KCGL/MoveStockBill/Kf_MoveStockBillList.vue
+++ b/src/views/KCGL/MoveStockBill/Kf_MoveStockBillList.vue
@@ -174,7 +174,7 @@
</template>
</el-table>
<!-- 璁板綍鏁般�侀〉鏁般�佸綋鍓嶉〉 -->
- <pagination v-show="total > 0" :total="total" :page.sync="page" :limit.sync="pageSize" @pagination="handleQuery" />
+ <pagination v-show="total > 0" :total="total" :page.sync="page" :limit.sync="pageSize" :pageSizes="pageSizes" @pagination="getList" />
<!-- 鍒楄缃� -->
<el-dialog title="闅愯棌鍒楄缃�" :visible.sync="openRowHide" width="816px" append-to-body>
<RowSettings :colName="btResList" HModName="Kf_MoveStockBillList" @rowEditClose="rowSetClose"
@@ -285,9 +285,17 @@
ColContent: '',
},
- page: 1, //page椤电储寮�
- pageSize: 0, //page椤甸潰璁板綍鏁�
- total: 0, //璁板綍鍚堣鏁�
+ loading: true,
+ tyResList: [],//鍒楄〃锛堟帴鍙ｆ暟鎹級
+ btList: [],//琛ㄥご鍒楄〃鏄剧ず
+ btResList: [],
+ tableData: [],//鍒楄〃(鍒嗛〉鏄剧ず)
+ dataList: [],
+ titleData: [],//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ pageSizes: [ 50,100, 500, 5000, 50000],
+ page: 1,
+ pageSize: 0,
+ total: 0,
tableShow: true, // table鏄剧ず鏍囪
totalNameList: [], // 闇�瑕佽缃悎璁¤鐨勫垪鏁扮粍
tableData: [], // 鍒楄〃鏁版嵁銆傜敤浜巘able鐩戝惉浜嬩欢
@@ -497,7 +505,6 @@
//#region 鏌ヨ
getList() {
- this.pageSize = 50
if (this.pageSize == 0) {
this.pageSize = 50
}
@@ -505,16 +512,19 @@
this.loading = true
// 鍒楄〃鏌ヨ
- axios.get(this.$baseUrl + '/Kf_MoveStockBill/GetMoveStockBillList', {
+ axios.get(this.$baseUrl + '/Kf_MoveStockBill/page', {
params: {
"sWhere": this.sWhere,
- "user": sessionStorage["HUserName"]
+ "user": sessionStorage["HUserName"],
+ "page": this.page,
+ "size": this.pageSize,
+ "Type":'1207',
},
}).then(response => {
this.tyResList = response.data.data//鎬绘暟鎹�
let data1 = response.data
let option = []
- if (data1.count == 1) {
+ if (data1.list && data1.list.length > 0) {
this.btResList = data1.list //鍒楄〃琛ㄥご鏁版嵁
this.total = data1.count;
var data = [];//鍒楀瓧娈垫暟鎹�
@@ -808,11 +818,11 @@
this.totalNameList.push(item)
}
})
- if (data1.data[0].HPageSize == 0) {
- this.pageSize = 50
- } else {
- this.pageSize = data1.data[0].HPageSize
- }
+ // if (data1.data[0].HPageSize == 0) {
+ // this.pageSize = 50
+ // } else {
+ // this.pageSize = data1.data[0].HPageSize
+ // }
this.tableData = option.data
this.tableShow = true
this.loading = false
@@ -918,7 +928,7 @@
var result = false;
axios.get(this.$baseUrl + '/Xt_getInfo/getCompanyName').then(response => {
var data1 = response.data
- if (data1.count == 1) {
+ if (data1.list && data1.list.length > 0) {
if (data1.data == "姘村姟") {
result = true;
}
--
Gitblit v1.9.1