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/operate/scrap/AddScrapDialog.vue | 19
src/views/overview/AddOverviewDialog.vue | 4
src/views/warehouseManage/bussinessType/AddBussinessType.vue | 220 +++++++++---------
src/views/productManage/product/index.vue | 6
src/views/productManage/productCategory/AddProductCategoryDialog.vue | 5
src/views/warehouseManage/position/AddDialog.vue | 182 +++++++-------
src/components/makepager/FormBtnsView.vue | 2
src/views/productManage/product/AddProductDialog.vue | 5
src/views/warehouseManage/warehouse/AddDialog.vue | 251 +++++++++++---------
9 files changed, 364 insertions(+), 330 deletions(-)
diff --git a/src/components/makepager/FormBtnsView.vue b/src/components/makepager/FormBtnsView.vue
index eee8037..201eb77 100644
--- a/src/components/makepager/FormBtnsView.vue
+++ b/src/components/makepager/FormBtnsView.vue
@@ -142,7 +142,7 @@
<style lang="scss" scoped>
.content-number {
display: flex;
- // justify-content: left;
+ justify-content: right;
height: 44px;
// border-bottom: 1px solid #e9e9e9;
padding: 0px 10px;
diff --git a/src/views/operate/scrap/AddScrapDialog.vue b/src/views/operate/scrap/AddScrapDialog.vue
index c3c675e..a2fd3e4 100644
--- a/src/views/operate/scrap/AddScrapDialog.vue
+++ b/src/views/operate/scrap/AddScrapDialog.vue
@@ -29,7 +29,6 @@
label-position="right"
label-width="120px"
size="mini"
- style="height: 60vh; overflow-x: hidden"
>
<div>
<!-- <div>aaa</div> -->
@@ -121,9 +120,9 @@
</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="saveClick('form')" :disabled="!showFooter">淇濆瓨</el-button>
<el-button size="small" @click="editConfig.visible = false">鍙栨秷</el-button>
- <el-button type="primary" size="small" @click="saveClick('form')">淇濆瓨</el-button>
</div>
</el-dialog>
</div>
@@ -313,13 +312,13 @@
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;
- .basic-info-view {
- margin-top: 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;
+ // .basic-info-view {
+ // margin-top: 20px;
+ // }
}
.purchase-view {
display: flex;
diff --git a/src/views/overview/AddOverviewDialog.vue b/src/views/overview/AddOverviewDialog.vue
index 2da5599..348a411 100644
--- a/src/views/overview/AddOverviewDialog.vue
+++ b/src/views/overview/AddOverviewDialog.vue
@@ -263,9 +263,9 @@
</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>
diff --git a/src/views/productManage/product/AddProductDialog.vue b/src/views/productManage/product/AddProductDialog.vue
index 94df055..8bb5ebb 100644
--- a/src/views/productManage/product/AddProductDialog.vue
+++ b/src/views/productManage/product/AddProductDialog.vue
@@ -29,7 +29,6 @@
label-position="right"
label-width="110px"
size="mini"
- style="height: 53vh; overflow-x: hidden"
>
<!-- <div class="content-btn">
<el-button plain size="mini" disabled>鏍囩鎵撳嵃</el-button>
@@ -450,8 +449,8 @@
</div>
</el-form>
<!-- 灏� -->
- <div v-if="showFooter" slot="footer" class="dialog-footer">
- <el-button type="primary" size="small" @click="saveClick('form')">淇濆瓨</el-button>
+ <div slot="footer" class="dialog-footer">
+ <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>
diff --git a/src/views/productManage/product/index.vue b/src/views/productManage/product/index.vue
index 2d5d8b8..c6f0298 100644
--- a/src/views/productManage/product/index.vue
+++ b/src/views/productManage/product/index.vue
@@ -89,7 +89,7 @@
data() {
return {
tableList: {},
- showcol: ["鍐呴儴鍙傝��", "璐熻矗浜�", "浜у搧鏍囩", "閿�鍞环鏍�", "鎴愭湰", "鍦ㄥ簱鏁伴噺", "棰勬祴鏁伴噺", "璁￠噺鍗曚綅"],
+ showcol: ["鍐呴儴缂栫爜", "璐熻矗浜�", "浜у搧鏍囩", "閿�鍞环鏍�", "鎴愭湰", "鍦ㄥ簱鏁伴噺", "棰勬祴鏁伴噺", "璁￠噺鍗曚綅"],
searchOptions: [],
commonDetail: {
visible: false,
@@ -148,9 +148,9 @@
default: true
},
{
- label: "鍐呴儴鍙傝��",
+ label: "鍐呴儴缂栫爜",
prop: "internalReference",
- isShowColumn: showcol.includes("鍐呴儴鍙傝��"),
+ isShowColumn: showcol.includes("鍐呴儴缂栫爜"),
default: false
},
{
diff --git a/src/views/productManage/productCategory/AddProductCategoryDialog.vue b/src/views/productManage/productCategory/AddProductCategoryDialog.vue
index 841d7b4..e0833be 100644
--- a/src/views/productManage/productCategory/AddProductCategoryDialog.vue
+++ b/src/views/productManage/productCategory/AddProductCategoryDialog.vue
@@ -36,7 +36,6 @@
label-position="right"
label-width="110px"
size="mini"
- style="height: 290px; overflow-x: hidden"
>
<div class="basic-info">
<FormBtnsView :showProduct="true" @productClick="productClick" />
@@ -161,9 +160,9 @@
</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>
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;
diff --git a/src/views/warehouseManage/position/AddDialog.vue b/src/views/warehouseManage/position/AddDialog.vue
index e61fef4..19ece9a 100644
--- a/src/views/warehouseManage/position/AddDialog.vue
+++ b/src/views/warehouseManage/position/AddDialog.vue
@@ -27,35 +27,34 @@
ref="form"
:model="editConfig.infomation"
:rules="rules"
- label-position="left"
- label-width="110px"
+ label-position="right"
+ label-width="130px"
size="mini"
- style="height: 60vh; overflow-x: hidden"
>
- <div>
- <!-- <div>aaa</div> -->
+ <div class="content-number-bg">
<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-col :span="12" class="line_height_30px">
<el-form-item label="浣嶇疆鍚嶇О" prop="name">
<el-input
:disabled="!showFooter"
v-model="editConfig.infomation.name"
placeholder="璇疯緭鍏�"
+ style="width: 90%"
></el-input>
</el-form-item>
</el-col>
- <el-col :span="24">
+ <el-col :span="12">
<el-form-item label="涓婄骇浣嶇疆" prop="parentId">
<el-select
v-model="editConfig.infomation.parentId"
placeholder="璇烽�夋嫨"
size="mini"
- style="width: 45%"
:disabled="!showFooter"
+ style="width: 90%"
>
<el-option v-for="item in positionList" :key="item.id" :label="item.name" :value="item.id">
</el-option>
@@ -63,79 +62,83 @@
</el-form-item>
</el-col>
</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="鏆傛棤鏁版嵁"
+ <div class="purchase-view">
+ <div class="left">
+ <el-form-item label="浣嶇疆绫诲瀷" prop="type">
+ <el-select
+ v-model="editConfig.infomation.type"
+ filterable
+ :disabled="!showFooter"
+ placeholder="璇烽�夋嫨"
+ style="width: 90%"
+ 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-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>
+ <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="right" 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="璇疯緭鍏�"
+ style="width: 90%"
+ ></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"
+ style="width: 90%"
+ >
+ </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"
+ style="width: 90%"
+ >
+ </el-date-picker>
+ </el-form-item>
+ </div>
</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>
+ <el-form-item label="澶囨敞" prop="notes">
+ <el-input
+ :disabled="!showFooter"
+ type="textarea"
+ placeholder="澶栭儴澶囨敞"
+ :autosize="{ minRows: 3, maxRows: 4 }"
+ maxlength="500"
+ clearable
+ v-model="editConfig.infomation.notes"
+ style="width: 96%"
+ ></el-input>
+ </el-form-item>
</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-form-item>
+
<div class="bottom">
<!-- <div class="left"> -->
<!-- <div class="second-label">鐗╂祦</div> -->
@@ -163,9 +166,9 @@
</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="saveClick('form')" :disabled="!showFooter">淇濆瓨</el-button>
<el-button size="small" @click="editConfig.visible = false">鍙栨秷</el-button>
- <el-button type="primary" size="small" @click="saveClick('form')">淇濆瓨</el-button>
</div>
</el-dialog>
</div>
@@ -347,18 +350,21 @@
.content-status {
display: flex;
}
+.content-number-bg {
+ margin-top: 10px;
+}
.basic-info {
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;
- .basic-info-view {
- margin-top: 20px;
- padding: 0 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;
+ // .basic-info-view {
+ // margin-top: 20px;
+ // padding: 0 20px;
+ // }
.bottom {
display: flex;
margin-left: 20px;
diff --git a/src/views/warehouseManage/warehouse/AddDialog.vue b/src/views/warehouseManage/warehouse/AddDialog.vue
index 11e26d7..3a53609 100644
--- a/src/views/warehouseManage/warehouse/AddDialog.vue
+++ b/src/views/warehouseManage/warehouse/AddDialog.vue
@@ -27,96 +27,113 @@
ref="form"
:model="editConfig.infomation"
:rules="rules"
- label-position="left"
+ label-position="right"
label-width="100px"
size="mini"
- style="height: 60vh; overflow-x: hidden"
>
- <div>
- <!-- <div>aaa</div> -->
+ <div class="content-number-bg">
<FormBtnsView :showWarehouse="true" @productClick="productClick" />
</div>
<div class="basic-info">
<div class="basic-info-view">
-
<el-row>
- <el-col :span="24" class="line_height_30px">
+ <el-col :span="12" class="line_height_30px">
<el-form-item label="浠撳簱" prop="name">
- <el-input
- :disabled="showEdit"
- v-model="editConfig.infomation.name"
- placeholder="璇疯緭鍏�"
- ></el-input>
+ <el-input :disabled="showEdit" v-model="editConfig.infomation.name" placeholder="璇疯緭鍏�"></el-input>
</el-form-item>
</el-col>
- <el-col :span="11">
+ <el-col :span="12">
<el-form-item label="缂╁啓" prop="code">
- <el-input
- :disabled="showEdit"
- v-model="editConfig.infomation.code"
- placeholder="璇疯緭鍏�"
- ></el-input>
+ <el-input :disabled="showEdit" v-model="editConfig.infomation.code" placeholder="璇疯緭鍏�"></el-input>
</el-form-item>
</el-col>
- <el-col :span="2"> </el-col>
- <el-col :span="11">
+ <el-col :span="12">
<el-form-item label="鍦板潃" prop="address">
<el-input
- :disabled="showEdit"
+ :disabled="showEdit"
v-model="editConfig.infomation.address"
placeholder="璇疯緭鍏�"
></el-input>
</el-form-item>
</el-col>
+ <el-col :span="24">
+ <el-form-item label="鍏ュ悜杩愯緭" prop="inboundTransportation">
+ <el-radio-group :disabled="showEdit" v-model="editConfig.infomation.inboundTransportation">
+ <el-radio
+ style="width: 90%"
+ class="line_height_30px"
+ v-for="item in inboundTransportationList"
+ :key="item.id"
+ :disabled="item.disabled"
+ :label="item.id"
+ >{{ item.name }}</el-radio
+ >
+ </el-radio-group>
+ </el-form-item>
+ </el-col>
+ <el-col :span="24">
+ <el-form-item label="鍑哄簱杩愯緭" prop="outboundTransportation">
+ <el-radio-group :disabled="showEdit" v-model="editConfig.infomation.outboundTransportation">
+ <el-radio
+ style="width: 90%"
+ class="line_height_30px"
+ v-for="item in outboundTransportationList"
+ :key="item.id"
+ :disabled="item.disabled"
+ :label="item.id"
+ >{{ item.name }}</el-radio
+ >
+ </el-radio-group>
+ </el-form-item>
+ </el-col>
</el-row>
</div>
- <div class="bottom">
+ <!-- <div class="bottom">
<el-tabs v-model="activeName" type="card">
<el-tab-pane label="浠撳簱閰嶇疆" name="first">
- <div class="second-label">杩愯緭</div>
<el-form-item label="鍏ュ悜杩愯緭" prop="inboundTransportation">
- <el-radio-group
- :disabled="showEdit"
- v-model="editConfig.infomation.inboundTransportation"
- >
- <el-radio style="width:100%;" class="line_height_30px"
- v-for="(item) in inboundTransportationList"
- :key='item.id'
- :disabled="item.disabled"
- :label="item.id"
- >{{item.name}}</el-radio>
+ <el-radio-group :disabled="showEdit" v-model="editConfig.infomation.inboundTransportation">
+ <el-radio
+ style="width: 100%"
+ class="line_height_30px"
+ v-for="item in inboundTransportationList"
+ :key="item.id"
+ :disabled="item.disabled"
+ :label="item.id"
+ >{{ item.name }}</el-radio
+ >
</el-radio-group>
</el-form-item>
<el-form-item label="鍑哄簱杩愯緭" prop="outboundTransportation">
- <el-radio-group
- :disabled="showEdit"
- v-model="editConfig.infomation.outboundTransportation"
- >
- <el-radio style="width:100%;" class="line_height_30px"
- v-for="(item) in outboundTransportationList"
- :key='item.id'
- :disabled="item.disabled"
- :label="item.id"
- >{{item.name}}</el-radio>
+ <el-radio-group :disabled="showEdit" v-model="editConfig.infomation.outboundTransportation">
+ <el-radio
+ style="width: 100%"
+ class="line_height_30px"
+ v-for="item in outboundTransportationList"
+ :key="item.id"
+ :disabled="item.disabled"
+ :label="item.id"
+ >{{ item.name }}</el-radio
+ >
</el-radio-group>
</el-form-item>
</el-tab-pane>
</el-tabs>
- </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="saveClick('form')" :disabled="!showFooter">淇濆瓨</el-button>
<el-button size="small" @click="editConfig.visible = false">鍙栨秷</el-button>
- <el-button type="primary" size="small" @click="saveClick('form')">淇濆瓨</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
-import { addWarehouse,updateWarehouse,deleteWarehouse } from "@/api/warehouseManage/warehouse"
-import { getDataByType } from "@/api/data";
+import { addWarehouse, updateWarehouse, deleteWarehouse } from "@/api/warehouseManage/warehouse"
+import { getDataByType } from "@/api/data"
export default {
name: "AddScrapDialog",
props: {
@@ -135,20 +152,20 @@
computed: {},
data() {
return {
- activeName:'first',
+ activeName: "first",
dialogWidth: "50%",
editConfig: this.editCommonConfig,
rules: {
name: [{ required: true, message: "璇疯緭鍏�", trigger: "change" }],
- code: [{ required: true, message: "璇疯緭鍏�", trigger: "change" }],
+ code: [{ required: true, message: "璇疯緭鍏�", trigger: "change" }]
},
memberOptions: [],
paymentTypeListOptions: [],
showEdit: false, // 鏄惁鏄剧ず缂栬緫鎸夐挳
showFooter: false, // 鏄惁鏄剧ず鍙栨秷淇濆瓨
currentState: "todo", // 褰撳墠鐘舵��
- inboundTransportationList:getDataByType('inboundTransportation'),
- outboundTransportationList:getDataByType('outboundTransportation'),
+ inboundTransportationList: getDataByType("inboundTransportation"),
+ outboundTransportationList: getDataByType("outboundTransportation")
}
},
created() {
@@ -156,9 +173,7 @@
},
methods: {
// 璺嚎
- productClick() {
-
- },
+ productClick() {},
// 璁剧疆鍒犻櫎/鎵撳嵃/缂栬緫鏄惁鏄剧ず
setBottonView() {
if (this.editConfig.title === "鏂板缓") {
@@ -178,16 +193,16 @@
},
// 鍒櫎
deleteClick() {
- let data = JSON.parse(JSON.stringify(this.editConfig.infomation));
+ let data = JSON.parse(JSON.stringify(this.editConfig.infomation))
deleteWarehouse({ id: data.id }).then((res) => {
if (res.code === 200) {
- this.editConfig.visible = false;
- this.$message.success("鍒櫎鎴愬姛!");
- this.$emit("refresh");
- }else {
- this.$message.warning(res.msg?res.msg:"鍒櫎澶辫触!")
- }
- });
+ this.editConfig.visible = false
+ this.$message.success("鍒櫎鎴愬姛!")
+ this.$emit("refresh")
+ } else {
+ this.$message.warning(res.msg ? res.msg : "鍒櫎澶辫触!")
+ }
+ })
},
// 缂栬緫
editClick() {
@@ -195,52 +210,52 @@
this.showFooter = true
},
saveParams() {
- let data =JSON.parse(JSON.stringify(this.editConfig.infomation));
-
+ let data = JSON.parse(JSON.stringify(this.editConfig.infomation))
+
let params = {
- address:data.address,
- buyToResupply:data.buyToResupply,
- code:data.code,
- name:data.name,
- inboundTransportation:data.inboundTransportation,
- outboundTransportation:data.outboundTransportation,
+ address: data.address,
+ buyToResupply: data.buyToResupply,
+ code: data.code,
+ name: data.name,
+ inboundTransportation: data.inboundTransportation,
+ outboundTransportation: data.outboundTransportation
}
- 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 === "鏂板缓") {
- addWarehouse(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 {
- updateWarehouse(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 === "鏂板缓") {
+ addWarehouse(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 {
+ updateWarehouse(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
}
- });
+ })
}
}
}
@@ -264,29 +279,31 @@
.content-status {
display: flex;
}
+.content-number-bg {
+ margin-top: 10px;
+}
.basic-info {
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;
- .basic-info-view {
- margin-top: 20px;
- padding:0 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;
+ // .basic-info-view {
+ // margin-top: 20px;
+ // padding: 0 20px;
+ // }
- }
- .bottom{
+ .bottom {
.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;
@@ -309,8 +326,18 @@
color: #333;
}
}
- .el-tabs--card > .el-tabs__header .el-tabs__nav {
- margin-left: 20px;
+ .el-tabs--card > .el-tabs__header {
+ border-bottom: none;
+ }
+ .el-tabs__item.is-active {
+ color: #fff;
+ background: #2a78fb;
+ }
+ .el-tabs__item {
+ height: 30px;
+ line-height: 30px;
+ font-size: 13px;
+ background: #f3f3f3;
}
.el-tabs__item {
height: 30px;
--
Gitblit v1.8.0