From 3435a2b1b3e237ee53c98ae7c044d0e84cfa521c Mon Sep 17 00:00:00 2001
From: su1124 <1583764726@qq.com>
Date: 星期四, 25 一月 2024 18:01:18 +0800
Subject: [PATCH] su
---
src/views/system/package/index.vue | 259 +++++++++++++++++++++++++++++++++------------------
1 files changed, 166 insertions(+), 93 deletions(-)
diff --git a/src/views/system/package/index.vue b/src/views/system/package/index.vue
index 492035c..c8a8541 100644
--- a/src/views/system/package/index.vue
+++ b/src/views/system/package/index.vue
@@ -26,19 +26,19 @@
</el-form-item>
<el-form-item label="濂楅鍒嗙被" prop="categoryId">
<el-select
- v-model="queryParams.categoryId"
- placeholder="璇烽�夋嫨鐘舵��"
- style="width: 200px"
- filterable
- clearable
- >
- <el-option
- v-for="dict in categoryList"
- :key="dict.id"
- :label="dict.name"
- :value="dict.id"
- ></el-option>
- </el-select>
+ v-model="queryParams.categoryId"
+ placeholder="璇烽�夋嫨鐘舵��"
+ style="width: 200px"
+ filterable
+ clearable
+ >
+ <el-option
+ v-for="dict in categoryList"
+ :key="dict.id"
+ :label="dict.name"
+ :value="dict.id"
+ ></el-option>
+ </el-select>
</el-form-item>
<el-form-item>
<el-button
@@ -131,12 +131,27 @@
/>
<!-- <el-table-column label="缂栧彿" align="center" prop="pacId" /> -->
<el-table-column
+ label="濂楅鍒嗙被"
+ width="100px"
+ align="center"
+ prop="categoryNames"
+ fixed
+ ></el-table-column>
+ <el-table-column
label="濂楅鍚嶇О"
align="center"
prop="pacName"
width="150px"
fixed
/>
+ <el-table-column
+ label="浠锋牸"
+ width="80px"
+ align="center"
+ prop="price"
+ fixed
+ >
+ </el-table-column>
<el-table-column
label="鍗曢」鍒楄〃"
align="center"
@@ -172,15 +187,7 @@
<image-preview :src="scope.row.pacPhone" :width="50" :height="50" />
</template>
</el-table-column> -->
- <el-table-column label="浠锋牸" width="80px" align="center" prop="price">
- </el-table-column>
-
- <el-table-column
- label="濂楅鍒嗙被"
- width="100px"
- align="center"
- prop="categoryNames"
- ></el-table-column>
+
<el-table-column
label="鍏抽敭瀛�"
width="110px"
@@ -193,8 +200,11 @@
align="center"
prop="isOnSale"
>
- <template slot-scope="scope">
- <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.isOnSale"/>
+ <template slot-scope="scope">
+ <dict-tag
+ :options="dict.type.sys_yes_no"
+ :value="scope.row.isOnSale"
+ />
</template>
</el-table-column>
<!-- <el-table-column
@@ -291,7 +301,7 @@
<el-dialog
:title="title"
:visible.sync="open"
- width="1000px"
+ width="1100px"
append-to-body
>
<el-form
@@ -304,10 +314,17 @@
<!-- <div class="dialo">
<div class="dialo1"> -->
<el-form-item label="濂楅鍚嶇О" prop="pacName">
+ <span
+ slot="label"
+ style="display: inline-block; border-bottom: 2px solid blue"
+ @click="handlePackage"
+ >
+ 濂楅鍚嶇О
+ </span>
<el-input
v-model="form.pacName"
placeholder="璇疯緭鍏ュ椁愬悕绉�"
- style="width: 200px"
+ style="width: 150px"
/>
</el-form-item>
<el-form-item label="濂楅鐘舵��" prop="pacStatus">
@@ -318,7 +335,7 @@
<el-select
v-model="form.pacStatus"
placeholder="璇烽�夋嫨鐘舵��"
- style="width: 200px"
+ style="width: 150px"
filterable
clearable
>
@@ -331,7 +348,7 @@
</el-select>
</el-form-item>
- <el-form-item label="鍟嗗搧绫荤洰" prop="categoryId">
+ <el-form-item label="濂楅绫荤洰" prop="categoryId">
<!-- <el-input
v-model="form.createId"
placeholder="璇疯緭鍏ュ晢鍝佺被鐩�"
@@ -339,8 +356,8 @@
/> -->
<el-select
v-model="form.categoryId"
- placeholder="璇烽�夋嫨鍟嗗搧绫荤洰"
- style="width: 200px"
+ placeholder="璇烽�夋嫨濂楅绫荤洰"
+ style="width: 150px"
@change="shangpin"
filterable
clearable
@@ -354,13 +371,12 @@
</el-select>
</el-form-item>
-
<el-form-item label="鍏抽敭瀛�" prop="keywords">
<el-select
multiple
v-model="form.keywords"
placeholder="璇烽�夋嫨鍏抽敭瀛�"
- style="width: 200px"
+ style="width: 150px"
@change="sel"
filterable
clearable
@@ -381,7 +397,7 @@
<el-select
v-model="form.isOnSale"
placeholder="璇烽�夋嫨鏄惁涓婃灦"
- style="width: 200px"
+ style="width: 150px"
filterable
clearable
>
@@ -393,61 +409,72 @@
></el-option>
</el-select>
</el-form-item>
-
+
<el-form-item label="鎺掑簭" prop="sort">
<el-input
v-model="form.sort"
placeholder="璇疯緭鍏ユ帓搴�"
- style="width: 200px"
+ style="width: 150px"
/>
</el-form-item>
<el-form-item label="灏忕▼搴忎环鏍�" prop="retailPrice">
<el-input
v-model="form.retailPrice"
placeholder="璇疯緭鍏ュ皬绋嬪簭浠锋牸"
- style="width: 200px"
+ style="width: 150px"
/>
</el-form-item>
<el-form-item label="鍘熶环" prop="counterPrice">
<el-input
v-model="form.counterPrice"
placeholder="璇疯緭鍏ュ師浠�"
- style="width: 200px"
+ style="width: 150px"
/>
</el-form-item>
- <el-form-item label="濂楅鎻忚堪" prop="pacRemark">
- <el-input
- type="textarea"
- v-model="form.pacRemark"
- placeholder="璇疯緭鍏ュ椁愭弿杩�"
- style="width: 820px"
- rows="2"
- ></el-input>
- </el-form-item>
- <el-form-item label="璇︾粏浠嬬粛" prop="detail">
- <!-- <el-input
+
+ <div v-if="!isCollapsed" style="display:flex">
+ <div>
+ <el-form-item label="濂楅鎻忚堪" prop="pacRemark">
+ <el-input
+ type="textarea"
+ v-model="form.pacRemark"
+ placeholder="璇疯緭鍏ュ椁愭弿杩�"
+ style="width: 670px"
+ rows="2"
+ ></el-input>
+ </el-form-item>
+ <el-form-item label="璇︾粏浠嬬粛" prop="detail">
+ <!-- <el-input
v-model="form.detail"
placeholder="璇疯緭鍏ヨ缁嗕粙缁�"
style="width: 200px"
/> -->
- <editor v-model="form.detail" :min-height="192" />
- </el-form-item>
- <!-- </div> -->
- <div class="dialo2">
- <el-form-item label="鍥剧墖">
- <image-upload v-model="form.pacPhone" />
+ <editor
+ v-model="form.detail"
+ :min-height="192"
+ style="width: 670px"
+ />
</el-form-item>
+ </div>
+ <!-- </div> -->
+ <div class="dialo2">
+ <el-form-item label="鍥剧墖">
+ <image-upload v-model="form.pacPhone" />
+ </el-form-item>
+ </div>
+ <!-- </div> -->
</div>
- <!-- </div> -->
</el-form>
-
+ <el-button type="primary" plain size="mini" @click="toggleCollapse">{{
+ isCollapsed ? "灞曞紑" : "鏀惰捣"
+ }}</el-button>
<el-button
type="primary"
plain
size="mini"
icon="el-icon-plus"
@click="addmembers()"
- >鏂板</el-button
+ >鏂板鍗曢」</el-button
>
<el-table
v-loading="loading"
@@ -558,10 +585,12 @@
</div>
</template>
</el-dialog> -->
+ <Packages ref="aaa" @add="handleChanges" />
</div>
</template>
<script>
+import Packages from "@/components/Packages";
import { listCategory } from "@/api/mall/category";
import { listKeyword } from "@/api/mall/keyword";
import {
@@ -579,22 +608,25 @@
export default {
name: "Package",
dicts: ["sys_normal_disable", "sys_yes_no"],
+ components: { Packages },
data() {
let checkPhoneNum = (rule, value, callback) => {
- console.log( value)
+ console.log(value);
let patter = new RegExp(/^1\s*[3456789]\s*(\d\s*){9}$/);
if (value == "" && value == undefined && !value) {
- return callback('');
- } else if(value != undefined && value != ""){
+ return callback("");
+ } else if (value != undefined && value != "") {
return callback();
- }else if (!patter.test(value)) {
- return callback('');
+ } else if (!patter.test(value)) {
+ return callback("");
}
};
return {
- categoryList:[],
- keys:"",
+ isCollapsed: true, // 榛樿涓烘姌鍙犵姸鎬�
+ categoryList: [],
+ keys: "",
keywordList: [],
+ dataListAll: [],
// 澶氶�夋
priceNow: "",
checkAll: false,
@@ -640,31 +672,29 @@
// 琛ㄥ崟鏍￠獙
rules: {
deleted: [
- { required: true, validator: checkPhoneNum, trigger: "blur" },
+ { required: true, validator: checkPhoneNum, trigger: "blur" },
],
pacName: [
- { required: true, validator: checkPhoneNum, trigger: "blur" },
+ { required: true, validator: checkPhoneNum, trigger: "blur" },
],
pacStatus: [
- { required: true, validator: checkPhoneNum, trigger: "change" },
+ { required: true, validator: checkPhoneNum, trigger: "change" },
],
- categoryId: [
- { required: true, validator: checkPhoneNum, trigger: "change" },
- ],
+ // categoryId: [
+ // { required: true, validator: checkPhoneNum, trigger: "change" },
+ // ],
keywords: [
- { required: true, validator: checkPhoneNum, trigger: "change" },
+ { required: true, validator: checkPhoneNum, trigger: "change" },
],
isOnSale: [
- { required: true, validator: checkPhoneNum, trigger: "change" },
+ { required: true, validator: checkPhoneNum, trigger: "change" },
],
- sort: [
- { required: true, validator: checkPhoneNum, trigger: "blur" },
- ],
+ sort: [{ required: true, validator: checkPhoneNum, trigger: "blur" }],
retailPrice: [
- { required: true, validator: checkPhoneNum, trigger: "blur" },
+ { required: true, validator: checkPhoneNum, trigger: "blur" },
],
counterPrice: [
- { required: true, validator: checkPhoneNum, trigger: "blur" },
+ { required: true, validator: checkPhoneNum, trigger: "blur" },
],
},
};
@@ -675,6 +705,9 @@
this.getCategory();
},
methods: {
+ toggleCollapse() {
+ this.isCollapsed = !this.isCollapsed; // 鐐瑰嚮鎸夐挳鏃跺垏鎹sCollapsed鐨勫��
+ },
/** 鏌ヨ浣撴濂楅鍒楄〃 */
getList() {
this.loading = true;
@@ -698,10 +731,10 @@
});
},
sel(val) {
- let id = val
+ let id = val;
this.keys = "";
id.forEach((item) => {
- this.keys += item + ","
+ this.keys += item + ",";
});
},
/** 鏌ヨ绫荤洰鍒楄〃 */
@@ -711,7 +744,7 @@
this.categoryList = response.rows;
});
},
- shangpin(vals){
+ shangpin(vals) {
console.log(vals);
},
// 鍙栨秷鎸夐挳
@@ -744,6 +777,20 @@
this.queryParams.pageNum = 1;
this.getList();
},
+
+ handlePackage() {
+ this.$refs.aaa.open = true;
+ this.$refs.aaa.getList();
+ this.$refs.aaa.title = "濂楅瀛楀吀";
+ },
+ handleChanges(param1) {
+ this.form.pacName = param1[0].pacName;
+ this.form.hisPacId = param1[0].pacId;
+ if (param1[0].price) {
+ this.form.counterPrice = param1[0].price;
+ this.form.retailPrice = param1[0].price;
+ }
+ },
/** 閲嶇疆鎸夐挳鎿嶄綔 */
resetQuery() {
this.resetForm("queryForm");
@@ -764,15 +811,15 @@
this.reset();
this.open = true;
this.title = "浣撴濂楅淇℃伅缁存姢";
- getAllList().then((response) => {
- this.allList = response.data;
- if (this.allList.proStatus === 0) {
- this.allList.proStatus = "鍚敤";
- } else {
- this.allList.proStatus = "鍋滅敤";
- }
- this.loading = false;
- });
+ // getAllList().then((response) => {
+ // this.allList = response.data;
+ // if (this.allList.proStatus === 0) {
+ // this.allList.proStatus = "鍚敤";
+ // } else {
+ // this.allList.proStatus = "鍋滅敤";
+ // }
+ // this.loading = false;
+ // });
// if (!this.form.tjProjectList) {
// this.form.tjProjectList = []
// this.form.tjProjectList.push({
@@ -789,11 +836,10 @@
// 鏄惁鍚敤
handleStatusChange(row) {
-
let data = {
- pacId:row.pacId,
- pacStatus:row.pacStatus,
- }
+ pacId: row.pacId,
+ pacStatus: row.pacStatus,
+ };
let text = row.pacStatus === "0" ? "鍚敤" : "鍋滅敤";
this.$confirm("纭瑕�" + text + row.pacName + "濂楅鍚楋紵")
.then(function () {
@@ -835,6 +881,16 @@
// 鏂板琛�
addmembers() {
if (this.form.pacName) {
+ this.loading = true;
+ getAllList().then((response) => {
+ this.allList = response.data;
+ if (this.allList.proStatus === 0) {
+ this.allList.proStatus = "鍚敤";
+ } else {
+ this.allList.proStatus = "鍋滅敤";
+ }
+ this.loading = false;
+ });
if (!this.form.tjProjectList) {
this.form.tjProjectList = [];
this.form.tjProjectList.push({
@@ -894,6 +950,20 @@
});
}
});
+
+ for (let i = 0; i < this.form.tjProjectList.length; i++) {
+ for (let j = i + 1; j < this.form.tjProjectList.length; j++) {
+ if (
+ this.form.tjProjectList[i].proId == this.form.tjProjectList[j].proId
+ ) {
+ this.form.tjProjectList.splice(j, 1);
+ j--;
+ this.$modal.msgError("姝ら」鐩凡褰曞叆锛屼笉鍙噸澶嶅綍鍏�");
+ }
+ }
+ }
+
+ return this.form.tjProjectList;
},
/** 鎻愪氦鎸夐挳 */
submitForm() {
@@ -1039,14 +1109,17 @@
display: flex;
justify-content: center;
}
+
.pag1 {
width: 30%;
}
+
.dialog-footer {
position: absolute;
left: 40%;
bottom: 2%;
}
+
/* .dialo{
display: flex;
flex-direction: row;
--
Gitblit v1.8.0