Browse Source

fix: #财务管理 - 用户资金明细:查询数据

loki 3 years ago
parent
commit
e4de0d3173

+ 1 - 1
.env.development

@@ -3,7 +3,7 @@ ENV = 'development'
 
 # base api
 # VUE_APP_BASE_API = 'http://127.0.0.1:18080'
-VUE_APP_BASE_API = 'https://430jy.uutime.cn/yxl-back-end/'
+VUE_APP_BASE_API = 'https://430jy.uutime.cn/'
 VUE_APP_API_TIMEOUT = 30000
 
 

+ 6 - 2
src/components/DataSelect.vue

@@ -2,9 +2,9 @@
   <el-select v-model="newValue" placeholder="请选择">
     <el-option
       v-for="item in options"
-      :key="item.value"
+      :key="item[valueKay]"
       :label="item.label"
-      :value="item.value"
+      :value="item[valueKay]"
     >
     </el-option>
   </el-select>
@@ -23,6 +23,10 @@ export default {
     params: {
       type: String,
       default: ''
+    },
+    valueKay: {
+      type: String,
+      default: 'value'
     }
   },
 

+ 4 - 1
src/const/dictType.js

@@ -1 +1,4 @@
-export default { BANNER_TYPE: 'BANNER_TYPE' };
+export default {
+  BANNER_TYPE: 'BANNER_TYPE',
+  INTEGRAL_CASH_TYPE: 'INTEGRAL_CASH_TYPE'
+};

+ 1 - 0
src/containers/ToolbarContainer.vue

@@ -87,6 +87,7 @@
               v-model="form[field.name]"
               :params="field.params"
               :props="field.props"
+              :valueKay="field.valueKay"
               :clearable="true"
             ></DataSelect>
             <ActivitySelect

+ 6 - 2
src/views/financialManagement/cashDetail/toolbar.vue

@@ -3,6 +3,8 @@
 </template>
 
 <script>
+import TYPE from '@/const/type';
+
 export default {
   name: 'CashDetailToolbar',
 
@@ -10,9 +12,11 @@ export default {
     return {
       fields: [
         {
-          type: 'select',
+          type: 'DataSelect',
           name: 'displayText',
-          label: '展示文案'
+          label: '展示文案',
+          params: this.$dict.INTEGRAL_CASH_TYPE,
+          valueKay: 'label'
         }
       ]
     };