From a48ded866d223f581944ea9043df1b296b3425e3 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期四, 21 十二月 2023 13:17:46 +0800
Subject: [PATCH] modified: src/views/basic/company/index.vue modified: src/views/basic/customizeparamtemplatetype/index.vue modified: src/views/basic/division/index.vue modified: src/views/basic/factory/index.vue modified: src/views/basic/location/index.vue modified: src/views/basic/param/index.vue modified: src/views/basic/part/index.vue modified: src/views/basic/post/index.vue modified: src/views/basic/shift/index.vue modified: src/views/basic/staff/index.vue modified: src/views/basic/template/index.vue modified: src/views/basic/warehouse/index.vue modified: src/views/basic/workstation/index.vue modified: src/views/plan/manufacturingorder/index.vue modified: src/views/plan/masterproductionschedule/index.vue modified: src/views/plan/operationtask/index.vue modified: src/views/plan/productionschedul/index.vue modified: src/views/quality/finishedProductInspection/index.vue modified: src/views/quality/rawMaterial/index.vue modified: src/views/technology/completeproductstructure/index.vue modified: src/views/technology/document/index.vue modified: src/views/technology/operation/index.vue modified: src/views/technology/routing/index.vue modified: src/views/technology/structure/index.vue modified: src/views/warehouse/FinishedWarehousing/index.vue modified: src/views/warehouse/changestock/index.vue modified: src/views/warehouse/pallettransports/index.vue
---
src/views/warehouse/pallettransports/index.vue | 72 +++++++++++++++++++++---------------
1 files changed, 42 insertions(+), 30 deletions(-)
diff --git a/src/views/warehouse/pallettransports/index.vue b/src/views/warehouse/pallettransports/index.vue
index 0cd60ad..5353e18 100644
--- a/src/views/warehouse/pallettransports/index.vue
+++ b/src/views/warehouse/pallettransports/index.vue
@@ -52,10 +52,15 @@
</div>
</div>
<div>
- <el-table class="pallet-transports-material-table" :data="palletTransportsMaterialData" style="width: 100%;"
- height="350px" border @selection-change="palletTransportsMaterialSelectionChange" stripe
+ <el-table class="pallet-transports-material-table" @current-change="handleCurrentChange" :data="palletTransportsMaterialData" style="width: 100%;"
+ height="350px" border stripe
ref="palletTransportsMaterialTable">
- <el-table-column type="selection" width="55"> </el-table-column>
+ <!--鍗曢�夋 @selection-change="palletTransportsMaterialSelectionChange"-->
+ <el-table-column align="center" width="55" label="鍗曢��">
+ <template slot-scope="scope">
+ <el-checkbox v-model="scope.row.commonChecked" @change="handleCurrentChange(scope.row)" ></el-checkbox>
+ </template>
+ </el-table-column>
<el-table-column prop="partNo" label="闆朵欢鍙�" align="center" show-overflow-tooltip>
</el-table-column>
<el-table-column prop="partDesc" label="闆朵欢鎻忚堪" align="center" show-overflow-tooltip>
@@ -76,7 +81,7 @@
</el-table-column>
<el-table-column prop="toIfsLocationNo" label="绉昏嚦搴撲綅" align="center">
</el-table-column>
- <el-table-column label="鎿嶄綔" align="center" width="100">
+ <el-table-column label="鎿嶄綔" align="center" width="100" v-if="permissions.warehouse_pallettransports_demand_edit">
<template slot-scope="scope">
<!-- <el-button v-show="!scope.row.canEdit" type="text" :disabled="scope.row.detailExistState"
@click="scope.row.canEdit = true">缂栬緫</el-button> -->
@@ -146,7 +151,7 @@
}}</span>
</template>
</el-table-column>
- <el-table-column label="鎿嶄綔" align="center" width="85">
+ <el-table-column label="鎿嶄綔" align="center" width="85" v-if="permissions.warehouse_pallettransports_detail_edit">
<template slot-scope="scope">
<!-- <el-button type="text" @click="openEditStockDialog(scope.row)"
:disabled="scope.row.state === '01initial' ? false : true">缂栬緫</el-button> -->
@@ -298,14 +303,7 @@
}
],
toolbar: [],
- operator: [
- {
- text: '鍒犻櫎',
- type: 'text',
- size: 'small',
- fun: this.deleteHandle
- }
- ],
+ operator: null,
operatorConfig: {
fixed: 'right',
label: '鎿嶄綔',
@@ -358,8 +356,31 @@
}
}
},
- created() { },
+ created() {
+ if(this.permissions.warehouse_pallettransports_edit){
+ this.table.operator = [
+ {
+ text: '鍒犻櫎',
+ type: 'text',
+ size: 'small',
+ fun: this.deleteHandle
+ }
+ ]
+ }
+ },
methods: {
+ // 鍗曡閫変腑
+ handleCurrentChange(row) {
+ this.palletTransportsMaterialData.forEach((item) => {
+ // 鎺掍粬,姣忔閫夋嫨鏃舵妸鍏朵粬閫夐」閮芥竻闄�
+ if (item.id !== row.id) {
+ item.commonChecked = false
+ }else{
+ item.commonChecked = true
+ }
+ })
+ this.palletTransportsMaterialSelectionChange([row])
+ },
// 宸ヨ壓绫诲瀷涓枃鏍煎紡鍖�
formatStateType(row, column, cellValue) {
this.stateOptions.forEach((obj) => {
@@ -408,7 +429,8 @@
unit: item.unit,
transportsId: item.transportsId,
detailExistState: item.detailExistState,
- canEdit: false
+ canEdit: false,
+ commonChecked: false
}
this.palletTransportsMaterialData.push(palletTransportsMaterial)
})
@@ -499,12 +521,10 @@
openLocationDialog() {
if (this.palletTransportsMaterialMultipleSelection.length > 0) {
let flag = true
- console.log(this.palletTransportsMaterialMultipleSelection)
this.palletTransportsMaterialMultipleSelection.forEach((item) => {
if (item.detailExistState) {
flag = false
}
- console.log(item.detailExistState)
})
if (flag) {
this.showLocation = true
@@ -559,8 +579,6 @@
},
// 鑾峰彇绉诲簱鏄庣粏鏁版嵁鍒楄〃
getPalletTransportsDetailData() {
- // console.log("瀵瑰簲宸ュ崟",this.WorkOrder);
- // console.log("閫変腑鐗╂枡闇�姹�",this.palletTransportsMaterialMultipleSelection);
let transportsDetails =[]
transportsDetails = this.palletTransportsMaterialMultipleSelection.map(el =>{
return{
@@ -585,10 +603,8 @@
this.innerVisible = false
this.$message.success('娣诲姞绉诲簱鏄庣粏鎴愬姛')
let materialRow = selectionList[selectionList.length - 1]
- console.log("materialRow-----",materialRow);
this.palletTransportsMaterialData.forEach(ele=>{
if(ele.id==materialRow.id){
- console.log("ele-------",ele);
ele.transferQuantity = materialRow.surplusQuantity
ele.surplusQuantity = 0
}
@@ -633,7 +649,6 @@
},
// 鎵撳紑鍗曚釜鏄庣粏鎵归噺鏇存柊搴撲綅寮规
openSingleLocationDialog(row) {
- console.log(row);
if (row.state === '01initial') {
this.detailList = []
this.detailList.push(row)
@@ -644,17 +659,15 @@
},
// 鍒犻櫎绉诲簱鏄庣粏
delDetail(row) {
- /* const delRow = this.palletTransportsDetailData.find((item) => {
+ const delRow = this.palletTransportsDetailData.find((item) => {
return item.id === row.id
- }) */
-
+ })
delPalletTransportsDetailObj(row.id).then((response) => {
const resData = response.data
if (resData.code === 0) {
- // const findRowIndex = this.palletTransportsDetailData.indexOf(delRow)
- // this.palletTransportsDetailData.splice(findRowIndex, 1)
+ const findRowIndex = this.palletTransportsDetailData.indexOf(delRow)
+ this.palletTransportsDetailData.splice(findRowIndex, 1)
this.$message.success('绉诲簱鏄庣粏鍒犻櫎鎴愬姛')
- // this.getPalletTransportsMaterialData()
const currRow = this.currPalletTransportsRow
this.getPallettransportsData().then(() => {
if (currRow) {
@@ -686,6 +699,7 @@
if (resData.code === 0) {
this.$message.success('鎵ц鎴愬姛')
// this.getPalletTransportsMaterialData()
+ this.palletTransportsDetailData=[]
const currRow = this.currPalletTransportsRow
this.getPallettransportsData().then(() => {
if (currRow) {
@@ -720,12 +734,10 @@
},
palletTransportsMaterialSelectionChange(val) {
this.palletTransportsMaterialMultipleSelection = val
- console.log(this.palletTransportsMaterialMultipleSelection);
if(val && val.length>0){
let ids =[]
this.palletTransportsMaterialMultipleSelection.forEach(el =>{ids.push(el.id)})
let pId = ids[ids.length - 1];
- console.log(pId);
if(pId!=null){
selectAll({
transportsId:this.currPalletTransportsRow.id,
--
Gitblit v1.9.3