增加商户筛选条件

src/views/setting/account/index.vue

@@ -27,7 +27,8 @@
                   <el-option :label="item.label" :value="item.value" v-for="(item, index) in select_status"
                     :key="index"></el-option>
                 </el-select>
-                <el-input placeholder="请输入内容" v-model="screenForm.keyword" size="small" style="width: 180px;">
+				<el-input placeholder="商户名称" v-model="screenForm.companyWechatName" size="small" style="width: 180px;"></el-input>
+                <el-input placeholder="用户名" v-model="screenForm.keyword" size="small" style="width: 180px;">
                   <el-button slot="append" icon="el-icon-search" size="small" @click="getListByScreen"></el-button>
                 </el-input>
               </div>
@@ -36,8 +37,9 @@
               <el-table v-loading="listLoading" :data="dataList" element-loading-text="Loading" border fit
                 highlight-current-row stripe>
                 <el-table-column align="center" label="序号" type="index" width="50"></el-table-column>
+				<el-table-column align="center" label="商户" prop="companyName" min-width="160"></el-table-column>
                 <el-table-column align="center" label="账号" prop="userName" min-width="120"></el-table-column>
-                <el-table-column align="center" label="用户名" prop="nickName" min-width="120"></el-table-column>
+                <el-table-column align="center" label="用户名" prop="nickName" min-width="160"></el-table-column>
                 <el-table-column align="center" label="角色" prop="roleName" min-width="100"></el-table-column>
                 <el-table-column align="center" label="创建时间" prop="createTime" min-width="160"></el-table-column>
                 <el-table-column align="center" label="最后登录时间" prop="lastLoginTime" min-width="160"></el-table-column>
@@ -219,6 +221,7 @@ export default {
         role: '', // 角色
         status: '', // 状态
         keyword: '', // 关键词
+		companyWechatName: ''//商户名
       },
       select_status: [ // 筛选字段 - 状态
         { label: '正常', value: true },
@@ -311,6 +314,7 @@ export default {
         roleId: this.screenForm.role,
         status: this.screenForm.status,
         userName: this.screenForm.keyword,
+		companyWechatName: this.screenForm.companyWechatName,
         pageNum: this.currentPage,
         pageSize: this.pageSize,
         ...(() => {

src/views/setting/oplog/index.vue

@@ -55,6 +55,7 @@
               </el-form>
             </template>
           </el-table-column>
+		  <el-table-column align="center" label="商户" prop="companyName" min-width="140"></el-table-column>
           <el-table-column align="center" label="所在模块" prop="moduleName" min-width="140"></el-table-column>
           <el-table-column align="center" label="记录时间" prop="createTime" min-width="160"></el-table-column>
           <el-table-column align="center" label="用户" prop="nickName" min-width="140">

src/views/setting/role/index.vue

@@ -15,12 +15,16 @@
                 <el-button size="small" type="primary" icon="el-icon-plus" @click="addOrEdit('add')">新增角色</el-button>
               </div>
               <div class="fr">
+                <el-input placeholder="商户名称" v-model="screenForm.companyWechatName" size="small" style="width: 300px;">
+                  <el-button slot="append" icon="el-icon-search" size="small" @click="getListByScreen"></el-button>
+                </el-input>
               </div>
             </div>
             <div class="table">
               <el-table v-loading="listLoading" :data="dataList" element-loading-text="Loading" border fit
                 highlight-current-row stripe>
                 <el-table-column align="center" label="序号" type="index" width="50"></el-table-column>
+				<el-table-column align="center" label="商户" prop="companyName"></el-table-column>
                 <el-table-column align="center" label="角色" prop="name"></el-table-column>
                 <el-table-column align="center" label="操作" width="180">
                   <template slot-scope="scope">
@@ -85,6 +89,9 @@ export default {
       listTotal: 0, // 列表总数
       editId: null,
       addFormType: 'add',
+	  screenForm: {
+	  	companyWechatName: ''
+	  },
       addForm: {
         name: '', // 角色名
       },
@@ -114,7 +121,8 @@ export default {
       this.listLoading = true;
       let params = {
         pageNum: this.currentPage,
-        pageSize: this.pageSize
+        pageSize: this.pageSize,
+		companyWechatName: this.screenForm.companyWechatName
       };
       getRoleList(params).then(res => {
         this.dataList = res.data.records;
@@ -122,6 +130,12 @@ export default {
         this.listLoading = false;
       })
     },
+		
+		// 筛选后重新获取列表
+		getListByScreen() {
+		  this.currentPage = 1;
+		  this.getList();
+		},
 
     // 更改每页数量
     handleSizeChange(val) {

src/views/workOrder/settleAccountsManagement/settleAccountsOrder/index.vue

@@ -159,6 +159,51 @@ export default {
 		exportList: pageExport,
 		// 表格列解析渲染数据更改
 		columnParsing(item, defaultData) {
+			if (item.jname === 'orderBaseId') {
+				defaultData.render = (h, { row, index, column }) => {
+					return (
+						<div style="padding:0 6px;cursor: pointer;" class={{ 'text-view': true, 'text-view-copy': column.isCopy }}>
+							<span style="color:#008dd4;" onClick={() => {
+								if (row.settleOrderType == 'EXAMINE') {
+									this.$router.push({
+										name: "rewardsPunishmentsOrder",
+										query: {
+											id: row.examineProjectId
+										}
+									})
+								} else if(row.settleOrderType == 'PUNISH'){
+									this.$router.push({
+										name: 'penaltyWorkOrder',
+										params: {
+											pageName: row.punishOrderId,
+											pageType: 'detail',
+											pageCode: row.punishOrderId,
+										},
+									})
+								}else{
+									this.$router.push({
+										name: 'workOrderPool',
+										params: {
+											pageName: row.orderBaseId,
+											pageType: 'detail',
+											pageCode: row.orderBaseId,
+											pagePam: 'SettleAccounts'
+										},
+									})
+								}
+							}}>{row.orderBaseId}</span>
+							{(column.isCopy && row.orderBaseId) ? (
+								<i
+									style="color:#008dd4;"
+									class={['el-icon-document-copy', column.columnCopyClass]}
+									data-clipboard-text={row[column.columnAttributes.prop]}
+								></i>
+							) : null}
+						</div>
+					)
+				}
+				defaultData.columnAttributes.width = 200
+			}
 			return defaultData
 		},
 		selectable(row, index) {