From 05fb7af4f0316fdae54f52076509e582ca5e1e4c Mon Sep 17 00:00:00 2001
From: qq_41295110 <qq_41295110@noreply.gitcode.com>
Date: 星期四, 04 十二月 2025 11:01:49 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI
---
src/views/scMould/basicModeling/Gy_MouldFile.vue | 54
src/views/warehouse/barcodeMaster/Gy_BarCodeBill.vue | 4
src/views/sell/XsSeOutStockBackBillList.vue | 4
src/views/system/user/Xt_UserGroupList.vue | 13
src/views/KCGL/OtherOutBill/Kf_OtherOutBillEdit.vue | 68
src/views/sell/XsSeOutStockBill.vue | 2
src/views/FbStepFoldOutBillList/fbStepFoldOutBillList.vue | 28
src/views/basic/gy/gyDepartmentEdit.vue | 147 -
src/views/component/HSourceReportHtml/index.vue | 210 +-
src/views/purchase/postockInBack/Kf_POStockInBackBillList.vue | 38
src/views/system/user/GyDriverEdit.vue | 734 +++++++++++
src/views/CaiGouGuanLi/CaiGouRuKu/Kf_POStockInBillEdit.vue | 3
src/views/system/user/Xt_UserGroupEdit.vue | 58
src/views/warehouse/shipment/Kf_StockOutRequestBillList.vue | 1
src/views/sell/Kf_ICStockBillMainList/Kf_ICStockBillMainList.vue | 98
src/views/sell/xsSeOrderBill/xsSeOrderBill.vue | 13
src/views/system/user/xtUserList.vue | 2
src/views/FbStepFoldinBillList/fbStepFoldinBillList.vue | 18
src/views/KCGL/OtherOutBill/Kf_OtherOutBillList.vue | 8
src/views/sell/Kf_ICStockBillMainList/Kf_ICStockBillMainListEdit.vue | 14
src/views/purchase/cgPoInStockBill/cgPoInStockBill.vue | 14
src/views/sell/XsSeOutStockBackBillEdit.vue | 2
src/views/system/user/GyDriver.vue | 1676 ++++++++++++++++++++++++++
src/views/basic/gy/gyDepartment.vue | 23
src/store/modules/permission.js | 108 +
src/views/basic/gyEmployee/gyEmployeeEdit.vue | 2
src/router/index.js | 220 ++-
src/views/basic/gy/gySupplier.vue | 37
src/views/purchase/cgPoOrderBill/cgPoOrderBill.vue | 4
.env.development | 5
src/views/sell/sellOut/sellOutBill.vue | 32
src/views/ProductInBill/Kf_ProductInBillList.vue | 3
src/views/sell/xsSeOrderBill/xsSeOrderBillEdit.vue | 24
.env.production | 4
src/views/KCGL/MoveStockBill/Kf_MoveStockBillEdit.vue | 3
src/views/warehouse/transfer/Kf_MoveStockRequestBillEdit.vue | 3
src/views/system/user/xtUserListEdit.vue | 10
src/views/warehouse/shipment/Kf_StockOutRequestBill.vue | 7
src/views/ProductInBill/Kf_ProductInBillEdit.vue | 36
39 files changed, 3,206 insertions(+), 524 deletions(-)
diff --git a/.env.development b/.env.development
index f8c6509..5d44591 100644
--- a/.env.development
+++ b/.env.development
@@ -6,7 +6,8 @@
# 鏅轰簯杩堟�滾-MOM绠＄悊绯荤粺/寮�鍙戠幆澧�
# VUE_APP_BASE_API = 'http://localhost:81/API/'
-VUE_APP_BASE_API = 'http://47.96.97.237/API/'
-# VUE_APP_BASE_API = 'http://220.189.218.155:9010/API/'
+# VUE_APP_BASE_API = 'http://47.96.97.237/API/'
+VUE_APP_BASE_API = 'http://220.189.218.155:9010/API/'
+VUE_APP_BASE_API = 'http://localhost:8082/LuBaoAPI/'
# 璺敱鎳掑姞杞�
VUE_CLI_BABEL_TRANSPILE_MODULES = true
diff --git a/.env.production b/.env.production
index 74cf4c4..800df2a 100644
--- a/.env.production
+++ b/.env.production
@@ -5,7 +5,7 @@
ENV = 'production'
# 鏅轰簯杩堟�滾-MOM绠＄悊绯荤粺/鐢熶骇鐜
-VUE_APP_BASE_API = 'http://47.96.97.237/API/'
-# VUE_APP_BASE_API = 'http://220.189.218.155:9010/API/'
+# VUE_APP_BASE_API = 'http://47.96.97.237/API/'
+VUE_APP_BASE_API = 'http://220.189.218.155:9010/API/'
# 璺敱鎳掑姞杞�
VUE_CLI_BABEL_TRANSPILE_MODULES = true
\ No newline at end of file
diff --git a/src/router/index.js b/src/router/index.js
index c9a703b..8648c4a 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -141,7 +141,10 @@
children: [
{
path: "/sell/StockBillMainList/KfICStockBillMainList",
- component: () => import("@/views/sell/Kf_ICStockBillMainList/Kf_ICStockBillMainList.vue"),
+ component: () =>
+ import(
+ "@/views/sell/Kf_ICStockBillMainList/Kf_ICStockBillMainList.vue"
+ ),
name: "KfICStockBillMainList",
meta: { title: "閿�鍞��璐у崟", activeMenu: "sell/StockBillMainList" },
},
@@ -160,7 +163,10 @@
children: [
{
path: "/sell/StockBillMainList/KfICStockBillMainListEdit",
- component: () => import("@/views/sell/Kf_ICStockBillMainList/Kf_ICStockBillMainListEdit.vue"),
+ component: () =>
+ import(
+ "@/views/sell/Kf_ICStockBillMainList/Kf_ICStockBillMainListEdit.vue"
+ ),
name: "KfICStockBillMainListEdit",
meta: { title: "閿�鍞��璐у崟缂栬緫", activeMenu: "sell/StockBillMainList" },
},
@@ -204,6 +210,25 @@
},
],
},
+ //鐢ㄦ埛鍒楄〃
+ {
+ path: "/system/user/GyDriver",
+ component: Layout,
+ hidden: true,
+ redirect: "noredirect",
+ meta: {
+ breadcrumb: false, // 濡傛灉璁剧疆涓篺alse锛屽垯涓嶄細鍦╞readcrumb闈㈠寘灞戜腑鏄剧ず
+ activeMenu: "/system/user", // 褰撹矾鐢辫缃簡璇ュ睘鎬э紝鍒欎細楂樹寒鐩稿搴旂殑渚ц竟鏍忋��
+ },
+ children: [
+ {
+ path: "/system/user/GyDriver",
+ component: () => import("@/views/system/user/GyDriver.vue"),
+ name: "gyDriver",
+ meta: { title: "椹鹃┒鍛樺垪琛�", activeMenu: "system/user" },
+ },
+ ],
+ },
//閲囪喘鍏ュ簱鍗�
{
path: "/purchase/POStockInBill/POStockInBillList",
@@ -217,7 +242,8 @@
children: [
{
path: "/purchase/POStockInBill/POStockInBillList",
- component: () => import("@/views/CaiGouGuanLi/CaiGouRuKu/Kf_POStockInBillList.vue"),
+ component: () =>
+ import("@/views/CaiGouGuanLi/CaiGouRuKu/Kf_POStockInBillList.vue"),
name: "POStockInBillList",
meta: { title: "閲囪喘鍏ュ簱鍗�", activeMenu: "purchase/POStockInBill" },
},
@@ -236,7 +262,8 @@
children: [
{
path: "/purchase/POStockInBill/POStockInBillEdit",
- component: () => import("@/views/CaiGouGuanLi/CaiGouRuKu/Kf_POStockInBillEdit.vue"),
+ component: () =>
+ import("@/views/CaiGouGuanLi/CaiGouRuKu/Kf_POStockInBillEdit.vue"),
name: "POStockInBillEdit",
meta: {
title: "閲囪喘鍏ュ簱鍗曠紪杈�",
@@ -367,7 +394,6 @@
component: () => import("@/views/sell/xsSeOrderBill/xsSeOrderBill"),
name: "XsSeOrderBill",
meta: { title: "閿�鍞鍗曠淮鎶�", activeMenu: "sell/seOrder" },
-
},
{
path: "/sell/seOrder/xsSeOrderBillEdit",
@@ -485,7 +511,7 @@
},
// 鐢熶骇璁㈠崟
{
- path: "/icmo/scIcmoBill/scIcmoBillList",
+ path: "/icmo",
component: Layout,
hidden: true,
redirect: "noredirect",
@@ -529,7 +555,6 @@
},
// i鑺傜偣椤甸潰
{
-
path: "/iframe",
component: () => import("@/layout/emptyLayout"), // 浣跨敤绌哄竷灞�
hidden: true, // 鍦ㄤ晶杈规爮涓嶆樉绀�
@@ -541,50 +566,51 @@
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: "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: "ScICMOBillEdit",
+ component: () => import("@/views/ICMO/ScICMOBillEdit"), // 鐢熶骇璁㈠崟
+ name: "IframeScICMOBillEdit",
+ meta: { title: "鐢熶骇璁㈠崟", noCache: true, noLoading: true },
},
{
- path: 'GyWarehouse',
+ 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 }
+ name: "IframeGyWarehouse",
+ meta: { title: "浠撳簱鍒楄〃", noCache: true, noLoading: true },
},
{
- path: 'GyMaterial',
+ path: "GyMaterial",
component: () => import("@/views/gyMaterial/GyMaterial"), // 鐗╂枡
- name: 'IframeGyMaterial',
- meta: { title: '鐗╂枡鍒楄〃', noCache: true, noLoading: true }
+ name: "IframeGyMaterial",
+ meta: { title: "鐗╂枡鍒楄〃", noCache: true, noLoading: true },
},
- ]
- }, // 瀹㈡埛
+ ],
+ }, // 瀹㈡埛
{
path: "/GyCustomer",
component: () => import("@/views/GyCustomer/index"),
@@ -695,7 +721,8 @@
children: [
{
path: "/scMould/warehouse/Sc_MouldProdOutBillList",
- component: () => import("@/views/scMould/warehouse/Sc_MouldProdOutBillList"),
+ component: () =>
+ import("@/views/scMould/warehouse/Sc_MouldProdOutBillList"),
name: "Sc_MouldProdOutBillList",
meta: { title: "鍣ㄥ叿棰嗙敤鍑哄簱鍗曠淮鎶�", activeMenu: "scMould/warehouse" },
},
@@ -714,7 +741,8 @@
children: [
{
path: "/scMould/warehouse/Sc_MouldProdOutBillEdit",
- component: () => import("@/views/scMould/warehouse/Sc_MouldProdOutBillEdit"),
+ component: () =>
+ import("@/views/scMould/warehouse/Sc_MouldProdOutBillEdit"),
name: "Sc_MouldProdOutBillEdit",
meta: { title: "鍣ㄥ叿棰嗙敤鍑哄簱鍗曠紪杈�", activeMenu: "scMould/warehouse" },
},
@@ -734,7 +762,8 @@
children: [
{
path: "/scMould/warehouse/Sc_MouldProdBackBillList",
- component: () => import("@/views/scMould/warehouse/Sc_MouldProdBackBillList"),
+ component: () =>
+ import("@/views/scMould/warehouse/Sc_MouldProdBackBillList"),
name: "Sc_MouldProdBackBillList",
meta: { title: "鍣ㄥ叿棰嗙敤閫�搴撳崟缁存姢", activeMenu: "scMould/warehouse" },
},
@@ -753,7 +782,8 @@
children: [
{
path: "/scMould/warehouse/Sc_MouldProdBackBillEdit",
- component: () => import("@/views/scMould/warehouse/Sc_MouldProdBackBillEdit"),
+ component: () =>
+ import("@/views/scMould/warehouse/Sc_MouldProdBackBillEdit"),
name: "Sc_MouldProdBackBillEdit",
meta: { title: "鍣ㄥ叿棰嗙敤閫�搴撳崟缂栬緫", activeMenu: "scMould/warehouse" },
},
@@ -773,7 +803,8 @@
children: [
{
path: "/scMould/warehouse/Sc_MouldProdMoveBillList",
- component: () => import("@/views/scMould/warehouse/Sc_MouldProdMoveBillList"),
+ component: () =>
+ import("@/views/scMould/warehouse/Sc_MouldProdMoveBillList"),
name: "Sc_MouldProdMoveBillList",
meta: { title: "鍣ㄥ叿鐩存帴璋冩嫧鍗曠淮鎶�", activeMenu: "scMould/warehouse" },
},
@@ -792,7 +823,8 @@
children: [
{
path: "/scMould/warehouse/Sc_MouldProdMoveBillEdit",
- component: () => import("@/views/scMould/warehouse/Sc_MouldProdMoveBillEdit"),
+ component: () =>
+ import("@/views/scMould/warehouse/Sc_MouldProdMoveBillEdit"),
name: "Sc_MouldProdMoveBillEdit",
meta: { title: "鍣ㄥ叿鐩存帴璋冩嫧鍗曠紪杈�", activeMenu: "scMould/warehouse" },
},
@@ -812,7 +844,8 @@
children: [
{
path: "/scMould/warehouse/Sc_MouldInRequestBillList",
- component: () => import("@/views/scMould/warehouse/Sc_MouldInRequestBillList"),
+ component: () =>
+ import("@/views/scMould/warehouse/Sc_MouldInRequestBillList"),
name: "Sc_MouldInRequestBillList",
meta: { title: "鍣ㄥ叿鍏ュ簱鐢宠鍗曠淮鎶�", activeMenu: "scMould/warehouse" },
},
@@ -831,13 +864,14 @@
children: [
{
path: "/scMould/warehouse/Sc_MouldInRequestBillEdit",
- component: () => import("@/views/scMould/warehouse/Sc_MouldInRequestBillEdit"),
+ component: () =>
+ import("@/views/scMould/warehouse/Sc_MouldInRequestBillEdit"),
name: "Sc_MouldInRequestBillEdit",
meta: { title: "鍣ㄥ叿鍏ュ簱鐢宠鍗曠紪杈�", activeMenu: "scMould/warehouse" },
},
],
},
- //鍣ㄥ叿棰嗙敤鐢宠鍗曠淮鎶�
+ //鍣ㄥ叿棰嗙敤鐢宠鍗曠淮鎶�
{
path: "/scMould/warehouse/Sc_MouldOutRequestBillList",
component: Layout,
@@ -851,7 +885,8 @@
children: [
{
path: "/scMould/warehouse/Sc_MouldOutRequestBillList",
- component: () => import("@/views/scMould/warehouse/Sc_MouldOutRequestBillList"),
+ component: () =>
+ import("@/views/scMould/warehouse/Sc_MouldOutRequestBillList"),
name: "Sc_MouldOutRequestBillList",
meta: { title: "鍣ㄥ叿棰嗙敤鐢宠鍗曠淮鎶�", activeMenu: "scMould/warehouse" },
},
@@ -870,13 +905,14 @@
children: [
{
path: "/scMould/warehouse/Sc_MouldOutRequestBillEdit",
- component: () => import("@/views/scMould/warehouse/Sc_MouldOutRequestBillEdit"),
+ component: () =>
+ import("@/views/scMould/warehouse/Sc_MouldOutRequestBillEdit"),
name: "Sc_MouldOutRequestBillEdit",
meta: { title: "鍣ㄥ叿棰嗙敤鐢宠鍗曠紪杈�", activeMenu: "scMould/warehouse" },
},
],
},
- //鍣ㄥ叿璋冩嫧鐢宠鍗曠淮鎶�
+ //鍣ㄥ叿璋冩嫧鐢宠鍗曠淮鎶�
{
path: "/scMould/warehouse/Sc_MouldMoveStockRequestBillList",
component: Layout,
@@ -890,7 +926,8 @@
children: [
{
path: "/scMould/warehouse/Sc_MouldMoveStockRequestBillList",
- component: () => import("@/views/scMould/warehouse/Sc_MouldMoveStockRequestBillList"),
+ component: () =>
+ import("@/views/scMould/warehouse/Sc_MouldMoveStockRequestBillList"),
name: "Sc_MouldMoveStockRequestBillList",
meta: { title: "鍣ㄥ叿璋冩嫧鐢宠鍗曠淮鎶�", activeMenu: "scMould/warehouse" },
},
@@ -909,14 +946,13 @@
children: [
{
path: "/scMould/warehouse/Sc_MouldMoveStockRequestBillEdit",
- component: () => import("@/views/scMould/warehouse/Sc_MouldMoveStockRequestBillEdit"),
+ component: () =>
+ import("@/views/scMould/warehouse/Sc_MouldMoveStockRequestBillEdit"),
name: "Sc_MouldMoveStockRequestBillEdit",
meta: { title: "鍣ㄥ叿璋冩嫧鐢宠鍗曠紪杈�", activeMenu: "scMould/warehouse" },
},
],
},
-
-
//鐩存帴璋冩嫧鍗曠淮鎶�
{
@@ -958,11 +994,6 @@
},
],
},
-
-
-
-
-
//鏉冮檺鏌ヨ
{
@@ -1172,47 +1203,58 @@
import("@/views/purchase/postockInBack/Kf_POStockInBackBillList.vue"),
name: "Kf_POStockInBackBillList",
meta: {
- title: "閲囪喘閫�鏂欏崟缁存姢",
+ title: "閲囪喘閫�鏂欏崟鍒楄〃锛堝凡鍏ュ簱锛�",
+ activeMenu: "purchase/postockInBack",
+ },
+ }
+ ],
+ },
+ {
+ path: "/purchase/postockInBack/Kf_POStockInBackBillList0",
+ component: Layout,
+ hidden: true,
+ redirect: "noredirect",
+ meta: {
+ breadcrumb: false, // 濡傛灉璁剧疆涓篺alse锛屽垯涓嶄細鍦╞readcrumb闈㈠寘灞戜腑鏄剧ず
+ activeMenu: "/purchase/postockInBack/Kf_POStockInBackBillList", // 褰撹矾鐢辫缃簡璇ュ睘鎬э紝鍒欎細楂樹寒鐩稿搴旂殑渚ц竟鏍忋��
+ },
+ children: [
+ {
+ path: "/purchase/postockInBack/Kf_POStockInBackBillList0",
+ 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",
+ path: "/icmo",
component: Layout,
hidden: true,
redirect: "noredirect",
meta: {
breadcrumb: false, // 濡傛灉璁剧疆涓篺alse锛屽垯涓嶄細鍦╞readcrumb闈㈠寘灞戜腑鏄剧ず
- activeMenu: "/purchase/ProductInBill", // 褰撹矾鐢辫缃簡璇ュ睘鎬э紝鍒欎細楂樹寒鐩稿搴旂殑渚ц竟鏍忋��
+ activeMenu: "/icmo/productInBill", // 褰撹矾鐢辫缃簡璇ュ睘鎬э紝鍒欎細楂樹寒鐩稿搴旂殑渚ц竟鏍忋��
},
children: [
{
- path: "/purchase/ProductInBill/ProductInBillEdit",
- component: () => import("@/views/ProductInBill/Kf_ProductInBillEdit.vue"),
+ path: "/icmo/productInBill/productInBillList",
+ component: () =>
+ import("@/views/ProductInBill/Kf_ProductInBillList.vue"),
+ name: "ProductInBillList",
+ meta: { title: "鐢熶骇鍏ュ簱鍗曞垪琛�", activeMenu: "icmo/productInBill" },
+ },
+ {
+ path: "/icmo/productInBill/productInBillEdit",
+ component: () =>
+ import("@/views/ProductInBill/Kf_ProductInBillEdit.vue"),
name: "ProductInBillEdit",
- meta: { title: "鐢熶骇鍏ュ簱鍗�", activeMenu: "/purchase/ProductInBill" },
+ meta: { title: "鐢熶骇鍏ュ簱鍗�", activeMenu: "icmo/productInBill" },
},
],
},
@@ -1230,9 +1272,13 @@
children: [
{
path: "/purchase/OtherOutBill/OtherOutBillList",
- component: () => import("@/views/KCGL/OtherOutBill/Kf_OtherOutBillList.vue"),
+ component: () =>
+ import("@/views/KCGL/OtherOutBill/Kf_OtherOutBillList.vue"),
name: "OtherOutBillList",
- meta: { title: "鍏朵粬鍑哄簱鍗曞垪琛�", activeMenu: "/views/KCGL/OtherOutBill" },
+ meta: {
+ title: "鍏朵粬鍑哄簱鍗曞垪琛�",
+ activeMenu: "/views/KCGL/OtherOutBill",
+ },
},
],
},
@@ -1249,7 +1295,8 @@
children: [
{
path: "/purchase/OtherOutBill/OtherOutBillEdit",
- component: () => import("@/views/KCGL/OtherOutBill/Kf_OtherOutBillEdit.vue"),
+ component: () =>
+ import("@/views/KCGL/OtherOutBill/Kf_OtherOutBillEdit.vue"),
name: "OtherOutBillEdit",
meta: { title: "鍏朵粬鍑哄簱鍗�", activeMenu: "/views/KCGL/OtherOutBill" },
},
@@ -1268,7 +1315,8 @@
children: [
{
path: "/icmo/scICMOReportBill/scICMOReportBillList",
- component: () => import("@/views/ICMO/ScICMOReportBill/ScICMOReportBillList.vue"),
+ component: () =>
+ import("@/views/ICMO/ScICMOReportBill/ScICMOReportBillList.vue"),
name: "ScICMOBillList",
meta: { title: "鐢熶骇姹囨姤鍗曠淮鎶�", activeMenu: "/icmo/scICMOReportBill" },
},
diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
index 756a8a8..0e846f5 100644
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -234,7 +234,10 @@
noCache: false,
title: "閿�鍞��璐у崟缁存姢",
},
- component: () =>import ("@/views/sell/Kf_ICStockBillMainList/Kf_ICStockBillMainList.vue"),
+ component: () =>
+ import(
+ "@/views/sell/Kf_ICStockBillMainList/Kf_ICStockBillMainList.vue"
+ ),
hidden: false,
name: "KfICStockBillMainList",
path: "KfICStockBillMainList",
@@ -246,7 +249,10 @@
noCache: false,
title: "閿�鍞��璐у崟",
},
- component: () =>import ("@/views/sell/Kf_ICStockBillMainList/Kf_ICStockBillMainListEdit.vue"),
+ component: () =>
+ import(
+ "@/views/sell/Kf_ICStockBillMainList/Kf_ICStockBillMainListEdit.vue"
+ ),
hidden: false,
name: "KfICStockBillMainListEdit",
path: "KfICStockBillMainListEdit",
@@ -290,7 +296,9 @@
title: "鍑哄簱鐢宠鍗曠淮鎶�",
},
component: () =>
- import("@/views/warehouse/shipment/Kf_StockOutRequestBillList.vue"),
+ import(
+ "@/views/warehouse/shipment/Kf_StockOutRequestBillList.vue"
+ ),
hidden: false,
name: "Kf_StockOutRequestBillList",
path: "Kf_StockOutRequestBillList",
@@ -303,7 +311,9 @@
title: "鍑哄簱鐢宠鍗�",
},
component: () =>
- import("@/views/warehouse/shipment/Kf_StockOutRequestBill.vue"),
+ import(
+ "@/views/warehouse/shipment/Kf_StockOutRequestBill.vue"
+ ),
hidden: false,
name: "Kf_StockOutRequestBill",
path: "Kf_StockOutRequestBill",
@@ -331,7 +341,9 @@
title: "璋冩嫧鐢宠鍗曠淮鎶�",
},
component: () =>
- import("@/views/warehouse/transfer/Kf_MoveStockRequestBillList.vue"),
+ import(
+ "@/views/warehouse/transfer/Kf_MoveStockRequestBillList.vue"
+ ),
hidden: false,
name: "Kf_MoveStockRequestBillList",
path: "Kf_MoveStockRequestBillList",
@@ -344,7 +356,9 @@
title: "璋冩嫧鐢宠鍗�",
},
component: () =>
- import("@/views/warehouse/transfer/Kf_MoveStockRequestBillEdit.vue"),
+ import(
+ "@/views/warehouse/transfer/Kf_MoveStockRequestBillEdit.vue"
+ ),
hidden: false,
name: "Kf_MoveStockRequestBillEdit",
path: "Kf_MoveStockRequestBillEdit",
@@ -357,7 +371,9 @@
title: "鐩存帴璋冩嫧鍗曠淮鎶�",
},
component: () =>
- import("@/views/KCGL/MoveStockBill/Kf_MoveStockBillList.vue"),
+ import(
+ "@/views/KCGL/MoveStockBill/Kf_MoveStockBillList.vue"
+ ),
hidden: false,
name: "Kf_MoveStockBillList",
path: "Kf_MoveStockBillList",
@@ -370,7 +386,9 @@
title: "鐩存帴璋冩嫧鍗�",
},
component: () =>
- import("@/views/KCGL/MoveStockBill/Kf_MoveStockBillEdit.vue"),
+ import(
+ "@/views/KCGL/MoveStockBill/Kf_MoveStockBillEdit.vue"
+ ),
hidden: false,
name: "Kf_MoveStockBillEdit",
path: "Kf_MoveStockBillEdit",
@@ -398,7 +416,9 @@
title: "鏉＄爜鐢熸垚",
},
component: () =>
- import("@/views/warehouse/barcodeMaster/Gy_BarCodeBill.vue"),
+ import(
+ "@/views/warehouse/barcodeMaster/Gy_BarCodeBill.vue"
+ ),
hidden: false,
name: "Gy_BarCodeBill",
path: "Gy_BarCodeBill",
@@ -750,7 +770,7 @@
icon: "build",
link: null,
noCache: false,
- title: "閲囪喘閫�鏂欏崟缁存姢",
+ title: "閲囪喘閫�鏂欏崟鍒楄〃锛堝凡鍏ュ簱锛�",
},
component: () =>
import(
@@ -759,6 +779,23 @@
hidden: false,
name: "Kf_POStockInBackBillList",
path: "Kf_POStockInBackBillList",
+ query: "{\"type\":1}"
+ },
+ {
+ meta: {
+ icon: "build",
+ link: null,
+ noCache: false,
+ title: "閲囪喘閫�鏂欏崟鍒楄〃锛堟湭鍏ュ簱锛�",
+ },
+ component: () =>
+ import(
+ "@/views/purchase/postockInBack/Kf_POStockInBackBillList.vue"
+ ),
+ hidden: false,
+ name: "Kf_POStockInBackBillList",
+ path: "Kf_POStockInBackBillList0",
+ query: "{\"type\":0}"
},
],
},
@@ -782,7 +819,10 @@
noCache: false,
title: "鍏朵粬鍑哄簱鍗曞垪琛�",
},
- component: () => import("@/views/KCGL/OtherOutBill/Kf_OtherOutBillList.vue"),
+ component: () =>
+ import(
+ "@/views/KCGL/OtherOutBill/Kf_OtherOutBillList.vue"
+ ),
hidden: false,
name: "OtherOutBillList",
path: "OtherOutBillList",
@@ -794,7 +834,10 @@
noCache: false,
title: "鍏朵粬鍑哄簱鍗�",
},
- component: () => import("@/views/KCGL/OtherOutBill/Kf_OtherOutBillEdit.vue"),
+ component: () =>
+ import(
+ "@/views/KCGL/OtherOutBill/Kf_OtherOutBillEdit.vue"
+ ),
hidden: false,
name: "OtherOutBillEdit",
path: "OtherOutBillEdit",
@@ -865,7 +908,7 @@
},
hidden: false,
name: "ProductInBill",
- path: "ProductInBill",
+ path: "productInBill",
redirect: "noRedirect",
component: "Layout",
children: [
@@ -876,10 +919,11 @@
noCache: false,
title: "鐢熶骇鍏ュ簱鍒楄〃",
},
- component: () => import("@/views/ProductInBill/Kf_ProductInBillList.vue"),
+ component: () =>
+ import("@/views/ProductInBill/Kf_ProductInBillList.vue"),
hidden: false,
name: "ProductInBillList",
- path: "ProductInBillList",
+ path: "productInBillList",
},
{
meta: {
@@ -888,10 +932,11 @@
noCache: false,
title: "鐢熶骇鍏ュ簱鍗�",
},
- component: () => import("@/views/ProductInBill/Kf_ProductInBillEdit.vue"),
+ component: () =>
+ import("@/views/ProductInBill/Kf_ProductInBillEdit.vue"),
hidden: false,
name: "ProductInBillEdit",
- path: "ProductInBillEdit",
+ path: "productInBillEdit",
},
],
},
@@ -915,7 +960,10 @@
noCache: false,
title: "鐢熶骇姹囨姤鍒楄〃",
},
- component: () => import("@/views/ICMO/ScICMOReportBill/ScICMOReportBillList.vue"),
+ component: () =>
+ import(
+ "@/views/ICMO/ScICMOReportBill/ScICMOReportBillList.vue"
+ ),
hidden: false,
name: "ScICMOReportBillList",
path: "scICMOReportBillList",
@@ -1052,7 +1100,8 @@
hidden: false,
name: "Sc_MouldProdMoveBillEdit",
path: "Sc_MouldProdMoveBillEdit",
- },{
+ },
+ {
meta: {
icon: "build",
link: null,
@@ -1081,7 +1130,8 @@
hidden: false,
name: "Sc_MouldInRequestBillEdit",
path: "Sc_MouldInRequestBillEdit",
- },{
+ },
+ {
meta: {
icon: "build",
link: null,
@@ -1110,7 +1160,8 @@
hidden: false,
name: "Sc_MouldOutRequestBillEdit",
path: "Sc_MouldOutRequestBillEdit",
- },{
+ },
+ {
meta: {
icon: "build",
link: null,
@@ -1249,7 +1300,8 @@
noCache: false,
title: "瑙掕壊鍒楄〃",
},
- component: () =>import("@/views/system/user/Xt_UserGroupList.vue"),
+ component: () =>
+ import("@/views/system/user/Xt_UserGroupList.vue"),
hidden: false,
name: "Xt_UserGroupList",
path: "Xt_UserGroupList",
@@ -1259,6 +1311,18 @@
icon: "build",
link: null,
noCache: false,
+ title: "椹鹃┒鍛樺垪琛�",
+ },
+ component: () =>import("@/views/system/user/GyDriver.vue"),
+ hidden: false,
+ name: "gyDriver",
+ path: "GyDriver",
+ },
+ {
+ meta: {
+ icon: "build",
+ link: null,
+ noCache: false,
title: "鏉冮檺鏌ヨ",
},
component: () =>
diff --git a/src/views/CaiGouGuanLi/CaiGouRuKu/Kf_POStockInBillEdit.vue b/src/views/CaiGouGuanLi/CaiGouRuKu/Kf_POStockInBillEdit.vue
index c3225b6..e9d6c9d 100644
--- a/src/views/CaiGouGuanLi/CaiGouRuKu/Kf_POStockInBillEdit.vue
+++ b/src/views/CaiGouGuanLi/CaiGouRuKu/Kf_POStockInBillEdit.vue
@@ -377,7 +377,8 @@
this.getdata()
},
beforeDestroy() {
- this.$destroy()
+ // 涓嬮潰鐨勪唬鐮佷細瀵艰嚧椤甸潰宕╂簝锛屽厛娉ㄩ噴鎺�
+ // this.$destroy()
},
methods: {
//#region 琛ㄥ崟鏁版嵁鍒濆鍖�
diff --git a/src/views/FbStepFoldOutBillList/fbStepFoldOutBillList.vue b/src/views/FbStepFoldOutBillList/fbStepFoldOutBillList.vue
index 67c0685..77c3b85 100644
--- a/src/views/FbStepFoldOutBillList/fbStepFoldOutBillList.vue
+++ b/src/views/FbStepFoldOutBillList/fbStepFoldOutBillList.vue
@@ -8,7 +8,7 @@
</el-select>
</el-form-item>
<el-form-item label="寮�濮嬫棩鏈�">
- <el-date-picker v-model="query.HBeginDate" type="date" placeholder="寮�濮嬫棩鏈�" style="width:160px" :disabled="timeCycleDisabled" value-formate="yyyy-mm-dd" format="yyyy-mm-dd"/>
+ <el-date-picker v-model="query.HBeginDate" type="date" placeholder="寮�濮嬫棩鏈�" style="width:160px" :disabled="timeCycleDisabled" value-formate="yyyy-MM-dd" format="yyyy-MM-dd"/>
</el-form-item>
<el-form-item label="缁撴潫鏃ユ湡">
<el-date-picker v-model="query.HEndDate" type="date" placeholder="缁撴潫鏃ユ湡" style="width:160px" :disabled="timeCycleDisabled" value-format="yyyy-MM-dd" format="yyyy-MM-dd"/>
@@ -72,14 +72,14 @@
<el-col :span="6">
<el-form-item label="杩囨护">
<el-select v-model="query.ColName" style="width:190px">
- <el-option value="0" label=""></el-option>
+ <!-- <el-option value="0" label=""></el-option> -->
<el-option v-for="col in filterColumns" :key="col.field" :value="col.field" :label="col.title" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-select v-model="query.Comparator" style="width:190px">
- <el-option value="0" label=""></el-option>
+ <!-- <el-option value="0" label=""></el-option> -->
<el-option value="=" label="=" />
<el-option value=">=" label=">=" />
<el-option value=">" label=">" />
@@ -108,7 +108,7 @@
</el-col>
<el-col :span="6">
<el-select v-model="query.Comparator1" style="width:190px">
- <el-option value="0" label=""></el-option>
+ <!-- <el-option value="0" label=""></el-option> -->
<el-option value="=" label="=" />
<el-option value=">=" label=">=" />
<el-option value=">" label=">" />
@@ -137,7 +137,7 @@
</el-col>
<el-col :span="6">
<el-select v-model="query.Comparator2" style="width:190px">
- <el-option value="0" label=""></el-option>
+ <!-- <el-option value="0" label=""></el-option> -->
<el-option value="=" label="=" />
<el-option value=">=" label=">=" />
<el-option value=">" label=">" />
@@ -220,6 +220,7 @@
//import FbStepFoldinBillEdit from './fbStepFoldinBillEdit'
import FbStepFoldinBillEdit from '@/views/FbStepFoldOutBillList/fbStepFoldOutBillListEdit'
import BarCodeDetail from '@/views/component/BarCodeDetail'
+import dayjs from 'dayjs';
export default {
@@ -249,14 +250,14 @@
HSourceBillNo: '',
Warehouse: '',
Hmaker: '',
- ColName: '0',
- Comparator: '0',
+ ColName: '',
+ Comparator: '',
ColContent: '',
- ColName1: '0',
- Comparator1: '0',
+ ColName1: '',
+ Comparator1: '',
ColContent1: '',
- ColName2: '0',
- Comparator2: '0',
+ ColName2: '',
+ Comparator2: '',
ColContent2: ''
},
timeCycles: [
@@ -322,6 +323,7 @@
const yyyy = d.getFullYear();
const mm = String(d.getMonth() + 1).padStart(2, '0');
const dd = String(d.getDate()).padStart(2, '0');
+
return `${yyyy}-${mm}-${dd}`;
},
onTimeCycleChange() {
@@ -392,8 +394,8 @@
if (q.ColName2 && q.Comparator2 && q.Comparator2 !== '0' && q.ColContent2)
sWhereParts.push(buildComparator(q.ColName2, q.Comparator2, q.ColContent2));
- if (q.HBeginDate) sWhereParts.push(` and CONVERT(varchar(100),鏃ユ湡, 23) >= '${q.HBeginDate}'`);
- if (q.HEndDate) sWhereParts.push(` and CONVERT(varchar(100),鏃ユ湡, 23) <= '${q.HEndDate}'`);
+ if (q.HBeginDate) sWhereParts.push(` and CONVERT(varchar(100),鏃ユ湡, 23) >= '${dayjs(q.HBeginDate).format("YYYY-MM-DD")}'`);
+ if (q.HEndDate) sWhereParts.push(` and CONVERT(varchar(100),鏃ユ湡, 23) <= '${dayjs(q.HEndDate).format("YYYY-MM-DD")}'`);
if (q.HBillNo) sWhereParts.push(` and 鍗曟嵁鍙� like '%${q.HBillNo}%'`);
if (q.HDeptID) sWhereParts.push(` and 閮ㄩ棬 like '%${q.HDeptID}%'`);
if (q.MaterialCode) sWhereParts.push(` and 鐗╂枡浠ｇ爜 like '%${q.MaterialCode}%'`);
diff --git a/src/views/FbStepFoldinBillList/fbStepFoldinBillList.vue b/src/views/FbStepFoldinBillList/fbStepFoldinBillList.vue
index 3a3311d..1ae80de 100644
--- a/src/views/FbStepFoldinBillList/fbStepFoldinBillList.vue
+++ b/src/views/FbStepFoldinBillList/fbStepFoldinBillList.vue
@@ -72,7 +72,7 @@
<el-col :span="6">
<el-form-item label="杩囨护">
<el-select v-model="query.ColName" style="width:190px">
- <el-option value="0" label=""></el-option>
+ <!-- <el-option value="0" label=""></el-option> -->
<el-option v-for="col in filterColumns" :key="col.field" :value="col.field" :label="col.title" />
</el-select>
</el-form-item>
@@ -101,7 +101,7 @@
<el-col :span="6">
<el-form-item label="杩囨护1">
<el-select v-model="query.ColName1" style="width:190px">
- <el-option value="0" label=""></el-option>
+ <!-- <el-option value="0" label=""></el-option> -->
<el-option v-for="col in filterColumns" :key="col.field" :value="col.field" :label="col.title" />
</el-select>
</el-form-item>
@@ -130,7 +130,7 @@
<el-col :span="6">
<el-form-item label="杩囨护2">
<el-select v-model="query.ColName2" style="width:190px">
- <el-option value="0" label=""></el-option>
+ <!-- <el-option value="0" label=""></el-option> -->
<el-option v-for="col in filterColumns" :key="col.field" :value="col.field" :label="col.title" />
</el-select>
</el-form-item>
@@ -246,14 +246,14 @@
HSourceBillNo: '',
Warehouse: '',
Hmaker: '',
- ColName: '0',
- Comparator: '0',
+ ColName: '',
+ Comparator: '',
ColContent: '',
- ColName1: '0',
- Comparator1: '0',
+ ColName1: '',
+ Comparator1: '',
ColContent1: '',
- ColName2: '0',
- Comparator2: '0',
+ ColName2: '',
+ Comparator2: '',
ColContent2: ''
},
timeCycles: [
diff --git a/src/views/KCGL/MoveStockBill/Kf_MoveStockBillEdit.vue b/src/views/KCGL/MoveStockBill/Kf_MoveStockBillEdit.vue
index 466d0e0..5df9bfa 100644
--- a/src/views/KCGL/MoveStockBill/Kf_MoveStockBillEdit.vue
+++ b/src/views/KCGL/MoveStockBill/Kf_MoveStockBillEdit.vue
@@ -505,7 +505,8 @@
this.getdata()
},
beforeDestroy() {
- this.$destroy()
+ // 浼氬鑷撮〉闈㈠穿婧� 鍏堟敞閲婃帀
+ // this.$destroy()
},
methods: {
//#region 琛ㄥ崟鏁版嵁鍒濆鍖�
diff --git a/src/views/KCGL/OtherOutBill/Kf_OtherOutBillEdit.vue b/src/views/KCGL/OtherOutBill/Kf_OtherOutBillEdit.vue
index 885d566..fa92ca9 100644
--- a/src/views/KCGL/OtherOutBill/Kf_OtherOutBillEdit.vue
+++ b/src/views/KCGL/OtherOutBill/Kf_OtherOutBillEdit.vue
@@ -14,7 +14,7 @@
<el-row>
<el-col :span="6">
<el-form-item label="鍗曟嵁缂栧彿" prop="HBillNo">
- <el-input v-model="form.HBillNo" placeholder="璇疯緭鍏ュ崟鎹紪鍙�" disabled="true" />
+ <el-input v-model="form.HBillNo" placeholder="璇疯緭鍏ュ崟鎹紪鍙�" :disabled="true" />
</el-form-item>
</el-col>
<el-col :span="6">
@@ -175,7 +175,7 @@
@selection-change="handleTableZbEdit" :row-class-name="rowSysZbIndex" show-summary border>
<el-table-column type="selection" width="55" align="center" />
<el-table-column align="center" label="搴忓彿" type="index" width="80" />
- <el-table-column align="center" label="婧愬崟鍗曞彿" width="120">
+ <!-- <el-table-column align="center" label="婧愬崟鍗曞彿" width="120">
<template slot-scope="scope">
<span>{{ scope.row.HSourceBillNo }}</span>
</template>
@@ -194,7 +194,7 @@
<template slot-scope="scope">
<span>{{ scope.row.HSourceEntryID }}</span>
</template>
- </el-table-column>
+ </el-table-column> -->
<el-table-column align="center" label="HMaterID" width="120">
<template slot-scope="scope">
<span>{{ scope.row.HMaterID }}</span>
@@ -287,8 +287,8 @@
</el-table-column>
<el-table-column align="center" label="鍙戞枡浠撲綅" width="120">
<template slot-scope="scope">
- <el-input v-model="scope.row.鏀舵枡浠撲綅" placeholder="璇疯緭鍏ュ彂鏂欎粨浣�" @keyup.native.f7="openDataDialog(2, scope.row)"
- @dblclick.native="openDataDialog(2, scope.row)" />
+ <el-input v-model="scope.row.鏀舵枡浠撲綅" placeholder="璇疯緭鍏ュ彂鏂欎粨浣�" @keyup.native.f7="openDataDialog(4, scope.row)"
+ @dblclick.native="openDataDialog(4, scope.row)" />
</template>
</el-table-column>
<el-table-column align="center" label="鎵规" width="120">
@@ -417,6 +417,7 @@
activeName: 'first',
zbIndex: null,
zbSelForm: {}, //瀛愯〃閫変腑鏁版嵁,鐢ㄤ簬瀛愯〃澶嶅埗銆佷笂绉汇�佷笅绉荤瓑鎿嶄綔
+ zbRow: null,
};
},
created() {
@@ -425,14 +426,15 @@
this.getdata()
},
beforeDestroy() {
- this.$destroy()
+
+ // this.$destroy()
},
methods: {
//#region 琛ㄥ崟鏁版嵁鍒濆鍖�
getdata() {
this.formShow = false
this.formLoading = true
-
+ console.log(this.OperationType,this.copyType)
if ((this.OperationType == 1 && this.copyType != 1) || (!this.OperationType && !this.copyType)) {
this.handleAdd()
}
@@ -637,7 +639,10 @@
//#region 鎵撳紑鏁版嵁鍒楄〃寮圭獥
openDataDialog(num, row) {
if (row) {
- this.zbIndex = row.index - 1
+
+ const idx = this.editData.indexOf(row);
+ this.zbIndex = idx >= 0 ? idx : null;
+ this.zbRow = row;
}
this.showReset()
if (num == 1) {
@@ -677,13 +682,23 @@
this.openData = false
}
else if (num == 2) { //鏀舵枡浠撳簱
- this.editData[this.zbIndex].HWHID = deptRow.HItemID;
- this.editData[this.zbIndex].鏀舵枡浠撳簱 = deptRow.浠撳簱鍚嶇О;
+
+ if (this.zbIndex == null || this.zbIndex < 0 || !this.editData[this.zbIndex]) {
+ this.$modal.msgError('璇烽�夋嫨瑕佺紪杈戠殑鏄庣粏琛屽悗鍐嶉�夋嫨浠撳簱');
+ this.openData = false;
+ return;
+ }
+
+ this.$set(this.editData[this.zbIndex], 'HWHID', deptRow.HItemID);
+ this.$set(this.editData[this.zbIndex], '鏀舵枡浠撳簱', deptRow.浠撳簱鍚嶇О);
+
this.openData = false
}
- else if (num == 4) { //浠撲綅
- this.editData[this.zbIndex].HSPID = deptRow.HItemID;
- this.editData[this.zbIndex].浠撲綅鍚嶇О = deptRow.浠撲綅鍚嶇О;
+ else if (num == 4) {
+ this.$set(this.editData[this.zbIndex], 'HSPID', deptRow.HItemID);
+ this.$set(this.editData[this.zbIndex], '鍙戞枡浠撲綅', deptRow.浠撲綅鍚嶇О); //浠撲綅
+ // this.editData[this.zbIndex].HSPID = deptRow.HItemID;
+ // this.editData[this.zbIndex].浠撲綅鍚嶇О = deptRow.浠撲綅鍚嶇О;
this.openData = false
}
else if (num == 3) { //鐗╂枡
@@ -803,8 +818,9 @@
//#region 瀛愯〃鎿嶄綔
//#region 璁剧疆瀛愯〃搴忓彿鍒�
- rowSysZbIndex({ row, rowIndex }) {
+ rowSysZbIndex( row, rowIndex ) {
row.index = rowIndex + 1;
+ return '';
},
//#endregion
@@ -837,13 +853,20 @@
HCostPrice: 0,
HCostMoney: 0,
HSalePrice: 0,
- HSeOrderInterID: 741,
- HSeOrderEntryID: 18,
- HSeOrderBillNo: 'XSFH00000747',
- HSourceInterID: 741,
- HSourceEntryID: 18,
- HSourceBillNo: 'XSFH00000747',
- HSourceBillType: 1402,
+ // HSeOrderInterID: 741,
+ // HSeOrderEntryID: 18,
+ HSeOrderInterID: '',
+ HSeOrderEntryID: '',
+ //HSeOrderBillNo: 'XSFH00000747',
+ HSeOrderBillNo: '',
+ // HSourceInterID: 741,
+ // HSourceEntryID: 18,
+ // HSourceBillNo: 'XSFH00000747',
+ HSourceInterID: '',
+ HSourceEntryID: '',
+ HSourceBillNo: '',
+ //HSourceBillType: '1402',
+ HSourceBillType: '',
HRelationQty: 0,
HRelationMoney: 0,
HSPID: 0,
@@ -943,7 +966,8 @@
handleTableZbEdit(selection) {
this.checkedSysZb = selection.map(item => item.index)
this.zbSelForm = selection[0]
- this.zbIndex = this.checkedSysZb[0]
+
+ this.zbIndex = selection.length ? this.editData.indexOf(selection[0]) : null
if (selection.length > 1) {
const del_row = selection.shift()
this.$refs.zbTable.toggleRowSelection(del_row, false) //璁剧疆杩欎竴琛屽彇娑堥�変腑
diff --git a/src/views/KCGL/OtherOutBill/Kf_OtherOutBillList.vue b/src/views/KCGL/OtherOutBill/Kf_OtherOutBillList.vue
index eb98d12..3934724 100644
--- a/src/views/KCGL/OtherOutBill/Kf_OtherOutBillList.vue
+++ b/src/views/KCGL/OtherOutBill/Kf_OtherOutBillList.vue
@@ -374,7 +374,7 @@
}).catch(error => {
this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
});
- this.queryParams.HOrgID = sessionStorage["OrganizationID"];
+ this.queryParams.HOrgID = sessionStorage["Organization"];
},
//#endregion
@@ -475,9 +475,9 @@
if (this.queryParams.HBillNo) {
this.sWhere += " and 鍗曟嵁鍙� like '%" + this.queryParams.HBillNo + "%'";
}
-
- if (this.queryParams.HOrgID) {
- this.sWhere += " and HOrgID = '" + this.queryParams.HOrgID + "'";
+ //this.queryParams.HOrgID
+ if (sessionStorage["OrganizationID"] != "0") {
+ this.sWhere += " and HOrgID = '" + sessionStorage["OrganizationID"] + "'";
}
this.getList()
},
diff --git a/src/views/ProductInBill/Kf_ProductInBillEdit.vue b/src/views/ProductInBill/Kf_ProductInBillEdit.vue
index 6dfa15b..d5dd6e9 100644
--- a/src/views/ProductInBill/Kf_ProductInBillEdit.vue
+++ b/src/views/ProductInBill/Kf_ProductInBillEdit.vue
@@ -164,7 +164,7 @@
@selection-change="handleTableZbEdit" :row-class-name="rowSysZbIndex" show-summary border>
<el-table-column type="selection" width="55" align="center" />
<el-table-column align="center" label="搴忓彿" type="index" width="80" />
- <el-table-column align="center" label="婧愬崟鍗曞彿" width="120">
+ <!-- <el-table-column align="center" label="婧愬崟鍗曞彿" width="120">
<template slot-scope="scope">
<span>{{ scope.row.HSourceBillNo }}</span>
</template>
@@ -183,7 +183,7 @@
<template slot-scope="scope">
<span>{{ scope.row.HSourceEntryID }}</span>
</template>
- </el-table-column>
+ </el-table-column> -->
<el-table-column align="center" label="HMaterID" width="120">
<template slot-scope="scope">
<span>{{ scope.row.HMaterID }}</span>
@@ -372,7 +372,7 @@
this.getdata()
},
beforeDestroy() {
- this.$destroy()
+ // this.$destroy()
},
methods: {
//#region 琛ㄥ崟鏁版嵁鍒濆鍖�
@@ -524,10 +524,10 @@
)
}
- if (data.鐘舵�� != '鍒涘缓' && this.copyType != 1) {
- this.$modal.msgError("姝ゆ潯鏁版嵁涓嶆槸鍒涘缓鐘舵�侊紝涓嶈兘淇敼");
- this.subDisabled = true
- }
+ // if (data.鐘舵�� != '鍒涘缓' && this.copyType != 1) {
+ // this.$modal.msgError("姝ゆ潯鏁版嵁涓嶆槸鍒涘缓鐘舵�侊紝涓嶈兘淇敼");
+ // this.subDisabled = true
+ // }
this.formShow = true
this.formLoading = false
@@ -606,7 +606,8 @@
this.form.HManagerName = deptRow.璐熻矗浜�
this.openData = false
}
- else if (num == 2) { //鏀舵枡浠撳簱
+ else if (num == 2) {
+ console.log(deptRow) //鏀舵枡浠撳簱
this.editData[this.zbIndex].HWHID = deptRow.HItemID;
this.editData[this.zbIndex].鏀舵枡浠撳簱 = deptRow.浠撳簱鍚嶇О;
this.openData = false
@@ -659,9 +660,9 @@
if (valid) {
let fhck = false
this.editData.map((item, index) => {
- if (!item.鍙戣揣浠撳簱) {
+ if (!item.鏀舵枡浠撳簱) {
fhck = true
- this.$modal.msgError("绗�" + (index + 1) + "琛岋細鍙戣揣浠撳簱鏈�夋嫨锛�");
+ this.$modal.msgError("绗�" + (index + 1) + "琛岋細鏀舵枡浠撳簱鏈�夋嫨锛�");
}
})
this.$nextTick(() => {
@@ -679,7 +680,7 @@
if (response.data.count == 1) {
this.subDisabled = true//璁剧疆淇濆瓨鎸夐挳涓嶅彲鐢�
this.$modal.msgSuccess(response.data.Message);
- this.get_MAXNum_Task(1);//璁剧疆娴佹按鍙峰鍔�
+ // this.get_MAXNum_Task(1);//璁剧疆娴佹按鍙峰鍔�
if (response.data.Verify == "Y") //鑷姩瀹℃牳
{
this.set_CheckBill(0, this.form); //瀹℃牳
@@ -759,7 +760,7 @@
HMoney: 0,
HTaxMoney: 0,
HWHID: 0,
- 鍙戣揣浠撳簱: '',
+ 鏀舵枡浠撳簱: '',
HRemark: '',
HQty_Full: 0,
HQty_Empty: 0,
@@ -769,10 +770,10 @@
HSalePrice: 0,
HSeOrderInterID: 741,
HSeOrderEntryID: 18,
- HSeOrderBillNo: 'XSFH00000747',
- HSourceInterID: 741,
- HSourceEntryID: 18,
- HSourceBillNo: 'XSFH00000747',
+ HSeOrderBillNo: '',
+ HSourceInterID: 0,
+ HSourceEntryID: 0,
+ HSourceBillNo: '',
HSourceBillType: 1402,
HRelationQty: 0,
HRelationMoney: 0,
@@ -941,7 +942,8 @@
//#region 鑾峰彇鏈�澶у崟鎹彿
get_MAXNum_Task(Type) {
- var sql = `exec h_p_Xt_GetMaxBillNo_SubType '1202','${this.form.HDate}',0,0,0,'${Type}','${this.form.HDeptID}'`;
+ console.log(dayjs(this.form.HDate).format("YYYY-MM-DD"))
+ var sql = `exec h_p_Xt_GetMaxBillNo_SubType '1202','${dayjs(this.form.HDate).format("YYYY-MM-DD")}',0,0,0,'${Type}','${this.form.HDeptID}'`;
axios({
method: 'get',
url: this.baseURL + "/CommonModel/searchMethod",
diff --git a/src/views/ProductInBill/Kf_ProductInBillList.vue b/src/views/ProductInBill/Kf_ProductInBillList.vue
index b71cf60..cfafb17 100644
--- a/src/views/ProductInBill/Kf_ProductInBillList.vue
+++ b/src/views/ProductInBill/Kf_ProductInBillList.vue
@@ -371,11 +371,12 @@
}).then(response => {
if (response.data.count == 1) {
this.organizationList = response.data.data;//缁勭粐鍒楄〃
+ this.queryParams.HOrgID = Number(sessionStorage["OrganizationID"]);
+
}
}).catch(error => {
this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
});
- this.queryParams.HOrgID = sessionStorage["OrganizationID"];
},
//#endregion
diff --git a/src/views/basic/gy/gyDepartment.vue b/src/views/basic/gy/gyDepartment.vue
index 1ec9d23..9280690 100644
--- a/src/views/basic/gy/gyDepartment.vue
+++ b/src/views/basic/gy/gyDepartment.vue
@@ -109,7 +109,7 @@
</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>
+ @click="handleEdit(row = rowForm, 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">鍒犻櫎
@@ -705,6 +705,7 @@
}
// this.sWhere += this.addSWhereByOpenType()
// this.sWhere += this.getOrgIDByUser()
+ this.clearData()
this.getList()
},
@@ -757,16 +758,23 @@
ColContent2: '',
ColContent: '',
}
+ this.clearData()
this.resetForm("queryForm")
this.getList()
},
-
+ clearData() {
+ this.single = true
+ this.multiple = true
+ this.OperationType = 0
+ this.copyType = 0
+ this.ids = []
+ },
//閫�鍑�
close() {
this.tableShow = true
- this.single = true
this.openEdit = false
this.editShow = false
+ this.clearData()
this.getList()
},
//鎵撳紑鏂板缁勪欢寮圭獥
@@ -789,8 +797,7 @@
editGyClose(val) {
this.editShow = false
this.openEdit = false
- this.single = true
- this.multiple = true
+ this.clearData()
this.getList()
},
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
@@ -829,15 +836,16 @@
else {
this.$modal.msgError("閿欒:" + result.code + result.Message,);
}
+ this.clearData()
}).catch(error => {
this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
});
},
// 鍙嶇鐢�/绂佺敤鏁版嵁
set_De_Stop(num, form) {
- var InterID = form.HItemID || form.HInterID
+ var InterID = form.HItemID.toString() || form.HInterID.toString()
//閫昏緫瀹℃牳鏂规硶
- axios.get(this.baseURL + "/Gy_Source/StopGy_Source", {
+ axios.get(this.baseURL + "/Gy_Department/StopGy_Department", {
params: { "HInterID": InterID, "IsStop": num, "CurUserName": sessionStorage["HUserName"] }
}).then(response => {
let result = response.data
@@ -848,6 +856,7 @@
else {
this.$modal.msgError("閿欒:" + result.code + result.Message,);
}
+ this.clearData()
}).catch(error => {
this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
});
diff --git a/src/views/basic/gy/gyDepartmentEdit.vue b/src/views/basic/gy/gyDepartmentEdit.vue
index 2997dd5..46783f7 100644
--- a/src/views/basic/gy/gyDepartmentEdit.vue
+++ b/src/views/basic/gy/gyDepartmentEdit.vue
@@ -173,13 +173,12 @@
openData: false, //鏁版嵁寮圭獥
dialogTitle: "",
zuzhiId: 0,
- organizationList: [], //缁勭粐鍒楄〃
+ organizationList: JSON.parse(sessionStorage.getItem('organizationList')), //缁勭粐鍒楄〃
subDisabled: false, //缂栬緫椤甸潰淇濆瓨鎸夐挳鏄惁绂佺敤(true绂佺敤锛宖alse鍙敤)
CheckBillDisabled: true,
// OperationType: this.$route.query.OperationType,//淇濆瓨绫诲瀷锛堟柊澧�1淇敼3锛�
HInterID: null,
baseURL: process.env.VUE_APP_BASE_API || "http://47.96.97.237/API/",
- user: "admin",
currentRow: [],
lastSelectedRowIndex: null, // 鐢ㄤ簬璁板綍涓婃鐐瑰嚮鐨勮绱㈠紩
lastSelectedRow: null, // 涓婁竴娆￠�変腑鐨勮
@@ -224,96 +223,66 @@
},
created() {
this.reset();
- this.fetchData();
+ this.getdata();
},
activated() {
this.reset();
- this.fetchData();
+ this.getdata();
},
methods: {
- fetchData() {
- //鐧诲綍鐢ㄦ埛淇℃伅
- axios
- .get(
- "http://47.96.97.237/API/Web/GetUser?UserName=001&PassWord=123456&HOrgName=100038"
- )
- .then((response) => {
- let data = response.data.data[0];
- this.zuzhiId = data.HUSEORGID; //鏍规嵁鐧诲綍鐢ㄦ埛鑾峰彇榛樿鐨勭粍缁嘔D
- this.user = data.Czymc;
- axios
- .get(this.baseURL + "/Web/GetOrganizations", {})
- .then((response) => {
- if (response.data.count == 1) {
- this.organizationList = response.data.data; //缁勭粐鍒楄〃
- this.getdata();
- }
- })
- .catch((error) => {
- this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
- });
- })
- .catch((error) => {
- this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
- });
- },
getdata() {
this.reset();
- console.log(this.OperationType);
+ console.log(this.OperationType,this.copyType);
if (this.OperationType != 1) {
this.zzSelDis = true;
- axios
- .get(this.baseURL + "/Gy_Department/cx", {
- params: {
- HInterID: this.linterid,
- },
- })
- .then((response) => {
- console.log(response);
- let result = response.data;
- if (result.code == 1) {
- // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- var data = result.data[0];
- Object.assign(this.form, {
- HNumber: data.閮ㄩ棬浠ｇ爜,
- HItemID: data.HItemID,
- HName: data.閮ㄩ棬鍚嶇О,
- HHelpCode: data.HHelpCode,
- HEmpID: data.HEmpID,
- HEmpName: data.HEmpName,
- HBarCode: data.鏉″舰鐮�,
- HStopflag: data.绂佺敤鏍囪,
- HRemark: data.HRemark,
- HUSEORGID: data.HUSEORGID,
- HRemark: data.澶囨敞,
- 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;
- }
- }
- this.$nextTick(() => {
- this.formShow = true;
- this.formLoading = false;
+ axios.get(this.baseURL + "/Gy_Department/cx", {
+ params: {
+ HInterID: this.linterid,
+ },
+ }).then((response) => {
+ let result = response.data;
+ if (result.code == 1) {
+ // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data[0];
+ Object.assign(this.form, {
+ HNumber: data.閮ㄩ棬浠ｇ爜,
+ HItemID: data.HItemID,
+ HName: data.閮ㄩ棬鍚嶇О,
+ HHelpCode: data.HHelpCode,
+ HEmpID: data.HEmpID,
+ HEmpName: data.HEmpName,
+ HBarCode: data.鏉″舰鐮�,
+ HStopflag: data.绂佺敤鏍囪,
+ HRemark: data.HRemark,
+ HUSEORGID: data.HUSEORGID,
+ HRemark: data.澶囨敞,
+ 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"),
});
- })
- .catch((error) => {
- this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ if (!data.HCheckEmp) {
+ this.CheckBillDisabled = false;
+ }
+ if (this.copyType == 1) {
+ this.form.HItemID = 0
+ this.form.HMakeEmp = sessionStorage["HUserName"]
+ this.form.HMakeDate = moment(new Date()).format("YYYY-MM-DDTHH:mm:ss")
+ this.form.HCheckEmp = ''
+ this.form.HCheckDate = ''
+ this.form.HStopEmp = ''
+ this.form.HStopDate = ''
+ }
+ }
+ this.$nextTick(() => {
+ this.formShow = true;
+ this.formLoading = false;
});
+ }).catch((error) => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
} else if (this.OperationType == 1) {
let date = new Date();
this.form.HMakeDate = moment(date).format("YYYY-MM-DDTHH:mm:ss");
@@ -361,17 +330,17 @@
reset() {
this.form = {
HNumber: '',
- HItemID:0,
+ HItemID: 0,
HName: '',
HHelpCode: '',
HEmpID: 0,
HEmpName: '',
HBarCode: '',
HStopflag: false,
- HRemark:'',
- HUSEORGID:sessionStorage["OrganizationID"],
HRemark: '',
- HMakeEmp:sessionStorage["HUserName"],
+ HUSEORGID: sessionStorage["OrganizationID"] - 0,
+ HRemark: '',
+ HMakeEmp: sessionStorage["HUserName"],
HMakeTime: null,
HStopEmp: null,
HStopTime: null,
@@ -444,7 +413,7 @@
if (this.rowForm.鐘舵�� == "鍒涘缓") {
axios
.get(this.baseURL + "/Kf_SellOutBill/DeltetSellOutBill", {
- params: { HInterID: this.rowForm.hmainid.toString(), user: this.user },
+ params: { HInterID: this.rowForm.hmainid.toString(), user: sessionStorage["HUserName"] },
})
.then((response) => {
if (response.data.count == 1) {
@@ -464,11 +433,11 @@
},
// 鍙嶅鏍�/瀹℃牳鏁版嵁
set_CheckBill(num, form) {
- var InterID = form.HItemID || form.HInterID;
+ var InterID = this.form.HItemID.toString();
//閫昏緫瀹℃牳鏂规硶
axios
- .get(this.baseURL + "/Gy_Department/StopGy_Department", {
- params: { HInterID: InterID, IsAudit: num, CurUserName: this.user },
+ .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/gySupplier.vue b/src/views/basic/gy/gySupplier.vue
index 19dbb6b..d96e140 100644
--- a/src/views/basic/gy/gySupplier.vue
+++ b/src/views/basic/gy/gySupplier.vue
@@ -10,7 +10,7 @@
</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 v-for="(item, index) in organizationList" :key="index" :label="item.Name" :value="item.Name">
</el-option>
</el-select>
</el-form-item>
@@ -291,7 +291,7 @@
open: false,
// 鏌ヨ鍙傛暟
queryParams: {
- HUSEORGID: sessionStorage["OrganizationID"] - 0,
+ HUSEORGID: sessionStorage["Organization"],
HName: null,
HNumber: null,
HSupTypeID: null,
@@ -448,7 +448,7 @@
params: {
"sWhere": this.sWhere,
"user": sessionStorage["HUserName"],
- "Organization": sessionStorage["Organization"],
+ "Organization": this.queryParams.HUSEORGID,
"page": this.page,
"size": this.pageSize
},
@@ -635,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)
}
},
@@ -752,11 +752,12 @@
if (this.queryParams.HName) {
this.sWhere += " and 渚涘簲鍟嗗悕绉� like '%" + this.queryParams.HName + "%'";
}
- if (this.queryParams.HUSEORGID) {
- this.sWhere += " and HUSEORGID = '" + this.queryParams.HUSEORGID + "'"
- }
+ // if (this.queryParams.HUSEORGID) {
+ // this.sWhere += " and HUSEORGID = '" + this.queryParams.HUSEORGID + "'"
+ // }
// this.sWhere += this.addSWhereByOpenType()
// this.sWhere += this.getOrgIDByUser()
+ this.clearData()
this.getList()
},
@@ -799,7 +800,7 @@
resetQuery() {
this.sWhere = ''
this.queryParams = {
- HUSEORGID: null,
+ HUSEORGID:sessionStorage["Organization"],
HName: null,
HNumber: null,
Comparator1: '',
@@ -810,14 +811,22 @@
ColContent: '',
}
this.resetForm("queryForm")
+ this.clearData()
this.getList()
},
-
+ clearData() {
+ this.single = true
+ this.multiple = true
+ this.OperationType = 0
+ this.copyType = 0
+ this.ids = []
+ },
//閫�鍑�
close() {
this.tableShow = true
this.openEdit = false
this.editShow = false
+ this.clearData()
this.getList()
},
//鎵撳紑鏂板缁勪欢寮圭獥
@@ -840,8 +849,8 @@
editGyClose(val) {
this.editShow = false
this.openEdit = false
- this.multiple = true,
- this.getList()
+ this.clearData()
+ this.getList()
},
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete() {
@@ -868,7 +877,7 @@
set_CheckBill(num, form) {
var InterID = form.HItemID || form.HInterID
//閫昏緫瀹℃牳鏂规硶
- axios.get(this.baseURL + "/Gy_Source/AuditGy_Source", {
+ axios.get(this.baseURL + "/Gy_Supplier/AuditGy_Supplier", {
params: { "HInterID": InterID, "IsAudit": num, "CurUserName": sessionStorage["HUserName"] }
}).then(response => {
let result = response.data
@@ -879,6 +888,7 @@
else {
this.$modal.msgError("閿欒:" + result.code + result.Message,);
}
+ this.clearData()
}).catch(error => {
this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
});
@@ -887,7 +897,7 @@
set_De_Stop(num, form) {
var InterID = form.HItemID || form.HInterID
//閫昏緫瀹℃牳鏂规硶
- axios.get(this.baseURL + "/Gy_Source/StopGy_Source", {
+ axios.get(this.baseURL + "/Gy_Supplier/StopGy_Supplier", {
params: { "HInterID": InterID, "IsStop": num, "CurUserName": sessionStorage["HUserName"] }
}).then(response => {
let result = response.data
@@ -898,6 +908,7 @@
else {
this.$modal.msgError("閿欒:" + result.code + result.Message,);
}
+ this.clearData()
}).catch(error => {
this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
});
diff --git a/src/views/basic/gyEmployee/gyEmployeeEdit.vue b/src/views/basic/gyEmployee/gyEmployeeEdit.vue
index 5c0ca2c..481d622 100644
--- a/src/views/basic/gyEmployee/gyEmployeeEdit.vue
+++ b/src/views/basic/gyEmployee/gyEmployeeEdit.vue
@@ -1702,8 +1702,6 @@
window.open(row.url, "_self");
},
async uploadDataUpload(row, index) {
- console.log(row.raw instanceof File);
- console.log(row.raw);
try {
let blob = await this.fileToBlob(row.raw);
console.log(blob);
diff --git a/src/views/component/HSourceReportHtml/index.vue b/src/views/component/HSourceReportHtml/index.vue
index ea92640..7f7ec1d 100644
--- a/src/views/component/HSourceReportHtml/index.vue
+++ b/src/views/component/HSourceReportHtml/index.vue
@@ -285,7 +285,7 @@
if (this.pageSize == 0) {
this.pageSize = 50;
}
- if (this.queryParams.HBillStatus &&this.HSouceBillType == '鐢熶骇璁㈠崟') {
+ if (this.queryParams.HBillStatus && this.HSouceBillType == '鐢熶骇璁㈠崟') {
this.sWhere += " and 鐘舵�� = '" + this.queryParams.HBillStatus + "'";
}
if (this.HSouceBillType == '鐢熶骇璁㈠崟') {
@@ -306,111 +306,117 @@
limit: this.pageSize,
},
}).then((response) => {
+ console.log(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,
- }); //浠庢瘡涓璞′腑鎻愬彇鏁版嵁
- var patrn = new RegExp(/^h/i);
- if (patrn.test(data1.list[key].ColmCols)) {
- this.titleData[key] = data1.list[key].ColmCols;
- }
+ // 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,
+ }); //浠庢瘡涓璞′腑鎻愬彇鏁版嵁
+ var patrn = new RegExp(/^h/i);
+ if (patrn.test(data1.list[key].ColmCols)) {
+ this.titleData[key] = data1.list[key].ColmCols;
}
- //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
- col.push({ type: "checkbox", fixed: "left", totalRowText: "鍚堣" });
- for (var i = 0; i < data.length; i++) {
- //閬嶅巻data鏁扮粍閲嶇殑鏁版嵁
- if (this.titleData.indexOf(data[i].name) > -1) {
- //妫�鏌ata銆恑銆�.name鏄惁鍦ㄦ暟缁勪腑 //璁＄畻鍒�
- col.push({
- field: data[i].id,
- title: data[i].name,
- align: "center",
- hide: true,
- }); //闅愯棌id鍒�
- } else if (
- totalArray.indexOf(data[i].name) > -1 ||
- data[i].Type == "Decimal" ||
- data[i].Type == "Int32"
- ) {
- //璁＄畻鍒�
- col.push({
- field: data[i].id,
- title: data[i].name,
- align: "center",
- sort: true,
- totalRow: true,
- width: 120,
- });
- } else {
- col.push({
- field: data[i].id,
- title: data[i].name,
- align: "center",
- sort: true,
- width: 200,
- });
- }
- }
- option.cols = [col];
- this.dataList = option;
- option.data = data1.data;
- var result = data1.data;
- option.data = result;
- switch (this.HSouceBillType) {
- case '鐢熶骇璁㈠崟':
- this.HModName = "Sc_ICMOBill_3710";
- break;
- case '鐢熶骇姹囨姤鍗�':
- this.HModName = "Sc_ICMOReportBill_3711";
- break;
- case '閲囪喘璁㈠崟':
- this.HModName = "Cg_POOrderBill_1102";
- break;
- case '鏀舵枡閫氱煡鍗�':
- this.HModName = "Cg_POInStockBill_1103";
- break;
- case '濮斿璁㈠崟':
- this.HModName = "WW_EntrustOrderBill_1601";
- break;
- case '鐢熶骇鍏ュ簱鍗�':
- $("#HProcExchBillNoHidden").show();
- this.HModName = "ProductInBill_1202";
- break;
- case '閲囪喘鍏ュ簱鍗�':
- this.HModName = "POStockInBill_1201";
- break;
- case '閿�鍞��璐�':
- this.HModName = "SellOutBackBill_1247";
- break;
- case '鐢熶骇閫�鏂�':
- this.HModName = "MateOutBackBill_1244";
- break;
- case '宸ュ簭娴佽浆鍗�':
- this.HModName = "ProcessExchangeBill_3772";
- break;
- case '閿�鍞嚭搴撳崟':
- this.HModName = "SellOutBill_1205";
- break;
- case '棰嗘枡鍑哄簱鍗�':
- this.HModName = "MateOutBill_1204";
- break;
- }
- this.DisPlay_HideColumn(this.HModName, sessionStorage["HUserName"], option, this.dataList);
}
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ 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;
+ if (data1.code == 0) {
+ data1.data = []
+ }
+ option.data = data1.data;
+ var result = data1.data;
+ option.data = result;
+ switch (this.HSouceBillType) {
+ case '鐢熶骇璁㈠崟':
+ this.HModName = "Sc_ICMOBill_3710";
+ break;
+ case '鐢熶骇姹囨姤鍗�':
+ this.HModName = "Sc_ICMOReportBill_3711";
+ break;
+ case '閲囪喘璁㈠崟':
+ this.HModName = "Cg_POOrderBill_1102";
+ break;
+ case '鏀舵枡閫氱煡鍗�':
+ this.HModName = "Cg_POInStockBill_1103";
+ break;
+ case '濮斿璁㈠崟':
+ this.HModName = "WW_EntrustOrderBill_1601";
+ break;
+ case '鐢熶骇鍏ュ簱鍗�':
+ $("#HProcExchBillNoHidden").show();
+ this.HModName = "ProductInBill_1202";
+ break;
+ case '閲囪喘鍏ュ簱鍗�':
+ this.HModName = "POStockInBill_1201";
+ break;
+ case '閿�鍞��璐�':
+ this.HModName = "SellOutBackBill_1247";
+ break;
+ case '鐢熶骇閫�鏂�':
+ this.HModName = "MateOutBackBill_1244";
+ break;
+ case '宸ュ簭娴佽浆鍗�':
+ this.HModName = "ProcessExchangeBill_3772";
+ break;
+ case '閿�鍞嚭搴撳崟':
+ this.HModName = "SellOutBill_1205";
+ break;
+ case '棰嗘枡鍑哄簱鍗�':
+ this.HModName = "MateOutBill_1204";
+ break;
+ }
+ this.DisPlay_HideColumn(this.HModName, sessionStorage["HUserName"], option, this.dataList);
+ // }
}).catch((error) => {
+ console.log(error)
this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
});
},
@@ -674,7 +680,7 @@
if (this.queryParams.HBillNo) {
this.sWhere += " and 鍗曟嵁鍙� like '%" + this.queryParams.HBillNo + "%'";
}
- if (this.queryParams.HProcExchBillNo &&this.HSouceBillType == '鐢熶骇鍏ュ簱鍗�') {
+ if (this.queryParams.HProcExchBillNo && this.HSouceBillType == '鐢熶骇鍏ュ簱鍗�') {
this.sWhere += " and 娴佽浆鍗″彿 like '%" + this.queryParams.HProcExchBillNo + "%'";
}
if (this.queryParams.HDeptName) {
@@ -686,7 +692,7 @@
if (this.queryParams.PartName) {
this.sWhere += " and 鐗╂枡鍚嶇О like '%" + this.queryParams.PartName + "%'";
}
- if (this.queryParams.HBillStatus &&this.HSouceBillType == '鐢熶骇璁㈠崟') {
+ if (this.queryParams.HBillStatus && this.HSouceBillType == '鐢熶骇璁㈠崟') {
this.sWhere += " and 鐘舵�� like '%" + this.queryParams.HBillStatus + "%'";
}
if (sessionStorage["Organization"] == "涔濊彵鐢垫満" && this.HSouceBillType == '鐢熶骇璁㈠崟') {
diff --git a/src/views/purchase/cgPoInStockBill/cgPoInStockBill.vue b/src/views/purchase/cgPoInStockBill/cgPoInStockBill.vue
index cfe0447..a0cb67c 100644
--- a/src/views/purchase/cgPoInStockBill/cgPoInStockBill.vue
+++ b/src/views/purchase/cgPoInStockBill/cgPoInStockBill.vue
@@ -1388,6 +1388,7 @@
},
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete() {
+ console.log("this.rowForm", this.rowForm)
this.$modal
.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠")
.then(() => {
@@ -1395,20 +1396,21 @@
axios
.get(this.baseURL + "Cg_POInStockBill/DeltetPOInStockBill", {
params: {
- HInter: this.rowForm.hmainid.toString(),
- HsupId: this.rowForm.HsupId,
- HQty: this.rowForm.HQty,
- HSourceInterID: this.rowForm.HSourceInterID,
- HSourceEntryID: this.rowForm.HSourceEntryID,
+ HInterID: this.rowForm.hmainid.toString(),
+ HsupId: this.rowForm.HSupID,
+ HQty: this.rowForm['鏁伴噺'],
+ HSourceInterID: this.rowForm['婧愬崟涓诲唴鐮�'],
+ HSourceEntryID: this.rowForm['婧愬崟瀛愬唴鐮�'],
user: sessionStorage["HUserName"],
},
})
.then((res) => {
+
if (res.data.count == 1) {
this.handleQuery();
this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
} else {
- this.$modal.msgError("閿欒:" + result.code + result.Message);
+ this.$modal.msgError("閿欒:" + res.data.code + res.data.Message);
}
})
.catch((error) => {
diff --git a/src/views/purchase/cgPoOrderBill/cgPoOrderBill.vue b/src/views/purchase/cgPoOrderBill/cgPoOrderBill.vue
index 85b2c9f..d564df0 100644
--- a/src/views/purchase/cgPoOrderBill/cgPoOrderBill.vue
+++ b/src/views/purchase/cgPoOrderBill/cgPoOrderBill.vue
@@ -62,8 +62,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>
diff --git a/src/views/purchase/postockInBack/Kf_POStockInBackBillList.vue b/src/views/purchase/postockInBack/Kf_POStockInBackBillList.vue
index 061e5c7..a6c815b 100644
--- a/src/views/purchase/postockInBack/Kf_POStockInBackBillList.vue
+++ b/src/views/purchase/postockInBack/Kf_POStockInBackBillList.vue
@@ -148,7 +148,7 @@
</el-collapse>
</el-form>
<el-row :gutter="10" class="mb8" style="margin-top: 10px">
- <!-- <el-col :span="1.5">
+ <!-- <el-col :span="1.5">
<el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAddEdit((OperationType = 1))"
id="btn-Add">鏂板</el-button>
</el-col> -->
@@ -233,14 +233,14 @@
<!-- 缂栬緫 -->
<el-dialog title="缂栬緫" :visible.sync="openEdit" width="1480px" append-to-body class="xsckdBox"
@close="close">
- <edit :OperationType="OperationType" :linterid="this.rowForm.hmainid"
- HSouceBillType="0" :copyType="copyType" @editClose="editClose"
- v-if="editShow" />
+ <edit :OperationType="OperationType" :linterid="this.rowForm.hmainid" HSouceBillType="0"
+ :copyType="copyType" @editClose="editClose" v-if="editShow" />
</el-dialog>
<PrintList :linterid="this.rowForm.hmainid" :MyMsg="this.rowForm.hmainid" Type="HPOInStockBill"
HModName="HPOInStockBill" @rowEditClose="rowSetClose" v-if="printListShow" />
<BarCodeDetail :visible.sync="barCodeDetailShow" ref="barcodeDetail" />
</div>
+
</div>
</template>
@@ -257,8 +257,10 @@
components: { RowSettings, Edit, PrintList, BarCodeDetail },
data() {
return {
+ typeIndex: 0,
activeSeach: "",
HModName: "Kf_StockOutRequestBillList",
+ backTypeList: [{ name: ' 閲囪喘閫�鏂欏垪琛�(宸插叆搴�)', value: 1, }, { name: '閲囪喘閫�鏂欏垪琛�(鏈叆搴�)', value: 0, }],
organizationList: JSON.parse(sessionStorage.getItem('organizationList')),
editShow: false,
openEdit: false,
@@ -421,6 +423,7 @@
this.eTime = yyyyE + "-" + mmE + "-" + ddE;
},
getList() {
+ console.log(this.$route.query.type)
this.pageSize = 50;
this.tableShow = false;
this.loading = true;
@@ -806,22 +809,22 @@
this.sWhere += " and 鐗╂枡浠ｇ爜 like '%" + this.queryParams.MaterialCode + "%'";
}
if (this.queryParams.MaterialName) {
- this.sWhere += " and 鐗╂枡鍚嶇О like '%" + MaterialName + "%'";
+ this.sWhere += " and 鐗╂枡鍚嶇О like '%" + this.queryParams.MaterialName + "%'";
}
if (this.queryParams.SpecificationModel) {
- this.sWhere += " and 瑙勬牸鍨嬪彿 like '%" + SpecificationModel + "%'";
+ this.sWhere += " and 瑙勬牸鍨嬪彿 like '%" + this.queryParams.SpecificationModel + "%'";
}
if (this.queryParams.HSourceBillNo) {
- this.sWhere += " and 婧愬崟鍗曞彿 like '%" + HSourceBillNo + "%'";
+ this.sWhere += " and 婧愬崟鍗曞彿 like '%" + this.queryParams.HSourceBillNo + "%'";
}
if (this.queryParams.Warehouse) {
- this.sWhere += " and 鍙戣揣浠撳簱 like '%" + Warehouse + "%'";
+ this.sWhere += " and 鍙戣揣浠撳簱 like '%" + this.queryParams.Warehouse + "%'";
}
if (this.queryParams.Hmaker) {
- this.sWhere += " and 鍒跺崟浜� like '%" + Hmaker + "%'";
+ this.sWhere += " and 鍒跺崟浜� like '%" + this.queryParams.Hmaker + "%'";
}
if (this.queryParams.HUSEORGID) {
- this.sWhere += " and HOrgID like '%" + HUSEORGID + "%'";
+ this.sWhere += " and HOrgID like '%" + this.queryParams.HUSEORGID + "%'";
}
this.getList();
},
@@ -956,8 +959,8 @@
if (this.ids.length != 1) {
this.$modal.msgError("璇烽�夋嫨涓�琛屾暟鎹�");
} else {
- this.printListShow = true;
- this.openPrintList = true;
+ this.printListShow = true;
+ this.openPrintList = true;
// axios.get(this.baseURL + "/Kf_SellOutBill/CheckSellOutBill_IsExist", {
// params: { HInterID: this.rowForm.hmainid },
// })
@@ -995,4 +998,15 @@
.xsckdBox .el-date-editor.el-input {
width: 100%;
}
+
+.cgtlType {
+ text-decoration: underline;
+ line-height: 36px;
+ color: #606266;
+ cursor: pointer;
+}
+
+.cgtlActive {
+ color: blue;
+}
</style>
diff --git a/src/views/scMould/basicModeling/Gy_MouldFile.vue b/src/views/scMould/basicModeling/Gy_MouldFile.vue
index 55a336c..76e0213 100644
--- a/src/views/scMould/basicModeling/Gy_MouldFile.vue
+++ b/src/views/scMould/basicModeling/Gy_MouldFile.vue
@@ -285,7 +285,40 @@
</el-form-item>
</el-col>
</el-row>
-
+ <el-row>
+ <el-col :span="6">
+ <el-form-item label="闀�" prop="HMouldLength">
+ <el-input v-model="form.HMouldLength" placeholder="璇疯緭鍏ラ暱" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="瀹�" prop="HMouldWidth">
+ <el-input v-model="form.HMouldWidth" placeholder="璇疯緭鍏ュ" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="楂�" prop="HMouldHeight">
+ <el-input v-model="form.HMouldHeight" placeholder="璇疯緭鍏ラ珮" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="鎶樺彔楂樺害" prop="HMouldFoldHeight">
+ <el-input v-model="form.HMouldFoldHeight" placeholder="璇疯緭鍏ユ姌鍙犻珮搴�" />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="6">
+ <el-form-item label="鍛ㄨ浆瀹瑰櫒鏍囪" prop="HTransPackFlag">
+ <el-checkbox v-model="form.HTransPackFlag"></el-checkbox>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="鍙戣揣瀹瑰櫒鏍囪" prop="HSendPackFlag">
+ <el-checkbox v-model="form.HSendPackFlag"></el-checkbox>
+ </el-form-item>
+ </el-col>
+ </el-row>
</el-tab-pane>
<el-tab-pane label="鍒跺崟淇℃伅" name="third">
<el-row>
@@ -935,8 +968,14 @@
HNowSPName: '',
HMouldUseStatus: '',
HNextMainDate: '',
- HUSEORGID: sessionStorage["OrganizationID"],
- HCREATEORGID: sessionStorage["OrganizationID"],
+ HUSEORGID: sessionStorage["OrganizationID"] - 0,
+ HCREATEORGID: sessionStorage["OrganizationID"] - 0,
+ HMouldLength: '',
+ HMouldWidth: '',
+ HMouldHeight: '',
+ HMouldFoldHeight: '',
+ HTransPackFlag: 0,
+ HSendPackFlag: 0,
HMaker: sessionStorage["HUserName"],
HMakeDate: '',
HChecker: '',
@@ -1090,6 +1129,12 @@
this.form.HMouldUseStatus = data.妯″叿鍙敤鐘舵��
this.form.HNextMainDate = data.鏍℃鏃ユ湡
this.form.HUSEORGID = data.HUSEORGID
+ this.form.HMouldLength = data.HMouldLength
+ this.form.HMouldWidth = data.HMouldWidth
+ this.form.HMouldHeight = data.HMouldHeight
+ this.form.HMouldFoldHeight = data.HMouldFoldHeight
+ this.form.HTransPackFlag = data.HTransPackFlag == 0 ? false : true
+ this.form.HSendPackFlag = data.HSendPackFlag == 0 ? false : true
for (var i = 0; i < result.data.length; i++) {
this.editData.push(
{
@@ -1379,7 +1424,6 @@
},
// 缂栬緫鎻愪氦淇濆瓨
submitForm() {
- console.log(1)
this.$refs["form"].validate(valid => {
if (valid) {
let url = null
@@ -1394,6 +1438,8 @@
} else (
url = '/Gy_Mould_Edit/AddBill'
)
+ this.form.HTransPackFlag = this.form.HTransPackFlag == false ? 0 : 1
+ this.form.HSendPackFlag = this.form.HSendPackFlag == false ? 0 : 1
var sMainStr = JSON.stringify(this.form);
var sSubStr = JSON.stringify(this.editData);
var mainTableMaintainRuleStr = JSON.stringify(this.maintainData);
diff --git a/src/views/sell/Kf_ICStockBillMainList/Kf_ICStockBillMainList.vue b/src/views/sell/Kf_ICStockBillMainList/Kf_ICStockBillMainList.vue
index d38f1fc..e582065 100644
--- a/src/views/sell/Kf_ICStockBillMainList/Kf_ICStockBillMainList.vue
+++ b/src/views/sell/Kf_ICStockBillMainList/Kf_ICStockBillMainList.vue
@@ -9,29 +9,38 @@
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-form-item label="寮�濮嬫棩鏈�" style="margin-left: 100px">
+ <el-date-picker
+ v-model="sTime"
+ type="date"
+ placeholder="寮�濮嬫棩鏈�"
+ style="width: 150px"
+ >
+ </el-date-picker>
+ </el-form-item>
+ <el-form-item label="缁撴潫鏃ユ湡">
+ <el-date-picker
+ v-model="eTime"
+ type="date"
+ placeholder="缁撴潫鏃ユ湡"
+ style="width: 150px"
+ >
+ </el-date-picker>
+ </el-form-item>
+ <el-form-item label="鏃ユ湡闂撮殧">
+ <el-select
+ v-model="queryParams.HInitTimeCycle"
+ placeholder="璇烽�夋嫨"
+ @change="riqiChange"
+ style="width: 150px"
+ >
+ <el-option
+ v-for="(item, index) in rqsgList"
+ :key="index"
+ :label="item.label"
+ :value="item.value"
>
- <el-option
- v-for="(item, index) in rqsgList"
- :key="index"
- :label="item.label"
- :value="item.value"
- >
- </el-option>
+ </el-option>
</el-select>
</el-form-item>
<el-form-item label="鍗曟嵁鍙�" prop="HBillNo">
@@ -405,6 +414,9 @@
<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-col :span="1.5">
+ <el-button type="primary" icon="el-icon-printer" size="mini" :disabled="single" @click="get_PackStockDetail">鍖呰瀹瑰櫒鍑哄叆搴撴槑缁�</el-button>
+ </el-col>
</el-row>
<div class="tableBox" v-loading="loading">
<el-table
@@ -587,6 +599,8 @@
</el-dialog>
<!-- 鏉＄爜鏄庣粏 -->
<BarCodeDetail :visible.sync="barCodeDetailShow" ref="barcodeDetail"/>
+ <!-- 鍖呰瀹瑰櫒鍑哄叆搴撴槑缁� -->
+ <PackStockDetail :visible.sync="packStockDetailShow" ref="packStockDetail"/>
</div>
</div>
</template>
@@ -597,10 +611,11 @@
import Edit from '@/views/sell/Kf_ICStockBillMainList/Kf_ICStockBillMainListEdit'
import BarCodeDetail from '@/views/component/BarCodeDetail' //鏉＄爜鏄庣粏缁勪欢
import dayjs from "dayjs"; //鏃ユ湡澶勭悊搴�
+import PackStockDetail from '@/views/component/PackStockDetail' //鍖呰鏄庣粏缁勪欢
export default {
name: "GySource",
- components: { RowSettings,Edit,BarCodeDetail},
+ components: { RowSettings,Edit,BarCodeDetail,PackStockDetail},
props: {
openPage: { type: String },
},
@@ -617,6 +632,7 @@
printListShow: false,
HClassTag: "ForFilteringSchemes", //杩囨护鏉′欢鐨刢lass绫�
barCodeDetailShow: false, //鏉＄爜鏄庣粏缁勪欢瀹瑰櫒鏄剧ず鏍囪
+ packStockDetailShow:false, //鍖呰瀹瑰櫒鍑哄叆搴撴槑缁嗗鍣ㄦ樉绀烘爣璁�
HBillType: "1202",
openBtnHide: false,
btnHideShow: false,
@@ -696,8 +712,8 @@
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"),
+ HBeginDate: dayjs(new Date()).subtract(29, "d").format("YYYY-MM-DD"),
+ HEndDate: dayjs(new Date()).format("YYYY-MM-DD"),
},
// 鏄剧ず鎼滅储鏉′欢
showSearch: true,
@@ -854,15 +870,11 @@
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.queryParams.HBeginDate = start;
+ this.queryParams.HEndDate = end;
this.dateRange = [this.sTime, this.eTime];
},
organizationChange(val) {
@@ -917,11 +929,11 @@
// this.sWhere += ` and CONVERT(varchar(100),鏃ユ湡, 23) >= '2020-01-01' and CONVERT(varchar(100),鏃ユ湡, 23) <= '2030-01-01'`;
// 鏀舵枡閫氱煡鍗曞垪琛�
- if (this.dateRange.length > 0) {
+ if (this.queryParams.HBeginDate && this.queryParams.HEndDate) {
this.sWhere +=
- " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.dateRange[0] + "'";
+ " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.queryParams.HBeginDate + "'";
this.sWhere +=
- " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + this.dateRange[1] + "'";
+ " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + this.queryParams.HEndDate + "'";
}
try {
@@ -1177,7 +1189,7 @@
},
//閫変腑琛岄珮浜牱寮�
rowStyle({ row, rowIndex }) {
- if (this.ids.includes(row.HItemID)) {
+ if (this.ids.includes(row.hmainid)) {
return { background: "#ecf5ff" };
}
},
@@ -1189,7 +1201,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) {
@@ -1570,6 +1582,18 @@
);
}
},
+ //#region 鍖呰瀹瑰櫒鍑哄叆搴撴槑缁�
+ get_PackStockDetail() {
+ // if (this.selectedRow.length !== 1) {
+ // this.$message.warning('璇烽�夋嫨涓�琛屾暟鎹煡鐪嬫潯鐮佹槑缁嗭紒')
+ // return
+ // }
+ this.packStockDetailShow = true
+ this.$nextTick(() => {
+ this.$refs.packStockDetail.open(this.rowForm)
+ })
+ },
+ //#endregion
// 鎻愪氦涓婁紶鏂囦欢
submitFileForm() {
this.$refs.upload.submit();
diff --git a/src/views/sell/Kf_ICStockBillMainList/Kf_ICStockBillMainListEdit.vue b/src/views/sell/Kf_ICStockBillMainList/Kf_ICStockBillMainListEdit.vue
index 7e2ff79..fef7788 100644
--- a/src/views/sell/Kf_ICStockBillMainList/Kf_ICStockBillMainListEdit.vue
+++ b/src/views/sell/Kf_ICStockBillMainList/Kf_ICStockBillMainListEdit.vue
@@ -247,12 +247,12 @@
<span>{{ scope.row.璁￠噺鍗曚綅 }}</span>
</template>
</el-table-column>
- <el-table-column align="center" label="搴旀敹鏁伴噺" width="120">
+ <el-table-column align="center" label="搴旈��鏁伴噺" width="120">
<template slot-scope="scope">
<span>{{ scope.row.HQtyMust }}</span>
</template>
</el-table-column>
- <el-table-column align="center" label="瀹炴敹鏁伴噺" width="120">
+ <el-table-column align="center" label="瀹為��鏁伴噺" width="120">
<template slot-scope="scope">
<el-input-number v-model="scope.row.HQty" :min="0" style="width: 90px;"
controls-position="right"></el-input-number>
@@ -515,7 +515,7 @@
, "瑙勬牸鍨嬪彿": dataArray[i].瑙勬牸鍨嬪彿
, "HUnitID": dataArray[i].HUnitID
, "璁￠噺鍗曚綅": dataArray[i].璁￠噺鍗曚綅
- , "HQtyMust": dataArray[i].鏁伴噺.toFixed(6)
+ , "HQtyMust": dataArray[i].搴斿彂鏁伴噺.toFixed(6)
, "HQty": dataArray[i].鏁伴噺.toFixed(6)
, "HPieceQty": "0"
, "HPrice": dataArray[i].鍗曚环.toFixed(4)
@@ -737,8 +737,8 @@
, "瑙勬牸鍨嬪彿": result.data[i].瑙勬牸鍨嬪彿
, "HUnitID": result.data[i].HUnitID
, "璁￠噺鍗曚綅": result.data[i].璁￠噺鍗曚綅
- , "HQtyMust": result.data[i].搴旀敹鏁伴噺
- , "HQty": result.data[i].瀹炴敹鏁伴噺
+ , "HQtyMust": result.data[i].搴斿彂鏁伴噺
+ , "HQty": result.data[i].鏁伴噺
, "HRemark": result.data[i].琛ㄤ綋澶囨敞
, "HPrice": result.data[i].鍗曚环
, "HMoney": result.data[i].閲戦
@@ -853,8 +853,8 @@
"瑙勬牸鍨嬪彿": result.data[i].瑙勬牸鍨嬪彿,
"HUnitID": result.data[i].HUnitID,
"璁￠噺鍗曚綅": result.data[i].璁￠噺鍗曚綅,
- "HQtyMust": result.data[i].搴旀敹鏁伴噺,
- "HQty": result.data[i].瀹炴敹鏁伴噺,
+ "HQtyMust": result.data[i].搴斿彂鏁伴噺,
+ "HQty": result.data[i].鏁伴噺,
"HRemark": (result.data[i].琛ㄤ綋澶囨敞 || "") + " (澶嶅埗)",
"HPrice": result.data[i].鍗曚环,
"HMoney": result.data[i].閲戦,
diff --git a/src/views/sell/XsSeOutStockBackBillEdit.vue b/src/views/sell/XsSeOutStockBackBillEdit.vue
index a4cd46e..227d91a 100644
--- a/src/views/sell/XsSeOutStockBackBillEdit.vue
+++ b/src/views/sell/XsSeOutStockBackBillEdit.vue
@@ -320,7 +320,7 @@
</el-table-column>
<el-table-column align="center" label="鍙戣揣浠撳簱" width="120">
<template slot-scope="scope">
- <span>{{ scope.row.璁￠噺鍗曚綅 }}</span>
+ <span>{{ scope.row.鍙戣揣浠撳簱 }}</span>
</template>
</el-table-column>
<el-table-column align="center" label="鏀惰揣浠撳簱" width="120">
diff --git a/src/views/sell/XsSeOutStockBackBillList.vue b/src/views/sell/XsSeOutStockBackBillList.vue
index ce7bc39..6b49044 100644
--- a/src/views/sell/XsSeOutStockBackBillList.vue
+++ b/src/views/sell/XsSeOutStockBackBillList.vue
@@ -1403,7 +1403,7 @@
//鎵撳紑鏂板缁勪欢寮圭獥
handleAddEdit() {
this.rowForm.HItemID = 0;
- this.iframeUrl = `/iframe/XsSeOutStockBackBillEdit?HInterID=${0}&OperationType=${1}©Type=${-1}`;
+ this.iframeUrl = `/iframe/XsSeOutStockBackBillEdit?HInterID=0&OperationType=1&CopyType=2`;
this.$nextTick(() => {
this.openEdit = true;
this.editShow = true;
@@ -1411,7 +1411,7 @@
},
//鎵撳紑淇敼缁勪欢寮圭獥
handleEdit(row, OperationType, copyType) {
- this.iframeUrl = `/iframe/XsSeOutStockBackBillEdit?HInterID=${row.hmainid}&OperationType=${OperationType}©Type=${copyType}`;
+ this.iframeUrl = `/iframe/XsSeOutStockBackBillEdit?HInterID=${row.hmainid}&OperationType=${OperationType}&CopyType=${copyType}`;
this.$nextTick(() => {
this.openEdit = true;
this.editShow = true;
diff --git a/src/views/sell/XsSeOutStockBill.vue b/src/views/sell/XsSeOutStockBill.vue
index 9e3d514..2686f05 100644
--- a/src/views/sell/XsSeOutStockBill.vue
+++ b/src/views/sell/XsSeOutStockBill.vue
@@ -300,6 +300,7 @@
>澶嶅埗</el-button
>
</el-col>
+ -->
<el-col :span="1.5">
<el-button
type="primary"
@@ -310,6 +311,7 @@
>鍒犻櫎
</el-button>
</el-col>
+ <!--
<el-col :span="1.5">
<el-button
type="primary"
diff --git a/src/views/sell/sellOut/sellOutBill.vue b/src/views/sell/sellOut/sellOutBill.vue
index e97661f..76c20e4 100644
--- a/src/views/sell/sellOut/sellOutBill.vue
+++ b/src/views/sell/sellOut/sellOutBill.vue
@@ -305,7 +305,14 @@
>
</el-col>
<el-col :span="1.5">
- <el-button type="primary" icon="el-icon-printer" size="mini" :disabled="single" @click="get_BarCodeDetail">鏉＄爜鏄庣粏</el-button>
+ <el-button
+ type="primary"
+ icon="el-icon-printer"
+ size="mini"
+ :disabled="single"
+ @click="get_BarCodeDetail"
+ >鏉＄爜鏄庣粏</el-button
+ >
</el-col>
</el-row>
<div class="tableBox" v-loading="loading">
@@ -416,7 +423,7 @@
<!-- <div>111</div> -->
</el-dialog>
<!-- 鏉＄爜鏄庣粏 -->
- <BarCodeDetail :visible.sync="barCodeDetailShow" ref="barcodeDetail"/>
+ <BarCodeDetail :visible.sync="barCodeDetailShow" ref="barcodeDetail" />
</div>
</div>
</template>
@@ -426,12 +433,12 @@
import RowSettings from "@/views/component/rowSettings";
import Edit from "@/views/sell/sellOut/sellOutBillEdit";
import PrintList from "@/views/component/printList";
-import BarCodeDetail from '@/views/component/BarCodeDetail' //鏉＄爜鏄庣粏缁勪欢
+import BarCodeDetail from "@/views/component/BarCodeDetail"; //鏉＄爜鏄庣粏缁勪欢
import moment from "moment";
export default {
name: "SellOutBill",
- components: { RowSettings, Edit, PrintList,BarCodeDetail },
+ components: { RowSettings, Edit, PrintList, BarCodeDetail },
data() {
return {
activeSeach: "",
@@ -441,7 +448,7 @@
tableShow: true,
openPrintList: false,
printListShow: false,
- barCodeDetailShow: false, //鏉＄爜鏄庣粏缁勪欢瀹瑰櫒鏄剧ず鏍囪
+ barCodeDetailShow: false, //鏉＄爜鏄庣粏缁勪欢瀹瑰櫒鏄剧ず鏍囪
openBtnHide: false,
btnHideShow: false,
rowHideShow: false,
@@ -1055,6 +1062,7 @@
.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠")
.then(() => {
if (this.rowForm.鐘舵�� == "鍒涘缓") {
+ this.loading = true;
axios
.get(this.baseURL + "/Kf_SellOutBill/DeltetSellOutBill", {
params: {
@@ -1065,13 +1073,16 @@
.then((response) => {
if (response.data.count == 1) {
this.getList();
- this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+ this.$modal.msgSuccess(response.data.Message);
} else {
this.$modal.msgError("閿欒:" + result.code + result.Message);
}
})
.catch((error) => {
this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ })
+ .finally(() => {
+ this.loading = false;
});
} else {
this.$modal.msgError("姝ゆ潯鏁版嵁涓嶆槸鍒涘缓鐘舵��,鏃犳硶鍒犻櫎!");
@@ -1144,13 +1155,12 @@
// this.$message.warning('璇烽�夋嫨涓�琛屾暟鎹煡鐪嬫潯鐮佹槑缁嗭紒')
// return
// }
- this.barCodeDetailShow = true
+ this.barCodeDetailShow = true;
this.$nextTick(() => {
- this.$refs.barcodeDetail.open(this.rowForm)
- })
- },
+ this.$refs.barcodeDetail.open(this.rowForm);
+ });
+ },
//#endregion
-
//#region 鑾峰彇鍏徃鍚嶏紝鏍规嵁鍏徃杩涜瀹氬埗鍖栧紑鍙�
defaintOperationByCompanyName() {
diff --git a/src/views/sell/xsSeOrderBill/xsSeOrderBill.vue b/src/views/sell/xsSeOrderBill/xsSeOrderBill.vue
index 5bc7ae0..8f412b5 100644
--- a/src/views/sell/xsSeOrderBill/xsSeOrderBill.vue
+++ b/src/views/sell/xsSeOrderBill/xsSeOrderBill.vue
@@ -683,7 +683,7 @@
openData: false, //鏁版嵁寮圭獥
dialogTitle: "",
zuzhiId: "",
- organizationList: [], //缁勭粐鍒楄〃
+ organizationList: JSON.parse(sessionStorage["organizationList"]), //缁勭粐鍒楄〃
subDisabled: false, //缂栬緫椤甸潰淇濆瓨鎸夐挳鏄惁绂佺敤(true绂佺敤锛宖alse鍙敤)
OperationType: null, //淇濆瓨绫诲瀷锛堟柊澧�1淇敼3锛�
HInterID: null,
@@ -1390,7 +1390,8 @@
},
//鎵撳紑鏂板缁勪欢寮圭獥
handleAddEdit() {
- this.rowForm.HItemID = 0;
+ // this.rowForm.HItemID = 0;
+ this.iframeUrl = `/iframe/XsSeOrderBillEdit?HInterID=0&OperationType=1©Type=-1`;
this.$nextTick(() => {
this.openEdit = true;
this.editShow = true;
@@ -1417,13 +1418,9 @@
.then(() => {
if (!this.rowForm.瀹℃牳浜�) {
axios
- .get(this.baseURL + "Cg_POInStockBill/DeltetPOInStockBill", {
+ .get(this.baseURL + "Xs_SeOrderBill/DropXs_SeOrderBill", {
params: {
- HInter: this.rowForm.hmainid.toString(),
- HsupId: this.rowForm.HsupId,
- HQty: this.rowForm.HQty,
- HSourceInterID: this.rowForm.HSourceInterID,
- HSourceEntryID: this.rowForm.HSourceEntryID,
+ HInterID: this.rowForm.hmainid.toString(),
user: sessionStorage["HUserName"],
},
})
diff --git a/src/views/sell/xsSeOrderBill/xsSeOrderBillEdit.vue b/src/views/sell/xsSeOrderBill/xsSeOrderBillEdit.vue
index 904eeec..bff4cbb 100644
--- a/src/views/sell/xsSeOrderBill/xsSeOrderBillEdit.vue
+++ b/src/views/sell/xsSeOrderBill/xsSeOrderBillEdit.vue
@@ -435,18 +435,18 @@
</el-table-column>
<el-table-column align="center" label="浠撳簱" width="120">
<template slot-scope="scope">
- <el-input-number
- v-model="scope.row.HQty"
+ <el-input
+ v-model="scope.row.浠撳簱"
:min="1"
style="width: 90px"
controls-position="right"
- ></el-input-number>
+ ></el-input>
</template>
</el-table-column>
<el-table-column align="center" label="鏁伴噺2" width="120">
<template slot-scope="scope">
<el-input-number
- v-model="scope.row.HPrice"
+ v-model="scope.row.HQty"
:min="0"
style="width: 90px"
controls-position="right"
@@ -455,22 +455,22 @@
</el-table-column>
<el-table-column align="center" label="鍗曚环" width="120">
<template slot-scope="scope">
- <span>{{ scope.row.HTaxPrice }}</span>
+ <span>{{ scope.row.HPrice }}</span>
</template>
</el-table-column>
- <el-table-column align="center" label="鍔犵◣鍚堣" width="120">
+ <el-table-column align="center" label="浠风◣鍚堣" width="120">
<template slot-scope="scope">
- <span>{{ scope.row.HTaxRate }}</span>
+ <span>{{ scope.row.HTaxMoney }}</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>
+ <span>{{ scope.row.HPrice * scope.row.瑙勬牸鍨嬪彿 }}</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>
+ <span>{{ scope.row.HTaxPrice * scope.row.HDate }}</span>
</template>
</el-table-column>
<el-table-column align="center" label="澶囨敞" width="120">
@@ -648,8 +648,8 @@
getdata() {
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.CopyType2 = this.$route.query.CopyType || this.copyType || -1;
+ console.log("浼犻�掔殑鍙傛暟",this.$route.query.CopyType,this.$route.query.OperationType, this.$route.query.HInterID);
this.formShow = false;
this.formLoading = true;
@@ -712,7 +712,7 @@
HMoney: dataArray[i].閲戦.toFixed(2),
HTaxMoney: dataArray[i].浠风◣鍚堣.toFixed(2),
HWHID: dataArray[i].HWHID,
- 鍙戣揣浠撳簱: dataArray[i].HWHName,
+ 浠撳簱: dataArray[i].HWHName,
HRemark: "",
HQty_Full: "0",
HQty_Empty: "0",
diff --git a/src/views/system/user/GyDriver.vue b/src/views/system/user/GyDriver.vue
new file mode 100644
index 0000000..897f4a2
--- /dev/null
+++ b/src/views/system/user/GyDriver.vue
@@ -0,0 +1,1676 @@
+<template>
+ <div style="padding: 10px">
+ <el-card class="search-card" style="margin-bottom: 15px">
+ <el-button
+ type="text"
+ @click="toggleAdvancedSearch"
+ style="font-size: 12px; color: #409eff"
+ >
+ {{ showAdvancedSearch ? "鏀惰捣" : "鏇村" }}
+ <i
+ :class="
+ showAdvancedSearch
+ ? 'el-icon-arrow-up'
+ : 'el-icon-arrow-down'
+ "
+ ></i>
+ </el-button>
+ <div style="margin-top: 15px">
+ <el-row :gutter="15">
+ <el-col :span="6">
+ <div style="display: flex; align-items: center">
+ <span style="width: 200px; text-align: right; margin-right: 10px"
+ >椹鹃┒鍛樹唬鐮�:</span
+ >
+ <el-input
+ v-model="queryParams.HNumber"
+ placeholder="璇疯緭鍏ラ┚椹跺憳浠ｇ爜"
+ size="small"
+ @keyup.enter.native="handleQuery"
+ clearable
+ />
+ </div>
+ </el-col>
+ <el-col :span="6">
+ <div style="display: flex; align-items: center">
+ <span style="width: 200px; text-align: right; margin-right: 10px"
+ >椹鹃┒鍛樺悕绉�:</span
+ >
+ <el-input
+ v-model="queryParams.HName"
+ placeholder="璇疯緭鍏ラ┚椹跺憳鍚嶇О"
+ size="small"
+ @keyup.enter.native="handleQuery"
+ clearable
+ />
+ </div>
+ </el-col>
+ <el-col :span="6">
+ <div style="display: flex; align-items: center">
+ <span style="width: 100px; text-align: right; margin-right: 10px"
+ >缁勭粐:</span
+ >
+ <el-select
+ v-model="queryParams.HUSEORGID"
+ placeholder="璇烽�夋嫨缁勭粐"
+ size="small"
+ style="width: 100%"
+ >
+ <el-option
+ v-for="(item, index) in organizationList"
+ :key="index"
+ :label="item.Name"
+ :value="item.ID"
+ >
+ </el-option>
+ </el-select>
+ </div>
+ </el-col>
+ <el-col :span="6">
+ <div style="display: flex; align-items: center">
+ <span style="width: 80px; text-align: right; margin-right: 10px"
+ >閲嶆柊鍚屾:</span
+ >
+ <el-input
+ v-model="queryParams.HSyncNumber"
+ placeholder="璇疯緭鍏ラ┚椹跺憳浠ｇ爜"
+ size="small"
+ @keyup.enter.native="handleSync"
+ clearable
+ style="flex: 1"
+ />
+ <el-button
+ @click="handleSync"
+ size="small"
+ style="margin-left: 5px"
+ >鍚屾</el-button
+ >
+ </div>
+ </el-col>
+ </el-row>
+ <div class="search-header">
+ <div style="display: flex; justify-content: space-between; align-items: center">
+ <div>
+ <el-button
+ type="primary"
+ icon="el-icon-search"
+ size="mini"
+ @click="handleQuery"
+ style="margin-right: 10px"
+ >鎼滅储</el-button
+ >
+ <el-button
+ icon="el-icon-refresh"
+ size="mini"
+ @click="resetQuery"
+ style="margin-right: 10px"
+ >閲嶇疆</el-button
+ >
+ <el-button
+ icon="el-icon-refresh"
+ size="mini"
+ @click="getList"
+ style="margin-right: 10px"
+ >鍒锋柊</el-button
+ >
+
+ </div>
+ </div>
+ </div>
+ <el-collapse-transition>
+ <div v-show="showAdvancedSearch">
+ <div style="margin-top: 15px">
+ <el-row :gutter="15">
+ <div style="margin-bottom: 50px">
+ <!-- 绗竴缁勮繃婊ゆ潯浠� -->
+ <el-col :span="24">
+ <div style="display: flex; align-items: center">
+ <el-select
+ v-model="queryParams.ColName"
+ placeholder="璇烽�夋嫨"
+ size="small"
+ style="flex: 1"
+ >
+ <el-option label="" value="0"></el-option>
+ <el-option
+ v-for="(item, index) in filterColumnList"
+ :key="index"
+ :label="item.field"
+ :value="item.field"
+ v-if="!item.hide"
+ ></el-option>
+ </el-select>
+ <el-select
+ v-model="queryParams.Comparator"
+ placeholder="璇烽�夋嫨"
+ size="small"
+ style="width: 100px; margin: 0 10px"
+ >
+ <el-option label="" value="0"></el-option>
+ <el-option
+ v-for="(item, index) in comparatorList"
+ :key="index"
+ :label="item.label"
+ :value="item.value"
+ ></el-option>
+ </el-select>
+ <el-input
+ v-model="queryParams.ColContent"
+ placeholder="璇疯緭鍏�"
+ size="small"
+ @keyup.enter.native="handleQuery"
+ clearable
+ style="flex: 1"
+ />
+ </div>
+ </el-col>
+ </div>
+ <div style="margin-bottom: 100px">
+ <!-- 绗簩缁勮繃婊ゆ潯浠� -->
+ <el-col :span="24">
+ <div style="display: flex; align-items: center">
+
+ <el-select
+ v-model="queryParams.ColName1"
+ placeholder="璇烽�夋嫨"
+ size="small"
+ style="flex: 1"
+ >
+ <!-- <el-option label="" value="0"></el-option> -->
+ <el-option
+ v-for="(item, index) in filterColumnList"
+ :key="index"
+ :label="item.field"
+ :value="item.field"
+ v-if="!item.hide"
+ ></el-option>
+ </el-select>
+ <el-select
+ v-model="queryParams.Comparator1"
+ placeholder="璇烽�夋嫨"
+ size="small"
+ style="width: 100px; margin: 0 10px"
+ >
+ <!-- <el-option label="" value="0"></el-option> -->
+ <el-option
+ v-for="(item, index) in comparatorList"
+ :key="index"
+ :label="item.label"
+ :value="item.value"
+ ></el-option>
+ </el-select>
+ <el-input
+ v-model="queryParams.ColContent1"
+ placeholder="璇疯緭鍏�"
+ size="small"
+ @keyup.enter.native="handleQuery"
+ clearable
+ style="flex: 1"
+ />
+ </div>
+ </el-col>
+ </div>
+ <div style="margin-bottom: 50px">
+ <!-- 绗笁缁勮繃婊ゆ潯浠� -->
+ <el-col :span="24">
+ <div style="display: flex; align-items: center">
+ <el-select
+ v-model="queryParams.ColName2"
+ placeholder="璇烽�夋嫨"
+ size="small"
+ style="flex: 1"
+ >
+ <!-- <el-option label="" value="0"></el-option> -->
+ <el-option
+ v-for="(item, index) in filterColumnList"
+ :key="index"
+ :label="item.field"
+ :value="item.field"
+ v-if="!item.hide"
+ ></el-option>
+ </el-select>
+ <el-select
+ v-model="queryParams.Comparator2"
+ placeholder="璇烽�夋嫨"
+ size="big"
+ style="width: 100px; margin: 0 10px"
+ >
+ <el-option label="" value="0"></el-option>
+ <el-option
+ v-for="(item, index) in comparatorList"
+ :key="index"
+ :label="item.label"
+ :value="item.value"
+ ></el-option>
+ </el-select>
+ <el-input
+ v-model="queryParams.ColContent2"
+ placeholder="璇疯緭鍏�"
+ size="big"
+ @keyup.enter.native="handleQuery"
+ clearable
+ style="flex: 1"
+ />
+ </div>
+ </el-col>
+ </div>
+ </el-row>
+ </div>
+
+ <div
+ v-if="currentFilterScheme"
+ style="
+ margin-top: 15px;
+ padding: 10px;
+ background-color: #f0f9ff;
+ border-radius: 4px;
+ border-left: 4px solid #409eff;
+ "
+ >
+ <span style="font-size: 14px; font-weight: bold; color: #fc9393">
+ 褰撳墠杩囨护鏂规锛歿{ currentFilterScheme }}
+ </span>
+ <span
+ v-if="currentFilterRemark"
+ style="font-size: 13px; color: #7b90fb; margin-left: 10px"
+ >
+ ({{ currentFilterRemark }})
+ </span>
+ <el-button
+ type="text"
+ @click="handleSaveScheme"
+ size="mini"
+ style="margin-left: 20px"
+ >淇濆瓨鏂规</el-button
+ >
+ <el-button
+ type="text"
+ @click="handleReadScheme"
+ size="mini"
+ >璇诲彇鏂规</el-button
+ >
+ <el-button
+ type="text"
+ @click="clearFilterScheme"
+ size="mini"
+ style="color: #f56c6c"
+ >娓呴櫎鏂规</el-button
+ >
+ </div>
+ </div>
+ </el-collapse-transition>
+ </div>
+ </el-card>
+
+ <el-row :gutter="10" class="mb8">
+ <el-col :span="1.5">
+ <el-button
+ type="primary"
+ plain
+ icon="el-icon-upload2"
+ size="mini"
+ @click="handleImport"
+ id="set_SouceExcel"
+ >瀵煎叆</el-button
+ >
+ </el-col>
+ <!-- <el-col :span="1.5">
+ <el-button
+ type="warning"
+ plain
+ icon="el-icon-download"
+ size="mini"
+ @click="handleExport"
+ id="get_export"
+ >瀵煎嚭</el-button
+ >
+ </el-col> -->
+ <el-col :span="1.5">
+ <el-button
+ type="primary"
+ plain
+ icon="el-icon-plus"
+ size="mini"
+ @click="handleAddEdit((OperationType = 1))"
+ id="set_add"
+ >鏂板</el-button
+ >
+ </el-col>
+ <el-col :span="1.5">
+ <el-button
+ type="primary"
+ plain
+ icon="el-icon-document-copy"
+ size="mini"
+ :disabled="single"
+ @click="handleCopy"
+ id="set_Copy"
+ >澶嶅埗</el-button
+ >
+ </el-col>
+ <el-col :span="1.5">
+ <el-button
+ type="primary"
+ plain
+ icon="el-icon-edit"
+ size="mini"
+ :disabled="single"
+ @click="handleEdit((row = rowForm), (OperationType = 3))"
+ id="set_show"
+ >缂栬緫</el-button
+ >
+ </el-col>
+ <el-col :span="1.5">
+ <el-button
+ type="primary"
+ plain
+ icon="el-icon-delete"
+ size="mini"
+ :disabled="single"
+ @click="handleDelete"
+ id="set_delete"
+ >鍒犻櫎</el-button
+ >
+ </el-col>
+ <el-col :span="1.5">
+ <el-button
+ type="primary"
+ plain
+ icon="el-icon-check"
+ size="mini"
+ :disabled="single"
+ @click="handleAudit(0)"
+ id="btn_audit"
+ >瀹℃牳</el-button
+ >
+ </el-col>
+ <el-col :span="1.5">
+ <el-button
+ type="primary"
+ plain
+ icon="el-icon-close"
+ size="mini"
+ :disabled="single"
+ @click="handleAudit(1)"
+ id="btn_deaudit"
+ >鍙嶅鏍�</el-button
+ >
+ </el-col>
+ <el-col :span="1.5">
+ <el-button
+ type="primary"
+ plain
+ icon="el-icon-turn-off"
+ size="mini"
+ :disabled="single"
+ @click="handleStop(0)"
+ id="btn_stop"
+ >绂佺敤</el-button
+ >
+ </el-col>
+ <el-col :span="1.5">
+ <el-button
+ type="primary"
+ plain
+ icon="el-icon-open"
+ size="mini"
+ :disabled="single"
+ @click="handleStop(1)"
+ id="btn_destop"
+ >鍙嶇鐢�</el-button
+ >
+ </el-col>
+ <el-col :span="1.5">
+ <el-button
+ type="primary"
+ plain
+ icon="el-icon-setting"
+ size="mini"
+ @click="handleRowHide"
+ id="set_hidecolumn"
+ >鍒楄缃�</el-button
+ >
+ </el-col>
+ <el-col :span="1.5">
+ <el-button
+ type="primary"
+ plain
+ icon="el-icon-s-operation"
+ size="mini"
+ @click="handleBtnHide"
+ id="HideButton"
+ >鎸夐挳璁剧疆</el-button
+ >
+ </el-col>
+ </el-row>
+
+ <div class="tableBox" v-loading="loading">
+ <el-table
+ :data="tableData"
+ ref="tableData"
+ max-height="650"
+ @selection-change="handleSelectionChange"
+ border
+ @row-click="handleRowClick"
+ :row-style="rowStyle"
+ @cell-dblclick="handleDblclick"
+ v-if="tableShow"
+ stripe
+ >
+ <el-table-column
+ type="selection"
+ width="55"
+ align="center"
+ fixed="left"
+ />
+ <template v-for="(item, index) in btList">
+ <el-table-column
+ :align="item.align"
+ :prop="item.field"
+ :label="item.title"
+ :width="item.width"
+ :key="item.field"
+ v-if="!item.hide && item.field !== 'checkbox'"
+ :sortable="item.sort"
+ show-overflow-tooltip
+ :fixed="item.fixed"
+ >
+ <template slot-scope="{ row, column }">
+ <div :style="item.style">
+ <!-- 鏃ユ湡鏍煎紡鍖� -->
+ <span
+ v-if="
+ column.property.includes('鏃ユ湡') ||
+ column.property.includes('Date')
+ "
+ >
+ {{ parseTime(row[column.property], "{y}-{m}-{d}") }}
+ </span>
+ <el-button
+ type="text"
+ @click="handleDriverCodeClick(row)"
+ v-else-if="column.property === '椹鹃┒鍛樹唬鐮�'"
+ style="color: #409eff"
+ >{{ row[column.property] }}</el-button
+ >
+ <span
+ v-else-if="column.property === '绂佺敤鏍囪'"
+ :style="{
+ color: row[column.property] === 'Y' ? '#f56c6c' : '#67c23a',
+ fontWeight:
+ row[column.property] === 'Y' ? 'bold' : 'normal',
+ }"
+ >
+ {{ row[column.property] === "Y" ? "宸茬鐢�" : "姝ｅ父" }}
+ </span>
+ <!-- 瀹℃牳鐘舵�佺壒娈婃牱寮� -->
+ <span
+ v-else-if="column.property === '瀹℃牳浜�'"
+ :style="{
+ color: row[column.property] ? '#67c23a' : '#909399',
+ }"
+ >
+ {{ row[column.property] || "鏈鏍�" }}
+ </span>
+ <span v-else>{{ row[column.property] }}</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="editDialogTitle"
+ :visible.sync="openEdit"
+ width="1480px"
+ append-to-body
+ class="driver-edit-dialog"
+ :before-close="closeEditDialog"
+ :close-on-click-modal="false"
+ >
+ <GyDriverEdit
+ :OperationType="OperationType"
+ :linterid="rowForm.HItemID"
+ :HSouceBillType="''"
+ @editCloseGy="editGyClose"
+ v-if="editShow"
+ ref="editComponent"
+ />
+ <span slot="footer" class="dialog-footer" v-if="OperationType !== 4">
+ <!-- <el-button @click="closeEditDialog">鍙� 娑�</el-button>
+ <el-button type="primary" @click="saveDriverData">淇� 瀛�</el-button> -->
+ </span>
+ </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="鎿嶄綔" 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>
+
+ <!-- 杩囨护鏂规寮圭獥 -->
+ <el-dialog
+ title="杩囨护鏂规鍒楄〃"
+ :visible.sync="openFilterScheme"
+ width="80%"
+ append-to-body
+ >
+ <div style="height: 500px; overflow: auto">
+ <el-table
+ :data="filterSchemeList"
+ border
+ style="width: 100%"
+ @row-click="selectFilterScheme"
+ >
+ <el-table-column
+ prop="鏂规鍚嶇О"
+ label="鏂规鍚嶇О"
+ width="200"
+ ></el-table-column>
+ <el-table-column
+ prop="澶囨敞"
+ label="澶囨敞"
+ width="300"
+ ></el-table-column>
+ <el-table-column prop="鍒涘缓浜�" label="鍒涘缓浜�" width="120"></el-table-column>
+ <el-table-column
+ prop="鍒涘缓鏃ユ湡"
+ label="鍒涘缓鏃ユ湡"
+ width="150"
+ ></el-table-column>
+ <el-table-column label="鎿嶄綔" width="150" align="center">
+ <template slot-scope="scope">
+ <el-button
+ type="text"
+ size="mini"
+ @click="applyFilterScheme(scope.row)"
+ >搴旂敤</el-button
+ >
+ <el-button
+ type="text"
+ size="mini"
+ @click="deleteFilterScheme(scope.row)"
+ style="color: #f56c6c"
+ >鍒犻櫎</el-button
+ >
+ </template>
+ </el-table-column>
+ </el-table>
+ </div>
+ <span slot="footer" class="dialog-footer">
+ <el-button type="primary" @click="confirmFilterScheme">纭� 瀹�</el-button>
+ <el-button @click="openFilterScheme = false">鍙� 娑�</el-button>
+
+ </span>
+ </el-dialog>
+ </div>
+ </div>
+</template>
+
+<script>
+import axios from "axios";
+import RowSettings from "@/views/component/rowSettings";
+import GyDriverEdit from "@/views/system/user/GyDriverEdit.vue";
+export default {
+ name: "GyDriverListNew",
+ components: { RowSettings, GyDriverEdit },
+ props: {
+ openPage: { type: String },
+ },
+ data() {
+ return {
+ HModName: "gy_driver",
+ HModuleName: "椹鹃┒鍛樿缃�",
+
+ showAdvancedSearch: false,
+
+ currentFilterScheme: "",
+ currentFilterRemark: "",
+ filterSchemeList: [],
+ openFilterScheme: false,
+
+ 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: "",
+ organizationList: [],
+ filterColumnList: [],
+
+ user: "admin",
+ Organization: "",
+ currentRow: [],
+ rowForm: {},
+ editShow: false,
+ openEdit: false,
+ editDialogTitle: "椹鹃┒鍛樼紪杈�",
+ tableShow: true,
+ openBtnHide: false,
+ btnHideShow: false,
+ rowHideShow: false,
+ openRowHide: false,
+ queryParams: {
+ HUSEORGID: null,
+ HName: null,
+ HNumber: null,
+ HSyncNumber: null,
+ Comparator: "",
+ Comparator1: "",
+ Comparator2: "",
+ ColContent: "",
+ ColContent1: "",
+ ColContent2: "",
+ ColName: "",
+ ColName1: "",
+ ColName2: "",
+ },
+ showSearch: true,
+ ids: [],
+
+ single: true,
+
+ multiple: true,
+
+ loading: true,
+
+ tyResList: [],
+ btList: [],
+ btResList: [],
+ tableData: [],
+ dataList: [],
+ titleData: ["HItemID", "HUSEORGID", "HEmpID", "璐熻矗浜�"],
+
+ pageSizes: [50, 100, 500, 5000, 50000],
+ page: 1,
+ pageSize: 50,
+ total: 0,
+
+ upload: {
+ open: false,
+ title: "瀵煎叆椹鹃┒鍛�",
+ isUploading: false,
+ updateSupport: 0,
+ url: process.env.VUE_APP_BASE_API + "/Gy_Driver/Gy_Driver_Excel",
+ },
+ uploadData: [],
+ alluploadList: [],
+ uploadTableLoading: false,
+ uploadPageSizes: [50, 100, 500, 5000, 50000],
+ uploadPage: 1,
+ uploadPageSize: 50,
+ uploadTotal: 0,
+
+ OperationType: null,
+ copyType: 0,
+
+ baseURL: process.env.VUE_APP_BASE_API,
+ };
+ },
+ created() {
+ this.initData();
+ },
+ methods: {
+ async initData() {
+ try {
+ const userRes = await axios.get(
+ `${this.baseURL}/Web/GetUser?UserName=${
+ sessionStorage.getItem("UserName") || "001"
+ }&PassWord=123456&HOrgName=100038`
+ );
+ if (userRes.data.data && userRes.data.data[0]) {
+ const userData = userRes.data.data[0];
+ this.user = userData.Czymc || "admin";
+ this.Organization = userData.HUSEORGID;
+ this.queryParams.HUSEORGID = userData.HUSEORGID;
+ }
+
+ const orgRes = await axios.get(`${this.baseURL}/Web/GetOrganizations`);
+ if (orgRes.data.count == 1) {
+ this.organizationList = orgRes.data.data;
+ }
+
+ await this.getList();
+ } catch (error) {
+ this.$modal.msgError("鍒濆鍖栨暟鎹け璐�!");
+ }
+ },
+
+ toggleAdvancedSearch() {
+ this.showAdvancedSearch = !this.showAdvancedSearch;
+ },
+
+ async getList() {
+ this.tableShow = false;
+ this.loading = true;
+ console.log("鑾峰彇鍒楄〃鏁版嵁...",this.sWhere );
+ try {
+ const params = {
+ sWhere: this.sWhere || "",
+ user: this.user,
+ Organization: this.Organization,
+ page: this.page,
+ size: this.pageSize,
+ };
+
+ const res = await axios.get(`${this.baseURL}/Gy_DriverController/list`, {
+ params,
+ });
+
+ if (res.data.count == 1) {
+ this.tyResList = res.data.data;
+ this.btResList = res.data.list;
+ this.total = res.data.count;
+
+ this.processTableHeader(res.data.list, res.data.data);
+ } else {
+ this.$modal.msgError(res.data.Message || "鑾峰彇鏁版嵁澶辫触");
+ }
+ } catch (error) {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ } finally {
+ this.loading = false;
+ }
+ },
+
+ processTableHeader(headerList, data) {
+ const col = [];
+ col.push({ type: "checkbox", fixed: "left", field: "checkbox" });
+
+ headerList.forEach((item) => {
+ if (this.titleData.includes(item.ColmCols)) {
+ col.push({
+ field: item.ColmCols,
+ title: item.ColmCols,
+ align: "center",
+ hide: true,
+ });
+ } else {
+ const column = {
+ field: item.ColmCols,
+ title: item.ColmCols,
+ align: "center",
+ sort: true,
+ width: 200,
+ };
+
+ if (item.ColmType === "DateTime") {
+ column.templet = true; // 鏍囪涓烘棩鏈熺被鍨�
+ }
+
+ col.push(column);
+ }
+ });
+
+ this.btList = col;
+ this.tableData = data;
+ this.tableShow = true;
+
+ this.updateFilterColumns();
+
+ this.DisPlay_HideColumn();
+ },
+
+ updateFilterColumns() {
+ this.filterColumnList = this.btList.filter(
+ (item) => !item.hide && item.field !== "checkbox"
+ );
+ },
+
+ async DisPlay_HideColumn() {
+ try {
+ const res = await axios.get(
+ `${this.baseURL}/Xt_grdAlignment_WMES/grdAlignmentWMESList`,
+ {
+ params: {
+ HModName: this.HModName,
+ user: this.user,
+ },
+ }
+ );
+
+ if (res.data.data.length > 0) {
+ const config = res.data.data[0];
+ const dataCol = config.HGridString.split(",");
+
+ dataCol.forEach((colStr, index) => {
+ if (this.btList[index + 1]) {
+ const colParts = colStr.split("|");
+
+ // 闅愯棌鍒�
+ if (colParts[1] == "1") {
+ this.btList[index + 1].hide = true;
+ }
+
+ // 鍒楀
+ if (colParts[3] > 0) {
+ this.btList[index + 1].width = colParts[3];
+ }
+
+ // 瀛椾綋澶у皬
+ if (config.HFontSize != 0) {
+ this.btList[index + 1].style = `font-size:${config.HFontSize}px;`;
+ }
+
+ // 鏄剧ず鍒�
+ if (
+ colParts[1] == "0" &&
+ !this.titleData.includes(this.btList[index + 1].title)
+ ) {
+ this.btList[index + 1].hide = false;
+ }
+
+ // 瀵归綈鏂瑰紡
+ switch (colParts[2]) {
+ case "L":
+ this.btList[index + 1].align = "left";
+ break;
+ case "M":
+ this.btList[index + 1].align = "center";
+ break;
+ case "R":
+ this.btList[index + 1].align = "right";
+ break;
+ }
+
+ // 鍒楀埆鍚�
+ if (colParts[4]) {
+ this.btList[index + 1].title = colParts[4];
+ }
+ }
+ });
+
+ // 鍐荤粨鍒�
+ if (config.HFixCols > 0) {
+ for (
+ let i = 1;
+ i <= config.HFixCols && i < this.btList.length;
+ i++
+ ) {
+ this.btList[i].fixed = "left";
+ }
+ }
+
+ this.tableShow = false;
+ this.$nextTick(() => {
+ this.tableShow = true;
+ });
+ }
+ } catch (error) {
+ console.error("鍔犺浇鍒楅厤缃け璐�:", error);
+ }
+ },
+
+ handleQuery() {
+ this.sWhere = "";
+ const conditions = [];
+
+ if (this.queryParams.HNumber) {
+ conditions.push(`椹鹃┒鍛樹唬鐮� like '%${this.queryParams.HNumber}%'`);
+ }
+ if (this.queryParams.HName) {
+ conditions.push(`椹鹃┒鍛樺悕绉� like '%${this.queryParams.HName}%'`);
+ }
+ // if (this.queryParams.HUSEORGID) {
+ // conditions.push(`HUSEORGID = '${this.queryParams.HUSEORGID}'`);
+ // }
+
+
+ if (this.queryParams.ColName !== "0" && this.queryParams.Comparator !== "0") {
+ const condition = this.buildCondition(
+ this.queryParams.ColName,
+ this.queryParams.Comparator,
+ this.queryParams.ColContent
+ );
+ if (condition) conditions.push(condition);
+ }
+
+
+ if (
+ this.queryParams.ColName1 !== "0" &&
+ this.queryParams.Comparator1 !== "0"
+ ) {
+ const condition = this.buildCondition(
+ this.queryParams.ColName1,
+ this.queryParams.Comparator1,
+ this.queryParams.ColContent1
+ );
+ if (condition) conditions.push(condition);
+ }
+
+ if (
+ this.queryParams.ColName2 !== "0" &&
+ this.queryParams.Comparator2 !== "0"
+ ) {
+ const condition = this.buildCondition(
+ this.queryParams.ColName2,
+ this.queryParams.Comparator2,
+ this.queryParams.ColContent2
+ );
+ if (condition) conditions.push(condition);
+ }
+
+
+ if (conditions.length > 0) {
+ this.sWhere ="and "+conditions;
+ }
+ console.log("鏌ヨ鏉′欢:", this.sWhere);
+ //this.sWhere += this.addSWhereByOpenType();
+
+ this.page = 1;
+ this.getList();
+ },
+
+ buildCondition(colName, comparator, content) {
+ if (!content) return null;
+
+ switch (comparator) {
+ case "7":
+ return `${colName} like '%${content}%'`;
+ case "8":
+ return `${colName} like '%${content}'`;
+ case "9":
+ return `${colName} like '${content}%'`;
+ case "10":
+ return `${colName} not like '%${content}%'`;
+ default:
+ return `${colName} ${comparator} '${content}'`;
+ }
+ },
+
+ //
+ addSWhereByOpenType() {
+ // if (this.openPage) {
+
+ // return " and 绂佺敤鏍囪 = '' and ISNULL(瀹℃牳浜�,'') <> ''";
+ // }
+ // // 鐩存帴鎵撳紑鐨勬儏鍐�
+ // return " and 绂佺敤鏍囪 = ' '";
+ },
+
+ resetQuery() {
+ this.queryParams = {
+ HUSEORGID: this.Organization,
+ HName: "",
+ HNumber: "",
+ HSyncNumber: "",
+ Comparator: "0",
+ Comparator1: "0",
+ Comparator2: "0",
+ ColContent: "",
+ ColContent1: "",
+ ColContent2: "",
+ ColName: "0",
+ ColName1: "0",
+ ColName2: "0",
+ };
+ this.sWhere = "";
+ this.page = 1;
+ this.getList();
+ },
+
+ async handleSync() {
+ if (!this.queryParams.HSyncNumber) {
+ this.$modal.msgWarning("璇疯緭鍏ヨ鍚屾鐨勯┚椹跺憳浠ｇ爜");
+ return;
+ }
+
+ try {
+ const res = await axios.get(`${this.baseURL}/Gy_Driver/Gy_DriverViewApi`, {
+ params: {
+ Number: this.queryParams.HSyncNumber,
+ Type: "JSY", // 椹鹃┒鍛樼被鍨�
+ HUseOrgID: this.queryParams.HUSEORGID,
+ },
+ });
+
+ if (res.data.count == 1) {
+ this.$modal.msgSuccess("鍚屾鎴愬姛");
+ this.getList();
+ } else {
+ this.$modal.msgError(res.data.Message || "鍚屾澶辫触");
+ }
+ } catch (error) {
+ this.$modal.msgError("鍚屾澶辫触");
+ }
+ },
+
+ // 鐐瑰嚮琛�
+ handleRowClick(row) {
+ this.$refs.tableData.toggleRowSelection(row);
+ },
+
+ // 琛屾牱寮�
+ rowStyle({ row }) {
+ if (this.ids.includes(row.HItemID)) {
+ return { background: "#ecf5ff" };
+ }
+ return {};
+ },
+
+ // 鍙屽嚮琛�
+ handleDblclick(row) {
+ this.rowForm = row;
+ this.OperationType = 3;
+ this.editDialogTitle = "缂栬緫椹鹃┒鍛�";
+ this.openEdit = true;
+ this.editShow = true;
+ },
+
+ handleDriverCodeClick(row) {
+ this.rowForm = row;
+ this.OperationType = 3;
+ this.editDialogTitle = "缂栬緫椹鹃┒鍛�";
+ this.openEdit = true;
+ this.editShow = true;
+ },
+
+ handleSelectionChange(selection) {
+ this.ids = selection.map((item) => item.HItemID);
+ this.single = selection.length !== 1;
+ this.multiple = !selection.length;
+ if (!this.single) {
+ this.rowForm = selection[0];
+ }
+ },
+
+ // 鏂板
+ handleAddEdit() {
+ this.rowForm = { HItemID: 0 };
+ this.OperationType = 1;
+ this.editDialogTitle = "鏂板椹鹃┒鍛�";
+ this.openEdit = true;
+ this.editShow = true;
+ },
+
+ // 澶嶅埗
+ handleCopy() {
+ if (this.single) {
+ this.$modal.msgWarning("璇烽�夋嫨涓�鏉℃暟鎹繘琛屽鍒�");
+ return;
+ }
+ this.OperationType = 2;
+ this.editDialogTitle = "澶嶅埗椹鹃┒鍛�";
+ this.openEdit = true;
+ this.editShow = true;
+ },
+
+ // 缂栬緫
+ handleEdit() {
+ if (this.single) {
+ this.$modal.msgWarning("璇烽�夋嫨涓�鏉℃暟鎹繘琛岀紪杈�");
+ return;
+ }
+ this.OperationType = 3;
+ this.editDialogTitle = "缂栬緫椹鹃┒鍛�";
+ this.openEdit = true;
+ this.editShow = true;
+ },
+
+ // 鍏抽棴缂栬緫寮圭獥
+ closeEditDialog() {
+ this.openEdit = false;
+ this.editShow = false;
+ setTimeout(() => {
+ this.getList();
+ }, 100);
+ },
+
+ // 淇濆瓨
+ async saveDriverData() {
+ if (this.$refs.editComponent) {
+ await this.$refs.editComponent.handleSave();
+
+ this.closeEditDialog();
+ }
+ },
+
+ // 鍏抽棴缂栬緫椤甸潰
+ editGyClose(val) {
+ this.editShow = false;
+ this.openEdit = false;
+ this.getList();
+ },
+
+ // 鍒犻櫎
+ async handleDelete() {
+ if (this.single) {
+ this.$modal.msgWarning("璇烽�夋嫨涓�鏉℃暟鎹繘琛屽垹闄�");
+ return;
+ }
+
+ if (this.rowForm.瀹℃牳浜�) {
+ this.$modal.msgError("宸插鏍哥殑鏁版嵁涓嶈兘鍒犻櫎");
+ return;
+ }
+
+ try {
+ await this.$modal.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠");
+
+ const res = await axios.get(`${this.baseURL}/DeltetGy_Driver`, {
+ params: {
+ HItemID: this.rowForm.HItemID.toString(),
+ user: this.user,
+ },
+ });
+
+ if (res.data.count == 1) {
+ this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+ this.getList();
+ } else {
+ this.$modal.msgError(res.data.Message || "鍒犻櫎澶辫触");
+ }
+ } catch (error) {
+ if (error !== "cancel") {
+ this.$modal.msgError("鍒犻櫎澶辫触");
+ }
+ }
+ },
+
+ // 瀹℃牳/鍙嶅鏍�
+ async handleAudit(isAudit) {
+ if (this.single) {
+ this.$modal.msgWarning("璇烽�夋嫨涓�鏉℃暟鎹�");
+ return;
+ }
+
+ try {
+ const action = isAudit ? "鍙嶅鏍�" : "瀹℃牳";
+ await this.$modal.confirm(`纭瑕�${action}鍚楋紵`);
+
+ const res = await axios.get(`${this.baseURL}/Gy_Driver/AuditGy_Driver`, {
+ params: {
+ HInterID: this.rowForm.HItemID.toString(),
+ IsAudit: isAudit,
+ CurUserName: this.user,
+ },
+ });
+
+ if (res.data.count == 1) {
+ this.$modal.msgSuccess(`${action}鎴愬姛`);
+ this.getList();
+ } else {
+ this.$modal.msgError(res.data.Message || `${action}澶辫触`);
+ }
+ } catch (error) {
+ if (error !== "cancel") {
+ this.$modal.msgError("鎿嶄綔澶辫触");
+ }
+ }
+ },
+
+ // 绂佺敤/鍙嶇鐢�
+ async handleStop(isStop) {
+ if (this.single) {
+ this.$modal.msgWarning("璇烽�夋嫨涓�鏉℃暟鎹�");
+ return;
+ }
+
+ try {
+ const action = isStop ? "鍙嶇鐢�" : "绂佺敤";
+ await this.$modal.confirm(`纭瑕�${action}鍚楋紵`);
+
+ const res = await axios.get(`${this.baseURL}/Gy_Driver/StopGy_Driver`, {
+ params: {
+ HInterID: this.rowForm.HItemID.toString(),
+ IsStop: isStop,
+ CurUserName: this.user,
+ },
+ });
+
+ if (res.data.count == 1) {
+ this.$modal.msgSuccess(`${action}鎴愬姛`);
+ this.getList();
+ } else {
+ this.$modal.msgError(res.data.Message || `${action}澶辫触`);
+ }
+ } catch (error) {
+ if (error !== "cancel") {
+ this.$modal.msgError("鎿嶄綔澶辫触");
+ }
+ }
+ },
+
+ // // 瀵煎嚭
+ // handleExport() {
+ // import("@/vendor/Export2Excel").then((excel) => {
+ // const tHeader = this.btList
+ // .filter((item) => !item.hide && item.field !== "checkbox")
+ // .map((item) => item.title);
+
+ // const filterVal = this.btList
+ // .filter((item) => !item.hide && item.field !== "checkbox")
+ // .map((item) => item.field);
+
+ // const data = this.formatJson(filterVal, this.tyResList);
+
+ // excel.export_json_to_excel({
+ // header: tHeader,
+ // data,
+ // filename: `椹鹃┒鍛樿缃甠${new Date().getTime()}`,
+ // autoWidth: true,
+ // bookType: "xlsx",
+ // });
+ // });
+ // },
+
+ formatJson(filterVal, jsonData) {
+ return jsonData.map((v) =>
+ filterVal.map((j) => {
+ if (j.includes("鏃ユ湡") || j.includes("Date")) {
+ return this.parseTime(v[j], "{y}-{m}-{d}");
+ }
+ return v[j];
+ })
+ );
+ },
+
+
+ parseTime(time, cFormat) {
+ if (arguments.length === 0) {
+ return null;
+ }
+ const format = cFormat || "{y}-{m}-{d} {h}:{i}:{s}";
+ let date;
+ if (typeof time === "object") {
+ date = time;
+ } else {
+ if (typeof time === "string" && /^[0-9]+$/.test(time)) {
+ time = parseInt(time);
+ }
+ if (typeof time === "number" && time.toString().length === 10) {
+ time = time * 1000;
+ }
+ date = new Date(time);
+ }
+ const formatObj = {
+ y: date.getFullYear(),
+ m: date.getMonth() + 1,
+ d: date.getDate(),
+ h: date.getHours(),
+ i: date.getMinutes(),
+ s: date.getSeconds(),
+ a: date.getDay(),
+ };
+ const time_str = format.replace(/{([ymdhisa])+}/g, (result, key) => {
+ const value = formatObj[key];
+ if (key === "a") {
+ return ["鏃�", "涓�", "浜�", "涓�", "鍥�", "浜�", "鍏�"][value];
+ }
+ return value.toString().padStart(2, "0");
+ });
+ return time_str;
+ },
+
+ // 瀵煎叆
+ handleImport() {
+ this.uploadData = [];
+ this.upload.title = "瀵煎叆椹鹃┒鍛�";
+ this.upload.open = true;
+ },
+
+ // 鏂囦欢涓婁紶涓�
+ handleFileUploadProgress(event, file, fileList) {
+ this.upload.isUploading = true;
+ this.uploadTableLoading = true;
+ },
+
+ // 鏂囦欢涓婁紶鎴愬姛
+ handleFileSuccess(response, file, fileList) {
+ this.upload.isUploading = false;
+ 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;
+ } else {
+ this.$alert(
+ `<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>${response.Message}</div>`,
+ "瀵煎叆缁撴灉",
+ { dangerouslyUseHTMLString: true }
+ );
+ }
+ },
+
+ // 鎵ц瀵煎叆
+ async set_AddNew() {
+ const validData = this.uploadData.filter((item) => item);
+
+ if (validData.length === 0) {
+ this.$modal.msgWarning("娌℃湁鍙鍏ョ殑鏁版嵁");
+ return;
+ }
+
+ try {
+ const sSubStr = JSON.stringify(validData);
+ const sMainSub = sSubStr + "&鍜�" + this.user;
+
+ const res = await axios.post(`${this.baseURL}/Gy_Driver/Gy_Process_Excel`, {
+ sMainSub: sMainSub,
+ });
+
+ 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("瀵煎叆澶辫触");
+ }
+ },
+
+ // 鑾峰彇鍒嗛〉鏁版嵁
+ getPage(page, list) {
+ const sindex = (page - 1) * this.uploadPageSize;
+ const eindex = page * this.uploadPageSize;
+ return list.slice(sindex, eindex);
+ },
+
+ // 瀵煎叆鍒嗛〉
+ currentPage(val) {
+ this.uploadPage = val.page;
+ this.uploadData = this.getPage(this.uploadPage, this.alluploadList);
+ },
+
+ // 瀵煎叆鏁版嵁搴忓彿
+ uploadDataIndex({ row, rowIndex }) {
+ row.index = rowIndex + 1 + (this.uploadPage - 1) * this.uploadPageSize;
+ },
+
+ // 鍒犻櫎瀵煎叆鏁版嵁
+ uploadDataDelete(row) {
+ this.$modal.confirm("纭瑕佸垹闄ゅ悧").then(() => {
+ const deleteIndex = row.index - 1 - (this.uploadPage - 1) * this.uploadPageSize;
+ this.uploadData.splice(deleteIndex, 1);
+ this.alluploadList.splice(row.index - 1, 1);
+ this.uploadTotal = this.alluploadList.length;
+
+ // 閲嶆柊璁＄畻褰撳墠椤垫暟鎹�
+ this.uploadData = this.getPage(this.uploadPage, this.alluploadList);
+ });
+ },
+
+ // 闅愯棌鍒楄缃�
+ handleRowHide() {
+ this.rowHideShow = true;
+ this.openRowHide = true;
+ },
+
+ // 鍏抽棴鍒楄缃�
+ rowSetClose(val) {
+ this.rowHideShow = false;
+ this.openRowHide = val;
+ this.getList();
+ },
+
+ // 鎸夐挳璁剧疆
+ handleBtnHide() {
+ this.$modal.msgInfo("鎸夐挳璁剧疆鍔熻兘寰呭紑鍙�");
+ },
+
+ // 淇濆瓨鏂规
+ handleSaveScheme() {
+ this.$modal.msgInfo("淇濆瓨鏂规鍔熻兘寰呭紑鍙�");
+ },
+
+ // 璇诲彇鏂规
+ handleReadScheme() {
+ this.loadFilterSchemes();
+ this.openFilterScheme = true;
+ },
+
+ // 鍔犺浇杩囨护鏂规
+ async loadFilterSchemes() {
+ try {
+ const res = await axios.get(`${this.baseURL}/Xt_FastICScheme/list`, {
+ params: {
+ HModuleName: this.HModuleName,
+ user: this.user,
+ },
+ });
+
+ if (res.data.count == 1) {
+ this.filterSchemeList = res.data.data;
+ }
+ } catch (error) {
+ console.error("鍔犺浇杩囨护鏂规澶辫触:", error);
+ }
+ },
+
+ // 閫夋嫨杩囨护鏂规
+ selectFilterScheme(row) {
+ this.selectedFilterScheme = row;
+ },
+
+ // 搴旂敤杩囨护鏂规
+ applyFilterScheme(row) {
+ this.currentFilterScheme = row.鏂规鍚嶇О;
+ this.currentFilterRemark = row.澶囨敞;
+
+ // 杩欓噷搴旇鏍规嵁鏂规鍐呭璁剧疆鏌ヨ鏉′欢
+ // 鐢变簬鏂规鏁版嵁缁撴瀯澶嶆潅锛岃繖閲屽彧鍋氱畝鍗曟紨绀�
+ this.$modal.msgSuccess(`宸插簲鐢ㄦ柟妗堬細${row.鏂规鍚嶇О}`);
+ this.openFilterScheme = false;
+ },
+
+ // 鍒犻櫎杩囨护鏂规
+ async deleteFilterScheme(row) {
+ try {
+ await this.$modal.confirm(`纭瑕佸垹闄ゆ柟妗�"${row.鏂规鍚嶇О}"鍚楋紵`);
+
+ const res = await axios.post(`${this.baseURL}/Xt_FastICScheme/delete`, {
+ HInterID: row.hmainid,
+ });
+
+ if (res.data.count == 1) {
+ this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+ this.loadFilterSchemes();
+ } else {
+ this.$modal.msgError("鍒犻櫎澶辫触");
+ }
+ } catch (error) {
+ if (error !== "cancel") {
+ this.$modal.msgError("鍒犻櫎澶辫触");
+ }
+ }
+ },
+
+ // 纭杩囨护鏂规
+ confirmFilterScheme() {
+ if (this.selectedFilterScheme) {
+ this.applyFilterScheme(this.selectedFilterScheme);
+ } else {
+ this.$modal.msgWarning("璇烽�夋嫨涓�涓繃婊ゆ柟妗�");
+ }
+ },
+
+ // 娓呴櫎杩囨护鏂规
+ clearFilterScheme() {
+ this.currentFilterScheme = "";
+ this.currentFilterRemark = "";
+ this.resetQuery();
+ this.$modal.msgSuccess("宸叉竻闄よ繃婊ゆ柟妗�");
+ },
+ },
+};
+</script>
+
+<style scoped>
+.search-card {
+ border-radius: 4px;
+ border: 1px solid #ebeef5;
+ box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+}
+
+.search-header {
+ border-bottom: 1px solid #ebeef5;
+ padding-bottom: 8px;
+ margin-bottom: 8px;
+}
+
+.mb8 {
+ margin-bottom: 15px;
+}
+
+.tableBox {
+ margin-top: 10px;
+ border: 1px solid #ebeef5;
+ border-radius: 4px;
+ padding: 15px;
+ background-color: #fff;
+}
+
+.driver-edit-dialog ::v-deep .el-dialog__body {
+ padding: 20px;
+}
+
+/* 鍝嶅簲寮忚皟鏁� */
+@media (max-width: 1200px) {
+ .el-col {
+ margin-bottom: 10px;
+ }
+}
+
+/* 琛ㄦ牸琛屾牱寮忎紭鍖� */
+::v-deep .el-table--striped .el-table__body tr.el-table__row--striped td {
+ background-color: #fafafa;
+}
+
+::v-deep .el-table th {
+ background-color: #f5f7fa;
+ color: #909399;
+ font-weight: bold;
+}
+
+/* 鎸夐挳缁勬牱寮� */
+::v-deep .el-button-group .el-button {
+ margin-right: 0;
+}
+
+/* 鎶樺彔杩囨浮鏁堟灉 */
+.el-collapse-transition-enter-active,
+.el-collapse-transition-leave-active {
+ transition: all 0.3s ease;
+}
+
+.el-collapse-transition-enter,
+.el-collapse-transition-leave-to {
+ opacity: 0;
+ transform: translateY(-10px);
+}
+</style>
\ No newline at end of file
diff --git a/src/views/system/user/GyDriverEdit.vue b/src/views/system/user/GyDriverEdit.vue
new file mode 100644
index 0000000..7f15f13
--- /dev/null
+++ b/src/views/system/user/GyDriverEdit.vue
@@ -0,0 +1,734 @@
+<template>
+ <div class="gy-driver-edit">
+ <div class="operation-buttons">
+ <el-button
+ type="primary"
+ icon="el-icon-check"
+ @click="handleSave"
+ :disabled="saveDisabled"
+ id="set_SaveBill"
+ >淇濆瓨</el-button
+ >
+ <el-button
+ type="primary"
+ icon="el-icon-check"
+ @click="handleAudit"
+ :disabled="!canAudit"
+ id="set_CheckBill"
+ >瀹℃牳</el-button
+ >
+ <el-button
+ type="primary"
+ icon="el-icon-close"
+ @click="handleCancel"
+ id="Cancel"
+ >閫�鍑�</el-button
+ >
+ </div>
+ <el-form
+ ref="formRef"
+ :model="formData"
+ :rules="formRules"
+ label-width="120px"
+ class="edit-form"
+ >
+ <el-tabs v-model="activeTab" type="card">
+ <el-tab-pane label="鍩烘湰淇℃伅" name="basic">
+ <div class="form-row">
+ <el-form-item label="椹鹃┒鍛樹唬鐮�" prop="HNumber">
+ <el-input
+ v-model="formData.HNumber"
+ placeholder="璇疯緭鍏ラ┚椹跺憳浠ｇ爜"
+ clearable
+ :disabled="isViewMode"
+ />
+ <el-input
+ type="hidden"
+ v-model="formData.HCREATEORGID"
+ style="display: none"
+ />
+ </el-form-item>
+
+ <el-form-item label="椹鹃┒鍛樺悕绉�" prop="HName">
+ <el-input
+ v-model="formData.HName"
+ placeholder="璇疯緭鍏ラ┚椹跺憳鍚嶇О"
+ clearable
+ :disabled="isViewMode"
+ />
+ </el-form-item>
+
+ <el-form-item label="鍔╄鐮�">
+ <el-input
+ v-model="formData.HHelpCode"
+ placeholder="璇疯緭鍏ュ姪璁扮爜"
+ clearable
+ :disabled="isViewMode"
+ />
+ </el-form-item>
+
+ <el-form-item label="鎵�灞炲叕鍙�" prop="HDeptID">
+ <div class="dept-select">
+ <el-input
+ v-model="formData.HDeptName"
+ placeholder="璇烽�夋嫨鎵�灞炲叕鍙�"
+ readonly
+ clearable
+ :disabled="isViewMode"
+ />
+ <el-input
+ type="hidden"
+ v-model="formData.HDeptID"
+ style="display: none"
+ />
+ <el-button
+ type="primary"
+ icon="el-icon-search"
+ @click="openDeptDialog"
+ :disabled="isViewMode"
+ style="margin-left: 10px"
+ >
+ </el-button>
+ </div>
+ </el-form-item>
+ </div>
+
+ <div class="form-row">
+ <el-form-item label="绂佺敤鏍囪">
+ <el-checkbox
+ v-model="formData.checkboxHStopflag"
+ :true-label="1"
+ :false-label="0"
+ :disabled="!canEditStopFlag"
+ @change="handleStopFlagChange"
+ >
+ 鏄惁绂佺敤
+ </el-checkbox>
+ <el-input
+ type="hidden"
+ v-model="formData.HStopflag"
+ style="display: none"
+ />
+ </el-form-item>
+ </div>
+
+ <div class="form-row">
+ <el-form-item label="澶囨敞">
+ <el-input
+ v-model="formData.HRemark"
+ placeholder="璇疯緭鍏ュ娉�"
+ type="textarea"
+ :rows="3"
+ style="width: 75%"
+ :disabled="isViewMode"
+ />
+ </el-form-item>
+ </div>
+
+ <div class="form-row">
+ <el-form-item label="缁勭粐" prop="Organization">
+ <el-select
+ v-model="formData.Organization"
+ placeholder="璇烽�夋嫨缁勭粐"
+ style="width: 717px"
+ :disabled="isViewMode || orgDisabled"
+ >
+ <el-option
+ v-for="org in organizationList"
+ :key="org.ID"
+ :label="org.Name"
+ :value="org.ID"
+ style="color: blue"
+ />
+ </el-select>
+ </el-form-item>
+ </div>
+ </el-tab-pane>
+
+ <el-tab-pane label="鍏朵粬淇℃伅" name="other">
+ <div class="form-row">
+ <el-form-item label="韬唤璇佸彿鐮�">
+ <el-input
+ v-model="formData.identityID"
+ placeholder="璇疯緭鍏ヨ韩浠借瘉鍙风爜"
+ clearable
+ :disabled="isViewMode"
+ style="width: 150px; background-color: #f5f7fa"
+ />
+ </el-form-item>
+
+ <el-form-item label="鎵嬫満鍙风爜">
+ <el-input
+ v-model="formData.Telephone"
+ placeholder="璇疯緭鍏ユ墜鏈哄彿鐮�"
+ clearable
+ :disabled="isViewMode"
+ />
+ </el-form-item>
+
+ <el-form-item label="椹剧収绫诲瀷">
+ <el-select
+ v-model="formData.LicenseType"
+ placeholder="璇烽�夋嫨椹剧収绫诲瀷"
+ :disabled="isViewMode"
+ >
+ <el-option label="A1" value="A1" />
+ <el-option label="A2" value="A2" />
+ <el-option label="A3" value="A3" />
+ <el-option label="B1" value="B1" />
+ <el-option label="B2" value="B2" />
+ </el-select>
+ </el-form-item>
+
+ <el-form-item label="鍙告満绫诲瀷">
+ <el-select
+ v-model="formData.DriverType"
+ placeholder="璇烽�夋嫨鍙告満绫诲瀷"
+ :disabled="isViewMode"
+ >
+ <el-option label="鍥哄畾" value="鍥哄畾" />
+ <el-option label="涓存椂" value="涓存椂" />
+ </el-select>
+ </el-form-item>
+ </div>
+ </el-tab-pane>
+
+ <el-tab-pane label="鍒跺崟淇℃伅" name="record">
+ <div class="form-row">
+ <el-form-item label="鍒跺崟浜�">
+ <el-input
+ v-model="formData.HMakeEmp"
+ readonly
+ style="width: 200px; background-color: #f5f7fa"
+ />
+ </el-form-item>
+
+ <el-form-item label="瀹℃牳浜�">
+ <el-input
+ v-model="formData.HCheckEmp"
+ readonly
+ style="width: 200px; background-color: #f5f7fa"
+ />
+ </el-form-item>
+
+ <el-form-item label="绂佺敤浜�">
+ <el-input
+ v-model="formData.HStopEmp"
+ readonly
+ style="width: 200px; background-color: #f5f7fa"
+ />
+ </el-form-item>
+ </div>
+
+ <div class="form-row">
+ <el-form-item label="鍒跺崟鏃ユ湡">
+ <el-input
+ v-model="formData.HMakeDate"
+ readonly
+ style="width: 200px; background-color: #f5f7fa"
+ />
+ </el-form-item>
+
+ <el-form-item label="瀹℃牳鏃ユ湡">
+ <el-input
+ v-model="formData.HCheckDate"
+ readonly
+ style="width: 200px; background-color: #f5f7fa"
+ />
+ </el-form-item>
+
+ <el-form-item label="绂佺敤鏃ユ湡">
+ <el-input
+ v-model="formData.HStopDate"
+ readonly
+ style="width: 200px; background-color: #f5f7fa"
+ />
+ </el-form-item>
+ </div>
+ </el-tab-pane>
+ </el-tabs>
+
+ <el-input type="hidden" v-model="formData.HItemID" />
+ </el-form>
+
+ <!-- 閮ㄩ棬閫夋嫨寮圭獥 -->
+ <el-dialog
+ title="dialogTitle"
+ :visible.sync="openData"
+ width="90%"
+ top="5vh"
+ append-to-body
+ >
+ <Dept @deptEmitDb="dbEmitData" @deptEmit="emitData" v-if="deptShow" />
+
+ <span slot="footer" class="dialog-footer">
+ <el-button type="primary" @click="deptClickSub">纭� 瀹�</el-button>
+ <el-button @click="closeDeptDialog">鍙� 娑�</el-button>
+
+ </span>
+ </el-dialog>
+ </div>
+</template>
+
+<script>
+import axios from "axios";
+import Dept from "@/views/component/dept";
+export default {
+ name: "GyDriverEdit",
+ components: { Dept},
+ props: {
+ OperationType: {
+ type: Number,
+ default: 1, // 1:鏂板, 2:澶嶅埗, 3:缂栬緫, 4:娴忚
+ },
+
+ linterid: {
+ type: String,
+ type: Number,
+ default: "0",
+ },
+ HSouceBillType: {
+ type: String,
+ default: "",
+ },
+ },
+ data() {
+ return {
+ baseURL: process.env.VUE_APP_BASE_API,
+ activeTab: "basic",
+
+ // 閮ㄩ棬閫夋嫨寮圭獥
+ deptDialogVisible: false,
+ deptDialogUrl: "",
+ dialogTitle: "",
+ deptShow: false,
+ openData: false,
+ deptform: {}, //寮圭獥閫変腑鏁版嵁
+ // 缁勭粐鍒楄〃
+ organizationList: [],
+
+ // 琛ㄥ崟鏁版嵁
+ formData: {
+ HItemID: "0",
+ HNumber: "",
+ HName: "",
+ HHelpCode: "",
+ HDeptName: "",
+ HDeptID: "0",
+ HDepNumber: "",
+ identityID: "",
+ Telephone: "",
+ LicenseType: "A1",
+ DriverType: "鍥哄畾",
+ HStopflag: "0",
+ checkboxHStopflag: 0,
+ HRemark: "",
+ HUSEORGID: "",
+ HCREATEORGID: "0",
+ HMakeEmp: "",
+ HMakeDate: "",
+ HCheckEmp: "",
+ HCheckDate: "",
+ HStopEmp: "",
+ HStopDate: "",
+ Organization: "",
+ },
+
+ // 琛ㄥ崟楠岃瘉瑙勫垯
+ formRules: {
+ HNumber: [
+ { required: true, message: "璇疯緭鍏ラ┚椹跺憳浠ｇ爜", trigger: "blur" },
+ ],
+ HName: [
+ { required: true, message: "璇疯緭鍏ラ┚椹跺憳鍚嶇О", trigger: "blur" },
+ ],
+ HUSEORGID: [
+ { required: true, message: "璇烽�夋嫨缁勭粐", trigger: "change" },
+ ],
+ HDeptID: [
+ { required: true, message: "璇烽�夋嫨鎵�灞炲叕鍙�", trigger: "change" },
+ ],
+ },
+ saveDisabled: false,
+ orgDisabled: false,
+ isViewMode: false,
+ canEditStopFlag: true,
+ };
+ },
+ computed: {
+ canAudit() {
+ return (
+ this.OperationType === 3 &&
+ this.formData.HItemID !== "0" &&
+ !this.formData.HCheckEmp
+ );
+ },
+
+ // 鏍煎紡鍖栧綋鍓嶆棩鏈�
+ currentDate() {
+ const now = new Date();
+ const year = now.getFullYear();
+ const month = String(now.getMonth() + 1).padStart(2, "0");
+ const day = String(now.getDate()).padStart(2, "0");
+ return `${year}-${month}-${day}`;
+ },
+ },
+ created() {
+ this.initData();
+ },
+ methods: {
+
+ async initData() {
+ try {
+
+ await this.getOrganizationList();
+ await this.initByOperationType();
+ } catch (error) {
+ this.$modal.msgError("鍒濆鍖栧け璐�");
+ console.error("鍒濆鍖栭敊璇�:", error);
+ }
+ },
+
+ emitData(row) {
+ this.deptform = row; // 瀛樺偍閫変腑鐨勯儴闂ㄦ暟鎹�
+ },
+ dbEmitData(deptRow){
+ this.formData.HDeptName = deptRow.閮ㄩ棬鍚嶇О;
+ this.formData.HDeptID = deptRow.HItemID;
+ this.openData = false;
+ },
+ deptClickSub() {
+ if (this.deptform && this.deptform.HItemID) {
+ this.formData.HDeptName = this.deptform.閮ㄩ棬鍚嶇О;
+ this.formData.HDeptID = this.deptform.HItemID;
+ this.openData = false;
+ this.deptShow = false;
+ } else {
+ this.$modal.msgWarning("璇峰厛閫夋嫨涓�涓儴闂�");
+ }
+ },
+ deptDialogVisible() {
+ this.deptform = {};
+ this.openData = false;
+ },
+ // 鑾峰彇缁勭粐鍒楄〃
+ async getOrganizationList() {
+ try {
+ const res = await axios.get(`${this.baseURL}/Web/GetOrganizations`);
+ if (res.data.count === 1) {
+ this.organizationList = res.data.data;
+ const orgId = sessionStorage.getItem("Organization");
+ this.formData.HUSEORGID = sessionStorage.getItem("OrganizationID") || "";
+ this.formData.Organization = orgId;
+ this.formData.HCREATEORGID = sessionStorage.getItem("OrganizationID")|| "0";
+ }
+ } catch (error) {
+ console.error("鑾峰彇缁勭粐鍒楄〃澶辫触:", error);
+ }
+ },
+
+
+ async initByOperationType() {
+ const { OperationType, linterid } = this;
+ this.formData.HMakeEmp = sessionStorage.getItem("HUserName") || "";
+ this.formData.HMakeDate = this.currentDate;
+
+ switch (OperationType) {
+ case 1: // 鏂板
+ this.orgDisabled = true;
+ this.formData.HItemID = "0";
+ break;
+
+ case 2: // 澶嶅埗
+ await this.loadDriverData(linterid);
+ this.formData.HItemID = "0";
+ this.formData.HNumber = "";
+ this.formData.HName = "";
+ this.formData.HMakeEmp = sessionStorage.getItem("HUserName") || "";
+ this.formData.HMakeDate = this.currentDate;
+ this.formData.HCheckEmp = "";
+ this.formData.HCheckDate = "";
+ this.formData.HStopEmp = "";
+ this.formData.HStopDate = "";
+ break;
+
+ case 3: // 缂栬緫
+ this.orgDisabled = true;
+ this.formData.HItemID = linterid;
+ await this.loadDriverData(linterid);
+ break;
+
+ case 4: // 娴忚
+ this.isViewMode = true;
+ this.saveDisabled = true;
+ this.canEditStopFlag = false;
+ this.formData.HItemID = linterid;
+ await this.loadDriverData(linterid);
+ break;
+
+ default:
+ this.$modal.msgError("鏈煡鎿嶄綔绫诲瀷");
+ break;
+ }
+ },
+
+ async loadDriverData(linterid) {
+ try {
+ const res = await axios.get(`${this.baseURL}/Gy_Driver/cx`, {
+ params: { HInterID: linterid },
+ });
+ console.log("椹鹃┒鍛樻暟鎹姞杞藉搷搴�:", linterid,this.baseURL);
+ console.log("鍔犺浇椹鹃┒鍛樻暟鎹�:", res.data.data);
+ if (res.data.data[0]) {
+ const data = res.data.data[0];
+ console.log("鍔犺浇椹鹃┒鍛樻暟鎹�:", data);
+ this.mapDataToForm(data);
+ } else {
+ this.$modal.msgError(res.data.msg || "鍔犺浇鏁版嵁澶辫触");
+ }
+ } catch (error) {
+ console.error("鍔犺浇椹鹃┒鍛樻暟鎹け璐�:", error);
+ this.$modal.msgError("鍔犺浇鏁版嵁澶辫触");
+ }
+ },
+
+ mapDataToForm(data) {
+ const mapping = {
+ HNumber: "椹鹃┒鍛樹唬鐮�",
+ HName: "椹鹃┒鍛樺悕绉�",
+ HHelpCode: "鐭唬鐮�",
+ HDeptName: "鎵�灞炲叕鍙稿悕绉�",
+ HDepNumber: "鎵�灞炲叕鍙镐唬鐮�",
+ HDeptID: "鎵�灞炲叕鍙窱D",
+ identityID: "韬唤璇佸彿鐮�",
+ Telephone: "鎵嬫満鍙风爜",
+ HStopflag: "绂佺敤鏍囪",
+ HRemark: "澶囨敞",
+ HUSEORGID: "HUSEORGID",
+ LicenseType: "椹剧収绫诲瀷",
+ DriverType: "鍙告満绫诲瀷",
+ HMakeEmp: "鍒涘缓浜�",
+ HMakeDate: "鍒涘缓鏃ユ湡",
+ HCheckEmp: "瀹℃牳浜�",
+ HCheckDate: "瀹℃牳鏃ユ湡",
+ HStopEmp: "绂佺敤浜�",
+ HStopDate: "绂佺敤鏃ユ湡",
+ };
+
+ Object.entries(mapping).forEach(([formKey, dataKey]) => {
+ if (data[dataKey] !== undefined) {
+ if (dataKey.includes("鏃ユ湡")) {
+ this.formData[formKey] = this.formatDate(data[dataKey]);
+ } else {
+ this.formData[formKey] = data[dataKey];
+ }
+ }
+ });
+
+ if (data.绂佺敤鏍囪) {
+ this.formData.checkboxHStopflag = 1;
+ this.formData.HStopflag = "1";
+ } else {
+ this.formData.checkboxHStopflag = 0;
+ this.formData.HStopflag = "0";
+ }
+ },
+
+ formatDate(dateStr) {
+ if (!dateStr) return "";
+ try {
+ const date = new Date(dateStr);
+ const year = date.getFullYear();
+ const month = String(date.getMonth() + 1).padStart(2, "0");
+ const day = String(date.getDate()).padStart(2, "0");
+ return `${year}-${month}-${day}`;
+ } catch (error) {
+ return dateStr;
+ }
+ },
+
+ async handleSave() {
+ try {
+ await this.$refs.formRef.validate();
+
+ if (!this.formData.HNumber) {
+ this.$modal.msgWarning("璇疯緭鍏ラ┚椹跺憳浠ｇ爜锛�");
+ return;
+ }
+
+ if (!this.formData.HName) {
+ this.$modal.msgWarning("璇疯緭鍏ラ┚椹跺憳鍚嶇О锛�");
+ return;
+ }
+
+ const saveData = {
+ ...this.formData,
+ HItemID: this.formData.HItemID,
+ HStopflag: this.formData.HStopflag,
+ };
+ console.log("淇濆瓨鏁版嵁:", saveData);
+
+ const sMainStr = JSON.stringify(saveData);
+ const res = await axios.post(`${this.baseURL}/Gy_Driver/AddBill1`, {
+ oMain: `${sMainStr};${sessionStorage.getItem("HUserName")};${
+ sessionStorage.getItem("OrganizationID") || 100038
+ }`,
+ });
+
+ if (res.data.count === 1) {
+ this.$modal.msgSuccess("淇濆瓨鎴愬姛");
+ this.saveDisabled = true;
+
+ if (this.OperationType === 1 || this.OperationType === 2) {
+ this.isViewMode = true;
+ }
+ } else {
+ this.$modal.msgError(res.data.Message || "淇濆瓨澶辫触");
+ }
+ } catch (error) {
+ if (error.name !== "Error") {
+ this.$modal.msgError("淇濆瓨澶辫触");
+ console.error("淇濆瓨閿欒:", error);
+ }
+ }
+ },
+
+ async handleAudit() {
+ try {
+ await this.$modal.confirm("纭瑕佸鏍稿悧?");
+
+ const res = await axios.get(`${this.baseURL}/Gy_Driver/AuditGy_Driver`, {
+ params: {
+ HInterID: this.formData.HItemID,
+ IsAudit: 0,
+ CurUserName: sessionStorage.getItem("HUserName") || "",
+ },
+ });
+
+ if (res.data.count === 1) {
+ this.$modal.msgSuccess("瀹℃牳鎴愬姛");
+
+
+ if (this.formData.HItemID !== "0") {
+ await this.loadDriverData(this.formData.HItemID);
+ }
+ } else {
+ this.$modal.msgError(res.data.Message || "瀹℃牳澶辫触");
+ }
+ } catch (error) {
+ if (error !== "cancel") {
+ this.$modal.msgError("瀹℃牳澶辫触");
+ }
+ }
+ },
+
+
+ handleCancel() {
+ this.$emit("editCloseGy", false);
+ },
+
+
+ handleStopFlagChange(value) {
+ this.formData.HStopflag = value ? "1" : "0";
+ },
+
+
+ openDeptDialog() {
+ this.deptShow = false;
+ this.dialogTitle = "閮ㄩ棬鍒楄〃";
+ this.deptShow = true;
+ this.openData = true;
+ },
+
+
+
+ clearDept() {
+ this.formData.HDeptName = "";
+ this.formData.HDeptID = "0";
+ this.formData.HDepNumber = "";
+ },
+
+ handleMessage(event) {
+
+ if (event.data && event.data.type === "deptSelected") {
+ const dept = event.data.data;
+ if (dept) {
+ this.formData.HDeptName = dept.閮ㄩ棬鍚嶇О;
+ this.formData.HDeptID = dept.HItemID;
+ this.formData.HDepNumber = dept.閮ㄩ棬浠ｇ爜;
+ this.deptDialogVisible = false;
+ }
+ }
+ },
+ },
+};
+</script>
+
+<style scoped>
+.gy-driver-edit {
+ padding: 15px;
+ height: 100%;
+ box-sizing: border-box;
+}
+
+.operation-buttons {
+ margin-bottom: 20px;
+}
+
+.operation-buttons .el-button {
+ margin-right: 10px;
+}
+
+.edit-form {
+ height: calc(100% - 60px);
+ overflow-y: auto;
+}
+
+.form-row {
+ display: flex;
+ flex-wrap: wrap;
+ margin-bottom: 15px;
+}
+
+.form-row .el-form-item {
+ flex: 1 1 300px;
+ margin-right: 20px;
+ margin-bottom: 0;
+ min-width: 300px;
+}
+
+.form-row .el-form-item:last-child {
+ margin-right: 0;
+}
+
+.dept-select {
+ display: flex;
+ align-items: center;
+}
+
+.dept-select .el-input {
+ flex: 1;
+}
+
+/* 璋冩暣鏍囩椤垫牱寮� */
+::v-deep .el-tabs__header {
+ margin-bottom: 20px;
+}
+
+::v-deep .el-tabs__content {
+ padding: 0 20px;
+}
+
+/* 鍝嶅簲寮忚皟鏁� */
+@media (max-width: 1200px) {
+ .form-row .el-form-item {
+ flex: 1 1 100%;
+ margin-right: 0;
+ }
+}
+
+/* 闅愯棌瀛楁鏍峰紡 */
+input[type="hidden"] {
+ display: none;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/system/user/Xt_UserGroupEdit.vue b/src/views/system/user/Xt_UserGroupEdit.vue
index a970543..c762ae4 100644
--- a/src/views/system/user/Xt_UserGroupEdit.vue
+++ b/src/views/system/user/Xt_UserGroupEdit.vue
@@ -6,7 +6,7 @@
<!-- <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="128px">
+ <el-form ref="form" :model="form" label-width="128px">
<el-tabs v-model="activeName" type="card">
<el-tab-pane label="鍩烘湰淇℃伅" name="first">
<el-row>
@@ -74,7 +74,7 @@
components: {},
props: {
OperationType: { type: Number, },
- linterid: {},
+ linterid: {type: Number},
},
data() {
return {
@@ -97,20 +97,25 @@
};
},
created() {
+
this.getdata()
},
methods: {
//#region 椤甸潰鍒濆鍖�
getdata() {
- this.formShow = false
- this.formLoading = true
- this.getUserGroup()
- if ((this.OperationType == 1 && this.copyType != 1) || (!this.OperationType && !this.copyType)) {
- this.handleAdd()
- } else if (this.OperationType == 3 || this.copyType == 1) {
- this.$nextTick(() => {
- this.handleUpdate()
- })
+ try {
+ this.formShow = false
+ this.formLoading = true
+ this.getUserGroup()
+ if ((this.OperationType == 1 && this.copyType != 1) || (!this.OperationType && !this.copyType)) {
+ this.handleAdd()
+ } else if (this.OperationType == 3 || this.copyType == 1) {
+ this.$nextTick(() => {
+ this.handleUpdate()
+ })
+ }
+ } catch (err) {
+ console.error('Error ', err)
}
},
@@ -179,12 +184,20 @@
handleUpdate() {
this.reset()
let rowHmainid = this.linterid
- axios.get(this.baseURL + "/Xt_User/EditUser", {
- params: { 'HID': rowHmainid }
+ let sWhere = " and HGroupID=" + rowHmainid ;
+ console.log("缂栬緫鐢ㄦ埛ID",rowHmainid)
+ ///Xt_User/EditUser
+ axios.get(this.baseURL + "Xt_UserGroup/list", {
+ params: { 'sWhere': sWhere }
}).then(response => {
if (response.data.code == 1) {
var result = response.data
- var data = result.data.h_v_IF_UserList_Edit[0]
+ // var data = result.data.h_v_IF_UserList_Edit[0]
+ var data = result.data[0]
+ console.log("缂栬緫鐢ㄦ埛淇℃伅",data)
+ this.form.HLev = data.绾у埆
+ this.form.HGroupName = data.瑙掕壊
+ this.form.HUSEORGID = sessionStorage["Organization"]
this.form.Czybm = data.鐢ㄦ埛缂栫爜
this.form.Czymc = data.鐢ㄦ埛鍚嶇О
this.form.Czmm = data.瀵嗙爜
@@ -216,7 +229,7 @@
this.form.HCusID = data.HCusID
this.form.HCusName = data.瀹㈡埛
this.form.HGroupID = data.HGroupID
- this.form.HGroupName = data.鐝粍
+ // this.form.HGroupName = data.鐝粍
this.form.HSourceID = data.HSourceID
this.form.HSourceName = data.鐢熶骇璧勬簮
this.form.HCheckEmpID = data.HCheckEmpID
@@ -238,16 +251,22 @@
//#endregion
//#region 鑾峰彇瀛愯〃鏁版嵁
- getUserGroup() {
+ async getUserGroup() {
//瑙掕壊鍒楄〃
- axios.get(this.baseURL + '/Xt_UserGroup/list', {
+ axios.get(this.baseURL + '/Xt_User/list', {
params: {
sWhere: '',
+ user: sessionStorage["HUserName"],
},
}).then(response => {
let data1 = response.data
if (data1.code == 1) {
+ console.log(data1)
this.editData = data1.data
+ this.form.Czybm = data1.data.鐢ㄦ埛缂栫爜
+ console.log("zhiwei",this.editData)
+ console.log("鐢ㄦ埛",this.form.Czybm)
+ //this.get_DisplayUserGroupInfoList()
}
}).catch(error => {
this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
@@ -256,14 +275,15 @@
//#endregion
- get_DisplayUserGroupInfoList() {
- var sWhere = "and UserId='" + this.linterid + "'";
+ async get_DisplayUserGroupInfoList() {
+ var sWhere = "and GroupId='" + this.linterid + "'";
axios.get(this.baseURL + '/Xt_UserGroup/UserGroupInfoList', {
params: {
sWhere: sWhere,
},
}).then(response => {
let data1 = response.data
+ console.log(data1)
if (data1.count == 1) {
if (data1.data.length > 0)
if (this.editData.length > 0) {
diff --git a/src/views/system/user/Xt_UserGroupList.vue b/src/views/system/user/Xt_UserGroupList.vue
index a0a7808..ad09d74 100644
--- a/src/views/system/user/Xt_UserGroupList.vue
+++ b/src/views/system/user/Xt_UserGroupList.vue
@@ -148,11 +148,11 @@
</el-dialog>
<!-- 缂栬緫 -->
<el-dialog title="缂栬緫" :visible.sync="openEdit" width="1480px" append-to-body class="xsckdBox" @close="close">
- <edit :OperationType=OperationType :linterid="this.rowForm.hmainid" @editClose="editClose" v-if="editShow" />
+ <edit :OperationType="OperationType" :linterid="this.rowForm.HGroupID" @editClose="editClose" v-if="editShow" />
</el-dialog>
<!-- 鏉冮檺 -->
<el-dialog title="瑙掕壊鏉冮檺" :visible.sync="openQuery" width="1480px" append-to-body class="xsckdBox">
- <Query HSouceBillType="js" @editQueryClose="editQueryClose" :linterid=this.rowForm.HGroupID v-if="queryShow" />
+ <Query HSouceBillType="js" @editQueryClose="editQueryClose" :linterid="this.rowForm.HGroupID" v-if="queryShow" />
</el-dialog>
</div>
</div>
@@ -282,7 +282,7 @@
//#region 閫変腑琛岄珮浜牱寮�
rowStyle({ row, rowIndex }) {
if (this.ids.includes(row.hmainid)) {
- return { "background": "#ecf5ff" }
+ return { }
}
},
//#endregion
@@ -290,7 +290,7 @@
//#region 鍙屽嚮琛�
handleDblclick(row, column, cell, event) {
this.OperationType = 3
- this.handleEdit()
+ this.handleEdit(row)
},
//#endregion
@@ -519,7 +519,9 @@
//#region 鏂板
handleAddEdit() {
- this.rowForm.hmainid = 0
+ this.OperationType = 1
+ this.rowForm.HGroupID = 0
+ console.log(' OperationType=', this.OperationType, 'rowForm.HGroupID=', this.rowForm.HGroupID)
this.editShow = true
this.openEdit = true
},
@@ -528,6 +530,7 @@
//#region 缂栬緫
handleEdit(row) {
this.rowForm = row
+ console.log('OperationType=', this.OperationType, 'rowForm=', this.rowForm)
this.editShow = true
this.openEdit = true
},
diff --git a/src/views/system/user/xtUserList.vue b/src/views/system/user/xtUserList.vue
index 35f1494..4ff2256 100644
--- a/src/views/system/user/xtUserList.vue
+++ b/src/views/system/user/xtUserList.vue
@@ -528,7 +528,7 @@
},
//閫変腑琛岄珮浜牱寮�
rowStyle({ row, rowIndex }) {
- if (this.ids.includes(row.HEmpID)) {
+ if (this.ids.includes(row.鐢ㄦ埛缂栫爜)) {
return { "background": "#ecf5ff" }
}
},
diff --git a/src/views/system/user/xtUserListEdit.vue b/src/views/system/user/xtUserListEdit.vue
index fcb590b..3a83f71 100644
--- a/src/views/system/user/xtUserListEdit.vue
+++ b/src/views/system/user/xtUserListEdit.vue
@@ -330,12 +330,18 @@
Czybm: [
{ required: true, message: "缂栫爜涓嶈兘涓虹┖!", trigger: "blur" }
],
- Czmm: [
+ Czymc: [
{ required: true, message: "鐢ㄦ埛鍚嶄笉鑳戒负绌�!", trigger: "blur" }
+ ],
+ Czmm: [
+ { required: true, message: "瀵嗙爜涓嶈兘涓虹┖!", trigger: "blur" }
],
Czyyz: [
{ required: true, message: "纭瀵嗙爜涓嶈兘涓虹┖!", trigger: "blur" },
{ required: true, validator: equalToPassword, trigger: "blur" }
+ ],
+ HDept: [
+ { required: true, message: "瀵瑰簲閮ㄩ棬涓嶈兘涓虹┖!", trigger: "blur" }
],
HWHName: [
{ validator: equalToHWHName, trigger: "blur" }
@@ -679,6 +685,8 @@
this.formShow = false
this.$emit('editClose', false)
this.$modal.msgSuccess(response.data.Message);
+ } else {
+ this.$modal.msgError(response.data.Message)
}
}).catch(error => {
this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
diff --git a/src/views/warehouse/barcodeMaster/Gy_BarCodeBill.vue b/src/views/warehouse/barcodeMaster/Gy_BarCodeBill.vue
index 6f69c43..0a80611 100644
--- a/src/views/warehouse/barcodeMaster/Gy_BarCodeBill.vue
+++ b/src/views/warehouse/barcodeMaster/Gy_BarCodeBill.vue
@@ -9,7 +9,7 @@
<el-button type="primary" @click="ToolBatch">鎵规</el-button>
<el-button type="primary" @click="close">閫� 鍑�</el-button>
</div>
- <div style="margin: 10px; font-size: 28px; font-weight: bold; text-align: center;">鍣ㄥ叿妗ｆ缂栬緫</div>
+ <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-row>
<el-col :span="6">
@@ -23,7 +23,7 @@
</el-col>
<el-col :span="6">
<el-form-item label="宸ュ巶浠ｇ爜" prop="HWorksNumber">
- <el-select v-model="form.HWorksNumber" placeholder="璇烽�夋嫨缁勭粐" style="width: 100%">
+ <el-select v-model="form.HWorksNumber" placeholder="璇烽�夋嫨宸ュ巶" style="width: 100%">
<el-option v-for="(item, index) in HWorksNumberList" :key="index" :label="item"
:value="item">
</el-option>
diff --git a/src/views/warehouse/shipment/Kf_StockOutRequestBill.vue b/src/views/warehouse/shipment/Kf_StockOutRequestBill.vue
index e9900b4..61ad812 100644
--- a/src/views/warehouse/shipment/Kf_StockOutRequestBill.vue
+++ b/src/views/warehouse/shipment/Kf_StockOutRequestBill.vue
@@ -693,6 +693,8 @@
this.form.HLinkPhone = data.鑱旂郴鐢佃瘽
this.form.HInnerBillNo = data.杈呭姪瀛楁
this.form.HRemark = data.琛ㄥご澶囨敞
+ this.form.HWHName = data['浠撳簱']
+ this.form.HWHID = data['HWHID']
for (var i = 0; i < result.data.length; i++) {
this.editData.push(
{
@@ -712,7 +714,10 @@
"HlineTotalBB": (result.data[i].閲戦 + result.data[i].绋庨) * result.data[i].姹囩巼, "HTaxPrice": result.data[i].鍚◣鍗曚环,
"HDiscountRate": result.data[i].鎶樻墸鐜�,
"HRelTaxPrice": data.瀹為檯鍚◣鍗曚环,
- "HDate": moment(result.data[i].浜よ揣鏃ユ湡).format('YYYY-MM-DD')
+ "浠撳簱": data.浠撳簱,
+ "HDate": moment(result.data[i].浜よ揣鏃ユ湡).format('YYYY-MM-DD'),
+ "HQtyMust": data.瀹炴敹鏁伴噺,
+ "HQty": data.搴旀敹鏁伴噺
}
);
}
diff --git a/src/views/warehouse/shipment/Kf_StockOutRequestBillList.vue b/src/views/warehouse/shipment/Kf_StockOutRequestBillList.vue
index 741a314..bf6119c 100644
--- a/src/views/warehouse/shipment/Kf_StockOutRequestBillList.vue
+++ b/src/views/warehouse/shipment/Kf_StockOutRequestBillList.vue
@@ -365,6 +365,7 @@
this.eTime = yyyyE + "-" + mmE + "-" + ddE;
},
getList() {
+ this.sWhere = ''
this.pageSize = 50;
this.tableShow = false;
this.loading = true;
diff --git a/src/views/warehouse/transfer/Kf_MoveStockRequestBillEdit.vue b/src/views/warehouse/transfer/Kf_MoveStockRequestBillEdit.vue
index 38ace7b..a960b2b 100644
--- a/src/views/warehouse/transfer/Kf_MoveStockRequestBillEdit.vue
+++ b/src/views/warehouse/transfer/Kf_MoveStockRequestBillEdit.vue
@@ -495,10 +495,13 @@
this.warehouseShow = false
this.openData = false
} else if (num == 3){
+ console.log(deptRow)
this.editData[this.zbIndex].HMaterID = deptRow.HItemID
this.editData[this.zbIndex].鐗╂枡浠ｇ爜 = deptRow.鐗╂枡浠ｇ爜
this.editData[this.zbIndex].鐗╂枡鍚嶇О = deptRow.鐗╂枡鍚嶇О
this.editData[this.zbIndex].瑙勬牸鍨嬪彿 = deptRow.瑙勬牸鍨嬪彿
+ this.editData[this.zbIndex].璁￠噺鍗曚綅 = deptRow.璁￠噺鍗曚綅鍚嶇О
+ this.editData[this.zbIndex].HUnitID = deptRow.HUnitID
this.materialShow = false
this.openData = false
} else if (num == 4) {
--
Gitblit v1.9.1