From 723793a0aa8d69cbbb463830a3344dbd6655cee5 Mon Sep 17 00:00:00 2001
From: chenhaozhe <gaozhechen26@gmail.com>
Date: 星期六, 04 四月 2026 14:57:02 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI
---
src/views/scMould/warehouse/Sc_MouldProdBackBillEdit.vue | 35
src/views/scMould/basicModeling/Gy_MaterialPackingRelationList.vue | 9
src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillList.vue | 4
src/views/KCGL/MoveStockBill/Kf_MoveStockBillList.vue | 48
src/views/system/user/GyDriverEdit.vue | 60
src/views/component/printList/barcode.vue | 9
src/views/FbStepFoldinBillList/fbStepFoldinBillList.vue | 46
src/views/scMould/warehouse/Sc_MouldProdOutBillEdit.vue | 33
src/views/component/printList/hBarPlanPrint.vue | 51
src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillEdit.vue | 21
src/views/basic/gytransport/cgContractTransportBillList/Cg_ContractTransportBillEdit.vue | 22
src/router/index.js | 47
src/views/basic/gy/gySupplier.vue | 21
.env.development | 6
src/views/sell/sellOut/sellOutBill.vue | 113 +
src/views/ProductInBill/Kf_ProductInBillList.vue | 93
src/views/warehouse/barcodeMaster/Gy_BarCodeBill_JinLong.vue | 56
.env.production | 4
src/views/scMould/warehouse/Sc_MouldInRequestBillEdit.vue | 24
src/views/scMould/warehouse/Sc_MouldOutRequestBillEdit.vue | 100
src/views/scMould/warehouse/Sc_MouldOutRequestBillList.vue | 8
src/views/component/CurrencyDialog/index.vue | 14
src/views/sell/XsSeOutStockBill.vue | 21
src/layout/components/Navbar.vue | 7
src/views/FbStepFoldOutBillList/fbStepFoldOutBillList.vue | 92
src/views/basic/gyCar/gyCarEdit.vue | 26
src/views/scMould/warehouse/Sc_MouldProdMoveBillEdit.vue | 33
RuoYi-Vue | 1
src/views/warehouse/barcodeMaster/Gy_BarCodeBillList.vue | 86
src/views/basic/gyCurrency/gyCurrency.vue | 9
src/views/logistics/transportGPS/WL_YayBill.vue | 619 +++++
src/views/warehouse/barcodeMaster/Gy_BarCodeBill_JinLong_AutoLogin.vue | 89
src/views/scMould/warehouse/Sc_MouldProdOutBillList.vue | 4
src/views/basic/gyCurrency/gyCurrencyEdit.vue | 14
src/views/basic/gyCar/gyCarList.vue | 121 +
src/views/scMould/warehouse/Sc_MouldProdMoveBillList.vue | 8
src/views/purchase/cgPoInStockBill/cgPoInStockBill.vue | 13
src/views/system/user/GyDriver.vue | 38
src/views/scMould/warehouse/Sc_MouldProdBackBillList.vue | 4
src/views/scMould/basicModeling/Gy_MouldFileList.vue | 19
src/store/modules/permission.js | 59
src/views/warehouse/BarCodeReport/Kf_BarCodeOutInReport.vue | 961 ++++++++++
src/views/component/printList/index.vue | 5
src/views/login.vue | 1
src/views/basic/gytransport/cgContractTransportBillList/Cg_ContractTransportBillList.vue | 91
src/views/scMould/warehouse/Sc_MouldInRequestBillList.vue | 6
public/static/grf/出运单.grf | 375 +++
src/views/warehouse/BarCodeReport/Kf_ICInventory_BarCode.vue | 924 +++++++++
src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue | 1288 ++++++++-----
49 files changed, 4,929 insertions(+), 809 deletions(-)
diff --git a/.env.development b/.env.development
index 1a22f02..2a4cc68 100644
--- a/.env.development
+++ b/.env.development
@@ -8,10 +8,12 @@
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/API/'
#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/
+# 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/
diff --git a/.env.production b/.env.production
index cc2da22..ec7dfbe 100644
--- a/.env.production
+++ b/.env.production
@@ -5,8 +5,8 @@
ENV = 'production'
# 瀹佹尝 鍥涚淮灏�
-# 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_INNER = http://192.168.1.11/API/
# VUE_APP_BASE_API = http://61.174.29.234:8880/API/
diff --git a/RuoYi-Vue b/RuoYi-Vue
new file mode 160000
index 0000000..8a1cf9e
--- /dev/null
+++ b/RuoYi-Vue
@@ -0,0 +1 @@
+Subproject commit 8a1cf9ed55747229ce4149ddacf8596fa0995814
diff --git "a/public/static/grf/\345\207\272\350\277\220\345\215\225.grf" "b/public/static/grf/\345\207\272\350\277\220\345\215\225.grf"
new file mode 100644
index 0000000..bdbd86e
--- /dev/null
+++ "b/public/static/grf/\345\207\272\350\277\220\345\215\225.grf"
@@ -0,0 +1,375 @@
+锘縶
+ "Version":"6.8.2.2",
+ "Title":"1a.绠�鍗曡〃鏍�",
+ "Author":"閿愭氮鎶ヨ〃杞欢",
+ "Description":"婕旂ず涓�涓渶鍩烘湰鐨勫垪琛ㄦ姤琛ㄣ��",
+ "Font":{
+ "Name":"瀹嬩綋",
+ "Size":90000,
+ "Weight":400,
+ "Charset":134
+ },
+ "Printer":{
+ "TopMargin":1.5,
+ "BottomMargin":1.5
+ },
+ "DetailGrid":{
+ "CenterView":true,
+ "PrintAdaptMethod":"ResizeToFit",
+ "Recordset":{
+ "Field":[
+ {
+ "Name":"鍗曟嵁鍙�"
+ },
+ {
+ "Name":"鐗╂枡浠ｇ爜"
+ },
+ {
+ "Name":"鐗╂枡鍚嶇О"
+ },
+ {
+ "Name":"鐗╂枡鏁伴噺",
+ "DBFieldName":"鏁伴噺"
+ },
+ {
+ "Name":"濮嬪彂鍦�"
+ },
+ {
+ "Name":"鏃ユ湡",
+ "Type":"DateTime",
+ "Format":"yyyy//MM//mm"
+ },
+ {
+ "Name":"鐩殑鍦�"
+ },
+ {
+ "Name":"杩愯緭绫诲瀷"
+ },
+ {
+ "Name":"鍙告満"
+ },
+ {
+ "Name":"杞﹀瀷"
+ },
+ {
+ "Name":"杞︾墝鍙�"
+ },
+ {
+ "Name":"瀹㈡埛"
+ },
+ {
+ "Name":"鎻愯揣鍦板潃"
+ },
+ {
+ "Name":"鍒拌揣鍦板潃"
+ },
+ {
+ "Name":"鎵胯繍鍟�"
+ }
+ ]
+ },
+ "Column":[
+ {
+ "Name":"鍗曟嵁鍙�",
+ "Width":2.77813
+ },
+ {
+ "Name":"鐗╂枡浠ｇ爜",
+ "Width":2.80458
+ },
+ {
+ "Name":"鐗╂枡鍚嶇О",
+ "Width":2.61938
+ },
+ {
+ "Name":"瑙勬牸鍨嬪彿",
+ "Width":4.84188
+ },
+ {
+ "Name":"Column1",
+ "Width":3.96875
+ },
+ {
+ "Name":"Column2",
+ "Width":2.77813
+ },
+ {
+ "Name":"Column3",
+ "Width":2.77813
+ }
+ ],
+ "ColumnContent":{
+ "Height":1.00542,
+ "ColumnContentCell":[
+ {
+ "Column":"鍗曟嵁鍙�",
+ "TextAlign":"MiddleCenter",
+ "DataField":"杩愯緭绫诲瀷"
+ },
+ {
+ "Column":"鐗╂枡浠ｇ爜",
+ "TextAlign":"MiddleCenter",
+ "DataField":"鐗╂枡浠ｇ爜"
+ },
+ {
+ "Column":"鐗╂枡鍚嶇О",
+ "TextAlign":"MiddleCenter",
+ "DataField":"鐗╂枡鍚嶇О"
+ },
+ {
+ "Column":"瑙勬牸鍨嬪彿",
+ "TextAlign":"MiddleCenter",
+ "DataField":"鐗╂枡鏁伴噺"
+ },
+ {
+ "Column":"Column1",
+ "DataField":"瀹㈡埛"
+ },
+ {
+ "Column":"Column2",
+ "DataField":"鎻愯揣鍦板潃"
+ },
+ {
+ "Column":"Column3",
+ "DataField":"鍒拌揣鍦板潃"
+ }
+ ]
+ },
+ "ColumnTitle":{
+ "BackColor":"C0C0C0",
+ "Height":0.608542,
+ "Font":{
+ "Name":"瀹嬩綋",
+ "Size":90000,
+ "Bold":true,
+ "Charset":134
+ },
+ "RepeatStyle":"OnPage",
+ "ColumnTitleCell":[
+ {
+ "GroupTitle":false,
+ "Column":"鍗曟嵁鍙�",
+ "BackColor":"FFFFFF",
+ "TextAlign":"MiddleCenter",
+ "Text":"杩愯緭绫诲瀷"
+ },
+ {
+ "GroupTitle":false,
+ "Column":"鐗╂枡浠ｇ爜",
+ "BackColor":"FFFFFF",
+ "TextAlign":"MiddleCenter",
+ "Text":"鐗╂枡浠ｇ爜"
+ },
+ {
+ "GroupTitle":false,
+ "Column":"鐗╂枡鍚嶇О",
+ "BackColor":"FFFFFF",
+ "TextAlign":"MiddleCenter",
+ "Text":"鐗╂枡鍚嶇О"
+ },
+ {
+ "GroupTitle":false,
+ "Column":"瑙勬牸鍨嬪彿",
+ "BackColor":"FFFFFF",
+ "TextAlign":"MiddleCenter",
+ "Text":"鐗╂枡鏁伴噺"
+ },
+ {
+ "GroupTitle":false,
+ "Column":"Column1",
+ "BackColor":"FFFFFF",
+ "TextAlign":"MiddleCenter",
+ "Text":"瀹㈡埛"
+ },
+ {
+ "GroupTitle":false,
+ "Column":"Column2",
+ "BackColor":"FFFFFF",
+ "TextAlign":"MiddleCenter",
+ "Text":"鎻愯揣鍦板潃"
+ },
+ {
+ "GroupTitle":false,
+ "Column":"Column3",
+ "BackColor":"FFFFFF",
+ "TextAlign":"MiddleCenter",
+ "Text":"鍒拌揣鍦板潃"
+ }
+ ]
+ }
+ },
+ "ReportHeader":[
+ {
+ "Height":2.98979,
+ "Control":[
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox1",
+ "Center":"Horizontal",
+ "Left":6.29708,
+ "Top":0.79375,
+ "Width":3.41313,
+ "Height":0.582083,
+ "Font":{
+ "Name":"瀹嬩綋",
+ "Size":150000,
+ "Bold":true,
+ "Charset":134
+ },
+ "TextAlign":"MiddleCenter",
+ "Text":"鍑鸿繍鍗�"
+ },
+ {
+ "Type":"MemoBox",
+ "Name":"MemoBox1",
+ "Top":2.40771,
+ "Width":2.19604,
+ "Height":0.582083,
+ "Text":"鍙戣揣閫氱煡鍗�"
+ },
+ {
+ "Type":"FieldBox",
+ "Name":"FieldBox1",
+ "Left":2.40771,
+ "Top":2.40771,
+ "Width":2.19604,
+ "Height":0.582083,
+ "DataField":"鍗曟嵁鍙�"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox2",
+ "Left":3.99521,
+ "Top":2.40771,
+ "Width":2.61938,
+ "Height":0.582083,
+ "Text":"濮嬪彂鍦�"
+ },
+ {
+ "Type":"FieldBox",
+ "Name":"FieldBox2",
+ "Left":5.60917,
+ "Top":2.40771,
+ "Width":2.80458,
+ "Height":0.582083,
+ "DataField":"濮嬪彂鍦�"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox3",
+ "Left":11.0067,
+ "Top":0.79375,
+ "Width":1.79917,
+ "Height":0.582083,
+ "Text":"鏃ユ湡"
+ },
+ {
+ "Type":"FieldBox",
+ "Name":"FieldBox3",
+ "Left":12.409,
+ "Top":0.79375,
+ "Width":2.01083,
+ "Height":0.582083,
+ "DataField":"鏃ユ湡"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox4",
+ "Left":8.20208,
+ "Top":2.40771,
+ "Width":2.19604,
+ "Height":0.582083,
+ "Text":"鐩殑鍦�"
+ },
+ {
+ "Type":"FieldBox",
+ "Name":"FieldBox4",
+ "Left":10.2129,
+ "Top":2.40771,
+ "Width":2.59292,
+ "Height":0.608542,
+ "DataField":"鐩殑鍦�"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox6",
+ "Left":12.409,
+ "Top":2.40771,
+ "Width":1.5875,
+ "Height":0.608542,
+ "Text":"鎵胯繍鍟�"
+ },
+ {
+ "Type":"FieldBox",
+ "Name":"FieldBox6",
+ "Left":13.9965,
+ "Top":2.40771,
+ "Width":2.01083,
+ "Height":0.582083,
+ "DataField":"鎵胯繍鍟�"
+ },
+ {
+ "Type":"Line",
+ "Name":"Line1",
+ "Left":3.99521,
+ "Top":1.5875,
+ "Width":6.61458
+ }
+ ]
+ }
+ ],
+ "ReportFooter":[
+ {
+ "Name":"ReportFooter1",
+ "Control":[
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox5",
+ "Width":2.59292,
+ "Height":0.396875,
+ "Text":"鍙告満"
+ },
+ {
+ "Type":"FieldBox",
+ "Name":"FieldBox5",
+ "Left":2.59292,
+ "Width":2.4,
+ "Height":0.396875,
+ "DataField":"鍙告満"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox7",
+ "Left":5.00063,
+ "Width":2.19604,
+ "Height":0.396875,
+ "Text":"杞﹀瀷"
+ },
+ {
+ "Type":"FieldBox",
+ "Name":"FieldBox7",
+ "Left":6.40292,
+ "Width":3.20146,
+ "Height":0.396875,
+ "DataField":"杞﹀瀷"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox8",
+ "Left":8.59896,
+ "Width":2.01083,
+ "Height":0.396875,
+ "Text":"杞︾墝鍙�"
+ },
+ {
+ "Type":"FieldBox",
+ "Name":"FieldBox8",
+ "Left":10.6098,
+ "Width":1.98438,
+ "Height":0.396875,
+ "DataField":"杞︾墝鍙�"
+ }
+ ]
+ }
+ ]
+}
\ No newline at end of file
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 56d54ee..4a16513 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -109,7 +109,12 @@
type: 'warning'
}).then(() => {
this.$store.dispatch('FedLogOut').then(() => {
- location.href = '/index'
+ const loginPage = sessionStorage.getItem('loginPage') || 'login';
+ if (loginPage === 'loginTMS') {
+ location.href = '/loginTMS'
+ } else {
+ location.href = '/index'
+ }
})
}).catch(() => { })
}
diff --git a/src/router/index.js b/src/router/index.js
index fa2d612..bab52bd 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -118,7 +118,32 @@
},
//#endregion
//#endregion
-
+ //#region 鏉＄爜鎶ヨ〃
+ {
+ path: "/BarCodeReport/Kf_BarCodeOutInReport",
+ component: Layout,
+ hidden: true,
+ redirect: "noredirect",
+ meta: {
+ breadcrumb: false, // 濡傛灉璁剧疆涓篺alse锛屽垯涓嶄細鍦╞readcrumb闈㈠寘灞戜腑鏄剧ず
+ activeMenu: "/warehouse/BarCodeReport/Kf_BarCodeOutInReport", // 褰撹矾鐢辫缃簡璇ュ睘鎬э紝鍒欎細楂樹寒鐩稿搴旂殑渚ц竟鏍忋��
+ },
+ children: [{
+ path: "/warehouse/BarCodeReport/Kf_BarCodeOutInReport",
+ component: () =>
+ import("@/views/warehouse/BarCodeReport/Kf_BarCodeOutInReport.vue"),
+ name: "Kf_BarCodeOutInReport",
+ meta: { title: "鏉＄爜鍑哄叆搴撴姤琛�", activeMenu: "/warehouse/BarCodeReport/Kf_BarCodeOutInReport" },
+ },{
+ path: "/warehouse/BarCodeReport/Kf_ICInventory_BarCode",
+ component: () =>
+ import("@/views/warehouse/BarCodeReport/Kf_ICInventory_BarCode.vue"),
+ name: "Kf_ICInventory_BarCode",
+ meta: { title: "鏉＄爜搴撳瓨鎶ヨ〃", activeMenu: "/warehouse/BarCodeReport/Kf_ICInventory_BarCode" },
+ },
+ ]
+ },
+ //#endregion
//#region 鏉＄爜绠＄悊
//#region 鏉＄爜鐢熸垚
{
@@ -1562,6 +1587,26 @@
},
//#endregion
+ //#region 杞﹁締鍒楄〃
+ {
+ path: "/basic",
+ component: Layout,
+ hidden: true,
+ redirect: "noredirect",
+ meta: {
+ breadcrumb: false, // 濡傛灉璁剧疆涓篺alse锛屽垯涓嶄細鍦╞readcrumb闈㈠寘灞戜腑鏄剧ず
+ activeMenu: "/basic/gy", // 褰撹矾鐢辫缃簡璇ュ睘鎬э紝鍒欎細楂樹寒鐩稿搴旂殑渚ц竟鏍忋��
+ },
+ children: [
+ {
+ path: "/basic/gy/GyDriver",
+ component: () => import("@/views/system/user/GyDriver.vue"),
+ name: "gyDriver",
+ meta: { title: "椹鹃┒鍛樺垪琛�", activeMenu: "/basic/gy" },
+ },
+ ],
+ },
+ //#endregion
//#endregion
//#region 璐圭敤鍩虹璧勬枡
diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
index c7d2e7a..cdc198b 100644
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -483,6 +483,51 @@
icon: "build",
link: null,
noCache: false,
+ title: "鎶ヨ〃缁熻",
+ },
+ hidden: false,
+ name: "barCodeReport",
+ path: "BarCodeReport",
+ redirect: "noRedirect",
+ component: "Layout",
+ children: [
+ {
+ meta: {
+ icon: "build",
+ link: null,
+ noCache: false,
+ title: "鏉＄爜鍑哄叆搴撴姤琛�",
+ },
+ component: () =>
+ import(
+ "@/views/warehouse/BarCodeReport/Kf_BarCodeOutInReport.vue"
+ ),
+ hidden: false,
+ name: "Kf_BarCodeOutInReport",
+ path: "Kf_BarCodeOutInReport",
+ },
+ {
+ meta: {
+ icon: "build",
+ link: null,
+ noCache: false,
+ title: "鏉＄爜搴撳瓨鎶ヨ〃",
+ },
+ component: () =>
+ import(
+ "@/views/warehouse/BarCodeReport/Kf_ICInventory_BarCode.vue"
+ ),
+ hidden: false,
+ name: "Kf_ICInventory_BarCode",
+ path: "Kf_ICInventory_BarCode",
+ },
+ ],
+ },
+ {
+ meta: {
+ icon: "build",
+ link: null,
+ noCache: false,
title: "鏉＄爜涓绘。",
},
hidden: false,
@@ -660,7 +705,7 @@
},
component: () =>
import("@/views/basic/gyCartypelist/gyCartypelist.vue"),
- hidden: false,
+ hidden: HIsHide,
name: "GyCartypelist",
path: "gyCartypelist",
},
@@ -695,6 +740,18 @@
icon: "build",
link: null,
noCache: false,
+ title: "椹鹃┒鍛樺垪琛�",
+ },
+ component: () => import("@/views/system/user/GyDriver.vue"),
+ hidden: false,
+ name: "gyDriver",
+ path: "GyDriver",
+ },
+ {
+ meta: {
+ icon: "build",
+ link: null,
+ noCache: false,
title: "鑱屽憳鍒楄〃",
},
component: () =>
diff --git a/src/views/FbStepFoldOutBillList/fbStepFoldOutBillList.vue b/src/views/FbStepFoldOutBillList/fbStepFoldOutBillList.vue
index a2a4b0f..4e0e9a1 100644
--- a/src/views/FbStepFoldOutBillList/fbStepFoldOutBillList.vue
+++ b/src/views/FbStepFoldOutBillList/fbStepFoldOutBillList.vue
@@ -163,6 +163,8 @@
<el-row style="margin-bottom:8px">
<el-col>
<el-button size="mini" type="primary" @click="handleAdd">鏂板</el-button>
+ <el-button size="mini" @click="set_HTagCount">璐存爣绛炬暟</el-button>
+ <el-button size="mini" @click="set_PalletChange">鎵樻暟鍙樻洿</el-button>
<el-button size="mini" @click="handleEdit">缂栬緫</el-button>
<el-button size="mini" type="danger" @click="set_DeleteBill">鍒犻櫎</el-button>
<el-button size="mini" @click="set_CheckBill(1)">瀹℃牳</el-button>
@@ -523,6 +525,96 @@
this.onSearch();
}
},
+ set_HTagCount() {
+ if (!this.rowForm || !this.rowForm.hmainid) {
+ this.$modal.msgError('璇峰厛閫夋嫨涓�鏉¤褰曪紒')
+ return
+ }
+
+ const rowData = this.rowForm // 浣跨敤 rowForm 鑰屼笉鏄� rowList
+ const currentPallet = rowData.璐存爣绛炬暟 || 0
+
+ // 灏�"璇疯緭鍏ユ柊鎵樻暟"浣滀负杈撳叆妗嗙殑placeholder
+ this.$prompt(`褰撳墠璐存爣绛炬暟锛�${currentPallet}`, {
+ confirmButtonText: '淇濆瓨',
+ cancelButtonText: '鍙栨秷',
+ inputValue: currentPallet,
+ inputType: 'number',
+ inputValidator: (value) => {
+ if (!value) return '璇疯緭鍏ヨ创鏍囩鏁帮紒'
+ const num = parseInt(value)
+ if (isNaN(num)) return '璇疯緭鍏ユ湁鏁堢殑鏁板瓧锛�'
+ if (num.toString() !== value) return '璐存爣绛炬暟涓嶈兘涓哄皬鏁帮紒'
+ if (num <0) return '璐存爣绛炬暟蹇呴』澶т簬0锛�'
+ return true
+ }
+ }).then(({ value }) => {
+ const newPallet = parseInt(value)
+
+ return axios.post(this.$baseUrl + '/Kf_POStockInBill/UpdateHTagCount', {
+ hmainid: rowData.hmainid,
+ newPallet: newPallet,
+ operator: sessionStorage["HUserName"]
+ })
+ }).then(response => {
+ if (response.data && response.data.count == 1) {
+ this.$modal.msgSuccess('璐存爣绛炬暟鍙樻洿鎴愬姛锛�')
+ this.onSearch()
+ this.rowForm = null
+ } else {
+ this.$modal.msgError('閿欒锛�' + (response.data.Message || '淇濆瓨澶辫触'))
+ }
+ }).catch(error => {
+ if (error !== 'cancel') {
+ this.$modal.msgError('鎿嶄綔澶辫触锛�' + error.message)
+ }
+ })
+ },
+ set_PalletChange() {
+ if (!this.rowForm || !this.rowForm.hmainid) {
+ this.$modal.msgError('璇峰厛閫夋嫨涓�鏉¤褰曪紒')
+ return
+ }
+
+ const rowData = this.rowForm // 浣跨敤 rowForm 鑰屼笉鏄� rowList
+ const currentPallet = rowData.鎵樻暟 || 0
+
+ // 灏�"璇疯緭鍏ユ柊鎵樻暟"浣滀负杈撳叆妗嗙殑placeholder
+ this.$prompt(`褰撳墠鎵樻暟锛�${currentPallet}`, {
+ confirmButtonText: '淇濆瓨',
+ cancelButtonText: '鍙栨秷',
+ inputValue: currentPallet,
+ inputType: 'number',
+ inputValidator: (value) => {
+ if (!value) return '璇疯緭鍏ユ墭鏁帮紒'
+ const num = parseInt(value)
+ if (isNaN(num)) return '璇疯緭鍏ユ湁鏁堢殑鏁板瓧锛�'
+ if (num.toString() !== value) return '鎵樻暟涓嶈兘涓哄皬鏁帮紒'
+ if (num <0) return '鎵樻暟蹇呴』澶т簬0锛�'
+ return true
+ }
+ }).then(({ value }) => {
+ const newPallet = parseInt(value)
+
+ return axios.post(this.$baseUrl + '/Kf_POStockInBill/UpdatePallet', {
+ hmainid: rowData.hmainid,
+ newPallet: newPallet,
+ operator: sessionStorage["HUserName"]
+ })
+ }).then(response => {
+ if (response.data && response.data.count == 1) {
+ this.$modal.msgSuccess('鎵樻暟鍙樻洿鎴愬姛锛�')
+ this.onSearch()
+ this.rowForm = null
+ } else {
+ this.$modal.msgError('閿欒锛�' + (response.data.Message || '淇濆瓨澶辫触'))
+ }
+ }).catch(error => {
+ if (error !== 'cancel') {
+ this.$modal.msgError('鎿嶄綔澶辫触锛�' + error.message)
+ }
+ })
+ },
set_AddNew() {
window.open('./Fb_StepFoldinBillEdit.html?OperationType=1&linterid=&HSouceBillType=0&closeType=1', '_blank');
},
diff --git a/src/views/FbStepFoldinBillList/fbStepFoldinBillList.vue b/src/views/FbStepFoldinBillList/fbStepFoldinBillList.vue
index 9890146..167f89f 100644
--- a/src/views/FbStepFoldinBillList/fbStepFoldinBillList.vue
+++ b/src/views/FbStepFoldinBillList/fbStepFoldinBillList.vue
@@ -163,6 +163,7 @@
<el-row style="margin-bottom:8px">
<el-col>
<el-button size="mini" type="primary" @click="handleAdd">鏂板</el-button>
+ <el-button size="mini" @click="set_PalletChange">鎵樻暟鍙樻洿</el-button>
<el-button size="mini" @click="handleEdit">缂栬緫</el-button>
<el-button size="mini" type="danger" @click="set_DeleteBill">鍒犻櫎</el-button>
<el-button size="mini" @click="set_CheckBill(1)">瀹℃牳</el-button>
@@ -663,6 +664,51 @@
}
}
},
+ set_PalletChange() {
+ if (!this.rowForm || !this.rowForm.hmainid) {
+ this.$modal.msgError('璇峰厛閫夋嫨涓�鏉¤褰曪紒')
+ return
+ }
+
+ const rowData = this.rowForm // 浣跨敤 rowForm 鑰屼笉鏄� rowList
+ const currentPallet = rowData.鎵樻暟 || 0
+
+ // 灏�"璇疯緭鍏ユ柊鎵樻暟"浣滀负杈撳叆妗嗙殑placeholder
+ this.$prompt(`褰撳墠鎵樻暟锛�${currentPallet}`, {
+ confirmButtonText: '淇濆瓨',
+ cancelButtonText: '鍙栨秷',
+ inputValue: currentPallet,
+ inputType: 'number',
+ inputValidator: (value) => {
+ if (!value) return '璇疯緭鍏ユ墭鏁帮紒'
+ const num = parseInt(value)
+ if (isNaN(num)) return '璇疯緭鍏ユ湁鏁堢殑鏁板瓧锛�'
+ if (num.toString() !== value) return '鎵樻暟涓嶈兘涓哄皬鏁帮紒'
+ if (num < 0) return '鎵樻暟蹇呴』澶т簬0锛�'
+ return true
+ }
+ }).then(({ value }) => {
+ const newPallet = parseInt(value)
+
+ return axios.post(this.$baseUrl + '/Kf_POStockInBill/UpdatePallet', {
+ hmainid: rowData.hmainid,
+ newPallet: newPallet,
+ operator: sessionStorage["HUserName"]
+ })
+ }).then(response => {
+ if (response.data && response.data.count == 1) {
+ this.$modal.msgSuccess('鎵樻暟鍙樻洿鎴愬姛锛�')
+ this.onSearch()
+ this.rowForm = null
+ } else {
+ this.$modal.msgError('閿欒锛�' + (response.data.Message || '淇濆瓨澶辫触'))
+ }
+ }).catch(error => {
+ if (error !== 'cancel') {
+ this.$modal.msgError('鎿嶄綔澶辫触锛�' + error.message)
+ }
+ })
+ },
onRowClick(row) {
this.$nextTick(() => {
const table = this.$refs.mainTable;
diff --git a/src/views/KCGL/MoveStockBill/Kf_MoveStockBillList.vue b/src/views/KCGL/MoveStockBill/Kf_MoveStockBillList.vue
index 7d0233d..677aa13 100644
--- a/src/views/KCGL/MoveStockBill/Kf_MoveStockBillList.vue
+++ b/src/views/KCGL/MoveStockBill/Kf_MoveStockBillList.vue
@@ -114,6 +114,10 @@
@click="handleEdit(row = rowForm, OperationType = 3)">缂栬緫</el-button>
</el-col>
<el-col :span="1.5">
+ <el-button type="primary" icon="el-icon-Pallet" size="mini" :disabled="single" @click="set_PalletChange">鎵樻暟鍙樻洿
+ </el-button>
+ </el-col>
+ <el-col :span="1.5">
<el-button type="primary" icon="el-icon-document-copy" size="mini" :disabled="single"
@click="handleEdit(row = rowForm, OperationType = 1, copyType = 1)">澶嶅埗</el-button>
</el-col>
@@ -642,6 +646,50 @@
});
},
//#endregion
+ set_PalletChange() {
+ if (!this.rowForm || !this.rowForm.hmainid) {
+ this.$modal.msgError('璇峰厛閫夋嫨涓�鏉¤褰曪紒')
+ return
+ }
+
+ const rowData = this.rowForm // 浣跨敤 rowForm 鑰屼笉鏄� rowList
+ const currentPallet = rowData.鎵樻暟 || 0
+
+ // 灏�"璇疯緭鍏ユ柊鎵樻暟"浣滀负杈撳叆妗嗙殑placeholder
+ this.$prompt(`褰撳墠鎵樻暟锛�${currentPallet}`, {
+ confirmButtonText: '淇濆瓨',
+ cancelButtonText: '鍙栨秷',
+ inputValue: currentPallet,
+ inputType: 'number',
+ inputValidator: (value) => {
+ if (!value) return '璇疯緭鍏ユ墭鏁帮紒'
+ const num = parseInt(value)
+ if (isNaN(num)) return '璇疯緭鍏ユ湁鏁堢殑鏁板瓧锛�'
+ if (num.toString() !== value) return '鎵樻暟涓嶈兘涓哄皬鏁帮紒'
+ if (num < 0) return '鎵樻暟蹇呴』澶т簬0锛�'
+ return true
+ }
+ }).then(({ value }) => {
+ const newPallet = parseInt(value)
+
+ return axios.post(this.$baseUrl + '/Kf_POStockInBill/UpdatePallet', {
+ hmainid: rowData.hmainid,
+ newPallet: newPallet,
+ operator: sessionStorage["HUserName"]
+ })
+ }).then(response => {
+ if (response.data && response.data.count == 1) {
+ this.$modal.msgSuccess('鎵樻暟鍙樻洿鎴愬姛锛�')
+ this.getList()
+ } else {
+ this.$modal.msgError('閿欒锛�' + (response.data.Message || '淇濆瓨澶辫触'))
+ }
+ }).catch(error => {
+ if (error !== 'cancel') {
+ this.$modal.msgError('鎿嶄綔澶辫触锛�' + error.message)
+ }
+ })
+ },
//#region 鍒楄缃�
handleRowHide() {
diff --git a/src/views/ProductInBill/Kf_ProductInBillList.vue b/src/views/ProductInBill/Kf_ProductInBillList.vue
index c20bc12..0a7958b 100644
--- a/src/views/ProductInBill/Kf_ProductInBillList.vue
+++ b/src/views/ProductInBill/Kf_ProductInBillList.vue
@@ -114,6 +114,10 @@
@click="handleEdit(row = rowForm, OperationType = 3)">缂栬緫</el-button>
</el-col>
<el-col :span="1.5">
+ <el-button type="primary" icon="el-icon-Pallet" size="mini" :disabled="single" @click="set_PalletChange">鎵樻暟鍙樻洿
+ </el-button>
+ </el-col>
+ <el-col :span="1.5">
<el-button type="primary" icon="el-icon-document-copy" size="mini" :disabled="single"
@click="handleEdit(row = rowForm, OperationType = 1, copyType = 1)">澶嶅埗</el-button>
</el-col>
@@ -169,10 +173,11 @@
</el-table-column>
</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="HModName" @rowEditClose="rowSetClose"
+ v-if="rowHideShow" />
+ </el-dialog>
<RowSettings :colName="btResList" HModName="Kf_ProductInBillList" @rowEditClose="rowSetClose"
v-if="rowHideShow" />
</el-dialog>
@@ -282,9 +287,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鐩戝惉浜嬩欢
@@ -494,7 +507,6 @@
//#region 鏌ヨ
getList() {
- this.pageSize = 50
if (this.pageSize == 0) {
this.pageSize = 50
}
@@ -502,18 +514,19 @@
this.loading = true
// 鍒楄〃鏌ヨ
- axios.get(this.$baseUrl + '/Kf_ProductInBillController/GetKf_ProductInBillList_Json', {
+ axios.get(this.$baseUrl + '/Kf_ProductInBillController/page', {
params: {
"sWhere": this.sWhere,
- "HMaker": sessionStorage["HUserName"],
- "OperationType": 1,
- "ViewName": "h_v_Kf_ProductInBillList"
+ "user": sessionStorage["HUserName"],
+ "page": this.page,
+ "size": this.pageSize,
+ "Type":'3802',
},
}).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 = [];//鍒楀瓧娈垫暟鎹�
@@ -651,6 +664,50 @@
this.rowHideShow = true
this.openRowHide = true
},
+ set_PalletChange() {
+ if (!this.rowForm || !this.rowForm.hmainid) {
+ this.$modal.msgError('璇峰厛閫夋嫨涓�鏉¤褰曪紒')
+ return
+ }
+
+ const rowData = this.rowForm // 浣跨敤 rowForm 鑰屼笉鏄� rowList
+ const currentPallet = rowData.鎵樻暟 || 0
+
+ // 灏�"璇疯緭鍏ユ柊鎵樻暟"浣滀负杈撳叆妗嗙殑placeholder
+ this.$prompt(`褰撳墠鎵樻暟锛�${currentPallet}`, {
+ confirmButtonText: '淇濆瓨',
+ cancelButtonText: '鍙栨秷',
+ inputValue: currentPallet,
+ inputType: 'number',
+ inputValidator: (value) => {
+ if (!value) return '璇疯緭鍏ユ墭鏁帮紒'
+ const num = parseInt(value)
+ if (isNaN(num)) return '璇疯緭鍏ユ湁鏁堢殑鏁板瓧锛�'
+ if (num.toString() !== value) return '鎵樻暟涓嶈兘涓哄皬鏁帮紒'
+ if (num < 0) return '鎵樻暟蹇呴』澶т簬0锛�'
+ return true
+ }
+ }).then(({ value }) => {
+ const newPallet = parseInt(value)
+
+ return axios.post(this.$baseUrl + '/Kf_POStockInBill/UpdatePallet', {
+ hmainid: rowData.hmainid,
+ newPallet: newPallet,
+ operator: sessionStorage["HUserName"]
+ })
+ }).then(response => {
+ if (response.data && response.data.count == 1) {
+ this.$modal.msgSuccess('鎵樻暟鍙樻洿鎴愬姛锛�')
+ this.getList()
+ } else {
+ this.$modal.msgError('閿欒锛�' + (response.data.Message || '淇濆瓨澶辫触'))
+ }
+ }).catch(error => {
+ if (error !== 'cancel') {
+ this.$modal.msgError('鎿嶄綔澶辫触锛�' + error.message)
+ }
+ })
+ },
rowSetClose(val) {
this.rowHideShow = false
this.tableShow = true
@@ -763,11 +820,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
@@ -873,7 +930,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;
}
diff --git a/src/views/basic/gy/gySupplier.vue b/src/views/basic/gy/gySupplier.vue
index 3fc2c10..7ed73b7 100644
--- a/src/views/basic/gy/gySupplier.vue
+++ b/src/views/basic/gy/gySupplier.vue
@@ -360,8 +360,29 @@
created() {
this.getList()
this.getTreeselect()
+ console.log(this.treeOptions)
+ if (this.openPage) {
+ this.autoSelectCarrierTree()
+ }
},
methods: {
+ autoSelectCarrierTree() {
+ setTimeout(() => {
+ if (this.$refs.tree && this.treeOptions) {
+ // 馃憞 杩欓噷鎹㈡垚浣犵湡瀹炵殑銆愭壙杩愬晢鍒嗙被ID銆�
+ const carrierId = "1"
+
+ // 鑷姩閫変腑鑺傜偣
+ this.$refs.tree.setCurrentKey(carrierId)
+
+ // 鑷姩瑙﹀彂鑺傜偣鐐瑰嚮锛屾墽琛岀瓫閫�
+ let node = this.$refs.tree.getNode(carrierId)
+ if (node) {
+ this.handleNodeClick(node.data)
+ }
+ }
+ }, 300)
+ },
getSummaries(param) {
const { columns, data } = param;
const sums = [];
diff --git a/src/views/basic/gyCar/gyCarEdit.vue b/src/views/basic/gyCar/gyCarEdit.vue
index 3769c34..5345abb 100644
--- a/src/views/basic/gyCar/gyCarEdit.vue
+++ b/src/views/basic/gyCar/gyCarEdit.vue
@@ -7,9 +7,9 @@
<el-button type="primary" @click="submitForm" :disabled="subDisabled"
>淇� 瀛�</el-button
>
- <el-button type="primary" @click="set_CheckBill(0, form)" :disabled="checkDisabled"
+ <!-- <el-button type="primary" @click="set_CheckBill(0, form)" :disabled="checkDisabled"
>瀹� 鏍�</el-button
- >
+ > -->
<el-button type="primary" @click="close">閫� 鍑�</el-button>
<!-- <el-button @click="cancel">鍙� 娑�</el-button> -->
</div>
@@ -64,7 +64,7 @@
</el-col>
</el-row>
<el-row>
- <el-col :span="16">
+ <!-- <el-col :span="16">
<el-form-item label="杞﹁締琛岄┒璇佺収鐗�" prop="HCarCardIDPic" label-width="8em">
<div
class="image-input-outer"
@@ -104,7 +104,7 @@
>
</el-upload>
</el-form-item>
- </el-col>
+ </el-col> -->
<el-col :span="8">
<el-form-item label="杞﹁締骞存鏃ユ湡" prop="HCarCheckDate" label-width="7em">
<el-date-picker
@@ -116,7 +116,7 @@
</el-col>
</el-row>
<el-row>
- <el-col :span="16">
+ <!-- <el-col :span="16">
<el-form-item label="杞﹁締鐓х墖" prop="HCarPric" label-width="8em">
<div class="image-input-outer" @click="openImagePreview('HCarPric')">
<el-input v-model="form.HCarPric"> </el-input>
@@ -153,7 +153,7 @@
>
</el-upload>
</el-form-item>
- </el-col>
+ </el-col> -->
<el-col :span="8">
<el-form-item label="杞﹀瀷" prop="HCarTypeName">
<el-input v-model="form.HCarTypeName" placeholder="璇烽�夋嫨杞﹀瀷" disabled>
@@ -169,8 +169,8 @@
</el-row>
<el-row>
<el-col :span="6">
- <el-form-item label="鎵�灞炲叕鍙�" prop="HCompName">
- <el-input v-model="form.HCompName" placeholder="璇烽�夋嫨鎵�灞炲叕鍙�" disabled>
+ <el-form-item label="鎵�灞炰緵搴斿晢" prop="HCompName">
+ <el-input v-model="form.HCompName" placeholder="璇烽�夋嫨鎵�灞炰緵搴斿晢" disabled>
<el-button
slot="append"
icon="el-icon-search"
@@ -440,6 +440,7 @@
rules: {
HNumber: [{ required: true, message: "杞︾墝鍙蜂笉鑳戒负绌�", trigger: "blur" }],
HName: [{ required: true, message: "杞﹁締鍚嶇О涓嶈兘涓虹┖", trigger: "blur" }],
+ HCarTypeName:[{required: true, message: "杞﹀瀷璇烽�夋嫨", trigger: "blur"}],
},
preUploadFiles: {
HCarPric: [], // 杞﹁締鐓х墖 鏂囦欢缂撳瓨(鍙繚瀛樹竴寮�)
@@ -814,6 +815,8 @@
//鏂板鑾峰彇鍗曟嵁鍙�
// this.getHBillNo();
let date = new Date();
+ this.form.HCompID = sessionStorage["HSupID"];
+ this.form.HCompName = sessionStorage["HSupName"];
this.form.HDate = moment(date).format("YYYY-MM-DDTHH:mm:ss");
this.resetForm();
if (this.OperationType == 1) {
@@ -853,7 +856,7 @@
HCarPric: data.杞﹁締鐓х墖,
HCarCardIDPic: data.杞﹁締琛岄┒璇佺収鐗�,
HCompID: data.HCompID,
- HCompName: data.鎵�灞炲叕鍙�,
+ HCompName: data.鎵�灞炰緵搴斿晢,
HModel: data.杞﹁締鍨嬪彿,
HColor: data.杞﹁締棰滆壊,
HBuyDate: data.璐拱鏃ユ湡 ? dayjs(data.璐拱鏃ユ湡).format("YYYY-MM-DD") : "",
@@ -1093,6 +1096,9 @@
this.subDisabled = true; //璁剧疆淇濆瓨鎸夐挳涓嶅彲鐢�
this.$modal.msgSuccess(response.data.Message);
this.addBtnShow = true;
+ }else {
+ // 鏄剧ず鍚庣杩斿洖鐨勯敊璇紙杞︾墝鍙烽噸澶嶃�佷繚瀛樺け璐ョ瓑锛�
+ this.$modal.msgError(response.data.Message);
}
})
.catch((error) => {
@@ -1159,7 +1165,7 @@
// 鎵�灞炲叕鍙�
this.iframeUrl = "/iframe/GySupplier";
- this.dialogTitle = "鎵�灞炲叕鍙�";
+ this.dialogTitle = "鎵�灞炰緵搴斿晢";
// this.materialShow = true;
this.openData = true;
}
diff --git a/src/views/basic/gyCar/gyCarList.vue b/src/views/basic/gyCar/gyCarList.vue
index e34bf0b..788df3b 100644
--- a/src/views/basic/gyCar/gyCarList.vue
+++ b/src/views/basic/gyCar/gyCarList.vue
@@ -112,11 +112,11 @@
</el-collapse-item>
</el-collapse>
- <!-- <el-form-item label-width="78px">
+ <el-form-item label-width="78px">
<el-button type="primary" size="small" icon="el-icon-search" @click="handleQuery">
鎼� 绱�</el-button>
<el-button icon="el-icon-circle-close" size="small" @click="searchOpen = false">鍙� 娑�</el-button>
- </el-form-item> -->
+ </el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
@@ -138,10 +138,10 @@
<el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single"
@click="handleEdit((row = rowForm), (OperationType = 3))">缂栬緫</el-button>
</el-col>
- <el-col :span="1.5">
+ <!-- <el-col :span="1.5">
<el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single"
@click="handleEdit((row = rowForm), (OperationType = 2))">澶嶅埗</el-button>
- </el-col>
+ </el-col> -->
<el-col :span="1.5">
<el-button type="primary" icon="el-icon-delete" size="mini" :disabled="single" @click="handleDelete">鍒犻櫎
</el-button>
@@ -207,12 +207,12 @@
<el-col :span="1.5">
<el-button type="primary" icon="el-icon-download" size="mini" @click="handleRowHide">闅愯棌鍒楄缃�</el-button>
</el-col>
- <el-col :span="1.5">
+ <!-- <el-col :span="1.5">
<el-button type="primary" icon="el-icon-help" size="mini" @click="handleSearch">鎼� 绱�</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery">閲� 缃�</el-button>
- </el-col>
+ </el-col> -->
<!-- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> -->
</el-row>
<div class="tableBox" v-loading="loading">
@@ -513,6 +513,109 @@
return sums;
},
+ //#region 鏉冮檺鍒ゆ柇
+ async set_ModCheck(ModRightNameCheck)
+ {
+ var Permission = false;
+ const res=await axios.get(this.$baseUrl + '/LMES/getReportByModRightNameCheck', {
+ params: {
+ "ModRightNameCheck": ModRightNameCheck,
+ "user": sessionStorage["HUserName"],
+
+ },
+ }).then(result=>{
+ if (result.data.count != 1) {
+ Permission = true;
+ this.sWhere=this.sWhere+"and HCompID ="+sessionStorage["HSupID"]
+ }
+ }).catch(error => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ },
+ //#endregion
+ //#region 蹇�熻繃婊�
+ async handleQuery() {
+ this.sWhere = ''
+ if (this.queryParams.ColName && this.queryParams.Comparator) {
+ var com = "";
+ switch (this.queryParams.Comparator) {
+ case "7":
+ com = "like'%" + this.queryParams.ColContent + "%'";
+ break;
+ case "8":
+ com = "like'%" + this.queryParams.ColContent + "'";
+ break;
+ case "9":
+ com = "like'" + this.queryParams.ColContent + "%'";
+ break;
+ case "10":
+ com = "not like'%" + this.queryParams.ColContent + "%'";
+ break;
+ default:
+ com = "" + this.queryParams.Comparator + "'" + this.queryParams.ColContent + "'";
+ break;
+ }
+ this.sWhere += " and " + this.queryParams.ColName + " " + com;
+ }
+ if (this.queryParams.ColName1 && this.queryParams.Comparator1) {
+ var com1 = "";
+ switch (this.queryParams.Comparator1) {
+ case "7":
+ com1 = "like'%" + this.queryParams.ColContent1 + "%'";
+ break;
+ case "8":
+ com1 = "like'%" + this.queryParams.ColContent1 + "'";
+ break;
+ case "9":
+ com1 = "like'" + this.queryParams.ColContent1 + "%'";
+ break;
+ case "10":
+ com1 = "not like'%" + this.queryParams.ColContent1 + "%'";
+ break;
+ default:
+ com1 = "" + this.queryParams.Comparator1 + "'" + this.queryParams.ColContent1 + "'";
+ break;
+ }
+ this.sWhere += " and " + this.queryParams.ColName1 + " " + com1;
+ }
+ if (this.queryParams.ColName2 && this.queryParams.Comparator2) {
+ var com2 = "";
+ switch (this.queryParams.Comparator2) {
+ case "7":
+ com2 = "like'%" + this.queryParams.ColContent2 + "%'";
+ break;
+ case "8":
+ com2 = "like'%" + this.queryParams.ColContent2 + "'";
+ break;
+ case "9":
+ com2 = "like'" + this.queryParams.ColContent2 + "%'";
+ break;
+ case "10":
+ com2 = "not like'%" + this.queryParams.ColContent2 + "%'";
+ break;
+ default:
+ com2 = "" + this.queryParams.Comparator + "'" + this.queryParams.ColContent + "'";
+ break;
+ }
+ this.sWhere += " and " + this.queryParams.ColName2 + " " + com2;
+ }
+ if (this.queryParams.sTime) {
+ this.queryParams.sTime = moment(this.queryParams.sTime).format('YYYY-MM-DD')
+ this.queryParams.eTime = moment(this.queryParams.eTime).format('YYYY-MM-DD')
+ this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.queryParams.sTime + "'" + " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + this.queryParams.eTime + "'";
+ }
+ if (this.queryParams.HBillNo) {
+ this.sWhere += " and 鍗曟嵁鍙� like '%" + this.queryParams.HBillNo + "%'";
+ }
+ // if (this.queryParams.HOrgID) {
+ // this.sWhere += " and HOrgID = '" + this.queryParams.HOrgID + "'";
+ // }
+ console.log("swhere",this.sWhere)
+ this.clearData()
+ this.getList()
+ },
+ //#endregion
+
//#region 鑾峰彇鍏徃鍚嶏紝鏍规嵁鍏徃杩涜瀹氬埗鍖栧紑鍙�
defaintOperationByCompanyName() {
var result = false;
@@ -607,6 +710,7 @@
this.deptform = {};
},
async getList() {
+ await this.set_ModCheck("Gy_Car_SUBQuery");
this.tableShow = false;
this.loading = true;
if (this.pageSize == 0) {
@@ -865,6 +969,7 @@
document.body.removeChild(span);
return h(span, column.label);
},
+
//鐐瑰嚮琛�
handleRowClick(row, column, event) {
this.lastSelectedRow = this.selectedRow; // 璁板綍涓婁竴娆￠�変腑鐨勮
@@ -1111,9 +1216,9 @@
.then(() => {
if (!this.rowForm.瀹℃牳浜�) {
axios
- .get(this.$baseUrl + "Xs_SeOrderBill/DropXs_SeOrderBill", {
+ .get(this.$baseUrl + "Gy_CarController/DropGy_Car", {
params: {
- HInterID: this.rowForm.hmainid.toString(),
+ HItemID: this.rowForm.hmainid.toString(),
user: sessionStorage["HUserName"],
},
})
diff --git a/src/views/basic/gyCurrency/gyCurrency.vue b/src/views/basic/gyCurrency/gyCurrency.vue
index 69f30aa..d2d4ad3 100644
--- a/src/views/basic/gyCurrency/gyCurrency.vue
+++ b/src/views/basic/gyCurrency/gyCurrency.vue
@@ -1177,12 +1177,17 @@
//鍙屽嚮琛�
handleDblclick(row, column, cell, event) {
if (this.checkIsIframe()) {
- window.parent.iframeCarCallBack(row);
+ window.parent.iframeCurrencyCallBack(row);
return;
}
this.OperationType = 3;
- this.handleEdit(row, this.OperationType);
+ if (this.openPage) {
+ this.$emit('deptEmitDb', row, 2)
+ } else {
+ this.handleEdit();
+ }
},
+
// 澶氶�夋閫変腑鏁版嵁
handleSelectionChange(selection) {
// this.rowForm = {}
diff --git a/src/views/basic/gyCurrency/gyCurrencyEdit.vue b/src/views/basic/gyCurrency/gyCurrencyEdit.vue
index 41c01b1..d4ae207 100644
--- a/src/views/basic/gyCurrency/gyCurrencyEdit.vue
+++ b/src/views/basic/gyCurrency/gyCurrencyEdit.vue
@@ -134,6 +134,18 @@
},
mounted() {
this.user = sessionStorage["HUserName"] || "admin";
+ this.fetchData();
+ this.getdata();
+ // 甯佸埆 鍥炶皟
+ window.iframeCurrencyCallBack = (info) => {
+ // 鍥炶皟璧嬪��
+ console.log(info);
+ this.form.HCurID = info.HItemID;
+ this.form.HCurName = info["璐у竵鍚嶇О"];
+ this.form.HExRate = info["姹囩巼"];
+ // 鍏抽棴寮圭獥
+ this.deptClose();
+ };
},
methods: {
// 妫�鏌ユ槸鍚﹀湪iframe涓�
@@ -147,6 +159,8 @@
const hID = urlParams.HInterID ? parseInt(urlParams.HInterID) : 0;
const opType = urlParams.OperationType ? parseInt(urlParams.OperationType) : 1;
+
+
// 濡傛灉props娌℃湁浼犻�掞紝浣跨敤URL鍙傛暟
const operationType = this.OperationType || opType;
const linterid = this.linterid || hID;
diff --git a/src/views/basic/gytransport/cgContractTransportBillList/Cg_ContractTransportBillEdit.vue b/src/views/basic/gytransport/cgContractTransportBillList/Cg_ContractTransportBillEdit.vue
index 0946f36..cb1b268 100644
--- a/src/views/basic/gytransport/cgContractTransportBillList/Cg_ContractTransportBillEdit.vue
+++ b/src/views/basic/gytransport/cgContractTransportBillList/Cg_ContractTransportBillEdit.vue
@@ -86,7 +86,7 @@
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="缁撶畻鏂瑰紡" prop="HSSName" required>
+ <el-form-item label="缁撶畻鏂瑰紡" prop="HSSName" >
<el-input v-model="form.HSSName" placeholder="璇烽�夋嫨缁撶畻鏂瑰紡" disabled>
<el-button
slot="append"
@@ -374,6 +374,10 @@
label: '寰�杩�',
value: '寰�杩�',
},
+ {
+ label: '闆舵媴',
+ value: '闆舵媴',
+ },
]"
:key="index"
:label="item.label"
@@ -622,7 +626,7 @@
HCurID: [{ required: true, message: "甯佸埆涓嶈兘涓虹┖", trigger: "blur" }],
HExRate: [{ required: true, message: "姹囩巼涓嶈兘涓虹┖", trigger: "blur" }],
HSTOCKINORGID: [{ required: true, message: "缁勭粐涓嶈兘涓虹┖", trigger: "change" }],
- HSSName: [{ required: true, message: "缁撶畻鏂瑰紡涓嶈兘涓虹┖", trigger: "blur" }],
+ // HSSName: [{ required: true, message: "缁撶畻鏂瑰紡涓嶈兘涓虹┖", trigger: "blur" }],
},
};
},
@@ -699,8 +703,8 @@
this.form.HCurName = deptRow.璐у竵鍚嶇О;
this.form.HCurID = deptRow.HItemID;
this.form.HExRate = deptRow.姹囩巼;
- this.CurrencyDialogShow = false;
- this.openData = false;
+ this.CurrencyDialogShow = false;
+ this.openData = false;
} else if (num == 3) {
console.log(deptRow);
if(this.areaType==1)
@@ -1103,6 +1107,12 @@
},
// 缂栬緫鎻愪氦淇濆瓨
submitForm() {
+ this.form.HSupID = this.form.HSupID || 0;
+ this.form.HEmpID = this.form.HEmpID || 0;
+ this.form.HDeptID = this.form.HDeptID || 0;
+ this.form.HCurID = this.form.HCurID || 0;
+ this.form.HExRate = this.form.HExRate || 1;
+ this.form.HSSID = this.form.HSSID || 0;
this.$refs["form"].validate((valid) => {
if (valid) {
let fhck = false;
@@ -1115,8 +1125,8 @@
{ field: 'HDeptID', name: '閮ㄩ棬' },
{ field: 'HCurID', name: '甯佸埆' },
{ field: 'HExRate', name: '姹囩巼' },
- { field: 'HSTOCKINORGID', name: '缁勭粐' },
- { field: 'HSSName', name: '缁撶畻鏂瑰紡' }
+ { field: 'HSTOCKINORGID', name: '缁勭粐' }
+ // { field: 'HSSName', name: '缁撶畻鏂瑰紡' }
];
for (let i = 0; i < requiredFields.length; i++) {
const field = requiredFields[i].field;
diff --git a/src/views/basic/gytransport/cgContractTransportBillList/Cg_ContractTransportBillList.vue b/src/views/basic/gytransport/cgContractTransportBillList/Cg_ContractTransportBillList.vue
index 4af588b..701685b 100644
--- a/src/views/basic/gytransport/cgContractTransportBillList/Cg_ContractTransportBillList.vue
+++ b/src/views/basic/gytransport/cgContractTransportBillList/Cg_ContractTransportBillList.vue
@@ -22,7 +22,7 @@
<el-form-item label-width="78px">
<el-button type="primary" icon="el-icon-search" @click="handleQuery"> 鎼� 绱�</el-button>
<el-button icon="el-icon-circle-close" @click="resetQuery">閲� 缃�</el-button>
- <el-button type="primary" icon="el-icon-search" @click="set_ResCnz">閲嶆柊鍚屾</el-button>
+ <!-- <el-button type="primary" icon="el-icon-search" @click="set_ResCnz">閲嶆柊鍚屾</el-button> -->
</el-form-item>
<el-collapse v-model="activeSeach">
<el-collapse-item title="鏇村" name="1">
@@ -170,7 +170,7 @@
</el-dialog>
<!-- 缂栬緫 -->
<el-dialog title="缂栬緫" :visible.sync="openEdit" width="1480px" append-to-body class="xsckdBox" @close="close">
- <edit :OperationType=OperationType :linterid=this.rowForm.HInterID||this.rowForm.hmainid
+ <edit :OperationType=OperationType :linterid=this.rowForm.HInterID || this.rowForm.hmainid
:HSouceBillType=this.rowForm.HSourceBillType :copyType="copyType" @editClose="editClose" v-if="editShow" />
</el-dialog>
<el-dialog title="鎵撳嵃妯℃澘閫夋嫨" :visible.sync="openPrintList" width="800px" append-to-body>
@@ -194,6 +194,9 @@
components: { RowSettings, Edit, PrintList },
props: {
openPage: { type: String, },
+ propHBeginAddrName: {},
+ propHBeginHEndAddrName: {},
+ propHCarTypeName: {},
},
data() {
return {
@@ -255,7 +258,7 @@
queryParams: {
HBillNo: '',
HBillno2: '',
- HInitTimeCycle: 29,
+ HInitTimeCycle: 364,
HDeptID: '',
HSourceBillNo: '',
@@ -279,13 +282,14 @@
multiple: true,
// 閬僵灞�
loading: true,
+ loading: true,
tyResList: [],//鍒楄〃锛堟帴鍙ｆ暟鎹級
btList: [],//琛ㄥご鍒楄〃鏄剧ず
btResList: [],
tableData: [],//鍒楄〃(鍒嗛〉鏄剧ず)
dataList: [],
titleData: [],//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
- pageSizes: [50, 100, 500, 5000, 50000],
+ pageSizes: [10, 50, 500, 5000, 50000],
page: 1,
pageSize: 0,
total: 0,
@@ -298,7 +302,7 @@
methods: {
//閲嶆柊鍚屾
- set_ResCnz(){
+ set_ResCnz() {
axios.get(this.$baseUrl + "/Cg_POOrderBill/Resynchronize", {
params: { "HBillNo": '', "HBillType": 1117 }
}).then(response => {
@@ -370,26 +374,41 @@
this.eTime = yyyyE + '-' + mmE + '-' + ddE
},
getList() {
- this.pageSize = 50
this.tableShow = false
this.loading = true
if (this.sTime && !this.sWhere) {
this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.sTime + "'"
this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + this.eTime + "'"
}
+ // if (this.propHBeginAddrName) {
+ // this.sWhere += " and 濮嬪彂鍦� = '" + this.propHBeginAddrName + "'"
+ // }
+ // if (this.propHBeginHEndAddrName) {
+ // this.sWhere += " and 鐩殑鍦� = '" + this.propHBeginHEndAddrName + "'"
+ // }
+ // if (this.propHCarTypeName) {
+ // this.sWhere += " and 杩愯緭鏂瑰紡 = '" + this.propHCarTypeName + "'"
+ // }
+ if (this.openPage) {
+ this.sWhere += " and 鍗曟嵁鐘舵�� = '" + '宸插鏍�' + "'"
+ }
+ console.log(this.sWhere)
if (this.pageSize == 0) {
this.pageSize = 50
}
- axios.get(this.$baseUrl + '/Cg_ContractTransportBillListController/get%EF%BB%BFList', {
+ axios.get(this.$baseUrl + '/Cg_ContractTransportBillListController/page', {
params: {
"sWhere": this.sWhere,
"user": sessionStorage["HUserName"],
+ "Page": this.page,
+ "size": this.pageSize,
+ "Type": 1117
},
}).then(response => {
this.tyResList = response.data.data//鎬绘暟鎹�
let data1 = response.data
let option = []
- if (data1.code == 1) {
+ if (data1.list && data1.list.length > 0) {
this.btResList = data1.list//閿�鍞嚭搴撳崟鎺ュ彛琛ㄥご鏁版嵁
this.total = data1.count;
var data = [];//鍒楀瓧娈垫暟鎹�
@@ -532,11 +551,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
@@ -575,7 +594,8 @@
},
//閫変腑琛岄珮浜牱寮�
rowStyle({ row, rowIndex }) {
- if (this.ids.includes(row.hmainid)) {
+ // 浣跨敤 HInterID 鍒ゆ柇
+ if (this.ids.includes(row.HInterID)) {
return { "background": "#ecf5ff" }
}
},
@@ -590,12 +610,23 @@
},
// 澶氶�夋閫変腑鏁版嵁
handleSelectionChange(selection) {
- // this.rowForm = {}
- this.ids = selection.map(item => item.hmainid)
- this.single = selection.length != 1
- this.multiple = !selection.length
- if (!this.single) {
+ if (this.openPage) {
+ //鍒楄〃鍗曢��
+ if (selection.length > 1) {
+ const del_row = selection.shift()
+ this.$refs.tableData.toggleRowSelection(del_row, false) //璁剧疆杩欎竴琛屽彇娑堥�変腑
+ }
+ this.rowForm = {}
+ this.ids = selection.map(item => item.HItemID)
this.rowForm = selection[0]
+ this.$emit('deptEmit', this.rowForm, 16)
+ } else {
+ this.ids = selection.map(item => item.HInterID)
+ this.single = selection.length != 1
+ this.multiple = !selection.length
+ if (!this.single) {
+ this.rowForm = selection[0]
+ }
}
},
/** 鎼滅储鎸夐挳鎿嶄綔 */
@@ -737,17 +768,17 @@
console.log("鍒犻櫎", this.rowForm.HInterID.toString())
this.$modal.confirm('纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠').then(() => {
axios.get(this.$baseUrl + "/Cg_ContractTransportBillListController/Delete%EF%BB%BFBill", {
- params: { 'HInterID': this.rowForm.HInterID.toString(), 'user': sessionStorage["HUserName"] }
- }).then(response => {
- if (response.data.count == 1) {
- this.getList()
- this.$modal.msgSuccess("鍒犻櫎鎴愬姛")
- } else {
- this.$modal.msgError("閿欒:" + result.code + result.Message);
- }
- }).catch(error => {
- this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
- });
+ params: { 'HInterID': this.rowForm.HInterID.toString(), 'user': sessionStorage["HUserName"] }
+ }).then(response => {
+ if (response.data.count == 1) {
+ this.getList()
+ this.$modal.msgSuccess("鍒犻櫎鎴愬姛")
+ } else {
+ this.$modal.msgError("閿欒:" + result.code + result.Message);
+ }
+ }).catch(error => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
}).catch(() => { })
},
// 鍙嶅鏍�/瀹℃牳鏁版嵁
diff --git a/src/views/component/CurrencyDialog/index.vue b/src/views/component/CurrencyDialog/index.vue
index 7a6a636..611c758 100644
--- a/src/views/component/CurrencyDialog/index.vue
+++ b/src/views/component/CurrencyDialog/index.vue
@@ -598,12 +598,14 @@
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)
+ if(this.openPage == 'Kf_StockOutRequestBill'){
+ this.$emit('deptEmitDb', row, 10)
+ this.closeDialog();
+ }
+ else{
+ this.$emit('deptEmitDb', row, 2)
+ this.closeDialog();
+ }
} else {
this.handleEdit();
}
diff --git a/src/views/component/printList/barcode.vue b/src/views/component/printList/barcode.vue
index 77c122c..69e739a 100644
--- a/src/views/component/printList/barcode.vue
+++ b/src/views/component/printList/barcode.vue
@@ -58,6 +58,7 @@
return datajson;
},
async getPrintData() {
+ console.log(this.$route.query.Type)
// 鍦ㄥぇ鎵归噺鎵撳嵃鐨勬椂鍊� url闀垮害鍙兘瓒単et鍏佽鐨勯暱搴� 鍚庣闇�鎸夐渶姹� 鏀规垚POST璇锋眰
let OpenTmp = decodeURIComponent(this.$route.query.OpenTmp);
let sql = "";
@@ -84,6 +85,12 @@
let condition = decodeURI(this.handleMessage.linterid.toString());
condition = condition.split(',').map(e => `'${e}'`).join(',')
sql = `exec h_p_GetSPBarCode_Swell N'${condition}'`;
+ } else if (this.$route.query.Type == "WL_YayBill") {
+ sql = "select * from h_v_WL_YayBilllist where hmainid in(" +
+ this.handleMessage.linterid.toString() +
+ ") order by hmainid desc";
+ console.log(sql)
+
}
try{
let res = await axios.get(this.$baseUrl + "/CommonModel/searchMethod", {
@@ -95,6 +102,8 @@
},
});
// 灏� 娓叉煋鏁版嵁 鍜� 妯℃澘鍔犺浇鍒版湰鍦�
+ console.log(res)
+
let result = res.data;
this.json_data.recordset = result.data;
this.grfPath = "./static/grf/" + OpenTmp + ".grf";
diff --git a/src/views/component/printList/hBarPlanPrint.vue b/src/views/component/printList/hBarPlanPrint.vue
index 2c3fa76..fd5c52e 100644
--- a/src/views/component/printList/hBarPlanPrint.vue
+++ b/src/views/component/printList/hBarPlanPrint.vue
@@ -39,6 +39,7 @@
return datajson;
},
ws_both_from_object() {
+ console.log(this.$route.query.Type)
let OpenTmp = decodeURIComponent(this.$route.query.OpenTmp);
let sql = "";
if (this.$route.query.Type == "Kf_SellOutBillList") {
@@ -71,9 +72,14 @@
) AS t
GROUP BY CEILING(CAST(t.row_num AS FLOAT) / 2)
ORDER BY orderid;`;
+ } else if (this.$route.query.Type == "WL_YayBill") {
+
+ sql = "select * from h_v_WL_YayBilllist where hmainid in(" +
+ this.handleMessage.linterid.toString() +
+ ") order by hmainid desc";
}
- axios
- .get(this.$baseUrl + "/CommonModel/searchMethod", {
+ this.$nextTick(() => {
+ axios.get(this.$baseUrl + "/CommonModel/searchMethod", {
params: {
sql: sql,
user: sessionStorage["HUserName"],
@@ -81,25 +87,28 @@
// , "HSubID": data[i].hsubid
},
})
- .then((response) => {
- let result = response.data;
- this.json_data.recordset = result.data;
- //鍙傛暟鍏蜂綋璇存槑璇峰弬鑰冨府鍔╂枃妗ｄ腑鐨勨�淲EB鎶ヨ〃(B/S鎶ヨ〃)->WEB鎶ヨ〃瀹㈡埛绔�->鍚姩鍙傛暟璇存槑鈥濋儴鍒�
- var args = {
- type: "preview", //璁剧疆涓嶅悓鐨勫睘鎬у彲浠ユ墽琛屼笉鍚岀殑浠诲姟锛屽锛歱review print pdf xls csv txt rtf img grd
- // report: this.json_report, //report: JSON.stringify(json_report),
- report: urlAddRandomNo("./static/grf/" + OpenTmp + ".grf"),
- data: this.json_data, //data: JSON.stringify(json_data)
- };
- console.log(args, this.json_data);
- webapp_ws_ajax_run(args);
- // var reportViewer = rubylong.grhtml5.insertReportViewer("report_holder", "./static/grf/閿�鍞嚭搴撳崟.grf", this.json_data);
- // reportViewer.start();
- })
- .catch((error) => {
- console.log(22222, error);
- this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
- });
+ .then((response) => {
+ console.log(111, OpenTmp, response)
+ let result = response.data;
+ this.json_data.recordset = result.data;
+ //鍙傛暟鍏蜂綋璇存槑璇峰弬鑰冨府鍔╂枃妗ｄ腑鐨勨�淲EB鎶ヨ〃(B/S鎶ヨ〃)->WEB鎶ヨ〃瀹㈡埛绔�->鍚姩鍙傛暟璇存槑鈥濋儴鍒�
+ var args = {
+ type: "preview", //璁剧疆涓嶅悓鐨勫睘鎬у彲浠ユ墽琛屼笉鍚岀殑浠诲姟锛屽锛歱review print pdf xls csv txt rtf img grd
+ // report: this.json_report, //report: JSON.stringify(json_report),
+ report: urlAddRandomNo("./static/grf/" + OpenTmp + ".grf"),
+ data: this.json_data, //data: JSON.stringify(json_data)
+ };
+ console.log(args, this.json_data);
+ webapp_ws_ajax_run(args);
+ // var reportViewer = rubylong.grhtml5.insertReportViewer("report_holder", "./static/grf/閿�鍞嚭搴撳崟.grf", this.json_data);
+ // reportViewer.start();
+ })
+ .catch((error) => {
+ console.log(22222, error);
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ })
+
},
},
};
diff --git a/src/views/component/printList/index.vue b/src/views/component/printList/index.vue
index 7e2d9d7..a8af829 100644
--- a/src/views/component/printList/index.vue
+++ b/src/views/component/printList/index.vue
@@ -8,7 +8,7 @@
<el-table v-loading="loading" :data="printdata" ref="printTable" max-height="540"
@selection-change="handleSelectionChange" :row-class-name="rowSysIndex" border>
<el-table-column type="selection" width="55" align="center" />
- <el-table-column align="center" label="妯″潡浠ｇ爜" prop="HNumber" />
+ <el-table-column align="center" label="妯″潡浠ｇ爜" prop="HNumber" v-if="hideFlag" />
<el-table-column align="center" label="妯℃澘鍚嶇О" prop="妯℃澘鍚嶇О" />
</el-table>
</el-form>
@@ -57,7 +57,8 @@
colTitleName: '',
tableIns: null,
option: {},
- tableData: []
+ tableData: [],
+ hideFlag:false, //闅愯棌鏍囪銆傜敤浜庤缃煇浜涗笉甯屾湜鏄剧ず鐨勬爣绛� // 褰撳墠閫変腑鐨勮
}
},
created() {
diff --git a/src/views/login.vue b/src/views/login.vue
index 07ec6b8..9e3caf7 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -210,6 +210,7 @@
this.$router.push({ path: this.redirect || "/" }).catch(() => { })
}).catch(() => {
this.loading = false
+ this.$message.error('璐﹀彿鎴栧瘑鐮侀敊璇紝璇烽噸鏂拌緭鍏�')
if (this.captchaEnabled) {
this.getCode()
}
diff --git a/src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue b/src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue
index 910cad6..dee3a6d 100644
--- a/src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue
+++ b/src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue
@@ -12,7 +12,7 @@
<el-form ref="form" :model="form" :rules="rules" label-width="130px">
<el-tabs v-model="activeName" type="card">
<el-tab-pane label="鍩烘湰淇℃伅" name="first">
- <!-- 绗竴鍧楋細鍗曟嵁鍙枫�佹棩鏈熴�佹簮鍗曞彿銆佹壙杩愬晢銆佸鎴� -->
+ <!-- 绗竴鍧楋細鍗曟嵁鍙枫�佹棩鏈熴�佹簮鍗曞彿銆佹壙杩愬晢銆佸鎴� -->
<div class="form-group">
<el-row>
<el-col :span="6">
@@ -29,7 +29,8 @@
<el-col :span="6">
<el-form-item label="婧愬崟鍙�" prop="HMainSourceBillNo">
<el-input v-model="form.HMainSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞彿">
- <el-button slot="append" icon="el-icon-search" @click="openDataDialog(12)"></el-button>
+ <el-button slot="append" icon="el-icon-search"
+ @click="openDataDialog(12)"></el-button>
</el-input>
</el-form-item>
</el-col>
@@ -37,29 +38,14 @@
<el-col :span="6"></el-col>
</el-row>
<el-row>
-
- <el-col :span="6">
+ <!-- <el-col :span="6">
<el-form-item label="瀹㈡埛" prop="HCusName">
<el-input v-model="form.HCusName" placeholder="璇疯緭鍏ュ鎴�">
- <el-button slot="append" icon="el-icon-search" @click="openDataDialog(7)"></el-button>
+ <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="HBeginAddrName">
- <el-input v-model="form.HBeginAddrName" placeholder="璇疯緭鍏ュ鍙戝湴">
- <el-button slot="append" icon="el-icon-search" @click="openDataDialog(3, areaType = 'b')"></el-button>
- </el-input>
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="鐩殑鍦�" prop="HEndAddrName">
- <el-input v-model="form.HEndAddrName" placeholder="璇疯緭鍏ョ洰鐨勫湴">
- <el-button slot="append" icon="el-icon-search" @click="openDataDialog(3, areaType = 'e')"></el-button>
- </el-input>
- </el-form-item>
- </el-col>
-
+ </el-col> -->
</el-row>
</div>
@@ -69,44 +55,200 @@
<el-col :span="6">
<el-form-item label="鎵胯繍鍚堝悓" prop="HContractTransportBillNo">
<el-input v-model="form.HContractTransportBillNo" placeholder="璇疯緭鍏ユ壙杩愬悎鍚�">
- <el-button slot="append" icon="el-icon-search" @click="openDataDialog(16)"></el-button>
+ <el-button slot="append" icon="el-icon-search"
+ @click="openDataDialog(16)"></el-button>
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="鎵胯繍鍟�" prop="HCarrierName">
- <el-input v-model="form.HCarrierName" placeholder="璇疯緭鍏ユ壙杩愬晢">
- <el-button slot="append" icon="el-icon-search" @click="openDataDialog(6)"></el-button>
+ <el-input v-model="form.HCarrierName" placeholder="璇疯緭鍏ユ壙杩愬晢" disabled>
+ <!-- <el-button slot="append" icon="el-icon-search" @click="openDataDialog(6)"></el-button> -->
</el-input>
</el-form-item>
</el-col>
- <el-col :span="6">
- <el-form-item label="璺濈锛堝叕閲岋級" prop="HDistance">
- <el-input v-model="form.HDistance" placeholder="璇疯緭鍏ヨ窛绂�" readonly />
+ <el-col :span="12">
+ <el-form-item label="杩愯緭绾胯矾" prop="HTransportLineName">
+ <el-select v-model="form.HTransportLineName" placeholder="璇烽�夋嫨杩愯緭绾胯矾" filterable
+ @change="transLineNameChange" @focus="checkTransportList">
+ <el-option v-for="(item, index) in transportList" :key="index" :label="item"
+ :value="item"></el-option>
+ </el-select>
</el-form-item>
</el-col>
-
</el-row>
<el-row>
-
-
<el-col :span="6">
- <el-form-item label="杩愯緭鏃舵晥" prop="HTransportTimes">
- <el-input v-model="form.HTransportTimes" placeholder="璇疯緭鍏ヨ繍杈撴椂鏁�" readonly />
+ <el-form-item label="杩愯緭鏂瑰紡" prop="HTransType">
+ <el-select v-model="form.HTransType" placeholder="璇烽�夋嫨杩愯緭鏂瑰紡"
+ @change="transTypeChange" @focus="checkTransTypeList">
+ <el-option v-for="(item, index) in transTypeList" :key="index" :label="item"
+ :value="item"></el-option>
+ </el-select>
</el-form-item>
</el-col>
+ <el-col :span="6">
+ <el-form-item label="杞﹀瀷" prop="HCarTypeName">
+ <el-select v-model="form.HCarTypeName" placeholder="璇烽�夋嫨杞﹀瀷"
+ @change="transHCarChange" @focus="checkHCarTypeNameList">
+ <el-option v-for="(item, index) in HCarTypeNameList" :key="index"
+ :label="item.value" :value="item.id"></el-option>
+ </el-select>
+ <!-- <el-input v-model="form.HCarTypeName" placeholder="璇疯緭鍏ヨ溅鍨�">
+ <el-button slot="append" icon="el-icon-search"
+ @click="openDataDialog(13)"></el-button>
+ </el-input> -->
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="6">
+ <el-form-item label="濮嬪彂鍦�" prop="HBeginAddrName">
+ <el-input v-model="form.HBeginAddrName" placeholder="璇疯緭鍏ュ鍙戝湴">
+ <el-button slot="append" icon="el-icon-search"
+ @click="openDataDialog(3, areaType = 'b')"></el-button>
+ </el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="鐩殑鍦�" prop="HEndAddrName">
+ <el-input v-model="form.HEndAddrName" placeholder="璇疯緭鍏ョ洰鐨勫湴">
+ <el-button slot="append" icon="el-icon-search"
+ @click="openDataDialog(3, areaType = 'e')"></el-button>
+ </el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
<el-col :span="6">
<el-form-item label="杩愯緭绫诲瀷" prop="HTransportTyep">
<el-input v-model="form.HTransportTyep" placeholder="璇疯緭鍏ヨ繍杈撶被鍨�" readonly />
</el-form-item>
</el-col>
+ <el-col :span="6">
+ <el-form-item label="璺濈锛堝叕閲岋級" prop="HDistance">
+ <el-input v-model="form.HDistance" placeholder="璇疯緭鍏ヨ窛绂�" readonly />
+ </el-form-item>
+ </el-col>
+
+ <el-col :span="6">
+ <el-form-item label="杩愯緭鏃舵晥" prop="HTransportTimes">
+ <el-input v-model="form.HTransportTimes" placeholder="璇疯緭鍏ヨ繍杈撴椂鏁�" readonly />
+ </el-form-item>
+ </el-col>
</el-row>
+ <el-row>
+ <el-col :span="6">
+ <el-form-item label="缁勭粐" prop="HOrgID">
+ <el-select v-model="form.HOrgID" placeholder="璇烽�夋嫨缁勭粐"
+ @change="organizationChange" disabled>
+ <el-option v-for="(item, index) in organizationList" :key="index"
+ :label="item.Name" :value="item.ID">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ </div>
+ <div class="form-group">
+ <el-row>
+ <el-col :span="6">
+ <el-form-item label="杞﹀瀷鏈�澶у绉�" prop="HCarTypeMaxVolume">
+ <el-input v-model="form.HCarTypeMaxVolume" placeholder="璇疯緭鍏ヨ溅鍨嬫渶澶у绉�" disabled />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="鎬讳綋绉紙绔嬫柟绫筹級" prop="HTotalVolume">
+ <el-input v-model="form.HTotalVolume" placeholder="璇疯緭鍏ユ�讳綋绉�" disabled />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="瑁呰浇鐜�" prop="HLoadingRate">
+ <el-input v-model="form.HLoadingRate" placeholder="璇疯緭鍏ヨ杞界巼" disabled />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ </div>
+ <!-- 绗笁鍧楋細鎻愯揣鍦板潃銆佸埌璐у湴鍧�銆佺粍缁囥�佽姹傛彁璐ф棩鏈熴�佹壙杩愬晢纭鏃ユ湡銆佺墿娴佺姸鎬� -->
+ <div class="form-group">
+ <!-- <el-row>
+ <el-col :span="6">
+ <el-form-item label="鎻愯揣鍦板潃" prop="HPickAddr">
+ <el-input v-model="form.HPickAddr" placeholder="璇疯緭鍏ユ彁璐у湴鍧�" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="鍒拌揣鍦板潃" prop="HArriverAddr">
+ <el-input v-model="form.HArriverAddr" placeholder="璇疯緭鍏ュ埌璐у湴鍧�" />
+ </el-form-item>
+ </el-col>
+ </el-row>-->
+ <el-row>
+ <el-col :span="6">
+ <el-form-item label="瑕佹眰鍒拌揪鏃ユ湡" prop="HDataForRequestedArrived">
+ <el-date-picker v-model="form.HDataForRequestedArrived" type="date"
+ placeholder="閫夋嫨瑕佹眰鍒拌揪鏃ユ湡" format="yyyy-MM-dd hh:mm:ss">
+ </el-date-picker>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="瑕佹眰鎻愯揣鏃ユ湡" prop="HDateForRequestedPick">
+ <el-date-picker v-model="form.HDateForRequestedPick" type="date"
+ placeholder="閫夋嫨瑕佹眰鎻愯揣鏃ユ湡" format="yyyy-MM-dd hh:mm:ss">
+ </el-date-picker>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ </div>
+ <!-- <div class="form-group">
+ <el-form-item label="闄勪欢" prop="fujian">
+ <el-upload class="upload-demo" ref="upload" action="" :on-preview="handleFilePreview"
+ :on-remove="handleFileRemove" :on-change="handleFileChange" :file-list="fileList"
+ :auto-upload="false" :limit="10" :on-exceed="handleExceed"
+ accept=".jpg,.png,.jpeg,.pdf,.doc,.docx,.xls,.xlsx,.zip,.rar">
+ <el-button size="small" type="primary">鐐瑰嚮涓婁紶</el-button>
+ <div slot="tip" class="el-upload__tip">
+ 鏀寔涓婁紶jpg/png/jpeg/pdf/doc/docx/xls/xlsx/zip/rar鏍煎紡鏂囦欢锛屾渶澶�10涓�</div>
+ </el-upload>
+ </el-form-item>
+ </div> -->
+ </el-tab-pane>
+ <el-tab-pane label="鎵胯繍鍟嗕俊鎭�" name="second">
+ <div class="form-group">
+ <el-row>
+ <el-col :span="6">
+ <el-form-item label="杞﹁締" prop="HCarName">
+ <el-input v-model="form.HCarName" placeholder="璇疯緭鍏ヨ溅杈�" disabled>
+ <el-button slot="append" icon="el-icon-search"
+ @click="openDataDialog(14)"></el-button>
+ </el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="鍙告満" prop="HDriverName">
+ <el-input v-model="form.HDriverName" placeholder="璇疯緭鍏ュ徃鏈�" disabled>
+ <el-button slot="append" icon="el-icon-search"
+ @click="openDataDialog(15)"></el-button>
+ </el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ </div>
+ </el-tab-pane>
+ <el-tab-pane label="璐㈠姟淇℃伅" name="third">
+ <div class="form-group">
<el-row>
<el-col :span="6">
<el-form-item label="缁撶畻鏂瑰紡" prop="HSSName">
<el-input v-model="form.HSSName" placeholder="璇疯緭鍏ョ粨绠楁柟寮�">
- <el-button slot="append" icon="el-icon-search" @click="openDataDialog('鏆傛棤')"></el-button>
+ <el-button slot="append" icon="el-icon-search"
+ @click="openDataDialog('鏆傛棤')"></el-button>
</el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="杩愯垂" prop="HMoney">
+ <el-input v-model="form.HMoney" placeholder="璇疯緭鍏ヨ繍璐�" disabled />
</el-form-item>
</el-col>
<el-col :span="6">
@@ -119,282 +261,185 @@
<el-input v-model="form.HExRate" placeholder="璇疯緭鍏ユ眹鐜�" readonly />
</el-form-item>
</el-col>
-
</el-row>
<el-row>
- <el-col :span="6">
- <el-form-item label="杩愯垂" prop="HMoney">
- <el-input v-model="form.HMoney" placeholder="璇疯緭鍏ヨ繍璐�" />
+ <el-col :span="6">
+ <el-form-item label="鏍哥畻浜�" prop="HSurer_Accounting">
+ <el-input v-model="form.HSurer_Accounting" placeholder="璇疯緭鍏ユ牳绠椾汉" disabled />
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="杩愯緭鏂瑰紡" prop="HTransType">
- <el-select v-model="form.HTransType" placeholder="璇烽�夋嫨杩愯緭鏂瑰紡">
- <el-option label="闆跺崟" value="闆跺崟"></el-option>
- <el-option label="鍗曠▼" value="鍗曠▼"></el-option>
- <el-option label="寰�杩�" value="寰�杩�"></el-option>
- </el-select>
- </el-form-item>
- </el-col>
- <!-- 绌虹櫧鍗犱綅鍒� -->
- <!-- <el-col :span="6"></el-col> -->
- </el-row>
- </div>
- <div class="form-group">
- <el-row>
- <el-col :span="6">
- <el-form-item label="杞﹀瀷" prop="HCarTypeName">
- <el-input v-model="form.HCarTypeName" placeholder="璇疯緭鍏ヨ溅鍨�">
- <el-button slot="append" icon="el-icon-search" @click="openDataDialog(13)"></el-button>
- </el-input>
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="杞﹀瀷鏈�澶у绉�" prop="HCarTypeMaxVolume">
- <el-input v-model="form.HCarTypeMaxVolume" placeholder="璇疯緭鍏ヨ溅鍨嬫渶澶у绉�" readonly />
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="鎬讳綋绉紙绔嬫柟绫筹級" prop="HTotalVolume">
- <el-input v-model="form.HTotalVolume" placeholder="璇疯緭鍏ユ�讳綋绉�" />
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="瑁呰浇鐜�" prop="HLoadingRate">
- <el-input v-model="form.HLoadingRate" placeholder="璇疯緭鍏ヨ杞界巼" />
+ <el-form-item label="鏍哥畻鏃堕棿" prop="HDate_Accounting">
+ <el-date-picker v-model="form.HDate_Accounting" type="date"
+ format="yyyy-MM-dd hh:mm:ss" placeholder="閫夋嫨鏍哥畻鏃堕棿" disabled>
+ </el-date-picker>
</el-form-item>
</el-col>
</el-row>
</div>
- <!-- 绗笁鍧楋細鎻愯揣鍦板潃銆佸埌璐у湴鍧�銆佺粍缁囥�佽姹傛彁璐ф棩鏈熴�佹壙杩愬晢纭鏃ユ湡銆佺墿娴佺姸鎬� -->
+ </el-tab-pane>
+ <el-tab-pane label="鐗╂祦淇℃伅" name="forth">
<div class="form-group">
<el-row>
<el-col :span="6">
- <el-form-item label="鎻愯揣鍦板潃" prop="HPickAddr">
- <el-input v-model="form.HPickAddr" placeholder="璇疯緭鍏ユ彁璐у湴鍧�" />
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="鍒拌揣鍦板潃" prop="HArriverAddr">
- <el-input v-model="form.HArriverAddr" placeholder="璇疯緭鍏ュ埌璐у湴鍧�" />
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="缁勭粐" prop="HOrgID">
- <el-select v-model="form.HOrgID" placeholder="璇烽�夋嫨缁勭粐" @change="organizationChange" disabled>
- <el-option v-for="(item, index) in organizationList" :key="index"
- :label="item.Name" :value="item.ID">
- </el-option>
+ <el-form-item label="鐗╂祦鐘舵��" prop="HCarryStatus">
+ <el-select v-model="form.HCarryStatus" placeholder="璇烽�夋嫨鐗╂祦鐘舵��" disabled>
+ <el-option label="鐢宠涓�" value="鐢宠涓�"></el-option>
+ <el-option label="寰呬緵搴斿晢纭" value="寰呬緵搴斿晢纭"></el-option>
+ <el-option label="鎸囧畾椹鹃┒鍛樸�佽溅杈嗕腑" value="鎸囧畾椹鹃┒鍛樸�佽溅杈嗕腑"></el-option>
+ <el-option label="姝ｅ湪鍓嶅線濮嬪彂鍦�" value="姝ｅ湪鍓嶅線濮嬪彂鍦�"></el-option>
+ <el-option label="鎻愯揣涓�" value="鎻愯揣涓�"></el-option>
+ <el-option label="鍑嗗绂诲巶" value="鍑嗗绂诲巶"></el-option>
+ <el-option label="閫佽揣涓�" value="閫佽揣涓�"></el-option>
+ <el-option label="宸茬鏀�" value="宸茬鏀�"></el-option>
+ <el-option label="宸叉牳绠�" value="宸叉牳绠�"></el-option>
</el-select>
- </el-form-item>
- </el-col>
- <el-col :span="6"></el-col>
- </el-row>
- <el-row>
- <el-col :span="6">
- <el-form-item label="瑕佹眰鎻愯揣鏃ユ湡" prop="HDateForRequestedPick">
- <el-date-picker v-model="form.HDateForRequestedPick" type="date"
- placeholder="閫夋嫨瑕佹眰鎻愯揣鏃ユ湡" format="yyyy-MM-dd hh:mm:ss">
- </el-date-picker>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="鎵胯繍鍟嗙‘璁ゆ棩鏈�" prop="HDate_CarrierSure">
- <el-date-picker v-model="form.HDate_CarrierSure" type="date" placeholder="閫夋嫨鎵胯繍鍟嗙‘璁ゆ棩鏈�"
- format="yyyy-MM-dd hh:mm:ss" disabled>
+ <el-date-picker v-model="form.HDate_CarrierSure" type="date"
+ placeholder="閫夋嫨鎵胯繍鍟嗙‘璁ゆ棩鏈�" format="yyyy-MM-dd hh:mm:ss" disabled>
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="鐗╂祦鐘舵��" prop="HCarryStatus">
- <el-select v-model="form.HCarryStatus" placeholder="璇烽�夋嫨鐗╂祦鐘舵��" disabled>
- <el-option label="鐢宠涓�" value="1"></el-option>
- <el-option label="宸插鏍�" value="2"></el-option>
- <el-option label="鎵胯繍鍟嗙‘璁�" value="3"></el-option>
- <el-option label="寰呮彁璐�" value="4"></el-option>
- <el-option label="宸插埌鍘�" value="5"></el-option>
- <el-option label="宸叉彁璐�" value="6"></el-option>
- <el-option label="杩愯緭涓�" value="7"></el-option>
- <el-option label="宸茬鏀�" value="8"></el-option>
- <el-option label="宸叉牳绠�" value="9"></el-option>
- </el-select>
+ <el-form-item label="鍒嗛厤鍙告満鏃ユ湡" prop="HDate_AllocationDriver">
+ <el-date-picker v-model="form.HDate_AllocationDriver" type="date"
+ placeholder="閫夋嫨鍒嗛厤鍙告満鏃ユ湡" format="yyyy-MM-dd hh:mm:ss" disabled>
+ </el-date-picker>
</el-form-item>
</el-col>
- <el-col :span="6"></el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="6">
+ <el-form-item label="鍒板巶纭浜�" prop="HSurer_Arrive">
+ <el-input v-model="form.HSurer_Arrive" placeholder="璇疯緭鍏ュ埌鍘傜‘璁や汉" disabled />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="鎻愯揣纭浜�" prop="HSurer_Pick">
+ <el-input v-model="form.HSurer_Pick" placeholder="璇疯緭鍏ユ彁璐х‘璁�" disabled />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="鍑哄巶杩愯緭纭浜�" prop="HSurer_Trans">
+ <el-input v-model="form.HSurer_Trans" placeholder="璇疯緭鍏ュ埌鍘傜‘璁や汉" disabled />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="绛炬敹纭浜�" prop="HSurer_Receive">
+ <el-input v-model="form.HSurer_Receive" placeholder="璇疯緭鍏ョ鏀剁‘璁や汉" disabled />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="6">
+ <el-form-item label="鍒板巶纭鏃堕棿" prop="HDate_Arrive">
+ <el-date-picker v-model="form.HDate_Arrive" type="date"
+ format="yyyy-MM-dd HH:mm:ss" placeholder="閫夋嫨鍒板巶纭鏃堕棿" disabled>
+ </el-date-picker>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="鎻愯揣纭鏃堕棿" prop="HDate_Pick">
+ <el-date-picker v-model="form.HDate_Pick" type="date"
+ format="yyyy-MM-dd hh:mm:ss" placeholder="閫夋嫨鎻愯揣纭鏃堕棿" disabled>
+ </el-date-picker>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="鍑哄巶杩愯緭纭鏃堕棿" prop="HDate_Trans">
+ <el-date-picker v-model="form.HDate_Trans" type="date"
+ format="yyyy-MM-dd hh:mm:ss" placeholder="閫夋嫨鍒板嚭鍘傝繍杈撶‘璁ゆ椂闂�" disabled>
+ </el-date-picker>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="绛炬敹纭鏃堕棿" prop="HDate_Receive">
+ <el-date-picker v-model="form.HDate_Receive" type="date"
+ format="yyyy-MM-dd hh:mm:ss" placeholder="閫夋嫨绛炬敹纭鏃堕棿" disabled>
+ </el-date-picker>
+ </el-form-item>
+ </el-col>
</el-row>
</div>
</el-tab-pane>
- <el-tab-pane label="鎵胯繍鍟嗕俊鎭�" name="second">
- <el-row>
- <el-col :span="6">
- <el-form-item label="鍒嗛厤鍙告満鏃ユ湡" prop="HDate_AllocationDriver">
- <el-date-picker v-model="form.HDate_AllocationDriver" type="date"
- placeholder="閫夋嫨鍒嗛厤鍙告満鏃ユ湡" format="yyyy-MM-dd hh:mm:ss" disabled>
- </el-date-picker>
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="瑕佹眰鍒拌揪鏃ユ湡" prop="HDataForRequestedArrived">
- <el-date-picker v-model="form.HDataForRequestedArrived" type="date"
- placeholder="閫夋嫨瑕佹眰鍒拌揪鏃ユ湡" format="yyyy-MM-dd hh:mm:ss">
- </el-date-picker>
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="杞﹁締" prop="HCarName">
- <el-input v-model="form.HCarName" placeholder="璇疯緭鍏ヨ溅杈�" disabled>
- <el-button slot="append" icon="el-icon-search"
- @click="openDataDialog(14)"></el-button>
- </el-input>
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="鍙告満" prop="HDriverName">
- <el-input v-model="form.HDriverName" placeholder="璇疯緭鍏ュ徃鏈�" disabled>
- <el-button slot="append" icon="el-icon-search"
- @click="openDataDialog(15)"></el-button>
- </el-input>
- </el-form-item>
- </el-col>
- </el-row>
- <el-row>
- <el-col :span="6">
- <el-form-item label="鍒板巶纭浜�" prop="HSurer_Arrive">
- <el-input v-model="form.HSurer_Arrive" placeholder="璇疯緭鍏ュ埌鍘傜‘璁や汉" disabled />
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="鍒板巶纭鏃堕棿" prop="HDate_Arrive">
- <el-date-picker v-model="form.HDate_Arrive" type="date" format="yyyy-MM-dd HH:mm:ss"
- placeholder="閫夋嫨鍒板巶纭鏃堕棿" disabled>
- </el-date-picker>
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="鎻愯揣纭浜�" prop="HSurer_Pick">
- <el-input v-model="form.HSurer_Pick" placeholder="璇疯緭鍏ユ彁璐х‘璁�" disabled />
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="鎻愯揣纭鏃堕棿" prop="HDate_Pick">
- <el-date-picker v-model="form.HDate_Pick" type="date" format="yyyy-MM-dd hh:mm:ss"
- placeholder="閫夋嫨鎻愯揣纭鏃堕棿" disabled>
- </el-date-picker>
- </el-form-item>
- </el-col>
- </el-row>
- <el-row>
- <el-col :span="6">
- <el-form-item label="鍑哄巶杩愯緭纭浜�" prop="HSurer_Trans">
- <el-input v-model="form.HSurer_Trans" placeholder="璇疯緭鍏ュ埌鍘傜‘璁や汉" disabled />
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="鍑哄巶杩愯緭纭鏃堕棿" prop="HDate_Trans">
- <el-date-picker v-model="form.HDate_Trans" type="date" format="yyyy-MM-dd hh:mm:ss"
- placeholder="閫夋嫨鍒板嚭鍘傝繍杈撶‘璁ゆ椂闂�" disabled>
- </el-date-picker>
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="绛炬敹纭浜�" prop="HSurer_Receive">
- <el-input v-model="form.HSurer_Receive" placeholder="璇疯緭鍏ョ鏀剁‘璁や汉" disabled />
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="绛炬敹纭鏃堕棿" prop="HDate_Receive">
- <el-date-picker v-model="form.HDate_Receive" type="date"
- format="yyyy-MM-dd hh:mm:ss" placeholder="閫夋嫨绛炬敹纭鏃堕棿" disabled>
- </el-date-picker>
- </el-form-item>
- </el-col>
- </el-row>
- <el-row>
- <el-col :span="6">
- <el-form-item label="鏍哥畻浜�" prop="HSurer_Accounting">
- <el-input v-model="form.HSurer_Accounting" placeholder="璇疯緭鍏ユ牳绠椾汉" disabled />
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="鏍哥畻鏃堕棿" prop="HDate_Accounting">
- <el-date-picker v-model="form.HDate_Accounting" type="date"
- format="yyyy-MM-dd hh:mm:ss" placeholder="閫夋嫨鏍哥畻鏃堕棿" disabled>
- </el-date-picker>
- </el-form-item>
- </el-col>
- </el-row>
- </el-tab-pane>
- <el-tab-pane label="鍒跺崟淇℃伅" name="third">
- <el-row>
- <el-col :span="6">
- <el-form-item label="鍒跺崟浜�" prop="HMaker">
- <el-input v-model="form.HMaker" placeholder="璇疯緭鍏ュ埗鍗曚汉" disabled />
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="淇敼浜�" prop="HUpDater">
- <el-input v-model="form.HUpDater" placeholder="璇疯緭鍏ヤ慨鏀逛汉" disabled />
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="瀹℃牳浜�" prop="HChecker">
- <el-input v-model="form.HChecker" placeholder="璇疯緭鍏ュ鏍镐汉" disabled />
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="鍏抽棴浜�" prop="HCloseMan">
- <el-input v-model="form.HCloseMan" placeholder="璇疯緭鍏ュ叧闂汉" disabled />
- </el-form-item>
- </el-col>
- </el-row>
- <el-row>
- <el-col :span="6">
- <el-form-item label="鍒跺崟鏃ユ湡" prop="HMakeDate">
- <el-date-picker v-model="form.HMakeDate" type="date" placeholder="閫夋嫨鍒跺崟鏃ユ湡" disabled>
- </el-date-picker>
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="淇敼鏃ユ湡" prop="HUpDateDate">
- <el-date-picker v-model="form.HUpDateDate" type="date" placeholder="閫夋嫨瀹℃牳鏃ユ湡"
- disabled>
- </el-date-picker>
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="瀹℃牳鏃ユ湡" prop="HCheckDate">
- <el-date-picker v-model="form.HCheckDate" type="date" placeholder="閫夋嫨瀹℃牳鏃ユ湡" disabled>
- </el-date-picker>
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="鍏抽棴鏃ユ湡" prop="HCloseDate">
- <el-date-picker v-model="form.HCloseDate" type="date" placeholder="閫夋嫨鍏抽棴鏃ユ湡" disabled>
- </el-date-picker>
- </el-form-item>
- </el-col>
- </el-row>
- <el-row>
- <el-col :span="6">
- <el-form-item label="浣滃簾浜�" prop="HDeleteMan">
- <el-input v-model="form.HDeleteMan" placeholder="璇疯緭鍏ヤ綔搴熶汉" disabled />
- </el-form-item>
+ <el-tab-pane label="鍒跺崟淇℃伅" name="fifth">
+ <div class="form-group">
+ <el-row>
+ <el-col :span="6">
+ <el-form-item label="鍒跺崟浜�" prop="HMaker">
+ <el-input v-model="form.HMaker" placeholder="璇疯緭鍏ュ埗鍗曚汉" disabled />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="淇敼浜�" prop="HUpDater">
+ <el-input v-model="form.HUpDater" placeholder="璇疯緭鍏ヤ慨鏀逛汉" disabled />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="瀹℃牳浜�" prop="HChecker">
+ <el-input v-model="form.HChecker" placeholder="璇疯緭鍏ュ鏍镐汉" disabled />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="鍏抽棴浜�" prop="HCloseMan">
+ <el-input v-model="form.HCloseMan" placeholder="璇疯緭鍏ュ叧闂汉" disabled />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="6">
+ <el-form-item label="鍒跺崟鏃ユ湡" prop="HMakeDate">
+ <el-date-picker v-model="form.HMakeDate" type="date" placeholder="閫夋嫨鍒跺崟鏃ユ湡"
+ disabled>
+ </el-date-picker>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="淇敼鏃ユ湡" prop="HUpDateDate">
+ <el-date-picker v-model="form.HUpDateDate" type="date" placeholder="閫夋嫨瀹℃牳鏃ユ湡"
+ disabled>
+ </el-date-picker>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="瀹℃牳鏃ユ湡" prop="HCheckDate">
+ <el-date-picker v-model="form.HCheckDate" type="date" placeholder="閫夋嫨瀹℃牳鏃ユ湡"
+ disabled>
+ </el-date-picker>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="鍏抽棴鏃ユ湡" prop="HCloseDate">
+ <el-date-picker v-model="form.HCloseDate" type="date" placeholder="閫夋嫨鍏抽棴鏃ユ湡"
+ disabled>
+ </el-date-picker>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="6">
+ <el-form-item label="浣滃簾浜�" prop="HDeleteMan">
+ <el-input v-model="form.HDeleteMan" placeholder="璇疯緭鍏ヤ綔搴熶汉" disabled />
+ </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="浣滃簾鏃ユ湡" prop="HDeleteDate">
- <el-date-picker v-model="form.HDeleteDate" type="date" placeholder="閫夋嫨浣滃簾鏃ユ湡"
- disabled>
- </el-date-picker>
- </el-form-item>
- </el-col>
- </el-row>
-
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="浣滃簾鏃ユ湡" prop="HDeleteDate">
+ <el-date-picker v-model="form.HDeleteDate" type="date" placeholder="閫夋嫨浣滃簾鏃ユ湡"
+ disabled>
+ </el-date-picker>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ </div>
</el-tab-pane>
</el-tabs>
<el-card class="box-card">
<div slot="header" class="clearfix">
- <span>妫�楠岄」淇℃伅</span>
+ <span>杩愬崟鏄庣粏</span>
</div>
<div>
<div style="margin-bottom: 10px;">
@@ -405,9 +450,20 @@
@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">
<span>{{ scope.row.HSourceBillNo }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="瀹㈡埛" prop="HCusName" width="120" />
+ <el-table-column align="center" label="鎻愯揣鍦板潃" width="120">
+ <template slot-scope="scope">
+ <el-input v-model="scope.row.HPickAddr" placeholder="璇疯緭鍏ユ彁璐у湴鍧�" />
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="鍒拌揣鍦板潃" width="120">
+ <template slot-scope="scope">
+ <el-input v-model="scope.row.HArriverAddr" placeholder="璇疯緭鍏ュ埌璐у湴鍧�" />
</template>
</el-table-column>
<el-table-column align="center" label="鐗╂枡浠ｇ爜" width="120">
@@ -416,66 +472,87 @@
<el-table-column align="center" label="鐗╂枡鍚嶇О" width="120">
<template slot-scope="scope">{{ scope.row.HMaterName }} </template>
</el-table-column>
- <el-table-column align="center" label="鍣ㄥ叿浠ｇ爜" width="120">
+ <el-table-column align="center" label="鐗╂枡瑙勬牸" width="120">
+ <template slot-scope="scope">{{ scope.row.HModel }} </template>
+ </el-table-column>
+ <el-table-column v-if="false" align="center" label="瀹瑰櫒浠ｇ爜" width="120">
<template slot-scope="scope">
<el-input v-model="scope.row.HMouldNumber" placeholder="璇疯緭鍏ュ櫒鍏蜂唬鐮�"
@keyup.native.f7="openDataDialog(17, scope.row)"
@dblclick.native="openDataDialog(17, scope.row)" />
</template>
</el-table-column>
- <el-table-column align="center" label="鍣ㄥ叿鍚嶇О" width="120">
+ <el-table-column v-if="false" align="center" label="瀹瑰櫒鍚嶇О" width="120">
<template slot-scope="scope">
<span>{{ scope.row.HMouldName }}</span>
</template>
</el-table-column>
- <el-table-column align="center" label="瀹瑰櫒闀垮害" width="120">
+
+ <el-table-column align="center" label="鐗╂枡鏁伴噺" width="150">
<template slot-scope="scope">
- <span>{{ scope.row.HMouldLength }}</span>
- </template>
- </el-table-column>
- <el-table-column align="center" label="瀹瑰櫒瀹藉害" width="120">
- <template slot-scope="scope">
- <span>{{ scope.row.HMouldWidth }}</span>
- </template>
- </el-table-column>
- <el-table-column align="center" label="瀹瑰櫒楂樺害" width="120">
- <template slot-scope="scope">
- <span>{{ scope.row.HMouldHeight }}</span>
- </template>
- </el-table-column>
- <el-table-column align="center" label="鎶樺彔楂樺害" width="120">
- <template slot-scope="scope">
- <span>{{ scope.row.HMouldFoldHeight }}</span>
- </template>
- </el-table-column>
- <el-table-column align="center" label="鏍囧噯鍖呰鏁伴噺" width="120">
- <template slot-scope="scope">
- <span>{{ scope.row.HSNP }}</span>
- </template>
- </el-table-column>
- <el-table-column align="center" label="鍖呰瀹瑰櫒鏁伴噺" width="120">
- <template slot-scope="scope">
- <el-input-number v-model="scope.row.HMouldQty" :min="0" style="width: 90px;"
- controls-position="right"
- @change="changeHMouldQty(scope.row)"></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.HQty" :min="0" style="width: 90px;"
+ <el-input-number v-model="scope.row.HQty" :min="0" style="width: 120px;"
controls-position="right"
@change="checkTotalQtyExceed(scope.row)"></el-input-number>
</template>
</el-table-column>
+ <el-table-column v-if="false" align="center" label="鏍囧噯鍖呰鏁伴噺" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.HSNP }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column v-if="false" align="center" label="鍖呰瀹瑰櫒鏁伴噺" width="170">
+ <template slot-scope="scope">
+ <el-input-number v-model="scope.row.HMouldQty" :min="0" style="width: 150px;"
+ controls-position="right"
+ @change="changeHMouldQty(scope.row)"></el-input-number>
+ </template>
+ </el-table-column>
+ <el-table-column v-if="false" align="center" label="瀹瑰櫒鏁伴噺/鎵�" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.HStandardQtyForMouldInPack }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column v-if="false" align="center" label="鎵樻暟" width="120">
+ <template slot-scope="scope"> <!--HPackQTY=HMouldQty/HStandardQtyForMouldInPack -->
+ <el-input-number v-model="scope.row.HPackQTY" :min="0" style="width: 90px;"
+ controls-position="right" @change="changeHPackQty(scope.row)"></el-input-number>
+ </template>
+ </el-table-column>
+ <el-table-column v-if="false" align="center" label="鎵樺崟浣嶄綋绉�" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.HPackV }}</span>
+ </template>
+ </el-table-column>
<el-table-column align="center" label="浣撶Н" width="120">
<template slot-scope="scope">
- <span>{{ scope.row.HVolume }}</span>
+ <el-input-number v-model="scope.row.HVolume" :min="0" style="width: 90px;"
+ controls-position="right" @change="changeHVolume(scope.row)"></el-input-number>
</template>
</el-table-column>
<el-table-column align="center" label="闆跺崟鍗犵敤浣撶Н" width="120">
<template slot-scope="scope">{{ scope.row.HScatteredVolume }}
<!-- <el-input-number v-model="scope.row.HScatteredVolume" :min="0" style="width: 90px;"
controls-position="right"></el-input-number> -->
+ </template>
+ </el-table-column>
+ <el-table-column v-if="false" align="center" label="瀹瑰櫒闀垮害" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.HMouldLength }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column v-if="false" align="center" label="瀹瑰櫒瀹藉害" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.HMouldWidth }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column v-if="false" align="center" label="瀹瑰櫒楂樺害" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.HMouldHeight }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column v-if="false" align="center" label="鎶樺彔楂樺害" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.HMouldFoldHeight }}</span>
</template>
</el-table-column>
<el-table-column align="center" label="鎿嶄綔" width="55" fixed="right">
@@ -506,7 +583,8 @@
<GyCar @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyCarShow" />
<GyDriver @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyDriverShow" />
<ContractTransport @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName"
- v-if="ContractTransportShow" />
+ v-if="ContractTransportShow" :propHBeginAddrName="form.HBeginAddr"
+ :propHBeginHEndAddrName="form.HEndAddr" :propHCarTypeName="form.HCarTypeID" />
<GyMaterialPackingRelation @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName"
:propHMaterID="editData[zbIndex].HMaterID" :propHOrgID="form.HOrgID"
v-if="gyMaterialPackingRelationShow" />
@@ -540,6 +618,7 @@
import ContractTransport from "@/views/basic/gytransport/cgContractTransportBillList/Cg_ContractTransportBillList.vue"
import GyMaterialPackingRelation from '@/views/scMould/basicModeling/Gy_MaterialPackingRelationList.vue'
import AreaDialog from "@/views/component/AreaDialog"
+
export default {
name: 'Add_Edit_WL_YayBill.vue',
components: { Dept, Warehouse, Material, RowSettings, XsSeOutStockBill, GyCustomer, GySupplier, GyCartype, GyCar, GyDriver, ContractTransport, GyMaterialPackingRelation, AreaDialog },
@@ -583,13 +662,16 @@
gyCarShow: false, //杞﹁締鏁版嵁缁勪欢鏄剧ず鏍囪
gyDriverShow: false, //鍙告満鏁版嵁缁勪欢鏄剧ず鏍囪
ContractTransportShow: false, //鎵胯繍鍚堝悓鏁版嵁缁勪欢鏄剧ず鏍囪
- gyMaterialPackingRelationShow: false, //瀹瑰櫒鏁版嵁缁勪欢鏄剧ず鏍囪
+ gyMaterialPackingRelationShow: false, //瀹瑰櫒鏁版嵁缁勪欢鏄剧ず鏍囪
AreaDialogShow: false, //鐩殑鍦版暟鎹粍浠舵樉绀烘爣璁�
deptform: {}, //寮圭獥閫変腑鏁版嵁
areaType: '',//鍦板尯閫夋嫨绫诲瀷
temp: undefined, //涓存椂鍙橀噺
btResList: [], // 鍒楄缃�
+ transportList: [], //杩愯緭绾胯矾閫夋嫨鍒楄〃
+ transTypeList: [],
+ HCarTypeNameList: [],
form: {}, // 琛ㄥ崟鍙傛暟
rules: { // 琛ㄥ崟鏍￠獙
HCarrierName: [
@@ -598,17 +680,26 @@
HCusName: [
{ required: true, message: "瀹㈡埛涓嶈兘涓虹┖", trigger: "blur" }
],
- HBeginAddrName: [
- { required: true, message: "濮嬪彂鍦颁笉鑳戒负绌�", trigger: "blur" }
- ],
- HEndAddrName: [
- { required: true, message: "鐩殑鍦颁笉鑳戒负绌�", trigger: "blur" }
+ HCarTypeName: [
+ { required: true, message: "杞﹀瀷涓嶈兘涓虹┖", trigger: "blur" }
],
HDate: [
{ required: true, message: "鏃ユ湡涓嶈兘涓虹┖", trigger: "blur" }
],
HExRate: [
{ required: true, message: "姹囩巼涓嶈兘涓虹┖", trigger: "blur" }
+ ],
+ HCarrierName: [
+ { required: true, message: "鎵胯繍鍚堝悓涓嶈兘涓虹┖", trigger: "blur" }
+ ],
+ HContractTransportBillNo: [
+ { required: true, message: "鎵胯繍鍚堝悓涓嶈兘涓虹┖", trigger: "blur" }
+ ],
+ HTransType: [
+ { required: true, message: "杩愯緭鏂瑰紡涓嶈兘涓虹┖", trigger: "blur" }
+ ],
+ HTransportLineName: [
+ { required: true, message: "杩愯緭绾胯矾涓嶈兘涓虹┖", trigger: "blur" }
]
},
@@ -662,6 +753,7 @@
// 涓嬮潰鐨勪唬鐮佷細瀵艰嚧椤甸潰宕╂簝锛屽厛娉ㄩ噴鎺�
// this.$destroy()
},
+
methods: {
//#region 琛ㄥ崟鏁版嵁鍒濆鍖�
getdata() {
@@ -711,6 +803,7 @@
HPickAddr: "",
HArriverAddr: "",
HTransType: "",
+ HTransportLineName: "",
HCarTypeID: 0,
HCarTypeName: "",
HCarTypeMaxVolume: 0,
@@ -814,14 +907,14 @@
this.form.HInnerBillNo = data.鍐呴儴鍗曟嵁鍙�
this.form.HCarrierID = data.鎵胯繍鍟咺D
this.form.HCarrierName = data.鎵胯繍鍟嗗悕绉�
- this.form.HCusID = data.HCusID
- this.form.HCusName = data.瀹㈡埛鍚嶇О
+ // this.form.HCusID = data.HCusID
+ // this.form.HCusName = data.瀹㈡埛鍚嶇О
this.form.HBeginAddr = data.濮嬪彂鍦�
this.form.HBeginAddrName = data.濮嬪彂鍦板悕绉�
this.form.HEndAddr = data.鐩殑鍦�
this.form.HEndAddrName = data.鐩殑鍦板悕绉�
- this.form.HPickAddr = data.鎻愯揣鍦板潃
- this.form.HArriverAddr = data.鍒拌揣鏂瑰紡
+ // this.form.HPickAddr = data.鎻愯揣鍦板潃
+ // this.form.HArriverAddr = data.鍒拌揣鍦板潃
this.form.HTransType = data.杩愯緭鏂瑰紡
this.form.HCarTypeID = data.杞﹀瀷ID
this.form.HCarTypeName = data.杞﹀瀷鍚嶇О
@@ -848,7 +941,7 @@
this.form.HCarName = data.杞﹁締鍚嶇О
this.form.HDriverID = data.鍙告満ID
this.form.HDriverName = data.鍙告満鍚嶇О
-
+ this.form.HTransportLineName = data.杩愯緭璺嚎鍚嶇О
//瀛愯〃 璧嬪��
for (var i = 0; i < result.data.length; i++) {
var qty = parseFloat(result.data[i].HQty) || 0;
@@ -859,12 +952,16 @@
var width = parseFloat(result.data[i].瀹瑰櫒瀹藉害) || 0;
var height = parseFloat(result.data[i].瀹瑰櫒楂樺害) || 0;
var rowVolume = (length * width * height).toFixed(2);
-
+ console.log(result.data)
this.editData.push(
{
"HSourceInterID": result.data[i].婧愬崟涓诲唴鐮�,
"HSourceEntryID": result.data[i].婧愬崟瀛愬唴鐮�,
"HSourceBillNo": result.data[i].婧愬崟鍗曟嵁,
+ "HCusID": result.data[i].HCusID,
+ "HCusName": result.data[i].瀹㈡埛鍚嶇О,
+ "HPickAddr": result.data[i].鎻愯揣鍦板潃,
+ "HArriverAddr": result.data[i].鍒拌揣鍦板潃,
"HMaterID": result.data[i].HMaterID,
"HMaterNumber": result.data[i].鐗╂枡浠ｇ爜,
"HMaterName": result.data[i].鐗╂枡鍚嶇О,
@@ -881,7 +978,10 @@
"HQty": result.data[i].鐗╂枡鏁伴噺,
"HQty_origin": result.data[i].HQty,
"HVolume": rowVolume,
- "HScatteredVolume": result.data[i].闆跺崟鍗犵敤浣撶Н
+ "HScatteredVolume": result.data[i].闆跺崟鍗犵敤浣撶Н,
+ "HStandardQtyForMouldInPack": result.data[i].HStandardQtyForMouldInPack,
+ "HPackV": result.data[i].HPackV,
+ "HPackQTY": result.data[i].HPackQTY,
}
)
}
@@ -972,7 +1072,7 @@
this.ContractTransportShow = true
this.openData = true
} else if (num == 17) {
- this.dialogTitle = '瀹瑰櫒鍖呰鍒楄〃'
+ this.dialogTitle = '浜у搧鍖呰瀹瑰櫒鍏宠仈淇℃伅琛�'
this.gyMaterialPackingRelationShow = true
this.openData = true
}
@@ -988,6 +1088,7 @@
this.gyCartypeShow = false
this.gyCarShow = false
this.gyDriverShow = false
+ this.AreaDialogShow = false
this.ContractTransportShow = false
this.gyMaterialPackingRelationShow = false
},
@@ -1040,6 +1141,7 @@
this.calculateLoadingRate(parseFloat(this.form.HTotalVolume || 0));
this.gyCartypeShow = false
this.openData = false
+ this.checkAndCallGetTransCost()
} else if (num == 14) {
this.form.HCarName = deptRow.杞﹁締鍚嶇О
this.form.HCarID = deptRow.HItemID
@@ -1054,19 +1156,37 @@
console.log(deptRow)
this.form.HContractTransportBillNo = deptRow.鍗曟嵁鍙�
this.form.HContractTransportInterID = deptRow.HInterID
- this.form.HContractTransportEntryID = deptRow.HInterID
- this.form.HDistance = deptRow.璺濈
- this.form.HTransportTimes = deptRow.杩愯緭鏃舵晥
- this.form.HTransportTyep = deptRow.杩愯緭绫诲瀷
- this.form.HTransType = deptRow.杩愯緭绫诲瀷
- this.form.HSSID = deptRow.缁撶畻鏂瑰紡
- this.form.HSSName = deptRow.缁撶畻鏂瑰紡鍚嶇О
- this.form.HCurID = deptRow.甯佸埆
- this.form.HCurName = deptRow.甯佸埆鍚嶇О
- this.form.HMoney = deptRow.杩愯緭璐圭敤
- this.form.HExRate = deptRow.姹囩巼 == null ? 0 : deptRow.姹囩巼
- this.form.HCarrierID = deptRow.HSupID
- this.form.HCarrierName = deptRow.渚涘簲鍟嗗悕绉�
+ this.transportList = []
+ this.transTypeList = []
+ this.HCarTypeNameList = []
+ axios.get(this.$baseUrl + '/WLYayBillController/initDataForSelectContractTransportBill', {
+ params: {
+ "hmainid": deptRow.HInterID,
+ },
+ }).then(res => {
+ let response = res.data
+ if (response.code == 1) {
+ if (response.data.length == 0) {
+ this.$modal.msgError("璇锋鏌ャ��" + this.form.HContractTransportBillNo + "銆戝搴旂殑鎵胯繍鍚堝悓鏄惁缁存姢锛侊紒锛�");
+ 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.HSSID = response.data[0].缁撶畻鏂瑰紡
+ this.form.HSSName = response.data[0].缁撶畻鏂瑰紡鍚嶇О
+ this.transportList = [...new Set(response.data.map(item => item.杩愯緭璺嚎鍚嶇О))]
+ // this.checkAndCallGetTransCost()
+ } else {
+ this.$modal.msgError("閿欒:" + response.data.code + response.data.Message);
+ }
+ }).catch(error => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
this.ContractTransportShow = false
this.openData = false
} else if (num == 17) {
@@ -1142,27 +1262,27 @@
async processSourceDataAsync(deptRow) {
try {
// 璁剧疆瀹㈡埛淇℃伅
- if (!this.form.HCusID && deptRow.length > 0) {
- this.form.HCusID = deptRow[0]["HCusID"];
- this.form.HCusName = deptRow[0]["瀹㈡埛"];
- }
+ // if (!this.form.HCusID && deptRow.length > 0) {
+ // this.form.HCusID = deptRow[0]["HCusID"];
+ // this.form.HCusName = deptRow[0]["瀹㈡埛"];
+ // }
console.log(deptRow)
this.form.HMainSourceInterID = deptRow[0]["hmainid"]
this.form.HMainSourceEntryID = deptRow[0]["hsubid"]
this.form.HMainSourceBillType = deptRow[0]["HBillType"]
this.form.HMainSourceBillNo = deptRow[0]["鍗曟嵁鍙�"]
- this.form.HCurName = deptRow[0]["甯佸埆"]
- this.form.HCurID = deptRow[0]["HCurID"]
- this.form.HExRate = deptRow[0]["姹囩巼"]
+ // this.form.HCurName = deptRow[0]["甯佸埆"]
+ // this.form.HCurID = deptRow[0]["HCurID"]
+ // this.form.HExRate = deptRow[0]["姹囩巼"]
// 妫�鏌ユ槸鍚︽墍鏈夎褰曞睘浜庡悓涓�瀹㈡埛
- for (var i = 0; i < deptRow.length; i++) {
- if (deptRow[i]["HCusID"] != this.form.HCusID) {
- this.$modal.msgError("涓嬫帹澶辫触!宸茬粡閫変腑鐨勮褰曚腑瀛樺湪涓嶅悓瀹㈡埛锛岃纭繚閫夋嫨鐨勬簮鍗曞睘浜庡悓涓�瀹㈡埛!");
- this.xsSeOutStockBillShow = false;
- this.openData = false;
- return;
- }
- }
+ // for (var i = 0; i < deptRow.length; i++) {
+ // if (deptRow[i]["HCusID"] != this.form.HCusID) {
+ // this.$modal.msgError("涓嬫帹澶辫触!宸茬粡閫変腑鐨勮褰曚腑瀛樺湪涓嶅悓瀹㈡埛锛岃纭繚閫夋嫨鐨勬簮鍗曞睘浜庡悓涓�瀹㈡埛!");
+ // this.xsSeOutStockBillShow = false;
+ // this.openData = false;
+ // return;
+ // }
+ // }
// 妫�鏌ユ柊閫夋嫨鐨勬簮鍗曟槸鍚﹀凡缁忓湪瀛愯〃涓瓨鍦�
var isDuplicate = this.checkDuplicateSource(deptRow);
@@ -1194,17 +1314,17 @@
try {
// 鏄剧ず婧愬崟鏁版嵁鍔犺浇鐘舵��
this.sourceDataLoading = true;
-
var dataArray = [];
-
+ let hmainidVal = []
+ for (var i = 0; i < checkStatus.length; i++) {
+ hmainidVal[i] = "'" + checkStatus[i].hmainid + '-' + checkStatus[i].hsubid + "'"
+ }
// 浣跨敤Promise.all绛夊緟鎵�鏈夊紓姝ヨ姹傚畬鎴�
const promises = checkStatus.map(async (item) => {
const temp = await this.getPushSeOutStockBillInit(item.hmainid, item.hsubid);
return temp;
});
-
const results = await Promise.all(promises);
-
// 杩囨护鎺塶ull鍊�
for (const result of results) {
if (result) {
@@ -1215,127 +1335,114 @@
return;
}
}
-
// 鑾峰彇鐜版湁瀛愯〃鏁版嵁
var existingData = this.editData || [];
var orginHQTY = 0;
-
// 鍒涘缓鐗╂枡ID鏄犲皠
- var materialMap = {};
- for (var i = 0; i < dataArray.length; i++) {
- orginHQTY = dataArray[i].鏁伴噺;
- var materialId = dataArray[i].HMaterID;
- if (!materialMap[materialId]) {
- materialMap[materialId] = [];
- }
- materialMap[materialId].push({
- hmainid: dataArray[i].hmainid,
- hsubid: dataArray[i].hsubid,
- 鍗曟嵁鍙�: dataArray[i].鍗曟嵁鍙�
- });
- }
+ // var materialMap = {};
+ // for (var i = 0; i < dataArray.length; i++) {
+ // orginHQTY = dataArray[i].鏁伴噺;
+ // var materialId = dataArray[i].HMaterID;
+ // console.log(materialId)
+ // if (!materialMap[materialId]) {
+ // materialMap[materialId] = [];
+ // }
+ // materialMap[materialId].push({
+ // HMaterID: dataArray[i].HMaterID,
+ // hmainid: dataArray[i].hmainid,
+ // hsubid: dataArray[i].hsubid,
+ // 鍗曟嵁鍙�: dataArray[i].鍗曟嵁鍙�
+ // });
+ // }
+ // // 鑾峰彇鎵�鏈夌墿鏂橧D
+ // var ListMaterial = "";
+ // for (var materialId in materialMap) {
+ // if (ListMaterial) ListMaterial += ";";
+ // ListMaterial += materialId;
+ // }
+ // if (!ListMaterial) {
+ // this.$modal.msgError("娌℃湁鎵惧埌鐗╂枡淇℃伅锛岃妫�鏌ラ�夋嫨鐨勬簮鍗曟槸鍚﹀寘鍚湁鏁堢殑鐗╂枡鏁版嵁!");
+ // this.sourceDataLoading = false;
+ // return;
+ // }
- // 鑾峰彇鎵�鏈夌墿鏂橧D
- var ListMaterial = "";
- for (var materialId in materialMap) {
- if (ListMaterial) ListMaterial += ";";
- ListMaterial += materialId;
- }
-
- if (!ListMaterial) {
- this.$modal.msgError("娌℃湁鎵惧埌鐗╂枡淇℃伅锛岃妫�鏌ラ�夋嫨鐨勬簮鍗曟槸鍚﹀寘鍚湁鏁堢殑鐗╂枡鏁版嵁!");
- this.sourceDataLoading = false;
- return;
- }
-
- const response = await axios.get(this.baseURL + '/WLYayBillController/GetMesByOrginBill', {
+ const response = await axios.get(this.baseURL + '/WLYayBillController/GetList', {
params: {
- "ListMaterial": ListMaterial
+ "user": sessionStorage["HUserName"],
+ "hmainid_hsubid": hmainidVal.join(',')
},
});
-
+ console.log('婧愬崟璇︽儏', response.data.data)
let result = response.data;
if (result.count == 1) {
let res = result.data;
var newRows = [];
- // 涓烘瘡涓簮鍗曡鍒涘缓瀵瑰簲鐨勫瓙琛ㄨ
- for (var materialId in materialMap) {
- var sourceInfos = materialMap[materialId];
-
- // 鏌ユ壘璇ョ墿鏂橧D瀵瑰簲鐨勫寘瑁呭鍣ㄤ俊鎭�
- var materialInfo = null;
- for (var i = 0; i < res.length; i++) {
- if (res[i].HMaterID == materialId) {
- materialInfo = res[i];
+ // 涓烘瘡涓簮鍗曡鍒涘缓涓�鏉¤褰�
+ for (var j = 0; j < res.length; j++) {
+ var sourceInfo = res[j];
+ // 鍐嶆妫�鏌ユ槸鍚﹀凡瀛樺湪锛堝弻閲嶄繚闄╋級
+ var isExist = false;
+ for (var k = 0; k < existingData.length; k++) {
+ if (existingData[k].HSourceInterID == sourceInfo.hmainid &&
+ existingData[k].HSourceEntryID == sourceInfo.hsubid) {
+ isExist = true;
break;
}
}
-
- if (materialInfo) {
- // 涓烘瘡涓簮鍗曡鍒涘缓涓�鏉¤褰�
- for (var j = 0; j < sourceInfos.length; j++) {
- var sourceInfo = sourceInfos[j];
-
- // 鍐嶆妫�鏌ユ槸鍚﹀凡瀛樺湪锛堝弻閲嶄繚闄╋級
- var isExist = false;
- for (var k = 0; k < existingData.length; k++) {
- if (existingData[k].HSourceInterID == sourceInfo.hmainid &&
- existingData[k].HSourceEntryID == sourceInfo.hsubid) {
- isExist = true;
- break;
- }
- }
-
- if (isExist) {
- this.$modal.msgError(`婧愬崟${sourceInfo.鍗曟嵁鍙穧宸插瓨鍦紝璺宠繃`);
- continue;
- }
-
- // 璁＄畻鐩稿叧鏁伴噺
- var qty = materialInfo.HSNP || 0;
- var snp = materialInfo.HSNP || 1;
- var mouldQty = snp > 0 ? Math.ceil(qty / snp) : 0;
- var length = parseFloat(materialInfo.闀垮害) || 0;
- var width = parseFloat(materialInfo.瀹藉害) || 0;
- var height = parseFloat(materialInfo.楂樺害) || 0;
- var rowVolume = (length * width * height * mouldQty).toFixed(2);
-
- newRows.push({
- "HSourceInterID": sourceInfo.hmainid,
- "HSourceEntryID": sourceInfo.hsubid,
- "HSourceBillNo": sourceInfo.鍗曟嵁鍙�,
- "HMaterID": materialInfo.HMaterID,
- "HMaterNumber": materialInfo.鐗╂枡浠ｇ爜,
- "HMaterName": materialInfo.鐗╂枡鍚嶇О,
- "HUnitID": materialInfo.HUnitID,
- "HMouldID": materialInfo.HMouldID,
- "HMouldNumber": materialInfo.HMouldNumber,
- "HMouldName": materialInfo.HMouldName,
- "HMouldLength": materialInfo.闀垮害,
- "HMouldWidth": materialInfo.瀹藉害,
- "HMouldHeight": materialInfo.楂樺害,
- "HMouldFoldHeight": materialInfo.鎶樺彔楂樺害,
- "HQty": orginHQTY,
- "HQty_origin": orginHQTY,
- "HMouldQty": mouldQty,
- "HVolume": rowVolume,
- "HSNP": materialInfo.HSNP,
- HScatteredVolume: 0,
- });
- }
+ if (isExist) {
+ this.$modal.msgError(`婧愬崟${sourceInfo.鍗曟嵁鍙穧宸插瓨鍦紝璺宠繃`);
+ continue;
}
+ // 璁＄畻鐩稿叧鏁伴噺
+ var qty = res[j].鐗╂枡鏁伴噺 || 0;
+ var snp = res[j].鎵樻爣鍑嗗鍣ㄦ暟閲� || 0;
+ var mouldQty = 0;
+ if (snp > 0) {
+ mouldQty = Math.ceil(qty / snp);
+ }
+ var HPackQTY = 0;
+ if (res[j].鎵樻暟閲� > 0 && mouldQty > 0) {
+ HPackQTY = Math.ceil(mouldQty / res[j].鎵樻暟閲�);
+ }
+ var rowVolume = (HPackQTY * res[j].鎵樹綋绉�).toFixed(2);
+ newRows.push({
+ "HSourceInterID": res[j].hmainid,
+ "HSourceEntryID": res[j].hsubid,
+ "HSourceBillNo": res[j].鍗曟嵁鍙�,
+ "HCusID": res[j].HCusID,
+ "HCusName": res[j].瀹㈡埛,
+ "HMaterID": res[j].HMaterID,
+ "HMaterNumber": res[j].鐗╂枡浠ｇ爜,
+ "HMaterName": res[j].鐗╂枡鍚嶇О,
+ "HMouldNumber": res[j].瀹瑰櫒浠ｇ爜,
+ "HMouldName": res[j].瀹瑰櫒鍚嶇О,
+ "HUnitID": res[j].HUnitID,
+ "HMouldID": res[j].HMouldID,
+ "HPackV": res[j].鎵樹綋绉�,
+ "HStandardQtyForMouldInPack": res[j].瀹瑰櫒鏁伴噺,
+ "HMouldLength": res[j].闀垮害,
+ "HMouldWidth": res[j].瀹藉害,
+ "HMouldHeight": res[j].楂樺害,
+ "HMouldFoldHeight": res[j].鎶樺彔楂樺害,
+ "HModel": res[j].鐗╂枡瑙勬牸,
+ "HQty": res[j].鐗╂枡鏁伴噺,
+ "HQty_origin": orginHQTY,
+ "HMouldQty": mouldQty,
+ "HVolume": rowVolume,
+ "HSNP": res[j].鎵樻爣鍑嗗鍣ㄦ暟閲�,
+ "HScatteredVolume": 0,
+ "HPackQTY": HPackQTY,
+ });
+ this.form.HTotalVolume = this.form.HTotalVolume * 1 + rowVolume * 1
}
-
if (newRows.length === 0) {
this.$modal.msgError("娌℃湁鍙坊鍔犵殑鏂拌褰曪紝鍙兘鏄簮鍗曟暟鎹凡瀛樺湪鎴栫墿鏂欎俊鎭笉瀹屾暣!");
this.sourceDataLoading = false;
return;
}
-
// 鍚堝苟鐜版湁鏁版嵁鍜屾柊鏁版嵁
var allData = existingData.concat(newRows);
-
// 娓叉煋琛ㄦ牸
this.editData = allData;
@@ -1375,22 +1482,21 @@
return null;
}
},
+ //#endregion
//#region 宸ュ叿鏍忔寜閽搷浣�
//#region 缂栬緫鎻愪氦淇濆瓨
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
+ this.form.HCarryStatus = 0;
var loadingRate = this.form.HLoadingRate;
if (loadingRate && typeof loadingRate === 'string') {
this.form.HLoadingRate = parseFloat(loadingRate.replace('%', '')) / 100;
}
var sMainStr = JSON.stringify(this.form);
var sSubStr = JSON.stringify(this.editData);
- console.log(this.form)
-
// 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",
@@ -1462,6 +1568,11 @@
this.$modal.msgError("璇烽�夋嫨涓�琛屾暟鎹�")
} else {
let copyRow = JSON.parse(JSON.stringify(this.zbSelForm))
+ copyRow.HPackQTY = 0,
+ copyRow.HMouldQty = 0,
+ copyRow.HQty = 0,
+ copyRow.HVolume = 0
+ copyRow.HScatteredVolume = 0
this.editData.push(copyRow);
}
},
@@ -1664,19 +1775,66 @@
});
},
//#endregion
- // 鍖呰瀹瑰櫒鏁伴噺璁＄畻浣撶Н
+ //#region 鍖呰瀹瑰櫒鏁伴噺璁＄畻浣撶Н
changeHMouldQty(row) {
this.zbIndex = row.index - 1
- let Volume = ((this.editData[this.zbIndex].HMouldLength * this.editData[this.zbIndex].HMouldWidth * this.editData[this.zbIndex].HMouldHeight * this.editData[this.zbIndex].HMouldQty).toFixed(2)) - 0
- if (!Volume) {
- this.editData[this.zbIndex].HVolume = 0
+
+ let HPackQty = 0;
+ const standardQty = parseFloat(this.editData[row.index - 1].HStandardQtyForMouldInPack) || 0;
+ const mouldQty = parseFloat(row.HMouldQty) || 0;
+
+ if (standardQty > 0 && mouldQty > 0) {
+ HPackQty = Math.ceil(mouldQty / standardQty);
} else {
- this.editData[this.zbIndex].HVolume = Volume
+ if (standardQty === 0) {
+ this.$message.warning('瀹瑰櫒鏁伴噺/鎵樹负0锛屾墭鏁板皢琚缃负0');
+ }
}
- this.form.HTotalVolume = 0
+
+ if (!HPackQty || HPackQty == 'Infinity') {
+ this.editData[row.index - 1].HPackQTY = 0;
+ } else {
+ this.editData[row.index - 1].HPackQTY = HPackQty;
+ }
+
+ this.changeHPackQty(row);
+ },
+ //#endregion
+ //#region 鎵樻暟璁＄畻浣撶Н
+ changeHPackQty(row) {
+ this.zbIndex = row.index - 1
+
+ const packQty = parseFloat(this.editData[this.zbIndex].HPackQTY) || 0;
+ const packV = parseFloat(this.editData[this.zbIndex].HPackV) || 0;
+ let Volume = ((packQty * packV).toFixed(2)) - 0;
+
+ if (!Volume) {
+ this.editData[this.zbIndex].HVolume = 0;
+ } else {
+ this.editData[this.zbIndex].HVolume = Volume;
+ }
+
+ this.form.HTotalVolume = 0;
this.editData.map(item => {
- this.form.HTotalVolume = Number(item.HVolume) + this.form.HTotalVolume
- })
+ this.form.HTotalVolume = Number(item.HVolume) + this.form.HTotalVolume;
+ });
+ this.calculateLoadingRate(parseFloat(this.form.HTotalVolume || 0));
+ },
+ //#region 浣撶Н鍊煎彉鍖栧鐞�
+ changeHVolume(row) {
+ this.zbIndex = row.index - 1;
+
+ // 纭繚浣撶Н鍊兼湁鏁�
+ const volume = parseFloat(row.HVolume) || 0;
+ this.editData[this.zbIndex].HVolume = volume;
+
+ // 鏇存柊琛ㄥご鎬讳綋绉�
+ this.form.HTotalVolume = 0;
+ this.editData.map(item => {
+ this.form.HTotalVolume = Number(item.HVolume) + this.form.HTotalVolume;
+ });
+
+ // 鏇存柊瑁呰浇鐜�
this.calculateLoadingRate(parseFloat(this.form.HTotalVolume || 0));
},
//#endregion
@@ -1757,13 +1915,58 @@
this.$modal.msgError(message);
return true; // 琛ㄧず鏈夎秴鍑�
}
- let MouldQty = Math.ceil(selRow.HQty / this.editData[selRow.index - 1].HSNP)
- if (!MouldQty||MouldQty=='Infinity') {
- this.editData[selRow.index - 1].HMouldQty = 0
+ const SNP = parseFloat(this.editData[selRow.index - 1].HSNP) || 0;
+ const HQty = parseFloat(selRow.HQty) || 0;
+ let warningMessages = [];
+
+ if (SNP > 0) {
+ let MouldQty = Math.ceil(HQty / SNP);
+ if (!MouldQty || MouldQty == 'Infinity') {
+ this.editData[selRow.index - 1].HMouldQty = 0;
+ } else {
+ this.editData[selRow.index - 1].HMouldQty = MouldQty;
+ }
} else {
- this.editData[selRow.index - 1].HMouldQty = MouldQty
+ this.editData[selRow.index - 1].HMouldQty = 0;
+ warningMessages.push('鏍囧噯鍖呰鏁伴噺涓�0锛屽寘瑁呭鍣ㄦ暟閲忓皢琚缃负0');
}
- this.changeHMouldQty(selRow)
+
+ const standardQtyForMouldInPack = parseFloat(this.editData[selRow.index - 1].HStandardQtyForMouldInPack) || 0;
+ const HMouldQty = parseFloat(this.editData[selRow.index - 1].HMouldQty) || 0;
+
+ if (standardQtyForMouldInPack > 0 && HMouldQty > 0) {
+ let HPackQTY = Math.ceil(HMouldQty / standardQtyForMouldInPack);
+ if (!HPackQTY || HPackQTY == 'Infinity') {
+ this.editData[selRow.index - 1].HPackQTY = 0;
+ } else {
+ this.editData[selRow.index - 1].HPackQTY = HPackQTY;
+ }
+ } else {
+ if (standardQtyForMouldInPack === 0) {
+ warningMessages.push('瀹瑰櫒鏁伴噺/鎵樹负0锛屾墭鏁板皢琚缃负0');
+ }
+ this.editData[selRow.index - 1].HPackQTY = 0;
+ }
+
+ if (warningMessages.length > 0) {
+ this.$message.warning(warningMessages.join('锛�'));
+ }
+
+ const HPackQTY = parseFloat(this.editData[selRow.index - 1].HPackQTY) || 0;
+ const HPackV = parseFloat(this.editData[selRow.index - 1].HPackV) || 0;
+ let HVolume = ((HPackQTY * HPackV).toFixed(2)) - 0;
+ if (!HVolume) {
+ this.editData[selRow.index - 1].HVolume = 0;
+ } else {
+ this.editData[selRow.index - 1].HVolume = HVolume;
+ }
+
+ this.form.HTotalVolume = 0;
+ this.editData.map(item => {
+ this.form.HTotalVolume = Number(item.HVolume) + this.form.HTotalVolume;
+ });
+ this.calculateLoadingRate(parseFloat(this.form.HTotalVolume || 0));
+
return false; // 琛ㄧず娌℃湁瓒呭嚭
},
//#region 闄勪欢涓婁紶鐩稿叧鏂规硶
@@ -1787,6 +1990,21 @@
// 鏂囦欢绉婚櫎鏃剁殑澶勭悊
handleFileRemove(file, fileList) {
this.uploadFiles = fileList;
+ },
+ // 鏂囦欢棰勮
+ handleFilePreview(file) {
+ if (file.url) {
+ window.open(file.url, '_blank');
+ } else if (file.raw) {
+ const url = URL.createObjectURL(file.raw);
+ window.open(url, '_blank');
+ } else {
+ this.$message.warning('鏃犳硶棰勮璇ユ枃浠�');
+ }
+ },
+ // 鏂囦欢瓒呭嚭闄愬埗鏃剁殑澶勭悊
+ handleExceed(files, fileList) {
+ this.$message.warning(`褰撳墠闄愬埗閫夋嫨 10 涓枃浠讹紝鏈閫夋嫨浜� ${files.length} 涓枃浠讹紝鍏遍�夋嫨浜� ${files.length + fileList.length} 涓枃浠禶);
},
flieUpload(row) {
// 鍒涘缓FormData瀵硅薄
@@ -1882,7 +2100,112 @@
this.uploadFiles.splice(index, 1)
},
//#endregion
- //#endregion
+ //#endregion
+ checkTransportList() {
+ if (this.transportList.length === 0) {
+ this.$message.warning('璇峰厛閫夋嫨鎵胯繍鍚堝悓')
+ }
+ },
+ checkTransTypeList() {
+ if (this.transTypeList.length === 0) {
+ this.$message.warning('璇峰厛閫夋嫨杩愯緭绾胯矾')
+ }
+ },
+ checkHCarTypeNameList() {
+ if (this.HCarTypeNameList.length === 0) {
+ this.$message.warning('璇峰厛閫夋嫨杩愯緭鏂瑰紡')
+ }
+ },
+ transLineNameChange() {
+ this.form.HTransType = ''
+ this.form.HCarTypeName = ''
+ this.transTypeList = []
+ this.HCarTypeNameList = []
+ this.getTransCost('line')
+ },
+ transTypeChange() {
+ this.form.HCarTypeName = ''
+ this.HCarTypeNameList = []
+ this.getTransCost('type')
+ },
+ transHCarChange() {
+ this.getTransCost('car')
+ },
+ checkAndCallGetTransCost() {
+ const { HContractTransportBillNo, HCarTypeName, HTransType, HTransportLineName, HCarrierID } = this.form
+
+ if (!HContractTransportBillNo) {
+ this.$message.warning('璇峰厛閫夋嫨鎵胯繍鍚堝悓')
+ return
+ }
+ if (!HTransportLineName) {
+ this.$message.warning('璇峰厛閫夋嫨杩愯緭绾胯矾')
+ return
+ }
+ if (!HTransType) {
+ this.$message.warning('璇峰厛閫夋嫨杩愯緭鏂瑰紡')
+ return
+ }
+ if (!HCarTypeName) {
+ this.$message.warning('璇峰厛閫夋嫨杞﹀瀷')
+ return
+ }
+ if (!HCarrierID) {
+ this.$message.warning('渚涘簲鍟嗕笉鑳戒负绌�')
+ return
+ }
+ this.getTransCost()
+ },
+ getTransCost(val) {
+ axios.get(this.$baseUrl + '/WLYayBillController/getSelectContractTransportBillEntryData', {
+ params: {
+ Cg_ContractTransportBillInterID: this.form.HContractTransportInterID,
+ HSupID: this.form.HCarrierID,
+ HTransportLineName: this.form.HTransportLineName,
+ HCarTypeID: this.form.HCarTypeID,
+ HTransportTyep: this.form.HTransType,
+ },
+ }).then(res => {
+ let response = res.data
+ if (response.code == 1) {
+ if (response.data.length == 0) {
+ this.$modal.msgError("鏈幏鍙栧埌鎸囧畾鎵胯繍鍚堝悓鏁版嵁锛岃妫�鏌ャ��" + this.form.HCarrierName + '-' + this.form.HTransportLineName + '-' + this.form.HCarTypeName + '-' + this.form.HTransType + "銆戝搴旂殑鎵胯繍鍚堝悓鏄惁缁存姢锛侊紒锛�");
+ this.form.HMoney = 0
+ return
+ }
+ if (val == 'line') {
+ this.transTypeList = [...new Set(response.data.map(item => item.杩愯緭绫诲瀷))]
+ } else if (val == 'type') {
+ 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 if (val == 'car') {
+ 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.HDistance = response.data[0].璺濈
+ this.form.HTransportTimes = response.data[0].杩愯緭鏃舵晥
+ this.form.HTransportTyep = response.data[0].杩愯緭绫诲瀷
+ this.form.HMoney = response.data[0].杩愯緭璐圭敤
+ if (this.form.HMoney == 0) {
+ this.$modal.msgError("褰撳墠杩愯垂涓�0");
+ }
+ }
+ } else {
+ this.$modal.msgError("閿欒:" + response.code + response.Message);
+ }
+ }).catch(error => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+
+ },
}
};
</script>
@@ -1890,10 +2213,15 @@
.xsckdBox .el-date-editor.el-input {
width: 100%;
}
+
.form-group {
- border: 1px solid #ddd; /* 鐏拌壊杈规 */
- padding: 15px; /* 鍐呰竟璺濓紝璁╁唴瀹逛笌杈规鏈夐棿璺� */
- border-radius: 4px; /* 鍙�夊渾瑙� */
- margin-bottom: 20px; /* 淇濇寔鍘熸湁鐨勪笅杈硅窛 */
+ border: 1px solid #ddd;
+ /* 鐏拌壊杈规 */
+ padding: 15px;
+ /* 鍐呰竟璺濓紝璁╁唴瀹逛笌杈规鏈夐棿璺� */
+ border-radius: 4px;
+ /* 鍙�夊渾瑙� */
+ margin-bottom: 20px;
+ /* 淇濇寔鍘熸湁鐨勪笅杈硅窛 */
}
</style>
diff --git a/src/views/logistics/transportGPS/WL_YayBill.vue b/src/views/logistics/transportGPS/WL_YayBill.vue
index ad03eff..6b42ca1 100644
--- a/src/views/logistics/transportGPS/WL_YayBill.vue
+++ b/src/views/logistics/transportGPS/WL_YayBill.vue
@@ -17,8 +17,25 @@
</el-select>
</el-form-item>
<el-form-item label="鍗曟嵁鍙�" prop="HBillNo">
- <el-input v-model="queryParams.HBillNo" placeholder="璇疯緭鍏ュ崟鎹彿" @keyup.enter.native="handleQuery" />
+ <el-input v-model="queryParams.HBillNo" placeholder="璇疯緭鍏ュ崟鎹彿" @keyup.enter.native="handleQuery"
+ style="width: 150px;" />
</el-form-item>
+ <el-form-item label="杞︾墝鍙�" prop="HPlateNumber">
+ <el-input v-model="queryParams.HPlateNumber" placeholder="璇疯緭鍏ヨ溅鐗屽彿" @keyup.enter.native="handleQuery"
+ style="width: 120px;" />
+ </el-form-item>
+ <el-form-item label="鍙戣揣閫氱煡鍗�" prop="HSourceBillNo">
+ <el-input v-model="queryParams.HSourceBillNo" placeholder="璇疯緭鍏ュ彂璐ч�氱煡鍗�" @keyup.enter.native="handleQuery"
+ style="width: 120px;" />
+ </el-form-item>
+ <el-form-item label="鐗╂祦鐘舵��" prop="HBillStatus">
+ <el-select v-model="queryParams.HBillStatus" placeholder="璇烽�夋嫨鐗╂祦鐘舵��">
+ <el-option v-for="(item, index) in HBillStatusList" :key="index" :label="item.Name"
+ :value="item.Name">
+ </el-option>
+ </el-select>
+ </el-form-item>
+
<el-form-item label="缁勭粐" prop="HOrgID">
<el-select v-model="queryParams.HOrgID" placeholder="璇烽�夋嫨缁勭粐">
<el-option v-for="(item, index) in organizationList" :key="index" :label="item.Name"
@@ -143,8 +160,32 @@
</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>
+ </el-col>
+ <el-col :span="1.5">
+ <el-button type="primary" icon="el-icon-edit-outline" size="mini" :disabled="single"
+ @click="set_CheckBill(1, form = rowForm)">鍙嶅鏍�</el-button>
+ </el-col>
+ <el-col :span="1.5">
+ <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="set_ConfirmBill">渚涘簲鍟嗙‘璁�</el-button>
+ </el-col>
+ <el-col :span="1.5">
+ <el-button type="primary" icon="el-icon-edit-outline" size="mini" :disabled="single"
+ @click="hanleCarOrDriver(form = rowForm)">鍒嗛厤杞﹁締鍜屽徃鏈�</el-button>
+ </el-col>
+ <el-col :span="1.5">
+ <el-button type="primary" icon="el-icon-edit-outline" size="mini" :disabled="single"
+ @click="openDataDialog(14, form = rowForm)">鍒嗛厤杞﹁締</el-button>
+ </el-col>
+ <el-col :span="1.5">
+ <el-button type="primary" icon="el-icon-edit-outline" size="mini" :disabled="single"
+ @click="openDataDialog(15, form = rowForm)">鍒嗛厤鍙告満</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="primary" icon="el-icon-circle-check" size="mini" :disabled="single"
@@ -162,29 +203,9 @@
<el-button type="primary" icon="el-icon-circle-check" size="mini" :disabled="single"
@click="set_ConfirmOtherBill(4)">鍒拌揣绛炬敹纭</el-button>
</el-col>
- <!-- <el-col :span="1.5">
- <el-button type="primary" icon="el-icon-circle-check" size="mini" :disabled="single"
- @click="set_CheckBill(0, form = rowForm)">鍒嗛厤鍙告満</el-button>
- </el-col> -->
- <el-col :span="1.5">
- <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-edit-outline" size="mini"
@click="handlePush(row = rowForm, OperationType = 4)">涓嬫帹锛堣垂鐢ㄧ粨绠楀崟锛�</el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button type="primary" icon="el-icon-edit-outline" size="mini" :disabled="single"
- @click="openDataDialog(14, form = rowForm)">鍒嗛厤鍙告満</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>
- </el-col>
- <el-col :span="1.5">
- <el-button type="primary" icon="el-icon-edit-outline" size="mini" :disabled="single"
- @click="set_CheckBill(1, form = rowForm)">鍙嶅鏍�</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="primary" icon="el-icon-edit-outline" size="mini" :disabled="single"
@@ -203,22 +224,22 @@
@click="set_DropBill(2, form = rowForm)">鍙嶄綔搴�</el-button>
</el-col>
<el-col :span="1.5">
+ <el-button type="primary" icon="el-icon-printer" size="mini" @click="get_PrintReport">鎵撳嵃</el-button>
+ </el-col>
+ <el-col :span="1.5">
<el-button type="primary" icon="el-icon-download" size="mini" @click="handleExport">瀵煎嚭</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="primary" icon="el-icon-date" size="mini" @click="handleRowHide">闅愯棌鍒楄缃�</el-button>
</el-col>
<!-- <el-col :span="1.5">
- <el-button type="primary" icon="el-icon-printer" size="mini" @click="get_PrintReport">鎵撳嵃</el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button type="primary" icon="el-icon-printer" size="mini" :disabled="single"
- @click="get_BarCodeDetail">鏉＄爜鏄庣粏</el-button>
+ <el-button type="primary" icon="el-icon-upload" size="mini" :disabled="single"
+ @click="handleFileUpload">闄勪欢涓婁紶</el-button>
</el-col>
<el-col :span="1.5">
- <el-button type="primary" icon="el-icon-printer" size="mini" :disabled="single"
- @click="get_PackStockDetail">鍖呰瀹瑰櫒鍑哄叆搴撴槑缁�</el-button>
- </el-col>-->
+ <el-button type="primary" icon="el-icon-download" size="mini" :disabled="multiple"
+ @click="handleBatchFileDownload">闄勪欢涓嬭浇</el-button>
+ </el-col> -->
</el-row>
<div class="tableBox" v-loading="loading">
<el-table :data="tableData" ref="tableData" max-height="710" :summary-method="getSummaries"
@@ -246,8 +267,9 @@
</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"
+ @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="HModName" @rowEditClose="rowSetClose" v-if="rowHideShow" />
@@ -261,8 +283,8 @@
</el-dialog>
<!-- 鎵撳嵃 -->
<el-dialog title="鎵撳嵃妯℃澘閫夋嫨" :visible.sync="openPrintList" width="800px" append-to-body>
- <PrintList :linterid=this.rowForm.HInterID :MyMsg=this.rowForm.HInterID :Type='HBillType'
- :HModName="HModName" @rowEditClose="rowSetClose" v-if="printListShow" />
+ <PrintList :linterid='printIds' :MyMsg='printIds' :Type='HBillType' :HModName="HBillType"
+ @rowEditClose="rowSetClose" v-if="printListShow" />
<!-- <div>111</div> -->
</el-dialog>
@@ -272,7 +294,8 @@
<el-input v-model="formVolume.鍗曟嵁鍙�" placeholder="璇疯緭鍏ュ崟鎹彿" disabled />
</el-form-item>
<el-form-item label="闆跺崟鍗犵敤浣撶Н">
- <el-input-number v-model="formVolume.currentVolume" placeholder="璇疯緭鍏ラ浂鍗曞崰鐢ㄤ綋绉�" />
+ <el-input-number v-model="formVolume.currentVolume"
+ :placeholder="`闆舵媴浣撶Н: ${formVolume.闆舵媴浣撶Н || 0}`" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@@ -298,6 +321,88 @@
<el-button @click="deptClose">鍙� 娑�</el-button>
</div>
</el-dialog>
+ <!-- 鍒嗛厤杞﹁締鍜屽徃鏈� -->
+ <el-dialog title="鍒嗛厤杞﹁締鍜屽徃鏈�" :visible.sync="openCarDriver" width="500px" append-to-body>
+ <el-form ref="carDriverForm" :model="carDriverForm" :rules="carDriverRules" label-width="100px">
+ <el-form-item label="杞︾墝鍙�" prop="CarHNumber">
+ <el-input v-model="carDriverForm.CarHNumber" placeholder="璇疯緭鍏ヨ溅鐗屽彿" />
+ </el-form-item>
+ <el-form-item label="杞﹁締鍚嶇О" prop="CarHName">
+ <el-input v-model="carDriverForm.CarHName" placeholder="璇疯緭鍏ヨ溅杈嗗悕绉�" />
+ </el-form-item>
+ <el-form-item label="椹鹃┒鍛�" prop="DriverHName">
+ <el-input v-model="carDriverForm.DriverHName" placeholder="璇疯緭鍏ラ┚椹跺憳" />
+ </el-form-item>
+ <el-form-item label="韬唤璇佸彿" prop="DriverHIDCard">
+ <el-input v-model="carDriverForm.DriverHIDCard" placeholder="璇疯緭鍏ヨ韩浠借瘉鍙�" />
+ </el-form-item>
+ </el-form>
+ <div slot="footer" class="dialog-footer">
+ <el-button type="primary" @click="submitCarDriver">纭� 瀹�</el-button>
+ <el-button @click="openCarDriver = false">鍙� 娑�</el-button>
+ </div>
+ </el-dialog>
+ <!-- 闄勪欢涓婁紶 -->
+ <el-dialog title="闄勪欢涓婁紶" :visible.sync="openFileUpload" width="600px" append-to-body>
+ <el-form ref="fileUploadForm" label-width="100px">
+ <el-form-item label="鍗曟嵁鍙�">
+ <el-input v-model="fileUploadForm.billNo" disabled />
+ </el-form-item>
+ <el-form-item label="闄勪欢">
+ <el-upload class="upload-demo" ref="fileUpload" :headers="upload.headers" action="http://220.189.218.155:9010/File" :on-preview="handleFilePreview"
+ :on-remove="handleFileRemove" :on-change="handleFileChange" :file-list="fileList" :on-success="handleFileSuccess" :on-error="handleFileError"
+ :limit="10" :on-exceed="handleFileExceed"
+ accept=".jpg,.png,.jpeg,.pdf,.doc,.docx,.xls,.xlsx,.zip,.rar">
+ <el-button size="small" type="primary">鐐瑰嚮涓婁紶</el-button>
+ <div slot="tip" class="el-upload__tip">
+ 鏀寔涓婁紶jpg/png/jpeg/pdf/doc/docx/xls/xlsx/zip/rar鏍煎紡鏂囦欢锛屾渶澶�10涓�</div>
+ </el-upload>
+ </el-form-item>
+ <el-form-item label="宸蹭笂浼犻檮浠�" v-if="uploadedFileList.length > 0">
+ <el-table :data="uploadedFileList" border size="small" max-height="200">
+ <el-table-column label="鏂囦欢鍚�" prop="name" align="center" show-overflow-tooltip />
+ <el-table-column label="涓婁紶鏃堕棿" prop="uploadTime" align="center" width="150" />
+ <el-table-column label="鎿嶄綔" align="center" width="100">
+ <template slot-scope="scope">
+ <el-button type="text" size="small" @click="downloadFile(scope.row)">涓嬭浇</el-button>
+ <el-button type="text" size="small" style="color: red;"
+ @click="deleteUploadedFile(scope.row, scope.$index)">鍒犻櫎</el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ </el-form-item>
+ </el-form>
+ <div slot="footer" class="dialog-footer">
+ <!-- <el-button type="primary" @click="submitFileUpload" :loading="fileUploadLoading">涓婁紶</el-button> -->
+ <el-button @click="openFileUpload = false">鍏� 闂�</el-button>
+ </div>
+ </el-dialog>
+ <!-- 闄勪欢鎵归噺涓嬭浇 -->
+ <el-dialog title="闄勪欢鎵归噺涓嬭浇" :visible.sync="openBatchDownload" width="900px" append-to-body>
+ <div style="margin-bottom: 10px;">
+ <el-alert :title="`宸查�夋嫨 ${selectedBillCount} 鏉″崟鎹紝鍏� ${batchFileList.length} 涓檮浠禶" type="info"
+ show-icon :closable="false" />
+ </div>
+ <el-table :data="batchFileList" border v-loading="batchDownloadLoading" max-height="400"
+ @selection-change="handleBatchFileSelectionChange">
+ <el-table-column type="selection" width="55" align="center" />
+ <el-table-column label="鍗曟嵁鍙�" prop="billNo" align="center" width="150" show-overflow-tooltip />
+ <el-table-column label="鏂囦欢鍚�" prop="name" align="center" show-overflow-tooltip />
+ <el-table-column label="鏂囦欢绫诲瀷" prop="fileType" align="center" width="100" />
+ <el-table-column label="涓婁紶鏃堕棿" prop="uploadTime" align="center" width="150" />
+ <el-table-column label="鎿嶄綔" align="center" width="80">
+ <template slot-scope="scope">
+ <el-button type="text" size="small" @click="downloadSingleFile(scope.row)">涓嬭浇</el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ <div slot="footer" class="dialog-footer">
+ <el-button type="primary" @click="batchDownloadFiles" :loading="batchDownloadLoading"
+ :disabled="selectedBatchFiles.length === 0">鎵归噺涓嬭浇閫変腑</el-button>
+ <el-button type="primary" @click="downloadAllFiles" :loading="batchDownloadLoading">涓嬭浇鍏ㄩ儴</el-button>
+ <el-button @click="openBatchDownload = false">鍏� 闂�</el-button>
+ </div>
+ </el-dialog>
</div>
</div>
</template>
@@ -318,15 +423,38 @@
components: { BarCodeDetail, PackStockDetail, Edit, RowSettings, PrintList, PayMentOtherBillTranEdit, GyCar, GyDriver },
data() {
return {
+ upload: {
+ // 鏄惁鏄剧ず寮瑰嚭灞�
+ open: false,
+ // 寮瑰嚭灞傛爣棰�
+ title: "",
+ // 鏄惁绂佺敤涓婁紶
+ isUploading: false,
+ // 鏄惁鏇存柊宸茬粡瀛樺湪鐨勬暟鎹�
+ updateSupport: 0,
+ // 璁剧疆涓婁紶鐨勮姹傚ご閮�
+ headers: { 'Content-Type': 'multipart/form-data'},
+ // 涓婁紶鐨勫湴鍧�
+ url: 'http://220.189.218.155:9010/File'
+ },
baseURL: process.env.VUE_APP_BASE_API, //鍚庣鎺ュ彛鍓嶇紑(鍚庣鏈嶅姟鍣╥p鍦板潃)
-
HModName: "Cg_ContractTransportBillMainList",
- HBillType: "Cg_ContractTransportBillMainList",
+ HBillType: "WL_YayBill",
OperationType: null, //淇濆瓨绫诲瀷锛堟柊澧�1淇敼3锛�
copyType: 0, //澶嶅埗鏍囪銆傛墦寮�缂栬緫缁勪欢鏃讹紝鐢ㄤ簬鍖哄垎缂栬緫杩樻槸澶嶅埗
HInterID: null,
hPriceTypeList: ['鎴愭湰浠�', '缁撶畻浠�'],
-
+ HBillStatusList:[
+ {ID: 1, Name: "鐢宠涓�" },
+ {ID: 2, Name: "寰呬緵搴斿晢纭" },
+ {ID: 3, Name: "鎸囧畾椹鹃┒鍛樸�佽溅杈嗕腑" },
+ {ID: 4, Name: "姝ｅ湪鍓嶅線濮嬪彂鍦�" },
+ {ID: 5, Name: "鎻愯揣涓�" },
+ {ID: 6, Name: "鍑嗗绂诲巶" },
+ {ID: 7, Name: "閫佽揣涓�" },
+ {ID: 8, Name: "宸茬鏀�" },
+ {ID: 9, Name: "宸叉牳绠�" },
+ ],
rqsgList: [ //鏃ユ湡闂撮殧涓嬫媺鍒楄〃鏁版嵁
{ label: '浠婂ぉ', value: 0 },
{ label: '杩戜袱澶�', value: 1 },
@@ -376,6 +504,33 @@
packStockDetailShow: false, //鍖呰瀹瑰櫒鍑哄叆搴撴槑缁嗗鍣ㄦ樉绀烘爣璁�
openVolume: false, //缁存姢闆跺崟鍗犵敤浣撶Н寮圭獥鏍囪
openData: false, //鏁版嵁寮圭獥
+ openCarDriver: false, //鍒嗛厤杞﹁締鍜屽徃鏈哄脊绐楁爣璁�
+ carDriverForm: { //鍒嗛厤杞﹁締鍜屽徃鏈鸿〃鍗�
+ CarHNumber: '',
+ CarHName: '',
+ DriverHName: '',
+ DriverHIDCard: ''
+ },
+ carDriverRules: { //鍒嗛厤杞﹁締鍜屽徃鏈鸿〃鍗曢獙璇�
+ CarHNumber: [{ required: true, message: '璇疯緭鍏ヨ溅鐗屽彿', trigger: 'blur' }],
+ CarHName: [{ required: true, message: '璇疯緭鍏ヨ溅杈嗗悕绉�', trigger: 'blur' }],
+ DriverHName: [{ required: true, message: '璇疯緭鍏ラ┚椹跺憳', trigger: 'blur' }],
+ DriverHIDCard: [{ required: true, message: '璇疯緭鍏ヨ韩浠借瘉鍙�', trigger: 'blur' }],
+ },
+ openFileUpload: false, //闄勪欢涓婁紶寮圭獥鏍囪
+ fileUploadForm: { //闄勪欢涓婁紶琛ㄥ崟
+ billNo: '',
+ hInterID: 0
+ },
+ fileList: [], //寰呬笂浼犳枃浠跺垪琛�
+ uploadFiles: [], //寰呬笂浼犳枃浠舵暟鎹�
+ fileUploadLoading: false, //涓婁紶鍔犺浇鐘舵��
+ uploadedFileList: [], //宸蹭笂浼犳枃浠跺垪琛�
+ openBatchDownload: false, //鎵归噺涓嬭浇寮圭獥鏍囪
+ batchFileList: [], //鎵归噺涓嬭浇鏂囦欢鍒楄〃
+ selectedBatchFiles: [], //閫変腑鐨勬壒閲忎笅杞芥枃浠�
+ batchDownloadLoading: false, //鎵归噺涓嬭浇鍔犺浇鐘舵��
+ selectedBillCount: 0, //閫変腑鐨勫崟鎹暟閲�
dialogTypeNum: null, //閮ㄩ棬寮圭獥1锛屼粨搴撳脊绐�2
gyCarShow: false, //杞﹁締鏁版嵁缁勪欢鏄剧ず鏍囪
gyDriverShow: false, //鍙告満鏁版嵁缁勪欢鏄剧ず鏍囪
@@ -384,7 +539,10 @@
sWhere: '', // 鎷兼帴杩囨护鏉′欢
queryParams: { // form鏁版嵁
HBillNo: '',
+ HPlateNumber: '',
HInitTimeCycle: 29,
+ HSourceBillNo:'',
+ HBillStatus:'',
sTime: '',
eTime: '',
HOrgID: sessionStorage["OrganizationID"] - 0,
@@ -401,7 +559,14 @@
ColContent2: '',
ColContent: '',
},
-
+ loading: true,
+ tyResList: [],//鍒楄〃锛堟帴鍙ｆ暟鎹級
+ btList: [],//琛ㄥご鍒楄〃鏄剧ず
+ btResList: [],
+ tableData: [],//鍒楄〃(鍒嗛〉鏄剧ず)
+ dataList: [],
+ titleData: [],//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ pageSizes: [ 50,100, 500, 5000, 50000],
page: 1, //page椤电储寮�
pageSize: 0, //page椤甸潰璁板綍鏁�
total: 0, //璁板綍鍚堣鏁�
@@ -409,6 +574,7 @@
totalNameList: [], // 闇�瑕佽缃悎璁¤鐨勫垪鏁扮粍
tableData: [], // 鍒楄〃鏁版嵁銆傜敤浜巘able鐩戝惉浜嬩欢
ids: [], // 閫変腑琛岀殑hmainid鏁扮粍
+ printIds: '', //鎵撳嵃閫夋嫨Id瀛楁
single: true, // 褰撻�変腑鐨勮鏁颁笉涓�1鏃朵负true銆傜敤浜庣鐢ㄧ浉鍏虫搷浣�
multiple: true, // 褰撻�変腑鐨勮鏁颁负0鏃朵负true銆傜敤浜庣鐢ㄧ浉鍏虫搷浣�
lastSelectedRowIndex: null, // 鐢ㄤ簬璁板綍涓婃鐐瑰嚮鐨勮绱㈠紩
@@ -429,6 +595,7 @@
},
methods: {
+
//#region 璁剧疆琛ㄥご
renderHeader(h, { column, $index }) {// 鏂板缓涓�涓� span
let span = document.createElement(span)// 璁剧疆琛ㄥご鍚嶇О
@@ -517,10 +684,29 @@
this.handleQuery()
},
//#endregion
+ //#region 鏉冮檺鍒ゆ柇
+ async set_ModCheck(ModRightNameCheck) {
+ var Permission = false;
+ const res = await axios.get(this.$baseUrl + '/LMES/getReportByModRightNameCheck', {
+ params: {
+ "ModRightNameCheck": ModRightNameCheck,
+ "user": sessionStorage["HUserName"],
+ },
+ }).then(result => {
+ if (result.data.count != 1) {
+ Permission = true;
+ this.sWhere = this.sWhere + " and 鎵胯繍鍟咺D =" + sessionStorage["HSupID"]
+ }
+ }).catch(error => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ },
+ //#endregion
//#region 蹇�熻繃婊�
- handleQuery() {
+ async handleQuery() {
this.sWhere = ''
+ await this.set_ModCheck("WLYayBill_SUPQuery")
if (this.queryParams.ColName && this.queryParams.Comparator) {
var com = "";
switch (this.queryParams.Comparator) {
@@ -592,9 +778,20 @@
if (this.queryParams.HBillNo) {
this.sWhere += " and 鍗曟嵁鍙� like '%" + this.queryParams.HBillNo + "%'";
}
+ if (this.queryParams.HPlateNumber) {
+ this.sWhere += " and 杞︾墝鍙� like '%" + this.queryParams.HPlateNumber + "%'";
+ }
+ if (this.queryParams.HSourceBillNo) {
+ this.sWhere += " and 鍙戣揣閫氱煡鍗曞彿 like '%" + this.queryParams.HSourceBillNo + "%'";
+ }
+ if (this.queryParams.HBillStatus) {
+ this.sWhere += " and 鐗╂祦鐘舵�� like '%" + this.queryParams.HBillStatus + "%'";
+ }
+
// if (this.queryParams.HOrgID) {
// this.sWhere += " and HOrgID = '" + this.queryParams.HOrgID + "'";
// }
+ console.log("swhere", this.sWhere)
this.clearData()
this.getList()
},
@@ -602,26 +799,27 @@
//#region 鏌ヨ
getList() {
- this.pageSize = 50
+
if (this.pageSize == 0) {
this.pageSize = 50
}
this.tableShow = false
this.loading = true
-
+ console.log("swhere", this.sWhere)
// 鍒楄〃鏌ヨ
- axios.get(this.$baseUrl + '/WLYayBillController/GetListPage', {
+ axios.get(this.$baseUrl + '/WLYayBillController/page', {
params: {
"sWhere": this.sWhere,
"user": sessionStorage["HUserName"],
"page": this.page,
- "size": this.pageSize
+ "size": this.pageSize,
+ "Type":3321
},
}).then(response => {
this.tyResList = response.data.data//鎬绘暟鎹�
let data1 = response.data
let option = []
- if (data1.code == 1) {
+ if (data1.list && data1.list.length > 0) {
this.btResList = data1.list //鍒楄〃琛ㄥご鏁版嵁
this.total = data1.count;
var data = [];//鍒楀瓧娈垫暟鎹�
@@ -713,8 +911,8 @@
//#region 鍒犻櫎
handleDelete() {
this.$modal.confirm('纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠').then(() => {
- axios.get(this.$baseUrl + "/Cg_ContractTransportBillListController/DeleteBill", {
- params: { 'HInterID': this.rowForm.HInterID.toString(), 'user': sessionStorage["HUserName"] }
+ axios.get(this.$baseUrl + "/WLYayBillController/deleteBill", {
+ params: { 'HItemID': this.rowForm.HInterID.toString(), 'user': sessionStorage["HUserName"] }
}).then(response => {
if (response.data.count == 1) {
this.handleQuery()
@@ -800,6 +998,7 @@
HInterID: 0,
HEntryID0: 0,
currentVolume: 0,
+
鍗曟嵁鍙�: ''
}
},
@@ -835,6 +1034,7 @@
cancelVolume() {
this.openVolume = false
this.resetVolume()
+ this.handleQuery()
},
//#region 缁存姢闆跺崟鍗犵敤浣撶Н鎻愪氦
set_HScatteredVolumeList() {
@@ -1070,11 +1270,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
@@ -1113,29 +1313,13 @@
//#region 鎵撳嵃
get_PrintReport() {
- if (this.ids.length != 1) {
- this.$modal.msgError("璇烽�夋嫨涓�琛屾暟鎹�")
- } else if (this.rowForm.鍗曟嵁鐘舵�� != "宸插鏍�" && !this.defaintOperationByCompanyName()) {
- this.$modal.msgError("鎵撳嵃澶辫触!鍘熷洜锛氬崟鎹姸鎬佷笉涓�'宸插鏍�'鐘舵��!!");
+ if (this.ids.length == 0) {
+ this.$modal.msgError("璇疯嚦灏戦�夋嫨涓�琛屾暟鎹�")
} else {
- axios.get(this.$baseUrl + "/Kf_SellOutBill/CheckSellOutBill_IsExist", {
- params: { "HInterID": this.rowForm.HInterID }
- }).then(response => {
- var result = response.data
- if (result.count == 1) {
- this.printListShow = true
- this.openPrintList = true
- // this.$router.push({ path:'/printList', query: { linterid: this.rowForm.hmainid,MyMsg:this.rowForm.hmainid,Type:'Kf_SellOutBillList' }})
- } else {
- this.$modal.msgError(result.code + result.Message)
- }
- }).catch(error => {
- this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
- });
-
-
+ this.printIds = this.ids.join(',')
+ this.printListShow = true
+ this.openPrintList = true
}
- // var content= ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + data[0].hmainid.toString() + '&MyMsg=' + data[0].hmainid.toString() + '&Type=Kf_SellOutBillList', 'yes']
},
//#endregion
@@ -1224,6 +1408,7 @@
IsAudit = 2
}
try {
+ console.log(deptRow)
const response = await axios.get(this.baseURL + '/WLYayBillController/selectDriver', {
params: {
"HInterID": this.rowForm.HInterID.toString(),
@@ -1277,6 +1462,295 @@
},
//#endregion
//#endregion
+ //#region 鍒嗛厤杞﹁締鍜屽徃鏈�
+ hanleCarOrDriver(form) {
+ this.carDriverForm = {
+ CarHNumber: '',
+ CarHName: '',
+ DriverHName: '',
+ DriverHIDCard: ''
+ }
+ this.openCarDriver = true
+ },
+ submitCarDriver() {
+ this.$refs.carDriverForm.validate((valid) => {
+ if (valid) {
+ axios({
+ method: 'GET',
+ url: this.baseURL + "WLYayBillController/selectDriver1",
+ params: {
+ "CarHNumber": this.carDriverForm.CarHNumber,
+ "CarHName": this.carDriverForm.CarHName,
+ "DriverHName": this.carDriverForm.DriverHName,
+ "DriverHIDCard": this.carDriverForm.DriverHIDCard,
+ "CurUserName": sessionStorage["HUserName"],
+ "HInterID": this.rowForm.HInterID
+ },
+ }).then(response => {
+ let result = response.data
+ if (result.code == 1) {
+ this.$modal.msgSuccess(result.Message || "鍒嗛厤鎴愬姛");
+ this.openCarDriver = false
+ this.handleQuery()
+ } else {
+ this.$modal.msgError(result.code + result.Message);
+ }
+ }).catch(error => {
+ console.log(error)
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ }
+ })
+ },
+ //#endregion
+ //#region 闄勪欢涓婁紶
+ handleFileUpload() {
+ this.fileUploadForm = {
+ billNo: this.rowForm.鍗曟嵁鍙�,
+ hInterID: this.rowForm.HInterID
+ }
+ this.fileList = []
+ this.uploadFiles = []
+ this.uploadedFileList = []
+ // this.getUploadedFileList()
+ this.openFileUpload = true
+ },
+ handleFileChange(file, fileList) {
+ console.log(file, fileList)
+
+ // this.uploadFiles = fileList
+ },
+ handleFileRemove(file, fileList) {
+ console.log(file, fileList)
+
+ this.uploadFiles = fileList
+ },
+ handleFileSuccess(response, file, fileList){
+ console.log(response, file, fileList)
+
+ },
+ handleFileError(response, file, fileList){
+ console.log(response, file, fileList)
+ },
+ handleFilePreview(file) {
+
+ if (file.url) {
+ window.open(file.url, '_blank')
+ } else if (file.raw) {
+ const url = URL.createObjectURL(file.raw)
+ window.open(url, '_blank')
+ } else {
+ this.$modal.msgWarning('鏃犳硶棰勮璇ユ枃浠�')
+ }
+ },
+ handleFileExceed(files, fileList) {
+ this.$modal.msgWarning(`褰撳墠闄愬埗閫夋嫨 10 涓枃浠讹紝鏈閫夋嫨浜� ${files.length} 涓枃浠讹紝鍏遍�夋嫨浜� ${files.length + fileList.length} 涓枃浠禶)
+ },
+ submitFileUpload() {
+ if (this.uploadFiles.length === 0) {
+ this.$modal.msgWarning('璇峰厛閫夋嫨瑕佷笂浼犵殑鏂囦欢')
+ return
+ }
+ console.log(this.uploadFiles)
+ this.fileUploadLoading = true
+ const formData = new FormData()
+ this.uploadFiles.forEach(file => {
+ formData.append('files', file.raw)
+ })
+
+ // formData.append('HBillNo', this.fileUploadForm.billNo)
+ formData.append('HInterID', this.fileUploadForm.hInterID)
+ formData.append('HUserName', sessionStorage["HUserName"] || '')
+ // axios.get(this.$baseUrl + '/WLYayBillController/saveFileAddress', formData, {
+ // headers: {
+ // 'Content-Type': 'multipart/form-data'
+ // },
+ // params:{
+ // HInterID:this.fileUploadForm.hInterID,
+ // HFileAddress:this.fileUploadPath + '/' + this.uploadFiles[0].name,
+ // CurUserName:sessionStorage["HUserName"]
+ // }
+ // })
+ axios('', {
+ headers: {
+ 'Content-Type': 'multipart/form-data'
+ },
+ methods: 'post',
+ data: formData
+ }).then(response => {
+ console.log(response)
+ this.fileUploadLoading = false
+ if (response.data.code == 1) {
+ this.$modal.msgSuccess(response.data.Message || '鏂囦欢涓婁紶鎴愬姛')
+ this.fileList = []
+ this.uploadFiles = []
+ this.getUploadedFileList()
+ } else {
+ this.$modal.msgError(response.data.code + response.data.Message || '涓婁紶澶辫触')
+ }
+ }).catch(error => {
+ this.fileUploadLoading = false
+ this.$modal.msgError('涓婁紶璇锋眰澶辫触')
+ console.error('涓婁紶閿欒:', error)
+ })
+ },
+ getUploadedFileList() {
+ axios.get(this.$baseUrl + '/WLYayBillController/GetFileList', {
+ params: {
+ HInterID: this.fileUploadForm.hInterID
+ }
+ }).then(response => {
+ if (response.data.code == 1) {
+ this.uploadedFileList = response.data.data || []
+ }
+ }).catch(error => {
+ console.error('鑾峰彇鏂囦欢鍒楄〃澶辫触:', error)
+ })
+ },
+ downloadFile(row) {
+ if (row.url) {
+ window.open(row.url, '_blank')
+ } else {
+ axios.get(this.$baseUrl + '/WLYayBillController/DownloadFile', {
+ params: {
+ fileId: row.id || row.fileId
+ },
+ responseType: 'blob'
+ }).then(response => {
+ const blob = new Blob([response.data])
+ const url = window.URL.createObjectURL(blob)
+ const link = document.createElement('a')
+ link.href = url
+ link.download = row.name || row.fileName
+ link.click()
+ window.URL.revokeObjectURL(url)
+ }).catch(error => {
+ this.$modal.msgError('涓嬭浇澶辫触')
+ console.error('涓嬭浇閿欒:', error)
+ })
+ }
+ },
+ deleteUploadedFile(row, index) {
+ this.$modal.confirm('纭瑕佸垹闄よ鏂囦欢鍚楋紵').then(() => {
+ axios.get(this.$baseUrl + '/WLYayBillController/DeleteFile', {
+ params: {
+ fileId: row.id || row.fileId,
+ HInterID: this.fileUploadForm.hInterID,
+ HUserName: sessionStorage["HUserName"]
+ }
+ }).then(response => {
+ if (response.data.code == 1) {
+ this.$modal.msgSuccess('鍒犻櫎鎴愬姛')
+ this.uploadedFileList.splice(index, 1)
+ } else {
+ this.$modal.msgError(response.data.Message || '鍒犻櫎澶辫触')
+ }
+ }).catch(error => {
+ this.$modal.msgError('鍒犻櫎璇锋眰澶辫触')
+ console.error('鍒犻櫎閿欒:', error)
+ })
+ }).catch(() => { })
+ },
+ //#endregion
+ //#region 闄勪欢鎵归噺涓嬭浇
+ handleBatchFileDownload() {
+ if (this.rowList.length === 0) {
+ this.$modal.msgWarning('璇峰厛閫夋嫨瑕佷笅杞介檮浠剁殑鍗曟嵁')
+ return
+ }
+ this.selectedBillCount = this.rowList.length
+ this.batchFileList = []
+ this.selectedBatchFiles = []
+ this.getBatchFileList()
+ this.openBatchDownload = true
+ },
+ getBatchFileList() {
+ this.batchDownloadLoading = true
+ const interIds = this.rowList.map(item => item.HInterID).join(',')
+ axios.get(this.$baseUrl + '/WLYayBillController/GetBatchFileList', {
+ params: {
+ HInterIDs: interIds
+ }
+ }).then(response => {
+ this.batchDownloadLoading = false
+ if (response.data.code == 1) {
+ this.batchFileList = response.data.data || []
+ } else {
+ this.$modal.msgError(response.data.Message || '鑾峰彇鏂囦欢鍒楄〃澶辫触')
+ }
+ }).catch(error => {
+ this.batchDownloadLoading = false
+ this.$modal.msgError('鑾峰彇鏂囦欢鍒楄〃澶辫触')
+ console.error('鑾峰彇鏂囦欢鍒楄〃閿欒:', error)
+ })
+ },
+ handleBatchFileSelectionChange(selection) {
+ this.selectedBatchFiles = selection
+ },
+ downloadSingleFile(row) {
+ if (row.url) {
+ window.open(row.url, '_blank')
+ } else {
+ axios.get(this.$baseUrl + '/WLYayBillController/DownloadFile', {
+ params: {
+ fileId: row.id || row.fileId
+ },
+ responseType: 'blob'
+ }).then(response => {
+ const blob = new Blob([response.data])
+ const url = window.URL.createObjectURL(blob)
+ const link = document.createElement('a')
+ link.href = url
+ link.download = row.name || row.fileName
+ link.click()
+ window.URL.revokeObjectURL(url)
+ }).catch(error => {
+ this.$modal.msgError('涓嬭浇澶辫触')
+ console.error('涓嬭浇閿欒:', error)
+ })
+ }
+ },
+ batchDownloadFiles() {
+ if (this.selectedBatchFiles.length === 0) {
+ this.$modal.msgWarning('璇峰厛閫夋嫨瑕佷笅杞界殑鏂囦欢')
+ return
+ }
+ this.downloadFiles(this.selectedBatchFiles)
+ },
+ downloadAllFiles() {
+ if (this.batchFileList.length === 0) {
+ this.$modal.msgWarning('娌℃湁鍙笅杞界殑鏂囦欢')
+ return
+ }
+ this.downloadFiles(this.batchFileList)
+ },
+ downloadFiles(fileList) {
+ this.batchDownloadLoading = true
+ const fileIds = fileList.map(item => item.id || item.fileId).join(',')
+ axios.get(this.$baseUrl + '/WLYayBillController/BatchDownloadFiles', {
+ params: {
+ fileIds: fileIds
+ },
+ responseType: 'blob'
+ }).then(response => {
+ this.batchDownloadLoading = false
+ const blob = new Blob([response.data], { type: 'application/zip' })
+ const url = window.URL.createObjectURL(blob)
+ const link = document.createElement('a')
+ link.href = url
+ const now = new Date()
+ const timestamp = `${now.getFullYear()}${(now.getMonth() + 1).toString().padStart(2, '0')}${now.getDate().toString().padStart(2, '0')}_${now.getHours().toString().padStart(2, '0')}${now.getMinutes().toString().padStart(2, '0')}${now.getSeconds().toString().padStart(2, '0')}`
+ link.download = `闄勪欢涓嬭浇_${timestamp}.zip`
+ link.click()
+ window.URL.revokeObjectURL(url)
+ this.$modal.msgSuccess('涓嬭浇鎴愬姛')
+ }).catch(error => {
+ this.batchDownloadLoading = false
+ this.$modal.msgError('鎵归噺涓嬭浇澶辫触')
+ console.error('鎵归噺涓嬭浇閿欒:', error)
+ })
+ },
+ //#endregion
//娓呴櫎閫変腑鏁版嵁鐨勭紦瀛�
clearData() {
this.ids = []
@@ -1285,7 +1759,6 @@
this.OperationType = 0
this.copyType = 0
},
-
}
};
</script>
diff --git a/src/views/purchase/cgPoInStockBill/cgPoInStockBill.vue b/src/views/purchase/cgPoInStockBill/cgPoInStockBill.vue
index c76e1b7..8bb8a14 100644
--- a/src/views/purchase/cgPoInStockBill/cgPoInStockBill.vue
+++ b/src/views/purchase/cgPoInStockBill/cgPoInStockBill.vue
@@ -168,13 +168,12 @@
@change="riqiChange"
class="ForFilteringSchemes"
>
- <span v-for="(item, index) in btList" :key="index">
- <el-option
- :label="item.field"
- :value="item.field"
- v-if="!item.hide"
- ></el-option>
- </span>
+ <el-option
+ v-for="(item, index) in comparatorList"
+ :key="index"
+ :label="item.label"
+ :value="item.value"
+ ></el-option>
</el-select>
</el-col>
<el-col :span="11">
diff --git a/src/views/scMould/basicModeling/Gy_MaterialPackingRelationList.vue b/src/views/scMould/basicModeling/Gy_MaterialPackingRelationList.vue
index d76e0d4..f9ea0f3 100644
--- a/src/views/scMould/basicModeling/Gy_MaterialPackingRelationList.vue
+++ b/src/views/scMould/basicModeling/Gy_MaterialPackingRelationList.vue
@@ -219,6 +219,7 @@
openPage: { type: String, },
propHMaterID: {},
propHOrgID: {},
+ propMarkVal: {},
},
data() {
return {
@@ -397,11 +398,15 @@
if (this.propHOrgID) {
this.sWhere += " and HOrgID like '%" + this.propHOrgID + "%'";
}
+ console.log(this.propHMaterID)
if (this.propHMaterID) {
this.sWhere += " and HMaterID like '%" + this.propHMaterID + "%'";
}
+ // if(this.propMarkVal){
+ // this.sWhere += " and 榛樿鍙戣揣瀹瑰櫒鏍囪 = 'Y'"
+ // }
if (this.openPage) {
- this.sWhere += " and HUseFlag != '0' and HSendPackFlag != '0' and ISNULL(瀹℃牳浜�,'') != ''"
+ this.sWhere += " and 浣跨敤鏍囪 = 'Y' and 鍙戣揣瀹瑰櫒鏍囪 = 'Y' and ISNULL(瀹℃牳浜�,'') != ''"
}
console.log(this.sWhere)
// 鍒楄〃
@@ -881,7 +886,7 @@
},
set_CheckBill(num) {
//閫昏緫瀹℃牳鏂规硶
- axios.get(this.$baseUrl + "/Sc_MouldinventoryBill/CheckGy_MaterialMouldBillMain", {
+ axios.get(this.$baseUrl + "/Gy_MaterialPackingRelation/AuditGy_MaterialPackingRelation", {
params: { "HInterID": this.rowForm.hmainid, "IsAudit": num, "CurUserName": sessionStorage["HUserName"] }
}).then(response => {
let result = response.data
diff --git a/src/views/scMould/basicModeling/Gy_MouldFileList.vue b/src/views/scMould/basicModeling/Gy_MouldFileList.vue
index 9833f91..a4cad85 100644
--- a/src/views/scMould/basicModeling/Gy_MouldFileList.vue
+++ b/src/views/scMould/basicModeling/Gy_MouldFileList.vue
@@ -237,6 +237,7 @@
components: { RowSettings, Edit, BtnSettings },
props: {
openPage: { type: String, },
+ multiple: { type: Boolean, default: false },
},
data() {
return {
@@ -760,17 +761,19 @@
}
},
// 澶氶�夋閫変腑鏁版嵁
- handleSelectionChange(selection) {
- // this.rowForm = {}
+ handleSelectionChange(selection) {
if (this.openPage) {
- //鍒楄〃鍗曢��
- if (selection.length > 1) {
+ if (!this.multiple && selection.length > 1) {
const del_row = selection.shift()
- this.$refs.tableData.toggleRowSelection(del_row, false) //璁剧疆杩欎竴琛屽彇娑堥�変腑
+ this.$refs.tableData.toggleRowSelection(del_row, false)
}
- this.rowForm = {}
- this.ids = selection.map(item => item.hmainid)
- this.rowForm = selection[0]
+ if (this.multiple) {
+ this.ids = selection.map(item => item.hmainid)
+ this.rowForm = selection
+ } else {
+ this.ids = selection.map(item => item.hmainid)
+ this.rowForm = selection[0]
+ }
} else {
this.ids = selection.map(item => item.hmainid)
this.single = selection.length != 1
diff --git a/src/views/scMould/warehouse/Sc_MouldInRequestBillEdit.vue b/src/views/scMould/warehouse/Sc_MouldInRequestBillEdit.vue
index f5fa7b7..eb3a114 100644
--- a/src/views/scMould/warehouse/Sc_MouldInRequestBillEdit.vue
+++ b/src/views/scMould/warehouse/Sc_MouldInRequestBillEdit.vue
@@ -19,7 +19,7 @@
</el-col>
<el-col :span="6">
<el-form-item v-show="HIsShow" label="鏃ユ湡" prop="HDate">
- <el-date-picker v-model="form.HDate" type="date" placeholder="閫夋嫨鏃ユ湡" format="yyyy-MM-dd">
+ <el-date-picker v-model="form.HDate" type="date" placeholder="閫夋嫨鏃ユ湡" format="yyyy-MM-dd HH:mm:ss">
</el-date-picker>
</el-form-item>
</el-col>
@@ -90,6 +90,16 @@
<el-input v-model="form.HKeeperName" placeholder="璇烽�夋嫨" disabled>
<el-button slot="append" icon="el-icon-search" @click="openDataDialog(4,empType=4)"></el-button>
</el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item v-show="HIsShow" label="瀛愬崟鎹被鍨�" prop="HBillSubType">
+ <el-select v-model="form.HBillSubType" placeholder="璇烽�夋嫨瀛愬崟鎹被鍨�">
+ <el-option label="鍙戣揣" value="鍙戣揣"></el-option>
+ <el-option label="瀹㈣繑" value="瀹㈣繑"></el-option>
+ <el-option label="渚涘簲鍟嗙鍊�" value="渚涘簲鍟嗙鍊�"></el-option>
+ <el-option label="渚涘簲鍟嗚繑杩�" value="渚涘簲鍟嗚繑杩�"></el-option>
+ </el-select>
</el-form-item>
</el-col>
</el-row>
@@ -184,7 +194,7 @@
size="mini">涓婄Щ</el-button>
<el-button type="success" plain icon="el-icon-arrow-down" @click="handleMoveRowDown(zbSelForm)"
size="mini">涓嬬Щ</el-button>
- <el-button type="success" plain icon="el-icon-printer" @click="get_ICInventoryMould(zbSelForm)">瀹瑰櫒搴撳瓨</el-button>
+ <el-button type="success" plain icon="el-icon-printer" @click="get_ICInvget_ContainerInstantStockentoryMould(zbSelForm)">瀹瑰櫒搴撳瓨</el-button>
<el-button type="success" plain icon="el-icon-printer" @click="get_ContainerInstantStock(zbSelForm)">瀹瑰櫒鍗虫椂搴撳瓨</el-button>
</div>
<el-table :data="editData" style="width: 100%" height="300" width="100%" ref="zbTable"
@@ -305,6 +315,7 @@
HIsShow: true,
HIsHide: false,
HModName: "Sc_MouldInRequestBill",
+ HBillSubType:'',
formShow: false,
temp: undefined,
formLoading: true,
@@ -388,6 +399,9 @@
],
HStockOrgID: [
{ required: true, message: "缁勭粐涓嶈兘涓虹┖", trigger: "blur" }
+ ],
+ HBillSubType: [
+ { required: true, message: "瀛愬崟鎹被鍨嬩笉鑳戒负绌�", trigger: "blur" }
],
HEmpName: [
{ required: true, message: "涓氬姟鍛樹笉鑳戒负绌�", trigger: "blur" }
@@ -558,6 +572,7 @@
HInterID: 0,
HDate: new Date(),
HStockOrgID:sessionStorage["OrganizationID"] - 0,
+ HBillSubType: '',
HSupTypeID:1,
HSupName:'',
HSupID:0,
@@ -643,7 +658,7 @@
//鏂板鑾峰彇鍗曟嵁鍙�
this.getHBillNo()
let date = new Date()
- this.form.HDate = moment(date).format('YYYY-MM-DD')
+ this.form.HDate = moment(date).format('YYYY-MM-DD HH:mm:ss')
if (this.OperationType == 1) {
this.handleAddSysZb()
}
@@ -764,7 +779,7 @@
if (this.copyType == 1) {
this.getHBillNo()
let date = new Date()
- this.form.HDate = moment(date).format('YYYY-MM-DD')
+ this.form.HDate = moment(date).format('YYYY-MM-DD HH:mm:ss')
} else {
this.form = {
"HBillNo": data.鍗曟嵁鍙�
@@ -787,6 +802,7 @@
, "HExplanation": data.鎽樿
, "HRemark": data.琛ㄥご澶囨敞
, "HStockOrgID": data.HStockOrgID
+ , "HBillSubType": data.瀛愬崟鎹被鍨�
, "HMaker": data.鍒跺崟浜�
, "HMakeDate": data.鍒跺崟鏃ユ湡 == null ? "" : data.鍒跺崟鏃ユ湡
diff --git a/src/views/scMould/warehouse/Sc_MouldInRequestBillList.vue b/src/views/scMould/warehouse/Sc_MouldInRequestBillList.vue
index 80f1f05..a94ea86 100644
--- a/src/views/scMould/warehouse/Sc_MouldInRequestBillList.vue
+++ b/src/views/scMould/warehouse/Sc_MouldInRequestBillList.vue
@@ -186,7 +186,7 @@
<template slot-scope="{row, column }">
<el-checkbox v-model="checked" v-if="item.type == 'checkbox'"></el-checkbox>
<div :style="item.style">
- <span v-if="column.property.includes('鏃ユ湡')">{{ parseTime(row[column.property], '{y}-{m}-{d}') }}</span>
+ <span v-if="column.property.includes('鏃ユ湡')">{{ parseTime(row[column.property], '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
<el-button type="text" @click="handleEdit(row, OperationType = 2)"
v-else-if="column.property == '鍗曟嵁鍙�'">{{
row.鍗曟嵁鍙�
@@ -340,7 +340,7 @@
created() {
// this.fetchData()
if(this.openPage && this.HOrgID){
- this.queryParams.HStockOrgID = this.HOrgID
+ this.queryParams.HStockOrgID = this.HOrgID
}
this.riqiChange()
this.getList();
@@ -889,7 +889,7 @@
const num = parseInt(value)
if (isNaN(num)) return '璇疯緭鍏ユ湁鏁堢殑鏁板瓧锛�'
if (num.toString() !== value) return '鎵樻暟涓嶈兘涓哄皬鏁帮紒'
- if (num <= 0) return '鎵樻暟蹇呴』澶т簬0锛�'
+ if (num <0) return '鎵樻暟蹇呴』澶т簬0锛�'
return true
}
}).then(({ value }) => {
diff --git a/src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillEdit.vue b/src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillEdit.vue
index 5a38797..84e8091 100644
--- a/src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillEdit.vue
+++ b/src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillEdit.vue
@@ -19,7 +19,7 @@
</el-col>
<el-col :span="6">
<el-form-item v-show="HIsShow" label="鏃ユ湡" prop="HDate">
- <el-date-picker v-model="form.HDate" type="date" placeholder="閫夋嫨鏃ユ湡" format="yyyy-MM-dd">
+ <el-date-picker v-model="form.HDate" type="date" placeholder="閫夋嫨鏃ユ湡" format="yyyy-MM-dd HH:mm:ss">
</el-date-picker>
</el-form-item>
</el-col>
@@ -31,6 +31,16 @@
</el-select>
</el-form-item>
</el-col>
+ <el-col :span="12">
+ <el-form-item label="瀛愬崟鎹被鍨�" prop="HBillSubType">
+ <el-select v-model="form.HBillSubType" placeholder="璇烽�夋嫨瀛愬崟鎹被鍨�">
+ <el-option label="鍙戣揣" value="鍙戣揣"></el-option>
+ <el-option label="瀹㈣繑" value="瀹㈣繑"></el-option>
+ <el-option label="渚涘簲鍟嗙鍊�" value="渚涘簲鍟嗙鍊�"></el-option>
+ <el-option label="渚涘簲鍟嗚繑杩�" value="渚涘簲鍟嗚繑杩�"></el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
</el-row>
<el-row>
<el-col :span="6">
@@ -440,6 +450,9 @@
HStockInOrgID: [
{ required: true, message: "璋冨叆缁勭粐涓嶈兘涓虹┖", trigger: "blur" }
],
+ HBillSubType: [
+ { required: true, message: "瀛愬崟鎹被鍨嬩笉鑳戒负绌�", trigger: "blur" }
+ ],
HStockOutOrgID: [
{ required: true, message: "璋冨嚭缁勭粐涓嶈兘涓虹┖", trigger: "blur" }
],
@@ -625,6 +638,7 @@
HInterID: 0,
HDate: new Date(),
HStockInOrgID:sessionStorage["OrganizationID"] - 0,
+ HBillSubType: '',
HSupTypeID:1,
HSupName:'',
HSupID:0,
@@ -714,7 +728,7 @@
//鏂板鑾峰彇鍗曟嵁鍙�
this.getHBillNo()
let date = new Date()
- this.form.HDate = moment(date).format('YYYY-MM-DD')
+ this.form.HDate = moment(date).format('YYYY-MM-DD HH:mm:ss')
if (this.OperationType == 1) {
this.handleAddSysZb()
}
@@ -839,7 +853,7 @@
if (this.copyType == 1) {
this.getHBillNo()
let date = new Date()
- this.form.HDate = moment(date).format('YYYY-MM-DD')
+ this.form.HDate = moment(date).format('YYYY-MM-DD HH:mm:ss')
} else {
this.form = {
"HBillNo": data.鍗曟嵁鍙�
@@ -865,6 +879,7 @@
, "HRemark": data.琛ㄥご澶囨敞
, "HStockInOrgID": data.HStockInOrgID
, "HStockOutOrgID": data.HStockOutOrgID
+ ,"HBillSubType": data.瀛愬崟鎹被鍨�
, "HMaker": data.鍒跺崟浜�
, "HMakeDate": data.鍒跺崟鏃ユ湡 == null ? "" : data.鍒跺崟鏃ユ湡
diff --git a/src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillList.vue b/src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillList.vue
index c608ef6..6c4c68e 100644
--- a/src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillList.vue
+++ b/src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillList.vue
@@ -149,7 +149,7 @@
</el-col>
<el-col :span="1.5">
<el-button type="primary" icon="el-icon-edit-outline" size="mini" :disabled="single"
- @click="set_CheckBill(2, form = rowForm)">杩斿鏍�</el-button>
+ @click="set_CheckBill(2, form = rowForm)">鍙嶅鏍�</el-button>
</el-col>
<!-- <el-col :span="1.5">
<el-button type="primary" icon="el-icon-download" size="mini" @click="handleExport">瀵煎嚭</el-button>
@@ -174,7 +174,7 @@
<template slot-scope="{row, column }">
<el-checkbox v-model="checked" v-if="item.type == 'checkbox'"></el-checkbox>
<div :style="item.style">
- <span v-if="column.property.includes('鏃ユ湡')">{{ parseTime(row[column.property], '{y}-{m}-{d}') }}</span>
+ <span v-if="column.property.includes('鏃ユ湡')">{{ parseTime(row[column.property], '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
<el-button type="text" @click="handleEdit(row, OperationType = 2)"
v-else-if="column.property == '鍗曟嵁鍙�'">{{row.鍗曟嵁鍙穧}</el-button>
<span v-else>{{ row[column.label] }}</span>
diff --git a/src/views/scMould/warehouse/Sc_MouldOutRequestBillEdit.vue b/src/views/scMould/warehouse/Sc_MouldOutRequestBillEdit.vue
index 2097786..ff7defe 100644
--- a/src/views/scMould/warehouse/Sc_MouldOutRequestBillEdit.vue
+++ b/src/views/scMould/warehouse/Sc_MouldOutRequestBillEdit.vue
@@ -19,7 +19,7 @@
</el-col>
<el-col :span="6">
<el-form-item v-show="HIsShow" label="鏃ユ湡" prop="HDate">
- <el-date-picker v-model="form.HDate" type="date" placeholder="閫夋嫨鏃ユ湡" format="yyyy-MM-dd">
+ <el-date-picker v-model="form.HDate" type="date" placeholder="閫夋嫨鏃ユ湡" format="yyyy-MM-dd HH:mm:ss">
</el-date-picker>
</el-form-item>
</el-col>
@@ -90,6 +90,16 @@
<el-input v-model="form.HKeeperName" placeholder="璇烽�夋嫨" disabled>
<el-button slot="append" icon="el-icon-search" @click="openDataDialog(4,empType=4)"></el-button>
</el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item v-show="HIsShow" label="瀛愬崟鎹被鍨�" prop="HBillSubType">
+ <el-select v-model="form.HBillSubType" placeholder="璇烽�夋嫨瀛愬崟鎹被鍨�">
+ <el-option label="鍙戣揣" value="鍙戣揣"></el-option>
+ <el-option label="瀹㈣繑" value="瀹㈣繑"></el-option>
+ <el-option label="渚涘簲鍟嗙鍊�" value="渚涘簲鍟嗙鍊�"></el-option>
+ <el-option label="渚涘簲鍟嗚繑杩�" value="渚涘簲鍟嗚繑杩�"></el-option>
+ </el-select>
</el-form-item>
</el-col>
</el-row>
@@ -285,7 +295,7 @@
<GyEmployee @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyEmployeeShow" />
<GySupplier @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gySupplierShow" />
<GyCustomer @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyCustomerShow" />
- <GyMould @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyMouldShow" />
+ <GyMould ref="gyMouldRef" @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyMouldShow" />
<GyStockPlace @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyStockPlaceShow" />
<ScICMOBillList @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="ScICMOBillShow" />
<div slot="footer" class="dialog-footer">
@@ -338,6 +348,7 @@
hSupTypeList: [{name:'渚涘簲鍟�',id:1,},{name:'瀹㈡埛',id:2},{name:'杞﹂棿閮ㄩ棬',id:3}],
HSourceBillTypes:[],
addBtnShow: false,
+ HBillSubType: '',
zbIndex: null,
zbSelForm: {},//瀛愯〃閫変腑鏁版嵁
dialogTypeNum: null,//閮ㄩ棬寮圭獥1锛屼粨搴撳脊绐�2
@@ -415,6 +426,9 @@
],
HStockOrgID: [
{ required: true, message: "缁勭粐涓嶈兘涓虹┖", trigger: "blur" }
+ ],
+ HBillSubType: [
+ { required: true, message: "瀛愬崟鎹被鍨嬩笉鑳戒负绌�", trigger: "blur" }
],
HEmpName: [
{ required: true, message: "涓氬姟鍛樹笉鑳戒负绌�", trigger: "blur" }
@@ -549,6 +563,61 @@
} else {
this.$modal.msgError("璇烽�夋嫨鏁版嵁!");
}
+
+ }else if(deptRow.length > 1 && num == 8) {
+ var rowdata = [];
+ for (let i = 0; i < deptRow.length; i++) {
+ rowdata.push({
+ "HMaterID": deptRow[i].hmainid || 0,
+ "HMaterNumber": deptRow[i].妯″叿缂栧彿 || "",
+ "HMaterName": deptRow[i].妯″叿鍚嶇О || "",
+ "HMaterModel": deptRow[i].妯″叿鍨嬪彿 || "",
+ "HUnitID": deptRow[i].HUnitID || 0,
+ "HUnitNumber": deptRow[i].璁￠噺鍗曚綅浠ｇ爜 || "",
+ "HUnitName": deptRow[i].璁￠噺鍗曚綅 || "",
+ "HQty": "1", // 榛樿鏁伴噺
+ "HWHID": this.form.HWHID || "0",
+ "HWHNumber": this.form.HWHNumber || "",
+ "HWHName": this.form.HWHName || "",
+ "HSPID": "0",
+ "HSPNumber": "",
+ "HSPName": "",
+ "KuHQty": "0", // 搴撳瓨鏁伴噺
+ "HSourceInterID": "0",
+ "HSourceEntryID": "0",
+ "HSourceBillType": "",
+ "HSourceBillNo": "",
+ "HRelationQty": "0",
+ "HRelationMoney": "0",
+ "HRemark": "",
+ "HPropertyID": "0",
+ "HSecUnitID": "0",
+ "HSecUnitRate": "0",
+ "HQtyMust": "0",
+ "HPrice": "0",
+ "HMoney": "0",
+ "HERPInterID": "0",
+ "HERPEntryID": "0",
+ "HPOOrderInterID": "0",
+ "HPOOrderEntryID": "0",
+ "HPOOrderBillNo": "",
+ "HSeOrderInterID": "0",
+ "HSeOrderEntryID": "0",
+ "HSeOrderBillNo": "",
+ "HICMOInterID": "0",
+ "HICMOEntryID": "0",
+ "HICMOBillNo": "",
+ "HSTOCKORGID": this.form.HStockOrgID,
+ "HOWNERID": this.form.HStockOrgID,
+ "HOWNERTYPEID": "",
+ "HSEQ": "0",
+ "HSTOCKSTATUSID": "0"
+ })
+ }
+ this.editData.splice(this.zbIndex, 1, ...rowdata)
+ this.ScICMOBillShow = false
+ this.openData = false
+ this.gyMouldShow = false
}else{
if (deptRow.HItemID || deptRow.hmainid) {
if (num == 1) {
@@ -637,8 +706,17 @@
this.deptform = deptRow
},
deptClickSub() {
- this.dbEmitData(this.deptform, this.dialogTypeNum)
- this.deptform = {}
+ if(this.dialogTypeNum==8){
+ const selectedData = this.$refs.gyMouldRef.rowForm;
+ if(selectedData.length>1){
+ this.dbEmitData(selectedData, this.dialogTypeNum);
+ }else{
+ this.dbEmitData(this.deptform, this.dialogTypeNum);
+ }
+ }else{
+ this.dbEmitData(this.deptform, this.dialogTypeNum);
+ }
+ this.deptform = {};
},
deptClose() {
this.deptform = {}
@@ -653,6 +731,7 @@
HDate: new Date(),
HStockOrgID:sessionStorage["OrganizationID"] - 0,
HSupTypeID:1,
+ HBillSubType: '',
HSupName:'',
HSupID:0,
HDeptName: '',
@@ -822,7 +901,7 @@
//鏂板鑾峰彇鍗曟嵁鍙�
this.getHBillNo()
let date = new Date()
- this.form.HDate = moment(date).format('YYYY-MM-DD')
+ this.form.HDate = moment(date).format('YYYY-MM-DD HH:mm:ss')
if (this.OperationType == 1) {
this.handleAddSysZb()
}
@@ -859,7 +938,7 @@
if (this.copyType == 1) {
this.getHBillNo()
let date = new Date()
- this.form.HDate = moment(date).format('YYYY-MM-DD')
+ this.form.HDate = moment(date).format('YYYY-MM-DD HH:mm:ss')
} else {
this.form = {
"HBillNo": data.鍗曟嵁鍙�
@@ -882,6 +961,7 @@
, "HExplanation": data.鎽樿
, "HRemark": data.琛ㄥご澶囨敞
, "HStockOrgID": data.HStockOrgID
+ , "HBillSubType": data.瀛愬崟鎹被鍨�
, "HMaker": data.鍒跺崟浜�
, "HMakeDate": data.鍒跺崟鏃ユ湡 == null ? "" : data.鍒跺崟鏃ユ湡
@@ -1189,6 +1269,14 @@
// 鎵撳紑鏁版嵁鍒楄〃寮圭獥
openDataDialog(num, row) {
//num1閮ㄩ棬锛�2鍑哄簱浠撳簱锛�3鐗╂枡锛�4閿�鍞憳
+ if (num == 8) {
+ if (this.$refs.gyMouldRef) {
+ this.$refs.gyMouldRef.clearSelection()
+ }
+ this.dialogTitle = '瀹瑰櫒鍒楄〃'
+ this.gyMouldShow = true
+ this.openData = true
+ }
if (row) {
this.zbIndex = row.index - 1
}
diff --git a/src/views/scMould/warehouse/Sc_MouldOutRequestBillList.vue b/src/views/scMould/warehouse/Sc_MouldOutRequestBillList.vue
index 24151ce..119e219 100644
--- a/src/views/scMould/warehouse/Sc_MouldOutRequestBillList.vue
+++ b/src/views/scMould/warehouse/Sc_MouldOutRequestBillList.vue
@@ -153,7 +153,7 @@
</el-col>
<el-col :span="1.5">
<el-button type="primary" icon="el-icon-edit-outline" size="mini" :disabled="single"
- @click="set_CheckBill(2, form = rowForm)">杩斿鏍�</el-button>
+ @click="set_CheckBill(2, form = rowForm)">鍙嶅鏍�</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="primary" icon="el-icon-edit-outline" size="mini" :disabled="multiple"
@@ -161,7 +161,7 @@
</el-col>
<el-col :span="1.5">
<el-button type="primary" icon="el-icon-edit-outline" size="mini" :disabled="multiple"
- @click="set_CheckBillAll(2, ids)">杩斿鏍�(鎵归噺)</el-button>
+ @click="set_CheckBillAll(2, ids)">鍙嶅鏍�(鎵归噺)</el-button>
</el-col>
<!-- <el-col :span="1.5">
<el-button type="primary" icon="el-icon-download" size="mini" @click="handleExport">瀵煎嚭</el-button>
@@ -186,7 +186,7 @@
<template slot-scope="{row, column }">
<el-checkbox v-model="checked" v-if="item.type == 'checkbox'"></el-checkbox>
<div :style="item.style">
- <span v-if="column.property.includes('鏃ユ湡')">{{ parseTime(row[column.property], '{y}-{m}-{d}') }}</span>
+ <span v-if="column.property.includes('鏃ユ湡')">{{ parseTime(row[column.property], '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
<el-button type="text" @click="handleEdit(row, OperationType = 2)"
v-else-if="column.property == '鍗曟嵁鍙�'">{{
row.鍗曟嵁鍙�
@@ -890,7 +890,7 @@
const num = parseInt(value)
if (isNaN(num)) return '璇疯緭鍏ユ湁鏁堢殑鏁板瓧锛�'
if (num.toString() !== value) return '鎵樻暟涓嶈兘涓哄皬鏁帮紒'
- if (num <= 0) return '鎵樻暟蹇呴』澶т簬0锛�'
+ if (num <0) return '鎵樻暟蹇呴』澶т簬0锛�'
return true
}
}).then(({ value }) => {
diff --git a/src/views/scMould/warehouse/Sc_MouldProdBackBillEdit.vue b/src/views/scMould/warehouse/Sc_MouldProdBackBillEdit.vue
index dfc7bcf..4ceb76d 100644
--- a/src/views/scMould/warehouse/Sc_MouldProdBackBillEdit.vue
+++ b/src/views/scMould/warehouse/Sc_MouldProdBackBillEdit.vue
@@ -19,7 +19,7 @@
</el-col>
<el-col :span="6">
<el-form-item v-show="HIsShow" label="鏃ユ湡" prop="HDate">
- <el-date-picker v-model="form.HDate" type="date" placeholder="閫夋嫨鏃ユ湡" format="yyyy-MM-dd">
+ <el-date-picker v-model="form.HDate" type="date" placeholder="閫夋嫨鏃ユ湡" format="yyyy-MM-dd HH:mm:ss">
</el-date-picker>
</el-form-item>
</el-col>
@@ -112,6 +112,16 @@
<el-col :span="6">
<el-form-item v-show="HIsShow" label="鍐呴儴鍗曟嵁鍙�" prop="HInnerBillNo">
<el-input v-model="form.HInnerBillNo" placeholder="璇疯緭鍏�" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item v-show="HIsShow" label="瀛愬崟鎹被鍨�" prop="HBillSubType">
+ <el-select v-model="form.HBillSubType" placeholder="璇烽�夋嫨瀛愬崟鎹被鍨�">
+ <el-option label="鍙戣揣" value="鍙戣揣"></el-option>
+ <el-option label="瀹㈣繑" value="瀹㈣繑"></el-option>
+ <el-option label="渚涘簲鍟嗙鍊�" value="渚涘簲鍟嗙鍊�"></el-option>
+ <el-option label="渚涘簲鍟嗚繑杩�" value="渚涘簲鍟嗚繑杩�"></el-option>
+ </el-select>
</el-form-item>
</el-col>
</el-row>
@@ -404,6 +414,7 @@
HModName: "Sc_MouldProdBackBillEdit",
formShow: false,
temp: undefined,
+ HBillSubType: '',
formLoading: true,
zzSelDis: false,
rowHideShow: false,
@@ -489,6 +500,9 @@
],
HStockOrgID: [
{ required: true, message: "缁勭粐涓嶈兘涓虹┖", trigger: "blur" }
+ ],
+ HBillSubType: [
+ { required: true, message: "瀛愬崟鎹被鍨嬩笉鑳戒负绌�", trigger: "blur" }
],
HSecManagerName: [
{ required: true, message: "楠屾敹鍛樹笉鑳戒负绌�", trigger: "blur" }
@@ -598,6 +612,7 @@
this.form.HDeptID = data.HDeptID
this.form.HDeptName = data.HDeptName
this.form.HStockOrgID = data.HStockOrgID == null ? 0 : data.HStockOrgID
+ this.form.HBillSubType = data.HBillSubType
this.ifOrganizationEdit = true
console.log(dataArray)
//瀛愯〃 璧嬪��
@@ -792,6 +807,7 @@
HInterID: 0,
HDate: new Date(),
HStockOrgID:sessionStorage["OrganizationID"] - 0,
+ HBillSubType:'',
HSupTypeID: 1,
HSupName:'',
HSupID:0,
@@ -879,7 +895,7 @@
//鏂板鑾峰彇鍗曟嵁鍙�
this.getHBillNo()
let date = new Date()
- this.form.HDate = moment(date).format('YYYY-MM-DD')
+ this.form.HDate = moment(date).format('YYYY-MM-DD HH:mm:ss')
if (this.OperationType == 1) {
this.handleAddSysZb()
}
@@ -994,7 +1010,7 @@
//鏂板鑾峰彇鍗曟嵁鍙�
this.getHBillNo()
let date = new Date()
- this.form.HDate = moment(date).format('YYYY-MM-DD')
+ this.form.HDate = moment(date).format('YYYY-MM-DD HH:mm:ss')
//璁剧疆婧愬崟绫诲瀷
this.form.HSourceBillType = this.HSouceBillType
@@ -1034,7 +1050,7 @@
if (this.copyType == 1) {
this.getHBillNo()
let date = new Date()
- this.form.HDate = moment(date).format('YYYY-MM-DD')
+ this.form.HDate = moment(date).format('YYYY-MM-DD HH:mm:ss')
} else {
if (data[0].HSourceInterID != "0") {
this.ifOrganizationEdit = true
@@ -1065,6 +1081,7 @@
, "HChecker": data[0].瀹℃牳浜�
, "HCloseMan": data[0].鍏抽棴浜�
, "HUpDater": data[0].淇敼浜�
+ ,"HBillSubType": data[0].瀛愬崟鎹被鍨�
, "HDeleteMan": data[0].浣滃簾浜�
, "HMakeDate": data[0].鍒跺崟鏃ユ湡 == null ? "" : data[0].鍒跺崟鏃ユ湡
, "HCheckDate": data[0].瀹℃牳鏃ユ湡 == null ? "" : data[0].瀹℃牳鏃ユ湡
@@ -1261,10 +1278,12 @@
}else if(!item.HWHID){
fhck = true
this.$modal.msgError("绗�" + (index + 1) + "琛岋細璋冨叆浠撳簱鏈�夋嫨锛�");
- }else if(!item.HUnitID){
- fhck = true
- this.$modal.msgError("绗�" + (index + 1) + "琛岋細璁￠噺鍗曚綅涓虹┖锛�");
- }else if(item.HQty == 0){
+ }
+ // else if(!item.HUnitID){
+ // fhck = true
+ // this.$modal.msgError("绗�" + (index + 1) + "琛岋細璁￠噺鍗曚綅涓虹┖锛�");
+ // }
+ else if(item.HQty == 0){
fhck = true
this.$modal.msgError("绗�" + (index + 1) + "琛岋細鏁伴噺涓嶈兘涓�0锛�");
}
diff --git a/src/views/scMould/warehouse/Sc_MouldProdBackBillList.vue b/src/views/scMould/warehouse/Sc_MouldProdBackBillList.vue
index ddd3d04..0c12431 100644
--- a/src/views/scMould/warehouse/Sc_MouldProdBackBillList.vue
+++ b/src/views/scMould/warehouse/Sc_MouldProdBackBillList.vue
@@ -174,7 +174,7 @@
<template slot-scope="{row, column }">
<el-checkbox v-model="checked" v-if="item.type == 'checkbox'"></el-checkbox>
<div :style="item.style">
- <span v-if="column.property.includes('鏃ユ湡')">{{ parseTime(row[column.property], '{y}-{m}-{d}') }}</span>
+ <span v-if="column.property.includes('鏃ユ湡')">{{ parseTime(row[column.property], '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
<el-button type="text" @click="handleEdit(row, OperationType = 2)"
v-else-if="column.property == '鍗曟嵁鍙�'">{{
row.鍗曟嵁鍙�
@@ -799,7 +799,7 @@
const num = parseInt(value)
if (isNaN(num)) return '璇疯緭鍏ユ湁鏁堢殑鏁板瓧锛�'
if (num.toString() !== value) return '鎵樻暟涓嶈兘涓哄皬鏁帮紒'
- if (num <= 0) return '鎵樻暟蹇呴』澶т簬0锛�'
+ if (num <0) return '鎵樻暟蹇呴』澶т簬0锛�'
return true
}
}).then(({ value }) => {
diff --git a/src/views/scMould/warehouse/Sc_MouldProdMoveBillEdit.vue b/src/views/scMould/warehouse/Sc_MouldProdMoveBillEdit.vue
index 52c9a9c..282f30d 100644
--- a/src/views/scMould/warehouse/Sc_MouldProdMoveBillEdit.vue
+++ b/src/views/scMould/warehouse/Sc_MouldProdMoveBillEdit.vue
@@ -19,7 +19,7 @@
</el-col>
<el-col :span="6">
<el-form-item v-show="HIsShow" label="鏃ユ湡" prop="HDate">
- <el-date-picker v-model="form.HDate" type="date" placeholder="閫夋嫨鏃ユ湡" format="yyyy-MM-dd">
+ <el-date-picker v-model="form.HDate" type="date" placeholder="閫夋嫨鏃ユ湡" format="yyyy-MM-dd HH:mm:ss">
</el-date-picker>
</el-form-item>
</el-col>
@@ -56,6 +56,14 @@
</el-select>
</el-form-item>
</el-col>
+ <el-form-item label="瀛愬崟鎹被鍨�" prop="HBillSubType">
+ <el-select v-model="form.HBillSubType" placeholder="璇烽�夋嫨瀛愬崟鎹被鍨�">
+ <el-option label="鍙戣揣" value="鍙戣揣"></el-option>
+ <el-option label="瀹㈣繑" value="瀹㈣繑"></el-option>
+ <el-option label="渚涘簲鍟嗙鍊�" value="渚涘簲鍟嗙鍊�"></el-option>
+ <el-option label="渚涘簲鍟嗚繑杩�" value="渚涘簲鍟嗚繑杩�"></el-option>
+ </el-select>
+ </el-form-item>
</el-row>
<el-row>
<el-col :span="6">
@@ -447,6 +455,7 @@
zzSelDis: false,
rowHideShow: false,
openRowHide: false,
+ HBillSubType: '',
hSupTypeList: [{name:'渚涘簲鍟�',id:1,},{name:'瀹㈡埛',id:2},{name:'杞﹂棿閮ㄩ棬',id:3}],
HSourceBillTypes:[],
addBtnShow: false,
@@ -532,6 +541,9 @@
],
HStockOutOrgID: [
{ required: true, message: "璋冨嚭缁勭粐涓嶈兘涓虹┖", trigger: "blur" }
+ ],
+ HBillSubType: [
+ { required: true, message: "瀛愬崟鎹被鍨嬩笉鑳戒负绌�", trigger: "blur" }
],
HSecManagerName: [
{ required: true, message: "楠屾敹鍛樹笉鑳戒负绌�", trigger: "blur" }
@@ -647,6 +659,7 @@
this.form.HDeptID = data.HDeptID
this.form.HDeptName = data.HDeptName
this.form.HStockOrgID = data.HStockOutOrgID
+ this.form.HBillSubType = data.HBillSubType
this.form.HStockInOrgID = data.HStockInOrgID == null ? 0 : data.HStockInOrgID
this.form.HStockOutOrgID = data.HStockOutOrgID == null ? 0 : data.HStockOutOrgID
this.ifOrganizationEdit = true
@@ -952,6 +965,7 @@
HSupName:'',
HSupID:0,
HStockOutOrgID:sessionStorage["OrganizationID"] - 0,
+ HBillSubType: '',
HDeptName: '',
HDeptID: 0,
HWHName:'',
@@ -1037,7 +1051,7 @@
//鏂板鑾峰彇鍗曟嵁鍙�
this.getHBillNo()
let date = new Date()
- this.form.HDate = moment(date).format('YYYY-MM-DD')
+ this.form.HDate = moment(date).format('YYYY-MM-DD HH:mm:ss')
if (this.OperationType == 1) {
this.handleAddSysZb()
}
@@ -1067,7 +1081,7 @@
//鏂板鑾峰彇鍗曟嵁鍙�
this.getHBillNo()
let date = new Date()
- this.form.HDate = moment(date).format('YYYY-MM-DD')
+ this.form.HDate = moment(date).format('YYYY-MM-DD HH:mm:ss')
//璁剧疆婧愬崟绫诲瀷
this.form.HSourceBillType = this.HSouceBillType
@@ -1107,7 +1121,7 @@
if (this.copyType == 1) {
this.getHBillNo()
let date = new Date()
- this.form.HDate = moment(date).format('YYYY-MM-DD')
+ this.form.HDate = moment(date).format('YYYY-MM-DD HH:mm:ss')
} else {
if (data[0].HSourceInterID != "0") {
this.ifOrganizationEdit = true
@@ -1137,6 +1151,7 @@
, "HInnerBillNo": data[0].鍐呴儴鍗曟嵁鍙�
, "HStockInOrgID": data[0].HStockInOrgID
, "HStockOutOrgID": data[0].HStockOutOrgID
+ , "HBillSubType": data[0].瀛愬崟鎹被鍨�
, "HMaker": data[0].鍒跺崟浜�
, "HChecker": data[0].瀹℃牳浜�
, "HCloseMan": data[0].鍏抽棴浜�
@@ -1341,10 +1356,12 @@
}else if(!item.HSCWHID){
fhck = true
this.$modal.msgError("绗�" + (index + 1) + "琛岋細璋冨嚭浠撳簱鏈�夋嫨锛�");
- }else if(!item.HUnitID){
- fhck = true
- this.$modal.msgError("绗�" + (index + 1) + "琛岋細璁￠噺鍗曚綅涓虹┖锛�");
- }else if(item.HQty == 0){
+ }
+ // else if(!item.HUnitID){
+ // fhck = true
+ // this.$modal.msgError("绗�" + (index + 1) + "琛岋細璁￠噺鍗曚綅涓虹┖锛�");
+ // }
+ else if(item.HQty == 0){
fhck = true
this.$modal.msgError("绗�" + (index + 1) + "琛岋細鏁伴噺涓嶈兘涓�0锛�");
}
diff --git a/src/views/scMould/warehouse/Sc_MouldProdMoveBillList.vue b/src/views/scMould/warehouse/Sc_MouldProdMoveBillList.vue
index bcbe0a1..1ec9039 100644
--- a/src/views/scMould/warehouse/Sc_MouldProdMoveBillList.vue
+++ b/src/views/scMould/warehouse/Sc_MouldProdMoveBillList.vue
@@ -123,10 +123,10 @@
</el-collapse>
</el-form>
<el-row :gutter="10" class="mb8" style="margin-top: 10px;">
- <el-col :span="1.5">
+ <!-- <el-col :span="1.5">
<el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAddEdit(OperationType = 1)"
id="btn-Add">鏂板</el-button>
- </el-col>
+ </el-col> -->
<el-col :span="1.5">
<el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single"
@click="handleEdit(row = rowForm, OperationType = 2)">缂栬緫</el-button>
@@ -145,7 +145,7 @@
</el-col>
<el-col :span="1.5">
<el-button type="primary" icon="el-icon-edit-outline" size="mini" :disabled="single"
- @click="set_CheckBill(2, form = rowForm)">杩斿鏍�</el-button>
+ @click="set_CheckBill(2, form = rowForm)">鍙嶅鏍�</el-button>
</el-col>
<!-- <el-col :span="1.5">
<el-button type="primary" icon="el-icon-download" size="mini" @click="handleExport">瀵煎嚭</el-button>
@@ -170,7 +170,7 @@
<template slot-scope="{row, column }">
<el-checkbox v-model="checked" v-if="item.type == 'checkbox'"></el-checkbox>
<div :style="item.style">
- <span v-if="column.property.includes('鏃ユ湡')">{{ parseTime(row[column.property], '{y}-{m}-{d}') }}</span>
+ <span v-if="column.property.includes('鏃ユ湡')">{{ parseTime(row[column.property], '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
<el-button type="text" @click="handleEdit(row, OperationType = 2)"
v-else-if="column.property == '鍗曟嵁鍙�'">{{
row.鍗曟嵁鍙�
diff --git a/src/views/scMould/warehouse/Sc_MouldProdOutBillEdit.vue b/src/views/scMould/warehouse/Sc_MouldProdOutBillEdit.vue
index 4ed5db1..c371703 100644
--- a/src/views/scMould/warehouse/Sc_MouldProdOutBillEdit.vue
+++ b/src/views/scMould/warehouse/Sc_MouldProdOutBillEdit.vue
@@ -19,7 +19,7 @@
</el-col>
<el-col :span="6">
<el-form-item v-show="HIsShow" label="鏃ユ湡" prop="HDate">
- <el-date-picker v-model="form.HDate" type="date" placeholder="閫夋嫨鏃ユ湡" format="yyyy-MM-dd">
+ <el-date-picker v-model="form.HDate" type="datetime" placeholder="閫夋嫨鏃ユ湡鏃堕棿" value-format="yyyy-MM-dd HH:mm:ss">
</el-date-picker>
</el-form-item>
</el-col>
@@ -112,6 +112,16 @@
<el-col :span="6">
<el-form-item v-show="HIsShow" label="鍐呴儴鍗曟嵁鍙�" prop="HInnerBillNo">
<el-input v-model="form.HInnerBillNo" placeholder="璇疯緭鍏�" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item v-show="HIsShow" label="瀛愬崟鎹被鍨�" prop="HBillSubType">
+ <el-select v-model="form.HBillSubType" placeholder="璇烽�夋嫨瀛愬崟鎹被鍨�">
+ <el-option label="鍙戣揣" value="鍙戣揣"></el-option>
+ <el-option label="瀹㈣繑" value="瀹㈣繑"></el-option>
+ <el-option label="渚涘簲鍟嗙鍊�" value="渚涘簲鍟嗙鍊�"></el-option>
+ <el-option label="渚涘簲鍟嗚繑杩�" value="渚涘簲鍟嗚繑杩�"></el-option>
+ </el-select>
</el-form-item>
</el-col>
</el-row>
@@ -409,6 +419,7 @@
formShow: false,
temp: undefined,
formLoading: true,
+ HBillSubType: '',
zzSelDis: false,
rowHideShow: false,
openRowHide: false,
@@ -493,6 +504,9 @@
],
HStockOrgID: [
{ required: true, message: "缁勭粐涓嶈兘涓虹┖", trigger: "blur" }
+ ],
+ HBillSubType: [
+ { required: true, message: "瀛愬崟鎹被鍨嬩笉鑳戒负绌�", trigger: "blur" }
],
HSecManagerName: [
{ required: true, message: "楠屾敹鍛樹笉鑳戒负绌�", trigger: "blur" }
@@ -601,6 +615,7 @@
this.form.HSecManagerName = data.HSecManagerName
this.form.HDeptID = data.HDeptID
this.form.HDeptName = data.HDeptName
+ this.form.HBillSubType = data.HBillSubType
this.form.HStockOrgID = data.HStockOrgID == null ? 0 : data.HStockOrgID
this.ifOrganizationEdit = true
//瀛愯〃 璧嬪��
@@ -796,6 +811,7 @@
HDate: new Date(),
HStockOrgID:sessionStorage["OrganizationID"] - 0,
HSupTypeID: 1,
+ HBillSubType: '',
HSupName:'',
HSupID:0,
HDeptName: '',
@@ -881,7 +897,7 @@
//鏂板鑾峰彇鍗曟嵁鍙�
this.getHBillNo()
let date = new Date()
- this.form.HDate = moment(date).format('YYYY-MM-DD')
+ this.form.HDate = moment(date).format('YYYY-MM-DD HH:mm:ss')
if (this.OperationType == 1) {
this.handleAddSysZb()
}
@@ -911,7 +927,7 @@
//鏂板鑾峰彇鍗曟嵁鍙�
this.getHBillNo()
let date = new Date()
- this.form.HDate = moment(date).format('YYYY-MM-DD')
+ this.form.HDate = moment(date).format('YYYY-MM-DD HH:mm:ss')
//璁剧疆婧愬崟绫诲瀷
this.form.HSourceBillType = this.HSouceBillType
@@ -978,6 +994,7 @@
, "HRemark": data[0].琛ㄥご澶囨敞
, "HInnerBillNo": data[0].鍐呴儴鍗曟嵁鍙�
, "HStockOrgID": data[0].HMainStockOrgID
+ , "HBillSubType": data[0].瀛愬崟鎹被鍨�
, "HMaker": data[0].鍒跺崟浜�
, "HChecker": data[0].瀹℃牳浜�
, "HCloseMan": data[0].鍏抽棴浜�
@@ -1261,10 +1278,12 @@
}else if(!item.HWHID){
fhck = true
this.$modal.msgError("绗�" + (index + 1) + "琛岋細璋冨叆浠撳簱鏈�夋嫨锛�");
- }else if(!item.HUnitID){
- fhck = true
- this.$modal.msgError("绗�" + (index + 1) + "琛岋細璁￠噺鍗曚綅涓虹┖锛�");
- }else if(item.HQty == 0){
+ }
+ // else if(!item.HUnitID){
+ // fhck = true
+ // this.$modal.msgError("绗�" + (index + 1) + "琛岋細璁￠噺鍗曚綅涓虹┖锛�");
+ // }
+ else if(item.HQty == 0){
fhck = true
this.$modal.msgError("绗�" + (index + 1) + "琛岋細鏁伴噺涓嶈兘涓�0锛�");
}
diff --git a/src/views/scMould/warehouse/Sc_MouldProdOutBillList.vue b/src/views/scMould/warehouse/Sc_MouldProdOutBillList.vue
index 9fad65a..8874e31 100644
--- a/src/views/scMould/warehouse/Sc_MouldProdOutBillList.vue
+++ b/src/views/scMould/warehouse/Sc_MouldProdOutBillList.vue
@@ -174,7 +174,7 @@
<template slot-scope="{row, column }">
<el-checkbox v-model="checked" v-if="item.type == 'checkbox'"></el-checkbox>
<div :style="item.style">
- <span v-if="column.property.includes('鏃ユ湡')">{{ parseTime(row[column.property], '{y}-{m}-{d}') }}</span>
+ <span v-if="column.property.includes('鏃ユ湡')">{{ parseTime(row[column.property], '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
<el-button type="text" @click="handleEdit(row, OperationType = 2)"
v-else-if="column.property == '鍗曟嵁鍙�'">{{
row.鍗曟嵁鍙�
@@ -831,7 +831,7 @@
const num = parseInt(value)
if (isNaN(num)) return '璇疯緭鍏ユ湁鏁堢殑鏁板瓧锛�'
if (num.toString() !== value) return '鎵樻暟涓嶈兘涓哄皬鏁帮紒'
- if (num <= 0) return '鎵樻暟蹇呴』澶т簬0锛�'
+ if (num < 0) return '鎵樻暟蹇呴』澶т簬0锛�'
return true
}
}).then(({ value }) => {
diff --git a/src/views/sell/XsSeOutStockBill.vue b/src/views/sell/XsSeOutStockBill.vue
index 82ff637..56ee72c 100644
--- a/src/views/sell/XsSeOutStockBill.vue
+++ b/src/views/sell/XsSeOutStockBill.vue
@@ -88,9 +88,8 @@
<el-col :span="6" style="padding: 0 10px">
<el-select v-model="queryParams.Comparator2" placeholder="璇烽�夋嫨" @change="riqiChange"
class="ForFilteringSchemes">
- <span v-for="(item, index) in btList" :key="index">
- <el-option :label="item.field" :value="item.field" v-if="!item.hide"></el-option>
- </span>
+ <el-option v-for="(item, index) in comparatorList" :key="index" :label="item.label"
+ :value="item.value"></el-option>
</el-select>
</el-col>
<el-col :span="11">
@@ -104,8 +103,9 @@
<el-col :span="7">
<el-select v-model="queryParams.ColName" placeholder="璇烽�夋嫨" @change="riqiChange"
class="ForFilteringSchemes">
- <el-option v-for="(item, index) in btList" :key="index" :label="item.field"
- :value="item.field"></el-option>
+ <span v-for="(item, index) in btList" :key="index">
+ <el-option :label="item.field" :value="item.field" v-if="!item.hide"></el-option>
+ </span>
</el-select>
</el-col>
<el-col :span="6" style="padding: 0 10px">
@@ -696,7 +696,7 @@
if (this.pageSize == 0) {
this.pageSize = 50;
}
- if (this.openPage && this.propsHOrgID) {
+ if (this.openPage && this.propsHOrgID && this.queryParams.HOrgID == "") {
this.queryParams.HOrgID = this.propsHOrgID
}
// this.queryParams.HOrgID = 100038
@@ -706,6 +706,9 @@
if (this.sTime && this.eTime) {
this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.sTime + "'";
this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + this.eTime + "'";
+ }
+ if (this.queryParams.HOrgID) {
+ this.sWhere += " and HOrgID = '" + this.queryParams.HOrgID + "'";
}
let Organization = this.organizationList.find(
(e) => e.ID == this.queryParams.HOrgID
@@ -990,6 +993,9 @@
this.rowForm = selection[0];
}
this.selRowList = selection
+ if (this.openPage) {
+ this.$emit('deptEmit', this.selRowList, 12)
+ }
},
//鎵撳紑渚ц竟鎼滅储寮圭獥
handleSearch() {
@@ -1070,9 +1076,8 @@
}
if (this.queryParams.HBillNo) {
- this.sWhere += " and 鍗曟嵁鍙� like '%" + this.queryParams.HNumber + "%'";
+ this.sWhere += " and 鍗曟嵁鍙� like '%" + this.queryParams.HBillNo + "%'";
}
-
if (this.queryParams.HProjectNumber) {
this.sWhere += " and 椤圭洰缂栫爜 like '%" + this.queryParams.HProjectNumber + "%'";
}
diff --git a/src/views/sell/sellOut/sellOutBill.vue b/src/views/sell/sellOut/sellOutBill.vue
index 3184a59..3e02408 100644
--- a/src/views/sell/sellOut/sellOutBill.vue
+++ b/src/views/sell/sellOut/sellOutBill.vue
@@ -242,6 +242,14 @@
>
</el-col>
<el-col :span="1.5">
+ <el-button type="primary" icon="el-icon-Pallet" size="mini" :disabled="single" @click="set_PalletChange">鎵樻暟鍙樻洿
+ </el-button>
+ </el-col>
+ <el-col :span="1.5">
+ <el-button type="primary" icon="el-icon-Pallet" size="mini" :disabled="single" @click="set_HTagCount">璐存爣绛炬暟
+ </el-button>
+ </el-col>
+ <el-col :span="1.5">
<el-button
type="primary"
icon="el-icon-document-copy"
@@ -1012,6 +1020,111 @@
}
this.getList();
},
+ set_HTagCount() {
+ if (!this.rowForm || !this.rowForm.hmainid) {
+ this.$modal.msgError('璇峰厛閫夋嫨涓�鏉¤褰曪紒')
+ return
+ }
+
+ const rowData = this.rowForm // 浣跨敤 rowForm 鑰屼笉鏄� rowList
+ const currentPallet = rowData.璐存爣绛炬暟 || 0
+
+ // 灏�"璇疯緭鍏ユ柊鎵樻暟"浣滀负杈撳叆妗嗙殑placeholder
+ this.$prompt(`褰撳墠璐存爣绛炬暟锛�${currentPallet}`, {
+ confirmButtonText: '淇濆瓨',
+ cancelButtonText: '鍙栨秷',
+ inputValue: currentPallet,
+ inputType: 'number',
+ inputValidator: (value) => {
+ if (!value) return '璇疯緭鍏ヨ创鏍囩鏁帮紒'
+ const num = parseInt(value)
+ if (isNaN(num)) return '璇疯緭鍏ユ湁鏁堢殑鏁板瓧锛�'
+ if (num.toString() !== value) return '璐存爣绛炬暟涓嶈兘涓哄皬鏁帮紒'
+ if (num < 0) return '璐存爣绛炬暟蹇呴』澶т簬0锛�'
+ return true
+ }
+ }).then(({ value }) => {
+ const newPallet = parseInt(value)
+
+ return axios.post(this.$baseUrl + '/Kf_POStockInBill/UpdateHTagCount', {
+ hmainid: rowData.hmainid,
+ newPallet: newPallet,
+ operator: sessionStorage["HUserName"]
+ })
+ }).then(response => {
+ if (response.data && response.data.count == 1) {
+ this.$modal.msgSuccess('璐存爣绛炬暟鍙樻洿鎴愬姛锛�')
+ // 1. 鍏堟竻闄ら�変腑鐘舵��
+ this.$refs.tableData.clearSelection()
+ // 2. 娓呴櫎 rowForm
+ this.rowForm = {}
+ // 3. 閲嶇疆閫変腑鐘舵�佸彉閲�
+ this.single = true
+ this.multiple = true
+ this.ids = []
+ this.getList()
+ } else {
+ this.$modal.msgError('閿欒锛�' + (response.data.Message || '淇濆瓨澶辫触'))
+ }
+ }).catch(error => {
+ if (error !== 'cancel') {
+ this.$modal.msgError('鎿嶄綔澶辫触锛�' + error.message)
+ }
+ })
+ },
+
+ set_PalletChange() {
+ if (!this.rowForm || !this.rowForm.hmainid) {
+ this.$modal.msgError('璇峰厛閫夋嫨涓�鏉¤褰曪紒')
+ return
+ }
+
+ const rowData = this.rowForm // 浣跨敤 rowForm 鑰屼笉鏄� rowList
+ const currentPallet = rowData.鎵樻暟 || 0
+
+ // 灏�"璇疯緭鍏ユ柊鎵樻暟"浣滀负杈撳叆妗嗙殑placeholder
+ this.$prompt(`褰撳墠鎵樻暟锛�${currentPallet}`, {
+ confirmButtonText: '淇濆瓨',
+ cancelButtonText: '鍙栨秷',
+ inputValue: currentPallet,
+ inputType: 'number',
+ inputValidator: (value) => {
+ if (!value) return '璇疯緭鍏ユ墭鏁帮紒'
+ const num = parseInt(value)
+ if (isNaN(num)) return '璇疯緭鍏ユ湁鏁堢殑鏁板瓧锛�'
+ if (num.toString() !== value) return '鎵樻暟涓嶈兘涓哄皬鏁帮紒'
+ if (num < 0) return '鎵樻暟蹇呴』澶т簬0锛�'
+ return true
+ }
+ }).then(({ value }) => {
+ const newPallet = parseInt(value)
+
+ return axios.post(this.$baseUrl + '/Kf_POStockInBill/UpdatePallet', {
+ hmainid: rowData.hmainid,
+ newPallet: newPallet,
+ operator: sessionStorage["HUserName"]
+ })
+ }).then(response => {
+ if (response.data && response.data.count == 1) {
+ this.$modal.msgSuccess('鎵樻暟鍙樻洿鎴愬姛锛�')
+ // 1. 鍏堟竻闄ら�変腑鐘舵��
+ this.$refs.tableData.clearSelection()
+ // 2. 娓呴櫎 rowForm
+ this.rowForm = {}
+ // 3. 閲嶇疆閫変腑鐘舵�佸彉閲�
+ this.single = true
+ this.multiple = true
+ this.ids = []
+ this.getList()
+ } else {
+ this.$modal.msgError('閿欒锛�' + (response.data.Message || '淇濆瓨澶辫触'))
+ }
+ }).catch(error => {
+ if (error !== 'cancel') {
+ this.$modal.msgError('鎿嶄綔澶辫触锛�' + error.message)
+ }
+ })
+ },
/** 閲嶇疆鎸夐挳鎿嶄綔 */
resetQuery() {
this.sWhere = "";
diff --git a/src/views/system/user/GyDriver.vue b/src/views/system/user/GyDriver.vue
index d8b9a4a..c51a9cd 100644
--- a/src/views/system/user/GyDriver.vue
+++ b/src/views/system/user/GyDriver.vue
@@ -437,9 +437,11 @@
);
if (userRes.data.data && userRes.data.data[0]) {
const userData = userRes.data.data[0];
- this.user = userData.Czymc || "admin";
+ this.user = sessionStorage["HUserName"] ;
this.Organization = userData.HUSEORGID;
- this.queryParams.HUSEORGID = userData.HUSEORGID;
+ const orgId = sessionStorage["OrganizationID"];
+ this.queryParams.HUSEORGID = orgId ? Number(orgId) : null;
+ this.$forceUpdate();
}
const orgRes = await axios.get(`${this.$baseUrl}/Web/GetOrganizations`);
@@ -460,7 +462,8 @@
async getList() {
this.tableShow = false;
this.loading = true;
- console.log("鑾峰彇鍒楄〃鏁版嵁...", this.sWhere);
+ this.sWhere=this.sWhere+"and 浣跨敤缁勭粐 ="+sessionStorage["OrganizationID"]
+ await this.set_ModCheck("GyDriver_SUPQuery")
try {
const params = {
sWhere: this.sWhere || "",
@@ -617,8 +620,27 @@
console.error("鍔犺浇鍒楅厤缃け璐�:", error);
}
},
+ async set_ModCheck(ModRightNameCheck)
+ {
+ var Permission = false;
+ const res=await axios.get(this.$baseUrl + '/LMES/getReportByModRightNameCheck', {
+ params: {
+ "ModRightNameCheck": ModRightNameCheck,
+ "user": sessionStorage["HUserName"],
+
+ },
+ }).then(result=>{
+ if (result.data.count != 1) {
+ Permission = true;
+ this.sWhere=this.sWhere+"and 鎵�灞炲叕鍙窱D ="+sessionStorage["HSupID"]
+ }
+ }).catch(error => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ },
- handleQuery() {
+ async handleQuery() {
+
this.sWhere = "";
const conditions = [];
@@ -628,9 +650,9 @@
if (this.queryParams.HName) {
conditions.push(`椹鹃┒鍛樺悕绉� like '%${this.queryParams.HName}%'`);
}
- // if (this.queryParams.HUSEORGID) {
- // conditions.push(`HUSEORGID = '${this.queryParams.HUSEORGID}'`);
- // }
+ if (this.queryParams.HUSEORGID) {
+ conditions.push(`浣跨敤缁勭粐 = '${this.queryParams.HUSEORGID}'`);
+ }
if (this.queryParams.ColName !== "0" && this.queryParams.Comparator !== "0") {
@@ -707,7 +729,7 @@
resetQuery() {
this.queryParams = {
- HUSEORGID: this.Organization,
+ HUSEORGID: sessionStorage["OrganizationID"],
HName: "",
HNumber: "",
HSyncNumber: "",
diff --git a/src/views/system/user/GyDriverEdit.vue b/src/views/system/user/GyDriverEdit.vue
index 925035d..341729c 100644
--- a/src/views/system/user/GyDriverEdit.vue
+++ b/src/views/system/user/GyDriverEdit.vue
@@ -67,18 +67,17 @@
/>
</el-form-item>
- <el-form-item label="鎵�灞炲叕鍙�" prop="HDeptID">
+ <el-form-item label="鎵�灞炴壙杩愬晢" prop="HCompID">
<div class="dept-select">
<el-input
v-model="formData.HDeptName"
- placeholder="璇烽�夋嫨鎵�灞炲叕鍙�"
+ placeholder="璇烽�夋嫨鎵�灞炴壙杩愬晢"
readonly
clearable
- :disabled="isViewMode"
/>
<el-input
type="hidden"
- v-model="formData.HDeptID"
+ v-model="formData.HCompID"
style="display: none"
/>
<el-button
@@ -87,6 +86,7 @@
@click="openDeptDialog"
:disabled="isViewMode"
style="margin-left: 10px"
+ disabled
>
</el-button>
</div>
@@ -99,7 +99,7 @@
v-model="formData.checkboxHStopflag"
:true-label="1"
:false-label="0"
- :disabled="!canEditStopFlag"
+ disabled
@change="handleStopFlagChange"
>
鏄惁绂佺敤
@@ -253,13 +253,14 @@
<!-- 閮ㄩ棬閫夋嫨寮圭獥 -->
<el-dialog
- title="dialogTitle"
+ title="鎵胯繍鍟�"
:visible.sync="openData"
width="90%"
top="5vh"
append-to-body
+ disabled
>
- <Dept @deptEmitDb="dbEmitData" @deptEmit="emitData" v-if="deptShow" />
+ <GySupplier ref="supplierRef"@deptEmitDb="dbEmitData" @deptEmit="emitData" v-if="deptShow" />
<span slot="footer" class="dialog-footer">
<el-button type="primary" @click="deptClickSub">纭� 瀹�</el-button>
@@ -272,10 +273,10 @@
<script>
import axios from "axios";
-import Dept from "@/views/component/dept";
+import GySupplier from '@/views/basic/gy/gySupplier.vue'
export default {
name: "GyDriverEdit",
- components: { Dept},
+ components: { GySupplier},
props: {
OperationType: {
type: Number,
@@ -313,14 +314,14 @@
HNumber: "",
HName: "",
HHelpCode: "",
- HDeptName: "",
- HDeptID: "0",
+ HDeptName:sessionStorage["HSupName"],
+ HCompID: sessionStorage["HSupID"],
HDepNumber: "",
HIDCard: "",
HPhone: "",
HDriverCardType: "A1",
HEmpType: "鍥哄畾",
- HStopflag: "0",
+ HStopflag: 0,
checkboxHStopflag: 0,
HRemark: "",
HUSEORGID: "",
@@ -399,14 +400,19 @@
this.openData = false;
},
deptClickSub() {
- if (this.deptform && this.deptform.HItemID) {
- this.formData.HDeptName = this.deptform.閮ㄩ棬鍚嶇О;
- this.formData.HDeptID = this.deptform.HItemID;
- this.openData = false;
- this.deptShow = false;
- } else {
- this.$modal.msgWarning("璇峰厛閫夋嫨涓�涓儴闂�");
- }
+ // 鐩存帴浠庡瓙缁勪欢鑾峰彇褰撳墠閫変腑鐨勮鏁版嵁
+ const selectedRow = this.$refs.supplierRef?.rowForm;
+ if (selectedRow && selectedRow.HItemID) {
+ // 璁剧疆琛ㄥ崟鏁版嵁
+ this.formData.HDeptName = selectedRow.渚涘簲鍟嗗悕绉� || selectedRow.HName;
+ this.formData.HCompID = selectedRow.HItemID;
+ this.openData = false;
+ this.deptShow = false;
+
+ this.$modal.msgSuccess("宸查�夋嫨鎵胯繍鍟嗭細" + this.formData.HDeptName);
+ } else {
+ this.$modal.msgWarning("璇峰厛閫夋嫨涓�涓壙杩愬晢");
+ }
},
deptDialogVisible() {
this.deptform = {};
@@ -438,6 +444,8 @@
case 1: // 鏂板
this.orgDisabled = true;
this.formData.HItemID = "0";
+ this.formData.HDeptName =sessionStorage["HSupName"];
+ this.formData.HCompID = sessionStorage["HSupID"];
break;
case 2: // 澶嶅埗
@@ -529,10 +537,10 @@
if (data.绂佺敤鏍囪瘑) {
this.formData.checkboxHStopflag = 1;
- this.formData.HStopflag = "1";
+ this.formData.HStopflag = 1;
} else {
this.formData.checkboxHStopflag = 0;
- this.formData.HStopflag = "0";
+ this.formData.HStopflag = 0;
}
},
@@ -573,7 +581,7 @@
const sMainStr = JSON.stringify(saveData);
const res = await axios.post(`${this.$baseUrl}/Gy_Driver/AddBill1`, {
oMain: `${sMainStr};${sessionStorage.getItem("HUserName")};${
- sessionStorage.getItem("OrganizationID") || 100038
+ sessionStorage.getItem("OrganizationID")
}`,
});
@@ -631,14 +639,14 @@
handleStopFlagChange(value) {
- this.formData.HStopflag = value ? "1" : "0";
+ this.formData.HStopflag = value ? 1 : 0;
},
openDeptDialog() {
this.deptShow = false;
- this.dialogTitle = "閮ㄩ棬鍒楄〃";
- this.deptShow = true;
+ this.dialogTitle = "鎵胯繍鍟嗗垪琛�";
+ this.deptShow = false;
this.openData = true;
},
diff --git a/src/views/warehouse/BarCodeReport/Kf_BarCodeOutInReport.vue b/src/views/warehouse/BarCodeReport/Kf_BarCodeOutInReport.vue
new file mode 100644
index 0000000..8d9b1d0
--- /dev/null
+++ b/src/views/warehouse/BarCodeReport/Kf_BarCodeOutInReport.vue
@@ -0,0 +1,961 @@
+<template>
+ <div style="padding: 10px;">
+ <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="78px" class="searchBox">
+ <el-form-item label="寮�濮嬫棩鏈�" style="margin-left: 100px;">
+ <el-date-picker v-model="sTime" type="date" placeholder="寮�濮嬫棩鏈�" style="width: 150px;">
+ </el-date-picker>
+ </el-form-item>
+ <el-form-item label="缁撴潫鏃ユ湡">
+ <el-date-picker v-model="eTime" type="date" placeholder="缁撴潫鏃ユ湡" style="width: 150px;">
+ </el-date-picker>
+ </el-form-item>
+ <el-form-item label="鏃ユ湡闂撮殧">
+ <el-select v-model="queryParams.HInitTimeCycle" placeholder="璇烽�夋嫨" @change="riqiChange" style="width: 150px;">
+ <el-option v-for="(item, index) in rqsgList" :key="index" :label="item.label" :value="item.value">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="鍗曟嵁鍙�" prop="HBillNo">
+ <el-input v-model="queryParams.HBillNo" placeholder="璇疯緭鍏ュ崟鎹彿" @keyup.enter.native="handleQuery" />
+ </el-form-item>
+ <el-form-item label="鍗曟嵁绫诲瀷" prop="HBillType">
+ <el-select v-model="queryParams.HBillTypeName" placeholder="璇烽�夋嫨" clearable>
+ <el-option
+ v-for="(item, index) in queryParams.HBillTypeArray"
+ :key="index"
+ :label="item.label"
+ :value="item.value"
+ />
+ </el-select>
+</el-form-item>
+ <el-form-item label-width="78px">
+ <el-button type="primary" icon="el-icon-search" @click="handleQuery"> 鎼� 绱�</el-button>
+ <el-button icon="el-icon-circle-close" @click="resetQuery">閲� 缃�</el-button>
+ <el-button type="primary" icon="el-icon-search" @click="set_ResCnz">閲嶆柊鍚屾</el-button>
+ </el-form-item>
+ <el-collapse v-model="activeSeach">
+ <el-collapse-item title="鏇村" name="1">
+ <el-card class="box-card">
+ <el-form-item label="鏉＄爜缂栧彿" prop="HBarCode">
+ <el-input v-model="queryParams.HBarCode" placeholder="璇疯緭鍏�" @keyup.enter.native="handleQuery" />
+ </el-form-item>
+ <el-form-item label="鐗╂枡浠ｇ爜" prop="MaterialCode">
+ <el-input v-model="queryParams.MaterialCode" placeholder="璇疯緭鍏�" @keyup.enter.native="handleQuery" />
+ </el-form-item>
+ <el-form-item label="鐗╂枡鍚嶇О" prop="MaterialName">
+ <el-input v-model="queryParams.MaterialName" placeholder="璇疯緭鍏�" @keyup.enter.native="handleQuery" />
+ </el-form-item>
+ <el-form-item label="瑙勬牸鍨嬪彿" prop="SpecificationModel">
+ <el-input v-model="queryParams.SpecificationModel" placeholder="璇疯緭鍏�" @keyup.enter.native="handleQuery" />
+ </el-form-item>
+ <el-form-item label="婧愬崟鍗曞彿" prop="HSourceBillNo">
+ <el-input v-model="queryParams.HSourceBillNo" placeholder="璇疯緭鍏�" @keyup.enter.native="handleQuery" />
+ </el-form-item>
+ <el-form-item label="浠撳簱" prop="Warehouse">
+ <el-input v-model="queryParams.Warehouse" placeholder="璇疯緭鍏�" @keyup.enter.native="handleQuery" />
+ </el-form-item>
+ <el-form-item label="浠撲綅" prop="StockPlace">
+ <el-input v-model="queryParams.StockPlace" placeholder="璇疯緭鍏�" @keyup.enter.native="handleQuery" />
+ </el-form-item>
+ <el-form-item label="鎵瑰彿" prop="HBatchNo">
+ <el-input v-model="queryParams.HBatchNo" placeholder="璇疯緭鍏�" @keyup.enter.native="handleQuery" />
+ </el-form-item>
+ <el-form-item label="鍒跺崟浜�" prop="Hmaker">
+ <el-input v-model="queryParams.Hmaker" placeholder="璇疯緭鍏�" @keyup.enter.native="handleQuery" />
+ </el-form-item>
+ <div slot="header" class="clearfix"><span>杩囨护</span></div>
+ <div>
+ <el-row>
+ <el-form-item label-width="0">
+ <el-row>
+ <el-col :span="7">
+ <el-select v-model="queryParams.ColName1" placeholder="璇烽�夋嫨" @change="riqiChange">
+ <span v-for="(item, index) in btList" :key="index">
+ <el-option :label="item.field" :value="item.field" v-if="!item.hide"></el-option>
+ </span>
+ </el-select>
+ </el-col>
+ <el-col :span="6" style="padding: 0 10px;">
+ <el-select v-model="queryParams.Comparator1" placeholder="璇烽�夋嫨" @change="riqiChange">
+ <el-option v-for="(item, index) in comparatorList" :key="index" :label="item.label"
+ :value="item.value"></el-option>
+ </el-select>
+ </el-col>
+ <el-col :span="11">
+ <el-input v-model="queryParams.ColContent1" placeholder="璇疯緭鍏�" clearable
+ @keyup.enter.native="handleQuery" />
+ </el-col>
+ </el-row>
+ </el-form-item>
+ </el-row>
+ <el-row>
+ <el-form-item label-width="0">
+ <el-row>
+ <el-col :span="7">
+ <el-select v-model="queryParams.ColName2" placeholder="璇烽�夋嫨" @change="riqiChange">
+ <span v-for="(item, index) in btList" :key="index">
+ <el-option :label="item.field" :value="item.field" v-if="!item.hide"></el-option>
+ </span>
+ </el-select>
+ </el-col>
+ <el-col :span="6" style="padding: 0 10px;">
+ <el-select v-model="queryParams.Comparator2" placeholder="璇烽�夋嫨" @change="riqiChange">
+ <el-option v-for="(item, index) in comparatorList" :key="index" :label="item.label"
+ :value="item.value"></el-option>
+ </el-select>
+ </el-col>
+ <el-col :span="11">
+ <el-input v-model="queryParams.ColContent2" placeholder="璇疯緭鍏�" clearable
+ @keyup.enter.native="handleQuery" />
+ </el-col>
+ </el-row>
+ </el-form-item>
+ </el-row>
+ <el-form-item label-width="0">
+ <el-row>
+ <el-col :span="7">
+ <el-select v-model="queryParams.ColName" placeholder="璇烽�夋嫨" @change="riqiChange">
+ <el-option v-for="(item, index) in btList" :key="index" :label="item.field"
+ :value="item.field"></el-option>
+ </el-select>
+ </el-col>
+ <el-col :span="6" style="padding: 0 10px;">
+ <el-select v-model="queryParams.Comparator" placeholder="璇烽�夋嫨" @change="riqiChange">
+ <el-option v-for="(item, index) in comparatorList" :key="index" :label="item.label"
+ :value="item.value"></el-option>
+ </el-select>
+ </el-col>
+ <el-col :span="11">
+ <el-input v-model="queryParams.ColContent" placeholder="璇疯緭鍏�" clearable
+ @keyup.enter.native="handleQuery" />
+ </el-col>
+ </el-row>
+ </el-form-item>
+ </div>
+ </el-card>
+ </el-collapse-item>
+ </el-collapse>
+ </el-form>
+ <el-row :gutter="10" class="mb8" style="margin-top: 10px;">
+ <!-- <el-col :span="1.5">
+ <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAddEdit(OperationType = 1)"
+ id="btn-Add">鏂板</el-button>
+ </el-col>
+ <el-col :span="1.5">
+ <el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single"
+ @click="handleEdit(row = rowForm, OperationType = 3)">缂栬緫</el-button>
+ </el-col> -->
+ <!-- <el-col :span="1.5">
+ <el-button type="primary" icon="el-icon-document-copy" size="mini" :disabled="single"
+ @click="handleEdit(row = rowForm, OperationType = 1, copyType = 1)">澶嶅埗</el-button>
+ </el-col> -->
+ <!-- <el-col :span="1.5">
+ <el-button type="primary" icon="el-icon-delete" size="mini" :disabled="single" @click="handleDelete">鍒犻櫎
+ </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(1, form = rowForm)">瀹℃牳</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(2, form = rowForm)">杩斿鏍�</el-button>
+ </el-col>
+ <el-col :span="1.5">
+ <el-button type="primary" icon="el-icon-delete" size="mini" :disabled="single" @click="set_CloseBill(0)">鍏抽棴
+ </el-button>
+ </el-col>
+ <el-col :span="1.5">
+ <el-button type="primary" icon="el-icon-delete" size="mini" :disabled="single" @click="set_CloseBill(1)">鍙嶅叧闂�
+ </el-button>
+ </el-col>
+ <el-col :span="1.5">
+ <el-button type="primary" icon="el-icon-delete" size="mini" :disabled="single" @click="set_DropBill(1)">浣滃簾
+ </el-button>
+ </el-col>
+ <el-col :span="1.5">
+ <el-button type="primary" icon="el-icon-delete" size="mini" :disabled="single" @click="set_DropBill(2)">鍙嶄綔搴�
+ </el-button>
+ </el-col> -->
+ <!-- <el-col :span="1.5">
+ <el-button type="primary" icon="el-icon-download" size="mini" @click="handleExport">瀵煎嚭</el-button>
+ </el-col> -->
+ <el-col :span="1.5">
+ <el-button type="primary" icon="el-icon-date" size="mini" @click="handleRowHide">闅愯棌鍒楄缃�</el-button>
+ </el-col>
+ <!-- <el-col :span="1.5">
+ <el-button type="primary" icon="el-icon-printer" size="mini" @click="get_PrintReport">鎵撳嵃</el-button>
+ </el-col> -->
+ </el-row>
+ <div class="tableBox" v-loading="loading">
+ <el-table :data="tableData" ref="tableData" max-height="710" :summary-method="getSummaries"
+ @selection-change="handleSelectionChange" show-summary border @row-click="handleRowClick" :row-style="rowStyle"
+ @cell-dblclick="handleDblclick" v-if="tableShow">
+ <template v-for="(item, index) in btList">
+ <el-table-column type="selection" width="55" align="center" :fixed="item.fixed" v-if="item.type == 'checkbox'"
+ :key="index" />
+ <el-table-column :align="item.align" :prop="item.field" :label="item.title" :width="item.width" :key="item.id"
+ v-else-if="!item.hide && item.type != 'checkbox'" :sortable="item.sort" show-overflow-tooltip
+ :fixed="item.fixed">
+ <template slot-scope="{row, column }">
+ <el-checkbox v-model="checked" v-if="item.type == 'checkbox'"></el-checkbox>
+ <div :style="item.style">
+ <span v-if="column.property.includes('鏃ユ湡')">{{ parseTime(row[column.property], '{y}-{m}-{d}') }}</span>
+ <el-button type="text" @click.stop="handleEdit(row, OperationType = 3)"
+ v-else-if="column.property == '鍗曟嵁鍙�'">{{
+ row.鍗曟嵁鍙�
+ }}</el-button>
+ <span v-else>{{ row[column.label] }}</span>
+ </div>
+ </template>
+ </el-table-column>
+ </template>
+ </el-table>
+ <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="HModName" @rowEditClose="rowSetClose" v-if="rowHideShow" />
+ </el-dialog>
+ <!-- 缂栬緫 -->
+ <el-dialog title="缂栬緫璋冩嫧鐢宠鍗�" :visible.sync="openEdit" width="1480px" append-to-body class="xsckdBox" @close="close">
+ <edit :OperationType=OperationType :linterid=this.rowForm.hmainid :HSouceBillType=this.rowForm.HSourceBillType
+ :copyType="copyType" @editClose="editClose" v-if="editShow" />
+ </el-dialog>
+ <el-dialog title="鎵撳嵃妯℃澘閫夋嫨" :visible.sync="openPrintList" width="800px" append-to-body>
+ <PrintList :linterid=this.rowForm.hmainid :MyMsg=this.rowForm.hmainid :Type='HModName' :HModName='HModName'
+ @rowEditClose="rowSetClose" v-if="printListShow" />
+ <!-- <div>111</div> -->
+ </el-dialog>
+ </div>
+ </div>
+</template>
+
+<script>
+import axios from 'axios'
+import RowSettings from '@/views/component/rowSettings'
+import Edit from '@/views/warehouse/transfer/Kf_MoveStockRequestBillEdit.vue'
+import PrintList from '@/views/component/printList'
+import moment from 'moment';
+
+
+export default {
+ name: 'Kf_MoveStockRequestBillList',
+ components: { RowSettings, Edit, PrintList },
+ data() {
+ return {
+ HModName: "Kf_MoveStockRequestBillList",
+ activeSeach: '',
+ editShow: false,
+ openEdit: false,
+ totalNameList: [],
+ tableShow: true,
+ openPrintList: false,
+ printListShow: false,
+ openBtnHide: false,
+ btnHideShow: false,
+ rowHideShow: false,
+ openRowHide: false,
+ copyType: 0,
+ comparatorList: [
+ { label: '=', value: '=' },
+ { label: '>=', value: '>=' },
+ { label: '>', value: '>' },
+ { label: '<=', value: '<=' },
+ { label: '<', value: '<' },
+ { label: '<>', value: '<>' },
+ { label: '鍖呭惈', value: '7' },
+ { label: '宸﹀寘鍚�', value: '8' },
+ { label: '鍙冲寘鍚�', value: '9' },
+ { label: '涓嶅寘鍚�', value: '10' },
+ ],
+ sWhere: '',
+ sTime: '',
+ eTime: '',
+ rqsgList: [
+ { label: '浠婂ぉ', value: 0 },
+ { label: '杩戜袱澶�', value: 1 },
+ { label: '杩戜笁澶�', value: 2 },
+ { label: '杩戝洓澶�', value: 3 },
+ { label: '杩戜簲澶�', value: 4 },
+ { label: '杩戝叚澶�', value: 5 },
+ { label: '杩戜竷澶�', value: 6 },
+ { label: '杩�30澶�', value: 29 },
+ { label: '杩戝崐骞�', value: 180 },
+ { label: '杩戜竴骞�', value: 365 },
+ ],
+ organizationList: JSON.parse(sessionStorage.getItem('organizationList')),//缁勭粐鍒楄〃
+ addBtnShow: false,
+ dialogTitle: '',
+ OperationType: null,//淇濆瓨绫诲瀷锛堟柊澧�1淇敼3锛�
+ HInterID: null,
+ baseURL: process.env.VUE_APP_BASE_API,
+ lastSelectedRowIndex: null, // 鐢ㄤ簬璁板綍涓婃鐐瑰嚮鐨勮绱㈠紩
+ lastSelectedRow: null, // 涓婁竴娆￠�変腑鐨勮
+ selectedRow: null, // 褰撳墠閫変腑鐨勮
+ rowForm: {},
+ // 寮瑰嚭灞傛爣棰�
+ title: "",
+ // 鏄惁鏄剧ず寮瑰嚭灞�
+ open: false,
+ // 鏌ヨ鍙傛暟
+ queryParams: {
+ HBillTypeName:'鍏ㄩ儴',
+ HBillTypeArray:[],
+ HBarCode: '',
+ HBatchNo: '',
+ StockPlace: '',
+ HBillNo: '',
+ HBillno2: '',
+ HInitTimeCycle: 29,
+ HDeptID: '',
+ MaterialCode: '',
+ MaterialName: '',
+ SpecificationModel: '',
+ HSourceBillNo: '',
+ Warehouse: '',
+ Hmaker: '',
+ ColName1: '',
+ ColName2: '',
+ ColName: '',
+ Comparator1: '',
+ Comparator2: '',
+ Comparator: '',
+ ColContent1: '',
+ ColContent2: '',
+ ColContent: '',
+ },
+ // 閫変腑鏁扮粍
+ ids: [],
+ // 闈炲崟涓鐢�
+ single: true,
+ // 闈炲涓鐢�
+ multiple: true,
+ // 閬僵灞�
+ loading: true,
+ tyResList: [],//鍒楄〃锛堟帴鍙ｆ暟鎹級
+ btList: [],//琛ㄥご鍒楄〃鏄剧ず
+ btResList: [],
+ tableData: [],//鍒楄〃(鍒嗛〉鏄剧ず)
+ dataList: [],
+ titleData: [],//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ pageSizes: [50, 100, 500, 5000, 50000],
+ page: 1,
+ pageSize: 0,
+ total: 0,
+ };
+ },
+ created() {
+ this.initHBillType();
+ this.riqiChange()
+ this.getList();
+
+ },
+
+ methods: {
+ //閲嶆柊鍚屾
+ set_ResCnz() {
+ axios.get(this.$baseUrl + "/Cg_POOrderBill/Resynchronize", {
+ params: { "HBillNo": '', "HBillType": 1243 }
+ }).then(response => {
+ let result = response.data
+ if (result.count == 1) {
+ this.$modal.msgSuccess('鎿嶄綔鎴愬姛');
+ this.getList();
+ }
+ else {
+ this.$modal.msgError("閿欒:" + result.code + result.Message,);
+ }
+ }).catch(error => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ },
+ getSummaries(param) {
+ const { columns, data } = param;
+ const sums = [];
+ columns.forEach((column, index) => {
+ if (index === 0) {
+ sums[index] = '鍚堣';
+ return;
+ }
+ const values = data.map(item => Number(item[column.property]));
+ if (this.totalNameList[index].totalRow) {
+ if (!values.every(value => isNaN(value))) {
+ sums[index] = values.reduce((prev, curr) => {
+ const value = Number(curr);
+ if (!isNaN(value)) {
+ return prev + curr;
+ } else {
+ return prev;
+ }
+ }, 0)
+
+ } else {
+ sums[index] = '';
+ }
+ }
+ }, 1000);
+ return sums;
+ },
+
+ handleBtnHide() {
+ this.btnHideShow = true
+ this.openBtnHide = true
+ },
+ handleRowHide() {
+ this.rowHideShow = true
+ this.openRowHide = true
+ },
+ rowSetClose(val) {
+ this.rowHideShow = false
+ this.tableShow = true
+ this.openRowHide = val
+ this.getList()
+ },
+ riqiChange() {
+ const end = new Date();
+ const start = new Date();
+ start.setTime(start.getTime() - 3600 * 1000 * 24 * this.queryParams.HInitTimeCycle);
+ const yyyyS = start.getFullYear();
+ const mmS = String(start.getMonth() + 1).padStart(2, '0'); // 鏈堜唤鏄粠0寮�濮嬬殑
+ const ddS = String(start.getDate()).padStart(2, '0');
+ const yyyyE = end.getFullYear();
+ const mmE = String(end.getMonth() + 1).padStart(2, '0'); // 鏈堜唤鏄粠0寮�濮嬬殑
+ const ddE = String(end.getDate()).padStart(2, '0');
+ this.sTime = yyyyS + '-' + mmS + '-' + ddS
+ this.eTime = yyyyE + '-' + mmE + '-' + ddE
+ },
+ initHBillType() {
+ axios.get(this.$baseUrl + '/WEBSController/GetBarCodeReport_BillType_Json')
+ .then(response => {
+ const data = response.data.data || []
+ this.queryParams.HBillTypeArray = data.map(item => ({
+ label: item.HBillTypeName,
+ value: item.HBillTypeName,
+ hide: false
+ }))
+ })
+ .catch(error => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!")
+ })
+},
+ getList() {
+ this.pageSize = 50
+ this.tableShow = false
+ this.loading = true
+ console.log("绫诲瀷鍚�",this.queryParams.HBillTypeName)
+ let HBillType = this.queryParams.HBillTypeName ? this.queryParams.HBillTypeName : ''
+ let HBillNo = this.queryParams.HBillNo ? this.queryParams.HBillNo : ''
+ let HBarCode = this.queryParams.HBarCode ? this.queryParams.HBarCode : ''
+ let HMater = this.queryParams.MaterialName ? this.queryParams.MaterialName : ''
+ let HBatchNo = this.queryParams.HBatchNo ? this.queryParams.HBatchNo : ''
+ let HWHName = this.queryParams.Warehouse ? this.queryParams.Warehouse : ''
+ let HSPName = this.queryParams.StockPlace ? this.queryParams.StockPlace : ''
+ let HSourceBillNo = this.queryParams.HSourceBillNo ? this.queryParams.HSourceBillNo : ''
+ let HMaker = this.queryParams.Hmaker ? this.queryParams.Hmaker : ''
+ let HStockOrgName = sessionStorage["Organization"] ? sessionStorage["Organization"] : ''
+
+
+ let HBeginDate= this.sTime
+ let HEndDate= this.eTime
+ this.sWhere = "'" + HBeginDate + "','" + HEndDate + "','" + HBillType + "','" + HBillNo + "','" + HBarCode + "','" + HMater + "','" + HBatchNo + "','" + HWHName + "','" + HSPName + "','" + HSourceBillNo + "','" + HMaker + "','" + HStockOrgName + "'";
+ console.log("sWhere",this.sWhere)
+
+ if (this.pageSize == 0) {
+ this.pageSize = 50
+ }
+ axios.get(this.$baseUrl + '/WEBSController/GetKf_BarCodeOutInReport_Json', {
+ params: {
+ "sWhere": this.sWhere,
+ },
+ }).then(response => {
+ this.tyResList = response.data.data//鎬绘暟鎹�
+ let data1 = response.data
+ let option = []
+ if (data1.count == 1) {
+ this.btResList = data1.list//閿�鍞嚭搴撳崟鎺ュ彛琛ㄥご鏁版嵁
+ this.total = data1.count;
+ var data = [];//鍒楀瓧娈垫暟鎹�
+ var col = [];
+ var totalArray = ["浠舵暟"];
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in data1.list) {//寰簭閬嶅巻鏁扮粍
+ data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });//浠庢瘡涓璞′腑鎻愬彇鏁版嵁
+ //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+ var patrn = new RegExp(/^h/i);
+ if (patrn.test(data1.list[key].ColmCols)) {
+ this.titleData[key] = data1.list[key].ColmCols;
+ }
+ }
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
+ for (var i = 0; i < data.length; i++) {//閬嶅巻data鏁扮粍閲嶇殑鏁版嵁
+ if (this.titleData.indexOf(data[i].name) > -1) {//妫�鏌ata銆恑銆�.name鏄惁鍦ㄦ暟缁勪腑 //璁＄畻鍒�
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+ } else if (totalArray.indexOf(data[i].name) > -1 || (data[i].Type == "Decimal" || data[i].Type == "Int32")) { //璁＄畻鍒�
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
+ }
+ else {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+ }
+
+ }
+ option.cols = [col]
+ option.data = data1.data
+ this.dataList = option
+ this.DisPlay_HideColumn(this.HModName, sessionStorage["HUserName"], option, this.dataList);
+ }
+ }).catch(error => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ },
+ DisPlay_HideColumn(HModName, user, option, dataOption) {
+ this.totalNameList = []
+ axios.get(this.$baseUrl + '/Xt_grdAlignment_WMES/grdAlignmentWMESList', {
+ params: {
+ "HModName": HModName,
+ "user": user,
+ },
+ }).then(res => {
+ let data1 = res.data
+ if (data1.data.length != 0) {
+ var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+ var newCols = [[]];//瀵瑰簲鏁版嵁搴撳垪椤哄簭col
+ newCols[0].push(option.cols[0][0]);//鏀惧叆绗竴涓猚heckbox
+ dataCol = data1.data[0].HGridString.split(',');
+ //鍒楄缃垪鏁颁笌椤甸潰鍒楁暟鏄惁涓�鑷�
+ if (dataCol.length == option.cols[0].length - 1) {
+ //閬嶅巻瀵绘壘鍒楄缃搴斿垪鎸夐『搴忔彃鍏�
+ for (var j = 0; j < option.cols[0].length - 1; j++) {
+ for (var i = 0; i < option.cols[0].length - 1; i++) {
+ var dataCols = dataCol[j].split('|');
+ //閫夋嫨涓巇atacols鐩稿簲鍒楄繘琛屼慨鏀�
+ if (option.cols[0][i + 1]["field"] == dataCols[5]) {
+ //闅愯棌鍒�
+ if (dataCols[1] == 1) {
+ option.cols[0][i + 1]["hide"] = true;
+ }
+ //璁剧疆鍒楀
+ if (dataCols[3] > 0) {
+ option.cols[0][i + 1]["width"] = dataCols[3];
+ }
+ //璁剧疆鍐呭瀛椾綋澶у皬
+ if (data1.data[0].HFontSize != 0) {
+ option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+ } else {
+ option.cols[0][i + 1]["style"] = "font-size:100%";
+ }
+ //鏄剧ず鍒�
+ if (dataCols[1] == 0 && this.titleData.indexOf(option.cols[0][i + 1]["title"]) == -1) {
+ option.cols[0][i + 1]["hide"] = false;
+ }
+ //缁熻鍒�
+ if (dataCols[6] == 1) {
+ option.cols[0][i + 1]["totalRow"] = true;
+ } else {
+ option.cols[0][i + 1]["totalRow"] = false;
+ }
+ //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+ switch (dataCols[2]) {
+ case "L":
+ option.cols[0][i + 1]["align"] = "left";
+ break;
+ case "M":
+ option.cols[0][i + 1]["align"] = "center";
+ break;
+ case "R":
+ option.cols[0][i + 1]["align"] = "right";
+ break;
+ }
+ //璁剧疆琛ㄦ牸title灞炴�ф樉绀哄埆鍚�
+ if (dataCols[4] != null && dataCols[4] != "") {
+ option.cols[0][i + 1]["title"] = dataCols[4];
+ }
+ newCols[0].push(option.cols[0][i + 1]);
+ break;
+ }
+ }
+ }
+ //閬嶅巻寰幆鍚庡垽鏂搴斿垪鏁版槸鍚︿竴鑷�
+ if (dataCol.length == newCols[0].length - 1) {
+ option.cols = newCols;
+ //鍙栨秷鍐荤粨鍒�
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ if (option.cols[0][i + 1]["fixed"] != null) {
+ option.cols[0][i + 1]["fixed"] = null;
+ }
+ else {
+ break;
+ }
+ }
+ //鍐荤粨鍒�
+ if (data1.data[0].HFixCols != 0) {
+ for (var i = 0; i < data1.data[0].HFixCols; i++) {
+ if (dataOption.cols[0].indexOf(option.cols[0][i + 1]["title"]) != -1) {
+ data1.data[0].HFixCols += 1;
+ }
+
+ option.cols[0][i + 1]["fixed"] = "left";
+ }
+ }
+ //璁剧疆鍒楁帓搴�
+ for (var i = 1; i < option.cols[0].length; i++) {
+ if (data1.data[0].HSortFlag == "鏄�") {
+ option.cols[0][i]["sort"] = true;
+ }
+ else {
+ option.cols[0][i]["sort"] = false;
+ }
+ }
+ }
+ }
+ this.btList = option.cols[0]
+ this.btList.map(item => {
+ if (!item.hide) {
+ this.totalNameList.push(item)
+ }
+ })
+ 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
+ } else {
+ this.btList = dataOption.cols[0]
+ this.btList.map(item => {
+ if (!item.hide) {
+ this.totalNameList.push(item)
+ }
+ })
+ this.tableData = dataOption.data
+ this.tableShow = true
+ this.loading = false
+ }
+ }).catch(error => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ },
+ renderHeader(h, { column, $index }) {// 鏂板缓涓�涓� span
+ let span = document.createElement(span)// 璁剧疆琛ㄥご鍚嶇О
+ span.innerText = column.label
+ //涓存椂鎻掑叆 document
+ document.body.appendChild(span)// 閲嶇偣:鑾峰彇 span 鏈�灏忓搴︼紝璁剧疆褰撳墠鍒楋紝娉ㄦ剰杩欓噷鍔犱簡 20锛屽瓧娈佃緝澶氭椂column.minWidth=span.getBoundingClientRect().width + 50.//绉婚櫎 document 涓复鏃剁殑 span
+ document.body.removeChild(span)
+ return h(span, column.label)
+ },
+ //鐐瑰嚮琛�
+ handleRowClick(row, column, event) {
+ this.lastSelectedRow = this.selectedRow; // 璁板綍涓婁竴娆￠�変腑鐨勮
+ this.selectedRow = row; // 璁板綍褰撳墠閫変腑鐨勮
+ this.lastSelectedRowIndex = this.tableData.indexOf(row);
+ this.$refs.tableData.toggleRowSelection(row);
+ },
+ //閫変腑琛岄珮浜牱寮�
+ rowStyle({ row, rowIndex }) {
+ if (this.ids.includes(row.hmainid)) {
+ return { "background": "#ecf5ff" }
+ }
+ },
+ //鍙屽嚮琛�
+ handleDblclick(row, column, cell, event) {
+ this.OperationType = 3
+ this.handleEdit()
+ },
+ // 澶氶�夋閫変腑鏁版嵁
+ handleSelectionChange(selection) {
+ // this.rowForm = {}
+ this.ids = selection.map(item => item.hmainid)
+ this.single = selection.length != 1
+ this.multiple = !selection.length
+ if (!this.single) {
+ this.rowForm = selection[0]
+ }
+ },
+ /** 鎼滅储鎸夐挳鎿嶄綔 */
+ handleQuery() {
+ this.sWhere = ''
+ if (this.queryParams.ColName && this.queryParams.Comparator) {
+ var com = "";
+ switch (this.queryParams.Comparator) {
+ case "7":
+ com = "like'%" + this.queryParams.ColContent + "%'";
+ break;
+ case "8":
+ com = "like'%" + this.queryParams.ColContent + "'";
+ break;
+ case "9":
+ com = "like'" + this.queryParams.ColContent + "%'";
+ break;
+ case "10":
+ com = "not like'%" + this.queryParams.ColContent + "%'";
+ break;
+ default:
+ com = "" + this.queryParams.Comparator + "'" + this.queryParams.ColContent + "'";
+ break;
+ }
+ this.sWhere += " and " + this.queryParams.ColName + " " + com;
+ }
+ if (this.queryParams.ColName1 && this.queryParams.Comparator1) {
+ var com1 = "";
+ switch (this.queryParams.Comparator1) {
+ case "7":
+ com1 = "like'%" + this.queryParams.ColContent1 + "%'";
+ break;
+ case "8":
+ com1 = "like'%" + this.queryParams.ColContent1 + "'";
+ break;
+ case "9":
+ com1 = "like'" + this.queryParams.ColContent1 + "%'";
+ break;
+ case "10":
+ com1 = "not like'%" + this.queryParams.ColContent1 + "%'";
+ break;
+ default:
+ com1 = "" + this.queryParams.Comparator1 + "'" + this.queryParams.ColContent1 + "'";
+ break;
+ }
+ this.sWhere += " and " + this.queryParams.ColName1 + " " + com1;
+ }
+ if (this.queryParams.ColName2 && this.queryParams.Comparator2) {
+ var com2 = "";
+ switch (this.queryParams.Comparator2) {
+ case "7":
+ com2 = "like'%" + this.queryParams.ColContent2 + "%'";
+ break;
+ case "8":
+ com2 = "like'%" + this.queryParams.ColContent2 + "'";
+ break;
+ case "9":
+ com2 = "like'" + this.queryParams.ColContent2 + "%'";
+ break;
+ case "10":
+ com2 = "not like'%" + this.queryParams.ColContent2 + "%'";
+ break;
+ default:
+ com2 = "" + this.queryParams.Comparator + "'" + this.queryParams.ColContent + "'";
+ break;
+ }
+ this.sWhere += " and " + this.queryParams.ColName2 + " " + com2;
+ }
+ if (this.sTime) {
+ this.sTime = moment(this.sTime).format('YYYY-MM-DD')
+ this.eTime = moment(this.eTime).format('YYYY-MM-DD')
+ console.log(this.sTime, this.eTime)
+ this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.sTime + "'" + " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + this.eTime + "'";
+ }
+ if (this.queryParams.HBillNo) {
+ this.sWhere += " and 鍗曟嵁鍙� like '%" + this.queryParams.HBillNo + "%'";
+ }
+ if (this.queryParams.HDeptID) {
+ this.sWhere += " and 閮ㄩ棬 like '%" + this.queryParams.HDeptID + "%'";
+ }
+ if (this.queryParams.MaterialCode) {
+ this.sWhere += " and 鐗╂枡浠ｇ爜 like '%" + this.queryParams.MaterialCode + "%'";
+ }
+ if (this.queryParams.MaterialName) {
+ this.sWhere += " and 鐗╂枡鍚嶇О like '%" + this.queryParams.MaterialName + "%'";
+ }
+ if (this.queryParams.SpecificationModel) {
+ this.sWhere += " and 瑙勬牸鍨嬪彿 like '%" + this.queryParams.SpecificationModel + "%'";
+ }
+ if (this.queryParams.HSourceBillNo) {
+ this.sWhere += " and 婧愬崟鍗曞彿 like '%" + this.queryParams.HSourceBillNo + "%'";
+ }
+ if (this.queryParams.Warehouse) {
+ this.sWhere += " and 浠撳簱鍚嶇О like '%" + this.queryParams.Warehouse + "%'";
+ }
+ if (this.queryParams.Hmaker) {
+ this.sWhere += " and 鍒跺崟浜� like '%" + this.queryParams.Hmaker + "%'";
+ }
+ this.clearData()
+ this.getList()
+ },
+ /** 閲嶇疆鎸夐挳鎿嶄綔 */
+ resetQuery() {
+ this.sWhere = ''
+ this.queryParams = {
+ HBillNo: '',
+ HInitTimeCycle: 29,
+ HDeptID: '',
+ MaterialCode: '',
+ MaterialName: '',
+ SpecificationModel: '',
+ HSourceBillNo: '',
+ Warehouse: '',
+ Hmaker: '',
+ ColName1: '',
+ ColName2: '',
+ ColName: '',
+ Comparator1: '',
+ Comparator2: '',
+ Comparator: '',
+ ColContent1: '',
+ ColContent2: '',
+ ColContent: '',
+ }
+ this.riqiChange()
+ this.clearData()
+ this.resetForm("queryForm")
+ this.getList()
+ },
+ clearData() {
+ this.single = true
+ this.multiple = true
+ this.OperationType = 0
+ this.copyType = 0
+ this.ids = []
+ },
+ //閫�鍑�
+ close() {
+ // this.reset()
+ this.tableShow = true
+ this.openEdit = false
+ this.editShow = false
+ this.clearData()
+ this.getList()
+ },
+ //鎵撳紑鏂板缁勪欢寮圭獥
+ handleAddEdit() {
+ this.rowForm.hmainid = 0
+ this.editShow = true
+ this.openEdit = true
+ },
+ //鎵撳紑淇敼缁勪欢寮圭獥
+ handleEdit(row) {
+ this.rowForm = row
+ this.editShow = true
+ this.openEdit = true
+ },
+ //鍏抽棴缂栬緫椤甸潰
+ editClose(val) {
+ this.open = val
+ this.editShow = false
+ this.openEdit = val
+ this.clearData()
+ this.getList()
+ },
+ /** 鍒犻櫎鎸夐挳鎿嶄綔 */
+ handleDelete() {
+ this.$modal.confirm('纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠').then(() => {
+ if (this.rowForm.鐘舵�� == "鍒涘缓") {
+ axios.get(this.$baseUrl + "/Kf_MoveStockRequestBill/DeltetKf_MoveStockRequestBill", {
+ params: { 'HInterID': this.rowForm.hmainid.toString() }
+ }).then(response => {
+ if (response.data.count == 1) {
+ this.getList()
+ this.$modal.msgSuccess("鍒犻櫎鎴愬姛")
+ } else {
+ this.$modal.msgError("閿欒:" + result.code + result.Message);
+ }
+ }).catch(error => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ } else {
+ this.$modal.msgError("姝ゆ暟鎹笉鏄垱寤虹姸鎬�,涓嶈兘鍒犻櫎锛�");
+ }
+ }).catch(() => { })
+
+
+ },
+ // 鍙嶅鏍�/瀹℃牳鏁版嵁
+ set_CheckBill(num, form) {
+ var InterID = form.hmainid || form.HInterID
+ //閫昏緫瀹℃牳鏂规硶
+ axios.get(this.$baseUrl + "/Kf_MoveStockRequestBill/AuditKf_MoveStockRequestBill", {
+ params: { "HInterID": InterID, "Type": num, "user": sessionStorage["HUserName"] }
+ }).then(response => {
+ let result = response.data
+ if (result.count == 1) {
+ this.$modal.msgSuccess('鎿嶄綔鎴愬姛');
+ this.getList();
+ }
+ else {
+ this.$modal.msgError("閿欒:" + result.code + result.Message,);
+ }
+ this.clearData()
+ }).catch(error => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ },
+ set_CloseBill(num) {
+ //閫昏緫鍏抽棴鏂规硶
+ axios.get(this.$baseUrl + "/Kf_MoveStockRequestBill/CloseKf_MoveStockRequestBill", {
+ params: { "HInterID": this.rowForm.hmainid, "Type": num, "user": sessionStorage["HUserName"] }
+ }).then(response => {
+ let result = response.data
+ if (result.code == 1) {
+ this.$modal.msgSuccess(result.Message);
+ this.getList();
+ }
+ else {
+ this.$modal.msgError("閿欒:" + result.code + result.Message,);
+ }
+ this.clearData()
+ }).catch(error => {
+ console.log(error)
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ },
+ set_DropBill(num) {
+ //閫昏緫浣滃簾鏂规硶
+ axios.get(this.$baseUrl + "/Kf_MoveStockRequestBill/DropKf_MoveStockRequestBill", {
+ params: { "HInterID": this.rowForm.hmainid.toString(), "Type": num, "user": sessionStorage["HUserName"] }
+ }).then(response => {
+ let result = response.data
+ if (result.count == 1) {
+ this.$modal.msgSuccess(result.Message);
+ this.getList();
+ }
+ else {
+ this.$modal.msgError("閿欒:" + result.code + result.Message,);
+ }
+ this.clearData()
+ }).catch(error => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ },
+ //瀵煎嚭
+ handleExport() {
+ const ws = this.$XLSX.utils.json_to_sheet(this.tyResList); // 灏嗘暟鎹浆鎹负宸ヤ綔琛�
+ const wb = this.$XLSX.utils.book_new(); // 鍒涘缓涓�涓柊鐨勫伐浣滅翱
+ this.$XLSX.utils.book_append_sheet(wb, ws, "Sheet1"); // 灏嗗伐浣滆〃娣诲姞鍒板伐浣滅翱涓紝骞跺懡鍚嶄负"Sheet1"
+ this.$XLSX.writeFile(wb, `sellOutBill_${new Date().getTime()}.xlsx`); // 瀵煎嚭鏂囦欢
+ },
+ //鎵撳嵃
+ get_PrintReport() {
+ if (this.ids.length != 1) {
+ this.$modal.msgError("璇烽�夋嫨涓�琛屾暟鎹�")
+ } else if (this.rowForm.鐘舵�� != "宸插鏍�" && !this.defaintOperationByCompanyName()) {
+ this.$modal.msgError("鎵撳嵃澶辫触!鍘熷洜锛氬崟鎹姸鎬佷笉涓�'宸插鏍�'鐘舵��!!");
+ } else {
+ this.printListShow = true;
+ this.openPrintList = true;
+ }
+ // var content= ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + data[0].hmainid.toString() + '&MyMsg=' + data[0].hmainid.toString() + '&Type=Kf_SellOutBillList', 'yes']
+ },
+
+ //#region 鑾峰彇鍏徃鍚嶏紝鏍规嵁鍏徃杩涜瀹氬埗鍖栧紑鍙�
+ defaintOperationByCompanyName() {
+ var result = false;
+ axios.get(this.$baseUrl + '/Xt_getInfo/getCompanyName').then(response => {
+ var data1 = response.data
+ if (data1.count == 1) {
+ if (data1.data == "姘村姟") {
+ result = true;
+ }
+ }
+ }).catch(error => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ return result;
+ },
+ }
+};
+</script>
+<style>
+.xsckdBox .el-date-editor.el-input {
+ width: 100%;
+}
+</style>
diff --git a/src/views/warehouse/BarCodeReport/Kf_ICInventory_BarCode.vue b/src/views/warehouse/BarCodeReport/Kf_ICInventory_BarCode.vue
new file mode 100644
index 0000000..e3404bc
--- /dev/null
+++ b/src/views/warehouse/BarCodeReport/Kf_ICInventory_BarCode.vue
@@ -0,0 +1,924 @@
+<template>
+ <div style="padding: 10px;">
+ <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="78px" class="searchBox">
+
+ <el-form-item label="鏉＄爜缂栧彿" prop="HBarCode" style="margin-left: 100px;">
+ <el-input v-model="queryParams.HBarCode" placeholder="璇疯緭鍏�" @keyup.enter.native="handleQuery" />
+ </el-form-item>
+ <el-form-item label="鐗╂枡鍚嶇О" prop="MaterialName">
+ <el-input v-model="queryParams.MaterialName" placeholder="璇疯緭鍏�" @keyup.enter.native="handleQuery" />
+ </el-form-item>
+ <el-form-item label="鎵瑰彿" prop="HBatchNo">
+ <el-input v-model="queryParams.HBatchNo" placeholder="璇疯緭鍏�" @keyup.enter.native="handleQuery" />
+ </el-form-item>
+ <el-form-item label="杈呭姪灞炴��" prop="HAuxProp">
+ <el-input v-model="queryParams.HAuxProp" placeholder="璇疯緭鍏�" @keyup.enter.native="handleQuery" />
+ </el-form-item>
+ <el-form-item label-width="78px">
+ <el-button type="primary" icon="el-icon-search" @click="handleQuery"> 鎼� 绱�</el-button>
+ <el-button icon="el-icon-circle-close" @click="resetQuery">閲� 缃�</el-button>
+ <el-button type="primary" icon="el-icon-search" @click="set_ResCnz">閲嶆柊鍚屾</el-button>
+ </el-form-item>
+ <el-collapse v-model="activeSeach">
+ <el-collapse-item title="鏇村" name="1">
+ <el-card class="box-card">
+
+ <!-- <el-form-item label="鐗╂枡浠ｇ爜" prop="MaterialCode">
+ <el-input v-model="queryParams.MaterialCode" placeholder="璇疯緭鍏�" @keyup.enter.native="handleQuery" />
+ </el-form-item> -->
+
+ <el-form-item label="瑙勬牸鍨嬪彿" prop="SpecificationModel">
+ <el-input v-model="queryParams.SpecificationModel" placeholder="璇疯緭鍏�" @keyup.enter.native="handleQuery" />
+ </el-form-item>
+ <el-form-item label="婧愬崟鍗曞彿" prop="HSourceBillNo">
+ <el-input v-model="queryParams.HSourceBillNo" placeholder="璇疯緭鍏�" @keyup.enter.native="handleQuery" />
+ </el-form-item>
+ <el-form-item label="浠撳簱" prop="Warehouse">
+ <el-input v-model="queryParams.Warehouse" placeholder="璇疯緭鍏�" @keyup.enter.native="handleQuery" />
+ </el-form-item>
+ <el-form-item label="浠撲綅" prop="StockPlace">
+ <el-input v-model="queryParams.StockPlace" placeholder="璇疯緭鍏�" @keyup.enter.native="handleQuery" />
+ </el-form-item>
+
+ <el-form-item label="鍒跺崟浜�" prop="Hmaker">
+ <el-input v-model="queryParams.Hmaker" placeholder="璇疯緭鍏�" @keyup.enter.native="handleQuery" />
+ </el-form-item>
+ <div slot="header" class="clearfix"><span>杩囨护</span></div>
+ <div>
+ <el-row>
+ <el-form-item label-width="0">
+ <el-row>
+ <el-col :span="7">
+ <el-select v-model="queryParams.ColName1" placeholder="璇烽�夋嫨" @change="riqiChange">
+ <span v-for="(item, index) in btList" :key="index">
+ <el-option :label="item.field" :value="item.field" v-if="!item.hide"></el-option>
+ </span>
+ </el-select>
+ </el-col>
+ <el-col :span="6" style="padding: 0 10px;">
+ <el-select v-model="queryParams.Comparator1" placeholder="璇烽�夋嫨" @change="riqiChange">
+ <el-option v-for="(item, index) in comparatorList" :key="index" :label="item.label"
+ :value="item.value"></el-option>
+ </el-select>
+ </el-col>
+ <el-col :span="11">
+ <el-input v-model="queryParams.ColContent1" placeholder="璇疯緭鍏�" clearable
+ @keyup.enter.native="handleQuery" />
+ </el-col>
+ </el-row>
+ </el-form-item>
+ </el-row>
+ <el-row>
+ <el-form-item label-width="0">
+ <el-row>
+ <el-col :span="7">
+ <el-select v-model="queryParams.ColName2" placeholder="璇烽�夋嫨" @change="riqiChange">
+ <span v-for="(item, index) in btList" :key="index">
+ <el-option :label="item.field" :value="item.field" v-if="!item.hide"></el-option>
+ </span>
+ </el-select>
+ </el-col>
+ <el-col :span="6" style="padding: 0 10px;">
+ <el-select v-model="queryParams.Comparator2" placeholder="璇烽�夋嫨" @change="riqiChange">
+ <el-option v-for="(item, index) in comparatorList" :key="index" :label="item.label"
+ :value="item.value"></el-option>
+ </el-select>
+ </el-col>
+ <el-col :span="11">
+ <el-input v-model="queryParams.ColContent2" placeholder="璇疯緭鍏�" clearable
+ @keyup.enter.native="handleQuery" />
+ </el-col>
+ </el-row>
+ </el-form-item>
+ </el-row>
+ <el-form-item label-width="0">
+ <el-row>
+ <el-col :span="7">
+ <el-select v-model="queryParams.ColName" placeholder="璇烽�夋嫨" @change="riqiChange">
+ <el-option v-for="(item, index) in btList" :key="index" :label="item.field"
+ :value="item.field"></el-option>
+ </el-select>
+ </el-col>
+ <el-col :span="6" style="padding: 0 10px;">
+ <el-select v-model="queryParams.Comparator" placeholder="璇烽�夋嫨" @change="riqiChange">
+ <el-option v-for="(item, index) in comparatorList" :key="index" :label="item.label"
+ :value="item.value"></el-option>
+ </el-select>
+ </el-col>
+ <el-col :span="11">
+ <el-input v-model="queryParams.ColContent" placeholder="璇疯緭鍏�" clearable
+ @keyup.enter.native="handleQuery" />
+ </el-col>
+ </el-row>
+ </el-form-item>
+ </div>
+ </el-card>
+ </el-collapse-item>
+ </el-collapse>
+ </el-form>
+ <el-row :gutter="10" class="mb8" style="margin-top: 10px;">
+ <!-- <el-col :span="1.5">
+ <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAddEdit(OperationType = 1)"
+ id="btn-Add">鏂板</el-button>
+ </el-col>
+ <el-col :span="1.5">
+ <el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single"
+ @click="handleEdit(row = rowForm, OperationType = 3)">缂栬緫</el-button>
+ </el-col> -->
+ <!-- <el-col :span="1.5">
+ <el-button type="primary" icon="el-icon-document-copy" size="mini" :disabled="single"
+ @click="handleEdit(row = rowForm, OperationType = 1, copyType = 1)">澶嶅埗</el-button>
+ </el-col> -->
+ <!-- <el-col :span="1.5">
+ <el-button type="primary" icon="el-icon-delete" size="mini" :disabled="single" @click="handleDelete">鍒犻櫎
+ </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(1, form = rowForm)">瀹℃牳</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(2, form = rowForm)">杩斿鏍�</el-button>
+ </el-col>
+ <el-col :span="1.5">
+ <el-button type="primary" icon="el-icon-delete" size="mini" :disabled="single" @click="set_CloseBill(0)">鍏抽棴
+ </el-button>
+ </el-col>
+ <el-col :span="1.5">
+ <el-button type="primary" icon="el-icon-delete" size="mini" :disabled="single" @click="set_CloseBill(1)">鍙嶅叧闂�
+ </el-button>
+ </el-col>
+ <el-col :span="1.5">
+ <el-button type="primary" icon="el-icon-delete" size="mini" :disabled="single" @click="set_DropBill(1)">浣滃簾
+ </el-button>
+ </el-col>
+ <el-col :span="1.5">
+ <el-button type="primary" icon="el-icon-delete" size="mini" :disabled="single" @click="set_DropBill(2)">鍙嶄綔搴�
+ </el-button>
+ </el-col> -->
+ <!-- <el-col :span="1.5">
+ <el-button type="primary" icon="el-icon-download" size="mini" @click="handleExport">瀵煎嚭</el-button>
+ </el-col> -->
+ <el-col :span="1.5">
+ <el-button type="primary" icon="el-icon-date" size="mini" @click="handleRowHide">闅愯棌鍒楄缃�</el-button>
+ </el-col>
+ <!-- <el-col :span="1.5">
+ <el-button type="primary" icon="el-icon-printer" size="mini" @click="get_PrintReport">鎵撳嵃</el-button>
+ </el-col> -->
+ </el-row>
+ <div class="tableBox" v-loading="loading">
+ <el-table :data="tableData" ref="tableData" max-height="710" :summary-method="getSummaries"
+ @selection-change="handleSelectionChange" show-summary border @row-click="handleRowClick" :row-style="rowStyle"
+ @cell-dblclick="handleDblclick" v-if="tableShow">
+ <template v-for="(item, index) in btList">
+ <el-table-column type="selection" width="55" align="center" :fixed="item.fixed" v-if="item.type == 'checkbox'"
+ :key="index" />
+ <el-table-column :align="item.align" :prop="item.field" :label="item.title" :width="item.width" :key="item.id"
+ v-else-if="!item.hide && item.type != 'checkbox'" :sortable="item.sort" show-overflow-tooltip
+ :fixed="item.fixed">
+ <template slot-scope="{row, column }">
+ <el-checkbox v-model="checked" v-if="item.type == 'checkbox'"></el-checkbox>
+ <div :style="item.style">
+ <span v-if="column.property.includes('鏃ユ湡')">{{ parseTime(row[column.property], '{y}-{m}-{d}') }}</span>
+ <el-button type="text" @click.stop="handleEdit(row, OperationType = 3)"
+ v-else-if="column.property == '鍗曟嵁鍙�'">{{
+ row.鍗曟嵁鍙�
+ }}</el-button>
+ <span v-else>{{ row[column.label] }}</span>
+ </div>
+ </template>
+ </el-table-column>
+ </template>
+ </el-table>
+ <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="HModName" @rowEditClose="rowSetClose" v-if="rowHideShow" />
+ </el-dialog>
+ <!-- 缂栬緫 -->
+ <el-dialog title="缂栬緫璋冩嫧鐢宠鍗�" :visible.sync="openEdit" width="1480px" append-to-body class="xsckdBox" @close="close">
+ <edit :OperationType=OperationType :linterid=this.rowForm.hmainid :HSouceBillType=this.rowForm.HSourceBillType
+ :copyType="copyType" @editClose="editClose" v-if="editShow" />
+ </el-dialog>
+ <el-dialog title="鎵撳嵃妯℃澘閫夋嫨" :visible.sync="openPrintList" width="800px" append-to-body>
+ <PrintList :linterid=this.rowForm.hmainid :MyMsg=this.rowForm.hmainid :Type='HModName' :HModName='HModName'
+ @rowEditClose="rowSetClose" v-if="printListShow" />
+ <!-- <div>111</div> -->
+ </el-dialog>
+ </div>
+ </div>
+</template>
+
+<script>
+import axios from 'axios'
+import RowSettings from '@/views/component/rowSettings'
+import Edit from '@/views/warehouse/transfer/Kf_MoveStockRequestBillEdit.vue'
+import PrintList from '@/views/component/printList'
+import moment from 'moment';
+
+
+export default {
+ name: 'Kf_MoveStockRequestBillList',
+ components: { RowSettings, Edit, PrintList },
+ data() {
+ return {
+ HModName: "Kf_MoveStockRequestBillList",
+ activeSeach: '',
+ editShow: false,
+ openEdit: false,
+ totalNameList: [],
+ tableShow: true,
+ openPrintList: false,
+ printListShow: false,
+ openBtnHide: false,
+ btnHideShow: false,
+ rowHideShow: false,
+ openRowHide: false,
+ copyType: 0,
+ comparatorList: [
+ { label: '=', value: '=' },
+ { label: '>=', value: '>=' },
+ { label: '>', value: '>' },
+ { label: '<=', value: '<=' },
+ { label: '<', value: '<' },
+ { label: '<>', value: '<>' },
+ { label: '鍖呭惈', value: '7' },
+ { label: '宸﹀寘鍚�', value: '8' },
+ { label: '鍙冲寘鍚�', value: '9' },
+ { label: '涓嶅寘鍚�', value: '10' },
+ ],
+ sWhere: '',
+ sTime: '',
+ eTime: '',
+ rqsgList: [
+ { label: '浠婂ぉ', value: 0 },
+ { label: '杩戜袱澶�', value: 1 },
+ { label: '杩戜笁澶�', value: 2 },
+ { label: '杩戝洓澶�', value: 3 },
+ { label: '杩戜簲澶�', value: 4 },
+ { label: '杩戝叚澶�', value: 5 },
+ { label: '杩戜竷澶�', value: 6 },
+ { label: '杩�30澶�', value: 29 },
+ { label: '杩戝崐骞�', value: 180 },
+ { label: '杩戜竴骞�', value: 365 },
+ ],
+ organizationList: JSON.parse(sessionStorage.getItem('organizationList')),//缁勭粐鍒楄〃
+ addBtnShow: false,
+ dialogTitle: '',
+ OperationType: null,//淇濆瓨绫诲瀷锛堟柊澧�1淇敼3锛�
+ HInterID: null,
+ baseURL: process.env.VUE_APP_BASE_API,
+ lastSelectedRowIndex: null, // 鐢ㄤ簬璁板綍涓婃鐐瑰嚮鐨勮绱㈠紩
+ lastSelectedRow: null, // 涓婁竴娆￠�変腑鐨勮
+ selectedRow: null, // 褰撳墠閫変腑鐨勮
+ rowForm: {},
+ // 寮瑰嚭灞傛爣棰�
+ title: "",
+ // 鏄惁鏄剧ず寮瑰嚭灞�
+ open: false,
+ // 鏌ヨ鍙傛暟
+ queryParams: {
+ HBarCode: '',
+ HBatchNo: '',
+ StockPlace: '',
+ HAuxProp:'',
+ HInitTimeCycle: 29,
+ HDeptID: '',
+ MaterialCode: '',
+ MaterialName: '',
+ SpecificationModel: '',
+ HSourceBillNo: '',
+ Warehouse: '',
+ Hmaker: '',
+ ColName1: '',
+ ColName2: '',
+ ColName: '',
+ Comparator1: '',
+ Comparator2: '',
+ Comparator: '',
+ ColContent1: '',
+ ColContent2: '',
+ ColContent: '',
+ },
+ // 閫変腑鏁扮粍
+ ids: [],
+ // 闈炲崟涓鐢�
+ single: true,
+ // 闈炲涓鐢�
+ multiple: true,
+ // 閬僵灞�
+ loading: true,
+ tyResList: [],//鍒楄〃锛堟帴鍙ｆ暟鎹級
+ btList: [],//琛ㄥご鍒楄〃鏄剧ず
+ btResList: [],
+ tableData: [],//鍒楄〃(鍒嗛〉鏄剧ず)
+ dataList: [],
+ titleData: [],//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ pageSizes: [50, 100, 500, 5000, 50000],
+ page: 1,
+ pageSize: 0,
+ total: 0,
+ };
+ },
+ created() {
+
+ this.riqiChange()
+ this.getList();
+
+ },
+
+ methods: {
+ //閲嶆柊鍚屾
+ set_ResCnz() {
+ axios.get(this.$baseUrl + "/Cg_POOrderBill/Resynchronize", {
+ params: { "HBillNo": '', "HBillType": 1243 }
+ }).then(response => {
+ let result = response.data
+ if (result.count == 1) {
+ this.$modal.msgSuccess('鎿嶄綔鎴愬姛');
+ this.getList();
+ }
+ else {
+ this.$modal.msgError("閿欒:" + result.code + result.Message,);
+ }
+ }).catch(error => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ },
+ getSummaries(param) {
+ const { columns, data } = param;
+ const sums = [];
+ columns.forEach((column, index) => {
+ if (index === 0) {
+ sums[index] = '鍚堣';
+ return;
+ }
+ const values = data.map(item => Number(item[column.property]));
+ if (this.totalNameList[index].totalRow) {
+ if (!values.every(value => isNaN(value))) {
+ sums[index] = values.reduce((prev, curr) => {
+ const value = Number(curr);
+ if (!isNaN(value)) {
+ return prev + curr;
+ } else {
+ return prev;
+ }
+ }, 0)
+
+ } else {
+ sums[index] = '';
+ }
+ }
+ }, 1000);
+ return sums;
+ },
+
+ handleBtnHide() {
+ this.btnHideShow = true
+ this.openBtnHide = true
+ },
+ handleRowHide() {
+ this.rowHideShow = true
+ this.openRowHide = true
+ },
+ rowSetClose(val) {
+ this.rowHideShow = false
+ this.tableShow = true
+ this.openRowHide = val
+ this.getList()
+ },
+ riqiChange() {
+ const end = new Date();
+ const start = new Date();
+ start.setTime(start.getTime() - 3600 * 1000 * 24 * this.queryParams.HInitTimeCycle);
+ const yyyyS = start.getFullYear();
+ const mmS = String(start.getMonth() + 1).padStart(2, '0'); // 鏈堜唤鏄粠0寮�濮嬬殑
+ const ddS = String(start.getDate()).padStart(2, '0');
+ const yyyyE = end.getFullYear();
+ const mmE = String(end.getMonth() + 1).padStart(2, '0'); // 鏈堜唤鏄粠0寮�濮嬬殑
+ const ddE = String(end.getDate()).padStart(2, '0');
+ this.sTime = yyyyS + '-' + mmS + '-' + ddS
+ this.eTime = yyyyE + '-' + mmE + '-' + ddE
+ },
+
+ getList() {
+ this.pageSize = 50
+ this.tableShow = false
+ this.loading = true
+
+
+
+ let HBarCode = this.queryParams.HBarCode ? this.queryParams.HBarCode : ''
+ let HAuxProp = this.queryParams.HAuxProp ? this.queryParams.HAuxProp : ''
+ let HMater = this.queryParams.MaterialName ? this.queryParams.MaterialName : ''
+ let HBatchNo = this.queryParams.HBatchNo ? this.queryParams.HBatchNo : ''
+ let HWHName = this.queryParams.Warehouse ? this.queryParams.Warehouse : ''
+ let HSPName = this.queryParams.StockPlace ? this.queryParams.StockPlace : ''
+ let HSourceBillNo = this.queryParams.HSourceBillNo ? this.queryParams.HSourceBillNo : ''
+ let HMaker = this.queryParams.Hmaker ? this.queryParams.Hmaker : ''
+ let HStockOrgName = sessionStorage["Organization"] ? sessionStorage["Organization"] : ''
+
+
+ this.sWhere = "'" + HBarCode + "','" + HMater + "','" + HAuxProp + "','" + HBatchNo + "','" + HWHName + "','" + HSPName + "','" + HStockOrgName + "'";
+ console.log("sWhere",this.sWhere)
+
+ if (this.pageSize == 0) {
+ this.pageSize = 50
+ }
+ axios.get(this.$baseUrl + '/WEBSController/GetKf_BarCodeICInventoryReport_Json', {
+ params: {
+ "sWhere": this.sWhere,
+ },
+ }).then(response => {
+ this.tyResList = response.data.data//鎬绘暟鎹�
+ let data1 = response.data
+ let option = []
+ if (data1.count == 1) {
+ this.btResList = data1.list//閿�鍞嚭搴撳崟鎺ュ彛琛ㄥご鏁版嵁
+ this.total = data1.count;
+ var data = [];//鍒楀瓧娈垫暟鎹�
+ var col = [];
+ var totalArray = ["浠舵暟"];
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in data1.list) {//寰簭閬嶅巻鏁扮粍
+ data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });//浠庢瘡涓璞′腑鎻愬彇鏁版嵁
+ //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+ var patrn = new RegExp(/^h/i);
+ if (patrn.test(data1.list[key].ColmCols)) {
+ this.titleData[key] = data1.list[key].ColmCols;
+ }
+ }
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
+ for (var i = 0; i < data.length; i++) {//閬嶅巻data鏁扮粍閲嶇殑鏁版嵁
+ if (this.titleData.indexOf(data[i].name) > -1) {//妫�鏌ata銆恑銆�.name鏄惁鍦ㄦ暟缁勪腑 //璁＄畻鍒�
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+ } else if (totalArray.indexOf(data[i].name) > -1 || (data[i].Type == "Decimal" || data[i].Type == "Int32")) { //璁＄畻鍒�
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
+ }
+ else {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+ }
+
+ }
+ option.cols = [col]
+ option.data = data1.data
+ this.dataList = option
+ this.DisPlay_HideColumn(this.HModName, sessionStorage["HUserName"], option, this.dataList);
+ }
+ }).catch(error => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ },
+ DisPlay_HideColumn(HModName, user, option, dataOption) {
+ this.totalNameList = []
+ axios.get(this.$baseUrl + '/Xt_grdAlignment_WMES/grdAlignmentWMESList', {
+ params: {
+ "HModName": HModName,
+ "user": user,
+ },
+ }).then(res => {
+ let data1 = res.data
+ if (data1.data.length != 0) {
+ var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+ var newCols = [[]];//瀵瑰簲鏁版嵁搴撳垪椤哄簭col
+ newCols[0].push(option.cols[0][0]);//鏀惧叆绗竴涓猚heckbox
+ dataCol = data1.data[0].HGridString.split(',');
+ //鍒楄缃垪鏁颁笌椤甸潰鍒楁暟鏄惁涓�鑷�
+ if (dataCol.length == option.cols[0].length - 1) {
+ //閬嶅巻瀵绘壘鍒楄缃搴斿垪鎸夐『搴忔彃鍏�
+ for (var j = 0; j < option.cols[0].length - 1; j++) {
+ for (var i = 0; i < option.cols[0].length - 1; i++) {
+ var dataCols = dataCol[j].split('|');
+ //閫夋嫨涓巇atacols鐩稿簲鍒楄繘琛屼慨鏀�
+ if (option.cols[0][i + 1]["field"] == dataCols[5]) {
+ //闅愯棌鍒�
+ if (dataCols[1] == 1) {
+ option.cols[0][i + 1]["hide"] = true;
+ }
+ //璁剧疆鍒楀
+ if (dataCols[3] > 0) {
+ option.cols[0][i + 1]["width"] = dataCols[3];
+ }
+ //璁剧疆鍐呭瀛椾綋澶у皬
+ if (data1.data[0].HFontSize != 0) {
+ option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+ } else {
+ option.cols[0][i + 1]["style"] = "font-size:100%";
+ }
+ //鏄剧ず鍒�
+ if (dataCols[1] == 0 && this.titleData.indexOf(option.cols[0][i + 1]["title"]) == -1) {
+ option.cols[0][i + 1]["hide"] = false;
+ }
+ //缁熻鍒�
+ if (dataCols[6] == 1) {
+ option.cols[0][i + 1]["totalRow"] = true;
+ } else {
+ option.cols[0][i + 1]["totalRow"] = false;
+ }
+ //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+ switch (dataCols[2]) {
+ case "L":
+ option.cols[0][i + 1]["align"] = "left";
+ break;
+ case "M":
+ option.cols[0][i + 1]["align"] = "center";
+ break;
+ case "R":
+ option.cols[0][i + 1]["align"] = "right";
+ break;
+ }
+ //璁剧疆琛ㄦ牸title灞炴�ф樉绀哄埆鍚�
+ if (dataCols[4] != null && dataCols[4] != "") {
+ option.cols[0][i + 1]["title"] = dataCols[4];
+ }
+ newCols[0].push(option.cols[0][i + 1]);
+ break;
+ }
+ }
+ }
+ //閬嶅巻寰幆鍚庡垽鏂搴斿垪鏁版槸鍚︿竴鑷�
+ if (dataCol.length == newCols[0].length - 1) {
+ option.cols = newCols;
+ //鍙栨秷鍐荤粨鍒�
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ if (option.cols[0][i + 1]["fixed"] != null) {
+ option.cols[0][i + 1]["fixed"] = null;
+ }
+ else {
+ break;
+ }
+ }
+ //鍐荤粨鍒�
+ if (data1.data[0].HFixCols != 0) {
+ for (var i = 0; i < data1.data[0].HFixCols; i++) {
+ if (dataOption.cols[0].indexOf(option.cols[0][i + 1]["title"]) != -1) {
+ data1.data[0].HFixCols += 1;
+ }
+
+ option.cols[0][i + 1]["fixed"] = "left";
+ }
+ }
+ //璁剧疆鍒楁帓搴�
+ for (var i = 1; i < option.cols[0].length; i++) {
+ if (data1.data[0].HSortFlag == "鏄�") {
+ option.cols[0][i]["sort"] = true;
+ }
+ else {
+ option.cols[0][i]["sort"] = false;
+ }
+ }
+ }
+ }
+ this.btList = option.cols[0]
+ this.btList.map(item => {
+ if (!item.hide) {
+ this.totalNameList.push(item)
+ }
+ })
+ 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
+ } else {
+ this.btList = dataOption.cols[0]
+ this.btList.map(item => {
+ if (!item.hide) {
+ this.totalNameList.push(item)
+ }
+ })
+ this.tableData = dataOption.data
+ this.tableShow = true
+ this.loading = false
+ }
+ }).catch(error => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ },
+ renderHeader(h, { column, $index }) {// 鏂板缓涓�涓� span
+ let span = document.createElement(span)// 璁剧疆琛ㄥご鍚嶇О
+ span.innerText = column.label
+ //涓存椂鎻掑叆 document
+ document.body.appendChild(span)// 閲嶇偣:鑾峰彇 span 鏈�灏忓搴︼紝璁剧疆褰撳墠鍒楋紝娉ㄦ剰杩欓噷鍔犱簡 20锛屽瓧娈佃緝澶氭椂column.minWidth=span.getBoundingClientRect().width + 50.//绉婚櫎 document 涓复鏃剁殑 span
+ document.body.removeChild(span)
+ return h(span, column.label)
+ },
+ //鐐瑰嚮琛�
+ handleRowClick(row, column, event) {
+ this.lastSelectedRow = this.selectedRow; // 璁板綍涓婁竴娆￠�変腑鐨勮
+ this.selectedRow = row; // 璁板綍褰撳墠閫変腑鐨勮
+ this.lastSelectedRowIndex = this.tableData.indexOf(row);
+ this.$refs.tableData.toggleRowSelection(row);
+ },
+ //閫変腑琛岄珮浜牱寮�
+ rowStyle({ row, rowIndex }) {
+ if (this.ids.includes(row.hmainid)) {
+ return { "background": "#ecf5ff" }
+ }
+ },
+ //鍙屽嚮琛�
+ handleDblclick(row, column, cell, event) {
+ this.OperationType = 3
+ this.handleEdit()
+ },
+ // 澶氶�夋閫変腑鏁版嵁
+ handleSelectionChange(selection) {
+ // this.rowForm = {}
+ this.ids = selection.map(item => item.hmainid)
+ this.single = selection.length != 1
+ this.multiple = !selection.length
+ if (!this.single) {
+ this.rowForm = selection[0]
+ }
+ },
+ /** 鎼滅储鎸夐挳鎿嶄綔 */
+ handleQuery() {
+ this.sWhere = ''
+ if (this.queryParams.ColName && this.queryParams.Comparator) {
+ var com = "";
+ switch (this.queryParams.Comparator) {
+ case "7":
+ com = "like'%" + this.queryParams.ColContent + "%'";
+ break;
+ case "8":
+ com = "like'%" + this.queryParams.ColContent + "'";
+ break;
+ case "9":
+ com = "like'" + this.queryParams.ColContent + "%'";
+ break;
+ case "10":
+ com = "not like'%" + this.queryParams.ColContent + "%'";
+ break;
+ default:
+ com = "" + this.queryParams.Comparator + "'" + this.queryParams.ColContent + "'";
+ break;
+ }
+ this.sWhere += " and " + this.queryParams.ColName + " " + com;
+ }
+ if (this.queryParams.ColName1 && this.queryParams.Comparator1) {
+ var com1 = "";
+ switch (this.queryParams.Comparator1) {
+ case "7":
+ com1 = "like'%" + this.queryParams.ColContent1 + "%'";
+ break;
+ case "8":
+ com1 = "like'%" + this.queryParams.ColContent1 + "'";
+ break;
+ case "9":
+ com1 = "like'" + this.queryParams.ColContent1 + "%'";
+ break;
+ case "10":
+ com1 = "not like'%" + this.queryParams.ColContent1 + "%'";
+ break;
+ default:
+ com1 = "" + this.queryParams.Comparator1 + "'" + this.queryParams.ColContent1 + "'";
+ break;
+ }
+ this.sWhere += " and " + this.queryParams.ColName1 + " " + com1;
+ }
+ if (this.queryParams.ColName2 && this.queryParams.Comparator2) {
+ var com2 = "";
+ switch (this.queryParams.Comparator2) {
+ case "7":
+ com2 = "like'%" + this.queryParams.ColContent2 + "%'";
+ break;
+ case "8":
+ com2 = "like'%" + this.queryParams.ColContent2 + "'";
+ break;
+ case "9":
+ com2 = "like'" + this.queryParams.ColContent2 + "%'";
+ break;
+ case "10":
+ com2 = "not like'%" + this.queryParams.ColContent2 + "%'";
+ break;
+ default:
+ com2 = "" + this.queryParams.Comparator + "'" + this.queryParams.ColContent + "'";
+ break;
+ }
+ this.sWhere += " and " + this.queryParams.ColName2 + " " + com2;
+ }
+ if (this.sTime) {
+ this.sTime = moment(this.sTime).format('YYYY-MM-DD')
+ this.eTime = moment(this.eTime).format('YYYY-MM-DD')
+ console.log(this.sTime, this.eTime)
+ this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.sTime + "'" + " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + this.eTime + "'";
+ }
+ if (this.queryParams.HBillNo) {
+ this.sWhere += " and 鍗曟嵁鍙� like '%" + this.queryParams.HBillNo + "%'";
+ }
+ if (this.queryParams.HDeptID) {
+ this.sWhere += " and 閮ㄩ棬 like '%" + this.queryParams.HDeptID + "%'";
+ }
+ if (this.queryParams.MaterialCode) {
+ this.sWhere += " and 鐗╂枡浠ｇ爜 like '%" + this.queryParams.MaterialCode + "%'";
+ }
+ if (this.queryParams.MaterialName) {
+ this.sWhere += " and 鐗╂枡鍚嶇О like '%" + this.queryParams.MaterialName + "%'";
+ }
+ if (this.queryParams.SpecificationModel) {
+ this.sWhere += " and 瑙勬牸鍨嬪彿 like '%" + this.queryParams.SpecificationModel + "%'";
+ }
+ if (this.queryParams.HSourceBillNo) {
+ this.sWhere += " and 婧愬崟鍗曞彿 like '%" + this.queryParams.HSourceBillNo + "%'";
+ }
+ if (this.queryParams.Warehouse) {
+ this.sWhere += " and 浠撳簱鍚嶇О like '%" + this.queryParams.Warehouse + "%'";
+ }
+ if (this.queryParams.Hmaker) {
+ this.sWhere += " and 鍒跺崟浜� like '%" + this.queryParams.Hmaker + "%'";
+ }
+ this.clearData()
+ this.getList()
+ },
+ /** 閲嶇疆鎸夐挳鎿嶄綔 */
+ resetQuery() {
+ this.sWhere = ''
+ this.queryParams = {
+ HBillNo: '',
+ HInitTimeCycle: 29,
+ HDeptID: '',
+ MaterialCode: '',
+ MaterialName: '',
+ SpecificationModel: '',
+ HSourceBillNo: '',
+ Warehouse: '',
+ Hmaker: '',
+ ColName1: '',
+ ColName2: '',
+ ColName: '',
+ Comparator1: '',
+ Comparator2: '',
+ Comparator: '',
+ ColContent1: '',
+ ColContent2: '',
+ ColContent: '',
+ }
+ this.riqiChange()
+ this.clearData()
+ this.resetForm("queryForm")
+ this.getList()
+ },
+ clearData() {
+ this.single = true
+ this.multiple = true
+ this.OperationType = 0
+ this.copyType = 0
+ this.ids = []
+ },
+ //閫�鍑�
+ close() {
+ // this.reset()
+ this.tableShow = true
+ this.openEdit = false
+ this.editShow = false
+ this.clearData()
+ this.getList()
+ },
+ //鎵撳紑鏂板缁勪欢寮圭獥
+ handleAddEdit() {
+ this.rowForm.hmainid = 0
+ this.editShow = true
+ this.openEdit = true
+ },
+ //鎵撳紑淇敼缁勪欢寮圭獥
+ handleEdit(row) {
+ this.rowForm = row
+ this.editShow = true
+ this.openEdit = true
+ },
+ //鍏抽棴缂栬緫椤甸潰
+ editClose(val) {
+ this.open = val
+ this.editShow = false
+ this.openEdit = val
+ this.clearData()
+ this.getList()
+ },
+ /** 鍒犻櫎鎸夐挳鎿嶄綔 */
+ handleDelete() {
+ this.$modal.confirm('纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠').then(() => {
+ if (this.rowForm.鐘舵�� == "鍒涘缓") {
+ axios.get(this.$baseUrl + "/Kf_MoveStockRequestBill/DeltetKf_MoveStockRequestBill", {
+ params: { 'HInterID': this.rowForm.hmainid.toString() }
+ }).then(response => {
+ if (response.data.count == 1) {
+ this.getList()
+ this.$modal.msgSuccess("鍒犻櫎鎴愬姛")
+ } else {
+ this.$modal.msgError("閿欒:" + result.code + result.Message);
+ }
+ }).catch(error => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ } else {
+ this.$modal.msgError("姝ゆ暟鎹笉鏄垱寤虹姸鎬�,涓嶈兘鍒犻櫎锛�");
+ }
+ }).catch(() => { })
+
+
+ },
+ // 鍙嶅鏍�/瀹℃牳鏁版嵁
+ set_CheckBill(num, form) {
+ var InterID = form.hmainid || form.HInterID
+ //閫昏緫瀹℃牳鏂规硶
+ axios.get(this.$baseUrl + "/Kf_MoveStockRequestBill/AuditKf_MoveStockRequestBill", {
+ params: { "HInterID": InterID, "Type": num, "user": sessionStorage["HUserName"] }
+ }).then(response => {
+ let result = response.data
+ if (result.count == 1) {
+ this.$modal.msgSuccess('鎿嶄綔鎴愬姛');
+ this.getList();
+ }
+ else {
+ this.$modal.msgError("閿欒:" + result.code + result.Message,);
+ }
+ this.clearData()
+ }).catch(error => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ },
+ set_CloseBill(num) {
+ //閫昏緫鍏抽棴鏂规硶
+ axios.get(this.$baseUrl + "/Kf_MoveStockRequestBill/CloseKf_MoveStockRequestBill", {
+ params: { "HInterID": this.rowForm.hmainid, "Type": num, "user": sessionStorage["HUserName"] }
+ }).then(response => {
+ let result = response.data
+ if (result.code == 1) {
+ this.$modal.msgSuccess(result.Message);
+ this.getList();
+ }
+ else {
+ this.$modal.msgError("閿欒:" + result.code + result.Message,);
+ }
+ this.clearData()
+ }).catch(error => {
+ console.log(error)
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ },
+ set_DropBill(num) {
+ //閫昏緫浣滃簾鏂规硶
+ axios.get(this.$baseUrl + "/Kf_MoveStockRequestBill/DropKf_MoveStockRequestBill", {
+ params: { "HInterID": this.rowForm.hmainid.toString(), "Type": num, "user": sessionStorage["HUserName"] }
+ }).then(response => {
+ let result = response.data
+ if (result.count == 1) {
+ this.$modal.msgSuccess(result.Message);
+ this.getList();
+ }
+ else {
+ this.$modal.msgError("閿欒:" + result.code + result.Message,);
+ }
+ this.clearData()
+ }).catch(error => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ },
+ //瀵煎嚭
+ handleExport() {
+ const ws = this.$XLSX.utils.json_to_sheet(this.tyResList); // 灏嗘暟鎹浆鎹负宸ヤ綔琛�
+ const wb = this.$XLSX.utils.book_new(); // 鍒涘缓涓�涓柊鐨勫伐浣滅翱
+ this.$XLSX.utils.book_append_sheet(wb, ws, "Sheet1"); // 灏嗗伐浣滆〃娣诲姞鍒板伐浣滅翱涓紝骞跺懡鍚嶄负"Sheet1"
+ this.$XLSX.writeFile(wb, `sellOutBill_${new Date().getTime()}.xlsx`); // 瀵煎嚭鏂囦欢
+ },
+ //鎵撳嵃
+ get_PrintReport() {
+ if (this.ids.length != 1) {
+ this.$modal.msgError("璇烽�夋嫨涓�琛屾暟鎹�")
+ } else if (this.rowForm.鐘舵�� != "宸插鏍�" && !this.defaintOperationByCompanyName()) {
+ this.$modal.msgError("鎵撳嵃澶辫触!鍘熷洜锛氬崟鎹姸鎬佷笉涓�'宸插鏍�'鐘舵��!!");
+ } else {
+ this.printListShow = true;
+ this.openPrintList = true;
+ }
+ // var content= ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + data[0].hmainid.toString() + '&MyMsg=' + data[0].hmainid.toString() + '&Type=Kf_SellOutBillList', 'yes']
+ },
+
+ //#region 鑾峰彇鍏徃鍚嶏紝鏍规嵁鍏徃杩涜瀹氬埗鍖栧紑鍙�
+ defaintOperationByCompanyName() {
+ var result = false;
+ axios.get(this.$baseUrl + '/Xt_getInfo/getCompanyName').then(response => {
+ var data1 = response.data
+ if (data1.count == 1) {
+ if (data1.data == "姘村姟") {
+ result = true;
+ }
+ }
+ }).catch(error => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ return result;
+ },
+ }
+};
+</script>
+<style>
+.xsckdBox .el-date-editor.el-input {
+ width: 100%;
+}
+</style>
diff --git a/src/views/warehouse/barcodeMaster/Gy_BarCodeBillList.vue b/src/views/warehouse/barcodeMaster/Gy_BarCodeBillList.vue
index f881dd8..817c60b 100644
--- a/src/views/warehouse/barcodeMaster/Gy_BarCodeBillList.vue
+++ b/src/views/warehouse/barcodeMaster/Gy_BarCodeBillList.vue
@@ -177,7 +177,8 @@
</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" @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="Gy_BarCodeBillList" @rowEditClose="rowSetClose"
@@ -272,6 +273,15 @@
ColContent2: '',
},
+
+ loading: true,
+ tyResList: [],//鍒楄〃锛堟帴鍙ｆ暟鎹級
+ btList: [],//琛ㄥご鍒楄〃鏄剧ず
+ btResList: [],
+ tableData: [],//鍒楄〃(鍒嗛〉鏄剧ず)
+ dataList: [],
+ titleData: [],//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ pageSizes: [ 50,100, 500, 5000, 50000],
page: 1, //page椤电储寮�
pageSize: 0, //page椤甸潰璁板綍鏁�
total: 0, //璁板綍鍚堣鏁�
@@ -405,6 +415,10 @@
//#region 蹇�熻繃婊�
handleQuery() {
+ var params = this.get_UrlVars();
+ var HSourceInterID = params[params[1]];
+ var HSourceEntryID = params[params[2]];
+ var HSEQ = params[params[3]];
this.sWhere = ''
if (this.queryParams.ColName && this.queryParams.Comparator) {
var com = "";
@@ -487,10 +501,18 @@
if (this.queryParams.HMaterName) {
this.sWhere += " and 鐗╂枡鍚嶇О like ''%" + this.queryParams.HMaterName + "%''";
}
+ if(HSEQ!=''&&HSEQ!=null){
+ this.sWhere += " and 婧愬崟琛屽彿 = ''" + HSEQ + "''";
+ }
+ if(HSourceInterID!=''&&HSourceInterID!=null){
+ this.sWhere += " and HSourceInterID = ''" + HSourceInterID + "''";
+ }
+ if(HSourceEntryID!=''&&HSourceEntryID!=null){
+ this.sWhere += " and HSourceEntryID = ''" + HSourceEntryID + "''";
+ }
if (this.queryParams.HOrgID) {
this.sWhere += " and HStockOrgID = ''" + this.queryParams.HOrgID + "''";
}
-
//濡傛灉鏄嚜鍔ㄧ櫥褰曪紝鍒欏彧鑳芥煡鐪嬩緵搴斿晢鑷繁鐨勬潯鐮併��
if (sessionStorage["HAutoLogin"] == "1") {
this.sWhere += " and HSupID = ''" + sessionStorage["HUserName"] + "''";
@@ -502,7 +524,6 @@
//#region 鏌ヨ
getList() {
- this.pageSize = 50
if (this.pageSize == 0) {
this.pageSize = 50
}
@@ -552,6 +573,43 @@
let HModName = "Gy_BarCodeBillList"
this.DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option, this.dataList);
}
+ else{
+ if(data1.list){
+ this.btResList = data1.list //鍒楄〃琛ㄥご鏁版嵁
+ this.total = data1.count;
+ var data = [];//鍒楀瓧娈垫暟鎹�
+ var col = [];
+ var totalArray = [];
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in data1.list) {//寰簭閬嶅巻鏁扮粍
+ data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });//浠庢瘡涓璞′腑鎻愬彇鏁版嵁
+ }
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
+ for (var i = 0; i < data.length; i++) {//閬嶅巻data鏁扮粍閲嶇殑鏁版嵁
+ if (this.titleData.indexOf(data[i].name) > -1) {//妫�鏌ata銆恑銆�.name鏄惁鍦ㄦ暟缁勪腑 //璁＄畻鍒�
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+ } else if (totalArray.indexOf(data[i].name) > -1 || (data[i].Type == "Decimal" || data[i].Type == "Int32")) { //璁＄畻鍒�
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
+ }
+ else {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+ }
+ }
+ option.cols = [col]
+ this.dataList = option
+ option.data = data1.data;
+ var result = data1.data;
+ option.data = result;
+ this.checkDataList = [];
+ let HModName = "Gy_BarCodeBillList"
+ this.DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option, this.dataList);
+ }
+ else{
+ this.tableShow = true
+ this.loading = false
+ }
+ }
}).catch(error => {
this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
});
@@ -589,6 +647,18 @@
//#endregion
+ //#region 鑾峰彇鍙傛暟
+ get_UrlVars() {
+ var vars = [], hash;
+ var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+ for (var i = 0; i < hashes.length; i++) {
+ hash = hashes[i].split('=');
+ vars.push(hash[0]);
+ vars[hash[0]] = hash[1];
+ }
+ return vars;
+ },
+ //#endregion
//#region 鍒犻櫎
handleDrop() {
},
@@ -843,11 +913,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
diff --git a/src/views/warehouse/barcodeMaster/Gy_BarCodeBill_JinLong.vue b/src/views/warehouse/barcodeMaster/Gy_BarCodeBill_JinLong.vue
index d592867..64df014 100644
--- a/src/views/warehouse/barcodeMaster/Gy_BarCodeBill_JinLong.vue
+++ b/src/views/warehouse/barcodeMaster/Gy_BarCodeBill_JinLong.vue
@@ -3,6 +3,7 @@
<div style=" margin-bottom: 10px; border-bottom: 1px solid #f6f6f6;">
<el-button type="primary" @click="onClickMethod_BarCodeProduce" :disabled="disabledFlag_BarCodeProduce">鐢熸垚</el-button>
<el-button type="primary" @click="get_PrintReport">鎵撳嵃</el-button>
+ <el-button type="primary" @click="get_BarCodeBillHSEQ">鏉＄爜琛屽彿鏌ヨ</el-button>
<!-- <el-button type="primary" @click="close">閫� 鍑�</el-button> -->
</div>
<div style="margin: 10px; font-size: 28px; font-weight: bold; text-align: center;">鏉＄爜鐢熸垚</div>
@@ -82,7 +83,7 @@
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="鏍囧噯鍖呰鏁�">
+ <el-form-item label="鏁伴噺/绠�">
<el-input-number v-model="initMainData.HMinQty" @change="onChangeForHMinQty" />
</el-form-item>
</el-col>
@@ -163,7 +164,7 @@
</el-tab-pane>
</el-tabs>
</el-form>
-
+
<!-- 鎵撳嵃寮圭獥 -->
<el-dialog title="鎵撳嵃妯℃澘閫夋嫨" :visible.sync="openPrintList" width="800px" append-to-body>
<PrintList :linterid="rowSel.toString()" :MyMsg="rowSel.toString()" Type="HGy_BarCodeBill"
@@ -187,7 +188,7 @@
return {
baseURL: process.env.VUE_APP_BASE_API, //鍚庣鎺ュ彛璁块棶鍓嶇紑
HModName: "Gy_BarCodeBill_JinLong", //妯″潡鍚嶇О
- disabledFlag_BarCodeProduce:false, //绂佺敤鏍囪-鐢熸垚 鎸夐挳
+ disabledFlag_BarCodeProduce:false, //绂佺敤鏍囪-鐢熸垚 鎸夐挳 // iframe URL
rules:{ //琛ㄥごform 鏍￠獙
},
@@ -224,7 +225,7 @@
,HSeOrderBillNo:"" //瀹㈡埛璁㈠崟鍙�
,HCusModel:"" //浜у搧鍨嬪彿
,HMTONo:null //璁″垝璺熻釜鍙�
-
+ ,HSourceBillSEQ:0 //婧愬崟琛屽彿
,HOrganizationID:0 //缁勭粐ID
,HOrganization:"" //缁勭粐鍚嶇О
},
@@ -320,7 +321,22 @@
}
},
//#endregion
+ //#region涓嬫帹鐢熸垚鏉＄爜
+ async get_BarCodeBillHSEQ() {
+ var params = this.get_UrlVars();
+ var HSourceInterID = params[params[1]];
+ var HSourceEntryID = params[params[2]];
+ var res1 = await this.getPushSource_POInStockBillInit1(HSourceInterID,HSourceEntryID);
+ var temp = res1.data.data[0];
+ var dataArray = [temp];
+ var HSEQ = dataArray[0].HSEQ;
+ this.$router.push({
+ path: `/warehouse/barcodeMaster/Gy_BarCodeBillList_JinLong_AutoLogin?OperationType=4&HSourceInterID=${HSourceInterID}&HSourceEntryID=${HSourceEntryID}&HSEQ=${HSEQ}`
+ }).catch(() => { });
+
+ },
+ //#endregion
//#region 鑾峰彇缁勭粐涓嬫媺鍒楄〃鏁版嵁
async get_OrganizationList() {
axios.get(this.$baseUrl + '/Web/GetOrganizations',{async:false}).then(response => {
@@ -468,6 +484,7 @@
this.$modal.msgError("鏉＄爜鐢熸垚鏁伴噺澶т簬鏈�澶у彲鐢熸垚鏁伴噺銆�" + ((dataArray[0].鏁伴噺 * 1) - (dataArray[0].宸茬敓鎴愭潯鐮佹暟閲� * 1)) + "銆�!!");
return false;
}
+
var sMainData_temp = [
{
@@ -492,6 +509,7 @@
, "HQty": this.initMainData.HQty_SourceBill
, "HMinQty": this.initMainData.HMinQty
, "HBQty": this.initMainData.HBQty
+ , "HSourceBillSEQ":this.initMainData.HSourceBillSEQ
, "HPackQty": 0
, "HCoilNO": ""
, "HFurnaceNO": ""
@@ -595,7 +613,26 @@
})
},
//#endregion
-
+
+ //#region 鏍规嵁涓诲唴鐮佷笌瀛愬唴鐮佽幏鍙栨簮鍗曟敹鏂欓�氱煡鍗曟暟鎹�
+ async getPushSource_POInStockBillInit1(HSourceInterID, HSourceEntryID) {
+ var sql = `SELECT m.*, s.*
+ FROM Cg_POInStockBillMain m
+ INNER JOIN Cg_POInStockBillSub s ON m.hinterid = s.HInterID
+ WHERE 1=1`;
+ sql += ` AND m.hinterid = ${HSourceInterID}`;
+ sql += ` AND s.HEntryID = ${HSourceEntryID}`;
+ var ModRightNameCheck = "";
+ return axios.get(this.$baseUrl + '/CommonModel/searchMethod', {
+ params: {
+ "sql": sql,
+ "user": sessionStorage["HUserName"],
+ "ModRightNameCheck": ModRightNameCheck
+ },
+ })
+ },
+ //#endregion
+
//#region 涓嬫帹椤甸潰鍒濆鍖�
async setInit_PushBill(HSourceInterID,HSourceEntryID) {
//鑾峰彇鍙傛暟
@@ -605,19 +642,19 @@
var HSourceEntryID = params[params[2]]; //婧愬崟瀛恑d
var HSourceBillType = params[params[3]]; //婧愬崟绫诲瀷
var HSourceBillNo = params[params[4]]; //婧愬崟鍗曞彿
-
//鑾峰彇婧愬崟淇℃伅
var temp = null;
var res = "none"
try{
res = await this.getPushSource_POInStockBillInit(HSourceInterID, HSourceEntryID);
if(res.data.code=="1"){
+ res = await this.getPushSource_POInStockBillInit(HSourceInterID, HSourceEntryID);
if(res.data.data.length>0){
res = await this.getPushSource_POInStockBillInit(HSourceInterID, HSourceEntryID);
}else{
res = "none";
- this.$modal.msgError("鏈煡璇㈠埌褰撳墠鍗曟嵁锛侊紒锛�");
- }
+ this.$modal.msgError("鍗曟嵁宸茬粡鍏ㄩ儴涓嬫帹锛屽鏋滄兂缁х画涓嬫帹锛屽幓鏉＄爜妗ｆ浣滃簾瀵瑰簲鏉＄爜");
+ }
}
else{
res = "none";
@@ -639,7 +676,7 @@
this.initMainData.HDate = moment().format('YYYY-MM-DD');
this.initMainData.HMainSourceInterID = HSourceInterID;
this.initMainData.HMainSourceEntryID = HSourceEntryID;
- this.initMainData.HMainSourceBillNo = HSourceBillNo;
+ this.initMainData.HMainSourceBillNo = dataArray[0].鍗曟嵁鍙�;
this.initMainData.HMainSourceBillType = HSourceBillType;
this.initMainData.HPOOrderBillNo = dataArray[0].婧愬崟鍗曞彿==null?"":dataArray[0].婧愬崟鍗曞彿;
this.initMainData.HMaterID = dataArray[0].HMaterID==null?0:dataArray[0].HMaterID;
@@ -664,6 +701,7 @@
this.initMainData.HSeOrderBillNo = dataArray[0].瀹㈡埛璁㈠崟鍙�;
this.initMainData.HCusModel = dataArray[0].浜у搧鍨嬪彿;
this.initMainData.HMTONo = dataArray[0].璁″垝璺熻釜鍙�;
+ this.initMainData.HSourceBillSEQ =dataArray[0].婧愬崟琛屽彿;
this.initMainData.HMinQty = 0;
if(this.initMainData.HMinQty>0){
this.initMainData.HBQty = (this.initMainData.HQty_SourceBill / this.initMainData.HMinQty) + (this.initMainData.HQty_SourceBill%this.initMainData.HMinQty == 0?0:1);
diff --git a/src/views/warehouse/barcodeMaster/Gy_BarCodeBill_JinLong_AutoLogin.vue b/src/views/warehouse/barcodeMaster/Gy_BarCodeBill_JinLong_AutoLogin.vue
index 587d8a0..c968a9f 100644
--- a/src/views/warehouse/barcodeMaster/Gy_BarCodeBill_JinLong_AutoLogin.vue
+++ b/src/views/warehouse/barcodeMaster/Gy_BarCodeBill_JinLong_AutoLogin.vue
@@ -4,11 +4,12 @@
<el-button type="primary" @click="onClickMethod_BarCodeProduce" :disabled="disabledFlag_BarCodeProduce">鐢熸垚</el-button>
<el-button type="primary" @click="get_PrintReport">鎵撳嵃</el-button>
<el-button type="primary" @click="get_BarCodeBillList">鏉＄爜妗ｆ</el-button>
+ <el-button type="primary" @click="get_BarCodeBillHSEQ">鏉＄爜琛屽彿鏌ヨ</el-button>
</div>
<div style="margin: 10px; font-size: 28px; font-weight: bold; text-align: center;">鏉＄爜鐢熸垚</div>
<el-form :model="initMainData" label-width="80px">
<el-row>
- <el-col :span="6">
+ <el-col :span="6">
<el-form-item label="鏃ユ湡">
<el-date-picker v-model="initMainData.HDate" type="date" placeholder="閫夋嫨鏃ユ湡" value-format="yyyy-MM-dd" style="width: 100%"> </el-date-picker>
</el-form-item>
@@ -82,7 +83,7 @@
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="鏍囧噯鍖呰鏁�">
+ <el-form-item label="鏁伴噺/绠�">
<el-input-number v-model="initMainData.HMinQty" @change="onChangeForHMinQty" />
</el-form-item>
</el-col>
@@ -163,7 +164,7 @@
</el-tab-pane>
</el-tabs>
</el-form>
-
+
<!-- 鎵撳嵃寮圭獥 -->
<el-dialog title="鎵撳嵃妯℃澘閫夋嫨" :visible.sync="openPrintList" width="800px" append-to-body>
<PrintList :linterid="rowSel.toString()" :MyMsg="rowSel.toString()" Type="HGy_BarCodeBill"
@@ -187,7 +188,7 @@
return {
baseURL: process.env.VUE_APP_BASE_API, //鍚庣鎺ュ彛璁块棶鍓嶇紑
HModName: "Gy_BarCodeBill_JinLong_AutoLogin", //妯″潡鍚嶇О
- disabledFlag_BarCodeProduce:false, //绂佺敤鏍囪-鐢熸垚 鎸夐挳
+ disabledFlag_BarCodeProduce:false, //绂佺敤鏍囪-鐢熸垚 鎸夐挳 // iframe URL
rules:{ //琛ㄥごform 鏍￠獙
},
@@ -224,7 +225,7 @@
,HSeOrderBillNo:"" //瀹㈡埛璁㈠崟鍙�
,HCusModel:"" //浜у搧鍨嬪彿
,HMTONo:null //璁″垝璺熻釜鍙�
-
+ ,HSourceBillSEQ:0 //婧愬崟琛屽彿
,HOrganizationID:0 //缁勭粐ID
,HOrganization:"" //缁勭粐鍚嶇О
},
@@ -493,6 +494,7 @@
, "HQty": this.initMainData.HQty_SourceBill
, "HMinQty": this.initMainData.HMinQty
, "HBQty": this.initMainData.HBQty
+ , "HSourceBillSEQ":this.initMainData.HSourceBillSEQ
, "HPackQty": 0
, "HCoilNO": ""
, "HFurnaceNO": ""
@@ -567,6 +569,32 @@
this.$router.push({ path: "/warehouse/barcodeMaster/Gy_BarCodeBillList_JinLong_AutoLogin" }).catch(() => { });
},
//#endregion
+
+
+ //#region涓嬫帹鐢熸垚鏉＄爜
+ async get_BarCodeBillHSEQ() {
+ var params = this.get_UrlVars();
+ var HSourceInterID = params[params[1]];
+ var HSourceEntryID = params[params[2]];
+ var res1 = await this.getPushSource_POInStockBillInit1(HSourceInterID,HSourceEntryID);
+ var temp = res1.data.data[0];
+ var dataArray = [temp];
+ var HSEQ
+ if (dataArray && dataArray.length > 0 && dataArray[0]) {
+ if (dataArray[0].HSEQ == '') {
+ HSEQ = 0;
+ } else {
+ HSEQ = dataArray[0].HSEQ;
+ }
+ } else {
+ HSEQ = 0;
+ }
+ this.$router.push({
+ path: `/warehouse/barcodeMaster/Gy_BarCodeBillList_JinLong_AutoLogin?OperationType=4&HSourceInterID=${HSourceInterID}&HSourceEntryID=${HSourceEntryID}&HSEQ=${HSEQ}`
+ }).catch(() => { });
+ },
+
+ //#endregion
//#region 鏉＄爜鍒楄〃澶嶉�夋閫夋嫨鐘舵�佸彉鏇寸洃鍚簨浠�
onSelectionChange_BarCode(selection){
@@ -602,6 +630,26 @@
})
},
//#endregion
+ //#region 鏍规嵁涓诲唴鐮佷笌瀛愬唴鐮佽幏鍙栨簮鍗曟敹鏂欓�氱煡鍗曟暟鎹紙鍚堝苟鐗堬級
+ async getPushSource_POInStockBillInit1(HSourceInterID, HSourceEntryID) {
+ var sql = `SELECT m.*, s.*
+ FROM Cg_POInStockBillMain m
+ INNER JOIN Cg_POInStockBillSub s ON m.hinterid = s.HInterID
+ WHERE 1=1`;
+ sql += ` AND m.hinterid = ${HSourceInterID}`;
+ sql += ` AND s.HEntryID = ${HSourceEntryID}`;
+ var ModRightNameCheck = "";
+ return axios.get(this.$baseUrl + '/CommonModel/searchMethod', {
+ params: {
+ "sql": sql,
+ "user": sessionStorage["HUserName"],
+ "ModRightNameCheck": ModRightNameCheck
+ },
+ })
+ },
+ //#endregion
+
+ //#endregion
//#region 涓嬫帹椤甸潰鍒濆鍖�
async setInit_PushBill(HSourceInterID,HSourceEntryID) {
@@ -615,20 +663,26 @@
//鑾峰彇婧愬崟淇℃伅
var temp = null;
- var res = "none"
+ var res = "none"
+ var res1 = "none"
try{
- res = await this.getPushSource_POInStockBillInit(HSourceInterID, HSourceEntryID);
- if(res.data.code=="1"){
- if(res.data.data.length>0){
- res = await this.getPushSource_POInStockBillInit(HSourceInterID, HSourceEntryID);
- }else{
- res = "none";
- this.$modal.msgError("鏈煡璇㈠埌褰撳墠鍗曟嵁锛侊紒锛�");
+ res1 = await this.getPushSource_POInStockBillInit1(HSourceInterID,HSourceEntryID);
+ if(res1.data.data.length<=0){
+ this.$modal.msgError("褰撳墠鍗曟嵁鏈悓姝ワ紝璇疯繑鍥為噾铦朵簯SRM骞冲彴閫佽揣鍗曞垪琛ㄦ壘鍒拌鍗曟嵁鍦ㄦ煡鐪嬮〉闈㈢偣鍑汇�愪紶閫扺MS銆戞寜閽紒锛�");
+ }else{
+ res = await this.getPushSource_POInStockBillInit(HSourceInterID, HSourceEntryID);
+ if(res.data.code=="1"){
+ if(res.data.data.length>0){
+ res = await this.getPushSource_POInStockBillInit(HSourceInterID, HSourceEntryID);
+ }else{
+ res = "none";
+ this.$modal.msgError("鍗曟嵁宸茬粡鍏ㄩ儴涓嬫帹锛屽鏋滄兂缁х画涓嬫帹锛屽幓鏉＄爜妗ｆ浣滃簾瀵瑰簲鏉＄爜");
+ }
}
- }
- else{
- res = "none";
- this.$modal.msgError(res.data.Message);
+ else{
+ res = "none";
+ this.$modal.msgError(res.data.Message);
+ }
}
}catch(error){
res = "none";
@@ -671,6 +725,7 @@
this.initMainData.HSeOrderBillNo = dataArray[0].瀹㈡埛璁㈠崟鍙�;
this.initMainData.HCusModel = dataArray[0].浜у搧鍨嬪彿;
this.initMainData.HMTONo = dataArray[0].璁″垝璺熻釜鍙�;
+ this.initMainData.HSourceBillSEQ =dataArray[0].婧愬崟琛屽彿;
this.initMainData.HMinQty = 0;
if(this.initMainData.HMinQty>0){
this.initMainData.HBQty = (this.initMainData.HQty_SourceBill / this.initMainData.HMinQty) + (this.initMainData.HQty_SourceBill%this.initMainData.HMinQty == 0?0:1);
--
Gitblit v1.9.1