From 3007cbf86ea42756be4d5bf4f81e0d56d6150c67 Mon Sep 17 00:00:00 2001
From: lzhe <lzhe@example.com>
Date: 星期一, 07 十月 2024 00:52:48 +0800
Subject: [PATCH] Merge branch 'release' of http://122.9.151.159:9090/r/smart-web into release
---
src/views/console/basic-data/addProduct.vue | 94 ++++++++++++++++++++++++++++------------------
1 files changed, 57 insertions(+), 37 deletions(-)
diff --git a/src/views/console/basic-data/addProduct.vue b/src/views/console/basic-data/addProduct.vue
index 7517873..be471ae 100644
--- a/src/views/console/basic-data/addProduct.vue
+++ b/src/views/console/basic-data/addProduct.vue
@@ -5,42 +5,59 @@
<el-row>
<el-col :span="8">
<el-form-item label="涓婄骇浜у搧">
- <el-input v-model="addDictForm.code" placeholder="涓婄骇浜у搧" clearable></el-input>
+ <el-tree-select
+ @change = "parentIdChange"
+ default-expand-all
+ v-model="addDictForm.parentId"
+ clearable
+ node-key="id"
+ placeholder="涓婄骇浜у搧"
+ ref="parentTree"
+ :data="parentData"
+ check-strictly
+ :props="{ label: 'name' }"
+ style="width:100%;"
+ :render-after-expand="false" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="浜у搧缂栧彿">
- <el-input v-model="addDictForm.dictValue" placeholder="浜у搧缂栧彿" clearable></el-input>
+ <el-input v-model="addDictForm.code" placeholder="淇濆瓨鏃剁郴缁熻嚜鍔ㄧ敓鎴�" disabled clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
- <el-form-item label="浜у搧鍚嶇О" prop="sort">
- <el-input v-model="addDictForm.sort" placeholder="浜у搧鍚嶇О" clearable></el-input>
+ <el-form-item label="浜у搧鍚嶇О" prop="name">
+ <el-input v-model="addDictForm.name" placeholder="浜у搧鍚嶇О" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
- <el-form-item label="浜у搧绫诲瀷" prop="sort">
- <el-input v-model="addDictForm.sort" placeholder="浜у搧绫诲瀷" clearable></el-input>
+ <el-form-item label="浜у搧绫诲瀷" prop="typeId">
+ <el-select v-model="addDictForm.typeId" placeholder="璇烽�夋嫨" style="width: 100%;">
+ <el-option v-for="item in typeIdList" :key="item.id" :label="item.name" :value="item.id" />
+ </el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="璁￠噺鍗曚綅">
- <el-input v-model="addDictForm.sort" placeholder="璁￠噺鍗曚綅" clearable></el-input>
+ <el-input v-model="addDictForm.unit" placeholder="璁￠噺鍗曚綅" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="瑙勬牸鍨嬪彿">
- <el-input v-model="addDictForm.sort" placeholder="瑙勬牸鍨嬪彿" clearable></el-input>
+ <el-input v-model="addDictForm.standardModel" placeholder="瑙勬牸鍨嬪彿" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="浜у搧鎻忚堪">
- <el-input v-model="addDictForm.remark" placeholder="瀛楀吀澶囨敞" clearable></el-input>
+ <el-input v-model="addDictForm.description" placeholder="瀛楀吀澶囨敞" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="鍚敤鐘舵��">
- <el-input v-model="addDictForm.sort" placeholder="鍚敤鐘舵��" clearable></el-input>
+ <el-select v-model="addDictForm.status" :prefix-icon="Search" placeholder="璇烽�夋嫨" style="width: 100%;padding-right: 20px;">
+ <el-option key="0" label="鍋滅敤" value="0" />
+ <el-option key="1" label="鍚敤" value="1" />
+ </el-select>
</el-form-item>
</el-col>
</el-row>
@@ -48,7 +65,7 @@
<div class="plan-content-title">鎵╁睍瀛楁</div>
<template #footer>
<el-button @click="visible=false" >鍙� 娑�</el-button>
- <el-button v-if="mode!='show'" type="primary" :loading="isSaveing" @click="dictSubmit()">淇� 瀛�</el-button>
+ <el-button v-if="mode!='show'" type="primary" :loading="isSaveing" @click="productSubmit">淇� 瀛�</el-button>
</template>
</el-dialog>
</template>
@@ -58,6 +75,8 @@
emits: ['success', 'closed'],
data() {
return {
+ parentData: {},
+ typeIdList: [],
value1: true,
mode: "add",
titleMap: {
@@ -69,19 +88,19 @@
isSaveing: false,
//琛ㄥ崟鏁版嵁
addDictForm: {
+ parentId: "",
code: "",
- dictValue: "",
- sort: "",
- isSealed: false,
- remark: "",
- dictKey: "-1",
- $isSealed: "鍚�"
+ name: "",
+ typeId: "",
+ unit: "",
+ standardModel: "",
+ description: "",
+ status: "1"
},
//楠岃瘉瑙勫垯
addDictRules: {
- code:[{required: true, message: '璇疯緭鍏ュ瓧鍏哥紪鍙�'}],
- dictValue:[{required: true, message: '璇疯緭鍏ュ瓧鍏稿悕绉�'}],
- sort:[{required: true, message: '璇疯緭鍏ュ瓧鍏告帓搴�'}]
+ name:[{required: true, message: '璇疯緭鍏ヤ骇鍝佸悕绉�'}],
+ typeId:[{required: true, message: '璇烽�夋嫨浜у搧绫诲瀷',trigger: 'change'}]
},
//鎵�闇�鏁版嵁閫夐」
groups: [],
@@ -102,9 +121,21 @@
// this.getDept()
},
methods: {
+ showParentData() {
+ this.$HTTP.get("/api/blade-cps/product/tree?status=1").then(res=> {
+ if(res.code == 200) {
+ this.parentData = res.data;
+ }
+ })
+ },
+ parentIdChange(val) {
+
+ },
//鏄剧ず
- open(mode='add'){
+ open(typeIdList,mode='add'){
+ this.showParentData(); //tree-select
this.mode = mode;
+ this.typeIdList = typeIdList;
this.visible = true;
return this
},
@@ -118,20 +149,11 @@
this.depts = res.data;
},
//琛ㄥ崟鎻愪氦鏂规硶
- dictSubmit(){
+ productSubmit(){
var obj = Object.assign({},this.addDictForm);
- if(obj.isSealed === true) {
- obj.$isSealed = "鏄�";
- obj.isSealed = "1";
- }else {
- obj.$isSealed = "鍚�";
- obj.isSealed = "0";
- }
this.$refs.dialogForm.validate(async (valid) => {
if (valid) {
- this.isSaveing = true;
- this.$HTTP.post("/api/blade-system/dict/submit",obj).then(res=> {
- this.isSaveing = false;
+ this.$HTTP.post("/api/blade-cps/product/insert",obj).then(res=> {
if(res.code == 200) {
this.$emit('success', this.addDictForm, this.mode);
this.visible = false;
@@ -149,12 +171,10 @@
setData(data){
console.log(data)
//鍙互鍜屼笂闈竴鏍峰崟涓敞鍏ワ紝涔熷彲浠ュ儚涓嬮潰涓�鏍风洿鎺ュ悎骞惰繘鍘�
- if(data.isSealed == "1") {
- data.isSealed = true;
- }else {
- data.isSealed = false;
- }
Object.assign(this.addDictForm, data);
+ if(data.parentId == 0) {
+ this.addDictForm.parentId = "";
+ }
}
}
}
--
Gitblit v1.9.3