From 2e2fe994aa53c7c2f389bc32d0933995389963be Mon Sep 17 00:00:00 2001
From: zzq <a13193816592@163.com>
Date: 星期三, 27 九月 2023 11:32:20 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/web/WMS
---
src/views/warehouseManage/position/AddDialog.vue | 302 +++++++++++++++++++++++---------------------------
1 files changed, 140 insertions(+), 162 deletions(-)
diff --git a/src/views/warehouseManage/position/AddDialog.vue b/src/views/warehouseManage/position/AddDialog.vue
index a14916e..e61fef4 100644
--- a/src/views/warehouseManage/position/AddDialog.vue
+++ b/src/views/warehouseManage/position/AddDialog.vue
@@ -34,16 +34,15 @@
>
<div>
<!-- <div>aaa</div> -->
- <FormBtnsView :showPosition="true" :showWarehouse=false @productClick="productClick" />
+ <FormBtnsView :showPosition="true" :showWarehouse="false" @productClick="productClick" />
</div>
<div class="basic-info">
<div class="basic-info-view">
-
<el-row>
<el-col :span="24" class="line_height_30px">
<el-form-item label="浣嶇疆鍚嶇О" prop="name">
<el-input
- :disabled="!showFooter"
+ :disabled="!showFooter"
v-model="editConfig.infomation.name"
placeholder="璇疯緭鍏�"
></el-input>
@@ -58,12 +57,7 @@
style="width: 45%"
:disabled="!showFooter"
>
- <el-option
- v-for="item in positionList"
- :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>
@@ -71,94 +65,81 @@
</el-row>
</div>
<div class="bottom">
- <div class="left">
- <div class="second-label">鍏朵粬淇℃伅</div>
- <el-form-item label="浣嶇疆绫诲瀷" prop="type">
- <el-select
- v-model="editConfig.infomation.type"
- filterable
- :disabled="!showFooter"
- placeholder="璇烽�夋嫨"
- style="width: 100%"
- no-data-text="鏆傛棤鏁版嵁"
- >
- <el-option
- v-for="item in positionTypeList"
- :key="item.id"
- :label="item.name"
- :value="item.id"
- >
- </el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="鏄竴涓姤搴熶綅缃�" v-if="editConfig.infomation.type==3||editConfig.infomation.type==5" prop="isScrapLocation">
- <el-checkbox
+ <div class="left">
+ <div class="second-label">鍏朵粬淇℃伅</div>
+ <el-form-item label="浣嶇疆绫诲瀷" prop="type">
+ <el-select
+ v-model="editConfig.infomation.type"
+ filterable
:disabled="!showFooter"
- v-model="editConfig.infomation.isScrapLocation"
- >
- </el-checkbox>
- </el-form-item>
- <el-form-item label="鏄竴涓��鍥炰綅缃�" prop="isReturnLocation">
- <el-checkbox
+ placeholder="璇烽�夋嫨"
+ style="width: 100%"
+ no-data-text="鏆傛棤鏁版嵁"
+ >
+ <el-option v-for="item in positionTypeList" :key="item.id" :label="item.name" :value="item.id">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item
+ label="鏄竴涓姤搴熶綅缃�"
+ v-if="editConfig.infomation.type == 3 || editConfig.infomation.type == 5"
+ prop="isScrapLocation"
+ >
+ <el-checkbox :disabled="!showFooter" v-model="editConfig.infomation.isScrapLocation"> </el-checkbox>
+ </el-form-item>
+ <el-form-item label="鏄竴涓��鍥炰綅缃�" prop="isReturnLocation">
+ <el-checkbox :disabled="!showFooter" v-model="editConfig.infomation.isReturnLocation"> </el-checkbox>
+ </el-form-item>
+ <el-form-item label="琛ュ厖浣嶇疆" v-if="editConfig.infomation.type == 3" prop="replenishLocation">
+ <el-checkbox :disabled="!showFooter" v-model="editConfig.infomation.replenishLocation"> </el-checkbox>
+ </el-form-item>
+ </div>
+ <div class="left" v-if="editConfig.infomation.type == 3 || editConfig.infomation.type == 7">
+ <div class="second-label">寰幆璁℃暟</div>
+ <el-form-item label="鐩樼偣棰戠巼锛堝ぉ锛�" prop="countFrequency">
+ <el-input
:disabled="!showFooter"
- v-model="editConfig.infomation.isReturnLocation"
- >
- </el-checkbox>
- </el-form-item>
- <el-form-item label="琛ュ厖浣嶇疆" v-if="editConfig.infomation.type==3" prop="replenishLocation">
- <el-checkbox
+ v-model="editConfig.infomation.countFrequency"
+ placeholder="璇疯緭鍏�"
+ ></el-input>
+ </el-form-item>
+ <el-form-item label="鏈�杩戞湁鏁堢洏鐐�" prop="recentlyCount">
+ <el-date-picker
:disabled="!showFooter"
- v-model="editConfig.infomation.replenishLocation"
- >
- </el-checkbox>
- </el-form-item>
- </div>
- <div class="left" v-if="editConfig.infomation.type==3||editConfig.infomation.type==7">
- <div class="second-label">寰幆璁℃暟</div>
- <el-form-item label="鐩樼偣棰戠巼锛堝ぉ锛�" prop="countFrequency">
- <el-input
- :disabled="!showFooter"
- v-model="editConfig.infomation.countFrequency"
- placeholder="璇疯緭鍏�"
- ></el-input>
- </el-form-item>
- <el-form-item label="鏈�杩戞湁鏁堢洏鐐�" prop="recentlyCount">
- <el-date-picker
- :disabled="!showFooter"
- v-model="editConfig.infomation.recentlyCount"
- type="date"
- placeholder="閫夋嫨鏃ユ湡"
- value-format="yyyy-MM-dd"
- >
- </el-date-picker>
- </el-form-item>
- <el-form-item label="棰勮涓嬩竴娆＄洏鐐�" prop="nextCount">
- <el-date-picker
- :disabled="!showFooter"
- v-model="editConfig.infomation.nextCount"
- type="date"
- placeholder="閫夋嫨鏃ユ湡"
- value-format="yyyy-MM-dd"
- >
- </el-date-picker>
- </el-form-item>
- </div>
+ v-model="editConfig.infomation.recentlyCount"
+ type="date"
+ placeholder="閫夋嫨鏃ユ湡"
+ value-format="yyyy-MM-dd"
+ >
+ </el-date-picker>
+ </el-form-item>
+ <el-form-item label="棰勮涓嬩竴娆＄洏鐐�" prop="nextCount">
+ <el-date-picker
+ :disabled="!showFooter"
+ v-model="editConfig.infomation.nextCount"
+ type="date"
+ placeholder="閫夋嫨鏃ユ湡"
+ value-format="yyyy-MM-dd"
+ >
+ </el-date-picker>
+ </el-form-item>
+ </div>
</div>
<el-form-item label="" prop="notes" label-width="20px">
- <el-input
- :disabled="!showFooter"
- type="textarea"
- placeholder="澶栭儴澶囨敞"
- :autosize="{ minRows: 3, maxRows: 4 }"
- maxlength="500"
- clearable
- v-model="editConfig.infomation.notes"
- ></el-input>
+ <el-input
+ :disabled="!showFooter"
+ type="textarea"
+ placeholder="澶栭儴澶囨敞"
+ :autosize="{ minRows: 3, maxRows: 4 }"
+ maxlength="500"
+ clearable
+ v-model="editConfig.infomation.notes"
+ ></el-input>
</el-form-item>
<div class="bottom">
<!-- <div class="left"> -->
- <!-- <div class="second-label">鐗╂祦</div> -->
- <!-- <el-form-item label="涓嬭浇绛栫暐" prop="desc">
+ <!-- <div class="second-label">鐗╂祦</div> -->
+ <!-- <el-form-item label="涓嬭浇绛栫暐" prop="desc">
<el-select
v-model="editConfig.value1"
filterable
@@ -177,7 +158,7 @@
</el-option>
</el-select>
</el-form-item> -->
- <!-- </div> -->
+ <!-- </div> -->
</div>
</div>
</el-form>
@@ -191,8 +172,8 @@
</template>
<script>
-import { addLocation,updateLocation,deleteLocation } from "@/api/warehouseManage/warehouse"
-import { getDataByType } from "@/api/data";
+import { addLocation, updateLocation, deleteLocation } from "@/api/warehouseManage/warehouse"
+import { getDataByType } from "@/api/data"
export default {
name: "AddScrapDialog",
props: {
@@ -206,8 +187,8 @@
}
}
},
- positionList:{
- type:[Array]
+ positionList: {
+ type: [Array]
}
},
components: {},
@@ -218,19 +199,21 @@
editConfig: this.editCommonConfig,
rules: {
name: [{ required: true, message: "璇疯緭鍏�", trigger: "change" }],
- countFrequency: [{
+ countFrequency: [
+ {
required: false,
message: "璇峰～鍐欎笉灏忎簬0鐨勬暟瀛�",
- trigger: "change",
+ trigger: "change"
},
{
validator: this.validatorNum,
- trigger: "blur",
- },],
+ trigger: "blur"
+ }
+ ]
},
showEdit: false, // 鏄惁鏄剧ず缂栬緫鎸夐挳
showFooter: false, // 鏄惁鏄剧ず鍙栨秷淇濆瓨
- positionTypeList: getDataByType("positionType"),
+ positionTypeList: getDataByType("positionType")
}
},
created() {
@@ -240,23 +223,21 @@
validatorNum(rule, value, callback) {
if (value) {
if (value == undefined || value == null) {
- callback(new Error("璇疯緭鍏ユ湁鏁堟暟瀛�"));
+ callback(new Error("璇疯緭鍏ユ湁鏁堟暟瀛�"))
} else {
- var reg = /^\+?[0-9]\d*$/;
+ var reg = /^\+?[0-9]\d*$/
if (!reg.test(value)) {
- callback(new Error("璇峰～鍐欎笉灏忎簬0鐨勬暟瀛�"));
+ callback(new Error("璇峰～鍐欎笉灏忎簬0鐨勬暟瀛�"))
} else {
- callback();
+ callback()
}
}
} else {
- callback();
+ callback()
}
},
// 璺嚎
- productClick() {
-
- },
+ productClick() {},
// 璁剧疆鍒犻櫎/鎵撳嵃/缂栬緫鏄惁鏄剧ず
setBottonView() {
if (this.editConfig.title === "鏂板缓") {
@@ -276,16 +257,16 @@
},
// 鍒櫎
deleteClick() {
- let data = JSON.parse(JSON.stringify(this.editConfig.infomation));
+ let data = JSON.parse(JSON.stringify(this.editConfig.infomation))
deleteLocation({ 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() {
@@ -293,56 +274,56 @@
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,
- parentId:data.parentId+'',
- type:data.type,
- isScrapLocation:data.isScrapLocation,
- isReturnLocation:data.isReturnLocation,
- replenishLocation:data.replenishLocation,
- countFrequency:data.countFrequency?Number(data.countFrequency):0,
- recentlyCount:data.recentlyCount,
- nextCount:data.nextCount,
- notes:data.notes,
+ name: data.name,
+ parentId: data.parentId,
+ type: data.type,
+ isScrapLocation: data.isScrapLocation,
+ isReturnLocation: data.isReturnLocation,
+ replenishLocation: data.replenishLocation,
+ countFrequency: data.countFrequency ? Number(data.countFrequency) : 0,
+ recentlyCount: data.recentlyCount,
+ nextCount: data.nextCount,
+ notes: data.notes
}
- 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 === "鏂板缓") {
- addLocation(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 {
- updateLocation(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 === "鏂板缓") {
+ addLocation(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 {
+ updateLocation(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
}
- });
+ })
}
}
}
@@ -376,29 +357,26 @@
-webkit-box-shadow: inset 0 0 2px #dee2e6;
.basic-info-view {
margin-top: 20px;
- padding:0 20px;
-
+ padding: 0 20px;
}
- .bottom{
+ .bottom {
display: flex;
margin-left: 20px;
.left {
width: calc(50% - 10px);
- margin-right:20px;
+ margin-right: 20px;
}
.right {
width: calc(50% - 10px);
}
.second-label {
-
border-bottom: 1px solid #d9d9d9;
margin-bottom: 10px;
}
- ::v-deep .el-tabs__content{
+ ::v-deep .el-tabs__content {
padding: 0 20px;
}
}
-
}
.purchase-view {
display: flex;
--
Gitblit v1.8.0