[add] 普通项目、工作组项目缴费凭证

src/views/MessagePage/PaymentVoucher.vue

@@ -237,6 +237,8 @@ export default {
      * 添加阶段
      */
     addStage() {
+      this.$refs.stageModal.projectId = this.$route.query.projectId
+      this.$refs.stageModal.projectType = this.$route.query.projectType
       this.$refs.stageModal.visible = true
     }
   }

src/views/MessagePage/modules/PaymentVoucherModal.vue

@@ -25,7 +25,7 @@
                   date-format="YYYY-MM-DD"/>
         </a-form-item>
         <a-form-item label="付款凭证" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <j-image-upload v-decorator="['paymentRecord',validatorRules.paymentRecord]"
+          <j-image-upload v-decorator="['proof',validatorRules.proof]"
                           :return-id="true">
           </j-image-upload>
         </a-form-item>
@@ -39,6 +39,8 @@ import { addZero } from '@/utils/util'
 import { money } from '@/utils/validate'
 import JImageUpload from '@comp/jero/JImageUpload'
 import JDate from '@comp/tools/JDate'
+import { postAction } from '@api/manage'
+import pick from 'lodash.pick'
 
 export default {
   name: 'PaymentVoucherModal',
@@ -68,11 +70,17 @@ export default {
           rules: [{ required: true, message: '请选择缴费日期' }],
           validateTrigger: 'change'
         },
-        paymentRecord: {
+        proof: {
           rules: [{ required: true, message: '请上传付款凭证' }],
           validateTrigger: 'change'
         }
-      }
+      },
+      url: {
+        add: '/paymentCheck/payPaymentCheck/applicant',
+        edit: ''
+      },
+      projectId: '',
+      projectType: ''
     }
   },
   methods: {
@@ -85,7 +93,7 @@ export default {
       this.model = Object.assign({}, record)
       this.visible = true
       this.$nextTick(() => {
-        this.form.setFieldsValue(pick(this.model, 'amountReceived', 'paymentDate', 'remark'))
+        this.form.setFieldsValue(pick(this.model, 'amountReceived', 'paymentDate', 'proof'))
       })
     },
     handleOk() {
@@ -97,16 +105,14 @@ export default {
         if (!err) {
           values.projectId = this.projectId
           values.projectType = this.projectType
-          const obj = Object.assign(this.model, values)
-          let okHttpMethod
+          const formData = Object.assign(this.model, values)
+          let url
           if (this.model.id) {
-            okHttpMethod = editAmountPhase(obj)
+            url = this.url.edit
           } else {
-            let arr = []
-            arr.push(obj)
-            okHttpMethod = addPaymentPhase(arr)
+            url = this.url.add
           }
-          okHttpMethod.then(res => {
+          postAction(url, formData).then(res => {
             if (res.success) {
               this.$message.success(res.message)
               this.$emit('ok')

src/views/mineProject/MineProject.vue

@@ -147,7 +147,8 @@ export default {
         path: '/MessagePage/PaymentVoucher',
         query: {
           projectId: record.id,
-          projectName: record.chargeProject
+          projectName: record.chargeProject,
+          projectType: 1
         }
       })
     }

src/views/workTeam/WorkTeam.vue

@@ -156,7 +156,8 @@ export default {
         path: '/MessagePage/PaymentVoucher',
         query: {
           projectId: record.id,
-          projectName: record.chargeProject
+          projectName: record.chargeProject,
+          projectType: 2
         }
       })
     },

src/views/workTeam/WorkTeamDetail.vue

@@ -40,7 +40,7 @@
             </a-col>
             <a-col :span="24" class="basic-info-item">
               <label>任务及目标：</label>
-              <span>{{ detail.remarks }}</span>
+              <span>{{ detail.missionAndObjectives }}</span>
             </a-col>
           </a-row>
         </a-spin>
@@ -166,7 +166,7 @@ export default {
       ipagination: {
         current: 1,
         pageSize: 10,
-        pageSizeOptions: ['10', '20', '30', '50', '100'],
+        pageSizeOptions: ['10', '20', '30'],
         showTotal: (total, range) => {
           return range[0] + '-' + range[1] + ' 共' + total + '条'
         },

vue.config.js

@@ -79,7 +79,7 @@ module.exports = {
   },
 
   devServer: {
-    port: 21826,
+    port: 3001,
     proxy: {
      /* '/api': {
         target: 'https://mock.ihx.me/mock/5baf3052f7da7e07e04a5116/antd-pro', //mock API接口系统
@@ -91,14 +91,14 @@ module.exports = {
       },*/
       '/jero-boot': {
         // target: 'http://localhost:21824', //请求本地 jero-boot后台项目
-        target: 'http://10.0.10.78:21824', //请求本地 jero-boot后台项目
+        target: 'http://localhost:8080', //请求本地 jero-boot后台项目
         ws: false,
         changeOrigin: true
       },
       // 会员系统的路由转发
       '/memberApi': {
         // target: 'http://localhost:9000', //请求本地 jero-boot后台项目
-        target: 'http://10.0.10.78:9000', //请求本地 jero-boot后台项目
+        target: 'http://localhost:8080', //请求本地 jero-boot后台项目
         ws: false,
         changeOrigin: true,
         pathRewrite: {