Merge branch 'bjcz_his_scrm' of http://1.14.104.71:10880/root/ylrz_his_scrm_adminUI into bjcz_his_scrm

src/views/hisStore/storePayment/index.vue

@@ -127,6 +127,16 @@
               />
         </el-select>
       </el-form-item>
+      <el-form-item label="所属小程序" prop="appId">
+        <el-select v-model="queryParams.appId" placeholder="请选择所属小程序" clearable size="small">
+          <el-option
+            v-for="dict in appMallOptions"
+            :key="dict.id"
+            :label="dict.name + '(' + dict.appid + ')'"
+            :value="dict.id"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item>
         <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -177,6 +187,7 @@
       <el-table-column label="所属公司" align="center" prop="companyName" />
       <el-table-column label="所属部门" align="center" prop="deptName" />
       <el-table-column label="员工" align="center" prop="companyUserNickName" />
+      <el-table-column label="所属小程序" align="center" prop="name" />
       <el-table-column label="状态" align="center" prop="status" >
           <template slot-scope="scope">
               <el-tag prop="status" v-for="(item, index) in statusOptions"    v-if="scope.row.status==item.dictValue">{{item.dictLabel}}</el-tag>
@@ -294,6 +305,7 @@
 <script>
 import { refundStorePayment,listStorePayment, getStorePayment, delStorePayment, addStorePayment, updateStorePayment, exportStorePayment,setPayNotify } from "@/api/hisStore/storePayment";
 import { getCompanyList } from "@/api/company/company";
+import {list as getAppMallOptions} from '@/api/course/coursePlaySourceConfig';
 export default {
   name: "HisStorePayment",
   data() {
@@ -370,12 +382,14 @@ export default {
         deptId: null,
         bankTransactionId:null,
         companyUserNickName:null,
+        appId:null,
       },
       // 表单参数
       form: {},
       // 表单校验
       rules: {
-      }
+      },
+      appMallOptions:[],
     };
   },
   created() {
@@ -387,6 +401,8 @@ export default {
         this.companys = response.data;
       });
     this.getList();
+    // 获取小程序选项列表
+    this.getAppMallOptions();
   },
   methods: {
     submitPayNotifyForm(){
@@ -457,7 +473,7 @@ export default {
         this.storePaymentList = response.rows;
         this.total = response.total;
         this.loading = false;
-        
+
         // 从后端返回的ext字段中获取统计信息
         if (response.ext) {
           this.totalPayMoney = parseFloat(response.ext.totalPaymentAmount) || 0;
@@ -566,15 +582,21 @@ export default {
     handleExport() {
       const queryParams = this.queryParams;
       this.$confirm('是否确认导出所有支付明细数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return exportStorePayment(queryParams);
-        }).then(response => {
-          this.download(response.msg);
-        }).catch(function() {});
-    }
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function() {
+        return exportStorePayment(queryParams);
+      }).then(response => {
+        this.download(response.msg);
+      }).catch(function() {});
+    },
+    // 获取小程序选项列表
+    getAppMallOptions() {
+      getAppMallOptions({pageNum:1,pageSize:100,isMall:1}).then(response => {
+        this.appMallOptions = response.rows;
+      })
+    },
   }
 };
 </script>