Merge branch 'dev' of https://gitlab.33.cn/CassiniatSaturn/fns_backend into dev

src/components/productManage/productTable.vue

@@ -14,7 +14,7 @@
       <span slot="name" slot-scope="text">
         {{ text.inst_name }}-{{ text.product_name }}
       </span>
-      <template #product_type="text">
+      <template #loan_type="text">
         {{ text | filterLoanType }}
       </template>
       <span slot="date" slot-scope="text">
@@ -53,12 +53,6 @@
         <div v-if="record.product_status == eProductStatus.unpublished">
           <a @click="toAdd(record)">上架</a>
           <a-divider type="vertical" />
-          <a @click="toDelete(record)">删除</a>
-        </div>
-        <!-- 上架状态 -->
-        <div v-else>
-          <a @click="toRemove(record)">下架</a>
-          <a-divider type="vertical" />
           <a
             @click="
               $router.push({
@@ -69,6 +63,12 @@
             >编辑</a
           >
           <a-divider type="vertical" />
+          <a @click="toDelete(record)">删除</a>
+        </div>
+        <!-- 上架状态 -->
+        <div v-else>
+          <a @click="toRemove(record)">下架</a>
+          <a-divider type="vertical" />
           <a
             v-if="record.product_status == eProductStatus.normal"
             @click="setAsHot(record)"

src/components/productManage/topbar.vue

@@ -12,13 +12,14 @@
       :startTime="searchPageReqParams.startTime"
       :endTime="searchPageReqParams.endTime"
     />
-    <span class="mr-3">消息分类</span>
+    <span class="mr-3">产品分类</span>
     <a-select
       :default-value="productType[0]"
       style="width: 120px; margin-right: 10px"
       v-model="searchPageReqParams.type"
+      @change="handleChange"
     >
-      <a-select-option v-for="(type, i) in productType" :key="i">
+      <a-select-option v-for="(type, i) in productType" :key="i" :value="i">
         {{ type }}
       </a-select-option>
     </a-select>
@@ -64,7 +65,7 @@ export default Vue.extend({
     return {
       searchPageReqParams: {
         name: "",
-        type: "",
+        type: 0,
         startTime: undefined as undefined | number,
         endTime: undefined as undefined | number,
         offset: 0,
@@ -86,6 +87,9 @@ export default Vue.extend({
     },
   },
   methods: {
+    handleChange(val:any){
+      this.searchPageReqParams.type = val
+    },
     ...mapMutations('loanProductManagement', {
       productSave: 'save',
     }),
@@ -104,7 +108,7 @@ export default Vue.extend({
     },
     reset() {
       this.searchPageReqParams.name = "";
-      this.searchPageReqParams.type = "";
+      this.searchPageReqParams.type = 0;
       this.searchPageReqParams.startTime = undefined;
       this.searchPageReqParams.endTime = undefined;
       this.$nextTick(() => {

src/const/columns/productColumn.ts

@@ -13,8 +13,8 @@ export default[
   {
     title: '产品分类',
     align: 'center',
-    dataIndex: 'product_type',
-    scopedSlots: { customRender: 'product_type' },
+    dataIndex: 'loan_type',
+    scopedSlots: { customRender: 'loan_type' },
   },
   {
     title: '贷款期限（月）',

src/service/LoanProductService/index.ts

@@ -89,7 +89,7 @@ export default class LoanProductService {
       items: iLoanProdcutItem[]
       total: number
     }>({
-      url: prefix + '/list',
+      url: '/loan/query/direct/list',
       method: 'POST',
       data,
     })

src/store/LoanProductManagement/index.ts

@@ -30,7 +30,7 @@ export default <Module<iProductModuleState, {}>>{
       const ret = await LoanProductService.getInstance().queryDirectLoanReq({
         end_time: state.end_time as number,
         limit: state.limit,
-        loan_type: 0,
+        loan_type: state.loan_type,
         offset: state.offset as number,
         product_status: 0,
         start_time: state.start_time as number,

src/views/Root/OutletManagement/index.vue

 <template>
   <div>
+    <!-- <input type="file" @input="handleInput"/> -->
     <div v-if="showbranchFilter">
       <p class="text-2xl font-bold mb-5">网点管理</p>
       <div>
@@ -401,6 +402,12 @@ export default Vue.extend({
     }
   },
   methods: {
+    async handleInput(e: Event){
+      const ret = await handle建设银行excelFileChange(e)
+      StaffService.getInstance().import({
+        staffs: ret as any
+      })
+    },
     getLalo() {
       window.navigator.geolocation.getCurrentPosition((position) => {
         this.formData.la = position.coords.latitude.toString();

src/views/Root/Product/Loan/publish.vue

@@ -60,11 +60,11 @@
         </a-form-model-item>
         <a-form-model-item label="担保方式" :wrapper-col="{ span: 5 }">
           <a-select
-            :default-value="guaranteeType[0]"
             style="width: 120px; margin-right: 10px"
             @change="changeGuarantee"
+            v-model="form.guarantee"
           >
-            <a-select-option v-for="(type, i) in guaranteeType" :key="i">
+            <a-select-option v-for="(type,i) in guaranteeType" :key="type" :value="i+1">
               {{ type }}
             </a-select-option>
           </a-select>

src/views/Root/index.vue

@@ -2,7 +2,7 @@
   <div>
     <a-layout id="components-layout-demo-fixed-sider">
       <a-layout-sider width="256" style="background: white">
-        <div class="text-center text-lg my-3">普惠金融后台</div>
+        <div class="text-center text-lg my-3">中小企业协会综合服务平台</div>
         <a-menu
           style="width: 256px"
           :open-keys.sync="openKeys"