BUG 30018

This commit is contained in:
aixianling
2022-06-07 16:34:09 +08:00
parent a1ee74f4c8
commit 47d44a94b8
3 changed files with 14 additions and 24 deletions

View File

@@ -10,7 +10,7 @@ instance.defaults.baseURL = baseURLs[process.env.NODE_ENV]
instance.interceptors.request.use(config => { instance.interceptors.request.use(config => {
if (config.url.startsWith("/node")) { if (config.url.startsWith("/node")) {
config.baseURL = "/ns" config.baseURL = "/ns"
} else if (/\/project\/grid/.test(location.pathname)) { } else if (/\/project\/beta/.test(location.pathname)) {
config.baseURL = "/wg" config.baseURL = "/wg"
} else if (/\/project\/sass/.test(location.pathname)) { } else if (/\/project\/sass/.test(location.pathname)) {
config.baseURL = "/saas" config.baseURL = "/saas"

View File

@@ -17,10 +17,10 @@
<el-input v-model="forms.girdName" placeholder="请输入…" :maxlength="50" show-word-limit clearable/> <el-input v-model="forms.girdName" placeholder="请输入…" :maxlength="50" show-word-limit clearable/>
</el-form-item> </el-form-item>
<el-form-item label="网格长" prop="girdMemberManageList"> <el-form-item label="网格长" prop="girdMemberManageList">
<ai-user-picker :instance="instance" v-model="forms.girdMemberManageList" isShowUser :props="{label:'name', id: 'id'}"/> <ai-user-picker :instance="instance" v-model="forms.girdMemberManageList" :props="{label:'name', id: 'id'}"/>
</el-form-item> </el-form-item>
<el-form-item label="网格员" prop="girdMemberList"> <el-form-item label="网格员" prop="girdMemberList">
<ai-user-picker :instance="instance" v-model="forms.girdMemberList" isShowUser :props="{label:'name', id: 'id'}"/> <ai-user-picker :instance="instance" v-model="forms.girdMemberList" :props="{label:'name', id: 'id'}"/>
</el-form-item> </el-form-item>
</template> </template>
</ai-card> </ai-card>
@@ -158,25 +158,12 @@ export default {
save() { save() {
this.$refs["rules"].validate((valid) => { this.$refs["rules"].validate((valid) => {
if (valid) { if (valid) {
this.instance let {girdMemberManageList, girdMemberList} = this.forms
.post( this.instance.post(`/app/appgirdinfo/addOrUpdate`, {
`/app/appgirdinfo/addOrUpdate`, ...this.forms,
{ girdMemberManageList: girdMemberManageList?.map(v => ({wxUserId: v.id})) || [],
...this.forms, girdMemberList: girdMemberList?.map(v => ({wxUserId: v.id})) || []
girdMemberManageList: this.forms.girdMemberManageList.length ? this.forms.girdMemberManageList.map(v => { }).then((res) => {
return {
wxUserId: v.wxOpenUserId || v.wxUserId
}
}) : [],
girdMemberList: this.forms.girdMemberList.length ? this.forms.girdMemberList.map(v => {
return {
wxUserId: v.wxOpenUserId || v.wxUserId
}
}) : []
},
null
)
.then((res) => {
if (res.code == 0) { if (res.code == 0) {
this.cancel(true) this.cancel(true)
} }

View File

@@ -16,16 +16,19 @@
<span>选择</span> <span>选择</span>
</div> </div>
</div> </div>
<ai-dialog title="选择人员" :visible.sync="dialog" width="1100px" @onConfirm="submit" @closed="selected=[]"> <ai-dialog title="选择人员" :visible.sync="dialog" width="1100px" @onConfirm="submit" @close="selected=[]">
<ai-table-select :instance="instance" v-model="selected" multiple action="/app/wxcp/wxuser/list?status=1"/> <ai-table-select1 :instance="instance" v-model="selected" multiple action="/app/wxcp/wxuser/list?status=1" valueObj extra="mobile"/>
</ai-dialog> </ai-dialog>
</section> </section>
</template> </template>
<script> <script>
import AiTableSelect1 from "../AppGridMember/components/AiTableSelect";
export default { export default {
name: "AiUserPicker", name: "AiUserPicker",
components: {AiTableSelect1},
model: { model: {
prop: 'value', prop: 'value',
event: 'change', event: 'change',