From 75e90888d0dc60d229b8f179d6b58de708595080 Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期一, 13 十一月 2023 17:24:06 +0800
Subject: [PATCH] 新增位置-上级位置改为非必填
---
src/views/overview/AddOverviewDialog.vue | 146 +++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 125 insertions(+), 21 deletions(-)
diff --git a/src/views/overview/AddOverviewDialog.vue b/src/views/overview/AddOverviewDialog.vue
index 09c7c6f..2097ac0 100644
--- a/src/views/overview/AddOverviewDialog.vue
+++ b/src/views/overview/AddOverviewDialog.vue
@@ -37,8 +37,10 @@
:isValidateClick="isValidateClick"
:isDelClick="isDelClick"
:list="list"
+ :showCancel="showCancel"
@delClick="delClick"
@validateClick="validateClick"
+ @btnCancel="btnCancel"
/>
</div>
<div class="basic-info">
@@ -144,7 +146,12 @@
style="width: 90%"
:disabled="!showFooter"
>
- <el-option v-for="item in toLocationOptions" :key="item.id" :label="item.jointName" :value="item.id">
+ <el-option
+ v-for="item in toLocationOptions"
+ :key="item.id"
+ :label="item.jointName"
+ :value="item.id"
+ >
</el-option>
</el-select>
</el-form-item>
@@ -158,7 +165,12 @@
style="width: 90%"
:disabled="!showFooter"
>
- <el-option v-for="item in toLocationOptions" :key="item.id" :label="item.jointName" :value="item.id">
+ <el-option
+ v-for="item in toLocationOptions"
+ :key="item.id"
+ :label="item.jointName"
+ :value="item.id"
+ >
</el-option>
</el-select>
</el-form-item>
@@ -215,6 +227,7 @@
<el-tabs v-model="activeName" type="card">
<!-- <el-tab-pane v-if="workType !== 1" label="璇︽儏" name="detail"> </el-tab-pane> -->
<el-tab-pane label="浜у搧" name="first"> </el-tab-pane>
+ <el-tab-pane label="鍙戣揣淇℃伅" name="two"></el-tab-pane>
</el-tabs>
<!-- 鎿嶄綔 -->
<div v-if="activeName === 'first'">
@@ -234,6 +247,30 @@
</el-table-column>
</template>
</CommonFormTableView>
+ </div>
+ <!-- 鍙戣揣淇℃伅 -->
+ <div v-if="activeName==='two'">
+ <el-form label-position="left" label-width="80px" :model="shipmentsInfo">
+ <el-form-item label="鎵胯繍鍟�" style="width: 50%;">
+ <el-select :disabled="!showFooter" v-model="editConfig.infomation.logisticCompanyId" placeholder="璇烽�夋嫨" style="width: 100%;">
+ <el-option
+ v-for="item in shipmentsInfo.carrier"
+ :key="item.id"
+ :label="item.name"
+ :value="item.id">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="杩愬崟鍙�" style="width: 50%;">
+ <el-input :disabled="!showFooter" v-model="editConfig.infomation.waybillNumber"></el-input>
+ </el-form-item>
+ <el-form-item label="閲嶉噺" style="width: 50%;">
+ <el-input :disabled="!showFooter" v-model="editConfig.infomation.weight"></el-input>
+ </el-form-item>
+ <el-form-item label="鐗╂祦閲嶉噺" style="width: 50%;">
+ <el-input :disabled="!showFooter" v-model="editConfig.infomation.logisticWeight"></el-input>
+ </el-form-item>
+ </el-form>
</div>
<!-- 璇︽儏 -->
<!-- <div v-if="activeName === 'detail'">
@@ -274,8 +311,10 @@
addOperation,
updateOperation,
updateStatus,
+ stateCancel,
deleteOperation,
- getOperationType
+ getListTransfer,
+ getLogisticCompanyList
} from "@/api/overview/overview"
import { getCompanyList } from "@/api/common/other"
export default {
@@ -325,7 +364,8 @@
{ label: "鑽夌", status: "todo", value: 1 },
{ label: "姝ｅ湪绛夊緟", status: "todo", value: 2 },
{ label: "灏辩华", status: "todo", value: 3 },
- { label: "瀹屾垚", status: "todo", value: 4 }
+ { label: "瀹屾垚", status: "todo", value: 4 },
+ { label: "宸插彇娑�", status: "todo", value: 5 }
],
showButton: true,
activeName: "first",
@@ -346,7 +386,14 @@
companyObj: {},
contacterObj: {},
isValidateClick: false, // 楠岃瘉鏄惁鏄剧ず
- operationTypeOptions: [] // 鍏ュ簱绫诲瀷鍒楄〃
+ operationTypeOptions: [], // 鍏ュ簱绫诲瀷鍒楄〃
+ shipmentsInfo: {
+ carrier:[],
+ waybillNumber:'',
+ weight:0,
+ logisticWeight:0,
+ },
+ showCancel:false, // 鍙栨秷鏄惁鍙互鏄剧ず
}
},
created() {
@@ -357,16 +404,17 @@
this.getLocationList()
this.receiptType = this.editConfig.title === "鏌ョ湅" ? this.editConfig.infomation.operationTypeName : this.addName
if (this.showOperationType) {
- this.getOperationType()
+ this.getListTransfer()
}
+ this.getLogisticCompanyList()
},
methods: {
// 鑾峰彇鍏徃鍒楄〃
async getCompanyList() {
await getCompanyList().then((res) => {
console.log(res)
- if (res.data.code === 200) {
- this.companyOptions = res.data.data
+ if (res.code === 200) {
+ this.companyOptions = res.data
}
})
},
@@ -374,7 +422,7 @@
async getLocationList() {
await getLocationList({
keyWord: "",
- jointName:this.editConfig.code,
+ jointName: this.editConfig.code,
page: 0,
pageSize: 0
}).then((res) => {
@@ -385,15 +433,15 @@
})
},
// 鑾峰彇浠撳簱绫诲瀷
- async getOperationType() {
- await getOperationType({
+ async getListTransfer() {
+ await getListTransfer({
keyword: "",
page: 0,
pageSize: 0
}).then((res) => {
- console.log(res.data.data)
- if (res.data.code === 200) {
- const list = res.data.data.map((item) => {
+ console.log(res.data)
+ if (res.code === 200) {
+ const list = res.data.map((item) => {
return {
name: item.name,
id: item.id
@@ -423,8 +471,12 @@
this.showFooter = false
if (this.editConfig.infomation.status === "瀹屾垚") {
this.isValidateClick = false
- } else {
+ }else if(this.editConfig.infomation.status === 3){
this.isValidateClick = true
+ this.showCancel=true
+ }else{
+ this.isValidateClick = true
+
}
} else if (this.editConfig.infomation.status === 4 || this.editConfig.infomation.status === "瀹屾垚") {
this.showButton = true
@@ -443,6 +495,7 @@
this.showEdit = true
this.showFooter = false
this.isValidateClick = true
+ this.showCancel=true
}
if (this.editConfig.title === "鏂板缓") {
this.list[0].status = "active"
@@ -467,6 +520,13 @@
this.showButton = false
this.showFooter = true
this.setTableForm()
+ },
+ async getLogisticCompanyList(){
+ await getLogisticCompanyList().then((res) => {
+ if(res.code===200){
+ this.shipmentsInfo.carrier=res.data
+ }
+ })
},
// 淇濆瓨
saveClick(formName) {
@@ -517,7 +577,7 @@
contacterName = Object.keys(this.contacterObj).length === 0 ? data.contacterName : this.contacterObj.label
}
let params = {
- baseOperationType:data.baseOperationType,
+ baseOperationType: data.baseOperationType,
comment: data.comment || "",
companyID: companyID,
companyName: companyName,
@@ -532,7 +592,11 @@
operationTypeName: this.receiptType,
sourceNumber: data.sourceNumber || "",
status: 3,
- toLocationId: data.toLocationId || 0
+ toLocationId: data.toLocationId || 0,
+ waybillNumber:data.waybillNumber||'',
+ weight:data.weight||0,
+ logisticWeight:data.logisticWeight||0,
+ logisticCompanyId:data.logisticCompanyId,
}
return params
},
@@ -589,6 +653,7 @@
},
// 鏂板
addProductClick(value) {
+ console.log(value)
if (value === "鎿嶄綔") {
console.log(this.tableData)
for (let i = 0; i < this.tableData.length; i++) {
@@ -697,6 +762,32 @@
this.$parent.getData()
}
})
+ },
+
+ // 鍙栨秷
+ btnCancel(){
+ this.$confirm('纭畾鍙栨秷鍚楋紵', '鎻愮ず', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning'
+ }).then(() => {
+ stateCancel(this.editConfig.infomation.id).then((res) => {
+ console.log(res)
+ this.editConfig.visible = false
+ if (res.code === 200) {
+ this.$message.success("鍙栨秷璋冩嫧")
+ this.$parent.getData()
+ }
+ })
+ this.list.map((item) => {
+ if (item.label==="宸插彇娑�") {
+ item.status = "active"
+ } else {
+ item.status = "todo"
+ }
+ })
+ }).catch(() => {
+ });
}
}
}
@@ -760,10 +851,10 @@
.el-tabs--card > .el-tabs__header {
border-bottom: none;
}
- .el-tabs__item.is-active {
- color: #333;
- background: #f1f3f8;
- }
+ // .el-tabs__item.is-active {
+ // color: #333;
+ // background: #f1f3f8;
+ // }
.el-tabs__item {
height: 30px;
line-height: 30px;
@@ -773,5 +864,18 @@
.el-tabs__header {
margin: 0 0 1px;
}
+ .bottom{
+ .el-form{
+ // border-top: 1px solid #EBEEF5;
+ }
+ .el-form-item{
+ height: 28px;
+ .el-input {
+ input{
+ height: 28px;
+ }
+ }
+ }
+ }
}
</style>
--
Gitblit v1.8.0