2022-11-2

src/styles/element-ui.scss

@@ -47,3 +47,26 @@
 .el-range-separator {
   box-sizing: content-box;
 }
+
+//层级选择
+.el-cascader-panel .el-radio {
+  width: 100%;
+  height: 100%;
+  z-index: 10;
+  position: absolute;
+  top: 10px;
+  right: 10px;
+}
+.el-cascader-panel .el-radio__input {
+  visibility: hidden;
+}
+.el-cascader-panel .el-cascader-node__postfix {
+  top: 10px;
+}
+
+
+.el-table__body-wrapper{
+
+  z-index:2
+
+}

src/views/finance/flow.vue

@@ -13,12 +13,12 @@
             >商家罚款
             </Button>
 
-            <Select v-model="select.merchantId" class="select" style="width:200px;margin-right: 10px;" :clearable="true"
+            <Select v-model="select.merchantId" class="select" style="width:160px;margin-right: 10px;" :clearable="true"
                     placeholder="所属商家" filterable
             >
-              <Option v-for="item in merchants" :value="item.id" :key="item.id">{{ item.username }}</Option>
+              <Option v-for="item in merchants" :value="item.id" :key="item.id">{{ item.name }}</Option>
             </Select>
-            <Select v-model="select.type" class="select" style="width:200px;margin-right: 10px;" :clearable="true"
+            <Select v-model="select.type" class="select" style="width:100px;margin-right: 10px;" :clearable="true"
                     placeholder="类型" filterable
             >
               <Option v-for="item in [{label:'佣金',value:'fee'},{label:'充值',value:'recharge'},{label:'退款',value:'fine'}]"
@@ -26,6 +26,7 @@
               >{{ item.label }}
               </Option>
             </Select>
+            <Input v-model="select.serial" style="width: 140px;margin-right: 10px;" clearable placeholder="请输入订单编号"/>
 
             <Button icon="ios-search" type="primary" style="margin-right: 10px;" @click="getFlow">搜索</Button>
             <Button icon="ios-repeat" type="primary" style="margin-right: 10px;"
@@ -67,7 +68,8 @@ export default {
         pageIndex: 1,
         pageSize: 10,
         merchantId: '',
-        type: ''
+        type: '',
+        serial:''
       },
 
       merchants: [],
@@ -82,6 +84,11 @@ export default {
           align: 'left',
           fixed:'left'
         },
+        {
+          prop:'order.serial',
+          label:'订单编号',
+          width: 150
+        },
         {
           prop: 'money',
           label: '金额',
@@ -118,7 +125,16 @@ export default {
   },
   methods: {
     downloadExel() {
-      download('/api/admin/finance/index', 'get', { is_export: 1 }, '财务流水.xlsx')
+      download(
+        '/api/admin/finance/index',
+        'get',
+        {
+          merchant_id: this.select.merchantId,
+          type: this.select.type,
+          serial: this.select.serial,
+          is_export: 1
+        },
+        '财务流水.xlsx')
     },
 
     pageChange(e) {
@@ -135,7 +151,8 @@ export default {
         page: this.select.pageIndex,
         page_size: this.select.pageSize,
         merchant_id: this.select.merchantId,
-        type: this.select.type
+        type: this.select.type,
+        serial: this.select.serial
       })
       this.list = res.data
       this.total = res.total

src/views/order/orderList.vue

@@ -36,7 +36,7 @@
                   <div class="select-content-item-label">订单状态</div>
                   <div>
                     <template v-for="(value,key) of orderStates">
-                      <el-tag size="small" :effect="select.orderStates == value ? 'dark' : 'plain'" @click="select.orderStates = value" style="margin-right: 6px;">{{value}}</el-tag>
+                      <el-tag size="small" :effect="select.orderStates.key === key ? 'dark' : 'plain'" @click="select.orderStates = {key,value}" style="margin-right: 6px;">{{value}}</el-tag>
                     </template>
                   </div>
                 </div>
@@ -61,7 +61,7 @@
                   </div>
                   <div v-if="select.orderStates">
                     <el-tag effect="light" size="small" closable @close="select.orderStates = ''">
-                      {{select.orderStates}}
+                      {{select.orderStates.value}}
                     </el-tag>
                   </div>
                 </div>
@@ -137,8 +137,7 @@ export default {
           prop: "order_name",
           label:"订单名称",
           width:340,
-          align:'left',
+          align:'left'
-          fixed:'left'
         },
         {
           prop:'bookable_name',
@@ -263,7 +262,8 @@ export default {
         page_size:this.select.pageSize,
         keyword:this.select.keyword,
         product_type_id:this.select.productType,
-        merchant_id:this.select.merchant.id
+        merchant_id:this.select.merchant.id,
+        order_state:this.select.orderStates.key
       })
       this.total = res.total
       this.list = res.rows
@@ -275,7 +275,17 @@ export default {
     },
 
     downloadExel(){
-      download('/api/admin/order/get-list','get',{is_export:1},'订单列表.xlsx')
+      download(
+        '/api/admin/order/get-list',
+        'get',
+        {
+          order_state:this.select.orderStates.key,
+          keyword:this.select.keyword,
+          product_type_id:this.select.productType,
+          merchant_id:this.select.merchant.id,
+          is_export:1
+        },
+        '订单列表.xlsx')
     }
   },
   mounted() {

src/views/productService/components/confinement/addClubPic.vue

@@ -2,6 +2,7 @@
   <div>
     <xy-dialog :is-show.sync="isShow" title="商户图片" ok-text="保存" @on-ok="submit">
       <el-upload
+        :multiple="true"
         class="upload-demo"
         :action="action"
         :before-upload="handleBefore"

src/views/productService/components/confinement/addProductPic.vue

@@ -2,6 +2,7 @@
   <div>
     <xy-dialog :is-show.sync="isShow" title="产品图片" ok-text="保存" @on-ok="submit">
       <el-upload
+        :multiple="true"
         class="upload-demo"
         :action="action"
         :before-upload="handleBefore"