From 02aa4d157d800650f1dc2fa2b7fbee52837df074 Mon Sep 17 00:00:00 2001 From: yxh <172933527@qq.com> Date: 星期五, 01 十二月 2023 13:46:07 +0800 Subject: [PATCH] Merge branch 'wulong' of http://116.62.18.175:6699/r/~yxh/smartor-web into yxh01 --- src/views/followvisit/satisfaction/index.vue | 140 ++++++++++++++++++++++++++++------------------ 1 files changed, 86 insertions(+), 54 deletions(-) diff --git a/src/views/followvisit/satisfaction/index.vue b/src/views/followvisit/satisfaction/index.vue index 3b969de..465309e 100644 --- a/src/views/followvisit/satisfaction/index.vue +++ b/src/views/followvisit/satisfaction/index.vue @@ -14,10 +14,10 @@ <el-form-item label="浠诲姟鍚嶇О"> <el-input v-model="topqueryParams.name"></el-input> </el-form-item> - <el-form-item label="瀹℃牳浜�"> + <el-form-item label="鍙戣捣浜�"> <el-input v-model="topqueryParams.name"></el-input> </el-form-item> - <el-form-item label="瀹℃牳鏃堕棿"> + <el-form-item label="鍙戣捣鏃堕棿"> <el-date-picker v-model="dateRange" style="width: 240px" @@ -28,7 +28,7 @@ end-placeholder="缁撴潫鏃ユ湡" ></el-date-picker> </el-form-item> - <el-form-item label="闅忚绫诲瀷" prop="status"> + <el-form-item label="璋冩煡绫诲瀷" prop="status"> <el-select v-model="topqueryParams.topic" placeholder="璇烽�夋嫨"> <el-option v-for="item in topicoptions" @@ -39,18 +39,7 @@ </el-option> </el-select> </el-form-item> - <el-form-item label="妯$増" prop="status"> - <el-select v-model="topqueryParams.topic" placeholder="璇烽�夋嫨"> - <el-option - v-for="item in topicoptions" - :key="item.value" - :label="item.label" - :value="item.value" - > - </el-option> - </el-select> - </el-form-item> - <el-form-item label="闂ㄨ瘖闅忚鐘舵��" prop="status"> + <el-form-item label="璋冩煡鐘舵��" prop="status"> <el-select v-model="topqueryParams.topic" placeholder="璇烽�夋嫨"> <el-option v-for="item in topicoptions" @@ -77,13 +66,23 @@ <el-divider></el-divider> <el-row :gutter="10" class="mb8"> <el-col :span="1.5"> + <el-select v-model="tasktopic" placeholder="璇烽�夋嫨鏂板绫诲瀷"> + <el-option + v-for="item in taskoptions" + :key="item.value" + :label="item.label" + :value="item.value" + > + </el-option> + </el-select> + </el-col> + <el-col :span="1.5"> <el-button type="primary" - plain icon="el-icon-plus" size="medium" + :disabled="!tasktopic" @click="handleAdd" - v-hasPermi="['system:user:add']" >鏂板</el-button > </el-col> @@ -111,7 +110,7 @@ >鍒犻櫎</el-button > </el-col> - <el-col :span="19"> + <el-col :span="1.5"> <div class="documentf"> <div class="document"> <el-button @@ -147,7 +146,7 @@ /> <el-table-column - label="浠诲姟鍚嶇О" + label="浣忛櫌缂栧彿" align="center" sortable key="userName" @@ -155,30 +154,62 @@ :show-overflow-tooltip="true" /> <el-table-column - label="鏈嶅姟妯℃澘" + label="濮撳悕" + align="center" + sortable + key="userName" + prop="userName" + :show-overflow-tooltip="true" + /> + <el-table-column + label="骞撮緞" + align="center" + key="age" + prop="age" + width="120" + /> + <el-table-column + label="璋冩煡妯℃澘" align="center" key="types" prop="types" /> <el-table-column - label="鍒涘缓鏃ユ湡" + label="璋冩煡绫诲瀷" + align="center" + key="types" + prop="types" + /> + <el-table-column + label="璋冩煡鍐呭" align="center" key="nickName" prop="nickName" /> <el-table-column - label="寰呮墽琛�/鎬绘暟" + label="浣忛櫌鐥呭尯" align="center" - key="phonenumber" - prop="phonenumber" - width="120" - > - <template slot-scope="scope"> - <span style="margin-left: 10px" - >{{ scope.row.date }}/{{ scope.row.data }}</span - > - </template> - </el-table-column> + key="nickName" + prop="nickName" + /> + <el-table-column + label="搴婂彿" + align="center" + key="nickName" + prop="nickName" + /> + <el-table-column + label="涓绘不鍖荤敓" + align="center" + key="nickName" + prop="nickName" + /> + <el-table-column + label="绠″簥鎶ゅ+" + align="center" + key="nickName" + prop="nickName" + /> <el-table-column label="鎵ц鐘舵��" @@ -193,7 +224,7 @@ </template> </el-table-column> <el-table-column - label="瀹℃牳浜�" + label="璇婃柇" align="center" key="topicnumberaa" prop="topicnumberaa" @@ -203,7 +234,7 @@ /> <el-table-column - label="瀹℃牳鏃堕棿" + label="鍏ラ櫌鏃堕棿" sortable align="center" prop="createTime" @@ -211,24 +242,6 @@ > <template slot-scope="scope"> <span>{{ parseTime(scope.row.createTime) }}</span> - </template> - </el-table-column> - <el-table-column - label="鎿嶄綔" - align="center" - width="120" - class-name="small-padding fixed-width" - > - <template slot-scope="scope"> - <el-button - size="medium" - type="text" - @click="handleUpdate(scope.row)" - v-hasPermi="['system:user:edit']" - ><span class="button-zx" - ><i class="el-icon-s-promotion"></i>寮�濮嬫墽琛�</span - ></el-button - > </template> </el-table-column> <el-table-column @@ -379,6 +392,21 @@ dateRange: [], // 宀椾綅閫夐」 postOptions: [], + taskoptions: [ + { + value: "1", + label: "闂ㄨ瘖鐥呬汉", + }, + { + value: "2", + label: "鍑洪櫌鐥呬汉", + }, + { + value: "3", + label: "鍖绘姢浜哄憳", + }, + ], + tasktopic: null, //鏂板绫诲瀷 // 瑙掕壊閫夐」 roleOptions: [], dynamicTags: ["閫夐」涓�", "閫夐」浜�", "閫夐」涓�"], //閫夐」 @@ -686,8 +714,12 @@ }, /** 鏂板鎸夐挳鎿嶄綔 */ handleAdd() { - this.reset(); - this.addalteropen = true; + // this.reset(); + // this.addalteropen = true; + this.$router.push({ + path: "/Intelligentcenter/satisfaction/particulars", + query: { type: this.tasktopic }, + }); // getUser().then((response) => { // this.postOptions = response.posts; // this.roleOptions = response.roles; -- Gitblit v1.9.3