From e0efd928e914e1a768635fb6b9fe303f3e329f01 Mon Sep 17 00:00:00 2001
From: zuozhengqing <a13193816592@163.com>
Date: 星期六, 18 十一月 2023 15:10:03 +0800
Subject: [PATCH] fix:调拨状态调整
---
src/views/operate/allot/index.vue | 2
src/views/overview/AddOverviewDialog.vue | 37 ++++++++++++++----
src/views/overview/OverviewListView.vue | 12 +++---
src/views/overview/index.vue | 7 +++
src/components/makepager/StatusCommonView.vue | 6 ++
5 files changed, 46 insertions(+), 18 deletions(-)
diff --git a/src/components/makepager/StatusCommonView.vue b/src/components/makepager/StatusCommonView.vue
index cc67562..d47fb2f 100644
--- a/src/components/makepager/StatusCommonView.vue
+++ b/src/components/makepager/StatusCommonView.vue
@@ -1,7 +1,7 @@
<template>
<div class="common-status">
<div v-if="showButton" style="margin-left: 30px">
- <el-button v-if="isValidateClick" plain size="mini" @click="validateClick">楠岃瘉</el-button>
+ <el-button v-if="isValidateClick" plain size="mini" @click="validateClick" :disabled="isCancel">楠岃瘉</el-button>
<el-button v-if="showOther" plain size="mini" @click="delClick" :disabled="isDelClick">鍒犻櫎</el-button>
<el-button v-if="showCancel" plain size="mini" @click="btnCancel">鍙栨秷</el-button>
<el-button v-if="showOther" plain size="mini" disabled>鎵撳嵃</el-button>
@@ -60,6 +60,10 @@
type: Boolean,
default: false
},
+ isCancel:{
+ type:Boolean,
+ default:false,
+ },
isValidateClick: {
type: Boolean,
default: false
diff --git a/src/views/operate/allot/index.vue b/src/views/operate/allot/index.vue
index 4156d63..84f4e10 100644
--- a/src/views/operate/allot/index.vue
+++ b/src/views/operate/allot/index.vue
@@ -260,7 +260,7 @@
},
// 鐘舵��
getStatus(val) {
- return val === 1 ? "鑽夌" : val === 3 ? "灏辩华" : "瀹屾垚"
+ return val === 1 ? "鑽夌" : val === 3 ? "灏辩华" :val===4? "瀹屾垚": "鍙栨秷"
}
}
}
diff --git a/src/views/overview/AddOverviewDialog.vue b/src/views/overview/AddOverviewDialog.vue
index 2097ac0..c12633b 100644
--- a/src/views/overview/AddOverviewDialog.vue
+++ b/src/views/overview/AddOverviewDialog.vue
@@ -18,7 +18,7 @@
<i class="el-icon-s-tools"></i>
<span>鍔ㄤ綔</span>
</span>
- <el-button v-if="showEdit" plain size="mini" style="margin-left: 15px" @click="editClick">缂栬緫</el-button>
+ <el-button v-if="showEdit" :disabled="this.editConfig.infomation.status===5" plain size="mini" style="margin-left: 15px" @click="editClick">缂栬緫</el-button>
</div>
</div>
<!-- 鍐呭 -->
@@ -36,6 +36,7 @@
:showButton="showButton"
:isValidateClick="isValidateClick"
:isDelClick="isDelClick"
+ :isCancel="isCancel"
:list="list"
:showCancel="showCancel"
@delClick="delClick"
@@ -360,13 +361,6 @@
companyOptions: [], // 鍏徃
memberOptions: [{ id: 1, name: "绠＄悊鍛�" }],
toLocationOptions: [], // 婧愪綅缃� 浠撳簱浣嶇疆
- list: [
- { label: "鑽夌", status: "todo", value: 1 },
- { label: "姝ｅ湪绛夊緟", status: "todo", value: 2 },
- { label: "灏辩华", status: "todo", value: 3 },
- { label: "瀹屾垚", status: "todo", value: 4 },
- { label: "宸插彇娑�", status: "todo", value: 5 }
- ],
showButton: true,
activeName: "first",
productTableList: {},
@@ -375,6 +369,7 @@
isNoProduct: true, // 娣诲姞鏄庣粏琛屾椂鏄惁鏈変骇鍝佹湭閫夋嫨
showEdit: false, // 鏄惁鏄剧ず缂栬緫鎸夐挳
isDelClick: false, // 鍒犻櫎鎸夐挳鏄惁鍙偣鍑�
+ isCancel:false, //楠岃瘉鎸夐挳鏄惁鍙偣鍑�
showFooter: false, // 鏄惁鏄剧ず鍙栨秷淇濆瓨
currentState: "todo", // 褰撳墠鐘舵��
detailTableList: {},
@@ -394,9 +389,11 @@
logisticWeight:0,
},
showCancel:false, // 鍙栨秷鏄惁鍙互鏄剧ず
+ list:[],
}
},
created() {
+ this.setStatusList()
this.setTableForm()
this.setBottonView()
this.setDetailTableForm()
@@ -409,6 +406,25 @@
this.getLogisticCompanyList()
},
methods: {
+ setStatusList(){
+ console.log(this.editConfig.infomation,"edit")
+ if(this.editConfig.infomation.status===5){
+ this.list=[
+ { label: "鑽夌", status: "todo", value: 1 },
+ { label: "姝ｅ湪绛夊緟", status: "todo", value: 2 },
+ { label: "灏辩华", status: "todo", value: 3 },
+ { label: "瀹屾垚", status: "todo", value: 4 },
+ { label: "宸插彇娑�", status: "todo", value: 5 }
+ ]
+ }else{
+ this.list=[
+ { label: "鑽夌", status: "todo", value: 1 },
+ { label: "姝ｅ湪绛夊緟", status: "todo", value: 2 },
+ { label: "灏辩华", status: "todo", value: 3 },
+ { label: "瀹屾垚", status: "todo", value: 4 }
+ ]
+ }
+ },
// 鑾峰彇鍏徃鍒楄〃
async getCompanyList() {
await getCompanyList().then((res) => {
@@ -474,9 +490,11 @@
}else if(this.editConfig.infomation.status === 3){
this.isValidateClick = true
this.showCancel=true
+ }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.showButton = true
@@ -485,6 +503,7 @@
this.showFooter = false
this.isValidateClick = false
} else if (this.editConfig.infomation.status === 5) {
+ this.isCancel=true
this.showButton = true
this.showEdit = false
this.showFooter = false
diff --git a/src/views/overview/OverviewListView.vue b/src/views/overview/OverviewListView.vue
index fc3a8d8..de6c5c0 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="'鏂板缓'"
@@ -22,7 +22,7 @@
<template slot-scope="scope">
<el-button @click="tableRowClick(scope.row, '鏌ョ湅')" type="text" size="small">鏌ョ湅</el-button>
<el-button
- v-if="scope.row.status !== 4"
+ v-if="scope.row.status !== 4&&scope.row.status !== 5"
@click="tableRowClick(scope.row, '缂栬緫')"
type="text"
size="small"
@@ -67,7 +67,8 @@
searchOptions: [],
commonDetail: {
visible: false,
- title: "鏂板缓",
+ title: "鏂板缓"
+ ,
infomation: {}
},
editConfig: {
@@ -272,7 +273,6 @@
addBtnClick() {
this.editConfig.title = "鏂板缓"
this.addName = this.params.name
- console.log(this.params, "ss鍒锋柊")
this.editConfig.operationTypeId = this.params.id
this.editConfig.code = this.params.code
this.editConfig.infomation = {}
@@ -280,7 +280,7 @@
},
// 鐘舵��
getStatus(val) {
- return val === 1 ? "鑽夌" : val === 3 ? "灏辩华" : val === 4 ? "瀹屾垚" : ""
+ return val === 1 ? "鑽夌" : val === 3 ? "灏辩华" : val === 4 ? "瀹屾垚" :val === 5 ? "鍙栨秷" : ""
},
// 鍒犻櫎鎼滅储鐘舵��
delSelectClick() {
diff --git a/src/views/overview/index.vue b/src/views/overview/index.vue
index a4b17f1..9ddec17 100644
--- a/src/views/overview/index.vue
+++ b/src/views/overview/index.vue
@@ -44,6 +44,11 @@
<span style="cursor: pointer">4 寤舵湡</span>
</div> -->
</div>
+ <div class="right">
+ <div class="right_status" @click.stop="statusClick(item, 5)">
+ <span style="cursor: pointer">{{ item.cancelCount + " 宸插彇娑�" }}</span>
+ </div>
+ </div>
</div>
</div>
</div>
@@ -193,7 +198,7 @@
}
}
.right {
- width: 50%;
+ width: 25%;
.right_status {
margin-top: 5px;
}
--
Gitblit v1.8.0