[update] 收入合同、eslint

public/api_address_config.js

@@ -9,4 +9,4 @@ window._CONFIG["staticDomainURL"] = window._CONFIG["domianURL"] + "/sys/common/d
 window._CONFIG["pdfDomainURL"] = window._CONFIG["domianURL"] + "/sys/common/pdf/pdfPreviewIframe";
 window._CONFIG["casPrefixUrl"] = "http://cas.example.org:8443/cas";
 // 预览文件地址
-window._CONFIG["onlinePreviewDomainURL"] = "http://127.0.0.1:8012/onlinePreview";
+window._CONFIG["onlinePreviewDomainURL"] = "http://localhost:8012/onlinePreview";

src/api/incomePaymentsApi.js

@@ -1,11 +1,17 @@
-import { getAction } from '@api/manage'
+import { getAction, postAction } from '@api/manage'
 
 // 通过id获取工作组详情
 const getWorkingGroupById = (params) => getAction('/project/payWorkingGroup/queryById', params)
 // 判断工作组成员是否设置来款通知
 const getChargeNotice = (param) => getAction('/project/payWorkingGroupSubitem/getCharge', param)
+// 通过id获取收入合同信息
+const getRevenueContractById = (param) => getAction('/contract/payIncomeContract/queryById', param)
+// 收入合同审核
+const aduitRevenueContract = (param) => postAction('/contract/payIncomeContract/audit', param)
 
 export {
 	getWorkingGroupById,
-	getChargeNotice
+	getChargeNotice,
+  getRevenueContractById,
+  aduitRevenueContract
 }

src/components/company/SelectContacts.vue

