From cf6a4b874aed82592eea78294715c7c688f9b248 Mon Sep 17 00:00:00 2001
From: songshankun <songshankun@foxmail.com>
Date: 星期五, 03 十一月 2023 14:50:31 +0800
Subject: [PATCH] Merge branch 'dev' into songshankun/add-token
---
src/views/warehouseManage/bussinessType/AddBussinessType.vue | 184 +++++++++++++++++++++++----------------------
1 files changed, 94 insertions(+), 90 deletions(-)
diff --git a/src/views/warehouseManage/bussinessType/AddBussinessType.vue b/src/views/warehouseManage/bussinessType/AddBussinessType.vue
index aa88c1c..b3d2827 100644
--- a/src/views/warehouseManage/bussinessType/AddBussinessType.vue
+++ b/src/views/warehouseManage/bussinessType/AddBussinessType.vue
@@ -36,7 +36,7 @@
<div class="basic-info-view">
<div class="purchase-view">
<div class="left">
- <el-form-item label="鍏ュ簱绫诲瀷" prop="name">
+ <el-form-item label="鍗曟嵁绫诲瀷" prop="name">
<el-input
v-model="editConfig.infomation.name"
placeholder="璇峰～鍐�"
@@ -56,24 +56,31 @@
</el-option>
</el-select>
</el-form-item>
-
- <el-form-item label="搴忓彿鍓嶇紑" prop="prefix">
- <el-input
- v-model="editConfig.infomation.prefix"
- placeholder=""
- :disabled="!showFooter"
- style="width: 100%"
- ></el-input>
- </el-form-item>
- <el-form-item label="浠撳簱" prop="warehouseId">
+ <el-form-item label="榛樿婧愪綅缃�" prop="defaultLocationSrcId">
<el-select
- v-model="editConfig.infomation.warehouseId"
+ v-model="editConfig.infomation.defaultLocationSrcId"
placeholder="璇烽�夋嫨"
size="mini"
style="width: 100%"
:disabled="!showFooter"
>
- <el-option v-for="item in warehouseList" :key="item.id" :label="item.name" :value="item.id">
+ <el-option v-for="item in positionlist" :key="item.id" :label="item.name" :value="item.id">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item
+ v-if="editConfig.infomation.baseOperationType !== 1"
+ label="榛樿鐩殑浣嶇疆"
+ prop="defaultLocationDestId"
+ >
+ <el-select
+ v-model="editConfig.infomation.defaultLocationDestId"
+ placeholder="璇烽�夋嫨"
+ size="mini"
+ style="width: 100%"
+ :disabled="!showFooter"
+ >
+ <el-option v-for="item in positionlist" :key="item.id" :label="item.name" :value="item.id">
</el-option>
</el-select>
</el-form-item>
@@ -92,10 +99,60 @@
</el-form-item> -->
</div>
<div class="right">
- <el-form-item label="閫�璐х被鍨�" prop="returnOperationTypeID">
+ <el-form-item label="搴忓彿鍓嶇紑" prop="prefix">
+ <el-input
+ v-model="editConfig.infomation.prefix"
+ placeholder=""
+ :disabled="!showFooter"
+ style="width: 100%"
+ ></el-input>
+ </el-form-item>
+ <el-form-item
+ v-if="editConfig.infomation.baseOperationType !== 1"
+ label="淇濈暀鏂瑰紡"
+ prop="reservationMethod"
+ >
+ <el-radio-group v-model="editConfig.infomation.reservationMethod" :disabled="!showFooter">
+ <el-radio v-for="item in reservationMethodList" :key="item.id" :value="item.id" :label="item.id"
+ >{{ item.name }}
+ </el-radio>
+ </el-radio-group>
+ </el-form-item>
+ <el-form-item label="浠撳簱" prop="warehouseId">
+ <el-select
+ v-model="editConfig.infomation.warehouseId"
+ placeholder="璇烽�夋嫨"
+ size="mini"
+ style="width: 100%"
+ :disabled="!showFooter"
+ >
+ <el-option v-for="item in warehouseList" :key="item.id" :label="item.name" :value="item.id">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item
+ v-if="editConfig.infomation.baseOperationType === 1"
+ label="榛樿鐩殑浣嶇疆"
+ prop="defaultLocationDestId"
+ >
+ <el-select
+ v-model="editConfig.infomation.defaultLocationDestId"
+ placeholder="璇烽�夋嫨"
+ size="mini"
+ style="width: 100%"
+ :disabled="!showFooter"
+ >
+ <el-option v-for="item in positionlist" :key="item.id" :label="item.name" :value="item.id">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <!-- <el-form-item
+ v-if="editConfig.infomation.baseOperationType"
+ label="閫�璐х被鍨�"
+ prop="returnOperationTypeID"
+ >
<el-select
v-model="editConfig.infomation.returnOperationTypeID"
- v-if="editConfig.infomation.baseOperationType"
placeholder="璇烽�夋嫨"
size="mini"
style="width: 100%"
@@ -123,70 +180,15 @@
</el-select>
</el-form-item>
<el-form-item label="鏄剧ず浣滀笟璇︽儏" prop="showOperations">
- <el-checkbox v-model="editConfig.infomation.showOperations"></el-checkbox>
+ <el-checkbox v-model="editConfig.infomation.showOperations" :disabled="!showFooter"></el-checkbox>
</el-form-item>
<el-form-item
v-if="editConfig.infomation.baseOperationType === 1"
label="棰勫～鍐欎綔涓氳鎯�"
prop="earlyOperations"
>
- <el-checkbox v-model="editConfig.infomation.earlyOperations"></el-checkbox>
- </el-form-item>
- <el-form-item
- v-if="editConfig.infomation.baseOperationType !== 1"
- label="淇濈暀鏂瑰紡"
- prop="reservationMethod"
- >
- <el-radio-group
- v-model="editConfig.infomation.reservationMethod"
- @input="reserveMethodClick"
- :disabled="!showFooter"
- >
-
- <div style="margin-top: 8px">
- <el-radio
- v-for="item in reservationMethodList"
- :key="item.id"
- :value="item.id"
- :label="item.id"
- >{{item.name}}
- </el-radio>
- </div>
- </el-radio-group>
- </el-form-item>
- </div>
- </div>
- </div>
- <div class="bottom">
- <div class="purchase-view">
- <div class="left">
- <!-- <div class="second-label">浣嶇疆</div> -->
- <el-form-item label="榛樿婧愪綅缃�" prop="defaultLocationSrcId">
- <el-select
- v-model="editConfig.infomation.defaultLocationSrcId"
- placeholder="璇烽�夋嫨"
- size="mini"
- style="width: 100%"
- :disabled="!showFooter"
- >
- <el-option v-for="item in positionlist" :key="item.id" :label="item.name" :value="item.id">
- </el-option>
- </el-select>
- </el-form-item>
- </div>
- <div class="right">
- <el-form-item label="榛樿鐩殑浣嶇疆" prop="defaultLocationDestId">
- <el-select
- v-model="editConfig.infomation.defaultLocationDestId"
- placeholder="璇烽�夋嫨"
- size="mini"
- style="width: 100%"
- :disabled="!showFooter"
- >
- <el-option v-for="item in positionlist" :key="item.id" :label="item.name" :value="item.id">
- </el-option>
- </el-select>
- </el-form-item>
+ <el-checkbox v-model="editConfig.infomation.earlyOperations" :disabled="!showFooter"></el-checkbox>
+ </el-form-item> -->
</div>
</div>
</div>
@@ -194,7 +196,6 @@
</el-form>
<!-- 灏� -->
<div slot="footer" class="dialog-footer">
- <!-- <el-button type="primary" size="small" @click="editConfig.visible = false">淇濆苟鎻愪氦瀹℃壒</el-button> -->
<el-button type="primary" size="small" @click="saveClick('form')" :disabled="!showFooter">淇濆瓨</el-button>
<el-button size="small" @click="editConfig.visible = false">鍙栨秷</el-button>
</div>
@@ -232,7 +233,7 @@
dialogWidth: "50%",
editConfig: this.editCommonConfig,
rules: {
- // 鍏ュ簱绫诲瀷
+ // 涓氬姟绫诲瀷
name: [{ required: true, message: "璇疯緭鍏�", trigger: "change" }],
// 鍓嶇紑
prefix: [{ required: true, message: "璇疯緭鍏�", trigger: "change" }],
@@ -279,8 +280,8 @@
page: 0,
pageSize: 0
}).then((res) => {
- if (res.data.code == 200) {
- this.warehouseList = res.data.data ? res.data.data : []
+ if (res.code == 200) {
+ this.warehouseList = res.data ? res.data : []
}
})
},
@@ -291,6 +292,9 @@
setBottonView() {
if (this.editConfig.title === "鏂板缓") {
this.showButton = false
+ this.showEdit = false
+ this.showFooter = true
+ } else if (this.editConfig.title === "缂栬緫") {
this.showEdit = false
this.showFooter = true
} else {
@@ -325,7 +329,7 @@
let data = JSON.parse(JSON.stringify(this.editConfig.infomation))
let params = {
- // 鍏ュ簱绫诲瀷
+ // 涓氬姟绫诲瀷
name: data.name,
// 鍓嶇紑
prefix: data.prefix,
@@ -338,10 +342,10 @@
// 浠撳簱
warehouseId: data.warehouseId,
// 鏄剧ず浣滀笟璇︽儏
- showOperations: data.showOperations?data.showOperations:false,
+ showOperations: data.showOperations ? data.showOperations : false,
earlyOperations: data.earlyOperations,
// 淇濈暀鏂瑰紡
- reservationMethod: data.reservationMethod?data.reservationMethod:0,
+ reservationMethod: data.reservationMethod ? data.reservationMethod : 0,
// 榛樿鍘熶綅缃�
defaultLocationSrcId: data.defaultLocationSrcId,
// 榛樿鐩爣浣嶇疆
@@ -389,14 +393,14 @@
// 浜у搧
productClick() {
this.$router.push({ path: "/productManage/productList", query: { name: "浜у搧" } })
- },
+ }
// 淇濈暀鏂瑰紡
// reserveMethodClick(val) {
- // if (val === "鍦ㄩ瀹氭棩鏈熶箣鍓�") {
- // this.labelWidth = "140px"
- // } else {
- // this.labelWidth = "80px"
- // }
+ // if (val === "鍦ㄩ瀹氭棩鏈熶箣鍓�") {
+ // this.labelWidth = "140px"
+ // } else {
+ // this.labelWidth = "80px"
+ // }
// }
}
}
@@ -424,10 +428,10 @@
border-bottom: 1px solid #e9e9e9;
}
.basic-info {
- height:350px;
- overflow-y: auto;
- overflow-x:hidden;
- width:calc(100% - 60px);
+ // height: 350px;
+ // overflow-y: auto;
+ // overflow-x: hidden;
+ width: calc(100% - 60px);
margin: 30px;
// border: 1px solid #dcdfe6;
// box-shadow: inset 0 0 2px #dee2e6;
--
Gitblit v1.8.0