From 0243fa63313ebf928894a86a8b4e465465c42ecf Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期四, 29 六月 2023 18:06:22 +0800
Subject: [PATCH] Merge branch 'wulong' of http://116.62.18.175:6699/r/~yxh/smartor-web into yxh01
---
src/views/repositoryai/intention/index.vue | 303 ++++++++++++++++++++++++++-----------------------
1 files changed, 160 insertions(+), 143 deletions(-)
diff --git a/src/views/repositoryai/intention/index.vue b/src/views/repositoryai/intention/index.vue
index bba76ed..ae0771e 100644
--- a/src/views/repositoryai/intention/index.vue
+++ b/src/views/repositoryai/intention/index.vue
@@ -3,7 +3,7 @@
<!-- 宸︿晶鏍� -->
<div class="sidecolumn">
<div class="sidecolumn-top">
- <div class="top-wj">鎰忓浘绫诲瀷</div>
+ <div class="top-wj">鎸囨爣绫诲瀷</div>
<div class="top-tj" @click="dialogFormVisible = true">+娣诲姞</div>
</div>
<div class="center-ss">
@@ -56,10 +56,10 @@
<div class="leftvlue-top">
<el-tabs v-model="topactiveName" @tab-click="tophandleClick">
<el-tab-pane name="Local">
- <span class="mulsz" slot="label">鏈湴鎰忓浘搴� </span>
+ <span class="mulsz" slot="label">鏅�氭寚鏍囧簱 </span>
</el-tab-pane>
<el-tab-pane name="sharing">
- <span class="mulsz" slot="label">鍏变韩鎰忓浘搴� </span>
+ <span class="mulsz" slot="label">鐗瑰畾鎸囨爣搴� </span>
</el-tab-pane>
</el-tabs>
</div>
@@ -75,7 +75,7 @@
v-show="showSearch"
label-width="98px"
>
- <el-form-item label="鎰忓浘鍚嶇О" prop="userName">
+ <el-form-item label="鎸囨爣绉嶇被" prop="userName">
<el-input
v-model="queryParams.userName"
placeholder="璇疯緭鍏�"
@@ -84,13 +84,36 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
- <el-form-item label="閫傜敤鐤剧梾" prop="status">
- <el-cascader
- v-model="queryParams.status"
- :options="optionss"
- :props="propss"
+ <el-form-item label="鎸囨爣鍊�" prop="userName">
+ <el-input
+ v-model="queryParams.userName"
+ placeholder="璇疯緭鍏�"
clearable
- ></el-cascader>
+ style="width: 200px"
+ @keyup.enter.native="handleQuery"
+ />
+ </el-form-item>
+ <el-form-item label="璇█" prop="status">
+ <el-select v-model="queryParams.status" placeholder="璇烽�夋嫨">
+ <el-option
+ v-for="item in languagelist"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ >
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="鏄惁鍚敤" prop="status">
+ <el-select v-model="queryParams.status" placeholder="璇烽�夋嫨">
+ <el-option
+ v-for="item in qyoptions"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ >
+ </el-option>
+ </el-select>
</el-form-item>
<el-form-item>
@@ -158,7 +181,7 @@
v-if="columns[0].visible"
/>
<el-table-column
- label="鎰忓浘鍚嶇О"
+ label="鎸囨爣绉嶇被"
align="center"
key="userName"
prop="userName"
@@ -166,7 +189,7 @@
:show-overflow-tooltip="true"
/>
<el-table-column
- label="鐗堟湰"
+ label="鎸囨爣鍊�"
align="center"
key="nickName"
prop="nickName"
@@ -175,14 +198,14 @@
/>
<el-table-column
- label="閫傜敤鐤剧梾"
+ label="鎸囨爣瑙勫垯"
align="center"
key="aphonenumber"
prop="aphonenumber"
v-if="columns[4].visible"
- width="120"
+ width="400"
/><el-table-column
- label="鎰忓浘鎻忚堪"
+ label="鎸囨爣绫诲瀷"
align="center"
key="bphonenumber"
prop="bphonenumber"
@@ -190,40 +213,31 @@
width="120"
/>
<el-table-column
- label="鏈�杩戠紪杈�"
+ label="璇█"
align="center"
key="cphonenumber"
prop="cphonenumber"
v-if="columns[4].visible"
width="120"
/>
+ <el-table-column label="鏄惁鍚敤" align="center" key="status">
+ <template slot-scope="scope">
+ <el-switch
+ v-model="scope.row.status"
+ active-value="0"
+ inactive-value="1"
+ @change="handleStatusChange(scope.row)"
+ ></el-switch>
+ </template>
+ </el-table-column>
<el-table-column
label="鎿嶄綔"
align="center"
- width="300"
+ width="200"
class-name="small-padding fixed-width"
>
<template slot-scope="scope">
- <el-button
- size="medium"
- type="text"
- @click="goQRCode(scope.row)"
- v-hasPermi="['system:user:edit']"
- >
- <span class="button-text"
- ><i class="el-icon-edit"></i>浜岀淮鐮�</span
- ></el-button
- >
- <el-button
- size="medium"
- type="text"
- @click="ViewQuestionnaire(scope.row)"
- v-hasPermi="['system:user:edit']"
- ><span class="button-textck"
- ><i class="el-icon-edit"></i>鏌ョ湅</span
- ></el-button
- >
<el-button
size="medium"
type="text"
@@ -256,87 +270,89 @@
</el-col>
</el-row>
- <!-- 娣诲姞鎴栦慨鏀规剰鍥鹃厤缃璇濇 -->
+ <!-- 娣诲姞鎴栦慨鏀规寚鏍囬厤缃璇濇 -->
<el-dialog
:title="title"
- :visible.sync="open"
+ :visible.sync="indexopen"
width="900px"
append-to-body
>
- <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+ <el-form
+ ref="form"
+ :model="indexform"
+ :rules="rules"
+ label-width="100px"
+ >
<el-row>
- <el-col :span="12">
- <el-form-item label="濮撳悕" prop="nickName">
- <el-input
- v-model="form.nickName"
- placeholder="璇疯緭鍏ュ鍚�"
- maxlength="30"
- />
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="鎬у埆" prop="deptId">
- <el-select v-model="form.sex" placeholder="璇烽�夋嫨鎬у埆">
+ <el-col :span="24">
+ <el-form-item label="璇█" prop="deptId">
+ <el-select
+ v-model="indexform.language"
+ placeholder="璇烽�夋嫨璇█"
+ >
<el-option
- v-for="dict in dict.type.sys_user_sex"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
+ v-for="index in languagelist"
+ :key="index.value"
+ :label="index.label"
+ :value="index.value"
></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
- <el-col :span="12">
- <el-form-item label="璇佷欢绫诲瀷" prop="phonenumber">
+ <el-col :span="24">
+ <el-form-item label="鎸囨爣绉嶇被" prop="nickName">
<el-input
- v-model="form.phonenumber"
- placeholder="璇烽�夋嫨璇佷欢绫诲瀷"
- maxlength="11"
+ v-model="indexform.nickName"
+ placeholder="璇疯緭鍏ユ寚鏍囩绫�"
+ maxlength="40"
/>
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="璇佷欢鍙�" prop="email">
- <el-input
- v-model="form.email"
- placeholder="璇疯緭鍏ヨ瘉浠跺彿"
- maxlength="50"
- />
- </el-form-item>
- </el-col>
- </el-row>
+ </el-form-item> </el-col
+ ></el-row>
<el-row>
- <el-col :span="12">
- <el-form-item label="鏈汉鎵嬫満鍙�" prop="userName">
+ <el-col :span="24">
+ <el-form-item label="鎷涙爣绫诲瀷">
+ <el-radio-group v-model="indexform.resource">
+ <el-radio label="閫夐」"></el-radio>
+ <el-radio label="鏂囨湰"></el-radio>
+ <el-radio label="鏁板��"></el-radio>
+ </el-radio-group>
+ </el-form-item> </el-col
+ ></el-row>
+ <el-row>
+ <el-col :span="24">
+ <el-form-item label="鎸囨爣鍊�" prop="userName">
<el-input
- v-model="form.userName"
+ v-model="indexform.userName"
placeholder="璇疯緭鍏ユ墜鏈哄彿"
maxlength="30"
/>
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="浜插睘鎵嬫満鍙�" prop="password">
+ </el-form-item> </el-col
+ ></el-row>
+
+ <el-row>
+ <el-col :span="24">
+ <el-form-item label="鎸囨爣瑙勫垯" prop="email">
<el-input
- v-model="form.password"
- placeholder="璇疯緭鍏ヤ翰灞炴墜鏈哄彿"
- type="password"
- maxlength="20"
- show-password
- />
+ v-model="indexform.remark"
+ type="textarea"
+ placeholder="璇疯緭鍏ュ唴瀹�"
+ ></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
- <el-col :span="12">
- <el-form-item label="鎮ｈ�呮爣绛�">
- <el-cascader
- :options="optionss"
- :props="propss"
- clearable
- ></el-cascader>
+ <el-col :span="24">
+ <el-form-item label="鏄惁鍚敤">
+ <el-radio-group v-model="indexform.qystatus">
+ <el-radio
+ v-for="item in qyoptions"
+ :key="item.value"
+ :label="item.value"
+ >{{ item.label }}</el-radio
+ >
+ </el-radio-group>
</el-form-item>
</el-col>
</el-row>
@@ -345,7 +361,7 @@
<el-col :span="24">
<el-form-item label="澶囨敞">
<el-input
- v-model="form.remark"
+ v-model="indexform.remark"
type="textarea"
placeholder="璇疯緭鍏ュ唴瀹�"
></el-input>
@@ -395,15 +411,6 @@
<el-button type="primary" @click="deletefenlei">纭� 瀹�</el-button>
</span>
</el-dialog>
- <!-- 浜岀淮鐮佸睍绀哄脊妗� -->
- <el-dialog width="30%" :visible.sync="goQRCodeVisible">
- <div class="qrcode-dialo">
- <div class="qrcode-text">
- {{ namequestionnaire }}<span>{{ haoquestionnaire }}</span>
- </div>
- <div class="qrcode-img"></div>
- </div>
- </el-dialog>
</div>
</template>
@@ -451,11 +458,12 @@
userList: [
{
userid: 1,
- userName: "涓夊彿鎰忓浘",
- nickName: "1.2.4",
- aphonenumber: "鍏宠妭鐐庣棁",
- bphonenumber: "寰堟",
- cphonenumber: "2022-12-12 ",
+ userName: "琛�甯歌銆佸翱甯歌",
+ nickName: "璐",
+ aphonenumber: "(?!涓�.*|娌�.*|鏈�.*)^.*([璐钩鍑]|璐|璇勫|璇勫),10",
+ bphonenumber: "閫夋嫨",
+ cphonenumber: "鏅�氳瘽",
+ status: "0",
},
],
// 寮瑰嚭灞傛爣棰�
@@ -468,53 +476,59 @@
postOptions: [],
// 瑙掕壊閫夐」
roleOptions: [],
- // 琛ㄥ崟鍙傛暟
- form: {},
+ // 娣诲姞銆佷慨鏀瑰弬鏁�
+ indexform: {},
numberlb: 22,
numberlbs: 2,
sidecolumnform: {}, //娣诲姞绫诲埆琛ㄥ崟
dialogFormVisible: false, //娣诲姞绫诲埆寮规
- goQRCodeVisible: false, //浜岀淮鐮佸脊妗�
sidecolumnval: "", //绫诲埆鎼滅储
+ indexopen: false, //寮规灞曠ず鍚�
propss: { multiple: true },
- optionss: [
+ languagelist: [
{
value: 1,
- label: "涓滃崡",
+ label: "鏅�氳瘽",
},
{
value: 2,
- label: "瑗垮寳",
+ label: "绮よ",
},
{
value: 3,
- label: "浠ㄤ花浠�",
+ label: "鑻辫",
+ },
+ ], //璇█鍒楄〃
+ qyoptions: [
+ {
+ value: 1,
+ label: "鍚敤",
},
{
- value: 4,
- label: "鍏椋掗",
+ value: 2,
+ label: "鍏抽棴",
},
],
//绫诲埆鍒楄〃
editableTabs: [
{
- title: "鎰忓浘鍒嗙被涓�",
+ title: "鎸囨爣鍒嗙被涓�",
number: "1",
},
{
- title: "鎰忓浘鍒嗙被浜�",
+ title: "鎸囨爣鍒嗙被浜�",
number: "2",
},
{
- title: "鎰忓浘鍒嗙被涓�",
+ title: "鎸囨爣鍒嗙被涓�",
number: "2",
},
{
- title: "鎰忓浘鍒嗙被鍥�",
+ title: "鎸囨爣鍒嗙被鍥�",
number: "2",
},
{
- title: "鎰忓浘鍒嗙被浜�",
+ title: "鎸囨爣鍒嗙被浜�",
number: "2",
},
],
@@ -639,20 +653,31 @@
this.deletefenl = row.title;
}
},
+ // 棰樼洰鐘舵�佷慨鏀�
+ handleStatusChange(row) {
+ let text = row.status === "0" ? "鍚敤" : "鍋滅敤";
+ this.$modal
+ .confirm('纭瑕�"' + text + '""' + row.userName + '"鐢ㄦ埛鍚楋紵')
+ .then(function () {
+ return changeUserStatus(row.userId, row.status);
+ })
+ .then(() => {
+ this.$modal.msgSuccess(text + "鎴愬姛");
+ })
+ .catch(function () {
+ row.status = row.status === "0" ? "1" : "0";
+ });
+ },
//鎼滅储绫诲埆
sidecolumnss() {},
// 鍒囨崲鍏变韩/鏈湴
tophandleClick() {},
// 鍙栨秷鎸夐挳
cancel() {
- this.open = false;
+ this.indexopen = false;
this.reset();
},
- goQRCode(row) {
- this.goQRCodeVisible = true;
- this.namequestionnaire = row.userName;
- this.haoquestionnaire = row.nickName;
- },
+
// 琛ㄥ崟閲嶇疆
reset() {
this.form = {
@@ -692,23 +717,15 @@
},
/** 鏂板鎸夐挳鎿嶄綔 */
handleAdd() {
- this.$router.push({
- path: "/knowledge/questionnaire/compilequer/",
- });
+ this.reset();
+ this.title = "鏂板鎸囨爣";
+ this.indexopen = true;
},
/** 淇敼鎸夐挳鎿嶄綔 */
handleUpdate(row) {
- this.$router.push({
- path: "/knowledge/questionnaire/compilequer/",
- query: { id: "1" },
- });
- },
- // 鏌ョ湅鎰忓浘
- ViewQuestionnaire() {
- this.$router.push({
- path: "/knowledge/questionnaire/examine/",
- query: { id: "1" },
- });
+ this.reset();
+ this.title = "淇敼鎸囨爣";
+ this.indexopen = true;
},
// 淇敼鍒嗙被寮规
popoveramend(tagcategoryid) {
@@ -724,13 +741,13 @@
if (this.form.userId != undefined) {
updateUser(this.form).then((response) => {
this.$modal.msgSuccess("淇敼鎴愬姛");
- this.open = false;
+ this.indexopen = false;
this.getList();
});
} else {
addUser(this.form).then((response) => {
this.$modal.msgSuccess("鏂板鎴愬姛");
- this.open = false;
+ this.indexopen = false;
this.getList();
});
}
--
Gitblit v1.9.3