@@ -91,15 +91,16 @@ export default {
      * 获取联系人数据
      */
     getContactsList() {
-      if (this.selectedCompany && this.selectedCompany.hasOwnProperty('id')) {
+      if (this.selectedCompany && this.selectedCompany.hasOwnProperty.call(this.selectedCompany, 'id')) {
         const params = {
           companyId: this.selectedCompany.id
         }
         getContactsByCompany(params).then(res => {
           this.contactsList = res.result
-          if (this.initContacts && this.initContacts.hasOwnProperty('id')) {
+          if (this.initContacts && this.initContacts.hasOwnProperty.call(this.initContacts, 'id')) {
             this.contactsList.push(this.initContacts)
           }
+          console.log(this.contactsList)
         })
       }
     },
@@ -127,7 +128,7 @@ export default {
       )
     },
     handleDropdownOpen() {
-      if (this.isFirstOpen && this.initContacts && this.initContacts.hasOwnProperty('id')) {
+      if (this.isFirstOpen && this.initContacts && this.initContacts.hasOwnProperty.call(this.initContacts, 'id')) {
         this.contactsList.forEach((item, index) => {
           if (item.id === this.initContacts.id) {
             this.$emit('change', undefined)

src/components/form/InstallmentForm.vue

@@ -116,13 +116,14 @@ export default {
      */
     initInstallmentList(record) {
       // 判断是否为编辑
-      if (record.installmentList && record.installmentList.length > 0) {
+      if (record && record.length > 0) {
-        this.installmentList = record.installmentList
+        this.installmentList = record
       } else {
-        record.installmentList = [this.defaultFormData]
+        record = [this.defaultFormData]
       }
-      this.model = Object({}, record)
+      let obj = {}
-      this.installmentList = record.installmentList
+      obj.installmentList = record
+      this.model = Object.assign({}, obj)
       this.$nextTick(() => {
         this.form.setFieldsValue(pick(this.model, 'installmentList'))
       })

src/views/contractManagement/revenueContract/RevenueContractList.vue

@@ -8,17 +8,17 @@
           <a-row>
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
               <a-form-item label="合同编号" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                <a-input placeholder="请输入合同编号" v-model="queryParam.workingGroupProject"></a-input>
+                <a-input placeholder="请输入合同编号" v-model="queryParam.contractNum"></a-input>
               </a-form-item>
             </a-col>
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
               <a-form-item label="合同名称" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                <a-input placeholder="请输入合同名称" v-model="queryParam.workingGroupProject"></a-input>
+                <a-input placeholder="请输入合同名称" v-model="queryParam.contractName"></a-input>
               </a-form-item>
             </a-col>
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
               <a-form-item label="关联项目" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                <a-input placeholder="请输入关联项目" v-model="queryParam.workingGroupProject"></a-input>
+                <a-input placeholder="请输入关联项目" v-model="queryParam.projectName"></a-input>
               </a-form-item>
             </a-col>
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
@@ -27,12 +27,13 @@
                     format="YYYY-MM-DD HH:mm:00"
                     :show-time="{ format: 'HH:mm' }"
                     :trigger-change="true"
+                    v-model="queryParam.createTime"
                     style="width: 100%"/>
               </a-form-item>
             </a-col>
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
               <a-form-item label="合同状态" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                <j-dict-select-tag v-model="queryParam.chargeUse" placeholder="请选择合同状态" dictCode="sex"/>
+                <j-dict-select-tag v-model="queryParam.status" placeholder="请选择合同状态" dictCode="revenue_contract_status"/>
               </a-form-item>
             </a-col>
             <a-col :xl="7" :lg="8" :md="9" :sm="24">
@@ -78,8 +79,8 @@
 
           <!--        项目名称 待审核状态为红色-->
           <template slot="projectName" slot-scope="text, record">
-            <div class="primary-color" @click="toRevenueContractDetail(record.id)" v-if="record.status !== 1">{{ text }}</div>
+            <div @click="toRevenueContractDetail(record.id, record.contractNum)" v-if="record.status === 2 || record.status === 4">{{ text }}</div>
-            <div @click="toRevenueContractDetail(record.id, record.contractNum)" v-else>{{ text }}</div>
+            <div class="primary-color" @click="toRevenueContractDetail(record.id)" v-else>{{ text }}</div>
           </template>
 
           <template slot="text" slot-scope="text">
@@ -87,12 +88,16 @@
           </template>
 
           <span slot="action" class="action-span-cell" slot-scope="text, record">
-            <a @click="handleEdit(record.id, record.contractNum)">编辑</a>
+            <a @click="handleAudit(record.id)" v-if="record.status === 2 || record.status === 4">审核</a>
-            <a @click="handleDelete(record.id)">删除</a>
+            <a @click="handleEdit(record.id, record.contractNum)" v-if="record.status === 1 || record.status === 2 || record.status === 4">编辑</a>
+            <a @click="handleArchive(record.id)" v-if="record.status === 3">存档</a>
+            <a @click="handleDelete(record.id)" v-if="record.status === 1 || record.status === 2 || record.status === 4">删除</a>
+            <a :disabled="true" v-if="record.status === 5">已存档</a>
           </span>
         </a-table>
       </div>
     </a-card>
+    <revenue-contract-aduit-module ref="aduitForm" @ok="aduitOk"></revenue-contract-aduit-module>
   </div>
 </template>
 
@@ -100,10 +105,11 @@
 import IconImg from '@assets/imgs/icon/icon_revenue_contract.png'
 import PageHeaderTitle from '../../../components/layouts/PageHeaderTitle'
 import { JeroListMixin } from '../../../mixins/JeroListMixin'
+import RevenueContractAduitModule from './modules/RevenueContractAduitModule'
 
 export default {
   name: 'RevenueContractList',
-  components: { PageHeaderTitle },
+  components: { PageHeaderTitle, RevenueContractAduitModule },
   mixins: [JeroListMixin],
   data() {
     return {
@@ -127,9 +133,10 @@ export default {
         }
       ],
       url: {
-        list: '',
+        list: '/contract/payIncomeContract/list',
-        delete: '',
+        exportXlsUrl: '/contract/payIncomeContract/exportXls',
-        deleteBatch: ''
+        delete: '/contract/payIncomeContract/delete',
+        deleteBatch: '/contract/payIncomeContract/deleteBatch'
       },
       columns: [
         {
@@ -187,7 +194,7 @@ export default {
           dataIndex: 'action',
           align: 'center',
           fixed: 'right',
-          width: 180,
+          width: 200,
           scopedSlots: { customRender: 'action' }
         }
       ],
@@ -202,6 +209,10 @@ export default {
     }
   },
   methods: {
+    searchQuery() {
+      this.lastQueryParam = {...this.queryParam}
+      this.loadData(1)
+    },
     toRevenueContractDetail(id, contractNum) {
       this.$router.push({
         path: '/contractManagement/RevenueContractDetail',
@@ -231,12 +242,21 @@ export default {
      * @returns {string}
      */
     aduitClass(record) {
-      console.log(record)
+      if (record.status === 2 || record.status === 4) {
-      if (record.status === 1) {
-        console.log(1)
         return 'aduit'
       }
       return ''
+    },
+    /**
+     * 审核
+     * @param id
+     */
+    handleAudit(id) {
+      this.$refs.aduitForm.contractId = id
+      this.$refs.aduitForm.open()
+    },
+    aduitOk() {
+
     }
   }
 }

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

@@ -0,0 +1,111 @@
+<template>
+  <j-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    :confirmLoading="confirmLoading"
+    switchFullscreen
+    @ok="handleOk"
+    @cancel="handleCancel"
+    cancelText="关闭">
+    <a-form :form="form">
+      <a-form-item label="审核人" :labelCol="labelCol" :wrapperCol="wrapperCol">
+        <a-input placeholder="请输入审核人"
+                 v-decorator="['userName',validatorRules.userName]"
+                 :maxLength='50'
+                 :disabled="true"
+                 @change="e => {e.target.value = (e.target.value + '').trim()}"></a-input>
+      </a-form-item>
+      <a-form-item label="审核" :labelCol="labelCol" :wrapperCol="wrapperCol">
+        <a-radio-group v-decorator="['contractStatus', validatorRules.contractStatus]">
+          <a-radio :value="0">通过</a-radio>
+          <a-radio :value="1">拒绝</a-radio>
+        </a-radio-group>
+      </a-form-item>
+      <a-form-item label="拒绝说明" :labelCol="labelCol" :wrapperCol="wrapperCol">
+        <a-textarea
+          placeholder="请输入拒绝说明"
+          v-decorator="['explainRemarks', validatorRules.explainRemarks]"
+          :auto-size="{ minRows: 3, maxRows: 6 }"
+          :maxLength='200'
+          @change="e => {e.target.value = (e.target.value + '').trim()}"/>
+      </a-form-item>
+    </a-form>
+  </j-modal>
+</template>
+
+<script>
+import { aduitRevenueContract } from '../../../../api/incomePaymentsApi'
+
+export default {
+  name: 'RevenueContractAduitModule',
+  data() {
+    return {
+      title: '审核',
+      width: 600,
+      visible: false,
+      confirmLoading: false,
+      form: this.$form.createForm(this),
+      contractId: '',
+      labelCol: {
+        xs: { span: 24 },
+        sm: { span: 4 }
+      },
+      wrapperCol: {
+        xs: { span: 24 },
+        sm: { span: 20 }
+      },
+      validatorRules: {
+        userName: {
+          rules: [{ required: true, message: '请输入审核人' }],
+          validateTrigger: 'blur'
+        },
+        contractStatus: {
+          rules: [{ required: true, message: '请选择审核状态' }],
+          validateTrigger: 'blur'
+        },
+        explainRemarks: {
+          rules: [{ required: true, message: '请输入拒绝说明' }],
+          validateTrigger: 'blur'
+        }
+      }
+    }
+  },
+  methods: {
+    handleOk() {
+      // 触发表单验证
+      this.form.validateFields((err, values) => {
+        if (!err) {
+          values.contractId = this.contractId
+          const formData = Object.assign(this.model, values)
+          console.log('表单提交数据', formData)
+          aduitRevenueContract(formData).then((res) => {
+            if (res.success) {
+              this.$message.success(res.message)
+              this.$emit('ok')
+              this.close()
+            } else {
+              this.$message.warning(res.message)
+            }
+          }).finally(() => {
+            this.confirmLoading = false
+          })
+        }
+      })
+    },
+    handleCancel() {
+      this.close()
+    },
+    open() {
+      this.visible = true
+    },
+    close() {
+      this.visible = false
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

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

@@ -11,7 +11,7 @@
           <template v-if="mainInfoShowList.length > 0">
             <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="10" :xs="24" class="detail-item-title">{{ item.title }}:</a-col>
                 <a-col :sm="14" :xs="24">{{ detailData[item.fieldName] }}</a-col>
               </a-row>
             </a-col>
@@ -29,7 +29,7 @@
           <template v-if="dateNodeShowList.length > 0">
             <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="10" :xs="24" class="detail-item-title">{{ item.title }}:</a-col>
                 <a-col :sm="14" :xs="24">{{ detailData[item.fieldName] }}</a-col>
               </a-row>
             </a-col>
@@ -48,7 +48,7 @@
             <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="10" :xs="24" class="detail-item-title">{{ item.title }}:</a-col>
                 <a-col :sm="14" :xs="24">{{ detailData[item.fieldName] }}</a-col>
               </a-row>
             </a-col>
@@ -64,9 +64,10 @@
         </div>
         <a-row class="detail">
           <template v-if="otherInfoShowList.length > 0">
-            <a-col :xxl="6" :xl="8" :sm="12" class="detail-item" v-for="(item, index) in otherInfoShowList" :key="index">
+            <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="10" :xs="24" class="detail-item-title">{{ item.title }}:</a-col>
                 <a-col :sm="14" :xs="24">{{ detailData[item.fieldName] }}</a-col>
               </a-row>
             </a-col>
@@ -80,11 +81,35 @@
         <div class="part-title">
           <div class="part-title-text">分期信息</div>
         </div>
-        <a-row class="detail">
+        <a-row class="detail" v-for="(item, index) in detailData.listInstallment" :key="item.id">
           <a-col :xxl="4" :xl="8" :sm="12" class="detail-item">
             <a-row>
-              <a-col :sm="10" :xs="24"></a-col>
+              <a-col :sm="10" :xs="24" class="detail-item-title">{{ index + 1 }}阶段:</a-col>
-              <a-col :sm="14" :xs="24"></a-col>
+              <a-col :sm="14" :xs="24">{{ item.phaseName }}</a-col>
+            </a-row>
+          </a-col>
+          <a-col :xxl="4" :xl="8" :sm="12" class="detail-item">
+            <a-row>
+              <a-col :sm="10" :xs="24" class="detail-item-title">{{ index + 1 }}阶段应收:</a-col>
+              <a-col :sm="14" :xs="24">{{ item.accountsReceivableAmount }}</a-col>
+            </a-row>
+          </a-col>
+          <a-col :xxl="4" :xl="8" :sm="12" class="detail-item">
+            <a-row>
+              <a-col :sm="10" :xs="24" class="detail-item-title">{{ index + 1 }}阶段应收时间:</a-col>
+              <a-col :sm="14" :xs="24">{{ item.accountsReceivableTime }}</a-col>
+            </a-row>
+          </a-col>
+          <a-col :xxl="4" :xl="8" :sm="12" class="detail-item">
+            <a-row>
+              <a-col :sm="10" :xs="24" class="detail-item-title">{{ index + 1 }}阶段实收:</a-col>
+              <a-col :sm="14" :xs="24">{{ item.paidAmount }}</a-col>
+            </a-row>
+          </a-col>
+          <a-col :xxl="4" :xl="8" :sm="12" class="detail-item">
+            <a-row>
+              <a-col :sm="10" :xs="24" class="detail-item-title">{{ index + 1 }}阶段实收时间:</a-col>
+              <a-col :sm="14" :xs="24">{{ item.paidTime }}</a-col>
             </a-row>
           </a-col>
         </a-row>
@@ -120,6 +145,7 @@
 <script>
 import IconImg from '@/assets/imgs/icon/icon_revenue_contract.png'
 import PageHeaderTitle from '@/components/layouts/PageHeaderTitle'
+import { getRevenueContractById } from '../../../../api/incomePaymentsApi'
 
 export default {
   name: 'RevenueContractDetail',
@@ -127,9 +153,7 @@ export default {
   data() {
     return {
       IconImg,
-      detailData: {
+      detailData: {},
-        contractNum: '132465'
-      },
       // 主体信息
       mainInfoList: [
         {
@@ -199,10 +223,10 @@ export default {
           fieldName: 'contractPaymentTimes',
           title: '合同约定付款次数'
         }, {
-          fieldName: 'package_dictText',
+          fieldName: 'pack_dictText',
           title: '是否打包'
         }, {
-          fieldName: 'packageYear',
+          fieldName: 'packYear',
           title: '打包年份'
         }
       ],
@@ -229,7 +253,18 @@ export default {
     }
   },
   created() {
-    console.log(this.$route.query.revenueId)
+    this.initDetailData(this.$route.query.revenueId)
+  },
+  methods: {
+    initDetailData(id) {
+      let param = {
+        id: id
+      }
+      getRevenueContractById(param).then(res => {
+        this.detailData = res.result
+        this.detailData.pack = this.detailData.pack === 1 ? '是' : this.detailData.pack === 0 ? '否' : ''
+      })
+    }
   }
 }
 </script>
@@ -242,6 +277,13 @@ export default {
 
   &-item {
     padding-top: 10px;
+    color: #2F3133;
+
+    &-title {
+      color: #999999;
+      padding-right: 5px;
+      text-align: right;
+    }
   }
 }
 

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

@@ -1,242 +1,236 @@
 <template>
   <div>
-    <page-header-title :is-level-one="false" :img-for-icon="IconImg" level-two-title="新建收入合同"></page-header-title>
+    <page-header-title :is-level-one="false" :img-for-icon="IconImg" :level-two-title="title"></page-header-title>
     <a-card :bordered="false">
-      <a-form :form="form">
+      <a-spin :spinning="confirmLoading">
-        <!--        主体信息-->
+        <a-form :form="form">
-        <div>
+          <!--        主体信息-->
-          <div class="part-title">
-            <div class="part-title-text">主体信息</div>
-          </div>
-          <a-row>
-            <a-col :xxl="6" :xl="8" :sm="12">
-              <a-form-item label="合同编号" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                <a-input placeholder="请输入合同编号"
-                         v-decorator="['contractNum',validatorRules.contractNum]"
-                         :maxLength='50'
-                         :disabled="isSaved"
-                         @change="e => {e.target.value = (e.target.value + '').trim()}"></a-input>
-              </a-form-item>
-            </a-col>
-            <a-col :xxl="6" :xl="8" :sm="12">
-              <a-form-item label="合同名称" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                <a-input placeholder="请输入合同名称"
-                         v-decorator="['contractName',validatorRules.contractName]"
-                         :maxLength='50'
-                         :disabled="isSaved"
-                         @change="e => {e.target.value = (e.target.value + '').trim()}"></a-input>
-              </a-form-item>
-            </a-col>
-            <a-col :xxl="6" :xl="8" :sm="12">
-              <a-form-item label="签订单位" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                <company-select placeholder="请选择签订单位"
-                                :disabled="isSaved"
-                                v-decorator="['signedCompany',validatorRules.signedCompany]"
-                                @change="handleSignedCompanyChange"></company-select>
-              </a-form-item>
-            </a-col>
-            <a-col :xxl="6" :xl="8" :sm="12">
-              <a-form-item label="签订联系人" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                <select-contacts placeholder="请选择签订联系人"
-                                 :disabled="isSaved"
-                                 :selected-company="selectedCompany"
-                                 v-decorator="['signedContactsId',validatorRules.signedContactsId]"></select-contacts>
-              </a-form-item>
-            </a-col>
-            <a-col :xxl="6" :xl="8" :sm="12">
-              <a-form-item label="是否开口" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                <j-dict-select-tag v-decorator="['opening']"
-                                   :triggerChange="true"
-                                   :disabled="isSaved"
-                                   placeholder="请选择是否开口"
-                                   dictCode="revenue_contract_open"/>
-              </a-form-item>
-            </a-col>
-            <a-col :xxl="6" :xl="8" :sm="12">
-              <a-form-item label="负责人" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                <select-principal placeholder="请选择负责人"
-                                  :disabled="isSaved"
-                                  v-decorator="['principalId',validatorRules.principalId]"
-                                  @change="principalChange"></select-principal>
-              </a-form-item>
-            </a-col>
-            <a-col :xxl="6" :xl="8" :sm="12">
-              <a-form-item label="部门名称" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                <a-input placeholder="请输入部门名称"
-                         v-decorator="['departmentName']"
-                         :disabled="true"></a-input>
-              </a-form-item>
-            </a-col>
-            <a-col :xxl="6" :xl="8" :sm="12">
-              <a-form-item label="签订合同总金额" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                <a-input placeholder="请输入签订合同总金额"
-                         :disabled="isSaved"
-                         v-decorator="['contractAmount',validatorRules.contractAmount]"
-                         :maxLength='50'
-                         @change="(e) => {e.target.value = (e.target.value.replace(/[^0-9.]/g,'')).trim()}"></a-input>
-              </a-form-item>
-            </a-col>
-            <a-col :xxl="6" :xl="8" :sm="12">
-              <a-form-item label="税率" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                <a-input placeholder="请输入税率"
-                         :disabled="isSaved"
-                         v-decorator="['rate',validatorRules.rate]"
-                         :maxLength='50'
-                         @change="e => {e.target.value = (e.target.value + '').trim()}"></a-input>
-              </a-form-item>
-            </a-col>
-            <a-col :xxl="6" :xl="8" :sm="12">
-              <a-form-item label="未税金额" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                <a-input placeholder="请输入未税金额"
-                         :disabled="isSaved"
-                         v-decorator="['noTaxAmount']"
-                         :maxLength='50'
-                         @change="(e) => {e.target.value = (e.target.value.replace(/[^0-9.]/g,'')).trim()}"></a-input>
-              </a-form-item>
-            </a-col>
-          </a-row>
-        </div>
-        <!--        /主体信息-->
-        <a-divider></a-divider>
-        <!--        日期节点-->
-        <div>
-          <div class="part-title">
-            <div class="part-title-text">日期节点</div>
-          </div>
-          <a-row :gutter="30">
-            <a-col :xxl="6" :xl="8" :sm="12">
-              <a-form-item label="合同签订日期" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                <j-date placeholder="请选择合同签订日期"
-                        style="width: 100%;"
-                        :disabled="isSaved"
-                        v-decorator="['contractDate']"
-                        :trigger-change="true"
-                        date-format="YYYY-MM-DD"/>
-              </a-form-item>
-            </a-col>
-            <a-col :xxl="6" :xl="8" :sm="12">
-              <a-form-item label="合同终止日期" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                <j-date placeholder="请选择合同终止日期"
-                        style="width: 100%;"
-                        :disabled="isSaved"
-                        v-decorator="['terminationDate']"
-                        :trigger-change="true"
-                        date-format="YYYY-MM-DD"/>
-              </a-form-item>
-            </a-col>
-            <a-col :xxl="6" :xl="8" :sm="12">
-              <a-form-item label="合同约定主要时点" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                <j-date placeholder="请选择合同约定主要时点"
-                        style="width: 100%;"
-                        :disabled="isSaved"
-                        v-decorator="['contractTimePoints']"
-                        :trigger-change="true"
-                        date-format="YYYY-MM-DD"/>
-              </a-form-item>
-            </a-col>
-          </a-row>
-        </div>
-        <!--        /日期节点-->
-        <a-divider></a-divider>
-        <!--        账款信息-->
-        <div>
-          <div class="part-title">
-            <div class="part-title-text">账款信息</div>
-          </div>
           <div>
-            <a-row :gutter="30">
+            <div class="part-title">
+              <div class="part-title-text">主体信息</div>
+            </div>
+            <a-row>
               <a-col :xxl="6" :xl="8" :sm="12">
-                <a-form-item label="应收金额" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                <a-form-item label="合同编号" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                  <a-input placeholder="请输入应收金额"
+                  <a-input placeholder="请输入合同编号"
-                           v-decorator="['accountsReceivableAmount',validatorRules.accountsReceivableAmount]"
+                           v-decorator="['contractNum',validatorRules.contractNum]"
-                           :maxLength='50'
-                           :disabled="isSaved"
-                           @change="(e) => {e.target.value = (e.target.value.replace(/[^0-9.]/g,'')).trim()}"></a-input>
-                </a-form-item>
-              </a-col>
-              <a-col :xxl="6" :xl="8" :sm="12">
-                <a-form-item label="已收金额" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                  <a-input placeholder="请输入已收金额"
-                           v-decorator="['amountReceived',validatorRules.amountReceived]"
-                           :maxLength='50'
-                           :disabled="isSaved"
-                           @change="(e) => {e.target.value = (e.target.value.replace(/[^0-9.]/g,'')).trim()}"></a-input>
-                </a-form-item>
-              </a-col>
-              <a-col :xxl="6" :xl="8" :sm="12">
-                <a-form-item label="未收金额" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                  <a-input placeholder="请输入未收金额"
-                           :maxLength='50'
-                           v-decorator="['amountReceived',validatorRules.amountReceived]"
-                           :disabled="true"></a-input>
-                </a-form-item>
-              </a-col>
-              <a-col :xxl="6" :xl="8" :sm="12">
-                <a-form-item label="赊账状态" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                  <j-dict-select-tag v-decorator="['accountStatus']"
-                                     :triggerChange="true"
-                                     placeholder="请选择赊账状态"
-                                     dictCode="revenue_contract_account_status"
-                                     :disabled="true"/>
-                </a-form-item>
-              </a-col>
-            </a-row>
-          </div>
-        </div>
-        <!--        /账款信息-->
-        <a-divider></a-divider>
-        <!--        其他-->
-        <div>
-          <div class="part-title">
-            <div class="part-title-text">其他信息</div>
-          </div>
-          <div>
-            <a-row :gutter="30">
-              <a-col :xxl="6" :xl="8" :sm="12">
-                <a-form-item label="合同约定付款次数" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                  <a-input placeholder="请输入合同约定付款次数"
-                           v-decorator="['contractPaymentTimes']"
                            :maxLength='50'
                            :disabled="isSaved"
                            @change="e => {e.target.value = (e.target.value + '').trim()}"></a-input>
                 </a-form-item>
               </a-col>
               <a-col :xxl="6" :xl="8" :sm="12">
-                <a-form-item label="是否打包" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                <a-form-item label="合同名称" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                  <j-dict-select-tag v-decorator="['package', validatorRules.package]"
+                  <a-input placeholder="请输入合同名称"
-                                     :triggerChange="true"
+                           v-decorator="['contractName',validatorRules.contractName]"
-                                     placeholder="请选择是否打包"
+                           :maxLength='50'
-                                     dictCode="yn"
+                           :disabled="isSaved"
-                                     :disabled="isSaved"/>
+                           @change="e => {e.target.value = (e.target.value + '').trim()}"></a-input>
                 </a-form-item>
               </a-col>
               <a-col :xxl="6" :xl="8" :sm="12">
-                <a-form-item label="打包年份" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                <a-form-item label="签订单位" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                  <j-year-date style="width:100%"
+                  <company-select placeholder="请选择签订单位"
-                               :disabled="isSaved"
+                                  :disabled="isSaved"
-                               placeholder="请选择打包年份"
+                                  v-decorator="['signedCompany',validatorRules.signedCompany]"
-                               v-decorator="['packageYear',validatorRules.packageYear]"></j-year-date>
+                                  @change="handleSignedCompanyChange"></company-select>
+                </a-form-item>
+              </a-col>
+              <a-col :xxl="6" :xl="8" :sm="12">
+                <a-form-item label="签订联系人" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                  <select-contacts placeholder="请选择签订联系人"
+                                   :selected-company="selectedCompany"
+                                   :init-contacts="selectedContact"
+                                   v-decorator="['signedContactsId',validatorRules.signedContactsId]"></select-contacts>
+                </a-form-item>
+              </a-col>
+              <a-col :xxl="6" :xl="8" :sm="12">
+                <a-form-item label="是否开口" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                  <j-dict-select-tag v-decorator="['opening']"
+                                     :triggerChange="true"
+                                     placeholder="请选择是否开口"
+                                     dictCode="revenue_contract_open"/>
+                </a-form-item>
+              </a-col>
+              <a-col :xxl="6" :xl="8" :sm="12">
+                <a-form-item label="负责人" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                  <select-principal placeholder="请选择负责人"
+                                    v-decorator="['principalId',validatorRules.principalId]"
+                                    @change="principalChange"></select-principal>
+                </a-form-item>
+              </a-col>
+              <a-col :xxl="6" :xl="8" :sm="12">
+                <a-form-item label="部门名称" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                  <a-input placeholder="请输入部门名称"
+                           v-decorator="['departmentName']"
+                           :disabled="true"></a-input>
+                </a-form-item>
+              </a-col>
+              <a-col :xxl="6" :xl="8" :sm="12">
+                <a-form-item label="签订合同总金额" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                  <a-input placeholder="请输入签订合同总金额"
+                           v-decorator="['contractAmount',validatorRules.contractAmount]"
+                           :maxLength='50'
+                           @change="contractAmountChange"></a-input>
+                </a-form-item>
+              </a-col>
+              <a-col :xxl="6" :xl="8" :sm="12">
+                <a-form-item label="税率" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                  <a-input placeholder="请输入税率"
+                           v-decorator="['rate',validatorRules.rate]"
+                           :maxLength='50'
+                           @change="rateChange"></a-input>
+                </a-form-item>
+              </a-col>
+              <a-col :xxl="6" :xl="8" :sm="12">
+                <a-form-item label="未税金额" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                  <a-input placeholder="请输入未税金额"
+                           v-decorator="['noTaxAmount']"
+                           :maxLength='50'
+                           :disabled="true"
+                           @change="(e) => {e.target.value = (e.target.value.replace(/[^0-9.]/g,'')).trim()}"></a-input>
                 </a-form-item>
               </a-col>
             </a-row>
           </div>
-        </div>
+          <!--        /主体信息-->
-        <!--        /其他-->
+          <a-divider></a-divider>
-        <a-divider></a-divider>
+          <!--        日期节点-->
-        <!--        分期信息-->
+          <div>
-        <div>
+            <div class="part-title">
-          <div class="part-title">
+              <div class="part-title-text">日期节点</div>
-            <div class="part-title-text">分期信息</div>
+            </div>
+            <a-row :gutter="30">
+              <a-col :xxl="6" :xl="8" :sm="12">
+                <a-form-item label="合同签订日期" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                  <j-date placeholder="请选择合同签订日期"
+                          style="width: 100%;"
+                          v-decorator="['contractDate']"
+                          :trigger-change="true"
+                          date-format="YYYY-MM-DD"/>
+                </a-form-item>
+              </a-col>
+              <a-col :xxl="6" :xl="8" :sm="12">
+                <a-form-item label="合同终止日期" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                  <j-date placeholder="请选择合同终止日期"
+                          style="width: 100%;"
+                          v-decorator="['terminationDate']"
+                          :trigger-change="true"
+                          date-format="YYYY-MM-DD"/>
+                </a-form-item>
+              </a-col>
+              <a-col :xxl="6" :xl="8" :sm="12">
+                <a-form-item label="合同约定主要时点" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                  <j-date placeholder="请选择合同约定主要时点"
+                          style="width: 100%;"
+                          v-decorator="['contractTimePoints']"
+                          :trigger-change="true"
+                          date-format="YYYY-MM-DD"/>
+                </a-form-item>
+              </a-col>
+            </a-row>
           </div>
-          <installment-form ref="installmentForm" @ok="installmentFormOk" :disabled="isSaved"></installment-form>
+          <!--        /日期节点-->
-        </div>
+          <a-divider></a-divider>
-        <!--        /分期信息-->
+          <!--        账款信息-->
-        <a-form-item class="table-operator">
+          <div>
-          <a-button type="primary" @click="handleSave">保存</a-button>
+            <div class="part-title">
-          <a-button @click="handleCancle">取消</a-button>
+              <div class="part-title-text">账款信息</div>
-        </a-form-item>
+            </div>
-      </a-form>
+            <div>
+              <a-row :gutter="30">
+                <a-col :xxl="6" :xl="8" :sm="12">
+                  <a-form-item label="应收金额" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                    <a-input placeholder="请输入应收金额"
+                             v-decorator="['accountsReceivableAmount',validatorRules.accountsReceivableAmount]"
+                             :maxLength='50'
+                             @change="accountsReceivableChange"></a-input>
+                  </a-form-item>
+                </a-col>
+                <a-col :xxl="6" :xl="8" :sm="12">
+                  <a-form-item label="已收金额" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                    <a-input placeholder="请输入已收金额"
+                             v-decorator="['amountReceived',validatorRules.amountReceived]"
+                             :maxLength='50'
+                             @change="amountReceivedChange"></a-input>
+                  </a-form-item>
+                </a-col>
+                <a-col :xxl="6" :xl="8" :sm="12">
+                  <a-form-item label="未收金额" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                    <a-input placeholder="请输入未收金额"
+                             :maxLength='50'
+                             v-decorator="['outstandingAmount']"
+                             :disabled="true"></a-input>
+                  </a-form-item>
+                </a-col>
+                <a-col :xxl="6" :xl="8" :sm="12">
+                  <a-form-item label="赊账状态" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                    <j-dict-select-tag v-decorator="['accountStatus']"
+                                       :triggerChange="true"
+                                       placeholder="请选择赊账状态"
+                                       dictCode="revenue_contract_account_status"
+                                       :disabled="true"/>
+                  </a-form-item>
+                </a-col>
+              </a-row>
+            </div>
+          </div>
+          <!--        /账款信息-->
+          <a-divider></a-divider>
+          <!--        其他-->
+          <div>
+            <div class="part-title">
+              <div class="part-title-text">其他信息</div>
+            </div>
+            <div>
+              <a-row :gutter="30">
+                <a-col :xxl="6" :xl="8" :sm="12">
+                  <a-form-item label="合同约定付款次数" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                    <a-input placeholder="请输入合同约定付款次数"
+                             v-decorator="['contractPaymentTimes']"
+                             :maxLength='50'
+                             @change="e => {e.target.value = (e.target.value + '').trim()}"></a-input>
+                  </a-form-item>
+                </a-col>
+                <a-col :xxl="6" :xl="8" :sm="12">
+                  <a-form-item label="是否打包" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                    <j-dict-select-tag v-decorator="['pack', validatorRules.pack]"
+                                       :triggerChange="true"
+                                       placeholder="请选择是否打包"
+                                       dictCode="yn"
+                                       :disabled="isSaved"
+                                       @change="packageChange"/>
+                  </a-form-item>
+                </a-col>
+                <a-col :xxl="6" :xl="8" :sm="12">
+                  <a-form-item label="打包年份" :labelCol="labelCol" :wrapperCol="wrapperCol" v-if="isPackage">
+                    <j-year-date style="width:100%"
+                                 placeholder="请选择打包年份"
+                                 v-decorator="['packYear',validatorRules.packYear]"></j-year-date>
+                  </a-form-item>
+                </a-col>
+              </a-row>
+            </div>
+          </div>
+          <!--        /其他-->
+          <a-divider></a-divider>
+          <!--        分期信息-->
+          <div>
+            <div class="part-title">
+              <div class="part-title-text">分期信息</div>
+            </div>
+            <installment-form ref="installmentForm" @ok="installmentFormOk" :disabled="isSaved"></installment-form>
+          </div>
+          <!--        /分期信息-->
+          <a-form-item class="table-operator">
+            <a-button type="primary" @click="handleSave">保存</a-button>
+            <a-button @click="handleCancle">取消</a-button>
+          </a-form-item>
+        </a-form>
+      </a-spin>
     </a-card>
+
+
     <!--      关联项目-->
     <a-card :bordered="false" v-if="isSaved" class="associated-project">
       <div class="part-title">
@@ -263,6 +257,9 @@ import ProjectTypeSelection from './ProjectTypeSelection'
 import SelectProjectModule from './SelectProjectModule'
 import pick from 'lodash.pick'
 import { getAllUserList } from '../../../../api/api'
+import { postAction } from '../../../../api/manage'
+import { getRevenueContractById } from '../../../../api/incomePaymentsApi'
+import { duplicateCheck } from '../../../../api/api'
 
 // 普通项目表头
 const generalProjectColumns = [
@@ -411,7 +408,9 @@ export default {
     return {
       IconImg,
       form: this.$form.createForm(this),
+      confirmLoading: false,
       model: {},
+      title: '',
       labelCol: {
         xs: { span: 24 },
         sm: { span: 10 }
@@ -422,11 +421,11 @@ export default {
       },
       validatorRules: {
         contractNum: {
-          rules: [{ required: true, validator: this.checkCompanyName }],
+          rules: [{ required: true, validator: this.checkContractNum }],
           validateTrigger: 'blur'
         },
         contractName: {
-          rules: [{ required: true, validator: this.checkCompanyName }],
+          rules: [{ required: true, validator: this.checkContractName }],
           validateTrigger: 'blur'
         },
         signedCompany: {
@@ -457,14 +456,14 @@ export default {
           rules: [{ required: true, message: '请输入已收金额' }],
           validateTrigger: 'blur'
         },
-        package: {
+        pack: {
           rules: [{ required: true, message: '请选择是否打包' }],
           validateTrigger: 'blur'
         }
       },
       url: {
-        add: '',
+        add: '/contract/payIncomeContract/add',
-        edit: '',
+        edit: '/contract/payIncomeContract/edit',
         generalProjectList: '/project/payCommonProject/list',
         workingGroupProjectList: '/project/payWorkingGroup/list',
         meetingProjectList: '',
@@ -472,11 +471,17 @@ export default {
       },
       selectedCompany: null, // 选中的企业
       installmentList: [],
-      isSaved: false // 是否保存上方数据
+      isSaved: false, // 是否保存上方数据
+      isPackage: false,
+      accountsReceivableNum: null, // 输入的应收金额
+      amountReceivedNum: null, // 输入的未收金额
+      contractAmountNum: null, // 输入的签订合同总金额
+      rateNum: null, // 输入的税率
+      selectedContact: null
     }
   },
   mounted() {
-    if (this.$route.query.hasOwnProperty('revenueId')) {
+    if (this.$route.query.hasOwnProperty.call(this.$route.query, 'revenueId')) {
       this.edit(this.$route.query.revenueId)
     } else {
       this.add()
@@ -484,29 +489,73 @@ export default {
   },
   methods: {
     add() {
+      this.title = '新建收入合同'
       this.$refs.installmentForm.initInstallmentList({})
     },
     edit(id) {
-      console.log(id)
+      this.title = '编辑收入合同'
-      let record
+      this.confirmLoading = true
-      this.$refs.installmentForm.initInstallmentList(record.initInstallmentList)
+      const param = {
-      this.model = Object.assign({}, record)
+        id: id
-      this.$nextTick(() => {
+      }
-        this.form.setFieldsValue(pick(this.model, 'contractNum', 'contractName', 'signedCompany', 'signedContactsId', 'opening', 'principalId', 'departmentName', 'contractAmount', 'rate', 'noTaxAmount', 'contractDate', 'terminationDate', 'contractTimePoints', 'accountsReceivableAmount', 'amountReceived', 'amountReceived', 'accountStatus', 'contractPaymentTimes', 'package', 'packageYear'))
+      getRevenueContractById(param).then(res => {
+        let record
+        record = res.result
+        this.isSaved = true
+        record.signedCompany = {
+          id: record.signedCompanyId,
+          companyName: record.signedCompanyTemporaryName
+        }
+        this.selectedCompany = record.signedCompany
+        record.signedContactsId = record.signedContactsTemporaryId
+        this.selectedContact = {
+          id: record.signedContactsTemporaryId,
+          name: record.signedContactsTemporaryName
+        }
+        this.$refs.installmentForm.initInstallmentList(record.listInstallment)
+        this.model = Object.assign({}, record)
+        this.$nextTick(() => {
+          this.form.setFieldsValue(pick(this.model, 'contractNum', 'contractName', 'signedCompany', 'signedContactsId', 'opening', 'principalId', 'departmentName', 'contractAmount', 'rate', 'noTaxAmount', 'contractDate', 'terminationDate', 'contractTimePoints', 'accountsReceivableAmount', 'amountReceived', 'amountReceived', 'accountStatus', 'contractPaymentTimes', 'pack', 'packYear'))
+          this.confirmLoading = false
+        })
       })
     },
+    /**
+     * 表单提交
+     */
     handleSave() {
       // 验证分期信息
       this.$refs.installmentForm.handleSave()
       this.form.validateFields((err, values) => {
         if (!err) {
+          this.confirmLoading = true
           if (this.installmentList.length > 0) {
-            console.log(values, '---外层form表单保存')
+            let formData = {}
+            values.signedCompanyId = values.signedCompany.id
+            delete values.signedCompany
+            formData.installment = this.installmentList
+            formData.contract = Object.assign(this.model, values)
+            console.log('表单提交数据', formData)
+            let url = ''
+            if (!this.model.id) {
+              url = this.url.add
+            } else {
+              url = this.url.edit
+            }
+            postAction(url, formData).then(res => {
+              if (res.success) {
+                this.$message.success(res.message)
+                // 保存上方表单信息，（应该在表单验证完全正确时置为true）
+                this.isSaved = true
+              } else {
+                this.$message.warning(res.message)
+              }
+            }).finally(() => {
+              this.confirmLoading = false
+            })
           }
         }
       })
-      // 保存上方表单信息，（应该在表单验证完全正确时置为true）
-      this.isSaved = true
     },
     handleCancle() {
       this.model = {}
@@ -537,6 +586,135 @@ export default {
         })
       })
     },
+    /**
+     * 打包状态修改
+     */
+    packageChange(value) {
+      if (value === '1') {
+        this.isPackage = true
+      } else {
+        this.isPackage = false
+      }
+    },
+    /**
+     * 总签订金额修改
+     * @param e
+     */
+    contractAmountChange(e) {
+      e.target.value = (e.target.value.replace(/[^0-9.]/g, '')).trim()
+      this.contractAmountNum = e.target.value
+      this.calculateNoTaxAmount()
+    },
+    /**
+     * 税率修改
+     * @param e
+     */
+    rateChange(e) {
+      e.target.value = (e.target.value.replace(/[^0-9.]/g, '')).trim()
+      this.rateNum = e.target.value
+      this.calculateNoTaxAmount()
+    },
+    /**
+     * 计算未税金额
+     */
+    calculateNoTaxAmount() {
+      if (this.rateNum !== null && this.contractAmountNum !== null) {
+        this.model.noTaxAmount = Number(this.contractAmountNum) / (1 + Number(this.rateNum))
+        this.$nextTick(() => {
+          this.form.setFieldsValue(pick(this.model, 'noTaxAmount'))
+        })
+      }
+    },
+    /**
+     * 应收金额输入
+     * @param value
+     */
+    accountsReceivableChange(e) {
+      e.target.value = (e.target.value.replace(/[^0-9.]/g, '')).trim()
+      this.accountsReceivableNum = e.target.value
+      this.calculateOutstandingAmount()
+    },
+    /**
+     * 已收金额输入
+     * @param value
+     */
+    amountReceivedChange(e) {
+      e.target.value = (e.target.value.replace(/[^0-9.]/g, '')).trim()
+      this.amountReceivedNum = e.target.value
+      this.calculateOutstandingAmount()
+    },
+    /**
+     * 计算未收金额和赊账状态
+     */
+    calculateOutstandingAmount() {
+      if (this.accountsReceivableNum !== null && this.amountReceivedNum !== null) {
+        this.model.outstandingAmount = Number(this.accountsReceivableNum) - Number(this.amountReceivedNum)
+        if (this.model.outstandingAmount === 0) {
+          this.model.accountStatus = '3'
+        } else if (this.model.outstandingAmount > 0 && this.model.outstandingAmount < Number(this.accountsReceivableNum)) {
+          this.model.accountStatus = '2'
+        } else if (this.model.outstandingAmount === Number(this.accountsReceivableNum)) {
+          this.model.accountStatus = '1'
+        }
+        this.$nextTick(() => {
+          this.form.setFieldsValue(pick(this.model, 'outstandingAmount', 'accountStatus'))
+        })
+      }
+    },
+    /**
+     * 合同编号唯一性校验
+     * @param rules
+     * @param value
+     * @param callback
+     */
+    checkContractNum(rules, value, callback) {
+      if (value) {
+        if (!this.model.id) {
+          const params = {
+            confusionCode: 'pay_contract_num',
+            fieldVal: value
+          }
+          duplicateCheck(params).then(res => {
+            if (res.success) {
+              callback()
+            } else {
+              callback('合同编号已存在')
+            }
+          })
+          return
+        }
+        callback()
+      } else {
+        callback('请输入合同编号')
+      }
+    },
+    /**
+     * 合同名称唯一性校验
+     * @param rules
+     * @param value
+     * @param callback
+     */
+    checkContractName(rules, value, callback) {
+      if (value) {
+        if (!this.model.id) {
+          const params = {
+            confusionCode: 'pay_contract_name',
+            fieldVal: value
+          }
+          duplicateCheck(params).then(res => {
+            if (res.success) {
+              callback()
+            } else {
+              callback('合同名称已存在')
+            }
+          })
+          return
+        }
+        callback()
+      } else {
+        callback('请输入合同名称')
+      }
+    },
     /**
      * 选择关联项目
      */

src/views/projectManagement/WorkingGroupMemberUnitMaintenance.vue

@@ -334,10 +334,10 @@ export default {
           chargeNoticeId: this.workingGroupDetail.chargeNoticeBId
         }
       }
-      if (chargeNoticeA && chargeNoticeA.hasOwnProperty('value')) {
+      if (chargeNoticeA && chargeNoticeA.hasOwnProperty.call(chargeNoticeA, 'value')) {
         this.chargeNoticeList.push(chargeNoticeA)
       }
-      if (chargeNoticeB && chargeNoticeB.hasOwnProperty('value')) {
+      if (chargeNoticeB && chargeNoticeB.hasOwnProperty.call(chargeNoticeA, 'value')) {
         this.chargeNoticeList.push(chargeNoticeB)
       }
     },

src/views/projectManagement/modules/GeneralProjectModule.vue

@@ -14,7 +14,7 @@
           <a-form-item label="来款项目" :labelCol="remarksLabelCol" :wrapperCol="remarksWrapperCol">
             <a-input placeholder="请输入来款项目"
                      v-decorator="['chargeProject',validatorRules.chargeProject]"
-                     :maxLength='50'
+                     :maxLength='100'
                      @change="e => {e.target.value = (e.target.value + '').trim()}"></a-input>
           </a-form-item>
         </a-col>