From 1be1b02ce28638c92076e4d40afec70a3f4c2249 Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期二, 07 五月 2024 14:37:02 +0800
Subject: [PATCH] 产品模块 启用多单位点击取消关闭复选框+点击确定的时候增加至少填写一项的校验
---
src/views/overview/OverviewListView.vue | 105 +++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 90 insertions(+), 15 deletions(-)
diff --git a/src/views/overview/OverviewListView.vue b/src/views/overview/OverviewListView.vue
index 1811b59..48dc227 100644
--- a/src/views/overview/OverviewListView.vue
+++ b/src/views/overview/OverviewListView.vue
@@ -1,8 +1,8 @@
<template>
<div class="rightContent">
- <!-- <div class="label-fixed-element">
+ <div class="label-fixed-element">
<span>{{ params.name }}</span>
- </div> -->
+ </div>
<div class="top">
<SearchCommonView
:add-title="'鏂板缓'"
@@ -97,7 +97,7 @@
data() {
return {
tableList: {},
- showcol: ["浠撳簱浣嶇疆", "鏉ユ簮","鏉ユ簮鍗曟嵁","璋冨嚭浣嶇疆", "璋冨叆浣嶇疆", "鑱旂郴浜�", "鏃ユ湡", "閿�鍞槑缁嗗崟", "鐘舵��"],
+ showcol: ["浠撳簱浣嶇疆", "鏉ユ簮","鏉ユ簮鍗曟嵁","璋冨嚭浣嶇疆", "璋冨叆浣嶇疆", "鑱旂郴浜�", "鏃ユ湡", "閿�鍞槑缁嗗崟", "鐘舵��" ,"涓荤","浼氳","淇濈鍛�",],
searchOptions: [],
commonDetail: {
visible: false,
@@ -109,7 +109,7 @@
title: "鏂板缓",
infomation: {}
},
- workType: this.$route.params.workType,
+ workType: this.$route.query.workType,
keyword: "",
params: {},
displayEdit: false,
@@ -120,7 +120,7 @@
numberLabel: "鍗曞彿",
TabsIndex: "0",
productTableList: {},
- showBottomCol: ["浜у搧缂栧彿", "浜у搧鍚嶇О", "浜у搧瑙勬牸", "浜у搧鍨嬪彿", "璁￠噺鍗曚綅", "璋冨嚭浣嶇疆", "璋冨叆浣嶇疆", "鏁伴噺"],
+ showBottomCol: ["浜у搧缂栧彿", "浜у搧鍚嶇О", "浜у搧瑙勬牸", "浜у搧鍨嬪彿", "璁￠噺鍗曚綅", "璋冨嚭浣嶇疆", "璋冨叆浣嶇疆", "鏁伴噺","涓荤","浼氳","淇濈鍛�",'杈呭姪鏁伴噺','杈呭姪鍗曚綅','姣涢噸','鎬绘瘺閲�','鍑�閲�','鎬诲噣閲�'],
tableBottomColumn: [],
selectRow: {},
productColumn: [
@@ -128,8 +128,14 @@
{ label: "浜у搧鍚嶇О", prop: "productName" },
{ label: "浜у搧瑙勬牸", prop: "specs" },
{ label: "浜у搧鍨嬪彿", prop: "model" },
+ { label: "鏁伴噺", prop: "amount" },
{ label: "璁￠噺鍗曚綅", prop: "unit" },
- { label: "鏁伴噺", prop: "amount" }
+ { label: "杈呭姪鏁伴噺", prop: "adjunctAmount" },
+ { label: "杈呭姪鍗曚綅", prop: "adjunctUnit" },
+ { label: "姣涢噸", prop: "grossWeight" },
+ { label: "鎬绘瘺閲�", prop: "totalGrossWeight" },
+ { label: "鍑�閲�", prop: "netWeight" },
+ { label: "鎬诲噣閲�", prop: "totalNetWeight" }
],
allotProductColumn: [
{ label: "浜у搧缂栧彿", prop: "id", default: true },
@@ -139,7 +145,13 @@
{ label: "璁￠噺鍗曚綅", prop: "unit" },
{ label: "璋冨嚭浣嶇疆", prop: "location" },
{ label: "璋冨叆浣嶇疆", prop: "toLocation" },
- { label: "鏁伴噺", prop: "amount" }
+ { label: "鏁伴噺", prop: "amount" },
+ { label: "杈呭姪鏁伴噺", prop: "adjunctAmount" },
+ { label: "杈呭姪鍗曚綅", prop: "adjunctUnit" },
+ { label: "姣涢噸", prop: "grossWeight" },
+ { label: "鎬绘瘺閲�", prop: "totalGrossWeight" },
+ { label: "鍑�閲�", prop: "netWeight" },
+ { label: "鎬诲噣閲�", prop: "totalNetWeight" }
]
}
},
@@ -151,7 +163,8 @@
if (paramsData) {
params = JSON.parse(sessionStorage.getItem("paramsData"))
} else {
- params = this.$route.params
+ params = this.$route.query
+ params.id=Number(params.id)
sessionStorage.setItem("paramsData", JSON.stringify(params))
}
this.params = params
@@ -175,7 +188,7 @@
this.toLabel = "瀹㈡埛浣嶇疆"
this.numberLabel = "鍑哄簱鍗曞彿"
} else {
- this.showcol=["浠撳簱浣嶇疆", "璋冨嚭浣嶇疆", "璋冨叆浣嶇疆", "鑱旂郴浜�", "鏃ユ湡", "閿�鍞槑缁嗗崟", "鐘舵��"],
+ this.showcol=["浠撳簱浣嶇疆", "璋冨嚭浣嶇疆", "璋冨叆浣嶇疆", "鑱旂郴浜�","鏃ユ湡", "閿�鍞槑缁嗗崟", "鐘舵��","涓荤","浼氳","淇濈鍛�",],
this.formLabel = "璋冨嚭浣嶇疆"
this.toLabel = "璋冨叆浣嶇疆"
this.numberLabel = "璋冩嫧鍗曞彿"
@@ -288,7 +301,25 @@
status: true,
isCallMethod: true,
getCallMethod: this.getStatus
- }
+ },
+ {
+ label: "涓荤",
+ prop: "manager",
+ isShowColumn: showcol.includes("涓荤"),
+ default: false
+ },
+ {
+ label: "浼氳",
+ prop: "accountant",
+ isShowColumn: showcol.includes("浼氳"),
+ default: false
+ },
+ {
+ label: "淇濈鍛�",
+ prop: "custodian",
+ isShowColumn: showcol.includes("淇濈鍛�"),
+ default: false
+ },
]
return tableColumn
},
@@ -300,7 +331,7 @@
async getData() {
await getOperation({
number: this.keyword,
- operationTypeId: this.$route.params.id ? this.$route.params.id : this.params.id,
+ operationTypeId: this.$route.query.id ? Number(this.$route.query.id) : this.params.id,
page: this.pagerOptions.currPage,
pageSize: this.pagerOptions.pageSize,
status: this.params.status
@@ -327,12 +358,45 @@
// bottom浜у搧淇℃伅鏁版嵁澶勭悊
bottomProductData(arr) {
const list = arr.details.map((item) => {
+ // let adjunctUnit=''
+ // let adjunctAmount=''
+ // if(item.product.moreUnit&&item.product.moreUnitList){
+ // let moreUnitList=item.product.moreUnitList
+ // if(moreUnitList.length>0){
+ // let isValue=false
+ // 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 {
...item,
productName: item.product.name,
unit: item.product.unit,
+ model:item.product.model,
+ specs:item.product.specs,
location: arr.location.name,
- toLocation: arr.toLocation.name
+ toLocation: arr.toLocation.name,
+ adjunctUnit:item.auxiliaryUnit,
+ adjunctAmount:item.auxiliaryAmount,
+ grossWeight:item.product.grossWeight==0?'':item.product.grossWeight,
+ totalGrossWeight:item.totalGrossWeight==0?'':item.totalGrossWeight,
+ netWeight:item.product.netWeight==0?'':item.product.netWeight,
+ totalNetWeight:item.totalNetWeight==0?'':item.totalNetWeight,
}
})
this.productTableList.tableInfomation = list
@@ -369,7 +433,18 @@
}
row.locationID = row.location.jointName
row.locationId = row.location.value
-
+ row.managerObj={
+ label:row.manager,
+ value:row.managerId
+ }
+ row.accountantObj={
+ label:row.accountant,
+ value:row.accountantId
+ }
+ row.custodianObj={
+ label:row.custodian,
+ value:row.custodianId
+ }
// row.tolocationId=row.tolocation.value
this.editConfig.infomation = { ...row }
},
@@ -449,7 +524,7 @@
overflow: hidden;
.body {
box-sizing: border-box;
- padding: 10px 20px;
+ padding: 10px 0px;
border-radius: 12px;
height: calc(100% - 70px);
.content-top {
@@ -508,8 +583,8 @@
}
}
.label-fixed-element {
- background: #e6ecf2;
position: fixed;
+ background:#f8f8f9;
font-size: 14px;
width: calc(100% - 530px);
height: 45px;
--
Gitblit v1.8.0