[bug] 验收bug修改

src/api/incomePaymentsApi.js

@@ -1,5 +1,6 @@
 import { getAction } from '@api/manage'
 
+// 通过id获取工作组详情
 const getWorkingGroupById = (params) => getAction('/project/payWorkingGroup/queryById', params)
 // 判断工作组成员是否设置来款通知
 const getChargeNotice = (param) => getAction('/project/payWorkingGroupSubitem/getCharge', param)

src/components/company/CompanySelect.vue

@@ -38,6 +38,7 @@ export default {
       if (this.isCompanyDisabled) {
         return
       }
+      this.$refs.businessSelect.searchReset()
       this.$refs.businessSelect.visible = true
       this.$refs.businessSelect.selectedRowKeys[0] = this.value.id
     },

src/views/businessManagement/BusinessManagement.vue

@@ -43,7 +43,7 @@
           bordered
           rowKey="id"
           :columns="columns"
-          :scroll="{x: 1500}"
+          :scroll="{x: 1600}"
           :dataSource="dataSource"
           :pagination="ipagination"
           :loading="loading"
@@ -112,6 +112,7 @@ export default {
         }, {
           title: '公司地址',
           align: 'center',
+          width: 400,
           dataIndex: 'companyAddress',
           scopedSlots: { customRender: 'text' }
         }, {

src/views/contractManagement/revenueContract/modules/RevenueContractDetail.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <page-header-title :is-level-one="false" :img-for-icon="IconImg" :level-two-title="contractNum"></page-header-title>
+    <page-header-title :is-level-one="false" :img-for-icon="IconImg" level-two-title="收入合同详情"></page-header-title>
     <a-card :bordered="false">
       <!--        主体信息-->
       <div>
@@ -8,8 +8,8 @@
           <div class="part-title-text">主体信息</div>
         </div>
         <a-row class="detail">
-          <template v-for="item in mainInfoList">
+          <template v-if="mainInfoShowList.length > 0">
-            <a-col :xxl="6" :xl="8" :sm="12" class="detail-item" v-if="detailData[item.fieldName] && detailData[item.fieldName] !== ''">
+            <a-col :xxl="6" :xl="8" :sm="12" class="detail-item" v-for="(item, index) in mainInfoShowList" :key="index">
               <a-row>
                 <a-col :sm="10" :xs="24">{{ item.title }}:</a-col>
                 <a-col :sm="14" :xs="24">{{ detailData[item.fieldName] }}</a-col>
@@ -26,8 +26,8 @@
           <div class="part-title-text">日期节点</div>
         </div>
         <a-row class="detail">
-          <template v-for="item in dateNodeList">
+          <template v-if="dateNodeShowList.length > 0">
-            <a-col :xxl="6" :xl="8" :sm="12" class="detail-item" v-if="detailData[item.fieldName] && detailData[item.fieldName] !== ''">
+            <a-col :xxl="6" :xl="8" :sm="12" class="detail-item" v-for="(item, index) in dateNodeShowList" :key="index">
               <a-row>
                 <a-col :sm="10" :xs="24">{{ item.title }}:</a-col>
                 <a-col :sm="14" :xs="24">{{ detailData[item.fieldName] }}</a-col>
@@ -44,8 +44,9 @@
           <div class="part-title-text">账款信息</div>
         </div>
         <a-row class="detail">
-          <template v-for="item in accountInfoList">
+          <template v-if="accountInfoShowList.length > 0">
-            <a-col :xxl="6" :xl="8" :sm="12" class="detail-item" v-if="detailData[item.fieldName] && detailData[item.fieldName] !== ''">
+            <a-col :xxl="6" :xl="8" :sm="12" class="detail-item" v-for="(item, index) in accountInfoShowList"
+                   :key="index">
               <a-row>
                 <a-col :sm="10" :xs="24">{{ item.title }}:</a-col>
                 <a-col :sm="14" :xs="24">{{ detailData[item.fieldName] }}</a-col>
@@ -62,8 +63,8 @@
           <div class="part-title-text">其他信息</div>
         </div>
         <a-row class="detail">
-          <template v-for="item in otherInfoList">
+          <template v-if="otherInfoShowList.length > 0">
-            <a-col :xxl="6" :xl="8" :sm="12" class="detail-item" v-if="detailData[item.fieldName] && detailData[item.fieldName] !== ''">
+            <a-col :xxl="6" :xl="8" :sm="12" class="detail-item" v-for="(item, index) in otherInfoShowList" :key="index">
               <a-row>
                 <a-col :sm="10" :xs="24">{{ item.title }}:</a-col>
                 <a-col :sm="14" :xs="24">{{ detailData[item.fieldName] }}</a-col>
@@ -80,14 +81,12 @@
           <div class="part-title-text">分期信息</div>
         </div>
         <a-row class="detail">
-          <template v-for="(item, index) in mainInfoList">
+          <a-col :xxl="4" :xl="8" :sm="12" class="detail-item">
-            <a-col :xxl="4" :xl="8" :sm="12" class="detail-item" v-if="detailData[item.fieldName] && detailData[item.fieldName] !== ''">
+            <a-row>
-              <a-row>
+              <a-col :sm="10" :xs="24"></a-col>
-                <a-col :sm="10" :xs="24">{{ item.title }}:</a-col>
+              <a-col :sm="14" :xs="24"></a-col>
-                <a-col :sm="14" :xs="24">{{ detailData[item.fieldName] }}</a-col>
+            </a-row>
-              </a-row>
+          </a-col>
-            </a-col>
-          </template>
         </a-row>
       </div>
       <a-divider></a-divider>
@@ -120,7 +119,7 @@
 
 <script>
 import IconImg from '@/assets/imgs/icon/icon_revenue_contract.png'
-import PageHeaderTitle from '../../../../components/layouts/PageHeaderTitle'
+import PageHeaderTitle from '@/components/layouts/PageHeaderTitle'
 
 export default {
   name: 'RevenueContractDetail',
@@ -128,8 +127,9 @@ export default {
   data() {
     return {
       IconImg,
-      contractNum: '',
+      detailData: {
-      detailData: {},
+        contractNum: '132465'
+      },
       // 主体信息
       mainInfoList: [
         {
@@ -164,6 +164,7 @@ export default {
           title: '未税金额'
         }
       ],
+      // 日期节点
       dateNodeList: [
         {
           fieldName: 'contractDate',
@@ -176,6 +177,7 @@ export default {
           title: '合同约定主要时点'
         }
       ],
+      // 账款信息
       accountInfoList: [
         {
           fieldName: 'accountsReceivableAmount',
@@ -191,6 +193,7 @@ export default {
           title: '赊账状态'
         }
       ],
+      // 其他信息
       otherInfoList: [
         {
           fieldName: 'contractPaymentTimes',
@@ -207,9 +210,26 @@ export default {
       installmentList: []
     }
   },
+  computed: {
+    // 主体信息，去掉没有数据的字段
+    mainInfoShowList() {
+      return this.mainInfoList.filter(item => this.detailData[item.fieldName] && this.detailData[item.fieldName] !== '') || []
+    },
+    // 日期节点
+    dateNodeShowList() {
+      return this.dateNodeList.filter(item => this.detailData[item.fieldName] && this.detailData[item.fieldName] !== '') || []
+    },
+    // 账款信息
+    accountInfoShowList() {
+      return this.accountInfoList.filter(item => this.detailData[item.fieldName] && this.detailData[item.fieldName] !== '') || []
+    },
+    // 其他信息
+    otherInfoShowList() {
+      return this.otherInfoList.filter(item => this.detailData[item.fieldName] && this.detailData[item.fieldName] !== '') || []
+    }
+  },
   created() {
     console.log(this.$route.query.revenueId)
-    this.contractNum = this.$route.query.contractNum
   }
 }
 </script>

src/views/contractManagement/revenueContract/modules/RevenueContractModule.vue

@@ -56,7 +56,8 @@
               <a-form-item label="负责人" :labelCol="labelCol" :wrapperCol="wrapperCol">
                 <select-principal placeholder="请选择负责人"
                                   :disabled="isSaved"
-                                  v-decorator="['principalId',validatorRules.principalId]"></select-principal>
+                                  v-decorator="['principalId',validatorRules.principalId]"
+                                  @change="principalChange"></select-principal>
               </a-form-item>
             </a-col>
             <a-col :xxl="6" :xl="8" :sm="12">
@@ -261,6 +262,7 @@ import InstallmentForm from '../../../../components/form/InstallmentForm'
 import ProjectTypeSelection from './ProjectTypeSelection'
 import SelectProjectModule from './SelectProjectModule'
 import pick from 'lodash.pick'
+import { getAllUserList } from '../../../../api/api'
 
 // 普通项目表头
 const generalProjectColumns = [
@@ -520,6 +522,21 @@ export default {
       this.selectedCompany = value
       this.model.signedContactsId = undefined
     },
+    /**
+     * 负责人变化获取部门信息回显至部门名称
+     * @param value
+     */
+    principalChange(value) {
+      let param = {
+        id: value
+      }
+      getAllUserList(param).then(res => {
+        this.model.departmentName = res.result[0].orgCodeTxt
+        this.$nextTick(() => {
+          this.form.setFieldsValue(pick(this.model, 'departmentName'))
+        })
+      })
+    },
     /**
      * 选择关联项目
      */

src/views/projectManagement/modules/GeneralProjectModule.vue

@@ -217,11 +217,11 @@ export default {
         },
         contactsId: {
           rules: [{ required: true, message: '请选择联系人' }],
-          validateTrigger: 'blur'
+          validateTrigger: 'change'
         },
         mailContactsId: {
           rules: [{ required: true, message: '请选择邮寄联系人' }],
-          validateTrigger: 'blur'
+          validateTrigger: 'change'
         },
         receivableAmount: {
           rules: [{ required: true, message: '请输入应收金额' }],

src/views/projectManagement/modules/WorkingGroupMemberUnitModule.vue

@@ -274,6 +274,10 @@ export default {
       this.selectedCompany = record.chargeCompany
       this.form.resetFields()
       this.model = Object.assign({}, record)
+      this.model.contactsIdOne = this.model.contactsTemporaryIdOne || undefined
+      this.model.contactsIdTwo = this.model.contactsTemporaryIdTwo || undefined
+      this.model.contactsIdThree = this.model.contactsTemporaryIdThree || undefined
+      this.model.mailContactsId = this.model.mailContactsTemporaryId || undefined
       if (this.model.id) {
         this.selectedContact1 = {
           id: this.model.contactsTemporaryIdOne,
@@ -346,7 +350,12 @@ export default {
     handlechargeWayChange(e) {
       if (e.target.value === 3) {
         if (this.chargeNoticeList.length === 0) {
+          this.chargeWayType = null
+          this.model.chargeWay = null
           this.$message.warn('请先补充该工作组的收费通知信息')
+          this.$nextTick(() => {
+            this.form.setFieldsValue(pick(this.model, 'chargeWay'))
+          })
           return
         }
       }