From 40eae1097035f908efee59518d0e6c2b2c9a5c2e Mon Sep 17 00:00:00 2001
From: luobisheng <727299681@qq.com>
Date: 星期五, 04 十一月 2022 15:42:25 +0800
Subject: [PATCH] Merge branch 'lbs'
---
src/views/operate/fivepack/shop/components/createUser/index.vue | 57 ++++++++++++++++++++++++++++++---------------------------
1 files changed, 30 insertions(+), 27 deletions(-)
diff --git a/src/views/operate/fivepack/shop/components/createUser/index.vue b/src/views/operate/fivepack/shop/components/createUser/index.vue
index 0e5b88d..6a17d2b 100644
--- a/src/views/operate/fivepack/shop/components/createUser/index.vue
+++ b/src/views/operate/fivepack/shop/components/createUser/index.vue
@@ -5,8 +5,8 @@
<el-form ref="user" label-width="140px" autoComplete="on" :model="store" :rules="createUserRules"
label-position="right">
<!-- 搴楅摵绫诲瀷 -->
- <el-form-item class="optionItem" label="搴楅摵绫诲瀷:" prop="storetype">
- <el-select v-model="store.storetype" placeholder="璇烽�夋嫨搴楅摵绫诲瀷">
+ <el-form-item class="optionItem" label="搴楅摵绫诲瀷:" prop="type">
+ <el-select v-model="store.type" placeholder="璇烽�夋嫨搴楅摵绫诲瀷">
<el-option value="1">
<el-tree ref="tree" :check-strictly="true" :data="shopTypeList" :props="defaultProps"
show-checkbox @check-change="handleCheck" default-expand-all node-key="id">
@@ -23,9 +23,9 @@
<el-input v-model="store.owner" placeholder="璇峰～鍐欏簵閾鸿礋璐ｄ汉鍚嶅瓧"></el-input>
</el-form-item>
<!-- 搴楅摵鎻忚堪 -->
- <el-form-item class="optionItem" label="搴楅摵鎻忚堪:" prop="storedesc">
- <el-input type="textarea" :autosize="{ minRows: 2, maxRows: 4}" maxlength="300" show-word-limit
- v-model="store.storedesc" placeholder="杈撳叆搴楅摵鎻忚堪"></el-input>
+ <el-form-item class="optionItem" label="搴楅摵鎻忚堪:" prop="description">
+ <el-input type="textarea" :autosize="{ minRows: 4, maxRows: 8 }" maxlength="300" show-word-limit
+ v-model="store.description" placeholder="杈撳叆搴楅摵鎻忚堪"></el-input>
<!-- <el-input type="textarea" v-model="user.storedesc" placeholder="杈撳叆閮ㄩ棬鎻忚堪"></el-input> -->
</el-form-item>
<!-- 鑱旂郴鏂瑰紡 -->
@@ -58,9 +58,9 @@
callback();
}
};
- const validatePass = (rule, value, callback) => {
+ const validateShopName = (rule, value, callback) => {
if (!value) {
- callback();
+ callback(new Error('搴楅摵鍚嶇О涓嶈兘涓虹┖'));
} else {
callback();
}
@@ -84,14 +84,15 @@
}
}
};
- const validateMail = (rule, value, callback) => {
- if (value) {
- callback();
- } else {
- callback(new Error('搴楅摵鍚嶇О涓嶈兘涓虹┖'))
- }
- };
+ // const validateMail = (rule, value, callback) => {
+ // if (value) {
+ // callback();
+ // } else {
+ // callback(new Error('搴楅摵鍚嶇О涓嶈兘涓虹┖'))
+ // }
+ // };
const validateType = (rule, value, callback) => {
+ console.log(value)
if (!value) {
callback(new Error('闂ㄥ簵绫诲瀷涓嶈兘涓虹┖'));
} else {
@@ -113,38 +114,38 @@
storeaddr: '',
storename: '',
storedesc: '',
- storetype: '',
+ type: '',
},
createUserRules: {
owner: [
{ required: true, trigger: "blur", validator: validateNickname },
],
- storetype: [
+ type: [
{
required: true, trigger: 'change', validator: validateType,
}
],
- idcardinfo: [
- { required: true, trigger: "blur", validator: validatePass },
- ],
+ // idcardinfo: [
+ // { required: true, trigger: "blur", validator: validatePass },
+ // ],
storeaddr: [
{ required: true, trigger: "blur", validator: validateTruename },
],
contact: [
{ required: true, trigger: "blur", validator: validatePhone },
],
- storename: [
- { required: true, trigger: "blur", validator: validateMail },
- ],
- storedesc: [
+ description: [
{ required: false, trigger: "blur", validator: validateDesc },
],
+ storename: [
+ { required: true, trigger: "blur", validator: validateShopName },
+ ]
},
shopTypeList: [
{ name: '绫诲瀷1', value: 1 }, { name: '绫诲瀷2', value: 2 }
],
defaultProps: {
- children: 'children',
+ children: 'children',
label: 'name',
disabled: (data, node) => {
if (node.level === 1 && node.childNodes.length !== 0) {
@@ -162,7 +163,7 @@
},
methods: {
handleStore() {
- const { store } = this;
+ const { store,selectOrg } = this;
this.$refs.user.validate((valid) => {
console.log(valid);
if (valid) {
@@ -171,10 +172,11 @@
url: 'sccg/store/storeinfo/add',
data: {
contact: store.contact,
- idcardinfo: '511025184612310215',
owner: store.owner,
storeaddr: store.storeaddr,
storename: store.storename,
+ description: store.description,
+ type: selectOrg.orgsid[0],
}
})
.then(res => {
@@ -226,7 +228,8 @@
}
},
handleCheck(data, checked) {
- this.store.storetype = data.name;
+ console.log(data)
+ this.store.type = data.name;
// 鑾峰彇褰撳墠閫夋嫨鐨刬d鍦ㄦ暟缁勪腑鐨勭储寮�
const indexs = this.selectOrg.orgsid.indexOf(data.id)
// 濡傛灉涓嶅瓨鍦ㄦ暟缁勪腑锛屽苟涓旀暟缁勪腑宸茬粡鏈変竴涓猧d骞朵笖checked涓簍rue鐨勬椂鍊欙紝浠ｈ〃涓嶈兘鍐嶆閫夋嫨銆�
--
Gitblit v1.8.0