1

src/router/index.js

@@ -172,12 +172,6 @@ const fwjg = [
     meta: { title: '政策服务-审核管理' },
     component: () => import('../views/adminCenter/reward/detail.vue'),
   },
-  {
-    path: '/adminCenter/reward/result',
-    name: 'admin_reward_result',
-    meta: { title: '政策服务-审核结果查看' },
-    component: () => import('../views/adminCenter/reward/result.vue'),
-  },
   // 服务机构-兑付管理
   // 创新券
   {

src/views/adminCenter/company/declare/detail.vue

@@ -9,13 +9,23 @@
           <el-col :span="24" class="down">
             <el-form :model="form" :rules="rules" ref="form" label-width="100px">
               <el-col :span="24" class="name">
-                <el-form-item label="企业名称" prop="name">
-                  <el-input v-model="form.name" disabled></el-input>
+                <el-form-item label="申请单位" prop="company">
+                  <el-input v-model="form.company" disabled></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="24" class="name">
+                <el-form-item label="申请人" prop="apply_person">
+                  <el-input v-model="form.apply_person"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="24" class="name">
+                <el-form-item label="联系电话" prop="phone">
+                  <el-input v-model="form.phone"></el-input>
                 </el-form-item>
               </el-col>
               <one :form="form"></one>
               <two :form="form"></two>
-              <thr :form="form" v-if="status == '1'"></thr>
+              <thr :form="form" v-if="status == '1' || status == '2'"></thr>
               <el-col :span="24" class="formBtn">
                 <el-button type="danger" size="mini" @click="back">取消申请</el-button>
                 <el-button type="primary" size="mini" @click="onSubmit('form')">提交申请</el-button>
@@ -68,7 +78,9 @@ export default {
         if (this.$checkRes(res)) {
           let data = {
             user_id: res.data.id,
-            name: res.data.name,
+            company: res.data.name,
+            apply_person: res.data.companyperson,
+            phone: res.data.phone,
             qyfr: [],
             yyzz: [],
             qylr: [],
@@ -125,7 +137,7 @@ export default {
       }
       return res;
     },
-    // 企业准备订单
+    // 企业信息资料
     twoMap() {
       let data = _.cloneDeep(this.form);
       const arr = ['qyfr1', 'yyzz1', 'qylr1'];
@@ -164,7 +176,8 @@ export default {
     searchStatus(data) {
       if (data == '0') return '0';
       else if (data == '-1') return '0';
-      else if (data == '1') return '1';
+      else if (data == '1') return '2';
+      else if (data == '2') return '2';
     },
     // 返回
     back() {

src/views/adminCenter/company/declare/index.vue

@@ -7,6 +7,11 @@
             <template #selfbtn>
               <el-button type="primary" size="mini" @click="toAdd">高企申报申请</el-button>
             </template>
+            <template #options="{ item }">
+              <template v-if="item.prop === 'medium_id'">
+                <el-option v-for="(i, index) in mediumList" :key="`coupons-${index}`" :label="i.name" :value="i.id"></el-option>
+              </template>
+            </template>
           </data-table>
         </el-col>
       </el-col>
@@ -15,10 +20,11 @@
 </template>
 
 <script>
-const { declareStatus } = require('@common/dict/index');
+const { iscashing, declareStatus } = require('@common/dict/couindex');
 const moment = require('moment');
 import { mapState, createNamespacedHelpers } from 'vuex';
 const { mapActions: declare } = createNamespacedHelpers('declare');
+const { mapActions: mechanism } = createNamespacedHelpers('mechanism');
 export default {
   name: 'index',
   props: {},
@@ -29,37 +35,75 @@ export default {
       total: 0,
       opera: [
         {
-          label: '查看',
+          label: '查看详情',
           method: 'view',
         },
         {
-          label: '编辑申请',
+          label: '重申',
+          method: 'edit',
+          display: (item) => {
+            return item.status == '-1';
+          },
+        },
+        {
+          label: '上传合同',
           method: 'edit',
           display: (item) => {
-            return item.status == '-1' || item.status == '1';
+            return item.status == '1' || item.status == '2';
+          },
+        },
+        {
+          label: '我要兑付',
+          method: 'cashing',
+          display: (item) => {
+            return item.status == '3';
           },
         },
       ],
       fields: [
-        { label: '申报企业', prop: 'name', filter: true },
-        { label: '申报时间', prop: 'meta.createdAt', format: (i) => moment(i).format('YYYY-MM-DD HH:mm:ss') },
+        { label: '申请单位', prop: 'company', filter: 'input' },
+        { label: '申请人', prop: 'apply_person', filter: 'input' },
+        { label: '联系电话', prop: 'phone', filter: 'input' },
         {
-          label: '申领状态',
+          label: '中介机构',
+          prop: 'medium_id',
+          filter: 'input',
+          filter: 'select',
+          format: (i) => {
+            const r = this.mediumList.find((f) => f.id === i);
+            if (r) return r.name;
+            else return '';
+          },
+        },
+        {
+          label: '是否兑付',
+          prop: 'is_cashing',
+          format: (i) => {
+            const r = iscashing.find((f) => f.value === i);
+            if (r) return r.label;
+            else return '';
+          },
+        },
+        {
+          label: '审核状态',
           prop: 'status',
           format: (i) => {
             const r = declareStatus.find((f) => f.value === i);
             if (r) return r.label;
-            return '未知状态';
+            else return '';
           },
         },
       ],
+      // 中介列表
+      mediumList: [],
     };
   },
-  async created() {
-    await this.search();
+  created() {
+    this.search();
   },
   methods: {
     ...declare(['query']),
+    ...mechanism({ mechanismQuery: 'query' }),
     // 查询
     async search({ skip = 0, limit = 10, ...info } = {}) {
       info.user_id = this.user.id;
@@ -68,16 +112,20 @@ export default {
         this.$set(this, `list`, res.data);
         this.$set(this, `total`, res.total);
       }
+      res = await this.mechanismQuery();
+      if (this.$checkRes(res)) {
+        this.$set(this, `mediumList`, res.data);
+      }
     },
     // 添加
     toAdd() {
       this.$router.push({ path: '/adminCenter/company/declare/detail' });
     },
-    // 查看资料
+    // 查看申请详情
     toView({ data }) {
       this.$router.push({ path: '/adminCenter/company/declare/info', query: { id: data._id, status: data.status } });
     },
-    // 修改申请
+    // 重申
     toEdit({ data }) {
       this.$router.push({ path: '/adminCenter/company/declare/detail', query: { id: data._id, status: data.status } });
     },

src/views/adminCenter/company/declare/info.vue

@@ -56,7 +56,7 @@
               <el-col :span="24" class="left"> 审核意见：</el-col>
               <el-col :span="24" class="right desc">
                 <el-timeline>
-                  <el-timeline-item v-for="(item, index) in data.record" :key="index" :timestamp="item.create_time" placement="top" type="success">
+                  <el-timeline-item v-for="(item, index) in data.record" :key="index" :timestamp="item.desc_time" placement="top" type="success">
                     <el-card>
                       <p>审核状态：{{ getStatus(item.status) || '暂无' }}</p>
                       <p>审核意见：{{ item.desc || '暂无' }}</p>
@@ -73,7 +73,7 @@
 </template>
 
 <script>
-const { declareStatus } = require('@common/dict/index');
+const { declareStatus } = require('@common/dict/couindex');
 const moment = require('moment');
 import { mapState, createNamespacedHelpers } from 'vuex';
 const { mapActions: declare } = createNamespacedHelpers('declare');

src/views/adminCenter/company/declare/parts/one.vue

@@ -1,27 +1,25 @@
 <template>
   <div id="one">
-    <el-row>
-      <el-col :span="24" class="main">
-        <el-col :span="24" class="one">
-          <el-col :span="24" class="down_1text"><span>企业资质资料</span></el-col>
-          <el-col :span="24" class="file">
-            <el-form-item label="法人复印件" prop="qyfr">
-              <e-upload url="/files/cysci/qyfr_file/upload" :limit="1" v-model="form.qyfr" type="text"></e-upload>
-            </el-form-item>
-          </el-col>
-          <el-col :span="24" class="file">
-            <el-form-item label="企业营业执照" prop="yyzz">
-              <e-upload url="/files/cysci/yyzz_file/upload" :limit="1" v-model="form.yyzz" type="text"></e-upload>
-            </el-form-item>
-          </el-col>
-          <el-col :span="24" class="file">
-            <el-form-item label="企业利润表" prop="qylr">
-              <e-upload url="/files/cysci/qylr_file/upload" :limit="1" v-model="form.qylr" type="text"></e-upload>
-            </el-form-item>
-          </el-col>
+    <el-col :span="24" class="main">
+      <el-col :span="24" class="one">
+        <el-col :span="24" class="down_1text"><span>企业资质资料</span></el-col>
+        <el-col :span="24" class="file">
+          <el-form-item label="法人复印件" prop="qyfr">
+            <e-upload url="/files/cysci/qyfr_file/upload" :limit="1" v-model="form.qyfr" type="text"></e-upload>
+          </el-form-item>
+        </el-col>
+        <el-col :span="24" class="file">
+          <el-form-item label="企业营业执照" prop="yyzz">
+            <e-upload url="/files/cysci/yyzz_file/upload" :limit="1" v-model="form.yyzz" type="text"></e-upload>
+          </el-form-item>
+        </el-col>
+        <el-col :span="24" class="file">
+          <el-form-item label="企业利润表" prop="qylr">
+            <e-upload url="/files/cysci/qylr_file/upload" :limit="1" v-model="form.qylr" type="text"></e-upload>
+          </el-form-item>
         </el-col>
       </el-col>
-    </el-row>
+    </el-col>
   </div>
 </template>
 

src/views/adminCenter/company/declare/parts/thr.vue

@@ -1,24 +1,22 @@
 <template>
   <div id="thr">
-    <el-row>
-      <el-col :span="24" class="main">
-        <el-col :span="24" class="one">
-          <el-col :span="24" class="down_1text"><span>合同资料上传</span></el-col>
-          <el-col :span="24" class="file">
-            <el-form-item label="上传合同" prop="contract">
-              <e-upload
-                url="/files/cysci/contract_file/upload"
-                :limit="2"
-                v-model="form.contract"
-                type="text"
-                :remove="fileRemove"
-                :extra="{ user_id: user._id }"
-              ></e-upload>
-            </el-form-item>
-          </el-col>
+    <el-col :span="24" class="main">
+      <el-col :span="24" class="one">
+        <el-col :span="24" class="down_1text"><span>合同资料上传</span></el-col>
+        <el-col :span="24" class="file">
+          <el-form-item label="上传合同" prop="contract">
+            <e-upload
+              url="/files/cysci/contract_file/upload"
+              :limit="2"
+              v-model="form.contract"
+              type="text"
+              :remove="fileRemove"
+              :extra="{ user_id: user._id }"
+            ></e-upload>
+          </el-form-item>
         </el-col>
       </el-col>
-    </el-row>
+    </el-col>
   </div>
 </template>
 

src/views/adminCenter/company/declare/parts/two.vue

@@ -1,34 +1,32 @@
 <template>
   <div id="two">
-    <el-row>
-      <el-col :span="24" class="main">
-        <el-col :span="24" class="one">
-          <el-col :span="24" class="down_1text"><span>企业准备订单</span></el-col>
-          <el-col :span="24" class="file">
-            <el-form-item label="选择中介">
-              <el-select v-model="form.mechanism_id" placeholder="">
-                <el-option v-for="item in mechanismList" :key="item.id" :label="item.name" :value="item.id"> </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="24" class="file">
-            <el-form-item label="法人复印件" prop="qyfr1">
-              <e-upload url="/files/cysci/qyfr1_file/upload" :limit="1" v-model="form.qyfr1" type="text"></e-upload>
-            </el-form-item>
-          </el-col>
-          <el-col :span="24" class="file">
-            <el-form-item label="企业营业执照" prop="yyzz1">
-              <e-upload url="/files/cysci/yyzz1_file/upload" :limit="1" v-model="form.yyzz1" type="text"></e-upload>
-            </el-form-item>
-          </el-col>
-          <el-col :span="24" class="file">
-            <el-form-item label="企业利润表" prop="qylr1">
-              <e-upload url="/files/cysci/qylr1_file/upload" :limit="1" v-model="form.qylr1" type="text"></e-upload>
-            </el-form-item>
-          </el-col>
+    <el-col :span="24" class="main">
+      <el-col :span="24" class="one">
+        <el-col :span="24" class="down_1text"><span>企业信息资料</span></el-col>
+        <el-col :span="24" class="file">
+          <el-form-item label="选择中介">
+            <el-select v-model="form.medium_id" placeholder="">
+              <el-option v-for="item in mechanismList" :key="item.id" :label="item.name" :value="item.id"> </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="24" class="file">
+          <el-form-item label="法人复印件" prop="qyfr1">
+            <e-upload url="/files/cysci/qyfr1_file/upload" :limit="1" v-model="form.qyfr1" type="text"></e-upload>
+          </el-form-item>
+        </el-col>
+        <el-col :span="24" class="file">
+          <el-form-item label="企业营业执照" prop="yyzz1">
+            <e-upload url="/files/cysci/yyzz1_file/upload" :limit="1" v-model="form.yyzz1" type="text"></e-upload>
+          </el-form-item>
+        </el-col>
+        <el-col :span="24" class="file">
+          <el-form-item label="企业利润表" prop="qylr1">
+            <e-upload url="/files/cysci/qylr1_file/upload" :limit="1" v-model="form.qylr1" type="text"></e-upload>
+          </el-form-item>
         </el-col>
       </el-col>
-    </el-row>
+    </el-col>
   </div>
 </template>
 

src/views/adminCenter/company/reward/detail.vue

@@ -19,8 +19,8 @@
                 </el-form-item>
               </el-col>
               <el-col :span="12" class="text">
-                <el-form-item label="申请人" prop="apply_personal">
-                  <el-input v-model="form.apply_personal" placeholder=""></el-input>
+                <el-form-item label="申请人" prop="apply_person">
+                  <el-input v-model="form.apply_person" placeholder=""></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="12" class="text">
@@ -82,7 +82,7 @@ export default {
         let data = {
           user_id: res.data.id,
           company: res.data.name,
-          apply_personal: res.data.companyperson,
+          apply_person: res.data.companyperson,
           phone: res.data.phone,
           type: this.type,
           qyfr: [],

src/views/adminCenter/company/reward/index.vue

@@ -3,9 +3,9 @@
     <el-row>
       <el-col :span="24" class="main">
         <el-col :span="24" class="one">
-          <data-table :fields="fields" :opera="opera" :data="list" :total="total" @query="search" @view="toView" @pay="toPay">
+          <data-table :fields="fields" :opera="opera" :data="list" :total="total" @query="search" @view="toView">
             <template #selfbtn>
-              <el-button type="primary" size="mini" @click="toAdd">添加</el-button>
+              <el-button type="primary" size="mini" @click="toAdd">{{ type }}申请</el-button>
             </template>
           </data-table>
         </el-col>
@@ -15,7 +15,7 @@
 </template>
 
 <script>
-const { rewardStatus } = require('@common/dict/index');
+const { iscashing, rewardStatus } = require('@common/dict/couindex');
 import { mapState, createNamespacedHelpers } from 'vuex';
 const { mapActions: reward } = createNamespacedHelpers('reward');
 export default {
@@ -28,15 +28,12 @@ export default {
       total: 0,
       opera: [
         {
-          label: '查看结果',
+          label: '查看详情',
           method: 'view',
-          display: (item) => {
-            return item.status == '1' || item.status == '-1';
-          },
         },
         {
           label: '我要兑付',
-          method: 'pay',
+          method: 'cashing',
           display: (item) => {
             return item.status == '1';
           },
@@ -44,16 +41,25 @@ export default {
       ],
       fields: [
         { label: '申领类型', prop: 'type' },
-        { label: '申领企业', prop: 'company', filter: 'input' },
-        { label: '申请人', prop: 'apply_personal', filter: 'input' },
+        { label: '申请单位', prop: 'company', filter: 'input' },
+        { label: '申请人', prop: 'apply_person', filter: 'input' },
         { label: '联系电话', prop: 'phone', filter: 'input' },
+        {
+          label: '是否兑付',
+          prop: 'is_cashing',
+          format: (i) => {
+            const r = iscashing.find((f) => f.value === i);
+            if (r) return r.label;
+            else return '';
+          },
+        },
         {
           label: '审核状态',
           prop: 'status',
           format: (i) => {
             const r = rewardStatus.find((f) => f.value === i);
             if (r) return r.label;
-            return '未知状态';
+            else return '';
           },
         },
       ],
@@ -71,18 +77,18 @@ export default {
         this.$set(this, `total`, res.total);
       }
     },
-    // 申领
+    // 申请
     toAdd() {
       this.$router.push({ path: '/adminCenter/company/reward/detail', query: { type: this.type } });
     },
-    // 查看结果
+    // 查看申请详情
     toView({ data }) {
       this.$router.push({ path: '/adminCenter/company/reward/result', query: { id: data.id, type: data.type } });
     },
-    // 我要兑付
-    toPay({ data }) {
-      this.$router.push({ path: '/adminCenter/company/reward/order', query: { id: data.id, type: data.type } });
-    },
+    // // 我要兑付
+    // toPay({ data }) {
+    //   this.$router.push({ path: '/adminCenter/company/reward/order', query: { id: data.id, type: data.type } });
+    // },
   },
   computed: {
     ...mapState(['user']),

src/views/adminCenter/company/reward/result.vue

@@ -8,6 +8,12 @@
           </el-col>
           <el-col :span="24" class="down">
             <el-form :model="form" ref="form" label-width="100px">
+              <el-col :span="24" class="text">
+                <el-col :span="2" class="left"> 申领类型</el-col>
+                <el-col :span="22" class="right">
+                  {{ form.type || '暂无' }}
+                </el-col>
+              </el-col>
               <el-col :span="24" class="text">
                 <el-col :span="2" class="left"> 申领单位</el-col>
                 <el-col :span="22" class="right">
@@ -17,7 +23,7 @@
               <el-col :span="24" class="text">
                 <el-col :span="2" class="left"> 申请人</el-col>
                 <el-col :span="22" class="right">
-                  {{ form.apply_personal || '暂无' }}
+                  {{ form.apply_person || '暂无' }}
                 </el-col>
               </el-col>
               <el-col :span="24" class="text">
@@ -83,7 +89,7 @@
 <script>
 const _ = require('lodash');
 const moment = require('moment');
-const { rewardStatus } = require('@common/dict/index');
+const { rewardStatus } = require('@common/dict/couindex');
 import { mapState, createNamespacedHelpers } from 'vuex';
 const { mapActions: reward } = createNamespacedHelpers('reward');
 export default {

src/views/adminCenter/declare/check.vue

@@ -10,9 +10,21 @@
           <el-col :span="24" class="down">
             <el-form :model="form" ref="form" label-width="100px">
               <el-col :span="24" class="text">
-                <el-col :span="2" class="left"> 企业名称：</el-col>
+                <el-col :span="2" class="left"> 申领单位：</el-col>
                 <el-col :span="22" class="right">
-                  {{ form.name }}
+                  {{ form.company }}
+                </el-col>
+              </el-col>
+              <el-col :span="24" class="text">
+                <el-col :span="2" class="left"> 申请人：</el-col>
+                <el-col :span="22" class="right">
+                  {{ form.apply_person }}
+                </el-col>
+              </el-col>
+              <el-col :span="24" class="text">
+                <el-col :span="2" class="left"> 联系电话：</el-col>
+                <el-col :span="22" class="right">
+                  {{ form.phone }}
                 </el-col>
               </el-col>
               <el-col :span="24" class="text">
@@ -50,7 +62,7 @@
               </el-col>
               <el-col :span="24" class="formBtn">
                 <el-button type="danger" size="mini" @click="back">取消保存</el-button>
-                <el-button type="primary" size="mini" @click="onSubmit('2')">高企申报确认</el-button>
+                <el-button type="primary" size="mini" @click="onSubmit('3')">高企申报确认</el-button>
               </el-col>
             </el-form>
           </el-col>

src/views/adminCenter/declare/flow.vue

@@ -46,7 +46,7 @@ export default {
       else return '未知步骤';
     },
     getTime(data) {
-      return moment(_.get(data, 'meta.createdAt')).format('YYYY-MM-DD HH:mm:ss');
+      return moment(_.get(data, 'desc_time')).format('YYYY-MM-DD HH:mm:ss');
     },
   },
   computed: {

src/views/adminCenter/declare/index.vue

@@ -3,7 +3,13 @@
     <el-row>
       <el-col :span="24" class="main">
         <el-col :span="24" class="one">
-          <data-table :fields="fields" :opera="opera" :data="list" :total="total" @query="search" @check="toCheck"> </data-table>
+          <data-table :fields="fields" :opera="opera" :data="list" :total="total" @query="search" @check="toCheck">
+            <template #options="{ item }">
+              <template v-if="item.prop === 'medium_id'">
+                <el-option v-for="(i, index) in mediumList" :key="`medium-${index}`" :label="i.name" :value="i.id"></el-option>
+              </template>
+            </template>
+          </data-table>
         </el-col>
       </el-col>
     </el-row>
@@ -11,10 +17,11 @@
 </template>
 
 <script>
+const { iscashing, declareStatus } = require('@common/dict/couindex');
 const moment = require('moment');
-const { declareStatus } = require('@common/dict/index');
 import { mapState, createNamespacedHelpers } from 'vuex';
 const { mapActions: declare } = createNamespacedHelpers('declare');
+const { mapActions: mechanism } = createNamespacedHelpers('mechanism');
 export default {
   name: 'index',
   props: {},
@@ -27,13 +34,37 @@ export default {
         {
           label: '申报确认',
           method: 'check',
+          display: (item) => {
+            return item.status == '2';
+          },
         },
       ],
       fields: [
-        { label: '企业', prop: 'name', filter: true },
-        { label: '申请时间', prop: 'meta.createdAt', format: (i) => moment(i).format('YYYY-MM-DD HH:mm:ss') },
+        { label: '申请单位', prop: 'company', filter: 'input' },
+        { label: '申请人', prop: 'apply_person', filter: 'input' },
+        { label: '联系电话', prop: 'phone', filter: 'input' },
+        {
+          label: '中介机构',
+          prop: 'medium_id',
+          filter: 'input',
+          filter: 'select',
+          format: (i) => {
+            const r = this.mediumList.find((f) => f.id === i);
+            if (r) return r.name;
+            else return '';
+          },
+        },
+        {
+          label: '是否兑付',
+          prop: 'is_cashing',
+          format: (i) => {
+            const r = iscashing.find((f) => f.value === i);
+            if (r) return r.label;
+            else return '';
+          },
+        },
         {
-          label: '状态',
+          label: '审核状态',
           prop: 'status',
           format: (i) => {
             const r = declareStatus.find((f) => f.value === i);
@@ -42,21 +73,29 @@ export default {
           },
         },
       ],
+      // 中介列表
+      mediumList: [],
     };
   },
   created() {
     this.search();
   },
   methods: {
-    ...declare(['query', 'delete']),
+    ...declare(['query']),
+    ...mechanism({ mechanismQuery: 'query' }),
+    // 查询
     async search({ skip = 0, limit = 10, ...info } = {}) {
-      info.status = '1';
-      const res = await this.query({ skip, limit, ...info });
+      let res = await this.query({ skip, limit, ...info });
       if (this.$checkRes(res)) {
         this.$set(this, `list`, res.data);
         this.$set(this, `total`, res.total);
       }
+      res = await this.mechanismQuery();
+      if (this.$checkRes(res)) {
+        this.$set(this, `mediumList`, res.data);
+      }
     },
+    // 申报确认
     toCheck({ data }) {
       this.$router.push({ path: '/adminCenter/declare/check', query: { id: data._id, status: data.status } });
     },
@@ -68,7 +107,7 @@ export default {
     return { title: this.$route.meta.title };
   },
   watch: {
-    status: {
+    test: {
       deep: true,
       immediate: true,
       handler(val) {},

src/views/adminCenter/inter/declare/detail.vue

@@ -10,9 +10,21 @@
           <el-col :span="24" class="down">
             <el-form :model="form" ref="form" label-width="100px">
               <el-col :span="24" class="text">
-                <el-col :span="2" class="left"> 企业名称：</el-col>
+                <el-col :span="2" class="left"> 申领企业：</el-col>
                 <el-col :span="22" class="right">
-                  {{ form.name }}
+                  {{ form.company }}
+                </el-col>
+              </el-col>
+              <el-col :span="24" class="text">
+                <el-col :span="2" class="left"> 申请人：</el-col>
+                <el-col :span="22" class="right">
+                  {{ form.apply_person }}
+                </el-col>
+              </el-col>
+              <el-col :span="24" class="text">
+                <el-col :span="2" class="left"> 联系电话：</el-col>
+                <el-col :span="22" class="right">
+                  {{ form.phone }}
                 </el-col>
               </el-col>
               <el-col :span="24" class="text">
@@ -86,7 +98,6 @@
 const _ = require('lodash');
 const moment = require('moment');
 import flow from './flow.vue';
-const { declareapplyStatus } = require('@common/dict/index');
 import { mapState, createNamespacedHelpers } from 'vuex';
 const { mapActions: declare } = createNamespacedHelpers('declare');
 export default {
@@ -99,7 +110,11 @@ export default {
     return {
       form: {},
       imgList: ['jpg', 'jpeg', 'png', 'bmp', 'gif'],
-      statusList: declareapplyStatus,
+      statusList: [
+        { label: '待审中', value: '0' },
+        { label: '通过', value: '1' },
+        { label: '拒绝', value: '-1' },
+      ],
       // 意见
       dialog: false,
     };
@@ -144,7 +159,7 @@ export default {
     },
     async toSave() {
       let data = this.form;
-      data.status = '1';
+      data.status = '2';
       const res = await this.update(data);
       if (this.$checkRes(res, '上传成功', res.errmsg || '上传失败')) {
         this.back();

src/views/adminCenter/inter/declare/index.vue

@@ -3,7 +3,7 @@
     <el-row>
       <el-col :span="24" class="main">
         <el-col :span="24" class="one">
-          <data-table :fields="fields" :opera="opera" :data="list" :total="total" @query="search" @edit="toEdit"> </data-table>
+          <data-table :fields="fields" :opera="opera" :data="list" :total="total" @edit="toEdit"> </data-table>
         </el-col>
       </el-col>
     </el-row>
@@ -11,8 +11,8 @@
 </template>
 
 <script>
+const { iscashing, declareStatus } = require('@common/dict/couindex');
 const moment = require('moment');
-const { declareStatus } = require('@common/dict/index');
 import { mapState, createNamespacedHelpers } from 'vuex';
 const { mapActions: declare } = createNamespacedHelpers('declare');
 export default {
@@ -27,13 +27,33 @@ export default {
         {
           label: '审核',
           method: 'edit',
+          display: (item) => {
+            return item.status == '0';
+          },
+        },
+        {
+          label: '上传合同',
+          method: 'edit',
+          display: (item) => {
+            return item.status == '1';
+          },
         },
       ],
       fields: [
-        { label: '企业', prop: 'name', filter: true },
-        { label: '申请时间', prop: 'meta.createdAt', format: (i) => moment(i).format('YYYY-MM-DD HH:mm:ss') },
+        { label: '申请单位', prop: 'company', filter: 'input' },
+        { label: '申请人', prop: 'apply_person', filter: 'input' },
+        { label: '联系电话', prop: 'phone', filter: 'input' },
+        {
+          label: '是否兑付',
+          prop: 'is_cashing',
+          format: (i) => {
+            const r = iscashing.find((f) => f.value === i);
+            if (r) return r.label;
+            else return '';
+          },
+        },
         {
-          label: '状态',
+          label: '审核状态',
           prop: 'status',
           format: (i) => {
             const r = declareStatus.find((f) => f.value === i);
@@ -42,21 +62,24 @@ export default {
           },
         },
       ],
+      // 中介列表
+      mediumList: [],
     };
   },
-  created() {
-    console.log(this.user);
-  },
+  created() {},
   methods: {
-    ...declare(['query', 'delete']),
+    ...declare(['query']),
+    // 查询
     async search({ skip = 0, limit = 10, ...info } = {}) {
       info.status = this.status;
-      const res = await this.query({ skip, limit, ...info });
+      info.medium_id = this.user.id;
+      let res = await this.query({ skip, limit, ...info });
       if (this.$checkRes(res)) {
         this.$set(this, `list`, res.data);
         this.$set(this, `total`, res.total);
       }
     },
+    // 审核
     toEdit({ data }) {
       this.$router.push({ path: '/adminCenter/inter/declare/detail', query: { id: data._id, status: data.status } });
     },

src/views/adminCenter/reward/detail.vue

@@ -23,7 +23,7 @@
               <el-col :span="24" class="text">
                 <el-col :span="2" class="left"> 申请人</el-col>
                 <el-col :span="22" class="right">
-                  {{ form.apply_personal }}
+                  {{ form.apply_person }}
                 </el-col>
               </el-col>
               <el-col :span="24" class="text">

src/views/adminCenter/reward/index.vue

@@ -3,7 +3,7 @@
     <el-row>
       <el-col :span="24" class="main">
         <el-col :span="24" class="one">
-          <data-table :fields="fields" :opera="opera" :data="list" :total="total" @query="search" @view="toView" @check="toCheck"> </data-table>
+          <data-table :fields="fields" :opera="opera" :data="list" :total="total" @query="search" @check="toCheck"> </data-table>
         </el-col>
       </el-col>
     </el-row>
@@ -11,7 +11,7 @@
 </template>
 
 <script>
-const { rewardStatus } = require('@common/dict/index');
+const { rewardStatus } = require('@common/dict/couindex');
 import { mapState, createNamespacedHelpers } from 'vuex';
 const { mapActions: reward } = createNamespacedHelpers('reward');
 export default {
@@ -23,13 +23,6 @@ export default {
       list: [],
       total: 0,
       opera: [
-        {
-          label: '查看结果',
-          method: 'view',
-          display: (item) => {
-            return item.status == '1' || item.status == '-1';
-          },
-        },
         {
           label: '审核',
           method: 'check',
@@ -41,7 +34,7 @@ export default {
       fields: [
         { label: '申领类型', prop: 'type' },
         { label: '申领企业', prop: 'company', filter: 'input' },
-        { label: '申请人', prop: 'apply_personal', filter: 'input' },
+        { label: '申请人', prop: 'apply_person', filter: 'input' },
         { label: '联系电话', prop: 'phone', filter: 'input' },
         {
           label: '审核状态',
@@ -70,10 +63,6 @@ export default {
     toCheck({ data }) {
       this.$router.push({ path: '/adminCenter/reward/detail', query: { id: data.id, type: data.type } });
     },
-    // 查看结果
-    toView({ data }) {
-      this.$router.push({ path: '/adminCenter/reward/result', query: { id: data.id, type: data.type } });
-    },
   },
   computed: {
     ...mapState(['user']),

src/views/adminCenter/reward/result.vue

@@ -1,189 +0,0 @@
-<template>
-  <div id="result">
-    <el-row>
-      <el-col :span="24" class="main">
-        <el-col :span="24" class="one">
-          <el-col :span="24" class="top">
-            <el-button type="primary" size="mini" @click="back">返回</el-button>
-          </el-col>
-          <el-col :span="24" class="down">
-            <el-form :model="form" ref="form" label-width="100px">
-              <el-col :span="24" class="text">
-                <el-col :span="2" class="left"> 申领单位</el-col>
-                <el-col :span="22" class="right">
-                  {{ form.company || '暂无' }}
-                </el-col>
-              </el-col>
-              <el-col :span="24" class="text">
-                <el-col :span="2" class="left"> 申请人</el-col>
-                <el-col :span="22" class="right">
-                  {{ form.apply_personal || '暂无' }}
-                </el-col>
-              </el-col>
-              <el-col :span="24" class="text">
-                <el-col :span="2" class="left"> 联系电话</el-col>
-                <el-col :span="22" class="right">
-                  {{ form.phone || '暂无' }}
-                </el-col>
-              </el-col>
-              <el-col :span="24" class="text">
-                <el-col :span="2" class="left"> 法人复印件：</el-col>
-                <el-col :span="20" class="right">
-                  <el-col :span="4" v-for="(i, index) in form.qyfr" :key="`medium_material-${index}`">
-                    <img v-if="isImg(i.url)" :src="i.url" width="150px" height="150px" @click="toOpen(i.url)" />
-                    <el-link v-else type="primary" @click="toOpen(i.url)"> <i class="el-icon-view"></i> {{ i.name }} </el-link>
-                  </el-col>
-                </el-col>
-              </el-col>
-              <el-col :span="24" class="text">
-                <el-col :span="2" class="left"> 企业营业执照：</el-col>
-                <el-col :span="20" class="right">
-                  <el-col :span="4" v-for="(i, index) in form.yyzz" :key="`medium_material-${index}`">
-                    <img v-if="isImg(i.url)" :src="i.url" width="150px" height="150px" @click="toOpen(i.url)" />
-                    <el-link v-else type="primary" @click="toOpen(i.url)"> <i class="el-icon-view"></i> {{ i.name }} </el-link>
-                  </el-col>
-                </el-col>
-              </el-col>
-              <el-col :span="24" class="text">
-                <el-col :span="2" class="left"> 企业利润表：</el-col>
-                <el-col :span="20" class="right">
-                  <el-col :span="4" v-for="(i, index) in form.qylr" :key="`medium_material-${index}`">
-                    <img v-if="isImg(i.url)" :src="i.url" width="150px" height="150px" @click="toOpen(i.url)" />
-                    <el-link v-else type="primary" @click="toOpen(i.url)"> <i class="el-icon-view"></i> {{ i.name }} </el-link>
-                  </el-col>
-                </el-col>
-              </el-col>
-              <el-col :span="24" class="text">
-                <el-col :span="2" class="left"> 审核状态：</el-col>
-                <el-col :span="22" class="right">
-                  {{ getStatus(form.status) }}
-                </el-col>
-              </el-col>
-              <el-col :span="24" class="text">
-                <el-col :span="24" class="left"> 审核意见：</el-col>
-                <el-col :span="24" class="right desc">
-                  <el-timeline>
-                    <el-timeline-item v-for="(item, index) in form.record" :key="index" :timestamp="item.desc_time" placement="top" type="success">
-                      <el-card>
-                        <p>审核状态：{{ getStatus(item.status) || '暂无' }}</p>
-                        <p>审核意见：{{ item.desc || '暂无' }}</p>
-                      </el-card>
-                    </el-timeline-item>
-                  </el-timeline>
-                </el-col>
-              </el-col>
-            </el-form>
-          </el-col>
-        </el-col>
-      </el-col>
-    </el-row>
-  </div>
-</template>
-
-<script>
-const _ = require('lodash');
-const moment = require('moment');
-const { rewardStatus } = require('@common/dict/index');
-import { mapState, createNamespacedHelpers } from 'vuex';
-const { mapActions: reward } = createNamespacedHelpers('reward');
-export default {
-  name: 'result',
-  props: {},
-  components: {},
-  data: function () {
-    return {
-      form: {},
-      imgList: ['jpg', 'jpeg', 'png', 'bmp', 'gif'],
-    };
-  },
-  created() {
-    if (this.id) this.search();
-  },
-  methods: {
-    ...reward(['fetch']),
-    async search() {
-      let res = await this.fetch(this.id);
-      if (this.$checkRes(res)) {
-        this.$set(this, `form`, res.data);
-      }
-    },
-    getStatus(i) {
-      const r = rewardStatus.find((f) => f.value === i);
-      if (r) return r.label;
-    },
-    back() {
-      this.$router.push({ path: '/adminCenter/reward', query: { type: this.type } });
-    },
-    isImg(url) {
-      const arr = url.split('.');
-      const suffix = _.last(arr);
-      return this.imgList.includes(suffix);
-    },
-    toOpen(url) {
-      window.open(url);
-    },
-  },
-  computed: {
-    ...mapState(['user']),
-    id() {
-      return this.$route.query.id;
-    },
-    type() {
-      return this.$route.query.type;
-    },
-  },
-  metaInfo() {
-    return { title: this.$route.meta.title };
-  },
-  watch: {
-    test: {
-      deep: true,
-      immediate: true,
-      handler(val) {},
-    },
-  },
-};
-</script>
-
-<style lang="less" scoped>
-.main {
-  border-radius: 10px;
-  box-shadow: 0 0 5px #cccccc;
-  padding: 20px;
-  .one {
-    .top {
-      text-align: right;
-      margin: 0 0 10px 0;
-    }
-    .down {
-      .text {
-        padding: 10px 0;
-        border-bottom: 1px dashed #333;
-        .left {
-          text-align: left;
-        }
-        .right {
-          img {
-            width: 200px;
-            height: 200px;
-            border: 1px solid #ccc;
-          }
-        }
-        .desc {
-          margin: 10px 0 0 0;
-        }
-      }
-      .file {
-        .file_title {
-          font-size: 16px;
-          font-weight: bold;
-          margin: 10px 0 0 0;
-        }
-      }
-    }
-  }
-}
-.main:hover {
-  box-shadow: 0 0 5px #409eff;
-}
-</style>