From 1e2cec2c74d3bb7c4b1d0ec6a5c16ac52a40534f Mon Sep 17 00:00:00 2001
From: 陈婷婷 <506607603@qq.com>
Date: 星期一, 24 十一月 2025 08:57:19 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI
---
src/views/scMould/warehouse/Sc_MouldProdBackBillEdit.vue | 1173 ++++------
src/views/sell/XsSeOutStockBackBillList.vue | 49
src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillList.vue | 829 +++++++
src/views/sell/XsSeOutStockBill.vue | 55
src/views/scMould/warehouse/Sc_MouldProdMoveBillEdit.vue | 1228 ++++------
.env.staging | 5
src/views/basic/gyEmployee/gyEmployee.vue | 74
src/views/sell/XsSeOutStockBillEdit.vue | 2
src/views/sell/Kf_ICStockBillMainList/Kf_ICStockBillMainList.vue | 23
src/views/sell/xsSeOrderBill/xsSeOrderBill.vue | 80
src/views/scMould/warehouse/Sc_MouldProdOutBillList.vue | 35
src/views/scMould/warehouse/Sc_MouldProdOutBillEdit.vue | 1177 ++++------
src/views/sell/Kf_ICStockBillMainList/Kf_ICStockBillMainListEdit.vue | 62
src/views/scMould/warehouse/Sc_MouldProdMoveBillList.vue | 35
src/views/purchase/cgPoInStockBill/cgPoInStockBill.vue | 51
src/views/sell/XsSeOutStockBackBillEdit.vue | 2
src/views/scMould/warehouse/Sc_MouldProdBackBillList.vue | 35
src/views/basic/gy/gyDepartment.vue | 1
src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillEdit.vue | 1104 +++++++++
src/store/modules/permission.js | 29
src/router/index.js | 48
src/views/basic/gyWarehouse/gyWarehouse.vue | 514 +++-
src/views/basic/gy/gySupplier.vue | 3
src/views/purchase/cgPoOrderBill/cgPoOrderBill.vue | 52
.env.development | 4
src/views/GyCustomer/index.vue | 2
src/views/ICMO/ScICMOBillList.vue | 58
.env.production | 2
28 files changed, 4,160 insertions(+), 2,572 deletions(-)
diff --git a/.env.development b/.env.development
index 233f7a7..a0c89aa 100644
--- a/.env.development
+++ b/.env.development
@@ -5,7 +5,7 @@
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_CLI_BABEL_TRANSPILE_MODULES = true
diff --git a/.env.production b/.env.production
index 634d712..68ca0f2 100644
--- a/.env.production
+++ b/.env.production
@@ -7,3 +7,5 @@
# 鏅轰簯杩堟�滾-MOM绠＄悊绯荤粺/鐢熶骇鐜
VUE_APP_BASE_API = 'http://47.96.97.237/API/'
+# 璺敱鎳掑姞杞�
+VUE_CLI_BABEL_TRANSPILE_MODULES = true
\ No newline at end of file
diff --git a/.env.staging b/.env.staging
index e86d15e..1a84e05 100644
--- a/.env.staging
+++ b/.env.staging
@@ -9,4 +9,7 @@
ENV = 'staging'
# 鏅轰簯杩堟�滾-MOM绠＄悊绯荤粺/娴嬭瘯鐜
-VUE_APP_BASE_API = '/stage-api'
+VUE_APP_BASE_API = 'http://192.168.0.51:81/API/'
+
+# 璺敱鎳掑姞杞�
+VUE_CLI_BABEL_TRANSPILE_MODULES = true
diff --git a/src/router/index.js b/src/router/index.js
index 51a70de..61543d8 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -198,7 +198,7 @@
children: [
{
path: "/purchase/POStockInBill/POStockInBillList",
-
+ component: () => import("@/views/CaiGouGuanLi/CaiGouRuKu/Kf_POStockInBillList.vue"),
name: "POStockInBillList",
meta: { title: "閲囪喘鍏ュ簱鍗�", activeMenu: "purchase/POStockInBill" },
},
@@ -217,7 +217,7 @@
children: [
{
path: "/purchase/POStockInBill/POStockInBillEdit",
-
+ component: () => import("@/views/CaiGouGuanLi/CaiGouRuKu/Kf_POStockInBillEdit.vue"),
name: "POStockInBillEdit",
meta: {
title: "閲囪喘鍏ュ簱鍗曠紪杈�",
@@ -398,7 +398,7 @@
},
children: [
{
- path: "/purchase/PoInStock/cgPoInStockBill",
+ path: "/purchase/PoInStock/cgPoInStockBillList",
component: () =>
import("@/views/purchase/cgPoInStockBill/cgPoInStockBill"),
name: "CgPoInStockBillList",
@@ -774,6 +774,48 @@
},
],
},
+ //鍣ㄥ叿璋冩嫧鐢宠鍗曠淮鎶�
+ {
+ path: "/scMould/warehouse/Sc_MouldMoveStockRequestBillList",
+ component: Layout,
+ hidden: true,
+ // permissions: ["system:goods:add"],
+ redirect: "noredirect",
+ meta: {
+ breadcrumb: false, // 濡傛灉璁剧疆涓篺alse锛屽垯涓嶄細鍦╞readcrumb闈㈠寘灞戜腑鏄剧ず
+ activeMenu: "/scMould/warehouse/Sc_MouldMoveStockRequestBillList", // 褰撹矾鐢辫缃簡璇ュ睘鎬э紝鍒欎細楂樹寒鐩稿搴旂殑渚ц竟鏍忋��
+ },
+ children: [
+ {
+ path: "/scMould/warehouse/Sc_MouldMoveStockRequestBillList",
+ component: () => import("@/views/scMould/warehouse/Sc_MouldMoveStockRequestBillList"),
+ name: "Sc_MouldMoveStockRequestBillList",
+ meta: { title: "鍣ㄥ叿璋冩嫧鐢宠鍗曠淮鎶�", activeMenu: "scMould/warehouse" },
+ },
+ ],
+ },
+ //鍣ㄥ叿璋冩嫧鐢宠鍗�
+ {
+ path: "/scMould/warehouse/Sc_MouldMoveStockRequestBillEdit",
+ component: Layout,
+ hidden: true,
+ redirect: "noredirect",
+ meta: {
+ breadcrumb: false, // 濡傛灉璁剧疆涓篺alse锛屽垯涓嶄細鍦╞readcrumb闈㈠寘灞戜腑鏄剧ず
+ activeMenu: "/scMould/warehouse/Sc_MouldMoveStockRequestBillEdit", // 褰撹矾鐢辫缃簡璇ュ睘鎬э紝鍒欎細楂樹寒鐩稿搴旂殑渚ц竟鏍忋��
+ },
+ children: [
+ {
+ path: "/scMould/warehouse/Sc_MouldMoveStockRequestBillEdit",
+ component: () => import("@/views/scMould/warehouse/Sc_MouldMoveStockRequestBillEdit"),
+ name: "Sc_MouldMoveStockRequestBillEdit",
+ meta: { title: "鍣ㄥ叿璋冩嫧鐢宠鍗曠紪杈�", activeMenu: "scMould/warehouse" },
+ },
+ ],
+ },
+
+
+
//鐩存帴璋冩嫧鍗曠淮鎶�
{
path: "/warehouse/transfer/Kf_MoveStockBillList",
diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
index 5b0689e..7ddc571 100644
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -1013,6 +1013,35 @@
hidden: false,
name: "Sc_MouldProdMoveBillEdit",
path: "Sc_MouldProdMoveBillEdit",
+ },{
+ meta: {
+ icon: "build",
+ link: null,
+ noCache: false,
+ title: "鍣ㄥ叿璋冩嫧鐢宠鍗曠淮鎶�",
+ },
+ component: () =>
+ import(
+ "@/views/scMould/warehouse/Sc_MouldMoveStockRequestBillList"
+ ),
+ hidden: false,
+ name: "Sc_MouldMoveStockRequestBillList",
+ path: "Sc_MouldMoveStockRequestBillList",
+ },
+ {
+ meta: {
+ icon: "build",
+ link: null,
+ noCache: false,
+ title: "鍣ㄥ叿璋冩嫧鐢宠鍗�",
+ },
+ component: () =>
+ import(
+ "@/views/scMould/warehouse/Sc_MouldMoveStockRequestBillEdit"
+ ),
+ hidden: false,
+ name: "Sc_MouldMoveStockRequestBillEdit",
+ path: "Sc_MouldMoveStockRequestBillEdit",
},
],
},
diff --git a/src/views/GyCustomer/index.vue b/src/views/GyCustomer/index.vue
index 0a1e4c0..51f44d3 100644
--- a/src/views/GyCustomer/index.vue
+++ b/src/views/GyCustomer/index.vue
@@ -1,5 +1,5 @@
<template>
- <div style="padding: 10px; position: relative;">
+ <div style="padding: 10px;position: relative;">
<el-card style="margin-bottom: 10px;">
<el-form :inline="true" :model="queryParams" ref="queryForm" class="mb8">
<el-form-item label="瀹㈡埛浠ｇ爜" prop="HNumber">
diff --git a/src/views/ICMO/ScICMOBillList.vue b/src/views/ICMO/ScICMOBillList.vue
index cea20b1..697f158 100644
--- a/src/views/ICMO/ScICMOBillList.vue
+++ b/src/views/ICMO/ScICMOBillList.vue
@@ -3,11 +3,21 @@
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="78px" class="searchBox">
<el-row>
<el-form-item label="寮�濮嬫棩鏈�" style="margin-left: 100px">
- <el-date-picker v-model="sTime" type="date" placeholder="寮�濮嬫棩鏈�" style="width: 150px">
+ <el-date-picker
+ v-model="sTime"
+ type="date"
+ placeholder="寮�濮嬫棩鏈�"
+ style="width: 150px"
+ >
</el-date-picker>
</el-form-item>
<el-form-item label="缁撴潫鏃ユ湡">
- <el-date-picker v-model="eTime" type="date" placeholder="缁撴潫鏃ユ湡" style="width: 150px">
+ <el-date-picker
+ v-model="eTime"
+ type="date"
+ placeholder="缁撴潫鏃ユ湡"
+ style="width: 150px"
+ >
</el-date-picker>
</el-form-item>
<el-form-item label="鏃ユ湡闂撮殧">
@@ -383,7 +393,7 @@
import dayjs from "dayjs";
export default {
- name: "GySource",
+ name: "ScICMOBillList",
components: { RowSettings },
props: {
openPage: { type: String },
@@ -393,7 +403,7 @@
selRowList: [],
iframeUrl: "",
activeSeach: "",
- HModName: "Cg_POOrderBillList",
+ HModName: "Sc_ICMOBillList",
editShow: false,
openEdit: false,
totalNameList: [],
@@ -402,7 +412,7 @@
openPrintList: false,
printListShow: false,
HClassTag: "ForFilteringSchemes", //杩囨护鏉′欢鐨刢lass绫�
- HBillType: "1202",
+ HBillType: "3710",
openBtnHide: false,
btnHideShow: false,
rowHideShow: false,
@@ -435,6 +445,7 @@
{ label: "杩�30澶�", value: 29 },
{ label: "杩戝崐骞�", value: 180 },
{ label: "杩戜竴骞�", value: 365 },
+ { label: "浠绘剰闂撮殧", value: -1 },
],
hPriceTypeList: ["鎴愭湰浠�", "缁撶畻浠�"],
addBtnShow: false,
@@ -455,7 +466,6 @@
OperationType: null, //淇濆瓨绫诲瀷锛堟柊澧�1淇敼3锛�
HInterID: null,
baseURL: process.env.VUE_APP_BASE_API || "http://47.96.97.237/API/",
- user: "admin",
currentRow: [],
lastSelectedRowIndex: null, // 鐢ㄤ簬璁板綍涓婃鐐瑰嚮鐨勮绱㈠紩
lastSelectedRow: null, // 涓婁竴娆￠�変腑鐨勮
@@ -670,6 +680,9 @@
this.getList();
},
riqiChange() {
+ if (this.queryParams.HInitTimeCycle == -1) {
+ return;
+ }
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * this.queryParams.HInitTimeCycle);
@@ -744,7 +757,7 @@
{
params: {
sWhere: this.sWhere,
- user: this.user,
+ user: sessionStorage["HUserName"],
Organization: Organization,
page: this.page,
size: this.pageSize,
@@ -834,7 +847,12 @@
}
}
option.data = result;
- this.DisPlay_HideColumn(this.HModName, this.user, option, this.dataList);
+ this.DisPlay_HideColumn(
+ this.HModName,
+ sessionStorage["HUserName"],
+ option,
+ this.dataList
+ );
}
} catch (err) {
this.$modal.msgError(`鑾峰彇鏀舵枡閫氱煡鍗曢敊璇�: ${err}`);
@@ -1151,7 +1169,7 @@
.get(this.baseURL + "/Xt_User/getOrgIDListByUser", {
params: {
HModName: this.HModName,
- user: this.user,
+ user: sessionStorage["HUserName"],
HOrgID: this.zuzhiId,
},
})
@@ -1241,7 +1259,7 @@
HQty: this.rowForm.HQty,
HSourceInterID: this.rowForm.HSourceInterID,
HSourceEntryID: this.rowForm.HSourceEntryID,
- user: this.user,
+ user: sessionStorage["HUserName"],
},
})
.then((res) => {
@@ -1267,7 +1285,11 @@
//閫昏緫瀹℃牳鏂规硶
axios
.get(this.baseURL + "/Xs_SeOutStockBill/CheckXs_SeOutStockBill", {
- params: { HInterID: InterID, TypeError: num, CurUserName: this.user },
+ params: {
+ HInterID: InterID,
+ TypeError: num,
+ CurUserName: sessionStorage["HUserName"],
+ },
})
.then((res) => {
let result = res.data;
@@ -1292,7 +1314,7 @@
params: {
HInterID: HInterID,
Type: num,
- user: this.user,
+ user: sessionStorage["HUserName"],
},
}
);
@@ -1320,7 +1342,7 @@
HInterID: HInterID,
HEntryID: HEntryID,
ISAudit: num,
- CurUserName: this.user,
+ CurUserName: sessionStorage["HUserName"],
},
}
);
@@ -1346,7 +1368,7 @@
params: {
HInterID: HInterID,
Type: num,
- user: this.user,
+ user: sessionStorage["HUserName"],
},
}
);
@@ -1368,7 +1390,11 @@
//閫昏緫瀹℃牳鏂规硶
axios
.get(this.baseURL + "/Gy_Employee/StopGy_Employee", {
- params: { HInterID: InterID, IsStop: num, CurUserName: this.user },
+ params: {
+ HInterID: InterID,
+ IsStop: num,
+ CurUserName: sessionStorage["HUserName"],
+ },
})
.then((res) => {
let result = res.data;
@@ -1434,7 +1460,7 @@
}
}
var sSubStr = JSON.stringify(num);
- var sMainSub = sSubStr + "&鍜�" + this.user;
+ var sMainSub = sSubStr + "&鍜�" + sessionStorage["HUserName"];
axios({
method: "post",
url: this.baseURL + "/Gy_Source/Gy_Source_btnSave",
diff --git a/src/views/basic/gy/gyDepartment.vue b/src/views/basic/gy/gyDepartment.vue
index 4853819..1ec9d23 100644
--- a/src/views/basic/gy/gyDepartment.vue
+++ b/src/views/basic/gy/gyDepartment.vue
@@ -619,6 +619,7 @@
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
diff --git a/src/views/basic/gy/gySupplier.vue b/src/views/basic/gy/gySupplier.vue
index 42a4349..19dbb6b 100644
--- a/src/views/basic/gy/gySupplier.vue
+++ b/src/views/basic/gy/gySupplier.vue
@@ -1,5 +1,5 @@
<template>
- <div style="padding: 10px; position: relative;">
+ <div style="padding: 10px;position: relative;">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="98px" class="searchBox">
<el-row>
<el-form-item label="渚涘簲鍟嗕唬鐮�" prop="HNumber" style="margin-left: 100px;">
@@ -668,6 +668,7 @@
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
diff --git a/src/views/basic/gyEmployee/gyEmployee.vue b/src/views/basic/gyEmployee/gyEmployee.vue
index c5ea92b..a3bb86a 100644
--- a/src/views/basic/gyEmployee/gyEmployee.vue
+++ b/src/views/basic/gyEmployee/gyEmployee.vue
@@ -34,7 +34,7 @@
v-for="(item, index) in organizationList"
:key="index"
:label="item.Name"
- :value="item.ID"
+ :value="item.ID.toString()"
>
</el-option>
</el-select>
@@ -509,7 +509,7 @@
data() {
return {
activeSeach: "",
- HModName: "Gy_Employee",
+ HModName: "Gy_EmployeeList",
editShow: false,
openEdit: false,
totalNameList: [],
@@ -517,7 +517,7 @@
openPrintList: false,
printListShow: false,
HClassTag: "ForFilteringSchemes", //杩囨护鏉′欢鐨刢lass绫�
- HBillType: "1205",
+ HBillType: "Gy_EmployeeList",
openBtnHide: false,
btnHideShow: false,
rowHideShow: false,
@@ -562,7 +562,7 @@
openData: false, //鏁版嵁寮圭獥
dialogTitle: "",
zuzhiId: "",
- organizationList: [], //缁勭粐鍒楄〃
+ organizationList: JSON.parse(sessionStorage["organizationList"]), //缁勭粐鍒楄〃
subDisabled: false, //缂栬緫椤甸潰淇濆瓨鎸夐挳鏄惁绂佺敤(true绂佺敤锛宖alse鍙敤)
OperationType: null, //淇濆瓨绫诲瀷锛堟柊澧�1淇敼3锛�
HInterID: null,
@@ -586,7 +586,7 @@
dateRange: [],
// 鏌ヨ鍙傛暟
queryParams: {
- HOrgID: null,
+ HOrgID: sessionStorage["OrganizationID"],
HName: null,
HNumber: null,
Comparator1: "",
@@ -649,7 +649,8 @@
};
},
created() {
- this.fetchData();
+ // this.fetchData();
+ this.handleQuery();
this.riqiChange();
},
methods: {
@@ -769,33 +770,6 @@
this.dbEmitData(this.deptform, this.dialogTypeNum);
this.deptform = {};
},
- fetchData() {
- //鐧诲綍鐢ㄦ埛淇℃伅
- axios
- .get(
- "http://47.96.97.237/API/Web/GetUser?UserName=001&PassWord=123456&HOrgName=100038"
- )
- .then((response) => {
- let data = response.data.data[0];
- this.zuzhiId = data.HUSEORGID; //鏍规嵁鐧诲綍鐢ㄦ埛鑾峰彇榛樿鐨勭粍缁嘔D
- this.queryParams.HOrgID = data.HUSEORGID;
- this.user = data.Czymc;
- axios
- .get(this.baseURL + "/Web/GetOrganizations", {})
- .then((response) => {
- if (response.data.count == 1) {
- this.organizationList = response.data.data; //缁勭粐鍒楄〃
- }
- this.getList();
- })
- .catch((error) => {
- this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
- });
- })
- .catch((error) => {
- this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
- });
- },
getList() {
this.tableShow = false;
this.loading = true;
@@ -804,13 +778,15 @@
}
// this.queryParams.HOrgID = 100038
this.sWhere += " and HUSEORGID = '" + this.queryParams.HOrgID + "'";
+ let OrgName =
+ this.organizationList.find((e) => e.ID == this.queryParams.HOrgID)?.Name || "";
//鐢熶骇璧勬枡鍒楄〃
axios
.get(this.baseURL + "/Gy_Employee/listPage", {
params: {
sWhere: this.sWhere,
- user: this.user,
- Organization: "娴欐睙鏅轰簯杩堟��",
+ user: sessionStorage["HUserName"],
+ Organization: OrgName,
page: this.page,
size: this.pageSize,
},
@@ -900,7 +876,12 @@
}
}
option.data = result;
- this.DisPlay_HideColumn(this.HModName, this.user, option, this.dataList);
+ this.DisPlay_HideColumn(
+ this.HModName,
+ sessionStorage["HUserName"],
+ option,
+ this.dataList
+ );
}
})
.catch((error) => {
@@ -1208,7 +1189,7 @@
.get(this.baseURL + "/Xt_User/getOrgIDListByUser", {
params: {
HModName: this.HModName,
- user: this.user,
+ user: sessionStorage["HUserName"],
HOrgID: this.zuzhiId,
},
})
@@ -1289,7 +1270,10 @@
if (!this.rowForm.瀹℃牳浜�) {
axios
.get(this.baseURL + "DeltetGy_Employee", {
- params: { HItemID: this.rowForm.HItemID.toString(), user: this.user },
+ params: {
+ HItemID: this.rowForm.HItemID.toString(),
+ user: sessionStorage["HUserName"],
+ },
})
.then((response) => {
if (response.data.count == 1) {
@@ -1314,7 +1298,11 @@
//閫昏緫瀹℃牳鏂规硶
axios
.get(this.baseURL + "/Gy_Employee/AuditGy_Employee", {
- params: { HInterID: InterID, IsAudit: num, CurUserName: this.user },
+ params: {
+ HInterID: InterID,
+ IsAudit: num,
+ CurUserName: sessionStorage["HUserName"],
+ },
})
.then((response) => {
let result = response.data;
@@ -1335,7 +1323,11 @@
//閫昏緫瀹℃牳鏂规硶
axios
.get(this.baseURL + "/Gy_Employee/StopGy_Employee", {
- params: { HInterID: InterID, IsStop: num, CurUserName: this.user },
+ params: {
+ HInterID: InterID,
+ IsStop: num,
+ CurUserName: sessionStorage["HUserName"],
+ },
})
.then((response) => {
let result = response.data;
@@ -1401,7 +1393,7 @@
}
}
var sSubStr = JSON.stringify(num);
- var sMainSub = sSubStr + "&鍜�" + this.user;
+ var sMainSub = sSubStr + "&鍜�" + sessionStorage["HUserName"];
axios({
method: "post",
url: this.baseURL + "/Gy_Source/Gy_Source_btnSave",
diff --git a/src/views/basic/gyWarehouse/gyWarehouse.vue b/src/views/basic/gyWarehouse/gyWarehouse.vue
index 9463dd2..89904cf 100644
--- a/src/views/basic/gyWarehouse/gyWarehouse.vue
+++ b/src/views/basic/gyWarehouse/gyWarehouse.vue
@@ -1,106 +1,199 @@
<template>
- <div style="padding: 10px; position: relative;">
- <el-form :model="queryParams" ref="queryForm" label-width="98px" :inline="true" class="searchBox">
+ <div style="padding: 10px; position: relative">
+ <el-form
+ :model="queryParams"
+ ref="queryForm"
+ label-width="98px"
+ :inline="true"
+ class="searchBox"
+ >
<el-row>
<el-form-item label="浠撳簱浠ｇ爜" prop="HNumber" style="padding-left: 100px">
- <el-input v-model="queryParams.HNumber" placeholder="璇疯緭鍏ヤ粨搴撲唬鐮�" @keyup.enter.native="handleQuery"
- class="ForFilteringSchemes" />
+ <el-input
+ v-model="queryParams.HNumber"
+ placeholder="璇疯緭鍏ヤ粨搴撲唬鐮�"
+ @keyup.enter.native="handleQuery"
+ class="ForFilteringSchemes"
+ />
</el-form-item>
<el-form-item label="浠撳簱鍚嶇О" prop="HName">
- <el-input v-model="queryParams.HName" placeholder="璇疯緭鍏ヤ粨搴撳悕绉�" @keyup.enter.native="handleQuery"
- class="ForFilteringSchemes" />
+ <el-input
+ v-model="queryParams.HName"
+ placeholder="璇疯緭鍏ヤ粨搴撳悕绉�"
+ @keyup.enter.native="handleQuery"
+ class="ForFilteringSchemes"
+ />
</el-form-item>
<el-form-item label="缁勭粐">
- <el-select v-model="queryParams.HOrgName" placeholder="璇烽�夋嫨" class="ForFilteringSchemes">
- <el-option v-for="(item, index) in organizationList" :key="index" :label="item.Name" :value="item.Name">
+ <el-select
+ v-model="queryParams.HOrgID"
+ placeholder="璇烽�夋嫨"
+ class="ForFilteringSchemes"
+ >
+ <el-option
+ v-for="(item, index) in organizationList"
+ :key="index"
+ :label="item.Name"
+ :value="item.ID.toString()"
+ >
</el-option>
</el-select>
</el-form-item>
<el-form-item label="鍚屾" :inline="true">
- <el-input v-model="queryParams.HSyncNumber" placeholder="璇疯緭鍏ヤ粨搴撲唬鐮�" @keyup.enter.native="handleSync">
+ <el-input
+ v-model="queryParams.HSyncNumber"
+ placeholder="璇疯緭鍏ヤ粨搴撲唬鐮�"
+ @keyup.enter.native="handleSync"
+ >
<el-button slot="append" type="primary" @click="handleSync">鍚屾</el-button>
</el-input>
</el-form-item>
</el-row>
<el-form-item label-width="78px">
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">
- 鎼� 绱�</el-button>
- <el-button icon="el-icon-circle-close" size="mini" @click="searchOpen = false">鍙� 娑�</el-button>
+ 鎼� 绱�</el-button
+ >
+ <el-button icon="el-icon-circle-close" size="mini" @click="searchOpen = false"
+ >鍙� 娑�</el-button
+ >
</el-form-item>
<el-collapse v-model="activeSeach">
<el-collapse-item title="鏇村" name="1">
<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" 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-form-item>
+ </el-row>
+ <el-row>
+ <el-form-item label-width="0">
<el-col :span="7">
- <el-select v-model="queryParams.ColName2" placeholder="璇烽�夋嫨" @change="riqiChange"
- class="ForFilteringSchemes">
+ <el-select
+ v-model="queryParams.ColName2"
+ placeholder="璇烽�夋嫨"
+ @change="riqiChange"
+ class="ForFilteringSchemes"
+ >
<span v-for="(item, index) in btList" :key="index">
- <el-option :label="item.field" :value="item.field" v-if="!item.hide"></el-option>
+ <el-option
+ :label="item.field"
+ :value="item.field"
+ v-if="!item.hide"
+ ></el-option>
</span>
</el-select>
</el-col>
<el-col :span="6" style="padding: 0 10px">
- <el-select v-model="queryParams.Comparator2" placeholder="璇烽�夋嫨" @change="riqiChange"
- class="ForFilteringSchemes">
+ <el-select
+ v-model="queryParams.Comparator2"
+ placeholder="璇烽�夋嫨"
+ @change="riqiChange"
+ class="ForFilteringSchemes"
+ >
<span v-for="(item, index) in comparatorList" :key="index">
- <el-option :label="item.label" :value="item.value" v-if="!item.hide"></el-option>
+ <el-option
+ :label="item.label"
+ :value="item.value"
+ v-if="!item.hide"
+ ></el-option>
</span>
</el-select>
</el-col>
<el-col :span="11">
- <el-input v-model="queryParams.ColContent2" placeholder="璇疯緭鍏�" clearable
- @keyup.enter.native="handleQuery" class="ForFilteringSchemes" />
+ <el-input
+ v-model="queryParams.ColContent2"
+ placeholder="璇疯緭鍏�"
+ clearable
+ @keyup.enter.native="handleQuery"
+ class="ForFilteringSchemes"
+ />
</el-col>
- </el-row>
- </el-form-item>
- <el-form-item label-width="0">
- <el-row>
+ </el-form-item>
+ </el-row>
+ <el-row>
+ <el-form-item label-width="0">
<el-col :span="7">
- <el-select v-model="queryParams.ColName" placeholder="璇烽�夋嫨" @change="riqiChange"
- class="ForFilteringSchemes">
- <el-option v-for="(item, index) in btList" :key="index" :label="item.field"
- :value="item.field"></el-option>
+ <el-select
+ 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>
+ </el-form-item>
+ </el-row>
</div>
</el-card>
</el-collapse-item>
@@ -109,64 +202,158 @@
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
- <el-button type="primary" icon="el-icon-download" size="mini" @click="handleImport">瀵煎叆</el-button>
+ <el-button
+ type="primary"
+ icon="el-icon-download"
+ size="mini"
+ @click="handleImport"
+ >瀵煎叆</el-button
+ >
</el-col>
<el-col :span="1.5">
- <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAddEdit((OperationType = 1))"
- id="btn-Add">鏂板</el-button>
+ <el-button
+ type="primary"
+ icon="el-icon-plus"
+ size="mini"
+ @click="handleAddEdit((OperationType = 1))"
+ id="btn-Add"
+ >鏂板</el-button
+ >
</el-col>
<el-col :span="1.5">
- <el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single"
- @click="handleEdit((row = rowForm), (OperationType = 3))">缂栬緫</el-button>
+ <el-button
+ type="primary"
+ icon="el-icon-edit"
+ size="mini"
+ :disabled="single"
+ @click="handleEdit((row = rowForm), (OperationType = 3))"
+ >缂栬緫</el-button
+ >
</el-col>
<el-col :span="1.5">
- <el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single"
- @click="handleEdit((row = rowForm), (OperationType = 2))">澶嶅埗</el-button>
+ <el-button
+ type="primary"
+ icon="el-icon-edit"
+ size="mini"
+ :disabled="single"
+ @click="handleEdit((row = rowForm), (OperationType = 2))"
+ >澶嶅埗</el-button
+ >
</el-col>
<el-col :span="1.5">
- <el-button type="primary" icon="el-icon-delete" size="mini" :disabled="single" @click="handleDelete">鍒犻櫎
+ <el-button
+ type="primary"
+ icon="el-icon-delete"
+ size="mini"
+ :disabled="single"
+ @click="handleDelete"
+ >鍒犻櫎
</el-button>
</el-col>
<el-col :span="1.5">
- <el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single"
- @click="set_CheckBill(0, (form = rowForm))">瀹℃牳</el-button>
+ <el-button
+ type="primary"
+ icon="el-icon-edit"
+ size="mini"
+ :disabled="single"
+ @click="set_CheckBill(0, (form = rowForm))"
+ >瀹℃牳</el-button
+ >
</el-col>
<el-col :span="1.5">
- <el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single"
- @click="set_CheckBill(1, (form = rowForm))">杩斿鏍�</el-button>
+ <el-button
+ type="primary"
+ icon="el-icon-edit"
+ size="mini"
+ :disabled="single"
+ @click="set_CheckBill(1, (form = rowForm))"
+ >杩斿鏍�</el-button
+ >
</el-col>
<el-col :span="1.5">
- <el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single"
- @click="set_De_Stop(0, (form = rowForm))">绂佺敤</el-button>
+ <el-button
+ type="primary"
+ icon="el-icon-edit"
+ size="mini"
+ :disabled="single"
+ @click="set_De_Stop(0, (form = rowForm))"
+ >绂佺敤</el-button
+ >
</el-col>
<el-col :span="1.5">
- <el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single"
- @click="set_De_Stop(1, (form = rowForm))">鍙嶇鐢�</el-button>
+ <el-button
+ type="primary"
+ icon="el-icon-edit"
+ size="mini"
+ :disabled="single"
+ @click="set_De_Stop(1, (form = rowForm))"
+ >鍙嶇鐢�</el-button
+ >
</el-col>
<el-col :span="1.5">
- <el-button type="primary" icon="el-icon-download" size="mini" @click="handleExport">瀵煎嚭</el-button>
+ <el-button
+ type="primary"
+ icon="el-icon-download"
+ size="mini"
+ @click="handleExport"
+ >瀵煎嚭</el-button
+ >
</el-col>
<el-col :span="1.5">
- <el-button type="primary" icon="el-icon-download" size="mini" @click="handleRowHide">闅愯棌鍒楄缃�</el-button>
+ <el-button
+ type="primary"
+ icon="el-icon-download"
+ size="mini"
+ @click="handleRowHide"
+ >闅愯棌鍒楄缃�</el-button
+ >
</el-col>
<el-col :span="1.5" class="zy-hidden">
- <el-button type="primary" icon="el-icon-help" size="mini" @click="handleSearch">鎼� 绱�</el-button>
+ <el-button type="primary" icon="el-icon-help" size="mini" @click="handleSearch"
+ >鎼� 绱�</el-button
+ >
</el-col>
<el-col :span="1.5" class="zy-hidden">
- <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery">閲� 缃�</el-button>
+ <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery"
+ >閲� 缃�</el-button
+ >
</el-col>
<!-- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> -->
</el-row>
<div class="tableBox" v-loading="loading">
- <el-table :data="tableData" ref="tableData" max-height="750" :summary-method="getSummaries"
- @selection-change="handleSelectionChange" show-summary border @row-click="handleRowClick" :row-style="rowStyle"
- @cell-dblclick="handleDblclick" v-if="tableShow">
+ <el-table
+ :data="tableData"
+ ref="tableData"
+ max-height="750"
+ :summary-method="getSummaries"
+ @selection-change="handleSelectionChange"
+ show-summary
+ border
+ @row-click="handleRowClick"
+ :row-style="rowStyle"
+ @cell-dblclick="handleDblclick"
+ v-if="tableShow"
+ >
<template v-for="(item, index) in btList">
- <el-table-column type="selection" width="55" align="center" :fixed="item.fixed" v-if="item.type == 'checkbox'"
- :key="index" />
- <el-table-column :align="item.align" :prop="item.field" :label="item.title" :width="item.width"
- :key="item.sorderid" v-else-if="!item.hide && item.type != 'checkbox'" :sortable="item.sort"
- show-overflow-tooltip :fixed="item.fixed">
+ <el-table-column
+ type="selection"
+ width="55"
+ align="center"
+ :fixed="item.fixed"
+ v-if="item.type == 'checkbox'"
+ :key="index"
+ />
+ <el-table-column
+ :align="item.align"
+ :prop="item.field"
+ :label="item.title"
+ :width="item.width"
+ :key="item.sorderid"
+ v-else-if="!item.hide && item.type != 'checkbox'"
+ :sortable="item.sort"
+ show-overflow-tooltip
+ :fixed="item.fixed"
+ >
<template slot-scope="{ row, column }">
<el-checkbox v-model="checked" v-if="item.type == 'checkbox'"></el-checkbox>
<div :style="item.style">
@@ -181,10 +368,26 @@
</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"
@@ -193,18 +396,35 @@
: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>
+ <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="浠撳簱浠ｇ爜" align="center" width="120" />
<el-table-column label="浠撳簱鍚嶇О" prop="浠撳簱鍚嶇О" align="center" width="120" />
@@ -214,13 +434,24 @@
<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>
@@ -243,7 +474,7 @@
editRef: null,
activeSeach: "",
HModName: "Gy_Warehouse",
- activeSeach: '',
+ activeSeach: "",
editShow: false,
openEdit: false,
totalNameList: [],
@@ -296,12 +527,11 @@
openData: false, //鏁版嵁寮圭獥
dialogTitle: "",
zuzhiId: "",
- organizationList: [], //缁勭粐鍒楄〃
+ organizationList: JSON.parse(sessionStorage["organizationList"]), //缁勭粐鍒楄〃
subDisabled: false, //缂栬緫椤甸潰淇濆瓨鎸夐挳鏄惁绂佺敤(true绂佺敤锛宖alse鍙敤)
OperationType: null, //淇濆瓨绫诲瀷锛堟柊澧�1淇敼3锛�
HInterID: null,
baseURL: process.env.VUE_APP_BASE_API,
- user: "admin",
currentRow: [],
lastSelectedRowIndex: null, // 鐢ㄤ簬璁板綍涓婃鐐瑰嚮鐨勮绱㈠紩
lastSelectedRow: null, // 涓婁竴娆￠�変腑鐨勮
@@ -320,7 +550,7 @@
dateRange: [],
// 鏌ヨ鍙傛暟
queryParams: {
- HOrgID: null,
+ HOrgID: sessionStorage["OrganizationID"],
HName: null,
HNumber: null,
Comparator1: "",
@@ -383,7 +613,7 @@
};
},
created() {
- this.getList();
+ this.handleQuery();
this.riqiChange();
},
methods: {
@@ -522,33 +752,6 @@
this.dbEmitData(this.deptform, this.dialogTypeNum);
this.deptform = {};
},
- fetchData() {
- //鐧诲綍鐢ㄦ埛淇℃伅
- axios
- .get(
- "http://47.96.97.237/API/Web/GetUser?UserName=001&PassWord=123456&HOrgName=100038"
- )
- .then((response) => {
- let data = response.data.data[0];
- this.zuzhiId = data.HUSEORGID; //鏍规嵁鐧诲綍鐢ㄦ埛鑾峰彇榛樿鐨勭粍缁嘔D
- this.queryParams.HOrgID = data.HUSEORGID;
- this.user = data.Czymc;
- axios
- .get(this.baseURL + "/Web/GetOrganizations", {})
- .then((response) => {
- if (response.data.count == 1) {
- this.organizationList = response.data.data; //缁勭粐鍒楄〃
- }
- this.getList();
- })
- .catch((error) => {
- this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
- });
- })
- .catch((error) => {
- this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
- });
- },
getList() {
this.tableShow = false;
this.loading = true;
@@ -562,7 +765,7 @@
.get(this.baseURL + "/Gy_WareHouse/listpage", {
params: {
sWhere: `${this.sWhere}`,
- user: this.user,
+ user: sessionStorage["HUserName"],
Organization: "娴欐睙鏅轰簯杩堟��",
page: this.page,
size: this.pageSize,
@@ -652,7 +855,12 @@
}
}
option.data = result;
- this.DisPlay_HideColumn(this.HModName, this.user, option, this.dataList);
+ this.DisPlay_HideColumn(
+ this.HModName,
+ sessionStorage["HUserName"],
+ option,
+ this.dataList
+ );
}
})
.catch((error) => {
@@ -808,14 +1016,14 @@
handleRowClick(row, column, event) {
this.lastSelectedRow = this.selectedRow; // 璁板綍涓婁竴娆￠�変腑鐨勮
this.selectedRow = row; // 璁板綍褰撳墠閫変腑鐨勮
- if (this.checkIsIframe) {
+ if (this.checkIsIframe()) {
// 灏嗗綋鍓嶉�変腑鐨勬暟鎹毚闇插埌window涓�
window.selectedRow = row;
}
this.lastSelectedRowIndex = this.tableData.indexOf(row);
this.$refs.tableData.toggleRowSelection(row);
if (this.openPage) {
- this.$emit('deptEmit', row, 2)
+ this.$emit("deptEmit", row, 2);
}
},
//閫変腑琛岄珮浜牱寮�
@@ -834,15 +1042,14 @@
handleDblclick(row, column, cell, event) {
this.OperationType = 3;
if (this.openPage) {
- this.$emit('deptEmitDb', row, 2)
- }
- else {
+ this.$emit("deptEmitDb", row, 2);
+ } else {
if (this.checkIsIframe) {
// IFrame 鍙屽嚮 杩斿洖褰撳墠鍙屽嚮鐨勬暟鎹�
window.parent.iframeWareHouseCallBack(row);
return;
}
- this.handleEdit();
+ this.handleEdit();
}
},
// 澶氶�夋閫変腑鏁版嵁
@@ -851,12 +1058,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);
this.single = selection.length != 1;
@@ -949,8 +1156,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()
@@ -975,7 +1184,7 @@
.get(this.baseURL + "/Xt_User/getOrgIDListByUser", {
params: {
HModName: this.HModName,
- user: this.user,
+ user: sessionStorage["HUserName"],
HOrgID: this.zuzhiId,
},
})
@@ -1057,7 +1266,10 @@
if (!this.rowForm.瀹℃牳浜�) {
axios
.get(this.baseURL + "/DeltetGy_Warehouse", {
- params: { HItemID: this.rowForm.HItemID.toString(), user: this.user },
+ params: {
+ HItemID: this.rowForm.HItemID.toString(),
+ user: sessionStorage["HUserName"],
+ },
})
.then((response) => {
if (response.data.count == 1) {
@@ -1074,7 +1286,7 @@
this.$modal.msgError("姝ゆ潯鏁版嵁涓嶆槸鍒涘缓鐘舵��,鏃犳硶鍒犻櫎!");
}
})
- .catch(() => { });
+ .catch(() => {});
},
// 鍙嶅鏍�/瀹℃牳鏁版嵁
set_CheckBill(num, form) {
@@ -1082,7 +1294,11 @@
//閫昏緫瀹℃牳鏂规硶
axios
.get(this.baseURL + "/Gy_Warehouse/AuditGy_Warehouse", {
- params: { HInterID: InterID, IsAudit: num, CurUserName: this.user },
+ params: {
+ HInterID: InterID,
+ IsAudit: num,
+ CurUserName: sessionStorage["HUserName"],
+ },
})
.then((response) => {
let result = response.data;
@@ -1103,7 +1319,11 @@
//閫昏緫瀹℃牳鏂规硶
axios
.get(this.baseURL + "/Gy_Warehouse/StopGy_Warehouse", {
- params: { HInterID: InterID, IsStop: num, CurUserName: this.user },
+ params: {
+ HInterID: InterID,
+ IsStop: num,
+ CurUserName: sessionStorage["HUserName"],
+ },
})
.then((response) => {
let result = response.data;
@@ -1169,7 +1389,7 @@
}
}
var sSubStr = JSON.stringify(num);
- var sMainSub = sSubStr + "&鍜�" + this.user;
+ var sMainSub = sSubStr + "&鍜�" + sessionStorage["HUserName"];
axios({
method: "post",
url: this.baseURL + "/Gy_Warehouse/Gy_Process_Excel",
@@ -1205,7 +1425,7 @@
return deleteList.indexOf(item.index) == -1;
});
})
- .catch(() => { });
+ .catch(() => {});
},
getPage(page, list) {
let sindex = (parseInt(page) - 1) * this.uploadPageSize;
@@ -1228,7 +1448,7 @@
width: 100%;
}
-.form-item-inline>.el-form-item__content {
+.form-item-inline > .el-form-item__content {
display: flex;
flex-direction: row;
}
diff --git a/src/views/purchase/cgPoInStockBill/cgPoInStockBill.vue b/src/views/purchase/cgPoInStockBill/cgPoInStockBill.vue
index 266b2ed..ed95899 100644
--- a/src/views/purchase/cgPoInStockBill/cgPoInStockBill.vue
+++ b/src/views/purchase/cgPoInStockBill/cgPoInStockBill.vue
@@ -15,6 +15,8 @@
type="date"
placeholder="寮�濮嬫棩鏈�"
style="width: 150px"
+ :disabled="queryParams.HInitTimeCycle != -1"
+ value-format="yyyy-MM-dd"
>
</el-date-picker>
</el-form-item>
@@ -24,6 +26,8 @@
type="date"
placeholder="缁撴潫鏃ユ湡"
style="width: 150px"
+ :disabled="queryParams.HInitTimeCycle != -1"
+ value-format="yyyy-MM-dd"
>
</el-date-picker>
</el-form-item>
@@ -608,7 +612,7 @@
import dayjs from "dayjs";
export default {
- name: "GySource",
+ name: "cgPoInStockBill",
components: { RowSettings, gySource },
props: {
openPage: { type: String },
@@ -618,7 +622,7 @@
iframeUrl: "",
activeSeach: "",
dateRange: [],
- HModName: "Cg_POOrderBillList",
+ HModName: "cgPoInStockBill",
editShow: false,
openEdit: false,
totalNameList: [],
@@ -626,7 +630,7 @@
openPrintList: false,
printListShow: false,
HClassTag: "ForFilteringSchemes", //杩囨护鏉′欢鐨刢lass绫�
- HBillType: "1202",
+ HBillType: "1103",
openBtnHide: false,
btnHideShow: false,
rowHideShow: false,
@@ -658,6 +662,7 @@
{ label: "杩�30澶�", value: 29 },
{ label: "杩戝崐骞�", value: 180 },
{ label: "杩戜竴骞�", value: 365 },
+ { label: "浠绘剰闂撮殧", value: -1 },
],
hPriceTypeList: ["鎴愭湰浠�", "缁撶畻浠�"],
addBtnShow: false,
@@ -676,7 +681,6 @@
OperationType: null, //淇濆瓨绫诲瀷锛堟柊澧�1淇敼3锛�
HInterID: null,
baseURL: process.env.VUE_APP_BASE_API || "http://47.96.97.237/API/",
- user: "admin",
currentRow: [],
lastSelectedRowIndex: null, // 鐢ㄤ簬璁板綍涓婃鐐瑰嚮鐨勮绱㈠紩
lastSelectedRow: null, // 涓婁竴娆￠�変腑鐨勮
@@ -777,7 +781,8 @@
},
created() {
this.riqiChange();
- this.getList();
+ // this.getList();
+ this.handleQuery();
},
beforeDestroy() {
// 缁勪欢閿�姣佹椂娓呯悊鍏ㄥ眬鏂规硶锛岄伩鍏嶅唴瀛樻硠婕�
@@ -859,6 +864,9 @@
this.getList();
},
riqiChange() {
+ if (this.queryParams.HInitTimeCycle == -1) {
+ return;
+ }
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * this.queryParams.HInitTimeCycle);
@@ -923,7 +931,7 @@
let res = await axios.get(this.baseURL + "Cg_POInStockBill/page", {
params: {
sWhere: this.sWhere,
- user: this.user,
+ user: sessionStorage["HUserName"],
page: this.page,
size: this.pageSize,
},
@@ -1011,7 +1019,12 @@
}
}
option.data = result;
- this.DisPlay_HideColumn(this.HModName, this.user, option, this.dataList);
+ this.DisPlay_HideColumn(
+ this.HModName,
+ sessionStorage["HUserName"],
+ option,
+ this.dataList
+ );
}
} catch (err) {
this.$modal.msgError(`鑾峰彇鏀舵枡閫氱煡鍗曢敊璇�: ${err}`);
@@ -1298,7 +1311,7 @@
.get(this.baseURL + "/Xt_User/getOrgIDListByUser", {
params: {
HModName: this.HModName,
- user: this.user,
+ user: sessionStorage["HUserName"],
HOrgID: this.zuzhiId,
},
})
@@ -1387,7 +1400,7 @@
HQty: this.rowForm.HQty,
HSourceInterID: this.rowForm.HSourceInterID,
HSourceEntryID: this.rowForm.HSourceEntryID,
- user: this.user,
+ user: sessionStorage["HUserName"],
},
})
.then((res) => {
@@ -1413,7 +1426,11 @@
//閫昏緫瀹℃牳鏂规硶
axios
.get(this.baseURL + "/Cg_POInStockBill/AuditCg_POInStockBill", {
- params: { HInterID: InterID, IsAudit: num, CurUserName: this.user },
+ params: {
+ HInterID: InterID,
+ IsAudit: num,
+ CurUserName: sessionStorage["HUserName"],
+ },
})
.then((res) => {
let result = res.data;
@@ -1438,7 +1455,7 @@
params: {
HInterID: HInterID,
Type: num,
- user: this.user,
+ user: sessionStorage["HUserName"],
},
}
);
@@ -1466,7 +1483,7 @@
HInterID: HInterID,
HEntryID: HEntryID,
ISAudit: num,
- CurUserName: this.user,
+ CurUserName: sessionStorage["HUserName"],
},
}
);
@@ -1492,7 +1509,7 @@
params: {
HInterID: HInterID,
Type: num,
- user: this.user,
+ user: sessionStorage["HUserName"],
},
}
);
@@ -1514,7 +1531,11 @@
//閫昏緫瀹℃牳鏂规硶
axios
.get(this.baseURL + "/Gy_Employee/StopGy_Employee", {
- params: { HInterID: InterID, IsStop: num, CurUserName: this.user },
+ params: {
+ HInterID: InterID,
+ IsStop: num,
+ CurUserName: sessionStorage["HUserName"],
+ },
})
.then((res) => {
let result = res.data;
@@ -1580,7 +1601,7 @@
}
}
var sSubStr = JSON.stringify(num);
- var sMainSub = sSubStr + "&鍜�" + this.user;
+ var sMainSub = sSubStr + "&鍜�" + sessionStorage["HUserName"];
axios({
method: "post",
url: this.baseURL + "/Gy_Source/Gy_Source_btnSave",
diff --git a/src/views/purchase/cgPoOrderBill/cgPoOrderBill.vue b/src/views/purchase/cgPoOrderBill/cgPoOrderBill.vue
index c913644..4eac4a8 100644
--- a/src/views/purchase/cgPoOrderBill/cgPoOrderBill.vue
+++ b/src/views/purchase/cgPoOrderBill/cgPoOrderBill.vue
@@ -15,6 +15,8 @@
type="date"
placeholder="寮�濮嬫棩鏈�"
style="width: 150px"
+ :disabled="queryParams.HInitTimeCycle != -1"
+ value-format="yyyy-MM-dd"
>
</el-date-picker>
</el-form-item>
@@ -24,6 +26,8 @@
type="date"
placeholder="缁撴潫鏃ユ湡"
style="width: 150px"
+ :disabled="queryParams.HInitTimeCycle != -1"
+ value-format="yyyy-MM-dd"
>
</el-date-picker>
</el-form-item>
@@ -613,7 +617,7 @@
import dayjs from "dayjs";
export default {
- name: "GySource",
+ name: "Cg_POOrderBillList",
components: { RowSettings, gySource },
props: {
openPage: { type: String },
@@ -630,7 +634,7 @@
openPrintList: false,
printListShow: false,
HClassTag: "ForFilteringSchemes", //杩囨护鏉′欢鐨刢lass绫�
- HBillType: "1202",
+ HBillType: "1102",
openBtnHide: false,
btnHideShow: false,
rowHideShow: false,
@@ -662,6 +666,7 @@
{ label: "杩�30澶�", value: 29 },
{ label: "杩戝崐骞�", value: 180 },
{ label: "杩戜竴骞�", value: 365 },
+ { label: "浠绘剰闂撮殧", value: -1 },
],
hPriceTypeList: ["鎴愭湰浠�", "缁撶畻浠�"],
addBtnShow: false,
@@ -680,7 +685,6 @@
OperationType: null, //淇濆瓨绫诲瀷锛堟柊澧�1淇敼3锛�
HInterID: null,
baseURL: process.env.VUE_APP_BASE_API || "http://47.96.97.237/API/",
- user: "admin",
currentRow: [],
lastSelectedRowIndex: null, // 鐢ㄤ簬璁板綍涓婃鐐瑰嚮鐨勮绱㈠紩
lastSelectedRow: null, // 涓婁竴娆￠�変腑鐨勮
@@ -781,7 +785,8 @@
},
created() {
this.riqiChange();
- this.getList();
+ // this.getList();
+ this.handleQuery();
},
beforeDestory() {
delete window.editGyClose;
@@ -861,6 +866,9 @@
this.getList();
},
riqiChange() {
+ if (this.queryParams.HInitTimeCycle == -1) {
+ return;
+ }
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * this.queryParams.HInitTimeCycle);
@@ -926,7 +934,7 @@
.get(this.baseURL + "/Cg_POOrderBill/page", {
params: {
sWhere: this.sWhere,
- user: this.user,
+ user: sessionStorage["HUserName"],
page: this.page,
size: this.pageSize,
},
@@ -1015,7 +1023,12 @@
}
}
option.data = result;
- this.DisPlay_HideColumn(this.HModName, this.user, option, this.dataList);
+ this.DisPlay_HideColumn(
+ this.HModName,
+ sessionStorage["HUserName"],
+ option,
+ this.dataList
+ );
}
})
.catch((error) => {
@@ -1317,7 +1330,7 @@
.get(this.baseURL + "/Xt_User/getOrgIDListByUser", {
params: {
HModName: this.HModName,
- user: this.user,
+ user: sessionStorage["HUserName"],
HOrgID: this.zuzhiId,
},
})
@@ -1400,7 +1413,10 @@
if (!this.rowForm.瀹℃牳浜�) {
axios
.get(this.baseURL + "Cg_POOrderBill/DeltetCg_POOrderBill", {
- params: { HInter: this.rowForm.HInterID.toString(), user: this.user },
+ params: {
+ HInter: this.rowForm.HInterID.toString(),
+ user: sessionStorage["HUserName"],
+ },
})
.then((response) => {
if (response.data.count == 1) {
@@ -1425,7 +1441,11 @@
//閫昏緫瀹℃牳鏂规硶
axios
.get(this.baseURL + "/Cg_POOrderBill/AuditCg_POOrderBill", {
- params: { HInterID: InterID, IsAudit: num, CurUserName: this.user },
+ params: {
+ HInterID: InterID,
+ IsAudit: num,
+ CurUserName: sessionStorage["HUserName"],
+ },
})
.then((response) => {
let result = response.data;
@@ -1448,7 +1468,7 @@
params: {
HInterID: HInterID,
Type: num,
- user: this.user,
+ user: sessionStorage["HUserName"],
},
});
@@ -1475,7 +1495,7 @@
HInterID: HInterID,
HEntryID: HEntryID,
ISAudit: num,
- CurUserName: this.user,
+ CurUserName: sessionStorage["HUserName"],
},
}
);
@@ -1499,7 +1519,7 @@
params: {
HInterID: HInterID,
Type: num,
- user: this.user,
+ user: sessionStorage["HUserName"],
},
});
@@ -1520,7 +1540,11 @@
//閫昏緫瀹℃牳鏂规硶
axios
.get(this.baseURL + "/Gy_Employee/StopGy_Employee", {
- params: { HInterID: InterID, IsStop: num, CurUserName: this.user },
+ params: {
+ HInterID: InterID,
+ IsStop: num,
+ CurUserName: sessionStorage["HUserName"],
+ },
})
.then((response) => {
let result = response.data;
@@ -1586,7 +1610,7 @@
}
}
var sSubStr = JSON.stringify(num);
- var sMainSub = sSubStr + "&鍜�" + this.user;
+ var sMainSub = sSubStr + "&鍜�" + sessionStorage["HUserName"];
axios({
method: "post",
url: this.baseURL + "/Gy_Source/Gy_Source_btnSave",
diff --git a/src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillEdit.vue b/src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillEdit.vue
new file mode 100644
index 0000000..1f9264a
--- /dev/null
+++ b/src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillEdit.vue
@@ -0,0 +1,1104 @@
+<template>
+ <div v-loading="formLoading" v-if="formShow">
+ <div style=" margin-bottom: 10px; border-bottom: 1px solid #f6f6f6;">
+ <!-- <el-button type="primary" @click="handleAdd(OperationType = 1)" v-if="addBtnShow">鏂板</el-button> -->
+ <el-button type="primary" @click="submitForm" :disabled="subDisabled">淇� 瀛�</el-button>
+ <!-- <el-button type="primary" @click="set_CheckBill(1, form)">瀹� 鏍�</el-button> -->
+ <el-button type="primary" @click="close">閫� 鍑�</el-button>
+ <!-- <el-button @click="cancel">鍙� 娑�</el-button> -->
+ </div>
+ <div style="margin: 10px; font-size: 28px; font-weight: bold; text-align: center;">鍣ㄥ叿璋冩嫧鐢宠鍗�</div>
+ <el-form ref="form" :model="form" :rules="rules" label-width="90px">
+ <el-tabs v-model="activeName" type="card">
+ <el-tab-pane label="鍩烘湰淇℃伅" name="first">
+ <el-row>
+ <el-col :span="6">
+ <el-form-item label="鍗曟嵁鍙�" prop="HBillNo">
+ <el-input v-model="form.HBillNo" placeholder="璇疯緭鍏ュ崟鎹彿" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="鏃ユ湡" prop="HDate">
+ <el-date-picker v-model="form.HDate" type="date" placeholder="閫夋嫨鏃ユ湡" value-format="yyyy-MM-ddT">
+ </el-date-picker>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="璋冨叆缁勭粐" prop="HStockInOrgID">
+ <el-select v-model="form.HStockInOrgID" placeholder="璇烽�夋嫨缁勭粐">
+ <el-option v-for="(item, index) in organizationList" :key="index" :label="item.Name" :value="item.ID">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="6">
+ <el-form-item label="寰�鏉ョ被鍨�" prop="HSupTypeID">
+ <el-select v-model="form.HSupTypeID" placeholder="璇烽�夋嫨寰�鏉ョ被鍨�">
+ <el-option v-for="(item, index) in hSupTypeList" :key="index" :label="item.name" :value="item.id">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="寰�鏉ュ崟浣�" prop="HSupName">
+ <el-input v-model="form.HSupName" placeholder="璇烽�夋嫨寰�鏉ュ崟浣�" disabled>
+ <el-button slot="append" icon="el-icon-search" @click="openDataDialogChoose()"></el-button>
+ </el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="璋冨嚭缁勭粐" prop="HStockOutOrgID">
+ <el-select v-model="form.HStockOutOrgID" placeholder="璇烽�夋嫨缁勭粐">
+ <el-option v-for="(item, index) in organizationList" :key="index" :label="item.Name" :value="item.ID">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="6">
+ <el-form-item label="閮ㄩ棬" prop="HDeptName">
+ <el-input v-model="form.HDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" disabled>
+ <el-button slot="append" icon="el-icon-search" @click="openDataDialog(1,deptType=1)"></el-button>
+ </el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="璋冨叆浠撳簱" prop="HWHName">
+ <el-input v-model="form.HWHName" placeholder="璇烽�夋嫨璋冨叆浠撳簱" disabled>
+ <el-button slot="append" icon="el-icon-search" @click="openDataDialog(2,eHWHType=1)"></el-button>
+ </el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="璋冨嚭浠撳簱" prop="HSCWHName">
+ <el-input v-model="form.HSCWHName" placeholder="璇烽�夋嫨璋冨嚭浠撳簱" disabled>
+ <el-button slot="append" icon="el-icon-search" @click="openDataDialog(2,eHWHType=2)"></el-button>
+ </el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="6">
+ <el-form-item label="涓氬姟鍛�" prop="HEmpName">
+ <el-input v-model="form.HEmpName" placeholder="璇烽�夋嫨" disabled>
+ <el-button slot="append" icon="el-icon-search" @click="openDataDialog(4,empType=1)"></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,empType=2)"></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,empType=3)"></el-button>
+ </el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="淇濈鍛�" prop="HKeeperName">
+ <el-input v-model="form.HKeeperName" placeholder="璇烽�夋嫨" disabled>
+ <el-button slot="append" icon="el-icon-search" @click="openDataDialog(4,empType=4)"></el-button>
+ </el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="12">
+ <el-form-item label="鎽樿" prop="HExplanation">
+ <el-input v-model="form.HExplanation" placeholder="璇疯緭鍏ユ憳瑕�" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="澶囨敞" prop="HRemark">
+ <el-input v-model="form.HRemark" placeholder="璇疯緭鍏ュ娉�" />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ </el-tab-pane>
+ <el-tab-pane label="鍒跺崟淇℃伅" name="third">
+ <el-row>
+ <el-col :span="6">
+ <el-form-item label="鍒跺崟浜�" prop="HMaker">
+ <el-input v-model="form.HMaker" placeholder="璇疯緭鍏ュ埗鍗曚汉" disabled />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="淇敼浜�" prop="HUpDater">
+ <el-input v-model="form.HUpDater" placeholder="璇疯緭鍏ヤ慨鏀逛汉" disabled />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="瀹℃牳浜�" prop="HChecker">
+ <el-input v-model="form.HChecker" placeholder="璇疯緭鍏ュ鏍镐汉" disabled />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="鍏抽棴浜�" prop="HCloseMan">
+ <el-input v-model="form.HCloseMan" placeholder="璇疯緭鍏ュ叧闂汉" disabled />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="6">
+ <el-form-item label="鍒跺崟鏃ユ湡" prop="HMakeDate">
+ <el-date-picker v-model="form.HMakeDate" type="date" placeholder="閫夋嫨鍒跺崟鏃ユ湡" disabled>
+ </el-date-picker>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="淇敼鏃ユ湡" prop="HUpDateDate">
+ <el-date-picker v-model="form.HUpDateDate" type="date" placeholder="閫夋嫨瀹℃牳鏃ユ湡" disabled>
+ </el-date-picker>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="瀹℃牳鏃ユ湡" prop="HCheckDate">
+ <el-date-picker v-model="form.HCheckDate" type="date" placeholder="閫夋嫨瀹℃牳鏃ユ湡" disabled>
+ </el-date-picker>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="鍏抽棴鏃ユ湡" prop="HCloseDate">
+ <el-date-picker v-model="form.HCloseDate" type="date" placeholder="閫夋嫨鍏抽棴鏃ユ湡" disabled>
+ </el-date-picker>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="6">
+ <el-form-item label="浣滃簾浜�" prop="HDeleteMan">
+ <el-input v-model="form.HDeleteMan" placeholder="璇疯緭鍏ヤ綔搴熶汉" disabled />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="6">
+ <el-form-item label="浣滃簾鏃ユ湡" prop="HDeleteDate">
+ <el-date-picker v-model="form.HDeleteDate" type="date" placeholder="閫夋嫨浣滃簾鏃ユ湡" disabled>
+ </el-date-picker>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ </el-tab-pane>
+ </el-tabs>
+
+ <el-tabs v-model="activeName1" type="border-card">
+ <el-tab-pane label="鏄庣粏淇℃伅" name="first">
+ <div style="margin-bottom: 10px;">
+ <el-button type="success" plain icon="el-icon-plus" @click="handleAddSysZb()" size="mini">澧炲姞涓�琛�</el-button>
+ <el-button type="success" plain icon="el-icon-plus" @click="handleAddSysZb(zbIndex, 1)"
+ size="mini">鎻掑叆涓�琛�</el-button>
+ <el-button type="success" plain icon="el-icon-plus" @click="handleCopyZbRow" size="mini">澶嶅埗涓�琛�</el-button>
+ <el-button type="success" plain icon="el-icon-arrow-up" @click="handleMoveRowUp(zbSelForm)"
+ size="mini">涓婄Щ</el-button>
+ <el-button type="success" plain icon="el-icon-arrow-down" @click="handleMoveRowDown(zbSelForm)"
+ size="mini">涓嬬Щ</el-button>
+ </div>
+ <el-table :data="editData" style="width: 100%" height="300" width="100%" ref="zbTable"
+ @selection-change="handleTableZbEdit" :row-class-name="rowSysZbIndex" show-summary border>
+ <el-table-column type="selection" width="55" align="center" />
+ <el-table-column align="center" label="搴忓彿" type="index" width="80" />
+ <el-table-column align="center" label="鍣ㄥ叿浠ｇ爜" width="120">
+ <template slot-scope="scope">
+ <el-input v-model="scope.row.HMaterNumber" placeholder="璇疯緭鍏�" @keyup.native.f7="openDataDialog(8, scope.row)"
+ @dblclick.native="openDataDialog(8, scope.row)" />
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="鍣ㄥ叿鍚嶇О" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.HMaterName }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="瑙勬牸鍨嬪彿" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.HMaterModel }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="璁￠噺鍗曚綅浠ｇ爜" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.HUnitNumber }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="璁￠噺鍗曚綅" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.HUnitName }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="鏁伴噺" width="120">
+ <template slot-scope="scope">
+ <el-input-number v-model="scope.row.HQty" :min="1" style="width: 90px;"
+ controls-position="right"></el-input-number>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="璋冨叆浠撳簱浠ｇ爜" width="120">
+ <template slot-scope="scope">
+ <el-input v-model="scope.row.HWHNumber" placeholder="璇疯緭鍏�" @keyup.native.f7="openDataDialog(2, scope.row ,eHWHType=3)"
+ @dblclick.native="openDataDialog(2, scope.row ,eHWHType=3)" />
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="璋冨叆浠撳簱" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.HWHName }}</span>
+ </template>
+ </el-table-column>
+ <!-- <el-table-column align="center" label="璋冨叆浠撲綅浠ｇ爜" width="120">
+ <template slot-scope="scope">
+ <el-input v-model="scope.row.HSPCode" placeholder="璇疯緭鍏�" @keyup.native.f7="openDataDialog(9, scope.row,HSPType=1)"
+ @dblclick.native="openDataDialog(9, scope.row,HSPType=1)" />
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="璋冨叆浠撲綅" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.HSPName }}</span>
+ </template>
+ </el-table-column> -->
+ <el-table-column align="center" label="璋冨嚭浠撳簱浠ｇ爜" width="120">
+ <template slot-scope="scope">
+ <el-input v-model="scope.row.HSCWHNumber" placeholder="璇疯緭鍏�" @keyup.native.f7="openDataDialog(2, scope.row ,eHWHType=4)"
+ @dblclick.native="openDataDialog(2, scope.row ,eHWHType=4)" />
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="璋冨嚭浠撳簱" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.HSCWHName }}</span>
+ </template>
+ </el-table-column>
+ <!-- <el-table-column align="center" label="璋冨嚭浠撲綅浠ｇ爜" width="120">
+ <template slot-scope="scope">
+ <el-input v-model="scope.row.HSCSPCode" placeholder="璇疯緭鍏�" @keyup.native.f7="openDataDialog(9, scope.row,HSPType=2)"
+ @dblclick.native="openDataDialog(9, scope.row,HSPType=2)" />
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="璋冨嚭浠撲綅" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.HSCSPName }}</span>
+ </template>
+ </el-table-column> -->
+ <el-table-column align="center" label="澶囨敞" width="120">
+ <template slot-scope="scope">
+ <el-input v-model="scope.row.HRemark" placeholder="璇疯緭鍏ュ娉�" />
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="鎿嶄綔" width="55" fixed="right">
+ <template slot-scope="scope">
+ <el-button type="danger" icon="el-icon-delete" size="mini" circle
+ @click="handleDeleteSysZb(scope.row)"></el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ </el-tab-pane>
+ </el-tabs>
+
+ </el-form>
+ <!-- 寮圭獥 -->
+ <el-dialog :title="dialogTitle" :visible.sync="openData" width="1280px" append-to-body>
+ <Dept @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="deptShow" />
+ <Warehouse @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="warehouseShow" />
+ <GyEmployee @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyEmployeeShow" />
+ <GySupplier @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gySupplierShow" />
+ <GyCustomer @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyCustomerShow" />
+ <GyMould @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyMouldShow" />
+ <GyStockPlace @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyStockPlaceShow" />
+ <div slot="footer" class="dialog-footer">
+ <el-button type="primary" @click="deptClickSub">纭� 瀹�</el-button>
+ <el-button @click="deptClose">鍙� 娑�</el-button>
+ </div>
+ </el-dialog>
+ <el-dialog title="闅愯棌鍒楄缃�" :visible.sync="openRowHide" width="816px" append-to-body>
+ <RowSettings :colName="btResList" :HModName="HModName" @rowEditClose="rowSetClose" v-if="rowHideShow" />
+ </el-dialog>
+ </div>
+</template>
+
+<script>
+import axios from 'axios'
+import RowSettings from '@/views/component/rowSettings'
+import GyEmployee from '@/views/basic/gyEmployee/gyEmployee.vue'
+import Dept from '@/views/basic/gy/gyDepartment'
+import Warehouse from '@/views/basic/gyWarehouse/gyWarehouse.vue'
+import GySupplier from '@/views/basic/gy/gySupplier.vue'
+import GyCustomer from '@/views/GyCustomer'
+import GyMould from '@/views/scMould/basicModeling/Gy_MouldFileList.vue'
+import GyStockPlace from '@/views/basic/gyStockPlace/gyStockPlace.vue'
+import moment from 'moment';
+
+export default {
+ name: 'Sc_MouldMoveStockRequestBillEdit',
+ components: { Dept, Warehouse, RowSettings, GyEmployee,GySupplier,GyCustomer,GyMould,GyStockPlace },
+ props: {
+ OperationType: { type: Number, },
+ linterid: { type: Number, },
+ HSouceBillType: { type: String, },
+ propsData: { type: String, },
+ copyType: { type: Number, },
+ },
+ data() {
+ return {
+ HModName: "Sc_MouldMoveStockRequestBill",
+ formShow: false,
+ temp: undefined,
+ formLoading: true,
+ rowHideShow: false,
+ openRowHide: false,
+ hSupTypeList: [{name:'渚涘簲鍟�',id:1,},{name:'瀹㈡埛',id:2},{name:'杞﹂棿閮ㄩ棬',id:3}],
+ addBtnShow: false,
+ zbIndex: null,
+ zbSelForm: {},//瀛愯〃閫変腑鏁版嵁
+ dialogTypeNum: null,//閮ㄩ棬寮圭獥1锛屼粨搴撳脊绐�2
+ deptShow: false,//閮ㄩ棬鏁版嵁缁勪欢
+ warehouseShow: false,//浠撳簱鏁版嵁缁勪欢
+ gyEmployeeShow: false,//閿�鍞憳鏁版嵁缁勪欢
+ gySupplierShow: false,//渚涘簲鍟嗘暟鎹粍浠�
+ gyCustomerShow: false,//瀹㈡埛鏁版嵁缁勪欢
+ gyMouldShow: false,//鍣ㄥ叿鏁版嵁缁勪欢
+ gyStockPlaceShow: false,//浠撲綅鏁版嵁缁勪欢
+ eHWHType:1,//浠撳簱寮圭獥鍖哄垎鏍囧織
+ empType:1,//鑱屽憳寮圭獥鍖哄垎鏍囧織
+ HSPType:1,//浠撲綅寮圭獥鍖哄垎鏍囧織
+ deptType:1,//閮ㄩ棬寮圭獥鍖哄垎鏍囧織
+ deptform: {},//寮圭獥閫変腑鏁版嵁
+ openData: false,//鏁版嵁寮圭獥
+ dialogTitle: '',
+ organizationList: [],//缁勭粐鍒楄〃
+ subDisabled: false,//缂栬緫椤甸潰淇濆瓨鎸夐挳鏄惁绂佺敤(true绂佺敤锛宖alse鍙敤)
+ // OperationType: this.$route.query.OperationType,//淇濆瓨绫诲瀷锛堟柊澧�1淇敼2锛�
+ HInterID: 0,
+ baseURL: process.env.VUE_APP_BASE_API,
+ checkedSysZb: [],
+ editData: [],//瀛愯〃
+ editData1: [],//姹囨�诲瓙琛�
+ editBtData: [],//瀛愯〃琛ㄥご
+ activeName: 'first',
+ activeName1:'first',
+ // 寮瑰嚭灞傛爣棰�
+ title: "",
+ // 鏄惁鏄剧ず寮瑰嚭灞�
+ open: false,
+ // 鏃ユ湡鑼冨洿
+ dateRange: [],
+ // 鏌ヨ鍙傛暟
+ queryParams: {
+ HBillNo: '',
+ HInitTimeCycle: 29,
+ HProjectNumber: '',
+ HCusID: null,
+ HMaterNumber: '',
+ HMaterName: '',
+ ColName1: '',
+ ColName2: '',
+ ColName: '',
+ Comparator1: '',
+ Comparator2: '',
+ Comparator: '',
+ ColContent1: '',
+ ColContent2: '',
+ ColContent: '',
+ },
+ // 鏄剧ず鎼滅储鏉′欢
+ showSearch: true,
+ // 閫変腑鏁扮粍
+ ids: [],
+ // 闈炲崟涓鐢�
+ single: true,
+ // 闈炲涓鐢�
+ multiple: true,
+ // 閬僵灞�
+ loading: true,
+ btResList: [],
+ // 琛ㄥ崟鍙傛暟
+ form: {},
+ // 琛ㄥ崟鏍￠獙
+ rules: {
+ HBillNo: [
+ { required: true, message: "鍗曟嵁鍙蜂笉鑳戒负绌�", trigger: "blur" }
+ ],
+ HDate: [
+ { required: true, message: "鏃ユ湡涓嶈兘涓虹┖", trigger: "blur" }
+ ],
+ HStockInOrgID: [
+ { required: true, message: "璋冨叆缁勭粐涓嶈兘涓虹┖", trigger: "blur" }
+ ],
+ HStockOutOrgID: [
+ { required: true, message: "璋冨嚭缁勭粐涓嶈兘涓虹┖", trigger: "blur" }
+ ]
+ }
+ };
+ },
+ created() {
+ this.fetchData()
+ this.getdata()
+ },
+ methods: {
+ fetchData() {
+ axios.get(this.baseURL + "/Web/GetOrganizations", {
+ }).then(response => {
+ if (response.data.count == 1) {
+ this.organizationList = response.data.data;//缁勭粐鍒楄〃
+ }
+ }).catch(error => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ },
+ getdata() {
+ console.log(this.copyType, this.OperationType)
+ this.formShow = false
+ this.formLoading = true
+ if ((this.OperationType == 1 && this.copyType != 1) || (!this.OperationType && !this.copyType)) {
+ this.handleAdd()
+ } else if (this.OperationType == 2 || this.copyType == 1) {
+ this.handleUpdate()
+ }
+ },
+ // 鑾峰彇鍙傛暟_浼犻�掔殑JSON鏍煎紡鍙傛暟
+ getUrlVars_JSON() {
+ var datajson;
+ var str = this.propsData; //鑾峰彇閾炬帴涓紶閫掔殑鍙傛暟
+ var arr = str.substring(str.lastIndexOf("=") + 1);
+ datajson = JSON.parse(decodeURI(arr));
+ return datajson;
+ },
+ handleRowHide() {
+ this.rowHideShow = true
+ this.openRowHide = true
+ },
+ rowSetClose(val) {
+ this.rowHideShow = false
+ this.openRowHide = val
+ },
+
+ HStockOrgChange(val) {
+ console.log(549,val,this.zbIndex)
+ console.log(this.organizationList)
+
+ // let options=undefined
+ // this.form=this.organizationList.find(option => option.ID === val)?.Name || '';
+ },
+ //寮圭獥璧嬪��
+ dbEmitData(deptRow, num) {
+ // num=1閮ㄩ棬 num=2浠撳簱
+ console.log(deptRow)
+ if (deptRow.HItemID || deptRow.hmainid) {
+ if (num == 1) {
+ if(this.deptType == 1){
+ this.form.HDeptName = deptRow.閮ㄩ棬鍚嶇О
+ this.form.HDeptID = deptRow.HItemID
+ }else{
+ this.form.HSupName = deptRow.閮ㄩ棬鍚嶇О
+ this.form.HSupID = deptRow.HItemID
+ }
+ this.deptShow = false
+ this.openData = false
+ } else if (num == 2) {
+ if(this.eHWHType == 1){
+ this.form.HWHName = deptRow.浠撳簱鍚嶇О
+ this.form.HWHID = deptRow.HItemID
+ this.form.HWHNumber = deptRow.浠撳簱浠ｇ爜
+ }else if(this.eHWHType == 2){
+ this.form.HSCWHName = deptRow.浠撳簱鍚嶇О
+ this.form.HSCWHID = deptRow.HItemID
+ this.form.HSCWHNumber = deptRow.浠撳簱浠ｇ爜
+ }else if(this.eHWHType == 3){
+ this.editData[this.zbIndex].HWHID = deptRow.HItemID
+ this.editData[this.zbIndex].HWHNumber = deptRow.浠撳簱浠ｇ爜
+ this.editData[this.zbIndex].HWHName = deptRow.浠撳簱鍚嶇О
+ }else if(this.eHWHType == 4){
+ this.editData[this.zbIndex].HSCWHID = deptRow.HItemID
+ this.editData[this.zbIndex].HSCWHNumber = deptRow.浠撳簱浠ｇ爜
+ this.editData[this.zbIndex].HSCWHName = deptRow.浠撳簱鍚嶇О
+ }
+ this.warehouseShow = false
+ this.openData = false
+ } else if (num == 4) {
+ if(this.empType == 1){
+ this.form.HEmpName = deptRow.鑱屽憳鍚嶇О
+ this.form.HEmpID = deptRow.HItemID
+ }else if(this.empType == 2){
+ this.form.HMangerName = deptRow.鑱屽憳鍚嶇О
+ this.form.HMangerID = deptRow.HItemID
+ }else if(this.empType == 3){
+ this.form.HSecManagerName = deptRow.鑱屽憳鍚嶇О
+ this.form.HSecManagerID = deptRow.HItemID
+ }else if(this.empType == 4){
+ this.form.HKeeperName = deptRow.鑱屽憳鍚嶇О
+ this.form.HKeeperID = deptRow.HItemID
+ }else
+ this.gyEmployeeShow = false
+ this.openData = false
+ } else if (num == 6) {
+ this.form.HSupName = deptRow.渚涘簲鍟嗗悕绉�
+ this.form.HSupID = deptRow.HItemID
+ this.gySupplierShow = false
+ this.openData = false
+ } else if (num == 7) {
+ this.form.HSupName = deptRow.瀹㈡埛鍚嶇О
+ this.form.HSupID = deptRow.HItemID
+ this.gyCustomerShow = false
+ this.openData = false
+ } else if (num == 8){
+ this.editData[this.zbIndex].HMaterID = deptRow.hmainid
+ this.editData[this.zbIndex].HMaterNumber = deptRow.妯″叿缂栧彿
+ this.editData[this.zbIndex].HMaterName = deptRow.妯″叿鍚嶇О
+ this.editData[this.zbIndex].HMaterModel = deptRow.妯″叿鍨嬪彿
+ this.editData[this.zbIndex].HUnitID = deptRow.HUnitID
+ this.editData[this.zbIndex].HUnitNumber = deptRow.璁￠噺鍗曚綅浠ｇ爜
+ this.editData[this.zbIndex].HUnitName = deptRow.璁￠噺鍗曚綅
+ this.gyMouldShow = false
+ this.openData = false
+ } else if (num == 9){
+ if(this.HSPType == 1){
+ this.editData[this.zbIndex].HSPID = deptRow.HMainID
+ this.editData[this.zbIndex].HSPCode = deptRow.浠撲綅浠ｇ爜
+ this.editData[this.zbIndex].HSPName = deptRow.浠撲綅鍚嶇О
+ }else{
+ this.editData[this.zbIndex].HSCSPID = deptRow.HMainID
+ this.editData[this.zbIndex].HSCSPCode = deptRow.浠撲綅浠ｇ爜
+ this.editData[this.zbIndex].HSCSPName = deptRow.浠撲綅鍚嶇О
+ }
+ this.gyStockPlaceShow = false
+ this.openData = false
+ }
+ } else {
+ this.$modal.msgError("璇烽�夋嫨鍗曟潯鏁版嵁!");
+ }
+
+ },
+ emitData(deptRow, num) {
+ this.dialogTypeNum = num
+ this.deptform = deptRow
+ },
+ deptClickSub() {
+ this.dbEmitData(this.deptform, this.dialogTypeNum)
+ this.deptform = {}
+ },
+ deptClose() {
+ this.deptform = {}
+ this.openData = false
+ },
+
+ //琛ㄥ崟鍒濆鍖�
+ reset() {
+ this.form = {
+ HBillNo: '',
+ HInterID: 0,
+ HDate: new Date(),
+ HStockInOrgID:sessionStorage["OrganizationID"] - 0,
+ HSupTypeID:1,
+ HSupName:'',
+ HSupID:0,
+ HStockOutOrgID:sessionStorage["OrganizationID"] - 0,
+ HDeptName: '',
+ HDeptID: 0,
+ HWHName:'',
+ HWHNumber:'',
+ HWHID:0,
+ HSCWHName:'',
+ HSCWHNumber:'',
+ HSCWHID:0,
+ HEmpName:'',
+ HEmpID:'',
+ HMangerName:'',
+ HMangerID:'',
+ HSecManagerName:'',
+ HSecManagerID:'',
+ HKeeperName:'',
+ HKeeperID:'',
+ HExplanation:'',
+ HRemark:'',
+
+ HMaker: '',
+ HUpDater: '',
+ HChecker: '',
+ HMakeDate: new Date(),
+ HUpDateDate: '',
+ HCheckDate: '',
+ HCloseMan: '',
+ HDeleteMan: '',
+ HCloseDate: '',
+ HDeleteDate: '',
+ }
+ this.editData = []
+ this.editData1 = []
+ this.editBtData = []
+ this.ids = []
+ this.subDisabled = false
+ this.addBtnShow = false
+ // this.$refs.tableData.clearSelection()
+ this.activeName = 'first'
+ this.activeName1 = 'first'
+ this.resetForm("form");
+ },
+ //閫�鍑�
+ close() {
+ this.reset()
+ console.log(this.$route.path)
+ if (!this.OperationType && !this.copyType) {
+ console.log(this.$route.path)
+ const obj = { fullPath: this.$route.path, path: this.$route.path, name: this.$route.name, };
+ this.$tab.closePage(obj).then(res => {
+ const latestView = res.visitedViews.slice(-1)[0]
+ if (latestView) {
+ this.$router.push(latestView.fullPath)
+ } else {
+ if (obj.name === 'Dashboard') {
+ this.$router.replace({ path: '/redirect' + obj.fullPath })
+ } else {
+ this.$router.push('/')
+ }
+ }
+ });
+ } else {
+ this.formShow = false
+ this.$emit('editClose', false)
+ }
+ },
+ //鏍规嵁鐢ㄦ埛鑾峰彇瀵瑰簲鑱屽憳銆侀儴闂ㄣ�侀攢鍞富绠�
+ getCzyglByUser() {
+ axios.get(this.baseURL + '/Xs_SeOrderBill/getCzyglByUser', {
+ params: { "CurUserName": sessionStorage["HUserName"] }
+ }).then(response => {
+ let dataForm = response.data.data[0]
+ this.form.HDeptID = dataForm.HDeptID
+ this.form.HDeptName = dataForm.HDeptName
+ this.form.HEmpID = dataForm.HEmpID
+ this.form.HEmpName = dataForm.HEmpName
+ }).catch(error => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ },
+ /** 鏂板鎸夐挳鎿嶄綔 */
+ handleAdd() {
+ this.reset()
+ //鏂板鑾峰彇鍗曟嵁鍙�
+ this.getHBillNo()
+ let date = new Date()
+ this.form.HDate = moment(date).format('YYYY-MM-DDTHH:mm:ss')
+ if (this.OperationType == 1) {
+ this.handleAddSysZb()
+ }
+ this.$nextTick(() => {
+ this.formShow = true
+ this.formLoading = false
+ })
+ },
+ getHBillNo() {
+ axios.get(this.baseURL + "/WEBSController/GetMaxBillNo_Json", {
+ params: {
+ HBillType: '3850'
+ }
+ }).then(response => {
+ this.form.HMaker = sessionStorage["HUserName"]
+ this.form.HBillNo = response.data.data[0].HBillNo
+ this.form.HInterID = 0
+ // this.copyType = 0
+ // this.getCzyglByUser()
+ }).catch(error => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ },
+ /** 淇敼鎸夐挳鎿嶄綔 */
+ handleUpdate() {
+ this.reset()
+ let rowHmainid = this.linterid
+ console.log(this.linterid)
+ //涓昏〃
+ axios.get(this.baseURL + "/Sc_MouldMoveStockRequestBillController/GetSc_MouldMoveStockRequestBill_Json", {
+ params: { 'HInterID': rowHmainid,'HMaker':sessionStorage["HUserName"] }
+ }).then(response => {
+ if (response.data.count == 1) {
+ var result = response.data
+ var data = response.data.data[0]
+ console.log(result,data)
+ if (this.copyType == 1) {
+ this.getHBillNo()
+ let date = new Date()
+ this.form.HDate = moment(date).format('YYYY-MM-DDTHH:mm:ss')
+ } else {
+ this.form = {
+ "HBillNo": data.鍗曟嵁鍙�
+ , "HDate": data.鏃ユ湡
+ , "HSupTypeID": data.HSupTypeID
+ , "HSupID": data.HSupID
+ , "HSupName": data.寰�鏉ュ崟浣�
+ , "HDeptID": data.HDeptID
+ , "HDeptName": data.閮ㄩ棬
+ , "HWHID": data.HWHID
+ , "HWHName": data.璋冨叆浠撳簱
+ , "HSCWHID": data.HSCWHID
+ , "HSCWHName": data.璋冨嚭浠撳簱
+ , "HEmpID": data.HEmpID
+ , "HEmpName": data.涓氬姟鍛�
+ , "HMangerID": data.HMangerID
+ , "HMangerName": data.涓荤
+ , "HSecManagerID": data.HSecManagerID
+ , "HSecManagerName": data.楠屾敹鍛�
+ , "HKeeperID": data.HKeeperID
+ , "HKeeperName": data.淇濈鍛�
+ , "HExplanation": data.鎽樿
+ , "HRemark": data.琛ㄥご澶囨敞
+ , "HStockInOrgID": data.HStockInOrgID
+ , "HStockOutOrgID": data.HStockOutOrgID
+
+ , "HMaker": data.鍒跺崟浜�
+ , "HMakeDate": data.鍒跺崟鏃ユ湡 == null ? "" : data.鍒跺崟鏃ユ湡
+ , "HChecker": data.瀹℃牳浜�
+ , "HCheckDate": data.瀹℃牳鏃ユ湡 == null ? "" : data.瀹℃牳鏃ユ湡
+ , "HUpDater": data.淇敼浜�
+ , "HUpDateDate": data.淇敼鏃ユ湡 == null ? "" : data.淇敼鏃ユ湡
+ , "HCloseMan": data.鍏抽棴浜�
+ , "HCloseDate": data.鍏抽棴鏃ユ湡 == null ? "" : data.鍏抽棴鏃ユ湡
+ , "HDeleteMan": data.浣滃簾浜�
+ , "HDeleteDate": data.浣滃簾鏃ユ湡 == null ? "" : data.浣滃簾鏃ユ湡
+ }
+ this.form.HStockInOrgID = data.HStockInOrgID == null ? 0 : data.HStockInOrgID;
+ this.form.HStockOutOrgID = data.HStockOutOrgID == null ? 0 : data.HStockOutOrgID;
+ //瀛愯〃
+ var rowdata = [];
+ for (let i = 0; i < result.data.length; i++) {
+ rowdata.push(
+ {
+ "HMaterID": result.data[i].HMaterID
+ , "HMaterNumber": result.data[i].HMaterNumber
+ , "HMaterName": result.data[i].HMaterName
+ , "HMaterModel": result.data[i].HMaterModel
+ , "HPropertyID": result.data[i].HProcID
+ , "HSecUnitID": result.data[i].HSecUnitID
+ , "HSecUnitRate": result.data[i].HSecUnitRate
+ , "HUnitID": result.data[i].HUnitID
+ , "HUnitNumber": result.data[i].HUnitNumber
+ , "HUnitName": result.data[i].HUnitName
+ , "HQtyMust": result.data[i].HQtyMust
+ , "HQty": result.data[i].HQty
+ , "HPrice": result.data[i].HPrice
+ , "HMoney": result.data[i].HMoney
+ , "HOutPrice": result.data[i].HOutPrice
+ , "HOutMoney": result.data[i].HOutMoney
+ , "HWHID": result.data[i].HWHID
+ , "HWHNumber": result.data[i].HWHNumber
+ , "HWHName": result.data[i].HWHName
+ , "HSCWHID": result.data[i].HSCWHID
+ , "HSCWHNumber": result.data[i].HSCWHNumber
+ , "HSCWHName": result.data[i].HSCWHName
+ , "HSPID": result.data[i].HSPID
+ , "HSPNumber": result.data[i].HSPNumber
+ , "HSPName": result.data[i].HSPName
+ , "HSCSPID": result.data[i].HSCSPID
+ , "HSCSPNumber": result.data[i].HSCSPNumber
+ , "HSCSPName": result.data[i].HSCSPName
+ , "HERPInterID": result.data[i].HERPInterID
+ , "HERPEntryID": result.data[i].HERPEntryID
+ , "HPOOrderInterID": result.data[i].HPOOrderInterID
+ , "HPOOrderEntryID": result.data[i].HPOOrderEntryID
+ , "HPOOrderBillNo": result.data[i].HPOOrderBillNo
+ , "HSeOrderInterID": result.data[i].HSeOrderInterID
+ , "HSeOrderEntryID": result.data[i].HSeOrderEntryID
+ , "HSeOrderBillNo": result.data[i].HSeOrderBillNo
+ , "HICMOInterID": result.data[i].HICMOInterID
+ , "HICMOEntryID": result.data[i].HICMOEntryID
+ , "HICMOBillNo": result.data[i].HICMOBillNo
+ , "HSTOCKORGID": result.data[i].HSTOCKORGID
+ , "HSTOCKORGName": result.data[i].HSTOCKORGName
+ , "HOWNERID": result.data[i].HOWNERID
+ , "HOWNERTYPEID": result.data[i].HOWNERTYPEID
+ , "HSTOCKORGINID": result.data[i].HSTOCKORGINID
+ , "HSTOCKORGINName": result.data[i].HSTOCKORGINName
+ , "HOWNERINID": result.data[i].HOWNERINID
+ , "HOWNERTYPEINID": result.data[i].HOWNERTYPEINID
+ , "HBASEUNITID": result.data[i].HBASEUNITID
+ , "HEXTAUXUNITID": result.data[i].HEXTAUXUNITID
+ , "HSECQTY": result.data[i].HSECQTY
+ , "HSourceBillType": result.data[i].HSourceBillType
+ , "HSourceInterID": result.data[i].HSourceInterID
+ , "HSourceEntryID": result.data[i].HSourceEntryID
+ , "HSourceBillNo": result.data[i].HSourceBillNo
+ , "HRemark": result.data[i].HRemark
+ }
+ )
+ }
+ this.editData = rowdata
+ }
+ this.formShow = true
+ this.formLoading = false
+ }
+ }).catch(error => {
+ console.log(error)
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ },
+ /** 瀛愯〃鏄庣粏搴忓彿 */
+ rowSysZbIndex({ row, rowIndex }) {
+ row.index = rowIndex + 1;
+ },
+ /** 缂栬緫椤靛瓙琛ㄦ坊鍔犳寜閽搷浣� */
+ handleAddSysZb(index, num) {
+ if (num == 1 && !index) {
+ this.$modal.msgError("璇烽�夋嫨涓�琛屾暟鎹紪杈�!");
+ } else {
+ let obj = {
+ "HMaterID": "0"
+ , "HMaterNumber": ""
+ , "HMaterName": ""
+ , "HMaterModel": ""
+ , "HUnitID": "0"
+ , "HUnitNumber": ""
+ , "HUnitName": ""
+ , "HQty": "0"
+ , "HWHID": "0"
+ , "HWHNumber": ""
+ , "HWHName": ""
+ , "HSPID": "0"
+ , "HSPNumber": ""
+ , "HSPName": ""
+ , "HSCWHID": "0"
+ , "HSCWHNumber": ""
+ , "HSCWHName": ""
+ , "HSCSPID": "0"
+ , "HSCSPNumber": ""
+ , "HSCSPName": ""
+ , "HRemark": ""
+ , "HPropertyID": "0"
+ , "HSecUnitID": "0"
+ , "HSecUnitRate": "0"
+ , "HQtyMust": "0"
+ , "HPrice": "0"
+ , "HMoney": "0"
+ , "HOutPrice": "0"
+ , "HOutMoney": "0"
+ , "HERPInterID": "0"
+ , "HERPEntryID": "0"
+ , "HPOOrderInterID": "0"
+ , "HPOOrderEntryID": "0"
+ , "HPOOrderBillNo": ""
+ , "HSeOrderInterID": "0"
+ , "HSeOrderEntryID": "0"
+ , "HSeOrderBillNo": ""
+ , "HICMOInterID": "0"
+ , "HICMOEntryID": "0"
+ , "HICMOBillNo": ""
+ , "HSTOCKORGID": "0"
+ , "HOWNERID": "0"
+ , "HOWNERTYPEID": ""
+ , "HSTOCKORGINID": "0"
+ , "HOWNERINID": "0"
+ , "HOWNERTYPEINID": ""
+ , "HBASEUNITID": "0"
+ , "HEXTAUXUNITID": "0"
+ , "HSECQTY": "0"
+ }
+ if (index) {
+ this.editData.splice(index, 0, obj);
+ this.$set(this.editData, index, obj)
+ } else {
+ this.editData.push(obj);
+ }
+ }
+ },
+ handleCopyZbRow() {
+ if (!this.zbIndex) {
+ this.$modal.msgError("璇烽�夋嫨涓�琛屾暟鎹�")
+ } else {
+ let copyRow = JSON.parse(JSON.stringify(this.zbSelForm))
+ this.editData.push(copyRow);
+ }
+ },
+ handleMoveRowUp(zbSelForm) {
+ if (!this.zbIndex) {
+ this.$modal.msgError("璇烽�夋嫨涓�琛屾暟鎹�")
+ } else {
+ if (zbSelForm.index == 1) {
+ this.$modal.msgError("绗竴琛屾暟鎹棤娉曚笂绉�");
+ } else { // 纭繚涓嶆槸绗竴琛�
+ let num = zbSelForm.index - 1
+ const record = this.editData.splice(num, 1)[0];
+ this.editData.splice(num - 1, 0, record);
+ }
+ }
+ },
+ handleMoveRowDown(zbSelForm) {
+ if (!this.zbIndex) {
+ this.$modal.msgError("璇烽�夋嫨涓�琛屾暟鎹�")
+ } else {
+ if (zbSelForm.index == this.editData.length) {
+ this.$modal.msgError("鏈�鍚庝竴琛屾暟鎹棤娉曚笅绉�");
+ } else { // 纭繚涓嶆槸绗竴琛�
+ let num = zbSelForm.index - 1
+ const record = this.editData.splice(num, 1)[0];
+ this.editData.splice(num + 1, 0, record);
+ }
+ }
+ },
+ /** 缂栬緫椤靛瓙琛ㄥ垹闄ゆ寜閽搷浣� */
+ handleDeleteSysZb(row) {
+ this.checkedSysZb = []
+ this.checkedSysZb.push(row.index)
+ if (this.checkedSysZb.length == 0) {
+ this.$modal.msgError("璇峰厛閫夋嫨瑕佸垹闄ょ殑鍟嗗搧璁㈠崟鏄庣粏鏁版嵁");
+ } else {
+ const editData = this.editData;
+ const checkedSysZb = this.checkedSysZb;
+ this.editData = editData.filter(function (item) {
+ return checkedSysZb.indexOf(item.index) == -1
+ });
+ }
+ },
+ /** 缂栬緫椤靛瓙琛ㄥ閫夋閫変腑鏁版嵁 */
+ handleTableZbEdit(selection) {
+ this.checkedSysZb = selection.map(item => item.index)
+ this.zbSelForm = selection[0]
+ this.zbIndex = this.checkedSysZb[0]
+ if (selection.length > 1) {
+ const del_row = selection.shift()
+ this.$refs.zbTable.toggleRowSelection(del_row, false) //璁剧疆杩欎竴琛屽彇娑堥�変腑
+ }
+ },
+ // 缂栬緫鎻愪氦淇濆瓨
+ submitForm() {
+ 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) {
+ 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) {
+ if(this.OperationType == 2){
+ this.form.HInterID = this.linterid
+ }
+ var sMainStr = JSON.stringify(this.form);
+ var sSubStr = JSON.stringify(this.editData);
+ var sMainSub = sMainStr + ';' + sSubStr + ';' + this.OperationType + ";" + sessionStorage["HUserName"];
+ axios({
+ method: 'post',
+ url: this.baseURL + "/Sc_MouldMoveStockRequestBillController/GetSc_MouldMoveStockRequestBill_Save_Json",
+ data: {
+ 'sMainSub': sMainSub
+ },
+ }).then(response => {
+ if (response.data.count == 1) {
+ this.subDisabled = true//璁剧疆淇濆瓨鎸夐挳涓嶅彲鐢�
+ this.$modal.msgSuccess(response.data.Message);
+ // if (response.data.Verify == "Y") //鑷姩瀹℃牳
+ // {
+ // this.set_CheckBill(1, this.form); //瀹℃牳
+ // }
+ this.addBtnShow = true
+ this.close()
+ } else {
+ this.$modal.msgError(response.data.code + response.data.Message);
+ }
+ }).catch(error => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ }
+ })
+ }
+ });
+ },
+ // 鍙嶅鏍�/瀹℃牳鏁版嵁
+ set_CheckBill(num, form) {
+ var InterID = form.hmainid || form.HInterID
+ //閫昏緫瀹℃牳鏂规硶
+ axios.get(this.baseURL + "/Sc_MouldProdMoveBill/AuditMouldProdMoveBill", {
+ params: { "HInterID": InterID, "flag": num, "user": sessionStorage["HUserName"] }
+ }).then(response => {
+ let result = response.data
+ if (result.code == 1) {
+ this.$modal.msgSuccess('鎿嶄綔鎴愬姛');
+ }
+ else {
+ this.$modal.msgError("閿欒:" + result.code + result.Message,);
+ }
+ }).catch(error => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ },
+ showReset() {
+ this.deptShow = false
+ this.warehouseShow = false
+ this.gyEmployeeShow = false
+ this.gySupplierShow = false
+ this.gyCustomerShow = false
+ this.gyMouldShow = false
+ this.gyStockPlaceShow = false
+ },
+ // 鎵撳紑鏁版嵁鍒楄〃寮圭獥
+ openDataDialog(num, row) {
+ //num1閮ㄩ棬锛�2鍑哄簱浠撳簱锛�3鐗╂枡锛�4閿�鍞憳
+ if (row) {
+ this.zbIndex = row.index - 1
+ }
+ this.showReset()
+ if (num == 1) {
+ this.dialogTitle = '閮ㄩ棬鍒楄〃'
+ this.deptShow = true
+ this.openData = true
+ } else if (num == 2) {
+ this.dialogTitle = '浠撳簱鍒楄〃'
+ this.warehouseShow = true
+ this.openData = true
+ } else if (num == 4) {
+ if(this.empType == 1){
+ this.dialogTitle = '涓氬姟鍛樺垪琛�'
+ }else if(this.empType == 2){
+ this.dialogTitle = '涓荤鍒楄〃'
+ }else if(this.empType == 3){
+ this.dialogTitle = '楠屾敹鍛樺垪琛�'
+ }else if(this.empType == 4){
+ this.dialogTitle = '淇濈鍛樺垪琛�'
+ }
+ this.gyEmployeeShow = true
+ this.openData = true
+ } else if (num == 6) {
+ this.dialogTitle = '渚涘簲鍟嗗垪琛�'
+ this.gySupplierShow = true
+ this.openData = true
+ } else if (num == 7) {
+ this.dialogTitle = '瀹㈡埛鍒楄〃'
+ this.gyCustomerShow = true
+ this.openData = true
+ } else if (num == 8) {
+ this.dialogTitle = '鍣ㄥ叿鍒楄〃'
+ this.gyMouldShow = true
+ this.openData = true
+ } else if (num == 9) {
+ this.dialogTitle = '浠撲綅鍒楄〃'
+ this.gyStockPlaceShow = true
+ this.openData = true
+ }
+ },
+ //鏍规嵁寰�鏉ョ被鍨嬪垽鏂線鏉ュ崟浣�
+ openDataDialogChoose(){
+ if(this.form.HSupTypeID == 1){
+ this.openDataDialog(6)
+ }else if(this.form.HSupTypeID == 2){
+ this.openDataDialog(7)
+ }else if(this.form.HSupTypeID == 3){
+ this.deptType = 2
+ this.openDataDialog(1)
+ }
+ }
+ }
+};
+</script>
+<style>
+.xsckdBox .el-date-editor.el-input {
+ width: 100%;
+}
+</style>
diff --git a/src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillList.vue b/src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillList.vue
new file mode 100644
index 0000000..de42970
--- /dev/null
+++ b/src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillList.vue
@@ -0,0 +1,829 @@
+<template>
+ <div style="padding: 10px;">
+ <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="78px" class="searchBox">
+ <el-form-item label="寮�濮嬫棩鏈�" style="margin-left: 100px;">
+ <el-date-picker v-model="sTime" type="date" placeholder="寮�濮嬫棩鏈�" style="width: 150px;">
+ </el-date-picker>
+ </el-form-item>
+ <el-form-item label="缁撴潫鏃ユ湡">
+ <el-date-picker v-model="eTime" type="date" placeholder="缁撴潫鏃ユ湡" style="width: 150px;">
+ </el-date-picker>
+ </el-form-item>
+ <el-form-item label="鏃ユ湡闂撮殧">
+ <el-select v-model="queryParams.HInitTimeCycle" placeholder="璇烽�夋嫨" @change="riqiChange" style="width: 150px;">
+ <el-option v-for="(item, index) in rqsgList" :key="index" :label="item.label" :value="item.value">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="鍗曟嵁鍙�" prop="HBillNo">
+ <el-input v-model="queryParams.HBillNo" placeholder="璇疯緭鍏ュ崟鎹彿" @keyup.enter.native="handleQuery" />
+ </el-form-item>
+ <el-form-item label-width="78px">
+ <el-button type="primary" icon="el-icon-search" @click="handleQuery"> 鎼� 绱�</el-button>
+ <el-button icon="el-icon-circle-close" @click="resetQuery">閲� 缃�</el-button>
+ </el-form-item>
+ <el-collapse v-model="activeSeach">
+ <el-collapse-item title="鏇村" name="1">
+ <el-card class="box-card">
+ <el-form-item label="鐘舵��" prop="HStatus">
+ <el-select v-model="queryParams.HStatus" placeholder="璇烽�夋嫨鐘舵��">
+ <el-option v-for="(item, index) in HStatusList" :key="index" :label="item.name" :value="item.value">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="璋冨嚭缁勭粐">
+ <el-select v-model="queryParams.HStockOutOrgID" placeholder="璇烽�夋嫨">
+ <el-option v-for="(item, index) in organizationList" :key="index" :label="item.Name" :value="item.ID">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="閮ㄩ棬淇℃伅" prop="HDept">
+ <el-input v-model="queryParams.HDept" placeholder="璇疯緭鍏ラ儴闂ㄤ俊鎭�" @keyup.enter.native="handleQuery" />
+ </el-form-item>
+ <el-form-item label="鍣ㄥ叿浠ｇ爜" prop="HModelNumber">
+ <el-input v-model="queryParams.HModelNumber" placeholder="璇疯緭鍏ュ櫒鍏蜂唬鐮�" @keyup.enter.native="handleQuery" />
+ </el-form-item>
+ <el-form-item label="寰�鏉ュ崟浣�" prop="HSupName">
+ <el-input v-model="queryParams.HSupName" placeholder="璇疯緭鍏ュ線鏉ュ崟浣�" @keyup.enter.native="handleQuery" />
+ </el-form-item>
+ <div slot="header" class="clearfix"><span>杩囨护</span></div>
+ <div>
+ <el-row>
+ <el-form-item label-width="0">
+ <el-row>
+ <el-col :span="7">
+ <el-select v-model="queryParams.ColName1" placeholder="璇烽�夋嫨" @change="riqiChange">
+ <span v-for="(item, index) in btList" :key="index">
+ <el-option :label="item.field" :value="item.field" v-if="!item.hide"></el-option>
+ </span>
+ </el-select>
+ </el-col>
+ <el-col :span="6" style="padding: 0 10px;">
+ <el-select v-model="queryParams.Comparator1" placeholder="璇烽�夋嫨" @change="riqiChange">
+ <el-option v-for="(item, index) in comparatorList" :key="index" :label="item.label"
+ :value="item.value"></el-option>
+ </el-select>
+ </el-col>
+ <el-col :span="11">
+ <el-input v-model="queryParams.ColContent1" placeholder="璇疯緭鍏�" clearable
+ @keyup.enter.native="handleQuery" />
+ </el-col>
+ </el-row>
+ </el-form-item>
+ </el-row>
+ <el-row>
+ <el-form-item label-width="0">
+ <el-row>
+ <el-col :span="7">
+ <el-select v-model="queryParams.ColName2" placeholder="璇烽�夋嫨" @change="riqiChange">
+ <span v-for="(item, index) in btList" :key="index">
+ <el-option :label="item.field" :value="item.field" v-if="!item.hide"></el-option>
+ </span>
+ </el-select>
+ </el-col>
+ <el-col :span="6" style="padding: 0 10px;">
+ <el-select v-model="queryParams.Comparator2" placeholder="璇烽�夋嫨" @change="riqiChange">
+ <el-option v-for="(item, index) in comparatorList" :key="index" :label="item.label"
+ :value="item.value"></el-option>
+ </el-select>
+ </el-col>
+ <el-col :span="11">
+ <el-input v-model="queryParams.ColContent2" placeholder="璇疯緭鍏�" clearable
+ @keyup.enter.native="handleQuery" />
+ </el-col>
+ </el-row>
+ </el-form-item>
+ </el-row>
+ <el-form-item label-width="0">
+ <el-row>
+ <el-col :span="7">
+ <el-select v-model="queryParams.ColName" placeholder="璇烽�夋嫨" @change="riqiChange">
+ <el-option v-for="(item, index) in btList" :key="index" :label="item.field"
+ :value="item.field"></el-option>
+ </el-select>
+ </el-col>
+ <el-col :span="6" style="padding: 0 10px;">
+ <el-select v-model="queryParams.Comparator" placeholder="璇烽�夋嫨" @change="riqiChange">
+ <el-option v-for="(item, index) in comparatorList" :key="index" :label="item.label"
+ :value="item.value"></el-option>
+ </el-select>
+ </el-col>
+ <el-col :span="11">
+ <el-input v-model="queryParams.ColContent" placeholder="璇疯緭鍏�" clearable
+ @keyup.enter.native="handleQuery" />
+ </el-col>
+ </el-row>
+ </el-form-item>
+ </div>
+ </el-card>
+ </el-collapse-item>
+ </el-collapse>
+ </el-form>
+ <el-row :gutter="10" class="mb8" style="margin-top: 10px;">
+ <el-col :span="1.5">
+ <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAddEdit(OperationType = 1)"
+ id="btn-Add">鏂板</el-button>
+ </el-col>
+ <el-col :span="1.5">
+ <el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single"
+ @click="handleEdit(row = rowForm, OperationType = 2)">缂栬緫</el-button>
+ </el-col>
+ <el-col :span="1.5">
+ <el-button type="primary" icon="el-icon-document-copy" size="mini" :disabled="single"
+ @click="handleEdit(row = rowForm, OperationType = 1, copyType = 1)">澶嶅埗</el-button>
+ </el-col>
+ <el-col :span="1.5">
+ <el-button type="primary" icon="el-icon-delete" size="mini" :disabled="single" @click="handleDelete">鍒犻櫎
+ </el-button>
+ </el-col>
+ <el-col :span="1.5">
+ <el-button type="primary" icon="el-icon-edit-outline" size="mini" :disabled="single"
+ @click="set_CheckBill(1, form = rowForm)">瀹℃牳</el-button>
+ </el-col>
+ <el-col :span="1.5">
+ <el-button type="primary" icon="el-icon-edit-outline" size="mini" :disabled="single"
+ @click="set_CheckBill(2, form = rowForm)">杩斿鏍�</el-button>
+ </el-col>
+ <!-- <el-col :span="1.5">
+ <el-button type="primary" icon="el-icon-download" size="mini" @click="handleExport">瀵煎嚭</el-button>
+ </el-col> -->
+ <el-col :span="1.5">
+ <el-button type="primary" icon="el-icon-date" size="mini" @click="handleRowHide">闅愯棌鍒楄缃�</el-button>
+ </el-col>
+ <!-- <el-col :span="1.5">
+ <el-button type="primary" icon="el-icon-printer" size="mini" @click="get_PrintReport">鎵撳嵃</el-button>
+ </el-col> -->
+ </el-row>
+ <div class="tableBox" v-loading="loading">
+ <el-table :data="tableData" ref="tableData" max-height="710" :summary-method="getSummaries"
+ @selection-change="handleSelectionChange" show-summary border @row-click="handleRowClick" :row-style="rowStyle"
+ @cell-dblclick="handleDblclick" v-if="tableShow">
+ <template v-for="(item, index) in btList">
+ <el-table-column type="selection" width="55" align="center" :fixed="item.fixed" v-if="item.type == 'checkbox'"
+ :key="index" />
+ <el-table-column :align="item.align" :prop="item.field" :label="item.title" :width="item.width" :key="item.id"
+ v-else-if="!item.hide && item.type != 'checkbox'" :sortable="item.sort" show-overflow-tooltip
+ :fixed="item.fixed">
+ <template slot-scope="{row, column }">
+ <el-checkbox v-model="checked" v-if="item.type == 'checkbox'"></el-checkbox>
+ <div :style="item.style">
+ <span v-if="column.property.includes('鏃ユ湡')">{{ parseTime(row[column.property], '{y}-{m}-{d}') }}</span>
+ <el-button type="text" @click="handleEdit(row, OperationType = 2)"
+ v-else-if="column.property == '鍗曟嵁鍙�'">{{
+ row.鍗曟嵁鍙�
+ }}</el-button>
+ <span v-else>{{ row[column.label] }}</span>
+ </div>
+ </template>
+ </el-table-column>
+ </template>
+ </el-table>
+ <pagination v-show="total > 0" :total="total" :page.sync="page" :limit.sync="pageSize" :pageSizes="pageSizes" @pagination="getList" />
+ <el-dialog title="闅愯棌鍒楄缃�" :visible.sync="openRowHide" width="816px" append-to-body>
+ <RowSettings :colName="btResList" :HModName="HModName" @rowEditClose="rowSetClose"
+ v-if="rowHideShow" />
+ </el-dialog>
+ <!-- 缂栬緫 -->
+ <el-dialog title="缂栬緫鍣ㄥ叿璋冩嫧鐢宠鍗�" :visible.sync="openEdit" width="1480px" append-to-body class="xsckdBox" @close="close">
+ <edit :OperationType=OperationType :linterid=this.rowForm.hmainid :HSouceBillType=this.rowForm.HSourceBillType
+ :copyType="copyType" @editClose="editClose" v-if="editShow" />
+ </el-dialog>
+ <el-dialog title="鎵撳嵃妯℃澘閫夋嫨" :visible.sync="openPrintList" width="800px" append-to-body>
+ <PrintList :linterid=this.rowForm.hmainid :MyMsg=this.rowForm.hmainid :Type='HModName'
+ :HModName='HModName' @rowEditClose="rowSetClose" v-if="printListShow" />
+ <!-- <div>111</div> -->
+ </el-dialog>
+ </div>
+ </div>
+</template>
+
+<script>
+import axios from 'axios'
+import RowSettings from '@/views/component/rowSettings'
+import Edit from '@/views/scMould/warehouse/Sc_MouldMoveStockRequestBillEdit'
+import PrintList from '@/views/component/printList'
+import moment from 'moment';
+
+export default {
+ name: 'Sc_MouldMoveStockRequestBillList',
+ components: { RowSettings, Edit, PrintList },
+ data() {
+ return {
+ HModName: "Sc_MouldMoveStockRequestBillList",
+ activeSeach: '',
+ editShow: false,
+ openEdit: false,
+ totalNameList: [],
+ tableShow: true,
+ openPrintList: false,
+ printListShow: false,
+ openBtnHide: false,
+ btnHideShow: false,
+ rowHideShow: false,
+ openRowHide: false,
+ copyType: 0,
+ comparatorList: [
+ { label: '=', value: '=' },
+ { label: '>=', value: '>=' },
+ { label: '>', value: '>' },
+ { label: '<=', value: '<=' },
+ { label: '<', value: '<' },
+ { label: '<>', value: '<>' },
+ { label: '鍖呭惈', value: '7' },
+ { label: '宸﹀寘鍚�', value: '8' },
+ { label: '鍙冲寘鍚�', value: '9' },
+ { label: '涓嶅寘鍚�', value: '10' },
+ ],
+ sWhere: '',
+ sTime: '',
+ eTime: '',
+ rqsgList: [
+ { label: '浠婂ぉ', value: 0 },
+ { label: '杩戜袱澶�', value: 1 },
+ { label: '杩戜笁澶�', value: 2 },
+ { label: '杩戝洓澶�', value: 3 },
+ { label: '杩戜簲澶�', value: 4 },
+ { label: '杩戝叚澶�', value: 5 },
+ { label: '杩戜竷澶�', value: 6 },
+ { label: '杩�30澶�', value: 29 },
+ { label: '杩戝崐骞�', value: 180 },
+ { label: '杩戜竴骞�', value: 365 },
+ ],
+ organizationList: JSON.parse(sessionStorage.getItem('organizationList')),//缁勭粐鍒楄〃
+ HStatusList: [{name:'鍏ㄩ儴',value:'-1'},{name:'鏈鏍�',value:'0'},{name:'宸插鏍�',value:'1'},{name:'宸插叧闂�',value:'2'}],
+ addBtnShow: false,
+ dialogTitle: '',
+ OperationType: null,//淇濆瓨绫诲瀷锛堟柊澧�1淇敼2锛�
+ HInterID: null,
+ baseURL: process.env.VUE_APP_BASE_API,
+ lastSelectedRowIndex: null, // 鐢ㄤ簬璁板綍涓婃鐐瑰嚮鐨勮绱㈠紩
+ lastSelectedRow: null, // 涓婁竴娆￠�変腑鐨勮
+ selectedRow: null, // 褰撳墠閫変腑鐨勮
+ rowForm: {},
+ // 寮瑰嚭灞傛爣棰�
+ title: "",
+ // 鏄惁鏄剧ず寮瑰嚭灞�
+ open: false,
+ // 鏌ヨ鍙傛暟
+ queryParams: {
+ HBillNo: '',
+ HInitTimeCycle: 29,
+ HStockOutOrgID: sessionStorage["OrganizationID"] - 0,
+ HStatus:'-1',
+ HDept:'',
+ HModelNumber:'',
+ HSupName:'',
+ ColName1: '',
+ ColName2: '',
+ ColName: '',
+ Comparator1: '',
+ Comparator2: '',
+ Comparator: '',
+ ColContent1: '',
+ ColContent2: '',
+ ColContent: '',
+ },
+ // 閫変腑鏁扮粍
+ ids: [],
+ // 闈炲崟涓鐢�
+ single: true,
+ // 闈炲涓鐢�
+ multiple: true,
+ // 閬僵灞�
+ loading: true,
+ tyResList: [],//鍒楄〃锛堟帴鍙ｆ暟鎹級
+ btList: [],//琛ㄥご鍒楄〃鏄剧ず
+ btResList: [],
+ tableData: [],//鍒楄〃(鍒嗛〉鏄剧ず)
+ dataList: [],
+ titleData: [],//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ pageSizes: [50, 100, 500, 5000, 50000],
+ page: 1,
+ pageSize: 0,
+ total: 0,
+ };
+ },
+ created() {
+ // this.fetchData()
+ this.riqiChange()
+ this.getList();
+ },
+
+ methods: {
+ getSummaries(param) {
+ const { columns, data } = param;
+ const sums = [];
+ columns.forEach((column, index) => {
+ if (index === 0) {
+ sums[index] = '鍚堣';
+ return;
+ }
+ const values = data.map(item => Number(item[column.property]));
+ if (this.totalNameList[index].totalRow) {
+ if (!values.every(value => isNaN(value))) {
+ sums[index] = values.reduce((prev, curr) => {
+ const value = Number(curr);
+ if (!isNaN(value)) {
+ return prev + curr;
+ } else {
+ return prev;
+ }
+ }, 0)
+
+ } else {
+ sums[index] = '';
+ }
+ }
+ }, 1000);
+ return sums;
+ },
+
+ handleBtnHide() {
+ this.btnHideShow = true
+ this.openBtnHide = true
+ },
+ handleRowHide() {
+ this.rowHideShow = true
+ this.openRowHide = true
+ },
+ rowSetClose(val) {
+ this.rowHideShow = false
+ this.tableShow = true
+ this.openRowHide = val
+ this.getList()
+ },
+ riqiChange() {
+ const end = new Date();
+ const start = new Date();
+ start.setTime(start.getTime() - 3600 * 1000 * 24 * this.queryParams.HInitTimeCycle);
+ const yyyyS = start.getFullYear();
+ const mmS = String(start.getMonth() + 1).padStart(2, '0'); // 鏈堜唤鏄粠0寮�濮嬬殑
+ const ddS = String(start.getDate()).padStart(2, '0');
+ const yyyyE = end.getFullYear();
+ const mmE = String(end.getMonth() + 1).padStart(2, '0'); // 鏈堜唤鏄粠0寮�濮嬬殑
+ const ddE = String(end.getDate()).padStart(2, '0');
+ this.sTime = yyyyS + '-' + mmS + '-' + ddS
+ this.eTime = yyyyE + '-' + mmE + '-' + ddE
+ },
+ getList() {
+ this.pageSize = 50
+ this.tableShow = false
+ this.loading = true
+ if (this.sTime && !this.sWhere) {
+ this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.sTime + "'"
+ this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + this.eTime + "'"
+ }
+ this.sWhere += " and HSTOCKORGID=" + this.queryParams.HStockOutOrgID;
+ if (this.pageSize == 0) {
+ this.pageSize = 50
+ }
+ // 閿�鍞嚭搴撳崟鍒楄〃
+ axios.get(this.baseURL + '/Sc_MouldMoveStockRequestBillController/page', {
+ params: {
+ "sWhere": this.sWhere,
+ "user": sessionStorage["HUserName"],
+ "page": this.page,
+ "size": this.pageSize
+ },
+ }).then(response => {
+ this.tyResList = response.data.data//鎬绘暟鎹�
+ let data1 = response.data
+ let option = []
+ if (data1.code == 1) {
+ this.btResList = data1.list//閿�鍞嚭搴撳崟鎺ュ彛琛ㄥご鏁版嵁
+ this.total = data1.count;
+ var data = [];//鍒楀瓧娈垫暟鎹�
+ var col = [];
+ var totalArray = ["浠舵暟"];
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in data1.list) {//寰簭閬嶅巻鏁扮粍
+ data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });//浠庢瘡涓璞′腑鎻愬彇鏁版嵁
+ //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+ var patrn = new RegExp(/^h/i);
+ if (patrn.test(data1.list[key].ColmCols)) {
+ this.titleData[key] = data1.list[key].ColmCols;
+ }
+ }
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
+ for (var i = 0; i < data.length; i++) {//閬嶅巻data鏁扮粍閲嶇殑鏁版嵁
+ if (this.titleData.indexOf(data[i].name) > -1) {//妫�鏌ata銆恑銆�.name鏄惁鍦ㄦ暟缁勪腑 //璁＄畻鍒�
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+ } else if (totalArray.indexOf(data[i].name) > -1 || (data[i].Type == "Decimal" || data[i].Type == "Int32")) { //璁＄畻鍒�
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
+ }
+ else {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+ }
+
+ }
+ option.cols = [col]
+ option.data = data1.data
+ this.dataList = option
+ this.DisPlay_HideColumn(this.HModName, sessionStorage["HUserName"], option, this.dataList);
+ }
+ }).catch(error => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ },
+ DisPlay_HideColumn(HModName, user, option, dataOption) {
+ this.totalNameList = []
+ axios.get(this.baseURL + '/Xt_grdAlignment_WMES/grdAlignmentWMESList', {
+ params: {
+ "HModName": HModName,
+ "user": user,
+ },
+ }).then(res => {
+ let data1 = res.data
+ if (data1.data.length != 0) {
+ var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+ var newCols = [[]];//瀵瑰簲鏁版嵁搴撳垪椤哄簭col
+ newCols[0].push(option.cols[0][0]);//鏀惧叆绗竴涓猚heckbox
+ dataCol = data1.data[0].HGridString.split(',');
+ //鍒楄缃垪鏁颁笌椤甸潰鍒楁暟鏄惁涓�鑷�
+ if (dataCol.length == option.cols[0].length - 1) {
+ //閬嶅巻瀵绘壘鍒楄缃搴斿垪鎸夐『搴忔彃鍏�
+ for (var j = 0; j < option.cols[0].length - 1; j++) {
+ for (var i = 0; i < option.cols[0].length - 1; i++) {
+ var dataCols = dataCol[j].split('|');
+ //閫夋嫨涓巇atacols鐩稿簲鍒楄繘琛屼慨鏀�
+ if (option.cols[0][i + 1]["field"] == dataCols[5]) {
+ //闅愯棌鍒�
+ if (dataCols[1] == 1) {
+ option.cols[0][i + 1]["hide"] = true;
+ }
+ //璁剧疆鍒楀
+ if (dataCols[3] > 0) {
+ option.cols[0][i + 1]["width"] = dataCols[3];
+ }
+ //璁剧疆鍐呭瀛椾綋澶у皬
+ if (data1.data[0].HFontSize != 0) {
+ option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+ } else {
+ option.cols[0][i + 1]["style"] = "font-size:100%";
+ }
+ //鏄剧ず鍒�
+ if (dataCols[1] == 0 && this.titleData.indexOf(option.cols[0][i + 1]["title"]) == -1) {
+ option.cols[0][i + 1]["hide"] = false;
+ }
+ //缁熻鍒�
+ if (dataCols[6] == 1) {
+ option.cols[0][i + 1]["totalRow"] = true;
+ } else {
+ option.cols[0][i + 1]["totalRow"] = false;
+ }
+ //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+ switch (dataCols[2]) {
+ case "L":
+ option.cols[0][i + 1]["align"] = "left";
+ break;
+ case "M":
+ option.cols[0][i + 1]["align"] = "center";
+ break;
+ case "R":
+ option.cols[0][i + 1]["align"] = "right";
+ break;
+ }
+ //璁剧疆琛ㄦ牸title灞炴�ф樉绀哄埆鍚�
+ if (dataCols[4] != null && dataCols[4] != "") {
+ option.cols[0][i + 1]["title"] = dataCols[4];
+ }
+ newCols[0].push(option.cols[0][i + 1]);
+ break;
+ }
+ }
+ }
+ //閬嶅巻寰幆鍚庡垽鏂搴斿垪鏁版槸鍚︿竴鑷�
+ if (dataCol.length == newCols[0].length - 1) {
+ option.cols = newCols;
+ //鍙栨秷鍐荤粨鍒�
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ if (option.cols[0][i + 1]["fixed"] != null) {
+ option.cols[0][i + 1]["fixed"] = null;
+ }
+ else {
+ break;
+ }
+ }
+ //鍐荤粨鍒�
+ if (data1.data[0].HFixCols != 0) {
+ for (var i = 0; i < data1.data[0].HFixCols; i++) {
+ if (dataOption.cols[0].indexOf(option.cols[0][i + 1]["title"]) != -1) {
+ data1.data[0].HFixCols += 1;
+ }
+
+ option.cols[0][i + 1]["fixed"] = "left";
+ }
+ }
+ //璁剧疆鍒楁帓搴�
+ for (var i = 1; i < option.cols[0].length; i++) {
+ if (data1.data[0].HSortFlag == "鏄�") {
+ option.cols[0][i]["sort"] = true;
+ }
+ else {
+ option.cols[0][i]["sort"] = false;
+ }
+ }
+ }
+ }
+ this.btList = option.cols[0]
+ this.btList.map(item => {
+ if (!item.hide) {
+ this.totalNameList.push(item)
+ }
+ })
+ if (data1.data[0].HPageSize == 0) {
+ this.pageSize = 50
+ } else {
+ this.pageSize = data1.data[0].HPageSize
+ }
+ this.tableData = option.data
+ this.tableShow = true
+ this.loading = false
+ } else {
+ this.btList = dataOption.cols[0]
+ this.btList.map(item => {
+ if (!item.hide) {
+ this.totalNameList.push(item)
+ }
+ })
+ this.tableData = dataOption.data
+ this.tableShow = true
+ this.loading = false
+ }
+ }).catch(error => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ },
+ renderHeader(h, { column, $index }) {// 鏂板缓涓�涓� span
+ let span = document.createElement(span)// 璁剧疆琛ㄥご鍚嶇О
+ span.innerText = column.label
+ //涓存椂鎻掑叆 document
+ document.body.appendChild(span)// 閲嶇偣:鑾峰彇 span 鏈�灏忓搴︼紝璁剧疆褰撳墠鍒楋紝娉ㄦ剰杩欓噷鍔犱簡 20锛屽瓧娈佃緝澶氭椂column.minWidth=span.getBoundingClientRect().width + 50.//绉婚櫎 document 涓复鏃剁殑 span
+ document.body.removeChild(span)
+ return h(span, column.label)
+ },
+ //鐐瑰嚮琛�
+ handleRowClick(row, column, event) {
+ this.lastSelectedRow = this.selectedRow; // 璁板綍涓婁竴娆￠�変腑鐨勮
+ this.selectedRow = row; // 璁板綍褰撳墠閫変腑鐨勮
+ this.lastSelectedRowIndex = this.tableData.indexOf(row);
+ this.$refs.tableData.toggleRowSelection(row);
+ },
+ //閫変腑琛岄珮浜牱寮�
+ rowStyle({ row, rowIndex }) {
+ if (this.ids.includes(row.hmainid)) {
+ return { "background": "#ecf5ff" }
+ }
+ },
+ //鍙屽嚮琛�
+ handleDblclick(row, column, cell, event) {
+ this.OperationType = 2
+ this.handleEdit()
+ },
+ // 澶氶�夋閫変腑鏁版嵁
+ handleSelectionChange(selection) {
+ // this.rowForm = {}
+ this.ids = selection.map(item => item.hmainid)
+ this.single = selection.length != 1
+ this.multiple = !selection.length
+ if (!this.single) {
+ this.rowForm = selection[0]
+ }
+ },
+ /** 鎼滅储鎸夐挳鎿嶄綔 */
+ handleQuery() {
+ this.sWhere = ''
+ if (this.queryParams.ColName && this.queryParams.Comparator) {
+ var com = "";
+ switch (this.queryParams.Comparator) {
+ case "7":
+ com = "like'%" + this.queryParams.ColContent + "%'";
+ break;
+ case "8":
+ com = "like'%" + this.queryParams.ColContent + "'";
+ break;
+ case "9":
+ com = "like'" + this.queryParams.ColContent + "%'";
+ break;
+ case "10":
+ com = "not like'%" + this.queryParams.ColContent + "%'";
+ break;
+ default:
+ com = "" + this.queryParams.Comparator + "'" + this.queryParams.ColContent + "'";
+ break;
+ }
+ this.sWhere += " and " + this.queryParams.ColName + " " + com;
+ }
+ if (this.queryParams.ColName1 && this.queryParams.Comparator1) {
+ var com1 = "";
+ switch (this.queryParams.Comparator1) {
+ case "7":
+ com1 = "like'%" + this.queryParams.ColContent1 + "%'";
+ break;
+ case "8":
+ com1 = "like'%" + this.queryParams.ColContent1 + "'";
+ break;
+ case "9":
+ com1 = "like'" + this.queryParams.ColContent1 + "%'";
+ break;
+ case "10":
+ com1 = "not like'%" + this.queryParams.ColContent1 + "%'";
+ break;
+ default:
+ com1 = "" + this.queryParams.Comparator1 + "'" + this.queryParams.ColContent1 + "'";
+ break;
+ }
+ this.sWhere += " and " + this.queryParams.ColName1 + " " + com1;
+ }
+ if (this.queryParams.ColName2 && this.queryParams.Comparator2) {
+ var com2 = "";
+ switch (this.queryParams.Comparator2) {
+ case "7":
+ com2 = "like'%" + this.queryParams.ColContent2 + "%'";
+ break;
+ case "8":
+ com2 = "like'%" + this.queryParams.ColContent2 + "'";
+ break;
+ case "9":
+ com2 = "like'" + this.queryParams.ColContent2 + "%'";
+ break;
+ case "10":
+ com2 = "not like'%" + this.queryParams.ColContent2 + "%'";
+ break;
+ default:
+ com2 = "" + this.queryParams.Comparator + "'" + this.queryParams.ColContent + "'";
+ break;
+ }
+ this.sWhere += " and " + this.queryParams.ColName2 + " " + com2;
+ }
+ if (this.sTime) {
+ this.sTime = moment(this.sTime).format('YYYY-MM-DD')
+ this.eTime = moment(this.eTime).format('YYYY-MM-DD')
+ console.log(this.sTime, this.eTime)
+ this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.sTime + "'" + " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + this.eTime + "'";
+ }
+
+ if (this.queryParams.HBillNo) {
+ this.sWhere += " and 鍗曟嵁鍙� like '%" + this.queryParams.HBillNo + "%'";
+ }
+ if (this.queryParams.HDept) {
+ sWhere += " and 閮ㄩ棬 like '%" + this.queryParams.HDept + "%'";
+ }
+ if (this.queryParams.HMaterNumber) {
+ sWhere += " and 鐗╂枡浠ｇ爜 like '%" + this.queryParams.HMaterNumber + "%'";
+ }
+ if (this.queryParams.HModelNumber) {
+ sWhere += " and 妯″叿浠ｇ爜 like '%" + this.queryParams.HModelNumber + "%'";
+ }
+ if (this.queryParams.HSupName) {
+ sWhere += " and 寰�鏉ュ崟浣� like '%" + this.queryParams.HSupName + "%'";
+ }
+ this.getList()
+ },
+ /** 閲嶇疆鎸夐挳鎿嶄綔 */
+ resetQuery() {
+ this.sWhere = ''
+ this.queryParams = {
+ HBillNo: '',
+ HInitTimeCycle: 29,
+ HStockOutOrgID: sessionStorage["OrganizationID"] - 0,
+ HStatus:'-1',
+ HDept:'',
+ HModelNumber:'',
+ HSupName:'',
+ ColName1: '',
+ ColName2: '',
+ ColName: '',
+ Comparator1: '',
+ Comparator2: '',
+ Comparator: '',
+ ColContent1: '',
+ ColContent2: '',
+ ColContent: '',
+ }
+ this.riqiChange()
+ this.resetForm("queryForm")
+ this.getList()
+ },
+
+ //閫�鍑�
+ close() {
+ // this.reset()
+ this.tableShow = true
+ this.openEdit = false
+ this.editShow = false
+ this.getList()
+ },
+ //鎵撳紑鏂板缁勪欢寮圭獥
+ handleAddEdit() {
+ this.rowForm.hmainid = 0
+ this.editShow = true
+ this.openEdit = true
+ },
+ //鎵撳紑淇敼缁勪欢寮圭獥
+ handleEdit(row) {
+ this.rowForm = row
+ this.editShow = true
+ this.openEdit = true
+ },
+ //鍏抽棴缂栬緫椤甸潰
+ editClose(val) {
+ this.open = val
+ this.editShow = false
+ this.openEdit = val
+ this.getList()
+ },
+ /** 鍒犻櫎鎸夐挳鎿嶄綔 */
+ handleDelete() {
+ this.$modal.confirm('纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠').then(() => {
+ axios.get(this.baseURL + "/Sc_MouldMoveStockRequestBillController/GetSc_MouldMoveStockRequestBill_Delete_Json", {
+ params: { 'HInterID': this.rowForm.hmainid.toString(), 'HMaker': sessionStorage["HUserName"] }
+ }).then(response => {
+ if (response.data.count == 1) {
+ this.getList()
+ this.$modal.msgSuccess("鍒犻櫎鎴愬姛")
+ } else {
+ this.$modal.msgError("閿欒:" + result.code + result.Message);
+ }
+ }).catch(error => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ }).catch(() => { })
+ },
+ // 鍙嶅鏍�/瀹℃牳鏁版嵁
+ set_CheckBill(num, form) {
+ var InterID = form.hmainid || form.HInterID
+ //閫昏緫瀹℃牳鏂规硶
+ axios.get(this.baseURL + "/Sc_MouldMoveStockRequestBillController/GetSc_MouldMoveStockRequestBill_Check_Json", {
+ params: { "HInterID": InterID, "Type": num, "HMaker": sessionStorage["HUserName"] }
+ }).then(response => {
+ let result = response.data
+ if (result.count == 1) {
+ this.$modal.msgSuccess('鎿嶄綔鎴愬姛');
+ this.getList();
+ }
+ else {
+ this.$modal.msgError("閿欒:" + result.code + result.Message,);
+ }
+ }).catch(error => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ },
+ //瀵煎嚭
+ handleExport() {
+ const ws = this.$XLSX.utils.json_to_sheet(this.tyResList); // 灏嗘暟鎹浆鎹负宸ヤ綔琛�
+ const wb = this.$XLSX.utils.book_new(); // 鍒涘缓涓�涓柊鐨勫伐浣滅翱
+ this.$XLSX.utils.book_append_sheet(wb, ws, "Sheet1"); // 灏嗗伐浣滆〃娣诲姞鍒板伐浣滅翱涓紝骞跺懡鍚嶄负"Sheet1"
+ this.$XLSX.writeFile(wb, `sellOutBill_${new Date().getTime()}.xlsx`); // 瀵煎嚭鏂囦欢
+ },
+ //鎵撳嵃
+ get_PrintReport() {
+ if (this.ids.length != 1) {
+ this.$modal.msgError("璇烽�夋嫨涓�琛屾暟鎹�")
+ } else if (this.rowForm.鐘舵�� != "宸插鏍�" && !this.defaintOperationByCompanyName()) {
+ this.$modal.msgError("鎵撳嵃澶辫触!鍘熷洜锛氬崟鎹姸鎬佷笉涓�'宸插鏍�'鐘舵��!!");
+ } else {
+ axios.get(this.baseURL + "/Kf_SellOutBill/CheckSellOutBill_IsExist", {
+ params: { "HInterID": this.rowForm.hmainid }
+ }).then(response => {
+ var result = response.data
+ if (result.count == 1) {
+ this.printListShow = true
+ this.openPrintList = true
+ // this.$router.push({ path:'/printList', query: { linterid: this.rowForm.hmainid,MyMsg:this.rowForm.hmainid,Type:'Kf_SellOutBillList' }})
+ } else {
+ this.$modal.msgError(result.code + result.Message)
+ }
+ }).catch(error => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+
+
+ }
+ // var content= ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + data[0].hmainid.toString() + '&MyMsg=' + data[0].hmainid.toString() + '&Type=Kf_SellOutBillList', 'yes']
+ },
+
+ //#region 鑾峰彇鍏徃鍚嶏紝鏍规嵁鍏徃杩涜瀹氬埗鍖栧紑鍙�
+ defaintOperationByCompanyName() {
+ var result = false;
+ axios.get(this.baseURL + '/Xt_getInfo/getCompanyName').then(response => {
+ var data1 = response.data
+ if (data1.count == 1) {
+ if (data1.data == "姘村姟") {
+ result = true;
+ }
+ }
+ }).catch(error => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ return result;
+ },
+ }
+};
+</script>
+<style>
+.xsckdBox .el-date-editor.el-input {
+ width: 100%;
+}
+</style>
diff --git a/src/views/scMould/warehouse/Sc_MouldProdBackBillEdit.vue b/src/views/scMould/warehouse/Sc_MouldProdBackBillEdit.vue
index 7731239..8610292 100644
--- a/src/views/scMould/warehouse/Sc_MouldProdBackBillEdit.vue
+++ b/src/views/scMould/warehouse/Sc_MouldProdBackBillEdit.vue
@@ -3,18 +3,18 @@
<div style=" margin-bottom: 10px; border-bottom: 1px solid #f6f6f6;">
<el-button type="primary" @click="handleAdd(OperationType = 1)" v-if="addBtnShow">鏂板</el-button>
<el-button type="primary" @click="submitForm" :disabled="subDisabled">淇� 瀛�</el-button>
- <el-button type="primary" @click="set_CheckBill(0, form)">瀹� 鏍�</el-button>
+ <el-button type="primary" @click="set_CheckBill(1, form)">瀹� 鏍�</el-button>
<el-button type="primary" @click="close">閫� 鍑�</el-button>
<!-- <el-button @click="cancel">鍙� 娑�</el-button> -->
</div>
- <div style="margin: 10px; font-size: 28px; font-weight: bold; text-align: center;">閿�鍞嚭搴撳崟</div>
- <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+ <div style="margin: 10px; font-size: 28px; font-weight: bold; text-align: center;">鍣ㄥ叿棰嗙敤閫�搴撳崟</div>
+ <el-form ref="form" :model="form" :rules="rules" label-width="90px">
<el-tabs v-model="activeName" type="card">
<el-tab-pane label="鍩烘湰淇℃伅" name="first">
<el-row>
<el-col :span="6">
- <el-form-item label="鍗曟嵁缂栧彿" prop="HBillNo">
- <el-input v-model="form.HBillNo" placeholder="璇疯緭鍏ュ崟鎹紪鍙�" />
+ <el-form-item label="鍗曟嵁鍙�" prop="HBillNo">
+ <el-input v-model="form.HBillNo" placeholder="璇疯緭鍏ュ崟鎹彿" />
</el-form-item>
</el-col>
<el-col :span="6">
@@ -24,158 +24,80 @@
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="婧愬崟绫诲瀷" prop="BillType">
- <el-select v-model="form.BillType" placeholder="璇烽�夋嫨">
- <el-option label="閿�鍞鍗�" value="1401" />
- <el-option label="鍙戣揣閫氱煡鍗�" value="1402" />
- </el-select>
+ <el-form-item label="鍐呴儴鍗曟嵁鍙�" prop="HInnerBillNo">
+ <el-input v-model="form.HInnerBillNo" placeholder="璇疯緭鍏ュ唴閮ㄥ崟鎹彿" />
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="婧愬崟鍙�" prop="HMainSourceBillNo">
- <el-input v-model="form.HMainSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞彿" disabled>
- <el-button slot="append" icon="el-icon-search"></el-button>
+ <el-form-item label="鍣ㄥ叿浠撳簱" prop="HWHName">
+ <el-input v-model="form.HWHName" placeholder="璇烽�夋嫨鍣ㄥ叿浠撳簱" disabled>
+ <el-button slot="append" icon="el-icon-search" @click="openDataDialog(2,eHWHType=1)"></el-button>
</el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
- <el-form-item label="閿�鍞憳" prop="HEmpName">
- <el-input v-model="form.HEmpName" placeholder="璇疯緭鍏ラ攢鍞憳" disabled>
- <el-button slot="append" icon="el-icon-search" @click="openDataDialog(4)"></el-button>
+ <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,empType=1)"></el-button>
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="閿�鍞儴闂�" prop="HDeptName">
- <el-input v-model="form.HDeptName" placeholder="璇疯緭鍏ラ攢鍞儴闂�" disabled>
- <el-button slot="append" icon="el-icon-search" @click="openDataDialog(1)"></el-button>
+ <el-form-item label="淇濈鍛�" prop="HKeeperName">
+ <el-input v-model="form.HKeeperName" placeholder="璇烽�夋嫨淇濈鍛�" disabled>
+ <el-button slot="append" icon="el-icon-search" @click="openDataDialog(4,empType=2)"></el-button>
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="涓荤" prop="HManagerName">
- <el-input v-model="form.HManagerName" placeholder="璇疯緭鍏ヤ富绠�" disabled>
- <el-button slot="append" icon="el-icon-search"></el-button>
- </el-input>
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="瀹㈡埛" prop="HSupName">
- <el-input v-model="form.HSupName" placeholder="璇疯緭鍏ュ鎴�" disabled>
- <el-button slot="append" icon="el-icon-search"></el-button>
+ <el-form-item label="閮ㄩ棬" prop="HDeptName">
+ <el-input v-model="form.HDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" disabled>
+ <el-button slot="append" icon="el-icon-search" @click="openDataDialog(1,deptType=1)"></el-button>
</el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
- <el-form-item label="鑱旂郴浜�" prop="HLinkMan">
- <el-input v-model="form.HLinkMan" placeholder="璇疯緭鍏ヨ仈绯讳汉" disabled />
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="鑱旂郴鐢佃瘽" prop="HLinkPhone">
- <el-input v-model="form.HLinkPhone" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" disabled />
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="棰嗘枡浜�" prop="HSecManagerName">
- <el-input v-model="form.HSecManagerName" placeholder="璇疯緭鍏ラ鏂欎汉">
- <el-button slot="append" icon="el-icon-search"></el-button>
- </el-input>
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="浠撶" prop="HKeeperName">
- <el-input v-model="form.HKeeperName" placeholder="璇疯緭鍏ヤ粨绠�">
- <el-button slot="append" icon="el-icon-search"></el-button>
- </el-input>
- </el-form-item>
- </el-col>
- </el-row>
- <el-form-item label="澶囨敞" prop="HRemark">
- <el-input v-model="form.HRemark" placeholder="璇疯緭鍏ュ娉�" />
- </el-form-item>
- <el-row>
- <el-col :span="6">
- <el-form-item label="椤圭洰浠ｇ爜" prop="HProjectNumber">
- <el-input v-model="form.HProjectNumber" placeholder="璇疯緭鍏ラ」鐩唬鐮�" disabled>
- <el-button slot="append" icon="el-icon-search"></el-button>
-
- </el-input>
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="椤圭洰鍚嶇О" prop="HProjectName">
- <el-input v-model="form.HProjectName" placeholder="璇疯緭鍏ラ」鐩悕绉�" disabled />
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="鐝粍" prop="HGroupName">
- <el-input v-model="form.HGroupName" placeholder="璇疯緭鍏ョ彮缁�" disabled>
- <el-button slot="append" icon="el-icon-search"></el-button>
- </el-input>
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="鍑哄簱浠撳簱" prop="HWHName">
- <el-input v-model="form.HWHName" placeholder="璇疯緭鍏ュ嚭搴撲粨搴�">
- <el-button slot="append" icon="el-icon-search"></el-button>
- </el-input>
- </el-form-item>
- </el-col>
- </el-row>
- </el-tab-pane>
- <el-tab-pane label="鍏朵粬淇℃伅" name="second">
- <el-row>
- <el-col :span="6">
- <el-form-item label="缁勭粐" prop="HOrgID">
- <el-select v-model="form.HOrgID" placeholder="璇烽�夋嫨缁勭粐" @change="organizationChange" :disabled="zzSelDis">
- <el-option v-for="(item, index) in organizationList" :key="index" :label="item.Name" :value="item.ID">
+ <el-form-item label="寰�鏉ョ被鍨�" prop="HSupTypeID">
+ <el-select v-model="form.HSupTypeID" placeholder="璇烽�夋嫨寰�鏉ョ被鍨�">
+ <el-option v-for="(item, index) in hSupTypeList" :key="index" :label="item.name" :value="item.id">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="甯佸埆" prop="HCurName">
- <el-input v-model="form.HCurName" placeholder="璇疯緭鍏ュ竵鍒�" disabled />
+ <el-form-item label="寰�鏉ュ崟浣�" prop="HSupName">
+ <el-input v-model="form.HSupName" placeholder="璇烽�夋嫨寰�鏉ュ崟浣�" disabled>
+ <el-button slot="append" icon="el-icon-search" @click="openDataDialogChoose()"></el-button>
+ </el-input>
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="姹囩巼" prop="HExRate">
- <el-input v-model="form.HExRate" placeholder="璇疯緭鍏ユ眹鐜�" disabled />
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="閿�鍞柟寮�" prop="HSellSName">
- <el-input v-model="form.HSellSName" placeholder="璇疯緭鍏ラ攢鍞柟寮�" disabled />
- </el-form-item>
- </el-col>
- </el-row>
- <el-row>
- <el-col :span="6">
- <el-form-item label="鍗曚环绫诲瀷" prop="HPriceType">
- <el-select v-model="form.HPriceType" placeholder="璇烽�夋嫨鍗曚环绫诲瀷" @change="organizationChange">
- <el-option v-for="(item, index) in hPriceTypeList" :key="index" :label="item" :value="item">
- </el-option>
+ <el-form-item label="婧愬崟绫诲瀷" prop="HSourceBillType">
+ <el-select v-model="form.HSourceBillType" placeholder="璇烽�夋嫨">
+ <el-option label="鐢熶骇浠诲姟鍗�" value="鐢熶骇浠诲姟鍗�" />
+ <el-option label="鎵嬪伐褰曞叆" value="鎵嬪伐褰曞叆" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="瀹㈡埛浣欓" prop="HCusBalance">
- <el-input v-model="form.HCusBalance" placeholder="璇疯緭鍏ュ鎴蜂綑棰�" disabled />
+ <el-form-item label="閫夊崟鍙�" prop="XDH">
+ <el-input v-model="form.XDH" placeholder="璇疯緭鍏ラ�夊崟鍙�" />
</el-form-item>
</el-col>
- <el-col :span="6">
- <el-form-item label="淇＄敤棰濆害" prop="HCreditRating_Now">
- <el-input v-model="form.HCreditRating_Now" placeholder="璇疯緭鍏ヤ俊鐢ㄩ搴�" disabled />
+ </el-row>
+ <el-row>
+ <el-col :span="12">
+ <el-form-item label="鎽樿" prop="HExplanation">
+ <el-input v-model="form.HExplanation" placeholder="璇疯緭鍏ユ憳瑕�" />
</el-form-item>
</el-col>
- <el-col :span="6">
- <el-form-item label="鍙敤棰濆害" prop="HAvailableBalance">
- <el-input v-model="form.HAvailableBalance" placeholder="璇疯緭鍏ュ彲鐢ㄩ搴�" disabled />
+ <el-col :span="12">
+ <el-form-item label="澶囨敞" prop="HRemark">
+ <el-input v-model="form.HRemark" placeholder="璇疯緭鍏ュ娉�" />
</el-form-item>
</el-col>
</el-row>
@@ -246,113 +168,159 @@
</el-row>
</el-tab-pane>
</el-tabs>
- <div style="margin-bottom: 10px;">
- <el-button type="success" plain icon="el-icon-plus" @click="handleAddSysZb()" size="mini">澧炲姞涓�琛�</el-button>
- <el-button type="success" plain icon="el-icon-plus" @click="handleAddSysZb(zbIndex, 1)"
- size="mini">鎻掑叆涓�琛�</el-button>
- <el-button type="success" plain icon="el-icon-plus" @click="handleCopyZbRow" size="mini">澶嶅埗涓�琛�</el-button>
- <el-button type="success" plain icon="el-icon-arrow-up" @click="handleMoveRowUp(zbSelForm)"
- size="mini">涓婄Щ</el-button>
- <el-button type="success" plain icon="el-icon-arrow-down" @click="handleMoveRowDown(zbSelForm)"
- size="mini">涓嬬Щ</el-button>
- </div>
- <el-table :data="editData" style="width: 100%" height="300" width="100%" ref="zbTable"
- @selection-change="handleTableZbEdit" :row-class-name="rowSysZbIndex" show-summary border>
- <el-table-column type="selection" width="55" align="center" />
- <el-table-column align="center" label="搴忓彿" type="index" width="80" />
- <el-table-column align="center" label="鐗╂枡缂栫爜" width="120">
- <template slot-scope="scope">
- <el-input v-model="scope.row.鐗╂枡浠ｇ爜" placeholder="璇疯緭鍏ョ墿鏂欑紪鐮�" @keyup.native.f7="openDataDialog(3, scope.row)"
- @dblclick.native="openDataDialog(3, scope.row)" />
- </template>
- </el-table-column>
- <el-table-column align="center" label="鐗╂枡鍚嶇О" width="120">
- <template slot-scope="scope">
- <span>{{ scope.row.鐗╂枡鍚嶇О }}</span>
- </template>
- </el-table-column>
- <el-table-column align="center" label="瑙勬牸鍨嬪彿" width="120">
- <template slot-scope="scope">
- <span>{{ scope.row.瑙勬牸鍨嬪彿 }}</span>
- </template>
- </el-table-column>
- <el-table-column align="center" label="璁￠噺鍗曚綅" width="120">
- <template slot-scope="scope">
- <span>{{ scope.row.璁￠噺鍗曚綅 }}</span>
- </template>
- </el-table-column>
- <el-table-column align="center" label="瀹炲彂鏁伴噺" width="120">
- <template slot-scope="scope">
- <el-input-number v-model="scope.row.HQty" :min="1" style="width: 90px;"
- controls-position="right"></el-input-number>
- </template>
- </el-table-column>
- <el-table-column align="center" label="鍗曚环" width="120">
- <template slot-scope="scope">
- <el-input-number v-model="scope.row.HPrice" :min="0" style="width: 90px;"
- controls-position="right"></el-input-number>
- </template>
- </el-table-column>
- <el-table-column align="center" label="鍚◣鍗曚环" width="120">
- <template slot-scope="scope">
- <span>{{ scope.row.HTaxPrice }}</span>
- </template>
- </el-table-column>
- <el-table-column align="center" label="绋庣巼" width="120">
- <template slot-scope="scope">
- <span>{{ scope.row.HTaxRate }}</span>
- </template>
- </el-table-column>
- <el-table-column align="center" label="閲戦" width="120">
- <template slot-scope="scope">
- <span>{{ scope.row.HPrice * scope.row.HQty }}</span>
- </template>
- </el-table-column>
- <el-table-column align="center" label="浠风◣鍚堣" width="120">
- <template slot-scope="scope">
- <span>{{ scope.row.HTaxPrice * scope.row.HQty }}</span>
- </template>
- </el-table-column>
- <el-table-column align="center" label="鍙戣揣浠撳簱" width="120">
- <template slot-scope="scope">
- <el-input v-model="scope.row.鍙戣揣浠撳簱" placeholder="璇疯緭鍏ュ彂璐т粨搴�" @keyup.native.f7="openDataDialog(2, scope.row)"
- @dblclick.native="openDataDialog(2, scope.row)" />
- </template>
- </el-table-column>
- <el-table-column align="center" label="澶囨敞" width="120">
- <template slot-scope="scope">
- <el-input v-model="scope.row.HRemark" placeholder="璇疯緭鍏ュ娉�" />
- </template>
- </el-table-column>
- <el-table-column align="center" label="閲囪喘鏁伴噺" width="120">
- <template slot-scope="scope">
- <span>{{ scope.row.HReqBuyQty }}</span>
- </template>
- </el-table-column>
- <el-table-column align="center" label="鐢宠鍑哄簱鏁伴噺" width="120">
- <template slot-scope="scope">
- <span>{{ scope.row.HReqOutQty }}</span>
- </template>
- </el-table-column>
- <el-table-column align="center" label="褰撳墠搴撳瓨" width="120">
- <template slot-scope="scope">
- <span>{{ scope.row.HCurrentInventory }}</span>
- </template>
- </el-table-column>
- <el-table-column align="center" label="鎿嶄綔" width="55" fixed="right">
- <template slot-scope="scope">
- <el-button type="danger" icon="el-icon-delete" size="mini" circle
- @click="handleDeleteSysZb(scope.row)"></el-button>
- </template>
- </el-table-column>
- </el-table>
+
+ <el-tabs v-model="activeName1" type="border-card">
+ <el-tab-pane label="鏄庣粏淇℃伅" name="first">
+ <div style="margin-bottom: 10px;">
+ <el-button type="success" plain icon="el-icon-plus" @click="handleAddSysZb()" size="mini">澧炲姞涓�琛�</el-button>
+ <el-button type="success" plain icon="el-icon-plus" @click="handleAddSysZb(zbIndex, 1)"
+ size="mini">鎻掑叆涓�琛�</el-button>
+ <el-button type="success" plain icon="el-icon-plus" @click="handleCopyZbRow" size="mini">澶嶅埗涓�琛�</el-button>
+ <el-button type="success" plain icon="el-icon-arrow-up" @click="handleMoveRowUp(zbSelForm)"
+ size="mini">涓婄Щ</el-button>
+ <el-button type="success" plain icon="el-icon-arrow-down" @click="handleMoveRowDown(zbSelForm)"
+ size="mini">涓嬬Щ</el-button>
+ </div>
+ <el-table :data="editData" style="width: 100%" height="300" width="100%" ref="zbTable"
+ @selection-change="handleTableZbEdit" :row-class-name="rowSysZbIndex" show-summary border>
+ <el-table-column type="selection" width="55" align="center" />
+ <el-table-column align="center" label="搴忓彿" type="index" width="80" />
+ <el-table-column align="center" label="鍣ㄥ叿浠ｇ爜" width="120">
+ <template slot-scope="scope">
+ <el-input v-model="scope.row.HMaterCode" placeholder="璇疯緭鍏�" @keyup.native.f7="openDataDialog(8, scope.row)"
+ @dblclick.native="openDataDialog(8, scope.row)" />
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="鍣ㄥ叿鍚嶇О" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.HMaterName }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="瑙勬牸鍨嬪彿" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.HMaterSpec }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="璁￠噺鍗曚綅浠ｇ爜" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.HUnitCode }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="璁￠噺鍗曚綅" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.HUnitName }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="搴斿彂鏁伴噺" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.HQtyMust }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="瀹炲彂鏁伴噺" width="120">
+ <template slot-scope="scope">
+ <el-input-number v-model="scope.row.HQty" :min="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 v-model="scope.row.HWHCode" placeholder="璇疯緭鍏�" @keyup.native.f7="openDataDialog(2, scope.row ,eHWHType=2)"
+ @dblclick.native="openDataDialog(2, scope.row ,eHWHType=2)" />
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="鍙戞枡浠撳簱" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.HWHName }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="浠撲綅浠ｇ爜" width="120">
+ <template slot-scope="scope">
+ <el-input v-model="scope.row.HSPCode" 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">
+ <span>{{ scope.row.HSPName }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="澶囨敞" width="120">
+ <template slot-scope="scope">
+ <el-input v-model="scope.row.HRemark" placeholder="璇疯緭鍏ュ娉�" />
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="鎿嶄綔" width="55" fixed="right">
+ <template slot-scope="scope">
+ <el-button type="danger" icon="el-icon-delete" size="mini" circle
+ @click="handleDeleteSysZb(scope.row)"></el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ </el-tab-pane>
+ <!-- <el-tab-pane label="姹囨�讳俊鎭�" name="second">
+ <el-table :data="editData1" style="width: 100%" height="300" width="100%" ref="zbTable"
+ @selection-change="handleTableZbEdit" :row-class-name="rowSysZbIndex" show-summary border>
+ <el-table-column type="selection" width="55" align="center" />
+ <el-table-column align="center" label="搴忓彿" type="index" width="80" />
+ <el-table-column align="center" label="鐗╂枡浠ｇ爜" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.鐗╂枡浠ｇ爜 }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="鐗╂枡鍚嶇О" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.鐗╂枡鍚嶇О }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="瑙勬牸鍨嬪彿" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.瑙勬牸鍨嬪彿 }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="鍗曟嵁鍙�" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.鍗曟嵁鍙� }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="鎵规" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.鎵规 }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="瀹炲彂鏁伴噺" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.瀹炲彂鏁伴噺 }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="鍙戞枡浠撳簱浠ｇ爜" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.鍙戞枡浠撳簱浠ｇ爜 }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="鍙戞枡浠撳簱" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.鍙戞枡浠撳簱 }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="澶囨敞" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.琛ㄤ綋澶囨敞 }}</span>
+ </template>
+ </el-table-column>
+ </el-table>
+ </el-tab-pane> -->
+ </el-tabs>
+
</el-form>
- <!-- 閮ㄩ棬寮圭獥 -->
+ <!-- 寮圭獥 -->
<el-dialog :title="dialogTitle" :visible.sync="openData" width="1280px" append-to-body>
- <Dept @deptEmitDb="dbEmitData" @deptEmit="emitData" v-if="deptShow" />
- <Warehouse @deptEmitDb="dbEmitData" @deptEmit="emitData" v-if="warehouseShow" />
- <Material @deptEmitDb="dbEmitData" @deptEmit="emitData" v-if="materialShow" />
+ <Dept @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="deptShow" />
+ <Warehouse @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="warehouseShow" />
<GyEmployee @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyEmployeeShow" />
+ <GySupplier @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gySupplierShow" />
+ <GyCustomer @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyCustomerShow" />
+ <GyMould @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyMouldShow" />
+ <GyStockPlace @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyStockPlaceShow" />
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="deptClickSub">纭� 瀹�</el-button>
<el-button @click="deptClose">鍙� 娑�</el-button>
@@ -366,16 +334,19 @@
<script>
import axios from 'axios'
-import Dept from '@/views/component/dept'
-import Warehouse from '@/views/component/warehouse'
-import Material from '@/views/component/material'
import RowSettings from '@/views/component/rowSettings'
import GyEmployee from '@/views/basic/gyEmployee/gyEmployee.vue'
+import Dept from '@/views/basic/gy/gyDepartment'
+import Warehouse from '@/views/basic/gyWarehouse/gyWarehouse.vue'
+import GySupplier from '@/views/basic/gy/gySupplier.vue'
+import GyCustomer from '@/views/GyCustomer'
+import GyMould from '@/views/scMould/basicModeling/Gy_MouldFileList.vue'
+import GyStockPlace from '@/views/basic/gyStockPlace/gyStockPlace.vue'
import moment from 'moment';
export default {
- name: 'SellOutBillEdit',
- components: { Dept, Warehouse, Material, RowSettings, GyEmployee },
+ name: 'Sc_MouldProdBackBillEdit',
+ components: { Dept, Warehouse, RowSettings, GyEmployee,GySupplier,GyCustomer,GyMould,GyStockPlace },
props: {
OperationType: { type: Number, },
linterid: { type: Number, },
@@ -385,34 +356,42 @@
},
data() {
return {
- HModName: "Kf_SellOutBill",
+ HModName: "Sc_MouldProdBackBillEdit",
formShow: false,
temp: undefined,
formLoading: true,
zzSelDis: false,
rowHideShow: false,
openRowHide: false,
- hPriceTypeList: ['鎴愭湰浠�', '缁撶畻浠�'],
+ hSupTypeList: [{name:'渚涘簲鍟�',id:1,},{name:'瀹㈡埛',id:2},{name:'杞﹂棿閮ㄩ棬',id:3}],
addBtnShow: false,
zbIndex: null,
zbSelForm: {},//瀛愯〃閫変腑鏁版嵁
dialogTypeNum: null,//閮ㄩ棬寮圭獥1锛屼粨搴撳脊绐�2
deptShow: false,//閮ㄩ棬鏁版嵁缁勪欢
warehouseShow: false,//浠撳簱鏁版嵁缁勪欢
- materialShow: false,//鐗╂枡鏁版嵁缁勪欢
gyEmployeeShow: false,//閿�鍞憳鏁版嵁缁勪欢
+ gySupplierShow: false,//渚涘簲鍟嗘暟鎹粍浠�
+ gyCustomerShow: false,//瀹㈡埛鏁版嵁缁勪欢
+ gyMouldShow: false,//鍣ㄥ叿鏁版嵁缁勪欢
+ gyStockPlaceShow: false,//浠撲綅鏁版嵁缁勪欢
+ eHWHType:1,//浠撳簱寮圭獥鍖哄垎鏍囧織
+ empType:1,//鑱屽憳寮圭獥鍖哄垎鏍囧織
+ deptType:1,//閮ㄩ棬寮圭獥鍖哄垎鏍囧織
deptform: {},//寮圭獥閫変腑鏁版嵁
openData: false,//鏁版嵁寮圭獥
dialogTitle: '',
organizationList: [],//缁勭粐鍒楄〃
subDisabled: false,//缂栬緫椤甸潰淇濆瓨鎸夐挳鏄惁绂佺敤(true绂佺敤锛宖alse鍙敤)
// OperationType: this.$route.query.OperationType,//淇濆瓨绫诲瀷锛堟柊澧�1淇敼3锛�
- HInterID: null,
+ HInterID: 0,
baseURL: process.env.VUE_APP_BASE_API,
checkedSysZb: [],
- editData: [],//閿�鍞嚭搴撳崟瀛愯〃
+ editData: [],//瀛愯〃
+ editData1: [],//姹囨�诲瓙琛�
editBtData: [],//瀛愯〃琛ㄥご
activeName: 'first',
+ activeName1:'first',
// 寮瑰嚭灞傛爣棰�
title: "",
// 鏄惁鏄剧ず寮瑰嚭灞�
@@ -452,14 +431,20 @@
form: {},
// 琛ㄥ崟鏍￠獙
rules: {
- HSupName: [
- { required: true, message: "瀹㈡埛涓嶈兘涓虹┖", trigger: "blur" }
- ],
HDate: [
{ required: true, message: "鏃ユ湡涓嶈兘涓虹┖", trigger: "blur" }
],
- HExRate: [
- { required: true, message: "姹囩巼涓嶈兘涓虹┖", trigger: "blur" }
+ HWHName: [
+ { required: true, message: "鍣ㄥ叿浠撳簱涓嶈兘涓虹┖", trigger: "blur" }
+ ],
+ HSecManagerName: [
+ { required: true, message: "楠屾敹鍛樹笉鑳戒负绌�", trigger: "blur" }
+ ],
+ HKeeperName: [
+ { required: true, message: "淇濈鍛樹笉鑳戒负绌�", trigger: "blur" }
+ ],
+ HDeptName: [
+ { required: true, message: "閮ㄩ棬涓嶈兘涓虹┖", trigger: "blur" }
]
}
};
@@ -467,9 +452,6 @@
created() {
this.fetchData()
this.getdata()
- },
- beforeDestroy() {
- this.$destroy()
},
methods: {
fetchData() {
@@ -486,118 +468,7 @@
console.log(this.copyType, this.OperationType)
this.formShow = false
this.formLoading = true
-
- 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("鎺ュ彛璇锋眰澶辫触!");
- });
- }
- } else if ((this.OperationType == 1 && this.copyType != 1) || (!this.OperationType && !this.copyType)) {
+ if ((this.OperationType == 1 && this.copyType != 1) || (!this.OperationType && !this.copyType)) {
this.handleAdd()
} else if (this.OperationType == 3 || this.copyType == 1) {
this.handleUpdate()
@@ -611,70 +482,81 @@
datajson = JSON.parse(decodeURI(arr));
return datajson;
},
- //鏍规嵁涓诲唴鐮佷笌瀛愬唴鐮佽幏鍙栨簮鍗曢攢鍞鍗曟暟鎹�
- getPushSourceBillInit(HSourceInterID, HSourceEntryID) {
- axios.get(this.baseURL + '/Xs_SeOrderBill/loadXs_SeOrderBill_Push', {
- params: {
- "HInterID": HSourceInterID
- , "HSubID": HSourceEntryID
- },
- }).then(response => {
- let result = response.data
- if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- this.temp = result.data[0];
- } else {
- this.temp = result.data;
- }
- }).catch(error => {
- this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
- });
- },
handleRowHide() {
this.rowHideShow = true
this.openRowHide = true
},
rowSetClose(val) {
-
this.rowHideShow = false
this.openRowHide = val
- this.$destroy()
},
organizationChange(val) {
// let options=undefined
// this.form=this.organizationList.find(option => option.ID === val)?.Name || '';
},
- //閮ㄩ棬寮圭獥璧嬪��
+ //寮圭獥璧嬪��
dbEmitData(deptRow, num) {
- // num=1閮ㄩ棬 num=2鍑哄簱浠撳簱
+ // num=1閮ㄩ棬 num=2浠撳簱
console.log(deptRow)
- if (deptRow.HItemID) {
+ if (deptRow.HItemID || deptRow.hmainid) {
if (num == 1) {
- this.form.HDeptName = deptRow.閮ㄩ棬鍚嶇О
- this.form.HDeptID = deptRow.HItemID
- this.form.HManagerName = deptRow.璐熻矗浜�
+ if(this.deptType == 1){
+ this.form.HDeptName = deptRow.閮ㄩ棬鍚嶇О
+ this.form.HDeptID = deptRow.HItemID
+ }else{
+ this.form.HSupName = deptRow.閮ㄩ棬鍚嶇О
+ this.form.HSupID = deptRow.HItemID
+ }
this.deptShow = false
this.openData = false
} else if (num == 2) {
- this.editData[this.zbIndex].HWHID = deptRow.HItemID;
- this.editData[this.zbIndex].鍙戣揣浠撳簱 = deptRow.浠撳簱鍚嶇О;
+ if(this.eHWHType == 1){
+ this.form.HWHName = deptRow.浠撳簱鍚嶇О
+ this.form.HWHID = deptRow.HItemID
+ this.form.HWHNumber = deptRow.浠撳簱浠ｇ爜
+ }else{
+ this.editData[this.zbIndex].HWHID = deptRow.HItemID
+ this.editData[this.zbIndex].HWHCode = deptRow.浠撳簱浠ｇ爜
+ this.editData[this.zbIndex].HWHName = deptRow.浠撳簱鍚嶇О
+ }
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
- this.openData = false
} else if (num == 4) {
- this.form.HEmpName = deptRow.鑱屽憳鍚嶇О
- this.form.HEmpID = deptRow.HItemID
+ if(this.empType == 1){
+ this.form.HSecManagerName = deptRow.鑱屽憳鍚嶇О
+ this.form.HSecManagerID = deptRow.HItemID
+ }else{
+ this.form.HKeeperName = deptRow.鑱屽憳鍚嶇О
+ this.form.HKeeperID = deptRow.HItemID
+ }
this.gyEmployeeShow = false
+ this.openData = false
+ } else if (num == 6) {
+ this.form.HSupName = deptRow.渚涘簲鍟嗗悕绉�
+ this.form.HSupID = deptRow.HItemID
+ this.gySupplierShow = false
+ this.openData = false
+ } else if (num == 7) {
+ this.form.HSupName = deptRow.瀹㈡埛鍚嶇О
+ this.form.HSupID = deptRow.HItemID
+ this.gyCustomerShow = false
+ this.openData = false
+ } else if (num == 8){
+ this.editData[this.zbIndex].HMaterID = deptRow.hmainid
+ this.editData[this.zbIndex].HMaterCode = deptRow.妯″叿缂栧彿
+ this.editData[this.zbIndex].HMaterName = deptRow.妯″叿鍚嶇О
+ this.editData[this.zbIndex].HMaterSpec = deptRow.妯″叿鍨嬪彿
+ this.editData[this.zbIndex].HUnitID = deptRow.HUnitID
+ this.editData[this.zbIndex].HUnitCode = deptRow.璁￠噺鍗曚綅浠ｇ爜
+ this.editData[this.zbIndex].HUnitName = deptRow.璁￠噺鍗曚綅
+ this.gyMouldShow = false
+ this.openData = false
+ } else if (num == 9){
+ this.editData[this.zbIndex].HSPID = deptRow.HMainID
+ this.editData[this.zbIndex].HSPCode = deptRow.浠撲綅浠ｇ爜
+ this.editData[this.zbIndex].HSPName = deptRow.浠撲綅鍚嶇О
+ this.gyStockPlaceShow = false
this.openData = false
}
} else {
@@ -695,63 +577,30 @@
this.openData = false
},
- //閿�鍞嚭搴撳崟鏂板缂栬緫琛ㄥ崟鍒濆鍖�
+ //琛ㄥ崟鍒濆鍖�
reset() {
this.form = {
- BillType: '1402',
HBillNo: '',
- HInterID: '',
- HBillSubType: '1205',
+ HInterID: 0,
HDate: new Date(),
- HMainSourceInterID: 0,
- HMainSourceEntryID: 0,
- HMainSourceBillType: '',
- HMainSourceBillNo: '',
- HEmpName: '',
- HEmpID: 0,
+ HInnerBillNo:'',
+ HWHName:'',
+ HWHNumber:'',
+ HWHID:0,
+ HSecManagerName:'',
+ HSecManagerID:0,
+ HKeeperName:'',
+ HKeeperID:0,
HDeptName: '',
HDeptID: 0,
- HManagerName: '',
- HManagerID: 0,
- HSupName: sessionStorage["HSupName"],
- HSupID: sessionStorage["HSupID"],
- HLinkMan: '',
- HLinkPhone: '',
- HSecManagerName: '',
- HSecManagerID: 0,
- HKeeperName: '',
- HKeeperID: 0,
- HRemark: '',
- HProjectNumber: '',
- HProjectID: 0,
- HProjectName: '',
- HGroupName: '',
- HGroupID: 0,
- HWHName: '',
- HWHID: 0,
- HConveyCompName: '',
- HConveyCompID: 0,
- HConveyTypeName: '',
- HConveyTypeID: 0,
- HConveyMoney: '0',
- HCarriage: '0',
- HSTOCKORGID: sessionStorage["OrganizationID"] - 0,//缁勭粐id
- HOWNERID: sessionStorage["OrganizationID"] - 0,
- HSCWHName: '',
- HSCWHID: 0,
- HCheckStatusMan: '',
- HExplanation: '',
- HInnerBillNo: '',
- HCurName: '浜烘皯甯�',
- HCurID: 1,
- HExRate: '1',
- HSellSName: '',
- HSellSID: 0,
- HCusBalance: '0',
- HCreditRating_Now: '0',
- HAvailableBalance: '0',
- HPriceType: '鎴愭湰浠�',
- HOrgID: sessionStorage["OrganizationID"] - 0,
+ HSupTypeID: 1,
+ HSupName:'',
+ HSupID:0,
+ HSourceBillType:'',
+ XDH:'',
+ HExplanation:'',
+ HRemark:'',
+
HMaker: '',
HUpDater: '',
HChecker: '',
@@ -764,21 +613,35 @@
HDeleteDate: '',
}
this.editData = []
+ this.editData1 = []
this.editBtData = []
this.ids = []
this.subDisabled = false
this.addBtnShow = false
// this.$refs.tableData.clearSelection()
this.activeName = 'first'
+ this.activeName1 = 'first'
this.resetForm("form");
},
//閫�鍑�
close() {
this.reset()
-
+ console.log(this.$route.path)
if (!this.OperationType && !this.copyType) {
- const obj = { path: "/sell/sellOut/sellOutBillEdit", name: "SellOutBillEdit" };
- this.$tab.closePage(obj);
+ console.log(this.$route.path)
+ const obj = { fullPath: this.$route.path, path: this.$route.path, name: this.$route.name, };
+ this.$tab.closePage(obj).then(res => {
+ const latestView = res.visitedViews.slice(-1)[0]
+ if (latestView) {
+ this.$router.push(latestView.fullPath)
+ } else {
+ if (obj.name === 'Dashboard') {
+ this.$router.replace({ path: '/redirect' + obj.fullPath })
+ } else {
+ this.$router.push('/')
+ }
+ }
+ });
} else {
this.formShow = false
this.$emit('editClose', false)
@@ -794,8 +657,6 @@
this.form.HDeptName = dataForm.HDeptName
this.form.HEmpID = dataForm.HEmpID
this.form.HEmpName = dataForm.HEmpName
- this.form.HManagerID = dataForm.HManagerID
- this.form.HManagerName = dataForm.HManagerName
}).catch(error => {
this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
});
@@ -816,44 +677,16 @@
})
},
getHBillNo() {
- axios.get(this.baseURL + "/WEBSController/GetMaxBillNoAndID_Json", {
+ axios.get(this.baseURL + "/Web/GetMAXNum", {
params: {
- HBillType: '1205'
+ HBillType: '3803'
}
}).then(response => {
this.form.HMaker = sessionStorage["HUserName"]
this.form.HBillNo = response.data.data[0].HBillNo
- this.form.HInterID = response.data.data[0].HInterID
+ this.form.HInterID = 0
// this.copyType = 0
// this.getCzyglByUser()
- }).catch(error => {
- this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
- });
- },
- //鑾峰彇閿�鍞嚭搴撳崟瀵瑰簲鐨勬潯鐮佹槑缁�
- getBarCodeNoteBySellOutBill(rowHmainid) {
- axios.get(this.baseURL + '/Kf_SellOutBill/BarCodeNote', {
- params: { "HInterID": rowHmainid }
- }).then(response => {
- if (response.data.count == 1) {
- if (response.data.data[2].length > 0) {
- this.$modal.msgError("褰撳墠鍗曟嵁鐢辨壂鐮佺敓鎴愶紝涓嶅彲浠ョ紪杈戯紒");
- this.subDisabled = true
- }
- } else { }
- }).catch(error => {
- this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
- });
- },
- //#region 鏍规嵁瀹㈡埛鑾峰彇瀹㈡埛浣欓
- getCustomerBalance(HCusID) {
- axios.get(this.baseURL + '/Xs_CusRatingChangeBill/getCustomerBalance', {
- params: { "HCusID": HCusID, 'CurUserName': sessionStorage["HUserName"] }
- }).then(response => {
- var data = response.data.data[0];
- this.form.HCusBalance = data.HCusBalance
- this.form.HCreditRating_Now = data.HCreditRating_Now
- this.form.HAvailableBalance = data.HAvailableBalance
}).catch(error => {
this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
});
@@ -863,173 +696,75 @@
this.reset()
let rowHmainid = this.linterid
console.log(this.linterid)
- axios.get(this.baseURL + "/Kf_SellOutBill/cx", {
- params: { 'HInterID': rowHmainid }
+ //涓昏〃
+ axios.get(this.baseURL + "/Sc_MouldProdBackBill/Sc_MouldProdBackBillListCheckDetai", {
+ params: { 'HID': rowHmainid }
}).then(response => {
- if (response.data.count == 1) {
- var result = response.data
- var data = response.data.data[0]
- this.form.BillType = data.HSourceBillType
+ if (response.data.code == 1) {
+ var data = response.data.data.h_v_Sc_MouldProdBackBill_Edit[0]
+ console.log(data)
if (this.copyType == 1) {
this.getHBillNo()
let date = new Date()
this.form.HDate = moment(date).format('YYYY-MM-DDTHH:mm:ss')
} else {
- this.form.HBillNo = data.鍗曟嵁鍙�
- this.form.HInterID = data.hmainid
- 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.HBillSubType = data.HBillSubType
- this.form.HMainSourceInterID = data.HMainSourceInterID
- this.form.HMainSourceEntryID = data.HMainSourceEntryID
- this.form.HMainSourceBillType = data.HMainSourceBillType
- this.form.HMainSourceBillNo = data.HMainSourceBillNo
- this.form.HEmpName = data.涓氬姟鍛�
- this.form.HEmpID = data.HEmpID
- this.form.HDeptName = data.閮ㄩ棬
- this.form.HDeptID = data.HDeptID
- this.form.HManagerName = data.涓荤
- this.form.HManagerID = data.HManagerID
- this.form.HSupName = data.瀹㈡埛
- this.form.HSupID = data.HSupID
- this.form.HLinkMan = data.鑱旂郴浜�
- this.form.HLinkPhone = data.鑱旂郴鐢佃瘽
- this.form.HSecManagerName = data.鍙戣揣浜�
- this.form.HSecManagerID = data.HSecManagerID
- this.form.HKeeperName = data.淇濈鍛�
- this.form.HKeeperID = data.HKeeperID
- this.form.HRemark = data.琛ㄥご澶囨敞
- this.form.HProjectNumber = data.椤圭洰缂栫爜
- this.form.HProjectID = data.HProjectID
- this.form.HProjectName = data.椤圭洰鍚嶇О
- this.form.HGroupName = data.鐝粍
- this.form.HGroupID = data.HGroupID
- this.form.HWHName = data.涓昏〃浠撳簱
- this.form.HWHID = data.HWHID_Main
- this.form.HConveyCompName = data.杩愯緭鍏徃
- this.form.HConveyCompID = data.HConveyCompID
- this.form.HConveyTypeName = data.杩愯緭鏂瑰紡
- this.form.HConveyTypeID = data.HConveyTypeID
- this.form.HConveyMoney = data.HConveyMoney
- this.form.HCarriage = data.杩愯垂
- this.form.HSTOCKORGID = data.HSTOCKORGID
- this.form.HOWNERID = data.HOWNERID
- this.form.HSCWHName = data.涓昏〃璋冨嚭浠撳簱
- this.form.HSCWHID = data.HSCWHID
- this.form.HCheckStatusMan = data.鏍搁攢浜�
- this.form.HExplanation = data.鎽樿
- this.form.HInnerBillNo = data.鍐呴儴鍗曟嵁鍙�
- this.form.HCurName = data.甯佸埆
- this.form.HCurID = data.HCurID
- this.form.HExRate = data.姹囩巼
- this.form.HSellSName = data.閿�鍞柟寮�
- this.form.HSellSID = data.HSellSID
- // this.form.HCusBalance=data
- // this.form.HCreditRating_Now=HConveyMoney
- // this.form.HAvailableBalance=data
- this.form.HPriceType = data.鍗曚环绫诲瀷
- this.form.HOrgID = data.HOrgID
- this.getCustomerByCusID(response.data.data[0].HSupID)//鏍规嵁瀹㈡埛鑾峰彇鑱旂郴浜猴紝鑱旂郴浜虹數璇�
- this.getBarCodeNoteBySellOutBill(rowHmainid)//鑾峰彇閿�鍞嚭搴撳崟瀵瑰簲鐨勬潯鐮佹槑缁嗘槸鍚﹀彲缂栬緫
- for (var i = 0; i < result.data.length; i++) {
- this.editData.push(
- {
- "HMaterID": result.data[i].HMaterID
- , "鐗╂枡浠ｇ爜": result.data[i].鐗╂枡浠ｇ爜
- , "鐗╂枡鍚嶇О": result.data[i].鐗╂枡鍚嶇О
- , "瑙勬牸鍨嬪彿": result.data[i].瑙勬牸鍨嬪彿
- , "HUnitID": result.data[i].HUnitID
- , "璁￠噺鍗曚綅": result.data[i].璁￠噺鍗曚綅
- , "HQtyMust": result.data[i].搴斿彂鏁伴噺.toFixed(6)
- , "HQty": result.data[i].鏁伴噺.toFixed(6)
- , "HPieceQty": result.data[i].浠舵暟.toFixed(0)
- , "HPrice": result.data[i].鍗曚环.toFixed(4)
- , "HTaxPrice": result.data[i].鍚◣鍗曚环.toFixed(4)
- , "HTaxRate": result.data[i].绋庣巼
- , "HMoney": (result.data[i].鏁伴噺 * result.data[i].鍗曚环).toFixed(2)
- , "HTaxMoney": (result.data[i].鏁伴噺 * result.data[i].鍚◣鍗曚环, 2).toFixed(2)
- , "HWHID": result.data[i].hwhid
- , "鍙戣揣浠撳簱": result.data[i].鍙戣揣浠撳簱
- , "HRemark": result.data[i].琛ㄤ綋澶囨敞
- , "HQty_Full": result.data[i].婊¤溅閲嶉噺
- , "HQty_Empty": result.data[i].绌鸿溅閲嶉噺
- , "HQty_Back": result.data[i].鍥炶溅閲嶉噺
- , "HCostPrice": result.data[i].鎴愭湰鍗曚环
- , "HCostMoney": result.data[i].鎴愭湰閲戦
- , "HSalePrice": result.data[i].閿�鍞崟浠�
- , "HSeOrderInterID": result.data[i].HSeOrderInterID
- , "HSeOrderEntryID": result.data[i].HSeOrderEntryID
- , "HSeOrderBillNo": result.data[i].閿�鍞鍗曞彿
- , "HSourceInterID": result.data[i].HSourceInterID
- , "HSourceEntryID": result.data[i].HSourceEntryID
- , "HSourceBillNo": result.data[i].婧愬崟鍗曞彿
- , "HSourceBillType": result.data[i].HSourceBillType
- , "HRelationQty": result.data[i].鍏宠仈鏁伴噺
- , "HRelationMoney": result.data[i].鍏宠仈閲戦
- , 'HSPID': result.data[i].HSPID
- , 'HSPName': result.data[i].浠撲綅
- , 'HSPGroupID': result.data[i].HSPGroupID
- , "HSPGroupName": result.data[i].浠撲綅缁�
- , 'HSCWHID': result.data[i].HSCWHID
- , 'HSCWHName': result.data[i].璋冨嚭浠撳簱
- , 'HSCSPID': result.data[i].HSCSPID
- , 'HSCSPName': result.data[i].璋冨嚭浠撲綅
- , 'HBatchNo': result.data[i].鎵规
- , 'HPOOrderInterID': result.data[i].閲囪喘璁㈠崟鍐呯爜
- , 'HPOOrderEntryID': result.data[i].閲囪喘璁㈠崟瀛愬唴鐮�
- , 'HPOOrderBillNo': result.data[i].閲囪喘璁㈠崟鍙�
- , 'HPropertyID': result.data[i].HPropertyID
- , 'HPropertyName': result.data[i].杈呭姪灞炴��
- , 'HSecUnitID': result.data[i].HSecUnitID
- , 'HSecUnitName': result.data[i].杈呭姪璁￠噺鍗曚綅
- , 'HSecUnitRate': result.data[i].鎹㈢畻鐜�
- , 'HEngineNum': result.data[i].鍙戝姩鏈哄彿
- , 'HUnderPanNum': result.data[i].鍦扮洏鍙�
- , 'HLeaveFactCard': result.data[i].鍑哄巶璇�
- , 'HReqBuyQty': result.data[i].鐢宠閲囪喘鏁伴噺
- , 'HReqOutQty': result.data[i].鐢宠鍑哄簱鏁伴噺
- , 'HCurrentInventory': result.data[i].褰撳墠搴撳瓨
- }
- );
- }
- if (data.鐘舵�� != '鍒涘缓' && this.copyType != 1) {
- this.$modal.msgError("姝ゆ潯鏁版嵁涓嶆槸鍒涘缓鐘舵�侊紝涓嶈兘淇敼");
- this.subDisabled = true
+ this.form = {
+ "HBillNo": data.鍗曟嵁鍙�
+ , "HDate": data.鏃ユ湡
+ , "HInnerBillNo": data.鍐呴儴鍗曟嵁鍙�
+ , "HWHID": data.HWHID //浠撳簱ID
+ , "HWHName": data.浠撳簱 //浠撳簱鍚嶇О
+ , "HSecManagerID": data.hsecmanagerid //楠屾敹鍛業D
+ , "HSecManagerName": data.棰嗘枡浜� //楠屾敹鍛樺悕绉�
+ , "HKeeperID": data.hkeeperid //淇濈鍛業D
+ , "HKeeperName": data.鍙戞枡浜� //淇濈鍛樺悕绉�
+ , "HDeptID": data.HDeptID //閮ㄩ棬ID
+ , "HDeptName": data.閮ㄩ棬 //閮ㄩ棬鍚嶇О
+ , "HSourceBillType": "" //婧愬崟绫诲瀷
+ , "XDH": "" //閫夊崟鍙�
+ , "HExplanation": data.鎽樿 //鎽樿
+ , "HRemark": data.琛ㄥご澶囨敞 //澶囨敞
+ , "HSupTypeID": data.寰�鏉ョ被鍨� //閫夊崟鍙�
+ , "HSupName": data.寰�鏉ュ崟浣�
+ , "HSupID": data.HSupID
+
+ , "HMaker": data.鍒跺崟浜�
+ , "HMakeDate": data.鍒跺崟鏃ユ湡 == null ? "" : data.鍒跺崟鏃ユ湡
+ , "HChecker": data.瀹℃牳浜�
+ , "HCheckDate": data.瀹℃牳鏃ユ湡 == null ? "" : data.瀹℃牳鏃ユ湡
+ , "HUpDater": data.淇敼浜�
+ , "HUpDateDate": data.淇敼鏃ユ湡 == null ? "" : data.淇敼鏃ユ湡
+ , "HCloseMan": data.鍏抽棴浜�
+ , "HCloseDate": data.鍏抽棴鏃ユ湡 == null ? "" : data.鍏抽棴鏃ユ湡
+ , "HDeleteMan": data.浣滃簾浜�
+ , "HDeleteDate": data.浣滃簾鏃ユ湡 == null ? "" : data.浣滃簾鏃ユ湡
+ }
}
this.formShow = true
this.formLoading = false
-
}
}).catch(error => {
+ console.log(error)
this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
});
- },
- //鏍规嵁瀹㈡埛甯﹀嚭鑱旂郴浜恒�佽仈绯荤數璇�
- getCustomerByCusID(HCusID) {
- axios.get(this.baseURL + "/Xs_SeOrderBill/getCustomerByCusID", {
- params: {
- HCusID: HCusID
- }
+ //瀛愯〃
+ axios.get(this.baseURL + "/Sc_MouldProdBackBill/Sc_MouldProdBackBillListProjectDetai", {
+ params: { 'sqlWhere': "and hmainid=" + rowHmainid }
}).then(response => {
- this.form.鑱旂郴浜� = response.data.data[0].HLinkMan
- this.form.鑱旂郴鐢佃瘽 = response.data.data[0].HLinkPhone
- // this.form = response.data.data[0]
-
+ if (response.data.count == 1) {
+ var data = response.data
+ console.log(data)
+ this.editData = data.list[0]
+ this.editData1 = data.list[1]
+ this.formShow = true
+ this.formLoading = false
+ }
}).catch(error => {
+ console.log(error)
this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
});
},
- /** 閿�鍞嚭搴撳瓙琛ㄦ槑缁嗗簭鍙� */
+ /** 瀛愯〃鏄庣粏搴忓彿 */
rowSysZbIndex({ row, rowIndex }) {
row.index = rowIndex + 1;
},
@@ -1039,61 +774,29 @@
this.$modal.msgError("璇烽�夋嫨涓�琛屾暟鎹紪杈�!");
} else {
let obj = {
- HMaterID: 0,
- 鐗╂枡浠ｇ爜: '',
- 鐗╂枡鍚嶇О: '',
- 瑙勬牸鍨嬪彿: '',
- HUnitID: 0,
- 璁￠噺鍗曚綅: '',
- HQtyMust: 1,
- HQty: 1,
- HPieceQty: 0,
- HPrice: 0,
- HTaxPrice: 0,
- HTaxRate: 0,
- HMoney: 0,
- HTaxMoney: 0,
- HWHID: 0,
- 鍙戣揣浠撳簱: '',
- HRemark: '',
- HQty_Full: 0,
- HQty_Empty: 0,
- HQty_Back: 0,
- HCostPrice: 0,
- HCostMoney: 0,
- HSalePrice: 0,
- HSeOrderInterID: 741,
- HSeOrderEntryID: 18,
- HSeOrderBillNo: 'XSFH00000747',
- HSourceInterID: 741,
- HSourceEntryID: 18,
- HSourceBillNo: 'XSFH00000747',
- HSourceBillType: 1402,
- HRelationQty: 0,
- HRelationMoney: 0,
- HSPID: 0,
- HSPName: '',
- HSPGroupID: 0,
- HSPGroupName: '',
- HSCWHID: 0,
- HSCWHName: '',
- HSCSPID: 0,
- HSCSPName: '',
- HBatchNo: '',
- HPOOrderInterID: 0,
- HPOOrderEntryID: 0,
- HPOOrderBillNo: '',
- HPropertyID: 0,
- HPropertyName: '',
- HSecUnitID: 0,
- HSecUnitName: '',
- HSecUnitRate: 0,
- HEngineNum: '',
- HUnderPanNum: '',
- HLeaveFactCard: '',
- HReqBuyQty: 0,
- HReqOutQty: 0,
- HCurrentInventory: 0,
+ HBatchNo: "",
+ HDesignLife: 0,
+ HLeaveLife: 0,
+ HMaterCode:"",
+ HMaterID:0,
+ HMaterName:"",
+ HMaterSpec:"",
+ HMoney:0,
+ HPrice:0,
+ HQty:0,
+ HQtyMust:0,
+ HSPCode:"",
+ HSPID:0,
+ HSPName:"",
+ HStockOrgID:sessionStorage["OrganizationID"] - 0,//缁勭粐id
+ HUnitCode:"",
+ HUnitID:0,
+ HUnitName:"",
+ HUseLife:0,
+ HWHCode:"",
+ HWHID:0,
+ HWHName:"",
+ HRemark:"",
}
if (index) {
this.editData.splice(index, 0, obj);
@@ -1161,42 +864,38 @@
this.$refs.zbTable.toggleRowSelection(del_row, false) //璁剧疆杩欎竴琛屽彇娑堥�変腑
}
},
- //鑾峰彇鏈�澶у崟鎹彿_浠诲姟绫伙紙Type涓�0鏃跺彧鑾峰彇涓嶆柊澧炴祦姘村彿锛屼负1鏃舵柊澧炰笖鑾峰彇娴佹按鍙凤級
- get_MAXNum_Task(Type) {
- var sql = `exec h_p_Xt_GetMaxBillNo_SubType '1205','${this.form.HDate}',0,0,0,'${Type}','${this.form.HDeptID}'`;
- axios({
- method: 'get',
- url: this.baseURL + "/CommonModel/searchMethod",
- params: { "sql": sql, "user": sessionStorage["HUserName"], "ModRightNameCheck": "" },
- }).then(response => {
- if (response.data.count == 1) {
- this.form.HBillNo = response.data.data[0].HBillNo;
- } else {
- this.$modal.msgError(response.data.code + response.data.Message);
- }
- }).catch(error => {
- this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
- });
- },
// 缂栬緫鎻愪氦淇濆瓨
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
let fhck = false
- this.editData.map((item, index) => {
- if (!item.鍙戣揣浠撳簱) {
+ if(this.editData.length == 0){
fhck = true
- this.$modal.msgError("绗�" + (index + 1) + "琛岋細鍙戣揣浠撳簱鏈�夋嫨锛�");
+ this.$modal.msgError("娌℃湁鐗╂枡鏄庣粏璁板綍锛�");
+ }
+ this.editData.map((item, index) => {
+ if (!item.HMaterID) {
+ fhck = true
+ this.$modal.msgError("绗�" + (index + 1) + "琛岋細鍣ㄥ叿鏈�夋嫨锛�");
+ }else if(!item.HWHID){
+ fhck = true
+ this.$modal.msgError("绗�" + (index + 1) + "琛岋細浠撳簱鏈�夋嫨锛�");
+ }else if(item.HQty == 0){
+ fhck = true
+ this.$modal.msgError("绗�" + (index + 1) + "琛岋細浜у搧鍏ュ簱璁板綍鏈壂鐮侊紙瀹炲彂鏁伴噺涓�0锛�");
}
})
this.$nextTick(() => {
if (!fhck) {
+ if(this.OperationType == 3){
+ this.form.HInterID = this.linterid
+ }
var sMainStr = JSON.stringify(this.form);
var sSubStr = JSON.stringify(this.editData);
- var sMainSub = sMainStr + ';' + sSubStr + ';' + sessionStorage["HUserName"] + ';' + this.OperationType;
+ var sMainSub = sMainStr + ';' + sSubStr + ';' + sessionStorage["HUserName"];
axios({
method: 'post',
- url: this.baseURL + "/Kf_SellOutBill/SaveSellOutBillList",
+ url: this.baseURL + "/Sc_MouldProdBackBill/SaveGetMouldProdBackBillList",
data: {
'msg': sMainSub
},
@@ -1204,12 +903,14 @@
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); //瀹℃牳
- }
+ // if (response.data.Verify == "Y") //鑷姩瀹℃牳
+ // {
+ // this.set_CheckBill(1, this.form); //瀹℃牳
+ // }
this.addBtnShow = true
+ this.close()
+ } else {
+ this.$modal.msgError(response.data.code + response.data.Message);
}
}).catch(error => {
this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
@@ -1223,8 +924,8 @@
set_CheckBill(num, form) {
var InterID = form.hmainid || form.HInterID
//閫昏緫瀹℃牳鏂规硶
- axios.get(this.baseURL + "/Kf_SellOutBill/AuditKf_SellOutBill", {
- params: { "HInterID": InterID, "IsAudit": num, "CurUserName": sessionStorage["HUserName"] }
+ axios.get(this.baseURL + "/Sc_MouldProdBackBill/AuditMouldProdBackBill", {
+ params: { "HInterID": InterID, "flag": num, "user": sessionStorage["HUserName"] }
}).then(response => {
let result = response.data
if (result.code == 1) {
@@ -1240,8 +941,11 @@
showReset() {
this.deptShow = false
this.warehouseShow = false
- this.materialShow = false
this.gyEmployeeShow = false
+ this.gySupplierShow = false
+ this.gyCustomerShow = false
+ this.gyMouldShow = false
+ this.gyStockPlaceShow = false
},
// 鎵撳紑鏁版嵁鍒楄〃寮圭獥
openDataDialog(num, row) {
@@ -1255,19 +959,46 @@
this.deptShow = true
this.openData = true
} else if (num == 2) {
- this.dialogTitle = '鍑哄簱浠撳簱鍒楄〃'
+ this.dialogTitle = '浠撳簱鍒楄〃'
this.warehouseShow = true
this.openData = true
- } else if (num == 3) {
- this.dialogTitle = '鐗╂枡鍒楄〃'
- this.materialShow = true
- this.openData = true
} else if (num == 4) {
- this.dialogTitle = '閿�鍞憳鍒楄〃'
+ if(this.empType == 1){
+ this.dialogTitle = '楠屾敹鍛樺垪琛�'
+ }else{
+ this.dialogTitle = '淇濈鍛樺垪琛�'
+ }
this.gyEmployeeShow = true
this.openData = true
- }
+ } else if (num == 6) {
+ this.dialogTitle = '渚涘簲鍟嗗垪琛�'
+ this.gySupplierShow = true
+ this.openData = true
+ } else if (num == 7) {
+ this.dialogTitle = '瀹㈡埛鍒楄〃'
+ this.gyCustomerShow = true
+ this.openData = true
+ } else if (num == 8) {
+ this.dialogTitle = '鍣ㄥ叿鍒楄〃'
+ this.gyMouldShow = true
+ this.openData = true
+ } else if (num == 9) {
+ this.dialogTitle = '浠撲綅鍒楄〃'
+ this.gyStockPlaceShow = true
+ this.openData = true
+ }
},
+ //鏍规嵁寰�鏉ョ被鍨嬪垽鏂線鏉ュ崟浣�
+ openDataDialogChoose(){
+ if(this.form.HSupTypeID == 1){
+ this.openDataDialog(6)
+ }else if(this.form.HSupTypeID == 2){
+ this.openDataDialog(7)
+ }else if(this.form.HSupTypeID == 3){
+ this.deptType = 2
+ this.openDataDialog(1)
+ }
+ }
}
};
</script>
diff --git a/src/views/scMould/warehouse/Sc_MouldProdBackBillList.vue b/src/views/scMould/warehouse/Sc_MouldProdBackBillList.vue
index dc0127d..5d0c77f 100644
--- a/src/views/scMould/warehouse/Sc_MouldProdBackBillList.vue
+++ b/src/views/scMould/warehouse/Sc_MouldProdBackBillList.vue
@@ -187,7 +187,7 @@
v-if="rowHideShow" />
</el-dialog>
<!-- 缂栬緫 -->
- <el-dialog title="缂栬緫閿�鍞嚭搴撳崟" :visible.sync="openEdit" width="1480px" append-to-body class="xsckdBox" @close="close">
+ <el-dialog title="缂栬緫鍣ㄥ叿棰嗙敤閫�搴撳崟" :visible.sync="openEdit" width="1480px" append-to-body class="xsckdBox" @close="close">
<edit :OperationType=OperationType :linterid=this.rowForm.hmainid :HSouceBillType=this.rowForm.HSourceBillType
:copyType="copyType" @editClose="editClose" v-if="editShow" />
</el-dialog>
@@ -402,6 +402,11 @@
//缁欑┖鐨勬暟缁勮祴鍊�
for (var key in data1.list) {//寰簭閬嶅巻鏁扮粍
data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });//浠庢瘡涓璞′腑鎻愬彇鏁版嵁
+ //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+ var patrn = new RegExp(/^h/i);
+ if (patrn.test(data1.list[key].ColmCols)) {
+ this.titleData[key] = data1.list[key].ColmCols;
+ }
}
//鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
@@ -743,22 +748,18 @@
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete() {
this.$modal.confirm('纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠').then(() => {
- if (this.rowForm.鐘舵�� == "鍒涘缓") {
- axios.get(this.baseURL + "/Sc_MouldProdBackBill/DeltetMouldProdBackBill", {
- params: { 'HInterID': this.rowForm.hmainid.toString(), 'user': sessionStorage["HUserName"] }
- }).then(response => {
- if (response.data.count == 1) {
- this.getList()
- this.$modal.msgSuccess("鍒犻櫎鎴愬姛")
- } else {
- this.$modal.msgError("閿欒:" + result.code + result.Message);
- }
- }).catch(error => {
- this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
- });
- } else {
- this.$modal.msgError("姝ゆ潯鏁版嵁涓嶆槸鍒涘缓鐘舵��,鏃犳硶鍒犻櫎!");
- }
+ axios.get(this.baseURL + "/Sc_MouldProdBackBill/DeltetMouldProdBackBill", {
+ params: { 'HInterID': this.rowForm.hmainid.toString(), 'user': sessionStorage["HUserName"] }
+ }).then(response => {
+ if (response.data.count == 1) {
+ this.getList()
+ this.$modal.msgSuccess("鍒犻櫎鎴愬姛")
+ } else {
+ this.$modal.msgError("閿欒:" + result.code + result.Message);
+ }
+ }).catch(error => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
}).catch(() => { })
},
// 鍙嶅鏍�/瀹℃牳鏁版嵁
diff --git a/src/views/scMould/warehouse/Sc_MouldProdMoveBillEdit.vue b/src/views/scMould/warehouse/Sc_MouldProdMoveBillEdit.vue
index 7731239..2f35de3 100644
--- a/src/views/scMould/warehouse/Sc_MouldProdMoveBillEdit.vue
+++ b/src/views/scMould/warehouse/Sc_MouldProdMoveBillEdit.vue
@@ -3,18 +3,18 @@
<div style=" margin-bottom: 10px; border-bottom: 1px solid #f6f6f6;">
<el-button type="primary" @click="handleAdd(OperationType = 1)" v-if="addBtnShow">鏂板</el-button>
<el-button type="primary" @click="submitForm" :disabled="subDisabled">淇� 瀛�</el-button>
- <el-button type="primary" @click="set_CheckBill(0, form)">瀹� 鏍�</el-button>
+ <el-button type="primary" @click="set_CheckBill(1, form)">瀹� 鏍�</el-button>
<el-button type="primary" @click="close">閫� 鍑�</el-button>
<!-- <el-button @click="cancel">鍙� 娑�</el-button> -->
</div>
- <div style="margin: 10px; font-size: 28px; font-weight: bold; text-align: center;">閿�鍞嚭搴撳崟</div>
- <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+ <div style="margin: 10px; font-size: 28px; font-weight: bold; text-align: center;">鍣ㄥ叿鐩存帴璋冩嫧鍗�</div>
+ <el-form ref="form" :model="form" :rules="rules" label-width="90px">
<el-tabs v-model="activeName" type="card">
<el-tab-pane label="鍩烘湰淇℃伅" name="first">
<el-row>
<el-col :span="6">
- <el-form-item label="鍗曟嵁缂栧彿" prop="HBillNo">
- <el-input v-model="form.HBillNo" placeholder="璇疯緭鍏ュ崟鎹紪鍙�" />
+ <el-form-item label="鍗曟嵁鍙�" prop="HBillNo">
+ <el-input v-model="form.HBillNo" placeholder="璇疯緭鍏ュ崟鎹彿" />
</el-form-item>
</el-col>
<el-col :span="6">
@@ -24,158 +24,70 @@
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="婧愬崟绫诲瀷" prop="BillType">
- <el-select v-model="form.BillType" placeholder="璇烽�夋嫨">
- <el-option label="閿�鍞鍗�" value="1401" />
- <el-option label="鍙戣揣閫氱煡鍗�" value="1402" />
- </el-select>
+ <el-form-item label="鍐呴儴鍗曟嵁鍙�" prop="HInnerBillNo">
+ <el-input v-model="form.HInnerBillNo" placeholder="璇疯緭鍏ュ唴閮ㄥ崟鎹彿" />
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="婧愬崟鍙�" prop="HMainSourceBillNo">
- <el-input v-model="form.HMainSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞彿" disabled>
- <el-button slot="append" icon="el-icon-search"></el-button>
+ <el-form-item label="鍣ㄥ叿浠撳簱" prop="HWHName">
+ <el-input v-model="form.HWHName" placeholder="璇烽�夋嫨鍣ㄥ叿浠撳簱" disabled>
+ <el-button slot="append" icon="el-icon-search" @click="openDataDialog(2,eHWHType=1)"></el-button>
</el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
- <el-form-item label="閿�鍞憳" prop="HEmpName">
- <el-input v-model="form.HEmpName" placeholder="璇疯緭鍏ラ攢鍞憳" disabled>
- <el-button slot="append" icon="el-icon-search" @click="openDataDialog(4)"></el-button>
+ <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,empType=1)"></el-button>
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="閿�鍞儴闂�" prop="HDeptName">
- <el-input v-model="form.HDeptName" placeholder="璇疯緭鍏ラ攢鍞儴闂�" disabled>
+ <el-form-item label="鍙戞枡浜�" prop="HKeeperName">
+ <el-input v-model="form.HKeeperName" placeholder="璇烽�夋嫨鍙戞枡浜�" disabled>
+ <el-button slot="append" icon="el-icon-search" @click="openDataDialog(4,empType=2)"></el-button>
+ </el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="閮ㄩ棬" prop="HDeptName">
+ <el-input v-model="form.HDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" disabled>
<el-button slot="append" icon="el-icon-search" @click="openDataDialog(1)"></el-button>
</el-input>
</el-form-item>
</el-col>
- <el-col :span="6">
- <el-form-item label="涓荤" prop="HManagerName">
- <el-input v-model="form.HManagerName" placeholder="璇疯緭鍏ヤ富绠�" disabled>
- <el-button slot="append" icon="el-icon-search"></el-button>
- </el-input>
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="瀹㈡埛" prop="HSupName">
- <el-input v-model="form.HSupName" placeholder="璇疯緭鍏ュ鎴�" disabled>
- <el-button slot="append" icon="el-icon-search"></el-button>
- </el-input>
- </el-form-item>
- </el-col>
</el-row>
<el-row>
<el-col :span="6">
- <el-form-item label="鑱旂郴浜�" prop="HLinkMan">
- <el-input v-model="form.HLinkMan" placeholder="璇疯緭鍏ヨ仈绯讳汉" disabled />
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="鑱旂郴鐢佃瘽" prop="HLinkPhone">
- <el-input v-model="form.HLinkPhone" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" disabled />
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="棰嗘枡浜�" prop="HSecManagerName">
- <el-input v-model="form.HSecManagerName" placeholder="璇疯緭鍏ラ鏂欎汉">
- <el-button slot="append" icon="el-icon-search"></el-button>
- </el-input>
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="浠撶" prop="HKeeperName">
- <el-input v-model="form.HKeeperName" placeholder="璇疯緭鍏ヤ粨绠�">
- <el-button slot="append" icon="el-icon-search"></el-button>
- </el-input>
+ <el-form-item label="璋冩嫧绫诲瀷" prop="HStockStyle">
+ <el-select v-model="form.HStockStyle" placeholder="璇烽�夋嫨">
+ <el-option label="鍚岀粍缁囪皟鎷�" value="鍚岀粍缁囪皟鎷�" />
+ <el-option label="璺ㄧ粍缁囪皟鎷�" value="璺ㄧ粍缁囪皟鎷�" />
+ </el-select>
</el-form-item>
</el-col>
</el-row>
- <el-form-item label="澶囨敞" prop="HRemark">
- <el-input v-model="form.HRemark" placeholder="璇疯緭鍏ュ娉�" />
- </el-form-item>
- <el-row>
- <el-col :span="6">
- <el-form-item label="椤圭洰浠ｇ爜" prop="HProjectNumber">
- <el-input v-model="form.HProjectNumber" placeholder="璇疯緭鍏ラ」鐩唬鐮�" disabled>
- <el-button slot="append" icon="el-icon-search"></el-button>
-
- </el-input>
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="椤圭洰鍚嶇О" prop="HProjectName">
- <el-input v-model="form.HProjectName" placeholder="璇疯緭鍏ラ」鐩悕绉�" disabled />
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="鐝粍" prop="HGroupName">
- <el-input v-model="form.HGroupName" placeholder="璇疯緭鍏ョ彮缁�" disabled>
- <el-button slot="append" icon="el-icon-search"></el-button>
- </el-input>
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="鍑哄簱浠撳簱" prop="HWHName">
- <el-input v-model="form.HWHName" placeholder="璇疯緭鍏ュ嚭搴撲粨搴�">
- <el-button slot="append" icon="el-icon-search"></el-button>
- </el-input>
- </el-form-item>
- </el-col>
- </el-row>
- </el-tab-pane>
- <el-tab-pane label="鍏朵粬淇℃伅" name="second">
<el-row>
<el-col :span="6">
<el-form-item label="缁勭粐" prop="HOrgID">
- <el-select v-model="form.HOrgID" placeholder="璇烽�夋嫨缁勭粐" @change="organizationChange" :disabled="zzSelDis">
+ <el-select v-model="form.HOrgID" placeholder="璇烽�夋嫨缁勭粐" :disabled="zzSelDis">
<el-option v-for="(item, index) in organizationList" :key="index" :label="item.Name" :value="item.ID">
</el-option>
</el-select>
</el-form-item>
</el-col>
- <el-col :span="6">
- <el-form-item label="甯佸埆" prop="HCurName">
- <el-input v-model="form.HCurName" placeholder="璇疯緭鍏ュ竵鍒�" disabled />
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="姹囩巼" prop="HExRate">
- <el-input v-model="form.HExRate" placeholder="璇疯緭鍏ユ眹鐜�" disabled />
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="閿�鍞柟寮�" prop="HSellSName">
- <el-input v-model="form.HSellSName" placeholder="璇疯緭鍏ラ攢鍞柟寮�" disabled />
- </el-form-item>
- </el-col>
</el-row>
<el-row>
- <el-col :span="6">
- <el-form-item label="鍗曚环绫诲瀷" prop="HPriceType">
- <el-select v-model="form.HPriceType" placeholder="璇烽�夋嫨鍗曚环绫诲瀷" @change="organizationChange">
- <el-option v-for="(item, index) in hPriceTypeList" :key="index" :label="item" :value="item">
- </el-option>
- </el-select>
+ <el-col :span="12">
+ <el-form-item label="鎽樿" prop="HExplanation">
+ <el-input v-model="form.HExplanation" placeholder="璇疯緭鍏ユ憳瑕�" />
</el-form-item>
</el-col>
- <el-col :span="6">
- <el-form-item label="瀹㈡埛浣欓" prop="HCusBalance">
- <el-input v-model="form.HCusBalance" placeholder="璇疯緭鍏ュ鎴蜂綑棰�" disabled />
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="淇＄敤棰濆害" prop="HCreditRating_Now">
- <el-input v-model="form.HCreditRating_Now" placeholder="璇疯緭鍏ヤ俊鐢ㄩ搴�" disabled />
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="鍙敤棰濆害" prop="HAvailableBalance">
- <el-input v-model="form.HAvailableBalance" placeholder="璇疯緭鍏ュ彲鐢ㄩ搴�" disabled />
+ <el-col :span="12">
+ <el-form-item label="澶囨敞" prop="HRemark">
+ <el-input v-model="form.HRemark" placeholder="璇疯緭鍏ュ娉�" />
</el-form-item>
</el-col>
</el-row>
@@ -246,113 +158,225 @@
</el-row>
</el-tab-pane>
</el-tabs>
- <div style="margin-bottom: 10px;">
- <el-button type="success" plain icon="el-icon-plus" @click="handleAddSysZb()" size="mini">澧炲姞涓�琛�</el-button>
- <el-button type="success" plain icon="el-icon-plus" @click="handleAddSysZb(zbIndex, 1)"
- size="mini">鎻掑叆涓�琛�</el-button>
- <el-button type="success" plain icon="el-icon-plus" @click="handleCopyZbRow" size="mini">澶嶅埗涓�琛�</el-button>
- <el-button type="success" plain icon="el-icon-arrow-up" @click="handleMoveRowUp(zbSelForm)"
- size="mini">涓婄Щ</el-button>
- <el-button type="success" plain icon="el-icon-arrow-down" @click="handleMoveRowDown(zbSelForm)"
- size="mini">涓嬬Щ</el-button>
- </div>
- <el-table :data="editData" style="width: 100%" height="300" width="100%" ref="zbTable"
- @selection-change="handleTableZbEdit" :row-class-name="rowSysZbIndex" show-summary border>
- <el-table-column type="selection" width="55" align="center" />
- <el-table-column align="center" label="搴忓彿" type="index" width="80" />
- <el-table-column align="center" label="鐗╂枡缂栫爜" width="120">
- <template slot-scope="scope">
- <el-input v-model="scope.row.鐗╂枡浠ｇ爜" placeholder="璇疯緭鍏ョ墿鏂欑紪鐮�" @keyup.native.f7="openDataDialog(3, scope.row)"
- @dblclick.native="openDataDialog(3, scope.row)" />
- </template>
- </el-table-column>
- <el-table-column align="center" label="鐗╂枡鍚嶇О" width="120">
- <template slot-scope="scope">
- <span>{{ scope.row.鐗╂枡鍚嶇О }}</span>
- </template>
- </el-table-column>
- <el-table-column align="center" label="瑙勬牸鍨嬪彿" width="120">
- <template slot-scope="scope">
- <span>{{ scope.row.瑙勬牸鍨嬪彿 }}</span>
- </template>
- </el-table-column>
- <el-table-column align="center" label="璁￠噺鍗曚綅" width="120">
- <template slot-scope="scope">
- <span>{{ scope.row.璁￠噺鍗曚綅 }}</span>
- </template>
- </el-table-column>
- <el-table-column align="center" label="瀹炲彂鏁伴噺" width="120">
- <template slot-scope="scope">
- <el-input-number v-model="scope.row.HQty" :min="1" style="width: 90px;"
- controls-position="right"></el-input-number>
- </template>
- </el-table-column>
- <el-table-column align="center" label="鍗曚环" width="120">
- <template slot-scope="scope">
- <el-input-number v-model="scope.row.HPrice" :min="0" style="width: 90px;"
- controls-position="right"></el-input-number>
- </template>
- </el-table-column>
- <el-table-column align="center" label="鍚◣鍗曚环" width="120">
- <template slot-scope="scope">
- <span>{{ scope.row.HTaxPrice }}</span>
- </template>
- </el-table-column>
- <el-table-column align="center" label="绋庣巼" width="120">
- <template slot-scope="scope">
- <span>{{ scope.row.HTaxRate }}</span>
- </template>
- </el-table-column>
- <el-table-column align="center" label="閲戦" width="120">
- <template slot-scope="scope">
- <span>{{ scope.row.HPrice * scope.row.HQty }}</span>
- </template>
- </el-table-column>
- <el-table-column align="center" label="浠风◣鍚堣" width="120">
- <template slot-scope="scope">
- <span>{{ scope.row.HTaxPrice * scope.row.HQty }}</span>
- </template>
- </el-table-column>
- <el-table-column align="center" label="鍙戣揣浠撳簱" width="120">
- <template slot-scope="scope">
- <el-input v-model="scope.row.鍙戣揣浠撳簱" placeholder="璇疯緭鍏ュ彂璐т粨搴�" @keyup.native.f7="openDataDialog(2, scope.row)"
- @dblclick.native="openDataDialog(2, scope.row)" />
- </template>
- </el-table-column>
- <el-table-column align="center" label="澶囨敞" width="120">
- <template slot-scope="scope">
- <el-input v-model="scope.row.HRemark" placeholder="璇疯緭鍏ュ娉�" />
- </template>
- </el-table-column>
- <el-table-column align="center" label="閲囪喘鏁伴噺" width="120">
- <template slot-scope="scope">
- <span>{{ scope.row.HReqBuyQty }}</span>
- </template>
- </el-table-column>
- <el-table-column align="center" label="鐢宠鍑哄簱鏁伴噺" width="120">
- <template slot-scope="scope">
- <span>{{ scope.row.HReqOutQty }}</span>
- </template>
- </el-table-column>
- <el-table-column align="center" label="褰撳墠搴撳瓨" width="120">
- <template slot-scope="scope">
- <span>{{ scope.row.HCurrentInventory }}</span>
- </template>
- </el-table-column>
- <el-table-column align="center" label="鎿嶄綔" width="55" fixed="right">
- <template slot-scope="scope">
- <el-button type="danger" icon="el-icon-delete" size="mini" circle
- @click="handleDeleteSysZb(scope.row)"></el-button>
- </template>
- </el-table-column>
- </el-table>
+
+ <el-tabs v-model="activeName1" type="border-card">
+ <el-tab-pane label="鏄庣粏淇℃伅" name="first">
+ <div style="margin-bottom: 10px;">
+ <el-button type="success" plain icon="el-icon-plus" @click="handleAddSysZb()" size="mini">澧炲姞涓�琛�</el-button>
+ <el-button type="success" plain icon="el-icon-plus" @click="handleAddSysZb(zbIndex, 1)"
+ size="mini">鎻掑叆涓�琛�</el-button>
+ <el-button type="success" plain icon="el-icon-plus" @click="handleCopyZbRow" size="mini">澶嶅埗涓�琛�</el-button>
+ <el-button type="success" plain icon="el-icon-arrow-up" @click="handleMoveRowUp(zbSelForm)"
+ size="mini">涓婄Щ</el-button>
+ <el-button type="success" plain icon="el-icon-arrow-down" @click="handleMoveRowDown(zbSelForm)"
+ size="mini">涓嬬Щ</el-button>
+ </div>
+ <el-table :data="editData" style="width: 100%" height="300" width="100%" ref="zbTable"
+ @selection-change="handleTableZbEdit" :row-class-name="rowSysZbIndex" show-summary border>
+ <el-table-column type="selection" width="55" align="center" />
+ <el-table-column align="center" label="搴忓彿" type="index" width="80" />
+ <el-table-column align="center" label="鍣ㄥ叿浠ｇ爜" width="120">
+ <template slot-scope="scope">
+ <el-input v-model="scope.row.HMaterCode" placeholder="璇疯緭鍏�" @keyup.native.f7="openDataDialog(8, scope.row)"
+ @dblclick.native="openDataDialog(8, scope.row)" />
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="鍣ㄥ叿鍚嶇О" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.HMaterName }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="瑙勬牸鍨嬪彿" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.HMaterSpec }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="鎵规" width="120">
+ <template slot-scope="scope">
+ <el-input v-model="scope.row.HBatchNo" placeholder="璇疯緭鍏�" />
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="璁￠噺鍗曚綅浠ｇ爜" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.HUnitCode }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="璁￠噺鍗曚綅" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.HUnitName }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="璁捐瀵垮懡" width="120">
+ <template slot-scope="scope">
+ <el-input v-model="scope.row.HDesignLife" placeholder="璇疯緭鍏�" />
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="鍓╀綑瀵垮懡" width="120">
+ <template slot-scope="scope">
+ <el-input v-model="scope.row.HLeaveLife" placeholder="璇疯緭鍏�" />
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="绱浣跨敤瀵垮懡" width="120">
+ <template slot-scope="scope">
+ <el-input v-model="scope.row.HUseLife" placeholder="璇疯緭鍏�" />
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="搴斿彂鏁伴噺" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.HQtyMust }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="瀹炲彂鏁伴噺" width="120">
+ <template slot-scope="scope">
+ <el-input-number v-model="scope.row.HQty" :min="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 v-model="scope.row.HPrice" placeholder="璇疯緭鍏�" />
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="閲戦" width="120">
+ <template slot-scope="scope">
+ <el-input v-model="scope.row.HMoney" placeholder="璇疯緭鍏�" />
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="璋冨叆缁勭粐浠ｇ爜" width="120">
+ <template slot-scope="scope">
+ <!-- <el-select v-model="scope.row.HStockOrgCode" placeholder="璇烽�夋嫨缁勭粐" @change="HStockOrgChange(zbIndex = scope.row.index - 1)">
+ <el-option v-for="(item, index) in organizationList" :key="index" :label="item.Name" :value="item.ID"></el-option>>
+ </el-option>
+ </el-select> -->
+ <span>{{ scope.row.HStockOrgCode }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="璋冨叆缁勭粐" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.HStockOrgName }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="璋冨叆浠撳簱浠ｇ爜" width="120">
+ <template slot-scope="scope">
+ <el-input v-model="scope.row.HWHCode" placeholder="璇疯緭鍏�" @keyup.native.f7="openDataDialog(2, scope.row ,eHWHType=2)"
+ @dblclick.native="openDataDialog(2, scope.row ,eHWHType=2)" />
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="璋冨叆浠撳簱" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.HWHName }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="璋冨叆浠撲綅浠ｇ爜" width="120">
+ <template slot-scope="scope">
+ <el-input v-model="scope.row.HSPCode" placeholder="璇疯緭鍏�" @keyup.native.f7="openDataDialog(9, scope.row,HSPType=1)"
+ @dblclick.native="openDataDialog(9, scope.row,HSPType=1)" />
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="璋冨叆浠撲綅" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.HSPName }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="璋冨嚭浠撳簱浠ｇ爜" width="120">
+ <template slot-scope="scope">
+ <el-input v-model="scope.row.HSCWHCode" placeholder="璇疯緭鍏�" @keyup.native.f7="openDataDialog(2, scope.row ,eHWHType=3)"
+ @dblclick.native="openDataDialog(2, scope.row ,eHWHType=3)" />
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="璋冨嚭浠撳簱" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.HSCWHName }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="璋冨嚭浠撲綅浠ｇ爜" width="120">
+ <template slot-scope="scope">
+ <el-input v-model="scope.row.HSCSPCode" placeholder="璇疯緭鍏�" @keyup.native.f7="openDataDialog(9, scope.row,HSPType=2)"
+ @dblclick.native="openDataDialog(9, scope.row,HSPType=2)" />
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="璋冨嚭浠撲綅" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.HSCSPName }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="澶囨敞" width="120">
+ <template slot-scope="scope">
+ <el-input v-model="scope.row.HRemark" placeholder="璇疯緭鍏ュ娉�" />
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="鎿嶄綔" width="55" fixed="right">
+ <template slot-scope="scope">
+ <el-button type="danger" icon="el-icon-delete" size="mini" circle
+ @click="handleDeleteSysZb(scope.row)"></el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ </el-tab-pane>
+ <!-- <el-tab-pane label="姹囨�讳俊鎭�" name="second">
+ <el-table :data="editData1" style="width: 100%" height="300" width="100%" ref="zbTable"
+ @selection-change="handleTableZbEdit" :row-class-name="rowSysZbIndex" show-summary border>
+ <el-table-column type="selection" width="55" align="center" />
+ <el-table-column align="center" label="搴忓彿" type="index" width="80" />
+ <el-table-column align="center" label="鐗╂枡浠ｇ爜" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.鐗╂枡浠ｇ爜 }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="鐗╂枡鍚嶇О" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.鐗╂枡鍚嶇О }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="瑙勬牸鍨嬪彿" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.瑙勬牸鍨嬪彿 }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="鍗曟嵁鍙�" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.鍗曟嵁鍙� }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="鎵规" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.鎵规 }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="瀹炲彂鏁伴噺" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.瀹炲彂鏁伴噺 }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="鍙戞枡浠撳簱浠ｇ爜" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.鍙戞枡浠撳簱浠ｇ爜 }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="鍙戞枡浠撳簱" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.鍙戞枡浠撳簱 }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="澶囨敞" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.琛ㄤ綋澶囨敞 }}</span>
+ </template>
+ </el-table-column>
+ </el-table>
+ </el-tab-pane> -->
+ </el-tabs>
+
</el-form>
- <!-- 閮ㄩ棬寮圭獥 -->
+ <!-- 寮圭獥 -->
<el-dialog :title="dialogTitle" :visible.sync="openData" width="1280px" append-to-body>
- <Dept @deptEmitDb="dbEmitData" @deptEmit="emitData" v-if="deptShow" />
- <Warehouse @deptEmitDb="dbEmitData" @deptEmit="emitData" v-if="warehouseShow" />
- <Material @deptEmitDb="dbEmitData" @deptEmit="emitData" v-if="materialShow" />
+ <Dept @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="deptShow" />
+ <Warehouse @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="warehouseShow" />
<GyEmployee @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyEmployeeShow" />
+ <GySupplier @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gySupplierShow" />
+ <GyCustomer @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyCustomerShow" />
+ <GyMould @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyMouldShow" />
+ <GyStockPlace @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyStockPlaceShow" />
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="deptClickSub">纭� 瀹�</el-button>
<el-button @click="deptClose">鍙� 娑�</el-button>
@@ -366,16 +390,19 @@
<script>
import axios from 'axios'
-import Dept from '@/views/component/dept'
-import Warehouse from '@/views/component/warehouse'
-import Material from '@/views/component/material'
import RowSettings from '@/views/component/rowSettings'
import GyEmployee from '@/views/basic/gyEmployee/gyEmployee.vue'
+import Dept from '@/views/basic/gy/gyDepartment'
+import Warehouse from '@/views/basic/gyWarehouse/gyWarehouse.vue'
+import GySupplier from '@/views/basic/gy/gySupplier.vue'
+import GyCustomer from '@/views/GyCustomer'
+import GyMould from '@/views/scMould/basicModeling/Gy_MouldFileList.vue'
+import GyStockPlace from '@/views/basic/gyStockPlace/gyStockPlace.vue'
import moment from 'moment';
export default {
- name: 'SellOutBillEdit',
- components: { Dept, Warehouse, Material, RowSettings, GyEmployee },
+ name: 'Sc_MouldProdMoveBillEdit',
+ components: { Dept, Warehouse, RowSettings, GyEmployee,GySupplier,GyCustomer,GyMould,GyStockPlace },
props: {
OperationType: { type: Number, },
linterid: { type: Number, },
@@ -385,34 +412,41 @@
},
data() {
return {
- HModName: "Kf_SellOutBill",
+ HModName: "Sc_MouldProdMoveBillEdit",
formShow: false,
temp: undefined,
formLoading: true,
zzSelDis: false,
rowHideShow: false,
openRowHide: false,
- hPriceTypeList: ['鎴愭湰浠�', '缁撶畻浠�'],
addBtnShow: false,
zbIndex: null,
zbSelForm: {},//瀛愯〃閫変腑鏁版嵁
dialogTypeNum: null,//閮ㄩ棬寮圭獥1锛屼粨搴撳脊绐�2
deptShow: false,//閮ㄩ棬鏁版嵁缁勪欢
warehouseShow: false,//浠撳簱鏁版嵁缁勪欢
- materialShow: false,//鐗╂枡鏁版嵁缁勪欢
gyEmployeeShow: false,//閿�鍞憳鏁版嵁缁勪欢
+ gySupplierShow: false,//渚涘簲鍟嗘暟鎹粍浠�
+ gyCustomerShow: false,//瀹㈡埛鏁版嵁缁勪欢
+ gyMouldShow: false,//鍣ㄥ叿鏁版嵁缁勪欢
+ gyStockPlaceShow: false,//浠撲綅鏁版嵁缁勪欢
+ eHWHType:1,//浠撳簱寮圭獥鍖哄垎鏍囧織
+ empType:1,//鑱屽憳寮圭獥鍖哄垎鏍囧織
+ HSPType:1,//浠撲綅寮圭獥鍖哄垎鏍囧織
deptform: {},//寮圭獥閫変腑鏁版嵁
openData: false,//鏁版嵁寮圭獥
dialogTitle: '',
organizationList: [],//缁勭粐鍒楄〃
subDisabled: false,//缂栬緫椤甸潰淇濆瓨鎸夐挳鏄惁绂佺敤(true绂佺敤锛宖alse鍙敤)
// OperationType: this.$route.query.OperationType,//淇濆瓨绫诲瀷锛堟柊澧�1淇敼3锛�
- HInterID: null,
+ HInterID: 0,
baseURL: process.env.VUE_APP_BASE_API,
checkedSysZb: [],
- editData: [],//閿�鍞嚭搴撳崟瀛愯〃
+ editData: [],//瀛愯〃
+ editData1: [],//姹囨�诲瓙琛�
editBtData: [],//瀛愯〃琛ㄥご
activeName: 'first',
+ activeName1:'first',
// 寮瑰嚭灞傛爣棰�
title: "",
// 鏄惁鏄剧ず寮瑰嚭灞�
@@ -452,14 +486,20 @@
form: {},
// 琛ㄥ崟鏍￠獙
rules: {
- HSupName: [
- { required: true, message: "瀹㈡埛涓嶈兘涓虹┖", trigger: "blur" }
- ],
HDate: [
{ required: true, message: "鏃ユ湡涓嶈兘涓虹┖", trigger: "blur" }
],
- HExRate: [
- { required: true, message: "姹囩巼涓嶈兘涓虹┖", trigger: "blur" }
+ HWHName: [
+ { required: true, message: "鍣ㄥ叿浠撳簱涓嶈兘涓虹┖", trigger: "blur" }
+ ],
+ HSecManagerName: [
+ { required: true, message: "棰嗘枡浜轰笉鑳戒负绌�", trigger: "blur" }
+ ],
+ HKeeperName: [
+ { required: true, message: "鍙戞枡浜轰笉鑳戒负绌�", trigger: "blur" }
+ ],
+ HDeptName: [
+ { required: true, message: "閮ㄩ棬涓嶈兘涓虹┖", trigger: "blur" }
]
}
};
@@ -467,9 +507,6 @@
created() {
this.fetchData()
this.getdata()
- },
- beforeDestroy() {
- this.$destroy()
},
methods: {
fetchData() {
@@ -486,118 +523,7 @@
console.log(this.copyType, this.OperationType)
this.formShow = false
this.formLoading = true
-
- 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("鎺ュ彛璇锋眰澶辫触!");
- });
- }
- } else if ((this.OperationType == 1 && this.copyType != 1) || (!this.OperationType && !this.copyType)) {
+ if ((this.OperationType == 1 && this.copyType != 1) || (!this.OperationType && !this.copyType)) {
this.handleAdd()
} else if (this.OperationType == 3 || this.copyType == 1) {
this.handleUpdate()
@@ -611,70 +537,80 @@
datajson = JSON.parse(decodeURI(arr));
return datajson;
},
- //鏍规嵁涓诲唴鐮佷笌瀛愬唴鐮佽幏鍙栨簮鍗曢攢鍞鍗曟暟鎹�
- getPushSourceBillInit(HSourceInterID, HSourceEntryID) {
- axios.get(this.baseURL + '/Xs_SeOrderBill/loadXs_SeOrderBill_Push', {
- params: {
- "HInterID": HSourceInterID
- , "HSubID": HSourceEntryID
- },
- }).then(response => {
- let result = response.data
- if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- this.temp = result.data[0];
- } else {
- this.temp = result.data;
- }
- }).catch(error => {
- this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
- });
- },
handleRowHide() {
this.rowHideShow = true
this.openRowHide = true
},
rowSetClose(val) {
-
this.rowHideShow = false
this.openRowHide = val
- this.$destroy()
},
- organizationChange(val) {
+ HStockOrgChange(val) {
+ console.log(549,val,this.zbIndex)
+ console.log(this.organizationList)
+
// let options=undefined
// this.form=this.organizationList.find(option => option.ID === val)?.Name || '';
},
- //閮ㄩ棬寮圭獥璧嬪��
+ //寮圭獥璧嬪��
dbEmitData(deptRow, num) {
- // num=1閮ㄩ棬 num=2鍑哄簱浠撳簱
+ // num=1閮ㄩ棬 num=2浠撳簱
console.log(deptRow)
- if (deptRow.HItemID) {
+ if (deptRow.HItemID || deptRow.hmainid) {
if (num == 1) {
this.form.HDeptName = deptRow.閮ㄩ棬鍚嶇О
this.form.HDeptID = deptRow.HItemID
- this.form.HManagerName = deptRow.璐熻矗浜�
this.deptShow = false
this.openData = false
} else if (num == 2) {
- this.editData[this.zbIndex].HWHID = deptRow.HItemID;
- this.editData[this.zbIndex].鍙戣揣浠撳簱 = deptRow.浠撳簱鍚嶇О;
+ if(this.eHWHType == 1){
+ this.form.HWHName = deptRow.浠撳簱鍚嶇О
+ this.form.HWHID = deptRow.HItemID
+ this.form.HWHNumber = deptRow.浠撳簱浠ｇ爜
+ }else if(this.eHWHType == 2){
+ this.editData[this.zbIndex].HWHID = deptRow.HItemID
+ this.editData[this.zbIndex].HWHCode = deptRow.浠撳簱浠ｇ爜
+ this.editData[this.zbIndex].HWHName = deptRow.浠撳簱鍚嶇О
+ }else if(this.eHWHType == 3){
+ this.editData[this.zbIndex].HSCWHID = deptRow.HItemID
+ this.editData[this.zbIndex].HSCWHCode = deptRow.浠撳簱浠ｇ爜
+ this.editData[this.zbIndex].HSCWHName = deptRow.浠撳簱鍚嶇О
+ }
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
- this.openData = false
} else if (num == 4) {
- this.form.HEmpName = deptRow.鑱屽憳鍚嶇О
- this.form.HEmpID = deptRow.HItemID
+ if(this.empType == 1){
+ this.form.HSecManagerName = deptRow.鑱屽憳鍚嶇О
+ this.form.HSecManagerID = deptRow.HItemID
+ }else{
+ this.form.HKeeperName = deptRow.鑱屽憳鍚嶇О
+ this.form.HKeeperID = deptRow.HItemID
+ }
this.gyEmployeeShow = false
+ this.openData = false
+ } else if (num == 8){
+ this.editData[this.zbIndex].HMaterID = deptRow.hmainid
+ this.editData[this.zbIndex].HMaterCode = deptRow.妯″叿缂栧彿
+ this.editData[this.zbIndex].HMaterName = deptRow.妯″叿鍚嶇О
+ this.editData[this.zbIndex].HMaterSpec = deptRow.妯″叿鍨嬪彿
+ this.editData[this.zbIndex].HUnitID = deptRow.HUnitID
+ this.editData[this.zbIndex].HUnitCode = deptRow.璁￠噺鍗曚綅浠ｇ爜
+ this.editData[this.zbIndex].HUnitName = deptRow.璁￠噺鍗曚綅
+ this.editData[this.zbIndex].HQty = 1
+ this.gyMouldShow = false
+ this.openData = false
+ } else if (num == 9){
+ if(this.HSPType == 1){
+ this.editData[this.zbIndex].HSPID = deptRow.HMainID
+ this.editData[this.zbIndex].HSPCode = deptRow.浠撲綅浠ｇ爜
+ this.editData[this.zbIndex].HSPName = deptRow.浠撲綅鍚嶇О
+ }else{
+ this.editData[this.zbIndex].HSCSPID = deptRow.HMainID
+ this.editData[this.zbIndex].HSCSPCode = deptRow.浠撲綅浠ｇ爜
+ this.editData[this.zbIndex].HSCSPName = deptRow.浠撲綅鍚嶇О
+ }
+ this.gyStockPlaceShow = false
this.openData = false
}
} else {
@@ -695,63 +631,29 @@
this.openData = false
},
- //閿�鍞嚭搴撳崟鏂板缂栬緫琛ㄥ崟鍒濆鍖�
+ //琛ㄥ崟鍒濆鍖�
reset() {
this.form = {
- BillType: '1402',
HBillNo: '',
- HInterID: '',
- HBillSubType: '1205',
+ HInterID: 0,
HDate: new Date(),
- HMainSourceInterID: 0,
- HMainSourceEntryID: 0,
- HMainSourceBillType: '',
- HMainSourceBillNo: '',
- HEmpName: '',
- HEmpID: 0,
+ HInnerBillNo:'',
+ HWHName:'',
+ HWHNumber:'',
+ HWHID:0,
+ HSecManagerName:'',
+ HSecManagerID:0,
+ HKeeperName:'',
+ HKeeperID:0,
HDeptName: '',
HDeptID: 0,
- HManagerName: '',
- HManagerID: 0,
- HSupName: sessionStorage["HSupName"],
- HSupID: sessionStorage["HSupID"],
- HLinkMan: '',
- HLinkPhone: '',
- HSecManagerName: '',
- HSecManagerID: 0,
- HKeeperName: '',
- HKeeperID: 0,
- HRemark: '',
- HProjectNumber: '',
- HProjectID: 0,
- HProjectName: '',
- HGroupName: '',
- HGroupID: 0,
- HWHName: '',
- HWHID: 0,
- HConveyCompName: '',
- HConveyCompID: 0,
- HConveyTypeName: '',
- HConveyTypeID: 0,
- HConveyMoney: '0',
- HCarriage: '0',
- HSTOCKORGID: sessionStorage["OrganizationID"] - 0,//缁勭粐id
- HOWNERID: sessionStorage["OrganizationID"] - 0,
- HSCWHName: '',
- HSCWHID: 0,
- HCheckStatusMan: '',
- HExplanation: '',
- HInnerBillNo: '',
- HCurName: '浜烘皯甯�',
- HCurID: 1,
- HExRate: '1',
- HSellSName: '',
- HSellSID: 0,
- HCusBalance: '0',
- HCreditRating_Now: '0',
- HAvailableBalance: '0',
- HPriceType: '鎴愭湰浠�',
- HOrgID: sessionStorage["OrganizationID"] - 0,
+ HStockStyle:'鍚岀粍缁囪皟鎷�',
+ HOrgID:sessionStorage["OrganizationID"] - 0,
+ HSourceBillType:'',
+ XDH:'',
+ HExplanation:'',
+ HRemark:'',
+
HMaker: '',
HUpDater: '',
HChecker: '',
@@ -764,21 +666,35 @@
HDeleteDate: '',
}
this.editData = []
+ this.editData1 = []
this.editBtData = []
this.ids = []
this.subDisabled = false
this.addBtnShow = false
// this.$refs.tableData.clearSelection()
this.activeName = 'first'
+ this.activeName1 = 'first'
this.resetForm("form");
},
//閫�鍑�
close() {
this.reset()
-
+ console.log(this.$route.path)
if (!this.OperationType && !this.copyType) {
- const obj = { path: "/sell/sellOut/sellOutBillEdit", name: "SellOutBillEdit" };
- this.$tab.closePage(obj);
+ console.log(this.$route.path)
+ const obj = { fullPath: this.$route.path, path: this.$route.path, name: this.$route.name, };
+ this.$tab.closePage(obj).then(res => {
+ const latestView = res.visitedViews.slice(-1)[0]
+ if (latestView) {
+ this.$router.push(latestView.fullPath)
+ } else {
+ if (obj.name === 'Dashboard') {
+ this.$router.replace({ path: '/redirect' + obj.fullPath })
+ } else {
+ this.$router.push('/')
+ }
+ }
+ });
} else {
this.formShow = false
this.$emit('editClose', false)
@@ -794,8 +710,6 @@
this.form.HDeptName = dataForm.HDeptName
this.form.HEmpID = dataForm.HEmpID
this.form.HEmpName = dataForm.HEmpName
- this.form.HManagerID = dataForm.HManagerID
- this.form.HManagerName = dataForm.HManagerName
}).catch(error => {
this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
});
@@ -816,44 +730,16 @@
})
},
getHBillNo() {
- axios.get(this.baseURL + "/WEBSController/GetMaxBillNoAndID_Json", {
+ axios.get(this.baseURL + "/Web/GetMAXNum", {
params: {
- HBillType: '1205'
+ HBillType: '3814'
}
}).then(response => {
this.form.HMaker = sessionStorage["HUserName"]
this.form.HBillNo = response.data.data[0].HBillNo
- this.form.HInterID = response.data.data[0].HInterID
+ this.form.HInterID = 0
// this.copyType = 0
// this.getCzyglByUser()
- }).catch(error => {
- this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
- });
- },
- //鑾峰彇閿�鍞嚭搴撳崟瀵瑰簲鐨勬潯鐮佹槑缁�
- getBarCodeNoteBySellOutBill(rowHmainid) {
- axios.get(this.baseURL + '/Kf_SellOutBill/BarCodeNote', {
- params: { "HInterID": rowHmainid }
- }).then(response => {
- if (response.data.count == 1) {
- if (response.data.data[2].length > 0) {
- this.$modal.msgError("褰撳墠鍗曟嵁鐢辨壂鐮佺敓鎴愶紝涓嶅彲浠ョ紪杈戯紒");
- this.subDisabled = true
- }
- } else { }
- }).catch(error => {
- this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
- });
- },
- //#region 鏍规嵁瀹㈡埛鑾峰彇瀹㈡埛浣欓
- getCustomerBalance(HCusID) {
- axios.get(this.baseURL + '/Xs_CusRatingChangeBill/getCustomerBalance', {
- params: { "HCusID": HCusID, 'CurUserName': sessionStorage["HUserName"] }
- }).then(response => {
- var data = response.data.data[0];
- this.form.HCusBalance = data.HCusBalance
- this.form.HCreditRating_Now = data.HCreditRating_Now
- this.form.HAvailableBalance = data.HAvailableBalance
}).catch(error => {
this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
});
@@ -863,173 +749,73 @@
this.reset()
let rowHmainid = this.linterid
console.log(this.linterid)
- axios.get(this.baseURL + "/Kf_SellOutBill/cx", {
- params: { 'HInterID': rowHmainid }
+ //涓昏〃
+ axios.get(this.baseURL + "/Sc_MouldProdMoveBill/Sc_MouldProdMoveBillListCheckDetai", {
+ params: { 'HID': rowHmainid }
}).then(response => {
- if (response.data.count == 1) {
- var result = response.data
- var data = response.data.data[0]
- this.form.BillType = data.HSourceBillType
+ if (response.data.code == 1) {
+ var data = response.data.data.h_v_Sc_MouldProdMoveBill_Edit[0]
+ console.log(data)
if (this.copyType == 1) {
this.getHBillNo()
let date = new Date()
this.form.HDate = moment(date).format('YYYY-MM-DDTHH:mm:ss')
} else {
- this.form.HBillNo = data.鍗曟嵁鍙�
- this.form.HInterID = data.hmainid
- 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.HBillSubType = data.HBillSubType
- this.form.HMainSourceInterID = data.HMainSourceInterID
- this.form.HMainSourceEntryID = data.HMainSourceEntryID
- this.form.HMainSourceBillType = data.HMainSourceBillType
- this.form.HMainSourceBillNo = data.HMainSourceBillNo
- this.form.HEmpName = data.涓氬姟鍛�
- this.form.HEmpID = data.HEmpID
- this.form.HDeptName = data.閮ㄩ棬
- this.form.HDeptID = data.HDeptID
- this.form.HManagerName = data.涓荤
- this.form.HManagerID = data.HManagerID
- this.form.HSupName = data.瀹㈡埛
- this.form.HSupID = data.HSupID
- this.form.HLinkMan = data.鑱旂郴浜�
- this.form.HLinkPhone = data.鑱旂郴鐢佃瘽
- this.form.HSecManagerName = data.鍙戣揣浜�
- this.form.HSecManagerID = data.HSecManagerID
- this.form.HKeeperName = data.淇濈鍛�
- this.form.HKeeperID = data.HKeeperID
- this.form.HRemark = data.琛ㄥご澶囨敞
- this.form.HProjectNumber = data.椤圭洰缂栫爜
- this.form.HProjectID = data.HProjectID
- this.form.HProjectName = data.椤圭洰鍚嶇О
- this.form.HGroupName = data.鐝粍
- this.form.HGroupID = data.HGroupID
- this.form.HWHName = data.涓昏〃浠撳簱
- this.form.HWHID = data.HWHID_Main
- this.form.HConveyCompName = data.杩愯緭鍏徃
- this.form.HConveyCompID = data.HConveyCompID
- this.form.HConveyTypeName = data.杩愯緭鏂瑰紡
- this.form.HConveyTypeID = data.HConveyTypeID
- this.form.HConveyMoney = data.HConveyMoney
- this.form.HCarriage = data.杩愯垂
- this.form.HSTOCKORGID = data.HSTOCKORGID
- this.form.HOWNERID = data.HOWNERID
- this.form.HSCWHName = data.涓昏〃璋冨嚭浠撳簱
- this.form.HSCWHID = data.HSCWHID
- this.form.HCheckStatusMan = data.鏍搁攢浜�
- this.form.HExplanation = data.鎽樿
- this.form.HInnerBillNo = data.鍐呴儴鍗曟嵁鍙�
- this.form.HCurName = data.甯佸埆
- this.form.HCurID = data.HCurID
- this.form.HExRate = data.姹囩巼
- this.form.HSellSName = data.閿�鍞柟寮�
- this.form.HSellSID = data.HSellSID
- // this.form.HCusBalance=data
- // this.form.HCreditRating_Now=HConveyMoney
- // this.form.HAvailableBalance=data
- this.form.HPriceType = data.鍗曚环绫诲瀷
- this.form.HOrgID = data.HOrgID
- this.getCustomerByCusID(response.data.data[0].HSupID)//鏍规嵁瀹㈡埛鑾峰彇鑱旂郴浜猴紝鑱旂郴浜虹數璇�
- this.getBarCodeNoteBySellOutBill(rowHmainid)//鑾峰彇閿�鍞嚭搴撳崟瀵瑰簲鐨勬潯鐮佹槑缁嗘槸鍚﹀彲缂栬緫
- for (var i = 0; i < result.data.length; i++) {
- this.editData.push(
- {
- "HMaterID": result.data[i].HMaterID
- , "鐗╂枡浠ｇ爜": result.data[i].鐗╂枡浠ｇ爜
- , "鐗╂枡鍚嶇О": result.data[i].鐗╂枡鍚嶇О
- , "瑙勬牸鍨嬪彿": result.data[i].瑙勬牸鍨嬪彿
- , "HUnitID": result.data[i].HUnitID
- , "璁￠噺鍗曚綅": result.data[i].璁￠噺鍗曚綅
- , "HQtyMust": result.data[i].搴斿彂鏁伴噺.toFixed(6)
- , "HQty": result.data[i].鏁伴噺.toFixed(6)
- , "HPieceQty": result.data[i].浠舵暟.toFixed(0)
- , "HPrice": result.data[i].鍗曚环.toFixed(4)
- , "HTaxPrice": result.data[i].鍚◣鍗曚环.toFixed(4)
- , "HTaxRate": result.data[i].绋庣巼
- , "HMoney": (result.data[i].鏁伴噺 * result.data[i].鍗曚环).toFixed(2)
- , "HTaxMoney": (result.data[i].鏁伴噺 * result.data[i].鍚◣鍗曚环, 2).toFixed(2)
- , "HWHID": result.data[i].hwhid
- , "鍙戣揣浠撳簱": result.data[i].鍙戣揣浠撳簱
- , "HRemark": result.data[i].琛ㄤ綋澶囨敞
- , "HQty_Full": result.data[i].婊¤溅閲嶉噺
- , "HQty_Empty": result.data[i].绌鸿溅閲嶉噺
- , "HQty_Back": result.data[i].鍥炶溅閲嶉噺
- , "HCostPrice": result.data[i].鎴愭湰鍗曚环
- , "HCostMoney": result.data[i].鎴愭湰閲戦
- , "HSalePrice": result.data[i].閿�鍞崟浠�
- , "HSeOrderInterID": result.data[i].HSeOrderInterID
- , "HSeOrderEntryID": result.data[i].HSeOrderEntryID
- , "HSeOrderBillNo": result.data[i].閿�鍞鍗曞彿
- , "HSourceInterID": result.data[i].HSourceInterID
- , "HSourceEntryID": result.data[i].HSourceEntryID
- , "HSourceBillNo": result.data[i].婧愬崟鍗曞彿
- , "HSourceBillType": result.data[i].HSourceBillType
- , "HRelationQty": result.data[i].鍏宠仈鏁伴噺
- , "HRelationMoney": result.data[i].鍏宠仈閲戦
- , 'HSPID': result.data[i].HSPID
- , 'HSPName': result.data[i].浠撲綅
- , 'HSPGroupID': result.data[i].HSPGroupID
- , "HSPGroupName": result.data[i].浠撲綅缁�
- , 'HSCWHID': result.data[i].HSCWHID
- , 'HSCWHName': result.data[i].璋冨嚭浠撳簱
- , 'HSCSPID': result.data[i].HSCSPID
- , 'HSCSPName': result.data[i].璋冨嚭浠撲綅
- , 'HBatchNo': result.data[i].鎵规
- , 'HPOOrderInterID': result.data[i].閲囪喘璁㈠崟鍐呯爜
- , 'HPOOrderEntryID': result.data[i].閲囪喘璁㈠崟瀛愬唴鐮�
- , 'HPOOrderBillNo': result.data[i].閲囪喘璁㈠崟鍙�
- , 'HPropertyID': result.data[i].HPropertyID
- , 'HPropertyName': result.data[i].杈呭姪灞炴��
- , 'HSecUnitID': result.data[i].HSecUnitID
- , 'HSecUnitName': result.data[i].杈呭姪璁￠噺鍗曚綅
- , 'HSecUnitRate': result.data[i].鎹㈢畻鐜�
- , 'HEngineNum': result.data[i].鍙戝姩鏈哄彿
- , 'HUnderPanNum': result.data[i].鍦扮洏鍙�
- , 'HLeaveFactCard': result.data[i].鍑哄巶璇�
- , 'HReqBuyQty': result.data[i].鐢宠閲囪喘鏁伴噺
- , 'HReqOutQty': result.data[i].鐢宠鍑哄簱鏁伴噺
- , 'HCurrentInventory': result.data[i].褰撳墠搴撳瓨
- }
- );
- }
- if (data.鐘舵�� != '鍒涘缓' && this.copyType != 1) {
- this.$modal.msgError("姝ゆ潯鏁版嵁涓嶆槸鍒涘缓鐘舵�侊紝涓嶈兘淇敼");
- this.subDisabled = true
+ this.form = {
+ "HBillNo": data.鍗曟嵁鍙�
+ , "HDate": data.鏃ユ湡
+ , "HInnerBillNo": data.鍐呴儴鍗曟嵁鍙�
+ , "HWHID": data.HWHID1 //浠撳簱ID
+ , "HWHName": data.鍣ㄥ叿浠撳簱 //浠撳簱鍚嶇О
+ , "HSecManagerID": data.hsecmanagerid //楠屾敹鍛業D
+ , "HSecManagerName": data.棰嗘枡浜� //楠屾敹鍛樺悕绉�
+ , "HKeeperID": data.hkeeperid //淇濈鍛業D
+ , "HKeeperName": data.鍙戞枡浜� //淇濈鍛樺悕绉�
+ , "HDeptID": data.HDeptID //閮ㄩ棬ID
+ , "HDeptName": data.閮ㄩ棬 //閮ㄩ棬鍚嶇О
+ , "HSourceBillType": "" //婧愬崟绫诲瀷
+ , "XDH": "" //閫夊崟鍙�
+ , "HExplanation": data.鎽樿 //鎽樿
+ , "HRemark": data.琛ㄥご澶囨敞 //澶囨敞
+ , "HStockStyle": data.璋冩嫧绫诲瀷
+
+ , "HMaker": data.鍒跺崟浜�
+ , "HMakeDate": data.鍒跺崟鏃ユ湡 == null ? "" : data.鍒跺崟鏃ユ湡
+ , "HChecker": data.瀹℃牳浜�
+ , "HCheckDate": data.瀹℃牳鏃ユ湡 == null ? "" : data.瀹℃牳鏃ユ湡
+ , "HUpDater": data.淇敼浜�
+ , "HUpDateDate": data.淇敼鏃ユ湡 == null ? "" : data.淇敼鏃ユ湡
+ , "HCloseMan": data.鍏抽棴浜�
+ , "HCloseDate": data.鍏抽棴鏃ユ湡 == null ? "" : data.鍏抽棴鏃ユ湡
+ , "HDeleteMan": data.浣滃簾浜�
+ , "HDeleteDate": data.浣滃簾鏃ユ湡 == null ? "" : data.浣滃簾鏃ユ湡
+ }
}
this.formShow = true
this.formLoading = false
-
}
}).catch(error => {
+ console.log(error)
this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
});
- },
- //鏍规嵁瀹㈡埛甯﹀嚭鑱旂郴浜恒�佽仈绯荤數璇�
- getCustomerByCusID(HCusID) {
- axios.get(this.baseURL + "/Xs_SeOrderBill/getCustomerByCusID", {
- params: {
- HCusID: HCusID
- }
+ //瀛愯〃
+ axios.get(this.baseURL + "/Sc_MouldProdMoveBill/Sc_MouldProdMoveBillListProjectDetai", {
+ params: { 'sqlWhere': "and hmainid=" + rowHmainid }
}).then(response => {
- this.form.鑱旂郴浜� = response.data.data[0].HLinkMan
- this.form.鑱旂郴鐢佃瘽 = response.data.data[0].HLinkPhone
- // this.form = response.data.data[0]
-
+ if (response.data.count == 1) {
+ var data = response.data
+ console.log(data)
+ this.editData = data.list[0]
+ this.editData1 = data.list[1]
+ this.formShow = true
+ this.formLoading = false
+ }
}).catch(error => {
+ console.log(error)
this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
});
},
- /** 閿�鍞嚭搴撳瓙琛ㄦ槑缁嗗簭鍙� */
+ /** 瀛愯〃鏄庣粏搴忓彿 */
rowSysZbIndex({ row, rowIndex }) {
row.index = rowIndex + 1;
},
@@ -1039,61 +825,38 @@
this.$modal.msgError("璇烽�夋嫨涓�琛屾暟鎹紪杈�!");
} else {
let obj = {
- HMaterID: 0,
- 鐗╂枡浠ｇ爜: '',
- 鐗╂枡鍚嶇О: '',
- 瑙勬牸鍨嬪彿: '',
- HUnitID: 0,
- 璁￠噺鍗曚綅: '',
- HQtyMust: 1,
- HQty: 1,
- HPieceQty: 0,
- HPrice: 0,
- HTaxPrice: 0,
- HTaxRate: 0,
- HMoney: 0,
- HTaxMoney: 0,
- HWHID: 0,
- 鍙戣揣浠撳簱: '',
- HRemark: '',
- HQty_Full: 0,
- HQty_Empty: 0,
- HQty_Back: 0,
- HCostPrice: 0,
- HCostMoney: 0,
- HSalePrice: 0,
- HSeOrderInterID: 741,
- HSeOrderEntryID: 18,
- HSeOrderBillNo: 'XSFH00000747',
- HSourceInterID: 741,
- HSourceEntryID: 18,
- HSourceBillNo: 'XSFH00000747',
- HSourceBillType: 1402,
- HRelationQty: 0,
- HRelationMoney: 0,
- HSPID: 0,
- HSPName: '',
- HSPGroupID: 0,
- HSPGroupName: '',
- HSCWHID: 0,
- HSCWHName: '',
- HSCSPID: 0,
- HSCSPName: '',
- HBatchNo: '',
- HPOOrderInterID: 0,
- HPOOrderEntryID: 0,
- HPOOrderBillNo: '',
- HPropertyID: 0,
- HPropertyName: '',
- HSecUnitID: 0,
- HSecUnitName: '',
- HSecUnitRate: 0,
- HEngineNum: '',
- HUnderPanNum: '',
- HLeaveFactCard: '',
- HReqBuyQty: 0,
- HReqOutQty: 0,
- HCurrentInventory: 0,
+ HBatchNo: "",
+ HDesignLife: 0,
+ HLeaveLife: 0,
+ HMaterCode:"",
+ HMaterID:0,
+ HMaterName:"",
+ HMaterSpec:"",
+ HMoney:0,
+ HPrice:0,
+ HQty:0,
+ HQtyMust:0,
+ HSPCode:"",
+ HSPID:0,
+ HSPName:"",
+ HOtherOrgID:sessionStorage["OrganizationID"] - 0,//缁勭粐id
+ HStockOrgID:0,
+ HStockOrgCode:"",
+ HStockOrgName:"",
+ HUnitCode:"",
+ HUnitID:0,
+ HUnitName:"",
+ HUseLife:0,
+ HWHCode:"",
+ HWHID:0,
+ HWHName:"",
+ HSCWHID:0,
+ HSCWHCode:"",
+ HSCWHName:"",
+ HSCSPID:0,
+ HSCSPCode:"",
+ HSCSPName:"",
+ HRemark:"",
}
if (index) {
this.editData.splice(index, 0, obj);
@@ -1161,42 +924,38 @@
this.$refs.zbTable.toggleRowSelection(del_row, false) //璁剧疆杩欎竴琛屽彇娑堥�変腑
}
},
- //鑾峰彇鏈�澶у崟鎹彿_浠诲姟绫伙紙Type涓�0鏃跺彧鑾峰彇涓嶆柊澧炴祦姘村彿锛屼负1鏃舵柊澧炰笖鑾峰彇娴佹按鍙凤級
- get_MAXNum_Task(Type) {
- var sql = `exec h_p_Xt_GetMaxBillNo_SubType '1205','${this.form.HDate}',0,0,0,'${Type}','${this.form.HDeptID}'`;
- axios({
- method: 'get',
- url: this.baseURL + "/CommonModel/searchMethod",
- params: { "sql": sql, "user": sessionStorage["HUserName"], "ModRightNameCheck": "" },
- }).then(response => {
- if (response.data.count == 1) {
- this.form.HBillNo = response.data.data[0].HBillNo;
- } else {
- this.$modal.msgError(response.data.code + response.data.Message);
- }
- }).catch(error => {
- this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
- });
- },
// 缂栬緫鎻愪氦淇濆瓨
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
let fhck = false
- this.editData.map((item, index) => {
- if (!item.鍙戣揣浠撳簱) {
+ if(this.editData.length == 0){
fhck = true
- this.$modal.msgError("绗�" + (index + 1) + "琛岋細鍙戣揣浠撳簱鏈�夋嫨锛�");
+ this.$modal.msgError("娌℃湁鐗╂枡鏄庣粏璁板綍锛�");
+ }
+ this.editData.map((item, index) => {
+ if (!item.HMaterID) {
+ fhck = true
+ this.$modal.msgError("绗�" + (index + 1) + "琛岋細鍣ㄥ叿鏈�夋嫨锛�");
+ }else if(!item.HWHID){
+ fhck = true
+ this.$modal.msgError("绗�" + (index + 1) + "琛岋細璋冨叆浠撳簱鏈�夋嫨锛�");
+ }else if(!item.HSCWHID){
+ fhck = true
+ this.$modal.msgError("绗�" + (index + 1) + "琛岋細璋冨嚭浠撳簱鏈�夋嫨锛�");
}
})
this.$nextTick(() => {
if (!fhck) {
+ if(this.OperationType == 3){
+ this.form.HInterID = this.linterid
+ }
var sMainStr = JSON.stringify(this.form);
var sSubStr = JSON.stringify(this.editData);
- var sMainSub = sMainStr + ';' + sSubStr + ';' + sessionStorage["HUserName"] + ';' + this.OperationType;
+ var sMainSub = sMainStr + ';' + sSubStr + ';' + sessionStorage["HUserName"];
axios({
method: 'post',
- url: this.baseURL + "/Kf_SellOutBill/SaveSellOutBillList",
+ url: this.baseURL + "/Sc_MouldProdMoveBill/SaveGetMouldProdMoveBillList",
data: {
'msg': sMainSub
},
@@ -1204,12 +963,14 @@
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); //瀹℃牳
- }
+ // if (response.data.Verify == "Y") //鑷姩瀹℃牳
+ // {
+ // this.set_CheckBill(1, this.form); //瀹℃牳
+ // }
this.addBtnShow = true
+ this.close()
+ } else {
+ this.$modal.msgError(response.data.code + response.data.Message);
}
}).catch(error => {
this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
@@ -1223,8 +984,8 @@
set_CheckBill(num, form) {
var InterID = form.hmainid || form.HInterID
//閫昏緫瀹℃牳鏂规硶
- axios.get(this.baseURL + "/Kf_SellOutBill/AuditKf_SellOutBill", {
- params: { "HInterID": InterID, "IsAudit": num, "CurUserName": sessionStorage["HUserName"] }
+ axios.get(this.baseURL + "/Sc_MouldProdMoveBill/AuditMouldProdMoveBill", {
+ params: { "HInterID": InterID, "flag": num, "user": sessionStorage["HUserName"] }
}).then(response => {
let result = response.data
if (result.code == 1) {
@@ -1240,8 +1001,11 @@
showReset() {
this.deptShow = false
this.warehouseShow = false
- this.materialShow = false
this.gyEmployeeShow = false
+ this.gySupplierShow = false
+ this.gyCustomerShow = false
+ this.gyMouldShow = false
+ this.gyStockPlaceShow = false
},
// 鎵撳紑鏁版嵁鍒楄〃寮圭獥
openDataDialog(num, row) {
@@ -1255,18 +1019,34 @@
this.deptShow = true
this.openData = true
} else if (num == 2) {
- this.dialogTitle = '鍑哄簱浠撳簱鍒楄〃'
+ this.dialogTitle = '浠撳簱鍒楄〃'
this.warehouseShow = true
this.openData = true
- } else if (num == 3) {
- this.dialogTitle = '鐗╂枡鍒楄〃'
- this.materialShow = true
- this.openData = true
} else if (num == 4) {
- this.dialogTitle = '閿�鍞憳鍒楄〃'
+ if(this.empType == 1){
+ this.dialogTitle = '楠屾敹鍛樺垪琛�'
+ }else{
+ this.dialogTitle = '淇濈鍛樺垪琛�'
+ }
this.gyEmployeeShow = true
this.openData = true
- }
+ } else if (num == 6) {
+ this.dialogTitle = '渚涘簲鍟嗗垪琛�'
+ this.gySupplierShow = true
+ this.openData = true
+ } else if (num == 7) {
+ this.dialogTitle = '瀹㈡埛鍒楄〃'
+ this.gyCustomerShow = true
+ this.openData = true
+ } else if (num == 8) {
+ this.dialogTitle = '鍣ㄥ叿鍒楄〃'
+ this.gyMouldShow = true
+ this.openData = true
+ } else if (num == 9) {
+ this.dialogTitle = '浠撲綅鍒楄〃'
+ this.gyStockPlaceShow = true
+ this.openData = true
+ }
},
}
};
diff --git a/src/views/scMould/warehouse/Sc_MouldProdMoveBillList.vue b/src/views/scMould/warehouse/Sc_MouldProdMoveBillList.vue
index 40feaf4..c4d4a8d 100644
--- a/src/views/scMould/warehouse/Sc_MouldProdMoveBillList.vue
+++ b/src/views/scMould/warehouse/Sc_MouldProdMoveBillList.vue
@@ -187,7 +187,7 @@
v-if="rowHideShow" />
</el-dialog>
<!-- 缂栬緫 -->
- <el-dialog title="缂栬緫閿�鍞嚭搴撳崟" :visible.sync="openEdit" width="1480px" append-to-body class="xsckdBox" @close="close">
+ <el-dialog title="缂栬緫鍣ㄥ叿鐩存帴璋冩嫧鍗�" :visible.sync="openEdit" width="1480px" append-to-body class="xsckdBox" @close="close">
<edit :OperationType=OperationType :linterid=this.rowForm.hmainid :HSouceBillType=this.rowForm.HSourceBillType
:copyType="copyType" @editClose="editClose" v-if="editShow" />
</el-dialog>
@@ -402,6 +402,11 @@
//缁欑┖鐨勬暟缁勮祴鍊�
for (var key in data1.list) {//寰簭閬嶅巻鏁扮粍
data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });//浠庢瘡涓璞′腑鎻愬彇鏁版嵁
+ //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+ var patrn = new RegExp(/^h/i);
+ if (patrn.test(data1.list[key].ColmCols)) {
+ this.titleData[key] = data1.list[key].ColmCols;
+ }
}
//鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
@@ -743,22 +748,18 @@
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete() {
this.$modal.confirm('纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠').then(() => {
- if (this.rowForm.鐘舵�� == "鍒涘缓") {
- axios.get(this.baseURL + "/Sc_MouldProdMoveBill/DeltetMouldProdMoveBill", {
- params: { 'HInterID': this.rowForm.hmainid.toString(), 'user': sessionStorage["HUserName"] }
- }).then(response => {
- if (response.data.count == 1) {
- this.getList()
- this.$modal.msgSuccess("鍒犻櫎鎴愬姛")
- } else {
- this.$modal.msgError("閿欒:" + result.code + result.Message);
- }
- }).catch(error => {
- this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
- });
- } else {
- this.$modal.msgError("姝ゆ潯鏁版嵁涓嶆槸鍒涘缓鐘舵��,鏃犳硶鍒犻櫎!");
- }
+ axios.get(this.baseURL + "/Sc_MouldProdMoveBill/DeltetMouldProdMoveBill", {
+ params: { 'HInterID': this.rowForm.hmainid.toString(), 'user': sessionStorage["HUserName"] }
+ }).then(response => {
+ if (response.data.count == 1) {
+ this.getList()
+ this.$modal.msgSuccess("鍒犻櫎鎴愬姛")
+ } else {
+ this.$modal.msgError("閿欒:" + result.code + result.Message);
+ }
+ }).catch(error => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
}).catch(() => { })
},
// 鍙嶅鏍�/瀹℃牳鏁版嵁
diff --git a/src/views/scMould/warehouse/Sc_MouldProdOutBillEdit.vue b/src/views/scMould/warehouse/Sc_MouldProdOutBillEdit.vue
index b6e5481..b40720e 100644
--- a/src/views/scMould/warehouse/Sc_MouldProdOutBillEdit.vue
+++ b/src/views/scMould/warehouse/Sc_MouldProdOutBillEdit.vue
@@ -3,18 +3,18 @@
<div style=" margin-bottom: 10px; border-bottom: 1px solid #f6f6f6;">
<el-button type="primary" @click="handleAdd(OperationType = 1)" v-if="addBtnShow">鏂板</el-button>
<el-button type="primary" @click="submitForm" :disabled="subDisabled">淇� 瀛�</el-button>
- <el-button type="primary" @click="set_CheckBill(0, form)">瀹� 鏍�</el-button>
+ <el-button type="primary" @click="set_CheckBill(1, form)">瀹� 鏍�</el-button>
<el-button type="primary" @click="close">閫� 鍑�</el-button>
<!-- <el-button @click="cancel">鍙� 娑�</el-button> -->
</div>
- <div style="margin: 10px; font-size: 28px; font-weight: bold; text-align: center;">閿�鍞嚭搴撳崟</div>
- <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+ <div style="margin: 10px; font-size: 28px; font-weight: bold; text-align: center;">鍣ㄥ叿棰嗙敤鍑哄簱鍗�</div>
+ <el-form ref="form" :model="form" :rules="rules" label-width="90px">
<el-tabs v-model="activeName" type="card">
<el-tab-pane label="鍩烘湰淇℃伅" name="first">
<el-row>
<el-col :span="6">
- <el-form-item label="鍗曟嵁缂栧彿" prop="HBillNo">
- <el-input v-model="form.HBillNo" placeholder="璇疯緭鍏ュ崟鎹紪鍙�" />
+ <el-form-item label="鍗曟嵁鍙�" prop="HBillNo">
+ <el-input v-model="form.HBillNo" placeholder="璇疯緭鍏ュ崟鎹彿" />
</el-form-item>
</el-col>
<el-col :span="6">
@@ -24,111 +24,18 @@
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="婧愬崟绫诲瀷" prop="BillType">
- <el-select v-model="form.BillType" placeholder="璇烽�夋嫨">
- <el-option label="閿�鍞鍗�" value="1401" />
- <el-option label="鍙戣揣閫氱煡鍗�" value="1402" />
- </el-select>
+ <el-form-item label="鍐呴儴鍗曟嵁鍙�" prop="HInnerBillNo">
+ <el-input v-model="form.HInnerBillNo" placeholder="璇疯緭鍏ュ唴閮ㄥ崟鎹彿" />
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="婧愬崟鍙�" prop="HMainSourceBillNo">
- <el-input v-model="form.HMainSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞彿" disabled>
- <el-button slot="append" icon="el-icon-search"></el-button>
+ <el-form-item label="鍣ㄥ叿浠撳簱" prop="HWHName">
+ <el-input v-model="form.HWHName" placeholder="璇烽�夋嫨鍣ㄥ叿浠撳簱" disabled>
+ <el-button slot="append" icon="el-icon-search" @click="openDataDialog(2,eHWHType=1)"></el-button>
</el-input>
</el-form-item>
</el-col>
</el-row>
- <el-row>
- <el-col :span="6">
- <el-form-item label="閿�鍞憳" prop="HEmpName">
- <el-input v-model="form.HEmpName" placeholder="璇疯緭鍏ラ攢鍞憳" disabled>
- <el-button slot="append" icon="el-icon-search" @click="openDataDialog(4)"></el-button>
- </el-input>
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="閿�鍞儴闂�" prop="HDeptName">
- <el-input v-model="form.HDeptName" placeholder="璇疯緭鍏ラ攢鍞儴闂�" disabled>
- <el-button slot="append" icon="el-icon-search" @click="openDataDialog(1)"></el-button>
- </el-input>
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="涓荤" prop="HManagerName">
- <el-input v-model="form.HManagerName" placeholder="璇疯緭鍏ヤ富绠�" disabled>
- <el-button slot="append" icon="el-icon-search"></el-button>
- </el-input>
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="瀹㈡埛" prop="HSupName">
- <el-input v-model="form.HSupName" placeholder="璇疯緭鍏ュ鎴�" disabled>
- <el-button slot="append" icon="el-icon-search"></el-button>
- </el-input>
- </el-form-item>
- </el-col>
- </el-row>
- <el-row>
- <el-col :span="6">
- <el-form-item label="鑱旂郴浜�" prop="HLinkMan">
- <el-input v-model="form.HLinkMan" placeholder="璇疯緭鍏ヨ仈绯讳汉" disabled />
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="鑱旂郴鐢佃瘽" prop="HLinkPhone">
- <el-input v-model="form.HLinkPhone" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" disabled />
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="棰嗘枡浜�" prop="HSecManagerName">
- <el-input v-model="form.HSecManagerName" placeholder="璇疯緭鍏ラ鏂欎汉">
- <el-button slot="append" icon="el-icon-search"></el-button>
- </el-input>
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="浠撶" prop="HKeeperName">
- <el-input v-model="form.HKeeperName" placeholder="璇疯緭鍏ヤ粨绠�">
- <el-button slot="append" icon="el-icon-search"></el-button>
- </el-input>
- </el-form-item>
- </el-col>
- </el-row>
- <el-form-item label="澶囨敞" prop="HRemark">
- <el-input v-model="form.HRemark" placeholder="璇疯緭鍏ュ娉�" />
- </el-form-item>
- <el-row>
- <el-col :span="6">
- <el-form-item label="椤圭洰浠ｇ爜" prop="HProjectNumber">
- <el-input v-model="form.HProjectNumber" placeholder="璇疯緭鍏ラ」鐩唬鐮�" disabled>
- <el-button slot="append" icon="el-icon-search"></el-button>
-
- </el-input>
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="椤圭洰鍚嶇О" prop="HProjectName">
- <el-input v-model="form.HProjectName" placeholder="璇疯緭鍏ラ」鐩悕绉�" disabled />
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="鐝粍" prop="HGroupName">
- <el-input v-model="form.HGroupName" placeholder="璇疯緭鍏ョ彮缁�" disabled>
- <el-button slot="append" icon="el-icon-search"></el-button>
- </el-input>
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="鍑哄簱浠撳簱" prop="HWHName">
- <el-input v-model="form.HWHName" placeholder="璇疯緭鍏ュ嚭搴撲粨搴�">
- <el-button slot="append" icon="el-icon-search"></el-button>
- </el-input>
- </el-form-item>
- </el-col>
- </el-row>
- </el-tab-pane>
- <el-tab-pane label="鍏朵粬淇℃伅" name="second">
<el-row>
<el-col :span="6">
<el-form-item label="缁勭粐" prop="HOrgID">
@@ -139,43 +46,61 @@
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="甯佸埆" prop="HCurName">
- <el-input v-model="form.HCurName" placeholder="璇疯緭鍏ュ竵鍒�" disabled />
+ <el-form-item label="楠屾敹鍛�" prop="HSecManagerName">
+ <el-input v-model="form.HSecManagerName" placeholder="璇烽�夋嫨楠屾敹鍛�" disabled>
+ <el-button slot="append" icon="el-icon-search" @click="openDataDialog(4,empType=1)"></el-button>
+ </el-input>
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="姹囩巼" prop="HExRate">
- <el-input v-model="form.HExRate" placeholder="璇疯緭鍏ユ眹鐜�" disabled />
+ <el-form-item label="淇濈鍛�" prop="HKeeperName">
+ <el-input v-model="form.HKeeperName" placeholder="璇烽�夋嫨淇濈鍛�" disabled>
+ <el-button slot="append" icon="el-icon-search" @click="openDataDialog(4,empType=2)"></el-button>
+ </el-input>
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="閿�鍞柟寮�" prop="HSellSName">
- <el-input v-model="form.HSellSName" placeholder="璇疯緭鍏ラ攢鍞柟寮�" disabled />
+ <el-form-item label="閮ㄩ棬" prop="HDeptName">
+ <el-input v-model="form.HDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" disabled>
+ <el-button slot="append" icon="el-icon-search" @click="openDataDialog(1,deptType=1)"></el-button>
+ </el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
- <el-form-item label="鍗曚环绫诲瀷" prop="HPriceType">
- <el-select v-model="form.HPriceType" placeholder="璇烽�夋嫨鍗曚环绫诲瀷" @change="organizationChange">
- <el-option v-for="(item, index) in hPriceTypeList" :key="index" :label="item" :value="item">
+ <el-form-item label="寰�鏉ョ被鍨�" prop="HSupTypeID">
+ <el-select v-model="form.HSupTypeID" placeholder="璇烽�夋嫨寰�鏉ョ被鍨�">
+ <el-option v-for="(item, index) in hSupTypeList" :key="index" :label="item.name" :value="item.id">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="瀹㈡埛浣欓" prop="HCusBalance">
- <el-input v-model="form.HCusBalance" placeholder="璇疯緭鍏ュ鎴蜂綑棰�" disabled />
+ <el-form-item label="寰�鏉ュ崟浣�" prop="HSupName">
+ <el-input v-model="form.HSupName" placeholder="璇烽�夋嫨寰�鏉ュ崟浣�" disabled>
+ <el-button slot="append" icon="el-icon-search" @click="openDataDialogChoose()"></el-button>
+ </el-input>
</el-form-item>
</el-col>
- <el-col :span="6">
- <el-form-item label="淇＄敤棰濆害" prop="HCreditRating_Now">
- <el-input v-model="form.HCreditRating_Now" placeholder="璇疯緭鍏ヤ俊鐢ㄩ搴�" disabled />
+ </el-row>
+ <el-row>
+ <!-- <el-col :span="6">
+ <el-form-item label="婧愬崟绫诲瀷" prop="BillType">
+ <el-select v-model="form.BillType" placeholder="璇烽�夋嫨">
+ <el-option label="閿�鍞鍗�" value="1401" />
+ <el-option label="鍙戣揣閫氱煡鍗�" value="1402" />
+ </el-select>
+ </el-form-item>
+ </el-col> -->
+ <el-col :span="12">
+ <el-form-item label="鎽樿" prop="HExplanation">
+ <el-input v-model="form.HExplanation" placeholder="璇疯緭鍏ユ憳瑕�" />
</el-form-item>
</el-col>
- <el-col :span="6">
- <el-form-item label="鍙敤棰濆害" prop="HAvailableBalance">
- <el-input v-model="form.HAvailableBalance" placeholder="璇疯緭鍏ュ彲鐢ㄩ搴�" disabled />
+ <el-col :span="12">
+ <el-form-item label="澶囨敞" prop="HRemark">
+ <el-input v-model="form.HRemark" placeholder="璇疯緭鍏ュ娉�" />
</el-form-item>
</el-col>
</el-row>
@@ -246,113 +171,159 @@
</el-row>
</el-tab-pane>
</el-tabs>
- <div style="margin-bottom: 10px;">
- <el-button type="success" plain icon="el-icon-plus" @click="handleAddSysZb()" size="mini">澧炲姞涓�琛�</el-button>
- <el-button type="success" plain icon="el-icon-plus" @click="handleAddSysZb(zbIndex, 1)"
- size="mini">鎻掑叆涓�琛�</el-button>
- <el-button type="success" plain icon="el-icon-plus" @click="handleCopyZbRow" size="mini">澶嶅埗涓�琛�</el-button>
- <el-button type="success" plain icon="el-icon-arrow-up" @click="handleMoveRowUp(zbSelForm)"
- size="mini">涓婄Щ</el-button>
- <el-button type="success" plain icon="el-icon-arrow-down" @click="handleMoveRowDown(zbSelForm)"
- size="mini">涓嬬Щ</el-button>
- </div>
- <el-table :data="editData" style="width: 100%" height="300" width="100%" ref="zbTable"
- @selection-change="handleTableZbEdit" :row-class-name="rowSysZbIndex" show-summary border>
- <el-table-column type="selection" width="55" align="center" />
- <el-table-column align="center" label="搴忓彿" type="index" width="80" />
- <el-table-column align="center" label="鐗╂枡缂栫爜" width="120">
- <template slot-scope="scope">
- <el-input v-model="scope.row.鐗╂枡浠ｇ爜" placeholder="璇疯緭鍏ョ墿鏂欑紪鐮�" @keyup.native.f7="openDataDialog(3, scope.row)"
- @dblclick.native="openDataDialog(3, scope.row)" />
- </template>
- </el-table-column>
- <el-table-column align="center" label="鐗╂枡鍚嶇О" width="120">
- <template slot-scope="scope">
- <span>{{ scope.row.鐗╂枡鍚嶇О }}</span>
- </template>
- </el-table-column>
- <el-table-column align="center" label="瑙勬牸鍨嬪彿" width="120">
- <template slot-scope="scope">
- <span>{{ scope.row.瑙勬牸鍨嬪彿 }}</span>
- </template>
- </el-table-column>
- <el-table-column align="center" label="璁￠噺鍗曚綅" width="120">
- <template slot-scope="scope">
- <span>{{ scope.row.璁￠噺鍗曚綅 }}</span>
- </template>
- </el-table-column>
- <el-table-column align="center" label="瀹炲彂鏁伴噺" width="120">
- <template slot-scope="scope">
- <el-input-number v-model="scope.row.HQty" :min="1" style="width: 90px;"
- controls-position="right"></el-input-number>
- </template>
- </el-table-column>
- <el-table-column align="center" label="鍗曚环" width="120">
- <template slot-scope="scope">
- <el-input-number v-model="scope.row.HPrice" :min="0" style="width: 90px;"
- controls-position="right"></el-input-number>
- </template>
- </el-table-column>
- <el-table-column align="center" label="鍚◣鍗曚环" width="120">
- <template slot-scope="scope">
- <span>{{ scope.row.HTaxPrice }}</span>
- </template>
- </el-table-column>
- <el-table-column align="center" label="绋庣巼" width="120">
- <template slot-scope="scope">
- <span>{{ scope.row.HTaxRate }}</span>
- </template>
- </el-table-column>
- <el-table-column align="center" label="閲戦" width="120">
- <template slot-scope="scope">
- <span>{{ scope.row.HPrice * scope.row.HQty }}</span>
- </template>
- </el-table-column>
- <el-table-column align="center" label="浠风◣鍚堣" width="120">
- <template slot-scope="scope">
- <span>{{ scope.row.HTaxPrice * scope.row.HQty }}</span>
- </template>
- </el-table-column>
- <el-table-column align="center" label="鍙戣揣浠撳簱" width="120">
- <template slot-scope="scope">
- <el-input v-model="scope.row.鍙戣揣浠撳簱" placeholder="璇疯緭鍏ュ彂璐т粨搴�" @keyup.native.f7="openDataDialog(2, scope.row)"
- @dblclick.native="openDataDialog(2, scope.row)" />
- </template>
- </el-table-column>
- <el-table-column align="center" label="澶囨敞" width="120">
- <template slot-scope="scope">
- <el-input v-model="scope.row.HRemark" placeholder="璇疯緭鍏ュ娉�" />
- </template>
- </el-table-column>
- <el-table-column align="center" label="閲囪喘鏁伴噺" width="120">
- <template slot-scope="scope">
- <span>{{ scope.row.HReqBuyQty }}</span>
- </template>
- </el-table-column>
- <el-table-column align="center" label="鐢宠鍑哄簱鏁伴噺" width="120">
- <template slot-scope="scope">
- <span>{{ scope.row.HReqOutQty }}</span>
- </template>
- </el-table-column>
- <el-table-column align="center" label="褰撳墠搴撳瓨" width="120">
- <template slot-scope="scope">
- <span>{{ scope.row.HCurrentInventory }}</span>
- </template>
- </el-table-column>
- <el-table-column align="center" label="鎿嶄綔" width="55" fixed="right">
- <template slot-scope="scope">
- <el-button type="danger" icon="el-icon-delete" size="mini" circle
- @click="handleDeleteSysZb(scope.row)"></el-button>
- </template>
- </el-table-column>
- </el-table>
+
+ <el-tabs v-model="activeName1" type="border-card">
+ <el-tab-pane label="鏄庣粏淇℃伅" name="first">
+ <div style="margin-bottom: 10px;">
+ <el-button type="success" plain icon="el-icon-plus" @click="handleAddSysZb()" size="mini">澧炲姞涓�琛�</el-button>
+ <el-button type="success" plain icon="el-icon-plus" @click="handleAddSysZb(zbIndex, 1)"
+ size="mini">鎻掑叆涓�琛�</el-button>
+ <el-button type="success" plain icon="el-icon-plus" @click="handleCopyZbRow" size="mini">澶嶅埗涓�琛�</el-button>
+ <el-button type="success" plain icon="el-icon-arrow-up" @click="handleMoveRowUp(zbSelForm)"
+ size="mini">涓婄Щ</el-button>
+ <el-button type="success" plain icon="el-icon-arrow-down" @click="handleMoveRowDown(zbSelForm)"
+ size="mini">涓嬬Щ</el-button>
+ </div>
+ <el-table :data="editData" style="width: 100%" height="300" width="100%" ref="zbTable"
+ @selection-change="handleTableZbEdit" :row-class-name="rowSysZbIndex" show-summary border>
+ <el-table-column type="selection" width="55" align="center" />
+ <el-table-column align="center" label="搴忓彿" type="index" width="80" />
+ <el-table-column align="center" label="鍣ㄥ叿浠ｇ爜" width="120">
+ <template slot-scope="scope">
+ <el-input v-model="scope.row.HMaterCode" placeholder="璇疯緭鍏�" @keyup.native.f7="openDataDialog(8, scope.row)"
+ @dblclick.native="openDataDialog(8, scope.row)" />
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="鍣ㄥ叿鍚嶇О" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.HMaterName }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="瑙勬牸鍨嬪彿" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.HMaterSpec }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="璁￠噺鍗曚綅浠ｇ爜" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.HUnitCode }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="璁￠噺鍗曚綅" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.HUnitName }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="搴斿彂鏁伴噺" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.HQtyMust }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="瀹炲彂鏁伴噺" width="120">
+ <template slot-scope="scope">
+ <el-input-number v-model="scope.row.HQty" :min="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 v-model="scope.row.HWHCode" placeholder="璇疯緭鍏�" @keyup.native.f7="openDataDialog(2, scope.row ,eHWHType=2)"
+ @dblclick.native="openDataDialog(2, scope.row ,eHWHType=2)" />
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="鍙戞枡浠撳簱" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.HWHName }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="浠撲綅浠ｇ爜" width="120">
+ <template slot-scope="scope">
+ <el-input v-model="scope.row.HSPCode" 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">
+ <span>{{ scope.row.HSPName }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="澶囨敞" width="120">
+ <template slot-scope="scope">
+ <el-input v-model="scope.row.HRemark" placeholder="璇疯緭鍏ュ娉�" />
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="鎿嶄綔" width="55" fixed="right">
+ <template slot-scope="scope">
+ <el-button type="danger" icon="el-icon-delete" size="mini" circle
+ @click="handleDeleteSysZb(scope.row)"></el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ </el-tab-pane>
+ <!-- <el-tab-pane label="姹囨�讳俊鎭�" name="second">
+ <el-table :data="editData1" style="width: 100%" height="300" width="100%" ref="zbTable"
+ @selection-change="handleTableZbEdit" :row-class-name="rowSysZbIndex" show-summary border>
+ <el-table-column type="selection" width="55" align="center" />
+ <el-table-column align="center" label="搴忓彿" type="index" width="80" />
+ <el-table-column align="center" label="鐗╂枡浠ｇ爜" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.鐗╂枡浠ｇ爜 }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="鐗╂枡鍚嶇О" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.鐗╂枡鍚嶇О }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="瑙勬牸鍨嬪彿" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.瑙勬牸鍨嬪彿 }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="鍗曟嵁鍙�" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.鍗曟嵁鍙� }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="鎵规" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.鎵规 }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="瀹炲彂鏁伴噺" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.瀹炲彂鏁伴噺 }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="鍙戞枡浠撳簱浠ｇ爜" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.鍙戞枡浠撳簱浠ｇ爜 }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="鍙戞枡浠撳簱" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.鍙戞枡浠撳簱 }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="澶囨敞" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.琛ㄤ綋澶囨敞 }}</span>
+ </template>
+ </el-table-column>
+ </el-table>
+ </el-tab-pane> -->
+ </el-tabs>
+
</el-form>
- <!-- 閮ㄩ棬寮圭獥 -->
+ <!-- 寮圭獥 -->
<el-dialog :title="dialogTitle" :visible.sync="openData" width="1280px" append-to-body>
- <Dept @deptEmitDb="dbEmitData" @deptEmit="emitData" v-if="deptShow" />
- <Warehouse @deptEmitDb="dbEmitData" @deptEmit="emitData" v-if="warehouseShow" />
- <Material @deptEmitDb="dbEmitData" @deptEmit="emitData" v-if="materialShow" />
+ <Dept @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="deptShow" />
+ <Warehouse @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="warehouseShow" />
<GyEmployee @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyEmployeeShow" />
+ <GySupplier @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gySupplierShow" />
+ <GyCustomer @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyCustomerShow" />
+ <GyMould @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyMouldShow" />
+ <GyStockPlace @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyStockPlaceShow" />
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="deptClickSub">纭� 瀹�</el-button>
<el-button @click="deptClose">鍙� 娑�</el-button>
@@ -366,16 +337,19 @@
<script>
import axios from 'axios'
-import Dept from '@/views/component/dept'
-import Warehouse from '@/views/component/warehouse'
-import Material from '@/views/component/material'
import RowSettings from '@/views/component/rowSettings'
import GyEmployee from '@/views/basic/gyEmployee/gyEmployee.vue'
+import Dept from '@/views/basic/gy/gyDepartment'
+import Warehouse from '@/views/basic/gyWarehouse/gyWarehouse.vue'
+import GySupplier from '@/views/basic/gy/gySupplier.vue'
+import GyCustomer from '@/views/GyCustomer'
+import GyMould from '@/views/scMould/basicModeling/Gy_MouldFileList.vue'
+import GyStockPlace from '@/views/basic/gyStockPlace/gyStockPlace.vue'
import moment from 'moment';
export default {
name: 'Sc_MouldProdOutBillEdit',
- components: { Dept, Warehouse, Material, RowSettings, GyEmployee },
+ components: { Dept, Warehouse, RowSettings, GyEmployee,GySupplier,GyCustomer,GyMould,GyStockPlace },
props: {
OperationType: { type: Number, },
linterid: { type: Number, },
@@ -392,27 +366,35 @@
zzSelDis: false,
rowHideShow: false,
openRowHide: false,
- hPriceTypeList: ['鎴愭湰浠�', '缁撶畻浠�'],
+ hSupTypeList: [{name:'渚涘簲鍟�',id:1,},{name:'瀹㈡埛',id:2},{name:'杞﹂棿閮ㄩ棬',id:3}],
addBtnShow: false,
zbIndex: null,
zbSelForm: {},//瀛愯〃閫変腑鏁版嵁
dialogTypeNum: null,//閮ㄩ棬寮圭獥1锛屼粨搴撳脊绐�2
deptShow: false,//閮ㄩ棬鏁版嵁缁勪欢
warehouseShow: false,//浠撳簱鏁版嵁缁勪欢
- materialShow: false,//鐗╂枡鏁版嵁缁勪欢
gyEmployeeShow: false,//閿�鍞憳鏁版嵁缁勪欢
+ gySupplierShow: false,//渚涘簲鍟嗘暟鎹粍浠�
+ gyCustomerShow: false,//瀹㈡埛鏁版嵁缁勪欢
+ gyMouldShow: false,//鍣ㄥ叿鏁版嵁缁勪欢
+ gyStockPlaceShow: false,//浠撲綅鏁版嵁缁勪欢
+ eHWHType:1,//浠撳簱寮圭獥鍖哄垎鏍囧織
+ empType:1,//鑱屽憳寮圭獥鍖哄垎鏍囧織
+ deptType:1,//閮ㄩ棬寮圭獥鍖哄垎鏍囧織
deptform: {},//寮圭獥閫変腑鏁版嵁
openData: false,//鏁版嵁寮圭獥
dialogTitle: '',
organizationList: [],//缁勭粐鍒楄〃
subDisabled: false,//缂栬緫椤甸潰淇濆瓨鎸夐挳鏄惁绂佺敤(true绂佺敤锛宖alse鍙敤)
// OperationType: this.$route.query.OperationType,//淇濆瓨绫诲瀷锛堟柊澧�1淇敼3锛�
- HInterID: null,
+ HInterID: 0,
baseURL: process.env.VUE_APP_BASE_API,
checkedSysZb: [],
- editData: [],//閿�鍞嚭搴撳崟瀛愯〃
+ editData: [],//瀛愯〃
+ editData1: [],//姹囨�诲瓙琛�
editBtData: [],//瀛愯〃琛ㄥご
activeName: 'first',
+ activeName1:'first',
// 寮瑰嚭灞傛爣棰�
title: "",
// 鏄惁鏄剧ず寮瑰嚭灞�
@@ -452,14 +434,20 @@
form: {},
// 琛ㄥ崟鏍￠獙
rules: {
- HSupName: [
- { required: true, message: "瀹㈡埛涓嶈兘涓虹┖", trigger: "blur" }
- ],
HDate: [
{ required: true, message: "鏃ユ湡涓嶈兘涓虹┖", trigger: "blur" }
],
- HExRate: [
- { required: true, message: "姹囩巼涓嶈兘涓虹┖", trigger: "blur" }
+ HWHName: [
+ { required: true, message: "鍣ㄥ叿浠撳簱涓嶈兘涓虹┖", trigger: "blur" }
+ ],
+ HSecManagerName: [
+ { required: true, message: "楠屾敹鍛樹笉鑳戒负绌�", trigger: "blur" }
+ ],
+ HKeeperName: [
+ { required: true, message: "淇濈鍛樹笉鑳戒负绌�", trigger: "blur" }
+ ],
+ HDeptName: [
+ { required: true, message: "閮ㄩ棬涓嶈兘涓虹┖", trigger: "blur" }
]
}
};
@@ -467,9 +455,6 @@
created() {
this.fetchData()
this.getdata()
- },
- beforeDestroy() {
- this.$destroy()
},
methods: {
fetchData() {
@@ -486,118 +471,7 @@
console.log(this.copyType, this.OperationType)
this.formShow = false
this.formLoading = true
-
- 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("鎺ュ彛璇锋眰澶辫触!");
- });
- }
- } else if ((this.OperationType == 1 && this.copyType != 1) || (!this.OperationType && !this.copyType)) {
+ if ((this.OperationType == 1 && this.copyType != 1) || (!this.OperationType && !this.copyType)) {
this.handleAdd()
} else if (this.OperationType == 3 || this.copyType == 1) {
this.handleUpdate()
@@ -611,70 +485,81 @@
datajson = JSON.parse(decodeURI(arr));
return datajson;
},
- //鏍规嵁涓诲唴鐮佷笌瀛愬唴鐮佽幏鍙栨簮鍗曢攢鍞鍗曟暟鎹�
- getPushSourceBillInit(HSourceInterID, HSourceEntryID) {
- axios.get(this.baseURL + '/Xs_SeOrderBill/loadXs_SeOrderBill_Push', {
- params: {
- "HInterID": HSourceInterID
- , "HSubID": HSourceEntryID
- },
- }).then(response => {
- let result = response.data
- if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- this.temp = result.data[0];
- } else {
- this.temp = result.data;
- }
- }).catch(error => {
- this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
- });
- },
handleRowHide() {
this.rowHideShow = true
this.openRowHide = true
},
rowSetClose(val) {
-
this.rowHideShow = false
this.openRowHide = val
- this.$destroy()
},
organizationChange(val) {
// let options=undefined
// this.form=this.organizationList.find(option => option.ID === val)?.Name || '';
},
- //閮ㄩ棬寮圭獥璧嬪��
+ //寮圭獥璧嬪��
dbEmitData(deptRow, num) {
- // num=1閮ㄩ棬 num=2鍑哄簱浠撳簱
+ // num=1閮ㄩ棬 num=2浠撳簱
console.log(deptRow)
- if (deptRow.HItemID) {
+ if (deptRow.HItemID || deptRow.hmainid) {
if (num == 1) {
- this.form.HDeptName = deptRow.閮ㄩ棬鍚嶇О
- this.form.HDeptID = deptRow.HItemID
- this.form.HManagerName = deptRow.璐熻矗浜�
+ if(this.deptType == 1){
+ this.form.HDeptName = deptRow.閮ㄩ棬鍚嶇О
+ this.form.HDeptID = deptRow.HItemID
+ }else{
+ this.form.HSupName = deptRow.閮ㄩ棬鍚嶇О
+ this.form.HSupID = deptRow.HItemID
+ }
this.deptShow = false
this.openData = false
} else if (num == 2) {
- this.editData[this.zbIndex].HWHID = deptRow.HItemID;
- this.editData[this.zbIndex].鍙戣揣浠撳簱 = deptRow.浠撳簱鍚嶇О;
+ if(this.eHWHType == 1){
+ this.form.HWHName = deptRow.浠撳簱鍚嶇О
+ this.form.HWHID = deptRow.HItemID
+ this.form.HWHNumber = deptRow.浠撳簱浠ｇ爜
+ }else{
+ this.editData[this.zbIndex].HWHID = deptRow.HItemID
+ this.editData[this.zbIndex].HWHCode = deptRow.浠撳簱浠ｇ爜
+ this.editData[this.zbIndex].HWHName = deptRow.浠撳簱鍚嶇О
+ }
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
- this.openData = false
} else if (num == 4) {
- this.form.HEmpName = deptRow.鑱屽憳鍚嶇О
- this.form.HEmpID = deptRow.HItemID
+ if(this.empType == 1){
+ this.form.HSecManagerName = deptRow.鑱屽憳鍚嶇О
+ this.form.HSecManagerID = deptRow.HItemID
+ }else{
+ this.form.HKeeperName = deptRow.鑱屽憳鍚嶇О
+ this.form.HKeeperID = deptRow.HItemID
+ }
this.gyEmployeeShow = false
+ this.openData = false
+ } else if (num == 6) {
+ this.form.HSupName = deptRow.渚涘簲鍟嗗悕绉�
+ this.form.HSupID = deptRow.HItemID
+ this.gySupplierShow = false
+ this.openData = false
+ } else if (num == 7) {
+ this.form.HSupName = deptRow.瀹㈡埛鍚嶇О
+ this.form.HSupID = deptRow.HItemID
+ this.gyCustomerShow = false
+ this.openData = false
+ } else if (num == 8){
+ this.editData[this.zbIndex].HMaterID = deptRow.hmainid
+ this.editData[this.zbIndex].HMaterCode = deptRow.妯″叿缂栧彿
+ this.editData[this.zbIndex].HMaterName = deptRow.妯″叿鍚嶇О
+ this.editData[this.zbIndex].HMaterSpec = deptRow.妯″叿鍨嬪彿
+ this.editData[this.zbIndex].HUnitID = deptRow.HUnitID
+ this.editData[this.zbIndex].HUnitCode = deptRow.璁￠噺鍗曚綅浠ｇ爜
+ this.editData[this.zbIndex].HUnitName = deptRow.璁￠噺鍗曚綅
+ this.gyMouldShow = false
+ this.openData = false
+ } else if (num == 9){
+ this.editData[this.zbIndex].HSPID = deptRow.HMainID
+ this.editData[this.zbIndex].HSPCode = deptRow.浠撲綅浠ｇ爜
+ this.editData[this.zbIndex].HSPName = deptRow.浠撲綅鍚嶇О
+ this.gyStockPlaceShow = false
this.openData = false
}
} else {
@@ -695,63 +580,31 @@
this.openData = false
},
- //閿�鍞嚭搴撳崟鏂板缂栬緫琛ㄥ崟鍒濆鍖�
+ //琛ㄥ崟鍒濆鍖�
reset() {
this.form = {
- BillType: '1402',
HBillNo: '',
- HInterID: '',
- HBillSubType: '1205',
+ HInterID: 0,
HDate: new Date(),
- HMainSourceInterID: 0,
- HMainSourceEntryID: 0,
- HMainSourceBillType: '',
- HMainSourceBillNo: '',
- HEmpName: '',
- HEmpID: 0,
+ HInnerBillNo:'',
+ HWHName:'',
+ HWHNumber:'',
+ HWHID:0,
+ HOrgID:sessionStorage["OrganizationID"] - 0,
+ HSecManagerName:'',
+ HSecManagerID:0,
+ HKeeperName:'',
+ HKeeperID:0,
HDeptName: '',
HDeptID: 0,
- HManagerName: '',
- HManagerID: 0,
- HSupName: sessionStorage["HSupName"],
- HSupID: sessionStorage["HSupID"],
- HLinkMan: '',
- HLinkPhone: '',
- HSecManagerName: '',
- HSecManagerID: 0,
- HKeeperName: '',
- HKeeperID: 0,
- HRemark: '',
- HProjectNumber: '',
- HProjectID: 0,
- HProjectName: '',
- HGroupName: '',
- HGroupID: 0,
- HWHName: '',
- HWHID: 0,
- HConveyCompName: '',
- HConveyCompID: 0,
- HConveyTypeName: '',
- HConveyTypeID: 0,
- HConveyMoney: '0',
- HCarriage: '0',
- HSTOCKORGID: sessionStorage["OrganizationID"] - 0,//缁勭粐id
- HOWNERID: sessionStorage["OrganizationID"] - 0,
- HSCWHName: '',
- HSCWHID: 0,
- HCheckStatusMan: '',
- HExplanation: '',
- HInnerBillNo: '',
- HCurName: '浜烘皯甯�',
- HCurID: 1,
- HExRate: '1',
- HSellSName: '',
- HSellSID: 0,
- HCusBalance: '0',
- HCreditRating_Now: '0',
- HAvailableBalance: '0',
- HPriceType: '鎴愭湰浠�',
- HOrgID: sessionStorage["OrganizationID"] - 0,
+ HSupTypeID: 1,
+ HSupName:'',
+ HSupID:0,
+ HSourceBillType:'',
+ XDH:'',
+ HExplanation:'',
+ HRemark:'',
+
HMaker: '',
HUpDater: '',
HChecker: '',
@@ -764,21 +617,35 @@
HDeleteDate: '',
}
this.editData = []
+ this.editData1 = []
this.editBtData = []
this.ids = []
this.subDisabled = false
this.addBtnShow = false
// this.$refs.tableData.clearSelection()
this.activeName = 'first'
+ this.activeName1 = 'first'
this.resetForm("form");
},
//閫�鍑�
close() {
this.reset()
-
+ console.log(this.$route.path)
if (!this.OperationType && !this.copyType) {
- const obj = { path: "/sell/sellOut/sellOutBillEdit", name: "SellOutBillEdit" };
- this.$tab.closePage(obj);
+ console.log(this.$route.path)
+ const obj = { fullPath: this.$route.path, path: this.$route.path, name: this.$route.name, };
+ this.$tab.closePage(obj).then(res => {
+ const latestView = res.visitedViews.slice(-1)[0]
+ if (latestView) {
+ this.$router.push(latestView.fullPath)
+ } else {
+ if (obj.name === 'Dashboard') {
+ this.$router.replace({ path: '/redirect' + obj.fullPath })
+ } else {
+ this.$router.push('/')
+ }
+ }
+ });
} else {
this.formShow = false
this.$emit('editClose', false)
@@ -794,8 +661,6 @@
this.form.HDeptName = dataForm.HDeptName
this.form.HEmpID = dataForm.HEmpID
this.form.HEmpName = dataForm.HEmpName
- this.form.HManagerID = dataForm.HManagerID
- this.form.HManagerName = dataForm.HManagerName
}).catch(error => {
this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
});
@@ -816,44 +681,16 @@
})
},
getHBillNo() {
- axios.get(this.baseURL + "/WEBSController/GetMaxBillNoAndID_Json", {
+ axios.get(this.baseURL + "/Web/GetMAXNum", {
params: {
- HBillType: '1205'
+ HBillType: '3802'
}
}).then(response => {
this.form.HMaker = sessionStorage["HUserName"]
this.form.HBillNo = response.data.data[0].HBillNo
- this.form.HInterID = response.data.data[0].HInterID
+ this.form.HInterID = 0
// this.copyType = 0
// this.getCzyglByUser()
- }).catch(error => {
- this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
- });
- },
- //鑾峰彇閿�鍞嚭搴撳崟瀵瑰簲鐨勬潯鐮佹槑缁�
- getBarCodeNoteBySellOutBill(rowHmainid) {
- axios.get(this.baseURL + '/Kf_SellOutBill/BarCodeNote', {
- params: { "HInterID": rowHmainid }
- }).then(response => {
- if (response.data.count == 1) {
- if (response.data.data[2].length > 0) {
- this.$modal.msgError("褰撳墠鍗曟嵁鐢辨壂鐮佺敓鎴愶紝涓嶅彲浠ョ紪杈戯紒");
- this.subDisabled = true
- }
- } else { }
- }).catch(error => {
- this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
- });
- },
- //#region 鏍规嵁瀹㈡埛鑾峰彇瀹㈡埛浣欓
- getCustomerBalance(HCusID) {
- axios.get(this.baseURL + '/Xs_CusRatingChangeBill/getCustomerBalance', {
- params: { "HCusID": HCusID, 'CurUserName': sessionStorage["HUserName"] }
- }).then(response => {
- var data = response.data.data[0];
- this.form.HCusBalance = data.HCusBalance
- this.form.HCreditRating_Now = data.HCreditRating_Now
- this.form.HAvailableBalance = data.HAvailableBalance
}).catch(error => {
this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
});
@@ -863,173 +700,75 @@
this.reset()
let rowHmainid = this.linterid
console.log(this.linterid)
- axios.get(this.baseURL + "/Kf_SellOutBill/cx", {
- params: { 'HInterID': rowHmainid }
+ //涓昏〃
+ axios.get(this.baseURL + "/Sc_MouldProdOutBill/Sc_MouldProdOutBillListCheckDetai", {
+ params: { 'HID': rowHmainid }
}).then(response => {
- if (response.data.count == 1) {
- var result = response.data
- var data = response.data.data[0]
- this.form.BillType = data.HSourceBillType
+ if (response.data.code == 1) {
+ var data = response.data.data.h_v_Sc_MouldProdOutHouseBill_Edit[0]
+ console.log(data)
if (this.copyType == 1) {
this.getHBillNo()
let date = new Date()
this.form.HDate = moment(date).format('YYYY-MM-DDTHH:mm:ss')
} else {
- this.form.HBillNo = data.鍗曟嵁鍙�
- this.form.HInterID = data.hmainid
- 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.HBillSubType = data.HBillSubType
- this.form.HMainSourceInterID = data.HMainSourceInterID
- this.form.HMainSourceEntryID = data.HMainSourceEntryID
- this.form.HMainSourceBillType = data.HMainSourceBillType
- this.form.HMainSourceBillNo = data.HMainSourceBillNo
- this.form.HEmpName = data.涓氬姟鍛�
- this.form.HEmpID = data.HEmpID
- this.form.HDeptName = data.閮ㄩ棬
- this.form.HDeptID = data.HDeptID
- this.form.HManagerName = data.涓荤
- this.form.HManagerID = data.HManagerID
- this.form.HSupName = data.瀹㈡埛
- this.form.HSupID = data.HSupID
- this.form.HLinkMan = data.鑱旂郴浜�
- this.form.HLinkPhone = data.鑱旂郴鐢佃瘽
- this.form.HSecManagerName = data.鍙戣揣浜�
- this.form.HSecManagerID = data.HSecManagerID
- this.form.HKeeperName = data.淇濈鍛�
- this.form.HKeeperID = data.HKeeperID
- this.form.HRemark = data.琛ㄥご澶囨敞
- this.form.HProjectNumber = data.椤圭洰缂栫爜
- this.form.HProjectID = data.HProjectID
- this.form.HProjectName = data.椤圭洰鍚嶇О
- this.form.HGroupName = data.鐝粍
- this.form.HGroupID = data.HGroupID
- this.form.HWHName = data.涓昏〃浠撳簱
- this.form.HWHID = data.HWHID_Main
- this.form.HConveyCompName = data.杩愯緭鍏徃
- this.form.HConveyCompID = data.HConveyCompID
- this.form.HConveyTypeName = data.杩愯緭鏂瑰紡
- this.form.HConveyTypeID = data.HConveyTypeID
- this.form.HConveyMoney = data.HConveyMoney
- this.form.HCarriage = data.杩愯垂
- this.form.HSTOCKORGID = data.HSTOCKORGID
- this.form.HOWNERID = data.HOWNERID
- this.form.HSCWHName = data.涓昏〃璋冨嚭浠撳簱
- this.form.HSCWHID = data.HSCWHID
- this.form.HCheckStatusMan = data.鏍搁攢浜�
- this.form.HExplanation = data.鎽樿
- this.form.HInnerBillNo = data.鍐呴儴鍗曟嵁鍙�
- this.form.HCurName = data.甯佸埆
- this.form.HCurID = data.HCurID
- this.form.HExRate = data.姹囩巼
- this.form.HSellSName = data.閿�鍞柟寮�
- this.form.HSellSID = data.HSellSID
- // this.form.HCusBalance=data
- // this.form.HCreditRating_Now=HConveyMoney
- // this.form.HAvailableBalance=data
- this.form.HPriceType = data.鍗曚环绫诲瀷
- this.form.HOrgID = data.HOrgID
- this.getCustomerByCusID(response.data.data[0].HSupID)//鏍规嵁瀹㈡埛鑾峰彇鑱旂郴浜猴紝鑱旂郴浜虹數璇�
- this.getBarCodeNoteBySellOutBill(rowHmainid)//鑾峰彇閿�鍞嚭搴撳崟瀵瑰簲鐨勬潯鐮佹槑缁嗘槸鍚﹀彲缂栬緫
- for (var i = 0; i < result.data.length; i++) {
- this.editData.push(
- {
- "HMaterID": result.data[i].HMaterID
- , "鐗╂枡浠ｇ爜": result.data[i].鐗╂枡浠ｇ爜
- , "鐗╂枡鍚嶇О": result.data[i].鐗╂枡鍚嶇О
- , "瑙勬牸鍨嬪彿": result.data[i].瑙勬牸鍨嬪彿
- , "HUnitID": result.data[i].HUnitID
- , "璁￠噺鍗曚綅": result.data[i].璁￠噺鍗曚綅
- , "HQtyMust": result.data[i].搴斿彂鏁伴噺.toFixed(6)
- , "HQty": result.data[i].鏁伴噺.toFixed(6)
- , "HPieceQty": result.data[i].浠舵暟.toFixed(0)
- , "HPrice": result.data[i].鍗曚环.toFixed(4)
- , "HTaxPrice": result.data[i].鍚◣鍗曚环.toFixed(4)
- , "HTaxRate": result.data[i].绋庣巼
- , "HMoney": (result.data[i].鏁伴噺 * result.data[i].鍗曚环).toFixed(2)
- , "HTaxMoney": (result.data[i].鏁伴噺 * result.data[i].鍚◣鍗曚环, 2).toFixed(2)
- , "HWHID": result.data[i].hwhid
- , "鍙戣揣浠撳簱": result.data[i].鍙戣揣浠撳簱
- , "HRemark": result.data[i].琛ㄤ綋澶囨敞
- , "HQty_Full": result.data[i].婊¤溅閲嶉噺
- , "HQty_Empty": result.data[i].绌鸿溅閲嶉噺
- , "HQty_Back": result.data[i].鍥炶溅閲嶉噺
- , "HCostPrice": result.data[i].鎴愭湰鍗曚环
- , "HCostMoney": result.data[i].鎴愭湰閲戦
- , "HSalePrice": result.data[i].閿�鍞崟浠�
- , "HSeOrderInterID": result.data[i].HSeOrderInterID
- , "HSeOrderEntryID": result.data[i].HSeOrderEntryID
- , "HSeOrderBillNo": result.data[i].閿�鍞鍗曞彿
- , "HSourceInterID": result.data[i].HSourceInterID
- , "HSourceEntryID": result.data[i].HSourceEntryID
- , "HSourceBillNo": result.data[i].婧愬崟鍗曞彿
- , "HSourceBillType": result.data[i].HSourceBillType
- , "HRelationQty": result.data[i].鍏宠仈鏁伴噺
- , "HRelationMoney": result.data[i].鍏宠仈閲戦
- , 'HSPID': result.data[i].HSPID
- , 'HSPName': result.data[i].浠撲綅
- , 'HSPGroupID': result.data[i].HSPGroupID
- , "HSPGroupName": result.data[i].浠撲綅缁�
- , 'HSCWHID': result.data[i].HSCWHID
- , 'HSCWHName': result.data[i].璋冨嚭浠撳簱
- , 'HSCSPID': result.data[i].HSCSPID
- , 'HSCSPName': result.data[i].璋冨嚭浠撲綅
- , 'HBatchNo': result.data[i].鎵规
- , 'HPOOrderInterID': result.data[i].閲囪喘璁㈠崟鍐呯爜
- , 'HPOOrderEntryID': result.data[i].閲囪喘璁㈠崟瀛愬唴鐮�
- , 'HPOOrderBillNo': result.data[i].閲囪喘璁㈠崟鍙�
- , 'HPropertyID': result.data[i].HPropertyID
- , 'HPropertyName': result.data[i].杈呭姪灞炴��
- , 'HSecUnitID': result.data[i].HSecUnitID
- , 'HSecUnitName': result.data[i].杈呭姪璁￠噺鍗曚綅
- , 'HSecUnitRate': result.data[i].鎹㈢畻鐜�
- , 'HEngineNum': result.data[i].鍙戝姩鏈哄彿
- , 'HUnderPanNum': result.data[i].鍦扮洏鍙�
- , 'HLeaveFactCard': result.data[i].鍑哄巶璇�
- , 'HReqBuyQty': result.data[i].鐢宠閲囪喘鏁伴噺
- , 'HReqOutQty': result.data[i].鐢宠鍑哄簱鏁伴噺
- , 'HCurrentInventory': result.data[i].褰撳墠搴撳瓨
- }
- );
- }
- if (data.鐘舵�� != '鍒涘缓' && this.copyType != 1) {
- this.$modal.msgError("姝ゆ潯鏁版嵁涓嶆槸鍒涘缓鐘舵�侊紝涓嶈兘淇敼");
- this.subDisabled = true
+ this.form = {
+ "HBillNo": data.鍗曟嵁鍙�
+ , "HDate": data.鏃ユ湡
+ , "HInnerBillNo": data.鍐呴儴鍗曟嵁鍙�
+ , "HWHID": data.HWHID //浠撳簱ID
+ , "HWHName": data.浠撳簱 //浠撳簱鍚嶇О
+ , "HSecManagerID": data.hsecmanagerid //楠屾敹鍛業D
+ , "HSecManagerName": data.棰嗘枡浜� //楠屾敹鍛樺悕绉�
+ , "HKeeperID": data.hkeeperid //淇濈鍛業D
+ , "HKeeperName": data.鍙戞枡浜� //淇濈鍛樺悕绉�
+ , "HDeptID": data.HDeptID //閮ㄩ棬ID
+ , "HDeptName": data.閮ㄩ棬 //閮ㄩ棬鍚嶇О
+ , "HSourceBillType": "" //婧愬崟绫诲瀷
+ , "XDH": "" //閫夊崟鍙�
+ , "HExplanation": data.鎽樿 //鎽樿
+ , "HRemark": data.琛ㄥご澶囨敞 //澶囨敞
+ , "HSupTypeID": data.寰�鏉ョ被鍨� //閫夊崟鍙�
+ , "HSupName": data.寰�鏉ュ崟浣�
+ , "HSupID": data.HSupID
+
+ , "HMaker": data.鍒跺崟浜�
+ , "HMakeDate": data.鍒跺崟鏃ユ湡 == null ? "" : data.鍒跺崟鏃ユ湡
+ , "HChecker": data.瀹℃牳浜�
+ , "HCheckDate": data.瀹℃牳鏃ユ湡 == null ? "" : data.瀹℃牳鏃ユ湡
+ , "HUpDater": data.淇敼浜�
+ , "HUpDateDate": data.淇敼鏃ユ湡 == null ? "" : data.淇敼鏃ユ湡
+ , "HCloseMan": data.鍏抽棴浜�
+ , "HCloseDate": data.鍏抽棴鏃ユ湡 == null ? "" : data.鍏抽棴鏃ユ湡
+ , "HDeleteMan": data.浣滃簾浜�
+ , "HDeleteDate": data.浣滃簾鏃ユ湡 == null ? "" : data.浣滃簾鏃ユ湡
+ }
}
this.formShow = true
this.formLoading = false
-
}
}).catch(error => {
+ console.log(error)
this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
});
- },
- //鏍规嵁瀹㈡埛甯﹀嚭鑱旂郴浜恒�佽仈绯荤數璇�
- getCustomerByCusID(HCusID) {
- axios.get(this.baseURL + "/Xs_SeOrderBill/getCustomerByCusID", {
- params: {
- HCusID: HCusID
- }
+ //瀛愯〃
+ axios.get(this.baseURL + "/Sc_MouldProdOutBill/Sc_MouldProdOutBillListProjectDetai", {
+ params: { 'sqlWhere': "and hmainid=" + rowHmainid }
}).then(response => {
- this.form.鑱旂郴浜� = response.data.data[0].HLinkMan
- this.form.鑱旂郴鐢佃瘽 = response.data.data[0].HLinkPhone
- // this.form = response.data.data[0]
-
+ if (response.data.count == 1) {
+ var data = response.data
+ console.log(data)
+ this.editData = data.list[0]
+ this.editData1 = data.list[1]
+ this.formShow = true
+ this.formLoading = false
+ }
}).catch(error => {
+ console.log(error)
this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
});
},
- /** 閿�鍞嚭搴撳瓙琛ㄦ槑缁嗗簭鍙� */
+ /** 瀛愯〃鏄庣粏搴忓彿 */
rowSysZbIndex({ row, rowIndex }) {
row.index = rowIndex + 1;
},
@@ -1039,61 +778,29 @@
this.$modal.msgError("璇烽�夋嫨涓�琛屾暟鎹紪杈�!");
} else {
let obj = {
- HMaterID: 0,
- 鐗╂枡浠ｇ爜: '',
- 鐗╂枡鍚嶇О: '',
- 瑙勬牸鍨嬪彿: '',
- HUnitID: 0,
- 璁￠噺鍗曚綅: '',
- HQtyMust: 1,
- HQty: 1,
- HPieceQty: 0,
- HPrice: 0,
- HTaxPrice: 0,
- HTaxRate: 0,
- HMoney: 0,
- HTaxMoney: 0,
- HWHID: 0,
- 鍙戣揣浠撳簱: '',
- HRemark: '',
- HQty_Full: 0,
- HQty_Empty: 0,
- HQty_Back: 0,
- HCostPrice: 0,
- HCostMoney: 0,
- HSalePrice: 0,
- HSeOrderInterID: 741,
- HSeOrderEntryID: 18,
- HSeOrderBillNo: 'XSFH00000747',
- HSourceInterID: 741,
- HSourceEntryID: 18,
- HSourceBillNo: 'XSFH00000747',
- HSourceBillType: 1402,
- HRelationQty: 0,
- HRelationMoney: 0,
- HSPID: 0,
- HSPName: '',
- HSPGroupID: 0,
- HSPGroupName: '',
- HSCWHID: 0,
- HSCWHName: '',
- HSCSPID: 0,
- HSCSPName: '',
- HBatchNo: '',
- HPOOrderInterID: 0,
- HPOOrderEntryID: 0,
- HPOOrderBillNo: '',
- HPropertyID: 0,
- HPropertyName: '',
- HSecUnitID: 0,
- HSecUnitName: '',
- HSecUnitRate: 0,
- HEngineNum: '',
- HUnderPanNum: '',
- HLeaveFactCard: '',
- HReqBuyQty: 0,
- HReqOutQty: 0,
- HCurrentInventory: 0,
+ HBatchNo: "",
+ HDesignLife: 0,
+ HLeaveLife: 0,
+ HMaterCode:"",
+ HMaterID:0,
+ HMaterName:"",
+ HMaterSpec:"",
+ HMoney:0,
+ HPrice:0,
+ HQty:0,
+ HQtyMust:0,
+ HSPCode:"",
+ HSPID:0,
+ HSPName:"",
+ HStockOrgID:sessionStorage["OrganizationID"] - 0,//缁勭粐id
+ HUnitCode:"",
+ HUnitID:0,
+ HUnitName:"",
+ HUseLife:0,
+ HWHCode:"",
+ HWHID:0,
+ HWHName:"",
+ HRemark:"",
}
if (index) {
this.editData.splice(index, 0, obj);
@@ -1161,42 +868,38 @@
this.$refs.zbTable.toggleRowSelection(del_row, false) //璁剧疆杩欎竴琛屽彇娑堥�変腑
}
},
- //鑾峰彇鏈�澶у崟鎹彿_浠诲姟绫伙紙Type涓�0鏃跺彧鑾峰彇涓嶆柊澧炴祦姘村彿锛屼负1鏃舵柊澧炰笖鑾峰彇娴佹按鍙凤級
- get_MAXNum_Task(Type) {
- var sql = `exec h_p_Xt_GetMaxBillNo_SubType '1205','${this.form.HDate}',0,0,0,'${Type}','${this.form.HDeptID}'`;
- axios({
- method: 'get',
- url: this.baseURL + "/CommonModel/searchMethod",
- params: { "sql": sql, "user": sessionStorage["HUserName"], "ModRightNameCheck": "" },
- }).then(response => {
- if (response.data.count == 1) {
- this.form.HBillNo = response.data.data[0].HBillNo;
- } else {
- this.$modal.msgError(response.data.code + response.data.Message);
- }
- }).catch(error => {
- this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
- });
- },
// 缂栬緫鎻愪氦淇濆瓨
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
let fhck = false
- this.editData.map((item, index) => {
- if (!item.鍙戣揣浠撳簱) {
+ if(this.editData.length == 0){
fhck = true
- this.$modal.msgError("绗�" + (index + 1) + "琛岋細鍙戣揣浠撳簱鏈�夋嫨锛�");
+ this.$modal.msgError("娌℃湁鐗╂枡鏄庣粏璁板綍锛�");
+ }
+ this.editData.map((item, index) => {
+ if (!item.HMaterID) {
+ fhck = true
+ this.$modal.msgError("绗�" + (index + 1) + "琛岋細鍣ㄥ叿鏈�夋嫨锛�");
+ }else if(!item.HWHID){
+ fhck = true
+ this.$modal.msgError("绗�" + (index + 1) + "琛岋細浠撳簱鏈�夋嫨锛�");
+ }else if(item.HQty == 0){
+ fhck = true
+ this.$modal.msgError("绗�" + (index + 1) + "琛岋細浜у搧鍏ュ簱璁板綍鏈壂鐮侊紙瀹炲彂鏁伴噺涓�0锛�");
}
})
this.$nextTick(() => {
if (!fhck) {
+ if(this.OperationType == 3){
+ this.form.HInterID = this.linterid
+ }
var sMainStr = JSON.stringify(this.form);
var sSubStr = JSON.stringify(this.editData);
- var sMainSub = sMainStr + ';' + sSubStr + ';' + sessionStorage["HUserName"] + ';' + this.OperationType;
+ var sMainSub = sMainStr + ';' + sSubStr + ';' + sessionStorage["HUserName"];
axios({
method: 'post',
- url: this.baseURL + "/Kf_SellOutBill/SaveSellOutBillList",
+ url: this.baseURL + "/Sc_MouldProdOutBill/SaveGetMouldProdOutBillList",
data: {
'msg': sMainSub
},
@@ -1204,12 +907,14 @@
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); //瀹℃牳
- }
+ // if (response.data.Verify == "Y") //鑷姩瀹℃牳
+ // {
+ // this.set_CheckBill(1, this.form); //瀹℃牳
+ // }
this.addBtnShow = true
+ this.close()
+ } else {
+ this.$modal.msgError(response.data.code + response.data.Message);
}
}).catch(error => {
this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
@@ -1223,8 +928,8 @@
set_CheckBill(num, form) {
var InterID = form.hmainid || form.HInterID
//閫昏緫瀹℃牳鏂规硶
- axios.get(this.baseURL + "/Kf_SellOutBill/AuditKf_SellOutBill", {
- params: { "HInterID": InterID, "IsAudit": num, "CurUserName": sessionStorage["HUserName"] }
+ axios.get(this.baseURL + "/Sc_MouldProdOutBill/AuditMouldProdOutBill", {
+ params: { "HInterID": InterID, "flag": num, "user": sessionStorage["HUserName"] }
}).then(response => {
let result = response.data
if (result.code == 1) {
@@ -1240,8 +945,11 @@
showReset() {
this.deptShow = false
this.warehouseShow = false
- this.materialShow = false
this.gyEmployeeShow = false
+ this.gySupplierShow = false
+ this.gyCustomerShow = false
+ this.gyMouldShow = false
+ this.gyStockPlaceShow = false
},
// 鎵撳紑鏁版嵁鍒楄〃寮圭獥
openDataDialog(num, row) {
@@ -1255,19 +963,46 @@
this.deptShow = true
this.openData = true
} else if (num == 2) {
- this.dialogTitle = '鍑哄簱浠撳簱鍒楄〃'
+ this.dialogTitle = '浠撳簱鍒楄〃'
this.warehouseShow = true
this.openData = true
- } else if (num == 3) {
- this.dialogTitle = '鐗╂枡鍒楄〃'
- this.materialShow = true
- this.openData = true
} else if (num == 4) {
- this.dialogTitle = '閿�鍞憳鍒楄〃'
+ if(this.empType == 1){
+ this.dialogTitle = '楠屾敹鍛樺垪琛�'
+ }else{
+ this.dialogTitle = '淇濈鍛樺垪琛�'
+ }
this.gyEmployeeShow = true
this.openData = true
- }
+ } else if (num == 6) {
+ this.dialogTitle = '渚涘簲鍟嗗垪琛�'
+ this.gySupplierShow = true
+ this.openData = true
+ } else if (num == 7) {
+ this.dialogTitle = '瀹㈡埛鍒楄〃'
+ this.gyCustomerShow = true
+ this.openData = true
+ } else if (num == 8) {
+ this.dialogTitle = '鍣ㄥ叿鍒楄〃'
+ this.gyMouldShow = true
+ this.openData = true
+ } else if (num == 9) {
+ this.dialogTitle = '浠撲綅鍒楄〃'
+ this.gyStockPlaceShow = true
+ this.openData = true
+ }
},
+ //鏍规嵁寰�鏉ョ被鍨嬪垽鏂線鏉ュ崟浣�
+ openDataDialogChoose(){
+ if(this.form.HSupTypeID == 1){
+ this.openDataDialog(6)
+ }else if(this.form.HSupTypeID == 2){
+ this.openDataDialog(7)
+ }else if(this.form.HSupTypeID == 3){
+ this.deptType = 2
+ this.openDataDialog(1)
+ }
+ }
}
};
</script>
diff --git a/src/views/scMould/warehouse/Sc_MouldProdOutBillList.vue b/src/views/scMould/warehouse/Sc_MouldProdOutBillList.vue
index 1aa1d91..06b0aea 100644
--- a/src/views/scMould/warehouse/Sc_MouldProdOutBillList.vue
+++ b/src/views/scMould/warehouse/Sc_MouldProdOutBillList.vue
@@ -181,7 +181,7 @@
v-if="rowHideShow" />
</el-dialog>
<!-- 缂栬緫 -->
- <el-dialog title="缂栬緫閿�鍞嚭搴撳崟" :visible.sync="openEdit" width="1480px" append-to-body class="xsckdBox" @close="close">
+ <el-dialog title="缂栬緫鍣ㄥ叿棰嗙敤鍑哄簱鍗�" :visible.sync="openEdit" width="1480px" append-to-body class="xsckdBox" @close="close">
<edit :OperationType=OperationType :linterid=this.rowForm.hmainid :HSouceBillType=this.rowForm.HSourceBillType
:copyType="copyType" @editClose="editClose" v-if="editShow" />
</el-dialog>
@@ -395,6 +395,11 @@
//缁欑┖鐨勬暟缁勮祴鍊�
for (var key in data1.list) {//寰簭閬嶅巻鏁扮粍
data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });//浠庢瘡涓璞′腑鎻愬彇鏁版嵁
+ //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+ var patrn = new RegExp(/^h/i);
+ if (patrn.test(data1.list[key].ColmCols)) {
+ this.titleData[key] = data1.list[key].ColmCols;
+ }
}
//鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
@@ -737,22 +742,18 @@
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete() {
this.$modal.confirm('纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠').then(() => {
- if (this.rowForm.鐘舵�� == "鍒涘缓") {
- axios.get(this.baseURL + "/Sc_MouldProdOutBill/DeltetMouldProdOutBill", {
- params: { 'HInterID': this.rowForm.hmainid.toString(), 'user': sessionStorage["HUserName"] }
- }).then(response => {
- if (response.data.count == 1) {
- this.getList()
- this.$modal.msgSuccess("鍒犻櫎鎴愬姛")
- } else {
- this.$modal.msgError("閿欒:" + result.code + result.Message);
- }
- }).catch(error => {
- this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
- });
- } else {
- this.$modal.msgError("姝ゆ潯鏁版嵁涓嶆槸鍒涘缓鐘舵��,鏃犳硶鍒犻櫎!");
- }
+ axios.get(this.baseURL + "/Sc_MouldProdOutBill/DeltetMouldProdOutBill", {
+ params: { 'HInterID': this.rowForm.hmainid.toString(), 'user': sessionStorage["HUserName"] }
+ }).then(response => {
+ if (response.data.count == 1) {
+ this.getList()
+ this.$modal.msgSuccess("鍒犻櫎鎴愬姛")
+ } else {
+ this.$modal.msgError("閿欒:" + result.code + result.Message);
+ }
+ }).catch(error => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
}).catch(() => { })
},
// 鍙嶅鏍�/瀹℃牳鏁版嵁
diff --git a/src/views/sell/Kf_ICStockBillMainList/Kf_ICStockBillMainList.vue b/src/views/sell/Kf_ICStockBillMainList/Kf_ICStockBillMainList.vue
index 98a6022..6e9bc8b 100644
--- a/src/views/sell/Kf_ICStockBillMainList/Kf_ICStockBillMainList.vue
+++ b/src/views/sell/Kf_ICStockBillMainList/Kf_ICStockBillMainList.vue
@@ -445,7 +445,7 @@
}}</span>
<el-button
type="text"
- @click="handleEdit(row, (OperationType = 3))"
+ @click="handleDblclick1"
v-else-if="column.property == '鍗曟嵁鍙�'"
>{{ row.鍗曟嵁鍙� }}</el-button
>
@@ -660,7 +660,7 @@
OperationType: null, //淇濆瓨绫诲瀷锛堟柊澧�1淇敼3锛�
HInterID: null,
baseURL: process.env.VUE_APP_BASE_API || "http://47.96.97.237/API/",
- user: "admin",
+ user: sessionStorage["HUserName"],
currentRow: [],
lastSelectedRowIndex: null, // 鐢ㄤ簬璁板綍涓婃鐐瑰嚮鐨勮绱㈠紩
lastSelectedRow: null, // 涓婁竴娆￠�変腑鐨勮
@@ -752,6 +752,17 @@
this.getList();
},
methods: {
+ handleDblclick1(){
+ // 寤惰繜鎵ц绗竴涓嚱鏁�
+ setTimeout(() => {
+ this.handleRowClick();
+ });
+
+ // 寤惰繜鎵ц绗簩涓嚱鏁帮紙鍙互璁剧疆鐩稿悓鎴栦笉鍚岀殑寤惰繜鏃堕棿锛�
+ setTimeout(() => {
+ this.handleDblclick();
+ }, 300);
+ },
BillSync() {
axios.get(`${this.baseURL}/Kf_ICStockBillMain/GetCStockBillList`, {
params: { BillNo: this.form.HBillno2, BillType: 1403 },
@@ -1340,14 +1351,15 @@
//閫�鍑�
close() {
this.tableShow = true;
+ this.editShow = false;
this.openEdit = false;
this.getList();
},
//鎵撳紑鏂板缁勪欢寮圭獥
handleAddEdit() {
this.rowForm.hmainid = 0
- this.editShow = true
this.openEdit = true
+ this.editShow = true
},
//鎵撳紑淇敼缁勪欢寮圭獥
handleEdit() {
@@ -1358,10 +1370,13 @@
this.$modal.msgError("璇烽�夋嫨瑕佺紪杈戠殑鏁版嵁!");
return;
}
- this.openEdit = true;
this.editShow = true;
+ this.openEdit = true;
+
});
},
+ // 鎵撳紑淇敼缁勪欢寮圭獥
+
//鍏抽棴缂栬緫椤甸潰
editGyClose(val) {
this.editShow = false;
diff --git a/src/views/sell/Kf_ICStockBillMainList/Kf_ICStockBillMainListEdit.vue b/src/views/sell/Kf_ICStockBillMainList/Kf_ICStockBillMainListEdit.vue
index 876016f..34bd751 100644
--- a/src/views/sell/Kf_ICStockBillMainList/Kf_ICStockBillMainListEdit.vue
+++ b/src/views/sell/Kf_ICStockBillMainList/Kf_ICStockBillMainListEdit.vue
@@ -723,37 +723,37 @@
this.form.HExplanation =data.鎽樿
this.form.HInnerBillNo= data.鍐呴儴鍗曟嵁鍙�
- //瀛愯〃 璧嬪��
- // for (var i = 0; i < result.data.length; i++) {
- // this.editData.push(
- // {
- // "HMaterID": result.data[i].HMaterID
- // , "鐗╂枡浠ｇ爜": result.data[i].鐗╂枡浠ｇ爜
- // , "鐗╂枡鍚嶇О": result.data[i].鐗╂枡鍚嶇О
- // , "瑙勬牸鍨嬪彿": result.data[i].瑙勬牸鍨嬪彿
- // , "HUnitID": result.data[i].HUnitID
- // , "璁￠噺鍗曚綅": result.data[i].璁￠噺鍗曚綅
- // , "HQtyMust": result.data[i].搴旀敹鏁伴噺
- // , "HQty": result.data[i].瀹炴敹鏁伴噺
- // , "HRemark": result.data[i].琛ㄤ綋澶囨敞
- // , "HPrice": result.data[i].鍗曚环
- // , "HMoney": result.data[i].閲戦
- // , "HOrderPrice": result.data[i].閲囪喘閲戦
- // , "HWHID": result.data[i].HWHID
- // , "鏀舵枡浠撳簱": result.data[i].鏀舵枡浠撳簱
- // , "HSPID": result.data[i].HSPID
- // , "浠撲綅鍚嶇О": result.data[i].浠撲綅鍚嶇О
- // , "HBatchNo": result.data[i].鎵规
- // , "HSourceBillNo": result.data[i].婧愬崟鍗曞彿 //婧愬崟鍙�
- // , "HSourceBillType": result.data[i].婧愬崟绫诲瀷 //婧愬崟绫诲瀷
- // , "HSourceInterID": result.data[i].婧愬崟涓诲唴鐮� //婧愬崟涓诲唴鐮�
- // , "HSourceEntryID": result.data[i].婧愬崟瀛愬唴鐮� //婧愬崟瀛愬唴鐮�
- // , "HTaxRate": result.data[i].绋庣巼
- // , "HTaxPrice": result.data[i].鍚◣鍗曚环
- // , "HlineTotal": result.data[i].鍚◣閲戦
- // }
- // )
- // }
+ // 瀛愯〃 璧嬪��
+ for (var i = 0; i < result.data.length; i++) {
+ this.editData.push(
+ {
+ "HMaterID": result.data[i].HMaterID
+ , "鐗╂枡浠ｇ爜": result.data[i].鐗╂枡浠ｇ爜
+ , "鐗╂枡鍚嶇О": result.data[i].鐗╂枡鍚嶇О
+ , "瑙勬牸鍨嬪彿": result.data[i].瑙勬牸鍨嬪彿
+ , "HUnitID": result.data[i].HUnitID
+ , "璁￠噺鍗曚綅": result.data[i].璁￠噺鍗曚綅
+ , "HQtyMust": result.data[i].搴旀敹鏁伴噺
+ , "HQty": result.data[i].瀹炴敹鏁伴噺
+ , "HRemark": result.data[i].琛ㄤ綋澶囨敞
+ , "HPrice": result.data[i].鍗曚环
+ , "HMoney": result.data[i].閲戦
+ , "HOrderPrice": result.data[i].閲囪喘閲戦
+ , "HWHID": result.data[i].HWHID
+ , "鏀舵枡浠撳簱": result.data[i].鏀舵枡浠撳簱
+ , "HSPID": result.data[i].HSPID
+ , "浠撲綅鍚嶇О": result.data[i].浠撲綅鍚嶇О
+ , "HBatchNo": result.data[i].鎵规
+ , "HSourceBillNo": result.data[i].婧愬崟鍗曞彿 //婧愬崟鍙�
+ , "HSourceBillType": result.data[i].婧愬崟绫诲瀷 //婧愬崟绫诲瀷
+ , "HSourceInterID": result.data[i].婧愬崟涓诲唴鐮� //婧愬崟涓诲唴鐮�
+ , "HSourceEntryID": result.data[i].婧愬崟瀛愬唴鐮� //婧愬崟瀛愬唴鐮�
+ , "HTaxRate": result.data[i].绋庣巼
+ , "HTaxPrice": result.data[i].鍚◣鍗曚环
+ , "HlineTotal": result.data[i].鍚◣閲戦
+ }
+ )
+ }
if (data.鐘舵�� != '鍒涘缓' && this.copyType != 1) {
this.$modal.msgError("姝ゆ潯鏁版嵁涓嶆槸鍒涘缓鐘舵�侊紝涓嶈兘淇敼");
diff --git a/src/views/sell/XsSeOutStockBackBillEdit.vue b/src/views/sell/XsSeOutStockBackBillEdit.vue
index 4960eb4..74c215d 100644
--- a/src/views/sell/XsSeOutStockBackBillEdit.vue
+++ b/src/views/sell/XsSeOutStockBackBillEdit.vue
@@ -414,7 +414,7 @@
import dayjs from "dayjs";
export default {
- name: "SellOutBill",
+ name: "XsSeOutStockBackBillEdit",
components: { Dept, Warehouse, Material, RowSettings },
props: {
OperationType: { type: Number },
diff --git a/src/views/sell/XsSeOutStockBackBillList.vue b/src/views/sell/XsSeOutStockBackBillList.vue
index f73c289..7e8ac2f 100644
--- a/src/views/sell/XsSeOutStockBackBillList.vue
+++ b/src/views/sell/XsSeOutStockBackBillList.vue
@@ -15,6 +15,8 @@
type="date"
placeholder="寮�濮嬫棩鏈�"
style="width: 150px"
+ :disabled="queryParams.HInitTimeCycle != -1"
+ value-format="yyyy-MM-dd"
>
</el-date-picker>
</el-form-item>
@@ -24,6 +26,8 @@
type="date"
placeholder="缁撴潫鏃ユ湡"
style="width: 150px"
+ :disabled="queryParams.HInitTimeCycle != -1"
+ value-format="yyyy-MM-dd"
>
</el-date-picker>
</el-form-item>
@@ -624,7 +628,7 @@
import dayjs from "dayjs";
export default {
- name: "GySource",
+ name: "XsSeOutStockBackBillList",
components: { RowSettings },
props: {
openPage: { type: String },
@@ -632,7 +636,7 @@
data() {
return {
activeSeach: "",
- HModName: "Cg_POOrderBillList",
+ HModName: "XsSeOutStockBackBillList",
editShow: false,
openEdit: false,
totalNameList: [],
@@ -641,7 +645,7 @@
openPrintList: false,
printListShow: false,
HClassTag: "ForFilteringSchemes", //杩囨护鏉′欢鐨刢lass绫�
- HBillType: "1202",
+ HBillType: "1105",
openBtnHide: false,
btnHideShow: false,
rowHideShow: false,
@@ -673,6 +677,7 @@
{ label: "杩�30澶�", value: 29 },
{ label: "杩戝崐骞�", value: 180 },
{ label: "杩戜竴骞�", value: 365 },
+ { label: "浠绘剰鏃堕棿", value: -1 },
],
hPriceTypeList: ["鎴愭湰浠�", "缁撶畻浠�"],
addBtnShow: false,
@@ -691,7 +696,6 @@
OperationType: null, //淇濆瓨绫诲瀷锛堟柊澧�1淇敼3锛�
HInterID: null,
baseURL: process.env.VUE_APP_BASE_API || "http://47.96.97.237/API/",
- user: "admin",
currentRow: [],
lastSelectedRowIndex: null, // 鐢ㄤ簬璁板綍涓婃鐐瑰嚮鐨勮绱㈠紩
lastSelectedRow: null, // 涓婁竴娆￠�変腑鐨勮
@@ -878,6 +882,10 @@
this.getList();
},
riqiChange() {
+ if (this.queryParams.HInitTimeCycle == -1) {
+ // 浠绘剰鏃堕棿
+ return;
+ }
const end = dayjs(new Date()).format("YYYY-MM-DD");
const start = dayjs(new Date())
.subtract(this.queryParams.HInitTimeCycle, "d")
@@ -953,7 +961,7 @@
let res = await axios.get(this.baseURL + "/Xs_SeOutStockBackBill/list_byPage", {
params: {
sWhere: this.sWhere,
- user: this.user,
+ user: sessionStorage["HUserName"],
Organization: HOrgName,
page: this.page,
size: this.pageSize,
@@ -1042,7 +1050,12 @@
}
}
option.data = result;
- this.DisPlay_HideColumn(this.HModName, this.user, option, this.dataList);
+ this.DisPlay_HideColumn(
+ this.HModName,
+ sessionStorage["HUserName"],
+ option,
+ this.dataList
+ );
}
} catch (err) {
this.$modal.msgError(`鑾峰彇鏀舵枡閫氱煡鍗曢敊璇�: ${err}`);
@@ -1335,7 +1348,7 @@
.get(this.baseURL + "/Xt_User/getOrgIDListByUser", {
params: {
HModName: this.HModName,
- user: this.user,
+ user: sessionStorage["HUserName"],
HOrgID: this.zuzhiId,
},
})
@@ -1424,7 +1437,7 @@
HQty: this.rowForm.HQty,
HSourceInterID: this.rowForm.HSourceInterID,
HSourceEntryID: this.rowForm.HSourceEntryID,
- user: this.user,
+ user: sessionStorage["HUserName"],
},
})
.then((res) => {
@@ -1450,7 +1463,11 @@
//閫昏緫瀹℃牳鏂规硶
axios
.get(this.baseURL + "/Xs_SeOutStockBill/CheckXs_SeOutStockBill", {
- params: { HInterID: InterID, TypeError: num, CurUserName: this.user },
+ params: {
+ HInterID: InterID,
+ TypeError: num,
+ CurUserName: sessionStorage["HUserName"],
+ },
})
.then((res) => {
let result = res.data;
@@ -1475,7 +1492,7 @@
params: {
HInterID: HInterID,
Type: num,
- user: this.user,
+ user: sessionStorage["HUserName"],
},
}
);
@@ -1503,7 +1520,7 @@
HInterID: HInterID,
HEntryID: HEntryID,
ISAudit: num,
- CurUserName: this.user,
+ CurUserName: sessionStorage["HUserName"],
},
}
);
@@ -1529,7 +1546,7 @@
params: {
HInterID: HInterID,
Type: num,
- user: this.user,
+ user: sessionStorage["HUserName"],
},
}
);
@@ -1551,7 +1568,11 @@
//閫昏緫瀹℃牳鏂规硶
axios
.get(this.baseURL + "/Gy_Employee/StopGy_Employee", {
- params: { HInterID: InterID, IsStop: num, CurUserName: this.user },
+ params: {
+ HInterID: InterID,
+ IsStop: num,
+ CurUserName: sessionStorage["HUserName"],
+ },
})
.then((res) => {
let result = res.data;
@@ -1617,7 +1638,7 @@
}
}
var sSubStr = JSON.stringify(num);
- var sMainSub = sSubStr + "&鍜�" + this.user;
+ var sMainSub = sSubStr + "&鍜�" + sessionStorage["HUserName"];
axios({
method: "post",
url: this.baseURL + "/Gy_Source/Gy_Source_btnSave",
diff --git a/src/views/sell/XsSeOutStockBill.vue b/src/views/sell/XsSeOutStockBill.vue
index 3ee1ef7..dd2c4ce 100644
--- a/src/views/sell/XsSeOutStockBill.vue
+++ b/src/views/sell/XsSeOutStockBill.vue
@@ -15,6 +15,8 @@
type="date"
placeholder="寮�濮嬫棩鏈�"
style="width: 150px"
+ :disabled="queryParams.HInitTimeCycle != -1"
+ value-format="yyyy-MM-dd"
>
</el-date-picker>
</el-form-item>
@@ -24,6 +26,8 @@
type="date"
placeholder="缁撴潫鏃ユ湡"
style="width: 150px"
+ :disabled="queryParams.HInitTimeCycle != -1"
+ value-format="yyyy-MM-dd"
>
</el-date-picker>
</el-form-item>
@@ -66,7 +70,7 @@
v-for="(item, index) in organizationList"
:key="index"
:label="item.Name"
- :value="item.ID"
+ :value="item.ID.toString()"
>
</el-option>
</el-select>
@@ -631,7 +635,7 @@
import dayjs from "dayjs";
export default {
- name: "GySource",
+ name: "XsSeOutStockBill",
components: { RowSettings },
props: {
openPage: { type: String },
@@ -640,7 +644,7 @@
return {
iframeUrl: "",
activeSeach: "",
- HModName: "Cg_POOrderBillList",
+ HModName: "XsSeOutStockBill",
editShow: false,
openEdit: false,
totalNameList: [],
@@ -649,7 +653,7 @@
openPrintList: false,
printListShow: false,
HClassTag: "ForFilteringSchemes", //杩囨护鏉′欢鐨刢lass绫�
- HBillType: "1202",
+ HBillType: "1402",
openBtnHide: false,
btnHideShow: false,
rowHideShow: false,
@@ -681,6 +685,7 @@
{ label: "杩�30澶�", value: 29 },
{ label: "杩戝崐骞�", value: 180 },
{ label: "杩戜竴骞�", value: 365 },
+ { label: "浠绘剰闂撮殧", value: -1 },
],
hPriceTypeList: ["鎴愭湰浠�", "缁撶畻浠�"],
addBtnShow: false,
@@ -699,7 +704,6 @@
OperationType: null, //淇濆瓨绫诲瀷锛堟柊澧�1淇敼3锛�
HInterID: null,
baseURL: process.env.VUE_APP_BASE_API || "http://47.96.97.237/API/",
- user: "admin",
currentRow: [],
lastSelectedRowIndex: null, // 鐢ㄤ簬璁板綍涓婃鐐瑰嚮鐨勮绱㈠紩
lastSelectedRow: null, // 涓婁竴娆￠�変腑鐨勮
@@ -718,7 +722,7 @@
dateRange: [],
// 鏌ヨ鍙傛暟
queryParams: {
- HOrgID: null,
+ HOrgID: sessionStorage["OrganizationID"],
HName: null,
HNumber: null,
Comparator1: "",
@@ -798,7 +802,6 @@
};
},
created() {
- this.queryParams.HOrgID = sessionStorage["OrganizationID"];
this.riqiChange();
this.getList();
},
@@ -887,6 +890,9 @@
this.getList();
},
riqiChange() {
+ if (this.queryParams.HInitTimeCycle == -1) {
+ return;
+ }
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * this.queryParams.HInitTimeCycle);
@@ -954,13 +960,13 @@
this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + this.eTime + "'";
}
let Organization = this.organizationList.find(
- (e) => (e.ID = this.queryParams.HOrgID)
+ (e) => e.ID == this.queryParams.HOrgID
)?.Name;
try {
let res = await axios.get(this.baseURL + "/Xs_SeOutStockBill/list_byPage", {
params: {
sWhere: this.sWhere,
- user: this.user,
+ user: sessionStorage["HUserName"],
Organization: Organization,
page: this.page,
size: this.pageSize,
@@ -1049,7 +1055,12 @@
}
}
option.data = result;
- this.DisPlay_HideColumn(this.HModName, this.user, option, this.dataList);
+ this.DisPlay_HideColumn(
+ this.HModName,
+ sessionStorage["HUserName"],
+ option,
+ this.dataList
+ );
}
} catch (err) {
this.$modal.msgError(`鑾峰彇鏀舵枡閫氱煡鍗曢敊璇�: ${err}`);
@@ -1354,7 +1365,7 @@
.get(this.baseURL + "/Xt_User/getOrgIDListByUser", {
params: {
HModName: this.HModName,
- user: this.user,
+ user: sessionStorage["HUserName"],
HOrgID: this.zuzhiId,
},
})
@@ -1443,7 +1454,7 @@
HQty: this.rowForm.HQty,
HSourceInterID: this.rowForm.HSourceInterID,
HSourceEntryID: this.rowForm.HSourceEntryID,
- user: this.user,
+ user: sessionStorage["HUserName"],
},
})
.then((res) => {
@@ -1469,7 +1480,11 @@
//閫昏緫瀹℃牳鏂规硶
axios
.get(this.baseURL + "/Xs_SeOutStockBill/CheckXs_SeOutStockBill", {
- params: { HInterID: InterID, TypeError: num, CurUserName: this.user },
+ params: {
+ HInterID: InterID,
+ TypeError: num,
+ CurUserName: sessionStorage["HUserName"],
+ },
})
.then((res) => {
let result = res.data;
@@ -1494,7 +1509,7 @@
params: {
HInterID: HInterID,
Type: num,
- user: this.user,
+ user: sessionStorage["HUserName"],
},
}
);
@@ -1522,7 +1537,7 @@
HInterID: HInterID,
HEntryID: HEntryID,
ISAudit: num,
- CurUserName: this.user,
+ CurUserName: sessionStorage["HUserName"],
},
}
);
@@ -1548,7 +1563,7 @@
params: {
HInterID: HInterID,
Type: num,
- user: this.user,
+ user: sessionStorage["HUserName"],
},
}
);
@@ -1570,7 +1585,11 @@
//閫昏緫瀹℃牳鏂规硶
axios
.get(this.baseURL + "/Gy_Employee/StopGy_Employee", {
- params: { HInterID: InterID, IsStop: num, CurUserName: this.user },
+ params: {
+ HInterID: InterID,
+ IsStop: num,
+ CurUserName: sessionStorage["HUserName"],
+ },
})
.then((res) => {
let result = res.data;
@@ -1636,7 +1655,7 @@
}
}
var sSubStr = JSON.stringify(num);
- var sMainSub = sSubStr + "&鍜�" + this.user;
+ var sMainSub = sSubStr + "&鍜�" + sessionStorage["HUserName"];
axios({
method: "post",
url: this.baseURL + "/Gy_Source/Gy_Source_btnSave",
diff --git a/src/views/sell/XsSeOutStockBillEdit.vue b/src/views/sell/XsSeOutStockBillEdit.vue
index 0824847..b2eaeb2 100644
--- a/src/views/sell/XsSeOutStockBillEdit.vue
+++ b/src/views/sell/XsSeOutStockBillEdit.vue
@@ -431,7 +431,7 @@
import dayjs from "dayjs";
export default {
- name: "SellOutBill",
+ name: "XsSeOutStockBillEdit",
components: { Dept, Warehouse, Material, RowSettings },
props: {
OperationType: { type: Number },
diff --git a/src/views/sell/xsSeOrderBill/xsSeOrderBill.vue b/src/views/sell/xsSeOrderBill/xsSeOrderBill.vue
index b8e751c..f30edcf 100644
--- a/src/views/sell/xsSeOrderBill/xsSeOrderBill.vue
+++ b/src/views/sell/xsSeOrderBill/xsSeOrderBill.vue
@@ -15,6 +15,8 @@
type="date"
placeholder="寮�濮嬫棩鏈�"
style="width: 150px"
+ :disabled="queryParams.HInitTimeCycle != -1"
+ value-format="yyyy-MM-dd"
>
</el-date-picker>
</el-form-item>
@@ -24,6 +26,8 @@
type="date"
placeholder="缁撴潫鏃ユ湡"
style="width: 150px"
+ :disabled="queryParams.HInitTimeCycle != -1"
+ value-format="yyyy-MM-dd"
>
</el-date-picker>
</el-form-item>
@@ -613,11 +617,9 @@
import axios from "axios";
import RowSettings from "@/views/component/rowSettings";
import dayjs from "dayjs";
-import { computed } from "vue";
-import { watch } from "vue";
export default {
- name: "GySource",
+ name: "xsSeOrderBill",
components: { RowSettings },
props: {
openPage: { type: String },
@@ -626,7 +628,7 @@
return {
iframeUrl: "",
activeSeach: "",
- HModName: "Cg_POOrderBillList",
+ HModName: "xsSeOrderBill",
editShow: false,
openEdit: false,
totalNameList: [],
@@ -635,7 +637,7 @@
openPrintList: false,
printListShow: false,
HClassTag: "ForFilteringSchemes", //杩囨护鏉′欢鐨刢lass绫�
- HBillType: "1202",
+ HBillType: "1401",
openBtnHide: false,
btnHideShow: false,
rowHideShow: false,
@@ -667,6 +669,7 @@
{ label: "杩�30澶�", value: 29 },
{ label: "杩戝崐骞�", value: 180 },
{ label: "杩戜竴骞�", value: 365 },
+ { label: "浠绘剰鏃ユ湡", value: -1 },
],
hPriceTypeList: ["鎴愭湰浠�", "缁撶畻浠�"],
addBtnShow: false,
@@ -685,7 +688,6 @@
OperationType: null, //淇濆瓨绫诲瀷锛堟柊澧�1淇敼3锛�
HInterID: null,
baseURL: process.env.VUE_APP_BASE_API || "http://47.96.97.237/API/",
- user: "admin",
currentRow: [],
lastSelectedRowIndex: null, // 鐢ㄤ簬璁板綍涓婃鐐瑰嚮鐨勮绱㈠紩
lastSelectedRow: null, // 涓婁竴娆￠�変腑鐨勮
@@ -869,6 +871,10 @@
this.getList();
},
riqiChange() {
+ if (this.queryParams.HInitTimeCycle == -1) {
+ // 闅忔剰鏃ユ湡涓嶈绠�
+ return;
+ }
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * this.queryParams.HInitTimeCycle);
@@ -919,35 +925,6 @@
this.dbEmitData(this.deptform, this.dialogTypeNum);
this.deptform = {};
},
- fetchData() {
- //鐧诲綍鐢ㄦ埛淇℃伅
- axios
- .get(
- "http://47.96.97.237/API/Web/GetUser?UserName=001&PassWord=123456&HOrgName=100038"
- )
- .then((res) => {
- let data = res.data.data[0];
- this.zuzhiId = data.HUSEORGID; //鏍规嵁鐧诲綍鐢ㄦ埛鑾峰彇榛樿鐨勭粍缁嘔D
- this.queryParams.HOrgID = data.HUSEORGID;
- this.user = data.Czymc;
- axios
- .get(this.baseURL + "/Web/GetOrganizations", {})
- .then((res) => {
- if (res.data.count == 1) {
- this.organizationList = res.data.data; //缁勭粐鍒楄〃
- }
-
- this.handleQuery();
- // this.getList();
- })
- .catch((error) => {
- this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
- });
- })
- .catch((error) => {
- this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
- });
- },
async getList() {
this.tableShow = false;
this.loading = true;
@@ -965,7 +942,7 @@
let res = await axios.get(this.baseURL + "Xs_SeOrderBill/list_ByPage", {
params: {
sWhere: this.sWhere,
- user: this.user,
+ user: sessionStorage["HUserName"],
Organization: sessionStorage["Organization"],
page: this.page,
size: this.pageSize,
@@ -1054,7 +1031,12 @@
}
}
option.data = result;
- this.DisPlay_HideColumn(this.HModName, this.user, option, this.dataList);
+ this.DisPlay_HideColumn(
+ this.HModName,
+ sessionStorage["HUserName"],
+ option,
+ this.dataList
+ );
}
} catch (err) {
this.$modal.msgError(`鑾峰彇鏀舵枡閫氱煡鍗曢敊璇�: ${err}`);
@@ -1354,7 +1336,7 @@
.get(this.baseURL + "/Xt_User/getOrgIDListByUser", {
params: {
HModName: this.HModName,
- user: this.user,
+ user: sessionStorage["HUserName"],
HOrgID: this.zuzhiId,
},
})
@@ -1442,7 +1424,7 @@
HQty: this.rowForm.HQty,
HSourceInterID: this.rowForm.HSourceInterID,
HSourceEntryID: this.rowForm.HSourceEntryID,
- user: this.user,
+ user: sessionStorage["HUserName"],
},
})
.then((res) => {
@@ -1468,7 +1450,11 @@
//閫昏緫瀹℃牳鏂规硶
axios
.get(this.baseURL + "/Cg_POInStockBill/AuditCg_POInStockBill", {
- params: { HInterID: InterID, IsAudit: num, CurUserName: this.user },
+ params: {
+ HInterID: InterID,
+ IsAudit: num,
+ CurUserName: sessionStorage["HUserName"],
+ },
})
.then((res) => {
let result = res.data;
@@ -1493,7 +1479,7 @@
params: {
HInterID: HInterID,
Type: num,
- user: this.user,
+ user: sessionStorage["HUserName"],
},
}
);
@@ -1521,7 +1507,7 @@
HInterID: HInterID,
HEntryID: HEntryID,
ISAudit: num,
- CurUserName: this.user,
+ CurUserName: sessionStorage["HUserName"],
},
}
);
@@ -1547,7 +1533,7 @@
params: {
HInterID: HInterID,
Type: num,
- user: this.user,
+ user: sessionStorage["HUserName"],
},
}
);
@@ -1569,7 +1555,11 @@
//閫昏緫瀹℃牳鏂规硶
axios
.get(this.baseURL + "/Gy_Employee/StopGy_Employee", {
- params: { HInterID: InterID, IsStop: num, CurUserName: this.user },
+ params: {
+ HInterID: InterID,
+ IsStop: num,
+ CurUserName: sessionStorage["HUserName"],
+ },
})
.then((res) => {
let result = res.data;
@@ -1635,7 +1625,7 @@
}
}
var sSubStr = JSON.stringify(num);
- var sMainSub = sSubStr + "&鍜�" + this.user;
+ var sMainSub = sSubStr + "&鍜�" + sessionStorage["HUserName"];
axios({
method: "post",
url: this.baseURL + "/Gy_Source/Gy_Source_btnSave",
--
Gitblit v1.9.1