From 1791a782cad48b6932b2415f5f2ef96bb7238493 Mon Sep 17 00:00:00 2001
From: llj <132905093+newwwwwwtree@users.noreply.github.com>
Date: 星期三, 19 十一月 2025 14:49:21 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI
---
src/views/basic/gyStockPlace/gyStockPlaceEdit.vue | 87 ++
src/views/sell/XsSeOutStockBackBillList.vue | 4
src/views/basic/gyStockPlace/gyStockPlace.vue | 63 +
src/views/component/employee/index.vue | 4
src/views/sell/XsSeOutStockBackBillEdit.vue | 72 +-
src/views/basic/gyEmployee/gyEmployeeEdit.vue | 190 +++---
src/router/index.js | 51 +
src/views/basic/gyWarehouse/gyWarehouse.vue | 85 ++
src/views/basic/gyWarehouse/gyWarehouseEdit.vue | 134 ++--
src/views/purchase/cgPoOrderBill/cgPoOrderBill.vue | 15
src/views/ICMO/ScICMOBillEdit.vue | 178 ++--
src/views/purchase/cgPoOrderBill/cgPoOrderBillEdit.vue | 116 +-
src/views/sell/xsSeOrderBill/xsSeOrderBillEdit.vue | 112 +-
src/views/basic/gyEmployee/gyEmployee.vue | 479 ++++++++++++---
src/views/sell/XsSeOutStockBillEdit.vue | 117 ++-
src/views/purchase/cgPoInStockBill/cgPoInStockBillEdit.vue | 106 +-
16 files changed, 1,127 insertions(+), 686 deletions(-)
diff --git a/src/router/index.js b/src/router/index.js
index 4c8ffda..39879db 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -127,7 +127,7 @@
},
],
},
- //閿�鍞��璐у崟
+ //閿�鍞��璐у崟
{
path: "/sell/StockBillMainList/KfICStockBillMainList",
component: Layout,
@@ -141,10 +141,10 @@
children: [
{
path: "/sell/StockBillMainList/KfICStockBillMainList",
- component: () =>import ("@/views/sell/Kf_ICStockBillMainList/Kf_ICStockBillMainList.vue"),
+ component: () => import("@/views/sell/Kf_ICStockBillMainList/Kf_ICStockBillMainList.vue"),
name: "KfICStockBillMainList",
meta: { title: "閿�鍞��璐у崟", activeMenu: "sell/StockBillMainList" },
- },
+ },
],
},
//閿�鍞��璐у崟缂栬緫椤甸潰
@@ -160,10 +160,10 @@
children: [
{
path: "/sell/StockBillMainList/KfICStockBillMainListEdit",
- component: () =>import ("@/views/sell/Kf_ICStockBillMainList/Kf_ICStockBillMainListEdit.vue"),
+ component: () => import("@/views/sell/Kf_ICStockBillMainList/Kf_ICStockBillMainListEdit.vue"),
name: "KfICStockBillMainListEdit",
meta: { title: "閿�鍞��璐у崟缂栬緫", activeMenu: "sell/StockBillMainList" },
- },
+ },
],
},
//鐢ㄦ埛鍒楄〃
@@ -198,8 +198,7 @@
children: [
{
path: "/purchase/POStockInBill/POStockInBillList",
- component: () =>
- import("@/views/CaiGouGuanLi/CaiGouRuKu/Kf_POStockInBillList.vue"),
+
name: "POStockInBillList",
meta: { title: "閲囪喘鍏ュ簱鍗�", activeMenu: "purchase/POStockInBill" },
},
@@ -218,8 +217,7 @@
children: [
{
path: "/purchase/POStockInBill/POStockInBillEdit",
- component: () =>
- import("@/views/CaiGouGuanLi/CaiGouRuKu/Kf_POStockInBillEdit.vue"),
+
name: "POStockInBillEdit",
meta: {
title: "閲囪喘鍏ュ簱鍗曠紪杈�",
@@ -350,6 +348,7 @@
component: () => import("@/views/sell/xsSeOrderBill/xsSeOrderBill"),
name: "XsSeOrderBill",
meta: { title: "閿�鍞鍗曠淮鎶�", activeMenu: "sell/seOrder" },
+
},
{
path: "/sell/seOrder/xsSeOrderBillEdit",
@@ -379,6 +378,7 @@
},
{
path: "/purchase/poOrder/cgPoOrderBillEdit",
+
component: () =>
import("@/views/purchase/cgPoOrderBill/cgPoOrderBillEdit"),
name: "CgPoOrderBillEdit",
@@ -510,6 +510,7 @@
},
// i鑺傜偣椤甸潰
{
+
path: "/iframe",
component: () => import("@/layout/emptyLayout"), // 浣跨敤绌哄竷灞�
hidden: true, // 鍦ㄤ晶杈规爮涓嶆樉绀�
@@ -521,6 +522,7 @@
meta: { title: "閫�璐ч�氱煡鍗�", noCache: true, noLoading: true },
},
{
+
path: "XsSeOutStockBillEdit",
component: () => import("@/views/sell/XsSeOutStockBillEdit"), // 鍙戣揣閫氱煡鍗�
name: "IframeXsSeOutStockBillEdit",
@@ -531,7 +533,32 @@
component: () => import('@/views/sell/xsSeOrderBill/xsSeOrderBillEdit'), // 閿�鍞鍗�
name: 'IframeXsSeOrderBillEdit',
meta: { title: '閿�鍞鍗�', noCache: true, noLoading: true }
- }
+ },
+ {
+ path: 'ScICMOBillEdit',
+ component: () => import('@/views/ICMO/ScICMOBillEdit'), // 鐢熶骇璁㈠崟
+ name: 'IframeScICMOBillEdit',
+ meta: { title: '鐢熶骇璁㈠崟', noCache: true, noLoading: true }
+ },
+ {
+ path: 'CgPoOrderBillEdit',
+ component: () => import('@/views/purchase/cgPoOrderBill/cgPoOrderBillEdit'), // 閲囪喘璁㈠崟
+ name: 'IframeCgPoOrderBillEdit',
+ meta: { title: '閲囪喘璁㈠崟', noCache: true, noLoading: true }
+ },
+ {
+ path: 'CgPoInStockBillEdit',
+ component: () => import('@/views/purchase/cgPoInStockBill/cgPoInStockBillEdit'), // 鏀舵枡閫氱煡鍗�
+ name: 'IframeCgPoInStockBillEdit',
+ meta: { title: '鏀舵枡閫氱煡鍗�', noCache: true, noLoading: true }
+ },
+ {
+ path: 'GyWarehouse',
+ component: () => import("@/views/basic/gyWarehouse/gyWarehouse"), // 浠撳簱
+ name: 'IframeGyWarehouse',
+ meta: { title: '浠撳簱鍒楄〃', noCache: true, noLoading: true }
+ },
+
]
}, // 瀹㈡埛
{
@@ -594,9 +621,11 @@
children: [
{
path: "/purchase/POStockInBill/FbStepFoldinBillList",
+
component: () =>
import("@/views/FbStepFoldinBillList/fbStepFoldinBillList.vue"),
name: "FbStepFoldinBillList",
+
meta: {
title: "鍒嗗竷寮忚皟鍏ュ崟鍒楄〃",
activeMenu: "/purchase/POStockInBill",
@@ -617,9 +646,11 @@
children: [
{
path: "/purchase/POStockInBill/FbStepFoldOutBillList",
+
component: () =>
import("@/views/FbStepFoldOutBillList/fbStepFoldOutBillList.vue"),
name: "FbStepFoldOutBillList",
+
meta: {
title: "鍒嗗竷寮忚皟鍑哄崟鍒楄〃",
activeMenu: "/purchase/POStockInBill",
diff --git a/src/views/ICMO/ScICMOBillEdit.vue b/src/views/ICMO/ScICMOBillEdit.vue
index cc4a8f8..e98308d 100644
--- a/src/views/ICMO/ScICMOBillEdit.vue
+++ b/src/views/ICMO/ScICMOBillEdit.vue
@@ -1089,96 +1089,100 @@
}
// this.form.BillType = data.HSourceBillType;
- Object.assign(this.form, {
- HBillNo: data[0].鍗曟嵁鍙�,
- HInterID: data[0].hmainid,
- HPRDORGID: data[0].HPRDORGID,
- HDate: dayjs(new Date(data[0].鏃ユ湡)).format("YYYY-MM-DD"),
- HSeOrderBillNo: data[0].婧愬崟鍗曞彿,
- HSeOrderInterID: data[0].婧愬崟涓诲唴鐮�,
- HSeOrderEntryID: data[0].婧愬崟瀛愬唴鐮�,
- HMainSourceBillSubType: data[0].HMainSourceBillSubType,
+ this.form = {
+ ...{
+ HBillNo: data[0].鍗曟嵁鍙�,
+ HInterID: data[0].hmainid,
+ HPRDORGID: data[0].HPRDORGID,
+ HDate: dayjs(new Date(data[0].鏃ユ湡)).format("YYYY-MM-DD"),
+ HSeOrderBillNo: data[0].婧愬崟鍗曞彿,
+ HSeOrderInterID: data[0].婧愬崟涓诲唴鐮�,
+ HSeOrderEntryID: data[0].婧愬崟瀛愬唴鐮�,
+ HMainSourceBillSubType: data[0].HMainSourceBillSubType,
- HSourceInterID: data[0].HSourceInterID,
- HSourceEntryID: data[0].HSourceEntryID,
- HSourceBillNo: data[0].HSourceBillNo,
- HSourceBillType: data[0].HSourceBillType,
- HEmpID: data[0].HEmpID,
- HEmpName: data[0].涓氬姟鍛�,
- HCusID: data[0].HEntryCusID,
- HCusName: data[0].瀹㈡埛,
- HCenterID: data[0].HCenterID,
- HCenterName: data[0].宸ヤ綔涓績,
- HDeptID: data[0].HDeptID,
- HDeptName: data[0].鐢熶骇杞﹂棿,
- HQty: data[0].鐢熶骇浠诲姟鍗曟暟閲�,
- HMaterID: data[0].HMaterID,
- HMaterNumber: data[0].浜у搧浠ｇ爜,
- HMaterName: data[0].浜у搧鍚嶇О,
- HModel: data[0].瑙勬牸鍨嬪彿,
- HSourceID: data[0].HSourceID_b,
- HSourceName: data[0].HsourceName,
- HUnitID: data[0].HUnitID,
- HUnitName: data[0].璁￠噺鍗曚綅,
- HIsStockQty: data[0].HIsStockQty,
- HIsStockQty_SeOrderBill: data[0].HIsStockQty_SeOrderBill ? 1 : 0,
- HBomID: data[0].HBomID,
- HBomName: data[0].BOM鍗曠紪鐮�,
- HPlanBeginDate: dayjs(new Date(data[0].璁″垝寮�宸ユ棩鏈�)).format("YYYY-MM-DD"),
- HPlanEndDate: dayjs(new Date(data[0].璁″垝瀹屽伐鏃ユ湡)).format("YYYY-MM-DD"),
- HBeginDate: dayjs(new Date(data[0].鏈�杩熷紑宸ユ棩鏈�)).format("YYYY-MM-DD"),
- HEndDate: dayjs(new Date(data[0].鏈�杩熷畬宸ユ棩鏈�)).format("YYYY-MM-DD"),
- HRemark: data[0].琛ㄥご澶囨敞,
- HRemark3: data[0].搴曢儴澶囨敞,
- HAuxQty: data[0].HAuxQty,
- HAuxUnit: data[0].HAuxUnit,
- HAuxUnitName: data[0].HAuxUnitName,
+ HSourceInterID: data[0].HSourceInterID,
+ HSourceEntryID: data[0].HSourceEntryID,
+ HSourceBillNo: data[0].HSourceBillNo,
+ HSourceBillType: data[0].HSourceBillType,
+ HEmpID: data[0].HEmpID,
+ HEmpName: data[0].涓氬姟鍛�,
+ HCusID: data[0].HEntryCusID,
+ HCusName: data[0].瀹㈡埛,
+ HCenterID: data[0].HCenterID,
+ HCenterName: data[0].宸ヤ綔涓績,
+ HDeptID: data[0].HDeptID,
+ HDeptName: data[0].鐢熶骇杞﹂棿,
+ HQty: data[0].鐢熶骇浠诲姟鍗曟暟閲�,
+ HMaterID: data[0].HMaterID,
+ HMaterNumber: data[0].浜у搧浠ｇ爜,
+ HMaterName: data[0].浜у搧鍚嶇О,
+ HModel: data[0].瑙勬牸鍨嬪彿,
+ HSourceID: data[0].HSourceID_b,
+ HSourceName: data[0].HsourceName,
+ HUnitID: data[0].HUnitID,
+ HUnitName: data[0].璁￠噺鍗曚綅,
+ HIsStockQty: data[0].HIsStockQty,
+ HIsStockQty_SeOrderBill: data[0].HIsStockQty_SeOrderBill ? 1 : 0,
+ HBomID: data[0].HBomID,
+ HBomName: data[0].BOM鍗曠紪鐮�,
+ HPlanBeginDate: dayjs(new Date(data[0].璁″垝寮�宸ユ棩鏈�)).format(
+ "YYYY-MM-DD"
+ ),
+ HPlanEndDate: dayjs(new Date(data[0].璁″垝瀹屽伐鏃ユ湡)).format("YYYY-MM-DD"),
+ HBeginDate: dayjs(new Date(data[0].鏈�杩熷紑宸ユ棩鏈�)).format("YYYY-MM-DD"),
+ HEndDate: dayjs(new Date(data[0].鏈�杩熷畬宸ユ棩鏈�)).format("YYYY-MM-DD"),
+ HRemark: data[0].琛ㄥご澶囨敞,
+ HRemark3: data[0].搴曢儴澶囨敞,
+ HAuxQty: data[0].HAuxQty,
+ HAuxUnit: data[0].HAuxUnit,
+ HAuxUnitName: data[0].HAuxUnitName,
- HAuxQty2: data[0].HAuxQty2,
- HAuxUnit2: data[0].HAuxUnit2,
- HAuxUnitName2: data[0].HAuxUnitName2,
+ HAuxQty2: data[0].HAuxQty2,
+ HAuxUnit2: data[0].HAuxUnit2,
+ HAuxUnitName2: data[0].HAuxUnitName2,
- HWidth: data[0].HWidth,
- HWeight: data[0].HWeight,
- HColorRemark: data[0].鏌撹壊瑕佹眰,
- HCusMaterName: data[0].瀹㈡埛鐗╂枡鍚嶇О,
- HCusModel: data[0].瀹㈡埛瑙勬牸鍨嬪彿,
- HCusMaterNumber: data[0].瀹㈡埛鐗╂枡缂栫爜,
- HOrderPickRemark: data[0].璁㈠崟鍖呰澶囨敞,
- HWidth_New: data[0].鐢熶骇骞呭,
- HWeight_New: data[0].鐢熶骇鍏嬮噸,
- HRemark_New: data[0].鐢熶骇瑙勬牸,
- //鍏朵粬淇℃伅
- hmakers: this.OperationType2 == 2 ? "" : data[0].鍒跺崟浜�,
- hmakedate:
- this.OperationType2 == 2
- ? ""
- : data[0].鍒跺崟鏃ユ湡 == null
- ? ""
- : dayjs(new Date(data[0].鍒跺崟鏃ユ湡)).format("YYYY-MM-DD"),
- hchecker: this.OperationType2 == 2 ? "" : data[0].瀹℃牳浜�,
- hcheckdate:
- this.OperationType2 == 2
- ? ""
- : data[0].瀹℃牳鏃ユ湡 == null
- ? ""
- : dayjs(new Date(data[0].瀹℃牳鏃ユ湡)).format("YYYY-MM-DD"),
- hupdater: this.OperationType2 == 2 ? "" : data[0].淇敼浜�,
- hupdatedate:
- this.OperationType2 == 2
- ? ""
- : data[0].淇敼鏃ユ湡 == null
- ? ""
- : dayjs(new Date(data[0].淇敼鏃ユ湡)).format("YYYY-MM-DD"),
- hdeleteman: this.OperationType2 == 2 ? "" : data[0].浣滃簾浜�,
- hdeletedate:
- this.OperationType2 == 2
- ? ""
- : data[0].浣滃簾鏃ユ湡 == null
- ? ""
- : dayjs(new Date(data[0].浣滃簾鏃ユ湡)).format("YYYY-MM-DD"),
- HPlanOrderProcNo: data[0].HPlanOrderProcNo,
- });
+ HWidth: data[0].HWidth,
+ HWeight: data[0].HWeight,
+ HColorRemark: data[0].鏌撹壊瑕佹眰,
+ HCusMaterName: data[0].瀹㈡埛鐗╂枡鍚嶇О,
+ HCusModel: data[0].瀹㈡埛瑙勬牸鍨嬪彿,
+ HCusMaterNumber: data[0].瀹㈡埛鐗╂枡缂栫爜,
+ HOrderPickRemark: data[0].璁㈠崟鍖呰澶囨敞,
+ HWidth_New: data[0].鐢熶骇骞呭,
+ HWeight_New: data[0].鐢熶骇鍏嬮噸,
+ HRemark_New: data[0].鐢熶骇瑙勬牸,
+ //鍏朵粬淇℃伅
+ hmakers: this.OperationType2 == 2 ? "" : data[0].鍒跺崟浜�,
+ hmakedate:
+ this.OperationType2 == 2
+ ? ""
+ : data[0].鍒跺崟鏃ユ湡 == null
+ ? ""
+ : dayjs(new Date(data[0].鍒跺崟鏃ユ湡)).format("YYYY-MM-DD"),
+ hchecker: this.OperationType2 == 2 ? "" : data[0].瀹℃牳浜�,
+ hcheckdate:
+ this.OperationType2 == 2
+ ? ""
+ : data[0].瀹℃牳鏃ユ湡 == null
+ ? ""
+ : dayjs(new Date(data[0].瀹℃牳鏃ユ湡)).format("YYYY-MM-DD"),
+ hupdater: this.OperationType2 == 2 ? "" : data[0].淇敼浜�,
+ hupdatedate:
+ this.OperationType2 == 2
+ ? ""
+ : data[0].淇敼鏃ユ湡 == null
+ ? ""
+ : dayjs(new Date(data[0].淇敼鏃ユ湡)).format("YYYY-MM-DD"),
+ hdeleteman: this.OperationType2 == 2 ? "" : data[0].浣滃簾浜�,
+ hdeletedate:
+ this.OperationType2 == 2
+ ? ""
+ : data[0].浣滃簾鏃ユ湡 == null
+ ? ""
+ : dayjs(new Date(data[0].浣滃簾鏃ユ湡)).format("YYYY-MM-DD"),
+ HPlanOrderProcNo: data[0].HPlanOrderProcNo,
+ },
+ };
if (this.copyType == 1) {
this.getHBillNo();
let date = new Date();
diff --git a/src/views/basic/gyEmployee/gyEmployee.vue b/src/views/basic/gyEmployee/gyEmployee.vue
index 59e0095..c5ea92b 100644
--- a/src/views/basic/gyEmployee/gyEmployee.vue
+++ b/src/views/basic/gyEmployee/gyEmployee.vue
@@ -1,26 +1,52 @@
<template>
- <div style="padding: 10px;position: relative;">
- <el-form :model="queryParams" ref="queryForm" label-width="98px" :inline="true" class="searchBox">
+ <div style="padding: 10px; position: relative">
+ <el-form
+ :model="queryParams"
+ ref="queryForm"
+ label-width="98px"
+ :inline="true"
+ class="searchBox"
+ >
<el-row>
<el-form-item label="鑱屽憳浠ｇ爜" prop="HNumber" style="padding-left: 100px">
- <el-input v-model="queryParams.HNumber" placeholder="璇疯緭鍏ヨ亴鍛樹唬鐮�" @keyup.enter.native="handleQuery"
- class="ForFilteringSchemes" />
+ <el-input
+ v-model="queryParams.HNumber"
+ placeholder="璇疯緭鍏ヨ亴鍛樹唬鐮�"
+ @keyup.enter.native="handleQuery"
+ class="ForFilteringSchemes"
+ />
</el-form-item>
<el-form-item label="鑱屽憳鍚嶇О" prop="HName">
- <el-input v-model="queryParams.HName" placeholder="璇疯緭鍏ヨ亴鍛樺悕绉�" @keyup.enter.native="handleQuery"
- class="ForFilteringSchemes" />
+ <el-input
+ v-model="queryParams.HName"
+ placeholder="璇疯緭鍏ヨ亴鍛樺悕绉�"
+ @keyup.enter.native="handleQuery"
+ class="ForFilteringSchemes"
+ />
</el-form-item>
<el-form-item label="缁勭粐">
- <el-select v-model="queryParams.HOrgID" placeholder="璇烽�夋嫨" class="ForFilteringSchemes">
- <el-option v-for="(item, index) in organizationList" :key="index" :label="item.Name" :value="item.ID">
+ <el-select
+ v-model="queryParams.HOrgID"
+ placeholder="璇烽�夋嫨"
+ class="ForFilteringSchemes"
+ >
+ <el-option
+ v-for="(item, index) in organizationList"
+ :key="index"
+ :label="item.Name"
+ :value="item.ID"
+ >
</el-option>
</el-select>
</el-form-item>
</el-row>
<el-form-item label-width="78px">
<el-button type="primary" size="small" icon="el-icon-search" @click="handleQuery">
- 鎼� 绱�</el-button>
- <el-button icon="el-icon-circle-close" size="small" @click="searchOpen = false">鍙� 娑�</el-button>
+ 鎼� 绱�</el-button
+ >
+ <el-button icon="el-icon-circle-close" size="small" @click="searchOpen = false"
+ >鍙� 娑�</el-button
+ >
</el-form-item>
<el-collapse v-model="activeSeach">
<el-collapse-item title="鏇村" name="1">
@@ -30,69 +56,132 @@
<el-form-item label-width="0">
<el-row>
<el-col :span="7">
- <el-select v-model="queryParams.ColName1" placeholder="璇烽�夋嫨" @change="riqiChange"
- class="ForFilteringSchemes">
+ <el-select
+ v-model="queryParams.ColName1"
+ placeholder="璇烽�夋嫨"
+ @change="riqiChange"
+ class="ForFilteringSchemes"
+ >
<span v-for="(item, index) in btList" :key="index">
- <el-option :label="item.field" :value="item.field" v-if="!item.hide"></el-option>
+ <el-option
+ :label="item.field"
+ :value="item.field"
+ v-if="!item.hide"
+ ></el-option>
</span>
</el-select>
</el-col>
<el-col :span="6" style="padding: 0 10px">
- <el-select v-model="queryParams.Comparator1" placeholder="璇烽�夋嫨" @change="riqiChange"
- class="ForFilteringSchemes">
- <el-option v-for="(item, index) in comparatorList" :key="index" :label="item.label"
- :value="item.value"></el-option>
+ <el-select
+ v-model="queryParams.Comparator1"
+ placeholder="璇烽�夋嫨"
+ @change="riqiChange"
+ class="ForFilteringSchemes"
+ >
+ <el-option
+ v-for="(item, index) in comparatorList"
+ :key="index"
+ :label="item.label"
+ :value="item.value"
+ ></el-option>
</el-select>
</el-col>
<el-col :span="11">
- <el-input v-model="queryParams.ColContent1" placeholder="璇疯緭鍏�" clearable
- @keyup.enter.native="handleQuery" class="ForFilteringSchemes" />
+ <el-input
+ v-model="queryParams.ColContent1"
+ placeholder="璇疯緭鍏�"
+ clearable
+ @keyup.enter.native="handleQuery"
+ class="ForFilteringSchemes"
+ />
</el-col>
</el-row>
</el-form-item>
<el-form-item label-width="0">
<el-row>
<el-col :span="7">
- <el-select v-model="queryParams.ColName2" placeholder="璇烽�夋嫨" @change="riqiChange"
- class="ForFilteringSchemes">
+ <el-select
+ v-model="queryParams.ColName2"
+ placeholder="璇烽�夋嫨"
+ @change="riqiChange"
+ class="ForFilteringSchemes"
+ >
<span v-for="(item, index) in btList" :key="index">
- <el-option :label="item.field" :value="item.field" v-if="!item.hide"></el-option>
+ <el-option
+ :label="item.field"
+ :value="item.field"
+ v-if="!item.hide"
+ ></el-option>
</span>
</el-select>
</el-col>
<el-col :span="6" style="padding: 0 10px">
- <el-select v-model="queryParams.Comparator2" placeholder="璇烽�夋嫨" @change="riqiChange"
- class="ForFilteringSchemes">
+ <el-select
+ v-model="queryParams.Comparator2"
+ placeholder="璇烽�夋嫨"
+ @change="riqiChange"
+ class="ForFilteringSchemes"
+ >
<span v-for="(item, index) in btList" :key="index">
- <el-option :label="item.field" :value="item.field" v-if="!item.hide"></el-option>
+ <el-option
+ :label="item.field"
+ :value="item.field"
+ v-if="!item.hide"
+ ></el-option>
</span>
</el-select>
</el-col>
<el-col :span="11">
- <el-input v-model="queryParams.ColContent2" placeholder="璇疯緭鍏�" clearable
- @keyup.enter.native="handleQuery" class="ForFilteringSchemes" />
+ <el-input
+ v-model="queryParams.ColContent2"
+ placeholder="璇疯緭鍏�"
+ clearable
+ @keyup.enter.native="handleQuery"
+ class="ForFilteringSchemes"
+ />
</el-col>
</el-row>
</el-form-item>
<el-form-item label-width="0">
<el-row>
<el-col :span="7">
- <el-select v-model="queryParams.ColName" placeholder="璇烽�夋嫨" @change="riqiChange"
- class="ForFilteringSchemes">
- <el-option v-for="(item, index) in btList" :key="index" :label="item.field"
- :value="item.field"></el-option>
+ <el-select
+ v-model="queryParams.ColName"
+ placeholder="璇烽�夋嫨"
+ @change="riqiChange"
+ class="ForFilteringSchemes"
+ >
+ <el-option
+ v-for="(item, index) in btList"
+ :key="index"
+ :label="item.field"
+ :value="item.field"
+ ></el-option>
</el-select>
</el-col>
<el-col :span="6" style="padding: 0 10px">
- <el-select v-model="queryParams.Comparator" placeholder="璇烽�夋嫨" @change="riqiChange"
- class="ForFilteringSchemes">
- <el-option v-for="(item, index) in comparatorList" :key="index" :label="item.label"
- :value="item.value"></el-option>
+ <el-select
+ v-model="queryParams.Comparator"
+ placeholder="璇烽�夋嫨"
+ @change="riqiChange"
+ class="ForFilteringSchemes"
+ >
+ <el-option
+ v-for="(item, index) in comparatorList"
+ :key="index"
+ :label="item.label"
+ :value="item.value"
+ ></el-option>
</el-select>
</el-col>
<el-col :span="11">
- <el-input v-model="queryParams.ColContent" placeholder="璇疯緭鍏�" clearable
- @keyup.enter.native="handleQuery" class="ForFilteringSchemes" />
+ <el-input
+ v-model="queryParams.ColContent"
+ placeholder="璇疯緭鍏�"
+ clearable
+ @keyup.enter.native="handleQuery"
+ class="ForFilteringSchemes"
+ />
</el-col>
</el-row>
</el-form-item>
@@ -113,120 +202,293 @@
>
</el-col> -->
<el-col :span="1.5">
- <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAddEdit((OperationType = 1))"
- id="btn-Add">鏂板</el-button>
+ <el-button
+ type="primary"
+ icon="el-icon-plus"
+ size="mini"
+ @click="handleAddEdit((OperationType = 1))"
+ id="btn-Add"
+ >鏂板</el-button
+ >
</el-col>
<el-col :span="1.5">
- <el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single"
- @click="handleEdit((row = rowForm), (OperationType = 3))">缂栬緫</el-button>
+ <el-button
+ type="primary"
+ icon="el-icon-edit"
+ size="mini"
+ :disabled="single"
+ @click="handleEdit((row = rowForm), (OperationType = 3))"
+ >缂栬緫</el-button
+ >
</el-col>
<el-col :span="1.5">
- <el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single"
- @click="handleEdit((row = rowForm), (OperationType = 2))">澶嶅埗</el-button>
+ <el-button
+ type="primary"
+ icon="el-icon-edit"
+ size="mini"
+ :disabled="single"
+ @click="handleEdit((row = rowForm), (OperationType = 2))"
+ >澶嶅埗</el-button
+ >
</el-col>
<el-col :span="1.5">
- <el-button type="primary" icon="el-icon-delete" size="mini" :disabled="single" @click="handleDelete">鍒犻櫎
+ <el-button
+ type="primary"
+ icon="el-icon-delete"
+ size="mini"
+ :disabled="single"
+ @click="handleDelete"
+ >鍒犻櫎
</el-button>
</el-col>
<el-col :span="1.5">
- <el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single"
- @click="set_CheckBill(0, (form = rowForm))">瀹℃牳</el-button>
+ <el-button
+ type="primary"
+ icon="el-icon-edit"
+ size="mini"
+ :disabled="single"
+ @click="set_CheckBill(0, (form = rowForm))"
+ >瀹℃牳</el-button
+ >
</el-col>
<el-col :span="1.5">
- <el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single"
- @click="set_CheckBill(1, (form = rowForm))">杩斿鏍�</el-button>
+ <el-button
+ type="primary"
+ icon="el-icon-edit"
+ size="mini"
+ :disabled="single"
+ @click="set_CheckBill(1, (form = rowForm))"
+ >杩斿鏍�</el-button
+ >
</el-col>
<el-col :span="1.5">
- <el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single"
- @click="set_De_Stop(0, (form = rowForm))">绂佺敤</el-button>
+ <el-button
+ type="primary"
+ icon="el-icon-edit"
+ size="mini"
+ :disabled="single"
+ @click="set_De_Stop(0, (form = rowForm))"
+ >绂佺敤</el-button
+ >
</el-col>
<el-col :span="1.5">
- <el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single"
- @click="set_De_Stop(1, (form = rowForm))">鍙嶇鐢�</el-button>
+ <el-button
+ type="primary"
+ icon="el-icon-edit"
+ size="mini"
+ :disabled="single"
+ @click="set_De_Stop(1, (form = rowForm))"
+ >鍙嶇鐢�</el-button
+ >
</el-col>
<el-col :span="1.5">
- <el-button type="primary" icon="el-icon-download" size="mini" @click="handleExport">瀵煎嚭</el-button>
+ <el-button
+ type="primary"
+ icon="el-icon-download"
+ size="mini"
+ @click="handleExport"
+ >瀵煎嚭</el-button
+ >
</el-col>
<el-col :span="1.5">
- <el-button type="primary" icon="el-icon-download" size="mini" @click="handleRowHide">闅愯棌鍒楄缃�</el-button>
+ <el-button
+ type="primary"
+ icon="el-icon-download"
+ size="mini"
+ @click="handleRowHide"
+ >闅愯棌鍒楄缃�</el-button
+ >
</el-col>
- <el-col :span="1.5">
- <el-button type="primary" icon="el-icon-help" size="mini" @click="handleSearch">鎼� 绱�</el-button>
+ <el-col :span="1.5" class="zy-hidden">
+ <el-button type="primary" icon="el-icon-help" size="mini" @click="handleSearch"
+ >鎼� 绱�</el-button
+ >
</el-col>
- <el-col :span="1.5">
- <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲� 缃�</el-button>
+ <el-col :span="1.5" class="zy-hidden">
+ <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+ >閲� 缃�</el-button
+ >
</el-col>
<!-- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> -->
</el-row>
<div class="tableBox" v-loading="loading">
- <el-table :data="tableData" ref="tableData" max-height="750" :summary-method="getSummaries"
- @selection-change="handleSelectionChange" show-summary border @row-click="handleRowClick" :row-style="rowStyle"
- @cell-dblclick="handleDblclick" v-if="tableShow">
+ <el-table
+ :data="tableData"
+ ref="tableData"
+ max-height="750"
+ :summary-method="getSummaries"
+ @selection-change="handleSelectionChange"
+ show-summary
+ border
+ @row-click="handleRowClick"
+ :row-style="rowStyle"
+ @cell-dblclick="handleDblclick"
+ v-if="tableShow"
+ >
<template v-for="(item, index) in btList">
- <el-table-column type="selection" width="55" align="center" :fixed="item.fixed" v-if="item.type == 'checkbox'"
- :key="index" />
- <el-table-column :align="item.align" :prop="item.field" :label="item.title" :width="item.width"
- :key="item.sorderid" v-else-if="!item.hide && item.type != 'checkbox'" :sortable="item.sort"
- show-overflow-tooltip :fixed="item.fixed">
+ <el-table-column
+ type="selection"
+ width="55"
+ align="center"
+ :fixed="item.fixed"
+ v-if="item.type == 'checkbox'"
+ :key="index"
+ />
+ <el-table-column
+ :align="item.align"
+ :prop="item.field"
+ :label="item.title"
+ :width="item.width"
+ :key="item.sorderid"
+ v-else-if="!item.hide && item.type != 'checkbox'"
+ :sortable="item.sort"
+ show-overflow-tooltip
+ :fixed="item.fixed"
+ >
<template slot-scope="{ row, column }">
<el-checkbox v-model="checked" v-if="item.type == 'checkbox'"></el-checkbox>
<div :style="item.style">
<span v-if="column.property.includes('鏃ユ湡')">{{
parseTime(row[column.property], "{y}-{m}-{d}")
}}</span>
- <el-button type="text" @click="handleEdit(row, (OperationType = 3))"
- v-else-if="column.property == '鍗曟嵁鍙�'">{{ row.鍗曟嵁鍙� }}</el-button>
+ <el-button
+ type="text"
+ @click="handleEdit(row, (OperationType = 3))"
+ v-else-if="column.property == '鑱屽憳浠ｇ爜'"
+ >{{ row.鑱屽憳浠ｇ爜 }}</el-button
+ >
<span v-else>{{ row[column.label] }}</span>
</div>
</template>
</el-table-column>
</template>
</el-table>
- <pagination v-show="total > 0" :total="total" :page.sync="page" :limit.sync="pageSize" :pageSizes="pageSizes"
- @pagination="getList" />
- <el-dialog title="闅愯棌鍒楄缃�" :visible.sync="openRowHide" width="816px" append-to-body>
- <RowSettings :colName="btResList" :HModName="HModName" @rowEditClose="rowSetClose" v-if="rowHideShow" />
+ <pagination
+ v-show="total > 0"
+ :total="total"
+ :page.sync="page"
+ :limit.sync="pageSize"
+ :pageSizes="pageSizes"
+ @pagination="getList"
+ />
+ <el-dialog
+ title="闅愯棌鍒楄缃�"
+ :visible.sync="openRowHide"
+ width="816px"
+ append-to-body
+ >
+ <RowSettings
+ :colName="btResList"
+ :HModName="HModName"
+ @rowEditClose="rowSetClose"
+ v-if="rowHideShow"
+ />
</el-dialog>
<!-- 缂栬緫 -->
- <el-dialog title="缂栬緫鑱屽憳" :visible.sync="openEdit" width="1480px" append-to-body class="xsckdBox"
- :before-close="close">
- <edit :OperationType="OperationType" :linterid="this.rowForm.HItemID"
- :HSouceBillType="this.rowForm.HSourceBillType" :HOrgID="this.queryParams.HOrgID" :copyType="copyType"
- @editCloseGy="editGyClose" v-if="editShow" />
+ <el-dialog
+ title="缂栬緫鑱屽憳"
+ :visible.sync="openEdit"
+ width="1480px"
+ append-to-body
+ class="xsckdBox"
+ :before-close="close"
+ >
+ <edit
+ :OperationType="OperationType"
+ :linterid="this.rowForm.HItemID"
+ :HSouceBillType="this.rowForm.HSourceBillType"
+ :HOrgID="this.queryParams.HOrgID"
+ :copyType="copyType"
+ @editCloseGy="editGyClose"
+ v-if="editShow"
+ />
</el-dialog>
- <el-dialog :title="upload.title" :visible.sync="upload.open" width="1500px" append-to-body>
+ <el-dialog
+ :title="upload.title"
+ :visible.sync="upload.open"
+ width="1500px"
+ append-to-body
+ >
<div style="margin-top: -20px">
<el-button type="primary" @click="set_AddNew">瀵煎叆鏁版嵁</el-button>
<el-button type="primary" @click="upload.open = false">閫� 鍑�</el-button>
- <el-upload ref="upload" :limit="1" accept=".xlsx, .xls" style="display: inline-block; margin-left: 10px"
- :action="upload.url + '?updateSupport=' + upload.updateSupport" :disabled="upload.isUploading"
- :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess">
+ <el-upload
+ ref="upload"
+ :limit="1"
+ accept=".xlsx, .xls"
+ style="display: inline-block; margin-left: 10px"
+ :action="upload.url + '?updateSupport=' + upload.updateSupport"
+ :disabled="upload.isUploading"
+ :on-progress="handleFileUploadProgress"
+ :on-success="handleFileSuccess"
+ >
<el-button type="primary">鏂囦欢涓婁紶</el-button>
</el-upload>
</div>
- <el-table :data="uploadData" v-loading="uploadTableLoading" :row-class-name="uploadDataIndex" border
- height="550">
+ <el-table
+ :data="uploadData"
+ v-loading="uploadTableLoading"
+ :row-class-name="uploadDataIndex"
+ border
+ height="550"
+ >
<el-table-column type="index" label="搴忓彿" width="55" align="center" />
<el-table-column label="缁勭粐浠ｇ爜" prop="缁勭粐浠ｇ爜" align="center" width="120" />
<el-table-column label="缁勭粐鍚嶇О" prop="缁勭粐鍚嶇О" align="center" width="120" />
- <el-table-column label="鐢熶骇璧勬簮鍚嶇О" prop="鐢熶骇璧勬簮鍚嶇О" align="center" width="120" />
- <el-table-column label="鐢熶骇璧勬簮浠ｇ爜" prop="鐢熶骇璧勬簮浠ｇ爜" align="center" width="120" />
+ <el-table-column
+ label="鐢熶骇璧勬簮鍚嶇О"
+ prop="鐢熶骇璧勬簮鍚嶇О"
+ align="center"
+ width="120"
+ />
+ <el-table-column
+ label="鐢熶骇璧勬簮浠ｇ爜"
+ prop="鐢熶骇璧勬簮浠ｇ爜"
+ align="center"
+ width="120"
+ />
<el-table-column label="閮ㄩ棬浠ｇ爜" prop="閮ㄩ棬浠ｇ爜" align="center" width="120" />
<el-table-column label="閮ㄩ棬鍚嶇О" prop="閮ㄩ棬鍚嶇О" align="center" width="120" />
- <el-table-column label="璐熻矗浜轰唬鐮�" prop="璐熻矗浜轰唬鐮�" align="center" width="120" />
+ <el-table-column
+ label="璐熻矗浜轰唬鐮�"
+ prop="璐熻矗浜轰唬鐮�"
+ align="center"
+ width="120"
+ />
<el-table-column label="璐熻矗浜�" prop="璐熻矗浜�" align="center" width="120" />
- <el-table-column label="宸ヤ綔涓績浠ｇ爜" prop="宸ヤ綔涓績浠ｇ爜" align="center" width="120" />
- <el-table-column label="宸ヤ綔涓績鍚嶇О" prop="宸ヤ綔涓績鍚嶇О" align="center" width="120" />
+ <el-table-column
+ label="宸ヤ綔涓績浠ｇ爜"
+ prop="宸ヤ綔涓績浠ｇ爜"
+ align="center"
+ width="120"
+ />
+ <el-table-column
+ label="宸ヤ綔涓績鍚嶇О"
+ prop="宸ヤ綔涓績鍚嶇О"
+ align="center"
+ width="120"
+ />
<el-table-column label="鍗曠彮宸ユ椂" prop="鍗曠彮宸ユ椂" align="center" width="120" />
<el-table-column label="鎿嶄綔" align="center">
<template slot-scope="scope">
- <el-button size="mini" type="text" icon="el-icon-delete"
- @click="uploadDataDelete(scope.row)">鍒犻櫎</el-button>
+ <el-button
+ size="mini"
+ type="text"
+ icon="el-icon-delete"
+ @click="uploadDataDelete(scope.row)"
+ >鍒犻櫎</el-button
+ >
</template>
</el-table-column>
</el-table>
- <pagination v-show="uploadTotal > 0" :total="uploadTotal" :page.sync="uploadPage" :limit.sync="uploadPageSize"
- :pageSizes="uploadPageSizes" @pagination="currentPage" />
+ <pagination
+ v-show="uploadTotal > 0"
+ :total="uploadTotal"
+ :page.sync="uploadPage"
+ :limit.sync="uploadPageSize"
+ :pageSizes="uploadPageSizes"
+ @pagination="currentPage"
+ />
</el-dialog>
</div>
</div>
@@ -246,7 +508,7 @@
},
data() {
return {
- activeSeach: '',
+ activeSeach: "",
HModName: "Gy_Employee",
editShow: false,
openEdit: false,
@@ -554,7 +816,7 @@
},
})
.then((response) => {
- console.log(response.data.data)
+ console.log(response.data.data);
this.tyResList = response.data.data; //鎬绘暟鎹�
let data1 = response.data;
let option = [];
@@ -797,7 +1059,7 @@
this.lastSelectedRowIndex = this.tableData.indexOf(row);
this.$refs.tableData.toggleRowSelection(row);
if (this.openPage) {
- this.$emit('deptEmit', row, 4)
+ this.$emit("deptEmit", row, 4);
}
},
//閫変腑琛岄珮浜牱寮�
@@ -810,7 +1072,7 @@
handleDblclick(row, column, cell, event) {
this.OperationType = 3;
if (this.openPage) {
- this.$emit('deptEmitDb', row, 4)
+ this.$emit("deptEmitDb", row, 4);
} else {
this.handleEdit();
}
@@ -821,12 +1083,12 @@
if (this.openPage) {
//鍒楄〃鍗曢��
if (selection.length > 1) {
- const del_row = selection.shift()
- this.$refs.tableData.toggleRowSelection(del_row, false) //璁剧疆杩欎竴琛屽彇娑堥�変腑
+ const del_row = selection.shift();
+ this.$refs.tableData.toggleRowSelection(del_row, false); //璁剧疆杩欎竴琛屽彇娑堥�変腑
}
- this.rowForm = {}
- this.ids = selection.map(item => item.HItemID)
- this.rowForm = selection[0]
+ this.rowForm = {};
+ this.ids = selection.map((item) => item.HItemID);
+ this.rowForm = selection[0];
} else {
//澶氶��
this.ids = selection.map((item) => item.HItemID);
@@ -1044,7 +1306,7 @@
this.$modal.msgError("姝ゆ潯鏁版嵁涓嶆槸鍒涘缓鐘舵��,鏃犳硶鍒犻櫎!");
}
})
- .catch(() => { });
+ .catch(() => {});
},
// 鍙嶅鏍�/瀹℃牳鏁版嵁
set_CheckBill(num, form) {
@@ -1120,8 +1382,8 @@
} else {
this.$alert(
"<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
- response.Message +
- "</div>",
+ response.Message +
+ "</div>",
"瀵煎叆缁撴灉",
{ dangerouslyUseHTMLString: true }
);
@@ -1150,8 +1412,8 @@
.then((res) => {
this.$alert(
"<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
- res.data.Message +
- "</div>",
+ res.data.Message +
+ "</div>",
"瀵煎叆缁撴灉",
{ dangerouslyUseHTMLString: true }
);
@@ -1175,7 +1437,7 @@
return deleteList.indexOf(item.index) == -1;
});
})
- .catch(() => { });
+ .catch(() => {});
},
getPage(page, list) {
let sindex = (parseInt(page) - 1) * this.uploadPageSize;
@@ -1197,4 +1459,7 @@
.xsckdBox .el-date-editor.el-input {
width: 100%;
}
+.zy-hidden {
+ display: none;
+}
</style>
diff --git a/src/views/basic/gyEmployee/gyEmployeeEdit.vue b/src/views/basic/gyEmployee/gyEmployeeEdit.vue
index 39d9e23..5c0ca2c 100644
--- a/src/views/basic/gyEmployee/gyEmployeeEdit.vue
+++ b/src/views/basic/gyEmployee/gyEmployeeEdit.vue
@@ -225,24 +225,24 @@
<el-row>
<el-col :span="8">
<el-form-item label="妗ｆ缂栧彿" prop="HArchivesNo">
- <el-input type="text" :v-model="form.HArchivesNo"></el-input>
+ <el-input type="text" v-model="form.HArchivesNo"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="鑱岀О" prop="HProTitleID">
- <el-input type="text" :v-model="form.HProTitleID"></el-input>
+ <el-input type="text" v-model="form.HProTitleID"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="钖祫绛夌骇" prop="HSalaryLev">
- <el-input type="text" :v-model="form.HSalaryLev"></el-input>
+ <el-input type="text" v-model="form.HSalaryLev"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="姣曚笟瀛︽牎" prop="HGradSchool">
- <el-input type="text" :v-model="form.HGradSchool"></el-input>
+ <el-input type="text" v-model="form.HGradSchool"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
@@ -1193,94 +1193,98 @@
if (result.code == 1) {
// 璇存槑楠岃瘉鎴愬姛浜嗭紝
var data = result.data.h_v_Edit_IF_EmployeeList[0];
-
- Object.assign(this.form, {
- HNumber: data.鑱屽憳浠ｇ爜,
- HItemID: this.OperationType == 2 ? 0 : data.HItemID,
- HName: data.鑱屽憳鍚嶇О,
- HHelpCode: data.鍔╄浠ｇ爜,
- HGroupID: data.HGroupID,
- HGroupName: data.鐝粍鍚嶇О,
- HGroupNumber: data.鐝粍浠ｇ爜,
- HEndFlag: data.鏄庣粏鏍囪,
- HNoBrushFlag: data.鏄惁鎵撳崱,
- HOverType: data.鏄惁璋冧紤,
- HShiftFlag: data.鏄惁杞彮璋冧紤,
- HStopwagesFlag: data.鏄惁鍋滃彂,
- HInsuranceStatus: data.鏄惁鍙備繚,
- HDeptID: data.閮ㄩ棬ID,
- HDeptName: data.閮ㄩ棬鍚嶇О,
- HDutyID: data.鑱屽姟ID,
- HDutyName: data.鑱屽姟鍚嶇О,
- HDutyNumber: data.鑱屽姟浠ｇ爜,
- HDormID: data.瀹胯垗ID,
- HDormName: data.瀹胯垗鍚嶇О,
- HDormNumber: data.瀹胯垗浠ｇ爜,
- HWorkTypeID: data.宸ョID,
- HWorkTypeName: data.宸ョ鍚嶇О,
- HWorkTypeNumber: data.宸ョ浠ｇ爜,
- HCTPrjID: data.鏍哥畻鏂瑰紡ID,
- HCTPrjName: data.鏍哥畻鏂瑰紡鍚嶇О,
- HCTPrjNumber: data.鏍哥畻鏂瑰紡浠ｇ爜,
- HPostID: data.宀椾綅ID,
- HPostName: data.宀椾綅鍚嶇О,
- HPostNumber: data.宀椾綅浠ｇ爜,
- HSex: data.鎬у埆,
- HBirthDay: dayjs(data.鍑虹敓骞存湀).format("YYYY-MM-DD"),
- HAge: data.骞撮緞,
- HBlighty: data.绫嶈疮,
- HNation: data.姘戞棌,
- HBlightyType: data.鎴风睄绫诲埆,
- HGovStatus: data.鏀挎不闈㈣矊,
- HKnowLev: data.瀛﹀巻,
- HMarr: data.濠氬Щ鐘跺喌,
- HArchivesNo: data.妗ｆ缂栧彿,
- HProTitleID: data.鑱岀О,
- HSalaryLev: data.钖祫绛夌骇,
- HGradSchool: data.姣曚笟瀛︽牎,
- HGradDate: dayjs(data.姣曚笟鏃堕棿).format("YYYY-MM-DD"),
- HEngLev: data.澶栬姘村钩,
- HCompLev: data.璁＄畻鏈烘按骞�,
- HSpec: data.涓撲笟,
- HNowAdd: data.鐜颁綇鍦板潃,
- HEmail: data.鐢靛瓙閭,
- HHomeAdd: data.瀹跺涵鍦板潃,
- HPostalCode: data.閭斂缂栫爜,
- HOldCompany: data.鍘熷叕鍙�,
- HLinkPhone: data.鑱旂郴鐢佃瘽,
- HMobilePhone: data.鎵嬫満鍙�,
- HWorkType: data.鐢ㄥ伐绫诲瀷,
- HInComDate: dayjs(data.杩涘巶鏃ユ湡).format("YYYY-MM-DD"),
- HRelDate: dayjs(data.杞鏃ユ湡).format("YYYY-MM-DD"),
- HInsuranceNo: data.淇濋櫓璇佺紪鍙�,
- HContractBDate: dayjs(data.鍚堝悓寮�濮嬫棩鏈�).format("YYYY-MM-DD"),
- HContractEDate: dayjs(data.鍚堝悓鍒版湡鏃ユ湡).format("YYYY-MM-DD"),
- HContractYear: data.鍚堝悓鏈熼檺,
- HInsuranceDate: dayjs(data.鍙備繚鏃ユ湡).format("YYYY-MM-DD"),
- HDimissionDate: dayjs(data.绂昏亴鏃ユ湡).format("YYYY-MM-DD"),
- HStayCardEDate: dayjs(data.鏆備綇璇佸埌鏈熸棩).format("YYYY-MM-DD"),
- HEmpRate: data.鑱屽憳绯绘暟,
- HBSTDeptID: data.璐濆＋杈鹃儴闂�,
- HRemark: data.澶囨敞,
- HDimissionReason: data.绂昏亴鍘熷洜,
- linteridCard: data.韬唤璇�,
- HEmpType: data.宸ヨ祫绫诲瀷,
- HBankAccount: data.閾惰璐︽埛,
- HInsuranceSubsidy: data.淇濋櫓琛ヨ创,
- HOtherDeduct3: data.鍏朵粬鎵ｆ3,
- HMedicare: data.鍖荤枟淇濋櫓,
- HInsurance: data.鍏昏�佷繚闄�,
- HDrydock: data.澶变笟淇濋櫓,
- HBasePay: data.鍩烘湰宸ヨ祫,
- HExamLevPostMoney: data.鑱屽姟鑰冩牳宸ヨ祫,
- HExamRate: data.鑰冩牳绯绘暟,
- HPayType: data.鏀粯绫诲瀷,
- HLeftMoneyRate: data.鍓╀綑宸ヨ祫,
- HHighestPay: data.鏈�楂樺伐璧�,
- HOverPayRate: data.瓒呴姣旂巼,
- HStopflag: data.绂佺敤鏍囪,
- HRemark: data.澶囨敞,
- });
+ console.log(data);
+ this.form = {
+ ...{
+ HNumber: data.鑱屽憳浠ｇ爜,
+ HItemID: this.OperationType == 2 ? 0 : data.HItemID,
+ HName: data.鑱屽憳鍚嶇О,
+ HHelpCode: data.鍔╄浠ｇ爜,
+ HGroupID: data.HGroupID,
+ HGroupName: data.鐝粍鍚嶇О,
+ HGroupNumber: data.鐝粍浠ｇ爜,
+ HEndFlag: data.鏄庣粏鏍囪 == "true" ? true : false,
+ HNoBrushFlag: data.鏄惁鎵撳崱 == "true" ? true : false,
+ HOverType: data.鏄惁璋冧紤 == "true" ? true : false,
+ HShiftFlag: data.鏄惁杞彮璋冧紤 == "true" ? true : false,
+ HStopwagesFlag: data.鏄惁鍋滃彂 == "true" ? true : false,
+ HInsuranceStatus: data.鏄惁鍙備繚,
+ HDeptID: data.閮ㄩ棬ID,
+ HDeptName: data.閮ㄩ棬鍚嶇О,
+ HDutyID: data.鑱屽姟ID,
+ HDutyName: data.鑱屽姟鍚嶇О,
+ HDutyNumber: data.鑱屽姟浠ｇ爜,
+ HDormID: data.瀹胯垗ID,
+ HDormName: data.瀹胯垗鍚嶇О,
+ HDormNumber: data.瀹胯垗浠ｇ爜,
+ HWorkTypeID: data.宸ョID,
+ HWorkTypeName: data.宸ョ鍚嶇О,
+ HWorkTypeNumber: data.宸ョ浠ｇ爜,
+ HCTPrjID: data.鏍哥畻鏂瑰紡ID,
+ HCTPrjName: data.鏍哥畻鏂瑰紡鍚嶇О,
+ HCTPrjNumber: data.鏍哥畻鏂瑰紡浠ｇ爜,
+ HPostID: data.宀椾綅ID,
+ HPostName: data.宀椾綅鍚嶇О,
+ HPostNumber: data.宀椾綅浠ｇ爜,
+ HSex: data.鎬у埆,
+ HBirthDay: dayjs(data.鍑虹敓骞存湀).format("YYYY-MM-DD"),
+ HAge: data.骞撮緞,
+ HBlighty: data.绫嶈疮,
+ HNation: data.姘戞棌,
+ HBlightyType: data.鎴风睄绫诲埆,
+ HGovStatus: data.鏀挎不闈㈣矊,
+ HKnowLev: data.瀛﹀巻,
+ HMarr: data.濠氬Щ鐘跺喌,
+ HArchivesNo: data.妗ｆ缂栧彿,
+ HProTitleID: data.鑱岀О,
+ HSalaryLev: data.钖祫绛夌骇,
+ HGradSchool: data.姣曚笟瀛︽牎,
+ HGradDate: dayjs(data.姣曚笟鏃堕棿).format("YYYY-MM-DD"),
+ HEngLev: data.澶栬姘村钩,
+ HCompLev: data.璁＄畻鏈烘按骞�,
+ HSpec: data.涓撲笟,
+ HNowAdd: data.鐜颁綇鍦板潃,
+ HEmail: data.鐢靛瓙閭,
+ HHomeAdd: data.瀹跺涵鍦板潃,
+ HPostalCode: data.閭斂缂栫爜,
+ HOldCompany: data.鍘熷叕鍙�,
+ HLinkPhone: data.鑱旂郴鐢佃瘽,
+ HMobilePhone: data.鎵嬫満鍙�,
+ HWorkType: data.鐢ㄥ伐绫诲瀷,
+ HInComDate: dayjs(data.杩涘巶鏃ユ湡).format("YYYY-MM-DD"),
+ HRelDate: dayjs(data.杞鏃ユ湡).format("YYYY-MM-DD"),
+ HInsuranceNo: data.淇濋櫓璇佺紪鍙�,
+ HContractBDate: dayjs(data.鍚堝悓寮�濮嬫棩鏈�).format("YYYY-MM-DD"),
+ HContractEDate: dayjs(data.鍚堝悓鍒版湡鏃ユ湡).format("YYYY-MM-DD"),
+ HContractYear: data.鍚堝悓鏈熼檺,
+ HInsuranceDate: dayjs(data.鍙備繚鏃ユ湡).format("YYYY-MM-DD"),
+ HDimissionDate: dayjs(data.绂昏亴鏃ユ湡).format("YYYY-MM-DD"),
+ HStayCardEDate: dayjs(data.鏆備綇璇佸埌鏈熸棩).format("YYYY-MM-DD"),
+ HEmpRate: data.鑱屽憳绯绘暟,
+ HBSTDeptID: data.璐濆＋杈鹃儴闂�,
+ HRemark: data.澶囨敞,
+ HDimissionReason: data.绂昏亴鍘熷洜,
+ linteridCard: data.韬唤璇�,
+ HEmpType: data.宸ヨ祫绫诲瀷,
+ HBankAccount: data.閾惰璐︽埛,
+ HInsuranceSubsidy: data.淇濋櫓琛ヨ创,
+ HOtherDeduct3: data.鍏朵粬鎵ｆ3,
+ HMedicare: data.鍖荤枟淇濋櫓,
+ HInsurance: data.鍏昏�佷繚闄�,
+ HDrydock: data.澶变笟淇濋櫓,
+ HBasePay: data.鍩烘湰宸ヨ祫,
+ HExamLevPostMoney: data.鑱屽姟鑰冩牳宸ヨ祫,
+ HExamRate: data.鑰冩牳绯绘暟,
+ HPayType: data.鏀粯绫诲瀷,
+ HLeftMoneyRate: data.鍓╀綑宸ヨ祫,
+ HHighestPay: data.鏈�楂樺伐璧�,
+ HOverPayRate: data.瓒呴姣旂巼,
+ HStopflag: data.绂佺敤鏍囪,
+ HRemark: data.澶囨敞,
+ HIDCard: data.韬唤璇� || "",
+ HFax: data.浼犵湡鍙风爜 || "",
+ },
+ };
if (this.OperationType == 3) {
// 缂栬緫鏃惰幏鍙栨枃浠跺垪琛�
@@ -1374,7 +1378,7 @@
} else if (num == "Group") {
// 鐝粍
Object.assign(this.form, {
- HGroupItem: deptRow.HItemID,
+ HGroupID: deptRow.HItemID,
HGroupName: deptRow.鐝粍鍚嶇О,
HGroupNumber: deptRow.鐝粍浠ｇ爜,
});
diff --git a/src/views/basic/gyStockPlace/gyStockPlace.vue b/src/views/basic/gyStockPlace/gyStockPlace.vue
index 8378ca9..92720f7 100644
--- a/src/views/basic/gyStockPlace/gyStockPlace.vue
+++ b/src/views/basic/gyStockPlace/gyStockPlace.vue
@@ -26,7 +26,7 @@
</el-form-item>
<el-form-item label="缁勭粐">
<el-select
- v-model="queryParams.HOrgName"
+ v-model="queryParams.HOrgID"
placeholder="璇烽�夋嫨"
class="ForFilteringSchemes"
>
@@ -34,7 +34,7 @@
v-for="(item, index) in organizationList"
:key="index"
:label="item.Name"
- :value="item.Name"
+ :value="item.ID.toString()"
>
</el-option>
</el-select>
@@ -62,8 +62,8 @@
<el-card class="box-card">
<div slot="header" class="clearfix"><span>杩囨护</span></div>
<div>
- <el-form-item label-width="0">
- <el-row>
+ <el-row>
+ <el-form-item label-width="0">
<el-col :span="7">
<el-select
v-model="queryParams.ColName1"
@@ -104,10 +104,10 @@
class="ForFilteringSchemes"
/>
</el-col>
- </el-row>
- </el-form-item>
- <el-form-item label-width="0">
- <el-row>
+ </el-form-item>
+ </el-row>
+ <el-row>
+ <el-form-item label-width="0">
<el-col :span="7">
<el-select
v-model="queryParams.ColName2"
@@ -149,10 +149,10 @@
class="ForFilteringSchemes"
/>
</el-col>
- </el-row>
- </el-form-item>
- <el-form-item label-width="0">
- <el-row>
+ </el-form-item>
+ </el-row>
+ <el-row>
+ <el-form-item label-width="0">
<el-col :span="7">
<el-select
v-model="queryParams.ColName"
@@ -192,8 +192,8 @@
class="ForFilteringSchemes"
/>
</el-col>
- </el-row>
- </el-form-item>
+ </el-form-item>
+ </el-row>
</div>
</el-card>
</el-collapse-item>
@@ -248,12 +248,12 @@
>闅愯棌鍒楄缃�</el-button
>
</el-col>
- <el-col :span="1.5">
+ <el-col :span="1.5" class="zy-hidden">
<el-button type="primary" icon="el-icon-help" size="mini" @click="handleSearch"
>鎼� 绱�</el-button
>
</el-col>
- <el-col :span="1.5">
+ <el-col :span="1.5" class="zy-hidden">
<el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery"
>閲� 缃�</el-button
>
@@ -303,8 +303,8 @@
<el-button
type="text"
@click="handleEdit(row, (OperationType = 3))"
- v-else-if="column.property == '鍗曟嵁鍙�'"
- >{{ row.鍗曟嵁鍙� }}</el-button
+ v-else-if="column.property == '浠撲綅浠ｇ爜'"
+ >{{ row.浠撲綅浠ｇ爜 }}</el-button
>
<span v-else>{{ row[column.label] }}</span>
</div>
@@ -341,6 +341,7 @@
append-to-body
class="xsckdBox"
:before-close="close"
+ @close="beforeEditCloseHandler"
>
<edit
:OperationType="OperationType"
@@ -349,6 +350,7 @@
:copyType="copyType"
@editCloseGy="editGyClose"
v-if="editShow"
+ ref="editRef"
/>
</el-dialog>
<el-dialog
@@ -426,6 +428,8 @@
},
data() {
return {
+ editRef: null,
+ activeSeach: "",
HModName: "Gy_Warehouse",
editShow: false,
openEdit: false,
@@ -479,7 +483,7 @@
openData: false, //鏁版嵁寮圭獥
dialogTitle: "",
zuzhiId: "",
- organizationList: [], //缁勭粐鍒楄〃
+ organizationList: JSON.parse(sessionStorage["organizationList"]), //缁勭粐鍒楄〃
subDisabled: false, //缂栬緫椤甸潰淇濆瓨鎸夐挳鏄惁绂佺敤(true绂佺敤锛宖alse鍙敤)
OperationType: null, //淇濆瓨绫诲瀷锛堟柊澧�1淇敼3锛�
HInterID: null,
@@ -503,7 +507,7 @@
dateRange: [],
// 鏌ヨ鍙傛暟
queryParams: {
- HOrgID: null,
+ HOrgID: sessionStorage["OrganizationID"],
HName: null,
HNumber: null,
Comparator1: "",
@@ -528,7 +532,7 @@
btResList: [],
tableData: [], //閿�鍞嚭搴撳垪琛�(鍒嗛〉鏄剧ず)
dataList: [],
- titleData: ["HItemID", "HParentID"], //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ titleData: ["HItemID", "HParentID", "閫夋嫨"], //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
pageSizes: [50, 100, 500, 5000, 50000],
page: 1,
pageSize: 50,
@@ -566,10 +570,13 @@
};
},
created() {
- this.fetchData();
+ this.handleQuery();
this.riqiChange();
},
methods: {
+ beforeEditCloseHandler() {
+ this.$refs.editRef.close();
+ },
// 浠撲綅鍚屾(API涓殏鏃舵病鏈夊搴旂殑API)
async handleSync() {
try {
@@ -743,11 +750,10 @@
this.sWhere += "";
//浠撲綅鍒楄〃
axios
- .get(this.baseURL + "/Gy_StockPlace/list1page", {
+ .get(this.baseURL + "/Gy_StockPlace/list2Page", {
params: {
sWhere: `${this.sWhere}`,
user: this.user,
- Organization: "娴欐睙鏅轰簯杩堟��",
page: this.page,
size: this.pageSize,
},
@@ -1099,8 +1105,10 @@
if (this.queryParams.HName) {
this.sWhere += " and 浠撲綅鍚嶇О like '%" + this.queryParams.HName + "%'";
}
- if (this.queryParams.HOrgName) {
- this.sWhere += " and 缁勭粐鍚嶇О = '" + this.queryParams.HOrgName + "'";
+ if (this.queryParams.HOrgID) {
+ let OrgName = this.organizationList.find((e) => e.ID == this.queryParams.HOrgID)
+ ?.Name;
+ this.sWhere += " and 缁勭粐鍚嶇О = '" + OrgName + "'";
}
// this.sWhere += this.addSWhereByOpenType()
// this.sWhere += this.getOrgIDByUser()
@@ -1342,4 +1350,7 @@
flex-direction: row;
width: 60%;
}
+.zy-hidden {
+ display: none;
+}
</style>
diff --git a/src/views/basic/gyStockPlace/gyStockPlaceEdit.vue b/src/views/basic/gyStockPlace/gyStockPlaceEdit.vue
index 5e98170..dbf6696 100644
--- a/src/views/basic/gyStockPlace/gyStockPlaceEdit.vue
+++ b/src/views/basic/gyStockPlace/gyStockPlaceEdit.vue
@@ -12,17 +12,17 @@
<el-row>
<el-col :span="8">
<el-form-item label="浠撲綅浠ｇ爜" prop="HNumber">
- <el-input v-model="form.HNumber" placeholder="璇疯緭鍏ヤ粨搴撲唬鐮�" />
+ <el-input v-model="form.HNumber" placeholder="璇疯緭鍏ヤ粨浣嶄唬鐮�" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="浠撲綅鍚嶇О" prop="HName">
- <el-input v-model="form.HName" placeholder="璇疯緭鍏ヤ粨搴撳悕绉�" />
+ <el-input v-model="form.HName" placeholder="璇疯緭鍏ヤ粨浣嶅悕绉�" />
</el-form-item>
</el-col>
<el-col :span="8">
- <el-form-item label="鎵�灞炰粨浣�" prop="HSPGroupName" class="form-inline">
- <el-input disabled v-model="form.HSPGroupName" placeholder="璇烽�夋嫨浠撲綅">
+ <el-form-item label="鎵�灞炰粨搴�" prop="HSPGroupName" class="form-inline">
+ <el-input disabled v-model="form.HSPGroupName" placeholder="璇烽�夋嫨浠撳簱">
</el-input>
<el-button icon="el-icon-search" @click="openDataDialog(1)"></el-button>
</el-form-item>
@@ -48,12 +48,12 @@
</el-col>
<el-col :span="8">
<el-form-item label="鍔╄鐮�" prop="HHelpCode">
- <el-input v-model="form.HAddress" placeholder="璇疯緭鍏ュ姪璁扮爜" />
+ <el-input v-model="form.HHelpCode" placeholder="璇疯緭鍏ュ姪璁扮爜" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="澶囨敞" prop="HRemark">
- <el-input v-model="form.HPhone" placeholder="璇疯緭鍏ュ娉�" />
+ <el-input v-model="form.HRemark" placeholder="璇疯緭鍏ュ娉�" />
</el-form-item>
</el-col>
</el-row>
@@ -73,17 +73,26 @@
</el-tab-pane>
</el-tabs>
</el-form>
- <!-- 閮ㄩ棬寮圭獥 -->
+ <!-- 閫夋嫨寮圭獥 -->
<el-dialog
:title="dialogTitle"
:visible.sync="openData"
width="1280px"
append-to-body
>
- <Dept @deptEmitDb="dbEmitData" @deptEmit="emitData" v-if="deptShow" />
+ <!-- <Dept @deptEmitDb="dbEmitData" @deptEmit="emitData" v-if="deptShow" />
<Warehouse @deptEmitDb="dbEmitData" @deptEmit="emitData" v-if="warehouseShow" />
<Material @deptEmitDb="dbEmitData" @deptEmit="emitData" v-if="materialShow" />
- <GyWorkCenter @deptEmitDb="dbEmitData" @deptEmit="emitData" v-if="workCenterShow" />
+ <GyWorkCenter @deptEmitDb="dbEmitData" @deptEmit="emitData" v-if="workCenterShow" /> -->
+ <div style="height: 60vh" v-if="openData">
+ <iframe
+ :src="iframeUrl"
+ frameborder="0"
+ width="100%"
+ height="100%"
+ ref="iframeInstance"
+ ></iframe>
+ </div>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="deptClickSub">纭� 瀹�</el-button>
<el-button @click="deptClose">鍙� 娑�</el-button>
@@ -114,6 +123,9 @@
},
data() {
return {
+ dialogEnabledNum: -1,
+ iframeInstance: null,
+ iframeUrl: "",
formShow: false,
temp: undefined,
formLoading: true,
@@ -187,9 +199,22 @@
this.reset();
this.fetchData();
},
+ mounted() {
+ window.iframeWareHouseCallBack = (info) => {
+ console.log(info);
+ // 鍥炶皟璧嬪��
+ this.form.HSPGroupName = info["浠撳簱鍚嶇О"];
+ this.form.HSPGroupID = info["HSPGroupID"];
+ // 鍏抽棴寮圭獥
+ this.deptClose();
+ };
+ },
activated() {
this.reset();
this.fetchData();
+ },
+ beforeDestroy() {
+ delete window.iframeWareHouseCallBack;
},
methods: {
fetchData() {
@@ -235,18 +260,21 @@
if (result.code == 1) {
// 璇存槑楠岃瘉鎴愬姛浜嗭紝
var data = result.data[0];
+ this.form = {
+ ...{
+ HUSEORGID: data.HUSEORGID,
+ HItemID: data.HMainID,
+ HNumber: data.浠撲綅浠ｇ爜,
+ HName: data.浠撲綅鍚嶇О,
+ HHelpCode: data.鍔╄鐮�,
+ HRemark: data.澶囨敞,
+ HSPGroupID: data.HSPGroupID,
+ HSPGroupName: data.鎵�灞炰粨浣�,
+ HStopflag: data.绂佺敤鏍囪 == "Y" ? true : false,
+ HStandard: data.榛樿浠撲綅 == "Y" ? true : false,
+ },
+ };
- Object.assign(this.form, {
- HItemID: data.HMainID,
- HNumber: data.浠撲綅浠ｇ爜,
- HName: data.浠撲綅鍚嶇О,
- HHelpCode: data.鍔╄鐮�,
- HRemark: data.澶囨敞,
- HSPGroupID: data.HSPGroupID,
- HSPGroupName: data.鎵�灞炰粨浣�,
- HStopflag: data.绂佺敤鏍囪 == "Y" ? true : false,
- HStandard: data.榛樿浠撲綅 == "Y" ? true : false,
- });
if (!data.HCheckEmp) {
this.CheckBillDisabled = false;
}
@@ -299,8 +327,19 @@
this.deptform = deptRow;
},
deptClickSub() {
- this.dbEmitData(this.deptform, this.dialogTypeNum);
- this.deptform = {};
+ // this.dbEmitData(this.deptform, this.dialogTypeNum);
+ // this.deptform = {};
+ // 浠庢墦寮�鐨刬frame涓幏鍙栭�変腑鏁版嵁
+ let selectedRow = this.$refs.iframeInstance.contentWindow.selectedRow;
+ console.log(selectedRow);
+ if (this.dialogEnabledNum == 1) {
+ // 淇敼閫変腑浠撳簱鏁版嵁
+ this.form.HSPGroupName = selectedRow["浠撳簱鍚嶇О"];
+ this.form.HSPGroupID = selectedRow["HSPGroupID"];
+ }
+
+ selectedRow = null; // 鎵嬪姩缃┖锛屾柟渚縂C鍥炴敹锛岄槻姝㈡硠闇�
+ this.deptClose();
},
deptClose() {
this.deptform = {};
@@ -461,12 +500,14 @@
},
// 鎵撳紑鏁版嵁鍒楄〃寮圭獥
openDataDialog(num, row) {
+ this.dialogEnabledNum = num;
if (row) {
this.zbIndex = row.index - 1;
}
this.showReset();
if (num == 1) {
- this.dialogTitle = "浠撲綅鍒楄〃";
+ this.iframeUrl = "/iframe/GyWarehouse";
+ this.dialogTitle = "浠撳簱鍒楄〃";
this.warehouseShow = true;
this.openData = true;
}
diff --git a/src/views/basic/gyWarehouse/gyWarehouse.vue b/src/views/basic/gyWarehouse/gyWarehouse.vue
index 4b80d23..c6cf099 100644
--- a/src/views/basic/gyWarehouse/gyWarehouse.vue
+++ b/src/views/basic/gyWarehouse/gyWarehouse.vue
@@ -149,10 +149,10 @@
<el-col :span="1.5">
<el-button type="primary" icon="el-icon-download" size="mini" @click="handleRowHide">闅愯棌鍒楄缃�</el-button>
</el-col>
- <el-col :span="1.5">
+ <el-col :span="1.5" class="zy-hidden">
<el-button type="primary" icon="el-icon-help" size="mini" @click="handleSearch">鎼� 绱�</el-button>
</el-col>
- <el-col :span="1.5">
+ <el-col :span="1.5" class="zy-hidden">
<el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery">閲� 缃�</el-button>
</el-col>
<!-- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> -->
@@ -173,8 +173,12 @@
<span v-if="column.property.includes('鏃ユ湡')">{{
parseTime(row[column.property], "{y}-{m}-{d}")
}}</span>
- <el-button type="text" @click="handleEdit(row, (OperationType = 3))"
- v-else-if="column.property == '鍗曟嵁鍙�'">{{ row.鍗曟嵁鍙� }}</el-button>
+ <el-button
+ type="text"
+ @click="handleEdit(row, (OperationType = 3))"
+ v-else-if="column.property == '浠撳簱浠ｇ爜'"
+ >{{ row.浠撳簱浠ｇ爜 }}</el-button
+ >
<span v-else>{{ row[column.label] }}</span>
</div>
</template>
@@ -187,11 +191,24 @@
<RowSettings :colName="btResList" :HModName="HModName" @rowEditClose="rowSetClose" v-if="rowHideShow" />
</el-dialog>
<!-- 缂栬緫 -->
- <el-dialog title="缂栬緫浠撳簱" :visible.sync="openEdit" width="1480px" append-to-body class="xsckdBox"
- :before-close="close">
- <edit :OperationType="OperationType" :linterid="this.rowForm.HItemID"
- :HSouceBillType="this.rowForm.HSourceBillType" :copyType="copyType" @editCloseGy="editGyClose"
- v-if="editShow" />
+ <el-dialog
+ title="缂栬緫浠撳簱"
+ :visible.sync="openEdit"
+ width="1480px"
+ append-to-body
+ class="xsckdBox"
+ :before-close="close"
+ @close="editBeforeCloseHandle"
+ >
+ <edit
+ :OperationType="OperationType"
+ :linterid="this.rowForm.HItemID"
+ :HSouceBillType="this.rowForm.HSourceBillType"
+ :copyType="copyType"
+ @editCloseGy="editGyClose"
+ v-if="editShow"
+ ref="editRef"
+ />
</el-dialog>
<el-dialog :title="upload.title" :visible.sync="upload.open" width="1500px" append-to-body>
<div style="margin-top: -20px">
@@ -206,7 +223,7 @@
<el-table :data="uploadData" v-loading="uploadTableLoading" :row-class-name="uploadDataIndex" border
height="550">
<el-table-column type="index" label="搴忓彿" width="55" align="center" />
- <el-table-column label="浠撳簱浠ｇ爜" prop="浠撳簱浠ｇ爜" align="center" width="120" />
+ <el-table-column label="浠撳簱浠ｇ爜" align="center" width="120" />
<el-table-column label="浠撳簱鍚嶇О" prop="浠撳簱鍚嶇О" align="center" width="120" />
<el-table-column label="鑱旂郴鐢佃瘽" prop="鑱旂郴鐢佃瘽" align="center" width="120" />
<el-table-column label="鑱屽憳浠ｇ爜" prop="鑱屽憳浠ｇ爜" align="center" width="120" />
@@ -240,6 +257,8 @@
},
data() {
return {
+ editRef: null,
+ activeSeach: "",
HModName: "Gy_Warehouse",
activeSeach: '',
editShow: false,
@@ -385,6 +404,9 @@
this.riqiChange();
},
methods: {
+ editBeforeCloseHandle() {
+ this.$refs.editRef.close();
+ },
// 浠撳簱鍚屾
async handleSync() {
try {
@@ -803,6 +825,10 @@
handleRowClick(row, column, event) {
this.lastSelectedRow = this.selectedRow; // 璁板綍涓婁竴娆￠�変腑鐨勮
this.selectedRow = row; // 璁板綍褰撳墠閫変腑鐨勮
+ if (this.checkIsIframe) {
+ // 灏嗗綋鍓嶉�変腑鐨勬暟鎹毚闇插埌window涓�
+ window.selectedRow = row;
+ }
this.lastSelectedRowIndex = this.tableData.indexOf(row);
this.$refs.tableData.toggleRowSelection(row);
if (this.openPage) {
@@ -815,14 +841,25 @@
return { background: "#ecf5ff" };
}
},
+ checkIsIframe() {
+ if (window.self == window.top) {
+ return false;
+ }
+ return true;
+ },
//鍙屽嚮琛�
handleDblclick(row, column, cell, event) {
+ if (this.checkIsIframe) {
+ // IFrame 鍙屽嚮 杩斿洖褰撳墠鍙屽嚮鐨勬暟鎹�
+ window.parent.iframeWareHouseCallBack(row);
+ return;
+ }
this.OperationType = 3;
if (this.openPage) {
this.$emit('deptEmitDb', row, 2)
}
else {
- this.handleEdit();
+ this.handleEdit();
}
},
// 澶氶�夋閫変腑鏁版嵁
@@ -838,12 +875,12 @@
this.ids = selection.map(item => item.HItemID)
this.rowForm = selection[0]
} else {
- this.ids = selection.map((item) => item.HItemID);
- this.single = selection.length != 1;
- this.multiple = !selection.length;
- if (!this.single) {
- this.rowForm = selection[0];
- }
+ this.ids = selection.map((item) => item.HItemID);
+ this.single = selection.length != 1;
+ this.multiple = !selection.length;
+ if (!this.single) {
+ this.rowForm = selection[0];
+ }
}
},
//鎵撳紑渚ц竟鎼滅储寮圭獥
@@ -1004,7 +1041,7 @@
//閫�鍑�
close() {
- this.tableShow = true;
+ this.tableShow = false;
this.openEdit = false;
this.getList();
},
@@ -1130,8 +1167,8 @@
} else {
this.$alert(
"<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
- response.Message +
- "</div>",
+ response.Message +
+ "</div>",
"瀵煎叆缁撴灉",
{ dangerouslyUseHTMLString: true }
);
@@ -1160,8 +1197,8 @@
.then((res) => {
this.$alert(
"<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
- res.data.Message +
- "</div>",
+ res.data.Message +
+ "</div>",
"瀵煎叆缁撴灉",
{ dangerouslyUseHTMLString: true }
);
@@ -1212,4 +1249,8 @@
display: flex;
flex-direction: row;
}
+
+.zy-hidden {
+ display: none;
+}
</style>
diff --git a/src/views/basic/gyWarehouse/gyWarehouseEdit.vue b/src/views/basic/gyWarehouse/gyWarehouseEdit.vue
index cc6803e..298d2b3 100644
--- a/src/views/basic/gyWarehouse/gyWarehouseEdit.vue
+++ b/src/views/basic/gyWarehouse/gyWarehouseEdit.vue
@@ -47,10 +47,19 @@
<el-form-item label="浠撳簱绫诲瀷" prop="HWarehouseType">
<el-select v-model="form.HWarehouseType" placeholder="璇烽�夋嫨浠撳簱绫诲瀷">
<el-option
- v-for="(item, index) in HWarehouseTypeList"
- :key="index"
- :label="item.Name"
- :value="item.Name"
+ v-for="item in [
+ {
+ label: '鐢熶骇浠撳簱',
+ value: '鐢熶骇浠撳簱',
+ },
+ {
+ label: '妯″叿浠撳簱',
+ value: '妯″叿浠撳簱',
+ },
+ ]"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
>
</el-option>
</el-select>
@@ -265,26 +274,12 @@
ids: [],
// 琛ㄥ崟鍙傛暟
- form: {
- HWarehouseType: "鐢熶骇浠撳簱",
- },
+ form: {},
// 琛ㄥ崟鏍￠獙
rules: {
HNumber: [{ required: true, message: "浠撳簱浠ｇ爜涓嶈兘涓虹┖", trigger: "blur" }],
HName: [{ required: true, message: "浠撳簱鍚嶇О鍚嶇О涓嶈兘涓虹┖", trigger: "blur" }],
- HWarehouseType: [
- { required: true, message: "浠撳簱绫诲瀷涓嶈兘涓虹┖", trigger: "blur" },
- ],
},
-
- HWarehouseTypeList: [
- {
- Name: "鐢熶骇浠撳簱",
- },
- {
- Name: "妯″叿浠撳簱",
- },
- ],
};
},
created() {
@@ -324,7 +319,6 @@
},
getdata() {
this.reset();
- console.log(this.OperationType);
if (this.OperationType != 1) {
this.zzSelDis = true;
axios
@@ -339,52 +333,68 @@
if (result.code == 1) {
// 璇存槑楠岃瘉鎴愬姛浜嗭紝
var data = result.data[0];
-
- Object.assign(this.form, {
- HNumber: data.浠撳簱浠ｇ爜,
- HItemID: data.HItemID,
- HParentID: data.HParentID,
- HShortNumber: data.HNumber,
- HName: data.浠撳簱鍚嶇О,
- HHelpCode: data.HHelpCode,
- HEmpID: data.HEmpID,
- HEmpName: data.HEmpName,
- HAddress: data.浠撳簱鍦板潃,
- HPhone: data.鑱旂郴鐢佃瘽,
- HStopflag: data.绂佺敤鏍囪,
- HStockCtrlFlag: data.璐熷簱瀛樻帶鍒舵爣璁�,
- HSPFlag: data.鍚敤浠撲綅 == "Y" ? 1 : 0,
- HRemark: data.HRemark,
- HWarehouseType: data.浠撳簱绫诲瀷,
- //, "HItemID": data.鏉＄爜缂栧彿
- HBarCode: data.HBarCode,
- HUSEORGID: data.HUSEORGID,
- //, "HCreator": data.鍒涘缓浜�
- //, "lngBillKey": data.lngBillKey
- //, "lngBillSubKey": data.lngBillSubKey
- //, "HMaker": data.HMaker
- //, "HCreateDate": data.鍒涘缓鏃ユ湡
- HUpDater: sessionStorage["HUserName"],
- HMakeEmp: data["鍒涘缓浜�"],
- HMakeDate:
- data["鍒涘缓鏃ユ湡"] == null
- ? ""
- : dayjs(new Date(data["鍒涘缓鏃ユ湡"])).format("yyyy-MM-dd"),
- HCheckEmp: data["瀹℃牳浜�"],
- HCheckDate:
- data["瀹℃牳鏃ユ湡"] == null
- ? ""
- : dayjs(new Date(data["瀹℃牳鏃ユ湡"])).format("yyyy-MM-dd"),
- HStopEmp: data["绂佺敤浜�"],
- HStopDate:
- data["绂佺敤鏃ユ湡"] == null
- ? ""
- : dayjs(new Date(data["绂佺敤鏃ユ湡"])).format("yyyy-MM-dd"),
- });
+ // 浣跨敤 Object.assign 涓㈠け鍝嶅簲寮� 鏀逛负浣跨敤 this.form = {...{}}
+ this.form = {
+ ...{
+ HNumber: data.浠撳簱浠ｇ爜,
+ HItemID: data.HItemID,
+ HParentID: data.HParentID,
+ HShortNumber: data.HNumber,
+ HName: data.浠撳簱鍚嶇О,
+ HHelpCode: data.HHelpCode,
+ HEmpID: data.HEmpID,
+ HEmpName: data.HEmpName,
+ HAddress: data.浠撳簱鍦板潃,
+ HPhone: data.鑱旂郴鐢佃瘽,
+ HStopflag: data.绂佺敤鏍囪 == "true",
+ HStockCtrlFlag: data.璐熷簱瀛樻帶鍒舵爣璁� == "true",
+ HSPFlag: data.鍚敤浠撲綅 == "Y" ? true : false,
+ HRemark: data.HRemark,
+ HWarehouseType: data.浠撳簱绫诲瀷,
+ //, "HItemID": data.鏉＄爜缂栧彿
+ HBarCode: data.HBarCode,
+ HUSEORGID: data.HUSEORGID,
+ //, "HCreator": data.鍒涘缓浜�
+ //, "lngBillKey": data.lngBillKey
+ //, "lngBillSubKey": data.lngBillSubKey
+ //, "HMaker": data.HMaker
+ //, "HCreateDate": data.鍒涘缓鏃ユ湡
+ HUpDater: sessionStorage["HUserName"],
+ HMakeEmp: data["鍒涘缓浜�"],
+ HMakeDate:
+ data["鍒涘缓鏃ユ湡"] == null
+ ? ""
+ : dayjs(new Date(data["鍒涘缓鏃ユ湡"])).format("yyyy-MM-dd"),
+ HCheckEmp: data["瀹℃牳浜�"],
+ HCheckDate:
+ data["瀹℃牳鏃ユ湡"] == null
+ ? ""
+ : dayjs(new Date(data["瀹℃牳鏃ユ湡"])).format("yyyy-MM-dd"),
+ HStopEmp: data["绂佺敤浜�"],
+ HStopDate:
+ data["绂佺敤鏃ユ湡"] == null
+ ? ""
+ : dayjs(new Date(data["绂佺敤鏃ユ湡"])).format("yyyy-MM-dd"),
+ },
+ };
if (!data.HCheckEmp) {
this.CheckBillDisabled = false;
}
}
+
+ if (this.OperationType == 2) {
+ // 澶嶅埗
+ Object.assign(this.form, {
+ HItemID: 0,
+ HMakeEmp: sessionStorage["HUserName"],
+ HMakeDate: dayjs(new Date()).format("YYYY-MM-DD"),
+ HCheckEmp: "",
+ HCheckDate: "",
+ HStopEmp: "",
+ HStopDate: "",
+ });
+ }
+
this.$nextTick(() => {
this.formShow = true;
this.formLoading = false;
diff --git a/src/views/component/employee/index.vue b/src/views/component/employee/index.vue
index c6708a4..09d20b7 100644
--- a/src/views/component/employee/index.vue
+++ b/src/views/component/employee/index.vue
@@ -48,7 +48,7 @@
subDisabled: false, //缂栬緫椤甸潰淇濆瓨鎸夐挳鏄惁绂佺敤(true绂佺敤锛宖alse鍙敤)
OperationType: null, //淇濆瓨绫诲瀷锛堟柊澧�1淇敼3锛�
HInterID: null,
- baseURL: "http://47.96.97.237/API",
+ baseURL: process.env.VUE_APP_BASE_API || "http://47.96.97.237/API/",
user: "admin",
currentRow: [],
lastSelectedRowIndex: null, // 鐢ㄤ簬璁板綍涓婃鐐瑰嚮鐨勮绱㈠紩
@@ -106,7 +106,7 @@
let sWhere = "";
this.loading = true;
axios
- .get(process.env.VUE_APP_BASE_URL + "/Gy_Employee/list", {
+ .get(this.baseURL + "/Gy_Employee/list", {
params: { sWhere: sWhere, user: this.user, Organization: "娴欐睙鏅轰簯杩堟��" },
})
.then((response) => {
diff --git a/src/views/purchase/cgPoInStockBill/cgPoInStockBillEdit.vue b/src/views/purchase/cgPoInStockBill/cgPoInStockBillEdit.vue
index 8e6604a..216921f 100644
--- a/src/views/purchase/cgPoInStockBill/cgPoInStockBillEdit.vue
+++ b/src/views/purchase/cgPoInStockBill/cgPoInStockBillEdit.vue
@@ -883,58 +883,60 @@
var result = response.data;
var data = response.data.data[0];
this.form.BillType = data.HSourceBillType;
- Object.assign(this.form, {
- HBillNo: data.鍗曟嵁鍙�,
- HDate: dayjs(data.鏃ユ湡),
- HInnerBillNo: data.鍐呴儴鍗曟嵁鍙�,
- HEmpID: data.HEmpID,
- HEmpName: data.涓氬姟鍛�,
- HSupID: data.HSupID,
- HSupName: data.渚涘簲鍟�,
- HWHID: data.涓昏〃浠撳簱ID,
- HWHName: data.涓昏〃浠撳簱,
- HCurID: data.HCurID,
- HCurName: data.甯佸埆,
- HExRate: data.姹囩巼,
- HDeptName: data.閮ㄩ棬,
- HDeptID: data.HDeptID,
- HManagerName: data.涓荤,
- HManagerID: data.HManagerID,
- HSourceBillType: data.婧愬崟绫诲瀷,
- HAddress: data.浜よ揣鍦扮偣,
- HExRate: data.姹囩巼,
- HProjectID: data.HProjectID,
- HProjectNumber: data.椤圭洰浠ｇ爜,
- HProjectName: data.椤圭洰鍚嶇О,
- HInvoiceBillNo: data.鍙戠エ缂栧彿,
- Box2: "",
- HRemark: data.琛ㄥご澶囨敞,
- HMaker: data.鍒跺崟浜�,
- HChecker: data.瀹℃牳浜�,
- HCloseMan: data.鍏抽棴浜�,
- HUpDater: data.淇敼浜�,
- HDeleteMan: data.浣滃簾浜�,
- HMakeDate:
- data.鍒跺崟鏃ユ湡 == null
- ? ""
- : dayjs(data.鍒跺崟鏃ユ湡).format("YYYY-MM-DD hh:mm:ss"),
- HCheckDate:
- data.瀹℃牳鏃ユ湡 == null
- ? ""
- : dayjs(data.瀹℃牳鏃ユ湡).format("YYYY-MM-DD hh:mm:ss"),
- HCloseDate:
- data.鍏抽棴鏃ユ湡 == null
- ? ""
- : dayjs(data.鍏抽棴鏃ユ湡).format("YYYY-MM-DD hh:mm:ss"),
- HUpDateDate:
- data.淇敼鏃ユ湡 == null
- ? ""
- : dayjs(data.淇敼鏃ユ湡).format("YYYY-MM-DD hh:mm:ss"),
- HDeleteDate:
- data.浣滃簾鏃ユ湡 == null
- ? ""
- : dayjs(data.浣滃簾鏃ユ湡).format("YYYY-MM-DD hh:mm:ss"),
- });
+ this.form = {
+ ...{
+ HBillNo: data.鍗曟嵁鍙�,
+ HDate: dayjs(data.鏃ユ湡),
+ HInnerBillNo: data.鍐呴儴鍗曟嵁鍙�,
+ HEmpID: data.HEmpID,
+ HEmpName: data.涓氬姟鍛�,
+ HSupID: data.HSupID,
+ HSupName: data.渚涘簲鍟�,
+ HWHID: data.涓昏〃浠撳簱ID,
+ HWHName: data.涓昏〃浠撳簱,
+ HCurID: data.HCurID,
+ HCurName: data.甯佸埆,
+ HExRate: data.姹囩巼,
+ HDeptName: data.閮ㄩ棬,
+ HDeptID: data.HDeptID,
+ HManagerName: data.涓荤,
+ HManagerID: data.HManagerID,
+ HSourceBillType: data.婧愬崟绫诲瀷,
+ HAddress: data.浜よ揣鍦扮偣,
+ HExRate: data.姹囩巼,
+ HProjectID: data.HProjectID,
+ HProjectNumber: data.椤圭洰浠ｇ爜,
+ HProjectName: data.椤圭洰鍚嶇О,
+ HInvoiceBillNo: data.鍙戠エ缂栧彿,
+ Box2: "",
+ HRemark: data.琛ㄥご澶囨敞,
+ HMaker: data.鍒跺崟浜�,
+ HChecker: data.瀹℃牳浜�,
+ HCloseMan: data.鍏抽棴浜�,
+ HUpDater: data.淇敼浜�,
+ HDeleteMan: data.浣滃簾浜�,
+ HMakeDate:
+ data.鍒跺崟鏃ユ湡 == null
+ ? ""
+ : dayjs(data.鍒跺崟鏃ユ湡).format("YYYY-MM-DD hh:mm:ss"),
+ HCheckDate:
+ data.瀹℃牳鏃ユ湡 == null
+ ? ""
+ : dayjs(data.瀹℃牳鏃ユ湡).format("YYYY-MM-DD hh:mm:ss"),
+ HCloseDate:
+ data.鍏抽棴鏃ユ湡 == null
+ ? ""
+ : dayjs(data.鍏抽棴鏃ユ湡).format("YYYY-MM-DD hh:mm:ss"),
+ HUpDateDate:
+ data.淇敼鏃ユ湡 == null
+ ? ""
+ : dayjs(data.淇敼鏃ユ湡).format("YYYY-MM-DD hh:mm:ss"),
+ HDeleteDate:
+ data.浣滃簾鏃ユ湡 == null
+ ? ""
+ : dayjs(data.浣滃簾鏃ユ湡).format("YYYY-MM-DD hh:mm:ss"),
+ },
+ };
if (this.copyType == 1) {
this.getHBillNo();
let date = new Date();
diff --git a/src/views/purchase/cgPoOrderBill/cgPoOrderBill.vue b/src/views/purchase/cgPoOrderBill/cgPoOrderBill.vue
index eda3df9..c913644 100644
--- a/src/views/purchase/cgPoOrderBill/cgPoOrderBill.vue
+++ b/src/views/purchase/cgPoOrderBill/cgPoOrderBill.vue
@@ -775,21 +775,18 @@
},
mounted() {
this.queryParams.HOrgID = sessionStorage["Organization"];
+ window.editGyClose = () => {
+ this.editGyClose(); // 缁勪欢鍐呯殑鏂规硶缁戝畾鍒皐indows
+ };
},
created() {
this.riqiChange();
this.getList();
},
+ beforeDestory() {
+ delete window.editGyClose;
+ },
methods: {
- handleTabActive() {
- window.editGyClose = () => {
- this.editGyClose(); // 缁勪欢鍐呯殑鏂规硶缁戝畾鍒皐indows
- };
- },
- handleTabInactive() {
- // 缁勪欢閿�姣佹椂娓呯悊鍏ㄥ眬鏂规硶锛岄伩鍏嶅唴瀛樻硠婕�
- delete window.editGyClose;
- },
onDateScanOptionChangerHandler(e) {
this.queryParams.timeSpan = e;
if (e == -1) {
diff --git a/src/views/purchase/cgPoOrderBill/cgPoOrderBillEdit.vue b/src/views/purchase/cgPoOrderBill/cgPoOrderBillEdit.vue
index 1d4929a..fe73dfd 100644
--- a/src/views/purchase/cgPoOrderBill/cgPoOrderBillEdit.vue
+++ b/src/views/purchase/cgPoOrderBill/cgPoOrderBillEdit.vue
@@ -905,63 +905,65 @@
var result = response.data;
var data = response.data.data[0];
this.form.BillType = data.HSourceBillType;
- Object.assign(this.form, {
- HBillNo: data.鍗曟嵁鍙�, //璁剧疆鍗曟嵁鍙风殑绗竴涓�间负鈥淗BillNo鈥濆瓧娈电殑鍊兼槸data.鍗曟嵁鍙穈鐨勫��
- HDate: dayjs(data.鏃ユ湡).format("YYYY-MM-DD"), //璁剧疆鈥淗Date鈥濆瓧娈电殑鍊间负`data.鏃ユ湡`缁忚繃`dayjs`鍑芥暟澶勭悊鍚庣殑鏍煎紡
- HSSDate: dayjs(data.缁撶畻鏃ユ湡).format("YYYY-MM-DD"), //浣嗚缃殑鏄�滅粨绠楁棩鏈熲�濆瓧娈点��
- //,"HInnerBillNo": data.鍐呴儴鍗曟嵁鍙�
- HAddress: data.浜よ揣鍦扮偣, // 璁剧疆鈥滀氦璐у湴鐐光�濆瓧娈电殑鍊笺��
- HDeptName: data.閮ㄩ棬, // 璁剧疆鈥滈儴闂ㄢ�濆悕绉板瓧娈电殑鍊笺��
- HDeptID: data.HDeptID, // 璁剧疆鈥淗DeptID鈥濆悕绉板瓧娈电殑鍊笺��
- HSupID: data.HSupID, // 璁剧疆鈥淗SupID鈥濆悕绉板瓧娈电殑鍊笺��
- HSupName: data.渚涘簲鍟�, // 璁剧疆鈥滀緵搴斿晢鈥濆悕绉板瓧娈电殑鍊笺��
- HEmpID: data.HEmpID,
- HEmpName: data.涓氬姟鍛�, // 璁剧疆鈥滀笟鍔″憳鈥濆悕绉板瓧娈电殑鍊笺��
- HCurID: data.HCurID,
- HCurName: data.甯佸埆, // 璁剧疆鈥滃竵鍒�濆悕绉板瓧娈电殑鍊笺��
- HExRate: data.姹囩巼, // 璁剧疆鈥滄眹鐜団�濆悕绉板瓧娈电殑鍊笺��
- HManagerName: data.涓荤, // 璁剧疆鈥滀富绠♀�濆悕绉板瓧娈电殑鍊笺��
- HManagerID: data.HManagerID,
- HPSStyleID: data.HPSStyleID,
- HPSStyleName: data.閲囪喘鏂瑰紡, // 璁剧疆鈥滈噰璐柟寮忊�濆悕绉板瓧娈电殑鍊笺��
- HSSID: data.HSSID,
- HSSName: data.缁撶畻鏂瑰紡, // 璁剧疆鈥滅粨绠楁柟寮忊�濆悕绉板瓧娈电殑鍊笺��
- HLinkMan: data.鑱旂郴浜�, // 璁剧疆鈥滆仈绯讳汉鈥濆悕绉板瓧娈电殑鍊笺��
- HLinkPhone: data.鑱旂郴浜虹數璇�, // 璁剧疆鈥滆仈绯荤數璇濃�濆悕绉板瓧娈电殑鍊笺��
- HInnerBillNo: data.杈呭姪瀛楁, // 璁剧疆鈥滆緟鍔╁瓧娈碘�濆悕绉板瓧娈电殑鍊笺��
- HProjectID: data.HProjectID,
- HProjectNumber: data.椤圭洰浠ｇ爜, // 璁剧疆鈥滈」鐩唬鐮佲�濆悕绉板瓧娈电殑鍊笺��
- HProjectName: data.椤圭洰鍚嶇О, // 璁剧疆鈥滈」鐩悕绉扳�濆悕绉板瓧娈电殑鍊笺��
- HWHID: data.HWHID,
- HOrgID: data.HOrgID,
- HWHName: data.浠撳簱, // 璁剧疆鈥滀粨搴撯�濆悕绉板瓧娈电殑鍊笺��
- HRemark: data.琛ㄥご澶囨敞, // 璁剧疆鈥滆〃澶村娉ㄢ�濆悕绉板瓧娈电殑鍊笺��
- HMaker: data.鍒跺崟浜�, // 璁剧疆鈥滃埗鍗曚汉鈥濆悕绉板瓧娈电殑鍊笺��
- HChecker: data.瀹℃牳浜�, // 璁剧疆鈥滃鏍镐汉鈥濆悕绉板瓧娈电殑鍊笺��
- HCloseMan: data.鍏抽棴浜�, // 璁剧疆鈥滃叧闂汉鈥濆悕绉板瓧娈电殑鍊笺��
- HUpDater: data.淇敼浜�, // 璁剧疆鈥滀慨鏀逛汉鈥濆悕绉板瓧娈电殑鍊笺��
- HDeleteMan: data.浣滃簾浜�, // 璁剧疆鈥滀綔搴熶汉鈥濆悕绉板瓧娈电殑鍊笺��
- HMakeDate:
- data.鍒跺崟鏃ユ湡 == null
- ? ""
- : dayjs(data.鍒跺崟鏃ユ湡).format("yyyy-MM-dd hh:mm:ss"),
- HCheckDate:
- data.瀹℃牳鏃ユ湡 == null
- ? ""
- : dayjs(data.瀹℃牳鏃ユ湡).format("yyyy-MM-dd hh:mm:ss"),
- HCloseDate:
- data.鍏抽棴鏃ユ湡 == null
- ? ""
- : dayjs(data.鍏抽棴鏃ユ湡).format("yyyy-MM-dd hh:mm:ss"),
- HUpDateDate:
- data.淇敼鏃ユ湡 == null
- ? ""
- : dayjs(data.淇敼鏃ユ湡).format("yyyy-MM-dd hh:mm:ss"),
- HDeleteDate:
- data.浣滃簾鏃ユ湡 == null
- ? ""
- : dayjs(data.浣滃簾鏃ユ湡).format("yyyy-MM-dd hh:mm:ss"),
- });
+ this.form = {
+ ...{
+ HBillNo: data.鍗曟嵁鍙�, //璁剧疆鍗曟嵁鍙风殑绗竴涓�间负鈥淗BillNo鈥濆瓧娈电殑鍊兼槸data.鍗曟嵁鍙穈鐨勫��
+ HDate: dayjs(data.鏃ユ湡).format("YYYY-MM-DD"), //璁剧疆鈥淗Date鈥濆瓧娈电殑鍊间负`data.鏃ユ湡`缁忚繃`dayjs`鍑芥暟澶勭悊鍚庣殑鏍煎紡
+ HSSDate: dayjs(data.缁撶畻鏃ユ湡).format("YYYY-MM-DD"), //浣嗚缃殑鏄�滅粨绠楁棩鏈熲�濆瓧娈点��
+ //,"HInnerBillNo": data.鍐呴儴鍗曟嵁鍙�
+ HAddress: data.浜よ揣鍦扮偣, // 璁剧疆鈥滀氦璐у湴鐐光�濆瓧娈电殑鍊笺��
+ HDeptName: data.閮ㄩ棬, // 璁剧疆鈥滈儴闂ㄢ�濆悕绉板瓧娈电殑鍊笺��
+ HDeptID: data.HDeptID, // 璁剧疆鈥淗DeptID鈥濆悕绉板瓧娈电殑鍊笺��
+ HSupID: data.HSupID, // 璁剧疆鈥淗SupID鈥濆悕绉板瓧娈电殑鍊笺��
+ HSupName: data.渚涘簲鍟�, // 璁剧疆鈥滀緵搴斿晢鈥濆悕绉板瓧娈电殑鍊笺��
+ HEmpID: data.HEmpID,
+ HEmpName: data.涓氬姟鍛�, // 璁剧疆鈥滀笟鍔″憳鈥濆悕绉板瓧娈电殑鍊笺��
+ HCurID: data.HCurID,
+ HCurName: data.甯佸埆, // 璁剧疆鈥滃竵鍒�濆悕绉板瓧娈电殑鍊笺��
+ HExRate: data.姹囩巼, // 璁剧疆鈥滄眹鐜団�濆悕绉板瓧娈电殑鍊笺��
+ HManagerName: data.涓荤, // 璁剧疆鈥滀富绠♀�濆悕绉板瓧娈电殑鍊笺��
+ HManagerID: data.HManagerID,
+ HPSStyleID: data.HPSStyleID,
+ HPSStyleName: data.閲囪喘鏂瑰紡, // 璁剧疆鈥滈噰璐柟寮忊�濆悕绉板瓧娈电殑鍊笺��
+ HSSID: data.HSSID,
+ HSSName: data.缁撶畻鏂瑰紡, // 璁剧疆鈥滅粨绠楁柟寮忊�濆悕绉板瓧娈电殑鍊笺��
+ HLinkMan: data.鑱旂郴浜�, // 璁剧疆鈥滆仈绯讳汉鈥濆悕绉板瓧娈电殑鍊笺��
+ HLinkPhone: data.鑱旂郴浜虹數璇�, // 璁剧疆鈥滆仈绯荤數璇濃�濆悕绉板瓧娈电殑鍊笺��
+ HInnerBillNo: data.杈呭姪瀛楁, // 璁剧疆鈥滆緟鍔╁瓧娈碘�濆悕绉板瓧娈电殑鍊笺��
+ HProjectID: data.HProjectID,
+ HProjectNumber: data.椤圭洰浠ｇ爜, // 璁剧疆鈥滈」鐩唬鐮佲�濆悕绉板瓧娈电殑鍊笺��
+ HProjectName: data.椤圭洰鍚嶇О, // 璁剧疆鈥滈」鐩悕绉扳�濆悕绉板瓧娈电殑鍊笺��
+ HWHID: data.HWHID,
+ HOrgID: data.HOrgID,
+ HWHName: data.浠撳簱, // 璁剧疆鈥滀粨搴撯�濆悕绉板瓧娈电殑鍊笺��
+ HRemark: data.琛ㄥご澶囨敞, // 璁剧疆鈥滆〃澶村娉ㄢ�濆悕绉板瓧娈电殑鍊笺��
+ HMaker: data.鍒跺崟浜�, // 璁剧疆鈥滃埗鍗曚汉鈥濆悕绉板瓧娈电殑鍊笺��
+ HChecker: data.瀹℃牳浜�, // 璁剧疆鈥滃鏍镐汉鈥濆悕绉板瓧娈电殑鍊笺��
+ HCloseMan: data.鍏抽棴浜�, // 璁剧疆鈥滃叧闂汉鈥濆悕绉板瓧娈电殑鍊笺��
+ HUpDater: data.淇敼浜�, // 璁剧疆鈥滀慨鏀逛汉鈥濆悕绉板瓧娈电殑鍊笺��
+ HDeleteMan: data.浣滃簾浜�, // 璁剧疆鈥滀綔搴熶汉鈥濆悕绉板瓧娈电殑鍊笺��
+ HMakeDate:
+ data.鍒跺崟鏃ユ湡 == null
+ ? ""
+ : dayjs(data.鍒跺崟鏃ユ湡).format("yyyy-MM-dd hh:mm:ss"),
+ HCheckDate:
+ data.瀹℃牳鏃ユ湡 == null
+ ? ""
+ : dayjs(data.瀹℃牳鏃ユ湡).format("yyyy-MM-dd hh:mm:ss"),
+ HCloseDate:
+ data.鍏抽棴鏃ユ湡 == null
+ ? ""
+ : dayjs(data.鍏抽棴鏃ユ湡).format("yyyy-MM-dd hh:mm:ss"),
+ HUpDateDate:
+ data.淇敼鏃ユ湡 == null
+ ? ""
+ : dayjs(data.淇敼鏃ユ湡).format("yyyy-MM-dd hh:mm:ss"),
+ HDeleteDate:
+ data.浣滃簾鏃ユ湡 == null
+ ? ""
+ : dayjs(data.浣滃簾鏃ユ湡).format("yyyy-MM-dd hh:mm:ss"),
+ },
+ };
if (this.copyType == 1) {
this.getHBillNo();
let date = new Date();
diff --git a/src/views/sell/XsSeOutStockBackBillEdit.vue b/src/views/sell/XsSeOutStockBackBillEdit.vue
index 19b4a6c..4960eb4 100644
--- a/src/views/sell/XsSeOutStockBackBillEdit.vue
+++ b/src/views/sell/XsSeOutStockBackBillEdit.vue
@@ -950,41 +950,43 @@
var result = response.data;
var data = response.data.data[0];
this.form.BillType = data.HSourceBillType;
- Object.assign(this.form, {
- HBillNo: data.鍗曟嵁鍙�,
- HDate: dayjs(data.鏃ユ湡).format("YYYY-MM-DD"),
- HInnerBillNo: data.閿�鍞鍗曞彿,
- HDeptID: data.HDeptID,
- HDeptName: data.閮ㄩ棬,
- HEmpID: data.HEmpID,
- HEmpName: data.涓氬姟鍛�,
- HManagerID: data.HManagerID,
- HManagerName: data.涓荤,
- HSSID: data.HSSID,
- HSSName: data.缁撶畻鏂瑰紡,
- HCurID: data.HCurID,
- HCurName: data.甯佸埆,
- HExRate: data.姹囩巼,
- HWHID: data.HWHID_Main,
- HWHName: data.浠撳簱,
- HCusID: data.HCusID,
- HCusName: data.瀹㈡埛,
- HAddress: data.浜よ揣鍦扮偣,
- HProjectID: data.HProjectID,
- HProjectNumber: data.椤圭洰缂栫爜,
- HProjectName: data.椤圭洰鍚嶇О,
- HRemark: data.琛ㄥご澶囨敞,
- HExplanation: data.鎽樿,
- HSourceBillType: data.婧愬崟绫诲瀷,
- HMaker: data.鍒跺崟浜�,
- HChecker: data.瀹℃牳浜�,
- HCloseMan: data.鍏抽棴浜�,
- HMakeDate: data.鍒跺崟鏃ユ湡,
- HCheckDate: data.瀹℃牳鏃ユ湡,
- HCloseDate: data.鍏抽棴鏃ユ湡,
- HUpDateDate: data.淇敼鏃ユ湡,
- HDeleteDate: data.浣滃簾鏃ユ湡,
- });
+ this.form = {
+ ...{
+ HBillNo: data.鍗曟嵁鍙�,
+ HDate: dayjs(data.鏃ユ湡).format("YYYY-MM-DD"),
+ HInnerBillNo: data.閿�鍞鍗曞彿,
+ HDeptID: data.HDeptID,
+ HDeptName: data.閮ㄩ棬,
+ HEmpID: data.HEmpID,
+ HEmpName: data.涓氬姟鍛�,
+ HManagerID: data.HManagerID,
+ HManagerName: data.涓荤,
+ HSSID: data.HSSID,
+ HSSName: data.缁撶畻鏂瑰紡,
+ HCurID: data.HCurID,
+ HCurName: data.甯佸埆,
+ HExRate: data.姹囩巼,
+ HWHID: data.HWHID_Main,
+ HWHName: data.浠撳簱,
+ HCusID: data.HCusID,
+ HCusName: data.瀹㈡埛,
+ HAddress: data.浜よ揣鍦扮偣,
+ HProjectID: data.HProjectID,
+ HProjectNumber: data.椤圭洰缂栫爜,
+ HProjectName: data.椤圭洰鍚嶇О,
+ HRemark: data.琛ㄥご澶囨敞,
+ HExplanation: data.鎽樿,
+ HSourceBillType: data.婧愬崟绫诲瀷,
+ HMaker: data.鍒跺崟浜�,
+ HChecker: data.瀹℃牳浜�,
+ HCloseMan: data.鍏抽棴浜�,
+ HMakeDate: data.鍒跺崟鏃ユ湡,
+ HCheckDate: data.瀹℃牳鏃ユ湡,
+ HCloseDate: data.鍏抽棴鏃ユ湡,
+ HUpDateDate: data.淇敼鏃ユ湡,
+ HDeleteDate: data.浣滃簾鏃ユ湡,
+ },
+ };
if (this.copyType == 1) {
this.getHBillNo();
let date = new Date();
diff --git a/src/views/sell/XsSeOutStockBackBillList.vue b/src/views/sell/XsSeOutStockBackBillList.vue
index 423cde1..f73c289 100644
--- a/src/views/sell/XsSeOutStockBackBillList.vue
+++ b/src/views/sell/XsSeOutStockBackBillList.vue
@@ -1202,7 +1202,7 @@
},
//閫変腑琛岄珮浜牱寮�
rowStyle({ row, rowIndex }) {
- if (this.ids.includes(row.HItemID)) {
+ if (this.ids.includes(row.hmainid)) {
return { background: "#ecf5ff" };
}
},
@@ -1214,7 +1214,7 @@
// 澶氶�夋閫変腑鏁版嵁
handleSelectionChange(selection) {
// this.rowForm = {}
- this.ids = selection.map((item) => item.HItemID);
+ this.ids = selection.map((item) => item.hmainid);
this.single = selection.length != 1;
this.multiple = !selection.length;
if (!this.single) {
diff --git a/src/views/sell/XsSeOutStockBillEdit.vue b/src/views/sell/XsSeOutStockBillEdit.vue
index 344e93b..0824847 100644
--- a/src/views/sell/XsSeOutStockBillEdit.vue
+++ b/src/views/sell/XsSeOutStockBillEdit.vue
@@ -144,8 +144,8 @@
<el-option
v-for="(item, index) in HSourceBillTypeList"
:key="index"
- :label="item"
- :value="item"
+ :label="item.label"
+ :value="item.value"
>
</el-option>
</el-select>
@@ -519,6 +519,7 @@
created() {
this.fetchData();
this.getdata();
+ this.getHSourceBillType();
},
beforeDestroy() {
if (window.parent) {
@@ -528,6 +529,32 @@
}
},
methods: {
+ getHSourceBillType() {
+ axios
+ .get(`${this.baseURL}/Web/GetHSourceBillType`, {
+ params: {
+ HName: "鍙戣揣閫氱煡鍗�",
+ Num: 2,
+ },
+ })
+ .then((res) => {
+ let { data, count, Message } = res.data;
+ if (count == 1) {
+ // 鑾峰彇鎴愬姛
+ this.HSourceBillTypeList = Array.from(data).map((e) => {
+ return {
+ label: e.HSourceBillTypeName,
+ value: e.HSourceBillType,
+ };
+ });
+ } else {
+ this.$modal.msgError(`鑾峰彇婧愬崟绫诲瀷澶辫触: ${Message}`);
+ }
+ })
+ .catch((err) => {
+ this.$modal.msgError(`鑾峰彇婧愬崟绫诲瀷澶辫触: ${err}`);
+ });
+ },
fetchData() {
axios
.get(this.baseURL + "/Web/GetOrganizations", {})
@@ -946,49 +973,51 @@
var result = response.data;
var data = response.data.data[0];
this.form.BillType = data.HSourceBillType;
- Object.assign(this.form, {
- HBillNo: data.鍗曟嵁鍙�,
- HInterID: data.hmainid,
- HDate: dayjs(data.鏃ユ湡).format("YYYY-MM-DD"),
- HSeOrderBillNo_M: data.閿�鍞鍗曞彿,
- HEmpID: data.HEmpID,
- HEmpName: data.涓氬姟鍛�,
- HCusID: data.HCusID,
- HCusName: data.瀹㈡埛,
- HWHID: data.涓讳粨搴揑D,
- HWHName: data.涓诲彂璐т粨搴�,
- HAddress: data.浜よ揣鍦板潃,
- HDeptName: data.閮ㄩ棬,
- HDeptID: data.HDeptID,
- HCurID: data.HCurID,
- HCurName: data.甯佸埆,
- HSSID: data.HSSID,
- HSSName: data.缁撶畻鏂瑰紡,
- HExRate: data.姹囩巼,
- HManagerName: data.涓荤,
- HManagerID: data.HManagerID,
- HSourceBillType: data.婧愬崟绫诲瀷,
- HLinkMan: data.鑱旂郴浜�,
- HLinkPhone: data.鑱旂郴鐢佃瘽,
- //, "HConveyCompID": data.杩愯緭鍏徃
- //, "HConveyTypeID": data.杩愯緭鏂瑰紡
- //, "HConveyMoney": data.杩愯垂
- //, "HDFflag": data.鏄惁鍨粯
- HProjectID: data.HProjectID,
- HProjectNumber: data.椤圭洰缂栫爜,
- HProjectName: data.椤圭洰鍚嶇О,
+ this.form = {
+ ...{
+ HBillNo: data.鍗曟嵁鍙�,
+ HInterID: data.hmainid,
+ HDate: dayjs(data.鏃ユ湡).format("YYYY-MM-DD"),
+ HSeOrderBillNo_M: data.閿�鍞鍗曞彿,
+ HEmpID: data.HEmpID,
+ HEmpName: data.涓氬姟鍛�,
+ HCusID: data.HCusID,
+ HCusName: data.瀹㈡埛,
+ HWHID: data.涓讳粨搴揑D,
+ HWHName: data.涓诲彂璐т粨搴�,
+ HAddress: data.浜よ揣鍦板潃,
+ HDeptName: data.閮ㄩ棬,
+ HDeptID: data.HDeptID,
+ HCurID: data.HCurID,
+ HCurName: data.甯佸埆,
+ HSSID: data.HSSID,
+ HSSName: data.缁撶畻鏂瑰紡,
+ HExRate: data.姹囩巼,
+ HManagerName: data.涓荤,
+ HManagerID: data.HManagerID,
+ HSourceBillType: data.婧愬崟绫诲瀷,
+ HLinkMan: data.鑱旂郴浜�,
+ HLinkPhone: data.鑱旂郴鐢佃瘽,
+ //, "HConveyCompID": data.杩愯緭鍏徃
+ //, "HConveyTypeID": data.杩愯緭鏂瑰紡
+ //, "HConveyMoney": data.杩愯垂
+ //, "HDFflag": data.鏄惁鍨粯
+ HProjectID: data.HProjectID,
+ HProjectNumber: data.椤圭洰缂栫爜,
+ HProjectName: data.椤圭洰鍚嶇О,
- Box2: "",
- HRemark: data.琛ㄥご澶囨敞,
- HMaker: data.鍒跺崟浜�,
- HChecker: data.瀹℃牳浜�,
- HCloseMan: data.鍏抽棴浜�,
- HMakeDate: data.鍒跺崟鏃ユ湡,
- HCheckDate: data.瀹℃牳鏃ユ湡,
- HCloseDate: data.鍏抽棴鏃ユ湡,
- HUpDateDate: data.淇敼鏃ユ湡,
- HDeleteDate: data.浣滃簾鏃ユ湡,
- });
+ Box2: "",
+ HRemark: data.琛ㄥご澶囨敞,
+ HMaker: data.鍒跺崟浜�,
+ HChecker: data.瀹℃牳浜�,
+ HCloseMan: data.鍏抽棴浜�,
+ HMakeDate: data.鍒跺崟鏃ユ湡,
+ HCheckDate: data.瀹℃牳鏃ユ湡,
+ HCloseDate: data.鍏抽棴鏃ユ湡,
+ HUpDateDate: data.淇敼鏃ユ湡,
+ HDeleteDate: data.浣滃簾鏃ユ湡,
+ },
+ };
if (this.copyType == 1) {
this.getHBillNo();
let date = new Date();
diff --git a/src/views/sell/xsSeOrderBill/xsSeOrderBillEdit.vue b/src/views/sell/xsSeOrderBill/xsSeOrderBillEdit.vue
index 006a9ec..904eeec 100644
--- a/src/views/sell/xsSeOrderBill/xsSeOrderBillEdit.vue
+++ b/src/views/sell/xsSeOrderBill/xsSeOrderBillEdit.vue
@@ -1046,61 +1046,63 @@
var result = response.data;
var data = response.data.data[0];
this.form.BillType = data.HSourceBillType;
- Object.assign(this.form, {
- HBillNo: data.鍗曟嵁鍙�,
- HDate: dayjs(data.鏃ユ湡).format("YYYY-MM-DD"),
- HInnerBillNo: data.杈呭姪瀛楁,
- HAddress: data.浜よ揣鍦板潃,
- HDeptID: data.HDeptID,
- HDeptName: data.閮ㄩ棬,
- HCusID: data.HCusID,
- HCusName: data.瀹㈡埛,
- HEmpID: data.HEmpID,
- HEmpName: data.涓氬姟鍛�,
- HCurID: data.HCurID,
- HCurName: data.甯佸埆,
- HExRate: data.姹囩巼,
- HEarnestRate: data.瀹氶噾姣斾緥,
- HBillSubType: data.HBillSubType,
- HManagerID: data.HManagerID,
- HManagerName: data.涓荤,
- HSellSID: data.HSellSID,
- HSellSName: data.閿�鍞柟寮�,
- HSSID: data.HSSID,
- HSSName: data.缁撶畻鏂瑰紡,
- HSSDate: dayjs(data.缁撶畻鏃ユ湡).format("YYYY-MM-DD"),
- HPayCusID: data.HPayCusID,
- HPayCusName: data.缁撶畻鏂�,
- HLinkMan: data.鑱旂郴浜�,
- HExplanation: data.鎽樿,
- HLinkPhone: data.鑱旂郴鐢佃瘽,
- HProjectID: data.HProjectID,
- HProjectNumber: data.椤圭洰缂栫爜,
- HProjectName: data.椤圭洰鍚嶇О,
- HWHID: data.涓讳粨搴搃d,
- HWHName: data.涓讳粨搴�,
- HProductType: data.浜у搧绫诲瀷,
- HCreditRating_Now: data.HCreditRating_Now,
- HRemark: data.琛ㄥご澶囨敞,
- HMaker: data.鍒跺崟浜�,
- HMakeDate:
- data.鍒跺崟浜� == "" ? "" : dayjs(data.鍒跺崟鏃ユ湡).format("YYYY-MM-DD"),
- HUpDater: data.淇敼浜�,
- HUpDateDate:
- data.淇敼浜� == "" ? "" : dayjs(data.淇敼鏃ユ湡).format("YYYY-MM-DD"),
- HChecker: data.瀹℃牳浜�,
- HCheckDate:
- data.瀹℃牳浜� == "" ? "" : dayjs(data.瀹℃牳鏃ユ湡).format("YYYY-MM-DD"),
- HCloseMan: data.鍏抽棴浜�,
- HCloseDate:
- data.鍏抽棴浜� == "" ? "" : dayjs(data.鍏抽棴鏃ユ湡).format("YYYY-MM-DD"),
- HDeleteMan: data.浣滃簾浜�,
- HDeleteDate:
- data.浣滃簾浜� == "" ? "" : dayjs(data.浣滃簾鏃ユ湡).format("YYYY-MM-DD"),
- HChangeMan: data.鍙樻洿浜�,
- HChangeDate:
- data.鍙樻洿浜� == "" ? "" : dayjs(data.鍙樻洿鏃ユ湡).format("YYYY-MM-DD"),
- });
+ this.form = {
+ ...{
+ HBillNo: data.鍗曟嵁鍙�,
+ HDate: dayjs(data.鏃ユ湡).format("YYYY-MM-DD"),
+ HInnerBillNo: data.杈呭姪瀛楁,
+ HAddress: data.浜よ揣鍦板潃,
+ HDeptID: data.HDeptID,
+ HDeptName: data.閮ㄩ棬,
+ HCusID: data.HCusID,
+ HCusName: data.瀹㈡埛,
+ HEmpID: data.HEmpID,
+ HEmpName: data.涓氬姟鍛�,
+ HCurID: data.HCurID,
+ HCurName: data.甯佸埆,
+ HExRate: data.姹囩巼,
+ HEarnestRate: data.瀹氶噾姣斾緥,
+ HBillSubType: data.HBillSubType,
+ HManagerID: data.HManagerID,
+ HManagerName: data.涓荤,
+ HSellSID: data.HSellSID,
+ HSellSName: data.閿�鍞柟寮�,
+ HSSID: data.HSSID,
+ HSSName: data.缁撶畻鏂瑰紡,
+ HSSDate: dayjs(data.缁撶畻鏃ユ湡).format("YYYY-MM-DD"),
+ HPayCusID: data.HPayCusID,
+ HPayCusName: data.缁撶畻鏂�,
+ HLinkMan: data.鑱旂郴浜�,
+ HExplanation: data.鎽樿,
+ HLinkPhone: data.鑱旂郴鐢佃瘽,
+ HProjectID: data.HProjectID,
+ HProjectNumber: data.椤圭洰缂栫爜,
+ HProjectName: data.椤圭洰鍚嶇О,
+ HWHID: data.涓讳粨搴搃d,
+ HWHName: data.涓讳粨搴�,
+ HProductType: data.浜у搧绫诲瀷,
+ HCreditRating_Now: data.HCreditRating_Now,
+ HRemark: data.琛ㄥご澶囨敞,
+ HMaker: data.鍒跺崟浜�,
+ HMakeDate:
+ data.鍒跺崟浜� == "" ? "" : dayjs(data.鍒跺崟鏃ユ湡).format("YYYY-MM-DD"),
+ HUpDater: data.淇敼浜�,
+ HUpDateDate:
+ data.淇敼浜� == "" ? "" : dayjs(data.淇敼鏃ユ湡).format("YYYY-MM-DD"),
+ HChecker: data.瀹℃牳浜�,
+ HCheckDate:
+ data.瀹℃牳浜� == "" ? "" : dayjs(data.瀹℃牳鏃ユ湡).format("YYYY-MM-DD"),
+ HCloseMan: data.鍏抽棴浜�,
+ HCloseDate:
+ data.鍏抽棴浜� == "" ? "" : dayjs(data.鍏抽棴鏃ユ湡).format("YYYY-MM-DD"),
+ HDeleteMan: data.浣滃簾浜�,
+ HDeleteDate:
+ data.浣滃簾浜� == "" ? "" : dayjs(data.浣滃簾鏃ユ湡).format("YYYY-MM-DD"),
+ HChangeMan: data.鍙樻洿浜�,
+ HChangeDate:
+ data.鍙樻洿浜� == "" ? "" : dayjs(data.鍙樻洿鏃ユ湡).format("YYYY-MM-DD"),
+ },
+ };
if (this.copyType == 1) {
this.getHBillNo();
let date = new Date();
--
Gitblit v1.9.1