From 2d70be7322a2ac6bce3e599e38437db30e915750 Mon Sep 17 00:00:00 2001
From: zhaoxiao <zhaoxiao@syxysoft.com>
Date: Tue, 26 Oct 2021 09:27:34 +0800
Subject: [PATCH 01/21] =?UTF-8?q?[=E9=9C=80=E6=B1=82=E5=8F=98=E6=9B=B4]-?=
 =?UTF-8?q?=E6=94=AF=E5=87=BA=E5=90=88=E5=90=8C=E5=AE=A1=E6=A0=B8=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=EF=BC=88=E6=9C=AA=E5=AF=B9=E6=8E=A5=E5=8F=A3=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ExpenditureContractDetail.vue             | 64 ++++++++++++---
 .../ExpenditureContractList.vue               | 77 +++++++++++++++++--
 .../modules/RevenueContractAduitModule.vue    | 10 ++-
 3 files changed, 133 insertions(+), 18 deletions(-)

diff --git a/src/views/contractManagement/expenditureContract/ExpenditureContractDetail.vue b/src/views/contractManagement/expenditureContract/ExpenditureContractDetail.vue
index 7d89eee..27ffb05 100644
--- a/src/views/contractManagement/expenditureContract/ExpenditureContractDetail.vue
+++ b/src/views/contractManagement/expenditureContract/ExpenditureContractDetail.vue
@@ -156,7 +156,8 @@
         </div>
 
         <!--        状态非已存档显示-->
-        <template v-if="detailData.status < 5">
+        <!--        v-if="detailData.status < 5"-->
+        <template>
           <a-divider></a-divider>
           <!--      编辑、审核、存档-->
           <div>
@@ -164,24 +165,27 @@
               <div class="part-title-text">操作</div>
             </div>
             <div class="operator-btn">
+              <!--              v-if="detailData.status === 1 || detailData.status === 4"-->
               <a-button
                 type="primary"
-                @click="handleEdit(detailData.id, detailData.contractNum)"
-                v-if="detailData.status === 1 || detailData.status === 4"
+                @click="handleEdit(detailData.id)"
+
                 v-has="'revenueContract:edit'">
                 编辑
               </a-button>
+              <!--              v-if="detailData.status === 2"-->
               <a-button
                 type="primary"
                 @click="handleAudit(detailData.id)"
-                v-if="detailData.status === 2"
+
                 v-has="'revenueContract:aduit'">
                 审核
               </a-button>
+              <!--              v-if="detailData.status === 3"-->
               <a-button
                 type="primary"
                 @click="handleArchive(detailData.id)"
-                v-if="detailData.status === 3"
+
                 v-has="'revenueContract:archive'">
                 存档
               </a-button>
@@ -192,17 +196,19 @@
       </a-card>
     </a-spin>
 
+    <revenue-contract-aduit-module ref="aduitForm" @ok="operatorOk"></revenue-contract-aduit-module>
   </div>
 </template>
 
 <script>
 import PageHeaderTitle from '../../../components/layouts/PageHeaderTitle'
 import IconImg from '@/assets/imgs/icon/icon_revenue_contract.png'
