From d86ccb2b95f03aaa4e3ef3fdab8f3bda5d965473 Mon Sep 17 00:00:00 2001
From: songshankun <songshankun@foxmail.com>
Date: 星期二, 17 十月 2023 20:38:06 +0800
Subject: [PATCH] Merge branch 'dev' into songshankun/adjust-style
---
src/views/warehouseManage/bussinessType/AddBussinessType.vue | 220 ++++++++++++++++++++++++++++---------------------------
1 files changed, 112 insertions(+), 108 deletions(-)
diff --git a/src/views/warehouseManage/bussinessType/AddBussinessType.vue b/src/views/warehouseManage/bussinessType/AddBussinessType.vue
index c3e8669..77d51d0 100644
--- a/src/views/warehouseManage/bussinessType/AddBussinessType.vue
+++ b/src/views/warehouseManage/bussinessType/AddBussinessType.vue
@@ -30,15 +30,13 @@
label-position="left"
label-width="110px"
size="mini"
- style="height: 60vh; overflow-x: hidden"
>
<div class="basic-info">
<!-- <FormBtnsView :showProduct="true" @productClick="productClick" /> -->
<div class="basic-info-view">
- <el-row>
- <el-col :span="24">
- <div style="margin-left: 20px">鍏ュ簱绫诲瀷</div>
- <el-form-item label="" prop="name" label-width="20px">
+ <div class="purchase-view">
+ <div class="left" style="margin-left: 20px">
+ <el-form-item label="鍏ュ簱绫诲瀷" prop="name">
<el-input
v-model="editConfig.infomation.name"
placeholder="璇峰～鍐�"
@@ -46,10 +44,6 @@
style="width: 85%"
></el-input>
</el-form-item>
- </el-col>
- </el-row>
- <div class="purchase-view">
- <div class="left" style="margin-left: 20px">
<el-form-item label="浣滀笟绫诲瀷" prop="baseOperationType" :label-width="labelWidth">
<el-select
v-model="editConfig.infomation.baseOperationType"
@@ -58,10 +52,11 @@
style="width: 85%"
:disabled="!showFooter"
>
- <el-option v-for="item in baseOperationTypeList" :key="item.id" :label="item.name" :value="item.id"> </el-option>
+ <el-option v-for="item in baseOperationTypeList" :key="item.id" :label="item.name" :value="item.id">
+ </el-option>
</el-select>
</el-form-item>
-
+
<el-form-item label="搴忓彿鍓嶇紑" prop="prefix" :label-width="labelWidth">
<el-input
v-model="editConfig.infomation.prefix"
@@ -82,27 +77,6 @@
</el-option>
</el-select>
</el-form-item>
- <el-form-item
- v-if="editConfig.infomation.baseOperationType !== 1"
- label="淇濈暀鏂瑰紡"
- prop="reservationMethod"
- :label-width="labelWidth"
- >
- <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.name"
- >
- </el-radio>
- </div>
- </el-radio-group>
- </el-form-item>
<!-- <el-form-item
v-if="editConfig.infomation.resource == '鍦ㄩ瀹氭棩鏈熶箣鍓�'"
label="鍦ㄩ瀹氭棩鏈熷墠棰勫畾"
@@ -118,7 +92,6 @@
</el-form-item> -->
</div>
<div class="right">
-
<el-form-item label="閫�璐х被鍨�" prop="returnOperationTypeID">
<el-select
v-model="editConfig.infomation.returnOperationTypeID"
@@ -128,7 +101,12 @@
style="width: 85%"
:disabled="!showFooter"
>
- <el-option v-for="item in returnOperationTypeList" :key="item.id" :label="item.username" :value="item.id">
+ <el-option
+ v-for="item in returnOperationTypeList"
+ :key="item.id"
+ :label="item.username"
+ :value="item.id"
+ >
</el-option>
</el-select>
</el-form-item>
@@ -154,16 +132,35 @@
>
<el-checkbox v-model="editConfig.infomation.earlyOperations"></el-checkbox>
</el-form-item>
+ <el-form-item
+ v-if="editConfig.infomation.baseOperationType !== 1"
+ label="淇濈暀鏂瑰紡"
+ prop="reservationMethod"
+ :label-width="labelWidth"
+ >
+ <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.name"
+ >
+ </el-radio>
+ </div>
+ </el-radio-group>
+ </el-form-item>
</div>
</div>
- <!-- <el-col :span="24">
-
- </el-col> -->
</div>
<div class="bottom">
<div class="purchase-view">
<div class="left">
- <div class="second-label">浣嶇疆</div>
+ <!-- <div class="second-label">浣嶇疆</div> -->
<el-form-item label="榛樿婧愪綅缃�" prop="defaultLocationSrcId" style="margin-left: 20px">
<el-select
v-model="editConfig.infomation.defaultLocationSrcId"
@@ -176,6 +173,8 @@
</el-option>
</el-select>
</el-form-item>
+ </div>
+ <div class="right">
<el-form-item label="榛樿鐩殑浣嶇疆" prop="defaultLocationDestId" style="margin-left: 20px">
<el-select
v-model="editConfig.infomation.defaultLocationDestId"
@@ -189,15 +188,14 @@
</el-select>
</el-form-item>
</div>
- <div class="right"></div>
</div>
</div>
</div>
</el-form>
<!-- 灏� -->
- <div v-if="showFooter" slot="footer" class="dialog-footer">
+ <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')">淇濆瓨</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>
</el-dialog>
@@ -205,8 +203,14 @@
</template>
<script>
-import { addOperationType,updateOperationType,getWarehouseList,deleteOperationType,getLocationList} from "@/api/warehouseManage/warehouse"
-import { getDataByType } from "@/api/data";
+import {
+ addOperationType,
+ updateOperationType,
+ getWarehouseList,
+ deleteOperationType,
+ getLocationList
+} from "@/api/warehouseManage/warehouse"
+import { getDataByType } from "@/api/data"
export default {
name: "AddBussinessType",
props: {
@@ -232,25 +236,25 @@
name: [{ required: true, message: "璇疯緭鍏�", trigger: "change" }],
// 鍓嶇紑
prefix: [{ required: true, message: "璇疯緭鍏�", trigger: "change" }],
- baseOperationType: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
+ baseOperationType: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }]
},
// 浣嶇疆
locationList: [],
- warehouseList:[],
+ warehouseList: [],
// 閫�璐х被鍨�
- returnOperationTypeList:[],
+ returnOperationTypeList: [],
// 浣滀笟绫诲瀷
- baseOperationTypeList:getDataByType('baseOperationType'),
+ baseOperationTypeList: getDataByType("baseOperationType"),
// 鍒涘缓娆犲崟
- createBackorderList:getDataByType('createBackorder'),
+ createBackorderList: getDataByType("createBackorder"),
// 淇濈暀鏂瑰紡
- reservationMethodList:getDataByType('reservationMethod'),
+ reservationMethodList: getDataByType("reservationMethod"),
showButton: true,
showEdit: false, // 鏄惁鏄剧ず缂栬緫鎸夐挳
isDelClick: false, // 鍒犻櫎鎸夐挳鏄惁鍙偣鍑�
showFooter: false, // 鏄惁鏄剧ず鍙栨秷淇濆瓨
labelWidth: "90px",
- positionlist:[],
+ positionlist: []
}
},
created() {
@@ -261,26 +265,26 @@
// 浠撳簱
async getWarehouse() {
await getLocationList({
- keyword:'',
+ keyword: "",
page: 0,
pageSize: 0
}).then((res) => {
if (res.code === 200) {
- this.positionlist = res.data?res.data:[]
+ this.positionlist = res.data ? res.data : []
this.$forceUpdate()
}
})
await getWarehouseList({
- keyword: '',
+ keyword: "",
page: 0,
pageSize: 0
}).then((res) => {
if (res.data.code == 200) {
- this.warehouseList = res.data.data?res.data.data:[]
+ this.warehouseList = res.data.data ? res.data.data : []
}
})
},
- getList(){
+ getList() {
this.getWarehouse()
},
// 璁剧疆鍒犻櫎/鎵撳嵃/缂栬緫鏄惁鏄剧ず
@@ -300,16 +304,16 @@
},
// 鍒櫎
deleteClick() {
- let data = JSON.parse(JSON.stringify(this.editConfig.infomation));
+ let data = JSON.parse(JSON.stringify(this.editConfig.infomation))
deleteOperationType({ id: data.id }).then((res) => {
if (res.code === 200) {
- this.editConfig.visible = false;
- this.$message.success("鍒櫎鎴愬姛!");
- this.$emit("refresh");
+ this.editConfig.visible = false
+ this.$message.success("鍒櫎鎴愬姛!")
+ this.$emit("refresh")
} else {
- this.$message.warning(res.msg?res.msg:"鍒犻櫎澶辫触!")
- }
- });
+ this.$message.warning(res.msg ? res.msg : "鍒犻櫎澶辫触!")
+ }
+ })
},
// 缂栬緫
editClick() {
@@ -318,67 +322,67 @@
this.showFooter = true
},
saveParams() {
- let data =JSON.parse(JSON.stringify(this.editConfig.infomation));
-
+ let data = JSON.parse(JSON.stringify(this.editConfig.infomation))
+
let params = {
// 鍏ュ簱绫诲瀷
- name:data.name,
+ name: data.name,
// 鍓嶇紑
- prefix:data.prefix,
+ prefix: data.prefix,
// 浣滀笟绫诲瀷
- baseOperationType:data.baseOperationType,
+ baseOperationType: data.baseOperationType,
// 閫�璐х被鍨�
- returnOperationTypeID:data.returnOperationTypeID,
+ returnOperationTypeID: data.returnOperationTypeID,
// 鍒涘缓娆犲崟
- createBackorder:data.createBackorder,
+ createBackorder: data.createBackorder,
// 浠撳簱
- warehouseId:data.warehouseId,
+ warehouseId: data.warehouseId,
// 鏄剧ず浣滀笟璇︽儏
- showOperations:data.showOperations,
- earlyOperations:data.earlyOperations,
+ showOperations: data.showOperations,
+ earlyOperations: data.earlyOperations,
// 淇濈暀鏂瑰紡
- reservationMethod:data.reservationMethod,
+ reservationMethod: data.reservationMethod,
// 榛樿鍘熶綅缃�
- defaultLocationSrcId:data.defaultLocationSrcId,
+ defaultLocationSrcId: data.defaultLocationSrcId,
// 榛樿鐩爣浣嶇疆
- defaultLocationDestId:data.defaultLocationDestId,
+ defaultLocationDestId: data.defaultLocationDestId
}
- if(data.id){
- params.id=data.id
+ if (data.id) {
+ params.id = data.id
}
- return params;
+ return params
},
// 淇濆瓨
saveClick(formName) {
this.$refs[formName].validate((valid) => {
if (valid) {
- const params = this.saveParams();
- if (this.editConfig.title === "鏂板缓") {
- addOperationType(params).then((res) => {
- if (res.code === 200) {
- this.editConfig.visible = false;
- this.$message.success("娣诲姞鎴愬姛!");
- this.$emit('refresh')
- } else {
- this.$message.warning(res.msg?res.msg:"娣诲姞澶辫触!")
- }
- });
- } else {
- updateOperationType(params).then((res) => {
- if (res.code === 200) {
- this.editConfig.visible = false;
- this.$message.success("缂栬緫鎴愬姛!");
- this.$emit('refresh')
- } else {
- this.$message.warning(res.msg?res.msg:"缂栬緫澶辫触!")
- }
- });
- }
- }else {
- console.log("error submit");
- return false;
+ const params = this.saveParams()
+ if (this.editConfig.title === "鏂板缓") {
+ addOperationType(params).then((res) => {
+ if (res.code === 200) {
+ this.editConfig.visible = false
+ this.$message.success("娣诲姞鎴愬姛!")
+ this.$emit("refresh")
+ } else {
+ this.$message.warning(res.msg ? res.msg : "娣诲姞澶辫触!")
+ }
+ })
+ } else {
+ updateOperationType(params).then((res) => {
+ if (res.code === 200) {
+ this.editConfig.visible = false
+ this.$message.success("缂栬緫鎴愬姛!")
+ this.$emit("refresh")
+ } else {
+ this.$message.warning(res.msg ? res.msg : "缂栬緫澶辫触!")
+ }
+ })
+ }
+ } else {
+ console.log("error submit")
+ return false
}
- });
+ })
},
// 鍒犻櫎
delClick() {},
@@ -423,10 +427,10 @@
height: calc(100% - 80px);
overflow: auto;
margin: 20px;
- border: 1px solid #dcdfe6;
- box-shadow: inset 0 0 2px #dee2e6;
- -moz-box-shadow: inset 0 0 2px #dee2e6;
- -webkit-box-shadow: inset 0 0 2px #dee2e6;
+ // border: 1px solid #dcdfe6;
+ // box-shadow: inset 0 0 2px #dee2e6;
+ // -moz-box-shadow: inset 0 0 2px #dee2e6;
+ // -webkit-box-shadow: inset 0 0 2px #dee2e6;
.content-number {
display: flex;
justify-content: right;
--
Gitblit v1.8.0