From 25b727a5dc28f3c2d225c5e017da58f35c6b84b3 Mon Sep 17 00:00:00 2001
From: zzq <a13193816592@163.com>
Date: 星期二, 26 九月 2023 19:38:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zzq'
---
src/views/warehouseManage/warehouse/AddDialog.vue | 177 ++++++++++++++++++++++++++++++++++++----------------------
1 files changed, 109 insertions(+), 68 deletions(-)
diff --git a/src/views/warehouseManage/warehouse/AddDialog.vue b/src/views/warehouseManage/warehouse/AddDialog.vue
index 9377289..11e26d7 100644
--- a/src/views/warehouseManage/warehouse/AddDialog.vue
+++ b/src/views/warehouseManage/warehouse/AddDialog.vue
@@ -17,6 +17,7 @@
<span class="btn" style="margin-left: 15px">
<i class="el-icon-s-tools"></i>
<span>鍔ㄤ綔</span>
+ <!-- <el-button plain size="mini" style="margin-left: 15px" @click="deleteClick">鍒犻櫎</el-button> -->
</span>
<el-button v-if="showEdit" plain size="mini" style="margin-left: 15px" @click="editClick">缂栬緫</el-button>
</div>
@@ -33,22 +34,38 @@
>
<div>
<!-- <div>aaa</div> -->
- <!-- <StatusCommonView :list="list" showWarehouse="true" /> -->
<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">浠撳簱鍚嶇О-warehouse#</el-col>
- <el-col :span="12">
- <el-form-item label="缂╁啓" prop="client_name">
- 瀵瑰瀵�
+ <el-col :span="24" class="line_height_30px">
+ <el-form-item label="浠撳簱" prop="name">
+ <el-input
+ :disabled="showEdit"
+ v-model="editConfig.infomation.name"
+ placeholder="璇疯緭鍏�"
+ ></el-input>
</el-form-item>
</el-col>
- <el-col :span="12">
- <el-form-item label="鍦板潃" prop="client_name">
- 瀵瑰瀵�
+ <el-col :span="11">
+ <el-form-item label="缂╁啓" prop="code">
+ <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-form-item label="鍦板潃" prop="address">
+ <el-input
+ :disabled="showEdit"
+ v-model="editConfig.infomation.address"
+ placeholder="璇疯緭鍏�"
+ ></el-input>
</el-form-item>
</el-col>
</el-row>
@@ -57,24 +74,31 @@
<el-tabs v-model="activeName" type="card">
<el-tab-pane label="浠撳簱閰嶇疆" name="first">
<div class="second-label">杩愯緭</div>
- <el-form-item label="鍏ュ悜杩愯緭" prop="desc">
+ <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,index) in wareList" :key='index' :label="item.id">{{item.name}}</el-radio>
+ <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="desc">
+ <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,index) in wareoutList" :key='index' :label="item.id">{{item.name}}</el-radio>
+ <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-tab-pane label="鎶�鏈俊鎭�" name="third">
- <el-form-item label="澶囨敞" prop="desc">
-
</el-form-item>
</el-tab-pane>
</el-tabs>
@@ -91,6 +115,8 @@
</template>
<script>
+import { addWarehouse,updateWarehouse,deleteWarehouse } from "@/api/warehouseManage/warehouse"
+import { getDataByType } from "@/api/data";
export default {
name: "AddScrapDialog",
props: {
@@ -113,49 +139,16 @@
dialogWidth: "50%",
editConfig: this.editCommonConfig,
rules: {
-
- number: [{ required: true, message: "璇疯緭鍏ラ��娆惧崟缂栧彿", trigger: "blur" }],
- refundDate: [{ required: true, message: "璇烽�夋嫨閫�娆炬棩鏈�", trigger: "change" }],
- memberId: [{ required: true, message: "璇烽�夋嫨閿�鍞礋璐ｄ汉", trigger: "change" }],
- sale_return_nunber: [{ required: true, message: "璇烽�夋嫨閿�鍞��璐у崟", trigger: "change" }]
+ name: [{ required: true, message: "璇疯緭鍏�", trigger: "change" }],
+ code: [{ required: true, message: "璇疯緭鍏�", trigger: "change" }],
},
memberOptions: [],
paymentTypeListOptions: [],
- list: [
- { label: "鑽夌", status: "todo" },
- { label: "瀹屾垚", status: "todo" }
- ],
showEdit: false, // 鏄惁鏄剧ず缂栬緫鎸夐挳
showFooter: false, // 鏄惁鏄剧ず鍙栨秷淇濆瓨
currentState: "todo", // 褰撳墠鐘舵��
- wareList:[
- {
- name:'鐩存帴鎺ユ敹浜у搧锛�1姝ユ敹璐э級',
- id:1,
- },
- {
- name:'鎺ュ埌浜у搧鍒版敹鏂欏尯锛屽啀鍏ュ簱锛�2姝ユ敹璐э級',
- id:2,
- },
- {
- name:'鎺ユ敹浜у搧鍒版敹鏂欏尯锛屾楠岋紝鐒跺悗鍏ュ簱锛�3姝ユ敹璐э級',
- id:3,
- }
- ],
- wareoutList:[
- {
- name:'鐩存帴鍑哄簱锛�1姝ワ級',
- id:1,
- },
- {
- name:'閫佸埌寰呭嚭搴撳尯锛屽啀閫佽揣锛�2姝ュ彂璐э級',
- id:2,
- },
- {
- name:'鍖呰浜у搧锛屽彂閫佸埌寰呭嚭搴撳尯锛屽啀閫佽揣锛�3姝ュ彂璐э級',
- id:3,
- }
- ],
+ inboundTransportationList:getDataByType('inboundTransportation'),
+ outboundTransportationList:getDataByType('outboundTransportation'),
}
},
created() {
@@ -178,29 +171,77 @@
this.showEdit = true
this.showFooter = false
}
- if (this.editConfig.title === "鏂板缓") {
- this.list[0].status = "active"
- } else {
- this.list.map((item) => {
- if (item.label === this.editConfig.infomation.status) {
- item.status = "active"
- } else {
- item.status = "todo"
- }
- })
- }
},
// 鍏抽棴
handleClose() {
this.editConfig.visible = false
+ },
+ // 鍒櫎
+ deleteClick() {
+ 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:"鍒櫎澶辫触!")
+ }
+ });
},
// 缂栬緫
editClick() {
this.showEdit = false
this.showFooter = true
},
+ saveParams() {
+ 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,
+ }
+ if(data.id){
+ params.id=data.id
+ }
+ return params;
+ },
// 淇濆瓨
- saveClick() {}
+ 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;
+ }
+ });
+ }
}
}
</script>
--
Gitblit v1.8.0