From 38080d8ef637391709d45ac5dba1b382c59a7faa Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期三, 18 十月 2023 11:05:18 +0800
Subject: [PATCH] 业务类型保留方式的枚举值修改 ，添加接口修改
---
src/views/warehouseManage/bussinessType/AddBussinessType.vue | 64 ++++++++++++++++---------------
src/api/data.js | 2
src/views/warehouseManage/bussinessType/index.vue | 14 +++++-
3 files changed, 45 insertions(+), 35 deletions(-)
diff --git a/src/api/data.js b/src/api/data.js
index 8e0ad06..8b74bf6 100644
--- a/src/api/data.js
+++ b/src/api/data.js
@@ -93,7 +93,7 @@
},
{
name: "鎵嬪伐",
- id: 2
+ id:2
}
]
// 浜у搧绫诲埆
diff --git a/src/views/warehouseManage/bussinessType/AddBussinessType.vue b/src/views/warehouseManage/bussinessType/AddBussinessType.vue
index 77d51d0..aa88c1c 100644
--- a/src/views/warehouseManage/bussinessType/AddBussinessType.vue
+++ b/src/views/warehouseManage/bussinessType/AddBussinessType.vue
@@ -27,29 +27,29 @@
ref="form"
:model="editConfig.infomation"
:rules="rules"
- label-position="left"
- label-width="110px"
+ label-position="right"
+ label-width="120px"
size="mini"
>
<div class="basic-info">
<!-- <FormBtnsView :showProduct="true" @productClick="productClick" /> -->
<div class="basic-info-view">
<div class="purchase-view">
- <div class="left" style="margin-left: 20px">
+ <div class="left">
<el-form-item label="鍏ュ簱绫诲瀷" prop="name">
<el-input
v-model="editConfig.infomation.name"
placeholder="璇峰～鍐�"
:disabled="!showFooter"
- style="width: 85%"
+ style="width: 100%"
></el-input>
</el-form-item>
- <el-form-item label="浣滀笟绫诲瀷" prop="baseOperationType" :label-width="labelWidth">
+ <el-form-item label="浣滀笟绫诲瀷" prop="baseOperationType">
<el-select
v-model="editConfig.infomation.baseOperationType"
placeholder="璇烽�夋嫨"
size="mini"
- style="width: 85%"
+ style="width: 100%"
:disabled="!showFooter"
>
<el-option v-for="item in baseOperationTypeList" :key="item.id" :label="item.name" :value="item.id">
@@ -57,20 +57,20 @@
</el-select>
</el-form-item>
- <el-form-item label="搴忓彿鍓嶇紑" prop="prefix" :label-width="labelWidth">
+ <el-form-item label="搴忓彿鍓嶇紑" prop="prefix">
<el-input
v-model="editConfig.infomation.prefix"
placeholder=""
:disabled="!showFooter"
- style="width: 85%"
+ style="width: 100%"
></el-input>
</el-form-item>
- <el-form-item label="浠撳簱" prop="warehouseId" :label-width="labelWidth">
+ <el-form-item label="浠撳簱" prop="warehouseId">
<el-select
v-model="editConfig.infomation.warehouseId"
placeholder="璇烽�夋嫨"
size="mini"
- style="width: 85%"
+ style="width: 100%"
:disabled="!showFooter"
>
<el-option v-for="item in warehouseList" :key="item.id" :label="item.name" :value="item.id">
@@ -98,7 +98,7 @@
v-if="editConfig.infomation.baseOperationType"
placeholder="璇烽�夋嫨"
size="mini"
- style="width: 85%"
+ style="width: 100%"
:disabled="!showFooter"
>
<el-option
@@ -115,7 +115,7 @@
v-model="editConfig.infomation.createBackorder"
placeholder="璇烽�夋嫨"
size="mini"
- style="width: 85%"
+ style="width: 100%"
:disabled="!showFooter"
>
<el-option v-for="item in createBackorderList" :key="item.id" :label="item.name" :value="item.id">
@@ -136,20 +136,20 @@
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"
- >
+ :label="item.id"
+ >{{item.name}}
</el-radio>
</div>
</el-radio-group>
@@ -161,12 +161,12 @@
<div class="purchase-view">
<div class="left">
<!-- <div class="second-label">浣嶇疆</div> -->
- <el-form-item label="榛樿婧愪綅缃�" prop="defaultLocationSrcId" style="margin-left: 20px">
+ <el-form-item label="榛樿婧愪綅缃�" prop="defaultLocationSrcId">
<el-select
v-model="editConfig.infomation.defaultLocationSrcId"
placeholder="璇烽�夋嫨"
size="mini"
- style="width: 85%"
+ style="width: 100%"
:disabled="!showFooter"
>
<el-option v-for="item in positionlist" :key="item.id" :label="item.name" :value="item.id">
@@ -175,12 +175,12 @@
</el-form-item>
</div>
<div class="right">
- <el-form-item label="榛樿鐩殑浣嶇疆" prop="defaultLocationDestId" style="margin-left: 20px">
+ <el-form-item label="榛樿鐩殑浣嶇疆" prop="defaultLocationDestId">
<el-select
v-model="editConfig.infomation.defaultLocationDestId"
placeholder="璇烽�夋嫨"
size="mini"
- style="width: 85%"
+ style="width: 100%"
:disabled="!showFooter"
>
<el-option v-for="item in positionlist" :key="item.id" :label="item.name" :value="item.id">
@@ -338,10 +338,10 @@
// 浠撳簱
warehouseId: data.warehouseId,
// 鏄剧ず浣滀笟璇︽儏
- showOperations: data.showOperations,
+ showOperations: data.showOperations?data.showOperations:false,
earlyOperations: data.earlyOperations,
// 淇濈暀鏂瑰紡
- reservationMethod: data.reservationMethod,
+ reservationMethod: data.reservationMethod?data.reservationMethod:0,
// 榛樿鍘熶綅缃�
defaultLocationSrcId: data.defaultLocationSrcId,
// 榛樿鐩爣浣嶇疆
@@ -391,13 +391,13 @@
this.$router.push({ path: "/productManage/productList", query: { name: "浜у搧" } })
},
// 淇濈暀鏂瑰紡
- reserveMethodClick(val) {
- if (val === "鍦ㄩ瀹氭棩鏈熶箣鍓�") {
- this.labelWidth = "140px"
- } else {
- this.labelWidth = "80px"
- }
- }
+ // reserveMethodClick(val) {
+ // if (val === "鍦ㄩ瀹氭棩鏈熶箣鍓�") {
+ // this.labelWidth = "140px"
+ // } else {
+ // this.labelWidth = "80px"
+ // }
+ // }
}
}
</script>
@@ -424,9 +424,11 @@
border-bottom: 1px solid #e9e9e9;
}
.basic-info {
- height: calc(100% - 80px);
- overflow: auto;
- margin: 20px;
+ 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;
// -moz-box-shadow: inset 0 0 2px #dee2e6;
diff --git a/src/views/warehouseManage/bussinessType/index.vue b/src/views/warehouseManage/bussinessType/index.vue
index 0d1f4d2..11fe1c6 100644
--- a/src/views/warehouseManage/bussinessType/index.vue
+++ b/src/views/warehouseManage/bussinessType/index.vue
@@ -124,7 +124,15 @@
// 琛岀偣鍑�
tableRowClick(row) {
this.editConfig.title = "缂栬緫"
- this.editConfig.infomation = { ...row }
+ let obj=JSON.parse(JSON.stringify(row))
+ for(let i in obj){
+ if(i=='name'||i=='prefix'){
+ obj[i]=obj[i]?obj[i]:''
+ }else{
+ obj[i]=obj[i]?obj[i]:null
+ }
+ }
+ this.editConfig.infomation = { ...obj }
this.editConfig.visible = true
},
// 鏂板缓
@@ -134,7 +142,7 @@
name:'',
prefix:'',
// 浣滀笟绫诲瀷
- baseOperationType:null,
+ baseOperationType:null,
// 閫�璐х被鍨�
returnOperationTypeID:null,
// 鍒涘缓娆犲崟
@@ -142,7 +150,7 @@
// 浠撳簱
warehouseId:null,
// 鏄剧ず浣滀笟璇︽儏
- showOperations:null,
+ showOperations:false,
earlyOperations:null,
// 淇濈暀鏂瑰紡
reservationMethod:null,
--
Gitblit v1.8.0