From 358377336e3e64e088d05bf67bd952bf4f25f419 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期三, 28 一月 2026 15:06:42 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI
---
src/views/scMould/basicModeling/Gy_MouldFile.vue | 16
src/views/scMould/warehouse/Sc_MouldProdBackBillEdit.vue | 10
src/views/scMould/basicModeling/Gy_MaterialPackingRelationList.vue | 37
src/views/component/CurrencyDialog/index.vue | 5
src/utils/loginSource.js | 38
src/views/basic/gyCartypelist/gyCartypelistEdit.vue | 14
src/views/logistics/WayBillPaymentBill/Pay_WayBillPaymentBillList.vue | 13
src/views/scMould/warehouse/Sc_MouldProdMoveBillEdit.vue | 10
src/views/system/user/GyDriverEdit.vue | 30
src/views/warehouse/barcodeMaster/Gy_BarCodeBillList.vue | 70 +
src/views/loginTMS.vue | 608 ++++++++++++
src/views/logistics/transportGPS/WL_YayBill.vue | 194 +++
src/permission.js | 3
src/views/scMould/warehouse/Sc_MouldProdOutBillEdit.vue | 10
src/views/logistics/WayBillPaymentBill/Pay_WayBillPaymentBillEdit.vue | 434 +++++---
src/store/modules/user.js | 4
src/views/system/user/GyDriver.vue | 779 ++++-----------
src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillEdit.vue | 10
src/store/modules/permission.js | 86 +
src/views/basic/gytransport/cgContractTransportBillList/Cg_ContractTransportBillEdit.vue | 157 ++-
src/router/index.js | 14
.env.development | 10
src/views/login.vue | 5
src/views/basic/gytransport/cgContractTransportBillList/Cg_ContractTransportBillList.vue | 14
src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue | 285 +----
src/views/scMould/warehouse/Sc_MouldInRequestBillEdit.vue | 10
src/views/scMould/warehouse/Sc_MouldOutRequestBillEdit.vue | 10
27 files changed, 1,728 insertions(+), 1,148 deletions(-)
diff --git a/.env.development b/.env.development
index 4d0690d..305e1ec 100644
--- a/.env.development
+++ b/.env.development
@@ -5,19 +5,19 @@
ENV = 'development'
# 鏅轰簯杩堟�滾-MOM绠＄悊绯荤粺/寮�鍙戠幆澧�
-VUE_APP_BASE_API = http://localhost:81/API/
-# VUE_APP_BASE_API = 'http://47.96.97.237/API/'
+# VUE_APP_BASE_API = http://localhost:81/API/
+VUE_APP_BASE_API = 'http://47.96.97.237/API/'
# VUE_APP_BASE_API = 'http://220.189.218.155:9010/API/'
# VUE_APP_BASE_API = 'http://localhost:8082/LuBaoAPI/'
#閿﹂殕
-# VUE_APP_BASE_API_INNER = 'http://192.168.1.11/API/'
-# VUE_APP_BASE_API = http://61.174.29.234:8880/API/
+# # VUE_APP_BASE_API_INNER = 'http://192.168.1.11/API/'
+# # VUE_APP_BASE_API = http://61.174.29.234:8880/API/
# 瀹佹尝 鍥涚淮灏�
# VUE_APP_BASE_API_INNER = http://192.168.0.236:9010/API/
# VUE_APP_BASE_API = http://220.189.218.155:9010/API/
#鏉滆春
# VUE_APP_BASE_API = http://localhost:8082/API/
# 鍐呯綉鍦板潃娴嬭瘯
-VUE_APP_BASE_API_INNER = http://192.168.1.11/API/
+# VUE_APP_BASE_API_INNER = http://192.168.1.11/API/
# 璺敱鎳掑姞杞�
VUE_CLI_BABEL_TRANSPILE_MODULES = true
diff --git a/src/permission.js b/src/permission.js
index ca0f2b5..fce477f 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -7,10 +7,12 @@
import { isPathMatch } from "@/utils/validate";
import { isRelogin } from "@/utils/request";
+
NProgress.configure({ showSpinner: false });
const whiteList = [
"/login",
+ "/loginTMS",
"/register",
"/printList",
"/hBarPlanPrint",
@@ -51,6 +53,7 @@
// 鍒ゆ柇褰撳墠鐢ㄦ埛鏄惁宸叉媺鍙栧畬user_info淇℃伅
store .dispatch("GetInfo").then(() => {
isRelogin.show = false;
+
store.dispatch("GenerateRoutes").then((accessRoutes) => {
// 鏍规嵁roles鏉冮檺鐢熸垚鍙闂殑璺敱琛�
router.addRoutes(accessRoutes); // 鍔ㄦ�佹坊鍔犲彲璁块棶璺敱琛�
diff --git a/src/router/index.js b/src/router/index.js
index 178b23f..fa2d612 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -86,7 +86,13 @@
hidden: true,
},
//#endregion
-
+ //#region 鐧诲綍TMS
+ {
+ path: "/loginTMS",
+ component: () => import("@/views/loginTMS"),
+ hidden: true,
+ },
+ //#endregion
//#region 娉ㄥ唽
{
path: "/register",
@@ -1823,9 +1829,9 @@
},
children: [
{
- path: "/logistics/WayBillPaymentBill/YFPayMentOtherBillTranList",
- component: () => import("@/views/logistics/WayBillPaymentBill/YF_PayMentOtherBillTranList.vue"),
- name: "yfPayMentOtherBillTranList",
+ path: "/logistics/WayBillPaymentBill/payWayBillPaymentBillList",
+ component: () => import("@/views/logistics/WayBillPaymentBill/Pay_WayBillPaymentBillList.vue"),
+ name: "payWayBillPaymentBillList",
meta: { title: "杩愬崟璐圭敤缁撶畻鍗�", activeMenu: "/logistics/WayBillPaymentBill" },
},
],
diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
index 32a61a6..c7d2e7a 100644
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -4,7 +4,7 @@
import Layout from "@/layout/index";
import ParentView from "@/components/ParentView";
import InnerLink from "@/layout/components/InnerLink";
-
+import { getLoginPageSource } from "@/utils/loginSource"; // 瀵煎叆鐧诲綍鏉ユ簮鍒ゆ柇宸ュ叿
const permission = {
state: {
routes: [],
@@ -31,6 +31,15 @@
actions: {
// 鐢熸垚璺敱
GenerateRoutes({ commit }) {
+ // 绀轰緥锛氭牴鎹櫥褰曟潵婧愭墽琛屼笉鍚岀殑閫昏緫
+ const loginSource = getLoginPageSource();
+ console.log(`鐢ㄦ埛浠� ${loginSource} 椤甸潰鐧诲綍`);
+
+ var HIsHide = false;
+ if(loginSource=="loginTMS"){
+ HIsHide = true;
+ }
+
return new Promise((resolve) => {
// 鍚戝悗绔姹傝矾鐢辨暟鎹�
let data = [
@@ -83,26 +92,29 @@
noCache: false,
title: "杩愯緭瀹氫綅",
},
- hidden: false,
+ hidden: HIsHide,
name: "WayBillPaymentBill",
path: "WayBillPaymentBill",
redirect: "noRedirect",
component: "Layout",
- children: [{
- meta: {
- icon: "build",
- link: null,
- noCache: false,
- title: "杩愬崟璐圭敤缁撶畻鍗�",
+ children: [
+ {
+ meta: {
+ icon: "build",
+ link: null,
+ noCache: false,
+ title: "杩愬崟璐圭敤缁撶畻鍗�",
+ },
+ component: () =>
+ import(
+ "@/views/logistics/WayBillPaymentBill/Pay_WayBillPaymentBillList.vue"
+ ),
+ hidden: HIsHide,
+ name: "payWayBillPaymentBillList",
+ path: "PayWayBillPaymentBillList",
},
- component: () =>
- import("@/views/logistics/WayBillPaymentBill/YF_PayMentOtherBillTranList.vue"),
- hidden: false,
- name: "yfPayMentOtherBillTranList",
- path: "YFPayMentOtherBillTranList",
- }
- ]
- }
+ ],
+ },
],
},
{
@@ -114,7 +126,7 @@
noCache: false,
title: "閿�鍞鐞�",
},
- hidden: false,
+ hidden: HIsHide,
name: "Sell",
path: "/sell",
redirect: "noRedirect",
@@ -341,7 +353,7 @@
noCache: false,
title: "浠撳簱绠＄悊",
},
- hidden: false,
+ hidden: HIsHide,
name: "Warehouse",
path: "/warehouse",
redirect: "noRedirect",
@@ -549,7 +561,7 @@
noCache: false,
title: "鐢熶骇璧勬枡",
},
- hidden: false,
+ hidden: HIsHide,
name: "Production",
path: "production",
redirect: "noRedirect",
@@ -577,7 +589,7 @@
noCache: false,
title: "鐗╂祦鍩虹璧勬枡",
},
- hidden: false,
+ hidden: HIsHide,
name: "Transport",
path: "transport",
redirect: "noRedirect",
@@ -622,7 +634,7 @@
},
component: () =>
import("@/views/basic/gyWarehouse/gyWarehouse.vue"),
- hidden: false,
+ hidden: HIsHide,
name: "GyWarehouse",
path: "gyWarehouse",
},
@@ -635,7 +647,7 @@
},
component: () =>
import("@/views/basic/gyStockPlace/gyStockPlace.vue"),
- hidden: false,
+ hidden: HIsHide,
name: "GyStockPlace",
path: "gyStockPlace",
},
@@ -661,7 +673,7 @@
},
component: () =>
import("@/views/basic/gyItemMoney/gyItemMoney.vue"),
- hidden: false,
+ hidden: HIsHide,
name: "GyItemMoney",
path: "gyItemMoney",
},
@@ -687,7 +699,7 @@
},
component: () =>
import("@/views/basic/gyEmployee/gyEmployee.vue"),
- hidden: false,
+ hidden: HIsHide,
name: "GyEmployee",
path: "gyEmployee",
},
@@ -700,7 +712,7 @@
},
component: () =>
import("@/views/basic/gy/gyDepartment.vue"),
- hidden: false,
+ hidden: HIsHide,
name: "GyDepartment",
path: "gyDepartment",
},
@@ -713,24 +725,22 @@
},
component: () =>
import("@/views/basic/gyCurrency/gyCurrency.vue"),
- hidden: false,
+ hidden: HIsHide,
name: "GyCurrency",
path: "gyCurrency",
},
-
{
meta: {
icon: "build",
link: null,
- noCache: false,
+ noCache: HIsHide,
title: "璁￠噺鍗曚綅鍒楄〃",
},
component: () => import("@/views/basic/gyUnit/gyUnit.vue"),
- hidden: false,
+ hidden: HIsHide,
name: "GyUnit",
path: "gyUnit",
},
-
{
meta: {
icon: "build",
@@ -739,7 +749,7 @@
title: "渚涘簲鍟嗗垪琛�",
},
component: () => import("@/views/basic/gy/gySupplier.vue"),
- hidden: false,
+ hidden: HIsHide,
name: "GySupplier",
path: "gySupplier",
},
@@ -752,7 +762,7 @@
},
component: () =>
import("@/views/gyMaterial/GyMaterial.vue"),
- hidden: false,
+ hidden: HIsHide,
name: "GyMaterial",
path: "GyMaterial",
},
@@ -764,7 +774,7 @@
title: "瀹㈡埛鍒楄〃",
},
component: () => import("@/views/GyCustomer/index.vue"),
- hidden: false,
+ hidden: HIsHide,
name: "GyCustomer",
path: "GyCustomer",
},
@@ -777,7 +787,7 @@
},
component: () =>
import("@/views/basic/gyProperty/gyPropertyList.vue"),
- hidden: false,
+ hidden: HIsHide,
name: "GyProperty",
path: "gyProperty",
},
@@ -794,7 +804,7 @@
noCache: false,
title: "閲囪喘绠＄悊",
},
- hidden: false,
+ hidden: HIsHide,
name: "Purchase",
path: "/purchase",
redirect: "noRedirect",
@@ -1065,7 +1075,7 @@
noCache: false,
title: "鐢熶骇绠＄悊",
},
- hidden: false,
+ hidden: HIsHide,
name: "ICMO",
path: "/icmo",
redirect: "noRedirect",
@@ -1203,7 +1213,7 @@
noCache: false,
title: "瀹瑰櫒绠＄悊",
},
- hidden: false,
+ hidden: HIsHide,
name: "ScMould",
path: "/scMould",
redirect: "noRedirect",
@@ -1472,7 +1482,7 @@
noCache: false,
title: "绯荤粺绠＄悊",
},
- hidden: false,
+ hidden: HIsHide,
name: "System",
path: "/system",
redirect: "noRedirect",
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 095133c..0f290af 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -48,9 +48,13 @@
// const code = userInfo.code
// const uuid = userInfo.uuid
const HOrgName = userInfo.HOrgName;
+ const loginPage = userInfo.loginPage || 'login'; // 娣诲姞鐧诲綍椤甸潰鏉ユ簮鏍囪
return new Promise((resolve, reject) => {
login(username, password, HOrgName)
.then((res) => {
+ // 瀛樺偍鐧诲綍椤甸潰鏉ユ簮
+ sessionStorage["loginPage"] = loginPage;
+
sessionStorage["OrganizationID"] = userInfo.HOrgName;
sessionStorage["Organization"] = userInfo.Organization;
sessionStorage["HTranSlate"] = userInfo.HTranSlate;
diff --git a/src/utils/loginSource.js b/src/utils/loginSource.js
new file mode 100644
index 0000000..e372da0
--- /dev/null
+++ b/src/utils/loginSource.js
@@ -0,0 +1,38 @@
+// 鍒ゆ柇鐧诲綍鏉ユ簮鐨勫伐鍏峰嚱鏁�
+
+/**
+ * 鑾峰彇鐧诲綍椤甸潰鏉ユ簮
+ * @returns {string} 杩斿洖 'login' 鎴� 'loginTMS'
+ */
+export function getLoginPageSource() {
+ return sessionStorage.getItem('loginPage') || 'login';
+}
+
+/**
+ * 鍒ゆ柇鏄惁鏉ヨ嚜TMS鐧诲綍椤甸潰
+ * @returns {boolean} 濡傛灉鏄疶MS鐧诲綍椤甸潰杩斿洖true锛屽惁鍒欒繑鍥瀎alse
+ */
+export function isFromTMSLogin() {
+ return getLoginPageSource() === 'loginTMS';
+}
+
+/**
+ * 鍒ゆ柇鏄惁鏉ヨ嚜鏅�氱櫥褰曢〉闈�
+ * @returns {boolean} 濡傛灉鏄櫘閫氱櫥褰曢〉闈㈣繑鍥瀟rue锛屽惁鍒欒繑鍥瀎alse
+ */
+export function isFromNormalLogin() {
+ return getLoginPageSource() === 'login';
+}
+
+/**
+ * 鏍规嵁鐧诲綍鏉ユ簮鎵ц涓嶅悓鐨勯�昏緫
+ * @param {Function} tmsCallback - 鏉ヨ嚜TMS鐧诲綍鏃剁殑鍥炶皟鍑芥暟
+ * @param {Function} normalCallback - 鏉ヨ嚜鏅�氱櫥褰曟椂鐨勫洖璋冨嚱鏁�
+ */
+export function executeByLoginSource(tmsCallback, normalCallback) {
+ if (isFromTMSLogin()) {
+ tmsCallback && tmsCallback();
+ } else {
+ normalCallback && normalCallback();
+ }
+}
\ No newline at end of file
diff --git a/src/views/basic/gyCartypelist/gyCartypelistEdit.vue b/src/views/basic/gyCartypelist/gyCartypelistEdit.vue
index cd8de39..3d93bb6 100644
--- a/src/views/basic/gyCartypelist/gyCartypelistEdit.vue
+++ b/src/views/basic/gyCartypelist/gyCartypelistEdit.vue
@@ -87,6 +87,7 @@
</el-form-item>
</el-col>
<el-col :span="8">
+ <el-col :span="8" v-show="false">
<el-form-item label="绛夌骇" prop="HLevel">
<el-input
v-model="form.HLevel"
@@ -94,6 +95,7 @@
type="text"
/>
</el-form-item>
+ </el-col>
</el-col>
</el-row>
<el-row>
@@ -283,7 +285,7 @@
HHeight: "",
HMaxVolume: "",
HUseFlag: "鏈娴�",
- HLevel: "",
+ HLevel: 0,
HEndFlag: true,
HStopflag: false,
HShortNumber: "",
@@ -334,13 +336,7 @@
trigger: "blur",
},
],
- HLevel: [
- {
- pattern: /^\d+$/,
- message: "绛夌骇蹇呴』涓烘暟瀛�",
- trigger: "blur",
- },
- ],
+
},
};
},
@@ -498,7 +494,7 @@
HHeight: "",
HMaxVolume: "",
HUseFlag: "鏈娴�",
- HLevel: "",
+ HLevel: 0,
HEndFlag: true,
HStopflag: false,
HShortNumber: "",
diff --git a/src/views/basic/gytransport/cgContractTransportBillList/Cg_ContractTransportBillEdit.vue b/src/views/basic/gytransport/cgContractTransportBillList/Cg_ContractTransportBillEdit.vue
index 5aaad5d..0946f36 100644
--- a/src/views/basic/gytransport/cgContractTransportBillList/Cg_ContractTransportBillEdit.vue
+++ b/src/views/basic/gytransport/cgContractTransportBillList/Cg_ContractTransportBillEdit.vue
@@ -17,7 +17,7 @@
<el-tab-pane label="鍩烘湰淇℃伅" name="first">
<el-row>
<el-col :span="6">
- <el-form-item label="鍗曟嵁鍙�" prop="HBillNo">
+ <el-form-item label="鍗曟嵁鍙�" prop="HBillNo" required>
<el-input v-model="form.HBillNo" placeholder="璇疯緭鍏ュ崟鎹彿" />
</el-form-item>
</el-col>
@@ -33,7 +33,7 @@
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="鍚堝悓缂栧彿" prop="HContractNumber">
+ <el-form-item label="鍚堝悓缂栧彿" prop="HContractNumber" required>
<el-input v-model="form.HContractNumber" placeholder="" />
</el-form-item>
</el-col>
@@ -49,8 +49,8 @@
</el-col>
<el-col :span="6">
- <el-form-item label="渚涘簲鍟�" prop="HSupName">
- <el-input v-model="form.HSupName" placeholder="璇烽�夋嫨渚涘簲鍟�" disabled>
+ <el-form-item label="鎵胯繍鍟�" prop="HSupName" required>
+ <el-input v-model="form.HSupName" placeholder="璇烽�夋嫨鎵胯繍鍟�" disabled>
<el-button
slot="append"
icon="el-icon-search"
@@ -62,7 +62,7 @@
</el-row>
<el-row>
<el-col :span="6">
- <el-form-item label="涓氬姟鍛�" prop="HEmpName">
+ <el-form-item label="涓氬姟鍛�" prop="HEmpName" required>
<el-input v-model="form.HEmpName" placeholder="璇烽�夋嫨" disabled>
<el-button
slot="append"
@@ -75,7 +75,7 @@
</el-row>
<el-row>
<el-col :span="6">
- <el-form-item label="甯佸埆" prop="HCurName">
+ <el-form-item label="甯佸埆" prop="HCurName" required>
<el-input v-model="form.HCurName" placeholder="璇烽�夋嫨璋冨叆甯佸埆" disabled>
<el-button
slot="append"
@@ -86,7 +86,7 @@
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="缁撶畻鏂瑰紡" prop="HSSName">
+ <el-form-item label="缁撶畻鏂瑰紡" prop="HSSName" required>
<el-input v-model="form.HSSName" placeholder="璇烽�夋嫨缁撶畻鏂瑰紡" disabled>
<el-button
slot="append"
@@ -98,11 +98,11 @@
</el-col>
<el-col :span="6">
<el-form-item label="姹囩巼" prop="HExRate">
- <el-input v-model="form.HExRate" placeholder="" />
+ <el-input v-model="form.HExRate" placeholder="" disabled/>
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="閮ㄩ棬" prop="HDeptName">
+ <el-form-item label="閮ㄩ棬" prop="HDeptName" required>
<el-input v-model="form.HDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" disabled>
<el-button
slot="append"
@@ -120,7 +120,7 @@
</el-row>
<el-row>
<el-col :span="6">
- <el-form-item label="缁勭粐" prop="HSTOCKINORGID" >
+ <el-form-item label="缁勭粐" prop="HSTOCKINORGID" required>
<el-select v-model="form.HSTOCKINORGID" placeholder="璇烽�夋嫨缁勭粐" :disabled="OperationType == 3" @change="StockInOrgChangeHandler">
<el-option
v-for="(item, index) in organizationList"
@@ -175,8 +175,9 @@
<el-form-item label="鍒跺崟鏃ユ湡" prop="HMakeDate">
<el-date-picker
v-model="form.HMakeDate"
- type="date"
+ type="datetime"
placeholder="閫夋嫨鍒跺崟鏃ユ湡"
+ value-format="yyyy-MM-dd HH:mm:ss"
disabled
>
</el-date-picker>
@@ -186,8 +187,9 @@
<el-form-item label="淇敼鏃ユ湡" prop="HUpDateDate">
<el-date-picker
v-model="form.HUpDateDate"
- type="date"
+ type="datetime"
placeholder="閫夋嫨瀹℃牳鏃ユ湡"
+ value-format="yyyy-MM-dd HH:mm:ss"
disabled
>
</el-date-picker>
@@ -197,8 +199,9 @@
<el-form-item label="瀹℃牳鏃ユ湡" prop="HCheckDate">
<el-date-picker
v-model="form.HCheckDate"
- type="date"
+ type="datetime"
placeholder="閫夋嫨瀹℃牳鏃ユ湡"
+ value-format="yyyy-MM-dd HH:mm:ss"
disabled
>
</el-date-picker>
@@ -208,8 +211,9 @@
<el-form-item label="鍏抽棴鏃ユ湡" prop="HCloseDate">
<el-date-picker
v-model="form.HCloseDate"
- type="date"
+ type="datetime"
placeholder="閫夋嫨鍏抽棴鏃ユ湡"
+ value-format="yyyy-MM-dd HH:mm:ss"
disabled
>
</el-date-picker>
@@ -318,7 +322,7 @@
</el-table-column>
- <el-table-column align="center" label="杩愯緭鏂瑰紡" width="120">
+ <el-table-column align="center" label="杞﹀瀷" width="120">
<template slot-scope="scope">
<el-input
v-model="scope.row.杩愯緭鏂瑰紡鍚嶇О"
@@ -335,13 +339,26 @@
</template>
</el-table-column>
<el-table-column align="center" label="璺濈锛堝叕閲岋級" width="120">
+ <template slot-scope="scope">
+ <el-input-number
+ v-model="scope.row.HDistance"
+ placeholder="璇疯緭鍏�"
+ :controls="false"
+ :min="0"
+
+ style="width: 100%"
+ />
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="杩愯緭鏃舵晥锛堟椂锛�" width="120">
<template slot-scope="scope">
- <el-input v-model="scope.row.HDistance" placeholder="璇疯緭鍏�" />
- </template>
- </el-table-column>
- <el-table-column align="center" label="杩愯緭鏃舵晥" width="120">
- <template slot-scope="scope">
- <el-input v-model="scope.row.HTransportTimes" placeholder="璇疯緭鍏�" />
+ <el-input-number
+ v-model="scope.row.HTransportTimes"
+ placeholder="璇疯緭鍏�"
+ :controls="false"
+ :min="0"
+ style="width: 100%"
+ />
</template>
</el-table-column>
<el-table-column align="center" label="杩愯緭绫诲瀷" width="120">
@@ -367,12 +384,24 @@
</el-table-column>
<el-table-column align="center" label="杩愯緭璐圭敤" width="120">
<template slot-scope="scope">
- <el-input v-model="scope.row.HMoney" placeholder="璇疯緭鍏�" />
+ <el-input-number
+ v-model="scope.row.HMoney"
+ placeholder="璇疯緭鍏�"
+ :controls="false"
+ :min="0"
+ style="width: 100%"
+ />
</template>
</el-table-column>
<el-table-column align="center" label="鍘嗗彶杩愯緭璐圭敤" width="120">
<template slot-scope="scope">
- <el-input v-model="scope.row.HMoney_His" placeholder="璇疯緭鍏�" />
+ <el-input-number
+ v-model="scope.row.HMoney_His"
+ placeholder="璇疯緭鍏�"
+ :controls="false"
+ :min="0"
+ style="width: 100%"
+ />
</template>
</el-table-column>
@@ -583,15 +612,17 @@
form: {},
// 琛ㄥ崟鏍￠獙
rules: {
- HDate: [{ required: true, message: "鏃ユ湡涓嶈兘涓虹┖", trigger: "blur" }],
- HSupName: [{ required: true, message: "寰�鏉ュ崟浣嶄笉鑳戒负绌�", trigger: "blur" }],
- HEmpName: [{ required: true, message: "涓氬姟鍛樹笉鑳戒负绌�", trigger: "blur" }],
- HMangerName: [{ required: true, message: "涓荤涓嶈兘涓虹┖", trigger: "blur" }],
- HSecManagerName: [{ required: true, message: "楠屾敹鍛樹笉鑳戒负绌�", trigger: "blur" }],
- HKeeperName: [{ required: true, message: "淇濈鍛樹笉鑳戒负绌�", trigger: "blur" }],
- HCurName: [{ required: true, message: "璋冨叆浠撳簱涓嶈兘涓虹┖", trigger: "blur" }],
- HSSName: [{ required: true, message: "璋冨嚭浠撳簱涓嶈兘涓虹┖", trigger: "blur" }],
- HDeptName: [{ required: true, message: "閮ㄩ棬涓嶈兘涓虹┖", trigger: "blur" }],
+ HDate: [{ required: true, message: "鏃ユ湡涓嶈兘涓虹┖", trigger: "blur" }],
+ HBillNo: [{ required: true, message: "鍗曟嵁鍙蜂笉鑳戒负绌�", trigger: "blur" }],
+ HContractNumber: [{ required: true, message: "鍚堝悓缂栧彿涓嶈兘涓虹┖", trigger: "blur" }],
+ HContractName: [{ required: true, message: "鍚堝悓鍚嶇О涓嶈兘涓虹┖", trigger: "blur" }],
+ HSupID: [{ required: true, message: "渚涘簲鍟嗕笉鑳戒负绌�", trigger: "blur" }],
+ HEmpID: [{ required: true, message: "涓氬姟鍛樹笉鑳戒负绌�", trigger: "blur" }],
+ HDeptID: [{ required: true, message: "閮ㄩ棬涓嶈兘涓虹┖", trigger: "blur" }],
+ HCurID: [{ required: true, message: "甯佸埆涓嶈兘涓虹┖", trigger: "blur" }],
+ HExRate: [{ required: true, message: "姹囩巼涓嶈兘涓虹┖", trigger: "blur" }],
+ HSTOCKINORGID: [{ required: true, message: "缁勭粐涓嶈兘涓虹┖", trigger: "change" }],
+ HSSName: [{ required: true, message: "缁撶畻鏂瑰紡涓嶈兘涓虹┖", trigger: "blur" }],
},
};
},
@@ -667,6 +698,7 @@
} else if (num == 2) {
this.form.HCurName = deptRow.璐у竵鍚嶇О;
this.form.HCurID = deptRow.HItemID;
+ this.form.HExRate = deptRow.姹囩巼;
this.CurrencyDialogShow = false;
this.openData = false;
} else if (num == 3) {
@@ -708,10 +740,10 @@
} else if (num == 5) {
this.form.HSSName = deptRow.缁撶畻鏂瑰紡鍚嶇О;
this.form.HSSID = deptRow.HItemID;
- this.form.HExRate = deptRow.姹囩巼;
+ //this.form.HExRate = deptRow.姹囩巼;
this.SettleStyleDialogShow = false;
this.openData = false;
- }else if (num == 7) {
+ }else if (num == 13) {
this.editData[this.zbIndex].HTransportCar = deptRow.HItemID;
this.editData[this.zbIndex].杩愯緭鏂瑰紡鍚嶇О = deptRow.杞﹀瀷鍚嶇О;
this.CarTypeShow = false;
@@ -732,6 +764,9 @@
deptClose() {
this.deptform = {};
this.openData = false;
+ this.$nextTick(() => {
+ this.showReset();
+ });
},
//琛ㄥ崟鍒濆鍖�
@@ -750,8 +785,8 @@
HExRate: 1,
HSSName: "",
HSSID: 0,
- HEmpName: "",
- HEmpID: "",
+ HEmpName: sessionStorage["HEmpName"] || "",
+ HEmpID: sessionStorage["HEmpID"] || 0,
HMangerName: "",
HMangerID: "",
HSecManagerName: "",
@@ -872,9 +907,9 @@
/** 淇敼鎸夐挳鎿嶄綔 */
handleUpdate() {
this.reset();
- let rowHmainid = this.linterid;
+ let rowHmainid = this.linterid || this.hmainid;
console.log(this.linterid);
- //涓昏〃
+ //涓昏〃 %EF%BB%BFEditList
axios
.get(this.$baseUrl + "/Cg_ContractTransportBillListController/%EF%BB%BFEditList", {
params: { HInterID: rowHmainid,user: sessionStorage["HUserName"]},
@@ -920,6 +955,7 @@
HDeleteDate: data[0].浣滃簾鏃ユ湡,
// HSTOCKOUTORGID: data[0].HSTOCKOUTORGID.toString(),
//HSTOCKINORGID: data[0].HSTOCKINORGID.toString(),
+ HSTOCKINORGID:sessionStorage["OrganizationID"],
},
};
//瀛愯〃
@@ -1070,19 +1106,36 @@
this.$refs["form"].validate((valid) => {
if (valid) {
let fhck = false;
- if (this.editData.length == 0) {
- fhck = true;
- this.$modal.msgError("娌℃湁鐗╂枡鏄庣粏璁板綍锛�");
- }
- this.editData.map((item, index) => {
- if (!item.HMaterID) {
+ const requiredFields = [
+ { field: 'HBillNo', name: '鍗曟嵁鍙�' },
+ { field: 'HContractNumber', name: '鍚堝悓缂栧彿' },
+ { field: 'HContractName', name: '鍚堝悓鍚嶇О' },
+ { field: 'HSupID', name: '渚涘簲鍟�' },
+ { field: 'HEmpID', name: '涓氬姟鍛�' },
+ { field: 'HDeptID', name: '閮ㄩ棬' },
+ { field: 'HCurID', name: '甯佸埆' },
+ { field: 'HExRate', name: '姹囩巼' },
+ { field: 'HSTOCKINORGID', name: '缁勭粐' },
+ { field: 'HSSName', name: '缁撶畻鏂瑰紡' }
+ ];
+ for (let i = 0; i < requiredFields.length; i++) {
+ const field = requiredFields[i].field;
+ const name = requiredFields[i].name;
+ if (!this.form[field] || this.form[field] === 0 || this.form[field] === '') {
fhck = true;
- this.$modal.msgError("绗�" + (index + 1) + "琛岋細鍣ㄥ叿鏈�夋嫨锛�");
- } else if (!item.HQty || item.HQty == 0) {
- fhck = true;
- this.$modal.msgError("绗�" + (index + 1) + "琛岋細鏁伴噺涓嶈兘涓�0锛�");
+ this.$modal.msgError(name + "涓嶈兘涓虹┖锛�");
}
- });
+ }
+
+ // this.editData.map((item, index) => {
+ // if (!item.HMaterID) {
+ // fhck = true;
+ // this.$modal.msgError("绗�" + (index + 1) + "琛岋細鍣ㄥ叿鏈�夋嫨锛�");
+ // } else if (!item.HQty || item.HQty == 0) {
+ // fhck = true;
+ // this.$modal.msgError("绗�" + (index + 1) + "琛岋細鏁伴噺涓嶈兘涓�0锛�");
+ // }
+ // });
this.$nextTick(() => {
if (!fhck) {
var Operation = null;
@@ -1110,7 +1163,7 @@
axios({
method: "post",
url:
- this.$baseUrl + "/Kf_MoveStockRequestBill/Kf_MoveStockRequestBillEdit",
+ this.$baseUrl + "/Cg_ContractTransportBillListController/Save%EF%BB%BFCg_ContractTransportBillList",
data: {
sMainSub: sMainSub,
},
@@ -1139,6 +1192,9 @@
this.gyEmployeeShow = false;
this.gySupplierShow = false;
this.AreaDialogShow = false;
+ this.CurrencyDialogShow = false;
+ this.SettleStyleDialogShow = false;
+ this.CarTypeShow = false;
},
// 鎵撳紑鏁版嵁鍒楄〃寮圭獥
openDataDialog(num, row) {
@@ -1146,6 +1202,7 @@
if (row) {
this.zbIndex = row.index - 1;
}
+
this.showReset();
if (num == 1) {
this.dialogTitle = "閮ㄩ棬鍒楄〃";
diff --git a/src/views/basic/gytransport/cgContractTransportBillList/Cg_ContractTransportBillList.vue b/src/views/basic/gytransport/cgContractTransportBillList/Cg_ContractTransportBillList.vue
index ff29d0b..4af588b 100644
--- a/src/views/basic/gytransport/cgContractTransportBillList/Cg_ContractTransportBillList.vue
+++ b/src/views/basic/gytransport/cgContractTransportBillList/Cg_ContractTransportBillList.vue
@@ -123,11 +123,11 @@
</el-col>
<el-col :span="1.5">
<el-button type="primary" icon="el-icon-edit-outline" size="mini" :disabled="single"
- @click="set_CheckBill(1, form = rowForm)">瀹℃牳</el-button>
+ @click="set_CheckBill(0, form = rowForm)">瀹℃牳</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="primary" icon="el-icon-edit-outline" size="mini" :disabled="single"
- @click="set_CheckBill(2, form = rowForm)">杩斿鏍�</el-button>
+ @click="set_CheckBill(1, form = rowForm)">杩斿鏍�</el-button>
</el-col>
<!-- <el-col :span="1.5">
<el-button type="primary" icon="el-icon-download" size="mini" @click="handleExport">瀵煎嚭</el-button>
@@ -170,7 +170,7 @@
</el-dialog>
<!-- 缂栬緫 -->
<el-dialog title="缂栬緫" :visible.sync="openEdit" width="1480px" append-to-body class="xsckdBox" @close="close">
- <edit :OperationType=OperationType :linterid=this.rowForm.hmainid || this.rowForm.HInterID
+ <edit :OperationType=OperationType :linterid=this.rowForm.HInterID||this.rowForm.hmainid
:HSouceBillType=this.rowForm.HSourceBillType :copyType="copyType" @editClose="editClose" v-if="editShow" />
</el-dialog>
<el-dialog title="鎵撳嵃妯℃澘閫夋嫨" :visible.sync="openPrintList" width="800px" append-to-body>
@@ -732,10 +732,12 @@
this.getList()
},
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
+ //Delete%EF%BB%BFBill
handleDelete() {
+ console.log("鍒犻櫎", this.rowForm.HInterID.toString())
this.$modal.confirm('纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠').then(() => {
axios.get(this.$baseUrl + "/Cg_ContractTransportBillListController/Delete%EF%BB%BFBill", {
- params: { 'HInterID': this.rowForm.hmainid.toString() }
+ params: { 'HInterID': this.rowForm.HInterID.toString(), 'user': sessionStorage["HUserName"] }
}).then(response => {
if (response.data.count == 1) {
this.getList()
@@ -750,10 +752,10 @@
},
// 鍙嶅鏍�/瀹℃牳鏁版嵁
set_CheckBill(num, form) {
- var InterID = form.hmainid || form.HInterID
+ var InterID = this.rowForm.HInterID.toString()
//閫昏緫瀹℃牳鏂规硶
axios.get(this.$baseUrl + "/Cg_ContractTransportBillEdit/AuditCg_ContractTransportBillEdit", {
- params: { "HInterID": InterID, "Type": num, "user": sessionStorage["HUserName"] }
+ params: { "HInterID": InterID, "IsAudit": num, "CurUserName": sessionStorage["HUserName"] }
}).then(response => {
let result = response.data
if (result.count == 1) {
diff --git a/src/views/component/CurrencyDialog/index.vue b/src/views/component/CurrencyDialog/index.vue
index 68e2363..7a6a636 100644
--- a/src/views/component/CurrencyDialog/index.vue
+++ b/src/views/component/CurrencyDialog/index.vue
@@ -598,6 +598,11 @@
handleDblclick(row, column, cell, event) {
this.OperationType = 3
if (this.openPage) {
+ if(this.openPage='Kf_StockOutRequestBill')
+ {
+ this.$emit('deptEmitDb', row, 10)
+ }
+ else
this.$emit('deptEmitDb', row, 2)
} else {
this.handleEdit();
diff --git a/src/views/login.vue b/src/views/login.vue
index fe62109..07ec6b8 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -203,7 +203,10 @@
Cookies.remove("password")
Cookies.remove('rememberMe')
}
- this.$store.dispatch("Login", this.loginForm).then(res => {
+ this.$store.dispatch("Login", {
+ ...this.loginForm,
+ loginPage: 'login' // 娣诲姞鐧诲綍椤甸潰鏉ユ簮鏍囪
+ }).then(res => {
this.$router.push({ path: this.redirect || "/" }).catch(() => { })
}).catch(() => {
this.loading = false
diff --git a/src/views/loginTMS.vue b/src/views/loginTMS.vue
new file mode 100644
index 0000000..8c183b8
--- /dev/null
+++ b/src/views/loginTMS.vue
@@ -0,0 +1,608 @@
+<template>
+ <div class="login-container">
+ <div class="login-bg">
+ <div class="bg-overlay"></div>
+ <div class="floating-shapes">
+ <div class="shape shape-1"></div>
+ <div class="shape shape-2"></div>
+ <div class="shape shape-3"></div>
+ <div class="shape shape-4"></div>
+ </div>
+ </div>
+ <div class="login-content">
+ <div class="login-card">
+ <div class="login-header">
+ <div class="logo-container">
+ <div class="logo-icon">
+ <i class="el-icon-truck"></i>
+ </div>
+ </div>
+ <h3 class="title" v-if="!loginForm.HLogoLabel">鏅轰簯杩堟�滾-MOM绠＄悊绯荤粺</h3>
+ <h3 class="title" v-else>{{ loginForm.HLogoLabel }}</h3>
+ <p class="subtitle">杩愯緭绠＄悊绯荤粺</p>
+ </div>
+ <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
+ <div class="form-group">
+ <label class="form-label">璇█</label>
+ <el-select v-model="loginForm.HTranSlate" :placeholder="languageSel" @change="languageChange" class="custom-select">
+ <el-option v-for="item in tranSlateList" :key="item.value" :label="item.label" :value="item.value">
+ </el-option>
+ </el-select>
+ </div>
+ <div class="form-group">
+ <label class="form-label">缁勭粐</label>
+ <el-select v-model="loginForm.HOrgName" placeholder="璇烽�夋嫨" @change="OrgChange" class="custom-select">
+ <el-option v-for="item in organizationList" :key="item.ID" :label="item.Name" :value="item.ID">
+ </el-option>
+ </el-select>
+ </div>
+ <div class="form-group">
+ <el-form-item prop="username">
+ <div class="input-wrapper">
+ <div class="input-icon">
+ <i class="el-icon-user"></i>
+ </div>
+ <el-input v-model="loginForm.username" type="text" auto-complete="off" placeholder="璐﹀彿" class="custom-input">
+ </el-input>
+ </div>
+ </el-form-item>
+ </div>
+ <div class="form-group">
+ <el-form-item prop="password">
+ <div class="input-wrapper">
+ <div class="input-icon">
+ <i class="el-icon-lock"></i>
+ </div>
+ <el-input v-model="loginForm.password" type="password" auto-complete="off" placeholder="瀵嗙爜"
+ @keyup.enter.native="handleLogin" class="custom-input">
+ </el-input>
+ </div>
+ </el-form-item>
+ </div>
+ <div class="form-group" v-if="captchaEnabled">
+ <el-form-item prop="code">
+ <div class="captcha-wrapper">
+ <div class="input-wrapper">
+ <div class="input-icon">
+ <i class="el-icon-key"></i>
+ </div>
+ <el-input v-model="loginForm.code" auto-complete="off" placeholder="楠岃瘉鐮�"
+ @keyup.enter.native="handleLogin" class="custom-input captcha-input">
+ </el-input>
+ </div>
+ <div class="captcha-image" @click="getCode">
+ <img :src="codeUrl" alt="楠岃瘉鐮�" />
+ </div>
+ </div>
+ </el-form-item>
+ </div>
+ <div class="form-options">
+ <el-checkbox v-model="loginForm.rememberMe" class="remember-me">璁颁綇瀵嗙爜</el-checkbox>
+ </div>
+ <div class="form-actions">
+ <el-button :loading="loading" class="login-btn" @click.native.prevent="handleLogin">
+ <span v-if="!loading">鐧� 褰�</span>
+ <span v-else>鐧� 褰� 涓�...</span>
+ </el-button>
+ <div class="register-link" v-if="register">
+ <router-link :to="'/register'">绔嬪嵆娉ㄥ唽</router-link>
+ </div>
+ </div>
+ </el-form>
+ </div>
+ </div>
+ <!-- 搴曢儴 -->
+ <div class="login-footer">
+ <span>Copyright 漏 2025 All Rights Reserved.</span>
+ </div>
+ </div>
+</template>
+
+<script>
+import { getCodeImg, getOrganizations, webBaseInfo, webGetDataBases } from "@/api/login"
+import Cookies from "js-cookie"
+import { encrypt, decrypt } from '@/utils/jsencrypt'
+
+export default {
+ name: "Login",
+ data() {
+ return {
+ tranSlateList: [{ label: '涓枃', value: '1' }, { label: 'Eeglish', value: '2' }, { label: 'Spanish', value: '3' },],
+ tranData: {},
+ languageSel: '璇█',
+ organizationList: [],//缁勭粐鍒楄〃
+ title: process.env.VUE_APP_TITLE,
+ codeUrl: "",
+ loginForm: {
+ username: "",
+ password: "",
+ rememberMe: false,
+ HOrgName: 1,
+ code: "",
+ uuid: "",
+ HTranSlate: '1',
+ HLogoLabel: '鏅轰簯杩堟�滾-MOM绠＄悊绯荤粺',
+ HMenuLabel: null,
+ HCusName: null,
+ Organization: null,
+ },
+ loginRules: {
+ username: [
+ { required: true, trigger: "blur", message: "璇疯緭鍏ユ偍鐨勮处鍙�" }
+ ],
+ password: [
+ { required: true, trigger: "blur", message: "璇疯緭鍏ユ偍鐨勫瘑鐮�" }
+ ],
+ code: [{ required: true, trigger: "change", message: "璇疯緭鍏ラ獙璇佺爜" }]
+ },
+ loading: false,
+ // 楠岃瘉鐮佸紑鍏�
+ captchaEnabled: false,
+ // 娉ㄥ唽寮�鍏�
+ register: false,
+ redirect: undefined
+ }
+ },
+ watch: {
+ $route: {
+ handler: function (route) {
+ this.redirect = route.query && route.query.redirect
+ },
+ immediate: true
+ }
+ },
+ created() {
+ // this.getCode()
+ this.getInfoData()
+ this.getCookie()
+ },
+ methods: {
+
+ //璇█鐨勯�夋嫨
+ languageChange() {
+ this.loginForm.HCusName = this.tranData.HCusName
+ if (this.loginForm.HTranSlate == "1" || !this.loginForm.HTranSlate) {
+ this.loginForm.HLogoLabel = this.tranData.HLogoLabel;
+ this.loginForm.HMenuLabel = this.tranData.HMenuLabel;
+ } else if (this.loginForm.HTranSlate == "2") {
+ this.loginForm.HLogoLabel = this.tranData.HLogoTranslationText_English;
+ this.loginForm.HMenuLabel = this.tranData.HMenuTranslationText_English;
+ } else if (this.loginForm.HTranSlate == "3") {
+ this.loginForm.HLogoLabel = this.tranData.HLogoTranslationText_Spain;
+ this.loginForm.HMenuLabel = this.tranData.HMenuTranslationText_Spain;
+ }
+ },
+ OrgChange(val) {
+ this.organizationList.map(item => {
+ if (item.ID == val) {
+ this.loginForm.Organization = item.Name
+ }
+ })
+ },
+ //鏁版嵁
+ getInfoData() {
+ //缁勭粐鍒楄〃
+ getOrganizations().then(res => {
+ if (res.count == 1) {
+ this.organizationList = res.data
+ sessionStorage[this.organizationList] = res.data;
+ this.$nextTick(() => {
+ this.OrgChange(this.loginForm.HOrgName)
+ })
+ }
+ })
+ //璇█
+ webBaseInfo().then(res => {
+ if (res.count == 1) {
+ this.tranData = res.data[0];
+ this.$nextTick(() => {
+ this.languageChange()
+ })
+ }
+ })
+ //鏁版嵁搴�
+ webGetDataBases().then(res => {
+ if (res.count == 1) {
+ sessionStorage["鏁版嵁搴�"] = res.data[0].Name
+ }
+ })
+ },
+ getCode() {
+ getCodeImg().then(res => {
+ this.captchaEnabled = res.captchaEnabled === undefined ? true : res.captchaEnabled
+ if (this.captchaEnabled) {
+ this.codeUrl = "data:image/gif;base64," + res.img
+ this.loginForm.uuid = res.uuid
+ }
+ })
+ },
+ getCookie() {
+ const username = Cookies.get("username")
+ const password = Cookies.get("password")
+ const HOrgName = Cookies.get('HOrgName')
+ const HTranSlate = Cookies.get('HTranSlate')
+ const rememberMe = Cookies.get('rememberMe')
+ this.loginForm = {
+ HOrgName: HOrgName === undefined ? this.loginForm.HOrgName - 0 : HOrgName - 0,
+ username: username === undefined ? this.loginForm.username : username,
+ password: password === undefined ? this.loginForm.password : decrypt(password),
+ HTranSlate: HTranSlate === undefined ? this.loginForm.HTranSlate : HTranSlate,
+ rememberMe: rememberMe === undefined ? false : Boolean(rememberMe)
+ }
+ },
+ handleLogin() {
+ this.$refs.loginForm.validate(valid => {
+ if (valid) {
+ this.loading = true
+ if (this.loginForm.rememberMe) {
+ Cookies.set("HTranSlate", this.loginForm.HTranSlate, { expires: 30 })
+ Cookies.set("HOrgName", this.loginForm.HOrgName, { expires: 30 })
+ Cookies.set("username", this.loginForm.username, { expires: 30 })
+ Cookies.set("password", encrypt(this.loginForm.password), { expires: 30 })
+ Cookies.set('rememberMe', this.loginForm.rememberMe, { expires: 30 })
+ } else {
+ Cookies.remove("HTranSlate")
+ Cookies.remove("HOrgName")
+ Cookies.remove("username")
+ Cookies.remove("password")
+ Cookies.remove('rememberMe')
+ }
+ this.$store.dispatch("Login", {
+ ...this.loginForm,
+ loginPage: 'loginTMS' // 娣诲姞鐧诲綍椤甸潰鏉ユ簮鏍囪
+ }).then(res => {
+ this.$router.push({ path: this.redirect || "/" }).catch(() => { })
+ }).catch(() => {
+ this.loading = false
+ if (this.captchaEnabled) {
+ this.getCode()
+ }
+ })
+ }
+ })
+ }
+ },
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss">
+.login-container {
+ position: relative;
+ height: 100vh;
+ overflow: hidden;
+ font-family: 'PingFang SC', 'Microsoft YaHei', sans-serif;
+}
+
+.login-bg {
+ position: absolute;
+ top: 0;
+ left: 0;
+ width: 100%;
+ height: 100%;
+ background: linear-gradient(135deg, #1a3a8f 0%, #0d1b4e 100%);
+ z-index: 1;
+}
+
+.bg-overlay {
+ position: absolute;
+ top: 0;
+ left: 0;
+ width: 100%;
+ height: 100%;
+ background: url("../assets/images/login-background.jpg") no-repeat center center;
+ background-size: cover;
+ opacity: 0.2;
+}
+
+.floating-shapes {
+ position: absolute;
+ top: 0;
+ left: 0;
+ width: 100%;
+ height: 100%;
+ overflow: hidden;
+ z-index: 1;
+}
+
+.shape {
+ position: absolute;
+ border-radius: 50%;
+ background: rgba(255, 255, 255, 0.05);
+ animation: float 20s infinite ease-in-out;
+}
+
+.shape-1 {
+ width: 80px;
+ height: 80px;
+ top: 20%;
+ left: 10%;
+ animation-delay: 0s;
+}
+
+.shape-2 {
+ width: 120px;
+ height: 120px;
+ top: 60%;
+ right: 10%;
+ animation-delay: 2s;
+}
+
+.shape-3 {
+ width: 60px;
+ height: 60px;
+ bottom: 20%;
+ left: 30%;
+ animation-delay: 4s;
+}
+
+.shape-4 {
+ width: 100px;
+ height: 100px;
+ top: 10%;
+ right: 30%;
+ animation-delay: 6s;
+}
+
+@keyframes float {
+ 0%, 100% {
+ transform: translateY(0) rotate(0deg);
+ }
+ 50% {
+ transform: translateY(-20px) rotate(180deg);
+ }
+}
+
+.login-content {
+ position: relative;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ height: 100%;
+ z-index: 2;
+}
+
+.login-card {
+ background: rgba(255, 255, 255, 0.95);
+ backdrop-filter: blur(10px);
+ border-radius: 16px;
+ box-shadow: 0 20px 40px rgba(0, 0, 0, 0.1);
+ width: 420px;
+ padding: 40px;
+ transition: all 0.3s ease;
+
+ &:hover {
+ transform: translateY(-5px);
+ box-shadow: 0 25px 50px rgba(0, 0, 0, 0.15);
+ }
+}
+
+.login-header {
+ text-align: center;
+ margin-bottom: 30px;
+}
+
+.logo-container {
+ display: flex;
+ justify-content: center;
+ margin-bottom: 20px;
+}
+
+.logo-icon {
+ width: 70px;
+ height: 70px;
+ background: linear-gradient(135deg, #1a3a8f 0%, #0d1b4e 100%);
+ border-radius: 50%;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ color: white;
+ font-size: 32px;
+ box-shadow: 0 8px 16px rgba(26, 58, 143, 0.3);
+}
+
+.title {
+ margin: 0 0 8px 0;
+ font-size: 24px;
+ font-weight: 600;
+ color: #1a3a8f;
+}
+
+.subtitle {
+ margin: 0;
+ font-size: 14px;
+ color: #666;
+ font-weight: 400;
+}
+
+.login-form {
+ .form-group {
+ margin-bottom: 20px;
+
+ .form-label {
+ display: block;
+ margin-bottom: 8px;
+ font-size: 14px;
+ color: #333;
+ font-weight: 500;
+ }
+ }
+
+ .custom-select {
+ width: 100%;
+
+ .el-input__inner {
+ height: 46px;
+ line-height: 46px;
+ border-radius: 8px;
+ border: 1px solid #e0e0e0;
+ transition: all 0.3s ease;
+
+ &:focus {
+ border-color: #1a3a8f;
+ box-shadow: 0 0 0 2px rgba(26, 58, 143, 0.2);
+ }
+ }
+ }
+
+ .input-wrapper {
+ position: relative;
+ display: flex;
+ align-items: center;
+ }
+
+ .input-icon {
+ position: absolute;
+ left: 15px;
+ z-index: 1;
+ color: #999;
+ font-size: 18px;
+ }
+
+ .custom-input {
+ .el-input__inner {
+ height: 46px;
+ line-height: 46px;
+ padding-left: 45px;
+ border-radius: 8px;
+ border: 1px solid #e0e0e0;
+ transition: all 0.3s ease;
+
+ &:focus {
+ border-color: #1a3a8f;
+ box-shadow: 0 0 0 2px rgba(26, 58, 143, 0.2);
+ }
+ }
+ }
+
+ .captcha-wrapper {
+ display: flex;
+ gap: 10px;
+
+ .captcha-input {
+ flex: 1;
+ }
+
+ .captcha-image {
+ width: 100px;
+ height: 46px;
+ border-radius: 8px;
+ overflow: hidden;
+ cursor: pointer;
+ border: 1px solid #e0e0e0;
+ transition: all 0.3s ease;
+
+ &:hover {
+ border-color: #1a3a8f;
+ }
+
+ img {
+ width: 100%;
+ height: 100%;
+ object-fit: cover;
+ }
+ }
+ }
+
+ .form-options {
+ margin-bottom: 25px;
+
+ .remember-me {
+ .el-checkbox__label {
+ font-size: 14px;
+ color: #666;
+ }
+ }
+ }
+
+ .form-actions {
+ .login-btn {
+ width: 100%;
+ height: 46px;
+ background: linear-gradient(135deg, #1a3a8f 0%, #0d1b4e 100%);
+ border: none;
+ border-radius: 8px;
+ font-size: 16px;
+ font-weight: 500;
+ transition: all 0.3s ease;
+
+ &:hover {
+ background: linear-gradient(135deg, #0d1b4e 0%, #1a3a8f 100%);
+ transform: translateY(-2px);
+ box-shadow: 0 8px 16px rgba(26, 58, 143, 0.3);
+ }
+
+ &:active {
+ transform: translateY(0);
+ }
+ }
+
+ .register-link {
+ text-align: center;
+ margin-top: 15px;
+
+ a {
+ color: #1a3a8f;
+ font-size: 14px;
+ text-decoration: none;
+ transition: all 0.3s ease;
+
+ &:hover {
+ color: #0d1b4e;
+ text-decoration: underline;
+ }
+ }
+ }
+ }
+}
+
+.login-footer {
+ position: fixed;
+ bottom: 0;
+ left: 0;
+ width: 100%;
+ text-align: center;
+ padding: 15px 0;
+ color: rgba(255, 255, 255, 0.7);
+ font-size: 12px;
+ z-index: 2;
+}
+
+/* 鍝嶅簲寮忚璁� */
+@media (max-width: 768px) {
+ .login-card {
+ width: 90%;
+ margin: 0 20px;
+ padding: 30px 20px;
+ }
+
+ .title {
+ font-size: 20px;
+ }
+
+ .subtitle {
+ font-size: 12px;
+ }
+
+ .logo-icon {
+ width: 60px;
+ height: 60px;
+ font-size: 28px;
+ }
+}
+
+@media (max-width: 480px) {
+ .login-card {
+ width: 95%;
+ padding: 20px 15px;
+ }
+
+ .captcha-wrapper {
+ flex-direction: column;
+
+ .captcha-image {
+ width: 100%;
+ height: 46px;
+ }
+ }
+}
+</style>
diff --git a/src/views/logistics/WayBillPaymentBill/YF_PayMentOtherBillTranEdit.vue b/src/views/logistics/WayBillPaymentBill/Pay_WayBillPaymentBillEdit.vue
similarity index 71%
rename from src/views/logistics/WayBillPaymentBill/YF_PayMentOtherBillTranEdit.vue
rename to src/views/logistics/WayBillPaymentBill/Pay_WayBillPaymentBillEdit.vue
index be1b4fc..0410801 100644
--- a/src/views/logistics/WayBillPaymentBill/YF_PayMentOtherBillTranEdit.vue
+++ b/src/views/logistics/WayBillPaymentBill/Pay_WayBillPaymentBillEdit.vue
@@ -23,11 +23,6 @@
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="杈呭姪瀛楁" prop="HInnerBillNo">
- <el-input v-model="form.HInnerBillNo" placeholder="璇疯緭鍏ヨ緟鍔╁瓧娈�" />
- </el-form-item>
- </el-col>
- <el-col :span="6">
<el-form-item label="涓氬姟鍛�" prop="HEmpName">
<el-input v-model="form.HEmpName" placeholder="璇疯緭鍏ヤ笟鍔″憳" disabled>
<el-button slot="append" icon="el-icon-search"
@@ -38,35 +33,16 @@
</el-row>
<el-row>
<el-col :span="6">
- <el-form-item label="淇濈鍛�" prop="HKeeperName">
- <el-input v-model="form.HKeeperName" placeholder="璇疯緭鍏ヤ繚绠″憳" disabled>
+ <el-form-item label="甯佸埆" prop="HCurName">
+ <el-input v-model="form.HCurName" placeholder="璇疯緭鍏ュ竵鍒�" disabled>
<el-button slot="append" icon="el-icon-search"
- @click="openDataDialog(4, zhiyuanType = 'baoguanyuan')"></el-button>
+ @click="openDataDialog(10, zhiyuanType = 'yewuyuan')"></el-button>
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="涓荤" prop="HMangerName">
- <el-input v-model="form.HMangerName" placeholder="璇疯緭鍏ヤ富绠�" disabled>
- <el-button slot="append" icon="el-icon-search"
- @click="openDataDialog(4, zhiyuanType = 'zhuguan')"></el-button>
- </el-input>
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="楠屾敹" prop="HSecManagerName">
- <el-input v-model="form.HSecManagerName" placeholder="璇疯緭鍏ラ獙鏀�" disabled>
- <el-button slot="append" icon="el-icon-search"
- @click="openDataDialog(4, zhiyuanType = 'yanshou')"></el-button>
- </el-input>
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="浠撳簱" prop="HWHName">
- <el-input v-model="form.HWHName" placeholder="璇疯緭鍏ヤ粨搴�" disabled>
- <el-button slot="append" icon="el-icon-search"
- @click="openDataDialog(2, ckType = 'form')"></el-button>
- </el-input>
+ <el-form-item label="姹囩巼" prop="HExRate">
+ <el-input v-model="form.HExRate" placeholder="璇疯緭鍏ユ眹鐜�" disabled />
</el-form-item>
</el-col>
</el-row>
@@ -80,8 +56,8 @@
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="寰�鏉ュ崟浣�" prop="HSupName">
- <el-input v-model="form.HSupName" placeholder="璇疯緭鍏ュ線鏉ュ崟浣�" disabled>
+ <el-form-item label="鎵胯繍鍟�" prop="HSupName">
+ <el-input v-model="form.HSupName" placeholder="璇疯緭鍏ユ壙杩愬晢" disabled>
<el-button slot="append" icon="el-icon-search"
@click="openDataDialog(6)"></el-button>
</el-input>
@@ -176,86 +152,37 @@
@selection-change="handleTableZbEdit" :row-class-name="rowSysZbIndex" show-summary border>
<el-table-column type="selection" width="55" align="center" />
<el-table-column align="center" label="搴忓彿" type="index" width="80" />
- <el-table-column align="center" label="鐗╂枡浠ｇ爜" width="120">
+ <el-table-column align="center" label="濮嬪彂鍦�" width="120">
<template slot-scope="scope">
- <el-input v-model="scope.row.鐗╂枡浠ｇ爜" placeholder="璇疯緭鍏ョ墿鏂欎唬鐮�"
- @keyup.native.f7="openDataDialog(3, scope.row)"
- @dblclick.native="openDataDialog(3, scope.row)" />
+ <el-input v-model="scope.row.HBeginAddrName" placeholder="璇疯緭鍏ュ鍙戝湴"
+ @keyup.native.f7="openDataDialog(3, scope.row, areaType = 'b')"
+ @dblclick.native="openDataDialog(3, scope.row, areaType = 'b')" />
</template>
</el-table-column>
- <el-table-column align="center" label="鐗╂枡鍚嶇О" width="120">
+ <el-table-column align="center" label="鐩殑鍦�" width="120">
<template slot-scope="scope">
- <span>{{ scope.row.鐗╂枡鍚嶇О }}</span>
+ <el-input v-model="scope.row.HEndAddrName" placeholder="璇疯緭鍏ョ洰鐨勫湴"
+ @keyup.native.f7="openDataDialog(3, scope.row, areaType = 'e')"
+ @dblclick.native="openDataDialog(3, scope.row, areaType = 'e')" />
</template>
</el-table-column>
- <el-table-column align="center" label="瑙勬牸鍨嬪彿" width="120">
+ <el-table-column align="center" label="杩愯緭璐圭敤" width="120">
<template slot-scope="scope">
- <span>{{ scope.row.瑙勬牸鍨嬪彿 }}</span>
+ <el-select v-model="scope.row.HTransType" placeholder="璇烽�夋嫨杩愯緭鏂瑰紡">
+ <el-option label="闆跺崟" value="闆跺崟"></el-option>
+ <el-option label="鏁磋溅" value="鏁磋溅"></el-option>
+ </el-select>
</template>
</el-table-column>
- <el-table-column align="center" label="璁￠噺鍗曚綅" width="120">
+ <el-table-column align="center" label="杩愯緭璐圭敤" width="120">
<template slot-scope="scope">
- <el-input v-model="scope.row.璁￠噺鍗曚綅" placeholder="璇疯緭鍏ヨ閲忓崟浣�"
- @keyup.native.f7="openDataDialog('鍗曚綅椤甸潰杩樻病鏈�', scope.row, dwType = 'jldw')"
- @dblclick.native="openDataDialog('鍗曚綅椤甸潰杩樻病鏈�', scope.row, dwType = 'jldw')" />
- </template>
- </el-table-column>
- <el-table-column align="center" label="浠撳簱" width="120">
- <template slot-scope="scope">
- <el-input v-model="scope.row.浠撳簱" placeholder="璇疯緭鍏ヤ粨搴�"
- @keyup.native.f7="openDataDialog(2, scope.row, ckType = 'zb')"
- @dblclick.native="openDataDialog(2, scope.row, ckType = 'zb')" />
- </template>
- </el-table-column>
- <el-table-column align="center" label="浠撲綅" width="120">
- <template slot-scope="scope">
- <el-input v-model="scope.row.浠撲綅" placeholder="璇疯緭鍏ヤ粨浣�"
- @keyup.native.f7="openDataDialog(9, scope.row)"
- @dblclick.native="openDataDialog(9, scope.row)" />
- </template>
- </el-table-column>
- <el-table-column align="center" label="搴撳瓨杈呭崟浣�" width="120">
- <template slot-scope="scope">
- <el-input v-model="scope.row.搴撳瓨杈呭崟浣�" placeholder="璇疯緭鍏ュ簱瀛樿緟鍗曚綅"
- @keyup.native.f7="openDataDialog('鍗曚綅椤甸潰杩樻病鏈�', scope.row, dwType = 'kcfdw')"
- @dblclick.native="openDataDialog('鍗曚綅椤甸潰杩樻病鏈�', scope.row, dwType = 'kcfdw')" />
- </template>
- </el-table-column>
- <el-table-column align="center" label="鍩烘湰鍗曚綅" width="120">
- <template slot-scope="scope">
- <el-input v-model="scope.row.鍩烘湰鍗曚綅" placeholder="璇疯緭鍏ュ熀鏈崟浣�"
- @keyup.native.f7="openDataDialog('鍗曚綅椤甸潰杩樻病鏈�', scope.row, dwType = 'jbdw')"
- @dblclick.native="openDataDialog('鍗曚綅椤甸潰杩樻病鏈�', scope.row, dwType = 'jbdw')" />
- </template>
- </el-table-column>
- <el-table-column align="center" label="杈呭崟浣�" width="120">
- <template slot-scope="scope">
- <el-input v-model="scope.row.杈呭崟浣�" placeholder="璇疯緭鍏ヨ緟鍗曚綅"
- @keyup.native.f7="openDataDialog('鍗曚綅椤甸潰杩樻病鏈�', scope.row, dwType = 'fdw')"
- @dblclick.native="openDataDialog('鍗曚綅椤甸潰杩樻病鏈�', scope.row, dwType = 'fdw')" />
- </template>
- </el-table-column>
- <el-table-column align="center" label="搴旀敹鏁伴噺" width="120">
- <template slot-scope="scope">
- <el-input-number v-model="scope.row.HQtyMust" :min="1" style="width: 90px;"
+ <el-input-number v-model="scope.row.HMoney" :min="0" style="width: 90px;"
controls-position="right"></el-input-number>
</template>
</el-table-column>
- <el-table-column align="center" label="瀹炴敹鏁伴噺" width="120">
+ <el-table-column align="center" label="琛ㄤ綋澶囨敞" width="120">
<template slot-scope="scope">
- <el-input-number v-model="scope.row.HQty" :min="1" style="width: 90px;"
- controls-position="right"></el-input-number>
- </template>
- </el-table-column>
- <el-table-column align="center" label="鍗曚环" width="120">
- <template slot-scope="scope">
- <el-input-number v-model="scope.row.HPrice" :min="0" style="width: 90px;"
- controls-position="right"></el-input-number>
- </template>
- </el-table-column>
- <el-table-column align="center" label="閲戦" width="120">
- <template slot-scope="scope">
- <span>{{ scope.row.HMoney }}</span>
+ <span>{{ scope.row.HRemark }}</span>
</template>
</el-table-column>
<el-table-column align="center" label="鎿嶄綔" width="55" fixed="right">
@@ -274,6 +201,8 @@
<GyEmployee @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyEmployeeShow" />
<GySupplier @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gySupplierShow" />
<GyStockPlace @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyStockPlaceShow" />
+ <GyCurrcy @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="currcyShow" />
+ <AreaDialog @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="areaShow" />
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="deptClickSub">纭� 瀹�</el-button>
<el-button @click="deptClose">鍙� 娑�</el-button>
@@ -290,15 +219,18 @@
import RowSettings from '@/views/component/rowSettings'
import Dept from '@/views/basic/gy/gyDepartment.vue'
import Warehouse from '@/views/basic/gyWarehouse/gyWarehouse.vue'
-import Material from '@/views/gyMaterial/GyMaterial.vue'
+// import Material from '@/views/gyMaterial/GyMaterial.vue'
import GyEmployee from '@/views/basic/gyEmployee/gyEmployee.vue'
import GySupplier from '@/views/basic/gy/gySupplier.vue'
import GyStockPlace from '@/views/basic/gyStockPlace/gyStockPlace.vue'
+// import GyCurrcy from '@/views/basic/gyCurrency/gyCurrency.vue'
+import GyCurrcy from '@/views/component/CurrencyDialog/index.vue'
+import AreaDialog from "@/views/component/AreaDialog"
import moment from 'moment';
export default {
name: 'Kf_StockOutRequestBill',
- components: { Dept, Warehouse, Material, RowSettings, GyEmployee, GySupplier, GyStockPlace },
+ components: { Dept, Warehouse, RowSettings, GyEmployee, GySupplier, GyStockPlace ,GyCurrcy, AreaDialog},
props: {
OperationType: { type: Number, },
linterid: { type: Number, },
@@ -329,6 +261,8 @@
gyEmployeeShow: false,//閿�鍞憳鏁版嵁缁勪欢
gySupplierShow: false,
gyStockPlaceShow: false,
+ currcyShow: false,
+ areaShow: false,//鍦板尯鏁版嵁缁勪欢
deptform: {},//寮圭獥閫変腑鏁版嵁
openData: false,//鏁版嵁寮圭獥
dialogTitle: '',
@@ -341,6 +275,7 @@
editData: [],//閿�鍞嚭搴撳崟瀛愯〃
editBtData: [],//瀛愯〃琛ㄥご
activeName: 'first',
+ dataID:'',
// 寮瑰嚭灞傛爣棰�
title: "",
// 鏄惁鏄剧ず寮瑰嚭灞�
@@ -380,7 +315,12 @@
form: {},
// 琛ㄥ崟鏍￠獙
rules: {
-
+ HBeginAddrName: [
+ { required: true, message: "濮嬪彂鍦颁笉鑳戒负绌�", trigger: "blur" }
+ ],
+ HEndAddrName: [
+ { required: true, message: "鐩殑鍦颁笉鑳戒负绌�", trigger: "blur" }
+ ],
HDate: [
{ required: true, message: "鏃ユ湡涓嶈兘涓虹┖", trigger: "blur" }
],
@@ -406,12 +346,17 @@
});
},
getdata() {
+ console.log('OperationType:', this.OperationType) // 搴旇鏄� 4
+ console.log('copyType:', this.copyType) // 搴旇鏄� undefined
+ console.log('propsData:', this.propsData) // 搴旇涓嶆槸绌�
this.formShow = false
this.formLoading = true
if ((this.OperationType == 1 && this.copyType != 1) || (!this.OperationType && !this.copyType)) {
this.handleAdd()
} else if (this.OperationType == 3 || this.copyType == 1) {
this.handleUpdate()
+ }else if (this.OperationType == 4) {
+ this.handleMove()
}
},
// 鑾峰彇鍙傛暟_浼犻�掔殑JSON鏍煎紡鍙傛暟
@@ -453,8 +398,98 @@
// let options=undefined
// this.form=this.organizationList.find(option => option.ID === val)?.Name || '';
},
+ /** 涓嬫帹鎵撳紑 */
+ handleMove() {
+ this.reset()
+ //鏂板鑾峰彇鍗曟嵁鍙�
+ this.getHBillNo()
+ let date = new Date()
+ this.form.HDate = moment(date).format('YYYY-MM-DD')
+
+ // //璁剧疆婧愬崟绫诲瀷
+ // this.form.HSourceBillType = this.HSouceBillType
+ //鑾峰彇婧愬崟鏁版嵁
+ var data = this.getUrlVars_JSON().data;
+ this.processSourceBills(data)
+ this.$nextTick(() => {
+ this.formShow = true
+ this.formLoading = false
+ })
+ },
+ async processSourceBills(data) {
+ const dataArray = [];
+ try {
+ for (var i = 0; i < data.length; i++) {
+ const result = await this.GetSourceBillList(data[i].HInterID, data[i].HEntryID);
+ dataArray.push(result);
+ }
+ // 鎵�鏈夊紓姝ユ搷浣滃畬鎴愬悗鎵ц
+ this.setInitBySourceBill(dataArray);
+ } catch (error) {
+ console.error("澶勭悊鍑洪敊:", error);
+ }
+ },
+ GetSourceBillList(hmainid, hsubid, HBillType) {
+ return new Promise((resolve, reject) => {
+ axios.get(this.$baseUrl + '/Pay_WayBillPaymentBillController/getOrginBill', {
+ params: {
+ "HInterID": hmainid,
+ "HEntryID": hsubid,
+
+ },
+ }).then(response => {
+ let result = response.data
+ if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ resolve(result.data[0]);
+ } else {
+ resolve(result.data);
+ }
+ }).catch(error => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ reject(error);
+ });
+ });
+ },
+ setInitBySourceBill(dataArray){
+ var data = dataArray[0]
+ this.form.HCarrierID = data.HCarrierID
+ this.form.HCarrierName = data.HCarrierName
+ this.form.HCurID = data.甯佸埆
+ this.form.HCurName = data.甯佸埆鍚嶇О
+
+ this.form.HDeptID = sessionStorage.getItem("deptID")
+ this.form.HDeptName = sessionStorage.getItem("deptName")
+ this.form.HEmpID = sessionStorage.getItem("empID")
+ this.form.HEmpName = sessionStorage.getItem("empName")
+
+ this.form.HSupID = data.HCarrierID
+ this.form.HSupName = data.HCarrierName
+
+
+ //瀛愯〃 璧嬪��
+ var rowdata = [];
+ for (let i = 0; i < dataArray.length; i++) {
+ this.dataID = this.dataID+","+dataArray[i].HInterID
+ rowdata.push(
+ {
+ "HBeginAddr": dataArray[i].濮嬪彂鍦�
+ , "HBeginAddrName": dataArray[i].濮嬪彂鍦板悕绉� == null ? "" : dataArray[i].濮嬪彂鍦板悕绉�
+ , "HEndAddr": dataArray[i].鐩殑鍦� == null ? "" : dataArray[i].鐩殑鍦�
+ , "HEndAddrName": dataArray[i].鐩殑鍦板悕绉� == null ? "" : dataArray[i].鐩殑鍦板悕绉�
+ , "HTransType": dataArray[i].HTransType == null ? "" : dataArray[i].HTransType
+ , "HMoney": dataArray[i].HMoney == null ? "" : dataArray[i].HMoney
+
+ }
+ )
+ }
+ this.editData = rowdata
+ },
//閮ㄩ棬寮圭獥璧嬪��
dbEmitData(deptRow, num) {
+ // console.log('dbEmitData 琚皟鐢�');
+ // console.log('num:', num, '绫诲瀷:', typeof num);
+ // console.log('褰撳墠zbIndex:', this.zbIndex);
+ // console.log('閫夋嫨鐨勬槸:', num === 3 ? '濮嬪彂鍦�' : num === 5 ? '鐩殑鍦�' : '鍏朵粬');
// num=1閮ㄩ棬 num=2鍑哄簱浠撳簱
if (deptRow.HItemID) {
if (num == 1) {
@@ -473,17 +508,26 @@
this.warehouseShow = false
this.openData = false
} else if (num == 3) {
- this.editData[this.zbIndex].HMaterID = deptRow.HItemID;
- this.editData[this.zbIndex].鐗╂枡浠ｇ爜 = deptRow.鐗╂枡浠ｇ爜;
- this.editData[this.zbIndex].鐗╂枡鍚嶇О = deptRow.鐗╂枡鍚嶇О;
- this.editData[this.zbIndex].HUnitID = deptRow.HUnitID;
- this.editData[this.zbIndex].瑙勬牸鍨嬪彿 = deptRow.瑙勬牸鍨嬪彿
- this.editData[this.zbIndex].璁￠噺鍗曚綅 = deptRow.璁￠噺鍗曚綅鍚嶇О
- this.editData[this.zbIndex].HTaxPrice = deptRow.鍚◣鎴愭湰浠�
- this.editData[this.zbIndex].HTaxRate = deptRow.榛樿绋庣巼
- this.materialShow = false
+ if (this.areaType == 'b') {
+ this.editData[this.zbIndex].HBeginAddrName = deptRow.鍦板尯鍚嶇О
+ this.editData[this.zbIndex].HBeginAddr = deptRow.HItemID
+ } else if (this.areaType == 'e') {
+ this.editData[this.zbIndex].HEndAddrName = deptRow.鍦板尯鍚嶇О
+ this.editData[this.zbIndex].HEndAddr = deptRow.HItemID
+ }
+ // this.editData[this.zbIndex].HBeginAddr = deptRow.HItemID;
+ // this.editData[this.zbIndex].HBeginAddrName = deptRow.鍦板尯鍚嶇О;
+ this.areaShow = false
this.openData = false
- } else if (num == 4) {
+ }
+ // else if (num == 5) {
+
+ // this.editData[this.zbIndex].HEndAddr = deptRow.HItemID;
+ // this.editData[this.zbIndex].HEndAddrName = deptRow.鍦板尯鍚嶇О;
+ // this.areaShow = false
+ // this.openData = false
+ // }
+ else if (num == 4) {
if (this.zhiyuanType == 'yewuyuan') {
this.form.HEmpName = deptRow.鑱屽憳鍚嶇О
this.form.HEmpID = deptRow.HItemID
@@ -508,6 +552,13 @@
this.editData[this.zbIndex].HSPID = deptRow.HMainID;
this.editData[this.zbIndex].浠撲綅 = deptRow.浠撲綅鍚嶇О;
this.gyStockPlaceShow = false
+ this.openData = false
+ }
+ else if (num == 10) {
+ this.form.HCurName = deptRow.璐у竵鍚嶇О
+ this.form.HCurID = deptRow.HItemID
+ this.form.HExRate = deptRow.姹囩巼
+ this.currcyShow = false
this.openData = false
}
} else {
@@ -539,11 +590,12 @@
HDeptID:0,
HSupID:0,
HSupName:'',
+ HCarrierID:0,
HEmpID:0,
HEmpName:'',
HCurID:0,
HCurName:'',
- HExRate:'',
+ HExRate:1,
HManagerName:'',
HManagerID:0,
HPSStyleID:0,
@@ -562,7 +614,9 @@
HCloseDate:'',
HUpDateDate:'',
HDeleteDate:'',
-
+ HCurID:0,
+ HCurName:'',
+ HExRate:1,
}
this.editData = []
this.editBtData = []
@@ -628,7 +682,7 @@
getHBillNo() {
axios.get(this.$baseUrl + "/Web/GetMAXNum", {
params: {
- HBillType: '1242'
+ HBillType: '6667'
}
}).then(response => {
this.form.HMaker = sessionStorage["HUserName"]
@@ -646,78 +700,61 @@
handleUpdate() {
this.reset()
let rowHmainid = this.linterid
- axios.get(this.$baseUrl + "/Kf_StockOutRequestBill/cx", {
+ axios.get(this.$baseUrl + "/Pay_WayBillPaymentBillController/Pay_WayBillPaymentBillEditList", {
params: { 'HInterID': rowHmainid }
}).then(response => {
if (response.data.count == 1) {
var result = response.data
var data = response.data.data[0]
this.allVal = data
- this.form.BillType = data.HSourceBillType
+ //this.form.BillType = data.HSourceBillType
if (this.copyType == 1) {
this.getHBillNo()
let date = new Date()
this.form.HDate = moment(date).format('YYYY-MM-DD')
} else {
- this.form.HBillNo = data.鍗曟嵁鍙�
- // this.form.HInterID = data.HInterID
- this.form.HDate = data.鏃ユ湡
- this.form.HMaker = data.鍒跺崟浜�
- this.form.HUpDater = data.淇敼浜�
- this.form.HChecker = data.瀹℃牳浜�
- this.form.HMakeDate = data.鍒跺崟鏃ユ湡
- this.form.HUpDateDate = data.淇敼鏃ユ湡
- this.form.HCheckDate = data.瀹℃牳鏃ユ湡
- this.form.HCloseMan = data.鍏抽棴浜�
- this.form.HDeleteMan = data.浣滃簾浜�
- this.form.HCloseDate = data.鍏抽棴鏃ユ湡
- this.form.HDeleteDate = data.浣滃簾鏃ユ湡
+ this.form.HBillNo = data[0].鍗曟嵁鍙�
+ this.form.HInterID = data[0].HInterID
+ this.form.HDate = data[0].鏃ユ湡
+ this.form.HMaker = data[0].鍒跺崟浜�
+ this.form.HUpDater = data[0].淇敼浜�
+ this.form.HChecker = data[0].瀹℃牳浜�
+ this.form.HMakeDate = data[0].鍒跺崟鏃ユ湡
+ this.form.HUpDateDate = data[0].淇敼鏃ユ湡
+ this.form.HCheckDate = data[0].瀹℃牳鏃ユ湡
+ this.form.HCloseMan = data[0].鍏抽棴浜�
+ this.form.HDeleteMan = data[0].浣滃簾浜�
+ this.form.HCloseDate = data[0].鍏抽棴鏃ユ湡
+ this.form.HDeleteDate = data[0].浣滃簾鏃ユ湡
}
- this.form.HAddress = data.浜よ揣鍦扮偣
- this.form.HDeptName = data.閮ㄩ棬
- this.form.HDeptID = data.HDeptID
- this.form.HSupID = data.HSupID
- this.form.HSupName = data.渚涘簲鍟�
- this.form.HEmpID = data.HEmpID
- this.form.HEmpName = data.涓氬姟鍛�
- this.form.HCurID = data.HCurID
- this.form.HCurName = data.甯佸埆
- this.form.HExRate = data.姹囩巼
- this.form.HManagerName = data.涓荤
- this.form.HManagerID = data.HManagerID
- this.form.HPSStyleID = data.HPSStyleID
- this.form.HPSStyleName = data.閲囪喘鏂瑰紡
- this.form.HSSID = data.HSSID
- this.form.HSSName = data.缁撶畻鏂瑰紡
- this.form.HLinkMan = data.鑱旂郴浜�
- this.form.HLinkPhone = data.鑱旂郴鐢佃瘽
- this.form.HInnerBillNo = data.杈呭姪瀛楁
- this.form.HRemark = data.琛ㄥご澶囨敞
- this.form.HWHName = data['浠撳簱']
- this.form.HWHID = data['HWHID']
- for (var i = 0; i < result.data.length; i++) {
+ this.form.HCarrierID = data[0].HCarrierID
+ this.form.HDeptName = data[0].閮ㄩ棬鍚嶇О
+ this.form.HDeptID = data[0].HDeptID
+ this.form.HSupID = data[0].HCarrierID
+ this.form.HSupName = data[0].渚涘簲鍟�
+ this.form.HEmpID = data[0].HEmpID
+ this.form.HEmpName = data[0].涓氬姟鍛樺悕绉�
+ this.form.HCurID = data[0].HCurID
+ this.form.HCurName = data[0].甯佸埆鍚嶇О
+ this.form.HExRate = data[0].姹囩巼
+
+
+ this.form.HRemark = data[0].琛ㄤ綋澶囨敞
+
+ for (var i = 0; i < data.length; i++) {
this.editData.push(
{
- "HMaterID": result.data[i].HMaterID,
- "鐗╂枡浠ｇ爜": result.data[i].鐗╂枡浠ｇ爜,
- "鐗╂枡鍚嶇О": result.data[i].鐗╂枡鍚嶇О,
- "瑙勬牸鍨嬪彿": result.data[i].瑙勬牸鍨嬪彿,
- "HUnitID": result.data[i].HUnitID,
- "璁￠噺鍗曚綅": result.data[i].璁￠噺鍗曚綅,
- "HQty": result.data[i].鏁伴噺,
- "HRemark": result.data[i].琛ㄤ綋澶囨敞,
- "HPrice": result.data[i].鍗曚环,
- "HMoney": result.data[i].閲戦,
- "HTaxRate": result.data[i].绋庣巼,
- "HTaxMoney": result.data[i].閲戦 * result.data[i].绋庣巼,
- "HlineTotal": result.data[i].閲戦 + result.data[i].绋庨,
- "HlineTotalBB": (result.data[i].閲戦 + result.data[i].绋庨) * result.data[i].姹囩巼, "HTaxPrice": result.data[i].鍚◣鍗曚环,
- "HDiscountRate": result.data[i].鎶樻墸鐜�,
- "HRelTaxPrice": data.瀹為檯鍚◣鍗曚环,
- "浠撳簱": data.浠撳簱,
- "HDate": moment(result.data[i].浜よ揣鏃ユ湡).format('YYYY-MM-DD'),
- "HQtyMust": data.瀹炴敹鏁伴噺,
- "HQty": data.搴旀敹鏁伴噺
+ "HBeginAddr": data[i].HBeginAddr,
+ "HBeginAddrName": data[i].濮嬪彂鍦�,
+ "HEndAddr": data[i].HEndAddr,
+ "HEndAddrName": data[i].鐩殑鍦�,
+ "HRemark": data[i].琛ㄤ綋澶囨敞,
+
+ "HMoney": data[i].杩愯緭璐圭敤,
+ "HTransType": data[i].杩愯緭鏂瑰紡,
+
+ // "HDate": moment(result.data[i].浜よ揣鏃ユ湡).format('YYYY-MM-DD'),
+
}
);
}
@@ -738,10 +775,13 @@
this.$modal.msgError("璇烽�夋嫨涓�琛屾暟鎹紪杈�!");
} else {
let obj = {
- "HMaterID": 0, "鐗╂枡浠ｇ爜": "", "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "", "HUnitID": 0, "璁￠噺鍗曚綅": "", "HWHID": 0, "浠撳簱": "",
- "HSPID": 0, "浠撲綅": "", "HSecUnitID": 0, "搴撳瓨杈呭崟浣�": "", "HBASEUNITID": 0, "鍩烘湰鍗曚綅": "",
- "HEXTAUXUNITID": 0, "杈呭崟浣�": "", "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HRemark": ""
- }
+ "HBeginAddrName": "",
+ "HBeginAddr": 0,
+ "HEndAddrName": "",
+ "HEndAddr": 0,
+ "HMoney": 0,
+ "HRemark": ""
+ };
if (index) {
this.editData.splice(index, 0, obj);
this.$set(this.editData, index, obj)
@@ -812,25 +852,31 @@
// 缂栬緫鎻愪氦淇濆瓨
submitForm() {
this.$refs["form"].validate(valid => {
+
if (valid) {
let fhck = false
- this.editData.map((item, index) => {
- if (!item.浠撳簱) {
- fhck = true
- this.$modal.msgError("绗�" + (index + 1) + "琛岋細浠撳簱鏈�夋嫨锛�");
- }
- })
+ // this.editData.map((item, index) => {
+ // if (!item.浠撳簱) {
+ // fhck = true
+ // this.$modal.msgError("绗�" + (index + 1) + "琛岋細浠撳簱鏈�夋嫨锛�");
+ // }
+ // })
this.$nextTick(() => {
if (!fhck) {
+
+
+ //this.form.HCarrierID=this.form.HSupID
+ this.form.HCarrierID=this.form.HSupID
var sMainStr = JSON.stringify(this.form);
var sSubStr = JSON.stringify(this.editData);
var sAllStr = JSON.stringify(this.allVal)
- var sMainSub = sMainStr + ';' + sSubStr + ';' + this.OperationType + ";" + sessionStorage["HUserName"] + ';' + sAllStr;
+ var refs=this.OperationType==3?"Update":"Add"
+ var sMainSub = sMainStr + ';' + sSubStr + ';' + refs + ";" + sessionStorage["HUserName"] + ';' + sAllStr+';'+this.dataID;
axios({
method: 'post',
- url: this.$baseUrl + "/Kf_StockOutRequestBill/StockOutRequestBillEdit",
+ url: this.$baseUrl + "/Pay_WayBillPaymentBillController/saveBILL",
data: {
- 'sMainSub': sMainSub
+ 'msg': sMainSub
},
}).then(response => {
if (response.data.count == 1) {
@@ -873,6 +919,8 @@
this.gyEmployeeShow = false
this.gySupplierShow = false
this.gyStockPlaceShow = false
+ this.currcyShow = false
+ this.areaShow = false
},
// 鎵撳紑鏁版嵁鍒楄〃寮圭獥
openDataDialog(num, row) {
@@ -890,10 +938,16 @@
this.warehouseShow = true
this.openData = true
} else if (num == 3) {
- this.dialogTitle = '鐗╂枡鍒楄〃'
- this.materialShow = true
+ this.dialogTitle = '鍦板尯鍒楄〃'
+ this.areaShow = true
this.openData = true
- } else if (num == 4) {
+ }
+ // else if (num == 5) {
+ // this.dialogTitle = '鍦板尯鍒楄〃'
+ // this.areaShow = true
+ // this.openData = true
+ // }
+ else if (num == 4) {
this.dialogTitle = '鑱屽憳鍒楄〃'
this.gyEmployeeShow = true
this.openData = true
@@ -905,7 +959,11 @@
this.dialogTitle = '寰�鏉ュ崟浣嶅垪琛�'
this.gyStockPlaceShow = true
this.openData = true
- }
+ }else if (num == 10) {
+ this.dialogTitle = '甯佸埆鍒楄〃'
+ this.currcyShow = true
+ this.openData = true
+ }
},
}
diff --git a/src/views/logistics/WayBillPaymentBill/YF_PayMentOtherBillTranList.vue b/src/views/logistics/WayBillPaymentBill/Pay_WayBillPaymentBillList.vue
similarity index 98%
rename from src/views/logistics/WayBillPaymentBill/YF_PayMentOtherBillTranList.vue
rename to src/views/logistics/WayBillPaymentBill/Pay_WayBillPaymentBillList.vue
index 215cd36..be54acb 100644
--- a/src/views/logistics/WayBillPaymentBill/YF_PayMentOtherBillTranList.vue
+++ b/src/views/logistics/WayBillPaymentBill/Pay_WayBillPaymentBillList.vue
@@ -27,7 +27,7 @@
<el-collapse v-model="activeSeach">
<el-collapse-item title="鏇村" name="1">
<el-card class="box-card">
- <el-form-item label="閮ㄩ棬鍚嶇О" prop="HDepartName">
+ <!---- <el-form-item label="閮ㄩ棬鍚嶇О" prop="HDepartName">
<el-input v-model="queryParams.HDepartName" placeholder="璇疯緭鍏ラ儴闂ㄥ悕绉�"
@keyup.enter.native="HDepartName" />
</el-form-item>
@@ -42,7 +42,7 @@
<el-form-item label="浠撳簱" prop="HWHID">
<el-input v-model="queryParams.HWHID" placeholder="璇疯緭鍏ヤ粨搴�"
@keyup.enter.native="handleQuery" />
- </el-form-item>
+ </el-form-item> -->
<div slot="header" class="clearfix"><span>杩囨护</span></div>
<div>
<el-row>
@@ -174,7 +174,7 @@
<!-- 缂栬緫 -->
<el-dialog title="缂栬緫" :visible.sync="openEdit" width="1480px" append-to-body class="xsckdBox"
@close="close">
- <edit :OperationType="OperationType" :linterid="this.rowForm.hmainid"
+ <edit :OperationType="OperationType" :linterid="this.rowForm.hmainid || this.rowForm.HInterID"
:HSouceBillType="this.rowForm.HSourceBillType" :copyType="copyType" @editClose="editClose"
v-if="editShow" />
</el-dialog>
@@ -185,13 +185,13 @@
<script>
import axios from "axios";
import RowSettings from "@/views/component/rowSettings";
-import Edit from "@/views/warehouse/shipment/Kf_StockOutRequestBill.vue";
+import Edit from "@/views/logistics/WayBillPaymentBill/Pay_WayBillPaymentBillEdit.vue";
import PrintList from "@/views/component/printList";
import BarCodeDetail from '@/views/component/BarCodeDetail' //鏉＄爜鏄庣粏缁勪欢
import moment from "moment";
export default {
- name: "Kf_StockOutRequestBillList",
+ name: "YF_PayMentOtherBillTranList",
components: { RowSettings, Edit, PrintList, BarCodeDetail },
data() {
return {
@@ -376,9 +376,10 @@
if (this.pageSize == 0) {
this.pageSize = 50;
}
+ console.log(this.$baseUrl);
// 鍒楄〃
axios
- .get(this.$baseUrl + "/YF_PayMentOtherBillTran/YF_PayMentOtherBillMainList", {
+ .get(this.$baseUrl + "/Pay_WayBillPaymentBillController/Pay_WayBillPaymentBillList", {
params: {
sWhere: this.sWhere,
user: sessionStorage["HUserName"],
diff --git a/src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue b/src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue
index 5684ebd..7bdf247 100644
--- a/src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue
+++ b/src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue
@@ -435,8 +435,8 @@
<el-table-column align="center" label="鍣ㄥ叿浠ｇ爜" width="120">
<template slot-scope="scope">
<el-input v-model="scope.row.HMouldNumber" placeholder="璇疯緭鍏ュ櫒鍏蜂唬鐮�"
- @keyup.native.f7="openDataDialog(8, scope.row)"
- @dblclick.native="openDataDialog(8, scope.row)" />
+ @keyup.native.f7="openDataDialog(17, scope.row)"
+ @dblclick.native="openDataDialog(17, scope.row)" />
</template>
</el-table-column>
<el-table-column align="center" label="鍣ㄥ叿鍚嶇О" width="120">
@@ -470,10 +470,7 @@
</template>
</el-table-column>
<el-table-column align="center" label="鍖呰瀹瑰櫒鏁伴噺" width="120">
- <template slot-scope="scope">
- <el-input-number v-model="scope.row.HMouldQty" :min="0" style="width: 90px;"
- controls-position="right"></el-input-number>
- </template>
+ <template slot-scope="scope">{{ scope.row.HMouldQty }}</template>
</el-table-column>
<el-table-column align="center" label="鐗╂枡鏁伴噺" width="120">
<template slot-scope="scope">
@@ -516,13 +513,16 @@
:propsHOrgID="form.HOrgID" v-if="xsSeOutStockBillShow" />
<GyCustomer @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyCustomerShow" />
<GySupplier @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gySupplierShow" />
- <GyCartype @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" :volume="form.HCarTypeMaxVolume" v-if="gyCartypeShow" />
+ <GyCartype @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName"
+ :volume="form.HCarTypeMaxVolume" v-if="gyCartypeShow" />
<GyCar @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyCarShow" />
<GyDriver @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyDriverShow" />
<ContractTransport @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName"
v-if="ContractTransportShow" />
- <GyMould @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyMouldShow" />
- <AreaDialog @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" :HBeginAddrName="form.HBeginAddrName" :HEndAddrName="form.HEndAddrName" v-if="AreaDialogShow" />
+ <GyMaterialPackingRelation @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName"
+ :propHMaterID="editData[zbIndex].HMaterID" :propHOrgID="form.HOrgID"
+ v-if="gyMaterialPackingRelationShow" />
+ <AreaDialog @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="AreaDialogShow" />
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="deptClickSub">纭� 瀹�</el-button>
<el-button @click="deptClose">鍙� 娑�</el-button>
@@ -550,11 +550,11 @@
import GyCar from "@/views/basic/gyCar/gyCarList.vue"
import GyDriver from "@/views/system/user/GyDriver.vue"
import ContractTransport from "@/views/basic/gytransport/cgContractTransportBillList/Cg_ContractTransportBillList.vue"
-import GyMould from '@/views/scMould/basicModeling/Gy_MouldFileList.vue'
+import GyMaterialPackingRelation from '@/views/scMould/basicModeling/Gy_MaterialPackingRelationList.vue'
import AreaDialog from "@/views/component/AreaDialog"
export default {
- name: 'SellOutBill',
- components: { Dept, Warehouse, Material, RowSettings, XsSeOutStockBill, GyCustomer, GySupplier, GyCartype, GyCar, GyDriver, ContractTransport, GyMould, AreaDialog },
+ name: 'Add_Edit_WL_YayBill.vue',
+ components: { Dept, Warehouse, Material, RowSettings, XsSeOutStockBill, GyCustomer, GySupplier, GyCartype, GyCar, GyDriver, ContractTransport, GyMaterialPackingRelation, AreaDialog },
props: {
OperationType: { type: Number, },
linterid: { type: Number, },
@@ -595,7 +595,7 @@
gyCarShow: false, //杞﹁締鏁版嵁缁勪欢鏄剧ず鏍囪
gyDriverShow: false, //鍙告満鏁版嵁缁勪欢鏄剧ず鏍囪
ContractTransportShow: false, //鎵胯繍鍚堝悓鏁版嵁缁勪欢鏄剧ず鏍囪
- gyMouldShow: false, //瀹瑰櫒鏁版嵁缁勪欢鏄剧ず鏍囪
+ gyMaterialPackingRelationShow: false, //瀹瑰櫒鏁版嵁缁勪欢鏄剧ず鏍囪
AreaDialogShow: false, //鐩殑鍦版暟鎹粍浠舵樉绀烘爣璁�
deptform: {}, //寮圭獥閫変腑鏁版嵁
areaType: '',//鍦板尯閫夋嫨绫诲瀷
@@ -684,117 +684,6 @@
}
else if (this.OperationType == 3 || this.copyType == 1) {
this.handleUpdate()
- }
- else if (this.OperationType == 4) {
- this.zzSelDis = true
- this.handleAdd()
- var data = this.getUrlVars_JSON();
- var dataArray = [];
- for (var i = 0; i < data.length; i++) {
- // this.getPushSourceBillInit(data[i].hmainid, data[i].hsubid);
- axios.get(this.$baseUrl + '/Xs_SeOrderBill/loadXs_SeOrderBill_Push', {
- params: {
- "HInterID": data[i].hmainid
- , "HSubID": data[i].hsubid
- },
- }).then(response => {
- let result = response.data
- if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- this.temp = result.data[0];
- } else {
- this.temp = result.data;
- }
- if (this.temp) {
- dataArray.push(this.temp);
- this.form.HDeptID = dataArray[0].HDeptID
- this.form.HDeptName = dataArray[0].閮ㄩ棬
- this.form.HEmpID = dataArray[0].HEmpID
- this.form.HEmpName = dataArray[0].涓氬姟鍛�
- this.form.HManagerID = dataArray[0].HManagerID
- this.form.HManagerName = dataArray[0].涓荤
- this.form.HMainSourceInterID = "0"
- this.form.HMainSourceEntryID = "0"
- this.form.HMainSourceBillNo = ""
- this.form.HMainSourceBillType = dataArray[0].HBillType
- this.form.HSupID = dataArray[0].HCusID
- this.form.HSupName = dataArray[0].瀹㈡埛
- this.form.HLinkMan = dataArray[0].鑱旂郴浜�
- this.form.HLinkPhone = dataArray[0].鑱旂郴鐢佃瘽
- this.form.HSellSID = dataArray[0].HSellSID
- this.form.HSellSName = dataArray[0].閿�鍞柟寮�
- this.form.HCurID = dataArray[0].HCurID
- this.form.HCurName = dataArray[0].甯佸埆
- this.form.HExRate = dataArray[0].姹囩巼
- for (var i = 0; i < dataArray.length; i++) {
- this.editData.push(
- {
- "HMaterID": dataArray[i].HMaterID
- , "鐗╂枡浠ｇ爜": dataArray[i].鐗╂枡浠ｇ爜
- , "鐗╂枡鍚嶇О": dataArray[i].鐗╂枡鍚嶇О
- , "瑙勬牸鍨嬪彿": dataArray[i].瑙勬牸鍨嬪彿
- , "HUnitID": dataArray[i].HUnitID
- , "璁￠噺鍗曚綅": dataArray[i].璁￠噺鍗曚綅
- , "HQtyMust": dataArray[i].鏁伴噺.toFixed(6)
- , "HQty": dataArray[i].鏁伴噺.toFixed(6)
- , "HPieceQty": "0"
- , "HPrice": dataArray[i].鍗曚环.toFixed(4)
- , "HTaxPrice": dataArray[i].瀹為檯鍚◣鍗曚环.toFixed(4)
- , "HTaxRate": dataArray[i].绋庣巼
- , "HMoney": dataArray[i].閲戦.toFixed(2)
- , "HTaxMoney": dataArray[i].浠风◣鍚堣.toFixed(2)
- , "HWHID": dataArray[i].HWHID
- , "鍙戣揣浠撳簱": dataArray[i].HWHName
- , "HRemark": ""
- , "HQty_Full": "0"
- , "HQty_Empty": "0"
- , "HQty_Back": "0"
- , "HCostPrice": "0"
- , "HCostMoney": "0"
- , "HSalePrice": "0"
- , "HSeOrderInterID": dataArray[i].hmainid
- , "HSeOrderEntryID": dataArray[i].hsubid
- , "HSeOrderBillNo": dataArray[i].鍗曟嵁鍙�
- , "HSourceInterID": dataArray[i].hmainid
- , "HSourceEntryID": dataArray[i].hsubid
- , "HSourceBillNo": dataArray[i].鍗曟嵁鍙�
- , "HSourceBillType": dataArray[i].HBillType
- , "HRelationQty": "0"
- , "HRelationMoney": "0"
- , 'HSPID': "0"
- , 'HSPName': ""
- , 'HSPGroupID': "0"
- , "HSPGroupName": ""
- , 'HSCWHID': "0"
- , 'HSCWHName': ""
- , 'HSCSPID': "0"
- , 'HSCSPName': ""
- , 'HBatchNo': ""
- , 'HPOOrderInterID': "0"
- , 'HPOOrderEntryID': "0"
- , 'HPOOrderBillNo': ""
- , 'HPropertyID': "0"
- , 'HPropertyName': ""
- , 'HSecUnitID': "0"
- , 'HSecUnitName': ""
- , 'HSecUnitRate': "0"
- , 'HEngineNum': ""
- , 'HUnderPanNum': ""
- , 'HLeaveFactCard': ""
- , 'HReqBuyQty': "0"
- , 'HReqOutQty': "0"
- , 'HCurrentInventory': "0"
- }
- );
- }
- }
- this.$nextTick(() => {
- this.formShow = true
- this.formLoading = false
- })
- }).catch(error => {
- this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
- });
- }
}
},
//#endregion
@@ -890,13 +779,12 @@
})
},
//#endregion
-
//#region 缂栬緫椤甸潰鍒濆鍖�
handleUpdate() {
this.reset()
let rowHmainid = this.linterid
- axios.get(this.$baseUrl + "/Kf_POStockInBill/cx", {
- params: { 'HInterID': rowHmainid }
+ axios.get(this.baseURL + "/WLYayBillController/WL_YayBillDetail", {
+ params: { 'HID': rowHmainid }
}).then(response => {
console.log(response.data.data.h_v_WL_YayBillEdit)
if (response.data.code == 1) {
@@ -1075,10 +963,6 @@
this.dialogTitle = '瀹㈡埛鍒楄〃'
this.gyCustomerShow = true
this.openData = true
- } else if (num == 8) {
- this.dialogTitle = '瀹瑰櫒鍒楄〃'
- this.gyMouldShow = true
- this.openData = true
} else if (num == 12) {
this.dialogTitle = '婧愬崟鍒楄〃'
this.xsSeOutStockBillShow = true
@@ -1092,12 +976,16 @@
this.gyCarShow = true
this.openData = true
} else if (num == 15) {
- this.dialogTitle = '杞﹁締鍒楄〃'
+ this.dialogTitle = '鍙告満鍒楄〃'
this.gyDriverShow = true
this.openData = true
} else if (num == 16) {
this.dialogTitle = '鎵胯繍鍚堝悓鍒楄〃'
this.ContractTransportShow = true
+ this.openData = true
+ } else if (num == 17) {
+ this.dialogTitle = '瀹瑰櫒鍖呰鍒楄〃'
+ this.gyMaterialPackingRelationShow = true
this.openData = true
}
},
@@ -1113,7 +1001,7 @@
this.gyCarShow = false
this.gyDriverShow = false
this.ContractTransportShow = false
- this.gyMouldShow = false
+ this.gyMaterialPackingRelationShow = false
},
//#endregion
//#endregion
@@ -1154,16 +1042,6 @@
this.form.HCusID = deptRow.HItemID
this.gyCustomerShow = false
this.openData = false
- } else if (num == 8) {
- console.log(deptRow)
- this.editData[this.zbIndex].HMouldID = deptRow.hmainid
- this.editData[this.zbIndex].HMouldNumber = deptRow.妯″叿缂栧彿
- this.editData[this.zbIndex].HMouldName = deptRow.妯″叿鍚嶇О
- this.editData[this.zbIndex].HMouldLength = deptRow.闀�
- this.editData[this.zbIndex].HMouldWidth = deptRow.瀹�
- this.editData[this.zbIndex].HMouldFoldHeight = deptRow.鎶樺彔楂樺害
- this.gyMouldShow = false
- this.openData = false
} else if (num == 12) {
// 浣跨敤寮傛鏂瑰紡澶勭悊婧愬崟鏁版嵁
this.processSourceDataAsync(deptRow);
@@ -1200,6 +1078,24 @@
this.form.HCarrierID = deptRow.HSupID
this.form.HCarrierName = deptRow.渚涘簲鍟嗗悕绉�
this.ContractTransportShow = false
+ this.openData = false
+ } else if (num == 17) {
+ console.log(deptRow)
+ this.editData[this.zbIndex].HMouldID = deptRow.hmainid
+ this.editData[this.zbIndex].HMouldNumber = deptRow.瀹瑰櫒浠ｇ爜
+ this.editData[this.zbIndex].HMouldName = deptRow.瀹瑰櫒鍚嶇О
+ this.editData[this.zbIndex].HMouldLength = deptRow.闀垮害
+ this.editData[this.zbIndex].HMouldWidth = deptRow.瀹藉害
+ this.editData[this.zbIndex].HMouldHeight = deptRow.楂樺害
+ this.editData[this.zbIndex].HMouldFoldHeight = deptRow.鎶樺彔楂樺害
+ this.editData[this.zbIndex].HSNP = deptRow.瀹瑰櫒鍖呰浜у搧鏁伴噺
+ this.editData[this.zbIndex].HVolume = (this.editData[this.zbIndex].HMouldLength * this.editData[this.zbIndex].HMouldWidth * this.editData[this.zbIndex].HMouldHeight).toFixed(2) - 0
+ this.form.HTotalVolume = 0
+ this.editData.map(item => {
+ this.form.HTotalVolume = item.HVolume + this.form.HTotalVolume
+ })
+ this.editData[this.zbIndex].HMouldQty = Math.ceil(this.editData[this.zbIndex].HQty / this.editData[this.zbIndex].HSNP)
+ this.gyMaterialPackingRelationShow = false
this.openData = false
}
},
@@ -1359,7 +1255,7 @@
return;
}
- const response = await axios.get(this.$baseUrl + '/WLYayBillController/GetMesByOrginBill', {
+ const response = await axios.get(this.baseURL + '/WLYayBillController/GetMesByOrginBill', {
params: {
"ListMaterial": ListMaterial
},
@@ -1467,7 +1363,7 @@
//鏀逛负寮傛鏂规硶锛岃繑鍥濸romise
async getPushSeOutStockBillInit(HSourceInterID, HSourceEntryID) {
try {
- const response = await axios.get(this.$baseUrl + '/Kf_SellOutBill/loadXs_SeOutStockBill_Push', {
+ const response = await axios.get(this.baseURL + '/Kf_SellOutBill/loadXs_SeOutStockBill_Push', {
params: {
"HInterID": HSourceInterID,
"HSubID": HSourceEntryID
@@ -1491,40 +1387,35 @@
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
- let fhck = false
- this.editData.map((item, index) => {
- if (!item.鍙戣揣浠撳簱) {
- fhck = true
- this.$modal.msgError("绗�" + (index + 1) + "琛岋細鍙戣揣浠撳簱鏈�夋嫨锛�");
+ var loadingRate = this.form.HLoadingRate;
+ if (loadingRate && typeof loadingRate === 'string') {
+ this.form.HLoadingRate = parseFloat(loadingRate.replace('%', '')) / 100;
+ }
+ var sMainStr = JSON.stringify(this.form);
+ var sSubStr = JSON.stringify(this.editData);
+ console.log(this.form)
+
+ // var sMainSub = sMainStr + ';' + sSubStr + ';' + sessionStorage["HUserName"] + ';' + this.OperationType;
+ var sMainSub = sMainStr + ';' + sSubStr + ';' + sessionStorage["HUserName"]
+ console.log(sMainSub)
+ axios({
+ method: 'post',
+ url: this.baseURL + "/WLYayBillController/SaveBill",
+ data: {
+ 'msg': sMainSub
+ },
+ }).then(response => {
+ if (response.data.count == 1) {
+ this.subDisabled = true//璁剧疆淇濆瓨鎸夐挳涓嶅彲鐢�
+ this.$modal.msgSuccess(response.data.Message);
+ this.close()
+ } else {
+ this.$modal.msgError(response.data.Message)
}
- })
- this.$nextTick(() => {
- if (!fhck) {
- var sMainStr = JSON.stringify(this.form);
- var sSubStr = JSON.stringify(this.editData);
- var sMainSub = sMainStr + ';' + sSubStr + ';' + sessionStorage["HUserName"] + ';' + this.OperationType;
- axios({
- method: 'post',
- url: this.$baseUrl + "/Kf_SellOutBill/SaveSellOutBillList",
- data: {
- 'msg': sMainSub
- },
- }).then(response => {
- if (response.data.count == 1) {
- this.subDisabled = true//璁剧疆淇濆瓨鎸夐挳涓嶅彲鐢�
- this.$modal.msgSuccess(response.data.Message);
- this.get_MAXNum_Task(1);//璁剧疆娴佹按鍙峰鍔�
- if (response.data.Verify == "Y") //鑷姩瀹℃牳
- {
- this.set_CheckBill(0, this.form); //瀹℃牳
- }
- this.addBtnShow = true
- }
- }).catch(error => {
- this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
- });
- }
- })
+ }).catch(error => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+
}
});
},
@@ -1534,7 +1425,7 @@
set_CheckBill(num, form) {
var InterID = form.hmainid || form.HInterID
//閫昏緫瀹℃牳鏂规硶
- axios.get(this.$baseUrl + "/Kf_SellOutBill/AuditKf_SellOutBill", {
+ axios.get(this.baseURL + "/Kf_SellOutBill/AuditKf_SellOutBill", {
params: { "HInterID": InterID, "IsAudit": num, "CurUserName": sessionStorage["HUserName"] }
}).then(response => {
let result = response.data
@@ -1655,22 +1546,9 @@
},
//#endregion
- //#region 缁勭粐涓嬫媺鍒楄〃鏁版嵁鍒濆鍖�
- fetchData() {
- axios.get(this.$baseUrl + "/Web/GetOrganizations", {
- }).then(response => {
- if (response.data.count == 1) {
- this.organizationList = response.data.data;//缁勭粐鍒楄〃
- }
- }).catch(error => {
- this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
- });
- },
- //#endregion
-
//#region 鑾峰彇鍐呯爜銆佸崟鎹彿
getHBillNo() {
- axios.get(this.$baseUrl + "/WEBSController/GetMaxBillNoAndID_Json", {
+ axios.get(this.baseURL + "/Web/GetMAXNum", {
params: {
HBillType: '3321'
}
@@ -1687,7 +1565,7 @@
var sql = `exec h_p_Xt_GetMaxBillNo_SubType '1201','${this.form.HDate}',0,0,0,'${Type}','${this.form.HDeptID}'`;
axios({
method: 'get',
- url: this.$baseUrl + "/CommonModel/searchMethod",
+ url: this.baseURL + "/CommonModel/searchMethod",
params: { "sql": sql, "user": sessionStorage["HUserName"], "ModRightNameCheck": "" },
}).then(response => {
if (response.data.count == 1) {
@@ -1703,7 +1581,7 @@
//#region 鏍规嵁鐢ㄦ埛鑾峰彇瀵瑰簲鑱屽憳銆侀儴闂ㄣ�侀攢鍞富绠�
getCzyglByUser() {
- axios.get(this.$baseUrl + '/Xs_SeOrderBill/getCzyglByUser', {
+ axios.get(this.baseURL + '/Xs_SeOrderBill/getCzyglByUser', {
params: { "CurUserName": sessionStorage["HUserName"] }
}).then(response => {
let dataForm = response.data.data[0]
@@ -1721,7 +1599,7 @@
//#region 鏍规嵁瀹㈡埛鑾峰彇瀹㈡埛浣欓
getCustomerBalance(HCusID) {
- axios.get(this.$baseUrl + '/Xs_CusRatingChangeBill/getCustomerBalance', {
+ axios.get(this.baseURL + '/Xs_CusRatingChangeBill/getCustomerBalance', {
params: { "HCusID": HCusID, 'CurUserName': sessionStorage["HUserName"] }
}).then(response => {
var data = response.data.data[0];
@@ -1736,7 +1614,7 @@
//#region 鏍规嵁瀹㈡埛甯﹀嚭鑱旂郴浜恒�佽仈绯荤數璇�
getCustomerByCusID(HCusID) {
- axios.get(this.$baseUrl + "/Xs_SeOrderBill/getCustomerByCusID", {
+ axios.get(this.baseURL + "/Xs_SeOrderBill/getCustomerByCusID", {
params: {
HCusID: HCusID
}
@@ -1753,7 +1631,7 @@
//#region 鑾峰彇閿�鍞嚭搴撳崟瀵瑰簲鐨勬潯鐮佹槑缁�
getBarCodeNoteBySellOutBill(rowHmainid) {
- axios.get(this.$baseUrl + '/Kf_SellOutBill/BarCodeNote', {
+ axios.get(this.baseURL + '/Kf_SellOutBill/BarCodeNote', {
params: { "HInterID": rowHmainid }
}).then(response => {
if (response.data.count == 1) {
@@ -1770,7 +1648,7 @@
//#region 鏍规嵁涓诲唴鐮佷笌瀛愬唴鐮佽幏鍙栨簮鍗曢攢鍞鍗曟暟鎹�
getPushSourceBillInit(HSourceInterID, HSourceEntryID) {
- axios.get(this.$baseUrl + '/Xs_SeOrderBill/loadXs_SeOrderBill_Push', {
+ axios.get(this.baseURL + '/Xs_SeOrderBill/loadXs_SeOrderBill_Push', {
params: {
"HInterID": HSourceInterID
, "HSubID": HSourceEntryID
@@ -1801,7 +1679,6 @@
//#endregion
checkTotalQtyExceed(selRow) {
var tableData = this.editData
- console.log(tableData)
if (!tableData || tableData.length === 0) return;
var sourceQtyMap = {};
var currentQtyMap = {};
@@ -1850,8 +1727,6 @@
});
}
}
- console.log(exceedSources)
-
if (exceedSources.length > 0) {
var message = '鐗╂枡鏁伴噺涔嬪拰瓒呰繃婧愬崟鏁伴噺锛�';
exceedSources.forEach(function (item, index) {
@@ -1863,7 +1738,7 @@
this.$modal.msgError(message);
return true; // 琛ㄧず鏈夎秴鍑�
}
-
+ this.editData[selRow.index-1].HMouldQty = Math.ceil(selRow.HQty / this.editData[selRow.index-1].HSNP)
return false; // 琛ㄧず娌℃湁瓒呭嚭
},
//#region 闄勪欢涓婁紶鐩稿叧鏂规硶
@@ -1900,7 +1775,7 @@
formData.append('HRemark', '');
formData.append('HUserName', sessionStorage["HUserName"]);
// 璁剧疆涓婁紶URL
- this.uploadUrl = this.$baseUrl + '/Gy_QCVerificationBillMain/UploadFile_Gy_QCVerification';
+ this.uploadUrl = this.baseURL + '/Gy_QCVerificationBillMain/UploadFile_Gy_QCVerification';
// 鍙戦�佷笂浼犺姹�
axios.post(this.uploadUrl, formData, {
headers: {
@@ -1948,7 +1823,7 @@
formData.append('HUserName', sessionStorage.getItem('HUserName') || '');
// 璁剧疆涓婁紶URL
- this.uploadUrl = this.$baseUrl + '/Gy_QCVerificationBillMain/UploadFile_Gy_QCVerification';
+ this.uploadUrl = this.baseURL + '/Gy_QCVerificationBillMain/UploadFile_Gy_QCVerification';
// 鍙戦�佷笂浼犺姹�
axios.post(this.uploadUrl, formData, {
diff --git a/src/views/logistics/transportGPS/WL_YayBill.vue b/src/views/logistics/transportGPS/WL_YayBill.vue
index 98d73f9..d0de9e1 100644
--- a/src/views/logistics/transportGPS/WL_YayBill.vue
+++ b/src/views/logistics/transportGPS/WL_YayBill.vue
@@ -171,6 +171,14 @@
@click="handleVolume(rowForm)">缁存姢闆跺崟鍗犵敤浣撶Н</el-button>
</el-col>
<el-col :span="1.5">
+ <el-button type="primary" icon="el-icon-edit-outline" size="mini"
+ @click="handlePush(row = rowForm, OperationType = 4)">涓嬫帹锛堣垂鐢ㄧ粨绠楀崟锛�</el-button>
+ </el-col>
+ <el-col :span="1.5">
+ <el-button type="primary" icon="el-icon-edit-outline" size="mini" :disabled="single"
+ @click="openDataDialog(14, form = rowForm)">鍒嗛厤鍙告満</el-button>
+ </el-col>
+ <el-col :span="1.5">
<el-button type="primary" icon="el-icon-edit-outline" size="mini" :disabled="single"
@click="set_CheckBill(0, form = rowForm)">瀹℃牳</el-button>
</el-col>
@@ -247,7 +255,7 @@
<!-- 缂栬緫 -->
<el-dialog title="缂栬緫" :visible.sync="openEdit" width="1480px" append-to-body class="xsckdBox"
@close="close">
- <edit :OperationType=OperationType :linterid=this.rowForm.HInterID
+ <Edit :OperationType=OperationType :linterid=this.rowForm.HInterID
:HSouceBillType=this.rowForm.HSourceBillType :copyType="copyType" @editClose="editClose"
v-if="editShow" />
</el-dialog>
@@ -276,6 +284,20 @@
<BarCodeDetail :visible.sync="barCodeDetailShow" ref="barcodeDetail" />
<!-- 鍖呰瀹瑰櫒鍑哄叆搴撴槑缁� -->
<PackStockDetail :visible.sync="packStockDetailShow" ref="packStockDetail" />
+ <!-- 涓嬫帹 -->
+ <el-dialog title="涓嬫帹杩愬崟缁撶畻鍗�" :visible.sync="openPush" width="1480px" append-to-body class="xsckdBox"
+ @close="close">
+ <PayMentOtherBillTranEdit :OperationType='4' :propsData='pushData'
+ :HSouceBillType=this.rowForm.HSourceBillType @editClose="pushClose" v-if="pushShow" />
+ </el-dialog>
+ <el-dialog :title="dialogTitle" :visible.sync="openData" width="1280px" append-to-body>
+ <GyCar @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyCarShow" />
+ <GyDriver @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyDriverShow" />
+ <div slot="footer" class="dialog-footer">
+ <el-button type="primary" @click="deptClickSub">纭� 瀹�</el-button>
+ <el-button @click="deptClose">鍙� 娑�</el-button>
+ </div>
+ </el-dialog>
</div>
</div>
</template>
@@ -286,12 +308,14 @@
import RowSettings from '@/views/component/rowSettings' //鍒楄缃粍浠�
import PrintList from '@/views/component/printList' //鎵撳嵃缁勪欢
import BarCodeDetail from '@/views/component/BarCodeDetail' //鏉＄爜鏄庣粏缁勪欢
-import PackStockDetail from '@/views/component/PackStockDetail' //鏉＄爜鏄庣粏缁勪欢
+import PackStockDetail from '@/views/component/PackStockDetail' //鏉＄爜鏄庣粏缁勪欢
import Edit from '@/views/logistics/transportGPS/Add_Edit_WL_YayBill' //缂栬緫椤甸潰缁勪欢
-
+import PayMentOtherBillTranEdit from "@/views/logistics/WayBillPaymentBill/Pay_WayBillPaymentBillEdit.vue"; //缂栬緫椤甸潰缁勪欢
+import GyCar from "@/views/basic/gyCar/gyCarList.vue"
+import GyDriver from "@/views/system/user/GyDriver.vue"
export default {
name: 'WL_YayBill',
- components: { RowSettings, Edit, PrintList, BarCodeDetail, PackStockDetail },
+ components: { BarCodeDetail, PackStockDetail, Edit, RowSettings, PrintList, PayMentOtherBillTranEdit, GyCar, GyDriver },
data() {
return {
baseURL: process.env.VUE_APP_BASE_API, //鍚庣鎺ュ彛鍓嶇紑(鍚庣鏈嶅姟鍣╥p鍦板潃)
@@ -334,11 +358,14 @@
title: "", // 寮瑰嚭灞傛爣棰�
open: false, // 鏄惁鏄剧ず寮瑰嚭灞�
loading: true, // 閬僵灞�
-
+ rowList: [], // 閫変腑琛屾暟鎹泦鍚�
activeSeach: '',
// addBtnShow: false, //缂栬緫缁勪欢瀹瑰櫒鏄剧ず鏍囪
editShow: false, //缂栬緫缁勪欢瀹瑰櫒鏄剧ず鏍囪
openEdit: false, //缂栬緫缁勪欢鏄剧ず鏍囪
+ pushShow: false,
+ openPush: false,
+ pushData: '',
openPrintList: false, //鎵撳嵃缁勪欢瀹瑰櫒鏄剧ず鏍囪
printListShow: false, //鎵撳嵃缁勪欢鏄剧ず鏍囪
openBtnHide: false, //鎸夐挳缁勪欢瀹瑰櫒鏄剧ず鏍囪
@@ -348,8 +375,11 @@
barCodeDetailShow: false, //鏉＄爜鏄庣粏缁勪欢瀹瑰櫒鏄剧ず鏍囪
packStockDetailShow: false, //鍖呰瀹瑰櫒鍑哄叆搴撴槑缁嗗鍣ㄦ樉绀烘爣璁�
openVolume: false, //缁存姢闆跺崟鍗犵敤浣撶Н寮圭獥鏍囪
-
-
+ openData: false, //鏁版嵁寮圭獥
+ dialogTypeNum: null, //閮ㄩ棬寮圭獥1锛屼粨搴撳脊绐�2
+ gyCarShow: false, //杞﹁締鏁版嵁缁勪欢鏄剧ず鏍囪
+ gyDriverShow: false, //鍙告満鏁版嵁缁勪欢鏄剧ず鏍囪
+ deptform: {}, //寮圭獥閫変腑鏁版嵁
// 鏌ヨ鍙傛暟
sWhere: '', // 鎷兼帴杩囨护鏉′欢
queryParams: { // form鏁版嵁
@@ -437,6 +467,7 @@
//#region 澶氶�夋閫変腑鏁版嵁
handleSelectionChange(selection) {
// this.rowForm = {}
+ this.rowList = selection
this.ids = selection.map(item => item.HInterID)
this.single = selection.length != 1
this.multiple = !selection.length
@@ -780,9 +811,24 @@
}).then(response => {
console.log(response.data.data.h_v_WL_YayBillEdit)
// this.formVolume = response.data.data.h_v_WL_YayBillEdit[form.HEntryID-1]
- this.formVolume=form
+ this.formVolume = form
this.openVolume = true
})
+ },
+ //#endregion
+ //#region 涓嬫帹杩愬崟璐圭敤
+ SelectPayWayBill() {
+ this.editShow = true
+ this.openEdit = true
+ this.OperationType = 4
+ },
+ //鍏抽棴涓嬫帹椤甸潰
+ pushClose(val) {
+ this.open = val
+ this.pushShow = false
+ this.openPush = val
+ this.clearData()
+ this.getList()
},
//#endregion
cancelVolume() {
@@ -802,7 +848,7 @@
let result = response.data
if (result.count == 1) {
this.handleQuery()
- this.openVolume = true
+ this.openVolume = true
this.$modal.msgSuccess(result.Message)
} else {
this.$modal.msgError(result.code + result.Message);
@@ -832,6 +878,38 @@
}).catch(error => {
this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
});
+ },
+ //#endregion
+ //#region 鎵撳紑涓嬫帹缁勪欢寮圭獥
+ handlePush() {
+
+ if (this.rowList && this.rowList.length > 0) {
+ var dataArray = [];
+ for (var i = 0; i < this.rowList.length; i++) {
+ if (this.rowList[i].鍗曟嵁鐘舵�� != "宸插鏍�") {
+ this.$modal.msgError("涓嬫帹澶辫触锛佹墍閫夊崟鎹��" + this.rowList[i].鍗曟嵁鍙� + "銆戜笉涓哄凡瀹℃牳鐘舵��,涓嶅厑璁镐笅鎺紒")
+ return;
+ }
+ if (this.rowList[i].HQtyMust <= 0) {
+ this.$modal.msgError("涓嬫帹澶辫触锛佹墍閫夊崟鎹��" + this.rowList[i].鍗曟嵁鍙� + "銆戝搴斿彲涓嬫帹鏁伴噺蹇呴』澶т簬 0 锛�")
+ return;
+ }
+ var temp = {
+ "HInterID": this.rowList[i].HInterID
+ , "HEntryID": this.rowList[i].HEntryID
+ , "HBillStatus": this.rowList[i].鍗曟嵁鐘舵��
+ }
+ dataArray.push(temp);
+ }
+ var datajson = {
+ "data": dataArray
+ };
+ this.pushData = JSON.stringify(datajson)
+ this.pushShow = true
+ this.openPush = true
+ } else {
+ this.$modal.msgError("璇烽�夋嫨鏁版嵁涓嬫帹锛�")
+ }
},
//#endregion
//#region 鍏抽棴/鍙嶅叧闂�
@@ -1092,6 +1170,8 @@
this.tableShow = true
this.openEdit = false
this.editShow = false
+ this.pushShow = false
+ this.openPush = false
this.handleQuery()
},
//#endregion
@@ -1112,6 +1192,102 @@
return result;
},
//#endregion
+ //#region 鏁版嵁寮圭獥
+ //#region 鎵撳紑鏁版嵁鍒楄〃寮圭獥
+ openDataDialog(num, row) {
+ this.showReset()
+ if (num == 14) {
+ this.dialogTitle = '杞﹁締鍒楄〃'
+ this.gyCarShow = true
+ this.openData = true
+ } else if (num == 15) {
+ this.dialogTitle = '鍙告満鍒楄〃'
+ this.gyDriverShow = true
+ this.openData = true
+ }
+ },
+ //#region 灏嗘暟鎹脊绐楀叏閮ㄥ彇娑堝姞杞�
+ showReset() {
+ this.gyCarShow = false
+ this.gyDriverShow = false
+ },
+ //#endregion
+ //#endregion
+
+ //#region 寮圭獥鏁版嵁鍙屽嚮杩斿洖琛ㄥ崟璧嬪�间簨浠�
+ async dbEmitData(deptRow, num) {
+ let IsAudit = null
+ if (num == 14) {
+ IsAudit = 1
+ } else if (num == 15) {
+ IsAudit = 2
+ }
+ try {
+ const response = await axios.get(this.baseURL + '/WLYayBillController/selectDriver', {
+ params: {
+ "HInterID": this.rowForm.HInterID.toString(),
+ "HcheckID": deptRow.HItemID,
+ "IsAudit": IsAudit,
+ "CurUserName": sessionStorage["HUserName"]
+ },
+ });
+ if (response.data.code == 1) {
+ // return response.data.data[0];
+ if (num == 14) {
+ this.gyCarShow = false
+ this.openData = false
+ this.$modal.msgSuccess(response.data.msg || "杞﹁締娣诲姞鎴愬姛");
+ num = 15
+ this.$nextTick(() => {
+ this.gyDriverShow = true
+ this.openData = true
+ })
+
+ } else if (num == 15) {
+ this.gyDriverShow = false
+ this.openData = false
+ this.$modal.msgSuccess(response.data.msg || "鍙告満娣诲姞鎴愬姛");
+ }
+ } else {
+ this.$modal.msgError(response.data.msg || "鑾峰彇婧愬崟鏁版嵁澶辫触");
+ }
+ } catch (error) {
+ this.$modal.msgError("鑾峰彇婧愬崟鏁版嵁鏃跺彂鐢熼敊璇紝璇风◢鍚庨噸璇�!");
+ }
+ },
+ // dbEmitData(deptRow, num) {
+ // if (num == 14) {
+
+ // this.gyCarShow = false
+ // this.openData = false
+ // } else if (num == 15) {
+ // this.gyDriverShow = false
+ // this.openData = false
+ // }
+ // this.openData = false
+ // },
+ //#endregion
+ //#region 寮圭獥鏁版嵁鍗曞嚮浜嬩欢
+ emitData(deptRow, num) {
+ this.dialogTypeNum = num
+ this.deptform = deptRow
+ },
+ //#endregion
+ //#region 寮圭獥纭畾浜嬩欢
+ deptClickSub() {
+ this.dbEmitData(this.deptform, this.dialogTypeNum)
+ this.deptform = {}
+ },
+ //#endregion
+
+ //#region 寮圭獥鍙栨秷浜嬩欢
+ deptClose() {
+ this.deptform = {}
+ this.openData = false
+ },
+ //#endregion
+ //#endregion
+
}
};
</script>
diff --git a/src/views/scMould/basicModeling/Gy_MaterialPackingRelationList.vue b/src/views/scMould/basicModeling/Gy_MaterialPackingRelationList.vue
index 7312404..485caa3 100644
--- a/src/views/scMould/basicModeling/Gy_MaterialPackingRelationList.vue
+++ b/src/views/scMould/basicModeling/Gy_MaterialPackingRelationList.vue
@@ -150,7 +150,7 @@
@click="set_CloseBill(1)">鍙嶅叧闂�
</el-button>
</el-col>
- <el-col :span="1.5">
+ <el-col :span="1.5">
<el-button type="primary" icon="el-icon-delete" size="mini" :disabled="single"
@click="set_DropBill(0)">浣滃簾
</el-button>
@@ -179,7 +179,7 @@
<div :style="item.style">
<span v-if="column.property.includes('鏃ユ湡')">{{
parseTime(row[column.property], "{y}-{m}-{d}")
- }}</span>
+ }}</span>
<el-button type="text" @click="handleEdit(row, (OperationType = 3))"
v-else-if="column.property == '鍗曟嵁鍙�'">{{ row.鍗曟嵁鍙� }}</el-button>
<span v-else>{{ row[column.label] }}</span>
@@ -215,6 +215,11 @@
export default {
name: "Kf_StockOutRequestBillList",
components: { RowSettings, Edit, PrintList, BarCodeDetail },
+ props: {
+ openPage: { type: String, },
+ propHMaterID: { },
+ propHOrgID: {},
+ },
data() {
return {
activeSeach: "",
@@ -388,6 +393,12 @@
}
if (this.pageSize == 0) {
this.pageSize = 50;
+ }
+ if (this.propHOrgID) {
+ this.sWhere += " and HOrgID like '%" + this.propHOrgID + "%'";
+ }
+ if (this.propHMaterID) {
+ this.sWhere += " and HMaterID like '%" + this.propHMaterID + "%'";
}
// 鍒楄〃
axios.get(this.$baseUrl + "/Gy_MaterialPackingRelation/Gy_MaterialPackingRelationList", {
@@ -641,6 +652,9 @@
this.selectedRow = row; // 璁板綍褰撳墠閫変腑鐨勮
this.lastSelectedRowIndex = this.tableData.indexOf(row);
this.$refs.tableData.toggleRowSelection(row);
+ if (this.openPage) {
+ this.$emit('deptEmit', row, 17)
+ }
},
//閫変腑琛岄珮浜牱寮�
rowStyle({ row, rowIndex }) {
@@ -651,7 +665,12 @@
//鍙屽嚮琛�
handleDblclick(row, column, cell, event) {
this.OperationType = 3;
- this.handleEdit();
+ if (this.openPage) {
+ this.$emit('deptEmitDb', row, 17)
+ }
+ else {
+ this.handleEdit();
+ }
},
// 澶氶�夋閫変腑鏁版嵁
handleSelectionChange(selection) {
@@ -764,22 +783,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();
},
diff --git a/src/views/scMould/basicModeling/Gy_MouldFile.vue b/src/views/scMould/basicModeling/Gy_MouldFile.vue
index 03b5789..b430e67 100644
--- a/src/views/scMould/basicModeling/Gy_MouldFile.vue
+++ b/src/views/scMould/basicModeling/Gy_MouldFile.vue
@@ -107,6 +107,16 @@
</el-date-picker>
</el-form-item>
</el-col>
+ <el-col :span="6">
+ <el-form-item label="鎵樹綋绉�" prop="HPackV" v-show="isShow">
+ <el-input v-model="form.HPackV" placeholder="璇疯緭鍏ユ墭浣撶Н" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="鎵樻爣鍑嗗鍣ㄦ暟閲�" prop="HStandardQtyForMouldInPack" v-show="isShow">
+ <el-input v-model="form.HStandardQtyForMouldInPack" placeholder="璇疯緭鍏ユ墭鏍囧噯瀹瑰櫒鏁伴噺" />
+ </el-form-item>
+ </el-col>
</el-row>
<el-row>
<el-col :span="6">
@@ -1002,6 +1012,8 @@
HInComDate: moment(new Date()).format('YYYY-MM-DD'),
DateTime: moment(new Date()).format('YYYY-MM-DD'),
HCalibrationDate: moment(new Date()).format('YYYY-MM-DD'),
+ HPackV:0,
+ HStandardQtyForMouldInPack:0,
}
this.editData = []
this.editBtData = []
@@ -1155,9 +1167,11 @@
this.form.HTransPackFlag = data.鍛ㄨ浆瀹瑰櫒鏍囪
this.form.HSendPackFlag = data.鍙戣揣瀹瑰櫒鏍囪
this.form.HMouldFoldHeight = data.鎶樺彔楂樺害
- this.form.HMouldLength = data.闀�
+ this.form.HMouldLength = data.闀�
this.form.HMouldWidth = data.瀹�
this.form.HMouldHeight = data.楂�
+ this.form.HPackV = data.鎵樹綋绉�
+ this.form.HStandardQtyForMouldInPack = data.鎵樻爣鍑嗗鍣ㄦ暟閲�
for (var i = 0; i < result.data.length; i++) {
this.editData.push(
{
diff --git a/src/views/scMould/warehouse/Sc_MouldInRequestBillEdit.vue b/src/views/scMould/warehouse/Sc_MouldInRequestBillEdit.vue
index d80ed35..7b896ff 100644
--- a/src/views/scMould/warehouse/Sc_MouldInRequestBillEdit.vue
+++ b/src/views/scMould/warehouse/Sc_MouldInRequestBillEdit.vue
@@ -574,13 +574,13 @@
HMaker: '',
HUpDater: '',
HChecker: '',
- HMakeDate: new Date(),
- HUpDateDate: '',
- HCheckDate: '',
+ HMakeDate: moment(new Date()).format('YYYY-MM-DD hh:mm:ss'),
+ HUpDateDate: moment(new Date()).format('YYYY-MM-DD hh:mm:ss'),
+ HCheckDate: moment(new Date()).format('YYYY-MM-DD hh:mm:ss'),
HCloseMan: '',
HDeleteMan: '',
- HCloseDate: '',
- HDeleteDate: '',
+ HCloseDate: moment(new Date()).format('YYYY-MM-DD hh:mm:ss'),
+ HDeleteDate: moment(new Date()).format('YYYY-MM-DD hh:mm:ss'),
}
this.editData = []
this.editData1 = []
diff --git a/src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillEdit.vue b/src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillEdit.vue
index 83dc5d9..d2d169a 100644
--- a/src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillEdit.vue
+++ b/src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillEdit.vue
@@ -644,13 +644,13 @@
HMaker: '',
HUpDater: '',
HChecker: '',
- HMakeDate: new Date(),
- HUpDateDate: '',
- HCheckDate: '',
+ HMakeDate: moment(new Date()).format('YYYY-MM-DD hh:mm:ss'),
+ HUpDateDate: moment(new Date()).format('YYYY-MM-DD hh:mm:ss'),
+ HCheckDate: moment(new Date()).format('YYYY-MM-DD hh:mm:ss'),
HCloseMan: '',
HDeleteMan: '',
- HCloseDate: '',
- HDeleteDate: '',
+ HCloseDate: moment(new Date()).format('YYYY-MM-DD hh:mm:ss'),
+ HDeleteDate: moment(new Date()).format('YYYY-MM-DD hh:mm:ss'),
}
this.editData = []
this.editData1 = []
diff --git a/src/views/scMould/warehouse/Sc_MouldOutRequestBillEdit.vue b/src/views/scMould/warehouse/Sc_MouldOutRequestBillEdit.vue
index 96119ca..4c4ffb2 100644
--- a/src/views/scMould/warehouse/Sc_MouldOutRequestBillEdit.vue
+++ b/src/views/scMould/warehouse/Sc_MouldOutRequestBillEdit.vue
@@ -667,13 +667,13 @@
HMaker: '',
HUpDater: '',
HChecker: '',
- HMakeDate: new Date(),
- HUpDateDate: '',
- HCheckDate: '',
+ HMakeDate: moment(new Date()).format('YYYY-MM-DD hh:mm:ss'),
+ HUpDateDate: moment(new Date()).format('YYYY-MM-DD hh:mm:ss'),
+ HCheckDate: moment(new Date()).format('YYYY-MM-DD hh:mm:ss'),
HCloseMan: '',
HDeleteMan: '',
- HCloseDate: '',
- HDeleteDate: '',
+ HCloseDate: moment(new Date()).format('YYYY-MM-DD hh:mm:ss'),
+ HDeleteDate: moment(new Date()).format('YYYY-MM-DD hh:mm:ss'),
}
this.editData = []
this.editData1 = []
diff --git a/src/views/scMould/warehouse/Sc_MouldProdBackBillEdit.vue b/src/views/scMould/warehouse/Sc_MouldProdBackBillEdit.vue
index b365975..3963759 100644
--- a/src/views/scMould/warehouse/Sc_MouldProdBackBillEdit.vue
+++ b/src/views/scMould/warehouse/Sc_MouldProdBackBillEdit.vue
@@ -810,13 +810,13 @@
HMaker: '',
HUpDater: '',
HChecker: '',
- HMakeDate: new Date(),
- HUpDateDate: '',
- HCheckDate: '',
+ HMakeDate: moment(new Date()).format('YYYY-MM-DD hh:mm:ss'),
+ HUpDateDate: moment(new Date()).format('YYYY-MM-DD hh:mm:ss'),
+ HCheckDate: moment(new Date()).format('YYYY-MM-DD hh:mm:ss'),
HCloseMan: '',
HDeleteMan: '',
- HCloseDate: '',
- HDeleteDate: '',
+ HCloseDate: moment(new Date()).format('YYYY-MM-DD hh:mm:ss'),
+ HDeleteDate: moment(new Date()).format('YYYY-MM-DD hh:mm:ss'),
}
this.editData = []
this.editData1 = []
diff --git a/src/views/scMould/warehouse/Sc_MouldProdMoveBillEdit.vue b/src/views/scMould/warehouse/Sc_MouldProdMoveBillEdit.vue
index 76ed53c..9fdfccc 100644
--- a/src/views/scMould/warehouse/Sc_MouldProdMoveBillEdit.vue
+++ b/src/views/scMould/warehouse/Sc_MouldProdMoveBillEdit.vue
@@ -883,13 +883,13 @@
HMaker: '',
HUpDater: '',
HChecker: '',
- HMakeDate: new Date(),
- HUpDateDate: '',
- HCheckDate: '',
+ HMakeDate: moment(new Date()).format('YYYY-MM-DD hh:mm:ss'),
+ HUpDateDate: moment(new Date()).format('YYYY-MM-DD hh:mm:ss'),
+ HCheckDate: moment(new Date()).format('YYYY-MM-DD hh:mm:ss'),
HCloseMan: '',
HDeleteMan: '',
- HCloseDate: '',
- HDeleteDate: '',
+ HCloseDate: moment(new Date()).format('YYYY-MM-DD hh:mm:ss'),
+ HDeleteDate: moment(new Date()).format('YYYY-MM-DD hh:mm:ss'),
}
this.editData = []
this.editData1 = []
diff --git a/src/views/scMould/warehouse/Sc_MouldProdOutBillEdit.vue b/src/views/scMould/warehouse/Sc_MouldProdOutBillEdit.vue
index ee9b2f9..3bad298 100644
--- a/src/views/scMould/warehouse/Sc_MouldProdOutBillEdit.vue
+++ b/src/views/scMould/warehouse/Sc_MouldProdOutBillEdit.vue
@@ -808,13 +808,13 @@
HMaker: '',
HUpDater: '',
HChecker: '',
- HMakeDate: new Date(),
- HUpDateDate: '',
- HCheckDate: '',
+ HMakeDate: moment(new Date()).format('YYYY-MM-DD hh:mm:ss'),
+ HUpDateDate: moment(new Date()).format('YYYY-MM-DD hh:mm:ss'),
+ HCheckDate: moment(new Date()).format('YYYY-MM-DD hh:mm:ss'),
HCloseMan: '',
HDeleteMan: '',
- HCloseDate: '',
- HDeleteDate: '',
+ HCloseDate: moment(new Date()).format('YYYY-MM-DD hh:mm:ss'),
+ HDeleteDate: moment(new Date()).format('YYYY-MM-DD hh:mm:ss'),
}
this.editData = []
this.editData1 = []
diff --git a/src/views/system/user/GyDriver.vue b/src/views/system/user/GyDriver.vue
index 474bfae..d8b9a4a 100644
--- a/src/views/system/user/GyDriver.vue
+++ b/src/views/system/user/GyDriver.vue
@@ -1,301 +1,143 @@
<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>
+ <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
- />
+ <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
- />
+ <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"
- >
+ <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
- >
+ <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 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>
- </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>
+ <!-- 绗竴缁勮繃婊ゆ潯浠� -->
+ <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>
+ <!-- 绗簩缁勮繃婊ゆ潯浠� -->
+ <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>
+ <!-- 绗笁缁勮繃婊ゆ潯浠� -->
+ <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="
+ <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"
- >
+ <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
- >
+ <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>
@@ -304,15 +146,8 @@
<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-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
@@ -326,190 +161,77 @@
>
</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-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-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-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-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-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-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-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-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-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-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"
- />
+ <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"
- >
+ <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')
- "
- >
+ <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',
- }"
- >
+ <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',
- }"
- >
+ <span v-else-if="column.property === '瀹℃牳浜�'" :style="{
+ color: row[column.property] ? '#67c23a' : '#909399',
+ }">
{{ row[column.property] || "鏈鏍�" }}
</span>
<span v-else>{{ row[column.property] }}</span>
@@ -519,48 +241,19 @@
</template>
</el-table>
- <pagination
- v-show="total > 0"
- :total="total"
- :page.sync="page"
- :limit.sync="pageSize"
- :pageSizes="pageSizes"
- @pagination="getList"
- />
+ <pagination v-show="total > 0" :total="total" :page.sync="page" :limit.sync="pageSize" :pageSizes="pageSizes"
+ @pagination="getList" />
<!-- 闅愯棌鍒楄缃脊绐� -->
- <el-dialog
- title="闅愯棌鍒楄缃�"
- :visible.sync="openRowHide"
- width="816px"
- append-to-body
- >
- <RowSettings
- :colName="btResList"
- :HModName="HModName"
- @rowEditClose="rowSetClose"
- v-if="rowHideShow"
- />
+ <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"
- />
+ <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> -->
@@ -568,132 +261,47 @@
</el-dialog>
<!-- 瀵煎叆寮圭獥 -->
- <el-dialog
- :title="upload.title"
- :visible.sync="upload.open"
- width="1500px"
- append-to-body
- >
+ <el-dialog :title="upload.title" :visible.sync="upload.open" width="1500px" append-to-body>
<div style="margin-top: -20px">
<el-button type="primary" @click="set_AddNew">瀵煎叆鏁版嵁</el-button>
<el-button type="primary" @click="upload.open = false">閫� 鍑�</el-button>
- <el-upload
- ref="upload"
- :limit="1"
- accept=".xlsx, .xls"
- style="display: inline-block; margin-left: 10px"
- :action="upload.url + '?updateSupport=' + upload.updateSupport"
- :disabled="upload.isUploading"
- :on-progress="handleFileUploadProgress"
- :on-success="handleFileSuccess"
- >
+ <el-upload ref="upload" :limit="1" accept=".xlsx, .xls" style="display: inline-block; margin-left: 10px"
+ :action="upload.url + '?updateSupport=' + upload.updateSupport" :disabled="upload.isUploading"
+ :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess">
<el-button type="primary">鏂囦欢涓婁紶</el-button>
</el-upload>
</div>
- <el-table
- :data="uploadData"
- v-loading="uploadTableLoading"
- :row-class-name="uploadDataIndex"
- border
- height="550"
- >
- <el-table-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 :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
- >
+ <el-button size="mini" type="text" icon="el-icon-delete"
+ @click="uploadDataDelete(scope.row)">鍒犻櫎</el-button>
</template>
</el-table-column>
</el-table>
- <pagination
- v-show="uploadTotal > 0"
- :total="uploadTotal"
- :page.sync="uploadPage"
- :limit.sync="uploadPageSize"
- :pageSizes="uploadPageSizes"
- @pagination="currentPage"
- />
+ <pagination v-show="uploadTotal > 0" :total="uploadTotal" :page.sync="uploadPage" :limit.sync="uploadPageSize"
+ :pageSizes="uploadPageSizes" @pagination="currentPage" />
</el-dialog>
<!-- 杩囨护鏂规寮圭獥 -->
- <el-dialog
- title="杩囨护鏂规鍒楄〃"
- :visible.sync="openFilterScheme"
- width="80%"
- append-to-body
- >
+ <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 :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 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
- >
+ <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>
@@ -701,7 +309,7 @@
<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>
@@ -743,7 +351,7 @@
{ label: "涓嶅寘鍚�", value: "10" },
],
-
+
sWhere: "",
organizationList: [],
filterColumnList: [],
@@ -824,8 +432,7 @@
async initData() {
try {
const userRes = await axios.get(
- `${this.$baseUrl}/Web/GetUser?UserName=${
- sessionStorage.getItem("UserName") || "001"
+ `${this.$baseUrl}/Web/GetUser?UserName=${sessionStorage.getItem("UserName") || "001"
}&PassWord=123456&HOrgName=100038`
);
if (userRes.data.data && userRes.data.data[0]) {
@@ -853,7 +460,7 @@
async getList() {
this.tableShow = false;
this.loading = true;
- console.log("鑾峰彇鍒楄〃鏁版嵁...",this.sWhere );
+ console.log("鑾峰彇鍒楄〃鏁版嵁...", this.sWhere);
try {
const params = {
sWhere: this.sWhere || "",
@@ -1025,7 +632,7 @@
// conditions.push(`HUSEORGID = '${this.queryParams.HUSEORGID}'`);
// }
-
+
if (this.queryParams.ColName !== "0" && this.queryParams.Comparator !== "0") {
const condition = this.buildCondition(
this.queryParams.ColName,
@@ -1035,7 +642,7 @@
if (condition) conditions.push(condition);
}
-
+
if (
this.queryParams.ColName1 !== "0" &&
this.queryParams.Comparator1 !== "0"
@@ -1060,14 +667,14 @@
if (condition) conditions.push(condition);
}
-
+
if (conditions.length > 0) {
- this.sWhere ="and "+conditions;
+ this.sWhere = "and " + conditions;
}
console.log("鏌ヨ鏉′欢:", this.sWhere);
//this.sWhere += this.addSWhereByOpenType();
- this.page = 1;
+ this.page = 1;
this.getList();
},
@@ -1075,15 +682,15 @@
if (!content) return null;
switch (comparator) {
- case "7":
+ case "7":
return `${colName} like '%${content}%'`;
- case "8":
+ case "8":
return `${colName} like '%${content}'`;
- case "9":
+ case "9":
return `${colName} like '${content}%'`;
- case "10":
+ case "10":
return `${colName} not like '%${content}%'`;
- default:
+ default:
return `${colName} ${comparator} '${content}'`;
}
},
@@ -1148,6 +755,9 @@
// 鐐瑰嚮琛�
handleRowClick(row) {
this.$refs.tableData.toggleRowSelection(row);
+ if (this.openPage) {
+ this.$emit('deptEmit', row, 15)
+ }
},
// 琛屾牱寮�
@@ -1266,6 +876,13 @@
if (res.data.count == 1) {
this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+ this.$refs.tableData.clearSelection();
+ // 娓呯┖閫変腑鏁版嵁
+ this.ids = [];
+ this.rowForm = {};
+ // 閲嶇疆鎸夐挳鐘舵��
+ this.single = true;
+ this.multiple = true;
this.getList();
} else {
this.$modal.msgError(res.data.Message || "鍒犻櫎澶辫触");
@@ -1298,6 +915,14 @@
if (res.data.count == 1) {
this.$modal.msgSuccess(`${action}鎴愬姛`);
+ // 娓呴櫎琛ㄦ牸閫変腑鐘舵��
+ this.$refs.tableData.clearSelection();
+ // 娓呯┖閫変腑鏁版嵁
+ this.ids = [];
+ this.rowForm = {};
+ // 閲嶇疆鎸夐挳鐘舵��
+ this.single = true;
+ this.multiple = true;
this.getList();
} else {
this.$modal.msgError(res.data.Message || `${action}澶辫触`);
@@ -1330,6 +955,14 @@
if (res.data.count == 1) {
this.$modal.msgSuccess(`${action}鎴愬姛`);
+ // 娓呴櫎琛ㄦ牸閫変腑鐘舵��
+ this.$refs.tableData.clearSelection();
+ // 娓呯┖閫変腑鏁版嵁
+ this.ids = [];
+ this.rowForm = {};
+ // 閲嶇疆鎸夐挳鐘舵��
+ this.single = true;
+ this.multiple = true;
this.getList();
} else {
this.$modal.msgError(res.data.Message || `${action}澶辫触`);
@@ -1375,7 +1008,7 @@
);
},
-
+
parseTime(time, cFormat) {
if (arguments.length === 0) {
return null;
@@ -1561,7 +1194,7 @@
applyFilterScheme(row) {
this.currentFilterScheme = row.鏂规鍚嶇О;
this.currentFilterRemark = row.澶囨敞;
-
+
// 杩欓噷搴旇鏍规嵁鏂规鍐呭璁剧疆鏌ヨ鏉′欢
// 鐢变簬鏂规鏁版嵁缁撴瀯澶嶆潅锛岃繖閲屽彧鍋氱畝鍗曟紨绀�
this.$modal.msgSuccess(`宸插簲鐢ㄦ柟妗堬細${row.鏂规鍚嶇О}`);
@@ -1572,7 +1205,7 @@
async deleteFilterScheme(row) {
try {
await this.$modal.confirm(`纭瑕佸垹闄ゆ柟妗�"${row.鏂规鍚嶇О}"鍚楋紵`);
-
+
const res = await axios.post(`${this.$baseUrl}/Xt_FastICScheme/delete`, {
HInterID: row.hmainid,
});
diff --git a/src/views/system/user/GyDriverEdit.vue b/src/views/system/user/GyDriverEdit.vue
index f4a0ce6..925035d 100644
--- a/src/views/system/user/GyDriverEdit.vue
+++ b/src/views/system/user/GyDriverEdit.vue
@@ -149,7 +149,7 @@
<div class="form-row">
<el-form-item label="韬唤璇佸彿鐮�">
<el-input
- v-model="formData.identityID"
+ v-model="formData.HIDCard"
placeholder="璇疯緭鍏ヨ韩浠借瘉鍙风爜"
clearable
:disabled="isViewMode"
@@ -159,7 +159,7 @@
<el-form-item label="鎵嬫満鍙风爜">
<el-input
- v-model="formData.Telephone"
+ v-model="formData.HPhone"
placeholder="璇疯緭鍏ユ墜鏈哄彿鐮�"
clearable
:disabled="isViewMode"
@@ -168,7 +168,7 @@
<el-form-item label="椹剧収绫诲瀷">
<el-select
- v-model="formData.LicenseType"
+ v-model="formData.HDriverCardType"
placeholder="璇烽�夋嫨椹剧収绫诲瀷"
:disabled="isViewMode"
>
@@ -182,7 +182,7 @@
<el-form-item label="鍙告満绫诲瀷">
<el-select
- v-model="formData.DriverType"
+ v-model="formData.HEmpType"
placeholder="璇烽�夋嫨鍙告満绫诲瀷"
:disabled="isViewMode"
>
@@ -316,10 +316,10 @@
HDeptName: "",
HDeptID: "0",
HDepNumber: "",
- identityID: "",
- Telephone: "",
- LicenseType: "A1",
- DriverType: "鍥哄畾",
+ HIDCard: "",
+ HPhone: "",
+ HDriverCardType: "A1",
+ HEmpType: "鍥哄畾",
HStopflag: "0",
checkboxHStopflag: 0,
HRemark: "",
@@ -332,6 +332,7 @@
HStopEmp: "",
HStopDate: "",
Organization: "",
+ HPhone: "",
},
// 琛ㄥ崟楠岃瘉瑙勫垯
@@ -497,16 +498,17 @@
HNumber: "椹鹃┒鍛樹唬鐮�",
HName: "椹鹃┒鍛樺悕绉�",
HHelpCode: "鐭唬鐮�",
+ HCompID: "鎵�灞炲叕鍙窱D",
HDeptName: "鎵�灞炲叕鍙稿悕绉�",
HDepNumber: "鎵�灞炲叕鍙镐唬鐮�",
HDeptID: "鎵�灞炲叕鍙窱D",
- identityID: "韬唤璇佸彿鐮�",
- Telephone: "鎵嬫満鍙风爜",
- HStopflag: "绂佺敤鏍囪",
+ HIDCard: "韬唤璇佸彿鐮�",
+ HPhone: "鎵嬫満鍙风爜",
+ HStopflag: "绂佺敤鏍囪瘑",
HRemark: "澶囨敞",
HUSEORGID: "HUSEORGID",
- LicenseType: "椹剧収绫诲瀷",
- DriverType: "鍙告満绫诲瀷",
+ HDriverCardType: "椹剧収绫诲瀷",
+ HEmpType: "鍙告満绫诲瀷",
HMakeEmp: "鍒涘缓浜�",
HMakeDate: "鍒涘缓鏃ユ湡",
HCheckEmp: "瀹℃牳浜�",
@@ -525,7 +527,7 @@
}
});
- if (data.绂佺敤鏍囪) {
+ if (data.绂佺敤鏍囪瘑) {
this.formData.checkboxHStopflag = 1;
this.formData.HStopflag = "1";
} else {
diff --git a/src/views/warehouse/barcodeMaster/Gy_BarCodeBillList.vue b/src/views/warehouse/barcodeMaster/Gy_BarCodeBillList.vue
index f4535ed..524f878 100644
--- a/src/views/warehouse/barcodeMaster/Gy_BarCodeBillList.vue
+++ b/src/views/warehouse/barcodeMaster/Gy_BarCodeBillList.vue
@@ -135,6 +135,14 @@
</el-button>
</el-col>
<el-col :span="1.5">
+ <el-button type="primary" icon="el-icon-delete" size="mini" @click="handleBatchLosingBar(0)">鏉＄爜瀹炵墿涓㈠け鎵归噺鏍囪
+ </el-button>
+ </el-col>
+ <el-col :span="1.5">
+ <el-button type="primary" icon="el-icon-delete" size="mini" @click="handleBatchLosingBar(1)">鏉＄爜瀹炵墿涓㈠け鎵归噺鍙嶆爣璁�
+ </el-button>
+ </el-col>
+ <el-col :span="1.5">
<el-button type="primary" icon="el-icon-download" size="mini" @click="handleExport">瀵煎嚭</el-button>
</el-col>
<el-col :span="1.5">
@@ -656,6 +664,68 @@
},
//#endregion
+ //#region 鏉＄爜瀹炵墿涓㈠け鎵归噺 鏍囪/鍙嶆爣璁�
+ handleBatchLosingBar(num) {
+ if (this.checkDataList.length == 0) {
+ this.$modal.msgError("璇烽�夋嫨鏁版嵁");
+ }
+ else if(this.checkDataList.length >100){
+ this.$modal.msgError("閫夋嫨鏁版嵁涓嶅彲澶т簬100鏉★紒");
+ }
+ else {
+ var HInterIDListStr = "";
+ for(var i=0;i<this.checkDataList.length;i++){
+ if(num == 0 && this.checkDataList[i]["鏉＄爜鐘舵��"]!="姝ｅ父"){
+ this.$message.error('鏉＄爜銆�' + this.checkDataList[i]["鏉＄爜缂栧彿"] + "銆戯細褰撳墠鏉＄爜鐨勬潯鐮佺姸鎬佷笉涓恒�愭甯搞�戯紝鏍囪澶辫触锛侊紒");
+ return;
+ }else if(num == 1 && this.checkDataList[i]["鏉＄爜鐘舵��"]!="鏉＄爜瀹炵墿涓㈠け"){
+ this.$message.error('鏉＄爜銆�' + this.checkDataList[i]["鏉＄爜缂栧彿"] + "銆戯細褰撳墠鏉＄爜鐨勬潯鐮佺姸鎬佷笉涓恒�愭潯鐮佸疄鐗╀涪澶便�戯紝鍙嶆爣璁板け璐ワ紒锛�");
+ return;
+ }
+
+ if(i==this.checkDataList.length-1){
+ HInterIDListStr += this.checkDataList[i].hmainid.toString();
+ }else{
+ HInterIDListStr += this.checkDataList[i].hmainid.toString() + ",";
+ }
+ }
+
+ try{
+ var sql = "";
+ if(num == 0){
+ sql = "update Gy_BarCodeBill set HBarCodeStatus = '鏉＄爜瀹炵墿涓㈠け' where HItemID in (" + HInterIDListStr + ") select * from Gy_BarCodeBill where HItemID in (" + HInterIDListStr + ")";
+ }else if(num == 1){
+ sql = "update Gy_BarCodeBill set HBarCodeStatus = '姝ｅ父' where HItemID in (" + HInterIDListStr + ") select * from Gy_BarCodeBill where HItemID in (" + HInterIDListStr + ")";
+ }
+
+ var ModRightNameCheck = "";
+ axios.get(this.$baseUrl + "/CommonModel/searchMethod", {
+ params: {
+ "sql": sql
+ , "user": sessionStorage["HUserName"]
+ , "ModRightNameCheck": ModRightNameCheck
+ }
+ }).then(response => {
+ var data1 = response.data
+ if (data1.count == 1) {
+ if(data1.data.length>0){
+ this.$message.error('鎿嶄綔鎴愬姛锛侊紒');
+ this.handleQuery();
+ }else{
+ this.$message.error('鎿嶄綔澶辫触锛侊紒鏈煡璇㈠埌鏉＄爜璁板綍锛侊紒');
+ }
+ }
+ else {
+ this.$message.error('鎿嶄綔澶辫触锛侊紒' + data1.Message );
+ }
+ });
+ }catch(error){
+ this.$message.error('鎺ュ彛璇锋眰澶辫触锛侊紒' + error );
+ }
+ }
+ },
+ //#endregion
+
//#region 鍒楄缃�
handleRowHide() {
this.rowHideShow = true
--
Gitblit v1.9.1