From 5fa77e254003aea6060e3f70d64e5fd1bcdb4748 Mon Sep 17 00:00:00 2001
From: qq_41295110 <qq_41295110@noreply.gitcode.com>
Date: 星期三, 19 十一月 2025 14:43:14 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI
---
src/views/warehouse/barcodeMaster/Gy_BarCodeBill.vue | 1
src/views/scMould/basicModeling/Gy_MaterialPackingRelationList.vue | 1
src/views/basic/gyStockPlace/gyStockPlace.vue | 63
src/views/KCGL/OtherOutBill/Kf_OtherOutBillEdit.vue | 1107 ++++
src/views/basic/gy/gyDepartmentEdit.vue | 247
src/views/purchase/postockInBack/Kf_POStockInBackBillList.vue | 1
src/views/system/user/powerInformation.vue | 214
src/views/basic/gyEmployee/gyEmployee.vue | 479 +
src/views/purchase/cgPoInStockBill/cgPoInStockBillEdit.vue | 181
src/views/GyCustomer/CustomerEdit/index.vue | 6
src/views/KCGL/OtherOutBill/Kf_OtherOutBillList.vue | 870 +++
src/views/sell/XsSeOutStockBackBillEdit.vue | 78
src/views/basic/gy/gyDepartment.vue | 22
src/router/index.js | 636 +
src/views/basic/gy/gySupplier.vue | 16
src/views/purchase/cgPoOrderBill/cgPoOrderBill.vue | 70
src/views/warehouse/transfer/Kf_MoveStockRequestBillList.vue | 1
src/views/GyCustomer/index.vue | 600 -
src/views/sell/sellOut/sellOutBill.vue | 1218 ++-
src/views/ProductInBill/Kf_ProductInBillList.vue | 873 +++
.env.production | 1
src/views/system/user/xtUserListEdit.vue | 132
src/views/scMould/basicModeling/Gy_MouldFile.vue | 1
src/views/basic/gy/gySupplierEdit.vue | 625 +-
src/views/sell/XsSeOutStockBackBillList.vue | 48
src/views/component/employee/index.vue | 4
src/views/sell/XsSeOutStockBill.vue | 43
src/views/ICMO/ScICMOBillEdit.vue | 1476 +++++
src/views/purchase/cgPoOrderBill/cgPoOrderBillEdit.vue | 160
src/views/CaiGouGuanLi/CaiGouRuKu/Kf_POStockInBillList.vue | 22
src/views/basic/production/gySource.vue | 38
src/views/sell/XsSeOutStockBillEdit.vue | 123
src/views/warehouse/shipment/Kf_StockOutRequestBillList.vue | 1
src/views/sell/Kf_ICStockBillMainList/Kf_ICStockBillMainList.vue | 1606 ++++++
src/views/sell/xsSeOrderBill/xsSeOrderBill.vue | 43
src/views/system/user/xtUserList.vue | 29
src/views/basic/gyStockPlace/gyStockPlaceEdit.vue | 87
src/views/sell/Kf_ICStockBillMainList/Kf_ICStockBillMainListEdit.vue | 1270 ++++
src/views/purchase/cgPoInStockBill/cgPoInStockBill.vue | 54
src/views/scMould/basicModeling/Gy_MouldFileList.vue | 1101 ++++
src/store/modules/permission.js | 408 +
src/views/basic/gyEmployee/gyEmployeeEdit.vue | 190
src/views/basic/gyWarehouse/gyWarehouse.vue | 442 -
src/views/basic/gyWarehouse/gyWarehouseEdit.vue | 134
src/views/ICMO/ScICMOBillList.vue | 109
src/views/sell/xsSeOrderBill/xsSeOrderBillEdit.vue | 125
src/views/warehouse/transfer/Kf_MoveStockRequestBillEdit.vue | 1
src/views/warehouse/shipment/Kf_StockOutRequestBill.vue | 1
src/views/ProductInBill/Kf_ProductInBillEdit.vue | 1056 +++
49 files changed, 13,313 insertions(+), 2,701 deletions(-)
diff --git a/.env.production b/.env.production
index 2cb25b8..634d712 100644
--- a/.env.production
+++ b/.env.production
@@ -6,3 +6,4 @@
# 鏅轰簯杩堟�滾-MOM绠＄悊绯荤粺/鐢熶骇鐜
VUE_APP_BASE_API = 'http://47.96.97.237/API/'
+
diff --git a/src/router/index.js b/src/router/index.js
index b4d8d23..39879db 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -127,6 +127,45 @@
},
],
},
+ //閿�鍞��璐у崟
+ {
+ path: "/sell/StockBillMainList/KfICStockBillMainList",
+ component: Layout,
+ hidden: true,
+ // permissions: ["system:goods:add"],
+ redirect: "noredirect",
+ meta: {
+ breadcrumb: false, // 濡傛灉璁剧疆涓篺alse锛屽垯涓嶄細鍦╞readcrumb闈㈠寘灞戜腑鏄剧ず
+ activeMenu: "/sell/StockBillMainList", // 褰撹矾鐢辫缃簡璇ュ睘鎬э紝鍒欎細楂樹寒鐩稿搴旂殑渚ц竟鏍忋��
+ },
+ children: [
+ {
+ path: "/sell/StockBillMainList/KfICStockBillMainList",
+ component: () => import("@/views/sell/Kf_ICStockBillMainList/Kf_ICStockBillMainList.vue"),
+ name: "KfICStockBillMainList",
+ meta: { title: "閿�鍞��璐у崟", activeMenu: "sell/StockBillMainList" },
+ },
+ ],
+ },
+ //閿�鍞��璐у崟缂栬緫椤甸潰
+ {
+ path: "/sell/StockBillMainList/KfICStockBillMainListEdit",
+ component: Layout,
+ hidden: true,
+ redirect: "noredirect",
+ meta: {
+ breadcrumb: false, // 濡傛灉璁剧疆涓篺alse锛屽垯涓嶄細鍦╞readcrumb闈㈠寘灞戜腑鏄剧ず
+ activeMenu: "/sell/StockBillMainList", // 褰撹矾鐢辫缃簡璇ュ睘鎬э紝鍒欎細楂樹寒鐩稿搴旂殑渚ц竟鏍忋��
+ },
+ children: [
+ {
+ path: "/sell/StockBillMainList/KfICStockBillMainListEdit",
+ component: () => import("@/views/sell/Kf_ICStockBillMainList/Kf_ICStockBillMainListEdit.vue"),
+ name: "KfICStockBillMainListEdit",
+ meta: { title: "閿�鍞��璐у崟缂栬緫", activeMenu: "sell/StockBillMainList" },
+ },
+ ],
+ },
//鐢ㄦ埛鍒楄〃
{
path: "/system/user/xtUserList",
@@ -159,7 +198,7 @@
children: [
{
path: "/purchase/POStockInBill/POStockInBillList",
- component: () => import("@/views/CaiGouGuanLi/CaiGouRuKu/Kf_POStockInBillList.vue"),
+
name: "POStockInBillList",
meta: { title: "閲囪喘鍏ュ簱鍗�", activeMenu: "purchase/POStockInBill" },
},
@@ -178,9 +217,12 @@
children: [
{
path: "/purchase/POStockInBill/POStockInBillEdit",
- component: () => import("@/views/CaiGouGuanLi/CaiGouRuKu/Kf_POStockInBillEdit.vue"),
+
name: "POStockInBillEdit",
- meta: { title: "閲囪喘鍏ュ簱鍗曠紪杈�", activeMenu: "/purchase/POStockInBill" },
+ meta: {
+ title: "閲囪喘鍏ュ簱鍗曠紪杈�",
+ activeMenu: "/purchase/POStockInBill",
+ },
},
],
},
@@ -306,7 +348,9 @@
component: () => import("@/views/sell/xsSeOrderBill/xsSeOrderBill"),
name: "XsSeOrderBill",
meta: { title: "閿�鍞鍗曠淮鎶�", activeMenu: "sell/seOrder" },
- }, {
+
+ },
+ {
path: "/sell/seOrder/xsSeOrderBillEdit",
component: () => import("@/views/sell/xsSeOrderBill/xsSeOrderBillEdit"),
name: "XsSeOrderBillEdit",
@@ -334,7 +378,9 @@
},
{
path: "/purchase/poOrder/cgPoOrderBillEdit",
- component: () => import("@/views/purchase/cgPoOrderBill/cgPoOrderBillEdit"),
+
+ component: () =>
+ import("@/views/purchase/cgPoOrderBill/cgPoOrderBillEdit"),
name: "CgPoOrderBillEdit",
meta: { title: "閲囪喘璁㈠崟", activeMenu: "/purchase/PoOrder" },
},
@@ -353,13 +399,15 @@
children: [
{
path: "/purchase/PoInStock/cgPoInStockBill",
- component: () => import("@/views/purchase/cgPoInStockBill/cgPoInStockBill"),
+ component: () =>
+ import("@/views/purchase/cgPoInStockBill/cgPoInStockBill"),
name: "CgPoInStockBillList",
meta: { title: "鏀舵枡閫氱煡鍗曞垪琛�", activeMenu: "/purchase/PoInStock" },
},
- {
+ {
path: "/purchase/PoInStock/cgPoInStockBillEdit",
- component: () => import("@/views/purchase/cgPoInStockBill/cgPoInStockBillEdit"),
+ component: () =>
+ import("@/views/purchase/cgPoInStockBill/cgPoInStockBillEdit"),
name: "CgPoInStockBillEdit",
meta: { title: "鏀舵枡閫氱煡鍗�", activeMenu: "/purchase/PoInStock" },
},
@@ -403,7 +451,6 @@
},
children: [
{
-
path: "/sell/seOutStockBack/xsSeOutStockBackBillList",
component: () => import("@/views/sell/XsSeOutStockBackBillList"),
name: "XsSeOutStockBackBillList",
@@ -432,14 +479,15 @@
path: "/icmo/scIcmoBill/scIcmoBillList",
component: () => import("@/views/ICMO/ScICMOBillList.vue"),
name: "ScICMOBillList",
- meta: { title: "鐢熶骇璁㈠崟鍒楄〃", activeMenu: "/icmo/scIcmoBill" },
+ meta: { title: "鐢熶骇璁㈠崟缁存姢", activeMenu: "/icmo/scIcmoBill" },
+ },
+ {
+ path: "/icmo/scIcmoBill/scIcmoBillEdit",
+ component: () => import("@/views/ICMO/ScICMOBillEdit.vue"),
+ name: "ScICMOBillEdit",
+ meta: { title: "鐢熶骇璁㈠崟", activeMenu: "/icmo/scIcmoBill" },
},
],
- },
- {
- path: "/ScICMOBillList",
- component: () => import("@/views/ICMO/ScICMOBillList.vue"),
- hidden: true,
},
//渚涘簲鍟嗗垪琛�
{
@@ -460,30 +508,57 @@
},
],
},
-// i鑺傜偣椤甸潰
+ // i鑺傜偣椤甸潰
{
- path: '/iframe',
- component: () => import('@/layout/emptyLayout'), // 浣跨敤绌哄竷灞�
+
+ path: "/iframe",
+ component: () => import("@/layout/emptyLayout"), // 浣跨敤绌哄竷灞�
hidden: true, // 鍦ㄤ晶杈规爮涓嶆樉绀�
children: [
{
- path: 'XsSeOutStockBackBillEdit',
- component: () => import('@/views/sell/XsSeOutStockBackBillEdit'), // 閫�璐ч�氱煡鍗�
- name: 'IFrameXsSeOutStockBackBillEdit',
- meta: { title: '閫�璐ч�氱煡鍗�', noCache: true, noLoading: true }
+ path: "XsSeOutStockBackBillEdit",
+ component: () => import("@/views/sell/XsSeOutStockBackBillEdit"), // 閫�璐ч�氱煡鍗�
+ name: "IFrameXsSeOutStockBackBillEdit",
+ meta: { title: "閫�璐ч�氱煡鍗�", noCache: true, noLoading: true },
},
{
- path: 'XsSeOutStockBillEdit',
- component: () => import('@/views/sell/XsSeOutStockBillEdit'), // 鍙戣揣閫氱煡鍗�
- name: 'IframeXsSeOutStockBillEdit',
- meta: { title: '鍙戣揣閫氱煡鍗�', noCache: true, noLoading: true }
+
+ path: "XsSeOutStockBillEdit",
+ component: () => import("@/views/sell/XsSeOutStockBillEdit"), // 鍙戣揣閫氱煡鍗�
+ name: "IframeXsSeOutStockBillEdit",
+ meta: { title: "鍙戣揣閫氱煡鍗�", noCache: true, noLoading: true },
},
{
path: 'XsSeOrderBillEdit',
component: () => import('@/views/sell/xsSeOrderBill/xsSeOrderBillEdit'), // 閿�鍞鍗�
name: 'IframeXsSeOrderBillEdit',
meta: { title: '閿�鍞鍗�', noCache: true, noLoading: true }
- }
+ },
+ {
+ path: 'ScICMOBillEdit',
+ component: () => import('@/views/ICMO/ScICMOBillEdit'), // 鐢熶骇璁㈠崟
+ name: 'IframeScICMOBillEdit',
+ meta: { title: '鐢熶骇璁㈠崟', noCache: true, noLoading: true }
+ },
+ {
+ path: 'CgPoOrderBillEdit',
+ component: () => import('@/views/purchase/cgPoOrderBill/cgPoOrderBillEdit'), // 閲囪喘璁㈠崟
+ name: 'IframeCgPoOrderBillEdit',
+ meta: { title: '閲囪喘璁㈠崟', noCache: true, noLoading: true }
+ },
+ {
+ path: 'CgPoInStockBillEdit',
+ component: () => import('@/views/purchase/cgPoInStockBill/cgPoInStockBillEdit'), // 鏀舵枡閫氱煡鍗�
+ name: 'IframeCgPoInStockBillEdit',
+ meta: { title: '鏀舵枡閫氱煡鍗�', noCache: true, noLoading: true }
+ },
+ {
+ path: 'GyWarehouse',
+ component: () => import("@/views/basic/gyWarehouse/gyWarehouse"), // 浠撳簱
+ name: 'IframeGyWarehouse',
+ meta: { title: '浠撳簱鍒楄〃', noCache: true, noLoading: true }
+ },
+
]
}, // 瀹㈡埛
{
@@ -491,7 +566,7 @@
component: () => import("@/views/GyCustomer/index"),
hidden: false,
},
- {
+ {
path: "/basic/gy/gyCustomer",
component: Layout,
hidden: true,
@@ -515,7 +590,7 @@
component: () => import("@/views/gyMaterial/GyMaterial"),
hidden: false,
},
- {
+ {
path: "/basic/gy/gyMaterial",
component: Layout,
hidden: true,
@@ -546,9 +621,15 @@
children: [
{
path: "/purchase/POStockInBill/FbStepFoldinBillList",
- component: () => import("@/views/FbStepFoldinBillList/fbStepFoldinBillList.vue"),
+
+ component: () =>
+ import("@/views/FbStepFoldinBillList/fbStepFoldinBillList.vue"),
name: "FbStepFoldinBillList",
- meta: { title: "鍒嗗竷寮忚皟鍏ュ崟鍒楄〃", activeMenu: "/purchase/POStockInBill" },
+
+ meta: {
+ title: "鍒嗗竷寮忚皟鍏ュ崟鍒楄〃",
+ activeMenu: "/purchase/POStockInBill",
+ },
},
],
},
@@ -565,128 +646,134 @@
children: [
{
path: "/purchase/POStockInBill/FbStepFoldOutBillList",
- component: () => import("@/views/FbStepFoldOutBillList/fbStepFoldOutBillList.vue"),
+
+ component: () =>
+ import("@/views/FbStepFoldOutBillList/fbStepFoldOutBillList.vue"),
name: "FbStepFoldOutBillList",
- meta: { title: "鍒嗗竷寮忚皟鍑哄崟鍒楄〃", activeMenu: "/purchase/POStockInBill" },
+
+ meta: {
+ title: "鍒嗗竷寮忚皟鍑哄崟鍒楄〃",
+ activeMenu: "/purchase/POStockInBill",
+ },
},
],
},
- //鍣ㄥ叿棰嗙敤鍑哄簱鍗曠淮鎶�
- {
- path: "/scMould/warehouse/Sc_MouldProdOutBillList",
- component: Layout,
- hidden: true,
- redirect: "noredirect",
- meta: {
- breadcrumb: false, // 濡傛灉璁剧疆涓篺alse锛屽垯涓嶄細鍦╞readcrumb闈㈠寘灞戜腑鏄剧ず
- activeMenu: "/scMould/warehouse/Sc_MouldProdOutBillList", // 褰撹矾鐢辫缃簡璇ュ睘鎬э紝鍒欎細楂樹寒鐩稿搴旂殑渚ц竟鏍忋��
- },
- children: [
- {
- path: "/scMould/warehouse/Sc_MouldProdOutBillList",
- component: () => import("@/views/scMould/warehouse/Sc_MouldProdOutBillList"),
- name: "Sc_MouldProdOutBillList",
- meta: { title: "鍣ㄥ叿棰嗙敤鍑哄簱鍗曠淮鎶�", activeMenu: "scMould/warehouse" },
- },
- ],
+ //鍣ㄥ叿棰嗙敤鍑哄簱鍗曠淮鎶�
+ {
+ path: "/scMould/warehouse/Sc_MouldProdOutBillList",
+ component: Layout,
+ hidden: true,
+ redirect: "noredirect",
+ meta: {
+ breadcrumb: false, // 濡傛灉璁剧疆涓篺alse锛屽垯涓嶄細鍦╞readcrumb闈㈠寘灞戜腑鏄剧ず
+ activeMenu: "/scMould/warehouse/Sc_MouldProdOutBillList", // 褰撹矾鐢辫缃簡璇ュ睘鎬э紝鍒欎細楂樹寒鐩稿搴旂殑渚ц竟鏍忋��
},
- //鍣ㄥ叿棰嗙敤鍑哄簱鍗�
- {
- path: "/scMould/warehouse/Sc_MouldProdOutBillEdit",
- component: Layout,
- hidden: true,
- redirect: "noredirect",
- meta: {
- breadcrumb: false, // 濡傛灉璁剧疆涓篺alse锛屽垯涓嶄細鍦╞readcrumb闈㈠寘灞戜腑鏄剧ず
- activeMenu: "/scMould/warehouse/Sc_MouldProdOutBillEdit", // 褰撹矾鐢辫缃簡璇ュ睘鎬э紝鍒欎細楂樹寒鐩稿搴旂殑渚ц竟鏍忋��
- },
- children: [
- {
- path: "/scMould/warehouse/Sc_MouldProdOutBillEdit",
- component: () => import("@/views/scMould/warehouse/Sc_MouldProdOutBillEdit"),
- name: "Sc_MouldProdOutBillEdit",
- meta: { title: "鍣ㄥ叿棰嗙敤鍑哄簱鍗曠紪杈�", activeMenu: "scMould/warehouse" },
- },
- ],
- },
- //鍣ㄥ叿棰嗙敤閫�搴撳崟缁存姢
- {
- path: "/scMould/warehouse/Sc_MouldProdBackBillList",
- component: Layout,
- hidden: true,
- // permissions: ["system:goods:add"],
- redirect: "noredirect",
- meta: {
- breadcrumb: false, // 濡傛灉璁剧疆涓篺alse锛屽垯涓嶄細鍦╞readcrumb闈㈠寘灞戜腑鏄剧ず
- activeMenu: "/scMould/warehouse/Sc_MouldProdBackBillList", // 褰撹矾鐢辫缃簡璇ュ睘鎬э紝鍒欎細楂樹寒鐩稿搴旂殑渚ц竟鏍忋��
- },
- children: [
- {
- path: "/scMould/warehouse/Sc_MouldProdBackBillList",
- component: () => import("@/views/scMould/warehouse/Sc_MouldProdBackBillList"),
- name: "Sc_MouldProdBackBillList",
- meta: { title: "鍣ㄥ叿棰嗙敤閫�搴撳崟缁存姢", activeMenu: "scMould/warehouse" },
- },
- ],
- },
- //鍣ㄥ叿棰嗙敤閫�搴撳崟
+ children: [
{
- path: "/scMould/warehouse/Sc_MouldProdBackBillEdit",
- component: Layout,
- hidden: true,
- redirect: "noredirect",
- meta: {
- breadcrumb: false, // 濡傛灉璁剧疆涓篺alse锛屽垯涓嶄細鍦╞readcrumb闈㈠寘灞戜腑鏄剧ず
- activeMenu: "/scMould/warehouse/Sc_MouldProdBackBillEdit", // 褰撹矾鐢辫缃簡璇ュ睘鎬э紝鍒欎細楂樹寒鐩稿搴旂殑渚ц竟鏍忋��
+ path: "/scMould/warehouse/Sc_MouldProdOutBillList",
+ component: () => import("@/views/scMould/warehouse/Sc_MouldProdOutBillList"),
+ name: "Sc_MouldProdOutBillList",
+ meta: { title: "鍣ㄥ叿棰嗙敤鍑哄簱鍗曠淮鎶�", activeMenu: "scMould/warehouse" },
},
- children: [
- {
- path: "/scMould/warehouse/Sc_MouldProdBackBillEdit",
- component: () => import("@/views/scMould/warehouse/Sc_MouldProdBackBillEdit"),
- name: "Sc_MouldProdBackBillEdit",
- meta: { title: "鍣ㄥ叿棰嗙敤閫�搴撳崟缂栬緫", activeMenu: "scMould/warehouse" },
- },
- ],
+ ],
+ },
+ //鍣ㄥ叿棰嗙敤鍑哄簱鍗�
+ {
+ path: "/scMould/warehouse/Sc_MouldProdOutBillEdit",
+ component: Layout,
+ hidden: true,
+ redirect: "noredirect",
+ meta: {
+ breadcrumb: false, // 濡傛灉璁剧疆涓篺alse锛屽垯涓嶄細鍦╞readcrumb闈㈠寘灞戜腑鏄剧ず
+ activeMenu: "/scMould/warehouse/Sc_MouldProdOutBillEdit", // 褰撹矾鐢辫缃簡璇ュ睘鎬э紝鍒欎細楂樹寒鐩稿搴旂殑渚ц竟鏍忋��
},
- //鍣ㄥ叿鐩存帴璋冩嫧鍗曠淮鎶�
- {
- path: "/scMould/warehouse/Sc_MouldProdMoveBillList",
- component: Layout,
- hidden: true,
- // permissions: ["system:goods:add"],
- redirect: "noredirect",
- meta: {
- breadcrumb: false, // 濡傛灉璁剧疆涓篺alse锛屽垯涓嶄細鍦╞readcrumb闈㈠寘灞戜腑鏄剧ず
- activeMenu: "/scMould/warehouse/Sc_MouldProdMoveBillList", // 褰撹矾鐢辫缃簡璇ュ睘鎬э紝鍒欎細楂樹寒鐩稿搴旂殑渚ц竟鏍忋��
+ children: [
+ {
+ path: "/scMould/warehouse/Sc_MouldProdOutBillEdit",
+ component: () => import("@/views/scMould/warehouse/Sc_MouldProdOutBillEdit"),
+ name: "Sc_MouldProdOutBillEdit",
+ meta: { title: "鍣ㄥ叿棰嗙敤鍑哄簱鍗曠紪杈�", activeMenu: "scMould/warehouse" },
},
- children: [
- {
- path: "/scMould/warehouse/Sc_MouldProdMoveBillList",
- component: () => import("@/views/scMould/warehouse/Sc_MouldProdMoveBillList"),
- name: "Sc_MouldProdMoveBillList",
- meta: { title: "鍣ㄥ叿鐩存帴璋冩嫧鍗曠淮鎶�", activeMenu: "scMould/warehouse" },
- },
- ],
+ ],
+ },
+ //鍣ㄥ叿棰嗙敤閫�搴撳崟缁存姢
+ {
+ path: "/scMould/warehouse/Sc_MouldProdBackBillList",
+ component: Layout,
+ hidden: true,
+ // permissions: ["system:goods:add"],
+ redirect: "noredirect",
+ meta: {
+ breadcrumb: false, // 濡傛灉璁剧疆涓篺alse锛屽垯涓嶄細鍦╞readcrumb闈㈠寘灞戜腑鏄剧ず
+ activeMenu: "/scMould/warehouse/Sc_MouldProdBackBillList", // 褰撹矾鐢辫缃簡璇ュ睘鎬э紝鍒欎細楂樹寒鐩稿搴旂殑渚ц竟鏍忋��
},
- //鍣ㄥ叿鐩存帴璋冩嫧鍗�
- {
- path: "/scMould/warehouse/Sc_MouldProdMoveBillEdit",
- component: Layout,
- hidden: true,
- redirect: "noredirect",
- meta: {
- breadcrumb: false, // 濡傛灉璁剧疆涓篺alse锛屽垯涓嶄細鍦╞readcrumb闈㈠寘灞戜腑鏄剧ず
- activeMenu: "/scMould/warehouse/Sc_MouldProdMoveBillEdit", // 褰撹矾鐢辫缃簡璇ュ睘鎬э紝鍒欎細楂樹寒鐩稿搴旂殑渚ц竟鏍忋��
+ children: [
+ {
+ path: "/scMould/warehouse/Sc_MouldProdBackBillList",
+ component: () => import("@/views/scMould/warehouse/Sc_MouldProdBackBillList"),
+ name: "Sc_MouldProdBackBillList",
+ meta: { title: "鍣ㄥ叿棰嗙敤閫�搴撳崟缁存姢", activeMenu: "scMould/warehouse" },
},
- children: [
- {
- path: "/scMould/warehouse/Sc_MouldProdMoveBillEdit",
- component: () => import("@/views/scMould/warehouse/Sc_MouldProdMoveBillEdit"),
- name: "Sc_MouldProdMoveBillEdit",
- meta: { title: "鍣ㄥ叿鐩存帴璋冩嫧鍗曠紪杈�", activeMenu: "scMould/warehouse" },
- },
- ],
+ ],
+ },
+ //鍣ㄥ叿棰嗙敤閫�搴撳崟
+ {
+ path: "/scMould/warehouse/Sc_MouldProdBackBillEdit",
+ component: Layout,
+ hidden: true,
+ redirect: "noredirect",
+ meta: {
+ breadcrumb: false, // 濡傛灉璁剧疆涓篺alse锛屽垯涓嶄細鍦╞readcrumb闈㈠寘灞戜腑鏄剧ず
+ activeMenu: "/scMould/warehouse/Sc_MouldProdBackBillEdit", // 褰撹矾鐢辫缃簡璇ュ睘鎬э紝鍒欎細楂樹寒鐩稿搴旂殑渚ц竟鏍忋��
},
+ children: [
+ {
+ path: "/scMould/warehouse/Sc_MouldProdBackBillEdit",
+ component: () => import("@/views/scMould/warehouse/Sc_MouldProdBackBillEdit"),
+ name: "Sc_MouldProdBackBillEdit",
+ meta: { title: "鍣ㄥ叿棰嗙敤閫�搴撳崟缂栬緫", activeMenu: "scMould/warehouse" },
+ },
+ ],
+ },
+ //鍣ㄥ叿鐩存帴璋冩嫧鍗曠淮鎶�
+ {
+ path: "/scMould/warehouse/Sc_MouldProdMoveBillList",
+ component: Layout,
+ hidden: true,
+ // permissions: ["system:goods:add"],
+ redirect: "noredirect",
+ meta: {
+ breadcrumb: false, // 濡傛灉璁剧疆涓篺alse锛屽垯涓嶄細鍦╞readcrumb闈㈠寘灞戜腑鏄剧ず
+ activeMenu: "/scMould/warehouse/Sc_MouldProdMoveBillList", // 褰撹矾鐢辫缃簡璇ュ睘鎬э紝鍒欎細楂樹寒鐩稿搴旂殑渚ц竟鏍忋��
+ },
+ children: [
+ {
+ path: "/scMould/warehouse/Sc_MouldProdMoveBillList",
+ component: () => import("@/views/scMould/warehouse/Sc_MouldProdMoveBillList"),
+ name: "Sc_MouldProdMoveBillList",
+ meta: { title: "鍣ㄥ叿鐩存帴璋冩嫧鍗曠淮鎶�", activeMenu: "scMould/warehouse" },
+ },
+ ],
+ },
+ //鍣ㄥ叿鐩存帴璋冩嫧鍗�
+ {
+ path: "/scMould/warehouse/Sc_MouldProdMoveBillEdit",
+ component: Layout,
+ hidden: true,
+ redirect: "noredirect",
+ meta: {
+ breadcrumb: false, // 濡傛灉璁剧疆涓篺alse锛屽垯涓嶄細鍦╞readcrumb闈㈠寘灞戜腑鏄剧ず
+ activeMenu: "/scMould/warehouse/Sc_MouldProdMoveBillEdit", // 褰撹矾鐢辫缃簡璇ュ睘鎬э紝鍒欎細楂樹寒鐩稿搴旂殑渚ц竟鏍忋��
+ },
+ children: [
+ {
+ path: "/scMould/warehouse/Sc_MouldProdMoveBillEdit",
+ component: () => import("@/views/scMould/warehouse/Sc_MouldProdMoveBillEdit"),
+ name: "Sc_MouldProdMoveBillEdit",
+ meta: { title: "鍣ㄥ叿鐩存帴璋冩嫧鍗曠紪杈�", activeMenu: "scMould/warehouse" },
+ },
+ ],
+ },
@@ -712,22 +799,275 @@
},
],
},
- //鏉冮檺鏌ヨ
+ //鍣ㄥ叿涓绘。缁存姢
{
- path: "/system/user/xtUserRightQuery",
+ path: "/scMould/basicModeling/Gy_MouldFileList",
component: Layout,
hidden: true,
redirect: "noredirect",
meta: {
breadcrumb: false, // 濡傛灉璁剧疆涓篺alse锛屽垯涓嶄細鍦╞readcrumb闈㈠寘灞戜腑鏄剧ず
- activeMenu: "/system/user/xtUserRightQuery", // 褰撹矾鐢辫缃簡璇ュ睘鎬э紝鍒欎細楂樹寒鐩稿搴旂殑渚ц竟鏍忋��
+ activeMenu: "/scMould/basicModeling/Gy_MouldFileList", // 褰撹矾鐢辫缃簡璇ュ睘鎬э紝鍒欎細楂樹寒鐩稿搴旂殑渚ц竟鏍忋��
},
children: [
{
- path: "/system/user/xtUserRightQuery",
- component: () => import("@/views/system/user/xtUserRightQuery.vue"),
- name: "XtUserRightQuery",
- meta: { title: "鏉冮檺鏌ヨ", activeMenu: "system/user" },
+ path: "/scMould/basicModeling/Gy_MouldFileList",
+ component: () =>
+ import("@/views/scMould/basicModeling/Gy_MouldFileList.vue"),
+ name: "Gy_MouldFileList",
+ meta: { title: "鍣ㄥ叿涓绘。缁存姢", activeMenu: "scMould/basicModeling" },
+ },
+ ],
+ },
+ {
+ path: "/scMould/basicModeling/Gy_MouldFile",
+ component: Layout,
+ hidden: true,
+ redirect: "noredirect",
+ meta: {
+ breadcrumb: false, // 濡傛灉璁剧疆涓篺alse锛屽垯涓嶄細鍦╞readcrumb闈㈠寘灞戜腑鏄剧ず
+ activeMenu: "/scMould/basicModeling/Gy_MouldFile", // 褰撹矾鐢辫缃簡璇ュ睘鎬э紝鍒欎細楂樹寒鐩稿搴旂殑渚ц竟鏍忋��
+ },
+ children: [
+ {
+ path: "/scMould/basicModeling/Gy_MouldFile",
+ component: () =>
+ import("@/views/scMould/basicModeling/Gy_MouldFile.vue"),
+ name: "Gy_MouldFile",
+ meta: { title: "鍣ㄥ叿涓绘。", activeMenu: "scMould/basicModeling" },
+ },
+ ],
+ },
+ {
+ path: "/scMould/basicModeling/Gy_MaterialPackingRelationList",
+ component: Layout,
+ hidden: true,
+ redirect: "noredirect",
+ meta: {
+ breadcrumb: false, // 濡傛灉璁剧疆涓篺alse锛屽垯涓嶄細鍦╞readcrumb闈㈠寘灞戜腑鏄剧ず
+ activeMenu: "/scMould/basicModeling/Gy_MaterialPackingRelationList", // 褰撹矾鐢辫缃簡璇ュ睘鎬э紝鍒欎細楂樹寒鐩稿搴旂殑渚ц竟鏍忋��
+ },
+ children: [
+ {
+ path: "/scMould/basicModeling/Gy_MaterialPackingRelationList",
+ component: () =>
+ import(
+ "@/views/scMould/basicModeling/Gy_MaterialPackingRelationList.vue"
+ ),
+ name: "Gy_MaterialPackingRelationList",
+ meta: {
+ title: "浜у搧鍖呰瀹瑰櫒鍏宠仈淇℃伅缁存姢",
+ activeMenu: "scMould/basicModeling",
+ },
+ },
+ ],
+ },
+ {
+ path: "/warehouse/barcodeMaster/Gy_BarCodeBill",
+ component: Layout,
+ hidden: true,
+ redirect: "noredirect",
+ meta: {
+ breadcrumb: false, // 濡傛灉璁剧疆涓篺alse锛屽垯涓嶄細鍦╞readcrumb闈㈠寘灞戜腑鏄剧ず
+ activeMenu: "/warehouse/barcodeMaster/Gy_BarCodeBill", // 褰撹矾鐢辫缃簡璇ュ睘鎬э紝鍒欎細楂樹寒鐩稿搴旂殑渚ц竟鏍忋��
+ },
+ children: [
+ {
+ path: "/warehouse/barcodeMaster/Gy_BarCodeBill",
+ component: () =>
+ import("@/views/warehouse/barcodeMaster/Gy_BarCodeBill.vue"),
+ name: "Gy_BarCodeBill",
+ meta: {
+ title: "鏉＄爜鐢熸垚",
+ activeMenu: "warehouse/barcodeMaster",
+ },
+ },
+ ],
+ },
+ {
+ path: "/warehouse/shipment/Kf_StockOutRequestBillList",
+ component: Layout,
+ hidden: true,
+ redirect: "noredirect",
+ meta: {
+ breadcrumb: false, // 濡傛灉璁剧疆涓篺alse锛屽垯涓嶄細鍦╞readcrumb闈㈠寘灞戜腑鏄剧ず
+ activeMenu: "/warehouse/shipment/Kf_StockOutRequestBillList", // 褰撹矾鐢辫缃簡璇ュ睘鎬э紝鍒欎細楂樹寒鐩稿搴旂殑渚ц竟鏍忋��
+ },
+ children: [
+ {
+ path: "/warehouse/shipment/Kf_StockOutRequestBillList",
+ component: () =>
+ import("@/views/warehouse/shipment/Kf_StockOutRequestBillList.vue"),
+ name: "Kf_StockOutRequestBillList",
+ meta: {
+ title: "鍑哄簱鐢宠鍗曠淮鎶�",
+ activeMenu: "warehouse/shipment",
+ },
+ },
+ ],
+ },
+ {
+ path: "/warehouse/shipment/Kf_StockOutRequestBill",
+ component: Layout,
+ hidden: true,
+ redirect: "noredirect",
+ meta: {
+ breadcrumb: false, // 濡傛灉璁剧疆涓篺alse锛屽垯涓嶄細鍦╞readcrumb闈㈠寘灞戜腑鏄剧ず
+ activeMenu: "/warehouse/shipment/Kf_StockOutRequestBill", // 褰撹矾鐢辫缃簡璇ュ睘鎬э紝鍒欎細楂樹寒鐩稿搴旂殑渚ц竟鏍忋��
+ },
+ children: [
+ {
+ path: "/warehouse/shipment/Kf_StockOutRequestBill",
+ component: () =>
+ import("@/views/warehouse/shipment/Kf_StockOutRequestBill.vue"),
+ name: "Kf_StockOutRequestBill",
+ meta: {
+ title: "鍑哄簱鐢宠鍗�",
+ activeMenu: "warehouse/shipment",
+ },
+ },
+ ],
+ },
+ {
+ path: "/warehouse/transfer/Kf_MoveStockRequestBillList",
+ component: Layout,
+ hidden: true,
+ redirect: "noredirect",
+ meta: {
+ breadcrumb: false, // 濡傛灉璁剧疆涓篺alse锛屽垯涓嶄細鍦╞readcrumb闈㈠寘灞戜腑鏄剧ず
+ activeMenu: "/warehouse/transfer/Kf_MoveStockRequestBillList", // 褰撹矾鐢辫缃簡璇ュ睘鎬э紝鍒欎細楂樹寒鐩稿搴旂殑渚ц竟鏍忋��
+ },
+ children: [
+ {
+ path: "/warehouse/transfer/Kf_MoveStockRequestBillList",
+ component: () =>
+ import("@/views/warehouse/transfer/Kf_MoveStockRequestBillList.vue"),
+ name: "Kf_MoveStockRequestBillList",
+ meta: {
+ title: "璋冩嫧鐢宠鍗曠淮鎶�",
+ activeMenu: "warehouse/transfer",
+ },
+ },
+ ],
+ },
+ {
+ path: "/warehouse/transfer/Kf_MoveStockRequestBillEdi",
+ component: Layout,
+ hidden: true,
+ redirect: "noredirect",
+ meta: {
+ breadcrumb: false, // 濡傛灉璁剧疆涓篺alse锛屽垯涓嶄細鍦╞readcrumb闈㈠寘灞戜腑鏄剧ず
+ activeMenu: "/warehouse/transfer/Kf_MoveStockRequestBillEdit", // 褰撹矾鐢辫缃簡璇ュ睘鎬э紝鍒欎細楂樹寒鐩稿搴旂殑渚ц竟鏍忋��
+ },
+ children: [
+ {
+ path: "/warehouse/transfer/Kf_MoveStockRequestBillEdit",
+ component: () =>
+ import("@/views/warehouse/transfer/Kf_MoveStockRequestBillEdit.vue"),
+ name: "Kf_MoveStockRequestBillEdit",
+ meta: {
+ title: "璋冩嫧鐢宠鍗�",
+ activeMenu: "warehouse/transfer",
+ },
+ },
+ ],
+ },
+ {
+ path: "/purchase/postockInBack/Kf_POStockInBackBillList",
+ component: Layout,
+ hidden: true,
+ redirect: "noredirect",
+ meta: {
+ breadcrumb: false, // 濡傛灉璁剧疆涓篺alse锛屽垯涓嶄細鍦╞readcrumb闈㈠寘灞戜腑鏄剧ず
+ activeMenu: "/purchase/postockInBack/Kf_POStockInBackBillList", // 褰撹矾鐢辫缃簡璇ュ睘鎬э紝鍒欎細楂樹寒鐩稿搴旂殑渚ц竟鏍忋��
+ },
+ children: [
+ {
+ path: "/purchase/postockInBack/Kf_POStockInBackBillList",
+ component: () =>
+ import("@/views/purchase/postockInBack/Kf_POStockInBackBillList.vue"),
+ name: "Kf_POStockInBackBillList",
+ meta: {
+ title: "閲囪喘閫�鏂欏崟缁存姢",
+ activeMenu: "purchase/postockInBack",
+ },
+ },
+ ],
+ },
+ //鐢熶骇鍏ュ簱鍗曞垪琛�
+ {
+ path: "/purchase/ProductInBill/ProductInBillList",
+ component: Layout,
+ hidden: true,
+ redirect: "noredirect",
+ meta: {
+ breadcrumb: false, // 濡傛灉璁剧疆涓篺alse锛屽垯涓嶄細鍦╞readcrumb闈㈠寘灞戜腑鏄剧ず
+ activeMenu: "/purchase/ProductInBill", // 褰撹矾鐢辫缃簡璇ュ睘鎬э紝鍒欎細楂樹寒鐩稿搴旂殑渚ц竟鏍忋��
+ },
+ children: [
+ {
+ path: "/purchase/ProductInBill/ProductInBillList",
+ component: () => import("@/views/ProductInBill/Kf_ProductInBillList.vue"),
+ name: "ProductInBillList",
+ meta: { title: "鐢熶骇鍏ュ簱鍗曞垪琛�", activeMenu: "/purchase/ProductInBill" },
+ },
+ ],
+ },
+ //鐢熶骇鍏ュ簱鍗�
+ {
+ path: "/purchase/ProductInBill/ProductInBillEdit",
+ component: Layout,
+ hidden: true,
+ redirect: "noredirect",
+ meta: {
+ breadcrumb: false, // 濡傛灉璁剧疆涓篺alse锛屽垯涓嶄細鍦╞readcrumb闈㈠寘灞戜腑鏄剧ず
+ activeMenu: "/purchase/ProductInBill", // 褰撹矾鐢辫缃簡璇ュ睘鎬э紝鍒欎細楂樹寒鐩稿搴旂殑渚ц竟鏍忋��
+ },
+ children: [
+ {
+ path: "/purchase/ProductInBill/ProductInBillEdit",
+ component: () => import("@/views/ProductInBill/Kf_ProductInBillEdit.vue"),
+ name: "ProductInBillEdit",
+ meta: { title: "鐢熶骇鍏ュ簱鍗�", activeMenu: "/purchase/ProductInBill" },
+ },
+ ],
+ },
+
+ //鍏朵粬鍑哄簱鍗曞垪琛�
+ {
+ path: "/purchase/OtherOutBill/OtherOutBillList",
+ component: Layout,
+ hidden: true,
+ redirect: "noredirect",
+ meta: {
+ breadcrumb: false, // 濡傛灉璁剧疆涓篺alse锛屽垯涓嶄細鍦╞readcrumb闈㈠寘灞戜腑鏄剧ず
+ activeMenu: "/purchase/OtherOutBill", // 褰撹矾鐢辫缃簡璇ュ睘鎬э紝鍒欎細楂樹寒鐩稿搴旂殑渚ц竟鏍忋��
+ },
+ children: [
+ {
+ path: "/purchase/OtherOutBill/OtherOutBillList",
+ component: () => import("@/views/KCGL/OtherOutBill/Kf_OtherOutBillList.vue"),
+ name: "OtherOutBillList",
+ meta: { title: "鍏朵粬鍑哄簱鍗曞垪琛�", activeMenu: "/views/KCGL/OtherOutBill" },
+ },
+ ],
+ },
+ //鍏朵粬鍑哄簱鍗�
+ {
+ path: "/purchase/OtherOutBill/OtherOutBillEdit",
+ component: Layout,
+ hidden: true,
+ redirect: "noredirect",
+ meta: {
+ breadcrumb: false, // 濡傛灉璁剧疆涓篺alse锛屽垯涓嶄細鍦╞readcrumb闈㈠寘灞戜腑鏄剧ず
+ activeMenu: "/purchase/OtherOutBill", // 褰撹矾鐢辫缃簡璇ュ睘鎬э紝鍒欎細楂樹寒鐩稿搴旂殑渚ц竟鏍忋��
+ },
+ children: [
+ {
+ path: "/purchase/OtherOutBill/OtherOutBillEdit",
+ component: () => import("@/views/KCGL/OtherOutBill/Kf_OtherOutBillEdit.vue"),
+ name: "OtherOutBillEdit",
+ meta: { title: "鍏朵粬鍑哄簱鍗�", activeMenu: "/views/KCGL/OtherOutBill" },
},
],
},
diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
index 892e963..6bf9aeb 100644
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -214,6 +214,171 @@
},
],
},
+ {
+ meta: {
+ icon: "build",
+ link: null,
+ noCache: false,
+ title: "閿�鍞��璐у崟",
+ },
+ hidden: false,
+ name: "StockBillMainList",
+ path: "StockBillMainList",
+ redirect: "noRedirect",
+ component: "Layout",
+ children: [
+ {
+ meta: {
+ icon: "build",
+ link: null,
+ noCache: false,
+ title: "閿�鍞��璐у崟缁存姢",
+ },
+ component: () =>import ("@/views/sell/Kf_ICStockBillMainList/Kf_ICStockBillMainList.vue"),
+ hidden: false,
+ name: "KfICStockBillMainList",
+ path: "KfICStockBillMainList",
+ },
+ {
+ meta: {
+ icon: "build",
+ link: null,
+ noCache: false,
+ title: "閿�鍞��璐у崟",
+ },
+ component: () =>import ("@/views/sell/Kf_ICStockBillMainList/Kf_ICStockBillMainListEdit.vue"),
+ hidden: false,
+ name: "KfICStockBillMainListEdit",
+ path: "KfICStockBillMainListEdit",
+ },
+ ],
+ },
+ ],
+ },
+ {
+ alwaysShow: true,
+ component: "Layout",
+ meta: {
+ icon: "build",
+ link: null,
+ noCache: false,
+ title: "浠撳簱绠＄悊",
+ },
+ hidden: false,
+ name: "Warehouse",
+ path: "/warehouse",
+ redirect: "noRedirect",
+ children: [
+ {
+ meta: {
+ icon: "build",
+ link: null,
+ noCache: false,
+ title: "棰嗘枡鍙戣揣",
+ },
+ hidden: false,
+ name: "Shipment",
+ path: "shipment",
+ redirect: "noRedirect",
+ component: "Layout",
+ children: [
+ {
+ meta: {
+ icon: "build",
+ link: null,
+ noCache: false,
+ title: "鍑哄簱鐢宠鍗曠淮鎶�",
+ },
+ component: () =>
+ import("@/views/warehouse/shipment/Kf_StockOutRequestBillList.vue"),
+ hidden: false,
+ name: "Kf_StockOutRequestBillList",
+ path: "Kf_StockOutRequestBillList",
+ },
+ {
+ meta: {
+ icon: "build",
+ link: null,
+ noCache: false,
+ title: "鍑哄簱鐢宠鍗�",
+ },
+ component: () =>
+ import("@/views/warehouse/shipment/Kf_StockOutRequestBill.vue"),
+ hidden: false,
+ name: "Kf_StockOutRequestBill",
+ path: "Kf_StockOutRequestBill",
+ },
+ ],
+ },
+ {
+ meta: {
+ icon: "build",
+ link: null,
+ noCache: false,
+ title: "璋冩嫧鐩樼偣",
+ },
+ hidden: false,
+ name: "Transfer",
+ path: "transfer",
+ redirect: "noRedirect",
+ component: "Layout",
+ children: [
+ {
+ meta: {
+ icon: "build",
+ link: null,
+ noCache: false,
+ title: "璋冩嫧鐢宠鍗曠淮鎶�",
+ },
+ component: () =>
+ import("@/views/warehouse/transfer/Kf_MoveStockRequestBillList.vue"),
+ hidden: false,
+ name: "Kf_MoveStockRequestBillList",
+ path: "Kf_MoveStockRequestBillList",
+ },
+ {
+ meta: {
+ icon: "build",
+ link: null,
+ noCache: false,
+ title: "璋冩嫧鐢宠鍗�",
+ },
+ component: () =>
+ import("@/views/warehouse/transfer/Kf_MoveStockRequestBillEdit.vue"),
+ hidden: false,
+ name: "Kf_MoveStockRequestBillEdit",
+ path: "Kf_MoveStockRequestBillEdit",
+ },
+ ],
+ },
+ {
+ meta: {
+ icon: "build",
+ link: null,
+ noCache: false,
+ title: "鏉＄爜涓绘。",
+ },
+ hidden: false,
+ name: "BarcodeMaster",
+ path: "barcodeMaster",
+ redirect: "noRedirect",
+ component: "Layout",
+ children: [
+ {
+ meta: {
+ icon: "build",
+ link: null,
+ noCache: false,
+ title: "鏉＄爜鐢熸垚",
+ },
+ component: () =>
+ import("@/views/warehouse/barcodeMaster/Gy_BarCodeBill.vue"),
+ hidden: false,
+ name: "Gy_BarCodeBill",
+ path: "Gy_BarCodeBill",
+ },
+ ],
+ },
],
},
{
@@ -335,14 +500,15 @@
name: "GySupplier",
path: "gySupplier",
},
- {
+ {
meta: {
icon: "build",
link: null,
noCache: false,
title: "鐗╂枡鍒楄〃",
},
- component: () => import("@/views/gyMaterial/GyMaterial.vue"),
+ component: () =>
+ import("@/views/gyMaterial/GyMaterial.vue"),
hidden: false,
name: "GyMaterial",
path: "GyMaterial",
@@ -411,7 +577,9 @@
title: "閲囪喘璁㈠崟",
},
component: () =>
- import("@/views/purchase/cgPoOrderBill/cgPoOrderBillEdit"),
+ import(
+ "@/views/purchase/cgPoOrderBill/cgPoOrderBillEdit"
+ ),
hidden: false,
name: "CgPoOrderBillEdit",
path: "cgPoOrderBillEdit",
@@ -484,7 +652,9 @@
title: "閲囪喘鍏ュ簱鍗曠淮鎶�",
},
component: () =>
- import("@/views/CaiGouGuanLi/CaiGouRuKu/Kf_POStockInBillList.vue"),
+ import(
+ "@/views/CaiGouGuanLi/CaiGouRuKu/Kf_POStockInBillList.vue"
+ ),
hidden: false,
name: "POStockInBillList",
path: "POStockInBillList",
@@ -497,7 +667,9 @@
title: "閲囪喘鍏ュ簱鍗�",
},
component: () =>
- import("@/views/CaiGouGuanLi/CaiGouRuKu/Kf_POStockInBillEdit.vue"),
+ import(
+ "@/views/CaiGouGuanLi/CaiGouRuKu/Kf_POStockInBillEdit.vue"
+ ),
hidden: false,
name: "POStockInBillEdit",
path: "POStockInBillEdit",
@@ -510,7 +682,9 @@
title: "鍒嗗竷寮忚皟鍏ュ崟缁存姢",
},
component: () =>
- import("@/views/FbStepFoldinBillList/fbStepFoldinBillList.vue"),
+ import(
+ "@/views/FbStepFoldinBillList/fbStepFoldinBillList.vue"
+ ),
hidden: false,
name: "FbStepFoldinBillList",
path: "FbStepFoldinBillList",
@@ -523,7 +697,9 @@
title: "鍒嗗竷寮忚皟鍑哄崟缁存姢",
},
component: () =>
- import("@/views/FbStepFoldOutBillList/fbStepFoldOutBillList.vue"),
+ import(
+ "@/views/FbStepFoldOutBillList/fbStepFoldOutBillList.vue"
+ ),
hidden: false,
name: "FbStepFoldOutBillList",
path: "FbStepFoldOutBillList",
@@ -531,46 +707,71 @@
],
},
{
- alwaysShow: true,
- component: "Layout",
meta: {
icon: "build",
link: null,
noCache: false,
- title: "绯荤粺绠＄悊",
+ title: "閲囪喘閫�鏂欏崟",
},
hidden: false,
- name: "System",
- path: "/system",
+ name: "PostockInBack",
+ path: "postockInBack",
redirect: "noRedirect",
+ component: "Layout",
children: [
{
meta: {
icon: "build",
link: null,
noCache: false,
- title: "鐢ㄦ埛绠＄悊",
+ title: "閲囪喘閫�鏂欏崟缁存姢",
},
+ component: () =>
+ import(
+ "@/views/purchase/postockInBack/Kf_POStockInBackBillList.vue"
+ ),
hidden: false,
- name: "User",
- path: "user",
- redirect: "noRedirect",
- component: "Layout",
- children: [
- {
- meta: {
- icon: "build",
- link: null,
- noCache: false,
- title: "鐢ㄦ埛鍒楄〃",
- },
- component: () =>
- import("@/views/system/user/xtUserList.vue"),
- hidden: false,
- name: "XtUserList",
- path: "xtUserList",
- },
- ],
+ name: "Kf_POStockInBackBillList",
+ path: "Kf_POStockInBackBillList",
+ },
+ ],
+ },
+ {
+ meta: {
+ icon: "build",
+ link: null,
+ noCache: false,
+ title: "鍏朵粬鍑哄簱鍗曠淮鎶�",
+ },
+ hidden: false,
+ name: "OtherOutBill",
+ path: "OtherOutBill",
+ redirect: "noRedirect",
+ component: "Layout",
+ children: [
+ {
+ meta: {
+ icon: "build",
+ link: null,
+ noCache: false,
+ title: "鍏朵粬鍑哄簱鍗曞垪琛�",
+ },
+ component: () => import("@/views/KCGL/OtherOutBill/Kf_OtherOutBillList.vue"),
+ hidden: false,
+ name: "OtherOutBillList",
+ path: "OtherOutBillList",
+ },
+ {
+ meta: {
+ icon: "build",
+ link: null,
+ noCache: false,
+ title: "鍏朵粬鍑哄簱鍗�",
+ },
+ component: () => import("@/views/KCGL/OtherOutBill/Kf_OtherOutBillEdit.vue"),
+ hidden: false,
+ name: "OtherOutBillEdit",
+ path: "OtherOutBillEdit",
},
],
},
@@ -615,6 +816,57 @@
name: "ScICMOBillList",
path: "scICMOBillList",
},
+ {
+ meta: {
+ icon: "build",
+ link: null,
+ noCache: false,
+ title: "鐢熶骇璁㈠崟",
+ },
+ component: () => import("@/views/ICMO/ScICMOBillEdit.vue"),
+ hidden: false,
+ name: "ScICMOBillEdit",
+ path: "scICMOBillEdit",
+ },
+ ],
+ },
+ {
+ meta: {
+ icon: "build",
+ link: null,
+ noCache: false,
+ title: "鐢熶骇鍏ュ簱缁存姢",
+ },
+ hidden: false,
+ name: "ProductInBill",
+ path: "ProductInBill",
+ redirect: "noRedirect",
+ component: "Layout",
+ children: [
+ {
+ meta: {
+ icon: "build",
+ link: null,
+ noCache: false,
+ title: "鐢熶骇鍏ュ簱鍒楄〃",
+ },
+ component: () => import("@/views/ProductInBill/Kf_ProductInBillList.vue"),
+ hidden: false,
+ name: "ProductInBillList",
+ path: "ProductInBillList",
+ },
+ {
+ meta: {
+ icon: "build",
+ link: null,
+ noCache: false,
+ title: "鐢熶骇鍏ュ簱鍗�",
+ },
+ component: () => import("@/views/ProductInBill/Kf_ProductInBillEdit.vue"),
+ hidden: false,
+ name: "ProductInBillEdit",
+ path: "ProductInBillEdit",
+ },
],
},
],
@@ -653,7 +905,10 @@
noCache: false,
title: "鍣ㄥ叿棰嗙敤鍑哄簱鍗曠淮鎶�",
},
- component: () => import("@/views/scMould/warehouse/Sc_MouldProdOutBillList"),
+ component: () =>
+ import(
+ "@/views/scMould/warehouse/Sc_MouldProdOutBillList"
+ ),
hidden: false,
name: "Sc_MouldProdOutBillList",
path: "Sc_MouldProdOutBillList",
@@ -665,7 +920,10 @@
noCache: false,
title: "鍣ㄥ叿棰嗙敤鍑哄簱鍗�",
},
- component: () => import("@/views/scMould/warehouse/Sc_MouldProdOutBillEdit"),
+ component: () =>
+ import(
+ "@/views/scMould/warehouse/Sc_MouldProdOutBillEdit"
+ ),
hidden: false,
name: "Sc_MouldProdOutBillEdit",
path: "Sc_MouldProdOutBillEdit",
@@ -677,7 +935,10 @@
noCache: false,
title: "鍣ㄥ叿棰嗙敤閫�搴撳崟缁存姢",
},
- component: () => import("@/views/scMould/warehouse/Sc_MouldProdBackBillList"),
+ component: () =>
+ import(
+ "@/views/scMould/warehouse/Sc_MouldProdBackBillList"
+ ),
hidden: false,
name: "Sc_MouldProdBackBillList",
path: "Sc_MouldProdBackBillList",
@@ -689,7 +950,10 @@
noCache: false,
title: "鍣ㄥ叿棰嗙敤閫�搴撳崟",
},
- component: () => import("@/views/scMould/warehouse/Sc_MouldProdBackBillEdit"),
+ component: () =>
+ import(
+ "@/views/scMould/warehouse/Sc_MouldProdBackBillEdit"
+ ),
hidden: false,
name: "Sc_MouldProdBackBillEdit",
path: "Sc_MouldProdBackBillEdit",
@@ -701,7 +965,10 @@
noCache: false,
title: "鍣ㄥ叿鐩存帴璋冩嫧鍗曠淮鎶�",
},
- component: () => import("@/views/scMould/warehouse/Sc_MouldProdMoveBillList"),
+ component: () =>
+ import(
+ "@/views/scMould/warehouse/Sc_MouldProdMoveBillList"
+ ),
hidden: false,
name: "Sc_MouldProdMoveBillList",
path: "Sc_MouldProdMoveBillList",
@@ -713,13 +980,74 @@
noCache: false,
title: "鍣ㄥ叿鐩存帴璋冩嫧鍗�",
},
- component: () => import("@/views/scMould/warehouse/Sc_MouldProdMoveBillEdit"),
+ component: () =>
+ import(
+ "@/views/scMould/warehouse/Sc_MouldProdMoveBillEdit"
+ ),
hidden: false,
name: "Sc_MouldProdMoveBillEdit",
path: "Sc_MouldProdMoveBillEdit",
},
],
- }
+ },
+ {
+ meta: {
+ icon: "build",
+ link: null,
+ noCache: false,
+ title: "鍩虹寤烘ā",
+ },
+ hidden: false,
+ name: "BasicModeling",
+ path: "basicModeling",
+ redirect: "noRedirect",
+ component: "Layout",
+ children: [
+ {
+ meta: {
+ icon: "build",
+ link: null,
+ noCache: false,
+ title: "鍣ㄥ叿涓绘。",
+ },
+ component: () =>
+ import("@/views/scMould/basicModeling/Gy_MouldFile.vue"),
+ hidden: false,
+ name: "Gy_MouldFile",
+ path: "Gy_MouldFile",
+ },
+ {
+ meta: {
+ icon: "build",
+ link: null,
+ noCache: false,
+ title: "鍣ㄥ叿涓绘。缁存姢",
+ },
+ component: () =>
+ import(
+ "@/views/scMould/basicModeling/Gy_MouldFileList.vue"
+ ),
+ hidden: false,
+ name: "Gy_MouldFileList",
+ path: "Gy_MouldFileList",
+ },
+ {
+ meta: {
+ icon: "build",
+ link: null,
+ noCache: false,
+ title: "浜у搧鍖呰瀹瑰櫒鍏宠仈淇℃伅缁存姢",
+ },
+ component: () =>
+ import(
+ "@/views/scMould/basicModeling/Gy_MaterialPackingRelationList.vue"
+ ),
+ hidden: false,
+ name: "Gy_MaterialPackingRelationList",
+ path: "Gy_MaterialPackingRelationList",
+ },
+ ],
+ },
],
},
{
@@ -771,7 +1099,7 @@
},
component: () =>
import("@/views/system/user/xtUserRightQuery.vue"),
- hidden: false,
+ hidden: true,
name: "XtUserRightQuery",
path: "xtUserRightQuery",
},
diff --git a/src/views/CaiGouGuanLi/CaiGouRuKu/Kf_POStockInBillList.vue b/src/views/CaiGouGuanLi/CaiGouRuKu/Kf_POStockInBillList.vue
index f47dfc5..1b1a2e0 100644
--- a/src/views/CaiGouGuanLi/CaiGouRuKu/Kf_POStockInBillList.vue
+++ b/src/views/CaiGouGuanLi/CaiGouRuKu/Kf_POStockInBillList.vue
@@ -147,6 +147,9 @@
<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-col>
</el-row>
<div class="tableBox" v-loading="loading">
<el-table :data="tableData" ref="tableData" max-height="710" :summary-method="getSummaries"
@@ -190,6 +193,8 @@
HModName='Kf_POStockInBillList' @rowEditClose="rowSetClose" v-if="printListShow" />
<!-- <div>111</div> -->
</el-dialog>
+ <!-- 鏉＄爜鏄庣粏 -->
+ <BarCodeDetail :visible.sync="barCodeDetailShow" ref="barcodeDetail"/>
</div>
</div>
</template>
@@ -199,11 +204,12 @@
import moment from 'moment'; //瀵煎嚭缁勪欢
import RowSettings from '@/views/component/rowSettings' //鍒楄缃粍浠�
import PrintList from '@/views/component/printList' //鎵撳嵃缁勪欢
+import BarCodeDetail from '@/views/component/BarCodeDetail' //鏉＄爜鏄庣粏缁勪欢
import Edit from '@/views/CaiGouGuanLi/CaiGouRuKu/Kf_POStockInBillEdit' //缂栬緫椤甸潰缁勪欢
export default {
name: 'Kf_POStockInBillList',
- components: { RowSettings, Edit, PrintList },
+ components: { RowSettings, Edit, PrintList,BarCodeDetail },
data() {
return {
baseURL: process.env.VUE_APP_BASE_API, //鍚庣鎺ュ彛鍓嶇紑(鍚庣鏈嶅姟鍣╥p鍦板潃)
@@ -258,6 +264,7 @@
btnHideShow: false, //鎸夐挳缁勪欢鏄剧ず鏍囪
openRowHide: false, //鍒楄缃粍浠舵樉绀烘爣璁�
rowHideShow: false, //鍒楄缃粍浠跺鍣ㄦ樉绀烘爣璁�
+ barCodeDetailShow: false, //鏉＄爜鏄庣粏缁勪欢瀹瑰櫒鏄剧ず鏍囪
@@ -843,6 +850,19 @@
},
//#endregion
+ //#region 鏉＄爜鏄庣粏
+ get_BarCodeDetail() {
+ // if (this.selectedRow.length !== 1) {
+ // this.$message.warning('璇烽�夋嫨涓�琛屾暟鎹煡鐪嬫潯鐮佹槑缁嗭紒')
+ // return
+ // }
+ this.barCodeDetailShow = true
+ this.$nextTick(() => {
+ this.$refs.barcodeDetail.open(this.rowForm)
+ })
+ },
+ //#endregion
+
//#region 閫�鍑�
close() {
// this.reset()
diff --git a/src/views/GyCustomer/CustomerEdit/index.vue b/src/views/GyCustomer/CustomerEdit/index.vue
index c5f1c65..5fb9f44 100644
--- a/src/views/GyCustomer/CustomerEdit/index.vue
+++ b/src/views/GyCustomer/CustomerEdit/index.vue
@@ -1,6 +1,6 @@
<template>
<div class="customer-edit">
- <el-dialog
+ <!-- <el-dialog
:title="dialogTitle"
:visible.sync="openEdit"
width="1480px"
@@ -8,7 +8,7 @@
class="customerBox"
:before-close="handleClose"
:close-on-click-modal="false"
- >
+ > -->
<div class="dialog-content">
<el-card style="margin-bottom: 10px;">
<div class="card-header">
@@ -397,7 +397,7 @@
:visible.sync="customerTypeDialogVisible"
@selected="handleCustomerTypeSelected"
/>
- </el-dialog>
+ <!-- </el-dialog> -->
</div>
</template>
diff --git a/src/views/GyCustomer/index.vue b/src/views/GyCustomer/index.vue
index 093a1eb..51f44d3 100644
--- a/src/views/GyCustomer/index.vue
+++ b/src/views/GyCustomer/index.vue
@@ -3,25 +3,13 @@
<el-card style="margin-bottom: 10px;">
<el-form :inline="true" :model="queryParams" ref="queryForm" class="mb8">
<el-form-item label="瀹㈡埛浠ｇ爜" prop="HNumber">
- <el-input
- v-model="queryParams.HNumber"
- placeholder="璇疯緭鍏ュ鎴蜂唬鐮�"
- style="width: 160px"
- />
+ <el-input v-model="queryParams.HNumber" placeholder="璇疯緭鍏ュ鎴蜂唬鐮�" style="width: 160px" />
</el-form-item>
<el-form-item label="瀹㈡埛鍚嶇О" prop="HName">
- <el-input
- v-model="queryParams.HName"
- placeholder="璇疯緭鍏ュ鎴峰悕绉�"
- style="width: 160px"
- />
+ <el-input v-model="queryParams.HName" placeholder="璇疯緭鍏ュ鎴峰悕绉�" style="width: 160px" />
</el-form-item>
<el-form-item label="閲嶆柊鍚屾">
- <el-input
- v-model="queryParams.HNumber2"
- placeholder="璇疯緭鍏ュ鎴蜂唬鐮�"
- style="width: 160px"
- />
+ <el-input v-model="queryParams.HNumber2" placeholder="璇疯緭鍏ュ鎴蜂唬鐮�" style="width: 160px" />
<el-button type="primary" @click="handleResCnz" style="margin-left: 10px">閲嶆柊鍚屾</el-button>
</el-form-item>
<el-form-item>
@@ -40,126 +28,66 @@
<el-form-item label-width="0">
<el-row>
<el-col :span="7">
- <el-select
- v-model="queryParams.ColName"
- placeholder="璇烽�夋嫨"
- style="width: 100%"
- >
+ <el-select v-model="queryParams.ColName" placeholder="璇烽�夋嫨" style="width: 100%">
<el-option value="0" label=""></el-option>
- <el-option
- v-for="(item, index) in visibleColumns"
- :key="index"
- :label="item.title"
- :value="item.field"
- ></el-option>
+ <el-option v-for="(item, index) in visibleColumns" :key="index" :label="item.title"
+ :value="item.field"></el-option>
</el-select>
</el-col>
<el-col :span="6" style="padding: 0 10px">
- <el-select
- v-model="queryParams.Comparator"
- placeholder="璇烽�夋嫨"
- style="width: 100%"
- >
+ <el-select v-model="queryParams.Comparator" placeholder="璇烽�夋嫨" style="width: 100%">
<el-option value="0" label=""></el-option>
- <el-option
- v-for="(item, index) in comparatorList"
- :key="index"
- :label="item.label"
- :value="item.value"
- ></el-option>
+ <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-input v-model="queryParams.ColContent" placeholder="璇疯緭鍏�" clearable
+ @keyup.enter.native="handleQuery" />
</el-col>
</el-row>
</el-form-item>
<el-form-item label-width="0">
<el-row>
<el-col :span="7">
- <el-select
- v-model="queryParams.ColName1"
- placeholder="璇烽�夋嫨"
- style="width: 100%"
- >
+ <el-select v-model="queryParams.ColName1" placeholder="璇烽�夋嫨" style="width: 100%">
<el-option value="0" label=""></el-option>
- <el-option
- v-for="(item, index) in visibleColumns"
- :key="index"
- :label="item.title"
- :value="item.field"
- ></el-option>
+ <el-option v-for="(item, index) in visibleColumns" :key="index" :label="item.title"
+ :value="item.field"></el-option>
</el-select>
</el-col>
<el-col :span="6" style="padding: 0 10px">
- <el-select
- v-model="queryParams.Comparator1"
- placeholder="璇烽�夋嫨"
- style="width: 100%"
- >
+ <el-select v-model="queryParams.Comparator1" placeholder="璇烽�夋嫨" style="width: 100%">
<el-option value="0" label=""></el-option>
- <el-option
- v-for="(item, index) in comparatorList"
- :key="index"
- :label="item.label"
- :value="item.value"
- ></el-option>
+ <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-input v-model="queryParams.ColContent1" placeholder="璇疯緭鍏�" clearable
+ @keyup.enter.native="handleQuery" />
</el-col>
</el-row>
</el-form-item>
<el-form-item label-width="0">
<el-row>
<el-col :span="7">
- <el-select
- v-model="queryParams.ColName2"
- placeholder="璇烽�夋嫨"
- style="width: 100%"
- >
+ <el-select v-model="queryParams.ColName2" placeholder="璇烽�夋嫨" style="width: 100%">
<el-option value="0" label=""></el-option>
- <el-option
- v-for="(item, index) in visibleColumns"
- :key="index"
- :label="item.title"
- :value="item.field"
- ></el-option>
+ <el-option v-for="(item, index) in visibleColumns" :key="index" :label="item.title"
+ :value="item.field"></el-option>
</el-select>
</el-col>
<el-col :span="6" style="padding: 0 10px">
- <el-select
- v-model="queryParams.Comparator2"
- placeholder="璇烽�夋嫨"
- style="width: 100%"
- >
+ <el-select v-model="queryParams.Comparator2" placeholder="璇烽�夋嫨" style="width: 100%">
<el-option value="0" label=""></el-option>
- <el-option
- v-for="(item, index) in comparatorList"
- :key="index"
- :label="item.label"
- :value="item.value"
- ></el-option>
+ <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-input v-model="queryParams.ColContent2" placeholder="璇疯緭鍏�" clearable
+ @keyup.enter.native="handleQuery" />
</el-col>
</el-row>
</el-form-item>
@@ -169,189 +97,73 @@
</el-collapse>
</el-form>
-
+
<div style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393;margin: 20px 0;">
{{ currentFilterScheme }}
</div>
</el-card>
-
+
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
- <el-button
- type="warning"
- plain
- icon="el-icon-upload2"
- size="mini"
- @click="handleImport"
- >瀵煎叆</el-button
- >
+ <el-button type="warning" plain icon="el-icon-upload2" size="mini" @click="handleImport">瀵煎叆</el-button>
</el-col>
<el-col :span="1.5">
- <el-button
- type="warning"
- plain
- icon="el-icon-download"
- size="mini"
- @click="handleExport"
- >瀵煎嚭</el-button
- >
+ <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport">瀵煎嚭</el-button>
</el-col>
<el-col :span="1.5">
- <el-button
- type="primary"
- plain
- icon="el-icon-document"
- size="mini"
- @click="handleNumAdd"
- >娴佹按鍙锋柊澧�</el-button
- >
+ <el-button type="primary" plain icon="el-icon-document" size="mini" @click="handleNumAdd">娴佹按鍙锋柊澧�</el-button>
</el-col>
<el-col :span="1.5">
- <el-button
- type="primary"
- plain
- icon="el-icon-plus"
- size="mini"
- @click="handleAdd"
- >鏂板</el-button
- >
+ <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd">鏂板</el-button>
</el-col>
<el-col :span="1.5">
- <el-button
- type="success"
- plain
- icon="el-icon-document-copy"
- size="mini"
- :disabled="single"
- @click="handleCopy"
- >澶嶅埗</el-button
- >
+ <el-button type="success" plain icon="el-icon-document-copy" size="mini" :disabled="single"
+ @click="handleCopy">澶嶅埗</el-button>
</el-col>
<el-col :span="1.5">
- <el-button
- type="success"
- plain
- icon="el-icon-edit"
- size="mini"
- :disabled="single"
- @click="handleEdit"
- >缂栬緫</el-button
- >
+ <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single"
+ @click="handleEdit">缂栬緫</el-button>
</el-col>
<el-col :span="1.5">
- <el-button
- type="danger"
- plain
- icon="el-icon-delete"
- size="mini"
- :disabled="single"
- @click="handleDelete"
- >鍒犻櫎</el-button
- >
+ <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="single"
+ @click="handleDelete">鍒犻櫎</el-button>
</el-col>
<el-col :span="1.5">
- <el-button
- type="success"
- plain
- icon="el-icon-check"
- size="mini"
- :disabled="single"
- @click="handleAudit(0)"
- >瀹℃牳</el-button
- >
+ <el-button type="success" plain icon="el-icon-check" size="mini" :disabled="single"
+ @click="handleAudit(0)">瀹℃牳</el-button>
</el-col>
<el-col :span="1.5">
- <el-button
- type="success"
- plain
- icon="el-icon-close"
- size="mini"
- :disabled="single"
- @click="handleAudit(1)"
- >鍙嶅鏍�</el-button
- >
+ <el-button type="success" plain icon="el-icon-close" size="mini" :disabled="single"
+ @click="handleAudit(1)">鍙嶅鏍�</el-button>
</el-col>
<el-col :span="1.5">
- <el-button
- type="warning"
- plain
- icon="el-icon-turn-off"
- size="mini"
- :disabled="single"
- @click="handleStop(0)"
- >绂佺敤</el-button
- >
+ <el-button type="warning" plain icon="el-icon-turn-off" size="mini" :disabled="single"
+ @click="handleStop(0)">绂佺敤</el-button>
</el-col>
<el-col :span="1.5">
- <el-button
- type="warning"
- plain
- icon="el-icon-open"
- size="mini"
- :disabled="single"
- @click="handleStop(1)"
- >鍙嶇鐢�</el-button
- >
+ <el-button type="warning" plain icon="el-icon-open" size="mini" :disabled="single"
+ @click="handleStop(1)">鍙嶇鐢�</el-button>
</el-col>
<el-col :span="1.5">
- <el-button
- type="info"
- plain
- icon="el-icon-setting"
- size="mini"
- @click="handleColumnSetting"
- >鍒楄缃�</el-button
- >
+ <el-button type="info" plain icon="el-icon-setting" size="mini" @click="handleColumnSetting">鍒楄缃�</el-button>
</el-col>
<el-col :span="1.5">
- <el-button
- type="info"
- plain
- icon="el-icon-s-operation"
- size="mini"
- @click="handleButtonSetting"
- >鎸夐挳璁剧疆</el-button
- >
+ <el-button type="info" plain icon="el-icon-s-operation" size="mini"
+ @click="handleButtonSetting">鎸夐挳璁剧疆</el-button>
</el-col>
<el-col :span="1.5">
- <el-button
- type="primary"
- plain
- icon="el-icon-folder-checked"
- size="mini"
- @click="handleSaveScheme"
- >淇濆瓨鏂规</el-button
- >
+ <el-button type="primary" plain icon="el-icon-folder-checked" size="mini"
+ @click="handleSaveScheme">淇濆瓨鏂规</el-button>
</el-col>
<el-col :span="1.5">
- <el-button
- type="primary"
- plain
- icon="el-icon-folder-opened"
- size="mini"
- @click="handleReadScheme"
- >璇诲彇鏂规</el-button
- >
+ <el-button type="primary" plain icon="el-icon-folder-opened" size="mini"
+ @click="handleReadScheme">璇诲彇鏂规</el-button>
</el-col>
<el-col :span="1.5">
- <el-button
- type="info"
- plain
- icon="el-icon-refresh"
- size="mini"
- @click="handleRefresh"
- >鍒锋柊</el-button
- >
+ <el-button type="info" plain icon="el-icon-refresh" size="mini" @click="handleRefresh">鍒锋柊</el-button>
</el-col>
<el-col :span="1.5">
- <el-button
- type="info"
- plain
- icon="el-icon-close"
- size="mini"
- @click="handleExit"
- >閫�鍑�</el-button
- >
+ <el-button type="info" plain icon="el-icon-close" size="mini" @click="handleExit">閫�鍑�</el-button>
</el-col>
</el-row>
@@ -361,15 +173,8 @@
<div slot="header">
<span>瀹㈡埛鍒嗙被</span>
</div>
- <el-tree
- :data="treeData"
- :props="treeProps"
- node-key="id"
- default-expand-all
- :expand-on-click-node="false"
- @node-click="handleTreeNodeClick"
- :highlight-current="true"
- >
+ <el-tree :data="treeData" :props="treeProps" node-key="id" default-expand-all :expand-on-click-node="false"
+ @node-click="handleTreeNodeClick" :highlight-current="true">
<span class="custom-tree-node" slot-scope="{ node, data }">
<span>{{ node.label }}</span>
</span>
@@ -377,42 +182,20 @@
</el-card>
</el-col>
-
+
<el-col :span="20">
<div class="tableBox" v-loading="loading">
- <el-table
- :data="tableData"
- ref="tableData"
- height="600"
- @selection-change="handleSelectionChange"
- border
- @row-click="handleRowClick"
- :row-style="rowStyle"
- @cell-dblclick="handleDblclick"
- v-if="tableShow"
- >
+ <el-table :data="tableData" ref="tableData" height="600" @selection-change="handleSelectionChange" border
+ @row-click="handleRowClick" :row-style="rowStyle" @cell-dblclick="handleDblclick" v-if="tableShow">
<el-table-column type="selection" width="55" align="center" fixed="left" />
<el-table-column prop="hmainid" label="鍗曟嵁ID" v-if="false" />
- <el-table-column
- v-for="(item, index) in btList"
- :key="index"
- :align="item.align"
- :prop="item.field"
- :label="item.title"
- :width="item.width"
- v-if="!item.hide"
- :sortable="item.sort"
- show-overflow-tooltip
- :fixed="item.fixed"
- >
+ <el-table-column v-for="(item, index) in btList" :key="index" :align="item.align" :prop="item.field"
+ :label="item.title" :width="item.width" v-if="!item.hide" :sortable="item.sort" show-overflow-tooltip
+ :fixed="item.fixed">
<template slot-scope="{ row, column }">
<div :style="item.style">
- <el-button
- type="text"
- @click="handleCustomerCodeClick(row)"
- v-if="column.property === '瀹㈡埛浠ｇ爜'"
- >{{ row[column.property] }}</el-button
- >
+ <el-button type="text" @click="handleCustomerCodeClick(row)" v-if="column.property === '瀹㈡埛浠ｇ爜'">{{
+ row[column.property] }}</el-button>
<span v-else-if="(column.property || '').includes('鏃堕棿') || (column.property || '').includes('鏃ユ湡')">
{{ formatDate(row[column.property]) }}
</span>
@@ -421,37 +204,20 @@
</template>
</el-table-column>
</el-table>
- <pagination
- v-show="total > 0"
- :total="total"
- :page.sync="page"
- :limit.sync="pageSize"
- :pageSizes="pageSizes"
- @pagination="getList"
- />
+ <pagination v-show="total > 0" :total="total" :page.sync="page" :limit.sync="pageSize" :pageSizes="pageSizes"
+ @pagination="getList" />
</div>
</el-col>
</el-row>
-
+
<el-card v-if="selectedRow" style="margin-top: 20px">
<div slot="header">
<span>鍏宠仈鐢ㄦ埛</span>
</div>
- <el-table
- :data="relationUserData"
- height="300"
- border
- v-loading="relationLoading"
- >
- <el-table-column
- v-for="(item, index) in relationUserColumns"
- :key="index"
- :prop="item.field"
- :label="item.title"
- :width="item.width"
- :align="item.align"
- >
+ <el-table :data="relationUserData" height="300" border v-loading="relationLoading">
+ <el-table-column v-for="(item, index) in relationUserColumns" :key="index" :prop="item.field"
+ :label="item.title" :width="item.width" :align="item.align">
<template slot-scope="{ row, column }">
<span v-if="column.property.includes('鏃堕棿') || column.property.includes('鏃ユ湡')">
{{ formatDate(row[column.property]) }}
@@ -462,80 +228,37 @@
</el-table>
</el-card>
- <el-dialog
- title="闅愯棌鍒楄缃�"
- :visible.sync="openColumnSetting"
- width="816px"
- append-to-body
- >
- <RowSettings
- :colName="btResList"
- :HModName="HModName"
- @rowEditClose="columnSettingClose"
- v-if="columnSettingShow"
- />
+ <el-dialog title="闅愯棌鍒楄缃�" :visible.sync="openColumnSetting" width="816px" append-to-body>
+ <RowSettings :colName="btResList" :HModName="HModName" @rowEditClose="columnSettingClose"
+ v-if="columnSettingShow" />
</el-dialog>
- <el-dialog
- title="缂栬緫瀹㈡埛"
- :visible.sync="openEdit"
- width="1480px"
- append-to-body
- class="customerBox"
- :before-close="closeEdit"
- >
- <CustomerEdit
- :OperationType="OperationType"
- :linterid="selectedRow ? selectedRow.HItemID : ''"
- :HSouceBillType="''"
- :HCusTypeID="currentCusTypeID"
- :HCusClsName="currentCusClsName"
- @editClose="editClose"
- v-if="editShow"
- />
+ <el-dialog title="缂栬緫瀹㈡埛" :visible.sync="openEdit" width="1480px" append-to-body class="customerBox"
+ :before-close="closeEdit">
+ <CustomerEdit :OperationType="OperationType" :linterid="selectedRow ? selectedRow.HItemID : ''"
+ :HSouceBillType="''" :HCusTypeID="currentCusTypeID" :HCusClsName="currentCusClsName" @editClose="editClose"
+ v-if="editShow" />
</el-dialog>
- <el-dialog
- :title="upload.title"
- :visible.sync="upload.open"
- width="1500px"
- append-to-body
- >
+ <el-dialog :title="upload.title" :visible.sync="upload.open" width="1500px" append-to-body>
<div style="margin-top: -20px">
<el-button type="primary" @click="handleImportSubmit">瀵煎叆鏁版嵁</el-button>
<el-button type="primary" @click="upload.open = false">閫� 鍑�</el-button>
- <el-upload
- ref="upload"
- :limit="1"
- accept=".xlsx, .xls"
- style="display: inline-block; margin-left: 10px"
- :action="upload.url + '?updateSupport=' + upload.updateSupport"
- :disabled="upload.isUploading"
- :on-progress="handleFileUploadProgress"
- :on-success="handleFileSuccess"
- >
+ <el-upload ref="upload" :limit="1" accept=".xlsx, .xls" style="display: inline-block; margin-left: 10px"
+ :action="upload.url + '?updateSupport=' + upload.updateSupport" :disabled="upload.isUploading"
+ :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess">
<el-button type="primary">鏂囦欢涓婁紶</el-button>
</el-upload>
</div>
- <el-table
- :data="uploadData"
- v-loading="uploadTableLoading"
- border
- height="550"
- >
+ <el-table :data="uploadData" v-loading="uploadTableLoading" border height="550">
<el-table-column type="index" label="搴忓彿" width="55" align="center" />
<el-table-column label="瀹㈡埛浠ｇ爜" prop="瀹㈡埛浠ｇ爜" align="center" width="120" />
<el-table-column label="瀹㈡埛鍚嶇О" prop="瀹㈡埛鍚嶇О" align="center" width="120" />
<el-table-column label="瀹㈡埛鍒嗙被" prop="瀹㈡埛鍒嗙被" align="center" width="120" />
<el-table-column label="鎿嶄綔" align="center">
<template slot-scope="scope">
- <el-button
- size="mini"
- type="text"
- icon="el-icon-delete"
- @click="uploadDataDelete(scope.$index)"
- >鍒犻櫎</el-button
- >
+ <el-button size="mini" type="text" icon="el-icon-delete"
+ @click="uploadDataDelete(scope.$index)">鍒犻櫎</el-button>
</template>
</el-table-column>
</el-table>
@@ -550,21 +273,21 @@
export default {
name: "GyCustomer",
- components: { RowSettings ,CustomerEdit},
+ components: { RowSettings, CustomerEdit },
props: {
openPage: { type: String },
},
data() {
return {
-
- activeCollapse: [],
-
+
+ activeCollapse: [],
+
HModName: "Gy_Customer",
HModuleName: "瀹㈡埛鍒楄〃缁存姢",
HClassTag: "ForFilteringSchemes",
-
-
+
+
treeData: [],
treeProps: {
children: 'children',
@@ -572,18 +295,18 @@
},
currentCusTypeID: 0,
currentCusClsName: '',
-
-
+
+
editShow: false,
openEdit: false,
OperationType: null,
-
+
columnSettingShow: false,
openColumnSetting: false,
-
+
tableShow: true,
loading: true,
-
+
queryParams: {
HNumber: null,
HName: null,
@@ -598,10 +321,10 @@
ColContent1: "",
ColContent2: "",
},
-
+
currentFilterScheme: "",
HInterID_Choose: 0,
-
+
comparatorList: [
{ label: "=", value: "=" },
{ label: ">=", value: ">=" },
@@ -614,7 +337,7 @@
{ label: "鍙冲寘鍚�", value: "9" },
{ label: "涓嶅寘鍚�", value: "10" },
],
-
+
sWhere: "",
selectedRow: null,
ids: [],
@@ -628,11 +351,11 @@
page: 1,
pageSize: 50,
total: 0,
-
+
relationUserData: [],
relationUserColumns: [],
relationLoading: false,
-
+
upload: {
open: false,
title: "瀵煎叆",
@@ -642,7 +365,7 @@
},
uploadData: [],
uploadTableLoading: false,
-
+
baseURL: process.env.VUE_APP_BASE_URL || "http://47.96.97.237/API/",
user: "admin",
};
@@ -672,7 +395,7 @@
this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
});
},
-
+
getTreeData() {
axios
.get(this.baseURL + "/Gy_BadReason/Gy_CusTypeTreeListByLevel")
@@ -685,7 +408,7 @@
this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
});
},
-
+
getList() {
this.tableShow = false;
this.loading = true;
@@ -724,7 +447,7 @@
this.loading = false;
});
},
-
+
setDefaultColumns() {
this.btList = [
{ type: 'checkbox', fixed: 'left' },
@@ -740,13 +463,13 @@
{ field: '鍒涘缓鏃堕棿', title: '鍒涘缓鏃堕棿', align: 'center', width: 150 }
];
},
-
+
handleTreeNodeClick(data) {
this.currentCusTypeID = data.id;
this.currentCusClsName = data.title;
-
+
if (data.id == "100") {
- this.sWhere = " and HCusTypeID= "+"0";
+ this.sWhere = " and HCusTypeID= " + "0";
} else if (data.id == "0") {
this.sWhere = "";
} else {
@@ -754,13 +477,13 @@
}
this.getList();
},
-
+
async handleQuery() {
this.sWhere = "";
-
+
this.processFilterConditions();
-
+
if (this.queryParams.HNumber) {
this.sWhere += " and 瀹㈡埛浠ｇ爜 like '%" + this.queryParams.HNumber + "%'";
@@ -771,7 +494,7 @@
this.getList();
},
-
+
processFilterConditions() {
const conditions = [
{ colName: this.queryParams.ColName, comparator: this.queryParams.Comparator, content: this.queryParams.ColContent },
@@ -803,8 +526,8 @@
}
});
},
-
-
+
+
resetQuery() {
this.sWhere = "";
this.queryParams = {
@@ -823,13 +546,13 @@
};
this.getList();
},
-
+
handleResCnz() {
if (!this.queryParams.HNumber2) {
this.$modal.msgWarning("璇疯緭鍏ュ鎴蜂唬鐮�");
return;
}
-
+
axios
.get(this.baseURL + "/Gy_Customer/Gy_CustomerViewApi", {
params: {
@@ -849,16 +572,16 @@
this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
});
},
-
-
+
+
handleImport() {
this.uploadData = [];
this.upload.isUploading = false;
this.upload.title = "瀵煎叆";
this.upload.open = true;
},
-
+
handleExport() {
axios
.get(this.baseURL + "/LMES/getReportByModRightNameCheck", {
@@ -881,7 +604,7 @@
this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
});
},
-
+
handleNumAdd() {
if ((this.currentCusTypeID == 0 || this.currentCusTypeID == null) && !this.judgeSkipTouchCusType()) {
this.$modal.msgWarning("璇烽�夋嫨鍏蜂綋瀹㈡埛鍒嗙被锛�");
@@ -891,13 +614,13 @@
this.openEdit = true;
this.editShow = true;
},
-
+
handleAdd() {
this.OperationType = 1;
this.openEdit = true;
this.editShow = true;
},
-
+
handleCopy() {
if (this.single) {
this.$modal.msgWarning("璇烽�夋嫨涓�鏉℃暟鎹�");
@@ -907,7 +630,7 @@
this.openEdit = true;
this.editShow = true;
},
-
+
handleEdit() {
if (this.single) {
this.$modal.msgWarning("璇烽�夋嫨涓�鏉℃暟鎹�");
@@ -917,7 +640,7 @@
this.openEdit = true;
this.editShow = true;
},
-
+
handleDelete() {
if (this.single) {
this.$modal.msgWarning("璇烽�夋嫨涓�鏉℃暟鎹�");
@@ -952,9 +675,9 @@
this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
});
})
- .catch(() => {});
+ .catch(() => { });
},
-
+
handleAudit(isAudit) {
if (this.single) {
this.$modal.msgWarning("璇烽�夋嫨涓�鏉℃暟鎹�");
@@ -981,7 +704,7 @@
this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
});
},
-
+
handleStop(isStop) {
if (this.single) {
this.$modal.msgWarning("璇烽�夋嫨涓�鏉℃暟鎹�");
@@ -1007,39 +730,39 @@
this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
});
},
-
+
handleColumnSetting() {
this.columnSettingShow = true;
this.openColumnSetting = true;
},
-
+
handleButtonSetting() {
this.$modal.msgInfo("鎸夐挳璁剧疆鍔熻兘");
},
-
+
handleSaveScheme() {
this.$modal.msgInfo("淇濆瓨鏂规鍔熻兘");
},
-
+
handleReadScheme() {
this.$modal.msgInfo("璇诲彇鏂规鍔熻兘");
},
-
+
handleRefresh() {
this.getList();
},
-
+
handleExit() {
this.$router.go(-1);
},
-
+
handleCustomerCodeClick(row) {
this.selectedRow = row;
this.OperationType = 3;
this.openEdit = true;
this.editShow = true;
},
-
+
handleRowClick(row, column, event) {
this.$refs.tableData.toggleRowSelection(row);
this.selectedRow = row;
@@ -1048,7 +771,7 @@
this.$emit('deptEmit', row, 7)
}
},
-
+
getRelationUserData(HCusID) {
this.relationLoading = true;
axios
@@ -1067,8 +790,8 @@
this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
});
},
-
-
+
+
setRelationUserColumns(list) {
this.relationUserColumns = [];
for (let key in list) {
@@ -1082,22 +805,21 @@
}
}
},
-
+
rowStyle({ row, rowIndex }) {
if (this.ids.includes(row.hmainid)) {
return { background: "#ecf5ff" };
}
},
-
+
handleDblclick(row, column, cell, event) {
- this.OperationType = 3;
if (this.openPage) {
this.$emit('deptEmitDb', row, 7)
} else {
this.handleCustomerCodeClick(row);
}
},
-
+
handleSelectionChange(selection) {
if (this.openPage) {
//鍒楄〃鍗曢��
@@ -1118,29 +840,29 @@
}
}
},
-
+
closeEdit() {
this.openEdit = false;
this.editShow = false;
},
-
+
editClose(val) {
this.openEdit = false;
this.editShow = false;
this.getList();
},
-
+
columnSettingClose(val) {
this.columnSettingShow = false;
this.openColumnSetting = val;
this.getList();
},
-
+
handleFileUploadProgress(event, file, fileList) {
this.upload.isUploading = true;
this.uploadTableLoading = true;
},
-
+
handleFileSuccess(response, file, fileList) {
this.upload.isUploading = true;
this.$refs.upload.clearFiles();
@@ -1150,20 +872,20 @@
} else {
this.$alert(
"<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
- response.Message +
- "</div>",
+ response.Message +
+ "</div>",
"瀵煎叆缁撴灉",
{ dangerouslyUseHTMLString: true }
);
}
},
-
+
handleImportSubmit() {
if (this.uploadData.length === 0) {
this.$modal.msgWarning("璇峰厛涓婁紶鏂囦欢");
return;
}
-
+
var sMainSub = JSON.stringify(this.uploadData) + "&鍜�" + this.user;
axios({
method: "post",
@@ -1175,8 +897,8 @@
.then((res) => {
this.$alert(
"<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
- res.data.Message +
- "</div>",
+ res.data.Message +
+ "</div>",
"瀵煎叆缁撴灉",
{ dangerouslyUseHTMLString: true }
);
@@ -1187,28 +909,28 @@
this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
});
},
-
+
uploadDataDelete(index) {
this.uploadData.splice(index, 1);
},
-
+
formatDate(dateString) {
if (!dateString) return '';
const date = new Date(dateString);
return date.toLocaleString('zh-CN');
},
-
+
judgeSkipTouchCusType() {
- if (this.treeData.length > 0 && this.treeData[0].children &&
- this.treeData[0].children.length == 1 &&
- this.treeData[0].children[0].children.length == 0) {
+ if (this.treeData.length > 0 && this.treeData[0].children &&
+ this.treeData[0].children.length == 1 &&
+ this.treeData[0].children[0].children.length == 0) {
return true;
} else {
return false;
}
},
-
+
getDefaultFilterScheme() {
this.currentFilterScheme = "褰撳墠杩囨护鏂规锛氶粯璁ゆ柟妗�";
}
diff --git a/src/views/ICMO/ScICMOBillEdit.vue b/src/views/ICMO/ScICMOBillEdit.vue
new file mode 100644
index 0000000..e98308d
--- /dev/null
+++ b/src/views/ICMO/ScICMOBillEdit.vue
@@ -0,0 +1,1476 @@
+<template>
+ <div v-loading="formLoading" v-if="formShow" style="padding: 20px">
+ <div style="margin-bottom: 10px; border-bottom: 1px solid #f6f6f6">
+ <el-button type="primary" @click="handleAdd((OperationType = 1))" v-if="addBtnShow"
+ >鏂板</el-button
+ >
+ <el-button type="primary" @click="submitForm" :disabled="subDisabled"
+ >淇� 瀛�</el-button
+ >
+ <el-button type="primary" @click="set_CheckBill(0, form)">瀹� 鏍�</el-button>
+ <el-button type="primary" @click="close">閫� 鍑�</el-button>
+ <!-- <el-button @click="cancel">鍙� 娑�</el-button> -->
+ </div>
+ <div style="margin: 10px; font-size: 28px; font-weight: bold; text-align: center">
+ 鐢熶骇璁㈠崟
+ </div>
+ <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+ <el-tabs v-model="activeName" type="card">
+ <el-tab-pane label="鍩烘湰淇℃伅" name="first">
+ <el-row>
+ <el-col :span="6">
+ <el-form-item label="鍗曟嵁鍙�" prop="HBillNo">
+ <el-input v-model="form.HBillNo" placeholder="璇疯緭鍏ュ崟鎹紪鍙�" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="鏃ユ湡" prop="HDate">
+ <el-date-picker
+ v-model="form.HDate"
+ type="date"
+ placeholder="閫夋嫨鏃ユ湡"
+ value-format="yyyy-MM-ddT"
+ >
+ </el-date-picker>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="閿�鍞鍗曞彿" prop="HSeOrderBillNo" labelWidth="6em">
+ <el-input
+ v-model="form.HSeOrderBillNo"
+ placeholder="璇烽�夋嫨閿�鍞鍗�"
+ disabled
+ >
+ <el-button slot="append" icon="el-icon-search"></el-button>
+ </el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item
+ label="閿�鍞鍗曠被鍨�"
+ prop="HMainSourceBillSubType"
+ labelWidth="7em"
+ >
+ <el-select
+ v-model="form.HMainSourceBillSubType"
+ placeholder="璇烽�夋嫨閿�鍞鍗曠被鍨�"
+ >
+ <el-option
+ v-for="(item, index) in [
+ {
+ label: '鏅�氬崟鎹�',
+ value: 0,
+ },
+ {
+ label: '杩斾慨鍗曟嵁',
+ value: 1,
+ },
+ ]"
+ :key="index"
+ :label="item.label"
+ :value="item.value.toString()"
+ ></el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="6">
+ <el-form-item label="涓氬姟鐘舵��" prop="HSTATUS">
+ <el-select v-model="form.HSTATUS" placeholder="璇烽�夋嫨涓氬姟鐘舵��">
+ <el-option
+ v-for="(item, index) in [
+ {
+ label: '璁″垝',
+ value: 1,
+ },
+ {
+ label: '璁″垝纭',
+ value: 2,
+ },
+ {
+ label: '涓嬭揪',
+ value: 3,
+ },
+ {
+ label: '寮�宸�',
+ value: 4,
+ },
+ {
+ label: '瀹屽伐',
+ value: 5,
+ },
+ {
+ label: '缁撴',
+ value: 6,
+ },
+ {
+ label: '缁撶畻',
+ value: 7,
+ },
+ ]"
+ :key="index"
+ :label="item.label"
+ :value="item.value.toString()"
+ ></el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="3">
+ <el-form-item
+ label="閿�鍞槸鍚﹀彇搴撳瓨"
+ prop="HIsStockQty_SeOrderBill"
+ labelWidth="8em"
+ >
+ <el-select
+ v-model="form.HIsStockQty_SeOrderBill"
+ placeholder="閿�鍞槸鍚﹀彇搴撳瓨"
+ >
+ <el-option
+ v-for="(item, index) in [
+ {
+ label: '鍚�',
+ value: 0,
+ },
+ {
+ label: '鏄�',
+ value: 1,
+ },
+ ]"
+ :key="index"
+ :label="item.label"
+ :value="item.value"
+ ></el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="3">
+ <el-form-item label="鐢熶骇鏄惁鍙栧簱瀛�" prop="HIsStockQty" labelWidth="8em">
+ <el-select v-model="form.HIsStockQty" placeholder="鐢熶骇鏄惁鍙栧簱瀛�">
+ <el-option
+ v-for="(item, index) in [
+ {
+ label: '鍚�',
+ value: 0,
+ },
+ {
+ label: '鏄�',
+ value: 1,
+ },
+ ]"
+ :key="index"
+ :label="item.label"
+ :value="item.value.toString()"
+ ></el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="3">
+ <el-form-item label="璁″垝鐢熶骇鏁伴噺" prop="HQty" labelWidth="7em">
+ <el-input v-model="form.HQty"> </el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="7">
+ <el-form-item label="璁￠噺鍗曚綅" prop="HUnitName">
+ <el-input v-model="form.HUnitName" placeholder="璇烽�夋嫨璁￠噺鍗曚綅">
+ <el-button slot="append" icon="el-icon-search"></el-button>
+ </el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="7">
+ <el-form-item label="涓氬姟鍛�" prop="HEmpName">
+ <el-input v-model="form.HEmpName" placeholder="璇烽�夋嫨涓氬姟鍛�">
+ <el-button slot="append" icon="el-icon-search"></el-button>
+ </el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <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"></el-button>
+ </el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="鐗╂枡缂栫爜" prop="HMaterNumber">
+ <el-input
+ v-model="form.HMaterNumber"
+ disabled
+ placeholder="璇疯緭鍏ョ墿鏂欑紪鐮�"
+ >
+ </el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="鐗╂枡鍚嶇О" prop="HMaterName">
+ <el-input v-model="form.HMaterName" disabled></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="瑙勬牸鍨嬪彿" prop="HModel">
+ <el-input v-model="form.HModel" disabled> </el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="骞呭" prop="HWidth">
+ <el-input v-model="form.HWidth" disabled />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="鍏嬮噸" prop="HWeight">
+ <el-input v-model="form.HWeight" disabled />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="3">
+ <el-form-item label="杈呮暟閲�" prop="HAuxQty">
+ <el-input v-model="form.HAuxQty" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="3">
+ <el-form-item label="杈呭姪鍗曚綅" prop="HAuxUnitName">
+ <el-input v-model="form.HAuxUnitName" disabled>
+ <template slot="append">
+ <el-button
+ type="primary"
+ icon="el-icon-search"
+ size="mini"
+ ></el-button>
+ </template>
+ </el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="鏌撹壊瑕佹眰" prop="HColorRemark">
+ <el-input v-model="form.HColorRemark" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="鐢熶骇瑙勬牸" prop="HRemark_New">
+ <el-input v-model="form.HRemark_New" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="鐢熶骇骞呭" prop="HWidth_New">
+ <el-input v-model="form.HWidth_New" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="鐢熶骇鍏嬮噸" prop="HWeight_New">
+ <el-input v-model="form.HWeight_New" />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="3">
+ <el-form-item label="杈呮暟閲�2" prop="HAuxQty2">
+ <el-input v-model="form.HAuxQty2" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="3">
+ <el-form-item label="杈呭姪鍗曚綅2" prop="HAuxUnitName2">
+ <el-input v-model="form.HAuxUnitName2">
+ <template slot="append">
+ <el-button
+ type="primary"
+ size="mini"
+ icon="el-icon-search"
+ ></el-button>
+ </template>
+ </el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="6">
+ <el-form-item label="瀹㈡埛鐗╂枡缂栫爜" prop="HCusMaterNumber" labelWidth="7em">
+ <el-input v-model="form.HCusMaterNumber" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="瀹㈡埛鐗╂枡鍚嶇О" prop="HCusMaterName" labelWidth="7em">
+ <el-input v-model="form.HCusMaterName" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="瀹㈡埛瑙勬牸鍨嬪彿" prop="HCusModel" labelWidth="7em">
+ <el-input v-model="form.HCusModel" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="璁″垝寮�宸ユ棩鏈�" prop="HPlanBeginDate" labelWidth="7em">
+ <el-date-picker
+ v-model="form.HPlanBeginDate"
+ type="date"
+ placeholder="閫夋嫨璁″垝寮�宸ユ棩鏈�"
+ >
+ </el-date-picker>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="璁″垝瀹屽伐鏃ユ湡" prop="HPlanEndDate" labelWidth="7em">
+ <el-date-picker
+ v-model="form.HPlanEndDate"
+ type="date"
+ placeholder="閫夋嫨璁″垝瀹屽伐鏃ユ湡"
+ >
+ </el-date-picker>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="16">
+ <el-form-item label="鐧藉澂瑕佹眰" prop="HRemark">
+ <el-input v-model="form.HRemark" placeholder="璇疯緭鍏ュ唴瀹�" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="8">
+ <el-form-item label="缁勭粐" prop="HOrgID">
+ <el-select v-model="form.HOrgID">
+ <el-option
+ v-for="(item, index) in organizationList"
+ :key="index"
+ :label="item.label"
+ :value="item.value"
+ ></el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="16">
+ <el-form-item label="搴曢儴澶囨敞" prop="HRemark3">
+ <el-input v-model="form.HRemark3" placeholder="璇疯緭鍏ュ娉�" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="8">
+ <el-form-item label="璁㈠崟鍖呰澶囨敞" prop="HOrderPickRemark" labelWidth="7em">
+ <el-input
+ v-model="form.HOrderPickRemark"
+ placeholder="璇疯緭鍏ヨ鍗曞寘瑁呭娉�"
+ />
+ </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-col>
+ </el-row>
+ <el-row>
+ <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-row>
+ <el-col :span="6">
+ <el-form-item label="宸ヤ綔涓績" prop="HCenterName">
+ <el-input
+ v-model="form.HCenterName"
+ placeholder="璇烽�夋嫨宸ヤ綔涓績"
+ disabled
+ >
+ <template slot="append">
+ <el-button type="primary" icon="el-icon-search"></el-button>
+ </template>
+ </el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="BOM" prop="HBomName">
+ <el-input v-model="form.HBomName" placeholder="璇烽�夋嫨鐗╂枡娓呭崟" disabled>
+ <template slot="append">
+ <el-button type="primary" icon="el-icon-search"></el-button>
+ </template>
+ </el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="鏈�杩熷紑宸ユ棩鏈�" prop="HBeginDate" labelWidth="7em">
+ <el-date-picker
+ v-model="form.HBeginDate"
+ type="date"
+ placeholder="閫夋嫨鏈�杩熷紑宸ユ棩鏈�"
+ >
+ </el-date-picker>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="鏈�杩熷畬宸ユ棩鏈�" prop="HEndDate" labelWidth="7em">
+ <el-date-picker
+ v-model="form.HEndDate"
+ type="date"
+ placeholder="閫夋嫨鏈�杩熷畬宸ユ棩鏈�"
+ >
+ </el-date-picker>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="6">
+ <el-form-item label="鐢熶骇杞﹂棿" prop="HDeptName">
+ <el-input v-model="form.HDeptName" placeholder="璇烽�夋嫨鐢熶骇杞﹂棿" disabled>
+ <template slot="append">
+ <el-button type="primary" icon="el-icon-search"></el-button>
+ </template>
+ </el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="璁㈠崟璺熻釜鍙�" prop="HPlanOrderProcNo" labelWidth="6em">
+ <el-input v-model="form.HPlanOrderProcNo" placeholder="璇疯緭鍏ヨ鍗曡窡韪彿">
+ </el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ </el-tab-pane>
+ </el-tabs>
+ </el-form>
+ <!-- 閮ㄩ棬寮圭獥 -->
+ <el-dialog
+ :title="dialogTitle"
+ :visible.sync="openData"
+ width="1280px"
+ append-to-body
+ >
+ <Dept @deptEmitDb="dbEmitData" @deptEmit="emitData" v-if="deptShow" />
+ <Warehouse @deptEmitDb="dbEmitData" @deptEmit="emitData" v-if="warehouseShow" />
+ <Material @deptEmitDb="dbEmitData" @deptEmit="emitData" v-if="materialShow" />
+ <div slot="footer" class="dialog-footer">
+ <el-button type="primary" @click="deptClickSub">纭� 瀹�</el-button>
+ <el-button @click="deptClose">鍙� 娑�</el-button>
+ </div>
+ </el-dialog>
+ <el-dialog
+ title="闅愯棌鍒楄缃�"
+ :visible.sync="openRowHide"
+ width="816px"
+ append-to-body
+ >
+ <RowSettings
+ :colName="btResList"
+ HModName="Kf_SellOutBillList"
+ @rowEditClose="rowSetClose"
+ v-if="rowHideShow"
+ />
+ </el-dialog>
+ </div>
+</template>
+
+<script>
+import axios from "axios";
+import Dept from "@/views/component/dept";
+import Warehouse from "@/views/component/warehouse";
+import Material from "@/views/component/material";
+import RowSettings from "@/views/component/rowSettings";
+import moment from "moment";
+import dayjs from "dayjs";
+
+export default {
+ name: "SellOutBill",
+ components: { Dept, Warehouse, Material, RowSettings },
+ props: {
+ OperationType: { type: Number },
+ linterid: { type: Number },
+ HSouceBillType: { type: String },
+ propsData: { type: String },
+ copyType: { type: Number },
+ },
+ data() {
+ return {
+ OperationType2: 1,
+ HInterID2: 0,
+ HEntryID: 1,
+ formShow: false,
+ temp: undefined,
+ formLoading: true,
+ zzSelDis: false,
+ rowHideShow: false,
+ openRowHide: false,
+ hPriceTypeList: ["鎴愭湰浠�", "缁撶畻浠�"],
+ addBtnShow: false,
+ zbIndex: null,
+ zbSelForm: {}, //瀛愯〃閫変腑鏁版嵁
+ dialogTypeNum: null, //閮ㄩ棬寮圭獥1锛屼粨搴撳脊绐�2
+ deptShow: false, //閮ㄩ棬鏁版嵁缁勪欢
+ warehouseShow: false, //浠撳簱鏁版嵁缁勪欢
+ materialShow: false, //鐗╂枡鏁版嵁缁勪欢
+ deptform: {}, //寮圭獥閫変腑鏁版嵁
+ openData: false, //鏁版嵁寮圭獥
+ dialogTitle: "",
+ organizationList: [], //缁勭粐鍒楄〃
+ subDisabled: false, //缂栬緫椤甸潰淇濆瓨鎸夐挳鏄惁绂佺敤(true绂佺敤锛宖alse鍙敤)
+ // OperationType: this.$route.query.OperationType,//淇濆瓨绫诲瀷锛堟柊澧�1淇敼3锛�
+ HInterID: null,
+ baseURL: process.env.VUE_APP_BASE_API,
+ checkedSysZb: [],
+ editData: [], //閿�鍞嚭搴撳崟瀛愯〃
+ editBtData: [], //瀛愯〃琛ㄥご
+ activeName: "first",
+ // 寮瑰嚭灞傛爣棰�
+ title: "",
+ // 鏄惁鏄剧ず寮瑰嚭灞�
+ open: false,
+ // 鏃ユ湡鑼冨洿
+ dateRange: [],
+ // 鏌ヨ鍙傛暟
+ queryParams: {
+ HBillNo: "",
+ HInitTimeCycle: 29,
+ HProjectNumber: "",
+ HCusID: null,
+ HMaterNumber: "",
+ HMaterName: "",
+ ColName1: "",
+ ColName2: "",
+ ColName: "",
+ Comparator1: "",
+ Comparator2: "",
+ Comparator: "",
+ ColContent1: "",
+ ColContent2: "",
+ ColContent: "",
+ },
+ // 鏄剧ず鎼滅储鏉′欢
+ showSearch: true,
+ // 閫変腑鏁扮粍
+ ids: [],
+ // 闈炲崟涓鐢�
+ single: true,
+ // 闈炲涓鐢�
+ multiple: true,
+ // 閬僵灞�
+ loading: true,
+ btResList: [],
+ // 琛ㄥ崟鍙傛暟
+ form: {},
+ // 琛ㄥ崟鏍￠獙
+ rules: {
+ HSupName: [{ required: true, message: "瀹㈡埛涓嶈兘涓虹┖", trigger: "blur" }],
+ HDate: [{ required: true, message: "鏃ユ湡涓嶈兘涓虹┖", trigger: "blur" }],
+ HExRate: [{ required: true, message: "姹囩巼涓嶈兘涓虹┖", trigger: "blur" }],
+ },
+ };
+ },
+ created() {
+ this.fetchData();
+ this.getdata();
+ },
+ beforeDestroy() {
+ if (window.parent) {
+ } else {
+ this.$destroy();
+ }
+ },
+ methods: {
+ fetchData() {
+ axios
+ .get(this.baseURL + "/Web/GetOrganizations", {})
+ .then((response) => {
+ if (response.data.count == 1) {
+ this.organizationList = response.data.data.map((item) => {
+ return {
+ label: item.Name,
+ value: item.ID,
+ };
+ }); //缁勭粐鍒楄〃
+ }
+ })
+ .catch((error) => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ },
+ getdata() {
+ this.HInterID2 = this.$route.query.HInterID || this.linterid || 0;
+ this.OperationType2 = this.$route.query.OperationType || this.OperationType || 1;
+ this.HEntryID = this.$route.query.HEntryID || 1;
+ this.formShow = false;
+ this.formLoading = true;
+
+ if (this.OperationType2 == 4) {
+ this.zzSelDis = true;
+ this.handleAdd();
+ var data = [{ hmainid: this.HInterID2 }];
+ var dataArray = [];
+ for (var i = 0; i < data.length; i++) {
+ // this.getPushSourceBillInit(data[i].hmainid, data[i].hsubid);
+ axios
+ .get(this.baseURL + "/Xs_SeOutStockBill/cx", {
+ params: {
+ HInterID: data[i].hmainid,
+ },
+ })
+ .then((response) => {
+ let result = response.data;
+ if (result.code == 1) {
+ // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ this.temp = result.data[0];
+ } else {
+ this.temp = result.data;
+ }
+ if (this.temp) {
+ dataArray.push(this.temp);
+ this.form.HDeptID = dataArray[0].HDeptID;
+ this.form.HDeptName = dataArray[0].閮ㄩ棬;
+ this.form.HEmpID = dataArray[0].HEmpID;
+ this.form.HEmpName = dataArray[0].涓氬姟鍛�;
+ this.form.HManagerID = dataArray[0].HManagerID;
+ this.form.HManagerName = dataArray[0].涓荤;
+ this.form.HMainSourceInterID = "0";
+ this.form.HMainSourceEntryID = "0";
+ this.form.HMainSourceBillNo = "";
+ this.form.HMainSourceBillType = dataArray[0].HBillType;
+ this.form.HSupID = dataArray[0].HCusID;
+ this.form.HSupName = dataArray[0].瀹㈡埛;
+ this.form.HLinkMan = dataArray[0].鑱旂郴浜�;
+ this.form.HLinkPhone = dataArray[0].鑱旂郴鐢佃瘽;
+ this.form.HSellSID = dataArray[0].HSellSID;
+ this.form.HSellSName = dataArray[0].閿�鍞柟寮�;
+ this.form.HCurID = dataArray[0].HCurID;
+ this.form.HCurName = dataArray[0].甯佸埆;
+ this.form.HExRate = dataArray[0].姹囩巼;
+ for (var i = 0; i < dataArray.length; i++) {
+ this.editData.push({
+ HMaterID: dataArray[i].HMaterID,
+ 鐗╂枡浠ｇ爜: dataArray[i].鐗╂枡浠ｇ爜,
+ 鐗╂枡鍚嶇О: dataArray[i].鐗╂枡鍚嶇О,
+ 瑙勬牸鍨嬪彿: dataArray[i].瑙勬牸鍨嬪彿,
+ HUnitID: dataArray[i].HUnitID,
+ 璁￠噺鍗曚綅: dataArray[i].璁￠噺鍗曚綅,
+ HQtyMust: dataArray[i].鏁伴噺.toFixed(6),
+ HQty: dataArray[i].鏁伴噺.toFixed(6),
+ HPieceQty: "0",
+ HPrice: dataArray[i].鍗曚环.toFixed(4),
+ HTaxPrice: dataArray[i].瀹為檯鍚◣鍗曚环.toFixed(4),
+ HTaxRate: dataArray[i].绋庣巼,
+ HMoney: dataArray[i].閲戦.toFixed(2),
+ HTaxMoney: dataArray[i].浠风◣鍚堣.toFixed(2),
+ HWHID: dataArray[i].HWHID,
+ 鍙戣揣浠撳簱: dataArray[i].HWHName,
+ HRemark: "",
+ HQty_Full: "0",
+ HQty_Empty: "0",
+ HQty_Back: "0",
+ HCostPrice: "0",
+ HCostMoney: "0",
+ HSalePrice: "0",
+ HSeOrderInterID: dataArray[i].hmainid,
+ HSeOrderEntryID: dataArray[i].hsubid,
+ HSeOrderBillNo: dataArray[i].鍗曟嵁鍙�,
+ HSourceInterID: dataArray[i].hmainid,
+ HSourceEntryID: dataArray[i].hsubid,
+ HSourceBillNo: dataArray[i].鍗曟嵁鍙�,
+ HSourceBillType: dataArray[i].HBillType,
+ HRelationQty: "0",
+ HRelationMoney: "0",
+ HSPID: "0",
+ HSPName: "",
+ HSPGroupID: "0",
+ HSPGroupName: "",
+ HSCWHID: "0",
+ HSCWHName: "",
+ HSCSPID: "0",
+ HSCSPName: "",
+ HBatchNo: "",
+ HPOOrderInterID: "0",
+ HPOOrderEntryID: "0",
+ HPOOrderBillNo: "",
+ HPropertyID: "0",
+ HPropertyName: "",
+ HSecUnitID: "0",
+ HSecUnitName: "",
+ HSecUnitRate: "0",
+ HEngineNum: "",
+ HUnderPanNum: "",
+ HLeaveFactCard: "",
+ HReqBuyQty: "0",
+ HReqOutQty: "0",
+ HCurrentInventory: "0",
+ });
+ }
+ }
+ this.$nextTick(() => {
+ this.formShow = true;
+ this.formLoading = false;
+ });
+ })
+ .catch((error) => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ }
+ } else if (this.OperationType2 == 1 || !this.OperationType2) {
+ this.handleAdd();
+ } else if (this.OperationType2 == 3) {
+ this.handleUpdate();
+ }
+ },
+ // 鑾峰彇鍙傛暟_浼犻�掔殑JSON鏍煎紡鍙傛暟
+ getUrlVars_JSON() {
+ var datajson;
+ var str = this.propsData; //鑾峰彇閾炬帴涓紶閫掔殑鍙傛暟
+ var arr = str.substring(str.lastIndexOf("=") + 1);
+ datajson = JSON.parse(decodeURI(arr));
+ return datajson;
+ },
+ //鏍规嵁涓诲唴鐮佷笌瀛愬唴鐮佽幏鍙栨簮鍗曢攢鍞鍗曟暟鎹�
+ getPushSourceBillInit(HSourceInterID, HSourceEntryID) {
+ axios
+ .get(this.baseURL + "/Xs_SeOrderBill/loadXs_SeOrderBill_Push", {
+ params: {
+ HInterID: HSourceInterID,
+ HSubID: HSourceEntryID,
+ },
+ })
+ .then((response) => {
+ let result = response.data;
+ if (result.code == 1) {
+ // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ this.temp = result.data[0];
+ } else {
+ this.temp = result.data;
+ }
+ })
+ .catch((error) => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ },
+ handleRowHide() {
+ this.rowHideShow = true;
+ this.openRowHide = true;
+ },
+ rowSetClose(val) {
+ this.rowHideShow = false;
+ this.openRowHide = val;
+ this.$destroy();
+ },
+
+ organizationChange(val) {
+ // let options=undefined
+ // this.form=this.organizationList.find(option => option.ID === val)?.Name || '';
+ },
+ //閮ㄩ棬寮圭獥璧嬪��
+ dbEmitData(deptRow, num) {
+ // num=1閮ㄩ棬 num=2鍑哄簱浠撳簱
+ if (num == 1) {
+ this.form.HDeptName = deptRow.閮ㄩ棬鍚嶇О;
+ this.form.HDeptID = deptRow.HItemID;
+ this.form.HEmpID = deptRow.HEmpID;
+ this.form.HManagerName = deptRow.璐熻矗浜�;
+ this.openData = false;
+ } else if (num == 2) {
+ this.editData[this.zbIndex].HWHID = deptRow.HItemID;
+ this.editData[this.zbIndex].鍙戣揣浠撳簱 = deptRow.浠撳簱鍚嶇О;
+ this.openData = false;
+ } else if (num == 3) {
+ this.editData[this.zbIndex].HMaterID = deptRow.HItemID;
+ this.editData[this.zbIndex].鐗╂枡浠ｇ爜 = deptRow.鐗╂枡浠ｇ爜;
+ this.editData[this.zbIndex].鐗╂枡鍚嶇О = deptRow.鐗╂枡鍚嶇О;
+ this.editData[this.zbIndex].HUnitID = deptRow.HUnitID;
+ this.editData[this.zbIndex].瑙勬牸鍨嬪彿 = deptRow.瑙勬牸鍨嬪彿;
+ this.editData[this.zbIndex].璁￠噺鍗曚綅 = deptRow.璁￠噺鍗曚綅鍚嶇О;
+ this.editData[this.zbIndex].HTaxPrice = deptRow.鍚◣鎴愭湰浠�;
+ this.editData[this.zbIndex].HTaxRate = deptRow.榛樿绋庣巼;
+ this.openData = false;
+ }
+ },
+ emitData(deptRow, num) {
+ this.dialogTypeNum = num;
+ this.deptform = deptRow;
+ },
+ deptClickSub() {
+ this.dbEmitData(this.deptform, this.dialogTypeNum);
+ this.deptform = {};
+ },
+ deptClose() {
+ this.deptform = {};
+ this.openData = false;
+ },
+
+ //閲囪喘璁㈠崟鏂板缂栬緫琛ㄥ崟鍒濆鍖�
+ reset() {
+ this.form = {
+ BillType: "1102",
+ HBillNo: "",
+ HInterID: "",
+ HBillSubType: "0",
+ HDate: new Date(),
+ HMainSourceInterID: 0,
+ HMainSourceEntryID: 0,
+ HMainSourceBillType: "",
+ HMainSourceBillNo: "",
+ HEmpName: "",
+ HEmpID: 0,
+ HDeptName: "",
+ HDeptID: 0,
+ HManagerName: "",
+ HManagerID: 0,
+ HSupName: sessionStorage["HSupName"],
+ HSupID: sessionStorage["HSupID"],
+ HLinkMan: "",
+ HLinkPhone: "",
+ HSecManagerName: "",
+ HSecManagerID: 0,
+ HKeeperName: "",
+ HKeeperID: 0,
+ HRemark: "",
+ HProjectNumber: "",
+ HProjectID: 0,
+ HProjectName: "",
+ HGroupName: "",
+ HGroupID: 0,
+ HWHName: "",
+ HWHID: 0,
+ HConveyCompName: "",
+ HConveyCompID: 0,
+ HConveyTypeName: "",
+ HConveyTypeID: 0,
+ HConveyMoney: "0",
+ HCarriage: "0",
+ HSTOCKORGID: sessionStorage["OrganizationID"] - 0, //缁勭粐id
+ HOWNERID: sessionStorage["OrganizationID"] - 0,
+ HSCWHName: "",
+ HSCWHID: 0,
+ HCheckStatusMan: "",
+ HExplanation: "",
+ HInnerBillNo: "",
+ HCurName: "浜烘皯甯�",
+ HCurID: 1,
+ HExRate: "1",
+ HSellSName: "",
+ HSellSID: 0,
+ HCusBalance: "0",
+ HCreditRating_Now: "0",
+ HAvailableBalance: "0",
+ HPriceType: "鎴愭湰浠�",
+ HOrgID: sessionStorage["OrganizationID"] - 0,
+ HMaker: "",
+ HUpDater: "",
+ HChecker: "",
+ HMakeDate: new Date(),
+ HUpDateDate: "",
+ HCheckDate: "",
+ HCloseMan: "",
+ HDeleteMan: "",
+ HCloseDate: "",
+ HDeleteDate: "",
+ };
+ this.editData = [];
+ this.editBtData = [];
+ this.ids = [];
+ this.subDisabled = false;
+ this.addBtnShow = false;
+ // this.$refs.tableData.clearSelection()
+ this.activeName = "first";
+ this.resetForm("form");
+ },
+ //閫�鍑�
+ close() {
+ this.reset();
+ if (window.self != window.top) {
+ window.parent.editGyClose;
+ } else if (!this.OperationType2 && !this.copyType) {
+ // this.$router.back()
+ window.close();
+ } else {
+ this.formShow = false;
+ this.$emit("editClose", false);
+ }
+ },
+ //鏍规嵁鐢ㄦ埛鑾峰彇瀵瑰簲鑱屽憳銆侀儴闂ㄣ�侀攢鍞富绠�
+ getCzyglByUser() {
+ axios
+ .get(this.baseURL + "/Xs_SeOrderBill/getCzyglByUser", {
+ params: { CurUserName: sessionStorage["HUserName"] },
+ })
+ .then((response) => {
+ let dataForm = response.data.data[0];
+ this.form.HDeptID = dataForm.HDeptID;
+ this.form.HDeptName = dataForm.HDeptName;
+ this.form.HEmpID = dataForm.HEmpID;
+ this.form.HEmpName = dataForm.HEmpName;
+ this.form.HManagerID = dataForm.HManagerID;
+ this.form.HManagerName = dataForm.HManagerName;
+ })
+ .catch((error) => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ },
+ /** 鏂板鎸夐挳鎿嶄綔 */
+ handleAdd() {
+ this.reset();
+ //鏂板鑾峰彇鍗曟嵁鍙�
+ this.getHBillNo();
+ let date = new Date();
+ this.form.HDate = moment(date).format("YYYY-MM-DDTHH:mm:ss");
+ if (this.OperationType2 == 1) {
+ this.handleAddSysZb();
+ }
+ this.$nextTick(() => {
+ this.formShow = true;
+ this.formLoading = false;
+ });
+ },
+ getHBillNo() {
+ axios
+ .get(this.baseURL + "/WEBSController/GetMaxBillNoAndID_Json", {
+ params: {
+ HBillType: "3710",
+ },
+ })
+ .then((response) => {
+ this.form.HMaker = sessionStorage["HUserName"];
+ this.form.HBillNo = response.data.data[0].HBillNo;
+ this.form.HInterID = response.data.data[0].HInterID;
+ // this.copyType = 0
+ // this.getCzyglByUser()
+ })
+ .catch((error) => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ },
+ //鑾峰彇閿�鍞嚭搴撳崟瀵瑰簲鐨勬潯鐮佹槑缁�
+ getBarCodeNoteBySellOutBill(rowHmainid) {
+ axios
+ .get(this.baseURL + "/Kf_SellOutBill/BarCodeNote", {
+ params: { HInterID: rowHmainid },
+ })
+ .then((response) => {
+ if (response.data.count == 1) {
+ if (response.data.data[2].length > 0) {
+ this.$modal.msgError("褰撳墠鍗曟嵁鐢辨壂鐮佺敓鎴愶紝涓嶅彲浠ョ紪杈戯紒");
+ this.subDisabled = true;
+ }
+ } else {
+ }
+ })
+ .catch((error) => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ },
+ //#region 鏍规嵁瀹㈡埛鑾峰彇瀹㈡埛浣欓
+ getCustomerBalance(HCusID) {
+ axios
+ .get(this.baseURL + "/Xs_CusRatingChangeBill/getCustomerBalance", {
+ params: { HCusID: HCusID, CurUserName: sessionStorage["HUserName"] },
+ })
+ .then((response) => {
+ var data = response.data.data[0];
+ this.form.HCusBalance = data.HCusBalance;
+ this.form.HCreditRating_Now = data.HCreditRating_Now;
+ this.form.HAvailableBalance = data.HAvailableBalance;
+ })
+ .catch((error) => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ },
+ /** 淇敼鎸夐挳鎿嶄綔 */
+ handleUpdate() {
+ this.reset();
+ let sWhere =
+ " and HPRDORGID=" +
+ sessionStorage["OrganizationID"] +
+ " and hmainid='" +
+ this.HInterID2 +
+ "' and HEntryID=" +
+ this.HEntryID;
+
+ axios
+ .get(this.baseURL + "/LEMS/MES_IF_ICMOBillList_Json", {
+ params: { sWhere: sWhere, user: sessionStorage["HUserName"] },
+ })
+ .then((response) => {
+ if (response.data.count == 1) {
+ let result = response.data;
+ let data = response.data.data;
+ switch (data[0]["鐘舵��"]) {
+ case "璁″垝":
+ this.form.HSTATUS = "1";
+ break;
+ case "璁″垝纭":
+ this.form.HSTATUS = "2";
+ break;
+ case "涓嬭揪":
+ this.form.HSTATUS = "3";
+ break;
+ case "寮�宸�":
+ this.form.HSTATUS = "4";
+ break;
+ case "瀹屽伐":
+ this.form.HSTATUS = "5";
+ break;
+ case "缁撴":
+ this.form.HSTATUS = "6";
+ break;
+ }
+
+ // this.form.BillType = data.HSourceBillType;
+ this.form = {
+ ...{
+ HBillNo: data[0].鍗曟嵁鍙�,
+ HInterID: data[0].hmainid,
+ HPRDORGID: data[0].HPRDORGID,
+ HDate: dayjs(new Date(data[0].鏃ユ湡)).format("YYYY-MM-DD"),
+ HSeOrderBillNo: data[0].婧愬崟鍗曞彿,
+ HSeOrderInterID: data[0].婧愬崟涓诲唴鐮�,
+ HSeOrderEntryID: data[0].婧愬崟瀛愬唴鐮�,
+ HMainSourceBillSubType: data[0].HMainSourceBillSubType,
+
+ HSourceInterID: data[0].HSourceInterID,
+ HSourceEntryID: data[0].HSourceEntryID,
+ HSourceBillNo: data[0].HSourceBillNo,
+ HSourceBillType: data[0].HSourceBillType,
+ HEmpID: data[0].HEmpID,
+ HEmpName: data[0].涓氬姟鍛�,
+ HCusID: data[0].HEntryCusID,
+ HCusName: data[0].瀹㈡埛,
+ HCenterID: data[0].HCenterID,
+ HCenterName: data[0].宸ヤ綔涓績,
+ HDeptID: data[0].HDeptID,
+ HDeptName: data[0].鐢熶骇杞﹂棿,
+ HQty: data[0].鐢熶骇浠诲姟鍗曟暟閲�,
+ HMaterID: data[0].HMaterID,
+ HMaterNumber: data[0].浜у搧浠ｇ爜,
+ HMaterName: data[0].浜у搧鍚嶇О,
+ HModel: data[0].瑙勬牸鍨嬪彿,
+ HSourceID: data[0].HSourceID_b,
+ HSourceName: data[0].HsourceName,
+ HUnitID: data[0].HUnitID,
+ HUnitName: data[0].璁￠噺鍗曚綅,
+ HIsStockQty: data[0].HIsStockQty,
+ HIsStockQty_SeOrderBill: data[0].HIsStockQty_SeOrderBill ? 1 : 0,
+ HBomID: data[0].HBomID,
+ HBomName: data[0].BOM鍗曠紪鐮�,
+ HPlanBeginDate: dayjs(new Date(data[0].璁″垝寮�宸ユ棩鏈�)).format(
+ "YYYY-MM-DD"
+ ),
+ HPlanEndDate: dayjs(new Date(data[0].璁″垝瀹屽伐鏃ユ湡)).format("YYYY-MM-DD"),
+ HBeginDate: dayjs(new Date(data[0].鏈�杩熷紑宸ユ棩鏈�)).format("YYYY-MM-DD"),
+ HEndDate: dayjs(new Date(data[0].鏈�杩熷畬宸ユ棩鏈�)).format("YYYY-MM-DD"),
+ HRemark: data[0].琛ㄥご澶囨敞,
+ HRemark3: data[0].搴曢儴澶囨敞,
+ HAuxQty: data[0].HAuxQty,
+ HAuxUnit: data[0].HAuxUnit,
+ HAuxUnitName: data[0].HAuxUnitName,
+
+ HAuxQty2: data[0].HAuxQty2,
+ HAuxUnit2: data[0].HAuxUnit2,
+ HAuxUnitName2: data[0].HAuxUnitName2,
+
+ HWidth: data[0].HWidth,
+ HWeight: data[0].HWeight,
+ HColorRemark: data[0].鏌撹壊瑕佹眰,
+ HCusMaterName: data[0].瀹㈡埛鐗╂枡鍚嶇О,
+ HCusModel: data[0].瀹㈡埛瑙勬牸鍨嬪彿,
+ HCusMaterNumber: data[0].瀹㈡埛鐗╂枡缂栫爜,
+ HOrderPickRemark: data[0].璁㈠崟鍖呰澶囨敞,
+ HWidth_New: data[0].鐢熶骇骞呭,
+ HWeight_New: data[0].鐢熶骇鍏嬮噸,
+ HRemark_New: data[0].鐢熶骇瑙勬牸,
+ //鍏朵粬淇℃伅
+ hmakers: this.OperationType2 == 2 ? "" : data[0].鍒跺崟浜�,
+ hmakedate:
+ this.OperationType2 == 2
+ ? ""
+ : data[0].鍒跺崟鏃ユ湡 == null
+ ? ""
+ : dayjs(new Date(data[0].鍒跺崟鏃ユ湡)).format("YYYY-MM-DD"),
+ hchecker: this.OperationType2 == 2 ? "" : data[0].瀹℃牳浜�,
+ hcheckdate:
+ this.OperationType2 == 2
+ ? ""
+ : data[0].瀹℃牳鏃ユ湡 == null
+ ? ""
+ : dayjs(new Date(data[0].瀹℃牳鏃ユ湡)).format("YYYY-MM-DD"),
+ hupdater: this.OperationType2 == 2 ? "" : data[0].淇敼浜�,
+ hupdatedate:
+ this.OperationType2 == 2
+ ? ""
+ : data[0].淇敼鏃ユ湡 == null
+ ? ""
+ : dayjs(new Date(data[0].淇敼鏃ユ湡)).format("YYYY-MM-DD"),
+ hdeleteman: this.OperationType2 == 2 ? "" : data[0].浣滃簾浜�,
+ hdeletedate:
+ this.OperationType2 == 2
+ ? ""
+ : data[0].浣滃簾鏃ユ湡 == null
+ ? ""
+ : dayjs(new Date(data[0].浣滃簾鏃ユ湡)).format("YYYY-MM-DD"),
+ HPlanOrderProcNo: data[0].HPlanOrderProcNo,
+ },
+ };
+ if (this.copyType == 1) {
+ this.getHBillNo();
+ let date = new Date();
+ this.form.HDate = moment(date).format("YYYY-MM-DDTHH:mm:ss");
+ }
+ this.formShow = true;
+ this.formLoading = false;
+ }
+ })
+ .catch((error) => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触! ");
+ console.error(error);
+ });
+ },
+ //鏍规嵁瀹㈡埛甯﹀嚭鑱旂郴浜恒�佽仈绯荤數璇�
+ getCustomerByCusID(HCusID) {
+ axios
+ .get(this.baseURL + "/Xs_SeOrderBill/getCustomerByCusID", {
+ params: {
+ HCusID: HCusID,
+ },
+ })
+ .then((response) => {
+ this.form.鑱旂郴浜� = response.data.data[0].HLinkMan;
+ this.form.鑱旂郴鐢佃瘽 = response.data.data[0].HLinkPhone;
+ // this.form = response.data.data[0]
+ })
+ .catch((error) => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ },
+ /** 閿�鍞嚭搴撳瓙琛ㄦ槑缁嗗簭鍙� */
+ rowSysZbIndex({ row, rowIndex }) {
+ row.index = rowIndex + 1;
+ },
+ /** 缂栬緫椤靛瓙琛ㄦ坊鍔犳寜閽搷浣� */
+ handleAddSysZb(index, num) {
+ if (num == 1 && !index) {
+ this.$modal.msgError("璇烽�夋嫨涓�琛屾暟鎹紪杈�!");
+ } else {
+ let obj = {
+ HMaterID: 0,
+ 鐗╂枡浠ｇ爜: "",
+ 鐗╂枡鍚嶇О: "",
+ 瑙勬牸鍨嬪彿: "",
+ HUnitID: 0,
+ 璁￠噺鍗曚綅: "",
+ HQtyMust: 1,
+ HQty: 1,
+ HPieceQty: 0,
+ HPrice: 0,
+ HTaxPrice: 0,
+ HTaxRate: 0,
+ HMoney: 0,
+ HTaxMoney: 0,
+ HWHID: 0,
+ 鍙戣揣浠撳簱: "",
+ HRemark: "",
+ HQty_Full: 0,
+ HQty_Empty: 0,
+ HQty_Back: 0,
+ HCostPrice: 0,
+ HCostMoney: 0,
+ HSalePrice: 0,
+ HSeOrderInterID: 741,
+ HSeOrderEntryID: 18,
+ HSeOrderBillNo: "XSFH00000747",
+ HSourceInterID: 741,
+ HSourceEntryID: 18,
+ HSourceBillNo: "XSFH00000747",
+ HSourceBillType: 1402,
+ HRelationQty: 0,
+ HRelationMoney: 0,
+ HSPID: 0,
+ HSPName: "",
+ HSPGroupID: 0,
+ HSPGroupName: "",
+ HSCWHID: 0,
+ HSCWHName: "",
+ HSCSPID: 0,
+ HSCSPName: "",
+ HBatchNo: "",
+ HPOOrderInterID: 0,
+ HPOOrderEntryID: 0,
+ HPOOrderBillNo: "",
+ HPropertyID: 0,
+ HPropertyName: "",
+ HSecUnitID: 0,
+ HSecUnitName: "",
+ HSecUnitRate: 0,
+ HEngineNum: "",
+ HUnderPanNum: "",
+ HLeaveFactCard: "",
+ HReqBuyQty: 0,
+ HReqOutQty: 0,
+ HCurrentInventory: 0,
+ };
+ if (index) {
+ this.editData.splice(index, 0, obj);
+ this.$set(this.editData, index, obj);
+ } else {
+ this.editData.push(obj);
+ }
+ }
+ },
+ handleCopyZbRow() {
+ if (!this.zbIndex) {
+ this.$modal.msgError("璇烽�夋嫨涓�琛屾暟鎹�");
+ } else {
+ let copyRow = JSON.parse(JSON.stringify(this.zbSelForm));
+ this.editData.push(copyRow);
+ }
+ },
+ handleMoveRowUp(zbSelForm) {
+ if (!this.zbIndex) {
+ this.$modal.msgError("璇烽�夋嫨涓�琛屾暟鎹�");
+ } else {
+ if (zbSelForm.index == 1) {
+ this.$modal.msgError("绗竴琛屾暟鎹棤娉曚笂绉�");
+ } else {
+ // 纭繚涓嶆槸绗竴琛�
+ let num = zbSelForm.index - 1;
+ const record = this.editData.splice(num, 1)[0];
+ this.editData.splice(num - 1, 0, record);
+ }
+ }
+ },
+ handleMoveRowDown(zbSelForm) {
+ if (!this.zbIndex) {
+ this.$modal.msgError("璇烽�夋嫨涓�琛屾暟鎹�");
+ } else {
+ if (zbSelForm.index == this.editData.length) {
+ this.$modal.msgError("鏈�鍚庝竴琛屾暟鎹棤娉曚笅绉�");
+ } else {
+ // 纭繚涓嶆槸绗竴琛�
+ let num = zbSelForm.index - 1;
+ const record = this.editData.splice(num, 1)[0];
+ this.editData.splice(num + 1, 0, record);
+ }
+ }
+ },
+ /** 缂栬緫椤靛瓙琛ㄥ垹闄ゆ寜閽搷浣� */
+ handleDeleteSysZb(row) {
+ this.checkedSysZb = [];
+ this.checkedSysZb.push(row.index);
+ if (this.checkedSysZb.length == 0) {
+ this.$modal.msgError("璇峰厛閫夋嫨瑕佸垹闄ょ殑鍟嗗搧璁㈠崟鏄庣粏鏁版嵁");
+ } else {
+ const editData = this.editData;
+ const checkedSysZb = this.checkedSysZb;
+ this.editData = editData.filter(function (item) {
+ return checkedSysZb.indexOf(item.index) == -1;
+ });
+ }
+ },
+ /** 缂栬緫椤靛瓙琛ㄥ閫夋閫変腑鏁版嵁 */
+ handleTableZbEdit(selection) {
+ this.checkedSysZb = selection.map((item) => item.index);
+ this.zbSelForm = selection[0];
+ this.zbIndex = this.checkedSysZb[0];
+ if (selection.length > 1) {
+ const del_row = selection.shift();
+ this.$refs.zbTable.toggleRowSelection(del_row, false); //璁剧疆杩欎竴琛屽彇娑堥�変腑
+ }
+ },
+ //鑾峰彇鏈�澶у崟鎹彿_浠诲姟绫伙紙Type涓�0鏃跺彧鑾峰彇涓嶆柊澧炴祦姘村彿锛屼负1鏃舵柊澧炰笖鑾峰彇娴佹按鍙凤級
+ get_MAXNum_Task(Type) {
+ var sql = `exec h_p_Xt_GetMaxBillNo_SubType '1205','${this.form.HDate}',0,0,0,'${Type}','${this.form.HDeptID}'`;
+ axios({
+ method: "get",
+ url: this.baseURL + "/CommonModel/searchMethod",
+ params: { sql: sql, user: sessionStorage["HUserName"], ModRightNameCheck: "" },
+ })
+ .then((response) => {
+ if (response.data.count == 1) {
+ this.form.HBillNo = response.data.data[0].HBillNo;
+ } else {
+ this.$modal.msgError(response.data.code + response.data.Message);
+ }
+ })
+ .catch((error) => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ },
+ // 缂栬緫鎻愪氦淇濆瓨
+ submitForm() {
+ this.$refs["form"].validate((valid) => {
+ if (valid) {
+ let fhck = false;
+ this.editData.map((item, index) => {
+ if (!item.鍙戣揣浠撳簱) {
+ fhck = true;
+ this.$modal.msgError("绗�" + (index + 1) + "琛岋細鍙戣揣浠撳簱鏈�夋嫨锛�");
+ }
+ });
+ this.$nextTick(() => {
+ if (!fhck) {
+ var sMainStr = JSON.stringify(this.form);
+ var sSubStr = JSON.stringify(this.editData);
+ var sMainSub =
+ sMainStr +
+ ";" +
+ sSubStr +
+ ";" +
+ sessionStorage["HUserName"] +
+ ";" +
+ this.OperationType2;
+ axios({
+ method: "post",
+ url: this.baseURL + "/Kf_SellOutBill/SaveSellOutBillList",
+ data: {
+ msg: sMainSub,
+ },
+ })
+ .then((response) => {
+ if (response.data.count == 1) {
+ this.subDisabled = true; //璁剧疆淇濆瓨鎸夐挳涓嶅彲鐢�
+ this.$modal.msgSuccess(response.data.Message);
+ this.get_MAXNum_Task(1); //璁剧疆娴佹按鍙峰鍔�
+ if (response.data.Verify == "Y") {
+ //鑷姩瀹℃牳
+ this.set_CheckBill(0, this.form); //瀹℃牳
+ }
+ this.addBtnShow = true;
+ }
+ })
+ .catch((error) => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ }
+ });
+ }
+ });
+ },
+ // 鍙嶅鏍�/瀹℃牳鏁版嵁
+ set_CheckBill(num, form) {
+ var InterID = form.hmainid || form.HInterID;
+ //閫昏緫瀹℃牳鏂规硶
+ axios
+ .get(this.baseURL + "/Kf_SellOutBill/AuditKf_SellOutBill", {
+ params: {
+ HInterID: InterID,
+ IsAudit: num,
+ CurUserName: sessionStorage["HUserName"],
+ },
+ })
+ .then((response) => {
+ let result = response.data;
+ if (result.code == 1) {
+ this.$modal.msgSuccess("鎿嶄綔鎴愬姛");
+ } else {
+ this.$modal.msgError("閿欒:" + result.code + result.Message);
+ }
+ })
+ .catch((error) => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ },
+ showReset() {
+ this.deptShow = false;
+ this.warehouseShow = false;
+ this.materialShow = false;
+ },
+ // 鎵撳紑鏁版嵁鍒楄〃寮圭獥
+ openDataDialog(num, row) {
+ if (row) {
+ this.zbIndex = row.index - 1;
+ }
+ this.showReset();
+ if (num == 1) {
+ this.dialogTitle = "閮ㄩ棬鍒楄〃";
+ this.deptShow = true;
+ this.openData = true;
+ } else if (num == 2) {
+ this.dialogTitle = "鍑哄簱浠撳簱鍒楄〃";
+ this.warehouseShow = true;
+ this.openData = true;
+ } else if (num == 3) {
+ this.dialogTitle = "鐗╂枡鍒楄〃";
+ this.materialShow = true;
+ this.openData = true;
+ }
+ },
+ },
+};
+</script>
+<style>
+.xsckdBox .el-date-editor.el-input {
+ width: 100%;
+}
+</style>
diff --git a/src/views/ICMO/ScICMOBillList.vue b/src/views/ICMO/ScICMOBillList.vue
index 7c13427..030a0e1 100644
--- a/src/views/ICMO/ScICMOBillList.vue
+++ b/src/views/ICMO/ScICMOBillList.vue
@@ -9,15 +9,23 @@
class="searchBox"
>
<el-row>
- <el-form-item label="鏃ユ湡" style="margin-left: 100px">
+ <el-form-item label="寮�濮嬫棩鏈�" style="margin-left: 100px">
<el-date-picker
- v-model="dateRange"
- value-format="yyyy-MM-dd"
- type="daterange"
- range-separator="-"
- start-placeholder="寮�濮嬫棩鏈�"
- end-placeholder="缁撴潫鏃ユ湡"
- ></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
@@ -51,7 +59,7 @@
v-for="(item, index) in organizationList"
:key="index"
:label="item.Name"
- :value="item.ID"
+ :value="item.ID.toString()"
>
</el-option>
</el-select>
@@ -68,8 +76,8 @@
<el-option
:label="item.label"
:value="item.value"
- :key="item.label"
- v-for="item in [
+ :key="index"
+ v-for="(item, index) in [
{
label: '寮�宸�',
value: '寮�宸�',
@@ -604,7 +612,7 @@
class="xsckdBox"
:before-close="close"
>
- <edit
+ <!-- <edit
:OperationType="OperationType"
:linterid="this.rowForm.HItemID"
:HSouceBillType="this.rowForm.HSourceBillType"
@@ -612,7 +620,10 @@
:copyType="copyType"
@editCloseGy="editGyClose"
v-if="editShow"
- />
+ /> -->
+ <div style="height: 80vh" v-if="openEdit">
+ <iframe :src="iframeUrl" width="100%" height="100%" frameborder="0"></iframe>
+ </div>
</el-dialog>
<el-dialog
:title="upload.title"
@@ -718,6 +729,7 @@
},
data() {
return {
+ iframeUrl: "",
activeSeach: "",
HModName: "Cg_POOrderBillList",
editShow: false,
@@ -800,7 +812,7 @@
dateRange: [],
// 鏌ヨ鍙傛暟
queryParams: {
- HOrgID: null,
+ HOrgID: sessionStorage["OrganizationID"],
HName: null,
HNumber: null,
Comparator1: "",
@@ -877,13 +889,20 @@
uploadTotal: 0,
};
},
- mounted() {},
+ mounted() {
+ window.editGyClose = () => {
+ this.editGyClose(); // 缁勪欢鍐呯殑鏂规硶缁戝畾鍒皐indows
+ };
+ },
created() {
- this.form.Organization = sessionStorage["Organization"];
this.riqiChange();
this.get_HProjectList();
this.get_HDeptNameList();
this.getList();
+ },
+ beforeDestroy() {
+ // 缁勪欢閿�姣佹椂娓呯悊鍏ㄥ眬鏂规硶锛岄伩鍏嶅唴瀛樻硠婕�
+ delete window.editGyClose;
},
methods: {
syncBill() {
@@ -898,10 +917,12 @@
let res = await axios.get(`${this.baseURL}/Sc_ICMOBill/GetHDeptList`, {
params: { HOrgID: sessionStorage["OrganizationID"] },
});
- console.log(res);
- this.HDeptNameList = res.data.data.map((e) => {
- return { label: e.HName, value: e.HItemID };
- });
+ this.HDeptNameList = [
+ { label: "鍏ㄩ儴杞﹂棿", value: 0 },
+ ...res.data.data.map((e) => {
+ return { label: e.HName, value: e.HItemID };
+ }),
+ ];
},
async get_HProjectList() {
let res = await axios.get(`${this.baseURL}/Gy_Material/Get_HProject`);
@@ -1037,52 +1058,21 @@
this.dbEmitData(this.deptform, this.dialogTypeNum);
this.deptform = {};
},
- fetchData() {
- //鐧诲綍鐢ㄦ埛淇℃伅
- axios
- .get(
- "http://47.96.97.237/API/Web/GetUser?UserName=001&PassWord=123456&HOrgName=100038"
- )
- .then((res) => {
- let data = res.data.data[0];
- this.zuzhiId = data.HUSEORGID; //鏍规嵁鐧诲綍鐢ㄦ埛鑾峰彇榛樿鐨勭粍缁嘔D
- this.queryParams.HOrgID = data.HUSEORGID;
- this.user = data.Czymc;
- axios
- .get(this.baseURL + "/Web/GetOrganizations", {})
- .then((res) => {
- if (res.data.count == 1) {
- this.organizationList = res.data.data; //缁勭粐鍒楄〃
- }
-
- this.handleQuery();
- // this.getList();
- })
- .catch((error) => {
- this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
- });
- })
- .catch((error) => {
- this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
- });
- },
async getList() {
this.tableShow = false;
this.loading = true;
if (this.pageSize == 0) {
this.pageSize = 50;
}
- this.queryParams.HOrgID = sessionStorage["OrganizationID"];
- if (this.dateRange.length > 0) {
- this.sWhere +=
- " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.dateRange[0] + "'";
- this.sWhere +=
- " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + this.dateRange[1] + "'";
+ if (this.sTime) {
+ this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.sTime + "'";
+ this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + this.eTime + "'";
}
let Organization = this.organizationList.find(
- (e) => (e.ID = this.queryParams.HOrgID)
+ (e) => e.ID == this.queryParams.HOrgID
)?.Name;
+ console.log(this.queryParams.HOrgID);
console.log(Organization);
@@ -1349,7 +1339,7 @@
//鍙屽嚮琛�
handleDblclick(row, column, cell, event) {
this.OperationType = 3;
- this.handleEdit();
+ this.handleEdit(row, this.OperationType);
},
// 澶氶�夋閫変腑鏁版嵁
handleSelectionChange(selection) {
@@ -1539,13 +1529,16 @@
//鎵撳紑鏂板缁勪欢寮圭獥
handleAddEdit() {
this.rowForm.HItemID = 0;
+ this.iframeUrl = `/iframe/ScICMOBillEdit?HInterID=0&OperationType=1`;
this.$nextTick(() => {
this.openEdit = true;
this.editShow = true;
});
},
//鎵撳紑淇敼缁勪欢寮圭獥
- handleEdit() {
+ handleEdit(row, OperationType) {
+ console.log(row);
+ this.iframeUrl = `/iframe/ScICMOBillEdit?HInterID=${row.hmainid}&OperationType=${OperationType}&HEntryID=${row.hsubid}`;
this.$nextTick(() => {
this.openEdit = true;
this.editShow = true;
diff --git a/src/views/KCGL/OtherOutBill/Kf_OtherOutBillEdit.vue b/src/views/KCGL/OtherOutBill/Kf_OtherOutBillEdit.vue
new file mode 100644
index 0000000..d2cad7a
--- /dev/null
+++ b/src/views/KCGL/OtherOutBill/Kf_OtherOutBillEdit.vue
@@ -0,0 +1,1107 @@
+<template>
+ <div v-loading="formLoading" v-if="formShow">
+ <div style=" margin-bottom: 10px; border-bottom: 1px solid #f6f6f6;">
+ <el-button type="primary" @click="handleAdd(OperationType = 1)" v-if="addBtnShow">鏂板</el-button>
+ <el-button type="primary" @click="submitForm" :disabled="subDisabled">淇� 瀛�</el-button>
+ <el-button type="primary" @click="set_CheckBill(0, form)">瀹� 鏍�</el-button>
+ <el-button type="primary" @click="close">閫� 鍑�</el-button>
+ <!-- <el-button @click="cancel">鍙� 娑�</el-button> -->
+ </div>
+ <div style="margin: 10px; font-size: 28px; font-weight: bold; text-align: center;">鍏朵粬鍑哄簱鍗�</div>
+ <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+ <el-tabs v-model="activeName" type="card">
+ <el-tab-pane label="鍩烘湰淇℃伅" name="first">
+ <el-row>
+ <el-col :span="6">
+ <el-form-item label="鍗曟嵁缂栧彿" prop="HBillNo">
+ <el-input v-model="form.HBillNo" placeholder="璇疯緭鍏ュ崟鎹紪鍙�" disabled="true" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="鏃ユ湡" prop="HDate">
+ <el-date-picker v-model="form.HDate" type="date" placeholder="閫夋嫨鏃ユ湡" value-format="yyyy-MM-ddT">
+ </el-date-picker>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="涓氬姟鍛�" prop="HEmpName">
+ <el-input v-model="form.HKeeperName" placeholder="璇疯緭鍏ヤ笟鍔″憳" disabled>
+ <el-button slot="append" icon="el-icon-search" @click="openDataDialog(1)"></el-button>
+ </el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="閮ㄩ棬" prop="HDeptName">
+ <el-input v-model="form.HDeptName" placeholder="璇疯緭鍏ラ儴闂�" disabled>
+ <el-button slot="append" icon="el-icon-search" @click="openDataDialog(1)"></el-button>
+ </el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="6">
+ <el-form-item label="寰�鏉ュ崟浣�" prop="HSupName">
+ <el-input v-model="form.HDeptName" placeholder="璇疯緭鍏ュ線鏉ュ崟浣�" disabled>
+ <el-button slot="append" icon="el-icon-search" @click="openDataDialog(1)"></el-button>
+ </el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="浠撳簱" prop="HWHName">
+ <el-input v-model="form.HWHName" placeholder="璇疯緭鍏ヤ粨搴�" disabled>
+ <el-button slot="append" icon="el-icon-search" @click="openDataDialog(1)"></el-button>
+ </el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="婧愬崟绫诲瀷" prop="HSourceBillType">
+ <el-select v-model="form.HSourceBillType" @change="sourceBillTypeChange" >
+ <el-option v-for="(item, index) in sourceBillTypeList" :key="index" :label="item.HSourceBillTypeName" :value="item.HSourceBillType">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="閫夊崟鍙�" prop="HMainSourceBillNo">
+ <el-input v-model="form.HMainSourceBillNo" placeholder="璇烽�夋嫨婧愬崟" disabled>
+ <el-button slot="append" icon="el-icon-search" @click="openDataDialog(1)"></el-button>
+ </el-input>
+ </el-form-item>
+ </el-col>
+
+ <el-col :span="6">
+ <el-form-item label="淇濈鍛�" prop="HKeeperName">
+ <el-input v-model="form.HKeeperName" placeholder="璇疯緭鍏ヤ繚绠″憳" disabled>
+ <el-button slot="append" icon="el-icon-search" @click="openDataDialog(1)"></el-button>
+ </el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="楠屾敹鍛�" prop="HSecManagerName">
+ <el-input v-model="form.HSecManagerName" placeholder="璇疯緭鍏ラ獙鏀跺憳" disabled>
+ <el-button slot="append" icon="el-icon-search" @click="openDataDialog(1)"></el-button>
+ </el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-form-item label="澶囨敞" prop="HRemark">
+ <el-input v-model="form.HRemark" placeholder="璇疯緭鍏ュ娉�" />
+ </el-form-item>
+ <el-form-item label="缁勭粐" prop="HOrgID">
+ <el-select v-model="form.HOrgID" placeholder="璇烽�夋嫨缁勭粐" @change="organizationChange" :disabled="zzSelDis">
+ <el-option v-for="(item, index) in organizationList" :key="index" :label="item.Name" :value="item.ID">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-row v-show="formHideDataShow">
+ <el-col :span="6">
+ <el-form-item label="淇濈鍛�" prop="HKeeperName">
+ <el-input v-model="form.HKeeperName" placeholder="璇疯緭鍏ヤ繚绠″憳" disabled>
+ <el-button slot="append" icon="el-icon-search" @click="openDataDialog(1)"></el-button>
+ </el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="楠屾敹鍛�" prop="HSecManagerName">
+ <el-input v-model="form.HSecManagerName" placeholder="璇疯緭鍏ラ獙鏀跺憳" disabled>
+ <el-button slot="append" icon="el-icon-search" @click="openDataDialog(1)"></el-button>
+ </el-input>
+ </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-col>
+ </el-row>
+ <el-row>
+ <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-tab-pane>
+ </el-tabs>
+ <div style="margin-bottom: 10px;">
+ <el-button type="success" plain icon="el-icon-plus" @click="handleAddSysZb()" size="mini">澧炲姞涓�琛�</el-button>
+ <el-button type="success" plain icon="el-icon-plus" @click="handleAddSysZb(zbIndex, 1)"
+ size="mini">鎻掑叆涓�琛�</el-button>
+ <el-button type="success" plain icon="el-icon-plus" @click="handleCopyZbRow" size="mini">澶嶅埗涓�琛�</el-button>
+ <el-button type="success" plain icon="el-icon-arrow-up" @click="handleMoveRowUp(zbSelForm)"
+ size="mini">涓婄Щ</el-button>
+ <el-button type="success" plain icon="el-icon-arrow-down" @click="handleMoveRowDown(zbSelForm)"
+ size="mini">涓嬬Щ</el-button>
+ </div>
+ <el-table :data="editData" style="width: 100%" height="300" width="100%" ref="zbTable"
+ @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">
+ <template slot-scope="scope">
+ <span>{{ scope.row.HSourceBillNo }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="婧愬崟绫诲瀷" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.HSourceBillType }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="婧愬崟涓诲唴鐮�" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.HSourceInterID }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="婧愬崟瀛愬唴鐮�" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.HSourceEntryID }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="HMaterID" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.HMaterID }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="鐗╂枡浠ｇ爜" width="120">
+ <template slot-scope="scope">
+ <el-input v-model="scope.row.鐗╂枡浠ｇ爜" placeholder="璇疯緭鍏ョ墿鏂欎唬鐮�" @keyup.native.f7="openDataDialog(3, scope.row)"
+ @dblclick.native="openDataDialog(3, scope.row)" />
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="鐗╂枡鍚嶇О" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.鐗╂枡鍚嶇О }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="瑙勬牸鍨嬪彿" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.瑙勬牸鍨嬪彿 }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="HUnitID" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.HUnitID }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="璁￠噺鍗曚綅" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.璁￠噺鍗曚綅 }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="HPropertyID" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.HPropertyID }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="杈呭姪灞炴��" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.杈呭姪灞炴�� }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="HAuxPropID" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.HAuxPropID }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="鐗╂枡杈呭姪灞炴��" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.鐗╂枡杈呭姪灞炴�� }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="鎹㈢畻鐜�" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.HSecUnitRate }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="搴斿彂鏁伴噺" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.HQtyMust }}</span>
+ </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;"
+ controls-position="right"></el-input-number>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="浠舵暟" width="120">
+ <template slot-scope="scope">
+ <el-input-number v-model="scope.row.HPieceQty" :min="0" style="width: 90px;"
+ controls-position="right"></el-input-number>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="鍗曚环" width="120">
+ <template slot-scope="scope">
+ <el-input-number v-model="scope.row.HPrice" :min="0" style="width: 90px;"
+ controls-position="right"></el-input-number>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="閲戦" width="120">
+ <template slot-scope="scope">
+ <span>{{scope.row.HMoney = scope.row.HPrice * scope.row.HQty }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="鍙戞枡浠撳簱" width="120">
+ <template slot-scope="scope">
+ <el-input v-model="scope.row.鏀舵枡浠撳簱" placeholder="璇疯緭鍏ュ彂鏂欎粨搴�" @keyup.native.f7="openDataDialog(2, scope.row)"
+ @dblclick.native="openDataDialog(2, scope.row)" />
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="鍙戞枡浠撲綅" width="120">
+ <template slot-scope="scope">
+ <el-input v-model="scope.row.鏀舵枡浠撲綅" placeholder="璇疯緭鍏ュ彂鏂欎粨浣�" @keyup.native.f7="openDataDialog(2, scope.row)"
+ @dblclick.native="openDataDialog(2, scope.row)" />
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="鎵规" width="120">
+ <template slot-scope="scope">
+ <el-input v-model="scope.row.HBatchNo" placeholder="璇疯緭鍏ユ壒娆�" />
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="閲囪喘璁㈠崟鍙�" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.HPOOrderBillNo }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="閲囪喘璁㈠崟涓诲唴鐮�" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.HPOOrderInterID }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="閲囪喘璁㈠崟瀛愬唴鐮�" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.HPOOrderEntryID }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="閿�鍞鍗曞彿" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.HPOOrderBillNo }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="閿�鍞鍗曚富鍐呯爜" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.HSeOrderInterID }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="閿�鍞鍗曞瓙鍐呯爜" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.HSeOrderEntryID }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="澶囨敞" width="120">
+ <template slot-scope="scope">
+ <el-input v-model="scope.row.HRemark" placeholder="璇疯緭鍏ュ娉�" />
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="鎿嶄綔" width="55" fixed="right">
+ <template slot-scope="scope">
+ <el-button type="danger" icon="el-icon-delete" size="mini" circle
+ @click="handleDeleteSysZb(scope.row)"></el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ </el-form>
+ <!-- 鏁版嵁寮圭獥 -->
+ <el-dialog :title="dialogTitle" :visible.sync="openData" width="1280px" append-to-body>
+ <!-- 閮ㄩ棬 -->
+ <Dept @deptEmitDb="dbEmitData" @deptEmit="emitData" v-if="deptShow" />
+ <!-- 浠撳簱 -->
+ <Warehouse @deptEmitDb="dbEmitData" @deptEmit="emitData" v-if="warehouseShow" />
+ <!-- 鐗╂枡 -->
+ <Material @deptEmitDb="dbEmitData" @deptEmit="emitData" v-if="materialShow" />
+ <div slot="footer" class="dialog-footer">
+ <el-button type="primary" @click="deptClickSub">纭� 瀹�</el-button>
+ <el-button @click="deptClose">鍙� 娑�</el-button>
+ </div>
+ </el-dialog>
+ <el-dialog title="闅愯棌鍒楄缃�" :visible.sync="openRowHide" width="816px" append-to-body>
+ <RowSettings :colName="btResList" HModName="Kf_ProductInBillEdit" @rowEditClose="rowSetClose" v-if="rowHideShow" />
+ </el-dialog>
+ </div>
+</template>
+
+<script>
+import axios from 'axios'
+import moment from 'moment';
+import RowSettings from '@/views/component/rowSettings'
+import Dept from '@/views/component/dept'
+import Warehouse from '@/views/component/warehouse'
+import Material from '@/views/component/material'
+
+export default {
+ name: 'ProductInBill',
+ components: { Dept, Warehouse, Material, RowSettings },
+ props: {
+ OperationType: { type: Number, },
+ linterid: { type: Number, },
+ HSouceBillType: { type: String, },
+ propsData: { type: String, },
+ copyType: { type: Number, },
+ },
+ data() {
+ return {
+ baseURL: process.env.VUE_APP_BASE_API, //鍚庣鎺ュ彛鍓嶇紑(鍚庣鏈嶅姟鍣↖P)
+
+ organizationList: [], //椤甸潰鍒濆鍖栫粍缁囧垪琛�
+ sourceBillTypeList: [], //椤甸潰鍒濆鍖栨簮鍗曠被鍨嬪垪琛�
+
+ loading: true, // 閬僵灞�
+
+ addBtnShow: false, //鏂板鎸夐挳鏄剧ず鏍囪
+ subDisabled: false, //淇濆瓨鎸夐挳绂佺敤鏍囪
+
+ formShow: false, //琛ㄥ崟鏄惁鏄剧ず鏍囪
+ formHideDataShow: false, //琛ㄥ崟闅愯棌鍐呭鏍囪
+ formLoading: true, //琛ㄥ崟鍔犺浇閬僵
+ zzSelDis: false, //缁勭粐涓嬫媺鍒楄〃绂佺敤鏍囪
+
+ rowHideShow: false, //鍒楄缃粍浠跺鍣ㄦ樉绀烘爣璁�
+ openRowHide: false, //鍒楄缃粍浠舵樉绀烘爣璁�
+
+ dialogTitle: '', //寮圭獥鏍囬
+ openData: false, //鏁版嵁寮圭獥
+ dialogTypeNum: null, //閮ㄩ棬寮圭獥1锛屼粨搴撳脊绐�2
+ deptShow: false, //閮ㄩ棬鏁版嵁缁勪欢鏄剧ず鏍囪
+ warehouseShow: false, //浠撳簱鏁版嵁缁勪欢鏄剧ず鏍囪
+ materialShow: false, //鐗╂枡鏁版嵁缁勪欢鏄剧ず鏍囪
+ stockPlaceShow: false, //浠撲綅鏁版嵁缁勪欢鏄剧ず鏍囪
+ deptform: {}, //寮圭獥閫変腑鏁版嵁
+
+ temp: undefined, //涓存椂鍙橀噺
+ btResList: [], // 鍒楄缃�
+ form: {}, // 琛ㄥ崟鍙傛暟
+ rules: { // 琛ㄥ崟鏍￠獙
+ },
+
+ checkedSysZb: [],
+ editData: [], //瀛愯〃鏁版嵁
+ editBtData: [], //瀛愯〃琛ㄥご
+ activeName: 'first',
+ zbIndex: null,
+ zbSelForm: {}, //瀛愯〃閫変腑鏁版嵁,鐢ㄤ簬瀛愯〃澶嶅埗銆佷笂绉汇�佷笅绉荤瓑鎿嶄綔
+ };
+ },
+ created() {
+ this.fetchData()
+ this.fetchData_SourceBillTypeList()
+ this.getdata()
+ },
+ beforeDestroy() {
+ this.$destroy()
+ },
+ methods: {
+ //#region 琛ㄥ崟鏁版嵁鍒濆鍖�
+ getdata() {
+ this.formShow = false
+ this.formLoading = true
+
+ if ((this.OperationType == 1 && this.copyType != 1) || (!this.OperationType && !this.copyType)) {
+ this.handleAdd()
+ }
+ else if (this.OperationType == 3 || this.copyType == 1) {
+ this.handleUpdate()
+ }
+ },
+ //#endregion
+
+ //#region 椤甸潰鏁版嵁鍒濆鍖�
+ reset() {
+ this.form = {
+ HInterID: 0,
+ HBillNo: "",
+ HDate: new Date(),
+ HInnerBillNo: "",
+ HSupID: 0,
+ HSupName: "",
+ HWHID: 0,
+ HWHName: "",
+ HSecManagerID: 0,
+ HSecManagerName: "",
+ HKeeperID: 0,
+ HKeeperName: "",
+ HDeptID: 0,
+ HDeptName: "",
+ HManagerID: 0,
+ HMangerName: "",
+ HEmpID: 0,
+ HEmpName: "",
+ HSourceBillType: "",
+ HExplanation :"",
+ HRemark: "",
+ HOrgID: sessionStorage["OrganizationID"] - 0,
+
+ HMaker: sessionStorage["HUserName"],
+ HMakeDate: new Date(),
+ HUpDater: "",
+ HUpDateDate: "",
+ HChecker: "",
+ HCheckDate: "",
+ HCloseMan: "",
+ HCloseDate: "",
+ HDeleteMan: "",
+ HDeleteDate: "",
+ }
+ this.editData = []
+ this.editBtData = []
+ this.ids = []
+ this.subDisabled = false
+ this.addBtnShow = false
+ // this.$refs.tableData.clearSelection()
+ this.activeName = 'first'
+ this.resetForm("form");
+ },
+ //#endregion
+
+ //#region 鏂板鎸夐挳鎿嶄綔
+ handleAdd() {
+ this.reset()
+ //鏂板鑾峰彇鍗曟嵁鍙�
+ this.getHBillNo()
+ if (this.OperationType == 1) {
+ this.handleAddSysZb()
+ }
+ this.$nextTick(() => {
+ this.formShow = true
+ this.formLoading = false
+ })
+ },
+ //#endregion
+
+ //#region 缂栬緫椤甸潰鍒濆鍖�
+ handleUpdate() {
+ this.reset()
+ let rowHmainid = this.linterid
+ axios.get(this.baseURL + "/Kf_OtherOutBill/Kf_OtherOutBillEdit", {
+ params: { 'HInterID': rowHmainid }
+ }).then(response => {
+ if (response.data.count == 1) {
+ var result = response.data
+ var data = response.data.data[0]
+ this.form.BillType = data.HSourceBillType
+ if (this.copyType == 1) {
+ this.getHBillNo()
+ }
+ else {
+ this.form.HInterID = data.hmainid
+ this.form.HBillNo = data.鍗曟嵁鍙�
+ this.form.HDate = data.鏃ユ湡
+ this.form.HMaker = data.鍒跺崟浜�
+ this.form.HUpDater = data.淇敼浜�
+ this.form.HChecker = data.瀹℃牳浜�
+ this.form.HMakeDate = data.鍒跺崟鏃ユ湡
+ this.form.HUpDateDate = data.淇敼鏃ユ湡
+ this.form.HCheckDate = data.瀹℃牳鏃ユ湡
+ this.form.HCloseMan = data.鍏抽棴浜�
+ this.form.HDeleteMan = data.浣滃簾浜�
+ this.form.HCloseDate = data.鍏抽棴鏃ユ湡
+ this.form.HDeleteDate = data.浣滃簾鏃ユ湡
+ }
+ this.form.HEmpID= data.HEmpID
+ this.form.HEmpName= data.涓氬姟鍛�
+ this.form.HDeptName= data.閮ㄩ棬
+ this.form.HDeptID= data.HDeptID
+ this.form.HSupID= data.HSupID
+ this.form.HSupName= data.寰�鏉ュ崟浣�
+ this.form.HWHID= data.HWHID
+ this.form.HWHName= data.浠撳簱
+ this.form.HExplanation= data.HExplanation
+ this.form.HRemark= data.琛ㄥご澶囨敞
+
+ this.form.HSecManagerID= data.HSecManagerID
+ this.form.HSecManagerName= data.楠屾敹鍛�
+ this.form.HKeeperID= data.HKeeperID
+ this.form.HKeeperName= data.淇濈鍛�
+
+ // this.form.HManagerID= data.HManagerID
+ // this.form.HMangerName= data.涓荤
+ // this.form.HInnerBillNo= data.鍐呴儴鍗曟嵁鍙�
+
+ // //瀛愯〃 璧嬪��
+ // for (var i = 0; i < result.data.length; i++) {
+ // // const data = result.data[i];
+ // // this.editData.push(result.data[i])
+ // }
+
+ if (data.鐘舵�� != '鍒涘缓' && this.copyType != 1) {
+ this.$modal.msgError("姝ゆ潯鏁版嵁涓嶆槸鍒涘缓鐘舵�侊紝涓嶈兘淇敼");
+ this.subDisabled = true
+ }
+ this.formShow = true
+ this.formLoading = false
+
+ }
+ }).catch(error => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ },
+ //#endregion
+
+ //#region 鍒楄缃�
+ handleRowHide() {
+ this.rowHideShow = true
+ this.openRowHide = true
+ },
+ rowSetClose(val) {
+
+ this.rowHideShow = false
+ this.openRowHide = val
+ this.$destroy()
+ },
+ //#endregion
+
+ //#region 缁勭粐鍊煎彉鏇翠簨浠�
+ organizationChange(val) {
+ // let options=undefined
+ // this.form=this.organizationList.find(option => option.ID === val)?.Name || '';
+ },
+ //#endregion
+
+ //#region 婧愬崟绫诲瀷鍊煎彉鏇翠簨浠�
+ sourceBillTypeChange(val) {
+ },
+ //#endregion
+
+ //#region 鏁版嵁寮圭獥
+ //#region 鎵撳紑鏁版嵁鍒楄〃寮圭獥
+ openDataDialog(num, row) {
+ if (row) {
+ this.zbIndex = row.index - 1
+ }
+ this.showReset()
+ if (num == 1) {
+ this.dialogTitle = '閮ㄩ棬鍒楄〃'
+ this.deptShow = true
+ this.openData = true
+ } else if (num == 2) {
+ this.dialogTitle = '鍑哄簱浠撳簱鍒楄〃'
+ this.warehouseShow = true
+ this.openData = true
+ } else if (num == 3) {
+ this.dialogTitle = '鐗╂枡鍒楄〃'
+ this.materialShow = true
+ this.openData = true
+ }else if (num == 4) {
+ this.dialogTitle = '浠撲綅鍒楄〃'
+ this.stockPlaceShow = true
+ this.openData = true
+ }
+ },
+ //#region 灏嗘暟鎹脊绐楀叏閮ㄥ彇娑堝姞杞�
+ showReset() {
+ this.deptShow = false
+ this.warehouseShow = false
+ this.materialShow = false
+ },
+ //#endregion
+ //#endregion
+
+ //#region 寮圭獥鏁版嵁鍙屽嚮杩斿洖琛ㄥ崟璧嬪�间簨浠�
+ dbEmitData(deptRow, num) {
+ if (num == 1) {
+ this.form.HDeptName = deptRow.閮ㄩ棬鍚嶇О //閮ㄩ棬
+ this.form.HDeptID = deptRow.HItemID
+ this.form.HEmpID = deptRow.HEmpID
+ this.form.HManagerName = deptRow.璐熻矗浜�
+ this.openData = false
+ }
+ else if (num == 2) { //鏀舵枡浠撳簱
+ this.editData[this.zbIndex].HWHID = deptRow.HItemID;
+ this.editData[this.zbIndex].鏀舵枡浠撳簱 = deptRow.浠撳簱鍚嶇О;
+ this.openData = false
+ }
+ else if (num == 4) { //浠撲綅
+ this.editData[this.zbIndex].HSPID = deptRow.HItemID;
+ this.editData[this.zbIndex].浠撲綅鍚嶇О = deptRow.浠撲綅鍚嶇О;
+ this.openData = false
+ }
+ else if (num == 3) { //鐗╂枡
+ this.editData[this.zbIndex].HMaterID = deptRow.HItemID;
+ this.editData[this.zbIndex].鐗╂枡浠ｇ爜 = deptRow.鐗╂枡浠ｇ爜;
+ this.editData[this.zbIndex].鐗╂枡鍚嶇О = deptRow.鐗╂枡鍚嶇О;
+ this.editData[this.zbIndex].HUnitID = deptRow.HUnitID;
+ this.editData[this.zbIndex].瑙勬牸鍨嬪彿 = deptRow.瑙勬牸鍨嬪彿
+ this.editData[this.zbIndex].璁￠噺鍗曚綅 = deptRow.璁￠噺鍗曚綅鍚嶇О
+ this.editData[this.zbIndex].HTaxPrice = deptRow.鍚◣鎴愭湰浠�
+ this.editData[this.zbIndex].HTaxRate = deptRow.榛樿绋庣巼
+ this.openData = false
+ }
+ },
+ //#endregion
+
+ //#region 寮圭獥鏁版嵁鍗曞嚮浜嬩欢
+ emitData(deptRow, num) {
+ this.dialogTypeNum = num
+ this.deptform = deptRow
+ },
+ //#endregion
+
+ //#region 寮圭獥纭畾浜嬩欢
+ deptClickSub() {
+ this.dbEmitData(this.deptform, this.dialogTypeNum)
+ this.deptform = {}
+ },
+ //#endregion
+
+ //#region 寮圭獥鍙栨秷浜嬩欢
+ deptClose() {
+ this.deptform = {}
+ this.openData = false
+ },
+ //#endregion
+ //#endregion
+
+ //#region 宸ュ叿鏍忔寜閽搷浣�
+ //#region 缂栬緫鎻愪氦淇濆瓨
+ submitForm() {
+ this.$refs["form"].validate(valid => {
+ if (valid) {
+ let fhck = false
+ this.editData.map((item, index) => {
+ if (!item.鍙戣揣浠撳簱) {
+ fhck = true
+ this.$modal.msgError("绗�" + (index + 1) + "琛岋細鍙戣揣浠撳簱鏈�夋嫨锛�");
+ }
+ })
+ this.$nextTick(() => {
+ if (!fhck) {
+ var sMainStr = JSON.stringify(this.form);
+ var sSubStr = JSON.stringify(this.editData);
+ var sMainSub = sMainStr + ';' + sSubStr + ';' + sessionStorage["HUserName"] + ';' + this.OperationType;
+ axios({
+ method: 'post',
+ url: this.baseURL + "/Kf_SellOutBill/SaveSellOutBillList",
+ data: {
+ 'msg': sMainSub
+ },
+ }).then(response => {
+ if (response.data.count == 1) {
+ this.subDisabled = true//璁剧疆淇濆瓨鎸夐挳涓嶅彲鐢�
+ this.$modal.msgSuccess(response.data.Message);
+ this.get_MAXNum_Task(1);//璁剧疆娴佹按鍙峰鍔�
+ if (response.data.Verify == "Y") //鑷姩瀹℃牳
+ {
+ this.set_CheckBill(0, this.form); //瀹℃牳
+ }
+ this.addBtnShow = true
+ }
+ }).catch(error => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ }
+ })
+ }
+ });
+ },
+ //#endregion
+
+ //#region 鍙嶅鏍�/瀹℃牳鏁版嵁
+ set_CheckBill(num, form) {
+ var InterID = form.hmainid || form.HInterID
+ //閫昏緫瀹℃牳鏂规硶
+ axios.get(this.baseURL + "/Kf_SellOutBill/AuditKf_SellOutBill", {
+ params: { "HInterID": InterID, "IsAudit": num, "CurUserName": sessionStorage["HUserName"] }
+ }).then(response => {
+ let result = response.data
+ if (result.code == 1) {
+ this.$modal.msgSuccess('鎿嶄綔鎴愬姛');
+ }
+ else {
+ this.$modal.msgError("閿欒:" + result.code + result.Message,);
+ }
+ }).catch(error => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ },
+ //#endregion
+
+ //#region 閫�鍑烘寜閽搷浣�
+ close() {
+ this.reset()
+
+ if (!this.OperationType && !this.copyType) {
+ // this.$router.back()
+ window.close()
+ } else {
+ this.formShow = false
+ this.$emit('editClose', false)
+ }
+ },
+ //#endregion
+ //#endregion
+
+ //#region 瀛愯〃鎿嶄綔
+ //#region 璁剧疆瀛愯〃搴忓彿鍒�
+ rowSysZbIndex({ row, rowIndex }) {
+ row.index = rowIndex + 1;
+ },
+ //#endregion
+
+ //#region 瀛愯〃鏂板銆佹彃鍏ユ寜閽搷浣�
+ handleAddSysZb(index, num) {
+ if (num == 1 && !index) {
+ this.$modal.msgError("璇烽�夋嫨涓�琛屾暟鎹紪杈�!");
+ } else {
+ let obj = {
+ HMaterID: 0,
+ 鐗╂枡浠ｇ爜: '',
+ 鐗╂枡鍚嶇О: '',
+ 瑙勬牸鍨嬪彿: '',
+ HUnitID: 0,
+ 璁￠噺鍗曚綅: '',
+ HQtyMust: 1,
+ HQty: 1,
+ HPieceQty: 0,
+ HPrice: 0,
+ HTaxPrice: 0,
+ HTaxRate: 0,
+ HMoney: 0,
+ HTaxMoney: 0,
+ HWHID: 0,
+ 鍙戣揣浠撳簱: '',
+ HRemark: '',
+ HQty_Full: 0,
+ HQty_Empty: 0,
+ HQty_Back: 0,
+ HCostPrice: 0,
+ HCostMoney: 0,
+ HSalePrice: 0,
+ HSeOrderInterID: 741,
+ HSeOrderEntryID: 18,
+ HSeOrderBillNo: 'XSFH00000747',
+ HSourceInterID: 741,
+ HSourceEntryID: 18,
+ HSourceBillNo: 'XSFH00000747',
+ HSourceBillType: 1402,
+ HRelationQty: 0,
+ HRelationMoney: 0,
+ HSPID: 0,
+ HSPName: '',
+ HSPGroupID: 0,
+ HSPGroupName: '',
+ HSCWHID: 0,
+ HSCWHName: '',
+ HSCSPID: 0,
+ HSCSPName: '',
+ HBatchNo: '',
+ HPOOrderInterID: 0,
+ HPOOrderEntryID: 0,
+ HPOOrderBillNo: '',
+ HPropertyID: 0,
+ HPropertyName: '',
+ HSecUnitID: 0,
+ HSecUnitName: '',
+ HSecUnitRate: 0,
+ HEngineNum: '',
+ HUnderPanNum: '',
+ HLeaveFactCard: '',
+ HReqBuyQty: 0,
+ HReqOutQty: 0,
+ HCurrentInventory: 0,
+ }
+ if (index) {
+ this.editData.splice(index, 0, obj);
+ this.$set(this.editData, index, obj)
+ } else {
+ this.editData.push(obj);
+ }
+ }
+ },
+ //#endregion
+
+ //#region 瀛愯〃澶嶅埗鎸夐挳
+ handleCopyZbRow() {
+ if (!this.zbIndex) {
+ this.$modal.msgError("璇烽�夋嫨涓�琛屾暟鎹�")
+ } else {
+ let copyRow = JSON.parse(JSON.stringify(this.zbSelForm))
+ this.editData.push(copyRow);
+ }
+ },
+ //#endregion
+
+ //#region 瀛愯〃涓婄Щ鎸夐挳
+ handleMoveRowUp(zbSelForm) {
+ if (!this.zbIndex) {
+ this.$modal.msgError("璇烽�夋嫨涓�琛屾暟鎹�")
+ } else {
+ if (zbSelForm.index == 1) {
+ this.$modal.msgError("绗竴琛屾暟鎹棤娉曚笂绉�");
+ } else { // 纭繚涓嶆槸绗竴琛�
+ let num = zbSelForm.index - 1
+ const record = this.editData.splice(num, 1)[0];
+ this.editData.splice(num - 1, 0, record);
+ }
+ }
+ },
+ //#endregion
+
+ //#region 瀛愯〃涓嬬Щ鎸夐挳
+ handleMoveRowDown(zbSelForm) {
+ if (!this.zbIndex) {
+ this.$modal.msgError("璇烽�夋嫨涓�琛屾暟鎹�")
+ } else {
+ if (zbSelForm.index == this.editData.length) {
+ this.$modal.msgError("鏈�鍚庝竴琛屾暟鎹棤娉曚笅绉�");
+ } else { // 纭繚涓嶆槸绗竴琛�
+ let num = zbSelForm.index - 1
+ const record = this.editData.splice(num, 1)[0];
+ this.editData.splice(num + 1, 0, record);
+ }
+ }
+ },
+ //#endregion
+
+ //#region 瀛愯〃鍒犻櫎鎸夐挳
+ handleDeleteSysZb(row) {
+ this.checkedSysZb = []
+ this.checkedSysZb.push(row.index)
+ if (this.checkedSysZb.length == 0) {
+ this.$modal.msgError("璇峰厛閫夋嫨瑕佸垹闄ょ殑鏄庣粏鏁版嵁");
+ } else {
+ const editData = this.editData;
+ const checkedSysZb = this.checkedSysZb;
+ this.editData = editData.filter(function (item) {
+ return checkedSysZb.indexOf(item.index) == -1
+ });
+ }
+ },
+ //#endregion
+
+ //#region 瀛愯〃澶嶉�夋閫変腑鏁版嵁
+ handleTableZbEdit(selection) {
+ this.checkedSysZb = selection.map(item => item.index)
+ this.zbSelForm = selection[0]
+ this.zbIndex = this.checkedSysZb[0]
+ if (selection.length > 1) {
+ const del_row = selection.shift()
+ this.$refs.zbTable.toggleRowSelection(del_row, false) //璁剧疆杩欎竴琛屽彇娑堥�変腑
+ }
+ },
+ //#endregion
+ //#endregion
+
+ //#region 閫氱敤鏂规硶銆�
+ //#region 鑾峰彇鍙傛暟_浼犻�掔殑JSON鏍煎紡鍙傛暟
+ getUrlVars_JSON() {
+ var datajson;
+ var str = this.propsData; //鑾峰彇閾炬帴涓紶閫掔殑鍙傛暟
+ var arr = str.substring(str.lastIndexOf("=") + 1);
+ datajson = JSON.parse(decodeURI(arr));
+ return datajson;
+ },
+ //#endregion
+
+ //#region 缁勭粐涓嬫媺鍒楄〃鏁版嵁鍒濆鍖�
+ fetchData() {
+ axios.get(this.baseURL + "/Web/GetOrganizations", {
+ }).then(response => {
+ if (response.data.count == 1) {
+ this.organizationList = response.data.data;//缁勭粐鍒楄〃
+ }
+ }).catch(error => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ },
+ //#endregion
+
+ //#region 婧愬崟绫诲瀷涓嬫媺鍒楄〃鏁版嵁鍒濆鍖�
+ fetchData_SourceBillTypeList() {
+ var HName = '鍏朵粬鍑哄簱鍗�';
+ axios.get(this.baseURL + "/Web/GetHSourceBillType", {
+ params: {
+ HName: HName,
+ Num: 2
+ }
+ }).then(response => {
+ if (response.data.count == 1) {
+ this.sourceBillTypeList = response.data.data;//缁勭粐鍒楄〃
+ }
+ }).catch(error => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ },
+ //#endregion
+
+ //#region 鑾峰彇鍐呯爜銆佸崟鎹彿
+ getHBillNo() {
+ axios.get(this.baseURL + "/WEBSController/GetMaxBillNoAndID_Json", {
+ params: {
+ HBillType: '1206'
+ }
+ }).then(response => {
+ this.form.HBillNo = response.data.data[0].HBillNo
+ this.form.HInterID = response.data.data[0].HInterID
+ }).catch(error => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ },
+ //#endregion
+
+ //#region 鑾峰彇鏈�澶у崟鎹彿
+ get_MAXNum_Task(Type) {
+ var sql = `exec h_p_Xt_GetMaxBillNo_SubType '1206','${this.form.HDate}',0,0,0,'${Type}','${this.form.HDeptID}'`;
+ axios({
+ method: 'get',
+ url: this.baseURL + "/CommonModel/searchMethod",
+ params: { "sql": sql, "user": sessionStorage["HUserName"], "ModRightNameCheck": "" },
+ }).then(response => {
+ if (response.data.count == 1) {
+ this.form.HBillNo = response.data.data[0].HBillNo;
+ } else {
+ this.$modal.msgError(response.data.code + response.data.Message);
+ }
+ }).catch(error => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ },
+ //#endregion
+
+ //#region 鏍规嵁鐢ㄦ埛鑾峰彇瀵瑰簲鑱屽憳銆侀儴闂ㄣ�侀攢鍞富绠�
+ getCzyglByUser() {
+ axios.get(this.baseURL + '/Xs_SeOrderBill/getCzyglByUser', {
+ params: { "CurUserName": sessionStorage["HUserName"] }
+ }).then(response => {
+ let dataForm = response.data.data[0]
+ this.form.HDeptID = dataForm.HDeptID
+ this.form.HDeptName = dataForm.HDeptName
+ this.form.HEmpID = dataForm.HEmpID
+ this.form.HEmpName = dataForm.HEmpName
+ this.form.HManagerID = dataForm.HManagerID
+ this.form.HManagerName = dataForm.HManagerName
+ }).catch(error => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ },
+ //#endregion
+
+ //#region 鏍规嵁瀹㈡埛鑾峰彇瀹㈡埛浣欓
+ getCustomerBalance(HCusID) {
+ axios.get(this.baseURL + '/Xs_CusRatingChangeBill/getCustomerBalance', {
+ params: { "HCusID": HCusID, 'CurUserName': sessionStorage["HUserName"] }
+ }).then(response => {
+ var data = response.data.data[0];
+ this.form.HCusBalance = data.HCusBalance
+ this.form.HCreditRating_Now = data.HCreditRating_Now
+ this.form.HAvailableBalance = data.HAvailableBalance
+ }).catch(error => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ },
+ //#endregion
+
+ //#region 鏍规嵁瀹㈡埛甯﹀嚭鑱旂郴浜恒�佽仈绯荤數璇�
+ getCustomerByCusID(HCusID) {
+ axios.get(this.baseURL + "/Xs_SeOrderBill/getCustomerByCusID", {
+ params: {
+ HCusID: HCusID
+ }
+ }).then(response => {
+ this.form.鑱旂郴浜� = response.data.data[0].HLinkMan
+ this.form.鑱旂郴鐢佃瘽 = response.data.data[0].HLinkPhone
+ // this.form = response.data.data[0]
+
+ }).catch(error => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ },
+ //#endregion
+
+ //#region 鑾峰彇閿�鍞嚭搴撳崟瀵瑰簲鐨勬潯鐮佹槑缁�
+ getBarCodeNoteBySellOutBill(rowHmainid) {
+ axios.get(this.baseURL + '/Kf_SellOutBill/BarCodeNote', {
+ params: { "HInterID": rowHmainid }
+ }).then(response => {
+ if (response.data.count == 1) {
+ if (response.data.data[2].length > 0) {
+ this.$modal.msgError("褰撳墠鍗曟嵁鐢辨壂鐮佺敓鎴愶紝涓嶅彲浠ョ紪杈戯紒");
+ this.subDisabled = true
+ }
+ } else { }
+ }).catch(error => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ },
+ //#endregion
+
+ //#region 鏍规嵁涓诲唴鐮佷笌瀛愬唴鐮佽幏鍙栨簮鍗曢攢鍞鍗曟暟鎹�
+ getPushSourceBillInit(HSourceInterID, HSourceEntryID) {
+ axios.get(this.baseURL + '/Xs_SeOrderBill/loadXs_SeOrderBill_Push', {
+ params: {
+ "HInterID": HSourceInterID
+ , "HSubID": HSourceEntryID
+ },
+ }).then(response => {
+ let result = response.data
+ if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ this.temp = result.data[0];
+ } else {
+ this.temp = result.data;
+ }
+ }).catch(error => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ },
+ //#endregion
+ //#endregion
+
+ }
+};
+</script>
+<style>
+.xsckdBox .el-date-editor.el-input {
+ width: 100%;
+}
+</style>
diff --git a/src/views/KCGL/OtherOutBill/Kf_OtherOutBillList.vue b/src/views/KCGL/OtherOutBill/Kf_OtherOutBillList.vue
new file mode 100644
index 0000000..eb98d12
--- /dev/null
+++ b/src/views/KCGL/OtherOutBill/Kf_OtherOutBillList.vue
@@ -0,0 +1,870 @@
+<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="queryParams.sTime" type="date" placeholder="寮�濮嬫棩鏈�" style="width: 150px;">
+ </el-date-picker>
+ </el-form-item>
+ <el-form-item label="缁撴潫鏃ユ湡">
+ <el-date-picker v-model="queryParams.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="HOrgID">
+ <el-select v-model="queryParams.HOrgID" placeholder="璇烽�夋嫨缁勭粐">
+ <el-option v-for="(item, index) in organizationList" :key="index" :label="item.Name" :value="item.ID">
+ </el-option>
+ </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-form-item>
+ <el-collapse v-model="activeSeach">
+ <el-collapse-item title="鏇村" name="1">
+ <el-card class="box-card">
+ <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-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-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="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" @pagination="handleQuery" />
+ <!-- 鍒楄缃� -->
+ <el-dialog title="闅愯棌鍒楄缃�" :visible.sync="openRowHide" width="816px" append-to-body>
+ <RowSettings :colName="btResList" HModName="Kf_OtherOutBillList" @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='Kf_ProductInBillList'
+ HModName='Kf_OtherOutBillList' @rowEditClose="rowSetClose" v-if="printListShow" />
+ <!-- <div>111</div> -->
+ </el-dialog>
+ <!-- 鏉＄爜鏄庣粏 -->
+ <BarCodeDetail :visible.sync="barCodeDetailShow" ref="barcodeDetail"/>
+ </div>
+ </div>
+</template>
+
+<script>
+import axios from 'axios'
+import moment from 'moment'; //瀵煎嚭缁勪欢
+import RowSettings from '@/views/component/rowSettings' //鍒楄缃粍浠�
+import PrintList from '@/views/component/printList' //鎵撳嵃缁勪欢
+import BarCodeDetail from '@/views/component/BarCodeDetail' //鏉＄爜鏄庣粏缁勪欢
+import Edit from '@/views/KCGL/OtherOutBill/Kf_OtherOutBillEdit.vue' //缂栬緫椤甸潰缁勪欢
+
+export default {
+ name: 'Kf_OtherOutBillList',
+ components: { RowSettings, Edit, PrintList,BarCodeDetail },
+ data() {
+ return {
+ baseURL: process.env.VUE_APP_BASE_API, //鍚庣鎺ュ彛鍓嶇紑(鍚庣鏈嶅姟鍣╥p鍦板潃)
+
+ OperationType: null, //淇濆瓨绫诲瀷锛堟柊澧�1淇敼3锛�
+ copyType: 0, //澶嶅埗鏍囪銆傛墦寮�缂栬緫缁勪欢鏃讹紝鐢ㄤ簬鍖哄垎缂栬緫杩樻槸澶嶅埗
+ HInterID: null,
+
+ 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: [], //缁勭粐鍒楄〃
+ btList: [], //鍒楄〃琛ㄥご瀛楁鍒楄〃
+ 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' },
+ ],
+
+ dialogTitle: '', // 寮圭獥鏍囬
+ title: "", // 寮瑰嚭灞傛爣棰�
+ open: false, // 鏄惁鏄剧ず寮瑰嚭灞�
+ loading: true, // 閬僵灞�
+
+ activeSeach: '',
+ // addBtnShow: false, //缂栬緫缁勪欢瀹瑰櫒鏄剧ず鏍囪
+ editShow: false, //缂栬緫缁勪欢瀹瑰櫒鏄剧ず鏍囪
+ openEdit: false, //缂栬緫缁勪欢鏄剧ず鏍囪
+ openPrintList: false, //鎵撳嵃缁勪欢瀹瑰櫒鏄剧ず鏍囪
+ printListShow: false, //鎵撳嵃缁勪欢鏄剧ず鏍囪
+ openBtnHide: false, //鎸夐挳缁勪欢瀹瑰櫒鏄剧ず鏍囪
+ btnHideShow: false, //鎸夐挳缁勪欢鏄剧ず鏍囪
+ openRowHide: false, //鍒楄缃粍浠舵樉绀烘爣璁�
+ rowHideShow: false, //鍒楄缃粍浠跺鍣ㄦ樉绀烘爣璁�
+ barCodeDetailShow: false, //鏉＄爜鏄庣粏缁勪欢瀹瑰櫒鏄剧ず鏍囪
+
+
+
+ // 鏌ヨ鍙傛暟
+ sWhere: '', // 鎷兼帴杩囨护鏉′欢
+ queryParams: { // form鏁版嵁
+ HBillNo: '',
+ HInitTimeCycle: 29,
+ sTime: '',
+ eTime: '',
+ HOrgID: 0,
+ ColName1: '',
+ ColName2: '',
+ ColName: '',
+ Comparator1: '',
+ Comparator2: '',
+ Comparator: '',
+ ColContent1: '',
+ ColContent2: '',
+ ColContent: '',
+ },
+
+ page: 1, //page椤电储寮�
+ pageSize: 0, //page椤甸潰璁板綍鏁�
+ total: 0, //璁板綍鍚堣鏁�
+ tableShow: true, // table鏄剧ず鏍囪
+ totalNameList: [], // 闇�瑕佽缃悎璁¤鐨勫垪鏁扮粍
+ tableData: [], // 鍒楄〃鏁版嵁銆傜敤浜巘able鐩戝惉浜嬩欢
+ ids: [], // 閫変腑琛岀殑hmainid鏁扮粍
+ single: true, // 褰撻�変腑鐨勮鏁颁笉涓�1鏃朵负true銆傜敤浜庣鐢ㄧ浉鍏虫搷浣�
+ multiple: true, // 褰撻�変腑鐨勮鏁颁负0鏃朵负true銆傜敤浜庣鐢ㄧ浉鍏虫搷浣�
+ lastSelectedRowIndex: null, // 鐢ㄤ簬璁板綍涓婃鐐瑰嚮鐨勮绱㈠紩
+ lastSelectedRow: null, // 涓婁竴娆￠�変腑鐨勮
+ selectedRow: null, // 褰撳墠閫変腑鐨勮
+ rowForm: {}, // 褰撻�変腑鐨勫彧鏈変竴琛屾椂锛屾洿鏂版暟鎹负璇ラ�変腑鐨勮銆�
+
+ tyResList: [], // 鍒楄〃鏁版嵁锛岀敤浜庡鍑�
+ titleData: [], // 涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ btResList: [], // 鍒楄〃琛ㄥご鏁版嵁銆傜敤浜庡垪璁剧疆
+ dataList: [], // option璁板綍銆傜敤浜庡綋option鏁版嵁鏃犳晥鏃讹紝鐢ㄤ簬鍒楄缃�
+ };
+ },
+ created() {
+ this.fetchData() //鍔犺浇缁勭粐涓嬫媺鍒楄〃鏁版嵁
+ this.riqiChange()
+ this.handleQuery();
+ },
+
+ methods: {
+ //#region 璁剧疆琛ㄥご
+ 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)
+ },
+ //#endregion
+
+ //#region 鐐瑰嚮琛�
+ handleRowClick(row, column, event) {
+ this.lastSelectedRow = this.selectedRow; // 璁板綍涓婁竴娆￠�変腑鐨勮
+ this.selectedRow = row; // 璁板綍褰撳墠閫変腑鐨勮
+ this.lastSelectedRowIndex = this.tableData.indexOf(row);
+ this.$refs.tableData.toggleRowSelection(row);
+ },
+ //#endregion
+
+ //#region 閫変腑琛岄珮浜牱寮�
+ rowStyle({ row, rowIndex }) {
+ if (this.ids.includes(row.hmainid)) {
+ return { "background": "#ecf5ff" }
+ }
+ },
+ //#endregion
+
+ //#region 鍙屽嚮琛�
+ handleDblclick(row, column, cell, event) {
+ this.OperationType = 3
+ this.handleEdit()
+ },
+ //#endregion
+
+ //#region 澶氶�夋閫変腑鏁版嵁
+ 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]
+ }
+ },
+ //#endregion
+
+ //#region 鏍规嵁鏃ユ湡闂撮殧锛岃缃紑濮嬫棩鏈熴�佺粨鏉熸棩鏈�
+ 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.queryParams.sTime = yyyyS + '-' + mmS + '-' + ddS
+ this.queryParams.eTime = yyyyE + '-' + mmE + '-' + ddE
+ },
+ //#endregion
+
+ //#region 鍔犺浇缁勭粐涓嬫媺鍒楄〃鏁版嵁
+ fetchData() {
+ axios.get(this.baseURL + "/Web/GetOrganizations", {
+ }).then(response => {
+ if (response.data.count == 1) {
+ this.organizationList = response.data.data;//缁勭粐鍒楄〃
+ }
+ }).catch(error => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ this.queryParams.HOrgID = sessionStorage["OrganizationID"];
+ },
+ //#endregion
+
+ //#region 閲嶇疆
+ resetQuery() {
+ this.sWhere = ''
+ this.queryParams = {
+ HBillNo: '',
+ HInitTimeCycle: 29,
+ ColName1: '',
+ ColName2: '',
+ ColName: '',
+ Comparator1: '',
+ Comparator2: '',
+ Comparator: '',
+ ColContent1: '',
+ ColContent2: '',
+ ColContent: '',
+ }
+ this.riqiChange()
+ this.resetForm("queryForm")
+ this.handleQuery()
+ },
+ //#endregion
+
+ //#region 蹇�熻繃婊�
+ 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')
+ console.log(this.queryParams.sTime, this.queryParams.eTime)
+ 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 + "'";
+ }
+ this.getList()
+ },
+ //#endregion
+
+ //#region 鏌ヨ
+ getList() {
+ this.pageSize = 50
+ if (this.pageSize == 0) {
+ this.pageSize = 50
+ }
+ this.tableShow = false
+ this.loading = true
+
+ // 鍒楄〃鏌ヨ
+ axios.get(this.baseURL + '/Kf_OtherOutBill/GetOtherOutBillList', {
+ params: {
+ "sWhere": this.sWhere,
+ "user": sessionStorage["HUserName"]
+ },
+ }).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 });//浠庢瘡涓璞′腑鎻愬彇鏁版嵁
+ }
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ 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;
+ let HModName = "Kf_OtherOutBillList"
+ this.DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option, this.dataList);
+ }
+ }).catch(error => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ },
+
+ //#region 鍚堣琛屾暟鎹鐞�
+ 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;
+ },
+ //#endregion
+
+ //#endregion
+
+ //#region 鏂板
+ handleAddEdit() {
+ this.rowForm.hmainid = 0
+ this.editShow = true
+ this.openEdit = true
+ },
+ //#endregion
+
+ //#region 缂栬緫
+ handleEdit(row) {
+ this.rowForm = row
+ this.editShow = true
+ this.openEdit = true
+ },
+ editClose(val) {
+ this.open = val
+ this.editShow = false
+ this.openEdit = val
+ this.handleQuery()
+ },
+ //#endregion
+
+ //#region 鍒犻櫎
+ handleDelete() {
+ this.$modal.confirm('纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠').then(() => {
+ if (this.rowForm.鐘舵�� == "鍒涘缓") {
+ axios.get(this.baseURL + "Kf_OtherOutBill/DelteteGetOtherOutBill", {
+ params: { 'HInterID': this.rowForm.hmainid.toString(), 'user': sessionStorage["HUserName"] }
+ }).then(response => {
+ if (response.data.count == 1) {
+ this.handleQuery()
+ this.$modal.msgSuccess("鍒犻櫎鎴愬姛")
+ } else {
+ this.$modal.msgError("閿欒:" + result.code + result.Message);
+ }
+ }).catch(error => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ } else {
+ this.$modal.msgError("姝ゆ潯鏁版嵁涓嶆槸鍒涘缓鐘舵��,鏃犳硶鍒犻櫎!");
+ }
+ }).catch(() => { })
+ },
+ //#endregion
+
+ //#region 瀹℃牳/鍙嶅鏍�
+ set_CheckBill(num, form) {
+ var InterID = form.hmainid || form.HInterID
+ //閫昏緫瀹℃牳鏂规硶
+ axios.get(this.baseURL + "/Kf_OtherOutBill/CheckKf_OtherOutBill", {
+ params: { "HInterID": InterID, "Type": num, "user": sessionStorage["HUserName"] }
+ }).then(response => {
+ let result = response.data
+ if (result.count == 1) {
+ this.$modal.msgSuccess('鎿嶄綔鎴愬姛');
+ this.handleQuery();
+ }
+ else {
+ this.$modal.msgError("閿欒:" + result.code + result.Message,);
+ }
+ }).catch(error => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ },
+ //#endregion
+
+ //#region 鍒楄缃�
+ handleRowHide() {
+ this.rowHideShow = true
+ this.openRowHide = true
+ },
+ rowSetClose(val) {
+ this.rowHideShow = false
+ this.tableShow = true
+ this.openRowHide = val
+ this.handleQuery()
+ },
+ 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("鎺ュ彛璇锋眰澶辫触!");
+ });
+ },
+ //#endregion
+
+ //#region 鎸夐挳璁剧疆
+ handleBtnHide() {
+ this.btnHideShow = true
+ this.openBtnHide = true
+ },
+ //#endregion
+
+ //#region 瀵煎嚭
+ 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, `Kf_OtherOutBillList_${new Date().getTime()}.xlsx`); // 瀵煎嚭鏂囦欢
+ },
+ //#endregion
+
+ //#region 鎵撳嵃
+ get_PrintReport() {
+ if (this.ids.length != 1) {
+ this.$modal.msgError("璇烽�夋嫨涓�琛屾暟鎹�")
+ } else if (this.rowForm.鐘舵�� != "宸插鏍�" && !this.defaintOperationByCompanyName()) {
+ this.$modal.msgError("鎵撳嵃澶辫触!鍘熷洜锛氬崟鎹姸鎬佷笉涓�'宸插鏍�'鐘舵��!!");
+ } else {
+ axios.get(this.baseURL + "/Kf_SellOutBill/CheckSellOutBill_IsExist", {
+ params: { "HInterID": this.rowForm.hmainid }
+ }).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("鎺ュ彛璇锋眰澶辫触!");
+ });
+
+
+ }
+ // var content= ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + data[0].hmainid.toString() + '&MyMsg=' + data[0].hmainid.toString() + '&Type=Kf_SellOutBillList', 'yes']
+ },
+ //#endregion
+
+ //#region 鏉＄爜鏄庣粏
+ get_BarCodeDetail() {
+ // if (this.selectedRow.length !== 1) {
+ // this.$message.warning('璇烽�夋嫨涓�琛屾暟鎹煡鐪嬫潯鐮佹槑缁嗭紒')
+ // return
+ // }
+ this.barCodeDetailShow = true
+ this.$nextTick(() => {
+ this.$refs.barcodeDetail.open(this.rowForm)
+ })
+ },
+ //#endregion
+
+ //#region 閫�鍑�
+ close() {
+ // this.reset()
+ this.tableShow = true
+ this.openEdit = false
+ this.editShow = false
+ this.handleQuery()
+ },
+ //#endregion
+
+ //#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;
+ },
+ //#endregion
+ }
+};
+</script>
+<style>
+.xsckdBox .el-date-editor.el-input {
+ width: 100%;
+}
+</style>
diff --git a/src/views/ProductInBill/Kf_ProductInBillEdit.vue b/src/views/ProductInBill/Kf_ProductInBillEdit.vue
new file mode 100644
index 0000000..6dfa15b
--- /dev/null
+++ b/src/views/ProductInBill/Kf_ProductInBillEdit.vue
@@ -0,0 +1,1056 @@
+<template>
+ <div v-loading="formLoading" v-if="formShow">
+ <div style=" margin-bottom: 10px; border-bottom: 1px solid #f6f6f6;">
+ <el-button type="primary" @click="handleAdd(OperationType = 1)" v-if="addBtnShow">鏂板</el-button>
+ <el-button type="primary" @click="submitForm" :disabled="subDisabled">淇� 瀛�</el-button>
+ <el-button type="primary" @click="set_CheckBill(0, form)">瀹� 鏍�</el-button>
+ <el-button type="primary" @click="close">閫� 鍑�</el-button>
+ <!-- <el-button @click="cancel">鍙� 娑�</el-button> -->
+ </div>
+ <div style="margin: 10px; font-size: 28px; font-weight: bold; text-align: center;">鐢熶骇鍏ュ簱鍗�</div>
+ <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+ <el-tabs v-model="activeName" type="card">
+ <el-tab-pane label="鍩烘湰淇℃伅" name="first">
+ <el-row>
+ <el-col :span="6">
+ <el-form-item label="鍗曟嵁缂栧彿" prop="HBillNo">
+ <el-input v-model="form.HBillNo" placeholder="璇疯緭鍏ュ崟鎹紪鍙�" disabled="true" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="鏃ユ湡" prop="HDate">
+ <el-date-picker v-model="form.HDate" type="date" placeholder="閫夋嫨鏃ユ湡" value-format="yyyy-MM-ddT">
+ </el-date-picker>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="淇濈鍛�" prop="HKeeperName">
+ <el-input v-model="form.HKeeperName" placeholder="璇疯緭鍏ヤ繚绠″憳" disabled>
+ <el-button slot="append" icon="el-icon-search"></el-button>
+ </el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="浠撳簱" prop="HWHName">
+ <el-input v-model="form.HWHName" placeholder="璇疯緭鍏ヤ粨搴�">
+ <el-button slot="append" icon="el-icon-search"></el-button>
+ </el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="6">
+ <el-form-item label="甯佸埆" prop="HCurName">
+ <el-input v-model="form.HCurName" placeholder="璇疯緭鍏ュ竵鍒�">
+ <el-button slot="append" icon="el-icon-search"></el-button>
+ </el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="姹囩巼" prop="HExRate">
+ <el-input-number v-model="form.HExRate" placeholder="" disabled="true"></el-input-number>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="楠屾敹鍛�" prop="HSecManagerName">
+ <el-input v-model="form.HSecManagerName" placeholder="璇疯緭鍏ラ獙鏀跺憳" disabled>
+ <el-button slot="append" icon="el-icon-search"></el-button>
+ </el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="閮ㄩ棬" prop="HDeptName">
+ <el-input v-model="form.HDeptName" placeholder="璇疯緭鍏ラ儴闂�" disabled>
+ <el-button slot="append" icon="el-icon-search" @click="openDataDialog(1)"></el-button>
+ </el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="婧愬崟绫诲瀷" prop="HSourceBillType">
+ <el-select v-model="form.HSourceBillType" @change="sourceBillTypeChange" >
+ <el-option v-for="(item, index) in sourceBillTypeList" :key="index" :label="item.HSourceBillTypeName" :value="item.HSourceBillType">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-form-item label="澶囨敞" prop="HRemark">
+ <el-input v-model="form.HRemark" placeholder="璇疯緭鍏ュ娉�" />
+ </el-form-item>
+ <el-form-item label="缁勭粐" prop="HOrgID">
+ <el-select v-model="form.HOrgID" placeholder="璇烽�夋嫨缁勭粐" @change="organizationChange" :disabled="zzSelDis">
+ <el-option v-for="(item, index) in organizationList" :key="index" :label="item.Name" :value="item.ID">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ </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-col>
+ </el-row>
+ <el-row>
+ <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-tab-pane>
+ </el-tabs>
+ <div style="margin-bottom: 10px;">
+ <el-button type="success" plain icon="el-icon-plus" @click="handleAddSysZb()" size="mini">澧炲姞涓�琛�</el-button>
+ <el-button type="success" plain icon="el-icon-plus" @click="handleAddSysZb(zbIndex, 1)"
+ size="mini">鎻掑叆涓�琛�</el-button>
+ <el-button type="success" plain icon="el-icon-plus" @click="handleCopyZbRow" size="mini">澶嶅埗涓�琛�</el-button>
+ <el-button type="success" plain icon="el-icon-arrow-up" @click="handleMoveRowUp(zbSelForm)"
+ size="mini">涓婄Щ</el-button>
+ <el-button type="success" plain icon="el-icon-arrow-down" @click="handleMoveRowDown(zbSelForm)"
+ size="mini">涓嬬Щ</el-button>
+ </div>
+ <el-table :data="editData" style="width: 100%" height="300" width="100%" ref="zbTable"
+ @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">
+ <template slot-scope="scope">
+ <span>{{ scope.row.HSourceBillNo }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="婧愬崟绫诲瀷" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.HSourceBillType }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="婧愬崟涓诲唴鐮�" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.HSourceInterID }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="婧愬崟瀛愬唴鐮�" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.HSourceEntryID }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="HMaterID" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.HMaterID }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="鐗╂枡浠ｇ爜" width="120">
+ <template slot-scope="scope">
+ <el-input v-model="scope.row.鐗╂枡浠ｇ爜" placeholder="璇疯緭鍏ョ墿鏂欎唬鐮�" @keyup.native.f7="openDataDialog(3, scope.row)"
+ @dblclick.native="openDataDialog(3, scope.row)" />
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="鐗╂枡鍚嶇О" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.鐗╂枡鍚嶇О }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="瑙勬牸鍨嬪彿" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.瑙勬牸鍨嬪彿 }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="HUnitID" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.HUnitID }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="璁￠噺鍗曚綅" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.璁￠噺鍗曚綅 }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="HPropertyID" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.HPropertyID }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="杈呭姪灞炴��" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.杈呭姪灞炴�� }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="HSecUnitID" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.HSecUnitID }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="杈呭姪璁￠噺鍗曚綅" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.杈呭姪璁￠噺鍗曚綅 }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="鎹㈢畻鐜�" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.HSecUnitRate }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="搴旀敹鏁伴噺" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.HQtyMust }}</span>
+ </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;"
+ controls-position="right"></el-input-number>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="鍗曚环" width="120">
+ <template slot-scope="scope">
+ <el-input-number v-model="scope.row.HPrice" :min="0" style="width: 90px;"
+ controls-position="right"></el-input-number>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="閲戦" width="120">
+ <template slot-scope="scope">
+ <span>{{scope.row.HMoney = scope.row.HPrice * scope.row.HQty }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="鏀舵枡浠撳簱" width="120">
+ <template slot-scope="scope">
+ <el-input v-model="scope.row.鏀舵枡浠撳簱" placeholder="璇疯緭鍏ユ敹鏂欎粨搴�" @keyup.native.f7="openDataDialog(2, scope.row)"
+ @dblclick.native="openDataDialog(2, scope.row)" />
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="浠撲綅鍚嶇О" width="120">
+ <template slot-scope="scope">
+ <el-input v-model="scope.row.鏀舵枡浠撲綅" placeholder="璇疯緭鍏ヤ粨浣嶅悕绉�" @keyup.native.f7="openDataDialog(2, scope.row)"
+ @dblclick.native="openDataDialog(2, scope.row)" />
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="澶囨敞" width="120">
+ <template slot-scope="scope">
+ <el-input v-model="scope.row.HRemark" placeholder="璇疯緭鍏ュ娉�" />
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="鎿嶄綔" width="55" fixed="right">
+ <template slot-scope="scope">
+ <el-button type="danger" icon="el-icon-delete" size="mini" circle
+ @click="handleDeleteSysZb(scope.row)"></el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ </el-form>
+ <!-- 鏁版嵁寮圭獥 -->
+ <el-dialog :title="dialogTitle" :visible.sync="openData" width="1280px" append-to-body>
+ <!-- 閮ㄩ棬 -->
+ <Dept @deptEmitDb="dbEmitData" @deptEmit="emitData" v-if="deptShow" />
+ <!-- 浠撳簱 -->
+ <Warehouse @deptEmitDb="dbEmitData" @deptEmit="emitData" v-if="warehouseShow" />
+ <!-- 鐗╂枡 -->
+ <Material @deptEmitDb="dbEmitData" @deptEmit="emitData" v-if="materialShow" />
+ <div slot="footer" class="dialog-footer">
+ <el-button type="primary" @click="deptClickSub">纭� 瀹�</el-button>
+ <el-button @click="deptClose">鍙� 娑�</el-button>
+ </div>
+ </el-dialog>
+ <el-dialog title="闅愯棌鍒楄缃�" :visible.sync="openRowHide" width="816px" append-to-body>
+ <RowSettings :colName="btResList" HModName="Kf_ProductInBillEdit" @rowEditClose="rowSetClose" v-if="rowHideShow" />
+ </el-dialog>
+ </div>
+</template>
+
+<script>
+import axios from 'axios'
+import moment from 'moment';
+import RowSettings from '@/views/component/rowSettings'
+import Dept from '@/views/component/dept'
+import Warehouse from '@/views/component/warehouse'
+import Material from '@/views/component/material'
+
+export default {
+ name: 'ProductInBill',
+ components: { Dept, Warehouse, Material, RowSettings },
+ props: {
+ OperationType: { type: Number, },
+ linterid: { type: Number, },
+ HSouceBillType: { type: String, },
+ propsData: { type: String, },
+ copyType: { type: Number, },
+ },
+ data() {
+ return {
+ baseURL: process.env.VUE_APP_BASE_API, //鍚庣鎺ュ彛鍓嶇紑(鍚庣鏈嶅姟鍣↖P)
+
+ organizationList: [], //椤甸潰鍒濆鍖栫粍缁囧垪琛�
+ sourceBillTypeList: [], //椤甸潰鍒濆鍖栨簮鍗曠被鍨嬪垪琛�
+
+ loading: true, // 閬僵灞�
+
+ addBtnShow: false, //鏂板鎸夐挳鏄剧ず鏍囪
+ subDisabled: false, //淇濆瓨鎸夐挳绂佺敤鏍囪
+
+ formShow: false, //琛ㄥ崟鏄惁鏄剧ず鏍囪
+ formLoading: true, //琛ㄥ崟鍔犺浇閬僵
+ zzSelDis: false, //缁勭粐涓嬫媺鍒楄〃绂佺敤鏍囪
+
+ rowHideShow: false, //鍒楄缃粍浠跺鍣ㄦ樉绀烘爣璁�
+ openRowHide: false, //鍒楄缃粍浠舵樉绀烘爣璁�
+
+ dialogTitle: '', //寮圭獥鏍囬
+ openData: false, //鏁版嵁寮圭獥
+ dialogTypeNum: null, //閮ㄩ棬寮圭獥1锛屼粨搴撳脊绐�2
+ deptShow: false, //閮ㄩ棬鏁版嵁缁勪欢鏄剧ず鏍囪
+ warehouseShow: false, //浠撳簱鏁版嵁缁勪欢鏄剧ず鏍囪
+ materialShow: false, //鐗╂枡鏁版嵁缁勪欢鏄剧ず鏍囪
+ stockPlaceShow: false, //浠撲綅鏁版嵁缁勪欢鏄剧ず鏍囪
+ deptform: {}, //寮圭獥閫変腑鏁版嵁
+
+ temp: undefined, //涓存椂鍙橀噺
+ btResList: [], // 鍒楄缃�
+ form: {}, // 琛ㄥ崟鍙傛暟
+ rules: { // 琛ㄥ崟鏍￠獙
+ },
+
+ checkedSysZb: [],
+ editData: [], //瀛愯〃鏁版嵁
+ editBtData: [], //瀛愯〃琛ㄥご
+ activeName: 'first',
+ zbIndex: null,
+ zbSelForm: {}, //瀛愯〃閫変腑鏁版嵁,鐢ㄤ簬瀛愯〃澶嶅埗銆佷笂绉汇�佷笅绉荤瓑鎿嶄綔
+ };
+ },
+ created() {
+ this.fetchData()
+ this.fetchData_SourceBillTypeList()
+ this.getdata()
+ },
+ beforeDestroy() {
+ this.$destroy()
+ },
+ methods: {
+ //#region 琛ㄥ崟鏁版嵁鍒濆鍖�
+ getdata() {
+ this.formShow = false
+ this.formLoading = true
+
+ if ((this.OperationType == 1 && this.copyType != 1) || (!this.OperationType && !this.copyType)) {
+ this.handleAdd()
+ }
+ else if (this.OperationType == 3 || this.copyType == 1) {
+ this.handleUpdate()
+ }
+ },
+ //#endregion
+
+ //#region 椤甸潰鏁版嵁鍒濆鍖�
+ reset() {
+ this.form = {
+ HInterID: 0,
+ HBillNo: "",
+ HDate: new Date(),
+ HInnerBillNo: "",
+ HWHID: 0,
+ HWHName: "",
+ HCurID: 0,
+ HCurName: '',
+ HExRate: 1,
+ HDeptID: 0,
+ HDeptName: "",
+ HSecManagerID: 0,
+ HSecManagerName: "",
+ HKeeperID: 0,
+ HKeeperName: "",
+ HSourceBillType: "",
+ HExplanation :"",
+ HRemark: "",
+
+
+ HEmpID: 0,
+ HEmpName: "",
+
+ HSupID: 0,
+ HSupName: "",
+ HInvoiceBillNo: "",
+ HOrgID: sessionStorage["OrganizationID"] - 0,
+ }
+ this.editData = []
+ this.editBtData = []
+ this.ids = []
+ this.subDisabled = false
+ this.addBtnShow = false
+ // this.$refs.tableData.clearSelection()
+ this.activeName = 'first'
+ this.resetForm("form");
+ },
+ //#endregion
+
+ //#region 鏂板鎸夐挳鎿嶄綔
+ handleAdd() {
+ this.reset()
+ //鏂板鑾峰彇鍗曟嵁鍙�
+ this.getHBillNo()
+ if (this.OperationType == 1) {
+ this.handleAddSysZb()
+ }
+ this.$nextTick(() => {
+ this.formShow = true
+ this.formLoading = false
+ })
+ },
+ //#endregion
+
+ //#region 缂栬緫椤甸潰鍒濆鍖�
+ handleUpdate() {
+ this.reset()
+ let rowHmainid = this.linterid
+ axios.get(this.baseURL + "/Kf_ProductInBillEdit/cx", {
+ params: { 'HInterID': rowHmainid }
+ }).then(response => {
+ if (response.data.count == 1) {
+ var result = response.data
+ var data = response.data.data[0]
+ this.form.BillType = data.HSourceBillType
+ if (this.copyType == 1) {
+ this.getHBillNo()
+ }
+ else {
+ this.form.HInterID = data.hmainid
+ this.form.HBillNo = data.鍗曟嵁鍙�
+ this.form.HDate = data.鏃ユ湡
+ this.form.HMaker = data.鍒跺崟浜�
+ this.form.HUpDater = data.淇敼浜�
+ this.form.HChecker = data.瀹℃牳浜�
+ this.form.HMakeDate = data.鍒跺崟鏃ユ湡
+ this.form.HUpDateDate = data.淇敼鏃ユ湡
+ this.form.HCheckDate = data.瀹℃牳鏃ユ湡
+ this.form.HCloseMan = data.鍏抽棴浜�
+ this.form.HDeleteMan = data.浣滃簾浜�
+ this.form.HCloseDate = data.鍏抽棴鏃ユ湡
+ this.form.HDeleteDate = data.浣滃簾鏃ユ湡
+ }
+ this.form.HInnerBillNo= data.鍐呴儴鍗曟嵁鍙�
+ this.form.HWHID= data.HWHID
+ this.form.HWHName= data.涓昏〃浠撳簱
+ this.form.HCurID= data.HCurID
+ this.form.HCurName= data.甯佸埆
+ this.form.HExRate= data.姹囩巼
+ this.form.HDeptName= data.閮ㄩ棬
+ this.form.HDeptID= data.HDeptID
+ this.form.HSecManagerName= data.楠屾敹鍛�
+ this.form.HSecManagerID= data.HSecManagerID
+ this.form.HKeeperName= data.淇濈鍛�
+ this.form.HKeeperID= data.HKeeperID
+ this.form.HSourceBillType= data.婧愬崟绫诲瀷
+ this.form.HInnerBillNo=data.鍐呴儴鍗曟嵁鍙�
+ this.form.HExplanation = data.鎽樿
+ this.form.HRemark= data.琛ㄥご澶囨敞
+
+ //瀛愯〃 璧嬪��
+ for (var i = 0; i < result.data.length; i++) {
+ const data = result.data[i];
+ this.editData.push(
+ {
+ "HMaterID":data.HMaterID
+ , "鐗╂枡浠ｇ爜": data.鐗╂枡浠ｇ爜
+ , "鐗╂枡鍚嶇О": data.鐗╂枡鍚嶇О
+ , "瑙勬牸鍨嬪彿": data.瑙勬牸鍨嬪彿
+ , "HUnitID": data.HUnitID
+ , "璁￠噺鍗曚綅": data.璁￠噺鍗曚綅
+ , "HPropertyID":data.HPropertyID
+ , "杈呭姪灞炴��":data.杈呭姪灞炴��
+ , "杈呭姪鍗曚綅":data.杈呭姪鍗曚綅
+ , "HSecUnitID": data.HSecUnitID
+ , "杈呭姪璁￠噺鍗曚綅": data.杈呭姪璁￠噺鍗曚綅
+ , "HSecUnitRate":data.鎹㈢畻鐜�
+ , "HQtyMust": data.搴旀敹鏁伴噺
+ , "HQty": data.鏁伴噺
+ , "HPrice": data.鍗曚环
+ , "HMoney": data.閲戦
+ , "HWHID": data.HWHID
+ , "鏀舵枡浠撳簱": data.鏀舵枡浠撳簱
+ , "HRemark": data.琛ㄤ綋澶囨敞
+ , "HSourceBillNo": data.婧愬崟鍗曞彿
+ , "HSourceBillType": data.婧愬崟绫诲瀷
+ , "HSourceInterID": data.婧愬崟涓诲唴鐮�
+ , "HSourceEntryID": data.婧愬崟瀛愬唴鐮�
+ }
+ )
+ }
+
+ if (data.鐘舵�� != '鍒涘缓' && this.copyType != 1) {
+ this.$modal.msgError("姝ゆ潯鏁版嵁涓嶆槸鍒涘缓鐘舵�侊紝涓嶈兘淇敼");
+ this.subDisabled = true
+ }
+ this.formShow = true
+ this.formLoading = false
+
+ }
+ }).catch(error => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ },
+ //#endregion
+
+ //#region 鍒楄缃�
+ handleRowHide() {
+ this.rowHideShow = true
+ this.openRowHide = true
+ },
+ rowSetClose(val) {
+
+ this.rowHideShow = false
+ this.openRowHide = val
+ this.$destroy()
+ },
+ //#endregion
+
+ //#region 缁勭粐鍊煎彉鏇翠簨浠�
+ organizationChange(val) {
+ // let options=undefined
+ // this.form=this.organizationList.find(option => option.ID === val)?.Name || '';
+ },
+ //#endregion
+
+ //#region 婧愬崟绫诲瀷鍊煎彉鏇翠簨浠�
+ sourceBillTypeChange(val) {
+ },
+ //#endregion
+
+ //#region 鏁版嵁寮圭獥
+ //#region 鎵撳紑鏁版嵁鍒楄〃寮圭獥
+ openDataDialog(num, row) {
+ if (row) {
+ this.zbIndex = row.index - 1
+ }
+ this.showReset()
+ if (num == 1) {
+ this.dialogTitle = '閮ㄩ棬鍒楄〃'
+ this.deptShow = true
+ this.openData = true
+ } else if (num == 2) {
+ this.dialogTitle = '鍑哄簱浠撳簱鍒楄〃'
+ this.warehouseShow = true
+ this.openData = true
+ } else if (num == 3) {
+ this.dialogTitle = '鐗╂枡鍒楄〃'
+ this.materialShow = true
+ this.openData = true
+ }else if (num == 4) {
+ this.dialogTitle = '浠撲綅鍒楄〃'
+ this.stockPlaceShow = true
+ this.openData = true
+ }
+ },
+ //#region 灏嗘暟鎹脊绐楀叏閮ㄥ彇娑堝姞杞�
+ showReset() {
+ this.deptShow = false
+ this.warehouseShow = false
+ this.materialShow = false
+ },
+ //#endregion
+ //#endregion
+
+ //#region 寮圭獥鏁版嵁鍙屽嚮杩斿洖琛ㄥ崟璧嬪�间簨浠�
+ dbEmitData(deptRow, num) {
+ if (num == 1) {
+ this.form.HDeptName = deptRow.閮ㄩ棬鍚嶇О //閮ㄩ棬
+ this.form.HDeptID = deptRow.HItemID
+ this.form.HEmpID = deptRow.HEmpID
+ this.form.HManagerName = deptRow.璐熻矗浜�
+ this.openData = false
+ }
+ else if (num == 2) { //鏀舵枡浠撳簱
+ this.editData[this.zbIndex].HWHID = deptRow.HItemID;
+ this.editData[this.zbIndex].鏀舵枡浠撳簱 = deptRow.浠撳簱鍚嶇О;
+ this.openData = false
+ }
+ else if (num == 4) { //浠撲綅
+ this.editData[this.zbIndex].HSPID = deptRow.HItemID;
+ this.editData[this.zbIndex].浠撲綅鍚嶇О = deptRow.浠撲綅鍚嶇О;
+ this.openData = false
+ }
+ else if (num == 3) { //鐗╂枡
+ this.editData[this.zbIndex].HMaterID = deptRow.HItemID;
+ this.editData[this.zbIndex].鐗╂枡浠ｇ爜 = deptRow.鐗╂枡浠ｇ爜;
+ this.editData[this.zbIndex].鐗╂枡鍚嶇О = deptRow.鐗╂枡鍚嶇О;
+ this.editData[this.zbIndex].HUnitID = deptRow.HUnitID;
+ this.editData[this.zbIndex].瑙勬牸鍨嬪彿 = deptRow.瑙勬牸鍨嬪彿
+ this.editData[this.zbIndex].璁￠噺鍗曚綅 = deptRow.璁￠噺鍗曚綅鍚嶇О
+ this.editData[this.zbIndex].HTaxPrice = deptRow.鍚◣鎴愭湰浠�
+ this.editData[this.zbIndex].HTaxRate = deptRow.榛樿绋庣巼
+ this.openData = false
+ }
+ },
+ //#endregion
+
+ //#region 寮圭獥鏁版嵁鍗曞嚮浜嬩欢
+ emitData(deptRow, num) {
+ this.dialogTypeNum = num
+ this.deptform = deptRow
+ },
+ //#endregion
+
+ //#region 寮圭獥纭畾浜嬩欢
+ deptClickSub() {
+ this.dbEmitData(this.deptform, this.dialogTypeNum)
+ this.deptform = {}
+ },
+ //#endregion
+
+ //#region 寮圭獥鍙栨秷浜嬩欢
+ deptClose() {
+ this.deptform = {}
+ this.openData = false
+ },
+ //#endregion
+ //#endregion
+
+ //#region 宸ュ叿鏍忔寜閽搷浣�
+ //#region 缂栬緫鎻愪氦淇濆瓨
+ submitForm() {
+ this.$refs["form"].validate(valid => {
+ if (valid) {
+ let fhck = false
+ this.editData.map((item, index) => {
+ if (!item.鍙戣揣浠撳簱) {
+ fhck = true
+ this.$modal.msgError("绗�" + (index + 1) + "琛岋細鍙戣揣浠撳簱鏈�夋嫨锛�");
+ }
+ })
+ this.$nextTick(() => {
+ if (!fhck) {
+ var sMainStr = JSON.stringify(this.form);
+ var sSubStr = JSON.stringify(this.editData);
+ var sMainSub = sMainStr + ';' + sSubStr + ';' + sessionStorage["HUserName"] + ';' + this.OperationType;
+ axios({
+ method: 'post',
+ url: this.baseURL + "/Kf_SellOutBill/SaveSellOutBillList",
+ data: {
+ 'msg': sMainSub
+ },
+ }).then(response => {
+ if (response.data.count == 1) {
+ this.subDisabled = true//璁剧疆淇濆瓨鎸夐挳涓嶅彲鐢�
+ this.$modal.msgSuccess(response.data.Message);
+ this.get_MAXNum_Task(1);//璁剧疆娴佹按鍙峰鍔�
+ if (response.data.Verify == "Y") //鑷姩瀹℃牳
+ {
+ this.set_CheckBill(0, this.form); //瀹℃牳
+ }
+ this.addBtnShow = true
+ }
+ }).catch(error => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ }
+ })
+ }
+ });
+ },
+ //#endregion
+
+ //#region 鍙嶅鏍�/瀹℃牳鏁版嵁
+ set_CheckBill(num, form) {
+ var InterID = form.hmainid || form.HInterID
+ //閫昏緫瀹℃牳鏂规硶
+ axios.get(this.baseURL + "/Kf_SellOutBill/AuditKf_SellOutBill", {
+ params: { "HInterID": InterID, "IsAudit": num, "CurUserName": sessionStorage["HUserName"] }
+ }).then(response => {
+ let result = response.data
+ if (result.code == 1) {
+ this.$modal.msgSuccess('鎿嶄綔鎴愬姛');
+ }
+ else {
+ this.$modal.msgError("閿欒:" + result.code + result.Message,);
+ }
+ }).catch(error => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ },
+ //#endregion
+
+ //#region 閫�鍑烘寜閽搷浣�
+ close() {
+ this.reset()
+
+ if (!this.OperationType && !this.copyType) {
+ // this.$router.back()
+ window.close()
+ } else {
+ this.formShow = false
+ this.$emit('editClose', false)
+ }
+ },
+ //#endregion
+ //#endregion
+
+ //#region 瀛愯〃鎿嶄綔
+ //#region 璁剧疆瀛愯〃搴忓彿鍒�
+ rowSysZbIndex({ row, rowIndex }) {
+ row.index = rowIndex + 1;
+ },
+ //#endregion
+
+ //#region 瀛愯〃鏂板銆佹彃鍏ユ寜閽搷浣�
+ handleAddSysZb(index, num) {
+ if (num == 1 && !index) {
+ this.$modal.msgError("璇烽�夋嫨涓�琛屾暟鎹紪杈�!");
+ } else {
+ let obj = {
+ HMaterID: 0,
+ 鐗╂枡浠ｇ爜: '',
+ 鐗╂枡鍚嶇О: '',
+ 瑙勬牸鍨嬪彿: '',
+ HUnitID: 0,
+ 璁￠噺鍗曚綅: '',
+ HQtyMust: 1,
+ HQty: 1,
+ HPieceQty: 0,
+ HPrice: 0,
+ HTaxPrice: 0,
+ HTaxRate: 0,
+ HMoney: 0,
+ HTaxMoney: 0,
+ HWHID: 0,
+ 鍙戣揣浠撳簱: '',
+ HRemark: '',
+ HQty_Full: 0,
+ HQty_Empty: 0,
+ HQty_Back: 0,
+ HCostPrice: 0,
+ HCostMoney: 0,
+ HSalePrice: 0,
+ HSeOrderInterID: 741,
+ HSeOrderEntryID: 18,
+ HSeOrderBillNo: 'XSFH00000747',
+ HSourceInterID: 741,
+ HSourceEntryID: 18,
+ HSourceBillNo: 'XSFH00000747',
+ HSourceBillType: 1402,
+ HRelationQty: 0,
+ HRelationMoney: 0,
+ HSPID: 0,
+ HSPName: '',
+ HSPGroupID: 0,
+ HSPGroupName: '',
+ HSCWHID: 0,
+ HSCWHName: '',
+ HSCSPID: 0,
+ HSCSPName: '',
+ HBatchNo: '',
+ HPOOrderInterID: 0,
+ HPOOrderEntryID: 0,
+ HPOOrderBillNo: '',
+ HPropertyID: 0,
+ HPropertyName: '',
+ HSecUnitID: 0,
+ HSecUnitName: '',
+ HSecUnitRate: 0,
+ HEngineNum: '',
+ HUnderPanNum: '',
+ HLeaveFactCard: '',
+ HReqBuyQty: 0,
+ HReqOutQty: 0,
+ HCurrentInventory: 0,
+ }
+ if (index) {
+ this.editData.splice(index, 0, obj);
+ this.$set(this.editData, index, obj)
+ } else {
+ this.editData.push(obj);
+ }
+ }
+ },
+ //#endregion
+
+ //#region 瀛愯〃澶嶅埗鎸夐挳
+ handleCopyZbRow() {
+ if (!this.zbIndex) {
+ this.$modal.msgError("璇烽�夋嫨涓�琛屾暟鎹�")
+ } else {
+ let copyRow = JSON.parse(JSON.stringify(this.zbSelForm))
+ this.editData.push(copyRow);
+ }
+ },
+ //#endregion
+
+ //#region 瀛愯〃涓婄Щ鎸夐挳
+ handleMoveRowUp(zbSelForm) {
+ if (!this.zbIndex) {
+ this.$modal.msgError("璇烽�夋嫨涓�琛屾暟鎹�")
+ } else {
+ if (zbSelForm.index == 1) {
+ this.$modal.msgError("绗竴琛屾暟鎹棤娉曚笂绉�");
+ } else { // 纭繚涓嶆槸绗竴琛�
+ let num = zbSelForm.index - 1
+ const record = this.editData.splice(num, 1)[0];
+ this.editData.splice(num - 1, 0, record);
+ }
+ }
+ },
+ //#endregion
+
+ //#region 瀛愯〃涓嬬Щ鎸夐挳
+ handleMoveRowDown(zbSelForm) {
+ if (!this.zbIndex) {
+ this.$modal.msgError("璇烽�夋嫨涓�琛屾暟鎹�")
+ } else {
+ if (zbSelForm.index == this.editData.length) {
+ this.$modal.msgError("鏈�鍚庝竴琛屾暟鎹棤娉曚笅绉�");
+ } else { // 纭繚涓嶆槸绗竴琛�
+ let num = zbSelForm.index - 1
+ const record = this.editData.splice(num, 1)[0];
+ this.editData.splice(num + 1, 0, record);
+ }
+ }
+ },
+ //#endregion
+
+ //#region 瀛愯〃鍒犻櫎鎸夐挳
+ handleDeleteSysZb(row) {
+ this.checkedSysZb = []
+ this.checkedSysZb.push(row.index)
+ if (this.checkedSysZb.length == 0) {
+ this.$modal.msgError("璇峰厛閫夋嫨瑕佸垹闄ょ殑鏄庣粏鏁版嵁");
+ } else {
+ const editData = this.editData;
+ const checkedSysZb = this.checkedSysZb;
+ this.editData = editData.filter(function (item) {
+ return checkedSysZb.indexOf(item.index) == -1
+ });
+ }
+ },
+ //#endregion
+
+ //#region 瀛愯〃澶嶉�夋閫変腑鏁版嵁
+ handleTableZbEdit(selection) {
+ this.checkedSysZb = selection.map(item => item.index)
+ this.zbSelForm = selection[0]
+ this.zbIndex = this.checkedSysZb[0]
+ if (selection.length > 1) {
+ const del_row = selection.shift()
+ this.$refs.zbTable.toggleRowSelection(del_row, false) //璁剧疆杩欎竴琛屽彇娑堥�変腑
+ }
+ },
+ //#endregion
+ //#endregion
+
+ //#region 閫氱敤鏂规硶銆�
+ //#region 鑾峰彇鍙傛暟_浼犻�掔殑JSON鏍煎紡鍙傛暟
+ getUrlVars_JSON() {
+ var datajson;
+ var str = this.propsData; //鑾峰彇閾炬帴涓紶閫掔殑鍙傛暟
+ var arr = str.substring(str.lastIndexOf("=") + 1);
+ datajson = JSON.parse(decodeURI(arr));
+ return datajson;
+ },
+ //#endregion
+
+ //#region 缁勭粐涓嬫媺鍒楄〃鏁版嵁鍒濆鍖�
+ fetchData() {
+ axios.get(this.baseURL + "/Web/GetOrganizations", {
+ }).then(response => {
+ if (response.data.count == 1) {
+ this.organizationList = response.data.data;//缁勭粐鍒楄〃
+ }
+ }).catch(error => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ },
+ //#endregion
+
+ //#region 婧愬崟绫诲瀷涓嬫媺鍒楄〃鏁版嵁鍒濆鍖�
+ fetchData_SourceBillTypeList() {
+ var HName = '浜у搧鍏ュ簱鍗�';
+ axios.get(this.baseURL + "/Web/GetHSourceBillType", {
+ params: {
+ HName: HName,
+ Num: 2
+ }
+ }).then(response => {
+ if (response.data.count == 1) {
+ this.sourceBillTypeList = response.data.data;//缁勭粐鍒楄〃
+ }
+ }).catch(error => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ },
+ //#endregion
+
+ //#region 鑾峰彇鍐呯爜銆佸崟鎹彿
+ getHBillNo() {
+ axios.get(this.baseURL + "/WEBSController/GetMaxBillNoAndID_Json", {
+ params: {
+ HBillType: '1202'
+ }
+ }).then(response => {
+ this.form.HBillNo = response.data.data[0].HBillNo
+ this.form.HInterID = response.data.data[0].HInterID
+ }).catch(error => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ },
+ //#endregion
+
+ //#region 鑾峰彇鏈�澶у崟鎹彿
+ get_MAXNum_Task(Type) {
+ var sql = `exec h_p_Xt_GetMaxBillNo_SubType '1202','${this.form.HDate}',0,0,0,'${Type}','${this.form.HDeptID}'`;
+ axios({
+ method: 'get',
+ url: this.baseURL + "/CommonModel/searchMethod",
+ params: { "sql": sql, "user": sessionStorage["HUserName"], "ModRightNameCheck": "" },
+ }).then(response => {
+ if (response.data.count == 1) {
+ this.form.HBillNo = response.data.data[0].HBillNo;
+ } else {
+ this.$modal.msgError(response.data.code + response.data.Message);
+ }
+ }).catch(error => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ },
+ //#endregion
+
+ //#region 鏍规嵁鐢ㄦ埛鑾峰彇瀵瑰簲鑱屽憳銆侀儴闂ㄣ�侀攢鍞富绠�
+ getCzyglByUser() {
+ axios.get(this.baseURL + '/Xs_SeOrderBill/getCzyglByUser', {
+ params: { "CurUserName": sessionStorage["HUserName"] }
+ }).then(response => {
+ let dataForm = response.data.data[0]
+ this.form.HDeptID = dataForm.HDeptID
+ this.form.HDeptName = dataForm.HDeptName
+ this.form.HEmpID = dataForm.HEmpID
+ this.form.HEmpName = dataForm.HEmpName
+ this.form.HManagerID = dataForm.HManagerID
+ this.form.HManagerName = dataForm.HManagerName
+ }).catch(error => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ },
+ //#endregion
+
+ //#region 鏍规嵁瀹㈡埛鑾峰彇瀹㈡埛浣欓
+ getCustomerBalance(HCusID) {
+ axios.get(this.baseURL + '/Xs_CusRatingChangeBill/getCustomerBalance', {
+ params: { "HCusID": HCusID, 'CurUserName': sessionStorage["HUserName"] }
+ }).then(response => {
+ var data = response.data.data[0];
+ this.form.HCusBalance = data.HCusBalance
+ this.form.HCreditRating_Now = data.HCreditRating_Now
+ this.form.HAvailableBalance = data.HAvailableBalance
+ }).catch(error => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ },
+ //#endregion
+
+ //#region 鏍规嵁瀹㈡埛甯﹀嚭鑱旂郴浜恒�佽仈绯荤數璇�
+ getCustomerByCusID(HCusID) {
+ axios.get(this.baseURL + "/Xs_SeOrderBill/getCustomerByCusID", {
+ params: {
+ HCusID: HCusID
+ }
+ }).then(response => {
+ this.form.鑱旂郴浜� = response.data.data[0].HLinkMan
+ this.form.鑱旂郴鐢佃瘽 = response.data.data[0].HLinkPhone
+ // this.form = response.data.data[0]
+
+ }).catch(error => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ },
+ //#endregion
+
+ //#region 鑾峰彇閿�鍞嚭搴撳崟瀵瑰簲鐨勬潯鐮佹槑缁�
+ getBarCodeNoteBySellOutBill(rowHmainid) {
+ axios.get(this.baseURL + '/Kf_SellOutBill/BarCodeNote', {
+ params: { "HInterID": rowHmainid }
+ }).then(response => {
+ if (response.data.count == 1) {
+ if (response.data.data[2].length > 0) {
+ this.$modal.msgError("褰撳墠鍗曟嵁鐢辨壂鐮佺敓鎴愶紝涓嶅彲浠ョ紪杈戯紒");
+ this.subDisabled = true
+ }
+ } else { }
+ }).catch(error => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ },
+ //#endregion
+
+ //#region 鏍规嵁涓诲唴鐮佷笌瀛愬唴鐮佽幏鍙栨簮鍗曢攢鍞鍗曟暟鎹�
+ getPushSourceBillInit(HSourceInterID, HSourceEntryID) {
+ axios.get(this.baseURL + '/Xs_SeOrderBill/loadXs_SeOrderBill_Push', {
+ params: {
+ "HInterID": HSourceInterID
+ , "HSubID": HSourceEntryID
+ },
+ }).then(response => {
+ let result = response.data
+ if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ this.temp = result.data[0];
+ } else {
+ this.temp = result.data;
+ }
+ }).catch(error => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ },
+ //#endregion
+ //#endregion
+
+ }
+};
+</script>
+<style>
+.xsckdBox .el-date-editor.el-input {
+ width: 100%;
+}
+</style>
diff --git a/src/views/ProductInBill/Kf_ProductInBillList.vue b/src/views/ProductInBill/Kf_ProductInBillList.vue
new file mode 100644
index 0000000..b71cf60
--- /dev/null
+++ b/src/views/ProductInBill/Kf_ProductInBillList.vue
@@ -0,0 +1,873 @@
+<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="queryParams.sTime" type="date" placeholder="寮�濮嬫棩鏈�" style="width: 150px;">
+ </el-date-picker>
+ </el-form-item>
+ <el-form-item label="缁撴潫鏃ユ湡">
+ <el-date-picker v-model="queryParams.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="HOrgID">
+ <el-select v-model="queryParams.HOrgID" placeholder="璇烽�夋嫨缁勭粐">
+ <el-option v-for="(item, index) in organizationList" :key="index" :label="item.Name" :value="item.ID">
+ </el-option>
+ </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-form-item>
+ <el-collapse v-model="activeSeach">
+ <el-collapse-item title="鏇村" name="1">
+ <el-card class="box-card">
+ <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-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-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="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" @pagination="handleQuery" />
+ <!-- 鍒楄缃� -->
+ <el-dialog title="闅愯棌鍒楄缃�" :visible.sync="openRowHide" width="816px" append-to-body>
+ <RowSettings :colName="btResList" HModName="Kf_ProductInBillList" @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='Kf_ProductInBillList'
+ HModName='Kf_ProductInBillList' @rowEditClose="rowSetClose" v-if="printListShow" />
+ <!-- <div>111</div> -->
+ </el-dialog>
+ <!-- 鏉＄爜鏄庣粏 -->
+ <BarCodeDetail :visible.sync="barCodeDetailShow" ref="barcodeDetail"/>
+ </div>
+ </div>
+</template>
+
+<script>
+import axios from 'axios'
+import moment from 'moment'; //瀵煎嚭缁勪欢
+import RowSettings from '@/views/component/rowSettings' //鍒楄缃粍浠�
+import PrintList from '@/views/component/printList' //鎵撳嵃缁勪欢
+import BarCodeDetail from '@/views/component/BarCodeDetail' //鏉＄爜鏄庣粏缁勪欢
+import Edit from '@/views/ProductInBill/Kf_ProductInBillEdit' //缂栬緫椤甸潰缁勪欢
+
+export default {
+ name: 'Kf_ProductInBillList',
+ components: { RowSettings, Edit, PrintList,BarCodeDetail },
+ data() {
+ return {
+ baseURL: process.env.VUE_APP_BASE_API, //鍚庣鎺ュ彛鍓嶇紑(鍚庣鏈嶅姟鍣╥p鍦板潃)
+
+ OperationType: null, //淇濆瓨绫诲瀷锛堟柊澧�1淇敼3锛�
+ copyType: 0, //澶嶅埗鏍囪銆傛墦寮�缂栬緫缁勪欢鏃讹紝鐢ㄤ簬鍖哄垎缂栬緫杩樻槸澶嶅埗
+ HInterID: null,
+ hPriceTypeList: ['鎴愭湰浠�', '缁撶畻浠�'],
+
+ 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: [], //缁勭粐鍒楄〃
+ btList: [], //鍒楄〃琛ㄥご瀛楁鍒楄〃
+ 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' },
+ ],
+
+ dialogTitle: '', // 寮圭獥鏍囬
+ title: "", // 寮瑰嚭灞傛爣棰�
+ open: false, // 鏄惁鏄剧ず寮瑰嚭灞�
+ loading: true, // 閬僵灞�
+
+ activeSeach: '',
+ // addBtnShow: false, //缂栬緫缁勪欢瀹瑰櫒鏄剧ず鏍囪
+ editShow: false, //缂栬緫缁勪欢瀹瑰櫒鏄剧ず鏍囪
+ openEdit: false, //缂栬緫缁勪欢鏄剧ず鏍囪
+ openPrintList: false, //鎵撳嵃缁勪欢瀹瑰櫒鏄剧ず鏍囪
+ printListShow: false, //鎵撳嵃缁勪欢鏄剧ず鏍囪
+ openBtnHide: false, //鎸夐挳缁勪欢瀹瑰櫒鏄剧ず鏍囪
+ btnHideShow: false, //鎸夐挳缁勪欢鏄剧ず鏍囪
+ openRowHide: false, //鍒楄缃粍浠舵樉绀烘爣璁�
+ rowHideShow: false, //鍒楄缃粍浠跺鍣ㄦ樉绀烘爣璁�
+ barCodeDetailShow: false, //鏉＄爜鏄庣粏缁勪欢瀹瑰櫒鏄剧ず鏍囪
+
+
+
+ // 鏌ヨ鍙傛暟
+ sWhere: '', // 鎷兼帴杩囨护鏉′欢
+ queryParams: { // form鏁版嵁
+ HBillNo: '',
+ HInitTimeCycle: 29,
+ sTime: '',
+ eTime: '',
+ HOrgID: 0,
+ ColName1: '',
+ ColName2: '',
+ ColName: '',
+ Comparator1: '',
+ Comparator2: '',
+ Comparator: '',
+ ColContent1: '',
+ ColContent2: '',
+ ColContent: '',
+ },
+
+ page: 1, //page椤电储寮�
+ pageSize: 0, //page椤甸潰璁板綍鏁�
+ total: 0, //璁板綍鍚堣鏁�
+ tableShow: true, // table鏄剧ず鏍囪
+ totalNameList: [], // 闇�瑕佽缃悎璁¤鐨勫垪鏁扮粍
+ tableData: [], // 鍒楄〃鏁版嵁銆傜敤浜巘able鐩戝惉浜嬩欢
+ ids: [], // 閫変腑琛岀殑hmainid鏁扮粍
+ single: true, // 褰撻�変腑鐨勮鏁颁笉涓�1鏃朵负true銆傜敤浜庣鐢ㄧ浉鍏虫搷浣�
+ multiple: true, // 褰撻�変腑鐨勮鏁颁负0鏃朵负true銆傜敤浜庣鐢ㄧ浉鍏虫搷浣�
+ lastSelectedRowIndex: null, // 鐢ㄤ簬璁板綍涓婃鐐瑰嚮鐨勮绱㈠紩
+ lastSelectedRow: null, // 涓婁竴娆￠�変腑鐨勮
+ selectedRow: null, // 褰撳墠閫変腑鐨勮
+ rowForm: {}, // 褰撻�変腑鐨勫彧鏈変竴琛屾椂锛屾洿鏂版暟鎹负璇ラ�変腑鐨勮銆�
+
+ tyResList: [], // 鍒楄〃鏁版嵁锛岀敤浜庡鍑�
+ titleData: [], // 涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ btResList: [], // 鍒楄〃琛ㄥご鏁版嵁銆傜敤浜庡垪璁剧疆
+ dataList: [], // option璁板綍銆傜敤浜庡綋option鏁版嵁鏃犳晥鏃讹紝鐢ㄤ簬鍒楄缃�
+ };
+ },
+ created() {
+ this.fetchData() //鍔犺浇缁勭粐涓嬫媺鍒楄〃鏁版嵁
+ this.riqiChange()
+ this.handleQuery();
+ },
+
+ methods: {
+ //#region 璁剧疆琛ㄥご
+ 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)
+ },
+ //#endregion
+
+ //#region 鐐瑰嚮琛�
+ handleRowClick(row, column, event) {
+ this.lastSelectedRow = this.selectedRow; // 璁板綍涓婁竴娆￠�変腑鐨勮
+ this.selectedRow = row; // 璁板綍褰撳墠閫変腑鐨勮
+ this.lastSelectedRowIndex = this.tableData.indexOf(row);
+ this.$refs.tableData.toggleRowSelection(row);
+ },
+ //#endregion
+
+ //#region 閫変腑琛岄珮浜牱寮�
+ rowStyle({ row, rowIndex }) {
+ if (this.ids.includes(row.hmainid)) {
+ return { "background": "#ecf5ff" }
+ }
+ },
+ //#endregion
+
+ //#region 鍙屽嚮琛�
+ handleDblclick(row, column, cell, event) {
+ this.OperationType = 3
+ this.handleEdit()
+ },
+ //#endregion
+
+ //#region 澶氶�夋閫変腑鏁版嵁
+ 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]
+ }
+ },
+ //#endregion
+
+ //#region 鏍规嵁鏃ユ湡闂撮殧锛岃缃紑濮嬫棩鏈熴�佺粨鏉熸棩鏈�
+ 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.queryParams.sTime = yyyyS + '-' + mmS + '-' + ddS
+ this.queryParams.eTime = yyyyE + '-' + mmE + '-' + ddE
+ },
+ //#endregion
+
+ //#region 鍔犺浇缁勭粐涓嬫媺鍒楄〃鏁版嵁
+ fetchData() {
+ axios.get(this.baseURL + "/Web/GetOrganizations", {
+ }).then(response => {
+ if (response.data.count == 1) {
+ this.organizationList = response.data.data;//缁勭粐鍒楄〃
+ }
+ }).catch(error => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ this.queryParams.HOrgID = sessionStorage["OrganizationID"];
+ },
+ //#endregion
+
+ //#region 閲嶇疆
+ resetQuery() {
+ this.sWhere = ''
+ this.queryParams = {
+ HBillNo: '',
+ HInitTimeCycle: 29,
+ ColName1: '',
+ ColName2: '',
+ ColName: '',
+ Comparator1: '',
+ Comparator2: '',
+ Comparator: '',
+ ColContent1: '',
+ ColContent2: '',
+ ColContent: '',
+ }
+ this.riqiChange()
+ this.resetForm("queryForm")
+ this.handleQuery()
+ },
+ //#endregion
+
+ //#region 蹇�熻繃婊�
+ 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')
+ console.log(this.queryParams.sTime, this.queryParams.eTime)
+ 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 HStockOrgID = '" + this.queryParams.HOrgID + "'";
+ }
+ this.getList()
+ },
+ //#endregion
+
+ //#region 鏌ヨ
+ getList() {
+ this.pageSize = 50
+ if (this.pageSize == 0) {
+ this.pageSize = 50
+ }
+ this.tableShow = false
+ this.loading = true
+
+ // 鍒楄〃鏌ヨ
+ axios.get(this.baseURL + '/Kf_ProductInBillController/GetKf_ProductInBillList_Json', {
+ params: {
+ "sWhere": this.sWhere,
+ "HMaker": sessionStorage["HUserName"],
+ "OperationType": 1,
+ "ViewName": "h_v_Kf_ProductInBillList"
+ },
+ }).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 });//浠庢瘡涓璞′腑鎻愬彇鏁版嵁
+ }
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ 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;
+ let HModName = "Kf_ProductInBillList"
+ this.DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option, this.dataList);
+ }
+ }).catch(error => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ },
+
+ //#region 鍚堣琛屾暟鎹鐞�
+ 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;
+ },
+ //#endregion
+
+ //#endregion
+
+ //#region 鏂板
+ handleAddEdit() {
+ this.rowForm.hmainid = 0
+ this.editShow = true
+ this.openEdit = true
+ },
+ //#endregion
+
+ //#region 缂栬緫
+ handleEdit(row) {
+ this.rowForm = row
+ this.editShow = true
+ this.openEdit = true
+ },
+ editClose(val) {
+ this.open = val
+ this.editShow = false
+ this.openEdit = val
+ this.handleQuery()
+ },
+ //#endregion
+
+ //#region 鍒犻櫎
+ handleDelete() {
+ this.$modal.confirm('纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠').then(() => {
+ if (this.rowForm.鐘舵�� == "鍒涘缓") {
+ axios.get(this.baseURL + "Kf_ProductInBillController/GetKf_ProductInBill_Delete_Json", {
+ params: { 'HInterID': this.rowForm.hmainid.toString(), 'HMaker': sessionStorage["HUserName"] }
+ }).then(response => {
+ if (response.data.count == 1) {
+ this.handleQuery()
+ this.$modal.msgSuccess("鍒犻櫎鎴愬姛")
+ } else {
+ this.$modal.msgError("閿欒:" + result.code + result.Message);
+ }
+ }).catch(error => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ } else {
+ this.$modal.msgError("姝ゆ潯鏁版嵁涓嶆槸鍒涘缓鐘舵��,鏃犳硶鍒犻櫎!");
+ }
+ }).catch(() => { })
+ },
+ //#endregion
+
+ //#region 瀹℃牳/鍙嶅鏍�
+ set_CheckBill(num, form) {
+ var InterID = form.hmainid || form.HInterID
+ //閫昏緫瀹℃牳鏂规硶
+ axios.get(this.baseURL + "/Kf_ProductInBillController/GetKf_ProductInBill_Check_Json", {
+ params: { "HInterID": InterID, "Type": num, "HMaker": sessionStorage["HUserName"] }
+ }).then(response => {
+ let result = response.data
+ if (result.count == 1) {
+ this.$modal.msgSuccess('鎿嶄綔鎴愬姛');
+ this.handleQuery();
+ }
+ else {
+ this.$modal.msgError("閿欒:" + result.code + result.Message,);
+ }
+ }).catch(error => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ },
+ //#endregion
+
+ //#region 鍒楄缃�
+ handleRowHide() {
+ this.rowHideShow = true
+ this.openRowHide = true
+ },
+ rowSetClose(val) {
+ this.rowHideShow = false
+ this.tableShow = true
+ this.openRowHide = val
+ this.handleQuery()
+ },
+ 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("鎺ュ彛璇锋眰澶辫触!");
+ });
+ },
+ //#endregion
+
+ //#region 鎸夐挳璁剧疆
+ handleBtnHide() {
+ this.btnHideShow = true
+ this.openBtnHide = true
+ },
+ //#endregion
+
+ //#region 瀵煎嚭
+ 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, `Kf_ProductInBillList_${new Date().getTime()}.xlsx`); // 瀵煎嚭鏂囦欢
+ },
+ //#endregion
+
+ //#region 鎵撳嵃
+ get_PrintReport() {
+ if (this.ids.length != 1) {
+ this.$modal.msgError("璇烽�夋嫨涓�琛屾暟鎹�")
+ } else if (this.rowForm.鐘舵�� != "宸插鏍�" && !this.defaintOperationByCompanyName()) {
+ this.$modal.msgError("鎵撳嵃澶辫触!鍘熷洜锛氬崟鎹姸鎬佷笉涓�'宸插鏍�'鐘舵��!!");
+ } else {
+ axios.get(this.baseURL + "/Kf_SellOutBill/CheckSellOutBill_IsExist", {
+ params: { "HInterID": this.rowForm.hmainid }
+ }).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("鎺ュ彛璇锋眰澶辫触!");
+ });
+
+
+ }
+ // var content= ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + data[0].hmainid.toString() + '&MyMsg=' + data[0].hmainid.toString() + '&Type=Kf_SellOutBillList', 'yes']
+ },
+ //#endregion
+
+ //#region 鏉＄爜鏄庣粏
+ get_BarCodeDetail() {
+ // if (this.selectedRow.length !== 1) {
+ // this.$message.warning('璇烽�夋嫨涓�琛屾暟鎹煡鐪嬫潯鐮佹槑缁嗭紒')
+ // return
+ // }
+ this.barCodeDetailShow = true
+ this.$nextTick(() => {
+ this.$refs.barcodeDetail.open(this.rowForm)
+ })
+ },
+ //#endregion
+
+ //#region 閫�鍑�
+ close() {
+ // this.reset()
+ this.tableShow = true
+ this.openEdit = false
+ this.editShow = false
+ this.handleQuery()
+ },
+ //#endregion
+
+ //#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;
+ },
+ //#endregion
+ }
+};
+</script>
+<style>
+.xsckdBox .el-date-editor.el-input {
+ width: 100%;
+}
+</style>
diff --git a/src/views/basic/gy/gyDepartment.vue b/src/views/basic/gy/gyDepartment.vue
index 7cbf7bb..1ec9d23 100644
--- a/src/views/basic/gy/gyDepartment.vue
+++ b/src/views/basic/gy/gyDepartment.vue
@@ -1,5 +1,5 @@
<template>
- <div style="padding: 10px;position: relative;">
+ <div style="padding: 10px; position: relative;">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="98px" class="searchBox">
<el-row>
<el-form-item label="閮ㄩ棬浠ｇ爜" prop="HNumber" style="margin-left: 100px;">
@@ -168,8 +168,7 @@
<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">
+ <el-dialog title="缂栬緫閮ㄩ棬璧勬枡" :visible.sync="openEdit" width="1480px" append-to-body class="xsckdBox" @close="close">
<edit :OperationType=OperationType :linterid=this.rowForm.HItemID :HSouceBillType=this.rowForm.HSourceBillType
:copyType="copyType" @editCloseGy="editGyClose" v-if="editShow" />
</el-dialog>
@@ -264,7 +263,7 @@
open: false,
// 鏌ヨ鍙傛暟
queryParams: {
- HOrgID: null,
+ HOrgID: sessionStorage["OrganizationID"] - 0,
HName: null,
HNumber: null,
Comparator1: '',
@@ -373,7 +372,6 @@
if (this.pageSize == 0) {
this.pageSize = 50
}
- this.queryParams.HOrgID = sessionStorage["OrganizationID"]-0
this.sWhere += " and HUSEORGID = '" + this.queryParams.HOrgID + "'"
//鐢熶骇璧勬枡鍒楄〃
axios.get(this.baseURL + '/Gy_Department/list', {
@@ -766,8 +764,9 @@
//閫�鍑�
close() {
this.tableShow = true
+ this.single = true
this.openEdit = false
- this.editShow= false
+ this.editShow = false
this.getList()
},
//鎵撳紑鏂板缁勪欢寮圭獥
@@ -790,15 +789,16 @@
editGyClose(val) {
this.editShow = false
this.openEdit = false
- this.multiple = true,
- this.getList()
+ this.single = true
+ this.multiple = true
+ this.getList()
},
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete() {
this.$modal.confirm('纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠').then(() => {
if (!this.rowForm.瀹℃牳浜�) {
- axios.get(this.baseURL + "DeltetGy_Source", {
- params: { 'HItemID': this.rowForm.HItemID.toString(), 'user': sessionStorage["HUserName"] }
+ axios.get(this.baseURL + "DeltetGy_Department", {
+ params: { 'HItemID': this.rowForm.HItemID, 'user': sessionStorage["HUserName"] }
}).then(response => {
if (response.data.count == 1) {
this.getList()
@@ -818,7 +818,7 @@
set_CheckBill(num, form) {
var InterID = form.HItemID || form.HInterID
//閫昏緫瀹℃牳鏂规硶
- axios.get(this.baseURL + "/Gy_Source/AuditGy_Source", {
+ axios.get(this.baseURL + "/Gy_Department/AuditGy_Department", {
params: { "HInterID": InterID, "IsAudit": num, "CurUserName": sessionStorage["HUserName"] }
}).then(response => {
let result = response.data
diff --git a/src/views/basic/gy/gyDepartmentEdit.vue b/src/views/basic/gy/gyDepartmentEdit.vue
index cc6803e..2997dd5 100644
--- a/src/views/basic/gy/gyDepartmentEdit.vue
+++ b/src/views/basic/gy/gyDepartmentEdit.vue
@@ -1,15 +1,8 @@
<template>
<div v-loading="formLoading" v-if="formShow">
<div style="margin-bottom: 10px; border-bottom: 1px solid #f6f6f6">
- <el-button type="primary" @click="submitForm" :disabled="subDisabled"
- >淇� 瀛�</el-button
- >
- <el-button
- type="primary"
- @click="set_CheckBill(0, form)"
- :disabled="CheckBillDisabled"
- >瀹� 鏍�</el-button
- >
+ <el-button type="primary" @click="submitForm" :disabled="subDisabled">淇� 瀛�</el-button>
+ <el-button type="primary" @click="set_CheckBill(0, form)" :disabled="CheckBillDisabled">瀹� 鏍�</el-button>
<el-button type="primary" @click="close">閫� 鍑�</el-button>
</div>
<el-form ref="form" :model="form" :rules="rules" label-width="110px">
@@ -17,12 +10,12 @@
<el-tab-pane label="鍩烘湰淇℃伅" name="first">
<el-row>
<el-col :span="8">
- <el-form-item label="浠撳簱浠ｇ爜" prop="HNumber">
+ <el-form-item label="閮ㄩ棬浠ｇ爜" prop="HNumber">
<el-input v-model="form.HNumber" placeholder="璇疯緭鍏ヤ粨搴撲唬鐮�" />
</el-form-item>
</el-col>
<el-col :span="8">
- <el-form-item label="浠撳簱鍚嶇О" prop="HName">
+ <el-form-item label="閮ㄩ棬鍚嶇О" prop="HName">
<el-input v-model="form.HName" placeholder="璇疯緭鍏ヤ粨搴撳悕绉�" />
</el-form-item>
</el-col>
@@ -34,84 +27,52 @@
</el-row>
<el-row>
<el-col :span="8">
- <el-form-item label="浠撳簱鍦板潃" prop="HAddress">
- <el-input v-model="form.HAddress" placeholder="璇疯緭鍏ヤ粨搴撳湴鍧�" />
- </el-form-item>
- </el-col>
- <el-col :span="8">
- <el-form-item label="鑱旂郴鐢佃瘽" prop="HPhone">
- <el-input v-model="form.HPhone" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" />
- </el-form-item>
- </el-col>
- <el-col :span="8">
- <el-form-item label="浠撳簱绫诲瀷" prop="HWarehouseType">
- <el-select v-model="form.HWarehouseType" placeholder="璇烽�夋嫨浠撳簱绫诲瀷">
- <el-option
- v-for="(item, index) in HWarehouseTypeList"
- :key="index"
- :label="item.Name"
- :value="item.Name"
- >
- </el-option>
- </el-select>
- </el-form-item>
- </el-col>
- </el-row>
- <el-row>
- <el-col :span="8">
<el-form-item label="绂佺敤鏍囧織" prop="HStopflag">
<el-checkbox v-model="form.HStopflag" disabled>鏄惁绂佺敤</el-checkbox>
</el-form-item>
</el-col>
<el-col :span="8">
- <el-form-item label="鍚敤浠撲綅" prop="HSPFlag">
- <el-checkbox v-model="form.HSPFlag">鏄惁鍚敤</el-checkbox>
- </el-form-item>
- </el-col>
- <el-col :span="8">
- <el-form-item label="璐熷簱瀛樻帶鍒舵爣璁�" prop="HStockCtrlFlag">
- <el-checkbox v-model="form.HStockCtrlFlag">鏄惁鍚敤</el-checkbox>
- </el-form-item>
- </el-col>
- </el-row>
- <el-row>
- <el-col :span="8">
<el-form-item label="缁勭粐" prop="HUSEORGID">
- <el-select
- v-model="form.HUSEORGID"
- placeholder="璇烽�夋嫨缁勭粐"
- :disabled="zzSelDis"
- >
- <el-option
- v-for="(item, index) in organizationList"
- :key="index"
- :label="item.Name"
- :value="item.ID"
- >
+ <el-select v-model="form.HUSEORGID" placeholder="璇烽�夋嫨缁勭粐" :disabled="zzSelDis">
+ <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-col :span="8">
+ <el-form-item class="form-inline" label="澶囨敞" prop="HRemark">
+ <el-input v-model="form.HRemark" placeholder="璇疯緭鍏ュ娉�..."></el-input>
</el-form-item>
</el-col>
</el-row>
</el-tab-pane>
<el-tab-pane label="鍏朵粬淇℃伅" name="second">
<el-row>
- <el-col :span="16">
- <el-form-item class="form-inline" label="澶囨敞" prop="HRemark">
- <el-input v-model="form.HRemark" placeholder="璇疯緭鍏ュ娉�..."></el-input>
+ <el-col :span="8">
+ <el-form-item label="璐熻矗浜�" prop="HEmpName">
+ <el-input v-model="form.HEmpName" placeholder="璇烽�夋嫨璐熻矗浜�">
+ <el-button slot="append" icon="el-icon-search" @click="openDataDialog(4)"></el-button>
+ </el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="8">
+ <el-form-item label="鏉″舰鐮�" prop="HBarCode">
+ <el-input v-model="form.HBarCode" placeholder="璇疯緭鍏ユ潯褰㈢爜"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="8">
+ <el-form-item label="鏄惁鐢熶骇杞﹂棿" prop="HWorkShopFlag">
+ <el-select v-model="form.HWorkShopFlag" placeholder="璇烽�夋嫨">
+ <el-option value="true">鏄�</el-option>
+ <el-option value="false">鍚�</el-option>
+ </el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
- <el-form-item class="form-inline" label="浠撳簱绠＄悊鍛�" prop="HEmpName">
- <el-input v-model="form.HEmpName" placeholder="璇烽�夋嫨浠撳簱绠＄悊鍛�">
- <el-button
- slot="append"
- icon="el-icon-search"
- @click="openDataDialog(1)"
- ></el-button>
- </el-input>
+ <el-form-item label="閮ㄩ棬浜烘暟" prop="HEmpQtys">
+ <el-input-number v-model="form.HEmpQtys" placeholder="璇疯緭鍏ラ儴闂ㄤ汉鏁�" :min="0" :precision="0" />
</el-form-item>
</el-col>
</el-row>
@@ -137,34 +98,19 @@
<el-row>
<el-col :span="8">
<el-form-item label="鍒涘缓鏃ユ湡" prop="HMakeDate">
- <el-date-picker
- v-model="form.HMakeDate"
- type="date"
- placeholder="閫夋嫨鍒涘缓鏃ユ湡"
- disabled
- >
+ <el-date-picker v-model="form.HMakeDate" type="date" placeholder="閫夋嫨鍒涘缓鏃ユ湡" disabled>
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="绂佺敤鏃ユ湡" prop="HStopTime">
- <el-date-picker
- v-model="form.HStopTime"
- type="date"
- placeholder="閫夋嫨绂佺敤鏃ユ湡"
- disabled
- >
+ <el-date-picker v-model="form.HStopTime" type="date" placeholder="閫夋嫨绂佺敤鏃ユ湡" disabled>
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="瀹℃牳鏃ユ湡" prop="HCheckTime">
- <el-date-picker
- v-model="form.HCheckTime"
- type="date"
- placeholder="閫夋嫨瀹℃牳鏃ユ湡"
- disabled
- >
+ <el-date-picker v-model="form.HCheckTime" type="date" placeholder="閫夋嫨瀹℃牳鏃ユ湡" disabled>
</el-date-picker>
</el-form-item>
</el-col>
@@ -173,21 +119,8 @@
</el-tabs>
</el-form>
<!-- 閮ㄩ棬寮圭獥 -->
- <el-dialog
- :title="dialogTitle"
- :visible.sync="openData"
- width="1280px"
- append-to-body
- >
- <Dept @deptEmitDb="dbEmitData" @deptEmit="emitData" v-if="deptShow" />
- <Warehouse @deptEmitDb="dbEmitData" @deptEmit="emitData" v-if="warehouseShow" />
- <Material @deptEmitDb="dbEmitData" @deptEmit="emitData" v-if="materialShow" />
- <GyWorkCenter @deptEmitDb="dbEmitData" @deptEmit="emitData" v-if="workCenterShow" />
- <Employee
- @deptEmitDb="dbEmitData"
- @deptEmit="emitData"
- v-if="employeeShow"
- ></Employee>
+ <el-dialog :title="dialogTitle" :visible.sync="openData" width="1280px" append-to-body>
+ <GyEmployee @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyEmployeeShow" />
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="deptClickSub">纭� 瀹�</el-button>
<el-button @click="deptClose">鍙� 娑�</el-button>
@@ -203,13 +136,13 @@
import Material from "@/views/component/material";
import RowSettings from "@/views/component/rowSettings";
import GyWorkCenter from "@/views/component/gyWorkCenter";
-import Employee from "@/views/component/employee";
+import GyEmployee from '@/views/basic/gyEmployee/gyEmployee.vue'
import moment from "moment";
import dayjs from "dayjs";
export default {
name: "gyWarehouse_Edit",
- components: { Dept, Warehouse, Material, RowSettings, GyWorkCenter, Employee },
+ components: { Dept, Warehouse, Material, RowSettings, GyWorkCenter, GyEmployee },
props: {
OperationType: { type: Number },
linterid: { type: Number },
@@ -218,13 +151,15 @@
},
data() {
return {
+ HModName: "Xt_UserListEdit",
formShow: false,
temp: undefined,
formLoading: true,
- zzSelDis: false,
+ zzSelDis: true,
rowHideShow: false,
openRowHide: false,
workCenterShow: false,
+ gyEmployeeShow: false,
sWhere: "",
sTime: "",
eTime: "",
@@ -328,7 +263,7 @@
if (this.OperationType != 1) {
this.zzSelDis = true;
axios
- .get(this.baseURL + "/Gy_Warehouse/cx", {
+ .get(this.baseURL + "/Gy_Department/cx", {
params: {
HInterID: this.linterid,
},
@@ -339,32 +274,18 @@
if (result.code == 1) {
// 璇存槑楠岃瘉鎴愬姛浜嗭紝
var data = result.data[0];
-
Object.assign(this.form, {
- HNumber: data.浠撳簱浠ｇ爜,
+ HNumber: data.閮ㄩ棬浠ｇ爜,
HItemID: data.HItemID,
- HParentID: data.HParentID,
- HShortNumber: data.HNumber,
- HName: data.浠撳簱鍚嶇О,
+ HName: data.閮ㄩ棬鍚嶇О,
HHelpCode: data.HHelpCode,
HEmpID: data.HEmpID,
HEmpName: data.HEmpName,
- HAddress: data.浠撳簱鍦板潃,
- HPhone: data.鑱旂郴鐢佃瘽,
+ HBarCode: data.鏉″舰鐮�,
HStopflag: data.绂佺敤鏍囪,
- HStockCtrlFlag: data.璐熷簱瀛樻帶鍒舵爣璁�,
- HSPFlag: data.鍚敤浠撲綅 == "Y" ? 1 : 0,
HRemark: data.HRemark,
- HWarehouseType: data.浠撳簱绫诲瀷,
- //, "HItemID": data.鏉＄爜缂栧彿
- HBarCode: data.HBarCode,
HUSEORGID: data.HUSEORGID,
- //, "HCreator": data.鍒涘缓浜�
- //, "lngBillKey": data.lngBillKey
- //, "lngBillSubKey": data.lngBillSubKey
- //, "HMaker": data.HMaker
- //, "HCreateDate": data.鍒涘缓鏃ユ湡
- HUpDater: sessionStorage["HUserName"],
+ HRemark: data.澶囨敞,
HMakeEmp: data["鍒涘缓浜�"],
HMakeDate:
data["鍒涘缓鏃ユ湡"] == null
@@ -416,12 +337,11 @@
},
//閮ㄩ棬寮圭獥璧嬪��
dbEmitData(deptRow, num) {
- console.log(deptRow, num);
- // num=1 浠撳簱绠＄悊鍛�
- if (num == 1) {
- this.form.HEmpID = deptRow.HItemID;
- this.form.HEmpName = deptRow["鑱屽憳鍚嶇О"];
- this.openData = false;
+ if (num == 4) {
+ this.form.HEmpName = deptRow.鑱屽憳鍚嶇О
+ this.form.HEmpID = deptRow.HItemID
+ this.gyEmployeeShow = false
+ this.openData = false
}
},
emitData(deptRow, num) {
@@ -440,35 +360,18 @@
//鏂板缂栬緫琛ㄥ崟鍒濆鍖�
reset() {
this.form = {
- HNumber: null,
- HItemID: 0,
- HName: null,
- HHelpCode: null,
- HWorkTimes: "0",
- HMaxWorkTimes: "0",
- HRelationID: "0",
- HMinAdd: "0",
- HClassCount: "0",
- HOverTimes: "0",
- HCenter: null,
- HCenterID: null,
- HGroup: null,
- HGroupID: 0,
- HDeptName: null,
- HDeptID: 0,
- HProcName: null,
- HProcID: 0,
- HProcNumber: null,
- HStopflag: false,
- HType: null,
- HRemark: null,
- HUseFlag: "鏈娴�",
- HUSEORGID: this.zuzhiId,
- HCREATEORGID: this.zuzhiId,
- HMacAddr: null,
+ HNumber: '',
+ HItemID:0,
+ HName: '',
+ HHelpCode: '',
HEmpID: 0,
- HEmpName: null,
- HMakeEmp: this.user,
+ HEmpName: '',
+ HBarCode: '',
+ HStopflag: false,
+ HRemark:'',
+ HUSEORGID:sessionStorage["OrganizationID"],
+ HRemark: '',
+ HMakeEmp:sessionStorage["HUserName"],
HMakeTime: null,
HStopEmp: null,
HStopTime: null,
@@ -504,15 +407,12 @@
let fhck = false;
this.$nextTick(() => {
if (!fhck) {
- console.log(4);
var sMainStr = JSON.stringify(this.form);
- // var sSubStr = JSON.stringify(this.editData);
- var sMainSub = sMainStr + ";" + this.user;
axios({
method: "post",
- url: this.baseURL + "/Gy_Warehouse/ModifyByID",
+ url: this.baseURL + "/Gy_Department/AddBill1",
data: {
- oMain: sMainSub,
+ oMain: sMainStr + ';' + sessionStorage["HUserName"] + ';' + sessionStorage["OrganizationID"],
},
})
.then((response) => {
@@ -560,14 +460,14 @@
this.$modal.msgError("姝ゆ潯鏁版嵁涓嶆槸鍒涘缓鐘舵��,鏃犳硶鍒犻櫎!");
}
})
- .catch(() => {});
+ .catch(() => { });
},
// 鍙嶅鏍�/瀹℃牳鏁版嵁
set_CheckBill(num, form) {
var InterID = form.HItemID || form.HInterID;
//閫昏緫瀹℃牳鏂规硶
axios
- .get(this.baseURL + "/Gy_Warehouse/AuditGy_Warehouse", {
+ .get(this.baseURL + "/Gy_Department/StopGy_Department", {
params: { HInterID: InterID, IsAudit: num, CurUserName: this.user },
})
.then((response) => {
@@ -584,10 +484,7 @@
});
},
showReset() {
- this.deptShow = false;
- this.warehouseShow = false;
- this.materialShow = false;
- this.workCenterShow = false;
+ this.gyEmployeeShow = false
},
// 鎵撳紑鏁版嵁鍒楄〃寮圭獥
openDataDialog(num, row) {
@@ -595,10 +492,10 @@
this.zbIndex = row.index - 1;
}
this.showReset();
- if (num == 1) {
- this.dialogTitle = "浠撳簱绠＄悊鍛樺垪琛�";
- this.employeeShow = true;
- this.openData = true;
+ if (num == 4) {
+ this.dialogTitle = '鑱屽憳鍒楄〃'
+ this.gyEmployeeShow = true
+ this.openData = true
}
},
},
@@ -609,7 +506,7 @@
width: 100%;
}
-.form-inline > .el-form-item__content {
+.form-inline>.el-form-item__content {
display: flex;
flex-direction: row;
}
diff --git a/src/views/basic/gy/gySupplier.vue b/src/views/basic/gy/gySupplier.vue
index 8f5aa94..19dbb6b 100644
--- a/src/views/basic/gy/gySupplier.vue
+++ b/src/views/basic/gy/gySupplier.vue
@@ -239,7 +239,7 @@
},
data() {
return {
- treeSql:'',
+ treeSql: '',
HSupClsName: 0,
//鏍戠粨鏋�
treeOptions: undefined,
@@ -409,9 +409,7 @@
let data1 = response.data
if (data1.count == 1) {
this.treeOptions = JSON.parse(data1.data);
- console.log(this.treeOptions)
}
-
}).catch(error => {
this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
});
@@ -445,7 +443,6 @@
this.pageSize = 50
}
// this.sWhere += " and HUSEORGID = '" + this.queryParams.HUSEORGID + "'"
- console.log(this.sWhere)
//鐢熶骇璧勬枡鍒楄〃
axios.get(this.baseURL + '/Gy_Supplier/page', {
params: {
@@ -488,8 +485,7 @@
var result = data1.data;
option.data = result;
this.DisPlay_HideColumn(this.HModName, sessionStorage["HUserName"], option, this.dataList);
- }else{
- console.log(response)
+ } else {
this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
}
}).catch(error => {
@@ -639,7 +635,7 @@
this.selectedRow = row; // 璁板綍褰撳墠閫変腑鐨勮
this.lastSelectedRowIndex = this.tableData.indexOf(row);
this.$refs.tableData.toggleRowSelection(row);
- if (this.openPage) {
+ if (this.openPage) {
this.$emit('deptEmit', row, 6)
}
},
@@ -654,7 +650,8 @@
this.OperationType = 3
if (this.openPage) {
this.$emit('deptEmitDb', row, 6)
- } else {
+ }
+ else {
this.handleEdit();
}
},
@@ -685,9 +682,7 @@
this.sWhere = ''
if (this.treeSql) {
this.sWhere += this.treeSql
- console.log(this.sWhere)
}
-
if (this.queryParams.ColName && this.queryParams.Comparator) {
var com = "";
switch (this.queryParams.Comparator) {
@@ -984,7 +979,6 @@
let sindex = (parseInt(page) - 1) * this.uploadPageSize
let eindex = parseInt(page) * this.uploadPageSize
let newList = list.slice(sindex, eindex)
- console.log(newList)
return newList
},
currentPage(val) {
diff --git a/src/views/basic/gy/gySupplierEdit.vue b/src/views/basic/gy/gySupplierEdit.vue
index 48fb5a7..e566424 100644
--- a/src/views/basic/gy/gySupplierEdit.vue
+++ b/src/views/basic/gy/gySupplierEdit.vue
@@ -8,176 +8,182 @@
<!-- <el-button @click="cancel">鍙� 娑�</el-button> -->
</div>
<div style="margin: 10px; font-size: 28px; font-weight: bold; text-align: center;">渚涘簲鍟嗚缃�</div>
- <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+ <el-form ref="form" :model="form" :rules="rules" label-width="90px">
<el-tabs v-model="activeName" type="card">
<el-tab-pane label="鍩烘湰淇℃伅" name="first">
<el-row>
<el-col :span="6">
- <el-form-item label="缂栫爜" prop="HBillNo">
- <el-input v-model="form.HBillNo" placeholder="璇疯緭鍏ュ崟鎹紪鍙�" />
+ <el-form-item label="缂栫爜" prop="HNumber">
+ <el-input v-model="form.HNumber" placeholder="璇疯緭鍏ョ紪鐮�" />
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="鏃ユ湡" prop="HDate">
- <el-date-picker v-model="form.HDate" type="date" placeholder="閫夋嫨鏃ユ湡" value-format="yyyy-MM-ddT">
- </el-date-picker>
+ <el-form-item label="鍚嶇О" prop="HName">
+ <el-input v-model="form.HName" placeholder="璇疯緭鍏ュ悕绉�" />
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="婧愬崟绫诲瀷" prop="BillType">
- <el-select v-model="form.BillType" placeholder="璇烽�夋嫨">
- <el-option label="閿�鍞鍗�" value="1401" />
- <el-option label="鍙戣揣閫氱煡鍗�" value="1402" />
- </el-select>
+ <el-form-item label="鍔╄鐮�" prop="HHelpCode">
+ <el-input v-model="form.HHelpCode" placeholder="璇疯緭鍏ュ姪璁扮爜" />
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="婧愬崟鍙�" prop="HMainSourceBillNo">
- <el-input v-model="form.HMainSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞彿" disabled>
- <el-button slot="append" icon="el-icon-search"></el-button>
- </el-input>
+ <el-form-item label="绠�绉�" prop="HShortName">
+ <el-input v-model="form.HShortName" placeholder="璇疯緭鍏ョ畝绉�" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
- <el-form-item label="閿�鍞憳" prop="HEmpName">
- <el-input v-model="form.HEmpName" placeholder="璇疯緭鍏ラ攢鍞憳" disabled>
- <el-button slot="append" icon="el-icon-search"></el-button>
- </el-input>
+ <el-form-item label="鍦板潃" prop="HAddress">
+ <el-input v-model="form.HAddress" placeholder="璇疯緭鍏ュ湴鍧�" />
</el-form-item>
</el-col>
- <el-col :span="6">
- <el-form-item label="閿�鍞儴闂�" prop="HDeptName">
- <el-input v-model="form.HDeptName" placeholder="璇疯緭鍏ラ攢鍞儴闂�" disabled>
- <el-button slot="append" icon="el-icon-search" @click="openDataDialog(1)"></el-button>
- </el-input>
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="涓荤" prop="HManagerName">
- <el-input v-model="form.HManagerName" placeholder="璇疯緭鍏ヤ富绠�" disabled>
- <el-button slot="append" icon="el-icon-search"></el-button>
- </el-input>
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="瀹㈡埛" prop="HSupName">
- <el-input v-model="form.HSupName" placeholder="璇疯緭鍏ュ鎴�" disabled>
- <el-button slot="append" icon="el-icon-search"></el-button>
- </el-input>
- </el-form-item>
- </el-col>
- </el-row>
- <el-row>
<el-col :span="6">
<el-form-item label="鑱旂郴浜�" prop="HLinkMan">
- <el-input v-model="form.HLinkMan" placeholder="璇疯緭鍏ヨ仈绯讳汉" disabled />
+ <el-input v-model="form.HLinkMan" placeholder="璇疯緭鍏ヨ仈绯讳汉" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="鑱旂郴鐢佃瘽" prop="HLinkPhone">
- <el-input v-model="form.HLinkPhone" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" disabled />
+ <el-input v-model="form.HLinkPhone" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" />
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="棰嗘枡浜�" prop="HSecManagerName">
- <el-input v-model="form.HSecManagerName" placeholder="璇疯緭鍏ラ鏂欎汉">
- <el-button slot="append" icon="el-icon-search"></el-button>
+ <el-form-item label="鎵嬫満" prop="HMobilePhone">
+ <el-input v-model="form.HMobilePhone" placeholder="璇疯緭鍏ユ墜鏈�" />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="6">
+ <el-form-item label="浼犵湡" prop="HFax">
+ <el-input v-model="form.HFax" placeholder="璇疯緭鍏ヤ紶鐪�" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="閭紪" prop="HPostalCode">
+ <el-input v-model="form.HPostalCode" placeholder="璇疯緭鍏ラ偖缂�" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="鐢靛瓙閭" prop="HEmail">
+ <el-input v-model="form.HEmail" placeholder="璇疯緭鍏ョ數瀛愰偖绠�" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="娉曚汉浠ｈ〃" prop="HCorMan">
+ <el-input v-model="form.HCorMan" placeholder="璇疯緭鍏ユ硶浜轰唬琛�" />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="6">
+ <el-form-item label="绋庡姟鐧昏鍙�" prop="HTaxNum">
+ <el-input v-model="form.HTaxNum" placeholder="璇疯緭鍏ョ◣鍔＄櫥璁板彿" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="鑻辨枃鍚嶇О" prop="HEnglishName">
+ <el-input v-model="form.HEnglishName" placeholder="璇疯緭鍏ヨ嫳鏂囧悕绉�" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="鑻辨枃鍦板潃" prop="HEnglishAddress">
+ <el-input v-model="form.HEnglishAddress" placeholder="璇疯緭鍏ヨ嫳鏂囧湴鍧�" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="鍥藉" prop="HCountry">
+ <el-input v-model="form.HCountry" placeholder="璇疯緭鍏ュ浗瀹�" />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="6">
+ <el-form-item label="鍦板尯" prop="HAreaName">
+ <el-input v-model="form.HAreaName" placeholder="璇疯緭鍏ュ湴鍖�" disabled>
+ <el-button slot="append" icon="el-icon-search" @click="openDataDialog(5)"></el-button>
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="浠撶" prop="HKeeperName">
- <el-input v-model="form.HKeeperName" placeholder="璇疯緭鍏ヤ粨绠�">
- <el-button slot="append" icon="el-icon-search"></el-button>
+ <el-form-item label="澧炲�肩◣鐜�" prop="HTaxRate">
+ <el-input-number v-model="form.HTaxRate" placeholder="璇疯緭鍏ヨ嫳鏂囧悕绉�" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="榛樿璐у竵" prop="HCurName">
+ <el-input v-model="form.HCurName" placeholder="璇疯緭鍏ラ粯璁よ揣甯�" disabled>
+ <el-button slot="append" icon="el-icon-search" @click="openDataDialog(5)"></el-button>
+ </el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="缁撶畻鏂瑰紡" prop="HSSName">
+ <el-input v-model="form.HSSName" placeholder="璇疯緭鍏ョ粨绠楁柟寮�" disabled>
+ <el-button slot="append" icon="el-icon-search" @click="openDataDialog(5)"></el-button>
</el-input>
</el-form-item>
</el-col>
</el-row>
- <el-form-item label="澶囨敞" prop="HRemark">
- <el-input v-model="form.HRemark" placeholder="璇疯緭鍏ュ娉�" />
- </el-form-item>
<el-row>
<el-col :span="6">
- <el-form-item label="椤圭洰浠ｇ爜" prop="HProjectNumber">
- <el-input v-model="form.HProjectNumber" placeholder="璇疯緭鍏ラ」鐩唬鐮�" disabled>
- <el-button slot="append" icon="el-icon-search"></el-button>
-
+ <el-form-item label="閾惰璐﹀彿" prop="HBankAccount">
+ <el-input v-model="form.HBankAccount" placeholder="璇疯緭鍏ラ摱琛岃处鍙�" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="閲囪喘鏂瑰紡" prop="HPSStyleName">
+ <el-input v-model="form.HPSStyleName" placeholder="璇疯緭鍏ラ噰璐柟寮�" disabled>
+ <el-button slot="append" icon="el-icon-search" @click="openDataDialog(5)"></el-button>
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="椤圭洰鍚嶇О" prop="HProjectName">
- <el-input v-model="form.HProjectName" placeholder="璇疯緭鍏ラ」鐩悕绉�" disabled />
+ <el-form-item label="鏉愭枡绫诲埆" prop="HMaterClass">
+ <el-select v-model="form.HMaterClass" placeholder="璇烽�夋嫨鏉愭枡绫诲埆">
+ <el-option value="涓绘潗">涓绘潗</el-option>
+ <el-option value="杈呮潗">杈呮潗</el-option>
+ </el-select>
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="鐝粍" prop="HGroupName">
- <el-input v-model="form.HGroupName" placeholder="璇疯緭鍏ョ彮缁�" disabled>
- <el-button slot="append" icon="el-icon-search"></el-button>
- </el-input>
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="鍑哄簱浠撳簱" prop="HWHName">
- <el-input v-model="form.HWHName" placeholder="璇疯緭鍏ュ嚭搴撲粨搴�">
- <el-button slot="append" icon="el-icon-search"></el-button>
+ <el-form-item label="渚涘簲鍟嗗垎绫�" prop="HSupClsName">
+ <el-input v-model="form.HSupClsName" placeholder="璇疯緭鍏ヤ緵搴斿晢鍒嗙被" disabled>
+ <el-button slot="append" icon="el-icon-search" @click="openDataDialog(5)"></el-button>
</el-input>
</el-form-item>
</el-col>
</el-row>
- </el-tab-pane>
- <el-tab-pane label="鍏朵粬淇℃伅" name="second">
<el-row>
<el-col :span="6">
- <el-form-item label="缁勭粐" prop="HOrgID">
- <el-select v-model="form.HOrgID" placeholder="璇烽�夋嫨缁勭粐" @change="organizationChange" :disabled="zzSelDis">
+ <el-form-item label="澶囨敞" prop="HRemark">
+ <el-input v-model="form.HRemark" placeholder="璇疯緭鍏ュ娉�" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="鍒涘缓缁勭粐" prop="HCREATEORGID">
+ <el-select v-model="form.HCREATEORGID" placeholder="璇烽�夋嫨鍒涘缓缁勭粐">
<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-col :span="6">
- <el-form-item label="甯佸埆" prop="HCurName">
- <el-input v-model="form.HCurName" placeholder="璇疯緭鍏ュ竵鍒�" disabled />
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="姹囩巼" prop="HExRate">
- <el-input v-model="form.HExRate" placeholder="璇疯緭鍏ユ眹鐜�" disabled />
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="閿�鍞柟寮�" prop="HSellSName">
- <el-input v-model="form.HSellSName" placeholder="璇疯緭鍏ラ攢鍞柟寮�" disabled />
- </el-form-item>
- </el-col>
- </el-row>
- <el-row>
- <el-col :span="6">
- <el-form-item label="鍗曚环绫诲瀷" prop="HPriceType">
- <el-select v-model="form.HPriceType" placeholder="璇烽�夋嫨鍗曚环绫诲瀷" @change="organizationChange">
- <el-option v-for="(item, index) in hPriceTypeList" :key="index" :label="item" :value="item">
+ <el-form-item label="浣跨敤缁勭粐" prop="HUSEORGID">
+ <el-select v-model="form.HUSEORGID" placeholder="璇烽�夋嫨浣跨敤缁勭粐">
+ <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-col :span="6">
- <el-form-item label="瀹㈡埛浣欓" prop="HCusBalance">
- <el-input v-model="form.HCusBalance" placeholder="璇疯緭鍏ュ鎴蜂綑棰�" disabled />
+ <el-form-item label="绂佺敤鏍囧織" prop="HStopflag">
+ <el-checkbox v-model="form.HStopflag" disabled>鏄惁绂佺敤</el-checkbox>
</el-form-item>
</el-col>
- <el-col :span="6">
- <el-form-item label="淇＄敤棰濆害" prop="HCreditRating_Now">
- <el-input v-model="form.HCreditRating_Now" placeholder="璇疯緭鍏ヤ俊鐢ㄩ搴�" disabled />
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="鍙敤棰濆害" prop="HAvailableBalance">
- <el-input v-model="form.HAvailableBalance" placeholder="璇疯緭鍏ュ彲鐢ㄩ搴�" disabled />
- </el-form-item>
- </el-col>
+
</el-row>
</el-tab-pane>
<el-tab-pane label="鍒跺崟淇℃伅" name="third">
@@ -195,11 +201,6 @@
<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>
@@ -222,130 +223,213 @@
</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-row>
- <el-row>
- <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-tab-pane>
</el-tabs>
- <div style="margin-bottom: 10px;">
- <el-button type="success" plain icon="el-icon-plus" @click="handleAddSysZb()" size="mini">澧炲姞涓�琛�</el-button>
- <el-button type="success" plain icon="el-icon-plus" @click="handleAddSysZb(zbIndex, 1)"
- size="mini">鎻掑叆涓�琛�</el-button>
- <el-button type="success" plain icon="el-icon-plus" @click="handleCopyZbRow" size="mini">澶嶅埗涓�琛�</el-button>
- <el-button type="success" plain icon="el-icon-arrow-up" @click="handleMoveRowUp(zbSelForm)"
- size="mini">涓婄Щ</el-button>
- <el-button type="success" plain icon="el-icon-arrow-down" @click="handleMoveRowDown(zbSelForm)"
- size="mini">涓嬬Щ</el-button>
- </div>
- <el-table :data="editData" style="width: 100%" height="300" width="100%" ref="zbTable"
- @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">
- <template slot-scope="scope">
- <el-input v-model="scope.row.鐗╂枡浠ｇ爜" placeholder="璇疯緭鍏ョ墿鏂欑紪鐮�" @keyup.native.f7="openDataDialog(3, scope.row)"
- @dblclick.native="openDataDialog(3, scope.row)" />
- </template>
- </el-table-column>
- <el-table-column align="center" label="鐗╂枡鍚嶇О" width="120">
- <template slot-scope="scope">
- <span>{{ scope.row.鐗╂枡鍚嶇О }}</span>
- </template>
- </el-table-column>
- <el-table-column align="center" label="瑙勬牸鍨嬪彿" width="120">
- <template slot-scope="scope">
- <span>{{ scope.row.瑙勬牸鍨嬪彿 }}</span>
- </template>
- </el-table-column>
- <el-table-column align="center" label="璁￠噺鍗曚綅" width="120">
- <template slot-scope="scope">
- <span>{{ scope.row.璁￠噺鍗曚綅 }}</span>
- </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="1" style="width: 90px;"
- controls-position="right"></el-input-number>
- </template>
- </el-table-column>
- <el-table-column align="center" label="鍗曚环" width="120">
- <template slot-scope="scope">
- <el-input-number v-model="scope.row.HPrice" :min="0" style="width: 90px;"
- controls-position="right"></el-input-number>
- </template>
- </el-table-column>
- <el-table-column align="center" label="鍚◣鍗曚环" width="120">
- <template slot-scope="scope">
- <span>{{ scope.row.HTaxPrice }}</span>
- </template>
- </el-table-column>
- <el-table-column align="center" label="绋庣巼" width="120">
- <template slot-scope="scope">
- <span>{{ scope.row.HTaxRate }}</span>
- </template>
- </el-table-column>
- <el-table-column align="center" label="閲戦" width="120">
- <template slot-scope="scope">
- <span>{{ scope.row.HPrice * scope.row.HQty }}</span>
- </template>
- </el-table-column>
- <el-table-column align="center" label="浠风◣鍚堣" width="120">
- <template slot-scope="scope">
- <span>{{ scope.row.HTaxPrice * scope.row.HQty }}</span>
- </template>
- </el-table-column>
- <el-table-column align="center" label="鍙戣揣浠撳簱" width="120">
- <template slot-scope="scope">
- <el-input v-model="scope.row.鍙戣揣浠撳簱" placeholder="璇疯緭鍏ュ彂璐т粨搴�" @keyup.native.f7="openDataDialog(2, scope.row)"
- @dblclick.native="openDataDialog(2, scope.row)" />
- </template>
- </el-table-column>
- <el-table-column align="center" label="澶囨敞" width="120">
- <template slot-scope="scope">
- <el-input v-model="scope.row.HRemark" placeholder="璇疯緭鍏ュ娉�" />
- </template>
- </el-table-column>
- <el-table-column align="center" label="閲囪喘鏁伴噺" width="120">
- <template slot-scope="scope">
- <span>{{ scope.row.HReqBuyQty }}</span>
- </template>
- </el-table-column>
- <el-table-column align="center" label="鐢宠鍑哄簱鏁伴噺" width="120">
- <template slot-scope="scope">
- <span>{{ scope.row.HReqOutQty }}</span>
- </template>
- </el-table-column>
- <el-table-column align="center" label="褰撳墠搴撳瓨" width="120">
- <template slot-scope="scope">
- <span>{{ scope.row.HCurrentInventory }}</span>
- </template>
- </el-table-column>
- <el-table-column align="center" label="鎿嶄綔" width="55" fixed="right">
- <template slot-scope="scope">
- <el-button type="danger" icon="el-icon-delete" size="mini" circle
- @click="handleDeleteSysZb(scope.row)"></el-button>
- </template>
- </el-table-column>
- </el-table>
+ <el-tabs v-model="activeNameZB" type="border-card">
+ <el-tab-pane label="鑱旂郴浜�" name="first">
+ <div style="margin-bottom: 10px;">
+ <el-button type="success" plain icon="el-icon-plus" @click="handleAddSysZb()" size="mini">澧炲姞涓�琛�</el-button>
+ <el-button type="success" plain icon="el-icon-plus" @click="handleAddSysZb(zbIndex, 1)"
+ size="mini">鎻掑叆涓�琛�</el-button>
+ <el-button type="success" plain icon="el-icon-plus" @click="handleCopyZbRow" size="mini">澶嶅埗涓�琛�</el-button>
+ <el-button type="success" plain icon="el-icon-arrow-up" @click="handleMoveRowUp(zbSelForm)"
+ size="mini">涓婄Щ</el-button>
+ <el-button type="success" plain icon="el-icon-arrow-down" @click="handleMoveRowDown(zbSelForm)"
+ size="mini">涓嬬Щ</el-button>
+ </div>
+ <el-table :data="editData" style="width: 100%" height="300" width="100%" ref="zbTable"
+ @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">
+ <template slot-scope="scope">
+ <el-input v-model="scope.row.鐗╂枡浠ｇ爜" placeholder="璇疯緭鍏ョ墿鏂欑紪鐮�" @keyup.native.f7="openDataDialog(3, scope.row)"
+ @dblclick.native="openDataDialog(3, scope.row)" />
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="鐗╂枡鍚嶇О" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.鐗╂枡鍚嶇О }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="瑙勬牸鍨嬪彿" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.瑙勬牸鍨嬪彿 }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="璁￠噺鍗曚綅" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.璁￠噺鍗曚綅 }}</span>
+ </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="1" style="width: 90px;"
+ controls-position="right"></el-input-number>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="鍗曚环" width="120">
+ <template slot-scope="scope">
+ <el-input-number v-model="scope.row.HPrice" :min="0" style="width: 90px;"
+ controls-position="right"></el-input-number>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="鍚◣鍗曚环" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.HTaxPrice }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="绋庣巼" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.HTaxRate }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="閲戦" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.HPrice * scope.row.HQty }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="浠风◣鍚堣" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.HTaxPrice * scope.row.HQty }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="鍙戣揣浠撳簱" width="120">
+ <template slot-scope="scope">
+ <el-input v-model="scope.row.鍙戣揣浠撳簱" placeholder="璇疯緭鍏ュ彂璐т粨搴�" @keyup.native.f7="openDataDialog(2, scope.row)"
+ @dblclick.native="openDataDialog(2, scope.row)" />
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="澶囨敞" width="120">
+ <template slot-scope="scope">
+ <el-input v-model="scope.row.HRemark" placeholder="璇疯緭鍏ュ娉�" />
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="閲囪喘鏁伴噺" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.HReqBuyQty }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="鐢宠鍑哄簱鏁伴噺" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.HReqOutQty }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="褰撳墠搴撳瓨" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.HCurrentInventory }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="鎿嶄綔" width="55" fixed="right">
+ <template slot-scope="scope">
+ <el-button type="danger" icon="el-icon-delete" size="mini" circle
+ @click="handleDeleteSysZb(scope.row)"></el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ </el-tab-pane>
+ <el-tab-pane label="浠樻璁″垝" name="second">
+ <div style="margin-bottom: 10px;">
+ <el-button type="success" plain icon="el-icon-plus" @click="handleAddSysZb()" size="mini">澧炲姞涓�琛�</el-button>
+ <el-button type="success" plain icon="el-icon-plus" @click="handleAddSysZb(zbIndex, 1)"
+ size="mini">鎻掑叆涓�琛�</el-button>
+ <el-button type="success" plain icon="el-icon-plus" @click="handleCopyZbRow" size="mini">澶嶅埗涓�琛�</el-button>
+ </div>
+ <el-table :data="editData" style="width: 100%" height="300" width="100%" ref="zbTable"
+ @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">
+ <template slot-scope="scope">
+ <el-input v-model="scope.row.鐗╂枡浠ｇ爜" placeholder="璇疯緭鍏ョ墿鏂欑紪鐮�" @keyup.native.f7="openDataDialog(3, scope.row)"
+ @dblclick.native="openDataDialog(3, scope.row)" />
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="鐗╂枡鍚嶇О" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.鐗╂枡鍚嶇О }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="瑙勬牸鍨嬪彿" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.瑙勬牸鍨嬪彿 }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="璁￠噺鍗曚綅" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.璁￠噺鍗曚綅 }}</span>
+ </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="1" style="width: 90px;"
+ controls-position="right"></el-input-number>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="鍗曚环" width="120">
+ <template slot-scope="scope">
+ <el-input-number v-model="scope.row.HPrice" :min="0" style="width: 90px;"
+ controls-position="right"></el-input-number>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="鍚◣鍗曚环" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.HTaxPrice }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="绋庣巼" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.HTaxRate }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="閲戦" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.HPrice * scope.row.HQty }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="浠风◣鍚堣" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.HTaxPrice * scope.row.HQty }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="鍙戣揣浠撳簱" width="120">
+ <template slot-scope="scope">
+ <el-input v-model="scope.row.鍙戣揣浠撳簱" placeholder="璇疯緭鍏ュ彂璐т粨搴�" @keyup.native.f7="openDataDialog(2, scope.row)"
+ @dblclick.native="openDataDialog(2, scope.row)" />
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="澶囨敞" width="120">
+ <template slot-scope="scope">
+ <el-input v-model="scope.row.HRemark" placeholder="璇疯緭鍏ュ娉�" />
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="閲囪喘鏁伴噺" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.HReqBuyQty }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="鐢宠鍑哄簱鏁伴噺" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.HReqOutQty }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="褰撳墠搴撳瓨" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.HCurrentInventory }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="鎿嶄綔" width="55" fixed="right">
+ <template slot-scope="scope">
+ <el-button type="danger" icon="el-icon-delete" size="mini" circle
+ @click="handleDeleteSysZb(scope.row)"></el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ </el-tab-pane>
+
+ </el-tabs>
+
</el-form>
<!-- 閮ㄩ棬寮圭獥 -->
<el-dialog :title="dialogTitle" :visible.sync="openData" width="1280px" append-to-body>
@@ -409,6 +493,7 @@
editData: [],//閿�鍞嚭搴撳崟瀛愯〃
editBtData: [],//瀛愯〃琛ㄥご
activeName: 'first',
+ activeNameZB: 'first',
// 寮瑰嚭灞傛爣棰�
title: "",
// 鏄惁鏄剧ず寮瑰嚭灞�
@@ -699,42 +784,41 @@
//閿�鍞嚭搴撳崟鏂板缂栬緫琛ㄥ崟鍒濆鍖�
reset() {
this.form = {
- HCREATEORGID: null,
- HUSEORGID: null,
- HUseOrg: null,
- HNumber: null,
- HHelpCode: null,
- HShortName: null,
- HAddress: null,
- HLinkMan: null,
- HLinkPhone: null,
- HMobilePhone: null,
- HFax: null,
- HPostalCode: null,
- HEmail: null,
- HCorMan: null,
- HBank: null,
- HTaxNum: null,
- HEnglishName: null,
- HEnglishAddress: null,
- HCountry: null,
- HAreaID: null,
- HAreaName: null,
+ HNumber: '',
+ HName: '',
+ HHelpCode: '',
+ HShortName: '',
+ HAddress: '',
+ HLinkMan: '',
+ HLinkPhone: '',
+ HMobilePhone: '',
+ HFax: '',
+ HPostalCode: '',
+ HEmail: '',
+ HCorMan: '',
+ HBank: '',
+ HTaxNum: '',
+ HEnglishName: '',
+ HEnglishAddress: '',
+ HCountry: '',
+ HAreaName: '',
+ HAreaID: 0,
HTaxRate: 13,
- HCurID: null,
- HCurName: null,
- HSSID: null,
- HSSName: null,
+ HCurName: '浜烘皯甯�',
+ HCurID: 1,
+ HSSName: '',
+ HSSID: '',
HBankAccount: null,
- HName: null,
- HPSStyleID: null,
- HPSStyleName: null,
- HRemark: null,
- HUpDater: null,
- HStopflag: null,
- HMaterClass: null,
- HSupTypeID: null,
- HSupClsName: null,
+ HPSStyleID: 0,
+ HPSStyleName: '',
+ HRemark: '',
+ HCreateOrgID: sessionStorage["OrganizationID"] - 0,
+ HUSEORGID: sessionStorage["OrganizationID"] - 0,
+ HUpDater: sessionStorage["HUserName"],
+ HStopflag: false,
+ HMaterClass: '涓绘潗',
+ HSupTypeID: 0,
+ HSupClsName: '',
HMaker: sessionStorage["HMaker"],
HMakeDate: new Date(),
HChecker: null,
@@ -754,13 +838,8 @@
//閫�鍑�
close() {
this.reset()
- if (!this.OperationType && !this.copyType) {
- const obj = { path: "/basic/gy/gySupplierEdit", name: "GySupplierEdit" };
- this.$tab.closePage(obj);
- } else {
- this.formShow = false
- this.$emit('editClose', false)
- }
+ this.formShow = false
+ this.$emit('editClose', false)
},
//鏍规嵁鐢ㄦ埛鑾峰彇瀵瑰簲鑱屽憳銆侀儴闂ㄣ�侀攢鍞富绠�
getCzyglByUser() {
@@ -841,7 +920,7 @@
this.reset()
let rowHmainid = this.linterid
console.log(this.linterid)
- axios.get(this.baseURL + "/Kf_SellOutBill/cx", {
+ axios.get(this.baseURL + "/Gy_Supplier/xg_ExpendBillMake", {
params: { 'HInterID': rowHmainid }
}).then(response => {
if (response.data.count == 1) {
diff --git a/src/views/basic/gyEmployee/gyEmployee.vue b/src/views/basic/gyEmployee/gyEmployee.vue
index 59e0095..c5ea92b 100644
--- a/src/views/basic/gyEmployee/gyEmployee.vue
+++ b/src/views/basic/gyEmployee/gyEmployee.vue
@@ -1,26 +1,52 @@
<template>
- <div style="padding: 10px;position: relative;">
- <el-form :model="queryParams" ref="queryForm" label-width="98px" :inline="true" class="searchBox">
+ <div style="padding: 10px; position: relative">
+ <el-form
+ :model="queryParams"
+ ref="queryForm"
+ label-width="98px"
+ :inline="true"
+ class="searchBox"
+ >
<el-row>
<el-form-item label="鑱屽憳浠ｇ爜" prop="HNumber" style="padding-left: 100px">
- <el-input v-model="queryParams.HNumber" placeholder="璇疯緭鍏ヨ亴鍛樹唬鐮�" @keyup.enter.native="handleQuery"
- class="ForFilteringSchemes" />
+ <el-input
+ v-model="queryParams.HNumber"
+ placeholder="璇疯緭鍏ヨ亴鍛樹唬鐮�"
+ @keyup.enter.native="handleQuery"
+ class="ForFilteringSchemes"
+ />
</el-form-item>
<el-form-item label="鑱屽憳鍚嶇О" prop="HName">
- <el-input v-model="queryParams.HName" placeholder="璇疯緭鍏ヨ亴鍛樺悕绉�" @keyup.enter.native="handleQuery"
- class="ForFilteringSchemes" />
+ <el-input
+ v-model="queryParams.HName"
+ placeholder="璇疯緭鍏ヨ亴鍛樺悕绉�"
+ @keyup.enter.native="handleQuery"
+ class="ForFilteringSchemes"
+ />
</el-form-item>
<el-form-item label="缁勭粐">
- <el-select v-model="queryParams.HOrgID" placeholder="璇烽�夋嫨" class="ForFilteringSchemes">
- <el-option v-for="(item, index) in organizationList" :key="index" :label="item.Name" :value="item.ID">
+ <el-select
+ v-model="queryParams.HOrgID"
+ placeholder="璇烽�夋嫨"
+ class="ForFilteringSchemes"
+ >
+ <el-option
+ v-for="(item, index) in organizationList"
+ :key="index"
+ :label="item.Name"
+ :value="item.ID"
+ >
</el-option>
</el-select>
</el-form-item>
</el-row>
<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-button
+ >
+ <el-button icon="el-icon-circle-close" size="small" @click="searchOpen = false"
+ >鍙� 娑�</el-button
+ >
</el-form-item>
<el-collapse v-model="activeSeach">
<el-collapse-item title="鏇村" name="1">
@@ -30,69 +56,132 @@
<el-form-item label-width="0">
<el-row>
<el-col :span="7">
- <el-select v-model="queryParams.ColName1" placeholder="璇烽�夋嫨" @change="riqiChange"
- class="ForFilteringSchemes">
+ <el-select
+ v-model="queryParams.ColName1"
+ 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>
+ <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"
- class="ForFilteringSchemes">
- <el-option v-for="(item, index) in comparatorList" :key="index" :label="item.label"
- :value="item.value"></el-option>
+ <el-select
+ v-model="queryParams.Comparator1"
+ placeholder="璇烽�夋嫨"
+ @change="riqiChange"
+ class="ForFilteringSchemes"
+ >
+ <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" class="ForFilteringSchemes" />
+ <el-input
+ v-model="queryParams.ColContent1"
+ placeholder="璇疯緭鍏�"
+ clearable
+ @keyup.enter.native="handleQuery"
+ class="ForFilteringSchemes"
+ />
</el-col>
</el-row>
</el-form-item>
<el-form-item label-width="0">
<el-row>
<el-col :span="7">
- <el-select v-model="queryParams.ColName2" placeholder="璇烽�夋嫨" @change="riqiChange"
- class="ForFilteringSchemes">
+ <el-select
+ v-model="queryParams.ColName2"
+ 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>
+ <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"
- class="ForFilteringSchemes">
+ <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>
+ <el-option
+ :label="item.field"
+ :value="item.field"
+ v-if="!item.hide"
+ ></el-option>
</span>
</el-select>
</el-col>
<el-col :span="11">
- <el-input v-model="queryParams.ColContent2" placeholder="璇疯緭鍏�" clearable
- @keyup.enter.native="handleQuery" class="ForFilteringSchemes" />
+ <el-input
+ v-model="queryParams.ColContent2"
+ placeholder="璇疯緭鍏�"
+ clearable
+ @keyup.enter.native="handleQuery"
+ class="ForFilteringSchemes"
+ />
</el-col>
</el-row>
</el-form-item>
<el-form-item label-width="0">
<el-row>
<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>
+ <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>
</el-select>
</el-col>
<el-col :span="6" style="padding: 0 10px">
- <el-select v-model="queryParams.Comparator" placeholder="璇烽�夋嫨" @change="riqiChange"
- class="ForFilteringSchemes">
- <el-option v-for="(item, index) in comparatorList" :key="index" :label="item.label"
- :value="item.value"></el-option>
+ <el-select
+ v-model="queryParams.Comparator"
+ placeholder="璇烽�夋嫨"
+ @change="riqiChange"
+ class="ForFilteringSchemes"
+ >
+ <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" class="ForFilteringSchemes" />
+ <el-input
+ v-model="queryParams.ColContent"
+ placeholder="璇疯緭鍏�"
+ clearable
+ @keyup.enter.native="handleQuery"
+ class="ForFilteringSchemes"
+ />
</el-col>
</el-row>
</el-form-item>
@@ -113,120 +202,293 @@
>
</el-col> -->
<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-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-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-edit" size="mini" :disabled="single"
- @click="handleEdit((row = rowForm), (OperationType = 2))">澶嶅埗</el-button>
+ <el-button
+ type="primary"
+ icon="el-icon-edit"
+ size="mini"
+ :disabled="single"
+ @click="handleEdit((row = rowForm), (OperationType = 2))"
+ >澶嶅埗</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
+ 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" size="mini" :disabled="single"
- @click="set_CheckBill(0, (form = rowForm))">瀹℃牳</el-button>
+ <el-button
+ type="primary"
+ icon="el-icon-edit"
+ 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" size="mini" :disabled="single"
- @click="set_CheckBill(1, (form = rowForm))">杩斿鏍�</el-button>
+ <el-button
+ type="primary"
+ icon="el-icon-edit"
+ 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" size="mini" :disabled="single"
- @click="set_De_Stop(0, (form = rowForm))">绂佺敤</el-button>
+ <el-button
+ type="primary"
+ icon="el-icon-edit"
+ size="mini"
+ :disabled="single"
+ @click="set_De_Stop(0, (form = rowForm))"
+ >绂佺敤</el-button
+ >
</el-col>
<el-col :span="1.5">
- <el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single"
- @click="set_De_Stop(1, (form = rowForm))">鍙嶇鐢�</el-button>
+ <el-button
+ type="primary"
+ icon="el-icon-edit"
+ size="mini"
+ :disabled="single"
+ @click="set_De_Stop(1, (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>
+ <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-download" size="mini" @click="handleRowHide">闅愯棌鍒楄缃�</el-button>
+ <el-button
+ type="primary"
+ icon="el-icon-download"
+ size="mini"
+ @click="handleRowHide"
+ >闅愯棌鍒楄缃�</el-button
+ >
</el-col>
- <el-col :span="1.5">
- <el-button type="primary" icon="el-icon-help" size="mini" @click="handleSearch">鎼� 绱�</el-button>
+ <el-col :span="1.5" class="zy-hidden">
+ <el-button type="primary" icon="el-icon-help" size="mini" @click="handleSearch"
+ >鎼� 绱�</el-button
+ >
</el-col>
- <el-col :span="1.5">
- <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲� 缃�</el-button>
+ <el-col :span="1.5" class="zy-hidden">
+ <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+ >閲� 缃�</el-button
+ >
</el-col>
<!-- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> -->
</el-row>
<div class="tableBox" v-loading="loading">
- <el-table :data="tableData" ref="tableData" max-height="750" :summary-method="getSummaries"
- @selection-change="handleSelectionChange" show-summary border @row-click="handleRowClick" :row-style="rowStyle"
- @cell-dblclick="handleDblclick" v-if="tableShow">
+ <el-table
+ :data="tableData"
+ ref="tableData"
+ max-height="750"
+ :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.sorderid" v-else-if="!item.hide && item.type != 'checkbox'" :sortable="item.sort"
- show-overflow-tooltip :fixed="item.fixed">
+ <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.sorderid"
+ 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="handleEdit(row, (OperationType = 3))"
- v-else-if="column.property == '鍗曟嵁鍙�'">{{ row.鍗曟嵁鍙� }}</el-button>
+ <el-button
+ type="text"
+ @click="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" />
+ <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"
- :before-close="close">
- <edit :OperationType="OperationType" :linterid="this.rowForm.HItemID"
- :HSouceBillType="this.rowForm.HSourceBillType" :HOrgID="this.queryParams.HOrgID" :copyType="copyType"
- @editCloseGy="editGyClose" v-if="editShow" />
+ <el-dialog
+ title="缂栬緫鑱屽憳"
+ :visible.sync="openEdit"
+ width="1480px"
+ append-to-body
+ class="xsckdBox"
+ :before-close="close"
+ >
+ <edit
+ :OperationType="OperationType"
+ :linterid="this.rowForm.HItemID"
+ :HSouceBillType="this.rowForm.HSourceBillType"
+ :HOrgID="this.queryParams.HOrgID"
+ :copyType="copyType"
+ @editCloseGy="editGyClose"
+ v-if="editShow"
+ />
</el-dialog>
- <el-dialog :title="upload.title" :visible.sync="upload.open" width="1500px" append-to-body>
+ <el-dialog
+ :title="upload.title"
+ :visible.sync="upload.open"
+ width="1500px"
+ append-to-body
+ >
<div style="margin-top: -20px">
<el-button type="primary" @click="set_AddNew">瀵煎叆鏁版嵁</el-button>
<el-button type="primary" @click="upload.open = false">閫� 鍑�</el-button>
- <el-upload ref="upload" :limit="1" accept=".xlsx, .xls" style="display: inline-block; margin-left: 10px"
- :action="upload.url + '?updateSupport=' + upload.updateSupport" :disabled="upload.isUploading"
- :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess">
+ <el-upload
+ ref="upload"
+ :limit="1"
+ accept=".xlsx, .xls"
+ style="display: inline-block; margin-left: 10px"
+ :action="upload.url + '?updateSupport=' + upload.updateSupport"
+ :disabled="upload.isUploading"
+ :on-progress="handleFileUploadProgress"
+ :on-success="handleFileSuccess"
+ >
<el-button type="primary">鏂囦欢涓婁紶</el-button>
</el-upload>
</div>
- <el-table :data="uploadData" v-loading="uploadTableLoading" :row-class-name="uploadDataIndex" border
- height="550">
+ <el-table
+ :data="uploadData"
+ v-loading="uploadTableLoading"
+ :row-class-name="uploadDataIndex"
+ border
+ height="550"
+ >
<el-table-column type="index" label="搴忓彿" width="55" align="center" />
<el-table-column label="缁勭粐浠ｇ爜" prop="缁勭粐浠ｇ爜" align="center" width="120" />
<el-table-column label="缁勭粐鍚嶇О" prop="缁勭粐鍚嶇О" align="center" width="120" />
- <el-table-column label="鐢熶骇璧勬簮鍚嶇О" prop="鐢熶骇璧勬簮鍚嶇О" align="center" width="120" />
- <el-table-column label="鐢熶骇璧勬簮浠ｇ爜" prop="鐢熶骇璧勬簮浠ｇ爜" align="center" width="120" />
+ <el-table-column
+ label="鐢熶骇璧勬簮鍚嶇О"
+ prop="鐢熶骇璧勬簮鍚嶇О"
+ align="center"
+ width="120"
+ />
+ <el-table-column
+ label="鐢熶骇璧勬簮浠ｇ爜"
+ prop="鐢熶骇璧勬簮浠ｇ爜"
+ align="center"
+ width="120"
+ />
<el-table-column label="閮ㄩ棬浠ｇ爜" prop="閮ㄩ棬浠ｇ爜" align="center" width="120" />
<el-table-column label="閮ㄩ棬鍚嶇О" prop="閮ㄩ棬鍚嶇О" align="center" width="120" />
- <el-table-column label="璐熻矗浜轰唬鐮�" prop="璐熻矗浜轰唬鐮�" align="center" width="120" />
+ <el-table-column
+ label="璐熻矗浜轰唬鐮�"
+ prop="璐熻矗浜轰唬鐮�"
+ align="center"
+ width="120"
+ />
<el-table-column label="璐熻矗浜�" prop="璐熻矗浜�" align="center" width="120" />
- <el-table-column label="宸ヤ綔涓績浠ｇ爜" prop="宸ヤ綔涓績浠ｇ爜" align="center" width="120" />
- <el-table-column label="宸ヤ綔涓績鍚嶇О" prop="宸ヤ綔涓績鍚嶇О" align="center" width="120" />
+ <el-table-column
+ label="宸ヤ綔涓績浠ｇ爜"
+ prop="宸ヤ綔涓績浠ｇ爜"
+ align="center"
+ width="120"
+ />
+ <el-table-column
+ label="宸ヤ綔涓績鍚嶇О"
+ prop="宸ヤ綔涓績鍚嶇О"
+ align="center"
+ width="120"
+ />
<el-table-column label="鍗曠彮宸ユ椂" prop="鍗曠彮宸ユ椂" align="center" width="120" />
<el-table-column label="鎿嶄綔" align="center">
<template slot-scope="scope">
- <el-button size="mini" type="text" icon="el-icon-delete"
- @click="uploadDataDelete(scope.row)">鍒犻櫎</el-button>
+ <el-button
+ size="mini"
+ type="text"
+ icon="el-icon-delete"
+ @click="uploadDataDelete(scope.row)"
+ >鍒犻櫎</el-button
+ >
</template>
</el-table-column>
</el-table>
- <pagination v-show="uploadTotal > 0" :total="uploadTotal" :page.sync="uploadPage" :limit.sync="uploadPageSize"
- :pageSizes="uploadPageSizes" @pagination="currentPage" />
+ <pagination
+ v-show="uploadTotal > 0"
+ :total="uploadTotal"
+ :page.sync="uploadPage"
+ :limit.sync="uploadPageSize"
+ :pageSizes="uploadPageSizes"
+ @pagination="currentPage"
+ />
</el-dialog>
</div>
</div>
@@ -246,7 +508,7 @@
},
data() {
return {
- activeSeach: '',
+ activeSeach: "",
HModName: "Gy_Employee",
editShow: false,
openEdit: false,
@@ -554,7 +816,7 @@
},
})
.then((response) => {
- console.log(response.data.data)
+ console.log(response.data.data);
this.tyResList = response.data.data; //鎬绘暟鎹�
let data1 = response.data;
let option = [];
@@ -797,7 +1059,7 @@
this.lastSelectedRowIndex = this.tableData.indexOf(row);
this.$refs.tableData.toggleRowSelection(row);
if (this.openPage) {
- this.$emit('deptEmit', row, 4)
+ this.$emit("deptEmit", row, 4);
}
},
//閫変腑琛岄珮浜牱寮�
@@ -810,7 +1072,7 @@
handleDblclick(row, column, cell, event) {
this.OperationType = 3;
if (this.openPage) {
- this.$emit('deptEmitDb', row, 4)
+ this.$emit("deptEmitDb", row, 4);
} else {
this.handleEdit();
}
@@ -821,12 +1083,12 @@
if (this.openPage) {
//鍒楄〃鍗曢��
if (selection.length > 1) {
- const del_row = selection.shift()
- this.$refs.tableData.toggleRowSelection(del_row, false) //璁剧疆杩欎竴琛屽彇娑堥�変腑
+ 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.rowForm = {};
+ this.ids = selection.map((item) => item.HItemID);
+ this.rowForm = selection[0];
} else {
//澶氶��
this.ids = selection.map((item) => item.HItemID);
@@ -1044,7 +1306,7 @@
this.$modal.msgError("姝ゆ潯鏁版嵁涓嶆槸鍒涘缓鐘舵��,鏃犳硶鍒犻櫎!");
}
})
- .catch(() => { });
+ .catch(() => {});
},
// 鍙嶅鏍�/瀹℃牳鏁版嵁
set_CheckBill(num, form) {
@@ -1120,8 +1382,8 @@
} else {
this.$alert(
"<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
- response.Message +
- "</div>",
+ response.Message +
+ "</div>",
"瀵煎叆缁撴灉",
{ dangerouslyUseHTMLString: true }
);
@@ -1150,8 +1412,8 @@
.then((res) => {
this.$alert(
"<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
- res.data.Message +
- "</div>",
+ res.data.Message +
+ "</div>",
"瀵煎叆缁撴灉",
{ dangerouslyUseHTMLString: true }
);
@@ -1175,7 +1437,7 @@
return deleteList.indexOf(item.index) == -1;
});
})
- .catch(() => { });
+ .catch(() => {});
},
getPage(page, list) {
let sindex = (parseInt(page) - 1) * this.uploadPageSize;
@@ -1197,4 +1459,7 @@
.xsckdBox .el-date-editor.el-input {
width: 100%;
}
+.zy-hidden {
+ display: none;
+}
</style>
diff --git a/src/views/basic/gyEmployee/gyEmployeeEdit.vue b/src/views/basic/gyEmployee/gyEmployeeEdit.vue
index 39d9e23..5c0ca2c 100644
--- a/src/views/basic/gyEmployee/gyEmployeeEdit.vue
+++ b/src/views/basic/gyEmployee/gyEmployeeEdit.vue
@@ -225,24 +225,24 @@
<el-row>
<el-col :span="8">
<el-form-item label="妗ｆ缂栧彿" prop="HArchivesNo">
- <el-input type="text" :v-model="form.HArchivesNo"></el-input>
+ <el-input type="text" v-model="form.HArchivesNo"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="鑱岀О" prop="HProTitleID">
- <el-input type="text" :v-model="form.HProTitleID"></el-input>
+ <el-input type="text" v-model="form.HProTitleID"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="钖祫绛夌骇" prop="HSalaryLev">
- <el-input type="text" :v-model="form.HSalaryLev"></el-input>
+ <el-input type="text" v-model="form.HSalaryLev"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="姣曚笟瀛︽牎" prop="HGradSchool">
- <el-input type="text" :v-model="form.HGradSchool"></el-input>
+ <el-input type="text" v-model="form.HGradSchool"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
@@ -1193,94 +1193,98 @@
if (result.code == 1) {
// 璇存槑楠岃瘉鎴愬姛浜嗭紝
var data = result.data.h_v_Edit_IF_EmployeeList[0];
-
- Object.assign(this.form, {
- HNumber: data.鑱屽憳浠ｇ爜,
- HItemID: this.OperationType == 2 ? 0 : data.HItemID,
- HName: data.鑱屽憳鍚嶇О,
- HHelpCode: data.鍔╄浠ｇ爜,
- HGroupID: data.HGroupID,
- HGroupName: data.鐝粍鍚嶇О,
- HGroupNumber: data.鐝粍浠ｇ爜,
- HEndFlag: data.鏄庣粏鏍囪,
- HNoBrushFlag: data.鏄惁鎵撳崱,
- HOverType: data.鏄惁璋冧紤,
- HShiftFlag: data.鏄惁杞彮璋冧紤,
- HStopwagesFlag: data.鏄惁鍋滃彂,
- HInsuranceStatus: data.鏄惁鍙備繚,
- HDeptID: data.閮ㄩ棬ID,
- HDeptName: data.閮ㄩ棬鍚嶇О,
- HDutyID: data.鑱屽姟ID,
- HDutyName: data.鑱屽姟鍚嶇О,
- HDutyNumber: data.鑱屽姟浠ｇ爜,
- HDormID: data.瀹胯垗ID,
- HDormName: data.瀹胯垗鍚嶇О,
- HDormNumber: data.瀹胯垗浠ｇ爜,
- HWorkTypeID: data.宸ョID,
- HWorkTypeName: data.宸ョ鍚嶇О,
- HWorkTypeNumber: data.宸ョ浠ｇ爜,
- HCTPrjID: data.鏍哥畻鏂瑰紡ID,
- HCTPrjName: data.鏍哥畻鏂瑰紡鍚嶇О,
- HCTPrjNumber: data.鏍哥畻鏂瑰紡浠ｇ爜,
- HPostID: data.宀椾綅ID,
- HPostName: data.宀椾綅鍚嶇О,
- HPostNumber: data.宀椾綅浠ｇ爜,
- HSex: data.鎬у埆,
- HBirthDay: dayjs(data.鍑虹敓骞存湀).format("YYYY-MM-DD"),
- HAge: data.骞撮緞,
- HBlighty: data.绫嶈疮,
- HNation: data.姘戞棌,
- HBlightyType: data.鎴风睄绫诲埆,
- HGovStatus: data.鏀挎不闈㈣矊,
- HKnowLev: data.瀛﹀巻,
- HMarr: data.濠氬Щ鐘跺喌,
- HArchivesNo: data.妗ｆ缂栧彿,
- HProTitleID: data.鑱岀О,
- HSalaryLev: data.钖祫绛夌骇,
- HGradSchool: data.姣曚笟瀛︽牎,
- HGradDate: dayjs(data.姣曚笟鏃堕棿).format("YYYY-MM-DD"),
- HEngLev: data.澶栬姘村钩,
- HCompLev: data.璁＄畻鏈烘按骞�,
- HSpec: data.涓撲笟,
- HNowAdd: data.鐜颁綇鍦板潃,
- HEmail: data.鐢靛瓙閭,
- HHomeAdd: data.瀹跺涵鍦板潃,
- HPostalCode: data.閭斂缂栫爜,
- HOldCompany: data.鍘熷叕鍙�,
- HLinkPhone: data.鑱旂郴鐢佃瘽,
- HMobilePhone: data.鎵嬫満鍙�,
- HWorkType: data.鐢ㄥ伐绫诲瀷,
- HInComDate: dayjs(data.杩涘巶鏃ユ湡).format("YYYY-MM-DD"),
- HRelDate: dayjs(data.杞鏃ユ湡).format("YYYY-MM-DD"),
- HInsuranceNo: data.淇濋櫓璇佺紪鍙�,
- HContractBDate: dayjs(data.鍚堝悓寮�濮嬫棩鏈�).format("YYYY-MM-DD"),
- HContractEDate: dayjs(data.鍚堝悓鍒版湡鏃ユ湡).format("YYYY-MM-DD"),
- HContractYear: data.鍚堝悓鏈熼檺,
- HInsuranceDate: dayjs(data.鍙備繚鏃ユ湡).format("YYYY-MM-DD"),
- HDimissionDate: dayjs(data.绂昏亴鏃ユ湡).format("YYYY-MM-DD"),
- HStayCardEDate: dayjs(data.鏆備綇璇佸埌鏈熸棩).format("YYYY-MM-DD"),
- HEmpRate: data.鑱屽憳绯绘暟,
- HBSTDeptID: data.璐濆＋杈鹃儴闂�,
- HRemark: data.澶囨敞,
- HDimissionReason: data.绂昏亴鍘熷洜,
- linteridCard: data.韬唤璇�,
- HEmpType: data.宸ヨ祫绫诲瀷,
- HBankAccount: data.閾惰璐︽埛,
- HInsuranceSubsidy: data.淇濋櫓琛ヨ创,
- HOtherDeduct3: data.鍏朵粬鎵ｆ3,
- HMedicare: data.鍖荤枟淇濋櫓,
- HInsurance: data.鍏昏�佷繚闄�,
- HDrydock: data.澶变笟淇濋櫓,
- HBasePay: data.鍩烘湰宸ヨ祫,
- HExamLevPostMoney: data.鑱屽姟鑰冩牳宸ヨ祫,
- HExamRate: data.鑰冩牳绯绘暟,
- HPayType: data.鏀粯绫诲瀷,
- HLeftMoneyRate: data.鍓╀綑宸ヨ祫,
- HHighestPay: data.鏈�楂樺伐璧�,
- HOverPayRate: data.瓒呴姣旂巼,
- HStopflag: data.绂佺敤鏍囪,
- HRemark: data.澶囨敞,
- });
+ console.log(data);
+ this.form = {
+ ...{
+ HNumber: data.鑱屽憳浠ｇ爜,
+ HItemID: this.OperationType == 2 ? 0 : data.HItemID,
+ HName: data.鑱屽憳鍚嶇О,
+ HHelpCode: data.鍔╄浠ｇ爜,
+ HGroupID: data.HGroupID,
+ HGroupName: data.鐝粍鍚嶇О,
+ HGroupNumber: data.鐝粍浠ｇ爜,
+ HEndFlag: data.鏄庣粏鏍囪 == "true" ? true : false,
+ HNoBrushFlag: data.鏄惁鎵撳崱 == "true" ? true : false,
+ HOverType: data.鏄惁璋冧紤 == "true" ? true : false,
+ HShiftFlag: data.鏄惁杞彮璋冧紤 == "true" ? true : false,
+ HStopwagesFlag: data.鏄惁鍋滃彂 == "true" ? true : false,
+ HInsuranceStatus: data.鏄惁鍙備繚,
+ HDeptID: data.閮ㄩ棬ID,
+ HDeptName: data.閮ㄩ棬鍚嶇О,
+ HDutyID: data.鑱屽姟ID,
+ HDutyName: data.鑱屽姟鍚嶇О,
+ HDutyNumber: data.鑱屽姟浠ｇ爜,
+ HDormID: data.瀹胯垗ID,
+ HDormName: data.瀹胯垗鍚嶇О,
+ HDormNumber: data.瀹胯垗浠ｇ爜,
+ HWorkTypeID: data.宸ョID,
+ HWorkTypeName: data.宸ョ鍚嶇О,
+ HWorkTypeNumber: data.宸ョ浠ｇ爜,
+ HCTPrjID: data.鏍哥畻鏂瑰紡ID,
+ HCTPrjName: data.鏍哥畻鏂瑰紡鍚嶇О,
+ HCTPrjNumber: data.鏍哥畻鏂瑰紡浠ｇ爜,
+ HPostID: data.宀椾綅ID,
+ HPostName: data.宀椾綅鍚嶇О,
+ HPostNumber: data.宀椾綅浠ｇ爜,
+ HSex: data.鎬у埆,
+ HBirthDay: dayjs(data.鍑虹敓骞存湀).format("YYYY-MM-DD"),
+ HAge: data.骞撮緞,
+ HBlighty: data.绫嶈疮,
+ HNation: data.姘戞棌,
+ HBlightyType: data.鎴风睄绫诲埆,
+ HGovStatus: data.鏀挎不闈㈣矊,
+ HKnowLev: data.瀛﹀巻,
+ HMarr: data.濠氬Щ鐘跺喌,
+ HArchivesNo: data.妗ｆ缂栧彿,
+ HProTitleID: data.鑱岀О,
+ HSalaryLev: data.钖祫绛夌骇,
+ HGradSchool: data.姣曚笟瀛︽牎,
+ HGradDate: dayjs(data.姣曚笟鏃堕棿).format("YYYY-MM-DD"),
+ HEngLev: data.澶栬姘村钩,
+ HCompLev: data.璁＄畻鏈烘按骞�,
+ HSpec: data.涓撲笟,
+ HNowAdd: data.鐜颁綇鍦板潃,
+ HEmail: data.鐢靛瓙閭,
+ HHomeAdd: data.瀹跺涵鍦板潃,
+ HPostalCode: data.閭斂缂栫爜,
+ HOldCompany: data.鍘熷叕鍙�,
+ HLinkPhone: data.鑱旂郴鐢佃瘽,
+ HMobilePhone: data.鎵嬫満鍙�,
+ HWorkType: data.鐢ㄥ伐绫诲瀷,
+ HInComDate: dayjs(data.杩涘巶鏃ユ湡).format("YYYY-MM-DD"),
+ HRelDate: dayjs(data.杞鏃ユ湡).format("YYYY-MM-DD"),
+ HInsuranceNo: data.淇濋櫓璇佺紪鍙�,
+ HContractBDate: dayjs(data.鍚堝悓寮�濮嬫棩鏈�).format("YYYY-MM-DD"),
+ HContractEDate: dayjs(data.鍚堝悓鍒版湡鏃ユ湡).format("YYYY-MM-DD"),
+ HContractYear: data.鍚堝悓鏈熼檺,
+ HInsuranceDate: dayjs(data.鍙備繚鏃ユ湡).format("YYYY-MM-DD"),
+ HDimissionDate: dayjs(data.绂昏亴鏃ユ湡).format("YYYY-MM-DD"),
+ HStayCardEDate: dayjs(data.鏆備綇璇佸埌鏈熸棩).format("YYYY-MM-DD"),
+ HEmpRate: data.鑱屽憳绯绘暟,
+ HBSTDeptID: data.璐濆＋杈鹃儴闂�,
+ HRemark: data.澶囨敞,
+ HDimissionReason: data.绂昏亴鍘熷洜,
+ linteridCard: data.韬唤璇�,
+ HEmpType: data.宸ヨ祫绫诲瀷,
+ HBankAccount: data.閾惰璐︽埛,
+ HInsuranceSubsidy: data.淇濋櫓琛ヨ创,
+ HOtherDeduct3: data.鍏朵粬鎵ｆ3,
+ HMedicare: data.鍖荤枟淇濋櫓,
+ HInsurance: data.鍏昏�佷繚闄�,
+ HDrydock: data.澶变笟淇濋櫓,
+ HBasePay: data.鍩烘湰宸ヨ祫,
+ HExamLevPostMoney: data.鑱屽姟鑰冩牳宸ヨ祫,
+ HExamRate: data.鑰冩牳绯绘暟,
+ HPayType: data.鏀粯绫诲瀷,
+ HLeftMoneyRate: data.鍓╀綑宸ヨ祫,
+ HHighestPay: data.鏈�楂樺伐璧�,
+ HOverPayRate: data.瓒呴姣旂巼,
+ HStopflag: data.绂佺敤鏍囪,
+ HRemark: data.澶囨敞,
+ HIDCard: data.韬唤璇� || "",
+ HFax: data.浼犵湡鍙风爜 || "",
+ },
+ };
if (this.OperationType == 3) {
// 缂栬緫鏃惰幏鍙栨枃浠跺垪琛�
@@ -1374,7 +1378,7 @@
} else if (num == "Group") {
// 鐝粍
Object.assign(this.form, {
- HGroupItem: deptRow.HItemID,
+ HGroupID: deptRow.HItemID,
HGroupName: deptRow.鐝粍鍚嶇О,
HGroupNumber: deptRow.鐝粍浠ｇ爜,
});
diff --git a/src/views/basic/gyStockPlace/gyStockPlace.vue b/src/views/basic/gyStockPlace/gyStockPlace.vue
index 8378ca9..92720f7 100644
--- a/src/views/basic/gyStockPlace/gyStockPlace.vue
+++ b/src/views/basic/gyStockPlace/gyStockPlace.vue
@@ -26,7 +26,7 @@
</el-form-item>
<el-form-item label="缁勭粐">
<el-select
- v-model="queryParams.HOrgName"
+ v-model="queryParams.HOrgID"
placeholder="璇烽�夋嫨"
class="ForFilteringSchemes"
>
@@ -34,7 +34,7 @@
v-for="(item, index) in organizationList"
:key="index"
:label="item.Name"
- :value="item.Name"
+ :value="item.ID.toString()"
>
</el-option>
</el-select>
@@ -62,8 +62,8 @@
<el-card class="box-card">
<div slot="header" class="clearfix"><span>杩囨护</span></div>
<div>
- <el-form-item label-width="0">
- <el-row>
+ <el-row>
+ <el-form-item label-width="0">
<el-col :span="7">
<el-select
v-model="queryParams.ColName1"
@@ -104,10 +104,10 @@
class="ForFilteringSchemes"
/>
</el-col>
- </el-row>
- </el-form-item>
- <el-form-item label-width="0">
- <el-row>
+ </el-form-item>
+ </el-row>
+ <el-row>
+ <el-form-item label-width="0">
<el-col :span="7">
<el-select
v-model="queryParams.ColName2"
@@ -149,10 +149,10 @@
class="ForFilteringSchemes"
/>
</el-col>
- </el-row>
- </el-form-item>
- <el-form-item label-width="0">
- <el-row>
+ </el-form-item>
+ </el-row>
+ <el-row>
+ <el-form-item label-width="0">
<el-col :span="7">
<el-select
v-model="queryParams.ColName"
@@ -192,8 +192,8 @@
class="ForFilteringSchemes"
/>
</el-col>
- </el-row>
- </el-form-item>
+ </el-form-item>
+ </el-row>
</div>
</el-card>
</el-collapse-item>
@@ -248,12 +248,12 @@
>闅愯棌鍒楄缃�</el-button
>
</el-col>
- <el-col :span="1.5">
+ <el-col :span="1.5" class="zy-hidden">
<el-button type="primary" icon="el-icon-help" size="mini" @click="handleSearch"
>鎼� 绱�</el-button
>
</el-col>
- <el-col :span="1.5">
+ <el-col :span="1.5" class="zy-hidden">
<el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery"
>閲� 缃�</el-button
>
@@ -303,8 +303,8 @@
<el-button
type="text"
@click="handleEdit(row, (OperationType = 3))"
- v-else-if="column.property == '鍗曟嵁鍙�'"
- >{{ row.鍗曟嵁鍙� }}</el-button
+ v-else-if="column.property == '浠撲綅浠ｇ爜'"
+ >{{ row.浠撲綅浠ｇ爜 }}</el-button
>
<span v-else>{{ row[column.label] }}</span>
</div>
@@ -341,6 +341,7 @@
append-to-body
class="xsckdBox"
:before-close="close"
+ @close="beforeEditCloseHandler"
>
<edit
:OperationType="OperationType"
@@ -349,6 +350,7 @@
:copyType="copyType"
@editCloseGy="editGyClose"
v-if="editShow"
+ ref="editRef"
/>
</el-dialog>
<el-dialog
@@ -426,6 +428,8 @@
},
data() {
return {
+ editRef: null,
+ activeSeach: "",
HModName: "Gy_Warehouse",
editShow: false,
openEdit: false,
@@ -479,7 +483,7 @@
openData: false, //鏁版嵁寮圭獥
dialogTitle: "",
zuzhiId: "",
- organizationList: [], //缁勭粐鍒楄〃
+ organizationList: JSON.parse(sessionStorage["organizationList"]), //缁勭粐鍒楄〃
subDisabled: false, //缂栬緫椤甸潰淇濆瓨鎸夐挳鏄惁绂佺敤(true绂佺敤锛宖alse鍙敤)
OperationType: null, //淇濆瓨绫诲瀷锛堟柊澧�1淇敼3锛�
HInterID: null,
@@ -503,7 +507,7 @@
dateRange: [],
// 鏌ヨ鍙傛暟
queryParams: {
- HOrgID: null,
+ HOrgID: sessionStorage["OrganizationID"],
HName: null,
HNumber: null,
Comparator1: "",
@@ -528,7 +532,7 @@
btResList: [],
tableData: [], //閿�鍞嚭搴撳垪琛�(鍒嗛〉鏄剧ず)
dataList: [],
- titleData: ["HItemID", "HParentID"], //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ titleData: ["HItemID", "HParentID", "閫夋嫨"], //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
pageSizes: [50, 100, 500, 5000, 50000],
page: 1,
pageSize: 50,
@@ -566,10 +570,13 @@
};
},
created() {
- this.fetchData();
+ this.handleQuery();
this.riqiChange();
},
methods: {
+ beforeEditCloseHandler() {
+ this.$refs.editRef.close();
+ },
// 浠撲綅鍚屾(API涓殏鏃舵病鏈夊搴旂殑API)
async handleSync() {
try {
@@ -743,11 +750,10 @@
this.sWhere += "";
//浠撲綅鍒楄〃
axios
- .get(this.baseURL + "/Gy_StockPlace/list1page", {
+ .get(this.baseURL + "/Gy_StockPlace/list2Page", {
params: {
sWhere: `${this.sWhere}`,
user: this.user,
- Organization: "娴欐睙鏅轰簯杩堟��",
page: this.page,
size: this.pageSize,
},
@@ -1099,8 +1105,10 @@
if (this.queryParams.HName) {
this.sWhere += " and 浠撲綅鍚嶇О like '%" + this.queryParams.HName + "%'";
}
- if (this.queryParams.HOrgName) {
- this.sWhere += " and 缁勭粐鍚嶇О = '" + this.queryParams.HOrgName + "'";
+ if (this.queryParams.HOrgID) {
+ let OrgName = this.organizationList.find((e) => e.ID == this.queryParams.HOrgID)
+ ?.Name;
+ this.sWhere += " and 缁勭粐鍚嶇О = '" + OrgName + "'";
}
// this.sWhere += this.addSWhereByOpenType()
// this.sWhere += this.getOrgIDByUser()
@@ -1342,4 +1350,7 @@
flex-direction: row;
width: 60%;
}
+.zy-hidden {
+ display: none;
+}
</style>
diff --git a/src/views/basic/gyStockPlace/gyStockPlaceEdit.vue b/src/views/basic/gyStockPlace/gyStockPlaceEdit.vue
index 5e98170..dbf6696 100644
--- a/src/views/basic/gyStockPlace/gyStockPlaceEdit.vue
+++ b/src/views/basic/gyStockPlace/gyStockPlaceEdit.vue
@@ -12,17 +12,17 @@
<el-row>
<el-col :span="8">
<el-form-item label="浠撲綅浠ｇ爜" prop="HNumber">
- <el-input v-model="form.HNumber" placeholder="璇疯緭鍏ヤ粨搴撲唬鐮�" />
+ <el-input v-model="form.HNumber" placeholder="璇疯緭鍏ヤ粨浣嶄唬鐮�" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="浠撲綅鍚嶇О" prop="HName">
- <el-input v-model="form.HName" placeholder="璇疯緭鍏ヤ粨搴撳悕绉�" />
+ <el-input v-model="form.HName" placeholder="璇疯緭鍏ヤ粨浣嶅悕绉�" />
</el-form-item>
</el-col>
<el-col :span="8">
- <el-form-item label="鎵�灞炰粨浣�" prop="HSPGroupName" class="form-inline">
- <el-input disabled v-model="form.HSPGroupName" placeholder="璇烽�夋嫨浠撲綅">
+ <el-form-item label="鎵�灞炰粨搴�" prop="HSPGroupName" class="form-inline">
+ <el-input disabled v-model="form.HSPGroupName" placeholder="璇烽�夋嫨浠撳簱">
</el-input>
<el-button icon="el-icon-search" @click="openDataDialog(1)"></el-button>
</el-form-item>
@@ -48,12 +48,12 @@
</el-col>
<el-col :span="8">
<el-form-item label="鍔╄鐮�" prop="HHelpCode">
- <el-input v-model="form.HAddress" placeholder="璇疯緭鍏ュ姪璁扮爜" />
+ <el-input v-model="form.HHelpCode" placeholder="璇疯緭鍏ュ姪璁扮爜" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="澶囨敞" prop="HRemark">
- <el-input v-model="form.HPhone" placeholder="璇疯緭鍏ュ娉�" />
+ <el-input v-model="form.HRemark" placeholder="璇疯緭鍏ュ娉�" />
</el-form-item>
</el-col>
</el-row>
@@ -73,17 +73,26 @@
</el-tab-pane>
</el-tabs>
</el-form>
- <!-- 閮ㄩ棬寮圭獥 -->
+ <!-- 閫夋嫨寮圭獥 -->
<el-dialog
:title="dialogTitle"
:visible.sync="openData"
width="1280px"
append-to-body
>
- <Dept @deptEmitDb="dbEmitData" @deptEmit="emitData" v-if="deptShow" />
+ <!-- <Dept @deptEmitDb="dbEmitData" @deptEmit="emitData" v-if="deptShow" />
<Warehouse @deptEmitDb="dbEmitData" @deptEmit="emitData" v-if="warehouseShow" />
<Material @deptEmitDb="dbEmitData" @deptEmit="emitData" v-if="materialShow" />
- <GyWorkCenter @deptEmitDb="dbEmitData" @deptEmit="emitData" v-if="workCenterShow" />
+ <GyWorkCenter @deptEmitDb="dbEmitData" @deptEmit="emitData" v-if="workCenterShow" /> -->
+ <div style="height: 60vh" v-if="openData">
+ <iframe
+ :src="iframeUrl"
+ frameborder="0"
+ width="100%"
+ height="100%"
+ ref="iframeInstance"
+ ></iframe>
+ </div>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="deptClickSub">纭� 瀹�</el-button>
<el-button @click="deptClose">鍙� 娑�</el-button>
@@ -114,6 +123,9 @@
},
data() {
return {
+ dialogEnabledNum: -1,
+ iframeInstance: null,
+ iframeUrl: "",
formShow: false,
temp: undefined,
formLoading: true,
@@ -187,9 +199,22 @@
this.reset();
this.fetchData();
},
+ mounted() {
+ window.iframeWareHouseCallBack = (info) => {
+ console.log(info);
+ // 鍥炶皟璧嬪��
+ this.form.HSPGroupName = info["浠撳簱鍚嶇О"];
+ this.form.HSPGroupID = info["HSPGroupID"];
+ // 鍏抽棴寮圭獥
+ this.deptClose();
+ };
+ },
activated() {
this.reset();
this.fetchData();
+ },
+ beforeDestroy() {
+ delete window.iframeWareHouseCallBack;
},
methods: {
fetchData() {
@@ -235,18 +260,21 @@
if (result.code == 1) {
// 璇存槑楠岃瘉鎴愬姛浜嗭紝
var data = result.data[0];
+ this.form = {
+ ...{
+ HUSEORGID: data.HUSEORGID,
+ HItemID: data.HMainID,
+ HNumber: data.浠撲綅浠ｇ爜,
+ HName: data.浠撲綅鍚嶇О,
+ HHelpCode: data.鍔╄鐮�,
+ HRemark: data.澶囨敞,
+ HSPGroupID: data.HSPGroupID,
+ HSPGroupName: data.鎵�灞炰粨浣�,
+ HStopflag: data.绂佺敤鏍囪 == "Y" ? true : false,
+ HStandard: data.榛樿浠撲綅 == "Y" ? true : false,
+ },
+ };
- Object.assign(this.form, {
- HItemID: data.HMainID,
- HNumber: data.浠撲綅浠ｇ爜,
- HName: data.浠撲綅鍚嶇О,
- HHelpCode: data.鍔╄鐮�,
- HRemark: data.澶囨敞,
- HSPGroupID: data.HSPGroupID,
- HSPGroupName: data.鎵�灞炰粨浣�,
- HStopflag: data.绂佺敤鏍囪 == "Y" ? true : false,
- HStandard: data.榛樿浠撲綅 == "Y" ? true : false,
- });
if (!data.HCheckEmp) {
this.CheckBillDisabled = false;
}
@@ -299,8 +327,19 @@
this.deptform = deptRow;
},
deptClickSub() {
- this.dbEmitData(this.deptform, this.dialogTypeNum);
- this.deptform = {};
+ // this.dbEmitData(this.deptform, this.dialogTypeNum);
+ // this.deptform = {};
+ // 浠庢墦寮�鐨刬frame涓幏鍙栭�変腑鏁版嵁
+ let selectedRow = this.$refs.iframeInstance.contentWindow.selectedRow;
+ console.log(selectedRow);
+ if (this.dialogEnabledNum == 1) {
+ // 淇敼閫変腑浠撳簱鏁版嵁
+ this.form.HSPGroupName = selectedRow["浠撳簱鍚嶇О"];
+ this.form.HSPGroupID = selectedRow["HSPGroupID"];
+ }
+
+ selectedRow = null; // 鎵嬪姩缃┖锛屾柟渚縂C鍥炴敹锛岄槻姝㈡硠闇�
+ this.deptClose();
},
deptClose() {
this.deptform = {};
@@ -461,12 +500,14 @@
},
// 鎵撳紑鏁版嵁鍒楄〃寮圭獥
openDataDialog(num, row) {
+ this.dialogEnabledNum = num;
if (row) {
this.zbIndex = row.index - 1;
}
this.showReset();
if (num == 1) {
- this.dialogTitle = "浠撲綅鍒楄〃";
+ this.iframeUrl = "/iframe/GyWarehouse";
+ this.dialogTitle = "浠撳簱鍒楄〃";
this.warehouseShow = true;
this.openData = true;
}
diff --git a/src/views/basic/gyWarehouse/gyWarehouse.vue b/src/views/basic/gyWarehouse/gyWarehouse.vue
index 0b94dff..073dea0 100644
--- a/src/views/basic/gyWarehouse/gyWarehouse.vue
+++ b/src/views/basic/gyWarehouse/gyWarehouse.vue
@@ -1,61 +1,31 @@
<template>
- <div style="padding: 10px;position: relative;">
- <el-form
- :model="queryParams"
- ref="queryForm"
- label-width="98px"
- :inline="true"
- class="searchBox"
- >
+ <div style="padding: 10px; position: relative;">
+ <el-form :model="queryParams" ref="queryForm" label-width="98px" :inline="true" class="searchBox">
<el-row>
<el-form-item label="浠撳簱浠ｇ爜" prop="HNumber" style="padding-left: 100px">
- <el-input
- v-model="queryParams.HNumber"
- placeholder="璇疯緭鍏ヤ粨搴撲唬鐮�"
- @keyup.enter.native="handleQuery"
- class="ForFilteringSchemes"
- />
+ <el-input v-model="queryParams.HNumber" placeholder="璇疯緭鍏ヤ粨搴撲唬鐮�" @keyup.enter.native="handleQuery"
+ class="ForFilteringSchemes" />
</el-form-item>
<el-form-item label="浠撳簱鍚嶇О" prop="HName">
- <el-input
- v-model="queryParams.HName"
- placeholder="璇疯緭鍏ヤ粨搴撳悕绉�"
- @keyup.enter.native="handleQuery"
- class="ForFilteringSchemes"
- />
+ <el-input v-model="queryParams.HName" placeholder="璇疯緭鍏ヤ粨搴撳悕绉�" @keyup.enter.native="handleQuery"
+ class="ForFilteringSchemes" />
</el-form-item>
<el-form-item label="缁勭粐">
- <el-select
- v-model="queryParams.HOrgName"
- placeholder="璇烽�夋嫨"
- class="ForFilteringSchemes"
- >
- <el-option
- v-for="(item, index) in organizationList"
- :key="index"
- :label="item.Name"
- :value="item.Name"
- >
+ <el-select v-model="queryParams.HOrgName" placeholder="璇烽�夋嫨" class="ForFilteringSchemes">
+ <el-option v-for="(item, index) in organizationList" :key="index" :label="item.Name" :value="item.Name">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="鍚屾" :inline="true">
- <el-input
- v-model="queryParams.HSyncNumber"
- placeholder="璇疯緭鍏ヤ粨搴撲唬鐮�"
- @keyup.enter.native="handleSync"
- >
+ <el-input v-model="queryParams.HSyncNumber" placeholder="璇疯緭鍏ヤ粨搴撲唬鐮�" @keyup.enter.native="handleSync">
<el-button slot="append" type="primary" @click="handleSync">鍚屾</el-button>
</el-input>
</el-form-item>
</el-row>
<el-form-item label-width="78px">
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">
- 鎼� 绱�</el-button
- >
- <el-button icon="el-icon-circle-close" size="mini" @click="searchOpen = false"
- >鍙� 娑�</el-button
- >
+ 鎼� 绱�</el-button>
+ <el-button icon="el-icon-circle-close" size="mini" @click="searchOpen = false">鍙� 娑�</el-button>
</el-form-item>
<el-collapse v-model="activeSeach">
<el-collapse-item title="鏇村" name="1">
@@ -65,132 +35,69 @@
<el-form-item label-width="0">
<el-row>
<el-col :span="7">
- <el-select
- v-model="queryParams.ColName1"
- placeholder="璇烽�夋嫨"
- @change="riqiChange"
- class="ForFilteringSchemes"
- >
+ <el-select v-model="queryParams.ColName1" 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>
+ <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"
- class="ForFilteringSchemes"
- >
- <el-option
- v-for="(item, index) in comparatorList"
- :key="index"
- :label="item.label"
- :value="item.value"
- ></el-option>
+ <el-select v-model="queryParams.Comparator1" placeholder="璇烽�夋嫨" @change="riqiChange"
+ class="ForFilteringSchemes">
+ <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"
- class="ForFilteringSchemes"
- />
+ <el-input v-model="queryParams.ColContent1" placeholder="璇疯緭鍏�" clearable
+ @keyup.enter.native="handleQuery" class="ForFilteringSchemes" />
</el-col>
</el-row>
</el-form-item>
<el-form-item label-width="0">
<el-row>
<el-col :span="7">
- <el-select
- v-model="queryParams.ColName2"
- placeholder="璇烽�夋嫨"
- @change="riqiChange"
- class="ForFilteringSchemes"
- >
+ <el-select v-model="queryParams.ColName2" 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>
+ <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"
- class="ForFilteringSchemes"
- >
+ <el-select v-model="queryParams.Comparator2" placeholder="璇烽�夋嫨" @change="riqiChange"
+ class="ForFilteringSchemes">
<span v-for="(item, index) in comparatorList" :key="index">
- <el-option
- :label="item.label"
- :value="item.value"
- v-if="!item.hide"
- ></el-option>
+ <el-option :label="item.label" :value="item.value" v-if="!item.hide"></el-option>
</span>
</el-select>
</el-col>
<el-col :span="11">
- <el-input
- v-model="queryParams.ColContent2"
- placeholder="璇疯緭鍏�"
- clearable
- @keyup.enter.native="handleQuery"
- class="ForFilteringSchemes"
- />
+ <el-input v-model="queryParams.ColContent2" placeholder="璇疯緭鍏�" clearable
+ @keyup.enter.native="handleQuery" class="ForFilteringSchemes" />
</el-col>
</el-row>
</el-form-item>
<el-form-item label-width="0">
<el-row>
<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>
+ <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>
</el-select>
</el-col>
<el-col :span="6" style="padding: 0 10px">
- <el-select
- v-model="queryParams.Comparator"
- placeholder="璇烽�夋嫨"
- @change="riqiChange"
- class="ForFilteringSchemes"
- >
- <el-option
- v-for="(item, index) in comparatorList"
- :key="index"
- :label="item.label"
- :value="item.value"
- ></el-option>
+ <el-select v-model="queryParams.Comparator" placeholder="璇烽�夋嫨" @change="riqiChange"
+ class="ForFilteringSchemes">
+ <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"
- class="ForFilteringSchemes"
- />
+ <el-input v-model="queryParams.ColContent" placeholder="璇疯緭鍏�" clearable
+ @keyup.enter.native="handleQuery" class="ForFilteringSchemes" />
</el-col>
</el-row>
</el-form-item>
@@ -202,158 +109,64 @@
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
- <el-button
- type="primary"
- icon="el-icon-download"
- size="mini"
- @click="handleImport"
- >瀵煎叆</el-button
- >
+ <el-button type="primary" icon="el-icon-download" size="mini" @click="handleImport">瀵煎叆</el-button>
</el-col>
<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-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-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-edit"
- size="mini"
- :disabled="single"
- @click="handleEdit((row = rowForm), (OperationType = 2))"
- >澶嶅埗</el-button
- >
+ <el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single"
+ @click="handleEdit((row = rowForm), (OperationType = 2))">澶嶅埗</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 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"
- size="mini"
- :disabled="single"
- @click="set_CheckBill(0, (form = rowForm))"
- >瀹℃牳</el-button
- >
+ <el-button type="primary" icon="el-icon-edit" 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"
- size="mini"
- :disabled="single"
- @click="set_CheckBill(1, (form = rowForm))"
- >杩斿鏍�</el-button
- >
+ <el-button type="primary" icon="el-icon-edit" 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"
- size="mini"
- :disabled="single"
- @click="set_De_Stop(0, (form = rowForm))"
- >绂佺敤</el-button
- >
+ <el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single"
+ @click="set_De_Stop(0, (form = rowForm))">绂佺敤</el-button>
</el-col>
<el-col :span="1.5">
- <el-button
- type="primary"
- icon="el-icon-edit"
- size="mini"
- :disabled="single"
- @click="set_De_Stop(1, (form = rowForm))"
- >鍙嶇鐢�</el-button
- >
+ <el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single"
+ @click="set_De_Stop(1, (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
- >
+ <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-download"
- size="mini"
- @click="handleRowHide"
- >闅愯棌鍒楄缃�</el-button
- >
+ <el-button type="primary" icon="el-icon-download" size="mini" @click="handleRowHide">闅愯棌鍒楄缃�</el-button>
</el-col>
- <el-col :span="1.5">
- <el-button type="primary" icon="el-icon-help" size="mini" @click="handleSearch"
- >鎼� 绱�</el-button
- >
+ <el-col :span="1.5" class="zy-hidden">
+ <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 :span="1.5" class="zy-hidden">
+ <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery">閲� 缃�</el-button>
</el-col>
<!-- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> -->
</el-row>
<div class="tableBox" v-loading="loading">
- <el-table
- :data="tableData"
- ref="tableData"
- max-height="750"
- :summary-method="getSummaries"
- @selection-change="handleSelectionChange"
- show-summary
- border
- @row-click="handleRowClick"
- :row-style="rowStyle"
- @cell-dblclick="handleDblclick"
- v-if="tableShow"
- >
+ <el-table :data="tableData" ref="tableData" max-height="750" :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.sorderid"
- v-else-if="!item.hide && item.type != 'checkbox'"
- :sortable="item.sort"
- show-overflow-tooltip
- :fixed="item.fixed"
- >
+ <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.sorderid" 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">
@@ -363,8 +176,8 @@
<el-button
type="text"
@click="handleEdit(row, (OperationType = 3))"
- v-else-if="column.property == '鍗曟嵁鍙�'"
- >{{ row.鍗曟嵁鍙� }}</el-button
+ v-else-if="column.property == '浠撳簱浠ｇ爜'"
+ >{{ row.浠撳簱浠ｇ爜 }}</el-button
>
<span v-else>{{ row[column.label] }}</span>
</div>
@@ -372,26 +185,10 @@
</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"
- />
+ <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
@@ -401,6 +198,7 @@
append-to-body
class="xsckdBox"
:before-close="close"
+ @close="editBeforeCloseHandle"
>
<edit
:OperationType="OperationType"
@@ -409,39 +207,23 @@
:copyType="copyType"
@editCloseGy="editGyClose"
v-if="editShow"
+ ref="editRef"
/>
</el-dialog>
- <el-dialog
- :title="upload.title"
- :visible.sync="upload.open"
- width="1500px"
- append-to-body
- >
+ <el-dialog :title="upload.title" :visible.sync="upload.open" width="1500px" append-to-body>
<div style="margin-top: -20px">
<el-button type="primary" @click="set_AddNew">瀵煎叆鏁版嵁</el-button>
<el-button type="primary" @click="upload.open = false">閫� 鍑�</el-button>
- <el-upload
- ref="upload"
- :limit="1"
- accept=".xlsx, .xls"
- style="display: inline-block; margin-left: 10px"
- :action="upload.url + '?updateSupport=' + upload.updateSupport"
- :disabled="upload.isUploading"
- :on-progress="handleFileUploadProgress"
- :on-success="handleFileSuccess"
- >
+ <el-upload ref="upload" :limit="1" accept=".xlsx, .xls" style="display: inline-block; margin-left: 10px"
+ :action="upload.url + '?updateSupport=' + upload.updateSupport" :disabled="upload.isUploading"
+ :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess">
<el-button type="primary">鏂囦欢涓婁紶</el-button>
</el-upload>
</div>
- <el-table
- :data="uploadData"
- v-loading="uploadTableLoading"
- :row-class-name="uploadDataIndex"
- border
- height="550"
- >
+ <el-table :data="uploadData" v-loading="uploadTableLoading" :row-class-name="uploadDataIndex" border
+ height="550">
<el-table-column type="index" label="搴忓彿" width="55" align="center" />
- <el-table-column label="浠撳簱浠ｇ爜" prop="浠撳簱浠ｇ爜" align="center" width="120" />
+ <el-table-column label="浠撳簱浠ｇ爜" align="center" width="120" />
<el-table-column label="浠撳簱鍚嶇О" prop="浠撳簱鍚嶇О" align="center" width="120" />
<el-table-column label="鑱旂郴鐢佃瘽" prop="鑱旂郴鐢佃瘽" align="center" width="120" />
<el-table-column label="鑱屽憳浠ｇ爜" prop="鑱屽憳浠ｇ爜" align="center" width="120" />
@@ -449,24 +231,13 @@
<el-table-column label="澶囨敞" prop="澶囨敞" align="center" width="120" />
<el-table-column label="鎿嶄綔" align="center">
<template slot-scope="scope">
- <el-button
- size="mini"
- type="text"
- icon="el-icon-delete"
- @click="uploadDataDelete(scope.row)"
- >鍒犻櫎</el-button
- >
+ <el-button size="mini" type="text" icon="el-icon-delete"
+ @click="uploadDataDelete(scope.row)">鍒犻櫎</el-button>
</template>
</el-table-column>
</el-table>
- <pagination
- v-show="uploadTotal > 0"
- :total="uploadTotal"
- :page.sync="uploadPage"
- :limit.sync="uploadPageSize"
- :pageSizes="uploadPageSizes"
- @pagination="currentPage"
- />
+ <pagination v-show="uploadTotal > 0" :total="uploadTotal" :page.sync="uploadPage" :limit.sync="uploadPageSize"
+ :pageSizes="uploadPageSizes" @pagination="currentPage" />
</el-dialog>
</div>
</div>
@@ -486,7 +257,10 @@
},
data() {
return {
+ editRef: null,
+ activeSeach: "",
HModName: "Gy_Warehouse",
+ activeSeach: '',
editShow: false,
openEdit: false,
totalNameList: [],
@@ -630,6 +404,9 @@
this.riqiChange();
},
methods: {
+ editBeforeCloseHandle() {
+ this.$refs.editRef.close();
+ },
// 浠撳簱鍚屾
async handleSync() {
try {
@@ -1048,6 +825,10 @@
handleRowClick(row, column, event) {
this.lastSelectedRow = this.selectedRow; // 璁板綍涓婁竴娆￠�変腑鐨勮
this.selectedRow = row; // 璁板綍褰撳墠閫変腑鐨勮
+ if (this.checkIsIframe) {
+ // 灏嗗綋鍓嶉�変腑鐨勬暟鎹毚闇插埌window涓�
+ window.selectedRow = row;
+ }
this.lastSelectedRowIndex = this.tableData.indexOf(row);
this.$refs.tableData.toggleRowSelection(row);
if (this.openPage) {
@@ -1060,13 +841,25 @@
return { background: "#ecf5ff" };
}
},
+ checkIsIframe() {
+ if (window.self == window.top) {
+ return false;
+ }
+ return true;
+ },
//鍙屽嚮琛�
handleDblclick(row, column, cell, event) {
+ if (this.checkIsIframe) {
+ // IFrame 鍙屽嚮 杩斿洖褰撳墠鍙屽嚮鐨勬暟鎹�
+ window.parent.iframeWareHouseCallBack(row);
+ return;
+ }
this.OperationType = 3;
if (this.openPage) {
this.$emit('deptEmitDb', row, 2)
- } else {
- this.handleEdit();
+ }
+ else {
+ this.handleEdit();
}
},
// 澶氶�夋閫変腑鏁版嵁
@@ -1089,6 +882,7 @@
if (!this.single) {
this.rowForm = selection[0];
}
+ }
}
},
//鎵撳紑渚ц竟鎼滅储寮圭獥
@@ -1249,7 +1043,7 @@
//閫�鍑�
close() {
- this.tableShow = true;
+ this.tableShow = false;
this.openEdit = false;
this.getList();
},
@@ -1299,7 +1093,7 @@
this.$modal.msgError("姝ゆ潯鏁版嵁涓嶆槸鍒涘缓鐘舵��,鏃犳硶鍒犻櫎!");
}
})
- .catch(() => {});
+ .catch(() => { });
},
// 鍙嶅鏍�/瀹℃牳鏁版嵁
set_CheckBill(num, form) {
@@ -1430,7 +1224,7 @@
return deleteList.indexOf(item.index) == -1;
});
})
- .catch(() => {});
+ .catch(() => { });
},
getPage(page, list) {
let sindex = (parseInt(page) - 1) * this.uploadPageSize;
@@ -1453,8 +1247,12 @@
width: 100%;
}
-.form-item-inline > .el-form-item__content {
+.form-item-inline>.el-form-item__content {
display: flex;
flex-direction: row;
}
+
+.zy-hidden {
+ display: none;
+}
</style>
diff --git a/src/views/basic/gyWarehouse/gyWarehouseEdit.vue b/src/views/basic/gyWarehouse/gyWarehouseEdit.vue
index cc6803e..298d2b3 100644
--- a/src/views/basic/gyWarehouse/gyWarehouseEdit.vue
+++ b/src/views/basic/gyWarehouse/gyWarehouseEdit.vue
@@ -47,10 +47,19 @@
<el-form-item label="浠撳簱绫诲瀷" prop="HWarehouseType">
<el-select v-model="form.HWarehouseType" placeholder="璇烽�夋嫨浠撳簱绫诲瀷">
<el-option
- v-for="(item, index) in HWarehouseTypeList"
- :key="index"
- :label="item.Name"
- :value="item.Name"
+ v-for="item in [
+ {
+ label: '鐢熶骇浠撳簱',
+ value: '鐢熶骇浠撳簱',
+ },
+ {
+ label: '妯″叿浠撳簱',
+ value: '妯″叿浠撳簱',
+ },
+ ]"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
>
</el-option>
</el-select>
@@ -265,26 +274,12 @@
ids: [],
// 琛ㄥ崟鍙傛暟
- form: {
- HWarehouseType: "鐢熶骇浠撳簱",
- },
+ form: {},
// 琛ㄥ崟鏍￠獙
rules: {
HNumber: [{ required: true, message: "浠撳簱浠ｇ爜涓嶈兘涓虹┖", trigger: "blur" }],
HName: [{ required: true, message: "浠撳簱鍚嶇О鍚嶇О涓嶈兘涓虹┖", trigger: "blur" }],
- HWarehouseType: [
- { required: true, message: "浠撳簱绫诲瀷涓嶈兘涓虹┖", trigger: "blur" },
- ],
},
-
- HWarehouseTypeList: [
- {
- Name: "鐢熶骇浠撳簱",
- },
- {
- Name: "妯″叿浠撳簱",
- },
- ],
};
},
created() {
@@ -324,7 +319,6 @@
},
getdata() {
this.reset();
- console.log(this.OperationType);
if (this.OperationType != 1) {
this.zzSelDis = true;
axios
@@ -339,52 +333,68 @@
if (result.code == 1) {
// 璇存槑楠岃瘉鎴愬姛浜嗭紝
var data = result.data[0];
-
- Object.assign(this.form, {
- HNumber: data.浠撳簱浠ｇ爜,
- HItemID: data.HItemID,
- HParentID: data.HParentID,
- HShortNumber: data.HNumber,
- HName: data.浠撳簱鍚嶇О,
- HHelpCode: data.HHelpCode,
- HEmpID: data.HEmpID,
- HEmpName: data.HEmpName,
- HAddress: data.浠撳簱鍦板潃,
- HPhone: data.鑱旂郴鐢佃瘽,
- HStopflag: data.绂佺敤鏍囪,
- HStockCtrlFlag: data.璐熷簱瀛樻帶鍒舵爣璁�,
- HSPFlag: data.鍚敤浠撲綅 == "Y" ? 1 : 0,
- HRemark: data.HRemark,
- HWarehouseType: data.浠撳簱绫诲瀷,
- //, "HItemID": data.鏉＄爜缂栧彿
- HBarCode: data.HBarCode,
- HUSEORGID: data.HUSEORGID,
- //, "HCreator": data.鍒涘缓浜�
- //, "lngBillKey": data.lngBillKey
- //, "lngBillSubKey": data.lngBillSubKey
- //, "HMaker": data.HMaker
- //, "HCreateDate": data.鍒涘缓鏃ユ湡
- HUpDater: sessionStorage["HUserName"],
- HMakeEmp: data["鍒涘缓浜�"],
- HMakeDate:
- data["鍒涘缓鏃ユ湡"] == null
- ? ""
- : dayjs(new Date(data["鍒涘缓鏃ユ湡"])).format("yyyy-MM-dd"),
- HCheckEmp: data["瀹℃牳浜�"],
- HCheckDate:
- data["瀹℃牳鏃ユ湡"] == null
- ? ""
- : dayjs(new Date(data["瀹℃牳鏃ユ湡"])).format("yyyy-MM-dd"),
- HStopEmp: data["绂佺敤浜�"],
- HStopDate:
- data["绂佺敤鏃ユ湡"] == null
- ? ""
- : dayjs(new Date(data["绂佺敤鏃ユ湡"])).format("yyyy-MM-dd"),
- });
+ // 浣跨敤 Object.assign 涓㈠け鍝嶅簲寮� 鏀逛负浣跨敤 this.form = {...{}}
+ this.form = {
+ ...{
+ HNumber: data.浠撳簱浠ｇ爜,
+ HItemID: data.HItemID,
+ HParentID: data.HParentID,
+ HShortNumber: data.HNumber,
+ HName: data.浠撳簱鍚嶇О,
+ HHelpCode: data.HHelpCode,
+ HEmpID: data.HEmpID,
+ HEmpName: data.HEmpName,
+ HAddress: data.浠撳簱鍦板潃,
+ HPhone: data.鑱旂郴鐢佃瘽,
+ HStopflag: data.绂佺敤鏍囪 == "true",
+ HStockCtrlFlag: data.璐熷簱瀛樻帶鍒舵爣璁� == "true",
+ HSPFlag: data.鍚敤浠撲綅 == "Y" ? true : false,
+ HRemark: data.HRemark,
+ HWarehouseType: data.浠撳簱绫诲瀷,
+ //, "HItemID": data.鏉＄爜缂栧彿
+ HBarCode: data.HBarCode,
+ HUSEORGID: data.HUSEORGID,
+ //, "HCreator": data.鍒涘缓浜�
+ //, "lngBillKey": data.lngBillKey
+ //, "lngBillSubKey": data.lngBillSubKey
+ //, "HMaker": data.HMaker
+ //, "HCreateDate": data.鍒涘缓鏃ユ湡
+ HUpDater: sessionStorage["HUserName"],
+ HMakeEmp: data["鍒涘缓浜�"],
+ HMakeDate:
+ data["鍒涘缓鏃ユ湡"] == null
+ ? ""
+ : dayjs(new Date(data["鍒涘缓鏃ユ湡"])).format("yyyy-MM-dd"),
+ HCheckEmp: data["瀹℃牳浜�"],
+ HCheckDate:
+ data["瀹℃牳鏃ユ湡"] == null
+ ? ""
+ : dayjs(new Date(data["瀹℃牳鏃ユ湡"])).format("yyyy-MM-dd"),
+ HStopEmp: data["绂佺敤浜�"],
+ HStopDate:
+ data["绂佺敤鏃ユ湡"] == null
+ ? ""
+ : dayjs(new Date(data["绂佺敤鏃ユ湡"])).format("yyyy-MM-dd"),
+ },
+ };
if (!data.HCheckEmp) {
this.CheckBillDisabled = false;
}
}
+
+ if (this.OperationType == 2) {
+ // 澶嶅埗
+ Object.assign(this.form, {
+ HItemID: 0,
+ HMakeEmp: sessionStorage["HUserName"],
+ HMakeDate: dayjs(new Date()).format("YYYY-MM-DD"),
+ HCheckEmp: "",
+ HCheckDate: "",
+ HStopEmp: "",
+ HStopDate: "",
+ });
+ }
+
this.$nextTick(() => {
this.formShow = true;
this.formLoading = false;
diff --git a/src/views/basic/production/gySource.vue b/src/views/basic/production/gySource.vue
index 5d2cabe..81f4bca 100644
--- a/src/views/basic/production/gySource.vue
+++ b/src/views/basic/production/gySource.vue
@@ -1,5 +1,5 @@
<template>
- <div style="padding: 10px;">
+ <div style="padding: 10px; position: relative;">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="98px" class="searchBox">
<el-row>
<el-form-item label="鐢熶骇璧勬簮浠ｇ爜" prop="HNumber" style="margin-left: 100px;">
@@ -168,8 +168,7 @@
<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">
+ <el-dialog title="缂栬緫鐢熶骇璧勬枡" :visible.sync="openEdit" width="1480px" append-to-body class="xsckdBox" @close="close">
<edit :OperationType=OperationType :linterid=this.rowForm.HItemID :HSouceBillType=this.rowForm.HSourceBillType
:copyType="copyType" @editCloseGy="editGyClose" v-if="editShow" />
</el-dialog>
@@ -268,7 +267,7 @@
open: false,
// 鏌ヨ鍙傛暟
queryParams: {
- HOrgID: null,
+ HOrgID: sessionStorage["OrganizationID"] - 0,
HName: null,
HNumber: null,
Comparator1: '',
@@ -387,7 +386,6 @@
if (this.pageSize == 0) {
this.pageSize = 50
}
- this.queryParams.HOrgID = sessionStorage["OrganizationID"]-0
this.sWhere += " and HUSEORGID = '" + this.queryParams.HOrgID + "'"
//鐢熶骇璧勬枡鍒楄〃
axios.get(this.baseURL + '/Gy_Source/list_byPage', {
@@ -603,6 +601,9 @@
this.selectedRow = row; // 璁板綍褰撳墠閫変腑鐨勮
this.lastSelectedRowIndex = this.tableData.indexOf(row);
this.$refs.tableData.toggleRowSelection(row);
+ if (this.openPage) {
+ this.$emit('deptEmit', row, 5)
+ }
},
//閫変腑琛岄珮浜牱寮�
rowStyle({ row, rowIndex }) {
@@ -613,16 +614,31 @@
//鍙屽嚮琛�
handleDblclick(row, column, cell, event) {
this.OperationType = 3
- this.handleEdit()
+ if (this.openPage) {
+ this.$emit('deptEmitDb', row, 5)
+ } else {
+ this.handleEdit();
+ }
},
// 澶氶�夋閫変腑鏁版嵁
handleSelectionChange(selection) {
// this.rowForm = {}
- this.ids = selection.map(item => item.HItemID)
- 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]
+ } else {
+ this.ids = selection.map(item => item.HItemID)
+ this.single = selection.length != 1
+ this.multiple = !selection.length
+ if (!this.single) {
+ this.rowForm = selection[0]
+ }
}
},
/** 鎼滅储鎸夐挳鎿嶄綔 */
@@ -762,7 +778,7 @@
close() {
this.tableShow = true
this.openEdit = false
- this.editShow= false
+ this.editShow = false
this.getList()
},
//鎵撳紑鏂板缁勪欢寮圭獥
diff --git a/src/views/component/employee/index.vue b/src/views/component/employee/index.vue
index c6708a4..09d20b7 100644
--- a/src/views/component/employee/index.vue
+++ b/src/views/component/employee/index.vue
@@ -48,7 +48,7 @@
subDisabled: false, //缂栬緫椤甸潰淇濆瓨鎸夐挳鏄惁绂佺敤(true绂佺敤锛宖alse鍙敤)
OperationType: null, //淇濆瓨绫诲瀷锛堟柊澧�1淇敼3锛�
HInterID: null,
- baseURL: "http://47.96.97.237/API",
+ baseURL: process.env.VUE_APP_BASE_API || "http://47.96.97.237/API/",
user: "admin",
currentRow: [],
lastSelectedRowIndex: null, // 鐢ㄤ簬璁板綍涓婃鐐瑰嚮鐨勮绱㈠紩
@@ -106,7 +106,7 @@
let sWhere = "";
this.loading = true;
axios
- .get(process.env.VUE_APP_BASE_URL + "/Gy_Employee/list", {
+ .get(this.baseURL + "/Gy_Employee/list", {
params: { sWhere: sWhere, user: this.user, Organization: "娴欐睙鏅轰簯杩堟��" },
})
.then((response) => {
diff --git a/src/views/purchase/cgPoInStockBill/cgPoInStockBill.vue b/src/views/purchase/cgPoInStockBill/cgPoInStockBill.vue
index 4383b6f..266b2ed 100644
--- a/src/views/purchase/cgPoInStockBill/cgPoInStockBill.vue
+++ b/src/views/purchase/cgPoInStockBill/cgPoInStockBill.vue
@@ -9,15 +9,23 @@
class="searchBox"
>
<el-row>
- <el-form-item label="鏃ユ湡" style="margin-left: 100px">
+ <el-form-item label="寮�濮嬫棩鏈�" style="margin-left: 100px">
<el-date-picker
- v-model="dateRange"
- value-format="yyyy-MM-dd"
- type="daterange"
- range-separator="-"
- start-placeholder="寮�濮嬫棩鏈�"
- end-placeholder="缁撴潫鏃ユ湡"
- ></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
@@ -482,14 +490,14 @@
</el-dialog>
<!-- 缂栬緫 -->
<el-dialog
- title="缂栬緫鑱屽憳"
+ title="缂栬緫鏀舵枡閫氱煡鍗�"
:visible.sync="openEdit"
width="1480px"
append-to-body
class="xsckdBox"
:before-close="close"
>
- <edit
+ <!-- <edit
:OperationType="OperationType"
:linterid="this.rowForm.HItemID"
:HSouceBillType="this.rowForm.HSourceBillType"
@@ -497,7 +505,10 @@
:copyType="copyType"
@editCloseGy="editGyClose"
v-if="editShow"
- />
+ /> -->
+ <div style="height: 80vh" v-if="openEdit">
+ <iframe :src="iframeUrl" frameborder="0" width="100%" height="100%"></iframe>
+ </div>
</el-dialog>
<el-dialog
:title="upload.title"
@@ -604,6 +615,7 @@
},
data() {
return {
+ iframeUrl: "",
activeSeach: "",
dateRange: [],
HModName: "Cg_POOrderBillList",
@@ -759,10 +771,17 @@
},
mounted() {
this.queryParams.HOrgID = sessionStorage["Organization"];
+ window.editGyClose = () => {
+ this.editGyClose(); // 缁勪欢鍐呯殑鏂规硶缁戝畾鍒皐indows
+ };
},
created() {
this.riqiChange();
this.getList();
+ },
+ beforeDestroy() {
+ // 缁勪欢閿�姣佹椂娓呯悊鍏ㄥ眬鏂规硶锛岄伩鍏嶅唴瀛樻硠婕�
+ delete window.editGyClose;
},
methods: {
onDateScanOptionChangerHandler(e) {
@@ -851,7 +870,6 @@
const ddE = String(end.getDate()).padStart(2, "0");
this.sTime = yyyyS + "-" + mmS + "-" + ddS;
this.eTime = yyyyE + "-" + mmE + "-" + ddE;
- this.dateRange = [this.sTime, this.eTime];
},
organizationChange(val) {
// let options=undefined
@@ -897,11 +915,9 @@
this.pageSize = 50;
}
- if (this.dateRange.length > 0) {
- this.sWhere +=
- " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.dateRange[0] + "'";
- this.sWhere +=
- " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + this.dateRange[1] + "'";
+ if (this.sTime && this.eTime) {
+ this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.sTime + "'";
+ this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + this.eTime + "'";
}
try {
let res = await axios.get(this.baseURL + "Cg_POInStockBill/page", {
@@ -1337,7 +1353,7 @@
//鎵撳紑鏂板缁勪欢寮圭獥
handleAddEdit() {
this.rowForm.HItemID = 0;
- this.iframeUrl = `/iframe/XsSeOutStockBackBillEdit?HInterID=${0}&OperationType=${1}©Type=${-1}`;
+ this.iframeUrl = `/iframe/CgPoInStockBillEdit?HInterID=${0}&OperationType=${1}©Type=${-1}`;
this.$nextTick(() => {
this.openEdit = true;
this.editShow = true;
@@ -1345,7 +1361,7 @@
},
//鎵撳紑淇敼缁勪欢寮圭獥
handleEdit(row, OperationType, copyType) {
- this.iframeUrl = `/iframe/XsSeOutStockBackBillEdit?HInterID=${row.hmainid}&OperationType=${OperationType}©Type=${copyType}`;
+ this.iframeUrl = `/iframe/CgPoInStockBillEdit?HInterID=${row.hmainid}&OperationType=${OperationType}©Type=${copyType}`;
this.$nextTick(() => {
this.openEdit = true;
this.editShow = true;
diff --git a/src/views/purchase/cgPoInStockBill/cgPoInStockBillEdit.vue b/src/views/purchase/cgPoInStockBill/cgPoInStockBillEdit.vue
index 5421a43..216921f 100644
--- a/src/views/purchase/cgPoInStockBill/cgPoInStockBillEdit.vue
+++ b/src/views/purchase/cgPoInStockBill/cgPoInStockBillEdit.vue
@@ -35,15 +35,15 @@
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="閲囪喘鍛�" prop="HEmpName">
- <el-input v-model="form.HEmpName" placeholder="璇烽�夋嫨閲囪喘鍛�" disabled>
+ <el-form-item label="涓氬姟鍛�" prop="HEmpName">
+ <el-input v-model="form.HEmpName" placeholder="璇烽�夋嫨涓氬姟鍛�" disabled>
<el-button slot="append" icon="el-icon-search"></el-button>
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="閮ㄩ棬" prop="HDeptName">
- <el-input v-model="form.HCusName" placeholder="璇烽�夋嫨閲囪喘閮ㄩ棬" disabled>
+ <el-input v-model="form.HDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" disabled>
<el-button slot="append" icon="el-icon-search"></el-button>
</el-input>
</el-form-item>
@@ -52,7 +52,7 @@
<el-row>
<el-col :span="6">
<el-form-item label="渚涘簲鍟�" prop="HSupName">
- <el-input v-model="form.HWHName" placeholder="璇烽�夋嫨渚涘簲鍟�" disabled>
+ <el-input v-model="form.HSupName" placeholder="璇烽�夋嫨渚涘簲鍟�" disabled>
<el-button
slot="append"
icon="el-icon-search"
@@ -69,15 +69,13 @@
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="姹囩巼" prop="HRemarHExRatek">
+ <el-form-item label="姹囩巼" prop="HExRate">
<el-input-number v-model="form.HExRate" placeholder="璇疯緭鍏ユ眹鐜�" />
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="鍙戠エ缂栧彿" prop="HWHName">
- <el-input v-model="form.HWHName" placeholder="璇烽�夋嫨浠撳簱">
- <el-button slot="append" icon="el-icon-search"></el-button>
- </el-input>
+ <el-form-item label="鍙戠エ缂栧彿" prop="HInvoiceBillNo">
+ <el-input v-model="form.HInvoiceBillNo" placeholder=""> </el-input>
</el-form-item>
</el-col>
</el-row>
@@ -105,7 +103,12 @@
<el-col :span="6">
<el-form-item label="缁勭粐" prop="HOrgID">
<el-select v-model="form.HOrgID">
- <el-option></el-option>
+ <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>
@@ -281,6 +284,11 @@
<span>{{ scope.row.璁￠噺鍗曚綅 }}</span>
</template>
</el-table-column>
+ <el-table-column align="center" label="鏀舵枡浠撳簱" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.鏀舵枡浠撳簱 }}</span>
+ </template>
+ </el-table-column>
<el-table-column align="center" label="鏁伴噺" width="120">
<template slot-scope="scope">
<span>{{ scope.row.HQty }}</span>
@@ -289,6 +297,16 @@
<el-table-column align="center" label="鍗曚环" width="120">
<template slot-scope="scope">
<span>{{ scope.row.HPrice }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="鍚◣鍗曚环" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.HTaxPrice }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="閲戦" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.HMoney }}</span>
</template>
</el-table-column>
<el-table-column align="center" label="澶囨敞" width="120">
@@ -381,7 +399,7 @@
deptform: {}, //寮圭獥閫変腑鏁版嵁
openData: false, //鏁版嵁寮圭獥
dialogTitle: "",
- organizationList: [], //缁勭粐鍒楄〃
+ organizationList: JSON.parse(sessionStorage["organizationList"]), // 缁勭粐鍒楄〃
subDisabled: false, //缂栬緫椤甸潰淇濆瓨鎸夐挳鏄惁绂佺敤(true绂佺敤锛宖alse鍙敤)
// OperationType: this.$route.query.OperationType,//淇濆瓨绫诲瀷锛堟柊澧�1淇敼3锛�
HInterID: null,
@@ -436,7 +454,7 @@
};
},
created() {
- this.fetchData();
+ // this.fetchData();
this.getdata();
},
beforeDestroy() {
@@ -753,8 +771,11 @@
//閫�鍑�
close() {
this.reset();
-
- if (!this.OperationType2 && !this.copyType) {
+ if (window.self != window.top) {
+ // iframe椤甸潰
+ console.log(window.parent);
+ window.parent.editGyClose();
+ } else if (!this.OperationType2 && !this.copyType) {
// this.$router.back()
window.close();
} else {
@@ -854,7 +875,7 @@
this.reset();
let rowHmainid = this.HInterID2;
axios
- .get(this.baseURL + "/Xs_SeOutStockBill/cx", {
+ .get(this.baseURL + "/Cg_POInStockBill/cx", {
params: { HInterID: rowHmainid },
})
.then((response) => {
@@ -862,49 +883,60 @@
var result = response.data;
var data = response.data.data[0];
this.form.BillType = data.HSourceBillType;
- Object.assign(this.form, {
- HBillNo: data.鍗曟嵁鍙�,
- HInterID: data.hmainid,
- HDate: dayjs(data.鏃ユ湡).format("YYYY-MM-DD"),
- HSeOrderBillNo_M: data.閿�鍞鍗曞彿,
- HEmpID: data.HEmpID,
- HEmpName: data.涓氬姟鍛�,
- HCusID: data.HCusID,
- HCusName: data.瀹㈡埛,
- HWHID: data.涓讳粨搴揑D,
- HWHName: data.涓诲彂璐т粨搴�,
- HAddress: data.浜よ揣鍦板潃,
- HDeptName: data.閮ㄩ棬,
- HDeptID: data.HDeptID,
- HCurID: data.HCurID,
- HCurName: data.甯佸埆,
- HSSID: data.HSSID,
- HSSName: data.缁撶畻鏂瑰紡,
- HExRate: data.姹囩巼,
- HManagerName: data.涓荤,
- HManagerID: data.HManagerID,
- HSourceBillType: data.婧愬崟绫诲瀷,
- HLinkMan: data.鑱旂郴浜�,
- HLinkPhone: data.鑱旂郴鐢佃瘽,
- //, "HConveyCompID": data.杩愯緭鍏徃
- //, "HConveyTypeID": data.杩愯緭鏂瑰紡
- //, "HConveyMoney": data.杩愯垂
- //, "HDFflag": data.鏄惁鍨粯
- HProjectID: data.HProjectID,
- HProjectNumber: data.椤圭洰缂栫爜,
- HProjectName: data.椤圭洰鍚嶇О,
-
- Box2: "",
- HRemark: data.琛ㄥご澶囨敞,
- HMaker: data.鍒跺崟浜�,
- HChecker: data.瀹℃牳浜�,
- HCloseMan: data.鍏抽棴浜�,
- HMakeDate: data.鍒跺崟鏃ユ湡,
- HCheckDate: data.瀹℃牳鏃ユ湡,
- HCloseDate: data.鍏抽棴鏃ユ湡,
- HUpDateDate: data.淇敼鏃ユ湡,
- HDeleteDate: data.浣滃簾鏃ユ湡,
- });
+ this.form = {
+ ...{
+ HBillNo: data.鍗曟嵁鍙�,
+ HDate: dayjs(data.鏃ユ湡),
+ HInnerBillNo: data.鍐呴儴鍗曟嵁鍙�,
+ HEmpID: data.HEmpID,
+ HEmpName: data.涓氬姟鍛�,
+ HSupID: data.HSupID,
+ HSupName: data.渚涘簲鍟�,
+ HWHID: data.涓昏〃浠撳簱ID,
+ HWHName: data.涓昏〃浠撳簱,
+ HCurID: data.HCurID,
+ HCurName: data.甯佸埆,
+ HExRate: data.姹囩巼,
+ HDeptName: data.閮ㄩ棬,
+ HDeptID: data.HDeptID,
+ HManagerName: data.涓荤,
+ HManagerID: data.HManagerID,
+ HSourceBillType: data.婧愬崟绫诲瀷,
+ HAddress: data.浜よ揣鍦扮偣,
+ HExRate: data.姹囩巼,
+ HProjectID: data.HProjectID,
+ HProjectNumber: data.椤圭洰浠ｇ爜,
+ HProjectName: data.椤圭洰鍚嶇О,
+ HInvoiceBillNo: data.鍙戠エ缂栧彿,
+ Box2: "",
+ HRemark: data.琛ㄥご澶囨敞,
+ HMaker: data.鍒跺崟浜�,
+ HChecker: data.瀹℃牳浜�,
+ HCloseMan: data.鍏抽棴浜�,
+ HUpDater: data.淇敼浜�,
+ HDeleteMan: data.浣滃簾浜�,
+ HMakeDate:
+ data.鍒跺崟鏃ユ湡 == null
+ ? ""
+ : dayjs(data.鍒跺崟鏃ユ湡).format("YYYY-MM-DD hh:mm:ss"),
+ HCheckDate:
+ data.瀹℃牳鏃ユ湡 == null
+ ? ""
+ : dayjs(data.瀹℃牳鏃ユ湡).format("YYYY-MM-DD hh:mm:ss"),
+ HCloseDate:
+ data.鍏抽棴鏃ユ湡 == null
+ ? ""
+ : dayjs(data.鍏抽棴鏃ユ湡).format("YYYY-MM-DD hh:mm:ss"),
+ HUpDateDate:
+ data.淇敼鏃ユ湡 == null
+ ? ""
+ : dayjs(data.淇敼鏃ユ湡).format("YYYY-MM-DD hh:mm:ss"),
+ HDeleteDate:
+ data.浣滃簾鏃ユ湡 == null
+ ? ""
+ : dayjs(data.浣滃簾鏃ユ湡).format("YYYY-MM-DD hh:mm:ss"),
+ },
+ };
if (this.copyType == 1) {
this.getHBillNo();
let date = new Date();
@@ -924,7 +956,7 @@
this.form.HCloseDate = data.鍏抽棴鏃ユ湡;
this.form.HDeleteDate = data.浣滃簾鏃ユ湡;
}
- this.getCustomerByCusID(response.data.data[0].HCusID); //鏍规嵁瀹㈡埛鑾峰彇鑱旂郴浜猴紝鑱旂郴浜虹數璇�
+ // this.getCustomerByCusID(response.data.data[0].HCusID); //鏍规嵁瀹㈡埛鑾峰彇鑱旂郴浜猴紝鑱旂郴浜虹數璇�
let subdata = result.data;
for (var i = 0; i < subdata.length; i++) {
this.editData.push({
@@ -935,11 +967,19 @@
HUnitID: subdata[i].HUnitID,
璁￠噺鍗曚綅: subdata[i].璁￠噺鍗曚綅,
HWHID: subdata[i].HWHID,
- 鍙戣揣浠撳簱: subdata[i].鍙戣揣浠撳簱,
+ 鏀舵枡浠撳簱: subdata[i].鏀舵枡浠撳簱,
+ HSPID: subdata[i].HSPID,
+ 浠撲綅鍚嶇О: subdata[i].浠撲綅鍚嶇О,
+ HSecUnitID: subdata[i].HSecUnitID,
+ 杈呭姪鍗曚綅: subdata[i].杈呭姪鍗曚綅,
HQty: subdata[i].鏁伴噺,
- HPrice: subdata[i].鍗曚环,
- HMoney: subdata[i].閲戦,
HRemark: subdata[i].琛ㄤ綋澶囨敞,
+ HPrice: subdata[i].鍗曚环,
+ HTaxPrice: subdata[i].鍚◣鍗曚环,
+ HMoney: subdata[i].閲戦,
+ HDiscountRate: subdata[i].鎶樻墸鐜�,
+ HTaxRate: subdata[i].绋庣巼,
+ HTaxMoney: subdata[i].绋庨,
HSourceBillNo: subdata[i].婧愬崟鍗曞彿, //婧愬崟鍙�
HSourceBillType: subdata[i].婧愬崟绫诲瀷, //婧愬崟绫诲瀷
HSourceInterID: subdata[i].婧愬崟涓诲唴鐮�, //婧愬崟涓诲唴鐮�
@@ -957,23 +997,6 @@
.catch((error) => {
this.$modal.msgError("鎺ュ彛璇锋眰澶辫触! ");
console.error(error);
- });
- },
- //鏍规嵁瀹㈡埛甯﹀嚭鑱旂郴浜恒�佽仈绯荤數璇�
- getCustomerByCusID(HCusID) {
- axios
- .get(this.baseURL + "/Xs_SeOrderBill/getCustomerByCusID", {
- params: {
- HCusID: HCusID,
- },
- })
- .then((response) => {
- this.form.鑱旂郴浜� = response.data.data[0].HLinkMan;
- this.form.鑱旂郴鐢佃瘽 = response.data.data[0].HLinkPhone;
- // this.form = response.data.data[0]
- })
- .catch((error) => {
- this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
});
},
/** 閿�鍞嚭搴撳瓙琛ㄦ槑缁嗗簭鍙� */
diff --git a/src/views/purchase/cgPoOrderBill/cgPoOrderBill.vue b/src/views/purchase/cgPoOrderBill/cgPoOrderBill.vue
index f7d1bf6..c913644 100644
--- a/src/views/purchase/cgPoOrderBill/cgPoOrderBill.vue
+++ b/src/views/purchase/cgPoOrderBill/cgPoOrderBill.vue
@@ -9,15 +9,23 @@
class="searchBox"
>
<el-row>
- <el-form-item label="鏃ユ湡" style="margin-left: 100px">
+ <el-form-item label="寮�濮嬫棩鏈�" style="margin-left: 100px">
<el-date-picker
- v-model="dateRange"
- value-format="yyyy-MM-dd"
- type="daterange"
- range-separator="-"
- start-placeholder="寮�濮嬫棩鏈�"
- end-placeholder="缁撴潫鏃ユ湡"
- ></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
@@ -50,8 +58,8 @@
<el-option
v-for="(item, index) in organizationList"
:key="index"
- :label="item.Name"
- :value="item.ID"
+ :label="item.label"
+ :value="item.value"
>
</el-option>
</el-select>
@@ -264,7 +272,7 @@
icon="el-icon-edit"
size="mini"
:disabled="single"
- @click="handleEdit((row = rowForm), (OperationType = 3))"
+ @click="handleEdit((row = rowForm), (OperationType = 3), (copyType = -1))"
>缂栬緫</el-button
>
</el-col>
@@ -274,7 +282,7 @@
icon="el-icon-edit"
size="mini"
:disabled="single"
- @click="handleEdit((row = rowForm), (OperationType = 2))"
+ @click="handleEdit((row = rowForm), (OperationType = 2), (copyType = 1))"
>澶嶅埗</el-button
>
</el-col>
@@ -463,7 +471,7 @@
}}</span>
<el-button
type="text"
- @click="handleEdit(row, (OperationType = 3))"
+ @click="handleEdit(row, (OperationType = 3), (copyType = 1))"
v-else-if="column.property == '鍗曟嵁鍙�'"
>{{ row.鍗曟嵁鍙� }}</el-button
>
@@ -496,22 +504,16 @@
</el-dialog>
<!-- 缂栬緫 -->
<el-dialog
- title="缂栬緫鑱屽憳"
+ title="缂栬緫閲囪喘璁㈠崟"
:visible.sync="openEdit"
width="1480px"
append-to-body
class="xsckdBox"
:before-close="close"
>
- <edit
- :OperationType="OperationType"
- :linterid="this.rowForm.HItemID"
- :HSouceBillType="this.rowForm.HSourceBillType"
- :HOrgID="this.queryParams.HOrgID"
- :copyType="copyType"
- @editCloseGy="editGyClose"
- v-if="editShow"
- />
+ <div style="height: 80vh" v-if="openEdit">
+ <iframe :src="iframeUrl" frameborder="0" width="100%" height="100%"></iframe>
+ </div>
</el-dialog>
<el-dialog
:title="upload.title"
@@ -618,6 +620,7 @@
},
data() {
return {
+ iframeUrl: "",
activeSeach: "",
HModName: "Cg_POOrderBillList",
editShow: false,
@@ -772,10 +775,16 @@
},
mounted() {
this.queryParams.HOrgID = sessionStorage["Organization"];
+ window.editGyClose = () => {
+ this.editGyClose(); // 缁勪欢鍐呯殑鏂规硶缁戝畾鍒皐indows
+ };
},
created() {
this.riqiChange();
this.getList();
+ },
+ beforeDestory() {
+ delete window.editGyClose;
},
methods: {
onDateScanOptionChangerHandler(e) {
@@ -863,7 +872,6 @@
const ddE = String(end.getDate()).padStart(2, "0");
this.sTime = yyyyS + "-" + mmS + "-" + ddS;
this.eTime = yyyyE + "-" + mmE + "-" + ddE;
- this.dateRange = [this.sTime, this.eTime];
},
organizationChange(val) {
// let options=undefined
@@ -908,11 +916,9 @@
if (this.pageSize == 0) {
this.pageSize = 50;
}
- if (this.dateRange.length > 0) {
- this.sWhere +=
- " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.dateRange[0] + "'";
- this.sWhere +=
- " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + this.dateRange[1] + "'";
+ if (this.sTime) {
+ this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.sTime + "'";
+ this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + this.eTime + "'";
}
// this.sWhere += ` and CONVERT(varchar(100),鏃ユ湡, 23) >= '2020-01-01' and CONVERT(varchar(100),鏃ユ湡, 23) <= '2030-01-01'`;
//鐢熶骇璧勬枡鍒楄〃
@@ -1177,7 +1183,7 @@
//鍙屽嚮琛�
handleDblclick(row, column, cell, event) {
this.OperationType = 3;
- this.handleEdit();
+ this.handleEdit(row, 3, 1);
},
// 澶氶�夋閫変腑鏁版嵁
handleSelectionChange(selection) {
@@ -1366,13 +1372,15 @@
//鎵撳紑鏂板缁勪欢寮圭獥
handleAddEdit() {
this.rowForm.HItemID = 0;
+ this.iframeUrl = `/iframe/CgPoOrderBillEdit?HInterID=${0}&OperationType=${1}©Type=${-1}`;
this.$nextTick(() => {
this.openEdit = true;
this.editShow = true;
});
},
//鎵撳紑淇敼缁勪欢寮圭獥
- handleEdit() {
+ handleEdit(row, OperationType, copyType) {
+ this.iframeUrl = `/iframe/CgPoOrderBillEdit?HInterID=${row.hmainid}&OperationType=${OperationType}©Type=${copyType}`;
this.$nextTick(() => {
this.openEdit = true;
this.editShow = true;
diff --git a/src/views/purchase/cgPoOrderBill/cgPoOrderBillEdit.vue b/src/views/purchase/cgPoOrderBill/cgPoOrderBillEdit.vue
index b60d0ca..fe73dfd 100644
--- a/src/views/purchase/cgPoOrderBill/cgPoOrderBillEdit.vue
+++ b/src/views/purchase/cgPoOrderBill/cgPoOrderBillEdit.vue
@@ -56,14 +56,14 @@
<el-row>
<el-col :span="6">
<el-form-item label="閲囪喘閮ㄩ棬" prop="HDeptName">
- <el-input v-model="form.HCusName" placeholder="璇烽�夋嫨閲囪喘閮ㄩ棬" disabled>
+ <el-input v-model="form.HDeptName" placeholder="璇烽�夋嫨閲囪喘閮ㄩ棬" disabled>
<el-button slot="append" icon="el-icon-search"></el-button>
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="渚涘簲鍟�" prop="HSupName">
- <el-input v-model="form.HWHName" placeholder="璇烽�夋嫨渚涘簲鍟�" disabled>
+ <el-input v-model="form.HSupName" placeholder="璇烽�夋嫨渚涘簲鍟�" disabled>
<el-button
slot="append"
icon="el-icon-search"
@@ -111,7 +111,7 @@
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="姹囩巼" prop="HRemarHExRatek">
+ <el-form-item label="姹囩巼" prop="HExRate">
<el-input-number v-model="form.HExRate" placeholder="璇疯緭鍏ユ眹鐜�" />
</el-form-item>
</el-col>
@@ -143,8 +143,8 @@
<el-option
v-for="(item, index) in organizationList"
:key="index"
- :label="item.label"
- :value="item.value"
+ :label="item.Name"
+ :value="item.ID"
></el-option>
</el-select>
</el-form-item> </el-col
@@ -421,7 +421,7 @@
deptform: {}, //寮圭獥閫変腑鏁版嵁
openData: false, //鏁版嵁寮圭獥
dialogTitle: "",
- organizationList: [], //缁勭粐鍒楄〃
+ organizationList: JSON.parse(sessionStorage["organizationList"]), //缁勭粐鍒楄〃
subDisabled: false, //缂栬緫椤甸潰淇濆瓨鎸夐挳鏄惁绂佺敤(true绂佺敤锛宖alse鍙敤)
// OperationType: this.$route.query.OperationType,//淇濆瓨绫诲瀷锛堟柊澧�1淇敼3锛�
HInterID: null,
@@ -476,7 +476,7 @@
};
},
created() {
- this.fetchData();
+ // this.fetchData();
this.getdata();
},
beforeDestroy() {
@@ -509,7 +509,6 @@
this.HInterID2 = this.$route.query.HInterID || this.linterid || 0;
this.OperationType2 = this.$route.query.OperationType || this.OperationType || 1;
this.CopyType2 = this.$route.query.copyType || this.copyType || -1;
- console.log(this.CopyType2, this.OperationType2, this.HInterID2);
this.formShow = false;
this.formLoading = true;
@@ -795,8 +794,10 @@
//閫�鍑�
close() {
this.reset();
-
- if (!this.OperationType2 && !this.copyType) {
+ if (window.self != window.top) {
+ // iframe 椤甸潰 璋冪敤鐖堕〉闈㈡柟娉曞叧闂脊绐�
+ window.parent.editGyClose();
+ } else if (!this.OperationType2 && !this.copyType) {
// this.$router.back()
window.close();
} else {
@@ -896,7 +897,7 @@
this.reset();
let rowHmainid = this.HInterID2;
axios
- .get(this.baseURL + "/Xs_SeOutStockBill/cx", {
+ .get(this.baseURL + "/Cg_POOrderBill/cx", {
params: { HInterID: rowHmainid },
})
.then((response) => {
@@ -904,49 +905,65 @@
var result = response.data;
var data = response.data.data[0];
this.form.BillType = data.HSourceBillType;
- Object.assign(this.form, {
- HBillNo: data.鍗曟嵁鍙�,
- HInterID: data.hmainid,
- HDate: dayjs(data.鏃ユ湡).format("YYYY-MM-DD"),
- HSeOrderBillNo_M: data.閿�鍞鍗曞彿,
- HEmpID: data.HEmpID,
- HEmpName: data.涓氬姟鍛�,
- HCusID: data.HCusID,
- HCusName: data.瀹㈡埛,
- HWHID: data.涓讳粨搴揑D,
- HWHName: data.涓诲彂璐т粨搴�,
- HAddress: data.浜よ揣鍦板潃,
- HDeptName: data.閮ㄩ棬,
- HDeptID: data.HDeptID,
- HCurID: data.HCurID,
- HCurName: data.甯佸埆,
- HSSID: data.HSSID,
- HSSName: data.缁撶畻鏂瑰紡,
- HExRate: data.姹囩巼,
- HManagerName: data.涓荤,
- HManagerID: data.HManagerID,
- HSourceBillType: data.婧愬崟绫诲瀷,
- HLinkMan: data.鑱旂郴浜�,
- HLinkPhone: data.鑱旂郴鐢佃瘽,
- //, "HConveyCompID": data.杩愯緭鍏徃
- //, "HConveyTypeID": data.杩愯緭鏂瑰紡
- //, "HConveyMoney": data.杩愯垂
- //, "HDFflag": data.鏄惁鍨粯
- HProjectID: data.HProjectID,
- HProjectNumber: data.椤圭洰缂栫爜,
- HProjectName: data.椤圭洰鍚嶇О,
-
- Box2: "",
- HRemark: data.琛ㄥご澶囨敞,
- HMaker: data.鍒跺崟浜�,
- HChecker: data.瀹℃牳浜�,
- HCloseMan: data.鍏抽棴浜�,
- HMakeDate: data.鍒跺崟鏃ユ湡,
- HCheckDate: data.瀹℃牳鏃ユ湡,
- HCloseDate: data.鍏抽棴鏃ユ湡,
- HUpDateDate: data.淇敼鏃ユ湡,
- HDeleteDate: data.浣滃簾鏃ユ湡,
- });
+ this.form = {
+ ...{
+ HBillNo: data.鍗曟嵁鍙�, //璁剧疆鍗曟嵁鍙风殑绗竴涓�间负鈥淗BillNo鈥濆瓧娈电殑鍊兼槸data.鍗曟嵁鍙穈鐨勫��
+ HDate: dayjs(data.鏃ユ湡).format("YYYY-MM-DD"), //璁剧疆鈥淗Date鈥濆瓧娈电殑鍊间负`data.鏃ユ湡`缁忚繃`dayjs`鍑芥暟澶勭悊鍚庣殑鏍煎紡
+ HSSDate: dayjs(data.缁撶畻鏃ユ湡).format("YYYY-MM-DD"), //浣嗚缃殑鏄�滅粨绠楁棩鏈熲�濆瓧娈点��
+ //,"HInnerBillNo": data.鍐呴儴鍗曟嵁鍙�
+ HAddress: data.浜よ揣鍦扮偣, // 璁剧疆鈥滀氦璐у湴鐐光�濆瓧娈电殑鍊笺��
+ HDeptName: data.閮ㄩ棬, // 璁剧疆鈥滈儴闂ㄢ�濆悕绉板瓧娈电殑鍊笺��
+ HDeptID: data.HDeptID, // 璁剧疆鈥淗DeptID鈥濆悕绉板瓧娈电殑鍊笺��
+ HSupID: data.HSupID, // 璁剧疆鈥淗SupID鈥濆悕绉板瓧娈电殑鍊笺��
+ HSupName: data.渚涘簲鍟�, // 璁剧疆鈥滀緵搴斿晢鈥濆悕绉板瓧娈电殑鍊笺��
+ HEmpID: data.HEmpID,
+ HEmpName: data.涓氬姟鍛�, // 璁剧疆鈥滀笟鍔″憳鈥濆悕绉板瓧娈电殑鍊笺��
+ HCurID: data.HCurID,
+ HCurName: data.甯佸埆, // 璁剧疆鈥滃竵鍒�濆悕绉板瓧娈电殑鍊笺��
+ HExRate: data.姹囩巼, // 璁剧疆鈥滄眹鐜団�濆悕绉板瓧娈电殑鍊笺��
+ HManagerName: data.涓荤, // 璁剧疆鈥滀富绠♀�濆悕绉板瓧娈电殑鍊笺��
+ HManagerID: data.HManagerID,
+ HPSStyleID: data.HPSStyleID,
+ HPSStyleName: data.閲囪喘鏂瑰紡, // 璁剧疆鈥滈噰璐柟寮忊�濆悕绉板瓧娈电殑鍊笺��
+ HSSID: data.HSSID,
+ HSSName: data.缁撶畻鏂瑰紡, // 璁剧疆鈥滅粨绠楁柟寮忊�濆悕绉板瓧娈电殑鍊笺��
+ HLinkMan: data.鑱旂郴浜�, // 璁剧疆鈥滆仈绯讳汉鈥濆悕绉板瓧娈电殑鍊笺��
+ HLinkPhone: data.鑱旂郴浜虹數璇�, // 璁剧疆鈥滆仈绯荤數璇濃�濆悕绉板瓧娈电殑鍊笺��
+ HInnerBillNo: data.杈呭姪瀛楁, // 璁剧疆鈥滆緟鍔╁瓧娈碘�濆悕绉板瓧娈电殑鍊笺��
+ HProjectID: data.HProjectID,
+ HProjectNumber: data.椤圭洰浠ｇ爜, // 璁剧疆鈥滈」鐩唬鐮佲�濆悕绉板瓧娈电殑鍊笺��
+ HProjectName: data.椤圭洰鍚嶇О, // 璁剧疆鈥滈」鐩悕绉扳�濆悕绉板瓧娈电殑鍊笺��
+ HWHID: data.HWHID,
+ HOrgID: data.HOrgID,
+ HWHName: data.浠撳簱, // 璁剧疆鈥滀粨搴撯�濆悕绉板瓧娈电殑鍊笺��
+ HRemark: data.琛ㄥご澶囨敞, // 璁剧疆鈥滆〃澶村娉ㄢ�濆悕绉板瓧娈电殑鍊笺��
+ HMaker: data.鍒跺崟浜�, // 璁剧疆鈥滃埗鍗曚汉鈥濆悕绉板瓧娈电殑鍊笺��
+ HChecker: data.瀹℃牳浜�, // 璁剧疆鈥滃鏍镐汉鈥濆悕绉板瓧娈电殑鍊笺��
+ HCloseMan: data.鍏抽棴浜�, // 璁剧疆鈥滃叧闂汉鈥濆悕绉板瓧娈电殑鍊笺��
+ HUpDater: data.淇敼浜�, // 璁剧疆鈥滀慨鏀逛汉鈥濆悕绉板瓧娈电殑鍊笺��
+ HDeleteMan: data.浣滃簾浜�, // 璁剧疆鈥滀綔搴熶汉鈥濆悕绉板瓧娈电殑鍊笺��
+ HMakeDate:
+ data.鍒跺崟鏃ユ湡 == null
+ ? ""
+ : dayjs(data.鍒跺崟鏃ユ湡).format("yyyy-MM-dd hh:mm:ss"),
+ HCheckDate:
+ data.瀹℃牳鏃ユ湡 == null
+ ? ""
+ : dayjs(data.瀹℃牳鏃ユ湡).format("yyyy-MM-dd hh:mm:ss"),
+ HCloseDate:
+ data.鍏抽棴鏃ユ湡 == null
+ ? ""
+ : dayjs(data.鍏抽棴鏃ユ湡).format("yyyy-MM-dd hh:mm:ss"),
+ HUpDateDate:
+ data.淇敼鏃ユ湡 == null
+ ? ""
+ : dayjs(data.淇敼鏃ユ湡).format("yyyy-MM-dd hh:mm:ss"),
+ HDeleteDate:
+ data.浣滃簾鏃ユ湡 == null
+ ? ""
+ : dayjs(data.浣滃簾鏃ユ湡).format("yyyy-MM-dd hh:mm:ss"),
+ },
+ };
if (this.copyType == 1) {
this.getHBillNo();
let date = new Date();
@@ -966,7 +983,7 @@
this.form.HCloseDate = data.鍏抽棴鏃ユ湡;
this.form.HDeleteDate = data.浣滃簾鏃ユ湡;
}
- this.getCustomerByCusID(response.data.data[0].HCusID); //鏍规嵁瀹㈡埛鑾峰彇鑱旂郴浜猴紝鑱旂郴浜虹數璇�
+ // this.getCustomerByCusID(response.data.data[0].HCusID); //鏍规嵁瀹㈡埛鑾峰彇鑱旂郴浜猴紝鑱旂郴浜虹數璇�
let subdata = result.data;
for (var i = 0; i < subdata.length; i++) {
this.editData.push({
@@ -977,15 +994,19 @@
HUnitID: subdata[i].HUnitID,
璁￠噺鍗曚綅: subdata[i].璁￠噺鍗曚綅,
HWHID: subdata[i].HWHID,
- 鍙戣揣浠撳簱: subdata[i].鍙戣揣浠撳簱,
+ HWHName: subdata[i].浠撳簱鍚嶇О,
HQty: subdata[i].鏁伴噺,
+ HRemark: subdata[i].琛ㄤ綋澶囨敞,
HPrice: subdata[i].鍗曚环,
HMoney: subdata[i].閲戦,
- HRemark: subdata[i].琛ㄤ綋澶囨敞,
- HSourceBillNo: subdata[i].婧愬崟鍗曞彿, //婧愬崟鍙�
- HSourceBillType: subdata[i].婧愬崟绫诲瀷, //婧愬崟绫诲瀷
- HSourceInterID: subdata[i].婧愬崟涓诲唴鐮�, //婧愬崟涓诲唴鐮�
- HSourceEntryID: subdata[i].婧愬崟瀛愬唴鐮�, //婧愬崟瀛愬唴鐮�
+ HTaxRate: subdata[i].绋庣巼,
+ HTaxMoney: subdata[i].绋庨,
+ HlineTotal: subdata[i].浠风◣鍚堣,
+ HlineTotalBB: subdata[i].鏈綅甯佷环绋庡悎璁�,
+ HTaxPrice: subdata[i].鍚◣鍗曚环,
+ HDiscountRate: subdata[i].鎶樻墸鐜�,
+ HRelTaxPrice: subdata[i].瀹為檯鍚◣鍗曚环,
+ HDate: dayjs(new Date(subdata[i].浜よ揣鏃ユ湡)).format("YYYY-MM-DD"),
});
}
if (data.鐘舵�� != "鍒涘缓" && this.copyType != 1) {
@@ -999,23 +1020,6 @@
.catch((error) => {
this.$modal.msgError("鎺ュ彛璇锋眰澶辫触! ");
console.error(error);
- });
- },
- //鏍规嵁瀹㈡埛甯﹀嚭鑱旂郴浜恒�佽仈绯荤數璇�
- getCustomerByCusID(HCusID) {
- axios
- .get(this.baseURL + "/Xs_SeOrderBill/getCustomerByCusID", {
- params: {
- HCusID: HCusID,
- },
- })
- .then((response) => {
- this.form.鑱旂郴浜� = response.data.data[0].HLinkMan;
- this.form.鑱旂郴鐢佃瘽 = response.data.data[0].HLinkPhone;
- // this.form = response.data.data[0]
- })
- .catch((error) => {
- this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
});
},
/** 閿�鍞嚭搴撳瓙琛ㄦ槑缁嗗簭鍙� */
diff --git a/src/views/purchase/postockInBack/Kf_POStockInBackBillList.vue b/src/views/purchase/postockInBack/Kf_POStockInBackBillList.vue
new file mode 100644
index 0000000..41a40c8
--- /dev/null
+++ b/src/views/purchase/postockInBack/Kf_POStockInBackBillList.vue
@@ -0,0 +1 @@
+<template></template>
\ No newline at end of file
diff --git a/src/views/scMould/basicModeling/Gy_MaterialPackingRelationList.vue b/src/views/scMould/basicModeling/Gy_MaterialPackingRelationList.vue
new file mode 100644
index 0000000..41a40c8
--- /dev/null
+++ b/src/views/scMould/basicModeling/Gy_MaterialPackingRelationList.vue
@@ -0,0 +1 @@
+<template></template>
\ No newline at end of file
diff --git a/src/views/scMould/basicModeling/Gy_MouldFile.vue b/src/views/scMould/basicModeling/Gy_MouldFile.vue
new file mode 100644
index 0000000..41a40c8
--- /dev/null
+++ b/src/views/scMould/basicModeling/Gy_MouldFile.vue
@@ -0,0 +1 @@
+<template></template>
\ No newline at end of file
diff --git a/src/views/scMould/basicModeling/Gy_MouldFileList.vue b/src/views/scMould/basicModeling/Gy_MouldFileList.vue
new file mode 100644
index 0000000..4f02606
--- /dev/null
+++ b/src/views/scMould/basicModeling/Gy_MouldFileList.vue
@@ -0,0 +1,1101 @@
+<template>
+ <div style="padding: 10px; position: relative;">
+ <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="98px" class="searchBox">
+ <el-row>
+ <el-form-item label="鍣ㄥ叿缂栧彿" prop="HNumber" style="margin-left: 100px;">
+ <el-input v-model="queryParams.HNumber" placeholder="璇疯緭鍏ュ櫒鍏风紪鍙�" @keyup.enter.native="handleQuery" />
+ </el-form-item>
+ <el-form-item label="鍣ㄥ叿鍚嶇О" prop="HName">
+ <el-input v-model="queryParams.HName" placeholder="璇疯緭鍏ュ櫒鍏峰悕绉�" @keyup.enter.native="handleQuery" />
+ </el-form-item>
+ <el-form-item label="缁勭粐">
+ <el-select v-model="queryParams.HUSEORGID" placeholder="璇烽�夋嫨">
+ <el-option v-for="(item, index) in organizationList" :key="index" :label="item.Name" :value="item.ID">
+ </el-option>
+ </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 type="primary" icon="el-icon-refresh" @click="resetQuery">閲� 缃�</el-button>
+ </el-form-item>
+ </el-row>
+ <el-collapse v-model="activeSeach">
+ <el-collapse-item title="鏇村" name="1">
+ <el-card class="box-card">
+ <div slot="header" class="clearfix"><span>杩囨护</span></div>
+ <div>
+ <el-form-item label-width="0">
+ <el-row>
+ <el-col :span="7">
+ <el-select v-model="queryParams.ColName1" placeholder="璇烽�夋嫨">
+ <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="璇烽�夋嫨">
+ <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-form-item label-width="0">
+ <el-row>
+ <el-col :span="7">
+ <el-select v-model="queryParams.ColName2" placeholder="璇烽�夋嫨">
+ <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="璇烽�夋嫨">
+ <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="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="璇烽�夋嫨">
+ <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="璇烽�夋嫨">
+ <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-download" size="mini" @click="handleImport">瀵煎叆</el-button>
+ </el-col>
+ <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-edit" size="mini" :disabled="single"
+ @click="handleEdit(row = rowForm, OperationType = 2)">澶嶅埗</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" 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" 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" size="mini" :disabled="single"
+ @click="set_De_Stop(0, form = rowForm)">绂佺敤</el-button>
+ </el-col>
+ <el-col :span="1.5">
+ <el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single"
+ @click="set_De_Stop(1, 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>
+ </el-col>
+ <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-button type="primary" icon="el-icon-download" size="mini" @click="handleBtnHide">鎸夐挳璁剧疆</el-button>
+ </el-col> -->
+ </el-row>
+ <div class="tableBox" v-loading="loading">
+ <el-row>
+ <el-col :span="4">
+ <el-tree :data="treeOptions" :props="defaultProps" :expand-on-click-node="false"
+ :filter-node-method="filterNode" ref="tree" node-key="id" default-expand-all highlight-current
+ @node-click="handleNodeClick" />
+ </el-col>
+ <el-col :span="20">
+ <el-table :data="tableData" ref="tableData" max-height="750" :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.sorderid" 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="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-col>
+ </el-row>
+
+ <el-dialog title="闅愯棌鍒楄缃�" :visible.sync="openRowHide" width="816px" append-to-body>
+ <RowSettings :colName="btResList" :HModName="HModName" @rowEditClose="rowSetClose" v-if="rowHideShow" />
+ <!-- <BtnSettings :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" @editCloseGy="editGyClose" v-if="editShow" />
+ </el-dialog>
+ <el-dialog :title="upload.title" :visible.sync="upload.open" width="1500px" append-to-body>
+ <div style="margin-top:-20px ;">
+ <el-button type="primary" @click="set_AddNew">瀵煎叆鏁版嵁</el-button>
+ <el-button type="primary" @click="upload.open = false">閫� 鍑�</el-button>
+ <el-upload ref="upload" :limit="1" accept=".xlsx, .xls" style="display: inline-block; margin-left: 10px;"
+ :action="upload.url + '?updateSupport=' + upload.updateSupport" :disabled="upload.isUploading"
+ :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess">
+ <el-button type="primary">鏂囦欢涓婁紶</el-button>
+ </el-upload>
+ </div>
+ <el-table :data="uploadData" v-loading="uploadTableLoading" :row-class-name="uploadDataIndex" border
+ height="550">
+ <el-table-column type="index" label="搴忓彿" width="55" align="center" />
+ <el-table-column label="缁勭粐浠ｇ爜" prop="缁勭粐浠ｇ爜" align="center" width="120" />
+ <el-table-column label="缁勭粐鍚嶇О" prop="缁勭粐鍚嶇О" align="center" width="120" />
+ <el-table-column label="鐢熶骇璧勬簮鍚嶇О" prop="鐢熶骇璧勬簮鍚嶇О" align="center" width="120" />
+ <el-table-column label="鐢熶骇璧勬簮浠ｇ爜" prop="鐢熶骇璧勬簮浠ｇ爜" align="center" width="120" />
+ <el-table-column label="閮ㄩ棬浠ｇ爜" prop="閮ㄩ棬浠ｇ爜" align="center" width="120" />
+ <el-table-column label="閮ㄩ棬鍚嶇О" prop="閮ㄩ棬鍚嶇О" align="center" width="120" />
+ <el-table-column label="璐熻矗浜轰唬鐮�" prop="璐熻矗浜轰唬鐮�" align="center" width="120" />
+ <el-table-column label="璐熻矗浜�" prop="璐熻矗浜�" align="center" width="120" />
+ <el-table-column label="宸ヤ綔涓績浠ｇ爜" prop="宸ヤ綔涓績浠ｇ爜" align="center" width="120" />
+ <el-table-column label="宸ヤ綔涓績鍚嶇О" prop="宸ヤ綔涓績鍚嶇О" align="center" width="120" />
+ <el-table-column label="鍗曠彮宸ユ椂" prop="鍗曠彮宸ユ椂" align="center" width="120" />
+ <el-table-column label="鎿嶄綔" align="center">
+ <template slot-scope="scope">
+ <el-button size="mini" type="text" icon="el-icon-delete"
+ @click="uploadDataDelete(scope.row)">鍒犻櫎</el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ <pagination v-show="uploadTotal > 0" :total="uploadTotal" :page.sync="uploadPage" :limit.sync="uploadPageSize"
+ :pageSizes="uploadPageSizes" @pagination="currentPage" />
+ </el-dialog>
+ </div>
+ </div>
+</template>
+
+<script>
+import axios from 'axios'
+import BtnSettings from '@/views/component/btnSettings'
+import RowSettings from '@/views/component/rowSettings'
+import Edit from '@/views/scMould/basicModeling/Gy_MouldFile.vue'
+export default {
+ name: 'Gy_MouldFileList',
+ components: { RowSettings, Edit, BtnSettings },
+ props: {
+ openPage: { type: String, },
+ },
+ data() {
+ return {
+ HModName: 'Gy_MouldFileList',
+ treeSql: '',
+ HSupClsName: 0,
+ //鏍戠粨鏋�
+ treeOptions: undefined,
+ defaultProps: {
+ children: "children",
+ label: "title"
+ },
+ activeSeach: '',
+ editShow: false,
+ openEdit: false,
+ totalNameList: [],
+ tableShow: true,
+ openPrintList: false,
+ printListShow: false,
+ HBillType: '1205',
+ 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: '',
+ dialogTitle: '',
+ organizationList: JSON.parse(sessionStorage.getItem('organizationList')),//缁勭粐鍒楄〃
+ OperationType: null,//淇濆瓨绫诲瀷锛堟柊澧�1淇敼3锛�
+ HInterID: null,
+ baseURL: process.env.VUE_APP_BASE_API,
+ lastSelectedRowIndex: null, // 鐢ㄤ簬璁板綍涓婃鐐瑰嚮鐨勮绱㈠紩
+ lastSelectedRow: null, // 涓婁竴娆￠�変腑鐨勮
+ selectedRow: null, // 褰撳墠閫変腑鐨勮
+ rowForm: {},
+ activeName: 'first',
+
+ // 寮瑰嚭灞傛爣棰�
+ title: "",
+ // 鏄惁鏄剧ず寮瑰嚭灞�
+ open: false,
+ // 鏌ヨ鍙傛暟
+ queryParams: {
+ HUSEORGID: sessionStorage["OrganizationID"] - 0,
+ HName: null,
+ HNumber: null,
+ HMouldTypeID: null,
+ Comparator1: '',
+ Comparator2: '',
+ Comparator: '',
+ ColContent1: '',
+ ColContent2: '',
+ ColContent: '',
+ },
+ // 閫変腑鏁扮粍
+ ids: [],
+ // 闈炲崟涓鐢�
+ single: true,
+ // 闈炲涓鐢�
+ multiple: true,
+ // 閬僵灞�
+ loading: true,
+ tyResList: [],//鍒楄〃锛堟帴鍙ｆ暟鎹級
+ btList: [],//琛ㄥご鍒楄〃鏄剧ず
+ btResList: [],
+ tableData: [],//鍒楄〃(鍒嗛〉鏄剧ず)
+ dataList: [],
+ titleData: ["sorderid", "hmainid", "HCurID", "HSSID", "HAreaID", "HPSStyleID"],//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ pageSizes: [50, 100, 500, 5000, 50000],
+ page: 1,
+ pageSize: 0,
+ total: 0,
+ // 琛ㄥ崟鍙傛暟
+ form: {},
+ // 琛ㄥ崟鏍￠獙
+ rules: {
+ HSupName: [
+ { required: true, message: "瀹㈡埛涓嶈兘涓虹┖", trigger: "blur" }
+ ],
+ HDate: [
+ { required: true, message: "鏃ユ湡涓嶈兘涓虹┖", trigger: "blur" }
+ ],
+ HExRate: [
+ { required: true, message: "姹囩巼涓嶈兘涓虹┖", trigger: "blur" }
+ ]
+ },
+ upload: {
+ // 鏄惁鏄剧ず寮瑰嚭灞�
+ open: false,
+ // 寮瑰嚭灞傛爣棰�
+ title: "",
+ // 鏄惁绂佺敤涓婁紶
+ isUploading: false,
+ // 鏄惁鏇存柊宸茬粡瀛樺湪鐨勬暟鎹�
+ updateSupport: 0,
+ // 璁剧疆涓婁紶鐨勮姹傚ご閮�
+ // headers: { Authorization: "Bearer " + getToken() },
+ // 涓婁紶鐨勫湴鍧�
+ url: process.env.VUE_APP_BASE_API + "/Gy_Source/Gy_Source_Excel"
+ },
+ uploadData: [],
+ alluploadList: [],
+ uploadTableLoading: false,
+ uploadPageSizes: [50, 100, 500, 5000, 50000],
+ uploadPage: 1,
+ uploadPageSize: 50,
+ uploadTotal: 0,
+ };
+ },
+ created() {
+ this.getList()
+ this.getTreeselect()
+ },
+ methods: {
+ 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()
+ },
+ getTreeselect() {
+ axios.get(this.baseURL + '/Gy_Mould/TreeList', {
+ params: {
+ "sWhere": this.sWhere,
+ "user": sessionStorage["HUserName"],
+ },
+ }).then(response => {
+
+ let data1 = response.data
+ if (data1.count == 1) {
+ let data = JSON.parse(data1.data)
+ console.log(JSON.parse(data1.data))
+ var liStr = '[';
+ //閬嶅巻鐢熸垚涓昏彍鍗�
+ for (var i = 0; i < data.length; i++) {
+ // 鍒ゆ柇鏄惁瀛樺湪瀛愯彍鍗�
+ if (data[i].children != null && data[i].children.length > 0) {
+ liStr += '{"title": "' + data[i].id + "-" + data[i].title + '", "id": "' + data[i].id + '","spread":true, "children":[ ';
+ // 閬嶅巻鑾峰彇瀛愯彍鍗�
+ for (var k = 0; k < data[i].children.length; k++) {
+ liStr += this.getChildMenu(data[i].children[k], 0);
+ }
+ liStr = liStr.substring(0, liStr.length - 1);
+ liStr += ']},';
+ } else {
+ liStr += '{"title": "' + data[i].id + "-" + data[i].title + '", "id": "' + data[i].id + '"},';
+ }
+ };
+ liStr = liStr.substring(0, liStr.length - 1);
+ liStr += "]";
+ this.treeOptions = JSON.parse(liStr);
+ }
+ }).catch(error => {
+ console.log(error)
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ },
+ getChildMenu(subMenu, num) {
+ num++;
+ var subStr = '';
+ if (subMenu.children != null && subMenu.children.length > 0) {
+ subStr += '{"title": "' + subMenu.id + "-" + subMenu.title + '", "id": "' + subMenu.id + '", "children":[';
+ for (var j = 0; j < subMenu.children.length; j++) {
+ subStr += this.getChildMenu(subMenu.children[j], num);
+ if (j + 1 == subMenu.children.length) {
+ subStr = subStr.substring(0, subStr.length - 1);
+ }
+ }
+ subStr += ']},';
+ } else {
+ subStr += '{"title": "' + subMenu.id + "-" + subMenu.title + '", "id": "' + subMenu.id + '"},';
+ }
+ return subStr;
+ },
+ // 绛涢�夎妭鐐�
+ filterNode(value, data) {
+ if (!value) return true
+ return data.label.indexOf(value) !== -1
+ },
+ // 鑺傜偣鍗曞嚮浜嬩欢
+ handleNodeClick(data) {
+ if (data.id == "0") {
+ this.treeSql = "";
+ this.queryParams.HMouldTypeID = 0;
+ } else {
+ this.treeSql = " and HMouldTypeID = '" + data.id + "' ";
+ this.HSupClsName = data.title;
+ this.queryParams.HMouldTypeID = data.id;
+ }
+ this.handleQuery()
+ },
+ //鍒楄〃鏁版嵁
+ getList() {
+ this.pageSize = 50
+ this.tableShow = false
+ this.loading = true
+ if (this.pageSize == 0) {
+ this.pageSize = 50
+ }
+ this.sWhere += " and HUSEORGID = '" + this.queryParams.HUSEORGID + "'"
+ //鐢熶骇璧勬枡鍒楄〃
+ axios.get(this.baseURL + '/Gy_Mould/page', {
+ params: {
+ "sWhere": this.sWhere,
+ "ModRightNameSelect": this.HModName,
+ "user": sessionStorage["HUserName"],
+ "Organization": sessionStorage["Organization"],
+ "page": this.page,
+ "size": this.pageSize
+ },
+ }).then(response => {
+ this.tyResList = response.data.data//鎬绘暟鎹�
+ let data1 = response.data
+ let option = []
+ if (data1.code == 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 });//浠庢瘡涓璞′腑鎻愬彇鏁版嵁
+ }
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ 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 = [[
+ { type: 'checkbox', fixed: 'left', totalRowText: '鍚堣琛�' }
+ , { field: 'hmainid', title: 'hmainid', sort: true, hide: true }
+ , { field: '鏃ユ湡', title: '鏃ユ湡', sort: true }
+ , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', sort: true }
+ , { field: '鏉＄爜缂栧彿', title: '鏉＄爜缂栧彿', sort: true }
+ , { field: '瀵瑰簲ERP鐗╂枡缂栫爜', title: '鐗╂枡缂栧彿', sort: true }
+ , { field: '妯″叿缂栧彿', title: '鍣ㄥ叿缂栧彿', sort: true, }
+ , { field: '妯″叿鍚嶇О', title: '鍣ㄥ叿鍚嶇О', sort: true }
+ , { field: '妯″叿鍨嬪彿', title: '鍣ㄥ叿鍨嬪彿', sort: true }
+ , { field: '妯″叿鍝佺被', title: '鍣ㄥ叿鍝佺被', sort: true }
+ , { field: '妯″叿鐘舵��', title: '鍣ㄥ叿鐘舵��', sort: true }
+ , { field: '妯″叿鍙敤鐘舵��', title: '妯″叿鍙敤鐘舵��', sort: true }
+ , { field: '绌存暟', title: '绌存暟', sort: true }
+ , { field: '瀵瑰簲ERP鐗╂枡缂栫爜', title: '鍣ㄥ叿ERP鐗╂枡', sort: true }
+ , { field: '鐩村緞', title: '鐩村緞', sort: true }
+ , { field: '杈呭姪灞炴��', title: '杈呭姪灞炴��', sort: true }
+ , { field: '杈呭姪灞炴��2', title: '杈呭姪灞炴��2', sort: true }
+ , { field: '鍥惧彿', title: '鍥惧彿', sort: true }
+ , { field: '鐢熶骇浜у搧鍨嬪彿', title: '鐢熶骇浜у搧鍨嬪彿', sort: true }
+ , { field: 'HUnitID', title: 'HUnitID', hide: true, sort: true }
+ , { field: '璁￠噺鍗曚綅浠ｇ爜', title: '璁￠噺鍗曚綅浠ｇ爜', sort: true }
+ , { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', sort: true }
+ , { field: '鍑哄巶鏃ユ湡', title: '鍑哄巶鏃ユ湡', sort: true }
+ , { field: '鍑哄巶缂栧彿', title: '鍑哄巶缂栧彿', sort: true }
+ , { field: '浣跨敤閮ㄩ棬浠ｇ爜', title: '浣跨敤閮ㄩ棬浠ｇ爜', sort: true }
+ , { field: '浣跨敤閮ㄩ棬', title: '浣跨敤閮ㄩ棬', sort: true }
+ , { field: 'HSupID', title: 'HSupID', hide: true, sort: true }
+ , { field: '渚涘簲鍟嗕唬鐮�', title: '渚涘簲鍟嗕唬鐮�', sort: true }
+ , { field: '渚涘簲鍟�', title: '渚涘簲鍟�', sort: true }
+ , { field: 'HWhID', title: 'HWhID', hide: true, sort: true }
+ , { field: '榛樿浠撳簱', title: '榛樿浠撳簱', sort: true }
+ , { field: 'HSPID', title: 'HSPID', hide: true, sort: true }
+ , { field: '榛樿浠撲綅', title: '榛樿浠撲綅', sort: true }
+ , { field: '鐗堟湰', title: '鐗堟湰', sort: true }
+ , { field: '褰撳墠浠撳簱', title: '褰撳墠浠撳簱', sort: true }
+ , { field: '褰撳墠浠撲綅', title: '褰撳墠浠撲綅', sort: true }
+ , { field: '铏氭嫙浠撶被鍨�', title: '铏氭嫙浠撶被鍨�', sort: true }
+ , { field: '铏氭嫙浠�', title: '铏氭嫙浠�', sort: true }
+ , { field: '褰撳墠妯″叿瑙勬牸', title: '褰撳墠鍣ㄥ叿瑙勬牸', sort: true }
+ , { field: '鍒濆妯″叿瑙勬牸', title: '鍒濆鍣ㄥ叿瑙勬牸', sort: true }
+ , { field: '褰撳墠璁捐瀵垮懡', title: '褰撳墠璁捐瀵垮懡', sort: true, totalRow: true }
+ , { field: '鍒濆璁捐瀵垮懡', title: '鍒濆璁捐瀵垮懡', sort: true, totalRow: true }
+ , { field: '浣跨敤瀵垮懡', title: '浣跨敤瀵垮懡', sort: true, totalRow: true }
+ , { field: '鍓╀綑瀵垮懡', title: '鍓╀綑瀵垮懡', sort: true, totalRow: true }
+ , { field: '宸茬敓浜ф暟閲�', title: '宸茬敓浜ф暟閲�', sort: true, totalRow: true }
+ , { field: '宸茬敓浜ч噸閲�', title: '宸茬敓浜ч噸閲�', sort: true, totalRow: true }
+ , { field: '澶囨敞', title: '澶囨敞', sort: true }
+ , { field: '鍏宠仈鏁伴噺', title: '鍏宠仈鏁伴噺', sort: true, totalRow: true }
+ , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', sort: true }
+ , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', sort: true }
+ , { field: '瀹℃牳浜�', title: '瀹℃牳浜�', sort: true }
+ , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', sort: true }
+ , { field: '淇敼浜�', title: '淇敼浜�', sort: true }
+ , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', sort: true }
+ , { field: '鍏抽棴浜�', title: '鍏抽棴浜�', sort: true }
+ , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', sort: true }
+ , { field: '浣滃簾浜�', title: '浣滃簾浜�', sort: true }
+ , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', sort: true }
+ , { field: 'hbilltype', title: 'hbilltype', hide: true, sort: true }
+ , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', hide: true, sort: true }
+ , { field: 'HMoudType', title: 'HMoudType', hide: true, sort: true }
+ , { field: 'hsubid', title: 'hsubid', hide: true, sort: true }
+ ]]
+ this.dataList = option
+ option.data = data1.data;
+ var result = data1.data;
+ option.data = result;
+ this.DisPlay_HideColumn(this.HModName, sessionStorage["HUserName"], option, this.dataList);
+ } else {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ }
+ }).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);
+ if (this.openPage) {
+ this.$emit('deptEmit', row, 8)
+ }
+ },
+ //閫変腑琛岄珮浜牱寮�
+ rowStyle({ row, rowIndex }) {
+ if (this.ids.includes(row.hmainid)) {
+ return { "background": "#ecf5ff" }
+ }
+ },
+ //鍙屽嚮琛�
+ handleDblclick(row, column, cell, event) {
+ this.OperationType = 3
+ if (this.openPage) {
+ this.$emit('deptEmitDb', row, 8)
+ }
+ else {
+ this.handleEdit();
+ }
+ },
+ // 澶氶�夋閫変腑鏁版嵁
+ handleSelectionChange(selection) {
+ // this.rowForm = {}
+ 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.hmainid)
+ this.rowForm = selection[0]
+ } else {
+ 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.treeSql) {
+ this.sWhere += this.treeSql
+ }
+ 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.HNumber) {
+ this.sWhere += " and 鍣ㄥ叿缂栧彿 like '%" + this.queryParams.HNumber + "%'";
+ }
+ if (this.queryParams.HName) {
+ this.sWhere += " and 鍣ㄥ叿鍚嶇О like '%" + this.queryParams.HName + "%'";
+ }
+ if (this.queryParams.HUSEORGID) {
+ this.sWhere += " and HUSEORGID = '" + this.queryParams.HUSEORGID + "'"
+ }
+ // this.sWhere += this.addSWhereByOpenType()
+ // this.sWhere += this.getOrgIDByUser()
+ this.getList()
+
+ },
+ // 鍒ゆ柇鏄洿鎺ユ墦寮�椤甸潰杩樻槸鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑锛屽苟鏄剧ず鐩稿簲鏁版嵁
+ addSWhereByOpenType() {
+ //鑾峰彇鍙傛暟
+ var sWhere = "";
+ //this.openPage鍒ゆ柇鏄惁鏈夊�硷紝鏈変唬琛ㄥ叾瀹冮〉闈㈤�氳繃閫夋嫨鎸夐挳鎵撳紑
+ if (this.openPage) {
+ sWhere += " and 绂佺敤鏍囪 != 'Y' and ISNULL(瀹℃牳浜�,'') != ''"
+ return sWhere;
+ }
+ return sWhere;
+ },
+ //鏍规嵁鐢ㄦ埛鑾峰彇鐢ㄦ埛鍏宠仈缁勭粐鐨勮繃婊ゆ潯浠�
+ getOrgIDByUser() {
+ var res = "";
+ axios.get(this.baseURL + '/Xt_User/getOrgIDListByUser', {
+ params: {
+ HModName: this.HModName,
+ user: sessionStorage["HUserName"],
+ HOrgID: sessionStorage["OrganizationID"]
+ },
+ }).then(response => {
+ let result = response.data
+ if (result.count == 1) {
+ if (result.data[0].sWhere == "1") {
+ res = " and HUSEORGID = '" + sessionStorage["OrganizationID"] + "'";
+ } else {
+ res = result.data[0].sWhere;
+ }
+ }
+ }).catch(error => {
+ res = " and 1 = 0";
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ return res;
+ },
+ /** 閲嶇疆鎸夐挳鎿嶄綔 */
+ resetQuery() {
+ this.sWhere = ''
+ this.queryParams = {
+ HUSEORGID: null,
+ HName: null,
+ HNumber: null,
+ Comparator1: '',
+ Comparator2: '',
+ Comparator: '',
+ ColContent1: '',
+ ColContent2: '',
+ ColContent: '',
+ }
+ this.resetForm("queryForm")
+ this.getList()
+ },
+
+ //閫�鍑�
+ close() {
+ this.tableShow = true
+ this.openEdit = false
+ this.editShow = false
+ this.getList()
+ },
+ //鎵撳紑鏂板缁勪欢寮圭獥
+ handleAddEdit() {
+ this.rowForm.hmainid = 0
+ this.$nextTick(() => {
+ this.openEdit = true
+ this.editShow = true
+ })
+
+ },
+ //鎵撳紑淇敼缁勪欢寮圭獥
+ handleEdit() {
+ this.$nextTick(() => {
+ this.openEdit = true
+ this.editShow = true
+ })
+ },
+ //鍏抽棴缂栬緫椤甸潰
+ editGyClose(val) {
+ this.editShow = false
+ this.openEdit = false
+ this.multiple = true,
+ this.getList()
+ },
+ /** 鍒犻櫎鎸夐挳鎿嶄綔 */
+ handleDelete() {
+ this.$modal.confirm('纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠').then(() => {
+ if (!this.rowForm.瀹℃牳浜�) {
+ axios.get(this.baseURL + "DeltetGy_Source", {
+ params: { 'HItemID': this.rowForm.hmainid.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("鎺ュ彛璇锋眰澶辫触!");
+ });
+ } else {
+ this.$modal.msgError("姝ゆ潯鏁版嵁涓嶆槸鍒涘缓鐘舵��,鏃犳硶鍒犻櫎!");
+ }
+ }).catch(() => { })
+ },
+ // 鍙嶅鏍�/瀹℃牳鏁版嵁
+ set_CheckBill(num, form) {
+ var InterID = form.hmainid || form.HInterID
+ //閫昏緫瀹℃牳鏂规硶
+ axios.get(this.baseURL + "/Gy_Source/AuditGy_Source", {
+ params: { "HInterID": InterID, "IsAudit": num, "CurUserName": sessionStorage["HUserName"] }
+ }).then(response => {
+ let result = response.data
+ if (result.code == 1) {
+ this.$modal.msgSuccess('鎿嶄綔鎴愬姛');
+ this.getList();
+ }
+ else {
+ this.$modal.msgError("閿欒:" + result.code + result.Message,);
+ }
+ }).catch(error => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ },
+ // 鍙嶇鐢�/绂佺敤鏁版嵁
+ set_De_Stop(num, form) {
+ var InterID = form.hmainid || form.HInterID
+ //閫昏緫瀹℃牳鏂规硶
+ axios.get(this.baseURL + "/Gy_Source/StopGy_Source", {
+ params: { "HInterID": InterID, "IsStop": num, "CurUserName": sessionStorage["HUserName"] }
+ }).then(response => {
+ let result = response.data
+ if (result.code == 1) {
+ this.$modal.msgSuccess('鎿嶄綔鎴愬姛');
+ this.getList();
+ }
+ else {
+ this.$modal.msgError("閿欒:" + result.code + result.Message,);
+ }
+ }).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, `gySource_${new Date().getTime()}.xlsx`); // 瀵煎嚭鏂囦欢
+ },
+ handleImport() {
+ this.uploadData = []
+ this.upload.isUploading = false
+ this.upload.title = "瀵煎叆";
+ this.upload.open = true;
+ },
+ // 鏂囦欢涓婁紶涓鐞�
+ handleFileUploadProgress(event, file, fileList) {
+ this.upload.isUploading = true;
+ this.uploadTableLoading = true
+ },
+ // 鏂囦欢涓婁紶鎴愬姛澶勭悊
+ handleFileSuccess(response, file, fileList) {
+ // this.upload.open = false;
+ this.upload.isUploading = true;
+ this.$refs.upload.clearFiles();
+ if (response.code == 1) {
+ this.alluploadList = response.data
+ this.uploadData = this.getPage(this.uploadPage, this.alluploadList)
+ this.uploadTotal = this.alluploadList.length
+ this.uploadTableLoading = false
+ // this.set_AddNew(response.data)
+ } else {
+ this.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.Message + "</div>", "瀵煎叆缁撴灉", { dangerouslyUseHTMLString: true });
+ }
+
+ },
+ // 鎻愪氦涓婁紶鏂囦欢
+ submitFileForm() {
+ this.$refs.upload.submit();
+ },
+ set_AddNew() {
+ var num = [];
+ for (var i = 0; i < this.uploadData.length; i++) {
+ if (this.uploadData[i] != "") {
+ num.push(this.uploadData[i])
+ }
+ }
+ var sSubStr = JSON.stringify(num);
+ var sMainSub = sSubStr + '&鍜�' + sessionStorage["HUserName"];
+ axios({
+ method: 'post',
+ url: this.baseURL + "/Gy_Source/Gy_Source_btnSave",
+ data: {
+ 'sMainSub': sMainSub
+ },
+ }).then(res => {
+ this.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + res.data.Message + "</div>", "瀵煎叆缁撴灉", { dangerouslyUseHTMLString: true });
+ this.upload.open = false
+ this.getList()
+ }).catch(error => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ },
+ uploadDataIndex({ row, rowIndex }) {
+ row.index = rowIndex + 1;
+ },
+ uploadDataDelete(row) {
+ this.$modal.confirm('纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠').then(() => {
+ const deleteList = [row.index]
+ const data = this.uploadData
+ this.uploadData = data.filter(item => {
+ return deleteList.indexOf(item.index) == -1
+ });
+ }).catch(() => { })
+ },
+ getPage(page, list) {
+ let sindex = (parseInt(page) - 1) * this.uploadPageSize
+ let eindex = parseInt(page) * this.uploadPageSize
+ let newList = list.slice(sindex, eindex)
+ return newList
+ },
+ currentPage(val) {
+ this.uploadPage = val.page
+ setTimeout(() => {
+ this.uploadData = this.getPage(this.uploadPage, this.alluploadList)
+ }, 100)
+ },
+ }
+};
+</script>
+<style>
+.xsckdBox .el-date-editor.el-input {
+ width: 100%;
+}
+</style>
diff --git a/src/views/sell/Kf_ICStockBillMainList/Kf_ICStockBillMainList.vue b/src/views/sell/Kf_ICStockBillMainList/Kf_ICStockBillMainList.vue
new file mode 100644
index 0000000..b73ffb6
--- /dev/null
+++ b/src/views/sell/Kf_ICStockBillMainList/Kf_ICStockBillMainList.vue
@@ -0,0 +1,1606 @@
+<template>
+ <div style="padding: 10px">
+ <el-form
+ :model="queryParams"
+ ref="queryForm"
+ size="small"
+ :inline="true"
+ label-width="78px"
+ class="searchBox"
+ >
+ <el-row>
+ <el-form-item label="鏃ユ湡" style="margin-left: 100px">
+ <el-date-picker
+ v-model="dateRange"
+ value-format="yyyy-MM-dd"
+ type="daterange"
+ range-separator="-"
+ start-placeholder="寮�濮嬫棩鏈�"
+ end-placeholder="缁撴潫鏃ユ湡"
+ ></el-date-picker>
+ </el-form-item>
+ <el-form-item label="鏃ユ湡闂撮殧">
+ <el-select
+ v-model="queryParams.HInitTimeCycle"
+ placeholder="璇烽�夋嫨"
+ @change="riqiChange"
+ >
+ <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="缁勭粐">
+ <el-select
+ v-model="queryParams.HOrgID"
+ placeholder="璇烽�夋嫨"
+ class="ForFilteringSchemes"
+ >
+ <el-option
+ v-for="(item, index) in organizationList"
+ :key="item.ID"
+ :label="item.Name"
+ :value="item.ID"
+ >
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="鍗曟嵁鍙�" prop="HBillNo2">
+ <el-input
+ v-model="form.HBillNo2"
+ placeholder="璇疯緭鍏ュ悓姝ュ崟鎹彿"
+ @keyup.enter.native="BillSync"
+ >
+ <el-button slot="append" @click="BillSync">閲嶆柊鍚屾</el-button>
+ </el-input>
+ </el-form-item>
+ </el-row>
+
+ <el-collapse v-model="activeSeach">
+ <el-collapse-item title="鏇村" name="1">
+ <el-form-item label="瀹㈡埛" prop="HCusID">
+ <el-input
+ v-model="queryParams.HCusID"
+ placeholder="璇疯緭鍏ュ鎴�"
+ @keyup.enter.native="handleQuery"
+ />
+ </el-form-item>
+ <el-form-item label="閮ㄩ棬" prop="HDeptID">
+ <el-input
+ v-model="queryParams.HDeptID"
+ placeholder="璇疯緭鍏ラ儴闂�"
+ @keyup.enter.native="handleQuery"
+ />
+ </el-form-item>
+ <el-form-item label="涓荤" prop="HMangerID">
+ <el-input
+ v-model="queryParams.HMangerID"
+ placeholder="璇疯緭鍏ヤ富绠�"
+ @keyup.enter.native="handleQuery"
+ />
+ </el-form-item>
+ <el-card class="box-card">
+ <div slot="header" class="clearfix"><span>杩囨护</span></div>
+ <div>
+ <el-row>
+ <el-form-item label-width="0">
+ <el-col :span="7">
+ <el-select
+ v-model="queryParams.ColName1"
+ 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-select>
+ </el-col>
+ <el-col :span="6" style="padding: 0 10px">
+ <el-select
+ v-model="queryParams.Comparator1"
+ placeholder="璇烽�夋嫨"
+ @change="riqiChange"
+ class="ForFilteringSchemes"
+ >
+ <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"
+ class="ForFilteringSchemes"
+ />
+ </el-col>
+ </el-form-item>
+ </el-row>
+ <el-row>
+ <el-form-item label-width="0">
+ <el-col :span="7">
+ <el-select
+ v-model="queryParams.ColName2"
+ 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-select>
+ </el-col>
+ <el-col :span="6" style="padding: 0 10px">
+ <el-select
+ v-model="queryParams.Comparator1"
+ placeholder="璇烽�夋嫨"
+ @change="riqiChange"
+ class="ForFilteringSchemes"
+ >
+ <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"
+ class="ForFilteringSchemes"
+ />
+ </el-col>
+ </el-form-item>
+ </el-row>
+ <el-row>
+ <el-form-item label-width="0">
+ <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>
+ </el-select>
+ </el-col>
+ <el-col :span="6" style="padding: 0 10px">
+ <el-select
+ v-model="queryParams.Comparator"
+ placeholder="璇烽�夋嫨"
+ @change="riqiChange"
+ class="ForFilteringSchemes"
+ >
+ <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"
+ class="ForFilteringSchemes"
+ />
+ </el-col>
+ </el-form-item>
+ </el-row>
+ </div>
+ </el-card>
+ </el-collapse-item>
+ </el-collapse>
+
+ <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>
+
+ <el-row :gutter="10" class="mb8">
+ <!-- <el-col :span="1.5">
+ <el-button
+ type="warning"
+ plain
+ icon="el-icon-download"
+ size="mini"
+ @click="handleImport"
+ >瀵煎叆</el-button
+ >
+ </el-col> -->
+ <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-edit"
+ size="mini"
+ :disabled="single"
+ @click="handleEdit((row = rowForm), (OperationType = 2))"
+ >澶嶅埗</el-button
+ >
+ </el-col>
+ <el-col :span="1.5">
+ <el-button
+ type="primary"
+ icon="el-icon-delete"
+ size="mini"
+ :disabled="single"
+ @click="handleDelete((form = rowForm))"
+ >鍒犻櫎
+ </el-button>
+ </el-col>
+ <el-col :span="1.5">
+ <el-button
+ type="primary"
+ icon="el-icon-edit"
+ 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"
+ size="mini"
+ :disabled="single"
+ @click="set_CheckBill(1, (form = rowForm))"
+ >鍙嶅鏍�</el-button
+ >
+ </el-col>
+ <!-- <el-col :span="1.5">
+ <el-button
+ type="success"
+ plain
+ icon="el-icon-edit"
+ size="mini"
+ :disabled="single"
+ @click="set_De_Stop(0, (form = rowForm))"
+ >绂佺敤</el-button
+ >
+ </el-col>
+ <el-col :span="1.5">
+ <el-button
+ type="success"
+ plain
+ icon="el-icon-edit"
+ size="mini"
+ :disabled="single"
+ @click="set_De_Stop(1, (form = rowForm))"
+ >鍙嶇鐢�</el-button
+ >
+ </el-col> -->
+ <el-col :span="1.5">
+ <el-button
+ type="primary"
+ icon="el-icon-edit"
+ size="mini"
+ :disabled="single"
+ @click="set_CloseBill(1, (form = rowForm))"
+ >鍏抽棴</el-button
+ >
+ </el-col>
+ <el-col :span="1.5">
+ <el-button
+ type="primary"
+ icon="el-icon-edit"
+ size="mini"
+ :disabled="single"
+ @click="set_CloseBill(2, (form = rowForm))"
+ >鍙嶅叧闂�</el-button
+ >
+ </el-col>
+ <el-col :span="1.5">
+ <el-button
+ type="primary"
+ icon="el-icon-edit"
+ size="mini"
+ :disabled="single"
+ @click="set_DropBill(1, (form = rowForm))"
+ >浣滃簾</el-button
+ >
+ </el-col>
+ <el-col :span="1.5">
+ <el-button
+ type="primary"
+ icon="el-icon-edit"
+ size="mini"
+ :disabled="single"
+ @click="set_DropBill(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
+ >
+ </el-col>
+ <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-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>
+ <!-- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> -->
+ </el-row>
+ <div class="tableBox" v-loading="loading">
+ <el-table
+ :data="tableData"
+ ref="tableData"
+ max-height="750"
+ :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.sorderid"
+ 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="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"
+ :before-close="close"
+ >
+ <edit
+ :OperationType="OperationType"
+ :linterid="this.rowForm.HItemID || this.rowForm.HInterID || this.rowForm.hmainid"
+ :HSouceBillType="this.rowForm.HSourceBillType"
+ :HOrgID="this.queryParams.HOrgID"
+ :copyType="copyType"
+ @editCloseGy="editGyClose"
+ v-if="editShow"
+ />
+ </el-dialog>
+ <el-dialog
+ :title="upload.title"
+ :visible.sync="upload.open"
+ width="1500px"
+ append-to-body
+ >
+ <div style="margin-top: -20px">
+ <el-button type="primary" @click="set_AddNew">瀵煎叆鏁版嵁</el-button>
+ <el-button type="primary" @click="upload.open = false">閫� 鍑�</el-button>
+ <el-upload
+ ref="upload"
+ :limit="1"
+ accept=".xlsx, .xls"
+ style="display: inline-block; margin-left: 10px"
+ :action="upload.url + '?updateSupport=' + upload.updateSupport"
+ :disabled="upload.isUploading"
+ :on-progress="handleFileUploadProgress"
+ :on-success="handleFileSuccess"
+ >
+ <el-button type="primary">鏂囦欢涓婁紶</el-button>
+ </el-upload>
+ </div>
+ <el-table
+ :data="uploadData"
+ v-loading="uploadTableLoading"
+ :row-class-name="uploadDataIndex"
+ border
+ height="550"
+ >
+ <el-table-column type="index" label="搴忓彿" width="55" align="center" />
+ <el-table-column label="缁勭粐浠ｇ爜" prop="缁勭粐浠ｇ爜" align="center" width="120" />
+ <el-table-column label="缁勭粐鍚嶇О" prop="缁勭粐鍚嶇О" align="center" width="120" />
+ <el-table-column
+ label="鐢熶骇璧勬簮鍚嶇О"
+ prop="鐢熶骇璧勬簮鍚嶇О"
+ align="center"
+ width="120"
+ />
+ <el-table-column
+ label="鐢熶骇璧勬簮浠ｇ爜"
+ prop="鐢熶骇璧勬簮浠ｇ爜"
+ align="center"
+ width="120"
+ />
+ <el-table-column label="閮ㄩ棬浠ｇ爜" prop="閮ㄩ棬浠ｇ爜" align="center" width="120" />
+ <el-table-column label="閮ㄩ棬鍚嶇О" prop="閮ㄩ棬鍚嶇О" align="center" width="120" />
+ <el-table-column
+ label="璐熻矗浜轰唬鐮�"
+ prop="璐熻矗浜轰唬鐮�"
+ align="center"
+ width="120"
+ />
+ <el-table-column label="璐熻矗浜�" prop="璐熻矗浜�" align="center" width="120" />
+ <el-table-column
+ label="宸ヤ綔涓績浠ｇ爜"
+ prop="宸ヤ綔涓績浠ｇ爜"
+ align="center"
+ width="120"
+ />
+ <el-table-column
+ label="宸ヤ綔涓績鍚嶇О"
+ prop="宸ヤ綔涓績鍚嶇О"
+ align="center"
+ width="120"
+ />
+ <el-table-column label="鍗曠彮宸ユ椂" prop="鍗曠彮宸ユ椂" align="center" width="120" />
+ <el-table-column label="鎿嶄綔" align="center">
+ <template slot-scope="scope">
+ <el-button
+ size="mini"
+ type="text"
+ icon="el-icon-delete"
+ @click="uploadDataDelete(scope.row)"
+ >鍒犻櫎</el-button
+ >
+ </template>
+ </el-table-column>
+ </el-table>
+ <pagination
+ v-show="uploadTotal > 0"
+ :total="uploadTotal"
+ :page.sync="uploadPage"
+ :limit.sync="uploadPageSize"
+ :pageSizes="uploadPageSizes"
+ @pagination="currentPage"
+ />
+ </el-dialog>
+ </div>
+ </div>
+</template>
+
+<script>
+import axios from "axios";
+import RowSettings from "@/views/component/rowSettings";
+import Edit from '@/views/sell/Kf_ICStockBillMainList/Kf_ICStockBillMainListEdit'
+import dayjs from "dayjs";
+
+export default {
+ name: "GySource",
+ components: { RowSettings,Edit},
+ props: {
+ openPage: { type: String },
+ },
+ data() {
+ return {
+ activeSeach: "",
+ HModName: "Cg_POOrderBillList",
+ editShow: false,
+ openEdit: false,
+ totalNameList: [],
+ dateRange: [],
+ tableShow: true,
+ openPrintList: false,
+ printListShow: false,
+ HClassTag: "ForFilteringSchemes", //杩囨护鏉′欢鐨刢lass绫�
+ HBillType: "1202",
+ 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 },
+ ],
+ hPriceTypeList: ["鎴愭湰浠�", "缁撶畻浠�"],
+ addBtnShow: false,
+ zbIndex: null,
+ zbSelForm: {}, //瀛愯〃閫変腑鏁版嵁
+ dialogTypeNum: null, //閮ㄩ棬寮圭獥1锛屼粨搴撳脊绐�2
+ deptShow: false, //閮ㄩ棬鏁版嵁缁勪欢
+ warehouseShow: false, //浠撳簱鏁版嵁缁勪欢
+ materialShow: false, //鐗╂枡鏁版嵁缁勪欢
+ deptform: {}, //寮圭獥閫変腑鏁版嵁
+ openData: false, //鏁版嵁寮圭獥
+ dialogTitle: "",
+ zuzhiId: "",
+ organizationList: JSON.parse(sessionStorage.getItem("organizationList")), //缁勭粐鍒楄〃
+ subDisabled: false, //缂栬緫椤甸潰淇濆瓨鎸夐挳鏄惁绂佺敤(true绂佺敤锛宖alse鍙敤)
+ OperationType: null, //淇濆瓨绫诲瀷锛堟柊澧�1淇敼3锛�
+ HInterID: null,
+ baseURL: process.env.VUE_APP_BASE_API || "http://47.96.97.237/API/",
+ user: "admin",
+ currentRow: [],
+ lastSelectedRowIndex: null, // 鐢ㄤ簬璁板綍涓婃鐐瑰嚮鐨勮绱㈠紩
+ lastSelectedRow: null, // 涓婁竴娆￠�変腑鐨勮
+ selectedRow: null, // 褰撳墠閫変腑鐨勮
+ rowForm: {},
+ checkedSysZb: [],
+ editData: [], //鐢熶骇璧勬枡瀛愯〃
+ editBtData: [], //瀛愯〃琛ㄥご
+ activeName: "first",
+ searchOpen: false,
+ // 寮瑰嚭灞傛爣棰�
+ title: "",
+ // 鏄惁鏄剧ず寮瑰嚭灞�
+ open: false,
+ // 鏃ユ湡鑼冨洿
+ dateRange: [],
+ // 鏌ヨ鍙傛暟
+ queryParams: {
+ HOrgID: sessionStorage["OrganizationID"],
+ HName: null,
+ HNumber: null,
+ Comparator1: "",
+ Comparator2: "",
+ Comparator: "",
+ ColContent1: "",
+ ColContent2: "",
+ ColContent: "",
+ HInitTimeCycle: 29,
+ HBeginDate: dayjs(new Date()).subtract(29, "d").format("YYYY-MM-DDTHH:mm:ss"),
+ HEndDate: dayjs(new Date()).format("YYYY-MM-DDTHH:mm:ss"),
+ },
+ // 鏄剧ず鎼滅储鏉′欢
+ showSearch: true,
+ // 閫変腑鏁扮粍
+ ids: [],
+ // 闈炲崟涓鐢�
+ single: true,
+ // 闈炲涓鐢�
+ multiple: true,
+ // 閬僵灞�
+ loading: true,
+ // 绂佺敤鏃ユ湡閫夋嫨
+ disableDataPicker: true,
+ tyResList: [], //鏀舵枡閫氱煡鍗曞垪琛紙鎺ュ彛鏁版嵁锛�
+ btList: [], //鏀舵枡閫氱煡鍗曞垪琛ㄦ樉绀�
+ btResList: [],
+ tableData: [], //鏀舵枡閫氱煡鍗曞垪琛�(鍒嗛〉鏄剧ず)
+ dataList: [],
+ titleData: ["HItemID", "Hprocid", "HUSEORGID", "HCREATEORGID", "HParentID"], //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ pageSizes: [50, 100, 500, 5000, 50000],
+ page: 1,
+ pageSize: 50,
+ total: 0,
+ scollHeight: document.body.clientHeight * (38.056 / 100),
+ // 琛ㄥ崟鍙傛暟
+ form: {},
+ // 琛ㄥ崟鏍￠獙
+ rules: {
+ HSupName: [{ required: true, message: "瀹㈡埛涓嶈兘涓虹┖", trigger: "blur" }],
+ HDate: [{ required: true, message: "鏃ユ湡涓嶈兘涓虹┖", trigger: "blur" }],
+ HExRate: [{ required: true, message: "姹囩巼涓嶈兘涓虹┖", trigger: "blur" }],
+ },
+ upload: {
+ // 鏄惁鏄剧ず寮瑰嚭灞�
+ open: false,
+ // 寮瑰嚭灞傛爣棰�
+ title: "",
+ // 鏄惁绂佺敤涓婁紶
+ isUploading: false,
+ // 鏄惁鏇存柊宸茬粡瀛樺湪鐨勬暟鎹�
+ updateSupport: 0,
+ // 璁剧疆涓婁紶鐨勮姹傚ご閮�
+ // headers: { Authorization: "Bearer " + getToken() },
+ // 涓婁紶鐨勫湴鍧�
+ url: "http://47.96.97.237/API/Gy_Source/Gy_Source_Excel",
+ },
+ uploadData: [],
+ alluploadList: [],
+ uploadTableLoading: false,
+ uploadPageSizes: [50, 100, 500, 5000, 50000],
+ uploadPage: 1,
+ uploadPageSize: 50,
+ uploadTotal: 0,
+ };
+ },
+ mounted() {},
+ created() {
+ this.riqiChange();
+ this.getList();
+ },
+ methods: {
+ BillSync() {
+ axios.get(`${this.baseURL}/Kf_ICStockBillMain/GetCStockBillList`, {
+ params: { BillNo: this.form.HBillno2, BillType: 1403 },
+ });
+ },
+ onDateScanOptionChangerHandler(e) {
+ this.queryParams.timeSpan = e;
+ if (e == -1) {
+ this.disableDataPicker = true;
+ return;
+ }
+
+ this.disableDataPicker = false;
+ },
+ 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;
+ },
+
+ //#region 鑾峰彇鍏徃鍚嶏紝鏍规嵁鍏徃杩涜瀹氬埗鍖栧紑鍙�
+ defaintOperationByCompanyName() {
+ var result = false;
+ axios
+ .get(this.baseURL + "/Xt_getInfo/getCompanyName")
+ .then((res) => {
+ var data1 = res.data;
+ if (data1.count == 1) {
+ if (data1.data == "姘村姟") {
+ result = true;
+ }
+ }
+ })
+ .catch((error) => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ return result;
+ },
+ handleSellOpen() {
+ this.$router.push("/sellBill");
+ },
+ handleSellOutOpen() {
+ this.$router.push("/sellOutBill");
+ },
+ 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 = dayjs(new Date()).format("YYYY-MM-DD");
+ const start = dayjs(new Date())
+ .subtract(this.queryParams.HInitTimeCycle, "d")
+ .format("YYYY-MM-DD");
+ // 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 = start;
+ this.eTime = end;
+ this.dateRange = [this.sTime, this.eTime];
+ },
+ organizationChange(val) {
+ // let options=undefined
+ // this.form=this.organizationList.find(option => option.ID === val)?.Name || '';
+ },
+ //閮ㄩ棬寮圭獥璧嬪��
+ dbEmitData(deptRow, num) {
+ // num=1閮ㄩ棬 num=2鍑哄簱浠撳簱
+ if (num == 1) {
+ this.form.HDeptName = deptRow.閮ㄩ棬鍚嶇О;
+ this.form.HDeptID = deptRow.HItemID;
+ this.form.HEmpID = deptRow.HEmpID;
+ this.form.HManagerName = deptRow.璐熻矗浜�;
+ this.openData = false;
+ } else if (num == 2) {
+ this.editData[this.zbIndex].HWHID = deptRow.HItemID;
+ this.editData[this.zbIndex].鍙戣揣浠撳簱 = deptRow.浠撳簱鍚嶇О;
+ this.openData = false;
+ } else if (num == 3) {
+ this.editData[this.zbIndex].HMaterID = deptRow.HItemID;
+ this.editData[this.zbIndex].鐗╂枡浠ｇ爜 = deptRow.鐗╂枡浠ｇ爜;
+ this.editData[this.zbIndex].鐗╂枡鍚嶇О = deptRow.鐗╂枡鍚嶇О;
+ this.editData[this.zbIndex].HUnitID = deptRow.HUnitID;
+ this.editData[this.zbIndex].瑙勬牸鍨嬪彿 = deptRow.瑙勬牸鍨嬪彿;
+ this.editData[this.zbIndex].璁￠噺鍗曚綅 = deptRow.璁￠噺鍗曚綅鍚嶇О;
+ this.editData[this.zbIndex].HTaxPrice = deptRow.鍚◣鎴愭湰浠�;
+ this.editData[this.zbIndex].HTaxRate = deptRow.榛樿绋庣巼;
+ this.openData = false;
+ }
+ },
+ emitData(deptRow, num) {
+ this.dialogTypeNum = num;
+ this.deptform = deptRow;
+ },
+ deptClickSub() {
+ this.dbEmitData(this.deptform, this.dialogTypeNum);
+ this.deptform = {};
+ },
+ async getList() {
+ this.tableShow = false;
+ this.loading = true;
+ if (this.pageSize == 0) {
+ this.pageSize = 50;
+ }
+ this.queryParams.HOrgID = sessionStorage["OrganizationID"] - 0;
+ console.log(this.organizationList);
+ let HOrgName = this.organizationList.find((e) => e.ID == this.queryParams.HOrgID)
+ ?.Name;
+
+ // this.queryParams.HOrgID = 100038
+ // this.sWhere += ` and CONVERT(varchar(100),鏃ユ湡, 23) >= '2020-01-01' and CONVERT(varchar(100),鏃ユ湡, 23) <= '2030-01-01'`;
+ // 鏀舵枡閫氱煡鍗曞垪琛�
+
+ if (this.dateRange.length > 0) {
+ this.sWhere +=
+ " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.dateRange[0] + "'";
+ this.sWhere +=
+ " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + this.dateRange[1] + "'";
+ }
+
+ try {
+ let res = await axios.get(this.baseURL + "/Kf_ICStockBillMain/GetCStockBillList", {
+ params: {
+ sWhere: this.sWhere,
+ user: this.user,
+ Organization: HOrgName,
+ page: this.page,
+ size: this.pageSize,
+ },
+ });
+ this.tyResList = [...JSON.parse(JSON.stringify(res.data.data))]; //鎬绘暟鎹�
+ let data1 = res.data;
+ let option = [];
+ if (data1.code == 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,
+ }); //浠庢瘡涓璞′腑鎻愬彇鏁版嵁
+ }
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ 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;
+ var temp = "";
+ for (var i = 0; i < result.length; i++) {
+ if (temp != result[i]["hmainid"]) {
+ temp = result[i]["hmainid"];
+ } else {
+ result[i].鏃ユ湡 = null;
+ result[i].鍗曟嵁鍙� = "";
+ /*result[i].鐘舵�� = "";*/
+ result[i].绾㈣摑鍗曟爣璁� = "";
+ result[i].hsupid = "";
+ result[i].瀹㈡埛 = "";
+ result[i].HEmpID = "";
+ result[i].涓氬姟鍛� = "";
+ result[i].hmanagerid = "";
+ result[i].涓荤 = "";
+ result[i].hsecmanagerid = "";
+ result[i].鍙戣揣浜� = "";
+ result[i].hkeeperid = "";
+ result[i].淇濈鍛� = "";
+ result[i].HDeptID = "";
+ result[i].閮ㄩ棬 = "";
+ result[i].閿�鍞柟寮� = "";
+ }
+ }
+ option.data = result;
+ this.DisPlay_HideColumn(this.HModName, this.user, option, this.dataList);
+ }
+ } catch (err) {
+ this.$modal.msgError(`鑾峰彇鏀舵枡閫氱煡鍗曢敊璇�: ${err}`);
+ }
+ },
+ 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.HItemID)) {
+ return { background: "#ecf5ff" };
+ }
+ },
+ //鍙屽嚮琛�
+ handleDblclick(row, column, cell, event) {
+ this.OperationType = 3;
+ this.handleEdit();
+ },
+ // 澶氶�夋閫変腑鏁版嵁
+ handleSelectionChange(selection) {
+ // this.rowForm = {}
+ this.ids = selection.map((item) => item.HItemID);
+ this.single = selection.length != 1;
+ this.multiple = !selection.length;
+ if (!this.single) {
+ this.rowForm = selection[0];
+ }
+ },
+ //鎵撳紑渚ц竟鎼滅储寮圭獥
+ handleSearch() {
+ this.searchOpen = true;
+ },
+ /** 鎼滅储鎸夐挳鎿嶄綔 */
+ 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.Comparator2 + "'" + this.queryParams.ColContent + "'";
+ break;
+ }
+ this.sWhere += " and " + this.queryParams.ColName2 + " " + com2;
+ }
+ if (this.queryParams.HBillNo) {
+ this.sWhere += " and 鍗曟嵁鍙� like '%" + this.queryParams.HBillNo + "%'";
+ }
+ if (this.queryParams.HCusID) {
+ this.sWhere += " and 瀹㈡埛 like '%" + this.queryParams.HCusID + "%'";
+ }
+ if (this.queryParams.HDeptID) {
+ this.sWhere += " and 閮ㄩ棬 like '%" + this.queryParams.HDeptID + "%'";
+ }
+ if (this.queryParams.HMangerID) {
+ this.sWhere += " and 涓荤 like '%" + this.queryParams.HMangerID + "%'";
+ }
+
+ this.sWhere += this.addSWhereByOpenType();
+ // this.sWhere += this.getOrgIDByUser();
+ this.searchOpen = false;
+ this.getList();
+ },
+ // 鍒ゆ柇鏄洿鎺ユ墦寮�椤甸潰杩樻槸鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑锛屽苟鏄剧ず鐩稿簲鏁版嵁
+ addSWhereByOpenType() {
+ //鑾峰彇鍙傛暟
+ var sWhere = "";
+ //this.openPage鍒ゆ柇鏄惁鏈夊�硷紝鏈変唬琛ㄥ叾瀹冮〉闈㈤�氳繃閫夋嫨鎸夐挳鎵撳紑
+ if (this.openPage) {
+ sWhere += " and 绂佺敤鏍囪 != 'Y' and ISNULL(瀹℃牳浜�,'') != ''";
+ return sWhere;
+ }
+ return sWhere;
+ },
+ //鏍规嵁鐢ㄦ埛鑾峰彇鐢ㄦ埛鍏宠仈缁勭粐鐨勮繃婊ゆ潯浠�
+ getOrgIDByUser() {
+ var res = "";
+ axios
+ .get(this.baseURL + "/Xt_User/getOrgIDListByUser", {
+ params: {
+ HModName: this.HModName,
+ user: this.user,
+ HOrgID: this.zuzhiId,
+ },
+ })
+ .then((res) => {
+ let result = res.data;
+ if (result.count == 1) {
+ if (result.data[0].sWhere == "1") {
+ res = " and HUSEORGID = '" + this.zuzhiId + "'";
+ } else {
+ res = result.data[0].sWhere;
+ }
+ }
+ })
+ .catch((error) => {
+ res = " and 1 = 0";
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ return res;
+ },
+ /** 閲嶇疆鎸夐挳鎿嶄綔 */
+ resetQuery() {
+ this.dateRange = [];
+ this.sWhere = "";
+ Object.assign(this.Parameters, {
+ HBillNo: "",
+ HInitTimeCycle: 29,
+ HProjectNumber: "",
+ HCusID: null,
+ HMaterNumber: "",
+ HMaterName: "",
+ ColName1: "",
+ ColName2: "",
+ ColName: "",
+ Comparator1: "",
+ Comparator2: "",
+ Comparator: "",
+ ColContent1: "",
+ ColContent2: "",
+ ColContent: "",
+ });
+ this.riqiChange();
+ this.resetForm("queryForm");
+ this.getList();
+ },
+
+ //閫�鍑�
+ close() {
+ this.tableShow = true;
+ this.openEdit = false;
+ this.getList();
+ },
+ //鎵撳紑鏂板缁勪欢寮圭獥
+ handleAddEdit() {
+ this.rowForm.hmainid = 0
+ this.editShow = true
+ this.openEdit = true
+ },
+ //鎵撳紑淇敼缁勪欢寮圭獥
+ handleEdit() {
+ this.$nextTick(() => {
+ this.openEdit = true;
+ this.editShow = true;
+ });
+ },
+ //鍏抽棴缂栬緫椤甸潰
+ editGyClose(val) {
+ this.editShow = false;
+ this.openEdit = false;
+ (this.multiple = true), this.getList();
+ },
+ /** 鍒犻櫎鎸夐挳鎿嶄綔 */
+ handleDelete(form) {
+ console.log(form);
+ this.$modal
+ .confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠")
+ .then(() => {
+ if (!this.rowForm.瀹℃牳浜�) {
+ axios
+ .get(this.baseURL + "Kf_ICStockBackBill/DropKf_ICStockBackBill", {
+ params: {
+ HInterID: form.hmainid.toString(),
+ HsupId: form.hsubid,
+ HQty: form["鏁伴噺"],
+ HSourceInterID: form["婧愬崟涓诲唴鐮�"],
+ HSourceEntryID: form["婧愬崟瀛愬唴鐮�"],
+ user: this.user,
+ },
+ })
+ .then((res) => {
+ if (res.data.count == 1) {
+ this.handleQuery();
+ 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.HItemID || form.HInterID || form.hmainid;
+ //閫昏緫瀹℃牳鏂规硶
+ axios
+ .get(this.baseURL + "/Kf_ICStockBackBill/AuditKf_ICStockBackBill", {
+ params: { HInterID: InterID, IsAudit: num, CurUserName: this.user },
+ })
+ .then((res) => {
+ let result = res.data;
+ if (result.code == 1) {
+ this.$modal.msgSuccess("鎿嶄綔鎴愬姛");
+ this.getList();
+ } else {
+ this.$modal.msgError("閿欒:" + result.code + result.Message);
+ }
+ })
+ .catch((error) => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ },
+ // 鍏抽棴/鍙嶅叧闂暟鎹�
+ async set_CloseBill(num, form) {
+ let HInterID = form.HItemID || form.HInterID || form.hmainid;
+ try {
+ let res = await axios.get(
+ this.baseURL+"/Kf_ICStockBackBill/CloseKf_ICStockBackBill",
+ {
+ params: {
+ HInterID: HInterID, IsAudit: num, CurUserName: this.user
+ },
+ }
+ );
+
+ let { data, Message, count } = res.data;
+
+ if (count == 1) {
+ this.handleQuery();
+ } else {
+ this.$modal.msgError(`${Message}`);
+ }
+ } catch (err) {
+ this.$modal.msgError(`鎺ュ彛璇锋眰澶辫触: ${err}`);
+ }
+ },
+
+ // 浣滃簾/鍙嶄綔搴熸暟鎹�
+ async set_DropBill(num, form) {
+ let HInterID = form.HItemID || form.HInterID || form.hmainid;
+ try {
+ let res = await axios.get(
+ this.baseURL+"Kf_ICStockBackBill/DeleteKf_ICStockBackBill",
+ {
+ params: {
+ HInterID: HInterID, IsAudit: num, CurUserName: this.user
+ },
+ }
+ );
+
+ let { data, Message, count } = res.data;
+
+ if (count == 1) {
+ this.handleQuery();
+ } else {
+ this.$modal.msgError(`${Message}`);
+ }
+ } catch (err) {
+ this.$modal.msgError(`鎺ュ彛璇锋眰澶辫触: ${err}`);
+ }
+ },
+ // 鍙嶇鐢�/绂佺敤鏁版嵁
+ set_De_Stop(num, form) {
+ var InterID = form.HItemID || form.HInterID;
+ //閫昏緫瀹℃牳鏂规硶
+ axios
+ .get(this.baseURL + "/Gy_Employee/StopGy_Employee", {
+ params: { HInterID: InterID, IsAudit: num, CurUserName: this.user },
+ })
+ .then((res) => {
+ let result = res.data;
+ if (result.code == 1) {
+ this.$modal.msgSuccess("鎿嶄綔鎴愬姛");
+ this.getList();
+ } else {
+ this.$modal.msgError("閿欒:" + result.code + result.Message);
+ }
+ })
+ .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, `gySource_${new Date().getTime()}.xlsx`); // 瀵煎嚭鏂囦欢
+ },
+ handleImport() {
+ this.uploadData = [];
+ this.upload.isUploading = false;
+ this.upload.title = "瀵煎叆";
+ this.upload.open = true;
+ },
+ // 鏂囦欢涓婁紶涓鐞�
+ handleFileUploadProgress(event, file, fileList) {
+ this.upload.isUploading = true;
+ this.uploadTableLoading = true;
+ },
+ // 鏂囦欢涓婁紶鎴愬姛澶勭悊
+ handleFileSuccess(res, file, fileList) {
+ // this.upload.open = false;
+ this.upload.isUploading = true;
+ this.$refs.upload.clearFiles();
+ if (res.code == 1) {
+ this.alluploadList = res.data;
+ this.uploadData = this.getPage(this.uploadPage, this.alluploadList);
+ this.uploadTotal = this.alluploadList.length;
+ this.uploadTableLoading = false;
+ // this.set_AddNew(res.data)
+ } else {
+ this.$alert(
+ "<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
+ res.Message +
+ "</div>",
+ "瀵煎叆缁撴灉",
+ { dangerouslyUseHTMLString: true }
+ );
+ }
+ },
+ // 鎻愪氦涓婁紶鏂囦欢
+ submitFileForm() {
+ this.$refs.upload.submit();
+ },
+ set_AddNew() {
+ var num = [];
+ for (var i = 0; i < this.uploadData.length; i++) {
+ if (this.uploadData[i] != "") {
+ num.push(this.uploadData[i]);
+ }
+ }
+ var sSubStr = JSON.stringify(num);
+ var sMainSub = sSubStr + "&鍜�" + this.user;
+ axios({
+ method: "post",
+ url: this.baseURL + "/Gy_Source/Gy_Source_btnSave",
+ data: {
+ sMainSub: sMainSub,
+ },
+ })
+ .then((res) => {
+ this.$alert(
+ "<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
+ res.data.Message +
+ "</div>",
+ "瀵煎叆缁撴灉",
+ { dangerouslyUseHTMLString: true }
+ );
+ this.upload.open = false;
+ this.getList();
+ })
+ .catch((error) => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ },
+ uploadDataIndex({ row, rowIndex }) {
+ row.index = rowIndex + 1;
+ },
+ uploadDataDelete(row) {
+ this.$modal
+ .confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠")
+ .then(() => {
+ const deleteList = [row.index];
+ const data = this.uploadData;
+ this.uploadData = data.filter((item) => {
+ return deleteList.indexOf(item.index) == -1;
+ });
+ })
+ .catch(() => {});
+ },
+ getPage(page, list) {
+ let sindex = (parseInt(page) - 1) * this.uploadPageSize;
+ let eindex = parseInt(page) * this.uploadPageSize;
+ let newList = list.slice(sindex, eindex);
+ console.log(newList);
+ return newList;
+ },
+ currentPage(val) {
+ this.uploadPage = val.page;
+ setTimeout(() => {
+ this.uploadData = this.getPage(this.uploadPage, this.alluploadList);
+ }, 100);
+ },
+ },
+};
+</script>
+<style>
+.xsckdBox .el-date-editor.el-input {
+ width: 100%;
+}
+
+.form-item-inline > .el-form-item__content {
+ display: flex;
+ flex-direction: row;
+ width: 60%;
+}
+</style>
diff --git a/src/views/sell/Kf_ICStockBillMainList/Kf_ICStockBillMainListEdit.vue b/src/views/sell/Kf_ICStockBillMainList/Kf_ICStockBillMainListEdit.vue
new file mode 100644
index 0000000..f44a073
--- /dev/null
+++ b/src/views/sell/Kf_ICStockBillMainList/Kf_ICStockBillMainListEdit.vue
@@ -0,0 +1,1270 @@
+<template>
+ <div v-loading="formLoading" v-if="formShow">
+ <div style=" margin-bottom: 10px; border-bottom: 1px solid #f6f6f6;">
+ <el-button type="primary" @click="handleAdd(OperationType = 1)" v-if="addBtnShow">鏂板</el-button>
+ <el-button type="primary" @click="submitForm" :disabled="subDisabled">淇� 瀛�</el-button>
+ <el-button type="primary" @click="set_CheckBill(0, form)">瀹� 鏍�</el-button>
+ <el-button type="primary" @click="close">閫� 鍑�</el-button>
+ <!-- <el-button @click="cancel">鍙� 娑�</el-button> -->
+ </div>
+ <div style="margin: 10px; font-size: 28px; font-weight: bold; text-align: center;">閿�鍞��璐у崟</div>
+ <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+ <el-tabs v-model="activeName" type="card">
+ <el-tab-pane label="鍩烘湰淇℃伅" name="first">
+ <el-row>
+ <el-col :span="6">
+ <el-form-item label="鍗曟嵁缂栧彿" prop="HBillNo">
+ <el-input v-model="form.HBillNo" placeholder="璇疯緭鍏ュ崟鎹紪鍙�" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="鏃ユ湡" prop="HDate">
+ <el-date-picker v-model="form.HDate" type="date" placeholder="閫夋嫨鏃ユ湡" value-format="yyyy-MM-ddT">
+ </el-date-picker>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="婧愬崟绫诲瀷" prop="BillType">
+ <el-select v-model="form.BillType" placeholder="璇烽�夋嫨">
+ <el-option label="閿�鍞鍗�" value="1401" />
+ <el-option label="鍙戣揣閫氱煡鍗�" value="1402" />
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="婧愬崟鍙�" prop="HMainSourceBillNo">
+ <el-input v-model="form.HMainSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞彿" disabled>
+ <el-button slot="append" icon="el-icon-search"></el-button>
+ </el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="6">
+ <el-form-item label="閿�鍞憳" prop="HEmpName">
+ <el-input v-model="form.HEmpName" placeholder="璇疯緭鍏ラ攢鍞憳" disabled>
+ <el-button slot="append" icon="el-icon-search"></el-button>
+ </el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="閿�鍞儴闂�" prop="HDeptName">
+ <el-input v-model="form.HDeptName" placeholder="璇疯緭鍏ラ攢鍞儴闂�" disabled>
+ <el-button slot="append" icon="el-icon-search" @click="openDataDialog(1)"></el-button>
+ </el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="涓荤" prop="HManagerName">
+ <el-input v-model="form.HManagerName" placeholder="璇疯緭鍏ヤ富绠�" disabled>
+ <el-button slot="append" icon="el-icon-search"></el-button>
+ </el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="瀹㈡埛" prop="HSupName">
+ <el-input v-model="form.HSupName" placeholder="璇疯緭鍏ュ鎴�" disabled>
+ <el-button slot="append" icon="el-icon-search"></el-button>
+ </el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="6">
+ <el-form-item label="甯佸埆" prop="HCurName">
+ <el-input v-model="form.HCurName" placeholder="璇疯緭鍏ュ竵鍒�" disabled />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="姹囩巼" prop="HExRate">
+ <el-input v-model="form.HExRate" placeholder="璇疯緭鍏ユ眹鐜�" disabled />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="鑱旂郴浜�" prop="HLinkMan">
+ <el-input v-model="form.HLinkMan" placeholder="璇疯緭鍏ヨ仈绯讳汉">
+ <el-button slot="append" icon="el-icon-search"></el-button>
+ </el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="鑱旂郴鐢佃瘽" prop="HLinkPhone">
+ <el-input v-model="form.HLinkPhone" placeholder="璇疯緭鍏ヨ仈绯荤數璇�">
+ <el-button slot="append" icon="el-icon-search"></el-button>
+ </el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="6">
+ <el-form-item label="閿�鍞柟寮�" prop="HSellSName">
+ <el-input v-model="form.HSellSName" placeholder="璇疯緭鍏ラ攢鍞柟寮�" disabled />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="鍙戣揣浜�" prop="HSecManagerName">
+ <el-input v-model="form.HSecManagerName" placeholder="璇疯緭鍏ュ彂璐т汉" disabled />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="浠撶" prop="HKeeperName">
+ <el-input v-model="form.HKeeperName" placeholder="璇疯緭鍏ヤ粨绠�">
+ <el-button slot="append" icon="el-icon-search"></el-button>
+ </el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="鍏ュ簱浠撳簱" prop="鍙戣揣浠撳簱">
+ <el-input v-model="form.HWHName" placeholder="璇疯緭鍏ュ叆搴撲粨搴�">
+ <el-button slot="append" icon="el-icon-search"></el-button>
+ </el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-form-item label="澶囨敞" prop="HRemark">
+ <el-input v-model="form.HRemark" placeholder="璇疯緭鍏ュ娉�" />
+ </el-form-item>
+ <el-row>
+ <el-col :span="6">
+ <el-form-item label="瀹㈡埛浣欓" prop="HCusBalance">
+ <el-input v-model="form.HCusBalance" >
+ <el-button slot="append" icon="el-icon-search"></el-button>
+ </el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="淇＄敤棰濆害" prop="HCreditRating_Now">
+ <el-input v-model="form.HCreditRating_Now"/>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="鍙敤棰濆害" prop="HAvailableBalance">
+ <el-input v-model="form.HAvailableBalance" >
+ <el-button slot="append" icon="el-icon-search"></el-button>
+ </el-input>
+ </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-col>
+ </el-row>
+ <el-row>
+ <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-tab-pane>
+ </el-tabs>
+ <div style="margin-bottom: 10px;">
+ <el-button type="success" plain icon="el-icon-plus" @click="handleAddSysZb()" size="mini">澧炲姞涓�琛�</el-button>
+ <el-button type="success" plain icon="el-icon-plus" @click="handleAddSysZb(zbIndex, 1)"
+ size="mini">鎻掑叆涓�琛�</el-button>
+ <el-button type="success" plain icon="el-icon-plus" @click="handleCopyZbRow" size="mini">澶嶅埗涓�琛�</el-button>
+ <el-button type="success" plain icon="el-icon-arrow-up" @click="handleMoveRowUp(zbSelForm)"
+ size="mini">涓婄Щ</el-button>
+ <el-button type="success" plain icon="el-icon-arrow-down" @click="handleMoveRowDown(zbSelForm)"
+ size="mini">涓嬬Щ</el-button>
+ </div>
+ <el-table :data="editData" style="width: 100%" height="300" width="100%" ref="zbTable"
+ @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">
+ <template slot-scope="scope">
+ <el-input v-model="scope.row.鐗╂枡浠ｇ爜" placeholder="璇疯緭鍏ョ墿鏂欎唬鐮�" @keyup.native.f7="openDataDialog(3, scope.row)"
+ @dblclick.native="openDataDialog(3, scope.row)" />
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="鐗╂枡鍚嶇О" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.鐗╂枡鍚嶇О }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="瑙勬牸鍨嬪彿" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.瑙勬牸鍨嬪彿 }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="璁￠噺鍗曚綅" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.璁￠噺鍗曚綅 }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="搴旀敹鏁伴噺" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.HQtyMust }}</span>
+ </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;"
+ controls-position="right"></el-input-number>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="绋庣巼" width="120">
+ <template slot-scope="scope">
+ <el-input-number v-model="scope.row.HTaxRate" :min="0" style="width: 90px;"
+ controls-position="right"></el-input-number>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="鍗曚环" width="120">
+ <template slot-scope="scope">
+ <el-input-number v-model="scope.row.HPrice" :min="0" style="width: 90px;"
+ controls-position="right"></el-input-number>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="鍚◣鍗曚环" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.HPrice * (1 + scope.row.HTaxRate*0.01) }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="閲戦" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.HPrice * scope.row.HQty }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="鍚◣閲戦" width="120">
+ <template slot-scope="scope">
+ <span>{{ (scope.row.HPrice * (1 + scope.row.HTaxRate*0.01)) * scope.row.HQty }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="閲囪喘閲戦" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.HPrice * scope.row.HQty }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="鏀舵枡浠撳簱" width="120">
+ <template slot-scope="scope">
+ <el-input v-model="scope.row.鏀舵枡浠撳簱" placeholder="璇疯緭鍏ユ敹鏂欎粨搴�" @keyup.native.f7="openDataDialog(2, scope.row)"
+ @dblclick.native="openDataDialog(2, scope.row)" />
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="浠撲綅鍚嶇О" width="120">
+ <template slot-scope="scope">
+ <el-input v-model="scope.row.鏀舵枡浠撲綅" placeholder="璇疯緭鍏ヤ粨浣嶅悕绉�" @keyup.native.f7="openDataDialog(2, scope.row)"
+ @dblclick.native="openDataDialog(2, scope.row)" />
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="澶囨敞" width="120">
+ <template slot-scope="scope">
+ <el-input v-model="scope.row.HRemark" placeholder="璇疯緭鍏ュ娉�" />
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="閲囪喘鏁伴噺" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.HReqBuyQty }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="鎵规" width="120">
+ <template slot-scope="scope">
+ <el-input v-model="scope.row.HBatchNo" placeholder="璇疯緭鍏ユ壒娆�" />
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="鎿嶄綔" width="55" fixed="right">
+ <template slot-scope="scope">
+ <el-button type="danger" icon="el-icon-delete" size="mini" circle
+ @click="handleDeleteSysZb(scope.row)"></el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ </el-form>
+ <!-- 鏁版嵁寮圭獥 -->
+ <el-dialog :title="dialogTitle" :visible.sync="openData" width="1280px" append-to-body>
+ <!-- 閮ㄩ棬 -->
+ <Dept @deptEmitDb="dbEmitData" @deptEmit="emitData" v-if="deptShow" />
+ <!-- 浠撳簱 -->
+ <Warehouse @deptEmitDb="dbEmitData" @deptEmit="emitData" v-if="warehouseShow" />
+ <!-- 鐗╂枡 -->
+ <Material @deptEmitDb="dbEmitData" @deptEmit="emitData" v-if="materialShow" />
+ <div slot="footer" class="dialog-footer">
+ <el-button type="primary" @click="deptClickSub">纭� 瀹�</el-button>
+ <el-button @click="deptClose">鍙� 娑�</el-button>
+ </div>
+ </el-dialog>
+ <el-dialog title="闅愯棌鍒楄缃�" :visible.sync="openRowHide" width="816px" append-to-body>
+ <RowSettings :colName="btResList" HModName="Kf_SellOutBillList" @rowEditClose="rowSetClose" v-if="rowHideShow" />
+ </el-dialog>
+ </div>
+</template>
+
+<script>
+import { nextTick } from 'vue'
+import axios from 'axios'
+import moment from 'moment';
+import RowSettings from '@/views/component/rowSettings'
+import Dept from '@/views/component/dept'
+import Warehouse from '@/views/component/warehouse'
+import Material from '@/views/component/material'
+
+export default {
+ name: 'SellOutBill',
+ components: { Dept, Warehouse, Material, RowSettings },
+ props: {
+ OperationType: { type: Number, },
+ linterid: { type: Number, },
+ HSouceBillType: { type: String, },
+ propsData: { type: String, },
+ copyType: { type: Number, },
+ },
+ data() {
+ return {
+ baseURL: process.env.VUE_APP_BASE_API, //鍚庣鎺ュ彛鍓嶇紑(鍚庣鏈嶅姟鍣↖P)
+
+ organizationList: [], //椤甸潰鍒濆鍖栫粍缁囧垪琛�
+
+ loading: true, // 閬僵灞�
+
+ addBtnShow: false, //鏂板鎸夐挳鏄剧ず鏍囪
+ subDisabled: false, //淇濆瓨鎸夐挳绂佺敤鏍囪
+
+ formShow: false, //琛ㄥ崟鏄惁鏄剧ず鏍囪
+ formLoading: true, //琛ㄥ崟鍔犺浇閬僵
+ zzSelDis: false, //缁勭粐涓嬫媺鍒楄〃绂佺敤鏍囪
+
+ rowHideShow: false, //鍒楄缃粍浠跺鍣ㄦ樉绀烘爣璁�
+ openRowHide: false, //鍒楄缃粍浠舵樉绀烘爣璁�
+
+ dialogTitle: '', //寮圭獥鏍囬
+ openData: false, //鏁版嵁寮圭獥
+ dialogTypeNum: null, //閮ㄩ棬寮圭獥1锛屼粨搴撳脊绐�2
+ deptShow: false, //閮ㄩ棬鏁版嵁缁勪欢鏄剧ず鏍囪
+ warehouseShow: false, //浠撳簱鏁版嵁缁勪欢鏄剧ず鏍囪
+ materialShow: false, //鐗╂枡鏁版嵁缁勪欢鏄剧ず鏍囪
+ stockPlaceShow: false, //浠撲綅鏁版嵁缁勪欢鏄剧ず鏍囪
+ deptform: {}, //寮圭獥閫変腑鏁版嵁
+
+ temp: undefined, //涓存椂鍙橀噺
+ btResList: [], // 鍒楄缃�
+ form: {}, // 琛ㄥ崟鍙傛暟
+ rules: { // 琛ㄥ崟鏍￠獙
+ HSupName: [
+ { required: true, message: "瀹㈡埛涓嶈兘涓虹┖", trigger: "blur" }
+ ],
+ HDate: [
+ { required: true, message: "鏃ユ湡涓嶈兘涓虹┖", trigger: "blur" }
+ ],
+ HExRate: [
+ { required: true, message: "姹囩巼涓嶈兘涓虹┖", trigger: "blur" }
+ ]
+ },
+
+ checkedSysZb: [],
+ editData: [], //瀛愯〃鏁版嵁
+ editBtData: [], //瀛愯〃琛ㄥご
+ activeName: 'first',
+ zbIndex: null,
+ zbSelForm: {}, //瀛愯〃閫変腑鏁版嵁,鐢ㄤ簬瀛愯〃澶嶅埗銆佷笂绉汇�佷笅绉荤瓑鎿嶄綔
+
+ HInterID: null,
+ hPriceTypeList: ['鎴愭湰浠�', '缁撶畻浠�'],
+ title: "", // 寮瑰嚭灞傛爣棰�
+ open: false, // 鏄惁鏄剧ず寮瑰嚭灞�
+ dateRange: [], // 鏃ユ湡鑼冨洿
+ // 鏌ヨ鍙傛暟
+ queryParams: {
+ HBillNo: '',
+ HInitTimeCycle: 29,
+ HProjectNumber: '',
+ HCusID: null,
+ HMaterNumber: '',
+ HMaterName: '',
+ ColName1: '',
+ ColName2: '',
+ ColName: '',
+ Comparator1: '',
+ Comparator2: '',
+ Comparator: '',
+ ColContent1: '',
+ ColContent2: '',
+ ColContent: '',
+ },
+ showSearch: true, // 鏄剧ず鎼滅储鏉′欢
+ ids: [], // 瀛愯〃閫変腑鏁版嵁
+ single: true, // 闈炲崟涓鐢�
+ multiple: true, // 闈炲涓鐢�
+
+
+ };
+ },
+ created() {
+ this.fetchData()
+ this.getdata()
+ },
+ beforeDestroy() {
+ this.$destroy()
+ },
+ methods: {
+ //#region 琛ㄥ崟鏁版嵁鍒濆鍖�
+ getdata() {
+ this.formShow = false
+ this.formLoading = true
+
+ if ((this.OperationType == 1 && this.copyType != 1) || (!this.OperationType && !this.copyType)) {
+ this.handleAdd()
+ }
+ else if (this.OperationType == 3 || this.copyType == 1) {
+ this.handleUpdate()
+ }
+ else if (this.OperationType == 4) {
+ this.zzSelDis = true
+ this.handleAdd()
+ var data = this.getUrlVars_JSON();
+ var dataArray = [];
+ for (var i = 0; i < data.length; i++) {
+ // this.getPushSourceBillInit(data[i].hmainid, data[i].hsubid);
+ axios.get(this.baseURL + '/Xs_SeOrderBill/loadXs_SeOrderBill_Push', {
+ params: {
+ "HInterID": data[i].hmainid
+ , "HSubID": data[i].hsubid
+ },
+ }).then(response => {
+ let result = response.data
+ if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ this.temp = result.data[0];
+ } else {
+ this.temp = result.data;
+ }
+ if (this.temp) {
+ dataArray.push(this.temp);
+ this.form.HDeptID = dataArray[0].HDeptID
+ this.form.HDeptName = dataArray[0].閮ㄩ棬
+ this.form.HEmpID = dataArray[0].HEmpID
+ this.form.HEmpName = dataArray[0].涓氬姟鍛�
+ this.form.HManagerID = dataArray[0].HManagerID
+ this.form.HManagerName = dataArray[0].涓荤
+ this.form.HMainSourceInterID = "0"
+ this.form.HMainSourceEntryID = "0"
+ this.form.HMainSourceBillNo = ""
+ this.form.HMainSourceBillType = dataArray[0].HBillType
+ this.form.HSupID = dataArray[0].HCusID
+ this.form.HSupName = dataArray[0].瀹㈡埛
+ this.form.HLinkMan = dataArray[0].鑱旂郴浜�
+ this.form.HLinkPhone = dataArray[0].鑱旂郴鐢佃瘽
+ this.form.HSellSID = dataArray[0].HSellSID
+ this.form.HSellSName = dataArray[0].閿�鍞柟寮�
+ this.form.HCurID = dataArray[0].HCurID
+ this.form.HCurName = dataArray[0].甯佸埆
+ this.form.HExRate = dataArray[0].姹囩巼
+ for (var i = 0; i < dataArray.length; i++) {
+ this.editData.push(
+ {
+ "HMaterID": dataArray[i].HMaterID
+ , "鐗╂枡浠ｇ爜": dataArray[i].鐗╂枡浠ｇ爜
+ , "鐗╂枡鍚嶇О": dataArray[i].鐗╂枡鍚嶇О
+ , "瑙勬牸鍨嬪彿": dataArray[i].瑙勬牸鍨嬪彿
+ , "HUnitID": dataArray[i].HUnitID
+ , "璁￠噺鍗曚綅": dataArray[i].璁￠噺鍗曚綅
+ , "HQtyMust": dataArray[i].鏁伴噺.toFixed(6)
+ , "HQty": dataArray[i].鏁伴噺.toFixed(6)
+ , "HPieceQty": "0"
+ , "HPrice": dataArray[i].鍗曚环.toFixed(4)
+ , "HTaxPrice": dataArray[i].瀹為檯鍚◣鍗曚环.toFixed(4)
+ , "HTaxRate": dataArray[i].绋庣巼
+ , "HMoney": dataArray[i].閲戦.toFixed(2)
+ , "HTaxMoney": dataArray[i].浠风◣鍚堣.toFixed(2)
+ , "HWHID": dataArray[i].HWHID
+ , "鍙戣揣浠撳簱": dataArray[i].HWHName
+ , "HRemark": ""
+ , "HQty_Full": "0"
+ , "HQty_Empty": "0"
+ , "HQty_Back": "0"
+ , "HCostPrice": "0"
+ , "HCostMoney": "0"
+ , "HSalePrice": "0"
+ , "HSeOrderInterID": dataArray[i].hmainid
+ , "HSeOrderEntryID": dataArray[i].hsubid
+ , "HSeOrderBillNo": dataArray[i].鍗曟嵁鍙�
+ , "HSourceInterID": dataArray[i].hmainid
+ , "HSourceEntryID": dataArray[i].hsubid
+ , "HSourceBillNo": dataArray[i].鍗曟嵁鍙�
+ , "HSourceBillType": dataArray[i].HBillType
+ , "HRelationQty": "0"
+ , "HRelationMoney": "0"
+ , 'HSPID': "0"
+ , 'HSPName': ""
+ , 'HSPGroupID': "0"
+ , "HSPGroupName": ""
+ , 'HSCWHID': "0"
+ , 'HSCWHName': ""
+ , 'HSCSPID': "0"
+ , 'HSCSPName': ""
+ , 'HBatchNo': ""
+ , 'HPOOrderInterID': "0"
+ , 'HPOOrderEntryID': "0"
+ , 'HPOOrderBillNo': ""
+ , 'HPropertyID': "0"
+ , 'HPropertyName': ""
+ , 'HSecUnitID': "0"
+ , 'HSecUnitName': ""
+ , 'HSecUnitRate': "0"
+ , 'HEngineNum': ""
+ , 'HUnderPanNum': ""
+ , 'HLeaveFactCard': ""
+ , 'HReqBuyQty': "0"
+ , 'HReqOutQty': "0"
+ , 'HCurrentInventory': "0"
+ }
+ );
+ }
+ }
+ this.$nextTick(() => {
+ this.formShow = true
+ this.formLoading = false
+ })
+ }).catch(error => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ }
+ }
+ },
+ //#endregion
+
+ //#region 椤甸潰鏁版嵁鍒濆鍖�
+ reset() {
+ this.form = {
+ HInterID: 0,
+ HBillNo: "",
+ HDate: new Date(),
+ HEmpID: 0,
+ HEmpName: "",
+ HDeptID: 0,
+ HDeptName: "",
+ HSupID: 0,
+ HSupName: "",
+ HInvoiceBillNo: "",
+ HWHID: 0,
+ HWHName: "",
+ HSecManagerID: 0,
+ HSecManagerName: "",
+ HRemark: "",
+ HOrgID: sessionStorage["OrganizationID"] - 0,
+ HMaker: sessionStorage["HUserName"],
+ HChecker: "",
+ HCloseMan: "",
+ HUpDater: "",
+ HDeleteMan: "",
+ HMakeDate: "",//new Date().format("yyyy-MM-dd hh:mm:ss"),
+ HCheckDate: "",
+ HCloseDate: "",
+ HUpDateDate: "",
+ HDeleteDate: "",
+ BillType: '1402',
+ HBillSubType: '1205',
+ HSTOCKORGID: sessionStorage["OrganizationID"] - 0,//缁勭粐id
+ HOWNERID: sessionStorage["OrganizationID"] - 0,
+
+
+ HManagerID: 0,
+ HManagerName:"",
+ HKeeperID: 0,
+ HKeeperName: "",
+ HProjectID: 0,
+ HProjectNumber: "",
+ HProjectName: "",
+
+
+ HCurID: 0,
+ HCurName: '',
+ HExRate: 1,
+ HSourceBillType: "",
+ HMainSourceInterID: 0,
+ HMainSourceEntryID: 0,
+ HMainSourceBillType: '',
+ HMainSourceBillNo: '',
+ HExplanation :"",
+ HInnerBillNo: "",
+ }
+ this.editData = []
+ this.editBtData = []
+ this.ids = []
+ this.subDisabled = false
+ this.addBtnShow = false
+ // this.$refs.tableData.clearSelection()
+ this.activeName = 'first'
+ this.resetForm("form");
+ },
+ //#endregion
+
+ //#region 鏂板鎸夐挳鎿嶄綔
+ handleAdd() {
+ this.reset()
+ //鏂板鑾峰彇鍗曟嵁鍙�
+ this.getHBillNo()
+ if (this.OperationType == 1) {
+ this.handleAddSysZb()
+ }
+ this.$nextTick(() => {
+ this.formShow = true
+ this.formLoading = false
+ })
+ },
+ //#endregion
+
+ //#region 缂栬緫椤甸潰鍒濆鍖�
+ handleUpdate() {
+ this.reset()
+ let rowHmainid = this.linterid
+ console.log("rowHmainid", rowHmainid)
+ axios.get(this.baseURL + "Kf_ICStockBackBill/getEditInitData", {
+ params: { 'HInterID': rowHmainid }
+ }).then(response => {
+ if (response.data.count == 1) {
+ var result = response.data
+ var data = response.data.data[0]
+ this.form.BillType = data.HSourceBillType
+ if (this.copyType == 1) {
+ this.getHBillNo()
+ }
+ else {
+ this.form.HInterID = data.hmainid
+ this.form.HBillNo = data.鍗曟嵁鍙�
+ this.form.HDate = data.鏃ユ湡
+ this.form.HMaker = data.鍒跺崟浜�
+ this.form.HUpDater = data.淇敼浜�
+ this.form.HChecker = data.瀹℃牳浜�
+ this.form.HMakeDate = data.鍒跺崟鏃ユ湡
+ this.form.HUpDateDate = data.淇敼鏃ユ湡
+ this.form.HCheckDate = data.瀹℃牳鏃ユ湡
+ this.form.HCloseMan = data.鍏抽棴浜�
+ this.form.HDeleteMan = data.浣滃簾浜�
+ this.form.HCloseDate = data.鍏抽棴鏃ユ湡
+ this.form.HDeleteDate = data.浣滃簾鏃ユ湡
+ }
+ this.form.HEmpID= data.HEmpID
+ this.form.HEmpName= data.涓氬姟鍛�
+ this.form.HDeptID= data.HDeptID
+ this.form.HDeptName= data.閮ㄩ棬
+ this.form.HSupID= data.HSupID
+ this.form.HSupName= data.渚涘簲鍟�
+ this.form.HInvoiceBillNo= data.鍙戠エ缂栧彿
+ this.form.HWHID= data.涓昏〃浠撳簱ID
+ this.form.HWHName= data.涓昏〃浠撳簱
+ this.form.HSecManagerID= data.HSecManagerID
+ this.form.HSecManagerName= data.楠屾敹鍛�
+ this.form.HRemark= data.琛ㄥご澶囨敞
+ this.form.HOrgID = data.HOrgID
+ this.form.HSTOCKORGID = data.HOrgID
+ this.form.HOWNERID = data.HOrgID
+
+ this.form.HKeeperID= data.HKeeperID
+ this.form.HKeeperName= data.淇濈鍛�
+ this.form.HSourceBillType= data.婧愬崟绫诲瀷
+ this.form.HManagerID= data.HManagerID
+ this.form.HManagerName= data.璐熻矗浜�
+ this.form.HExRate= data.姹囩巼
+ this.form.HProjectID= data.HProjectID
+ this.form.HProjectNumber= data.椤圭洰浠ｇ爜
+ this.form.HProjectName= data.椤圭洰鍚嶇О
+ this.form.HCurID = data.HCurID
+ this.form.HCurName = data.甯佸埆
+ this.form.HExRate = data.姹囩巼
+ this.form.HBillSubType = data.HBillSubType
+ this.form.HMainSourceInterID = data.HMainSourceInterID
+ this.form.HMainSourceEntryID = data.HMainSourceEntryID
+ this.form.HMainSourceBillType = data.HMainSourceBillType
+ this.form.HMainSourceBillNo = data.HMainSourceBillNo
+ this.form.HExplanation =data.鎽樿
+ this.form.HInnerBillNo= data.鍐呴儴鍗曟嵁鍙�
+
+ //瀛愯〃 璧嬪��
+ // for (var i = 0; i < result.data.length; i++) {
+ // this.editData.push(
+ // {
+ // "HMaterID": result.data[i].HMaterID
+ // , "鐗╂枡浠ｇ爜": result.data[i].鐗╂枡浠ｇ爜
+ // , "鐗╂枡鍚嶇О": result.data[i].鐗╂枡鍚嶇О
+ // , "瑙勬牸鍨嬪彿": result.data[i].瑙勬牸鍨嬪彿
+ // , "HUnitID": result.data[i].HUnitID
+ // , "璁￠噺鍗曚綅": result.data[i].璁￠噺鍗曚綅
+ // , "HQtyMust": result.data[i].搴旀敹鏁伴噺
+ // , "HQty": result.data[i].瀹炴敹鏁伴噺
+ // , "HRemark": result.data[i].琛ㄤ綋澶囨敞
+ // , "HPrice": result.data[i].鍗曚环
+ // , "HMoney": result.data[i].閲戦
+ // , "HOrderPrice": result.data[i].閲囪喘閲戦
+ // , "HWHID": result.data[i].HWHID
+ // , "鏀舵枡浠撳簱": result.data[i].鏀舵枡浠撳簱
+ // , "HSPID": result.data[i].HSPID
+ // , "浠撲綅鍚嶇О": result.data[i].浠撲綅鍚嶇О
+ // , "HBatchNo": result.data[i].鎵规
+ // , "HSourceBillNo": result.data[i].婧愬崟鍗曞彿 //婧愬崟鍙�
+ // , "HSourceBillType": result.data[i].婧愬崟绫诲瀷 //婧愬崟绫诲瀷
+ // , "HSourceInterID": result.data[i].婧愬崟涓诲唴鐮� //婧愬崟涓诲唴鐮�
+ // , "HSourceEntryID": result.data[i].婧愬崟瀛愬唴鐮� //婧愬崟瀛愬唴鐮�
+ // , "HTaxRate": result.data[i].绋庣巼
+ // , "HTaxPrice": result.data[i].鍚◣鍗曚环
+ // , "HlineTotal": result.data[i].鍚◣閲戦
+ // }
+ // )
+ // }
+
+ if (data.鐘舵�� != '鍒涘缓' && this.copyType != 1) {
+ this.$modal.msgError("姝ゆ潯鏁版嵁涓嶆槸鍒涘缓鐘舵�侊紝涓嶈兘淇敼");
+ this.subDisabled = true
+ }
+ this.formShow = true
+ this.formLoading = false
+
+ }
+ }).catch(error => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ },
+ //#endregion
+
+ //#region 鍒楄缃�
+ handleRowHide() {
+ this.rowHideShow = true
+ this.openRowHide = true
+ },
+ rowSetClose(val) {
+
+ this.rowHideShow = false
+ this.openRowHide = val
+ this.$destroy()
+ },
+ //#endregion
+
+ //#region 缁勭粐鍊煎彉鏇翠簨浠�
+ organizationChange(val) {
+ // let options=undefined
+ // this.form=this.organizationList.find(option => option.ID === val)?.Name || '';
+ },
+ //#endregion
+
+ //#region 鏁版嵁寮圭獥
+ //#region 鎵撳紑鏁版嵁鍒楄〃寮圭獥
+ openDataDialog(num, row) {
+ if (row) {
+ this.zbIndex = row.index - 1
+ }
+ this.showReset()
+ if (num == 1) {
+ this.dialogTitle = '閮ㄩ棬鍒楄〃'
+ this.deptShow = true
+ this.openData = true
+ } else if (num == 2) {
+ this.dialogTitle = '鍑哄簱浠撳簱鍒楄〃'
+ this.warehouseShow = true
+ this.openData = true
+ } else if (num == 3) {
+ this.dialogTitle = '鐗╂枡鍒楄〃'
+ this.materialShow = true
+ this.openData = true
+ }else if (num == 4) {
+ this.dialogTitle = '浠撲綅鍒楄〃'
+ this.stockPlaceShow = true
+ this.openData = true
+ }
+ },
+ //#region 灏嗘暟鎹脊绐楀叏閮ㄥ彇娑堝姞杞�
+ showReset() {
+ this.deptShow = false
+ this.warehouseShow = false
+ this.materialShow = false
+ },
+ //#endregion
+ //#endregion
+
+ //#region 寮圭獥鏁版嵁鍙屽嚮杩斿洖琛ㄥ崟璧嬪�间簨浠�
+ dbEmitData(deptRow, num) {
+ if (num == 1) {
+ this.form.HDeptName = deptRow.閮ㄩ棬鍚嶇О //閮ㄩ棬
+ this.form.HDeptID = deptRow.HItemID
+ this.form.HEmpID = deptRow.HEmpID
+ this.form.HManagerName = deptRow.璐熻矗浜�
+ this.openData = false
+ }
+ else if (num == 2) { //鏀舵枡浠撳簱
+ this.editData[this.zbIndex].HWHID = deptRow.HItemID;
+ this.editData[this.zbIndex].鏀舵枡浠撳簱 = deptRow.浠撳簱鍚嶇О;
+ this.openData = false
+ }
+ else if (num == 4) { //浠撲綅
+ this.editData[this.zbIndex].HSPID = deptRow.HItemID;
+ this.editData[this.zbIndex].浠撲綅鍚嶇О = deptRow.浠撲綅鍚嶇О;
+ this.openData = false
+ }
+ else if (num == 3) { //鐗╂枡
+ this.editData[this.zbIndex].HMaterID = deptRow.HItemID;
+ this.editData[this.zbIndex].鐗╂枡浠ｇ爜 = deptRow.鐗╂枡浠ｇ爜;
+ this.editData[this.zbIndex].鐗╂枡鍚嶇О = deptRow.鐗╂枡鍚嶇О;
+ this.editData[this.zbIndex].HUnitID = deptRow.HUnitID;
+ this.editData[this.zbIndex].瑙勬牸鍨嬪彿 = deptRow.瑙勬牸鍨嬪彿
+ this.editData[this.zbIndex].璁￠噺鍗曚綅 = deptRow.璁￠噺鍗曚綅鍚嶇О
+ this.editData[this.zbIndex].HTaxPrice = deptRow.鍚◣鎴愭湰浠�
+ this.editData[this.zbIndex].HTaxRate = deptRow.榛樿绋庣巼
+ this.openData = false
+ }
+ },
+ //#endregion
+
+ //#region 寮圭獥鏁版嵁鍗曞嚮浜嬩欢
+ emitData(deptRow, num) {
+ this.dialogTypeNum = num
+ this.deptform = deptRow
+ },
+ //#endregion
+
+ //#region 寮圭獥纭畾浜嬩欢
+ deptClickSub() {
+ this.dbEmitData(this.deptform, this.dialogTypeNum)
+ this.deptform = {}
+ },
+ //#endregion
+
+ //#region 寮圭獥鍙栨秷浜嬩欢
+ deptClose() {
+ this.deptform = {}
+ this.openData = false
+ },
+ //#endregion
+ //#endregion
+
+ //#region 宸ュ叿鏍忔寜閽搷浣�
+ //#region 缂栬緫鎻愪氦淇濆瓨
+ submitForm() {
+ this.$refs["form"].validate(valid => {
+ if (valid) {
+ let fhck = false
+ this.editData.map((item, index) => {
+ if (!item.鍙戣揣浠撳簱) {
+ fhck = true
+ this.$modal.msgError("绗�" + (index + 1) + "琛岋細鍙戣揣浠撳簱鏈�夋嫨锛�");
+ }
+ })
+ this.$nextTick(() => {
+ if (!fhck) {
+ var sMainStr = JSON.stringify(this.form);
+ var sSubStr = JSON.stringify(this.editData);
+ var sMainSub = sMainStr + ';' + sSubStr + ';' + sessionStorage["HUserName"] + ';' + this.OperationType;
+ axios({
+ method: 'post',
+ url: this.baseURL + "/Kf_SellOutBill/SaveSellOutBillList",
+ data: {
+ 'msg': sMainSub
+ },
+ }).then(response => {
+ if (response.data.count == 1) {
+ this.subDisabled = true//璁剧疆淇濆瓨鎸夐挳涓嶅彲鐢�
+ this.$modal.msgSuccess(response.data.Message);
+ this.get_MAXNum_Task(1);//璁剧疆娴佹按鍙峰鍔�
+ if (response.data.Verify == "Y") //鑷姩瀹℃牳
+ {
+ this.set_CheckBill(0, this.form); //瀹℃牳
+ }
+ this.addBtnShow = true
+ }
+ }).catch(error => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ }
+ })
+ }
+ });
+ },
+ //#endregion
+
+ //#region 鍙嶅鏍�/瀹℃牳鏁版嵁
+ set_CheckBill(num, form) {
+ var InterID = form.hmainid || form.HInterID
+ //閫昏緫瀹℃牳鏂规硶
+ axios.get(this.baseURL + "/Kf_SellOutBill/AuditKf_SellOutBill", {
+ params: { "HInterID": InterID, "IsAudit": num, "CurUserName": sessionStorage["HUserName"] }
+ }).then(response => {
+ let result = response.data
+ if (result.code == 1) {
+ this.$modal.msgSuccess('鎿嶄綔鎴愬姛');
+ }
+ else {
+ this.$modal.msgError("閿欒:" + result.code + result.Message,);
+ }
+ }).catch(error => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ },
+ //#endregion
+
+ //#region 閫�鍑烘寜閽搷浣�
+ close() {
+ this.reset()
+
+ if (!this.OperationType && !this.copyType) {
+ // this.$router.back()
+ window.close()
+ } else {
+ this.formShow = false
+
+ this.$emit('editCloseGy', false)
+ //this.$emit('editClose', false)
+ }
+ },
+ //#endregion
+ //#endregion
+
+ //#region 瀛愯〃鎿嶄綔
+ //#region 璁剧疆瀛愯〃搴忓彿鍒�
+ rowSysZbIndex({ row, rowIndex }) {
+ row.index = rowIndex + 1;
+ },
+ //#endregion
+
+ //#region 瀛愯〃鏂板銆佹彃鍏ユ寜閽搷浣�
+ handleAddSysZb(index, num) {
+ if (num == 1 && !index) {
+ this.$modal.msgError("璇烽�夋嫨涓�琛屾暟鎹紪杈�!");
+ } else {
+ let obj = {
+ HMaterID: 0,
+ 鐗╂枡浠ｇ爜: '',
+ 鐗╂枡鍚嶇О: '',
+ 瑙勬牸鍨嬪彿: '',
+ HUnitID: 0,
+ 璁￠噺鍗曚綅: '',
+ HQtyMust: 1,
+ HQty: 1,
+ HPieceQty: 0,
+ HPrice: 0,
+ HTaxPrice: 0,
+ HTaxRate: 0,
+ HMoney: 0,
+ HTaxMoney: 0,
+ HWHID: 0,
+ 鍙戣揣浠撳簱: '',
+ HRemark: '',
+ HQty_Full: 0,
+ HQty_Empty: 0,
+ HQty_Back: 0,
+ HCostPrice: 0,
+ HCostMoney: 0,
+ HSalePrice: 0,
+ HSeOrderInterID: 741,
+ HSeOrderEntryID: 18,
+ HSeOrderBillNo: 'XSFH00000747',
+ HSourceInterID: 741,
+ HSourceEntryID: 18,
+ HSourceBillNo: 'XSFH00000747',
+ HSourceBillType: 1402,
+ HRelationQty: 0,
+ HRelationMoney: 0,
+ HSPID: 0,
+ HSPName: '',
+ HSPGroupID: 0,
+ HSPGroupName: '',
+ HSCWHID: 0,
+ HSCWHName: '',
+ HSCSPID: 0,
+ HSCSPName: '',
+ HBatchNo: '',
+ HPOOrderInterID: 0,
+ HPOOrderEntryID: 0,
+ HPOOrderBillNo: '',
+ HPropertyID: 0,
+ HPropertyName: '',
+ HSecUnitID: 0,
+ HSecUnitName: '',
+ HSecUnitRate: 0,
+ HEngineNum: '',
+ HUnderPanNum: '',
+ HLeaveFactCard: '',
+ HReqBuyQty: 0,
+ HReqOutQty: 0,
+ HCurrentInventory: 0,
+ }
+ if (index) {
+ this.editData.splice(index, 0, obj);
+ this.$set(this.editData, index, obj)
+ } else {
+ this.editData.push(obj);
+ }
+ }
+ },
+ //#endregion
+
+ //#region 瀛愯〃澶嶅埗鎸夐挳
+ handleCopyZbRow() {
+ if (!this.zbIndex) {
+ this.$modal.msgError("璇烽�夋嫨涓�琛屾暟鎹�")
+ } else {
+ let copyRow = JSON.parse(JSON.stringify(this.zbSelForm))
+ this.editData.push(copyRow);
+ }
+ },
+ //#endregion
+
+ //#region 瀛愯〃涓婄Щ鎸夐挳
+ handleMoveRowUp(zbSelForm) {
+ if (!this.zbIndex) {
+ this.$modal.msgError("璇烽�夋嫨涓�琛屾暟鎹�")
+ } else {
+ if (zbSelForm.index == 1) {
+ this.$modal.msgError("绗竴琛屾暟鎹棤娉曚笂绉�");
+ } else { // 纭繚涓嶆槸绗竴琛�
+ let num = zbSelForm.index - 1
+ const record = this.editData.splice(num, 1)[0];
+ this.editData.splice(num - 1, 0, record);
+ }
+ }
+ },
+ //#endregion
+
+ //#region 瀛愯〃涓嬬Щ鎸夐挳
+ handleMoveRowDown(zbSelForm) {
+ if (!this.zbIndex) {
+ this.$modal.msgError("璇烽�夋嫨涓�琛屾暟鎹�")
+ } else {
+ if (zbSelForm.index == this.editData.length) {
+ this.$modal.msgError("鏈�鍚庝竴琛屾暟鎹棤娉曚笅绉�");
+ } else { // 纭繚涓嶆槸绗竴琛�
+ let num = zbSelForm.index - 1
+ const record = this.editData.splice(num, 1)[0];
+ this.editData.splice(num + 1, 0, record);
+ }
+ }
+ },
+ //#endregion
+
+ //#region 瀛愯〃鍒犻櫎鎸夐挳
+ handleDeleteSysZb(row) {
+ this.checkedSysZb = []
+ this.checkedSysZb.push(row.index)
+ if (this.checkedSysZb.length == 0) {
+ this.$modal.msgError("璇峰厛閫夋嫨瑕佸垹闄ょ殑鍟嗗搧璁㈠崟鏄庣粏鏁版嵁");
+ } else {
+ const editData = this.editData;
+ const checkedSysZb = this.checkedSysZb;
+ this.editData = editData.filter(function (item) {
+ return checkedSysZb.indexOf(item.index) == -1
+ });
+ }
+ },
+ //#endregion
+
+ //#region 瀛愯〃澶嶉�夋閫変腑鏁版嵁
+ handleTableZbEdit(selection) {
+ this.checkedSysZb = selection.map(item => item.index)
+ this.zbSelForm = selection[0]
+ this.zbIndex = this.checkedSysZb[0]
+ if (selection.length > 1) {
+ const del_row = selection.shift()
+ this.$refs.zbTable.toggleRowSelection(del_row, false) //璁剧疆杩欎竴琛屽彇娑堥�変腑
+ }
+ },
+ //#endregion
+ //#endregion
+
+ //#region 閫氱敤鏂规硶銆�
+ //#region 鑾峰彇鍙傛暟_浼犻�掔殑JSON鏍煎紡鍙傛暟
+ getUrlVars_JSON() {
+ var datajson;
+ var str = this.propsData; //鑾峰彇閾炬帴涓紶閫掔殑鍙傛暟
+ var arr = str.substring(str.lastIndexOf("=") + 1);
+ datajson = JSON.parse(decodeURI(arr));
+ return datajson;
+ },
+ //#endregion
+
+ //#region 缁勭粐涓嬫媺鍒楄〃鏁版嵁鍒濆鍖�
+ fetchData() {
+ axios.get(this.baseURL + "/Web/GetOrganizations", {
+ }).then(response => {
+ if (response.data.count == 1) {
+ this.organizationList = response.data.data;//缁勭粐鍒楄〃
+ }
+ }).catch(error => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ },
+ //#endregion
+
+ //#region 鑾峰彇鍐呯爜銆佸崟鎹彿
+ getHBillNo() {
+ axios.get(this.baseURL + "/WEBSController/GetMaxBillNoAndID_Json", {
+ params: {
+ HBillType: '1201'
+ }
+ }).then(response => {
+ this.form.HBillNo = response.data.data[0].HBillNo
+ this.form.HInterID = response.data.data[0].HInterID
+ }).catch(error => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ },
+ //#endregion
+
+ //#region 鑾峰彇鏈�澶у崟鎹彿
+ get_MAXNum_Task(Type) {
+ var sql = `exec h_p_Xt_GetMaxBillNo_SubType '1201','${this.form.HDate}',0,0,0,'${Type}','${this.form.HDeptID}'`;
+ axios({
+ method: 'get',
+ url: this.baseURL + "/CommonModel/searchMethod",
+ params: { "sql": sql, "user": sessionStorage["HUserName"], "ModRightNameCheck": "" },
+ }).then(response => {
+ if (response.data.count == 1) {
+ this.form.HBillNo = response.data.data[0].HBillNo;
+ } else {
+ this.$modal.msgError(response.data.code + response.data.Message);
+ }
+ }).catch(error => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ },
+ //#endregion
+
+ //#region 鏍规嵁鐢ㄦ埛鑾峰彇瀵瑰簲鑱屽憳銆侀儴闂ㄣ�侀攢鍞富绠�
+ getCzyglByUser() {
+ axios.get(this.baseURL + '/Xs_SeOrderBill/getCzyglByUser', {
+ params: { "CurUserName": sessionStorage["HUserName"] }
+ }).then(response => {
+ let dataForm = response.data.data[0]
+ this.form.HDeptID = dataForm.HDeptID
+ this.form.HDeptName = dataForm.HDeptName
+ this.form.HEmpID = dataForm.HEmpID
+ this.form.HEmpName = dataForm.HEmpName
+ this.form.HManagerID = dataForm.HManagerID
+ this.form.HManagerName = dataForm.HManagerName
+ }).catch(error => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ },
+ //#endregion
+
+ //#region 鏍规嵁瀹㈡埛鑾峰彇瀹㈡埛浣欓
+ getCustomerBalance(HCusID) {
+ axios.get(this.baseURL + '/Xs_CusRatingChangeBill/getCustomerBalance', {
+ params: { "HCusID": HCusID, 'CurUserName': sessionStorage["HUserName"] }
+ }).then(response => {
+ var data = response.data.data[0];
+ this.form.HCusBalance = data.HCusBalance
+ this.form.HCreditRating_Now = data.HCreditRating_Now
+ this.form.HAvailableBalance = data.HAvailableBalance
+ }).catch(error => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ },
+ //#endregion
+
+ //#region 鏍规嵁瀹㈡埛甯﹀嚭鑱旂郴浜恒�佽仈绯荤數璇�
+ getCustomerByCusID(HCusID) {
+ axios.get(this.baseURL + "/Xs_SeOrderBill/getCustomerByCusID", {
+ params: {
+ HCusID: HCusID
+ }
+ }).then(response => {
+ this.form.鑱旂郴浜� = response.data.data[0].HLinkMan
+ this.form.鑱旂郴鐢佃瘽 = response.data.data[0].HLinkPhone
+ // this.form = response.data.data[0]
+
+ }).catch(error => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ },
+ //#endregion
+
+ //#region 鑾峰彇閿�鍞嚭搴撳崟瀵瑰簲鐨勬潯鐮佹槑缁�
+ getBarCodeNoteBySellOutBill(rowHmainid) {
+ axios.get(this.baseURL + '/Kf_SellOutBill/BarCodeNote', {
+ params: { "HInterID": rowHmainid }
+ }).then(response => {
+ if (response.data.count == 1) {
+ if (response.data.data[2].length > 0) {
+ this.$modal.msgError("褰撳墠鍗曟嵁鐢辨壂鐮佺敓鎴愶紝涓嶅彲浠ョ紪杈戯紒");
+ this.subDisabled = true
+ }
+ } else { }
+ }).catch(error => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ },
+ //#endregion
+
+ //#region 鏍规嵁涓诲唴鐮佷笌瀛愬唴鐮佽幏鍙栨簮鍗曢攢鍞鍗曟暟鎹�
+ getPushSourceBillInit(HSourceInterID, HSourceEntryID) {
+ axios.get(this.baseURL + '/Xs_SeOrderBill/loadXs_SeOrderBill_Push', {
+ params: {
+ "HInterID": HSourceInterID
+ , "HSubID": HSourceEntryID
+ },
+ }).then(response => {
+ let result = response.data
+ if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ this.temp = result.data[0];
+ } else {
+ this.temp = result.data;
+ }
+ }).catch(error => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ },
+ //#endregion
+ //#endregion
+
+
+
+
+
+ }
+};
+</script>
+<style>
+.xsckdBox .el-date-editor.el-input {
+ width: 100%;
+}
+</style>
diff --git a/src/views/sell/XsSeOutStockBackBillEdit.vue b/src/views/sell/XsSeOutStockBackBillEdit.vue
index 8152077..4960eb4 100644
--- a/src/views/sell/XsSeOutStockBackBillEdit.vue
+++ b/src/views/sell/XsSeOutStockBackBillEdit.vue
@@ -839,8 +839,10 @@
//閫�鍑�
close() {
this.reset();
-
- if (!this.OperationType2 && !this.copyType) {
+ if (window.top != window.self) {
+ // iframe 椤甸潰 璋冪敤鐖堕〉闈㈢殑鍑芥暟鍏抽棴寮圭獥
+ window.parent.editGyClose();
+ } else if (!this.OperationType2 && !this.copyType) {
// this.$router.back()
window.close();
} else {
@@ -948,41 +950,43 @@
var result = response.data;
var data = response.data.data[0];
this.form.BillType = data.HSourceBillType;
- Object.assign(this.form, {
- HBillNo: data.鍗曟嵁鍙�,
- HDate: dayjs(data.鏃ユ湡).format("YYYY-MM-DD"),
- HInnerBillNo: data.閿�鍞鍗曞彿,
- HDeptID: data.HDeptID,
- HDeptName: data.閮ㄩ棬,
- HEmpID: data.HEmpID,
- HEmpName: data.涓氬姟鍛�,
- HManagerID: data.HManagerID,
- HManagerName: data.涓荤,
- HSSID: data.HSSID,
- HSSName: data.缁撶畻鏂瑰紡,
- HCurID: data.HCurID,
- HCurName: data.甯佸埆,
- HExRate: data.姹囩巼,
- HWHID: data.HWHID_Main,
- HWHName: data.浠撳簱,
- HCusID: data.HCusID,
- HCusName: data.瀹㈡埛,
- HAddress: data.浜よ揣鍦扮偣,
- HProjectID: data.HProjectID,
- HProjectNumber: data.椤圭洰缂栫爜,
- HProjectName: data.椤圭洰鍚嶇О,
- HRemark: data.琛ㄥご澶囨敞,
- HExplanation: data.鎽樿,
- HSourceBillType: data.婧愬崟绫诲瀷,
- HMaker: data.鍒跺崟浜�,
- HChecker: data.瀹℃牳浜�,
- HCloseMan: data.鍏抽棴浜�,
- HMakeDate: data.鍒跺崟鏃ユ湡,
- HCheckDate: data.瀹℃牳鏃ユ湡,
- HCloseDate: data.鍏抽棴鏃ユ湡,
- HUpDateDate: data.淇敼鏃ユ湡,
- HDeleteDate: data.浣滃簾鏃ユ湡,
- });
+ this.form = {
+ ...{
+ HBillNo: data.鍗曟嵁鍙�,
+ HDate: dayjs(data.鏃ユ湡).format("YYYY-MM-DD"),
+ HInnerBillNo: data.閿�鍞鍗曞彿,
+ HDeptID: data.HDeptID,
+ HDeptName: data.閮ㄩ棬,
+ HEmpID: data.HEmpID,
+ HEmpName: data.涓氬姟鍛�,
+ HManagerID: data.HManagerID,
+ HManagerName: data.涓荤,
+ HSSID: data.HSSID,
+ HSSName: data.缁撶畻鏂瑰紡,
+ HCurID: data.HCurID,
+ HCurName: data.甯佸埆,
+ HExRate: data.姹囩巼,
+ HWHID: data.HWHID_Main,
+ HWHName: data.浠撳簱,
+ HCusID: data.HCusID,
+ HCusName: data.瀹㈡埛,
+ HAddress: data.浜よ揣鍦扮偣,
+ HProjectID: data.HProjectID,
+ HProjectNumber: data.椤圭洰缂栫爜,
+ HProjectName: data.椤圭洰鍚嶇О,
+ HRemark: data.琛ㄥご澶囨敞,
+ HExplanation: data.鎽樿,
+ HSourceBillType: data.婧愬崟绫诲瀷,
+ HMaker: data.鍒跺崟浜�,
+ HChecker: data.瀹℃牳浜�,
+ HCloseMan: data.鍏抽棴浜�,
+ HMakeDate: data.鍒跺崟鏃ユ湡,
+ HCheckDate: data.瀹℃牳鏃ユ湡,
+ HCloseDate: data.鍏抽棴鏃ユ湡,
+ HUpDateDate: data.淇敼鏃ユ湡,
+ HDeleteDate: data.浣滃簾鏃ユ湡,
+ },
+ };
if (this.copyType == 1) {
this.getHBillNo();
let date = new Date();
diff --git a/src/views/sell/XsSeOutStockBackBillList.vue b/src/views/sell/XsSeOutStockBackBillList.vue
index ec0c6fd..f73c289 100644
--- a/src/views/sell/XsSeOutStockBackBillList.vue
+++ b/src/views/sell/XsSeOutStockBackBillList.vue
@@ -9,15 +9,23 @@
class="searchBox"
>
<el-row>
- <el-form-item label="鏃ユ湡" style="margin-left: 100px">
+ <el-form-item label="寮�濮嬫棩鏈�" style="margin-left: 100px">
<el-date-picker
- v-model="dateRange"
- value-format="yyyy-MM-dd"
- type="daterange"
- range-separator="-"
- start-placeholder="寮�濮嬫棩鏈�"
- end-placeholder="缁撴潫鏃ユ湡"
- ></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
@@ -776,10 +784,18 @@
uploadTotal: 0,
};
},
- mounted() {},
+ mounted() {
+ window.editGyClose = () => {
+ this.editGyClose(); // 缁勪欢鍐呯殑鏂规硶缁戝畾鍒皐indows
+ };
+ },
created() {
this.riqiChange();
this.getList();
+ },
+ beforeDestroy() {
+ // 缁勪欢閿�姣佹椂娓呯悊鍏ㄥ眬鏂规硶锛岄伩鍏嶅唴瀛樻硠婕�
+ delete window.editGyClose;
},
methods: {
BillSync() {
@@ -875,7 +891,6 @@
// const ddE = String(end.getDate()).padStart(2, "0");
this.sTime = start;
this.eTime = end;
- this.dateRange = [this.sTime, this.eTime];
},
organizationChange(val) {
// let options=undefined
@@ -929,11 +944,9 @@
// this.sWhere += ` and CONVERT(varchar(100),鏃ユ湡, 23) >= '2020-01-01' and CONVERT(varchar(100),鏃ユ湡, 23) <= '2030-01-01'`;
// 鏀舵枡閫氱煡鍗曞垪琛�
- if (this.dateRange.length > 0) {
- this.sWhere +=
- " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.dateRange[0] + "'";
- this.sWhere +=
- " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + this.dateRange[1] + "'";
+ if (this.sTime && this.eTime) {
+ this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.sTime + "'";
+ this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + this.eTime + "'";
}
try {
@@ -1189,7 +1202,7 @@
},
//閫変腑琛岄珮浜牱寮�
rowStyle({ row, rowIndex }) {
- if (this.ids.includes(row.HItemID)) {
+ if (this.ids.includes(row.hmainid)) {
return { background: "#ecf5ff" };
}
},
@@ -1201,7 +1214,7 @@
// 澶氶�夋閫変腑鏁版嵁
handleSelectionChange(selection) {
// this.rowForm = {}
- this.ids = selection.map((item) => item.HItemID);
+ this.ids = selection.map((item) => item.hmainid);
this.single = selection.length != 1;
this.multiple = !selection.length;
if (!this.single) {
@@ -1285,6 +1298,7 @@
}
this.sWhere += " and " + this.queryParams.ColName2 + " " + com2;
}
+
if (this.queryParams.HBillNo) {
this.sWhere += " and 鍗曟嵁鍙� like '%" + this.queryParams.HBillNo + "%'";
}
diff --git a/src/views/sell/XsSeOutStockBill.vue b/src/views/sell/XsSeOutStockBill.vue
index 814a3c1..3ee1ef7 100644
--- a/src/views/sell/XsSeOutStockBill.vue
+++ b/src/views/sell/XsSeOutStockBill.vue
@@ -9,15 +9,23 @@
class="searchBox"
>
<el-row>
- <el-form-item label="鏃ユ湡" style="margin-left: 100px">
+ <el-form-item label="寮�濮嬫棩鏈�" style="margin-left: 100px">
<el-date-picker
- v-model="dateRange"
- value-format="yyyy-MM-dd"
- type="daterange"
- range-separator="-"
- start-placeholder="寮�濮嬫棩鏈�"
- end-placeholder="缁撴潫鏃ユ湡"
- ></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
@@ -784,11 +792,19 @@
uploadTotal: 0,
};
},
- mounted() {},
+ mounted() {
+ window.editGyClose = () => {
+ this.editGyClose(); // 缁勪欢鍐呯殑鏂规硶缁戝畾鍒皐indows
+ };
+ },
created() {
this.queryParams.HOrgID = sessionStorage["OrganizationID"];
this.riqiChange();
this.getList();
+ },
+ beforeDestroy() {
+ // 缁勪欢閿�姣佹椂娓呯悊鍏ㄥ眬鏂规硶锛岄伩鍏嶅唴瀛樻硠婕�
+ delete window.editGyClose;
},
methods: {
BillSync() {
@@ -933,11 +949,9 @@
// this.sWhere += ` and CONVERT(varchar(100),鏃ユ湡, 23) >= '2020-01-01' and CONVERT(varchar(100),鏃ユ湡, 23) <= '2030-01-01'`;
// 鏀舵枡閫氱煡鍗曞垪琛�
- if (this.dateRange.length > 0) {
- this.sWhere +=
- " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.dateRange[0] + "'";
- this.sWhere +=
- " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + this.dateRange[1] + "'";
+ if (this.sTime && this.eTime) {
+ this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.sTime + "'";
+ this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + this.eTime + "'";
}
let Organization = this.organizationList.find(
(e) => (e.ID = this.queryParams.HOrgID)
@@ -1291,6 +1305,7 @@
}
this.sWhere += " and " + this.queryParams.ColName2 + " " + com2;
}
+
if (this.queryParams.HBillNo) {
this.sWhere += " and 鍗曟嵁鍙� like '%" + this.queryParams.HNumber + "%'";
}
diff --git a/src/views/sell/XsSeOutStockBillEdit.vue b/src/views/sell/XsSeOutStockBillEdit.vue
index 72622a5..0824847 100644
--- a/src/views/sell/XsSeOutStockBillEdit.vue
+++ b/src/views/sell/XsSeOutStockBillEdit.vue
@@ -144,8 +144,8 @@
<el-option
v-for="(item, index) in HSourceBillTypeList"
:key="index"
- :label="item"
- :value="item"
+ :label="item.label"
+ :value="item.value"
>
</el-option>
</el-select>
@@ -519,6 +519,7 @@
created() {
this.fetchData();
this.getdata();
+ this.getHSourceBillType();
},
beforeDestroy() {
if (window.parent) {
@@ -528,6 +529,32 @@
}
},
methods: {
+ getHSourceBillType() {
+ axios
+ .get(`${this.baseURL}/Web/GetHSourceBillType`, {
+ params: {
+ HName: "鍙戣揣閫氱煡鍗�",
+ Num: 2,
+ },
+ })
+ .then((res) => {
+ let { data, count, Message } = res.data;
+ if (count == 1) {
+ // 鑾峰彇鎴愬姛
+ this.HSourceBillTypeList = Array.from(data).map((e) => {
+ return {
+ label: e.HSourceBillTypeName,
+ value: e.HSourceBillType,
+ };
+ });
+ } else {
+ this.$modal.msgError(`鑾峰彇婧愬崟绫诲瀷澶辫触: ${Message}`);
+ }
+ })
+ .catch((err) => {
+ this.$modal.msgError(`鑾峰彇婧愬崟绫诲瀷澶辫触: ${err}`);
+ });
+ },
fetchData() {
axios
.get(this.baseURL + "/Web/GetOrganizations", {})
@@ -835,8 +862,10 @@
//閫�鍑�
close() {
this.reset();
-
- if (!this.OperationType2 && !this.copyType) {
+ if (window.top != window.self) {
+ // iframe 椤甸潰 璋冪敤鐖堕〉闈㈢殑鍑芥暟鍏抽棴寮圭獥
+ window.parent.editGyClose();
+ } else if (!this.OperationType2 && !this.copyType) {
// this.$router.back()
window.close();
} else {
@@ -944,49 +973,51 @@
var result = response.data;
var data = response.data.data[0];
this.form.BillType = data.HSourceBillType;
- Object.assign(this.form, {
- HBillNo: data.鍗曟嵁鍙�,
- HInterID: data.hmainid,
- HDate: dayjs(data.鏃ユ湡).format("YYYY-MM-DD"),
- HSeOrderBillNo_M: data.閿�鍞鍗曞彿,
- HEmpID: data.HEmpID,
- HEmpName: data.涓氬姟鍛�,
- HCusID: data.HCusID,
- HCusName: data.瀹㈡埛,
- HWHID: data.涓讳粨搴揑D,
- HWHName: data.涓诲彂璐т粨搴�,
- HAddress: data.浜よ揣鍦板潃,
- HDeptName: data.閮ㄩ棬,
- HDeptID: data.HDeptID,
- HCurID: data.HCurID,
- HCurName: data.甯佸埆,
- HSSID: data.HSSID,
- HSSName: data.缁撶畻鏂瑰紡,
- HExRate: data.姹囩巼,
- HManagerName: data.涓荤,
- HManagerID: data.HManagerID,
- HSourceBillType: data.婧愬崟绫诲瀷,
- HLinkMan: data.鑱旂郴浜�,
- HLinkPhone: data.鑱旂郴鐢佃瘽,
- //, "HConveyCompID": data.杩愯緭鍏徃
- //, "HConveyTypeID": data.杩愯緭鏂瑰紡
- //, "HConveyMoney": data.杩愯垂
- //, "HDFflag": data.鏄惁鍨粯
- HProjectID: data.HProjectID,
- HProjectNumber: data.椤圭洰缂栫爜,
- HProjectName: data.椤圭洰鍚嶇О,
+ this.form = {
+ ...{
+ HBillNo: data.鍗曟嵁鍙�,
+ HInterID: data.hmainid,
+ HDate: dayjs(data.鏃ユ湡).format("YYYY-MM-DD"),
+ HSeOrderBillNo_M: data.閿�鍞鍗曞彿,
+ HEmpID: data.HEmpID,
+ HEmpName: data.涓氬姟鍛�,
+ HCusID: data.HCusID,
+ HCusName: data.瀹㈡埛,
+ HWHID: data.涓讳粨搴揑D,
+ HWHName: data.涓诲彂璐т粨搴�,
+ HAddress: data.浜よ揣鍦板潃,
+ HDeptName: data.閮ㄩ棬,
+ HDeptID: data.HDeptID,
+ HCurID: data.HCurID,
+ HCurName: data.甯佸埆,
+ HSSID: data.HSSID,
+ HSSName: data.缁撶畻鏂瑰紡,
+ HExRate: data.姹囩巼,
+ HManagerName: data.涓荤,
+ HManagerID: data.HManagerID,
+ HSourceBillType: data.婧愬崟绫诲瀷,
+ HLinkMan: data.鑱旂郴浜�,
+ HLinkPhone: data.鑱旂郴鐢佃瘽,
+ //, "HConveyCompID": data.杩愯緭鍏徃
+ //, "HConveyTypeID": data.杩愯緭鏂瑰紡
+ //, "HConveyMoney": data.杩愯垂
+ //, "HDFflag": data.鏄惁鍨粯
+ HProjectID: data.HProjectID,
+ HProjectNumber: data.椤圭洰缂栫爜,
+ HProjectName: data.椤圭洰鍚嶇О,
- Box2: "",
- HRemark: data.琛ㄥご澶囨敞,
- HMaker: data.鍒跺崟浜�,
- HChecker: data.瀹℃牳浜�,
- HCloseMan: data.鍏抽棴浜�,
- HMakeDate: data.鍒跺崟鏃ユ湡,
- HCheckDate: data.瀹℃牳鏃ユ湡,
- HCloseDate: data.鍏抽棴鏃ユ湡,
- HUpDateDate: data.淇敼鏃ユ湡,
- HDeleteDate: data.浣滃簾鏃ユ湡,
- });
+ Box2: "",
+ HRemark: data.琛ㄥご澶囨敞,
+ HMaker: data.鍒跺崟浜�,
+ HChecker: data.瀹℃牳浜�,
+ HCloseMan: data.鍏抽棴浜�,
+ HMakeDate: data.鍒跺崟鏃ユ湡,
+ HCheckDate: data.瀹℃牳鏃ユ湡,
+ HCloseDate: data.鍏抽棴鏃ユ湡,
+ HUpDateDate: data.淇敼鏃ユ湡,
+ HDeleteDate: data.浣滃簾鏃ユ湡,
+ },
+ };
if (this.copyType == 1) {
this.getHBillNo();
let date = new Date();
diff --git a/src/views/sell/sellOut/sellOutBill.vue b/src/views/sell/sellOut/sellOutBill.vue
index c07dc36..e94af0f 100644
--- a/src/views/sell/sellOut/sellOutBill.vue
+++ b/src/views/sell/sellOut/sellOutBill.vue
@@ -1,41 +1,90 @@
<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;">
+ <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
+ 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-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-input
+ v-model="queryParams.HBillNo"
+ placeholder="璇疯緭鍏ュ崟鎹彿"
+ @keyup.enter.native="handleQuery"
+ />
</el-form-item>
<el-form-item label="椤圭洰缂栧彿" prop="HBillNo">
- <el-input v-model="queryParams.HProjectNumber" placeholder="璇疯緭鍏ラ」鐩紪鍙�" @keyup.enter.native="HProjectNumber" />
+ <el-input
+ v-model="queryParams.HProjectNumber"
+ placeholder="璇疯緭鍏ラ」鐩紪鍙�"
+ @keyup.enter.native="HProjectNumber"
+ />
</el-form-item>
<el-form-item label-width="78px">
- <el-button type="primary" icon="el-icon-search" @click="handleQuery"> 鎼� 绱�</el-button>
+ <el-button type="primary" icon="el-icon-search" @click="handleQuery">
+ 鎼� 绱�</el-button
+ >
<el-button icon="el-icon-circle-close" @click="resetQuery">閲� 缃�</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="HCusID">
- <el-input v-model="queryParams.HCusID" placeholder="璇疯緭鍏ュ鎴�" @keyup.enter.native="handleQuery" />
+ <el-input
+ v-model="queryParams.HCusID"
+ placeholder="璇疯緭鍏ュ鎴�"
+ @keyup.enter.native="handleQuery"
+ />
</el-form-item>
<el-form-item label="鐗╂枡浠ｇ爜" prop="HMaterNumber">
- <el-input v-model="queryParams.HMaterNumber" placeholder="璇疯緭鍏ョ墿鏂欎唬鐮�" @keyup.enter.native="handleQuery" />
+ <el-input
+ v-model="queryParams.HMaterNumber"
+ placeholder="璇疯緭鍏ョ墿鏂欎唬鐮�"
+ @keyup.enter.native="handleQuery"
+ />
</el-form-item>
<el-form-item label="鐗╂枡鍚嶇О" prop="HMaterName">
- <el-input v-model="queryParams.HMaterName" placeholder="璇疯緭鍏ョ墿鏂欏悕绉�" @keyup.enter.native="handleQuery" />
+ <el-input
+ v-model="queryParams.HMaterName"
+ placeholder="璇疯緭鍏ョ墿鏂欏悕绉�"
+ @keyup.enter.native="handleQuery"
+ />
</el-form-item>
<div slot="header" class="clearfix"><span>杩囨护</span></div>
<div>
@@ -43,21 +92,41 @@
<el-form-item label-width="0">
<el-row>
<el-col :span="7">
- <el-select v-model="queryParams.ColName1" placeholder="璇烽�夋嫨" @change="riqiChange">
+ <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>
+ <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-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-input
+ v-model="queryParams.ColContent1"
+ placeholder="璇疯緭鍏�"
+ clearable
+ @keyup.enter.native="handleQuery"
+ />
</el-col>
</el-row>
</el-form-item>
@@ -66,22 +135,42 @@
<el-form-item label-width="0">
<el-row>
<el-col :span="7">
- <el-select v-model="queryParams.ColName2" placeholder="璇烽�夋嫨" @change="riqiChange">
+ <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>
+ <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-col :span="6" style="padding: 0 10px">
+ <el-select
+ v-model="queryParams.Comparator2"
+ 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>
+ <el-option
+ :label="item.field"
+ :value="item.field"
+ v-if="!item.hide"
+ ></el-option>
</span>
</el-select>
</el-col>
<el-col :span="11">
- <el-input v-model="queryParams.ColContent2" placeholder="璇疯緭鍏�" clearable
- @keyup.enter.native="handleQuery" />
+ <el-input
+ v-model="queryParams.ColContent2"
+ placeholder="璇疯緭鍏�"
+ clearable
+ @keyup.enter.native="handleQuery"
+ />
</el-col>
</el-row>
</el-form-item>
@@ -89,20 +178,40 @@
<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
+ 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-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-input
+ v-model="queryParams.ColContent"
+ placeholder="璇疯緭鍏�"
+ clearable
+ @keyup.enter.native="handleQuery"
+ />
</el-col>
</el-row>
</el-form-item>
@@ -111,78 +220,196 @@
</el-collapse-item>
</el-collapse>
</el-form>
- <el-row :gutter="10" class="mb8" style="margin-top: 10px;">
+ <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-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-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-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
+ 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(0, form = rowForm)">瀹℃牳</el-button>
+ <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-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-download" size="mini" @click="handleExport">瀵煎嚭</el-button>
+ <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-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-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">
+ <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-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="handleEdit(row, OperationType = 3)"
- v-else-if="column.property == '鍗曟嵁鍙�'">{{
- row.鍗曟嵁鍙�
- }}</el-button>
+ <span v-if="column.property.includes('鏃ユ湡')">{{
+ parseTime(row[column.property], "{y}-{m}-{d}")
+ }}</span>
+ <el-button
+ type="text"
+ @click="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="Kf_SellOutBillList" @rowEditClose="rowSetClose"
- v-if="rowHideShow" />
+ <pagination
+ v-show="total > 0"
+ :total="total"
+ :page.sync="page"
+ :limit.sync="pageSize"
+ :pageSizes="pageSizes"
+ @pagination="getList"
+ />
+ <el-dialog
+ title="闅愯棌鍒楄缃�"
+ :visible.sync="openRowHide"
+ width="816px"
+ append-to-body
+ >
+ <RowSettings
+ :colName="btResList"
+ HModName="Kf_SellOutBillList"
+ @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
+ 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='Kf_SellOutBillList'
- HModName='Kf_SellOutBillList' @rowEditClose="rowSetClose" v-if="printListShow" />
+ <el-dialog
+ title="鎵撳嵃妯℃澘閫夋嫨"
+ :visible.sync="openPrintList"
+ width="800px"
+ append-to-body
+ >
+ <PrintList
+ :linterid="this.rowForm.hmainid"
+ :MyMsg="this.rowForm.hmainid"
+ Type="Kf_SellOutBillList"
+ HModName="Kf_SellOutBillList"
+ @rowEditClose="rowSetClose"
+ v-if="printListShow"
+ />
<!-- <div>111</div> -->
</el-dialog>
</div>
@@ -190,18 +417,18 @@
</template>
<script>
-import axios from 'axios'
-import RowSettings from '@/views/component/rowSettings'
-import Edit from '@/views/sell/sellOut/sellOutBillEdit'
-import PrintList from '@/views/component/printList'
-import moment from 'moment';
+import axios from "axios";
+import RowSettings from "@/views/component/rowSettings";
+import Edit from "@/views/sell/sellOut/sellOutBillEdit";
+import PrintList from "@/views/component/printList";
+import moment from "moment";
export default {
- name: 'SellOutBill',
+ name: "SellOutBill",
components: { RowSettings, Edit, PrintList },
data() {
return {
- activeSeach: '',
+ activeSeach: "",
editShow: false,
openEdit: false,
totalNameList: [],
@@ -214,36 +441,36 @@
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' },
+ { 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: '',
+ 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 },
+ { 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 },
],
- hPriceTypeList: ['鎴愭湰浠�', '缁撶畻浠�'],
+ hPriceTypeList: ["鎴愭湰浠�", "缁撶畻浠�"],
addBtnShow: false,
- dialogTitle: '',
- OperationType: null,//淇濆瓨绫诲瀷锛堟柊澧�1淇敼3锛�
+ dialogTitle: "",
+ OperationType: null, //淇濆瓨绫诲瀷锛堟柊澧�1淇敼3锛�
HInterID: null,
baseURL: process.env.VUE_APP_BASE_API,
lastSelectedRowIndex: null, // 鐢ㄤ簬璁板綍涓婃鐐瑰嚮鐨勮绱㈠紩
@@ -256,21 +483,21 @@
open: false,
// 鏌ヨ鍙傛暟
queryParams: {
- HBillNo: '',
+ HBillNo: "",
HInitTimeCycle: 29,
- HProjectNumber: '',
+ HProjectNumber: "",
HCusID: null,
- HMaterNumber: '',
- HMaterName: '',
- ColName1: '',
- ColName2: '',
- ColName: '',
- Comparator1: '',
- Comparator2: '',
- Comparator: '',
- ColContent1: '',
- ColContent2: '',
- ColContent: '',
+ HMaterNumber: "",
+ HMaterName: "",
+ ColName1: "",
+ ColName2: "",
+ ColName: "",
+ Comparator1: "",
+ Comparator2: "",
+ Comparator: "",
+ ColContent1: "",
+ ColContent2: "",
+ ColContent: "",
},
// 閫変腑鏁扮粍
ids: [],
@@ -280,12 +507,27 @@
multiple: true,
// 閬僵灞�
loading: true,
- tyResList: [],//閿�鍞嚭搴撳垪琛紙鎺ュ彛鏁版嵁锛�
- btList: [],//閿�鍞嚭搴撹〃澶村垪琛ㄦ樉绀�
+ tyResList: [], //閿�鍞嚭搴撳垪琛紙鎺ュ彛鏁版嵁锛�
+ btList: [], //閿�鍞嚭搴撹〃澶村垪琛ㄦ樉绀�
btResList: [],
- tableData: [],//閿�鍞嚭搴撳垪琛�(鍒嗛〉鏄剧ず)
+ tableData: [], //閿�鍞嚭搴撳垪琛�(鍒嗛〉鏄剧ず)
dataList: [],
- titleData: ["hmainid", "hsupid", "HEmpID", "hmanagerid", "hsecmanagerid", "鍙戣揣浜�", "hkeeperid", "淇濈鍛�", "HDeptID", "閿�鍞柟寮�", "hsubid", "hmaterid", "hunitid", "HWHID"],//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ titleData: [
+ "hmainid",
+ "hsupid",
+ "HEmpID",
+ "hmanagerid",
+ "hsecmanagerid",
+ "鍙戣揣浜�",
+ "hkeeperid",
+ "淇濈鍛�",
+ "HDeptID",
+ "閿�鍞柟寮�",
+ "hsubid",
+ "hmaterid",
+ "hunitid",
+ "HWHID",
+ ], //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
pageSizes: [50, 100, 500, 5000, 50000],
page: 1,
pageSize: 0,
@@ -294,7 +536,7 @@
},
created() {
// this.fetchData()
- this.riqiChange()
+ this.riqiChange();
this.getList();
},
@@ -304,12 +546,12 @@
const sums = [];
columns.forEach((column, index) => {
if (index === 0) {
- sums[index] = '鍚堣';
+ sums[index] = "鍚堣";
return;
}
- const values = data.map(item => Number(item[column.property]));
+ const values = data.map((item) => Number(item[column.property]));
if (this.totalNameList[index].totalRow) {
- if (!values.every(value => isNaN(value))) {
+ if (!values.every((value) => isNaN(value))) {
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr);
if (!isNaN(value)) {
@@ -317,10 +559,9 @@
} else {
return prev;
}
- }, 0)
-
+ }, 0);
} else {
- sums[index] = '';
+ sums[index] = "";
}
}
}, 1000);
@@ -328,253 +569,296 @@
},
handleBtnHide() {
- this.btnHideShow = true
- this.openBtnHide = true
+ this.btnHideShow = true;
+ this.openBtnHide = true;
},
handleRowHide() {
- this.rowHideShow = true
- this.openRowHide = true
+ this.rowHideShow = true;
+ this.openRowHide = true;
},
rowSetClose(val) {
- this.rowHideShow = false
- this.tableShow = true
- this.openRowHide = val
- this.getList()
+ 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 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
+ 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
+ this.pageSize = 50;
+ this.tableShow = false;
+ this.loading = true;
if (this.sTime) {
- this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.sTime + "'"
- this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + this.eTime + "'"
+ this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.sTime + "'";
+ this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + this.eTime + "'";
}
if (this.pageSize == 0) {
- this.pageSize = 50
+ this.pageSize = 50;
}
// 閿�鍞嚭搴撳崟鍒楄〃
- axios.get(this.baseURL + '/Kf_SellOutBill/GetSellOutBillList_byPage', {
- params: {
- "sWhere": this.sWhere,
- "user": sessionStorage["HUserName"],
- "Organization": sessionStorage["Organization"],
- "page": this.page,
- "size": this.pageSize
- },
- }).then(response => {
- this.tyResList = response.data.data//鎬绘暟鎹�
- let data1 = response.data
- let option = []
- if (data1.code == 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 });//浠庢瘡涓璞′腑鎻愬彇鏁版嵁
- }
- //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
- 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 });
+ axios
+ .get(this.baseURL + "/Kf_SellOutBill/GetSellOutBillList_byPage", {
+ params: {
+ sWhere: this.sWhere,
+ user: sessionStorage["HUserName"],
+ Organization: sessionStorage["Organization"],
+ page: this.page,
+ size: this.pageSize,
+ },
+ })
+ .then((response) => {
+ this.tyResList = response.data.data; //鎬绘暟鎹�
+ let data1 = response.data;
+ let option = [];
+ if (data1.code == 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,
+ }); //浠庢瘡涓璞′腑鎻愬彇鏁版嵁
}
- else {
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ 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;
+ var temp = "";
+ for (var i = 0; i < result.length; i++) {
+ if (temp != result[i]["hmainid"]) {
+ temp = result[i]["hmainid"];
+ } else {
+ result[i].鏃ユ湡 = null;
+ result[i].鍗曟嵁鍙� = "";
+ /*result[i].鐘舵�� = "";*/
+ result[i].绾㈣摑鍗曟爣璁� = "";
+ result[i].hsupid = "";
+ result[i].瀹㈡埛 = "";
+ result[i].HEmpID = "";
+ result[i].涓氬姟鍛� = "";
+ result[i].hmanagerid = "";
+ result[i].涓荤 = "";
+ result[i].hsecmanagerid = "";
+ result[i].鍙戣揣浜� = "";
+ result[i].hkeeperid = "";
+ result[i].淇濈鍛� = "";
+ result[i].HDeptID = "";
+ result[i].閮ㄩ棬 = "";
+ result[i].閿�鍞柟寮� = "";
+ }
}
+ option.data = result;
+ let HModName = "Kf_SellOutBillList";
+ this.DisPlay_HideColumn(
+ HModName,
+ sessionStorage["HUserName"],
+ option,
+ this.dataList
+ );
}
- option.cols = [col]
- this.dataList = option
- option.data = data1.data;
- var result = data1.data;
- var temp = "";
- for (var i = 0; i < result.length; i++) {
- if (temp != result[i]["hmainid"]) {
- temp = result[i]["hmainid"];
- } else {
- result[i].鏃ユ湡 = null;
- result[i].鍗曟嵁鍙� = "";
- /*result[i].鐘舵�� = "";*/
- result[i].绾㈣摑鍗曟爣璁� = "";
- result[i].hsupid = "";
- result[i].瀹㈡埛 = "";
- result[i].HEmpID = "";
- result[i].涓氬姟鍛� = "";
- result[i].hmanagerid = "";
- result[i].涓荤 = "";
- result[i].hsecmanagerid = "";
- result[i].鍙戣揣浜� = "";
- result[i].hkeeperid = "";
- result[i].淇濈鍛� = "";
- result[i].HDeptID = "";
- result[i].閮ㄩ棬 = "";
- result[i].閿�鍞柟寮� = "";
- }
- }
-
- option.data = result;
- let HModName = "Kf_SellOutBillList"
- this.DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option, this.dataList);
- }
- }).catch(error => {
- this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
- });
+ })
+ .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;
+ 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 (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;
+ //閬嶅巻寰幆鍚庡垽鏂搴斿垪鏁版槸鍚︿竴鑷�
+ 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";
+ 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;
+ //璁剧疆鍒楁帓搴�
+ 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)
+ 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;
}
- })
- if (data1.data[0].HPageSize == 0) {
- this.pageSize = 50
+ this.tableData = option.data;
+ this.tableShow = true;
+ this.loading = false;
} else {
- this.pageSize = data1.data[0].HPageSize
+ 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;
}
- 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("鎺ュ彛璇锋眰澶辫触!");
- });
+ })
+ .catch((error) => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
},
- renderHeader(h, { column, $index }) {// 鏂板缓涓�涓� span
- let span = document.createElement(span)// 璁剧疆琛ㄥご鍚嶇О
- span.innerText = column.label
+ 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)
+ 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) {
@@ -586,27 +870,27 @@
//閫変腑琛岄珮浜牱寮�
rowStyle({ row, rowIndex }) {
if (this.ids.includes(row.hmainid)) {
- return { "background": "#ecf5ff" }
+ return { background: "#ecf5ff" };
}
},
//鍙屽嚮琛�
handleDblclick(row, column, cell, event) {
- this.OperationType = 3
- this.handleEdit()
+ 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
+ this.ids = selection.map((item) => item.hmainid);
+ this.single = selection.length != 1;
+ this.multiple = !selection.length;
if (!this.single) {
- this.rowForm = selection[0]
+ this.rowForm = selection[0];
}
},
/** 鎼滅储鎸夐挳鎿嶄綔 */
handleQuery() {
- this.sWhere = ''
+ this.sWhere = "";
if (this.queryParams.ColName && this.queryParams.Comparator) {
var com = "";
switch (this.queryParams.Comparator) {
@@ -623,7 +907,8 @@
com = "not like'%" + this.queryParams.ColContent + "%'";
break;
default:
- com = "" + this.queryParams.Comparator + "'" + this.queryParams.ColContent + "'";
+ com =
+ "" + this.queryParams.Comparator + "'" + this.queryParams.ColContent + "'";
break;
}
this.sWhere += " and " + this.queryParams.ColName + " " + com;
@@ -644,7 +929,12 @@
com1 = "not like'%" + this.queryParams.ColContent1 + "%'";
break;
default:
- com1 = "" + this.queryParams.Comparator1 + "'" + this.queryParams.ColContent1 + "'";
+ com1 =
+ "" +
+ this.queryParams.Comparator1 +
+ "'" +
+ this.queryParams.ColContent1 +
+ "'";
break;
}
this.sWhere += " and " + this.queryParams.ColName1 + " " + com1;
@@ -665,16 +955,23 @@
com2 = "not like'%" + this.queryParams.ColContent2 + "%'";
break;
default:
- com2 = "" + this.queryParams.Comparator + "'" + this.queryParams.ColContent + "'";
+ 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 + "'";
+ 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 + "%'";
@@ -691,130 +988,146 @@
if (this.queryParams.HMaterName) {
this.sWhere += " and 鐗╂枡鍚嶇О like '%" + this.queryParams.HMaterName + "%'";
}
- this.getList()
+ this.getList();
},
/** 閲嶇疆鎸夐挳鎿嶄綔 */
resetQuery() {
- this.sWhere = ''
+ this.sWhere = "";
this.queryParams = {
- HBillNo: '',
+ HBillNo: "",
HInitTimeCycle: 29,
- HProjectNumber: '',
+ HProjectNumber: "",
HCusID: null,
- HMaterNumber: '',
- HMaterName: '',
- ColName1: '',
- ColName2: '',
- ColName: '',
- Comparator1: '',
- Comparator2: '',
- Comparator: '',
- ColContent1: '',
- ColContent2: '',
- ColContent: '',
- }
- this.riqiChange()
- this.resetForm("queryForm")
- this.getList()
+ HMaterNumber: "",
+ HMaterName: "",
+ ColName1: "",
+ ColName2: "",
+ ColName: "",
+ Comparator1: "",
+ Comparator2: "",
+ Comparator: "",
+ ColContent1: "",
+ ColContent2: "",
+ ColContent: "",
+ };
+ this.riqiChange();
+ this.resetForm("queryForm");
+ this.getList();
},
//閫�鍑�
close() {
// this.reset()
- this.tableShow = true
- this.openEdit = false
- this.editShow = false
- this.getList()
+ this.tableShow = true;
+ this.openEdit = false;
+ this.editShow = false;
+ this.getList();
},
//鎵撳紑鏂板缁勪欢寮圭獥
handleAddEdit() {
- this.rowForm.hmainid = 0
- this.editShow = true
- this.openEdit = true
+ this.rowForm.hmainid = 0;
+ this.editShow = true;
+ this.openEdit = true;
},
//鎵撳紑淇敼缁勪欢寮圭獥
handleEdit(row) {
- this.rowForm = row
- this.editShow = true
- this.openEdit = true
+ this.rowForm = row;
+ this.editShow = true;
+ this.openEdit = true;
},
//鍏抽棴缂栬緫椤甸潰
editClose(val) {
- this.open = val
- this.editShow = false
- this.openEdit = val
- this.getList()
+ this.open = val;
+ this.editShow = false;
+ this.openEdit = val;
+ this.getList();
},
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete() {
- this.$modal.confirm('纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠').then(() => {
- if (this.rowForm.鐘舵�� == "鍒涘缓") {
- axios.get(this.baseURL + "/Kf_SellOutBill/DeltetSellOutBill", {
- params: { 'HInterID': this.rowForm.hmainid.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("鎺ュ彛璇锋眰澶辫触!");
- });
- } else {
- this.$modal.msgError("姝ゆ潯鏁版嵁涓嶆槸鍒涘缓鐘舵��,鏃犳硶鍒犻櫎!");
- }
- }).catch(() => { })
+ this.$modal
+ .confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠")
+ .then(() => {
+ if (this.rowForm.鐘舵�� == "鍒涘缓") {
+ axios
+ .get(this.baseURL + "/Kf_SellOutBill/DeltetSellOutBill", {
+ params: {
+ HInterID: this.rowForm.hmainid.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("鎺ュ彛璇锋眰澶辫触!");
+ });
+ } else {
+ this.$modal.msgError("姝ゆ潯鏁版嵁涓嶆槸鍒涘缓鐘舵��,鏃犳硶鍒犻櫎!");
+ }
+ })
+ .catch(() => {});
},
// 鍙嶅鏍�/瀹℃牳鏁版嵁
set_CheckBill(num, form) {
- var InterID = form.hmainid || form.HInterID
+ var InterID = form.hmainid || form.HInterID;
//閫昏緫瀹℃牳鏂规硶
- axios.get(this.baseURL + "/Kf_SellOutBill/AuditKf_SellOutBill", {
- params: { "HInterID": InterID, "IsAudit": num, "CurUserName": sessionStorage["HUserName"] }
- }).then(response => {
- let result = response.data
- if (result.code == 1) {
- this.$modal.msgSuccess('鎿嶄綔鎴愬姛');
- this.getList();
- }
- else {
- this.$modal.msgError("閿欒:" + result.code + result.Message,);
- }
- }).catch(error => {
- this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
- });
+ axios
+ .get(this.baseURL + "/Kf_SellOutBill/AuditKf_SellOutBill", {
+ params: {
+ HInterID: InterID,
+ IsAudit: num,
+ CurUserName: sessionStorage["HUserName"],
+ },
+ })
+ .then((response) => {
+ let result = response.data;
+ if (result.code == 1) {
+ this.$modal.msgSuccess("鎿嶄綔鎴愬姛");
+ this.getList();
+ } else {
+ this.$modal.msgError("閿欒:" + result.code + result.Message);
+ }
+ })
+ .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`); // 瀵煎嚭鏂囦欢
+ this.$XLSX.writeFile(wb, `sellOutBill_${new Date().getTime()}.xlsx`); // 瀵煎嚭鏂囦欢
},
//鎵撳嵃
get_PrintReport() {
if (this.ids.length != 1) {
- this.$modal.msgError("璇烽�夋嫨涓�琛屾暟鎹�")
+ this.$modal.msgError("璇烽�夋嫨涓�琛屾暟鎹�");
} else if (this.rowForm.鐘舵�� != "宸插鏍�" && !this.defaintOperationByCompanyName()) {
this.$modal.msgError("鎵撳嵃澶辫触!鍘熷洜锛氬崟鎹姸鎬佷笉涓�'宸插鏍�'鐘舵��!!");
} else {
- axios.get(this.baseURL + "/Kf_SellOutBill/CheckSellOutBill_IsExist", {
- params: { "HInterID": this.rowForm.hmainid }
- }).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("鎺ュ彛璇锋眰澶辫触!");
- });
-
-
+ axios
+ .get(this.baseURL + "/Kf_SellOutBill/CheckSellOutBill_IsExist", {
+ params: { HInterID: this.rowForm.hmainid },
+ })
+ .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("鎺ュ彛璇锋眰澶辫触!");
+ });
}
// var content= ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + data[0].hmainid.toString() + '&MyMsg=' + data[0].hmainid.toString() + '&Type=Kf_SellOutBillList', 'yes']
},
@@ -822,19 +1135,22 @@
//#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;
+ 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("鎺ュ彛璇锋眰澶辫触!");
- });
+ })
+ .catch((error) => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
return result;
},
- }
+ },
};
</script>
<style>
diff --git a/src/views/sell/xsSeOrderBill/xsSeOrderBill.vue b/src/views/sell/xsSeOrderBill/xsSeOrderBill.vue
index 72790d1..b8e751c 100644
--- a/src/views/sell/xsSeOrderBill/xsSeOrderBill.vue
+++ b/src/views/sell/xsSeOrderBill/xsSeOrderBill.vue
@@ -9,15 +9,23 @@
class="searchBox"
>
<el-row>
- <el-form-item label="鏃ユ湡" style="margin-left: 100px">
+ <el-form-item label="寮�濮嬫棩鏈�" style="margin-left: 100px">
<el-date-picker
- v-model="dateRange"
- value-format="yyyy-MM-dd"
- type="daterange"
- range-separator="-"
- start-placeholder="寮�濮嬫棩鏈�"
- end-placeholder="缁撴潫鏃ユ湡"
- ></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
@@ -605,6 +613,8 @@
import axios from "axios";
import RowSettings from "@/views/component/rowSettings";
import dayjs from "dayjs";
+import { computed } from "vue";
+import { watch } from "vue";
export default {
name: "GySource",
@@ -769,7 +779,15 @@
};
},
mounted() {
+ window.editGyClose = () => {
+ this.editGyClose(); // 缁勪欢鍐呯殑鏂规硶缁戝畾鍒皐indows
+ };
this.queryParams.HOrgID = sessionStorage["Organization"];
+ },
+
+ beforeDestroy() {
+ // 缁勪欢閿�姣佹椂娓呯悊鍏ㄥ眬鏂规硶锛岄伩鍏嶅唴瀛樻硠婕�
+ delete window.editGyClose;
},
created() {
this.riqiChange();
@@ -939,11 +957,9 @@
// this.queryParams.HOrgID = 100038
// this.sWhere += ` and CONVERT(varchar(100),鏃ユ湡, 23) >= '2020-01-01' and CONVERT(varchar(100),鏃ユ湡, 23) <= '2030-01-01'`;
// 鏀舵枡閫氱煡鍗曞垪琛�
- if (this.dateRange.length > 0) {
- this.sWhere +=
- " and CONVERT(varchar(100),鏃ユ湡, 23) >= ''" + this.dateRange[0] + "''";
- this.sWhere +=
- " and CONVERT(varchar(100),鏃ユ湡, 23) <= ''" + this.dateRange[1] + "''";
+ if (this.sTime) {
+ this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.sTime + "'";
+ this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + this.eTime + "'";
}
try {
let res = await axios.get(this.baseURL + "Xs_SeOrderBill/list_ByPage", {
@@ -1294,6 +1310,7 @@
}
this.sWhere += " and " + this.queryParams.ColName2 + " " + com2;
}
+
if (this.queryParams.HBillNo) {
this.sWhere += " and 鍗曟嵁鍙� like '%" + this.queryParams.HBillNo + "%'";
}
diff --git a/src/views/sell/xsSeOrderBill/xsSeOrderBillEdit.vue b/src/views/sell/xsSeOrderBill/xsSeOrderBillEdit.vue
index c71d57b..904eeec 100644
--- a/src/views/sell/xsSeOrderBill/xsSeOrderBillEdit.vue
+++ b/src/views/sell/xsSeOrderBill/xsSeOrderBillEdit.vue
@@ -935,8 +935,10 @@
//閫�鍑�
close() {
this.reset();
-
- if (!this.OperationType2 && !this.copyType) {
+ if (window.top != window.self) {
+ // iframe 椤甸潰 璋冪敤鐖堕〉闈㈢殑鍑芥暟鍏抽棴寮圭獥
+ window.parent.editGyClose();
+ } else if (!this.OperationType2 && !this.copyType) {
// this.$router.back()
window.close();
} else {
@@ -1044,61 +1046,63 @@
var result = response.data;
var data = response.data.data[0];
this.form.BillType = data.HSourceBillType;
- Object.assign(this.form, {
- HBillNo: data.鍗曟嵁鍙�,
- HDate: dayjs(data.鏃ユ湡).format("YYYY-MM-DD"),
- HInnerBillNo: data.杈呭姪瀛楁,
- HAddress: data.浜よ揣鍦板潃,
- HDeptID: data.HDeptID,
- HDeptName: data.閮ㄩ棬,
- HCusID: data.HCusID,
- HCusName: data.瀹㈡埛,
- HEmpID: data.HEmpID,
- HEmpName: data.涓氬姟鍛�,
- HCurID: data.HCurID,
- HCurName: data.甯佸埆,
- HExRate: data.姹囩巼,
- HEarnestRate: data.瀹氶噾姣斾緥,
- HBillSubType: data.HBillSubType,
- HManagerID: data.HManagerID,
- HManagerName: data.涓荤,
- HSellSID: data.HSellSID,
- HSellSName: data.閿�鍞柟寮�,
- HSSID: data.HSSID,
- HSSName: data.缁撶畻鏂瑰紡,
- HSSDate: dayjs(data.缁撶畻鏃ユ湡).format("YYYY-MM-DD"),
- HPayCusID: data.HPayCusID,
- HPayCusName: data.缁撶畻鏂�,
- HLinkMan: data.鑱旂郴浜�,
- HExplanation: data.鎽樿,
- HLinkPhone: data.鑱旂郴鐢佃瘽,
- HProjectID: data.HProjectID,
- HProjectNumber: data.椤圭洰缂栫爜,
- HProjectName: data.椤圭洰鍚嶇О,
- HWHID: data.涓讳粨搴搃d,
- HWHName: data.涓讳粨搴�,
- HProductType: data.浜у搧绫诲瀷,
- HCreditRating_Now: data.HCreditRating_Now,
- HRemark: data.琛ㄥご澶囨敞,
- HMaker: data.鍒跺崟浜�,
- HMakeDate:
- data.鍒跺崟浜� == "" ? "" : dayjs(data.鍒跺崟鏃ユ湡).format("YYYY-MM-DD"),
- HUpDater: data.淇敼浜�,
- HUpDateDate:
- data.淇敼浜� == "" ? "" : dayjs(data.淇敼鏃ユ湡).format("YYYY-MM-DD"),
- HChecker: data.瀹℃牳浜�,
- HCheckDate:
- data.瀹℃牳浜� == "" ? "" : dayjs(data.瀹℃牳鏃ユ湡).format("YYYY-MM-DD"),
- HCloseMan: data.鍏抽棴浜�,
- HCloseDate:
- data.鍏抽棴浜� == "" ? "" : dayjs(data.鍏抽棴鏃ユ湡).format("YYYY-MM-DD"),
- HDeleteMan: data.浣滃簾浜�,
- HDeleteDate:
- data.浣滃簾浜� == "" ? "" : dayjs(data.浣滃簾鏃ユ湡).format("YYYY-MM-DD"),
- HChangeMan: data.鍙樻洿浜�,
- HChangeDate:
- data.鍙樻洿浜� == "" ? "" : dayjs(data.鍙樻洿鏃ユ湡).format("YYYY-MM-DD"),
- });
+ this.form = {
+ ...{
+ HBillNo: data.鍗曟嵁鍙�,
+ HDate: dayjs(data.鏃ユ湡).format("YYYY-MM-DD"),
+ HInnerBillNo: data.杈呭姪瀛楁,
+ HAddress: data.浜よ揣鍦板潃,
+ HDeptID: data.HDeptID,
+ HDeptName: data.閮ㄩ棬,
+ HCusID: data.HCusID,
+ HCusName: data.瀹㈡埛,
+ HEmpID: data.HEmpID,
+ HEmpName: data.涓氬姟鍛�,
+ HCurID: data.HCurID,
+ HCurName: data.甯佸埆,
+ HExRate: data.姹囩巼,
+ HEarnestRate: data.瀹氶噾姣斾緥,
+ HBillSubType: data.HBillSubType,
+ HManagerID: data.HManagerID,
+ HManagerName: data.涓荤,
+ HSellSID: data.HSellSID,
+ HSellSName: data.閿�鍞柟寮�,
+ HSSID: data.HSSID,
+ HSSName: data.缁撶畻鏂瑰紡,
+ HSSDate: dayjs(data.缁撶畻鏃ユ湡).format("YYYY-MM-DD"),
+ HPayCusID: data.HPayCusID,
+ HPayCusName: data.缁撶畻鏂�,
+ HLinkMan: data.鑱旂郴浜�,
+ HExplanation: data.鎽樿,
+ HLinkPhone: data.鑱旂郴鐢佃瘽,
+ HProjectID: data.HProjectID,
+ HProjectNumber: data.椤圭洰缂栫爜,
+ HProjectName: data.椤圭洰鍚嶇О,
+ HWHID: data.涓讳粨搴搃d,
+ HWHName: data.涓讳粨搴�,
+ HProductType: data.浜у搧绫诲瀷,
+ HCreditRating_Now: data.HCreditRating_Now,
+ HRemark: data.琛ㄥご澶囨敞,
+ HMaker: data.鍒跺崟浜�,
+ HMakeDate:
+ data.鍒跺崟浜� == "" ? "" : dayjs(data.鍒跺崟鏃ユ湡).format("YYYY-MM-DD"),
+ HUpDater: data.淇敼浜�,
+ HUpDateDate:
+ data.淇敼浜� == "" ? "" : dayjs(data.淇敼鏃ユ湡).format("YYYY-MM-DD"),
+ HChecker: data.瀹℃牳浜�,
+ HCheckDate:
+ data.瀹℃牳浜� == "" ? "" : dayjs(data.瀹℃牳鏃ユ湡).format("YYYY-MM-DD"),
+ HCloseMan: data.鍏抽棴浜�,
+ HCloseDate:
+ data.鍏抽棴浜� == "" ? "" : dayjs(data.鍏抽棴鏃ユ湡).format("YYYY-MM-DD"),
+ HDeleteMan: data.浣滃簾浜�,
+ HDeleteDate:
+ data.浣滃簾浜� == "" ? "" : dayjs(data.浣滃簾鏃ユ湡).format("YYYY-MM-DD"),
+ HChangeMan: data.鍙樻洿浜�,
+ HChangeDate:
+ data.鍙樻洿浜� == "" ? "" : dayjs(data.鍙樻洿鏃ユ湡).format("YYYY-MM-DD"),
+ },
+ };
if (this.copyType == 1) {
this.getHBillNo();
let date = new Date();
@@ -1187,8 +1191,11 @@
},
})
.then((response) => {
- this.form.鑱旂郴浜� = response.data.data[0].HLinkMan;
- this.form.鑱旂郴鐢佃瘽 = response.data.data[0].HLinkPhone;
+ if (response.data.count == 1) {
+ this.form.鑱旂郴浜� = response.data.data[0].HLinkMan;
+ this.form.鑱旂郴鐢佃瘽 = response.data.data[0].HLinkPhone;
+ }
+ this.$modal.msg(`璀﹀憡: ${response.data.Message}`);
// this.form = response.data.data[0]
})
.catch((error) => {
diff --git a/src/views/system/user/powerInformation.vue b/src/views/system/user/powerInformation.vue
new file mode 100644
index 0000000..a47ef9a
--- /dev/null
+++ b/src/views/system/user/powerInformation.vue
@@ -0,0 +1,214 @@
+<template>
+ <div style="padding: 10px;">
+ <el-row>
+ <el-button type="primary" @click="handleSaver">淇濆瓨</el-button>
+ <el-button type="primary" @click="close">閫�鍑�</el-button>
+ </el-row>
+ <el-row>
+ <el-col :span="8" style="padding-right:10px ;">
+ <el-tree :data="treeOptions" :props="defaultProps" :expand-on-click-node="false"
+ :default-checked-keys="['鏉冮檺绠＄悊-鐢ㄦ埛']" :filter-node-method="filterNode" ref="tree" node-key="id"
+ :default-expand-all="false" highlight-current @node-click="handleNodeClick" />
+ </el-col>
+ <el-col :span="16">
+ <el-table :data="queryData" ref="queryMultipleTable" max-height="800" @selection-change="handleQueryChange"
+ border v-if="tableQueryShow">
+ <el-table-column type="selection" width="55" prop="AuthorityID" align="center" />
+ <el-table-column align="center" prop="AuthorityID" label="鏄惁鏉冮檺" show-overflow-tooltip>
+ <template slot-scope="scope">
+ <span style="color: green;" v-if="scope.row.AuthorityID == 1">鏄�</span>
+ <span v-else-if="scope.row.AuthorityID == 0">鍚�</span>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" prop="gnms" label="鍔熻兘璇存槑" show-overflow-tooltip />
+ </el-table>
+ </el-col>
+ </el-row>
+ </div>
+</template>
+
+<script>
+import axios from 'axios'
+export default {
+ name: 'PowerInformation',
+ components: {},
+ props: {
+ HSouceBillType: { type: String, },
+ linterid: {},
+ },
+ data() {
+ return {
+ powerShow: false,
+ HModName: 'Xt_UserRightQuery',
+ selQueryRows: [],
+ nodeData: {},
+ queryData: [],
+ tableQueryShow: false,
+ //鏍戠粨鏋�
+ treeOptions: [],
+ defaultProps: {
+ children: "children",
+ label: "title"
+ },
+ tableShow: true,
+ sGnbm: '',
+ organizationList: JSON.parse(sessionStorage.getItem('organizationList')),//缁勭粐鍒楄〃
+ baseURL: process.env.VUE_APP_BASE_API,
+ rowForm: {},
+ // 寮瑰嚭灞傛爣棰�
+ title: "",
+ // 閫変腑鏁扮粍
+ ids: [],
+ // 閬僵灞�
+ loading: true,
+ tyResList: [],//鍒楄〃锛堟帴鍙ｆ暟鎹級
+ btList: [],//琛ㄥご鍒楄〃鏄剧ず
+ btResList: [],
+ tableData: [],//鍒楄〃(鍒嗛〉鏄剧ず)
+ allTableData: [],
+ pageSizes: [50, 100, 500, 5000, 50000],
+ page: 1,
+ pageSize: 0,
+ total: 0,
+ };
+ },
+ created() {
+ this.getTreeselect()
+ },
+ methods: {
+ getTreeselect() {
+ console.log(1)
+ axios.get(this.baseURL + 'Gy_MaintenanceMode/PowerLoadTree').then(response => {
+ let data1 = response.data
+ if (data1.count == 1) {
+ let map = {};
+ let treeData = [];
+ data1.data.forEach(it => {
+ map[it.id.toUpperCase()] = it; //ID涓烘瘡涓妭鐐圭殑id
+ })
+ //鐢熸垚缁撴灉闆�
+ data1.data.forEach(it => {
+ const parent = map[it.ParentID.toUpperCase()]; //ParentID涓虹埗鑺傜偣鐨刬d
+ if (parent) {
+ if (!Array.isArray(parent.children)) parent.children = [];
+ parent.children.push(it);
+ } else {
+ treeData.push(it)
+ }
+ })
+ this.treeOptions = treeData
+ this.powerShow = true
+ this.handleNodeClick()
+ }
+ }).catch(error => {
+ console.log(error)
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ },
+ // 绛涢�夎妭鐐�
+ filterNode(value, data) {
+ if (!value) return true
+ return data.label.indexOf(value) !== -1
+ },
+ // 鑺傜偣鍗曞嚮浜嬩欢
+ handleNodeClick(data) {
+ this.nodeData = data
+ if (!data) {
+ this.sGnbm = '鏉冮檺绠＄悊-鐢ㄦ埛'
+ } else {
+ this.sGnbm = data.id
+ }
+ this.queryData = []
+ let text = ''
+ axios.get(this.baseURL + '/PublicPageMethod/PowerList', {
+ params: {
+ czybm: this.linterid,
+ sGnbm: this.sGnbm,
+ HSouceBillType: this.HSouceBillType,
+ },
+ }).then(response => {
+ this.queryData = response.data.data
+ this.tableQueryShow = true
+ this.$nextTick(() => {
+ if (this.queryData.length > 0) {
+ this.queryData.forEach(row => {
+ if (row.AuthorityID) {
+ this.$refs.queryMultipleTable.toggleRowSelection(row);
+ }
+ });
+ } else {
+ this.$refs.queryMultipleTable.clearSelection();
+ }
+
+ })
+ }).catch(error => {
+ console.log(error)
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ },
+ handleQueryChange(selection) {
+ this.selQueryRows = selection
+ this.queryData.forEach(row => {
+ row.AuthorityHID = this.selQueryRows.some(selectedRow => selectedRow.hgnbm === row.hgnbm) ? 1 : 0;
+ });
+ },
+ //閫�鍑�
+ close() {
+ // const obj = { fullPath: this.$route.path, path: this.$route.path, name: this.$route.name, };
+ // this.$tab.closePage(obj).then(res => {
+ // const latestView = res.visitedViews.slice(-1)[0]
+ // if (latestView) {
+ // this.$router.push(latestView.fullPath)
+ // } else {
+ // if (obj.name === 'Dashboard') {
+ // this.$router.replace({ path: '/redirect' + obj.fullPath })
+ // } else {
+ // this.$router.push('/')
+ // }
+ // }
+ // });
+ this.powerShow = false
+ this.$emit('editQueryClose', false)
+ },
+ handleSaver() {
+ var sSubStr = JSON.stringify(this.queryData);
+ var sMainSub = this.sGnbm + ';' + sSubStr + ';' + this.linterid + ";" + this.HSouceBillType;
+ axios({
+ method: 'post',
+ url: this.baseURL + "/Gy_MaintenanceMode/SaverPower",
+ data: {
+ 'msg': sMainSub
+ },
+ }).then(response => {
+ if (response.data.count == 1) {
+ this.subDisabled = true//璁剧疆淇濆瓨鎸夐挳涓嶅彲鐢�
+ this.$modal.msgSuccess(response.data.Message);
+ this.handleNodeClick(this.nodeData)
+ }
+ }).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, this.HSouceBillType + `_${new Date().getTime()}.xlsx`); // 瀵煎嚭鏂囦欢
+ },
+ }
+};
+</script>
+<style>
+.xsckdBox .el-date-editor.el-input {
+ width: 100%;
+}
+
+.btnQueryBox {
+ margin-top: 10px;
+ padding: 5px;
+ border-top: 1px solid #ebebeb;
+ display: flex;
+ justify-content: right;
+}
+</style>
diff --git a/src/views/system/user/xtUserList.vue b/src/views/system/user/xtUserList.vue
index 2672ee6..35f1494 100644
--- a/src/views/system/user/xtUserList.vue
+++ b/src/views/system/user/xtUserList.vue
@@ -105,8 +105,7 @@
@click="handleEdit(row = rowForm, OperationType = 3)">缂栬緫</el-button>
</el-col>
<el-col :span="1.5">
- <el-button type="primary" icon="el-icon-share" size="mini" :disabled="single"
- @click="openQuery = true">鏉冮檺</el-button>
+ <el-button type="primary" icon="el-icon-share" size="mini" :disabled="single" @click="queryClick">鏉冮檺</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="primary" icon="el-icon-delete" size="mini" :disabled="single" @click="handleDelete">鍒犻櫎
@@ -147,7 +146,7 @@
:copyType="copyType" @editClose="editClose" v-if="editShow" />
</el-dialog>
<el-dialog title="鐢ㄦ埛鏉冮檺" :visible.sync="openQuery" width="1480px" append-to-body class="xsckdBox">
- <Query />
+ <Query HSouceBillType="yh" @editQueryClose="editQueryClose" :linterid=this.rowForm.鐢ㄦ埛缂栫爜 v-if="queryShow" />
</el-dialog>
</div>
</div>
@@ -157,7 +156,7 @@
import axios from 'axios'
import RowSettings from '@/views/component/rowSettings'
import Edit from '@/views/system/user/xtUserListEdit.vue'
-import Query from '@/views/system/user/xtUserRightQuery.vue'
+import Query from '@/views/system/user/powerInformation.vue'
export default {
@@ -172,6 +171,7 @@
activeSeach: '',
HModName: 'Xt_UserList',
editShow: false,
+ queryShow: false,
openEdit: false,
totalNameList: [],
tableShow: true,
@@ -213,7 +213,7 @@
open: false,
// 鏌ヨ鍙傛暟
queryParams: {
- HUSEORGID: null,
+ HUSEORGID: sessionStorage["OrganizationID"] - 0,
HName: null,
HNumber: null,
Comparator1: '',
@@ -350,7 +350,6 @@
if (this.pageSize == 0) {
this.pageSize = 50
}
- this.queryParams.HUSEORGID = sessionStorage["OrganizationID"] - 0
// this.sWhere += " and HUSEORGID = '" + this.queryParams.HUSEORGID + "'"
//鍒楄〃
axios.get(this.baseURL + '/Xt_User/list', {
@@ -667,7 +666,7 @@
resetQuery() {
this.sWhere = ''
this.queryParams = {
- // HOrgID: null,
+ HOrgID: null,
HName: null,
HNumber: null,
Comparator1: '',
@@ -684,6 +683,7 @@
//閫�鍑�
close() {
this.tableShow = true
+ this.single= true
this.openEdit = false
this.editShow = false
this.getList()
@@ -695,7 +695,6 @@
this.openEdit = true
this.editShow = true
})
-
},
//鎵撳紑淇敼缁勪欢寮圭獥
handleEdit() {
@@ -708,7 +707,19 @@
editClose(val) {
this.editShow = false
this.openEdit = false
- this.multiple = true
+ this.single= true
+ this.ids = []
+ this.getList()
+ },
+ queryClick() {
+ this.queryShow = true
+ this.openQuery = true
+ },
+ editQueryClose(val) {
+ this.queryShow = false
+ this.openQuery = false
+ this.single= true
+ this.ids = []
this.getList()
},
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
diff --git a/src/views/system/user/xtUserListEdit.vue b/src/views/system/user/xtUserListEdit.vue
index 7053293..fcb590b 100644
--- a/src/views/system/user/xtUserListEdit.vue
+++ b/src/views/system/user/xtUserListEdit.vue
@@ -35,7 +35,7 @@
<el-col :span="6">
<el-form-item label="瀵瑰簲鑱屽憳" prop="HEmpName">
<el-input v-model="form.HEmpName" placeholder="璇疯緭鍏ュ搴旇亴鍛�" disabled>
- <el-button slot="append" icon="el-icon-search" @click="openDataDialog(4)"></el-button>
+ <el-button slot="append" icon="el-icon-search" @click="openDataDialog(4, empType = '1')"></el-button>
</el-input>
</el-form-item>
</el-col>
@@ -84,7 +84,7 @@
<el-col :span="6">
<el-form-item label="瀵瑰簲淇濈" prop="HKeeper">
<el-input v-model="form.HKeeper" placeholder="璇疯緭鍏ュ搴斾繚绠�" disabled>
- <el-button slot="append" icon="el-icon-search" @click="openDataDialog(4)"></el-button>
+ <el-button slot="append" icon="el-icon-search" @click="openDataDialog(4, empType = '2')"></el-button>
</el-input>
</el-form-item>
</el-col>
@@ -93,28 +93,28 @@
<el-col :span="6">
<el-form-item label="瀵瑰簲楠屾敹" prop="HSecManager">
<el-input v-model="form.HSecManager" placeholder="璇疯緭鍏ュ搴旈獙鏀�" disabled>
- <el-button slot="append" icon="el-icon-search" @click="openDataDialog(4)"></el-button>
+ <el-button slot="append" icon="el-icon-search" @click="openDataDialog(4, empType = '3')"></el-button>
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="瀵瑰簲鐢熶骇璧勬簮" prop="HSourceName">
<el-input v-model="form.HSourceName" placeholder="璇疯緭鍏ュ搴旂敓浜ц祫婧�" disabled>
- <el-button slot="append" icon="el-icon-search" @click="openDataDialog(4)"></el-button>
+ <el-button slot="append" icon="el-icon-search" @click="openDataDialog(5)"></el-button>
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="瀵瑰簲涓氬姟鍛�" prop="HSellMan">
<el-input v-model="form.HSellMan" placeholder="璇疯緭鍏ュ搴斾笟鍔″憳" disabled>
- <el-button slot="append" icon="el-icon-search" @click="openDataDialog(4)"></el-button>
+ <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 label="瀵瑰簲閮ㄩ棬" prop="HDept">
<el-input v-model="form.HDept" placeholder="璇疯緭鍏ュ搴旈儴闂�" disabled>
- <el-button slot="append" icon="el-icon-search" @click="openDataDialog(4)"></el-button>
+ <el-button slot="append" icon="el-icon-search" @click="openDataDialog(1)"></el-button>
</el-input>
</el-form-item>
</el-col>
@@ -123,21 +123,21 @@
<el-col :span="6">
<el-form-item label="妫�楠屽憳" prop="HCheckEmpName">
<el-input v-model="form.HCheckEmpName" placeholder="璇疯緭鍏ユ楠屽憳" disabled>
- <el-button slot="append" icon="el-icon-search" @click="openDataDialog(4)"></el-button>
+ <el-button slot="append" icon="el-icon-search" @click="openDataDialog(4, empType = '5')"></el-button>
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="瀵瑰簲浠撳簱" prop="HWHName">
<el-input v-model="form.HWHName" placeholder="璇疯緭鍏ュ搴斾粨搴�" disabled>
- <el-button slot="append" icon="el-icon-search" @click="openDataDialog(4)"></el-button>
+ <el-button slot="append" icon="el-icon-search" @click="openDataDialog(2, ckType = '1')"></el-button>
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="璋冨叆浠撳簱" prop="HSCWHName">
<el-input v-model="form.HSCWHName" placeholder="璇疯緭鍏ヨ皟鍏ヤ粨搴�" disabled>
- <el-button slot="append" icon="el-icon-search" @click="openDataDialog(4)"></el-button>
+ <el-button slot="append" icon="el-icon-search" @click="openDataDialog(2, ckType = '2')"></el-button>
</el-input>
</el-form-item>
</el-col>
@@ -153,7 +153,7 @@
<el-col :span="6">
<el-form-item label="瀵瑰簲渚涘簲鍟�" prop="HSupName">
<el-input v-model="form.HSupName" placeholder="璇疯緭鍏ュ搴斾緵搴斿晢" disabled>
- <el-button slot="append" icon="el-icon-search" @click="openDataDialog(4)"></el-button>
+ <el-button slot="append" icon="el-icon-search" @click="openDataDialog(6)"></el-button>
</el-input>
</el-form-item>
</el-col>
@@ -167,7 +167,7 @@
<el-col :span="6">
<el-form-item label="瀹㈡埛" prop="HCusName">
<el-input v-model="form.HCusName" placeholder="璇疯緭鍏ュ鎴�" disabled>
- <el-button slot="append" icon="el-icon-search" @click="openDataDialog(4)"></el-button>
+ <el-button slot="append" icon="el-icon-search" @click="openDataDialog(7)"></el-button>
</el-input>
</el-form-item>
</el-col>
@@ -198,10 +198,13 @@
</el-form>
<!-- 閮ㄩ棬寮圭獥 -->
<el-dialog :title="dialogTitle" :visible.sync="openData" width="1280px" append-to-body>
- <Dept @deptEmitDb="dbEmitData" @deptEmit="emitData" v-if="deptShow" />
- <Warehouse @deptEmitDb="dbEmitData" @deptEmit="emitData" v-if="warehouseShow" />
- <Material @deptEmitDb="dbEmitData" @deptEmit="emitData" v-if="materialShow" />
+ <Dept @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="deptShow" />
+ <Warehouse @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="warehouseShow" />
+ <Material @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="materialShow" />
<GyEmployee @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyEmployeeShow" />
+ <GySource @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gySourceShow" />
+ <GySupplier @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gySupplierShow" />
+ <GyCustomer @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyCustomerShow" />
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="deptClickSub">纭� 瀹�</el-button>
<el-button @click="deptClose">鍙� 娑�</el-button>
@@ -215,15 +218,18 @@
<script>
import axios from 'axios'
-import Dept from '@/views/component/dept'
-import Warehouse from '@/views/component/warehouse'
+import Dept from '@/views/basic/gy/gyDepartment.vue'
+import Warehouse from '@/views/basic/gyWarehouse/gyWarehouse.vue'
import Material from '@/views/component/material'
import RowSettings from '@/views/component/rowSettings'
import GyEmployee from '@/views/basic/gyEmployee/gyEmployee.vue'
+import GySource from '@/views/basic/production/gySource.vue'
+import GySupplier from '@/views/basic/gy/gySupplier.vue'
+import GyCustomer from '@/views/GyCustomer'
export default {
name: 'XtUserListEdit',
- components: { Dept, Warehouse, Material, RowSettings, GyEmployee },
+ components: { Dept, Warehouse, Material, RowSettings, GyEmployee, GySource, GySupplier, GyCustomer },
props: {
OperationType: { type: Number, },
linterid: {},
@@ -240,7 +246,7 @@
}
}
const equalToHWHName = (rule, value, callback) => {
- if (this.form.HWHName&&this.form.HSCWHName&&(this.form.HWHName == this.form.HSCWHName)) {
+ if (this.form.HWHName && this.form.HSCWHName && (this.form.HWHName == this.form.HSCWHName)) {
callback(new Error("瀵瑰簲浠撳簱鍜岃皟鍏ヤ粨搴撲笉鑳界浉鍚岋紒"))
} else {
callback()
@@ -248,6 +254,8 @@
}
return {
HModName: "Xt_UserListEdit",
+ empType: '',
+ ckType: '',
formShow: false,
temp: undefined,
formLoading: true,
@@ -261,7 +269,10 @@
deptShow: false,//閮ㄩ棬鏁版嵁缁勪欢
warehouseShow: false,//浠撳簱鏁版嵁缁勪欢
materialShow: false,//鐗╂枡鏁版嵁缁勪欢
- gyEmployeeShow: false,//閿�鍞憳鏁版嵁缁勪欢
+ gyEmployeeShow: false,//鑱屽憳鏁版嵁缁勪欢
+ gySourceShow: false,
+ gySupplierShow: false,
+ gyCustomerShow: false,
deptform: {},//寮圭獥閫変腑鏁版嵁
openData: false,//鏁版嵁寮圭獥
dialogTitle: '',
@@ -374,7 +385,6 @@
sWhere: sWhere,
},
}).then(response => {
- console.log(response)
let data1 = response.data
if (data1.count == 1) {
if (data1.data.length > 0)
@@ -387,7 +397,6 @@
}
}
}).catch(error => {
- console.log(error)
this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
});
},
@@ -435,14 +444,18 @@
// num=1閮ㄩ棬 num=2鍑哄簱浠撳簱
if (deptRow.HItemID) {
if (num == 1) {
- this.form.HDeptName = deptRow.閮ㄩ棬鍚嶇О
+ this.form.HDept = deptRow.閮ㄩ棬鍚嶇О
this.form.HDeptID = deptRow.HItemID
- this.form.HManagerName = deptRow.璐熻矗浜�
this.deptShow = false
this.openData = false
} else if (num == 2) {
- this.editData[this.zbIndex].HWHID = deptRow.HItemID;
- this.editData[this.zbIndex].鍙戣揣浠撳簱 = deptRow.浠撳簱鍚嶇О;
+ if (this.ckType == '1') {
+ this.form.HWHName = deptRow.浠撳簱鍚嶇О;
+ this.form.HWhID = deptRow.HItemID;
+ } else if (this.ckType == '2') {
+ this.form.HSCWHName = deptRow.浠撳簱鍚嶇О;
+ this.form.HSCWHID = deptRow.HItemID;
+ }
this.warehouseShow = false
this.openData = false
} else if (num == 3) {
@@ -457,9 +470,39 @@
this.materialShow = false
this.openData = false
} else if (num == 4) {
- this.form.HEmpName = deptRow.鑱屽憳鍚嶇О
- this.form.HEmpID = deptRow.HItemID
+ if (this.empType == '1') {
+ this.form.HEmpName = deptRow.鑱屽憳鍚嶇О
+ this.form.HEmpID = deptRow.HItemID
+ } else if (this.empType == '2') {
+ this.form.HKeeper = deptRow.鑱屽憳鍚嶇О
+ this.form.HKeeperID = deptRow.HItemID
+ } else if (this.empType == '3') {
+ this.form.HSecManager = deptRow.鑱屽憳鍚嶇О
+ this.form.HSecManagerID = deptRow.HItemID
+ } else if (this.empType == '4') {
+ this.form.HSellMan = deptRow.鑱屽憳鍚嶇О
+ this.form.HSellManID = deptRow.HItemID
+ } else if (this.empType == '5') {
+ this.form.HCheckEmpName = deptRow.鑱屽憳鍚嶇О
+ this.form.HCheckEmpID = deptRow.HItemID
+ }
this.gyEmployeeShow = false
+ this.openData = false
+ } else if (num == 5) {
+ this.form.HSourceName = deptRow.鐢熶骇璧勬簮鍚嶇О
+ this.form.HSourceID = deptRow.HItemID
+ this.gySourceShow = false
+ this.openData = false
+ } else if (num == 6) {
+ this.form.HSupName = deptRow.渚涘簲鍟嗗悕绉�
+ this.form.HSupID = deptRow.HItemID
+ this.gySupplierShow = false
+ this.openData = false
+ } else if (num == 7) {
+ console.log(deptRow)
+ this.form.HCusName = deptRow.瀹㈡埛鍚嶇О
+ this.form.HCusID = deptRow.HItemID
+ this.gyCustomerShow = false
this.openData = false
}
} else {
@@ -479,7 +522,6 @@
this.deptform = {}
this.openData = false
},
-
//閿�鍞嚭搴撳崟鏂板缂栬緫琛ㄥ崟鍒濆鍖�
reset() {
this.form = {
@@ -534,13 +576,8 @@
//閫�鍑�
close() {
this.reset()
- if (!this.OperationType && !this.copyType) {
- const obj = { path: "/system/user/xtUserListEdit", name: "xtUserListEdit" };
- this.$tab.closePage(obj);
- } else {
- this.formShow = false
- this.$emit('editClose', false)
- }
+ this.formShow = false
+ this.$emit('editClose', false)
},
/** 鏂板鎸夐挳鎿嶄綔 */
handleAdd() {
@@ -610,7 +647,6 @@
/** 缂栬緫椤靛瓙琛ㄥ閫夋閫変腑鏁版嵁 */
handleTableZbEdit(selection) {
- console.log(selection)
this.checkedSysZb = selection
// this.editData.forEach(row => {
// row.AuthorityHID = this.checkedSysZb.some(selectedRow => selectedRow.GroupId === row.HGroupID) ? 1 : 0;
@@ -619,9 +655,7 @@
// 缂栬緫鎻愪氦淇濆瓨
submitForm() {
this.$refs["form"].validate(valid => {
- console.log(this.form)
if (valid) {
-
var num = [];
var Sav = ''
if (this.OperationType == 1) {
@@ -629,13 +663,11 @@
} else if (this.OperationType == 3) {
Sav = "Update"
}
-
for (var i = 0; i < this.checkedSysZb.length; i++) {
num.push(this.checkedSysZb[i].HGroupID)
}
- console.log(num,Sav)
var sSubStr = num.toString() == "" ? "-1" : num.toString();
- var sMainStr = JSON.stringify(this.form) + ';' + Sav + ';' + sSubStr;
+ var sMainStr = JSON.stringify(this.form) + ';' + Sav + ';' + sSubStr;
axios({
method: 'post',
url: this.baseURL + "/Xt_User/SaveUser",
@@ -659,10 +691,12 @@
this.warehouseShow = false
this.materialShow = false
this.gyEmployeeShow = false
+ this.gySourceShow = false
+ this.gySupplierShow = false
+ this.gyCustomerShow = false
},
// 鎵撳紑鏁版嵁鍒楄〃寮圭獥
openDataDialog(num, row) {
- //num1閮ㄩ棬锛�2鍑哄簱浠撳簱锛�3鐗╂枡锛�4閿�鍞憳
if (row) {
this.zbIndex = row.index - 1
}
@@ -680,9 +714,21 @@
this.materialShow = true
this.openData = true
} else if (num == 4) {
- this.dialogTitle = '閿�鍞憳鍒楄〃'
+ this.dialogTitle = '鑱屽憳鍒楄〃'
this.gyEmployeeShow = true
this.openData = true
+ } else if (num == 5) {
+ this.dialogTitle = '鐢熶骇璧勬簮鍒楄〃'
+ this.gySourceShow = true
+ this.openData = true
+ } else if (num == 6) {
+ this.dialogTitle = '渚涘簲鍟嗗垪琛�'
+ this.gySupplierShow = true
+ this.openData = true
+ } else if (num == 7) {
+ this.dialogTitle = '瀹㈡埛鍒楄〃'
+ this.gyCustomerShow = true
+ this.openData = true
}
},
}
diff --git a/src/views/warehouse/barcodeMaster/Gy_BarCodeBill.vue b/src/views/warehouse/barcodeMaster/Gy_BarCodeBill.vue
new file mode 100644
index 0000000..41a40c8
--- /dev/null
+++ b/src/views/warehouse/barcodeMaster/Gy_BarCodeBill.vue
@@ -0,0 +1 @@
+<template></template>
\ No newline at end of file
diff --git a/src/views/warehouse/shipment/Kf_StockOutRequestBill.vue b/src/views/warehouse/shipment/Kf_StockOutRequestBill.vue
new file mode 100644
index 0000000..41a40c8
--- /dev/null
+++ b/src/views/warehouse/shipment/Kf_StockOutRequestBill.vue
@@ -0,0 +1 @@
+<template></template>
\ No newline at end of file
diff --git a/src/views/warehouse/shipment/Kf_StockOutRequestBillList.vue b/src/views/warehouse/shipment/Kf_StockOutRequestBillList.vue
new file mode 100644
index 0000000..41a40c8
--- /dev/null
+++ b/src/views/warehouse/shipment/Kf_StockOutRequestBillList.vue
@@ -0,0 +1 @@
+<template></template>
\ No newline at end of file
diff --git a/src/views/warehouse/transfer/Kf_MoveStockRequestBillEdit.vue b/src/views/warehouse/transfer/Kf_MoveStockRequestBillEdit.vue
new file mode 100644
index 0000000..41a40c8
--- /dev/null
+++ b/src/views/warehouse/transfer/Kf_MoveStockRequestBillEdit.vue
@@ -0,0 +1 @@
+<template></template>
\ No newline at end of file
diff --git a/src/views/warehouse/transfer/Kf_MoveStockRequestBillList.vue b/src/views/warehouse/transfer/Kf_MoveStockRequestBillList.vue
new file mode 100644
index 0000000..41a40c8
--- /dev/null
+++ b/src/views/warehouse/transfer/Kf_MoveStockRequestBillList.vue
@@ -0,0 +1 @@
+<template></template>
\ No newline at end of file
--
Gitblit v1.9.1