[add] 工作组、普通项目缴费凭证，分标委详情

src/components/detailPage/FileList.vue

@@ -1,13 +1,12 @@
 <template>
   <div>
     <a-table
-      ref="table"
+      ref="fileTable"
       size="middle"
-      :rowKey="record => record.id || record.fileId"
       :columns="columns"
       :dataSource="dataSource"
       :pagination="false"
-      :loading="loading"
+      :loading="fileLoading"
       class="j-table-force-nowrap">
 
       <template slot="text" slot-scope="text">
@@ -59,11 +58,18 @@ const columns = [
 ]
 export default {
   name: 'FileList',
+  props: {
+    dataSource: {
+      type: Array,
+      default: () => {
+        return []
+      }
+    }
+  },
   data() {
     return {
       columns,
-      dataSource: [],
+      fileLoading: false
-      loading: false
     }
   },
   methods: {
@@ -72,7 +78,7 @@ export default {
      * @param record
      */
     handleDownload(record) {
-      downloadFile(`sys/common/download/${record.fileId}`, record.fileName)
+      downloadFile(`sys/common/download/${ record.fileId }`, record.fileName)
     },
     /**
      * 预览
@@ -80,8 +86,8 @@ export default {
      */
     preview(record) {
       if (record && record.fileId) {
-        const fileFullUrl = `${window._CONFIG['domianWebSocketURL']}/sys/common/download/${record.fileId}?token=${Vue.ls.get(ACCESS_TOKEN)}&fullfilename=${record.fileName}`
+        const fileFullUrl = `${ window._CONFIG['domianWebSocketURL'] }/sys/common/download/${ record.fileId }?token=${ Vue.ls.get(ACCESS_TOKEN) }&fullfilename=${ record.fileName }`
-        let url = `${window._CONFIG['onlinePreviewDomainURL']}?url=${encodeURIComponent(fileFullUrl)}`
+        let url = `${ window._CONFIG['onlinePreviewDomainURL'] }?url=${ encodeURIComponent(fileFullUrl) }`
         // let url = `${window._CONFIG['onlinePreviewDomainURL']}?url=${encodeURIComponent(fileFullUrl)}`
         window.open(url)
       }

src/components/detailPage/MeetingList.vue

@@ -60,19 +60,19 @@ const columns = [
     align: 'center',
     width: 100,
     dataIndex: 'status_dictText',
-    scopedSlots: { customRender: 'project-approval' }
+    scopedSlots: { customRender: 'text' }
   }, {
     title: '报名状态',
     align: 'center',
     width: 100,
     dataIndex: 'createTime',
-    scopedSlots: { customRender: 'advice' }
+    scopedSlots: { customRender: 'text' }
   }, {
     title: '会议状态',
     align: 'center',
     width: 100,
     dataIndex: 'bankAccountName',
-    scopedSlots: { customRender: 'review-material' }
+    scopedSlots: { customRender: 'text' }
   }, {
     title: '操作',
     dataIndex: 'action',

src/config/router.config.js

@@ -385,5 +385,20 @@ export const routerData = [
     },
     name: 'council-detail-page',
     id: '12'
+  },
+  {
+    path: '/MessagePage/PaymentVoucher',
+    component: 'MessagePage/PaymentVoucher',
+    redirect: null,
+    hidden: true,
+    route: '1',
+    meta: {
+      icon: '', // 菜单前图标
+      componentName: 'PaymentVoucher',
+      keepAlive: false,
+      title: '缴费凭证' // 菜单名称
+    },
+    name: 'payment-voucher',
+    id: '13'
   }
 ]

src/utils/util.js

@@ -595,4 +595,39 @@ export function processingTimestamp(value) {
   minute = minute < 10 ? ('0' + minute) : minute
   second = second < 10 ? ('0' + second) : second
   return y + '-' + m + '-' + d + ' ' + h + ':' + minute + ':' + second
+}
+
+/**
+ * 补充0
+ * */
+
+export function addZero(e) {
+  // (e) => {e.target.value = e.target.value.replace(/[^0-9.]/g,'')}
+  // console.log(e.target.value)
+  // 判断是否包含 .
+  let value = e.target.value
+  // 判断是否有数据
+  if (value && value !== '') {
+    // 判断是否包含小数点
+    if (value.includes('.')) {
+      // 获取索引
+      let index = value.indexOf('.')
+      console.log('index', index)
+      // 小树点之前的数
+      let beforePointValue = value.slice(0, index + 1)
+      // 小数点之后的数字
+      let afterPointValue = value.slice(index + 1)
+      // 大于等于2
+      if (afterPointValue.length >= 2) {
+        e.target.value = beforePointValue + afterPointValue
+      } else {
+        // 不足2位补0
+        afterPointValue = afterPointValue.padEnd(2, '0')
+        e.target.value = beforePointValue + afterPointValue
+      }
+    } else {
+      // 不包括小数点
+      e.target.value = e.target.value + '.00'
+    }
+  }
 }

src/utils/validate.js

@@ -53,3 +53,13 @@ export function chineseReg(s){
 export function postcode(s) {
   return /^[0-9]\d{5}$/.test(s)
 }
+
+/**
+ * 金额格式，小数点后两位，整数部分十位
+ * /^[1-9](\d{1,10})?(\.\d{1,2})$|^0\.([1-9](\d{0,1})|\d[1-9])$|^[1-9]\d{1,10}$|^0$/ ---- 最初的正则，能输入十一位整数
+ * @param s
+ * @returns {boolean}
+ */
+export function money(s) {
+  return /^[-]?[0-9](\d{1,9})?(\.\d{1,2})$|^[-]?0\.([1-9](\d{0,1})|\d[1-9])$|^[-]?[1-9]\d{0,9}$|^0$/.test(s)
+}

src/views/MessagePage/PaymentVoucher.vue

@@ -0,0 +1,298 @@
+<template>
+  <div class="main-box">
+    <a-card :bordered="false">
+      <!--查询区域begin-->
+      <div class="table-page-search-wrapper">
+        <a-row :gutter="24">
+          <a-col :xl="12" :lg="8" :md="8" :sm="24">
+            <a-tooltip placement="topLeft">
+              <template slot="title">{{ $route.query.projectName }}</template>
+              <div class="project-title">
+                {{ $route.query.projectName }}
+              </div>
+            </a-tooltip>
+          </a-col>
+          <a-col :xl="6" :lg="8" :md="8" :sm="24">
+            <span>应付金额：{{  }}元</span>
+          </a-col>
+          <a-col :xl="6" :lg="8" :md="8" :sm="24">
+            <span>已付金额：{{  }}元</span>
+          </a-col>
+        </a-row>
+      </div>
+      <!--查询区域end-->
+
+      <!--    表格区域-->
+      <div class="table-box">
+        <a-table
+          ref="table"
+          rowKey="id"
+          :columns="columns"
+          :dataSource="dataSource"
+          :pagination="ipagination"
+          :loading="loading"
+          @change="handleTableChange"
+          class="j-table-force-nowrap">
+
+          <!--        项目名称-->
+          <template slot="projectName" slot-scope="text, record">
+            <j-ellipsis :value="text" :length="20" class="project-name" @click="openDetail(record)"></j-ellipsis>
+          </template>
+
+          <template slot="text" slot-scope="text, record">
+            <j-ellipsis :value="text" :length="20"></j-ellipsis>
+          </template>
+
+          <!--          打包、需要发票-->
+          <template v-slot:status-pack="{record, text}">
+            <status-slot :statu-obj="record" :status-no="text"></status-slot>
+          </template>
+          <!--            到账-->
+          <template v-slot:status="{record, text}">
+            <status-slot :statu-obj="record" :status-no="text" :status-type="true"></status-slot>
+          </template>
+          <!--            开票-->
+          <template v-slot:status-bill="{record, text}">
+            <status-slot :statu-obj="record" :status-no="text" :status-type="true" status-key="bill"></status-slot>
+          </template>
+          <!--            邮寄-->
+          <template v-slot:status-mail="{record, text}">
+            <status-slot :statu-obj="record" :status-no="text" :status-type="true" status-key="mail"></status-slot>
+          </template>
+
+          <!--          缴费凭证-->
+          <span slot="action" class="action-span-cell" slot-scope="text,record">
+            <a @click="paymentVoucher(record)">缴费凭证</a>
+          </span>
+        </a-table>
+      </div>
+      <!--    表格区域end-->
+      <!--      添加阶段按钮-->
+      <a-button type="primary" icon="plus" class="add-stage-btn" @click="addStage">添加阶段</a-button>
+
+      <div class="audit-info">
+        <div class="audit-info-title">审核信息</div>
+        <template v-if="auditInfo && auditInfo.length > 0">
+          <div class="audit-info-item-box" v-for="(item, index) in auditInfo" :key="index">
+            <a-row :gutter="15">
+              <a-col :span="8">
+                <div class="audit-info-item">
+                  <span class="audit-info-item-title">申请人：</span>
+                  <span class="audit-info-item-content">{{  }}</span>
+                </div>
+              </a-col>
+              <a-col :span="8">
+                <div class="audit-info-item">
+                  <span class="audit-info-item-title">申请时间：</span>
+                  <span class="audit-info-item-content">{{  }}</span>
+                </div>
+              </a-col>
+              <a-col :span="8">
+                <div class="audit-info-item">
+                  <span class="audit-info-item-title">缴费金额：</span>
+                  <span class="audit-info-item-content">{{  }}</span>
+                </div>
+              </a-col>
+            </a-row>
+            <a-row :gutter="15">
+              <a-col :span="8">
+                <div class="audit-info-item">
+                  <span class="audit-info-item-title">缴费日期：</span>
+                  <span class="audit-info-item-content">{{  }}</span>
+                </div>
+              </a-col>
+              <a-col :span="8">
+                <div class="audit-info-item">
+                  <span class="audit-info-item-title">缴费凭证：</span>
+                  <img class="audit-info-img" src="">
+                </div>
+              </a-col>
+              <a-col :span="8">
+                <div class="audit-info-item">
+                  <span class="audit-info-item-title">审核结果：</span>
+                  <span class="audit-info-item-content">{{  }}</span>
+                </div>
+              </a-col>
+            </a-row>
+            <a-row :gutter="15">
+              <a-col :span="8">
+                <div class="audit-info-item">
+                  <span class="audit-info-item-title">审核人：</span>
+                  <span class="audit-info-item-content">{{  }}</span>
+                </div>
+              </a-col>
+              <a-col :span="8">
+                <div class="audit-info-item">
+                  <span class="audit-info-item-title">审核时间：</span>
+                  <span class="audit-info-item-content">{{  }}</span>
+                </div>
+              </a-col>
+              <a-col :span="8">
+                <div class="audit-info-item">
+                  <span class="audit-info-item-title">说明：</span>
+                  <span class="audit-info-item-content">{{  }}</span>
+                </div>
+              </a-col>
+            </a-row>
+          </div>
+        </template>
+        <a-list :data-source="[]" v-else></a-list>
+      </div>
+    </a-card>
+
+    <payment-voucher-modal ref="stageModal" @ok="modalFormOk"></payment-voucher-modal>
+  </div>
+
+</template>
+
+<script>
+import { JeroListMixin } from '@/mixins/JeroListMixin'
+import PaymentVoucherModal from '@views/MessagePage/modules/PaymentVoucherModal'
+
+const columns = [
+  {
+    title: '阶段',
+    dataIndex: 'chargeProject',
+    align: 'center',
+    scopedSlots: { customRender: 'text' }
+  }, {
+    title: '缴费金额',
+    dataIndex: 'principalName',
+    align: 'center',
+    scopedSlots: { customRender: 'text' }
+  }, {
+    title: '缴费凭证',
+    dataIndex: 'principalPhone',
+    align: 'center',
+    scopedSlots: { customRender: 'img' }
+  }, {
+    title: '申请人',
+    dataIndex: 'principalMail',
+    align: 'center',
+    scopedSlots: { customRender: 'text' }
+  }, {
+    title: '申请日期',
+    dataIndex: 'createTime',
+    align: 'center',
+    scopedSlots: { customRender: 'text' }
+  }, {
+    title: '状态',
+    dataIndex: 'status',
+    align: 'center',
+    scopedSlots: { customRender: 'text' }
+  }, {
+    title: '操作',
+    dataIndex: 'action',
+    align: 'center',
+    scopedSlots: { customRender: 'action' }
+  }
+]
+
+export default {
+  name: 'PaymentVoucher',
+  components: { PaymentVoucherModal },
+  mixins: [JeroListMixin],
+  data() {
+    return {
+      columns,
+      // 审核信息
+      auditInfo: [],
+      url: {
+        list: ''
+      }
+    }
+  },
+  methods: {
+    loadData(arg) {
+      if (!this.url.list) {
+        this.$message.error('请设置url.list属性!')
+        return
+      }
+      //加载数据 若传入参数1则加载第一页的内容
+      if (arg === 1) {
+        this.ipagination.current = 1
+      }
+      var params = this.getQueryParams()//查询条件
+      this.loading = true
+      this.getAction(this.url.list, params).then((res) => {
+        if (res.success) {
+          //update-begin---author:zhangyafei    Date:20201118  for：适配不分页的数据列表------------
+          this.dataSource = res.result.records || res.result
+          if (res.result.total) {
+            this.ipagination.total = res.result.total
+            //清空列表选中
+            this.onClearSelected()
+          } else {
+            this.ipagination.total = 0
+          }
+          //update-end---author:zhangyafei    Date:20201118  for：适配不分页的数据列表------------
+        }
+        if (res.code === 510) {
+          this.$message.warning(res.message)
+        }
+        this.loading = false
+      })
+    },
+    /**
+     * 添加阶段
+     */
+    addStage() {
+      this.$refs.stageModal.visible = true
+    }
+  }
+}
+</script>
+
+<style scoped lang="less">
+@import '~@assets/less/common.less';
+
+.project-title {
+  font-weight: 700;
+  font-size: 16px;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+.table-box {
+  margin-top: 20px;
+}
+
+.add-stage-btn {
+  margin-top: 20px;
+  width: 100%;
+}
+
+.audit-info {
+
+  &-title {
+    padding: 20px 0;
+    font-weight: 700;
+    font-size: 16px;
+  }
+
+  &-item-box {
+    padding-bottom: 10px;
+
+    .ant-col {
+      padding-bottom: 10px;
+    }
+  }
+
+  &-item {
+    display: flex;
+
+    &-title {
+      flex-shrink: 0;
+    }
+  }
+
+  &-img {
+    width: calc(100% - 6rem);
+  }
+}
+
+.ant-list {
+  border-bottom: 1px solid #e8e8e8;
+}
+</style>

src/views/MessagePage/modules/PaymentVoucherModal.vue

@@ -0,0 +1,154 @@
+<template>
+  <j-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    :confirmLoading="confirmLoading"
+    switchFullscreen
+    @ok="handleOk"
+    @cancel="handleCancel"
+    cancelText="关闭">
+    <a-spin :spinning="confirmLoading">
+      <a-form :form="form">
+        <a-form-item label="缴费金额" :labelCol="labelCol" :wrapperCol="wrapperCol">
+          <a-input placeholder="请输入缴费金额"
+                   v-decorator="['amountReceived',validatorRules.amountReceived]"
+                   :maxLength='50'
+                   @blur="addZero"
+                   @change="e => e.target.value = (e.target.value.replace(/[^0-9-.]/g, '')).trim()"></a-input>
+        </a-form-item>
+        <a-form-item label="缴费日期" :labelCol="labelCol" :wrapperCol="wrapperCol">
+          <j-date placeholder="请选择缴费日期"
+                  style="width: 100%;"
+                  v-decorator="['paymentDate',validatorRules.paymentDate]"
+                  :trigger-change="true"
+                  date-format="YYYY-MM-DD"/>
+        </a-form-item>
+        <a-form-item label="付款凭证" :labelCol="labelCol" :wrapperCol="wrapperCol">
+          <j-image-upload v-decorator="['paymentRecord',validatorRules.paymentRecord]"
+                          :return-id="true">
+          </j-image-upload>
+        </a-form-item>
+      </a-form>
+    </a-spin>
+  </j-modal>
+</template>
+
+<script>
+import { addZero } from '@/utils/util'
+import { money } from '@/utils/validate'
+import JImageUpload from '@comp/jero/JImageUpload'
+import JDate from '@comp/tools/JDate'
+
+export default {
+  name: 'PaymentVoucherModal',
+  components: { JImageUpload, JDate },
+  data() {
+    return {
+      title: '凭证信息',
+      width: 600,
+      visible: false,
+      confirmLoading: false,
+      form: this.$form.createForm(this),
+      model: {},
+      labelCol: {
+        xs: { span: 24 },
+        sm: { span: 5 }
+      },
+      wrapperCol: {
+        xs: { span: 24 },
+        sm: { span: 18 }
+      },
+      validatorRules: {
+        amountReceived: {
+          rules: [{ required: true, validator: this.checkMoney }],
+          validateTrigger: 'blur'
+        },
+        paymentDate: {
+          rules: [{ required: true, message: '请选择缴费日期' }],
+          validateTrigger: 'change'
+        },
+        paymentRecord: {
+          rules: [{ required: true, message: '请上传付款凭证' }],
+          validateTrigger: 'change'
+        }
+      }
+    }
+  },
+  methods: {
+    addZero,
+    add() {
+      this.edit({})
+    },
+    edit(record) {
+      this.form.resetFields()
+      this.model = Object.assign({}, record)
+      this.visible = true
+      this.$nextTick(() => {
+        this.form.setFieldsValue(pick(this.model, 'amountReceived', 'paymentDate', 'remark'))
+      })
+    },
+    handleOk() {
+      if (this.confirmLoading) {
+        return
+      }
+      this.confirmLoading = true
+      this.form.validateFields((err, values) => {
+        if (!err) {
+          values.projectId = this.projectId
+          values.projectType = this.projectType
+          const obj = Object.assign(this.model, values)
+          let okHttpMethod
+          if (this.model.id) {
+            okHttpMethod = editAmountPhase(obj)
+          } else {
+            let arr = []
+            arr.push(obj)
+            okHttpMethod = addPaymentPhase(arr)
+          }
+          okHttpMethod.then(res => {
+            if (res.success) {
+              this.$message.success(res.message)
+              this.$emit('ok')
+              this.close()
+            } else {
+              this.$message.warn(res.message)
+            }
+          }).finally(() => {
+            setTimeout(() => {
+              this.confirmLoading = false
+            }, 1000)
+          })
+        } else {
+          this.confirmLoading = false
+        }
+      })
+    },
+    handleCancel() {
+      this.close()
+    },
+    close() {
+      this.visible = false
+    },
+    /**
+     * 校验金额格式
+     * @param rules
+     * @param value
+     * @param callback
+     */
+    checkMoney(rules, value, callback) {
+      if (value) {
+        if (money(value)) {
+          callback()
+        }
+        callback('请输入合法的金额数字,最多2位小数,10位整数')
+      }
+      callback('请输入缴费金额')
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

src/views/mineProject/MineProject.vue

@@ -36,128 +36,90 @@
 
       <!--    表格区域-->
       <div>
-        <a-spin :spinning="loading">
+        <a-table
-          <project-table :column-data="columns" :table-data="dataSource" @change="handlePageChange">
+          ref="table"
-            <!--          打包、需要发票-->
+          rowKey="id"
-            <template v-slot:status-pack="{record, text}">
+          :columns="columns"
-              <status-slot :statu-obj="record" :status-no="text"></status-slot>
+          :dataSource="dataSource"
-            </template>
+          :pagination="ipagination"
-            <!--            到账-->
+          :loading="loading"
-            <template v-slot:status="{record, text}">
+          @change="handleTableChange"
-              <status-slot :statu-obj="record" :status-no="text" :status-type="true"></status-slot>
+          class="j-table-force-nowrap">
-            </template>
+
-            <!--            开票-->
+          <!--        项目名称-->
-            <template v-slot:status-bill="{record, text}">
+          <template slot="projectName" slot-scope="text, record">
-              <status-slot :statu-obj="record" :status-no="text" :status-type="true" status-key="bill"></status-slot>
+            <j-ellipsis :value="text" :length="20" class="project-name" @click="openDetail(record)"></j-ellipsis>
-            </template>
+          </template>
-            <!--            邮寄-->
+
-            <template v-slot:status-mail="{record, text}">
+          <template slot="text" slot-scope="text, record">
-              <status-slot :statu-obj="record" :status-no="text" :status-type="true" status-key="mail"></status-slot>
+            <j-ellipsis :value="text" :length="20"></j-ellipsis>
-            </template>
+          </template>
-            <!--          项目名称-->
+
-            <template v-slot:projectName="{record}">
+          <!--          缴费凭证-->
-              <a-tooltip>
+          <span slot="action" class="action-span-cell" slot-scope="text,record">
-                <template slot="title">
+            <a @click="paymentVoucher(record)">缴费凭证</a>
-                  {{ record.chargeProject }}
+          </span>
-                </template>
+        </a-table>
-                <div @click="openDetailModal(record)" class="project-name">
-                  {{ record.chargeProject }}
-                </div>
-              </a-tooltip>
-            </template>
-            <!--          需要tooltip的文本-->
-            <template v-slot:text="{record,text}">
-              <a-tooltip>
-                <template slot="title">
-                  {{ text }}
-                </template>
-                {{ text }}
-              </a-tooltip>
-            </template>
-            <!--            金额-->
-            <template v-slot:money="{record,text}">
-              <a-tooltip>
-                <template slot="title">
-                  {{ text }}元
-                </template>
-                {{ text }}元
-              </a-tooltip>
-            </template>
-          </project-table>
-        </a-spin>
       </div>
       <!--    表格区域end-->
     </a-card>
 
     <project-detail-modal ref="projectDetail" @openContractModule="handleOpenContractModule"></project-detail-modal>
-    <mine-contract-module :contract-id="contractId" :visible.sync="contractModuleVisible" @openProjectDetail="openDetailModal"></mine-contract-module>
+    <mine-contract-module :contract-id="contractId" :visible.sync="contractModuleVisible"
+                          @openProjectDetail="openDetailModal"></mine-contract-module>
   </div>
 </template>
 <script>
 import { JeroListMixin } from '@/mixins/JeroListMixin'
-import ProjectTable from '@comp/table/ProjectTable'
 import ProjectDetailModal from '@views/MessagePage/ProjectDetailModal'
-import StatusSlot from '@comp/tools/StatusSlot'
 import MineContractModule from '@views/mineContract/modules/MineContractModule'
 
 export default {
   name: 'MineProject',
-  components: { ProjectTable, ProjectDetailModal, StatusSlot, MineContractModule },
+  components: { ProjectDetailModal, MineContractModule },
   mixins: [JeroListMixin],
   data() {
     return {
       columns: [
         {
-          title: '',
+          title: '序号',
+          dataIndex: '',
+          key: 'rowIndex',
+          width: 60,
+          align: 'center',
+          customRender: function (t, r, index) {
+            return parseInt(index) + 1
+          }
+        }, {
+          title: '项目名称',
           dataIndex: 'chargeProject',
-          scopedSlots: 'projectName',
+          align: 'center',
-          col: 3
+          scopedSlots: { customRender: 'projectName' }
         }, {
-          title: '项目用途',
+          title: '项目负责人',
-          dataIndex: 'chargeUse_dictText',
-          scopedSlots: 'text',
-          col: 3
-        }, {
-          title: '应付金额',
-          dataIndex: 'receivableAmount',
-          scopedSlots: 'money',
-          col: 3
-        }, {
-          title: '实付金额',
-          dataIndex: 'paidAmount',
-          scopedSlots: 'money',
-          col: 3
-        }, {
-          title: '负责人',
           dataIndex: 'principalName',
-          scopedSlots: 'text',
+          align: 'center',
-          col: 2
+          scopedSlots: { customRender: 'text' }
         }, {
-          title: '打包',
+          title: '负责人联系电话',
-          dataIndex: 'pack',
+          dataIndex: 'principalPhone',
-          scopedSlots: 'status-pack',
+          align: 'center',
-          col: 2
+          scopedSlots: { customRender: 'text' }
         }, {
-          title: '需要发票',
+          title: '负责人邮箱',
-          col: 2,
+          dataIndex: 'principalMail',
-          dataIndex: 'needInvoice',
+          align: 'center',
-          scopedSlots: 'status-pack',
+          scopedSlots: { customRender: 'text' }
-          slot: 'status'
         }, {
-          title: '到账',
+          title: '缴费凭证状态',
-          dataIndex: 'inAccount',
+          dataIndex: 'status',
-          scopedSlots: 'status',
+          align: 'center',
-          col: 2
+          scopedSlots: { customRender: 'text' }
         }, {
-          title: '开票',
+          title: '操作',
-          dataIndex: 'makeInvoice',
+          dataIndex: 'action',
-          scopedSlots: 'status-bill',
+          align: 'center',
-          col: 2
+          scopedSlots: { customRender: 'action' }
-        }, {
-          title: '邮寄',
-          dataIndex: 'mail',
-          scopedSlots: 'status-mail',
-          col: 2
         }
       ],
       url: {
@@ -169,17 +131,25 @@ export default {
   },
   methods: {
     /**
-     * 分页变化获取数据
+     * 打开收入合同详情
-     * @param pagination
+     * @param contractId
      */
-    handlePageChange(pagination) {
-      this.ipagination.current = pagination.current
-      this.ipagination.pageSize = pagination.pageSize
-      this.loadData()
-    },
     handleOpenContractModule(contractId) {
       this.contractId = contractId
       this.contractModuleVisible = true
+    },
+    /**
+     * 缴费凭证
+     * @param record
+     */
+    paymentVoucher(record) {
+      this.$router.push({
+        path: '/MessagePage/PaymentVoucher',
+        query: {
+          projectId: record.id,
+          projectName: record.chargeProject
+        }
+      })
     }
   }
 }

src/views/subBidCommittee/SubBidCommitteeDetailPage.vue

@@ -21,7 +21,6 @@
         <h3 class="title">在研项目</h3>
         <a-table
           ref="table"
-          rowKey="id"
           size="middle"
           :scroll="{x: 1200}"
           :columns="columns"
@@ -39,12 +38,12 @@
             <a @click="viewProjectApproval(record)">查看</a>
           </span>
 
-              <!--          征求意见-->
+          <!--          征求意见-->
           <span slot="advice" class="action-span-cell" slot-scope="text, record">
             <a @click="viewAdvice(record)">查看</a>
           </span>
 
-              <!--          送审材料-->
+          <!--          送审材料-->
           <span slot="review-material" class="action-span-cell" slot-scope="text, record">
             <a @click="viewReviewMaterial(record)">查看</a>
           </span>
@@ -60,7 +59,7 @@
       <!--      其他分发资料-->
       <div class="meeting basic-box">
         <div class="file-title"><h3 class="title">其他分发资料</h3><span>(如月报、调研表等)</span></div>
-        <file-list ref="fileList"></file-list>
+        <file-list ref="fileListTable" :data-source="fileList"></file-list>
       </div>
     </a-card>
 
@@ -170,7 +169,7 @@ export default {
       }
       this.basicLoading = true
       this.$nextTick(() => {
-        this.$refs.fileList.loading = true
+        this.$refs.fileListTable.fileLoading = true
       })
       let param = {
         id: this.$route.query.id
@@ -178,14 +177,14 @@ export default {
       getSubBidCommitteeDetail(param).then(res => {
         if (res.success) {
           this.committeeDetail = res.result
-          this.$refs.fileList.dataSource = res.result.files
+          this.fileList = res.result.files || []
         } else {
           this.$message.warn(res.message)
         }
       }).finally(() => {
         this.basicLoading = false
         this.$nextTick(() => {
-          this.$refs.fileList.loading = false
+          this.$refs.fileListTable.fileLoading = false
         })
       })
     },
@@ -249,7 +248,7 @@ export default {
       }
       this.ipagination = pagination
       this.getUnderStudyProjectList()
-    },
+    }
   }
 }
 </script>

src/views/subBidCommittee/modules/CommitteeUnderStudyFilesModal.vue

@@ -12,6 +12,7 @@
       <a-table
         ref="table"
         size="middle"
+        :rowKey="record => record.FILE_ID"
         bordered
         :columns="columns"
         :dataSource="dataSource"

src/views/user/register/Register.vue

@@ -270,7 +270,7 @@ export default {
           rules: [
             { required: true, message: '请输入新密码!' },
             {
-              pattern: /^(?=.*[a-zA-Z])(?=.*\d)(?=.*[~!@#$%^&*()_+`\-={}:";'<>?,.\/]).{8,}$/,
+              pattern: /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[~!@#$%^&*()_+`\-={}:";'<>?,./]).{8,30}$/,
               message: '密码由8位及以上数字、大小写字母和特殊符号组成！'
             }
           ],

src/views/workTeam/WorkTeam.vue

@@ -36,55 +36,30 @@
 
       <!--    表格区域-->
       <div>
-        <a-spin :spinning="loading">
+        <a-table
-          <project-table :column-data="columns" :table-data="dataSource" show-meeting-btn button-text="工作组会议" @change="handlePageChange">
+          ref="table"
-            <!--          打包、需要发票-->
+          rowKey="id"
-            <template v-slot:status-pack="{record, text}">
+          :columns="columns"
-              <status-slot :statu-obj="record" :status-no="text"></status-slot>
+          :dataSource="dataSource"
-            </template>
+          :pagination="ipagination"
-            <!--            到账-->
+          :loading="loading"
-            <template v-slot:status="{record, text}">
+          @change="handleTableChange"
-              <status-slot :statu-obj="record" :status-no="text" :status-type="true"></status-slot>
+          class="j-table-force-nowrap">
-            </template>
+
-            <!--            开票-->
+          <!--        项目名称-->
-            <template v-slot:status-bill="{record, text}">
+          <template slot="projectName" slot-scope="text, record">
-              <status-slot :statu-obj="record" :status-no="text" :status-type="true" status-key="bill"></status-slot>
+            <j-ellipsis :value="text" :length="20" class="project-name" @click="openDetailModal(record)"></j-ellipsis>
-            </template>
+          </template>
-            <!--            邮寄-->
+
-            <template v-slot:status-mail="{record, text}">
+          <template slot="text" slot-scope="text, record">
-              <status-slot :statu-obj="record" :status-no="text" :status-type="true" status-key="mail"></status-slot>
+            <j-ellipsis :value="text" :length="20"></j-ellipsis>
-            </template>
+          </template>
-            <!--          项目名称-->
+
-            <template v-slot:projectName="{record}">
+          <!--          缴费凭证-->
-              <div @click="openDetailModal(record)" class="project-name">
+          <span slot="action" class="action-span-cell" slot-scope="text,record">
-                {{ record.chargeProject }}
+            <a @click="paymentVoucher(record)">缴费凭证</a>
-              </div>
+          </span>
-            </template>
+        </a-table>
-            <!--          需要tooltip的文本-->
-            <template v-slot:text="{record,text}">
-              <a-tooltip>
-                <template slot="title">
-                  {{ text }}
-                </template>
-                {{ text }}
-              </a-tooltip>
-            </template>
-            <!--            金额-->
-            <template v-slot:money="{record,text}">
-              <a-tooltip>
-                <template slot="title">
-                  {{ text }}元
-                </template>
-                {{ text }}元
-              </a-tooltip>
-            </template>
-            <template v-slot:meeting>
-              <a-button type="primary" @click="toMeeting">工作组会议
-                <a-icon type="right"></a-icon>
-              </a-button>
-            </template>
-          </project-table>
-        </a-spin>
       </div>
       <!--    表格区域end-->
 
@@ -96,64 +71,55 @@
 </template>
 <script>
 import { JeroListMixin } from '@/mixins/JeroListMixin'
-import ProjectTable from '@comp/table/ProjectTable'
 import ProjectDetailModal from '@views/MessagePage/ProjectDetailModal'
-import StatusSlot from '@comp/tools/StatusSlot'
 import MineContractModule from '@views/mineContract/modules/MineContractModule'
 
 export default {
   name: 'WorkTeam',
-  components: { ProjectTable, ProjectDetailModal, StatusSlot, MineContractModule },
+  components: { ProjectDetailModal, MineContractModule },
   mixins: [JeroListMixin],
   data() {
     return {
       columns: [
         {
-          title: '',
+          title: '序号',
+          dataIndex: '',
+          key: 'rowIndex',
+          width: 60,
+          align: 'center',
+          customRender: function (t, r, index) {
+            return parseInt(index) + 1
+          }
+        }, {
+          title: '项目名称',
           dataIndex: 'chargeProject',
-          scopedSlots: 'projectName',
+          align: 'center',
-          col: 4
+          scopedSlots: { customRender: 'projectName' }
         }, {
-          title: '应付金额',
+          title: '项目负责人',
-          dataIndex: 'receivableAmount',
-          scopedSlots: 'money',
-          col: 4
-        }, {
-          title: '实付金额',
-          dataIndex: 'paidAmount',
-          scopedSlots: 'money',
-          col: 3
-        }, {
-          title: '负责人',
           dataIndex: 'principalName',
-          scopedSlots: 'text',
+          align: 'center',
-          col: 3
+          scopedSlots: { customRender: 'text' }
         }, {
-          title: '打包',
+          title: '负责人联系电话',
-          dataIndex: 'pack',
+          dataIndex: 'principalPhone',
-          scopedSlots: 'status-pack',
+          align: 'center',
-          col: 2
+          scopedSlots: { customRender: 'text' }
         }, {
-          title: '需要发票',
+          title: '负责人邮箱',
-          col: 2,
+          dataIndex: 'principalMail',
-          dataIndex: 'needInvoice',
+          align: 'center',
-          scopedSlots: 'status-pack',
+          scopedSlots: { customRender: 'text' }
-          slot: 'status'
         }, {
-          title: '到账',
+          title: '缴费凭证状态',
-          dataIndex: 'inAccount',
+          dataIndex: 'status',
-          scopedSlots: 'status',
+          align: 'center',
-          col: 2
+          scopedSlots: { customRender: 'text' }
         }, {
-          title: '开票',
+          title: '操作',
-          dataIndex: 'makeInvoice',
+          dataIndex: 'action',
-          scopedSlots: 'status-bill',
+          align: 'center',
-          col: 2
+          scopedSlots: { customRender: 'action' }
-        }, {
-          title: '邮寄',
-          dataIndex: 'mail',
-          scopedSlots: 'status-mail',
-          col: 2
         }
       ],
       contractId: null,
@@ -164,15 +130,6 @@ export default {
     }
   },
   methods: {
-    /**
-     * 分页变化获取数据
-     * @param pagination
-     */
-    handlePageChange(pagination) {
-      this.ipagination.current = pagination.current
-      this.ipagination.pageSize = pagination.pageSize
-      this.loadData()
-    },
     toMeeting() {
       this.$router.push({
         path: '/meetingActivity/MeetingActivity',
@@ -188,6 +145,19 @@ export default {
     handleOpenContractModule(contractId) {
       this.contractId = contractId
       this.contractModuleVisible = true
+    },
+    /**
+     * 缴费凭证
+     * @param record
+     */
+    paymentVoucher(record) {
+      this.$router.push({
+        path: '/MessagePage/PaymentVoucher',
+        query: {
+          projectId: record.id,
+          projectName: record.chargeProject
+        }
+      })
     }
   }
 }