bug修改

src/views/businessManagement/ContactManagement.vue

@@ -134,7 +134,7 @@ export default {
         }, {
           title: '职务',
           align: 'center',
-          width: 160,
+          width: 280,
           dataIndex: 'post',
           scopedSlots: { customRender: 'text' }
         }, {
@@ -149,6 +149,7 @@ export default {
         }, {
           title: '企业名称',
           align: 'center',
+          width: 280,
           dataIndex: 'companyName',
           scopedSlots: { customRender: 'text' }
         }, {

src/views/projectManagement/WorkingGroupMemberUnitMaintenance.vue

@@ -379,6 +379,7 @@ export default {
           type: 'chargeNoticeA',
           label: `A：${ this.workingGroupDetail.chargeNoticeNoA }`,
           value: this.workingGroupDetail.chargeNoticeNoA,
+          key: this.workingGroupDetail.chargeA,
           yearCharge: this.workingGroupDetail.yearChargeA,
           chargeNoticeId: this.workingGroupDetail.chargeNoticeAId
         }
@@ -390,6 +391,7 @@ export default {
           type: 'chargeNoticeB',
           label: `B：${ this.workingGroupDetail.chargeNoticeNoB }`,
           value: this.workingGroupDetail.chargeNoticeNoB,
+          key: this.workingGroupDetail.chargeB,
           yearCharge: this.workingGroupDetail.yearChargeB,
           chargeNoticeId: this.workingGroupDetail.chargeNoticeBId
         }

src/views/projectManagement/WorkingGroupProjectManagement.vue

@@ -117,7 +117,7 @@ import SelectPrincipal from '@comp/company/SelectPrincipal'
 import ProgressBar from '@comp/ProgressBar'
 import PageHeaderTitle from '@comp/layouts/PageHeaderTitle'
 import IconWorkingGruop from '@/assets/imgs/icon/icon_working_group.png'
-import { copyWorkingGroup, checkoutWorkingGroupPrincipal } from '../../api/incomePaymentsApi'
+import { copyWorkingGroup } from '../../api/incomePaymentsApi'
 import { getAction } from '../../api/manage'
 
 export default {

src/views/projectManagement/modules/WorkingGroupMemberSetChargeNotice.vue

@@ -11,8 +11,16 @@
     <a-spin :spinning="confirmLoading">
       <a-form :form="form">
         <a-form-item label="收费通知号" :labelCol="remarksLabelCol" :wrapperCol="remarksWrapperCol">
-          <a-radio-group v-decorator="['chargeNoticeNo']" @change="handleChargeNoticeChange"
+          <a-radio-group
-                         :options="chargeNoticeList"></a-radio-group>
+            class="charge-notice-no"
+            v-decorator="['charge']"
+            @change="handleChargeNoticeChange">
+            <a-radio v-for="item in chargeNoticeList" :key="item.key" :value="item.key">
+              <a-tooltip :title="item.label">
+                {{ item.label }}
+              </a-tooltip>
+            </a-radio>
+          </a-radio-group>
         </a-form-item>
         <a-row v-if="selectedChargeNotice === 'A'">
           <a-col :xl="12" :sm="24">
@@ -146,25 +154,25 @@ export default {
      * 收费通知号变化, 回显本年应收款和文件
      */
     handleChargeNoticeChange(e) {
-      let chargeNoticeNo = e.target.value
+      let key = e.target.value
-      this.pickChargeNoticeType(chargeNoticeNo)
+      this.pickChargeNoticeType(key)
     },
     /**
      * 匹配显隐
-     * @param value
+     * @param key
      */
-    pickChargeNoticeType(value) {
+    pickChargeNoticeType(key) {
       this.chargeNoticeList.forEach(item => {
-        if (item.value === value) {
+        if (item.type === 'chargeNoticeA' && key === 'a') {
-          if (item.type === 'chargeNoticeA') {
+          this.selectedChargeNotice = 'A'
-            this.selectedChargeNotice = 'A'
+          this.model.receivableAmount = item.yearCharge
-            this.model.receivableAmount = item.yearCharge
+          this.model.chargeNoticeId = item.chargeNoticeId
-            this.model.chargeNoticeId = item.chargeNoticeId
+          this.model.chargeNoticeNo = item.value
-          } else {
+        } else if (item.type === 'chargeNoticeB' && key === 'b'){
-            this.selectedChargeNotice = 'B'
+          this.selectedChargeNotice = 'B'
-            this.model.receivableAmount = item.yearCharge
+          this.model.receivableAmount = item.yearCharge
-            this.model.chargeNoticeId = item.chargeNoticeId
+          this.model.chargeNoticeId = item.chargeNoticeId
-          }
+          this.model.chargeNoticeNo = item.value
         }
       })
       this.$nextTick(() => {

src/views/projectManagement/modules/WorkingGroupMemberUnitModule.vue

@@ -100,9 +100,9 @@
             <a-form-item label="收费通知号" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <a-radio-group
                 class="charge-notice-no"
-                v-decorator="['chargeNoticeNo',validatorRules.chargeNoticeNo]"
+                v-decorator="['charge',validatorRules.charge]"
                 @change="handleChargeNoticeChange">
-                <a-radio v-for="item in chargeNoticeList" :key="item.value" :value="item.value">
+                <a-radio v-for="item in chargeNoticeList" :key="item.key" :value="item.key">
                   <a-tooltip :title="item.label">
                     {{ item.label }}
                   </a-tooltip>
@@ -325,7 +325,7 @@ export default {
           rules: [{ required: true, message: '请输入合同号' }],
           validateTrigger: 'blur'
         },
-        chargeNoticeNo: {
+        charge: {
           rules: [{ required: true, message: '请输入收费通知号' }],
           validateTrigger: 'blur'
         },
@@ -400,7 +400,6 @@ export default {
       this.companyChange(this.selectedCompany)
       this.form.resetFields()
       this.model = Object.assign({}, record)
-      console.log(this.signedContactId)
       // 是否存在从收入合同传入的签订联系人id
       this.model.contactsIdOne = this.signedContactId || this.model.contactsTemporaryIdOne || undefined
       this.model.contactsIdTwo = this.model.contactsTemporaryIdTwo || undefined
@@ -426,10 +425,10 @@ export default {
         }
       }
       this.chargeWayType = record.chargeWay
-      this.pickChargeNoticeType(record.chargeNoticeNo)
+      this.pickChargeNoticeType(record.charge)
       this.visible = true
       this.$nextTick(() => {
-        this.form.setFieldsValue(pick(this.model, 'chargeCompany', 'contactsIdOne', 'contactsIdTwo', 'contactsIdThree', 'mailContactsId', 'chargeWay', 'chargeNoticeNo', 'receivableAmount', 'contractNum', 'receivableAmount', 'chargeNoticeId', 'needInvoice', 'remarks'))
+        this.form.setFieldsValue(pick(this.model, 'chargeCompany', 'contactsIdOne', 'contactsIdTwo', 'contactsIdThree', 'mailContactsId', 'chargeWay', 'charge', 'receivableAmount', 'contractNum', 'receivableAmount', 'chargeNoticeId', 'needInvoice', 'remarks'))
       })
     },
     close() {
@@ -512,25 +511,25 @@ export default {
      * 收费通知号变化, 回显本年应收款和文件
      */
     handleChargeNoticeChange(e) {
-      let chargeNoticeNo = e.target.value
+      let key = e.target.value
-      this.pickChargeNoticeType(chargeNoticeNo)
+      this.pickChargeNoticeType(key)
     },
     /**
      * 匹配收费通知显隐
      * @param value
      */
-    pickChargeNoticeType(value) {
+    pickChargeNoticeType(key) {
       this.chargeNoticeList.forEach(item => {
-        if (item.value === value) {
+        if (item.type === 'chargeNoticeA' && key === 'a') {
-          if (item.type === 'chargeNoticeA') {
+          this.selectedChargeNotice = 'A'
-            this.selectedChargeNotice = 'A'
+          this.model.receivableAmount = item.yearCharge
-            this.model.receivableAmount = item.yearCharge
+          this.model.chargeNoticeId = item.chargeNoticeId
-            this.model.chargeNoticeId = item.chargeNoticeId
+          this.model.chargeNoticeNo = item.value
-          } else {
+        } else if (item.type === 'chargeNoticeB' && key === 'b') {
-            this.selectedChargeNotice = 'B'
+          this.selectedChargeNotice = 'B'
-            this.model.receivableAmount = item.yearCharge
+          this.model.receivableAmount = item.yearCharge
-            this.model.chargeNoticeId = item.chargeNoticeId
+          this.model.chargeNoticeId = item.chargeNoticeId
-          }
+          this.model.chargeNoticeNo = item.value
         }
       })
       this.$nextTick(() => {

src/views/projectManagement/modules/WorkingGroupProjectModule.vue

@@ -93,9 +93,7 @@
           </a-col>
           <a-col :span="12">
             <a-form-item label="收费通知A" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <j-upload file-type="pdf"
+              <j-upload :multiple="false"
-                        file-type-error-message="请上传pdf文件"
-                        :multiple="false"
                         :return-id="true"
                         bizPath="payment"
                         :number="1"
@@ -131,9 +129,7 @@
           </a-col>
           <a-col :span="12">
             <a-form-item label="收费通知B" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <j-upload file-type="pdf"
+              <j-upload :multiple="false"
-                        file-type-error-message="请上传pdf文件"
-                        :multiple="false"
                         :return-id="true"
                         bizPath="payment"
                         :number="1"
@@ -275,6 +271,8 @@ export default {
           }
           values.yearChargeA = values.yearChargeA ? Number(values.yearChargeA) : null
           values.yearChargeB = values.yearChargeB ? Number(values.yearChargeB) : null
+          values.chargeA = values.chargeNoticeNoA ? 'a' : null
+          values.chargeB = values.chargeNoticeNoB ? 'b' : null
           const formData = Object.assign(this.model, values)
           console.log('表单提交数据', formData)
           httpAction(httpurl, formData, method).then((res) => {