-import { getExpenditureContractById } from '../../../api/incomePaymentsApi'
+import { archiveRevenueContract, getExpenditureContractById } from '../../../api/incomePaymentsApi'
+import RevenueContractAduitModule from '../revenueContract/modules/RevenueContractAduitModule'
 
 export default {
   name: 'ExpenditureContractDetail',
-  components: { PageHeaderTitle },
+  components: { PageHeaderTitle, RevenueContractAduitModule },
   data() {
     return {
       IconImg,
@@ -334,11 +340,49 @@ export default {
      * @param id
      * @param contractNum
      */
-    handleEdit(id, contractNum) {
+    handleEdit(id) {
       this.$router.push({
         path: '/contractManagement/RevenueContractModule',
         query: {
-          revenueId: id
+          contractId: id
+        }
+      })
+    },
+    /**
+     * 审核
+     * @param id
+     */
+    handleAudit(id) {
+      this.$refs.aduitForm.contractType = 2
+      this.$refs.aduitForm.contractId = id
+      this.$refs.aduitForm.open()
+    },
+    /**
+     * 存档
+     * @param id
+     */
+    handleArchive(id) {
+      let that = this
+      this.$confirm({
+        title: '存档',
+        content: '确认存档?',
+        onOk: function () {
+          that.loading = true
+          that.loading = false
+          let param = {
+            contractId: id,
+            contractStatus: 5
+          }
+          archiveRevenueContract(param).then((res) => {
+            if (res.success) {
+              that.$message.success(res.message)
+              that.initDetailData()
+            } else {
+              that.$message.warning(res.message)
+            }
+          }).finally(() => {
+            that.loading = false
+          })
         }
       })
     }
@@ -369,7 +413,7 @@ export default {
 }
 
 .all-line {
-  width: 100%!important;
+  width: 100% !important;
 }
 
 .ant-divider-horizontal {
diff --git a/src/views/contractManagement/expenditureContract/ExpenditureContractList.vue b/src/views/contractManagement/expenditureContract/ExpenditureContractList.vue
index cc633cf..50a5153 100644
--- a/src/views/contractManagement/expenditureContract/ExpenditureContractList.vue
+++ b/src/views/contractManagement/expenditureContract/ExpenditureContractList.vue
@@ -37,7 +37,8 @@
             </a-col>
             <a-col :xl="4" :lg="7" :md="8" :sm="24">
             <span class="table-page-search-submitButtons">
-              <a-button type="primary" icon="search" @click="searchQuery" v-has="'expenditureContract:search'">查询</a-button>
+              <a-button type="primary" icon="search" @click="searchQuery"
+                        v-has="'expenditureContract:search'">查询</a-button>
               <a-button icon="reload" @click="searchReset" class="reset-button">重置</a-button>
             </span>
             </a-col>
@@ -53,8 +54,12 @@
                   @change="handleImportExcel" v-has="'expenditureContract:import'">
           <a-button type="primary" icon="import">导入</a-button>
         </a-upload>
-        <a-button type="primary" icon="export" @click="handleExportXls('支出合同')" v-has="'expenditureContract:export'">导出</a-button>
-        <a-button type="primary" icon="download" @click="downTemplate('支出合同导入模板')" v-has="'expenditureContract:downTemplate'">下载模板</a-button>
+        <a-button type="primary" icon="export" @click="handleExportXls('支出合同')" v-has="'expenditureContract:export'">
+          导出
+        </a-button>
+        <a-button type="primary" icon="download" @click="downTemplate('支出合同导入模板')"
+                  v-has="'expenditureContract:downTemplate'">下载模板
+        </a-button>
         <a-button type="danger" icon="delete" @click="batchDel" v-has="'expenditureContract:batchDel'">批量删除</a-button>
       </div>
       <!--    操作按钮区域-end-->
@@ -88,12 +93,25 @@
           </template>
 
           <span slot="action" class="action-span-cell" slot-scope="text, record">
-            <a @click="handleEdit(record.id)" v-has="'expenditureContract:edit'">编辑</a>
-            <a @click="handleDelete(record.id)" v-has="'expenditureContract:delete'">删除</a>
+
+<!--            v-if="record.status === 2"-->
+            <a @click="handleAudit(record.id)" v-has="'revenueContract:aduit'">审核</a>
+            <!--            v-if="record.status === 1 || record.status === 4" -->
+            <a @click="handleEdit(record.id, record.contractNum)"
+               v-has="'expenditureContract:edit'">编辑</a>
+            <!--            v-if="record.status === 3" -->
+            <a @click="handleArchive(record.id)" v-has="'revenueContract:archive'">存档</a>
+            <!--            v-if="record.status === 1 || record.status === 2 || record.status === 4"-->
+            <a @click="handleDelete(record.id)"
+               v-has="'expenditureContract:delete'">删除</a>
+            <!--            v-if="record.status === 5"-->
+            <a :disabled="true">已存档</a>
           </span>
         </a-table>
       </div>
     </a-card>
+
+    <revenue-contract-aduit-module ref="aduitForm" @ok="modalFormOk"></revenue-contract-aduit-module>
   </div>
 </template>
 
@@ -103,10 +121,12 @@ import IconImg from '@assets/imgs/icon/icon_revenue_contract.png'
 import { JeroListMixin } from '../../../mixins/JeroListMixin'
 import { RangeDateMixin } from '../../../mixins/RangeDateMixin'
 import JDate from '../../../components/tools/JDate'
+import { archiveRevenueContract } from '../../../api/incomePaymentsApi'
+import RevenueContractAduitModule from '../revenueContract/modules/RevenueContractAduitModule'
 
 export default {
   name: 'ExpenditureContractList',
-  components: { PageHeaderTitle, JDate },
+  components: { PageHeaderTitle, JDate, RevenueContractAduitModule },
   mixins: [JeroListMixin, RangeDateMixin],
   computed: {
     importExcelUrl: function () {
@@ -206,6 +226,10 @@ export default {
         }
       })
     },
+    /**
+     * 详情
+     * @param id
+     */
     toContractDetail(id) {
       console.log(id)
       this.$router.push({
@@ -214,7 +238,46 @@ export default {
           revenueId: id
         }
       })
-    }
+    },
+    /**
+     * 审核
+     * @param id
+     */
+    handleAudit(id) {
+      this.$refs.aduitForm.contractType = 2
+      this.$refs.aduitForm.contractId = id
+      this.$refs.aduitForm.open()
+    },
+    /**
+     * 存档
+     * @param id
+     */
+    handleArchive(id) {
+      console.log(id)
+      let that = this
+      this.$confirm({
+        title: '存档',
+        content: '确认存档?',
+        onOk: function () {
+          that.loading = true
+          that.loading = false
+          let param = {
+            contractId: id,
+            contractStatus: 5
+          }
+          archiveRevenueContract(param).then((res) => {
+            if (res.success) {
+              that.$message.success(res.message)
+              that.loadData()
+            } else {
+              that.$message.warning(res.message)
+            }
+          }).finally(() => {
+            that.loading = false
+          })
+        }
+      })
+    },
   }
 }
 </script>
diff --git a/src/views/contractManagement/revenueContract/modules/RevenueContractAduitModule.vue b/src/views/contractManagement/revenueContract/modules/RevenueContractAduitModule.vue
index fca0949..a3094ab 100644
--- a/src/views/contractManagement/revenueContract/modules/RevenueContractAduitModule.vue
+++ b/src/views/contractManagement/revenueContract/modules/RevenueContractAduitModule.vue
@@ -53,6 +53,7 @@ export default {
       confirmLoading: false,
       form: this.$form.createForm(this),
       contractId: '',
+      contractType: 1, // 1---收入合同；2---支出合同
       model: {},
       labelCol: {
         xs: { span: 24 },
@@ -92,7 +93,14 @@ export default {
           values.contractId = this.contractId
           const formData = Object.assign(this.model, values)
           console.log('表单提交数据', formData)
-          aduitRevenueContract(formData).then((res) => {
+          // 收入合同、支出合同调用不同接口
+          let methodFunction
+          if (this.contractType === 1) {
+            methodFunction = aduitRevenueContract
+          } else {
+            methodFunction = ''
+          }
+          methodFunction(formData).then((res) => {
             if (res.success) {
               this.$message.success(res.message)
               this.$emit('ok')

From c904fee6addb136ceaad9a6e03d40e8b99a4f0d0 Mon Sep 17 00:00:00 2001
From: zhaoxiao <zhaoxiao@syxysoft.com>
Date: Tue, 26 Oct 2021 11:52:15 +0800
Subject: [PATCH 02/21] =?UTF-8?q?[=E9=9C=80=E6=B1=82=E5=8F=98=E6=9B=B4]=20?=
 =?UTF-8?q?=E6=89=93=E5=8C=85=E7=AE=A1=E7=90=86-=E6=89=93=E5=8C=85?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=88=97=E8=A1=A8=EF=BC=9A=E4=BC=81=E4=B8=9A?=
 =?UTF-8?q?=E8=81=94=E7=B3=BB=E4=BA=BA=E3=80=81=E8=81=94=E7=B3=BB=E4=BA=BA?=
 =?UTF-8?q?=E7=94=B5=E8=AF=9D=E3=80=81=E9=82=AE=E7=AE=B1=E8=BF=99=E4=B8=89?=
 =?UTF-8?q?=E4=B8=AA=E5=AD=97=E6=AE=B5=E6=94=BE=E5=9C=A8=E6=9C=80=E5=90=8E?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/packManagement/PackCompanyList.vue  | 40 ++++++++++---------
 .../packManagement/PackProjectMaintenance.vue | 36 ++++++++---------
 2 files changed, 39 insertions(+), 37 deletions(-)

diff --git a/src/views/packManagement/PackCompanyList.vue b/src/views/packManagement/PackCompanyList.vue
index 0d34c00..571cf83 100644
--- a/src/views/packManagement/PackCompanyList.vue
+++ b/src/views/packManagement/PackCompanyList.vue
@@ -137,25 +137,27 @@ export default {
           width: 180,
           dataIndex: 'receiptExpense',
           scopedSlots: { customRender: 'text' }
-        }, {
-          title: '企业联系人',
-          align: 'center',
-          width: 280,
-          dataIndex: 'companyContactTemporaryName',
-          scopedSlots: { customRender: 'text' }
-        }, {
-          title: '联系人电话',
-          align: 'center',
-          width: 200,
-          dataIndex: 'phone',
-          scopedSlots: { customRender: 'text' }
-        }, {
-          title: '邮箱',
-          align: 'center',
-          width: 280,
-          dataIndex: 'email',
-          scopedSlots: { customRender: 'text' }
-        }, {
+        },
+        // {
+        //   title: '企业联系人',
+        //   align: 'center',
+        //   width: 280,
+        //   dataIndex: 'companyContactTemporaryName',
+        //   scopedSlots: { customRender: 'text' }
+        // }, {
+        //   title: '联系人电话',
+        //   align: 'center',
+        //   width: 200,
+        //   dataIndex: 'phone',
+        //   scopedSlots: { customRender: 'text' }
+        // }, {
+        //   title: '邮箱',
+        //   align: 'center',
+        //   width: 280,
+        //   dataIndex: 'email',
+        //   scopedSlots: { customRender: 'text' }
+        // },
+        {
           title: '操作',
           dataIndex: 'action',
           align: 'center',
diff --git a/src/views/packManagement/PackProjectMaintenance.vue b/src/views/packManagement/PackProjectMaintenance.vue
index d3501a7..7b153d8 100644
--- a/src/views/packManagement/PackProjectMaintenance.vue
+++ b/src/views/packManagement/PackProjectMaintenance.vue
@@ -273,24 +273,6 @@ export default {
           width: 140,
           dataIndex: 'principalName',
           scopedSlots: { customRender: 'text' }
-        }, {
-          title: '企业联系人',
-          align: 'center',
-          width: 280,
-          dataIndex: 'contactsTemporaryName',
-          scopedSlots: { customRender: 'text' }
-        }, {
-          title: '联系人电话',
-          align: 'center',
-          width: 160,
-          dataIndex: 'phone',
-          scopedSlots: { customRender: 'text' }
-        }, {
-          title: '联系人邮箱',
-          align: 'center',
-          width: 200,
-          dataIndex: 'email',
-          scopedSlots: { customRender: 'text' }
         }, {
           title: '应收金额',
           align: 'center',
@@ -331,6 +313,24 @@ export default {
           width: 80,
           dataIndex: 'mail',
           scopedSlots: { customRender: 'status-mail' }
+        }, {
+          title: '企业联系人',
+          align: 'center',
+          width: 280,
+          dataIndex: 'contactsTemporaryName',
+          scopedSlots: { customRender: 'text' }
+        }, {
+          title: '联系人电话',
+          align: 'center',
+          width: 160,
+          dataIndex: 'phone',
+          scopedSlots: { customRender: 'text' }
+        }, {
+          title: '联系人邮箱',
+          align: 'center',
+          width: 200,
+          dataIndex: 'email',
+          scopedSlots: { customRender: 'text' }
         }, {
           title: '操作',
           dataIndex: 'action',

From 153cb7ad95c67b0c34f225e335708e4197a631db Mon Sep 17 00:00:00 2001
From: zhaoxiao <zhaoxiao@syxysoft.com>
Date: Tue, 26 Oct 2021 11:55:48 +0800
Subject: [PATCH 03/21] =?UTF-8?q?[=E9=9C=80=E6=B1=82=E5=8F=98=E6=9B=B4]=20?=
 =?UTF-8?q?=E6=89=93=E5=8C=85=E3=80=81=E5=88=B0=E8=B4=A6=E5=BC=80=E7=A5=A8?=
 =?UTF-8?q?=EF=BC=9A=E6=A0=87=E5=8D=8F=E4=BC=9A=E5=91=98=E7=9A=84=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=8F=AA=E8=83=BD=E5=85=88=E6=9D=A5=E6=AC=BE=E6=89=8D?=
 =?UTF-8?q?=E8=83=BD=E5=BC=80=E7=A5=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../arriveAndInvoicing/ArriveAndInvoivingList.vue          | 2 +-
 src/views/packManagement/PackProjectMaintenance.vue        | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue b/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue
index 0599295..1c5219a 100644
--- a/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue
+++ b/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue
@@ -359,7 +359,7 @@ export default {
           if (arr.some(item => item.projectType === 5)) {
             // 标协会员项目是否完全到账
             if (arr.some(item => item.inAccount !== 1)) {
-              reject('存在未全部到账的标协会员项目！')
+              reject('标协会员项目必须先到账才可开票。')
             }
           }
 
diff --git a/src/views/packManagement/PackProjectMaintenance.vue b/src/views/packManagement/PackProjectMaintenance.vue
index 7b153d8..fa8115b 100644
--- a/src/views/packManagement/PackProjectMaintenance.vue
+++ b/src/views/packManagement/PackProjectMaintenance.vue
@@ -530,6 +530,13 @@ export default {
           if (arr.some(item => item.makeInvoice === 1)) {
             reject('存在已完成开票的项目！')
           }
+          // 是否选中了标协会员项目，标协会员项目只能到账一次、开票一次，前端进行是否完全到账的限制
+          if (arr.some(item => item.projectType === 5)) {
+            // 标协会员项目是否完全到账
+            if (arr.some(item => item.inAccount !== 1)) {
+              reject('标协会员项目必须先到账才可开票。')
+            }
+          }
         }
         // 来款
         if (operateType === 'incomePayment') {

From 3dd68388cb58903ee3f14d0578f2227b21f40f50 Mon Sep 17 00:00:00 2001
From: zhaoxiao <zhaoxiao@syxysoft.com>
Date: Tue, 26 Oct 2021 14:15:04 +0800
Subject: [PATCH 04/21] =?UTF-8?q?[=E9=9C=80=E6=B1=82=E5=8F=98=E6=9B=B4]=20?=
 =?UTF-8?q?=E6=94=AF=E5=87=BA=E5=90=88=E5=90=8C=EF=BC=9A=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E3=80=81=E5=AD=98=E6=A1=A3=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/incomePaymentsApi.js                           | 10 ++++++++--
 .../expenditureContract/ExpenditureContractDetail.vue  |  4 ++--
 .../expenditureContract/ExpenditureContractList.vue    |  8 ++++----
 .../modules/RevenueContractAduitModule.vue             |  4 ++--
 4 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/src/api/incomePaymentsApi.js b/src/api/incomePaymentsApi.js
index 15f9aae..28e902d 100644
--- a/src/api/incomePaymentsApi.js
+++ b/src/api/incomePaymentsApi.js
@@ -21,7 +21,7 @@ const submitAudit = (param) => postAction('/contract/payIncomeContract/submitAud
 // 获取不存在成员单位的工作组信息
 const getWorkingGroupListByNotCompany = (param) => getAction('/project/payWorkingGroup/queryListByNotCompany', param)
 // 收入合同存档
-const archiveRevenueContract = (param) => postAction('contract/payIncomeContract/archive', param)
+const archiveRevenueContract = (param) => postAction('/contract/payIncomeContract/archive', param)
 // 根据部门id获取用户信息
 const queryUserByDepartId = (param) => getAction('/sys/user/listRoleAndDepart', param)
 // 企业联系人新建重名校验
@@ -78,6 +78,10 @@ const checkCompanyAduit = (param) => getAction('/payMailContract/payMailContract
 const getAllDepartTreeList = (param) => getAction('/sys/sysDepart/queryTreeAllList', param)
 // 验证项目是否关联合同
 const getIsAssociatedProject = (param) => getAction('/contract/payIncomeContract/getAssociatedProject', param)
+// 支出合同审核
+const aduitExpenditureContract = (param) => postAction('/contract/paySpendingContract/audit', param)
+// 支出合同存档
+const archiveExpenditureContract = (param) => postAction('/contract/paySpendingContract/archive', param)
 
 export {
   getWorkingGroupById,
@@ -118,5 +122,7 @@ export {
   sysReminders,
   checkCompanyAduit,
   getAllDepartTreeList,
-  getIsAssociatedProject
+  getIsAssociatedProject,
+  aduitExpenditureContract,
+  archiveExpenditureContract
 }
diff --git a/src/views/contractManagement/expenditureContract/ExpenditureContractDetail.vue b/src/views/contractManagement/expenditureContract/ExpenditureContractDetail.vue
index 27ffb05..c8396ba 100644
--- a/src/views/contractManagement/expenditureContract/ExpenditureContractDetail.vue
+++ b/src/views/contractManagement/expenditureContract/ExpenditureContractDetail.vue
@@ -203,7 +203,7 @@
 <script>
 import PageHeaderTitle from '../../../components/layouts/PageHeaderTitle'
 import IconImg from '@/assets/imgs/icon/icon_revenue_contract.png'
-import { archiveRevenueContract, getExpenditureContractById } from '../../../api/incomePaymentsApi'
+import { archiveExpenditureContract, getExpenditureContractById } from '../../../api/incomePaymentsApi'
 import RevenueContractAduitModule from '../revenueContract/modules/RevenueContractAduitModule'
 
 export default {
@@ -373,7 +373,7 @@ export default {
             contractId: id,
             contractStatus: 5
           }
-          archiveRevenueContract(param).then((res) => {
+          archiveExpenditureContract(param).then((res) => {
             if (res.success) {
               that.$message.success(res.message)
               that.initDetailData()
diff --git a/src/views/contractManagement/expenditureContract/ExpenditureContractList.vue b/src/views/contractManagement/expenditureContract/ExpenditureContractList.vue
index 50a5153..72a926c 100644
--- a/src/views/contractManagement/expenditureContract/ExpenditureContractList.vue
+++ b/src/views/contractManagement/expenditureContract/ExpenditureContractList.vue
@@ -121,7 +121,7 @@ import IconImg from '@assets/imgs/icon/icon_revenue_contract.png'
 import { JeroListMixin } from '../../../mixins/JeroListMixin'
 import { RangeDateMixin } from '../../../mixins/RangeDateMixin'
 import JDate from '../../../components/tools/JDate'
-import { archiveRevenueContract } from '../../../api/incomePaymentsApi'
+import { archiveExpenditureContract } from '../../../api/incomePaymentsApi'
 import RevenueContractAduitModule from '../revenueContract/modules/RevenueContractAduitModule'
 
 export default {
@@ -161,8 +161,8 @@ export default {
         }, {
           title: '合同编号',
           align: 'center',
-          dataIndex: 'contractNum',
           width: 280,
+          dataIndex: 'contractNum',
           scopedSlots: { customRender: 'projectName' }
         }, {
           title: '合同名称',
@@ -231,7 +231,7 @@ export default {
      * @param id
      */
     toContractDetail(id) {
-      console.log(id)
+      debugger
       this.$router.push({
         path: '/contractManagement/ExpenditureContractDetail',
         query: {
@@ -265,7 +265,7 @@ export default {
             contractId: id,
             contractStatus: 5
           }
-          archiveRevenueContract(param).then((res) => {
+          archiveExpenditureContract(param).then((res) => {
             if (res.success) {
               that.$message.success(res.message)
               that.loadData()
diff --git a/src/views/contractManagement/revenueContract/modules/RevenueContractAduitModule.vue b/src/views/contractManagement/revenueContract/modules/RevenueContractAduitModule.vue
index a3094ab..1651af3 100644
--- a/src/views/contractManagement/revenueContract/modules/RevenueContractAduitModule.vue
+++ b/src/views/contractManagement/revenueContract/modules/RevenueContractAduitModule.vue
@@ -38,7 +38,7 @@
 </template>
 
 <script>
-import { aduitRevenueContract } from '../../../../api/incomePaymentsApi'
+import { aduitRevenueContract, aduitExpenditureContract } from '../../../../api/incomePaymentsApi'
 import { USER_INFO } from '../../../../store/mutation-types'
 import Vue from 'vue'
 import pick from 'lodash.pick'
@@ -98,7 +98,7 @@ export default {
           if (this.contractType === 1) {
             methodFunction = aduitRevenueContract
           } else {
-            methodFunction = ''
+            methodFunction = aduitExpenditureContract
           }
           methodFunction(formData).then((res) => {
             if (res.success) {

From ea6c308271c8158f5279c96ae62d4d3090b9fcf6 Mon Sep 17 00:00:00 2001
From: zhaoxiao <zhaoxiao@syxysoft.com>
Date: Tue, 26 Oct 2021 14:35:26 +0800
Subject: [PATCH 05/21] =?UTF-8?q?=E6=94=AF=E5=87=BA=E5=90=88=E5=90=8C?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../expenditureContract/ExpenditureContractList.vue              | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/views/contractManagement/expenditureContract/ExpenditureContractList.vue b/src/views/contractManagement/expenditureContract/ExpenditureContractList.vue
index 72a926c..da725d3 100644
--- a/src/views/contractManagement/expenditureContract/ExpenditureContractList.vue
+++ b/src/views/contractManagement/expenditureContract/ExpenditureContractList.vue
@@ -231,7 +231,6 @@ export default {
      * @param id
      */
     toContractDetail(id) {
-      debugger
       this.$router.push({
         path: '/contractManagement/ExpenditureContractDetail',
         query: {

From 4a8e0216519b32c7e5059a87ab2a74ef7774e9aa Mon Sep 17 00:00:00 2001
From: zhaoxiao <zhaoxiao@syxysoft.com>
Date: Tue, 26 Oct 2021 14:43:10 +0800
Subject: [PATCH 06/21] =?UTF-8?q?[=E9=9C=80=E6=B1=82=E5=8F=98=E6=9B=B4]=20?=
 =?UTF-8?q?=E6=94=AF=E5=87=BA=E5=90=88=E5=90=8C=E6=B5=81=E7=A8=8B=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ExpenditureContractDetail.vue             | 16 ++++-----
 .../ExpenditureContractList.vue               | 35 ++++++++++++-------
 2 files changed, 28 insertions(+), 23 deletions(-)

diff --git a/src/views/contractManagement/expenditureContract/ExpenditureContractDetail.vue b/src/views/contractManagement/expenditureContract/ExpenditureContractDetail.vue
index c8396ba..f8a28dc 100644
--- a/src/views/contractManagement/expenditureContract/ExpenditureContractDetail.vue
+++ b/src/views/contractManagement/expenditureContract/ExpenditureContractDetail.vue
@@ -156,8 +156,7 @@
         </div>
 
         <!--        状态非已存档显示-->
-        <!--        v-if="detailData.status < 5"-->
-        <template>
+        <template v-if="detailData.status < 5">
           <a-divider></a-divider>
           <!--      编辑、审核、存档-->
           <div>
@@ -165,28 +164,25 @@
               <div class="part-title-text">操作</div>
             </div>
             <div class="operator-btn">
-              <!--              v-if="detailData.status === 1 || detailData.status === 4"-->
               <a-button
                 type="primary"
                 @click="handleEdit(detailData.id)"
-
+                v-if="detailData.status === 1 || detailData.status === 4"
                 v-has="'revenueContract:edit'">
                 编辑
               </a-button>
-              <!--              v-if="detailData.status === 2"-->
               <a-button
                 type="primary"
                 @click="handleAudit(detailData.id)"
-
-                v-has="'revenueContract:aduit'">
+                v-if="detailData.status === 2"
+                v-has="'expenditureContract:aduit'">
                 审核
               </a-button>
-              <!--              v-if="detailData.status === 3"-->
               <a-button
                 type="primary"
                 @click="handleArchive(detailData.id)"
-
-                v-has="'revenueContract:archive'">
+                v-if="detailData.status === 3"
+                v-has="'expenditureContract:archive'">
                 存档
               </a-button>
             </div>
diff --git a/src/views/contractManagement/expenditureContract/ExpenditureContractList.vue b/src/views/contractManagement/expenditureContract/ExpenditureContractList.vue
index da725d3..c4f7eda 100644
--- a/src/views/contractManagement/expenditureContract/ExpenditureContractList.vue
+++ b/src/views/contractManagement/expenditureContract/ExpenditureContractList.vue
@@ -16,7 +16,7 @@
                 <a-input placeholder="请输入合同名称" v-model="queryParam.contractName" :maxLength='50'></a-input>
               </a-form-item>
             </a-col>
-            <a-col :xxl="8" :xl="10" :lg="11" :md="12" :sm="24">
+            <a-col :xxl="8" :xl="10" :lg="12" :md="12" :sm="24">
               <a-form-item label="创建时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
                 <j-date
                   placeholder="请选择开始日期"
@@ -35,6 +35,13 @@
                 </j-date>
               </a-form-item>
             </a-col>
+            <a-col :xxl="4" :xl="10" :lg="12" :md="12" :sm="24">
+              <a-form-item label="合同状态" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                <j-dict-select-tag v-model="queryParam.status"
+                                   placeholder="请选择合同状态"
+                                   dictCode="revenue_contract_status"/>
+              </a-form-item>
+            </a-col>
             <a-col :xl="4" :lg="7" :md="8" :sm="24">
             <span class="table-page-search-submitButtons">
               <a-button type="primary" icon="search" @click="searchQuery"
@@ -93,19 +100,15 @@
           </template>
 
           <span slot="action" class="action-span-cell" slot-scope="text, record">
-
-<!--            v-if="record.status === 2"-->
-            <a @click="handleAudit(record.id)" v-has="'revenueContract:aduit'">审核</a>
-            <!--            v-if="record.status === 1 || record.status === 4" -->
+            <a @click="handleAudit(record.id)" v-has="'expenditureContract:aduit'" v-if="record.status === 2">审核</a>
             <a @click="handleEdit(record.id, record.contractNum)"
-               v-has="'expenditureContract:edit'">编辑</a>
-            <!--            v-if="record.status === 3" -->
-            <a @click="handleArchive(record.id)" v-has="'revenueContract:archive'">存档</a>
-            <!--            v-if="record.status === 1 || record.status === 2 || record.status === 4"-->
+               v-has="'expenditureContract:edit'"
+               v-if="record.status === 1 || record.status === 4">编辑</a>
+            <a @click="handleArchive(record.id)" v-has="'expenditureContract:archive'" v-if="record.status === 3">存档</a>
             <a @click="handleDelete(record.id)"
-               v-has="'expenditureContract:delete'">删除</a>
-            <!--            v-if="record.status === 5"-->
-            <a :disabled="true">已存档</a>
+               v-has="'expenditureContract:delete'"
+               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>
@@ -188,6 +191,12 @@ export default {
           dataIndex: 'contractAmount',
           width: 200,
           scopedSlots: { customRender: 'text' }
+        }, {
+          title: '状态',
+          align: 'center',
+          dataIndex: 'status_dictText',
+          width: 150,
+          scopedSlots: { customRender: 'text' }
         }, {
           title: '创建时间',
           align: 'center',
@@ -276,7 +285,7 @@ export default {
           })
         }
       })
-    },
+    }
   }
 }
 </script>

From 516a8c401f413bc7ec88cddac05ccbf78f3f1ade Mon Sep 17 00:00:00 2001
From: zhaoxiao <zhaoxiao@syxysoft.com>
Date: Tue, 26 Oct 2021 14:47:35 +0800
Subject: [PATCH 07/21] =?UTF-8?q?[=E9=9C=80=E6=B1=82=E5=8F=98=E6=9B=B4]=20?=
 =?UTF-8?q?=E6=94=AF=E5=87=BA=E5=90=88=E5=90=8C-=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=AD=97=E5=85=B8=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../expenditureContract/ExpenditureContractList.vue             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/contractManagement/expenditureContract/ExpenditureContractList.vue b/src/views/contractManagement/expenditureContract/ExpenditureContractList.vue
index c4f7eda..fe3b05f 100644
--- a/src/views/contractManagement/expenditureContract/ExpenditureContractList.vue
+++ b/src/views/contractManagement/expenditureContract/ExpenditureContractList.vue
@@ -39,7 +39,7 @@
               <a-form-item label="合同状态" :labelCol="labelCol" :wrapperCol="wrapperCol">
                 <j-dict-select-tag v-model="queryParam.status"
                                    placeholder="请选择合同状态"
-                                   dictCode="revenue_contract_status"/>
+                                   dictCode="expenditure_contract_status"/>
               </a-form-item>
             </a-col>
             <a-col :xl="4" :lg="7" :md="8" :sm="24">

From b49719c6418c1d4f5f3fe8076c33ecac3d293438 Mon Sep 17 00:00:00 2001
From: zhaoxiao <zhaoxiao@syxysoft.com>
Date: Tue, 26 Oct 2021 16:25:16 +0800
Subject: [PATCH 08/21] =?UTF-8?q?[=E9=9C=80=E6=B1=82=E5=8F=98=E6=9B=B4]=20?=
 =?UTF-8?q?=E6=89=93=E5=8C=85=E3=80=81=E5=88=B0=E8=B4=A6=E5=BC=80=E7=A5=A8?=
 =?UTF-8?q?=EF=BC=9A=E6=A0=87=E5=8D=8F=E4=BC=9A=E5=91=98=E7=9A=84=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=8F=AA=E8=83=BD=E5=85=88=E6=9D=A5=E6=AC=BE=E6=89=8D?=
 =?UTF-8?q?=E8=83=BD=E5=BC=80=E7=A5=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../arriveAndInvoicing/ArriveAndInvoivingList.vue        | 9 +++++++--
 src/views/packManagement/PackProjectMaintenance.vue      | 5 ++++-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue b/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue
index 1c5219a..d335414 100644
--- a/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue
+++ b/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue
@@ -25,7 +25,8 @@
             </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.chargeCompanyTemporaryName" :maxLength='50'></a-input>
+                <a-input placeholder="请输入来款单位" v-model="queryParam.chargeCompanyTemporaryName"
+                         :maxLength='50'></a-input>
               </a-form-item>
             </a-col>
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
@@ -295,7 +296,11 @@ export default {
      * @param record
      */
     invoicing(record) {
-      console.log(record)
+      // 标协会员项目必须先到账后开票
+      if (record.projectType === 5 && record.inAccount !== 1) {
+        this.$message.warn('标协会员项目必须先到账才可开票。')
+        return
+      }
       this.mailContactsId = record.mailContactsId
       this.selectProjectId = record.id
       this.selectProjectType = record.projectType
diff --git a/src/views/packManagement/PackProjectMaintenance.vue b/src/views/packManagement/PackProjectMaintenance.vue
index fa8115b..c622097 100644
--- a/src/views/packManagement/PackProjectMaintenance.vue
+++ b/src/views/packManagement/PackProjectMaintenance.vue
@@ -504,7 +504,10 @@ export default {
      * @param record
      */
     invoicing(record) {
-      console.log(record)
+      if (record.projectType === 5 && record.inAccount !== 1) {
+        this.$message.warn('标协会员项目必须先到账才可开票。')
+        return
+      }
       this.selectProjectName = record.chargeProject
       this.selectProjectId = record.id
       this.selectProjectType = record.projectType

From c6ef891a570d9a3cad1525357b11ed00a485353b Mon Sep 17 00:00:00 2001
From: zhaoxiao <zhaoxiao@syxysoft.com>
Date: Tue, 26 Oct 2021 16:42:27 +0800
Subject: [PATCH 09/21] =?UTF-8?q?[=E9=9C=80=E6=B1=82=E5=8F=98=E6=9B=B4]=20?=
 =?UTF-8?q?=E6=89=93=E5=8C=85=E4=BC=81=E4=B8=9A=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/packManagement/PackCompanyList.vue | 24 +++++++++++---------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/views/packManagement/PackCompanyList.vue b/src/views/packManagement/PackCompanyList.vue
index 571cf83..ce09250 100644
--- a/src/views/packManagement/PackCompanyList.vue
+++ b/src/views/packManagement/PackCompanyList.vue
@@ -113,13 +113,14 @@ export default {
           width: 280,
           dataIndex: 'companyTemporaryName',
           scopedSlots: { customRender: 'projectName' }
-        }, {
-          title: '打包年份',
+        },
+        {
+          title: '企业联系人',
           align: 'center',
-          width: 140,
-          dataIndex: 'packYear',
+          width: 280,
+          dataIndex: 'companyContactTemporaryName',
           scopedSlots: { customRender: 'text' }
-        }, {
+        },{
           title: '打包联系人',
           align: 'center',
           width: 280,
@@ -137,14 +138,15 @@ export default {
           width: 180,
           dataIndex: 'receiptExpense',
           scopedSlots: { customRender: 'text' }
+        }, {
+          title: '打包年份',
+          align: 'center',
+          width: 140,
+          dataIndex: 'packYear',
+          scopedSlots: { customRender: 'text' }
         },
+
         // {
-        //   title: '企业联系人',
-        //   align: 'center',
-        //   width: 280,
-        //   dataIndex: 'companyContactTemporaryName',
-        //   scopedSlots: { customRender: 'text' }
-        // }, {
         //   title: '联系人电话',
         //   align: 'center',
         //   width: 200,

From a81636f8f9e8f4c362a1dfbf43268354d138e3ea Mon Sep 17 00:00:00 2001
From: zhaoxiao <zhaoxiao@syxysoft.com>
Date: Tue, 26 Oct 2021 16:48:43 +0800
Subject: [PATCH 10/21] =?UTF-8?q?[=E9=9C=80=E6=B1=82=E5=8F=98=E6=9B=B4]=20?=
 =?UTF-8?q?=E6=94=AF=E5=87=BA=E5=90=88=E5=90=8C=E4=BF=9D=E5=AD=98=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/ExpenditureContractModule.vue          | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/views/contractManagement/expenditureContract/modules/ExpenditureContractModule.vue b/src/views/contractManagement/expenditureContract/modules/ExpenditureContractModule.vue
index 968dd8b..f264b33 100644
--- a/src/views/contractManagement/expenditureContract/modules/ExpenditureContractModule.vue
+++ b/src/views/contractManagement/expenditureContract/modules/ExpenditureContractModule.vue
@@ -232,7 +232,7 @@
           </div>
           <!--        /分期信息-->
           <a-form-item class="table-operator">
-            <a-button type="primary" @click="handleSave" v-preventclick>保存</a-button>
+            <a-button type="primary" @click="save" v-preventclick>保存</a-button>
             <a-button @click="handleCancle">取消</a-button>
           </a-form-item>
         </a-form>
@@ -403,6 +403,18 @@ export default {
         }
       })
     },
+    save() {
+      const that = this
+      this.$confirm({
+        title: '提示',
+        content: '保存后将进入待审核状态，无法编辑，确定要保存吗 ?',
+        onOk() {
+          that.handleSave()
+        },
+        onCancel() {
+        },
+      })
+    },
     /**
      * 表单提交
      */

From a4ef90964f4eb449be659741d61eea896569ee45 Mon Sep 17 00:00:00 2001
From: zhaoxiao <zhaoxiao@syxysoft.com>
Date: Tue, 26 Oct 2021 17:29:09 +0800
Subject: [PATCH 11/21] =?UTF-8?q?[=E9=9C=80=E6=B1=82=E5=8F=98=E6=9B=B4]=20?=
 =?UTF-8?q?=E6=94=AF=E5=87=BA=E5=90=88=E5=90=8C=E6=A0=B7=E5=BC=8F=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ExpenditureContractList.vue               | 25 ++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/src/views/contractManagement/expenditureContract/ExpenditureContractList.vue b/src/views/contractManagement/expenditureContract/ExpenditureContractList.vue
index fe3b05f..c3c35e9 100644
--- a/src/views/contractManagement/expenditureContract/ExpenditureContractList.vue
+++ b/src/views/contractManagement/expenditureContract/ExpenditureContractList.vue
@@ -84,13 +84,22 @@
           :pagination="ipagination"
           :loading="loading"
           :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+          :rowClassName="aduitClass"
           @change="handleTableChange"
           class="j-table-force-nowrap">
 
+          <!--          项目名称-->
           <template slot="projectName" slot-scope="text, record">
+            <j-ellipsis
+              @click="toRevenueContractDetail(record.id, record.contractNum)"
+              v-if="record.chargeStatus === 1"
+              :value="text"
+              style="cursor: pointer"
+              :length="18"></j-ellipsis>
             <j-ellipsis
               class="primary-color"
-              @click="toContractDetail(record.id)"
+              @click="toRevenueContractDetail(record.id)"
+              v-else
               :value="text"
               :length="18"></j-ellipsis>
           </template>
@@ -235,6 +244,17 @@ export default {
         }
       })
     },
+    /**
+     * 动态设置到期未付款状态的表格样式
+     * @param record
+     * @returns {string}
+     */
+    aduitClass(record) {
+      if (record.chargeStatus === 1) {
+        return 'aduit'
+      }
+      return ''
+    },
     /**
      * 详情
      * @param id
@@ -292,4 +312,7 @@ export default {
 
 <style scoped lang="less">
 @import '~@assets/less/common.less';
+/deep/ .aduit {
+  color: red !important;
+}
 </style>
\ No newline at end of file

From 42f9e5052d43c5af66a559ab16374641404b333b Mon Sep 17 00:00:00 2001
From: zhaoxiao <zhaoxiao@syxysoft.com>
Date: Tue, 26 Oct 2021 18:28:45 +0800
Subject: [PATCH 12/21] =?UTF-8?q?[=E9=9C=80=E6=B1=82=E5=8F=98=E6=9B=B4]=20?=
 =?UTF-8?q?=E6=94=B6=E5=85=A5=E5=90=88=E5=90=8C-=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E6=97=B6=E8=AE=A1=E7=AE=97=E6=9C=AA=E6=94=B6=E9=87=91=E9=A2=9D?=
 =?UTF-8?q?=E3=80=81=E8=B5=8A=E8=B4=A6=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/ExpenditureContractModule.vue                  | 2 +-
 .../revenueContract/modules/RevenueContractModule.vue      | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/views/contractManagement/expenditureContract/modules/ExpenditureContractModule.vue b/src/views/contractManagement/expenditureContract/modules/ExpenditureContractModule.vue
index f264b33..ef64c03 100644
--- a/src/views/contractManagement/expenditureContract/modules/ExpenditureContractModule.vue
+++ b/src/views/contractManagement/expenditureContract/modules/ExpenditureContractModule.vue
@@ -631,7 +631,7 @@ export default {
       if (this.accountsReceivableNum !== null && this.amountReceivedNum !== null) {
         this.model.outstandingAmount = Number(this.accountsReceivableNum) - Number(this.amountReceivedNum)
         this.model.outstandingAmount = this.model.outstandingAmount.toFixed(2)
-        if (Number(this.model.outstandingAmount) === 0) {
+        if (Number(this.model.outstandingAmount) <= 0) {
           this.model.accountStatus = '3'
         } else if (Number(this.model.outstandingAmount) > 0 && Number(this.model.outstandingAmount) < Number(this.accountsReceivableNum)) {
           this.model.accountStatus = '2'
diff --git a/src/views/contractManagement/revenueContract/modules/RevenueContractModule.vue b/src/views/contractManagement/revenueContract/modules/RevenueContractModule.vue
index d2ddc59..74b0338 100644
--- a/src/views/contractManagement/revenueContract/modules/RevenueContractModule.vue
+++ b/src/views/contractManagement/revenueContract/modules/RevenueContractModule.vue
@@ -502,8 +502,11 @@ export default {
         this.accountsReceivableNum = record.accountsReceivableAmount
         this.amountReceivedNum = record.amountReceived
         this.model = Object.assign({}, record)
+        // 计算未收金额和赊账状态
+        this.calculateOutstandingAmount()
         this.$nextTick(() => {
-          this.form.setFieldsValue(pick(this.model, 'contractNum', 'contractName', 'signedCompany', 'signedContactsId', 'opening', 'principalId', 'departmentName', 'contractAmount', 'rate', 'noTaxAmount', 'contractDate', 'terminationDate', 'contractTimePoints', 'accountsReceivableAmount', 'amountReceived', 'outstandingAmount', 'accountStatus', 'contractPaymentTimes', 'pack', 'packYear'))
+          // 此处回显缺少未收金额和赊账状态，因为需要进行计算，选择了在this.calculateOutstandingAmount()方法中计算后回显
+          this.form.setFieldsValue(pick(this.model, 'contractNum', 'contractName', 'signedCompany', 'signedContactsId', 'opening', 'principalId', 'departmentName', 'contractAmount', 'rate', 'noTaxAmount', 'contractDate', 'terminationDate', 'contractTimePoints', 'accountsReceivableAmount', 'amountReceived', 'contractPaymentTimes', 'pack', 'packYear'))
           this.confirmLoading = false
         })
       })
@@ -694,7 +697,7 @@ export default {
         this.model.outstandingAmount = Number(this.accountsReceivableNum) - Number(this.amountReceivedNum)
         this.model.outstandingAmount = this.model.outstandingAmount.toFixed(2)
         // 未收金额 === 0，已付全款状态
-        if (Number(this.model.outstandingAmount) === 0) {
+        if (Number(this.model.outstandingAmount) <= 0) {
           this.model.accountStatus = '3'
           // 未收金额 > 0 且 未收金额 < 应收金额，部分付款状态
         } else if (Number(this.model.outstandingAmount) > 0 && Number(this.model.outstandingAmount) < Number(this.accountsReceivableNum)) {

From e250bfe5153f404fe878b9aed6550c68157fd7e1 Mon Sep 17 00:00:00 2001
From: zhaoxiao <zhaoxiao@syxysoft.com>
Date: Tue, 26 Oct 2021 18:37:05 +0800
Subject: [PATCH 13/21] =?UTF-8?q?[=E9=9C=80=E6=B1=82=E5=8F=98=E6=9B=B4]=20?=
 =?UTF-8?q?=E6=94=B6=E5=85=A5=E5=90=88=E5=90=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../expenditureContract/ExpenditureContractList.vue           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/contractManagement/expenditureContract/ExpenditureContractList.vue b/src/views/contractManagement/expenditureContract/ExpenditureContractList.vue
index c3c35e9..d2a322c 100644
--- a/src/views/contractManagement/expenditureContract/ExpenditureContractList.vue
+++ b/src/views/contractManagement/expenditureContract/ExpenditureContractList.vue
@@ -91,14 +91,14 @@
           <!--          项目名称-->
           <template slot="projectName" slot-scope="text, record">
             <j-ellipsis
-              @click="toRevenueContractDetail(record.id, record.contractNum)"
+              @click="toContractDetail(record.id, record.contractNum)"
               v-if="record.chargeStatus === 1"
               :value="text"
               style="cursor: pointer"
               :length="18"></j-ellipsis>
             <j-ellipsis
               class="primary-color"
-              @click="toRevenueContractDetail(record.id)"
+              @click="toContractDetail(record.id)"
               v-else
               :value="text"
               :length="18"></j-ellipsis>

From ada23bcece3dc33beb4f7e13f334ce0693c17ca2 Mon Sep 17 00:00:00 2001
From: zhaoxiao <zhaoxiao@syxysoft.com>
Date: Wed, 27 Oct 2021 11:24:27 +0800
Subject: [PATCH 14/21] =?UTF-8?q?[bug]=20=E5=AE=A1=E6=A0=B8=E5=B8=A6?=
 =?UTF-8?q?=E5=87=BA=E4=BA=86=E4=B8=8A=E4=B8=AA=E5=AE=A1=E6=A0=B8=E5=90=88?=
 =?UTF-8?q?=E5=90=8C=E7=9A=84=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../revenueContract/modules/RevenueContractAduitModule.vue    | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/views/contractManagement/revenueContract/modules/RevenueContractAduitModule.vue b/src/views/contractManagement/revenueContract/modules/RevenueContractAduitModule.vue
index 1651af3..5ff0086 100644
--- a/src/views/contractManagement/revenueContract/modules/RevenueContractAduitModule.vue
+++ b/src/views/contractManagement/revenueContract/modules/RevenueContractAduitModule.vue
@@ -122,6 +122,8 @@ export default {
       this.close()
     },
     open() {
+      this.showExplainRemarks = false
+      this.form.resetFields()
       let userInfo = Vue.ls.get(USER_INFO)
       console.log(userInfo)
       this.model.userName = userInfo.realname
@@ -131,6 +133,8 @@ export default {
       })
     },
     close() {
+      this.showExplainRemarks = false
+      this.form.resetFields()
       this.visible = false
     },
     /**

From 8f5d9914d252d73ad24881456fedc582a01c60ee Mon Sep 17 00:00:00 2001
From: zhaoxiao <zhaoxiao@syxysoft.com>
Date: Wed, 27 Oct 2021 11:28:28 +0800
Subject: [PATCH 15/21] =?UTF-8?q?[=E9=9C=80=E6=B1=82=E5=8F=98=E6=9B=B4]=20?=
 =?UTF-8?q?=E6=99=AE=E9=80=9A=E9=A1=B9=E7=9B=AE=E3=80=81=E5=B7=A5=E4=BD=9C?=
 =?UTF-8?q?=E7=BB=84=E6=88=90=E5=91=98=E6=96=B0=E5=A2=9E/=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E6=94=B6=E5=85=A5=E5=90=88=E5=90=8C=E6=94=B9=E4=B8=BA?=
 =?UTF-8?q?=E4=B8=8B=E6=8B=89=EF=BC=88=E6=B7=BB=E5=8A=A0=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E6=94=B6=E5=85=A5=E5=90=88=E5=90=8C=E7=BB=84=E4=BB=B6=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/incomePaymentsApi.js                  |  5 +-
 src/components/company/SelectPrincipal.vue    |  6 +-
 .../tools/SelectRevenueContract.vue           | 65 +++++++++++++++++++
 .../modules/GeneralProjectModule.vue          | 20 ++++--
 .../modules/WorkingGroupMemberUnitModule.vue  | 20 ++++--
 5 files changed, 100 insertions(+), 16 deletions(-)
 create mode 100644 src/components/tools/SelectRevenueContract.vue

diff --git a/src/api/incomePaymentsApi.js b/src/api/incomePaymentsApi.js
index 28e902d..ff7d65f 100644
--- a/src/api/incomePaymentsApi.js
+++ b/src/api/incomePaymentsApi.js
@@ -82,6 +82,8 @@ const getIsAssociatedProject = (param) => getAction('/contract/payIncomeContract
 const aduitExpenditureContract = (param) => postAction('/contract/paySpendingContract/audit', param)
 // 支出合同存档
 const archiveExpenditureContract = (param) => postAction('/contract/paySpendingContract/archive', param)
+// 获取全部收入合同
+const getAllRevenueContract = (param) => getAction('', param)
 
 export {
   getWorkingGroupById,
@@ -124,5 +126,6 @@ export {
   getAllDepartTreeList,
   getIsAssociatedProject,
   aduitExpenditureContract,
-  archiveExpenditureContract
+  archiveExpenditureContract,
+  getAllRevenueContract
 }
diff --git a/src/components/company/SelectPrincipal.vue b/src/components/company/SelectPrincipal.vue
index 7a68338..accd74b 100644
--- a/src/components/company/SelectPrincipal.vue
+++ b/src/components/company/SelectPrincipal.vue
@@ -39,7 +39,11 @@ export default {
      */
     initUserList() {
       getAllUserList().then(res => {
-        this.userList = res.result
+        if (res.success) {
+          this.userList = res.result
+        } else {
+          this.$message.warn(res.message)
+        }
       })
     },
     // 下拉框的搜索
diff --git a/src/components/tools/SelectRevenueContract.vue b/src/components/tools/SelectRevenueContract.vue
new file mode 100644
index 0000000..d12b655
--- /dev/null
+++ b/src/components/tools/SelectRevenueContract.vue
@@ -0,0 +1,65 @@
+<template>
+  <a-select
+    :value="value"
+    v-bind="$attrs"
+    v-on="$listeners"
+    show-search
+    allowClear
+    option-filter-prop="children"
+    :filter-option="filterOption">
+    <a-select-option v-for="item in contractList" :key="item.id" :value="item.contractNum">
+      {{ item.contractNum }}
+    </a-select-option>
+  </a-select>
+</template>
+
+<script>
+import { getAllRevenueContract } from '../../api/incomePaymentsApi'
+
+export default {
+  name: 'SelectRevenueContract',
+  props: {
+    // 绑定值--合同号
+    value: {
+      type: String,
+      required: false,
+      default: undefined
+    }
+  },
+  data() {
+    return {
+      // 合同列表
+      contractList: []
+    }
+  },
+  created() {
+    this.initRevenueContractList()
+  },
+  methods: {
+    initRevenueContractList() {
+      getAllRevenueContract().then(res => {
+        if (res.success) {
+          this.contractList = res.result.records
+        } else {
+          this.$message.warn(res.message)
+        }
+      })
+    },
+    // 下拉框的搜索
+    filterOption(input, option) {
+      console.log(option)
+      return (
+        option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
+      )
+    }
+  },
+  model: {
+    prop: 'value',
+    event: 'change'
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
\ No newline at end of file
diff --git a/src/views/projectManagement/modules/GeneralProjectModule.vue b/src/views/projectManagement/modules/GeneralProjectModule.vue
index 114f5d8..4800cc9 100644
--- a/src/views/projectManagement/modules/GeneralProjectModule.vue
+++ b/src/views/projectManagement/modules/GeneralProjectModule.vue
@@ -120,11 +120,16 @@
           </a-col>
           <a-col :xl="12" :sm="24">
             <a-form-item label="合同号" :labelCol="labelCol" :wrapperCol="wrapperCol" v-if="chargeWayType === 2">
-              <a-input placeholder="请输入合同号"
-                       v-decorator="['contractNum',validatorRules.contractNum]"
-                       :maxLength='50'
-                       :disabled="isContractNumDisabled || isAssociatedContract"
-                       @change="e => {e.target.value = (e.target.value + '').trim()}"></a-input>
+<!--              <a-input placeholder="请输入合同号"-->
+<!--                       v-decorator="['contractNum',validatorRules.contractNum]"-->
+<!--                       :maxLength='50'-->
+<!--                       :disabled="isContractNumDisabled || isAssociatedContract"-->
+<!--                       @change="e => {e.target.value = (e.target.value + '').trim()}"></a-input>-->
+              <select-revenue-contract
+                placeholder="请选择合同号"
+                v-decorator="['contractNum',validatorRules.contractNum]"
+                :disabled="isContractNumDisabled || isAssociatedContract">
+              </select-revenue-contract>
             </a-form-item>
           </a-col>
         </a-row>
@@ -189,10 +194,11 @@ import Vue from 'vue'
 import { USER_INFO } from '../../../store/mutation-types'
 import { money } from '../../../utils/validate'
 import { checkAssociatedProject } from '../../../utils/projectCheck'
+import SelectRevenueContract from '../../../components/tools/SelectRevenueContract'
 
 export default {
   name: 'GeneralProjectModule',
-  components: { JYearDate, JUpload, CompanySelect, SelectPrincipal, SelectContacts },
+  components: { JYearDate, JUpload, CompanySelect, SelectPrincipal, SelectContacts, SelectRevenueContract },
   props: {
     // 收入合同关联时传入的企业信息，不可修改
     defaultChargeCompany: {
@@ -304,7 +310,7 @@ export default {
           validateTrigger: 'change'
         },
         contractNum: {
-          rules: [{ required: true, message: '请输入合同号' }],
+          rules: [{ required: true, message: '请选择合同号' }],
           validateTrigger: 'blur'
         },
         chargeNoticeNo: {
diff --git a/src/views/projectManagement/modules/WorkingGroupMemberUnitModule.vue b/src/views/projectManagement/modules/WorkingGroupMemberUnitModule.vue
index 713e304..2c71b63 100644
--- a/src/views/projectManagement/modules/WorkingGroupMemberUnitModule.vue
+++ b/src/views/projectManagement/modules/WorkingGroupMemberUnitModule.vue
@@ -138,11 +138,16 @@
           </a-col>
           <a-col :xl="12" :sm="24">
             <a-form-item label="合同号" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input placeholder="请输入合同号"
-                       v-decorator="['contractNum',validatorRules.contractNum]"
-                       :maxLength='50'
-                       :disabled="isContractNumDisabled || isAssociatedContract"
-                       @change="e => {e.target.value = (e.target.value + '').trim()}"></a-input>
+<!--              <a-input placeholder="请输入合同号"-->
+<!--                       v-decorator="['contractNum',validatorRules.contractNum]"-->
+<!--                       :maxLength='50'-->
+<!--                       :disabled="isContractNumDisabled || isAssociatedContract"-->
+<!--                       @change="e => {e.target.value = (e.target.value + '').trim()}"></a-input>-->
+              <select-revenue-contract
+                placeholder="请选择合同号"
+                v-decorator="['contractNum',validatorRules.contractNum]">
+                :disabled="isContractNumDisabled || isAssociatedContract"
+              </select-revenue-contract>
             </a-form-item>
           </a-col>
         </a-row>
@@ -227,10 +232,11 @@ import { isRepeat } from '../../../utils/util'
 import { addZero } from '../../../utils/util'
 import { money } from '../../../utils/validate'
 import { checkAssociatedProject } from '../../../utils/projectCheck'
+import SelectRevenueContract from '../../../components/tools/SelectRevenueContract'
 
 export default {
   name: 'WorkingGroupMemberUnitModule',
-  components: { JUpload, CompanySelect, SelectContacts },
+  components: { JUpload, CompanySelect, SelectContacts, SelectRevenueContract },
   props: {
     // 默认来款方式（收入合同新增工作组项目，来款方式默认为2--合同）
     defaultChargeWay: {
@@ -331,7 +337,7 @@ export default {
           validateTrigger: 'blur'
         },
         contractNum: {
-          rules: [{ required: true, message: '请输入合同号' }],
+          rules: [{ required: true, message: '请选择合同号' }],
           validateTrigger: 'blur'
         },
         charge: {

From 4fc06160f2a4851c7aaf21b0976abce934f682f2 Mon Sep 17 00:00:00 2001
From: zhaoxiao <zhaoxiao@syxysoft.com>
Date: Wed, 27 Oct 2021 14:42:40 +0800
Subject: [PATCH 16/21] =?UTF-8?q?[=E9=9C=80=E6=B1=82=E5=8F=98=E6=9B=B4]=20?=
 =?UTF-8?q?=E6=99=AE=E9=80=9A=E9=A1=B9=E7=9B=AE=E3=80=81=E5=B7=A5=E4=BD=9C?=
 =?UTF-8?q?=E7=BB=84=E6=88=90=E5=91=98=E7=BB=B4=E6=8A=A4=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?/=E7=BC=96=E8=BE=91=E9=A1=B5=E9=9D=A2=E5=90=88=E5=90=8C?=
 =?UTF-8?q?=E7=BC=96=E5=8F=B7=E8=BE=93=E5=85=A5=E6=A1=86=E5=8F=98=E6=88=90?=
 =?UTF-8?q?=E4=B8=8B=E6=8B=89=E9=80=89=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/incomePaymentsApi.js                  |  4 +-
 src/components/company/SelectContacts.vue     | 67 ++++++++++---------
 .../tools/SelectRevenueContract.vue           | 37 ++++++++--
 .../modules/GeneralProjectModule.vue          |  4 +-
 .../modules/WorkingGroupMemberUnitModule.vue  | 13 ++--
 5 files changed, 80 insertions(+), 45 deletions(-)

diff --git a/src/api/incomePaymentsApi.js b/src/api/incomePaymentsApi.js
index ff7d65f..0a6e399 100644
--- a/src/api/incomePaymentsApi.js
+++ b/src/api/incomePaymentsApi.js
@@ -82,8 +82,8 @@ const getIsAssociatedProject = (param) => getAction('/contract/payIncomeContract
 const aduitExpenditureContract = (param) => postAction('/contract/paySpendingContract/audit', param)
 // 支出合同存档
 const archiveExpenditureContract = (param) => postAction('/contract/paySpendingContract/archive', param)
-// 获取全部收入合同
-const getAllRevenueContract = (param) => getAction('', param)
+// 获取全部收入合同（通过企业id查询列表）
+const getAllRevenueContract = (param) => getAction('/contract/payIncomeContract/queryByCompanyId', param)
 
 export {
   getWorkingGroupById,
diff --git a/src/components/company/SelectContacts.vue b/src/components/company/SelectContacts.vue
index 369f319..1ef6603 100644
--- a/src/components/company/SelectContacts.vue
+++ b/src/components/company/SelectContacts.vue
@@ -28,7 +28,7 @@
 
 <script>
 import ContactManagementModule from '@views/businessManagement/modules/ContactManagementModule'
-import { getContactsByCompany,getContactsByCompanyNoLimit } from '@api/api'
+import { getContactsByCompany, getContactsByCompanyNoLimit } from '@api/api'
 
 export default {
   name: 'SelectContacts',
@@ -68,10 +68,10 @@ export default {
       default: 'string'
     },
     // 是否调用无权限接口
-    isLimit:{
-      type:Boolean,
-      required:false,
-      default:false
+    isLimit: {
+      type: Boolean,
+      required: false,
+      default: false
     }
   },
   data() {
@@ -119,35 +119,36 @@ export default {
      * 获取联系人数据
      */
     getContactsList() {
+      let params = {}
       if (this.selectedCompany && this.selectedCompany.id) {
-        const params = {
-          companyId: this.selectedCompany.id
-        }
-        // 是否调用无权限接口
-        if(this.isLimit){
-          // 调用无权限接口
-          return new Promise(resolve => {
-            getContactsByCompanyNoLimit(params).then(res => {
-              this.contactsList = res.result
-              if (this.initContacts && this.initContacts.id) {
-                this.contactsList.push(this.initContacts)
-              }
-              resolve()
-            })
-          })
-        }else{
-          return new Promise(resolve => {
-            getContactsByCompany(params).then(res => {
-              this.contactsList = res.result
-              console.log(this.initContacts)
-              if (this.initContacts && this.initContacts.id) {
-                this.contactsList.push(this.initContacts)
-              }
-              resolve()
-            })
-          })
-        }
+        params.companyId = this.selectedCompany.id
+      } else {
+        params.companyId = null
       }
+      // 是否调用无权限接口
+      if (this.isLimit) {
+        // 调用无权限接口
+        return new Promise(resolve => {
+          getContactsByCompanyNoLimit(params).then(res => {
+            this.contactsList = res.result
+            if (this.initContacts && this.initContacts.id) {
+              this.contactsList.push(this.initContacts)
+            }
+            resolve()
+          })
+        })
+      } else {
+        return new Promise(resolve => {
+          getContactsByCompany(params).then(res => {
+            this.contactsList = res.result || []
+            if (this.initContacts && this.initContacts.id) {
+              this.contactsList.push(this.initContacts)
+            }
+            resolve()
+          })
+        })
+      }
+
     },
     /**
      * 新建联系人
@@ -179,7 +180,7 @@ export default {
     // 下拉框的搜索
     filterOption(input, option) {
       return (
-          option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
+        option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
       )
     },
     /**
diff --git a/src/components/tools/SelectRevenueContract.vue b/src/components/tools/SelectRevenueContract.vue
index d12b655..67871fa 100644
--- a/src/components/tools/SelectRevenueContract.vue
+++ b/src/components/tools/SelectRevenueContract.vue
@@ -7,8 +7,8 @@
     allowClear
     option-filter-prop="children"
     :filter-option="filterOption">
-    <a-select-option v-for="item in contractList" :key="item.id" :value="item.contractNum">
-      {{ item.contractNum }}
+    <a-select-option v-for="item in contractList" :key="item" :value="item">
+      {{ item }}
     </a-select-option>
   </a-select>
 </template>
@@ -24,6 +24,14 @@ export default {
       type: String,
       required: false,
       default: undefined
+    },
+    // 选中的企业，用于获取合同列表
+    company: {
+      type: Object,
+      required: false,
+      default: () => {
+        return {}
+      }
     }
   },
   data() {
@@ -32,16 +40,35 @@ export default {
       contractList: []
     }
   },
+  watch: {
+    // 监听企业变化获取合同信息
+    company: {
+      handler() {
+        if (!this.company.id) {
+          this.$message.warn(`请先选择企业`)
+          return
+        }
+        this.initRevenueContractList()
+      },
+      deep: true
+    }
+  },
   created() {
     this.initRevenueContractList()
   },
   methods: {
+    /**
+     * 通过企业id获取合同号
+     */
     initRevenueContractList() {
-      getAllRevenueContract().then(res => {
+      const param = {
+        companyId: this.company.id
+      }
+      getAllRevenueContract(param).then(res => {
         if (res.success) {
-          this.contractList = res.result.records
+          this.contractList = res.result
         } else {
-          this.$message.warn(res.message)
+          console.log(res.message)
         }
       })
     },
diff --git a/src/views/projectManagement/modules/GeneralProjectModule.vue b/src/views/projectManagement/modules/GeneralProjectModule.vue
index 4800cc9..edec7d6 100644
--- a/src/views/projectManagement/modules/GeneralProjectModule.vue
+++ b/src/views/projectManagement/modules/GeneralProjectModule.vue
@@ -127,6 +127,7 @@
 <!--                       @change="e => {e.target.value = (e.target.value + '').trim()}"></a-input>-->
               <select-revenue-contract
                 placeholder="请选择合同号"
+                :company="selectedCompany"
                 v-decorator="['contractNum',validatorRules.contractNum]"
                 :disabled="isContractNumDisabled || isAssociatedContract">
               </select-revenue-contract>
@@ -472,8 +473,9 @@ export default {
       this.selectedCompany = value
       this.model.contactsId = undefined
       this.model.mailContactsId = undefined
+      this.model.contractNum = undefined
       this.$nextTick(() => {
-        this.form.setFieldsValue(pick(this.model, 'contactsId', 'mailContactsId'))
+        this.form.setFieldsValue(pick(this.model, 'contactsId', 'mailContactsId', 'contractNum'))
       })
     },
     /**
diff --git a/src/views/projectManagement/modules/WorkingGroupMemberUnitModule.vue b/src/views/projectManagement/modules/WorkingGroupMemberUnitModule.vue
index 2c71b63..c17c5c0 100644
--- a/src/views/projectManagement/modules/WorkingGroupMemberUnitModule.vue
+++ b/src/views/projectManagement/modules/WorkingGroupMemberUnitModule.vue
@@ -88,8 +88,10 @@
           <a-col :xl="12" :sm="24">
             <a-form-item label="来款方式" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <span v-if="defaultChargeWay === 2">合同</span>
-              <a-radio-group v-decorator="['chargeWay',validatorRules.chargeWay]" @change="handlechargeWayChange"
-                             v-else :disabled="isAssociatedContract">
+              <a-radio-group v-decorator="['chargeWay',validatorRules.chargeWay]"
+                             @change="handlechargeWayChange"
+                             v-else
+                             :disabled="isAssociatedContract">
                 <a-radio :value="1">无</a-radio>
                 <a-radio :value="2">合同</a-radio>
                 <a-radio :value="3">收费通知</a-radio>
@@ -145,8 +147,9 @@
 <!--                       @change="e => {e.target.value = (e.target.value + '').trim()}"></a-input>-->
               <select-revenue-contract
                 placeholder="请选择合同号"
-                v-decorator="['contractNum',validatorRules.contractNum]">
+                :company="selectedCompany"
                 :disabled="isContractNumDisabled || isAssociatedContract"
+                v-decorator="['contractNum',validatorRules.contractNum]">
               </select-revenue-contract>
             </a-form-item>
           </a-col>
@@ -417,6 +420,7 @@ export default {
         checkAssociatedProject(record.id).then(res => {
           this.disabledCompany = this.disabledChargeCompany || res || (!!record.inAccount && record.inAccount !== 0) || (!!record.makeInvoice && record.makeInvoice !== 0) || (!!record.mail && record.mail !== 0)
           this.isAssociatedContract = res
+          console.log(this.isContractNumDisabled,this.isAssociatedContract, this.isContractNumDisabled || this.isAssociatedContract, '----------------')
         })
       } else {
         this.disabledCompany = this.disabledChargeCompany
@@ -584,8 +588,9 @@ export default {
       this.model.contactsIdTwo = undefined
       this.model.contactsIdThree = undefined
       this.model.mailContactsId = undefined
+      this.model.contractNum = undefined
       this.$nextTick(() => {
-        this.form.setFieldsValue(pick(this.model, 'contactsIdOne', 'contactsIdTwo', 'contactsIdThree', 'mailContactsId'))
+        this.form.setFieldsValue(pick(this.model, 'contactsIdOne', 'contactsIdTwo', 'contactsIdThree', 'mailContactsId', 'contractNum'))
       })
     },
     /**

From 8801eb6388850b3daaa9ebfa24372c2aed2d639b Mon Sep 17 00:00:00 2001
From: zhaoxiao <zhaoxiao@syxysoft.com>
Date: Wed, 27 Oct 2021 15:05:41 +0800
Subject: [PATCH 17/21] =?UTF-8?q?[=E9=9C=80=E6=B1=82=E5=8F=98=E6=9B=B4]=20?=
 =?UTF-8?q?=E8=B5=84=E6=96=99=E7=BD=91=E5=91=98=E6=96=B0=E5=A2=9E/?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E9=A1=B5=E9=9D=A2=E5=90=88=E5=90=8C=E7=BC=96?=
 =?UTF-8?q?=E5=8F=B7=E8=BE=93=E5=85=A5=E6=A1=86=E5=8F=98=E6=88=90=E4=B8=8B?=
 =?UTF-8?q?=E6=8B=89=E9=80=89=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tools/SelectRevenueContract.vue           |  7 +-
 .../modules/AddMemberProject.vue              | 15 ++-
 .../modules/SafeguardMemberModal.vue          | 98 ++++++++++---------
 3 files changed, 70 insertions(+), 50 deletions(-)

diff --git a/src/components/tools/SelectRevenueContract.vue b/src/components/tools/SelectRevenueContract.vue
index 67871fa..a8e97e4 100644
--- a/src/components/tools/SelectRevenueContract.vue
+++ b/src/components/tools/SelectRevenueContract.vue
@@ -61,8 +61,11 @@ export default {
      * 通过企业id获取合同号
      */
     initRevenueContractList() {
-      const param = {
-        companyId: this.company.id
+      let param = {}
+      if (this.company && this.company.id){
+        param.companyId = this.company.id
+      } else {
+        param.companyId = null
       }
       getAllRevenueContract(param).then(res => {
         if (res.success) {
diff --git a/src/views/contractManagement/revenueContract/modules/AddMemberProject.vue b/src/views/contractManagement/revenueContract/modules/AddMemberProject.vue
index 9a40f62..194a84c 100644
--- a/src/views/contractManagement/revenueContract/modules/AddMemberProject.vue
+++ b/src/views/contractManagement/revenueContract/modules/AddMemberProject.vue
@@ -85,8 +85,14 @@
           </a-col>
           <a-col :xl="12" :sm="24">
             <a-form-item label="合同编号" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input placeholder="请输入合同编号" @change="event => event.target.value = event.target.value.trim()"
-                       :maxLength="50" v-decorator="['contractNo',validatorRules.contractNo]" disabled></a-input>
+<!--              <a-input placeholder="请输入合同编号" @change="event => event.target.value = event.target.value.trim()"-->
+<!--                       :maxLength="50" v-decorator="['contractNo',validatorRules.contractNo]" disabled></a-input>-->
+              <select-revenue-contract
+                placeholder="请选择合同编号"
+                :company="contractInfo.companyId"
+                disabled
+                v-decorator="['contractNo',validatorRules.contractNo]" >
+              </select-revenue-contract>
             </a-form-item>
           </a-col>
         </a-row>
@@ -120,14 +126,15 @@ import CompanySelect from '@comp/company/CompanySelect'
 import {queryContractMemberProject} from '@api/incomeMeetingApi'
 import {money} from '@/utils/validate'
 import {addZero} from '@/utils/util'
-
+import SelectRevenueContract from '../../../../components/tools/SelectRevenueContract'
 
 export default {
   name: 'AddMemberProject',
   components: {
     SelectContacts,
     JDictSelectTag,
-    CompanySelect
+    CompanySelect,
+    SelectRevenueContract
   },
   data() {
     return {
diff --git a/src/views/incomePayments/memberManage/modules/SafeguardMemberModal.vue b/src/views/incomePayments/memberManage/modules/SafeguardMemberModal.vue
index 1db26ae..812e0af 100644
--- a/src/views/incomePayments/memberManage/modules/SafeguardMemberModal.vue
+++ b/src/views/incomePayments/memberManage/modules/SafeguardMemberModal.vue
@@ -132,17 +132,23 @@
               :labelCol="labelCol"
               :wrapperCol="wrapperCol"
             >
-              <a-input
-                placeholder="请输入合同号"
-                :maxLength="50"
+              <!--              <a-input-->
+              <!--                placeholder="请输入合同号"-->
+              <!--                :maxLength="50"-->
+              <!--                v-decorator="['contractNo', validatorRules.contractNo]"-->
+              <!--                :disabled="isAssociatedContract"-->
+              <!--                @change="-->
+              <!--                  (e) => {-->
+              <!--                    e.target.value = (e.target.value + '').trim();-->
+              <!--                  }-->
+              <!--                "-->
+              <!--              ></a-input>-->
+              <select-revenue-contract
+                :company="selectedCompany"
+                placeholder="请选择合同号"
                 v-decorator="['contractNo', validatorRules.contractNo]"
-                :disabled="isAssociatedContract"
-                @change="
-                  (e) => {
-                    e.target.value = (e.target.value + '').trim();
-                  }
-                "
-              ></a-input>
+                :disabled="isAssociatedContract">
+              </select-revenue-contract>
             </a-form-item>
           </a-col>
         </a-row>
@@ -207,11 +213,11 @@
         </a-row>
       </a-form>
     </a-spin>
-<!--    <contact-management-module-->
-<!--      ref="contactForm"-->
-<!--      is-company-disabled-->
-<!--      :selected-company="selectedCompany"-->
-<!--    ></contact-management-module>-->
+    <!--    <contact-management-module-->
+    <!--      ref="contactForm"-->
+    <!--      is-company-disabled-->
+    <!--      :selected-company="selectedCompany"-->
+    <!--    ></contact-management-module>-->
   </j-modal>
 </template>
 
@@ -222,9 +228,10 @@ import JUpload from '@comp/jero/JUpload'
 import CompanySelect from '@comp/company/CompanySelect'
 // import ContactManagementModule from '@views/businessManagement/modules/ContactManagementModule'
 import SelectContacts from '@comp/company/SelectContacts'
-import {addZero} from '@/utils/util'
-import {money} from '@/utils/validate'
-import {checkAssociatedProject} from '@/utils/projectCheck'
+import { addZero } from '@/utils/util'
+import { money } from '@/utils/validate'
+import { checkAssociatedProject } from '@/utils/projectCheck'
+import SelectRevenueContract from '../../../../components/tools/SelectRevenueContract'
 
 export default {
   name: 'SafeguardMemberModal',
@@ -233,6 +240,7 @@ export default {
     CompanySelect,
     // ContactManagementModule,
     SelectContacts,
+    SelectRevenueContract
   },
   data() {
     return {
@@ -244,58 +252,58 @@ export default {
       model: {},
       labelCol: {
         xs: { span: 24 },
-        sm: { span: 6 },
+        sm: { span: 6 }
       },
       wrapperCol: {
         xs: { span: 24 },
-        sm: { span: 18 },
+        sm: { span: 18 }
       },
       remarksLabelCol: {
         xs: { span: 24 },
-        sm: { span: 3 },
+        sm: { span: 3 }
       },
       remarksWrapperCol: {
         xs: { span: 24 },
-        sm: { span: 21 },
+        sm: { span: 21 }
       },
       validatorRules: {
         companyId: {
           rules: [{ required: true, message: '请选择会员单位' }],
-          validateTrigger: 'blur',
+          validateTrigger: 'blur'
         },
         contractNo: {
-          rules: [{ required: true, message: '请输入合同号' }],
-          validateTrigger: 'blur',
+          rules: [{ required: true, message: '请选择合同号' }],
+          validateTrigger: 'blur'
         },
         companyContactId: {
           rules: [{ required: true, message: '请选择企业联系人' }],
-          validateTrigger: 'change',
+          validateTrigger: 'change'
         },
         postContactId: {
           rules: [{ required: true, message: '请选择邮寄联系人' }],
-          validateTrigger: 'change',
+          validateTrigger: 'change'
         },
         paymentMethod: {
           rules: [{ required: true, message: '请选择来款方式' }],
           validateTrigger: ['blur', 'change'],
-          initialValue: 3,
+          initialValue: 3
         },
         amountReceivable: {
           rules: [
-            {required: true, validator: this.validateMoney},
+            { required: true, validator: this.validateMoney }
           ],
           validateTrigger: ['blur']
         },
 
         chargeNoticeNo: {
           rules: [{ required: true, message: '请输入收费通知号' }],
-          validateTrigger: 'blur',
+          validateTrigger: 'blur'
         },
         needInvoice: {
           rules: [{ required: true, message: '请选择发票类型' }],
           validateTrigger: ['change', 'blur'],
-          initialValue: 0,
-        },
+          initialValue: 0
+        }
       },
       // 来款方式
       incomePaysType: 3,
@@ -309,10 +317,10 @@ export default {
       baseInfo: this.$store.state.currentProjetcInfo,
       url: {
         add: '/jero/memberProjectSubitem/add',
-        edit: '/jero/memberProjectSubitem/edit',
+        edit: '/jero/memberProjectSubitem/edit'
       },
       disabledCompany: false, // 企业是否可以编辑
-      isAssociatedContract: false, // 是否已关联合同
+      isAssociatedContract: false // 是否已关联合同
     }
   },
   methods: {
@@ -354,7 +362,7 @@ export default {
         this.timer = setTimeout(() => {
           this.form.setFieldsValue({
             chargeNoticeFileId: this.baseInfo.chargeNoticeFileId,
-            chargeNoticeNo: this.baseInfo.chargeNoticeNo,
+            chargeNoticeNo: this.baseInfo.chargeNoticeNo
           })
         }, 100)
       }
@@ -363,16 +371,16 @@ export default {
       if (record.companyId) {
         this.model.companyId = {
           id: record.companyId,
-          companyName: record.companyName,
+          companyName: record.companyName
         }
         this.selectedCompany = Object.assign({}, this.model.companyId)
         this.selectPerson = {
           id: this.model.companyContactTemporaryId,
-          name: this.model.companyContactName,
+          name: this.model.companyContactName
         }
         this.selectMailPerson = {
           id: this.model.postContactTemporaryId,
-          name: this.model.postContactName,
+          name: this.model.postContactName
         }
         // 修改来款方式 控制dom对应显示隐藏
         this.incomePaysType = record.paymentMethod
@@ -397,10 +405,10 @@ export default {
       })
     },
     // 选择企业联系人 带出邮寄联系人
-    changetPerson(val){
+    changetPerson(val) {
       // 只有邮寄联系人没有值的时候才去联动复制
-      if(this.form.getFieldValue('postContactId') === undefined ){
-        this.form.setFieldsValue({'postContactId':val})
+      if (this.form.getFieldValue('postContactId') === undefined) {
+        this.form.setFieldsValue({ 'postContactId': val })
       }
     },
     close() {
@@ -454,7 +462,9 @@ export default {
      *  选择会员单位
      * */
     companyChange(val) {
-      this.selectedCompany = Object.assign({}, val, )
+      // 清除合同号
+      this.form.setFieldsValue({ contractNo: undefined })
+      this.selectedCompany = Object.assign({}, val)
     },
     handleCancel() {
       this.selectedCompany = null
@@ -472,8 +482,8 @@ export default {
     addContactsOk() {
       this.$refs.selectContacts.getContactsList()
       this.$refs.selectMailContacts.getContactsList()
-    },
-  },
+    }
+  }
 }
 </script>
 

From 0ab50be5b0dd69511f6f8d4266063325e87e2ca6 Mon Sep 17 00:00:00 2001
From: zhaoxiao <zhaoxiao@syxysoft.com>
Date: Thu, 28 Oct 2021 11:28:29 +0800
Subject: [PATCH 18/21] =?UTF-8?q?[=E9=9C=80=E6=B1=82=E5=8F=98=E6=9B=B4]=20?=
 =?UTF-8?q?=E5=90=88=E5=90=8C=E7=BC=96=E5=8F=B7=E4=B8=8B=E6=8B=89=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E6=A0=A1=E9=AA=8C=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../revenueContract/modules/AddMemberProject.vue                | 2 +-
 .../memberManage/modules/SafeguardMemberModal.vue               | 2 +-
 src/views/projectManagement/modules/GeneralProjectModule.vue    | 2 +-
 .../projectManagement/modules/WorkingGroupMemberUnitModule.vue  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/contractManagement/revenueContract/modules/AddMemberProject.vue b/src/views/contractManagement/revenueContract/modules/AddMemberProject.vue
index 194a84c..7d6ec07 100644
--- a/src/views/contractManagement/revenueContract/modules/AddMemberProject.vue
+++ b/src/views/contractManagement/revenueContract/modules/AddMemberProject.vue
@@ -171,7 +171,7 @@ export default {
         },
         contractNo: {
           rules: [{ required: true, message: '请输入合同号' }],
-          validateTrigger: 'blur',
+          validateTrigger: 'change',
         },
         companyContactId: {
           rules: [{ required: true, message: '请选择企业联系人' }],
diff --git a/src/views/incomePayments/memberManage/modules/SafeguardMemberModal.vue b/src/views/incomePayments/memberManage/modules/SafeguardMemberModal.vue
index 812e0af..6f4223c 100644
--- a/src/views/incomePayments/memberManage/modules/SafeguardMemberModal.vue
+++ b/src/views/incomePayments/memberManage/modules/SafeguardMemberModal.vue
@@ -273,7 +273,7 @@ export default {
         },
         contractNo: {
           rules: [{ required: true, message: '请选择合同号' }],
-          validateTrigger: 'blur'
+          validateTrigger: 'change'
         },
         companyContactId: {
           rules: [{ required: true, message: '请选择企业联系人' }],
diff --git a/src/views/projectManagement/modules/GeneralProjectModule.vue b/src/views/projectManagement/modules/GeneralProjectModule.vue
index 418c941..5a0feae 100644
--- a/src/views/projectManagement/modules/GeneralProjectModule.vue
+++ b/src/views/projectManagement/modules/GeneralProjectModule.vue
@@ -314,7 +314,7 @@ export default {
         },
         contractNum: {
           rules: [{ required: true, message: '请选择合同号' }],
-          validateTrigger: 'blur'
+          validateTrigger: 'change'
         },
         chargeNoticeNo: {
           rules: [{ required: true, message: '请输入收费通知号' }],
diff --git a/src/views/projectManagement/modules/WorkingGroupMemberUnitModule.vue b/src/views/projectManagement/modules/WorkingGroupMemberUnitModule.vue
index c17c5c0..9b473dc 100644
--- a/src/views/projectManagement/modules/WorkingGroupMemberUnitModule.vue
+++ b/src/views/projectManagement/modules/WorkingGroupMemberUnitModule.vue
@@ -341,7 +341,7 @@ export default {
         },
         contractNum: {
           rules: [{ required: true, message: '请选择合同号' }],
-          validateTrigger: 'blur'
+          validateTrigger: 'change'
         },
         charge: {
           rules: [{ required: true, message: '请输入收费通知号' }],

From e848ab6fa743e572d02b0a92aea0b92f7424a2c8 Mon Sep 17 00:00:00 2001
From: zhaoxiao <zhaoxiao@syxysoft.com>
Date: Thu, 28 Oct 2021 11:45:53 +0800
Subject: [PATCH 19/21] =?UTF-8?q?[=E9=9C=80=E6=B1=82=E5=8F=98=E6=9B=B4]=20?=
 =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=BB=84=E4=BC=9A=E8=AE=AE=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?/=E7=BC=96=E8=BE=91=E9=A1=B5=E9=9D=A2=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E4=BC=9A=E8=AE=AE=E8=B4=B9=E7=94=A8=E6=8F=90=E7=A4=BA=E8=AF=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../meetManage/AddOrDetailMeet.vue            | 94 ++++++++++---------
 1 file changed, 52 insertions(+), 42 deletions(-)

diff --git a/src/views/incomePayments/meetManage/AddOrDetailMeet.vue b/src/views/incomePayments/meetManage/AddOrDetailMeet.vue
index a9b8ab6..894895c 100644
--- a/src/views/incomePayments/meetManage/AddOrDetailMeet.vue
+++ b/src/views/incomePayments/meetManage/AddOrDetailMeet.vue
@@ -181,7 +181,11 @@
           <!--邀请码end-->
 
           <!--会议费用begin-->
-          <div class="item-title">会议费用</div>
+          <div>
+            <span class="item-title">会议费用</span>
+            <!--            工作组会议添加的需求变更-->
+            <span class="working-group-remind" v-if="isWorkGroupMeetType">不收费请填写0元</span>
+          </div>
           <a-row :gutter="24">
 
             <a-col :xxl="8" :xl="12" :sm="24">
@@ -329,9 +333,9 @@
 </template>
 
 <script>
-import {getUserInfo, getMeetInfoById} from '@api/incomeMeetingApi'
-import {isRepeat} from '@/utils/util'
-import {httpAction} from '@api/manage'
+import { getUserInfo, getMeetInfoById } from '@api/incomeMeetingApi'
+import { isRepeat } from '@/utils/util'
+import { httpAction } from '@api/manage'
 import JDictSelectTag from '@comp/dict/JDictSelectTag'
 import JYearDate from '@comp/jero/JYearDate'
 import JUpload from '@comp/jero/JUpload'
@@ -344,9 +348,9 @@ import pick from 'lodash.pick'
 import meetingValidate from '@views/incomePayments/meetManage/meetingValidate'
 import PageHeaderTitle from '@comp/layouts/PageHeaderTitle'
 import JImageUpload from '@comp/jero/JImageUpload'
-import {checkMeetingName} from '@/utils/validateOnly'
-import {addZero} from '@/utils/util'
-import {money} from '@/utils/validate'
+import { checkMeetingName } from '@/utils/validateOnly'
+import { addZero } from '@/utils/util'
+import { money } from '@/utils/validate'
 
 export default {
   name: 'AddOrDetailMeet',
@@ -369,26 +373,26 @@ export default {
       form: this.$form.createForm(this),
       model: {},
       labelCol: {
-        xxl: {span: 7},
-        xs: {span: 24},
-        sm: {span: 6}
+        xxl: { span: 7 },
+        xs: { span: 24 },
+        sm: { span: 6 }
       },
       wrapperCol: {
-        xxl: {span: 17},
-        xs: {span: 24},
-        sm: {span: 18}
+        xxl: { span: 17 },
+        xs: { span: 24 },
+        sm: { span: 18 }
       },
       remarksLabelCol: {
-        xxl: {span: 3},
-        xl: {span: 4},
-        xs: {span: 24},
-        sm: {span: 3}
+        xxl: { span: 3 },
+        xl: { span: 4 },
+        xs: { span: 24 },
+        sm: { span: 3 }
       },
       remarksWrapperCol: {
-        xxl: {span: 21},
-        xl: {span: 20},
-        xs: {span: 24},
-        sm: {span: 21}
+        xxl: { span: 21 },
+        xl: { span: 20 },
+        xs: { span: 24 },
+        sm: { span: 21 }
       },
       // 详细地址
       address: '',
@@ -396,39 +400,39 @@ export default {
       validateInviteCode: {
         invitationCode: {
           rules: [
-            {required: true, validator: this.validateCode},
+            { required: true, validator: this.validateCode }
           ],
           validateTrigger: ['blur']
         },
         meetingName: {
           rules: [
-            {required: true, validator: this.validaeMeetingName},
+            { required: true, validator: this.validaeMeetingName }
           ],
           validateTrigger: ['blur']
         },
         particularYear: {
           rules: [
-            {required: true, validator: this.validateYear},
+            { required: true, validator: this.validateYear }
           ],
           validateTrigger: ['blur', 'change'],
           initialValue: this.$store.getters.currentYear
         },
         meetingCosts: {
           rules: [
-            {required: true, validator: this.validateMeetingCosts},
+            { required: true, validator: this.validateMeetingCosts }
           ],
           validateTrigger: ['blur']
         },
         meetingCostsVip: {
           rules: [
-            {required: true, validator: this.validateMeetingCostsVip},
+            { required: true, validator: this.validateMeetingCostsVip }
           ],
           validateTrigger: ['blur']
-        },
+        }
       },
       url: {
         add: '/meeting/payMeeting/add',
-        edit: '/meeting/payMeeting/edit',
+        edit: '/meeting/payMeeting/edit'
       },
       // 召开时间
       newConvokeTime: '',
@@ -439,9 +443,9 @@ export default {
       // 收费二维码显示
       QRcodeBool: true,
       // 召开地点border颜色控制
-      hasError:false,
+      hasError: false,
       // 会议类型
-      meetingType: '',
+      meetingType: ''
     }
   },
   computed: {
@@ -460,13 +464,13 @@ export default {
       } else {
         return false
       }
-    },
+    }
   },
   mounted() {
     this.pcaData = new AreaPca()
     // 编辑获取会议信息 有id就是编辑走编辑
     if (this.$route.query.id) {
-      getMeetInfoById({id: this.$route.query.id}).then(res => {
+      getMeetInfoById({ id: this.$route.query.id }).then(res => {
         if (res.success) {
           this.edit(res.result)
         }
@@ -538,7 +542,7 @@ export default {
         }
         // 如果是工作组会议 赋值工作组
         if (this.meetingType === '1') {
-          this.form.setFieldsValue(pick(this.model, 'workingGroupId',))
+          this.form.setFieldsValue(pick(this.model, 'workingGroupId'))
         }
         // 如果是国际研讨会则赋值邀请码
         if (this.meetingType === '3') {
@@ -568,7 +572,7 @@ export default {
             httpurl = this.url.add
           }
           let placeName = values.convokeLocale
-          const formData = Object.assign(this.model, values, {venue: this.getPcaText(placeName)})
+          const formData = Object.assign(this.model, values, { venue: this.getPcaText(placeName) })
           // 如果会议的费用未为0 不能上传缴费凭证
           if (values.meetingCosts === '0.00') {
             delete formData.paymentQrCode
@@ -611,8 +615,8 @@ export default {
     /*
     *
     * */
-    changeConvoke(val){
-      if(val){
+    changeConvoke(val) {
+      if (val) {
         this.hasError = false
       }
     },
@@ -648,10 +652,10 @@ export default {
     * 会议负责人
     * */
     selectPerson(val) {
-      getUserInfo({id: val}).then(res => {
+      getUserInfo({ id: val }).then(res => {
         if (res.success) {
           this.$nextTick(() => {
-            this.form.setFieldsValue({directorPhone: res.result.phone})
+            this.form.setFieldsValue({ directorPhone: res.result.phone })
           })
         }
       })
@@ -664,7 +668,7 @@ export default {
         this.$message.warning('最多添加5个酒店联系人')
         return
       }
-      const {form} = this
+      const { form } = this
       const obj = {
         hotelContacts: '',
         hotelContactsPhone: ''
@@ -687,7 +691,7 @@ export default {
       if (this.model.hotelContactsList.length === 1) {
         return
       }
-      const {form} = this
+      const { form } = this
       // // can use data-binding to get
       const hotelContactsList = form.getFieldValue('hotelContactsList')
       // 把循环的dom元素删除
@@ -796,7 +800,7 @@ export default {
       }
       const year = new Date().getFullYear()
       if (Number(value) < year) {
-        callback(`请选择${year}年或之后的年份`)
+        callback(`请选择${ year }年或之后的年份`)
       } else {
         callback()
       }
@@ -836,7 +840,7 @@ export default {
       } else {
         callback('请输入合法的金额数字，最多2位小数,10位正数')
       }
-    },
+    }
   }
 }
 </script>
@@ -870,6 +874,12 @@ export default {
   }
 }
 
+/*会议费用添加的提示语*/
+.working-group-remind {
+  color: red;
+  margin-left: 10px;
+}
+
 /* 新建会议 */
 
 .project-base-info-title {

From 96febb9d80f5462dbe38ccf7923792468074dc5a Mon Sep 17 00:00:00 2001
From: zhaoxiao <zhaoxiao@syxysoft.com>
Date: Thu, 28 Oct 2021 17:34:15 +0800
Subject: [PATCH 20/21] =?UTF-8?q?[=E9=9C=80=E6=B1=82=E5=8F=98=E6=9B=B4]=20?=
 =?UTF-8?q?=E6=89=93=E5=8C=85=E7=AE=A1=E7=90=86-=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=89=93=E5=8C=85=E9=A1=B9=E7=9B=AE-=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BC=B9=E6=A1=86=E3=80=81=E5=88=B0=E8=B4=A6?=
 =?UTF-8?q?=E5=BC=80=E7=A5=A8=E5=88=97=E8=A1=A8=E5=8A=A0=E4=B8=8A=E4=BC=81?=
 =?UTF-8?q?=E4=B8=9A=E8=81=94=E7=B3=BB=E4=BA=BA=E8=BF=99=E4=B8=80=E5=88=97?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=EF=BC=9B=E8=B4=A2=E5=8A=A1=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?-=E6=9D=A5=E6=AC=BE=EF=BC=9A=E6=9C=AA=E5=AE=A1=E6=A0=B8?=
 =?UTF-8?q?=E9=80=9A=E8=BF=87=E7=9A=84=E4=BC=9A=E8=AE=AE=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E4=B8=8D=E5=85=81=E8=AE=B8=E5=9C=A8=E8=BF=99=E9=87=8C=E6=9D=A5?=
 =?UTF-8?q?=E6=AC=BE=EF=BC=8C=E6=9D=A5=E6=AC=BE=E6=8C=89=E9=92=AE=E7=BD=AE?=
 =?UTF-8?q?=E7=81=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../arriveAndInvoicing/ArriveAndInvoivingList.vue     | 11 ++++++++++-
 src/views/mailManagement/BillMail.vue                 |  7 +++++++
 .../modules/PackProjectSelectProjectModule.vue        | 10 ++++++++--
 3 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue b/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue
index d335414..a082d26 100644
--- a/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue
+++ b/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue
@@ -103,7 +103,10 @@
           </template>
 
           <span slot="action" class="action-span-cell" slot-scope="text, record">
-            <a @click="incomePayment(record)" v-has="'incomePaymentAndInvoiving:incomePayment'">来款</a>
+<!--            未审核通过的会议项目不允许在这里来款-->
+            <a @click="incomePayment(record)"
+               v-has="'incomePaymentAndInvoiving:incomePayment'"
+               :disabled="record.projectType === 3 && record.registerCheckResult === '0'">来款</a>
             <a @click="invoicing(record)" :disabled="record.needInvoice === 0"
                v-has="'incomePaymentAndInvoiving:invoicing'">开票</a>
           </span>
@@ -214,6 +217,12 @@ export default {
           width: 280,
           dataIndex: 'chargeCompanyTemporaryName',
           scopedSlots: { customRender: 'text' }
+        }, {
+          title: '企业联系人',
+          align: 'center',
+          width: 280,
+          dataIndex: 'contactsTemporaryName',
+          scopedSlots: { customRender: 'text' }
         }, {
           title: '应收金额',
           align: 'center',
diff --git a/src/views/mailManagement/BillMail.vue b/src/views/mailManagement/BillMail.vue
index fb036c0..1be7d5f 100644
--- a/src/views/mailManagement/BillMail.vue
+++ b/src/views/mailManagement/BillMail.vue
@@ -179,6 +179,13 @@ export default {
           dataIndex: 'chargeCompanyName',
           scopedSlots: { customRender: 'text' }
         },
+        // {
+        //   title: '企业联系人',
+        //   align: 'center',
+        //   width: 300,
+        //   dataIndex: 'principalName',
+        //   scopedSlots: { customRender: 'text' }
+        // },
         {
           title: '邮寄联系人',
           align: 'center',
diff --git a/src/views/packManagement/modules/PackProjectSelectProjectModule.vue b/src/views/packManagement/modules/PackProjectSelectProjectModule.vue
index 372eb63..75071c9 100644
--- a/src/views/packManagement/modules/PackProjectSelectProjectModule.vue
+++ b/src/views/packManagement/modules/PackProjectSelectProjectModule.vue
@@ -145,10 +145,16 @@ export default {
         }, {
           title: '项目负责人',
           align: 'center',
-          width: 140,
+          width: 280,
           dataIndex: 'principalName',
           scopedSlots: { customRender: 'text' }
-        }, {
+        },{
+          title: '企业联系人',
+          align: 'center',
+          width: 280,
+          dataIndex: 'contactsTemporaryName',
+          scopedSlots: { customRender: 'text' }
+        },  {
           title: '应收金额',
           align: 'center',
           width: 120,

From d4cd66ae463d3fd3a912237f4ec4e4e4e4922d88 Mon Sep 17 00:00:00 2001
From: zhaoxiao <zhaoxiao@syxysoft.com>
Date: Thu, 28 Oct 2021 17:49:14 +0800
Subject: [PATCH 21/21] =?UTF-8?q?[bug]=20=E5=BE=85=E5=AD=98=E6=A1=A3?=
 =?UTF-8?q?=E6=96=87=E5=AD=97=E6=9B=BF=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../expenditureContract/ExpenditureContractDetail.vue        | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/views/contractManagement/expenditureContract/ExpenditureContractDetail.vue b/src/views/contractManagement/expenditureContract/ExpenditureContractDetail.vue
index 1cc7a61..6db42ae 100644
--- a/src/views/contractManagement/expenditureContract/ExpenditureContractDetail.vue
+++ b/src/views/contractManagement/expenditureContract/ExpenditureContractDetail.vue
@@ -147,7 +147,10 @@
               <a-row>
                 <a-col :sm="6" :xs="24">{{ item.createBy }}</a-col>
                 <a-col :sm="6" :xs="24">{{ item.createTime }}</a-col>
-                <a-col :sm="6" :xs="24">{{ item.contractStatus_dictText }}</a-col>
+                <!--                待存档文字替换-->
+                <a-col :sm="6" :xs="24">
+                  {{ item.contractStatus_dictText === '待存档' ? '审核通过' : item.contractStatus_dictText }}
+                </a-col>
                 <a-col :sm="6" :xs="24">{{ item.explainRemarks }}</a-col>
               </a-row>
             </div>