From f22884b3d5293713525582ded93a60d71871b946 Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期五, 19 四月 2024 11:05:10 +0800
Subject: [PATCH] 入库，新增一个产品之后，无法再添加的问题修改+入库，出库，调拨，2个模块单位和数量位置调整+
---
src/views/overview/AddOverviewDialog.vue | 410 ++++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 268 insertions(+), 142 deletions(-)
diff --git a/src/views/overview/AddOverviewDialog.vue b/src/views/overview/AddOverviewDialog.vue
index 4f93016..31446e2 100644
--- a/src/views/overview/AddOverviewDialog.vue
+++ b/src/views/overview/AddOverviewDialog.vue
@@ -9,7 +9,7 @@
<!-- 澶� -->
<div slot="title" class="dialog-header">
<span>{{
- editCommonConfig.title === "鏌ョ湅"
+ editCommonConfig.title == "鏌ョ湅"
? editCommonConfig.title
: editCommonConfig.title + addName
}}</span>
@@ -29,7 +29,7 @@
</span>
<el-button
v-if="showEdit"
- :disabled="this.editConfig.infomation.status === 5"
+ :disabled="this.editConfig.infomation.status == 5"
plain
size="mini"
style="margin-left: 15px"
@@ -68,9 +68,9 @@
<el-form-item prop="number">
<span slot="label"
>{{
- workType === 1
+ workType == 1
? "鍏ュ簱"
- : workType === 2
+ : workType == 2
? "鍑哄簱"
: "璋冩嫧"
}}鍗曞彿</span
@@ -102,15 +102,15 @@
<el-col :span="12">
<el-form-item prop="companyName">
<span slot="label">{{
- workType === 1
+ workType == 1
? "渚涘簲鍟�"
- : workType === 2
+ : workType == 2
? "瀹㈡埛"
: "鑱旂郴浜�"
}}</span>
<el-select
- v-if="workType === 1"
+ v-if="workType == 1"
v-model="editConfig.infomation.companyName"
placeholder="璇烽�夋嫨"
size="mini"
@@ -130,7 +130,7 @@
</el-option>
</el-select>
<el-select
- v-else-if="workType === 2"
+ v-else-if="workType == 2"
v-model="editConfig.infomation.companyName"
placeholder="璇烽�夋嫨"
size="mini"
@@ -156,7 +156,7 @@
@change="companyChange"
>
<el-option
- v-for="item in companyOptions"
+ v-for="item in personelOptions"
:key="item.id"
:label="item.name"
:value="{ value: item.id, label: item.name }"
@@ -166,7 +166,7 @@
</el-form-item>
</el-col>
<!-- <el-col :span="12">
- <el-form-item v-if="workType === 3" label="鑱旂郴浜�" prop="contacterName">
+ <el-form-item v-if="workType == 3" label="鑱旂郴浜�" prop="contacterName">
<el-select
v-model="editConfig.infomation.contacterName"
placeholder="璇烽�夋嫨"
@@ -180,7 +180,7 @@
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item v-if="workType === 2" label="閫佽揣鍦板潃" prop="client_name">
+ <el-form-item v-if="workType == 2" label="閫佽揣鍦板潃" prop="client_name">
<el-select
v-model="editConfig.infomation.memberId"
placeholder="璇烽�夋嫨"
@@ -246,7 +246,7 @@
</el-col>
<el-col :span="12">
<el-form-item
- :label="workType === 1 ? '浠撳簱浣嶇疆' : '浠�'"
+ :label="workType == 1 ? '浠撳簱浣嶇疆' : '浠�'"
prop="location"
>
<el-select
@@ -287,7 +287,7 @@
</el-select>
</el-form-item>
</el-col>
- <el-col :span="12" v-if="workType === 3">
+ <el-col :span="12" v-if="workType == 3">
<el-form-item label="鑷�" prop="toLocation">
<el-select
@change="toLocationChange"
@@ -462,11 +462,11 @@
<el-tab-pane
label="鐗╂祦淇℃伅"
name="two"
- v-if="this.workType === 2"
+ v-if="this.workType == 2"
></el-tab-pane>
</el-tabs>
<!-- 鎿嶄綔 -->
- <div v-if="activeName === 'first'">
+ <div v-if="activeName == 'first'">
<CommonFormTableView
ref="tableView"
:islistingrules="true"
@@ -502,7 +502,7 @@
</CommonFormTableView>
</div>
<!-- 鐗╂祦淇℃伅 -->
- <div v-if="activeName === 'two' && this.workType === 2">
+ <div v-if="activeName == 'two' && this.workType == 2">
<el-form
:rules="rules2"
ref="shipmentsInfo"
@@ -590,7 +590,7 @@
</el-form>
</div>
<!-- 璇︽儏 -->
- <!-- <div v-if="activeName === 'detail'">
+ <!-- <div v-if="activeName == 'detail'">
<CommonFormTableView
:product-table-list="detailTableList"
:detail-enter="!showFooter"
@@ -666,7 +666,7 @@
},
},
workType: {
- type: Number,
+ type: [Number,String],
default: function () {
// return JSON.parse(window.sessionStorage.getItem('paramsData')).workType|| 1;
return 1;
@@ -763,8 +763,8 @@
showCancel: false, // 鍙栨秷鏄惁鍙互鏄剧ず
list: [],
pdfParams: {},
- thatCursor: this.workType === 3 ? "no-drop" : "pointer",
- thatColor: this.workType === 3 ? "#ccc" : "#000",
+ thatCursor: this.workType == 3 ? "no-drop" : "pointer",
+ thatColor: this.workType == 3 ? "#ccc" : "#000",
};
},
created() {
@@ -775,7 +775,7 @@
this.setDetailTableForm();
this.getLocationList();
this.receiptType =
- this.editConfig.title === "鏌ョ湅" || this.editConfig.title === "缂栬緫"
+ this.editConfig.title == "鏌ョ湅" || this.editConfig.title == "缂栬緫"
? this.editConfig.infomation.operationTypeName
: this.addName;
if (this.showOperationType) {
@@ -783,7 +783,7 @@
}
this.getLogisticCompanyList();
this.formInfo();
- if (this.editConfig.title === "鏌ョ湅" || this.editConfig.title === "缂栬緫") {
+ if (this.editConfig.title == "鏌ョ湅" || this.editConfig.title == "缂栬緫") {
setTimeout(() => {
this.$refs.tableView.setLocationList(
this.editConfig.infomation.location.label
@@ -794,15 +794,14 @@
mounted() {},
methods: {
setFormItem(val, itemMark, itemName) {
- console.log(val, "===val");
this.editConfig.infomation[itemMark] = val.id;
this.editConfig.infomation[itemName] = val.name;
},
formInfo() {
this.objCode.type =
- this.workType === 1
+ this.workType == 1
? "鍏ュ簱缂栫爜"
- : this.workType === 2
+ : this.workType == 2
? "鍑哄簱缂栫爜"
: "璋冩嫧缂栫爜";
this.objCode.codeStandID = "";
@@ -812,7 +811,7 @@
this.getRCodeStandardList();
},
setStatusList() {
- if (this.editConfig.infomation.status === 5) {
+ if (this.editConfig.infomation.status == 5) {
this.list = [
{ label: "鑽夌", status: "todo", value: 1 },
{ label: "姝ｅ湪绛夊緟", status: "todo", value: 2 },
@@ -832,28 +831,27 @@
// 鑾峰彇鍏徃鍒楄〃
async getCompanyList() {
await getPersonnelList().then((res) => {
- if (res.code === 200) {
+ if (res.code == 200) {
this.personelOptions = res.data;
}
});
- if (this.workType === 1) {
+ if (this.workType == 1) {
await getSupplierList().then((res) => {
console.log(res);
- if (res.code === 200) {
+ if (res.code == 200) {
this.supplierOptions = res.data;
}
});
- } else if (this.workType === 2) {
+ } else if (this.workType == 2) {
await getClientList().then((res) => {
console.log(res);
- if (res.code === 200) {
+ if (res.code == 200) {
this.clientOptions = res.data;
}
});
} else {
await getCompanyList().then((res) => {
- console.log(res);
- if (res.code === 200) {
+ if (res.code == 200) {
this.companyOptions = res.data;
}
});
@@ -873,7 +871,7 @@
pageSize: 0,
}).then((res) => {
console.log(res);
- if (res.code === 200) {
+ if (res.code == 200) {
this.formLocationOptions = res.data;
}
});
@@ -884,7 +882,7 @@
pageSize: 0,
}).then((res) => {
console.log(res);
- if (res.code === 200) {
+ if (res.code == 200) {
this.toLocationOptions = res.data;
}
});
@@ -897,7 +895,7 @@
pageSize: 0,
}).then((res) => {
console.log(res.data);
- if (res.code === 200) {
+ if (res.code == 200) {
const list = res.data.map((item) => {
return {
name: item.name,
@@ -911,45 +909,45 @@
// 璁剧疆鍒犻櫎/鎵撳嵃/缂栬緫鏄惁鏄剧ず
setBottonView() {
console.log(this.editConfig.infomation.status);
- if (this.editConfig.title === "鏂板缓") {
+ if (this.editConfig.title == "鏂板缓") {
this.showButton = false;
this.showEdit = false;
this.showFooter = true;
this.isValidateClick = false;
- } else if (this.editConfig.title === "缂栬緫") {
+ } else if (this.editConfig.title == "缂栬緫") {
this.showButton = true;
this.showEdit = false;
this.isDelClick = true;
this.showFooter = true;
} else if (
- this.editConfig.title === "鏌ョ湅" &&
+ this.editConfig.title == "鏌ョ湅" &&
this.editConfig.infomation.status !== 4
) {
this.showButton = true;
this.showEdit = true;
this.isDelClick = true;
this.showFooter = false;
- if (this.editConfig.infomation.status === "瀹屾垚") {
+ if (this.editConfig.infomation.status == "瀹屾垚") {
this.isValidateClick = false;
- } else if (this.editConfig.infomation.status === 3) {
+ } else if (this.editConfig.infomation.status == 3) {
this.isValidateClick = true;
this.showCancel = true;
- } else if (this.editConfig.infomation.status === 5) {
+ } else if (this.editConfig.infomation.status == 5) {
this.isCancel = true;
this.isValidateClick = true;
} else {
this.isValidateClick = true;
}
} else if (
- this.editConfig.infomation.status === 4 ||
- this.editConfig.infomation.status === "瀹屾垚"
+ this.editConfig.infomation.status == 4 ||
+ this.editConfig.infomation.status == "瀹屾垚"
) {
this.showButton = true;
this.showEdit = false;
this.isDelClick = true;
this.showFooter = false;
this.isValidateClick = false;
- } else if (this.editConfig.infomation.status === 5) {
+ } else if (this.editConfig.infomation.status == 5) {
this.isCancel = true;
this.showButton = true;
this.showEdit = false;
@@ -963,14 +961,14 @@
this.isValidateClick = true;
this.showCancel = true;
}
- if (this.editConfig.title === "鏂板缓") {
+ if (this.editConfig.title == "鏂板缓") {
this.list[0].status = "active";
} else {
this.list.map((item) => {
console.log(item, this.editConfig.infomation.status, "鎵撳嵃淇℃伅");
if (
- item.value === this.editConfig.infomation.status ||
- item.label === this.editConfig.infomation.status
+ item.value == this.editConfig.infomation.status ||
+ item.label == this.editConfig.infomation.status
) {
item.status = "active";
} else {
@@ -992,7 +990,7 @@
},
async getLogisticCompanyList() {
await getLogisticCompanyList().then((res) => {
- if (res.code === 200) {
+ if (res.code == 200) {
this.editConfig.infomation.carrier = res.data;
}
});
@@ -1000,11 +998,9 @@
// 淇濆瓨
saveClick() {
let validArr = [];
- if (this.workType === 2) {
- console.log("鍑哄簱");
+ if (this.workType == 2) {
validArr = [this.$refs.form.validate()];
} else {
- console.log("鍏ュ簱");
validArr = [this.$refs.form.validate()];
}
console.log(validArr, "xxx");
@@ -1012,7 +1008,7 @@
.then((results) => {
console.log(results, "鎵ц鎴愬姛", this.tableData);
for (let i = 0; i < this.tableData.length; i++) {
- if (this.tableData[i].productName.length === 0) {
+ if (this.tableData[i].productName.length == 0) {
this.isNoProduct = true;
break;
} else {
@@ -1024,11 +1020,11 @@
} else {
let params = this.saveParams();
let isContinue=false;
- // if(this.workType===2){
+ // if(this.workType==2){
// params.details.map((item)=>{
// item.fromLocationId=item.fromLocationId.value
// })
- // }else if(this.workType===3){
+ // }else if(this.workType==3){
// params.details.map((item)=>{
// item.fromLocationId=item.fromLocationId.value
// item.toLocationId=item.toLocationId.value
@@ -1036,20 +1032,22 @@
// }
// 浜у搧鍒楄〃瑙ｆ瀯
if (
- this.editConfig.title === "缂栬緫" ||
- this.editConfig.title === "鏌ョ湅"
+ this.editConfig.title == "缂栬緫" ||
+ this.editConfig.title == "鏌ョ湅"
) {
let arr = [];
- if (this.workType === 1) {
+ if (this.workType == 1) {
params.details.map((item) => {
arr.push({
operationId: item.operationId,
amount: item.amount,
productId: item.productId,
+ auxiliaryUnit:item.auxiliaryUnit,
+ auxiliaryAmount:item.auxiliaryAmount,
});
});
params.details = arr;
- } else if (this.workType === 2) {
+ } else if (this.workType == 2) {
params.details.map((item) => {
if (item.fromLocationId.value) {
arr.push({
@@ -1057,6 +1055,8 @@
amount: item.amount,
fromLocationId: item.fromLocationId.value,
productId: item.productId,
+ auxiliaryUnit:item.auxiliaryUnit,
+ auxiliaryAmount:item.auxiliaryAmount,
});
} else {
arr.push({
@@ -1064,11 +1064,13 @@
amount: item.amount,
fromLocationId: item.fromLocation.id,
productId: item.productId,
+ auxiliaryUnit:item.auxiliaryUnit,
+ auxiliaryAmount:item.auxiliaryAmount,
});
}
});
params.details = arr;
- } else if (this.workType === 3) {
+ } else if (this.workType == 3) {
console.log(params.details, "鐪嬬湅");
params.details.map((item) => {
arr.push({
@@ -1081,6 +1083,8 @@
? item.toLocationId.value
: item.toLocation.id,
productId: item.productId,
+ auxiliaryUnit:item.auxiliaryUnit,
+ auxiliaryAmount:item.auxiliaryAmount,
});
// if(item.fromLocationId.value){
// arr.push({
@@ -1102,13 +1106,13 @@
});
params.details = arr;
}
- } else if (this.editConfig.title === "鏂板缓") {
+ } else if (this.editConfig.title == "鏂板缓") {
- if (this.workType === 2) {
+ if (this.workType == 2) {
params.details.map((item) => {
item.fromLocationId = item.fromLocationId.value;
});
- } else if (this.workType === 3) {
+ } else if (this.workType == 3) {
params.details.map((item) => {
if(!item.fromLocationId||!item.toLocationId){
@@ -1125,14 +1129,14 @@
}
}
let requestUrl =
- this.editConfig.title === "鏂板缓" ? addOperation : updateOperation;
+ this.editConfig.title == "鏂板缓" ? addOperation : updateOperation;
// let params = this.saveParams()
requestUrl({
...params,
}).then((res) => {
this.editConfig.visible = false;
- if (res.code === 200) {
- if (this.editConfig.title === "鏂板缓") {
+ if (res.code == 200) {
+ if (this.editConfig.title == "鏂板缓") {
this.$message.success("娣诲姞鎴愬姛");
} else {
this.$message.success("缂栬緫鎴愬姛");
@@ -1150,45 +1154,45 @@
},
saveParams() {
let data = this.editConfig.infomation;
- let companyID = 0;
+ let companyID = '';
let companyName = "";
- let contacterID = 0;
+ let contacterID = '';
let contacterName = "";
- if (this.editConfig.title === "鏂板缓") {
+ if (this.editConfig.title == "鏂板缓") {
companyID =
- Object.keys(this.companyObj).length === 0 ? 0 : this.companyObj.value;
+ Object.keys(this.companyObj).length == 0 ? '' : this.companyObj.value;
companyName =
- Object.keys(this.companyObj).length === 0
+ Object.keys(this.companyObj).length == 0
? ""
: this.companyObj.label;
contacterID =
- Object.keys(this.contacterObj).length === 0
+ Object.keys(this.contacterObj).length == 0
? 0
: this.contacterObj.value;
contacterName =
- Object.keys(this.contacterObj).length === 0
+ Object.keys(this.contacterObj).length == 0
? ""
: this.contacterObj.label;
} else {
companyID =
- Object.keys(this.companyObj).length === 0
+ Object.keys(this.companyObj).length == 0
? data.companyID
: this.companyObj.value;
companyName =
- Object.keys(this.companyObj).length === 0
+ Object.keys(this.companyObj).length == 0
? data.companyName
: this.companyObj.label;
contacterID =
- Object.keys(this.contacterObj).length === 0
+ Object.keys(this.contacterObj).length == 0
? data.contacterID
: this.contacterObj.value;
contacterName =
- Object.keys(this.contacterObj).length === 0
+ Object.keys(this.contacterObj).length == 0
? data.contacterName
: this.contacterObj.label;
}
let params = {};
- if (this.workType === 1 || this.workType === 2) {
+ if (this.workType == 1 || this.workType == 2) {
params = {
baseOperationType: data.baseOperationType,
comment: data.comment || "",
@@ -1222,7 +1226,7 @@
custodian: data.custodian || "",
custodianId: data.custodianId || "",
};
- } else if (this.workType === 3) {
+ } else if (this.workType == 3) {
params = {
baseOperationType: data.baseOperationType,
comment: data.comment || "",
@@ -1264,7 +1268,7 @@
await deleteOperation(this.editConfig.infomation.id).then((res) => {
console.log(res);
this.editConfig.visible = false;
- if (res.code === 200) {
+ if (res.code == 200) {
this.$message.success("鍒犻櫎鎴愬姛");
this.$parent.getData();
}
@@ -1277,21 +1281,14 @@
this.editConfig.infomation.details &&
this.editConfig.infomation.details.length > 0
) {
- const list = this.editConfig.infomation.details.map((item) => {
- return {
- ...item,
- productName: item.product.name,
- productId: item.product.id,
- unit: item.product.unit,
- };
- });
+ const list= this.getTwoTable(this.editConfig.infomation.details,'1')
this.tableData = list;
} else {
this.tableData = [];
}
// this.tableData = this.editConfig.title !== "鏂板缓" ? list : []
let tableColumnArr = [];
- if (this.workType === 1) {
+ if (this.workType == 1) {
tableColumnArr = [
{
label: "浜у搧鍚嶇О",
@@ -1304,8 +1301,14 @@
{ label: "浜у搧瑙勬牸", prop: "specs" },
{ label: "浜у搧鍨嬪彿", prop: "model" },
{ label: "璁￠噺鍗曚綅", prop: "unit" },
+ { label: "杈呭姪鏁伴噺", prop: "auxiliaryAmount",inputFloatValue:true,isInputFloat:'inputFloatAuxiliaryAmount' },
+ { label: "杈呭姪鍗曚綅", prop: "auxiliaryUnit" },
+ { label: "姣涢噸", prop: "grossWeight" },
+ { label: "鎬绘瘺閲�", prop: "totalGrossWeight" },
+ { label: "鍑�閲�", prop: "netWeight" },
+ { label: "鎬诲噣閲�", prop: "totalNetWeight" }
];
- } else if (this.workType === 2) {
+ } else if (this.workType == 2) {
tableColumnArr = [
{
label: "浜у搧鍚嶇О",
@@ -1324,8 +1327,46 @@
isRequird: true,
},
{ label: "璁￠噺鍗曚綅", prop: "unit" },
+ { label: "杈呭姪鏁伴噺", prop: "auxiliaryAmount",inputFloatValue:true,isInputFloat:'inputFloatAuxiliaryAmount' },
+ { label: "杈呭姪鍗曚綅", prop: "auxiliaryUnit" },
+ { label: "姣涢噸", prop: "grossWeight" },
+ { label: "鎬绘瘺閲�", prop: "totalGrossWeight" },
+ { label: "鍑�閲�", prop: "netWeight" },
+ { label: "鎬诲噣閲�", prop: "totalNetWeight" }
];
- } else if (this.workType === 3) {
+ } else if (this.workType == 3) {
+ tableColumnArr = [
+ {
+ label: "浜у搧鍚嶇О",
+ prop: "productName",
+ productName: true,
+ isRequird: true,
+ },
+ { label: "浜у搧缂栫爜", prop: "productId" },
+ { label: "鏁伴噺", prop: "amount", inputFloat: true },
+ { label: "浜у搧瑙勬牸", prop: "specs" },
+ { label: "浜у搧鍨嬪彿", prop: "model" },
+ {
+ label: "浠�",
+ prop: "fromLocationId",
+ sonLocation: true,
+ isRequird: true,
+ },
+ {
+ label: "鑷�",
+ prop: "toLocationId",
+ toLocation: true,
+ isRequird: true,
+ },
+ { label: "璁￠噺鍗曚綅", prop: "unit" },
+ { label: "杈呭姪鏁伴噺", prop: "auxiliaryAmount",inputFloatValue:true,isInputFloat:'inputFloatAuxiliaryAmount' },
+ { label: "杈呭姪鍗曚綅", prop: "auxiliaryUnit" },
+ { label: "姣涢噸", prop: "grossWeight" },
+ { label: "鎬绘瘺閲�", prop: "totalGrossWeight" },
+ { label: "鍑�閲�", prop: "netWeight" },
+ { label: "鎬诲噣閲�", prop: "totalNetWeight" }
+ ];
+ } else if (this.workType == 4) {
tableColumnArr = [
{
label: "浜у搧鍚嶇О",
@@ -1351,33 +1392,7 @@
},
{ label: "璁￠噺鍗曚綅", prop: "unit" },
];
- } else if (this.workType === 4) {
- tableColumnArr = [
- {
- label: "浜у搧鍚嶇О",
- prop: "productName",
- productName: true,
- isRequird: true,
- },
- { label: "浜у搧缂栫爜", prop: "productId" },
- { label: "鏁伴噺", prop: "amount", inputFloat: true },
- { label: "浜у搧瑙勬牸", prop: "specs" },
- { label: "浜у搧鍨嬪彿", prop: "model" },
- {
- label: "浠�",
- prop: "fromLocationId",
- sonLocation: true,
- isRequird: true,
- },
- {
- label: "鑷�",
- prop: "toLocationId",
- toLocation: true,
- isRequird: true,
- },
- { label: "璁￠噺鍗曚綅", prop: "unit" },
- ];
- } else if (this.workType === 5) {
+ } else if (this.workType == 5) {
tableColumnArr = [
{
label: "浜у搧鍚嶇О",
@@ -1409,22 +1424,135 @@
tableColumn: tableColumnArr,
};
},
+ getTwoTable(data,value){
+ let list = data.map((res) => {
+ let adjunctUnit=''
+ let adjunctAmount=''
+ let isValue=false
+ let moreUnit=null
+ let moreUnitList=[]
+ if(value==1){
+ moreUnit=res.product.moreUnit
+ moreUnitList=res.product.moreUnitList
+ }else{
+ moreUnit=res.moreUnit
+ moreUnitList=res.moreUnitList
+ }
+ if(moreUnit&&moreUnitList){
+ if(moreUnitList.length>0){
+ for(let j in moreUnitList){
+ if(moreUnitList[j].floating){
+ isValue=true;
+ adjunctUnit=moreUnitList[j].unit
+ adjunctAmount=moreUnitList[j].amount
+
+ break;
+ }
+ }
+ if(!isValue){
+ for(let j in moreUnitList){
+ if(moreUnitList[j].unit){
+ adjunctUnit=moreUnitList[j].unit
+ adjunctAmount=moreUnitList[j].amount
+ break;
+ }
+ }
+ }
+ }
+ }
+ if(value==1){
+ return {
+ ...res,
+ productName: res.product.name,
+ productId: res.product.id,
+ unit: res.product.unit,
+ model:res.product.model,
+ specs:res.product.specs,
+ moreUnit:res.product.moreUnit,
+ moreUnitList:res.product.moreUnitList,
+ auxiliaryUnit:res.auxiliaryUnit,
+ auxiliaryAmount:res.amount&&adjunctAmount?Number(adjunctAmount)*Number(res.amount):0,
+ auxiliaryAmountInfo:adjunctAmount?Number(adjunctAmount):0,
+ inputFloatAuxiliaryAmount:isValue,
+ grossWeight:res.product.grossWeight,
+ totalGrossWeight:res.totalGrossWeight,
+ netWeight:res.product.netWeight,
+ totalNetWeight:res.totalNetWeight,
+ };
+ }else{
+ return {
+ ...res,
+ amount: 1,
+ productName: res.name,
+ productId: res.id,
+ auxiliaryUnit:adjunctUnit,
+ auxiliaryAmount:adjunctAmount?Number(adjunctAmount)*1:0,
+ auxiliaryAmountInfo:adjunctAmount?Number(adjunctAmount):0,
+ inputFloatAuxiliaryAmount:isValue,
+ grossWeight:res.grossWeight,
+ totalGrossWeight:res.grossWeight?Number(res.grossWeight)*1:'',
+ netWeight:res.netWeight,
+ totalNetWeight:res.netWeight?Number(res.netWeight)*1:'',
+ };
+ }
+ });
+ return list||[];
+ },
+ getAuxiligyAmount(unit,unitList){
+ let adjunctUnit=''
+ let adjunctAmount=''
+ let isValue=false
+ let moreUnit=unit?unit:''
+ let moreUnitList=unitList?unitList:[]
+ if(moreUnit&&moreUnitList){
+ if(moreUnitList.length>0){
+ for(let j in moreUnitList){
+ if(moreUnitList[j].floating){
+ isValue=true;
+ adjunctUnit=moreUnitList[j].unit
+ adjunctAmount=moreUnitList[j].amount
+ break;
+ }
+ }
+ if(!isValue){
+ for(let j in moreUnitList){
+ if(moreUnitList[j].unit){
+ adjunctUnit=moreUnitList[j].unit
+ adjunctAmount=moreUnitList[j].amount
+ break;
+ }
+ }
+ }
+ }
+ }
+ return {
+ auxiliaryAmount:adjunctAmount,
+ auxiliaryUnit:adjunctUnit,
+ }
+ },
// 鎿嶄綔杈撳叆
inputContent(val, prop, row) {
this.countId = row.countId;
this.tableData.map((item) => {
- if (item.id === row.id) {
+ if (item.id == row.id) {
+ debugger
item[prop] = val;
+ let auxiliaryAmountObject=this.getAuxiligyAmount(item.moreUnit,item.moreUnitList)
+ if(prop=='amount'){
+ item.totalGrossWeight=item[prop]&&item.grossWeight?Number(item.grossWeight)*Number(item[prop]):''
+ item.totalNetWeight=item[prop]&&item.netWeight?Number(item.netWeight)*Number(item[prop]):''
+ item.auxiliaryAmount=item[prop]&&auxiliaryAmountObject.auxiliaryAmount?Number(auxiliaryAmountObject.auxiliaryAmount)*Number(item[prop]):''
+ }
}
});
},
// 鏂板
addProductClick(value) {
console.log(value);
- // if (value === "鎿嶄綔") {
+ // if (value == "鎿嶄綔") {
// console.log(this.tableData)
// for (let i = 0; i < this.tableData.length; i++) {
- // if (this.tableData[i].productName.length === 0) {
+ // if (this.tableData[i].productName.length == 0) {
// this.isNoProduct = false
// break
// } else {
@@ -1444,7 +1572,7 @@
// } else {
// console.log(this.detailTableData)
// for (let i = 0; i < this.detailTableData.length; i++) {
- // if (this.detailTableData[i].name.length === 0) {
+ // if (this.detailTableData[i].name.length == 0) {
// this.isNoDetail = true
// break
// } else {
@@ -1479,15 +1607,8 @@
} else {
this.tableData = this.tableData.concat(val);
}
- console.log(this.tableData);
- let list = this.tableData.map((res) => {
- return {
- ...res,
- amount: 1,
- productName: res.name,
- productId: res.id,
- };
- });
+ const list= this.getTwoTable(this.tableData,2)
+
this.tableData = list;
this.productTableList.tableData = list;
// this.showSummary.show = true
@@ -1503,7 +1624,7 @@
},
// 鍒犻櫎
handleDelClick(scope, value) {
- if (value === "鎿嶄綔") {
+ if (value == "鎿嶄綔") {
this.tableData.splice(scope.$index, 1);
this.productTableList.tableData = this.tableData;
this.$message.success("鍒犻櫎鎴愬姛锛�");
@@ -1520,7 +1641,7 @@
};
},
setTableColumn() {
- if (this.workType === "鍐呴儴璋冩嫧") {
+ if (this.workType == "鍐呴儴璋冩嫧"||this.workType==3) {
this.tableColumn = [
{ label: "浜у搧", prop: "name", productName: true, isRequird: true },
{ label: "浠�", prop: "number", select: true },
@@ -1541,7 +1662,7 @@
inputDetail(val, prop, row) {
this.detailId = row.detailId;
this.detailTableData.map((item) => {
- if (item.detailId === row.detailId) {
+ if (item.detailId == row.detailId) {
item[prop] = val;
}
});
@@ -1560,7 +1681,7 @@
await updateStatus(this.editConfig.infomation.id).then((res) => {
console.log(res);
this.editConfig.visible = false;
- if (res.code === 200) {
+ if (res.code == 200) {
this.$message.success("楠岃瘉鎴愬姛");
this.$parent.getData();
}
@@ -1578,13 +1699,13 @@
stateCancel(this.editConfig.infomation.id).then((res) => {
console.log(res);
this.editConfig.visible = false;
- if (res.code === 200) {
+ if (res.code == 200) {
this.$message.success("鍙栨秷璋冩嫧");
this.$parent.getData();
}
});
this.list.map((item) => {
- if (item.label === "宸插彇娑�") {
+ if (item.label == "宸插彇娑�") {
item.status = "active";
} else {
item.status = "todo";
@@ -1600,16 +1721,21 @@
try {
let res = await printReceipts(this.editCommonConfig.infomation.id);
console.log(res);
- if (res.code === 200) {
+ if (res.code == 200) {
console.log(this.editConfig.infomation.baseOperationType, "绫诲瀷");
+ let name=''
+ if(res.data){
+ name=res.data.name?res.data.name:''
+ }
let pdfParams = {
- url: res.data,
+ url: res.data?res.data.url:'',
baseOperationType:
this.editConfig.infomation.baseOperationType || undefined,
- cutAfterWidth:
- this.editConfig.infomation.baseOperationType === 2
+ // 1鏄槈鑱�
+ cutAfterWidth:name=='jialian'?52.6:
+ (this.editConfig.infomation.baseOperationType == 2
? 50.8
- : 53.3,
+ : 53.3),
};
var { href } = this.$router.resolve({
path: "/overview/previewExcel",
--
Gitblit v1.8.0