소스 검색

医健宝-销售公司流量充值相关

chenguo 5 일 전
부모
커밋
3bd74e7bfc

+ 2 - 1
src/views/company/companyTraffic/index.vue

@@ -233,7 +233,8 @@ export default {
   methods: {
     resetForm,
     resetOption(){
-      this.companyOptions = []
+      this.companyOptions = [];
+      this.rechargeOpen = false;
     },
     /** 查询流量记录列表 */
     getList() {

+ 4 - 4
src/views/company/companyTrafficLog/index.vue

@@ -34,7 +34,7 @@
 
       <el-form-item label="操作人员">
         <el-input
-          v-model="queryParams.createBy"
+          v-model="queryParams.userName"
           placeholder="请输入操作人员"
           clearable
           size="small"
@@ -101,7 +101,7 @@
 
       <el-table-column label="操作后余额(KB)" align="center" prop="balance" />
 
-      <el-table-column label="操作人员" align="center" prop="userId" />
+      <el-table-column label="操作人员" align="center" prop="userName" />
 
       <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
 
@@ -160,7 +160,7 @@ export default {
         companyId: null,
         companyIds: [], // 多选公司ID
         operationType: null,
-        createBy: null,
+        userName: null,
         createTime: null,
         createTimeStart: null,
         createTimeEnd: null
@@ -172,7 +172,7 @@ export default {
     //初始化formatterCompanyOptions
     allList().then(e => {
       this.formatterCompanyOptions = e.rows;
-    })
+    });
   },
   methods: {
     /** 查询流量记录列表 */

+ 81 - 1
src/views/course/coursePlaySourceConfig/index.vue

@@ -10,6 +10,27 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="所属公司" prop="companyId">
+        <el-select
+          v-model="queryParams.companyId"
+          filterable
+          remote
+          reserve-keyword
+          placeholder="请输入公司名称搜索"
+          :remote-method="searchCompanies"
+          :loading="companySearchLoading"
+          style="width: 220px"
+          clearable
+          size="small"
+        >
+          <el-option
+            v-for="item in companyOptions"
+            :key="item.dictValue"
+            :label="item.dictLabel"
+            :value="item.dictValue"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item label="appid" prop="appid">
         <el-input
           v-model="queryParams.appid"
@@ -95,6 +116,7 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="ID" align="center" prop="id" />
       <el-table-column label="名称" align="center" prop="name" />
+      <el-table-column label="所属公司" align="center" prop="companyId" :formatter="companyNameFormatter"/>
       <el-table-column label="图标" align="center" prop="img">
         <template slot-scope="scope">
           <el-image
@@ -152,11 +174,32 @@
     />
 
     <!-- 添加或修改点播配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body :before-close="resetOption">
       <el-form ref="form" :model="form" :rules="rules" label-width="130px">
         <el-form-item label="名称" prop="name">
           <el-input v-model="form.name" placeholder="请输入名称" />
         </el-form-item>
+        <el-form-item label="所属公司" prop="companyId">
+          <el-select
+            v-model="form.companyId"
+            filterable
+            remote
+            reserve-keyword
+            placeholder="请输入公司名称搜索"
+            :remote-method="searchCompanies"
+            :loading="companySearchLoading"
+            style="width: 220px"
+            clearable
+            size="small"
+          >
+            <el-option
+              v-for="item in companyOptions"
+              :key="item.dictValue"
+              :label="item.dictLabel"
+              :value="item.dictValue"
+            />
+          </el-select>
+        </el-form-item>
         <el-form-item label="图标" prop="img">
           <image-upload v-model="form.img" :file-type='["png", "jpg", "jpeg"]' :limit="1"/>
         </el-form-item>
@@ -203,12 +246,18 @@
 <script>
 import {list, get, update, add, del} from '@/api/course/coursePlaySourceConfig'
 import {updateIsTownOn} from "@/api/system/config";
+import { allList } from '@/api/company/company'
+import { resetForm } from '@/utils/common'
 
 export default {
   name: 'CoursePlaySourceConfig',
   data() {
     return {
       switchDialogVisible: false,
+      // 公司搜索相关
+      companySearchLoading: false,
+      companyOptions: [],
+      formatterCompanyOptions: [],
       switchForm: {
         appId: '',
         switchStatus: '001',
@@ -234,6 +283,9 @@ export default {
         name: [
           { required: true, message: "名称不能为空", trigger: "blur" }
         ],
+        companyId: [
+          { required: true, message: "所属公司不能为空", trigger: "blur" }
+        ],
         appid: [
           { required: true, message: "appid不能为空", trigger: "blur" }
         ],
@@ -269,9 +321,19 @@ export default {
         listClass: 'primary'}
       })
     });
+    //初始化formatterCompanyOptions
+    allList().then(e => {
+      this.formatterCompanyOptions = e.rows;
+    });
     this.getList();
   },
   methods: {
+    resetForm,
+    resetOption(){
+      console.log(1)
+      this.companyOptions = [];
+      this.open = false;
+    },
 
 
     // 处理开关配置
@@ -283,6 +345,24 @@ export default {
       this.getSwitchConfig(row.appid);
       this.switchDialogVisible = true;
     },
+    /** 搜索公司 */
+    searchCompanies(query) {
+      this.companySearchLoading = true;
+      allList().then(response => {
+        this.companyOptions = response.rows;
+        if (query) {
+          this.companyOptions = this.companyOptions.filter(item =>
+            item.dictLabel.includes(query)
+          );
+        }
+        this.companySearchLoading = false;
+      }).catch(()=>{
+        this.companySearchLoading = false;
+      });
+    },
+    companyNameFormatter(row){
+      return this.formatterCompanyOptions.filter(item => item.dictValue === row.companyId)[0].dictLabel
+    },
 
     // 获取开关配置
     getSwitchConfig(appId) {

+ 3 - 2
src/views/hisStore/store/audit.vue

@@ -88,7 +88,7 @@
       </el-table-column>
       <el-table-column label="地址" align="center" prop="address" width="200px"/>
       <el-table-column label="店铺电话" align="center" prop="phone" width="120px"/>
-      <el-table-column label="资质证书" align="center" prop="licenseImages" width="100px">
+<!--      <el-table-column label="资质证书" align="center" prop="licenseImages" width="100px">
         <template slot-scope="scope">
           <el-popover
             placement="right"
@@ -98,7 +98,7 @@
             <img :src="scope.row.licenseImages" style="max-width: 150px;">
           </el-popover>
         </template>
-      </el-table-column>
+      </el-table-column>-->
       <el-table-column label="审核状态" align="center" prop="isAudit">
         <template slot-scope="scope">
           <dict-tag :options="isAuditOptions" :value="scope.row.isAudit"/>
@@ -121,6 +121,7 @@
           <el-button
             size="mini"
             type="text"
+            icon="el-icon-s-promotion"
             @click="handledetails(scope.row)"
           >
             <span v-if="scope.row.isAudit===0">审核</span>

+ 3 - 2
src/views/hisStore/store/index.vue

@@ -121,8 +121,8 @@
             placement="right"
             title=""
             trigger="hover">
-            <img slot="reference" :src="scope.row.logoUrl" width="80px">
-            <img :src="scope.row.logoUrl" style="max-width: 150px;">
+            <img slot="reference" :src="scope.row.logoUrl" width="80px" height="80px">
+            <img :src="scope.row.logoUrl" style="max-width: 160px;">
           </el-popover>
         </template>
       </el-table-column>
@@ -178,6 +178,7 @@
           <el-button
             size="mini"
             type="text"
+            icon="el-icon-s-promotion"
             @click="handledetails(scope.row)"
           >详情
           </el-button>