Merge remote-tracking branch 'origin/branch20211008'

public/development_address_config.js

@@ -13,8 +13,14 @@ window._CONFIG["casPrefixUrl"] = "http://cas.example.org:8443/cas";
 window._CONFIG["onlinePreviewDomainURL"] = "http://localhost:8012/onlinePreview";
 
 // 会议管理报名二维码地址
-window._CONFIG['singUpQRCodeURL'] = 'http://localhost:3000/signupentrance'
+window._CONFIG["singUpQRCodeURL"] = "http://localhost:3000/signupentrance"
 
 // 签到二维码url
-window._CONFIG['signInUrl'] = '/meeting/payMeetingSituation/getSignInPage'
+window._CONFIG["signInUrl"] = "/meeting/payMeetingSituation/getSignInPage"
 
+// 票据打印--寄件人单位名称
+window._CONFIG["sendCompanyName"] = "中汽标准所"
+// 票据打印--寄件人地址
+window._CONFIG["sendAddress"] = "天津市东丽区先锋东路68号"
+// 票据打印--寄件人邮编
+window._CONFIG["sendPostCode"] = "300000"

public/production_address_config.js

@@ -12,5 +12,11 @@ window._CONFIG["casPrefixUrl"] = "http://cas.example.org:8443/cas";
 window._CONFIG["onlinePreviewDomainURL"] = "http://10.10.10.46:8012/onlinePreview";
 
 // 会议管理报名二维码地址
-window._CONFIG['singUpQRCodeURL'] = 'http://10.10.10.46:8055/signupentrance'
+window._CONFIG["singUpQRCodeURL"] = "http://10.10.10.46:8055/signupentrance"
 
+// 票据打印--寄件人单位名称
+window._CONFIG["sendCompanyName"] = "中汽标准所"
+// 票据打印--寄件人地址
+window._CONFIG["sendAddress"] = "天津市东丽区先锋东路68号"
+// 票据打印--寄件人邮编
+window._CONFIG["sendPostCode"] = "300000"

src/assets/less/common.less

@@ -99,8 +99,14 @@
   }
 }
 
+/*重置按钮*/
 .reset-button {
   color: #08B6AF;
   background: rgba(8,182,175,0.10);
   border: 1px solid #08b6af;
 }
+
+/*表格滚动条*/
+.ant-table-body {
+  overflow-x: auto!important;
+}

src/components/ProjectDetailModal.vue

@@ -16,7 +16,8 @@
         </a-col>
         <a-col :span="12" class="detail-item">
           <label>应收金额：</label>
-          <span><j-ellipsis :value="`${basicInfo.receivableAmount ? basicInfo.receivableAmount : '0.00'}元`" :length="20"></j-ellipsis></span>
+          <span><j-ellipsis :value="`${basicInfo.receivableAmount ? basicInfo.receivableAmount : '0.00'}元`"
+                            :length="20"></j-ellipsis></span>
         </a-col>
       </a-row>
       <a-row :gutter="24">
@@ -64,7 +65,7 @@
         </a-col>
         <a-col :span="12" class="detail-item">
           <label>企业联系人：</label>
-          <span>{{ basicInfo.name }}</span>
+          <span><j-ellipsis :value="basicInfo.name" :length="20"></j-ellipsis></span>
         </a-col>
       </a-row>
       <a-row :gutter="24">
@@ -74,7 +75,7 @@
         </a-col>
         <a-col :span="12" class="detail-item">
           <label>企业联系人职务：</label>
-          <span>{{ basicInfo.post }}</span>
+          <span><j-ellipsis :value="basicInfo.post" :length="17"></j-ellipsis></span>
         </a-col>
       </a-row>
       <a-row :gutter="24">
@@ -94,9 +95,108 @@
         </a-col>
         <a-col :span="12" class="detail-item">
           <label>企业联系人地址：</label>
-          <span><j-ellipsis :value="basicInfo.contactAddress" :length="20"></j-ellipsis></span>
+          <span><j-ellipsis :value="basicInfo.contactAddress" :length="17"></j-ellipsis></span>
         </a-col>
       </a-row>
+      <!--      工作组项目有企业联系人2、3-->
+      <template v-if="basicInfo.projectType===2">
+        <!--        企业联系人1的备注-->
+        <template>
+          <a-row :gutter="24">
+            <a-col :span="12" class="detail-item">
+              <label>企业联系人1备注：</label>
+              <span><j-ellipsis :value="basicInfo.remarksOne" :length="16"></j-ellipsis></span>
+            </a-col>
+          </a-row>
+        </template>
+        <!--        企业联系人2-->
+        <template v-if="basicInfo.nameTwo">
+          <a-row :gutter="24">
+            <a-col :span="12" class="detail-item">
+              <label>企业联系人2：</label>
+              <span><j-ellipsis :value="basicInfo.nameTwo" :length="16"></j-ellipsis></span>
+            </a-col>
+            <a-col :span="12">
+              <label>企业联系人2性别：</label>
+              <span>{{ basicInfo.genderTwo_dictText }}</span>
+            </a-col>
+          </a-row>
+          <a-row :gutter="24">
+            <a-col :span="12" class="detail-item">
+              <label>企业联系人2职务：</label>
+              <span><j-ellipsis :value="basicInfo.postTwo" :length="16"></j-ellipsis></span>
+            </a-col>
+            <a-col :span="12" class="detail-item">
+              <label>企业联系人2电话：</label>
+              <span>{{ basicInfo.phoneTwo }}</span>
+            </a-col>
+          </a-row>
+          <a-row :gutter="24">
+            <a-col :span="12" class="detail-item">
+              <label>企业联系人2邮箱：</label>
+              <span>{{ basicInfo.emailTwo }}</span>
+            </a-col>
+            <a-col :span="12" class="detail-item">
+              <label>企业联系人2邮编：</label>
+              <span>{{ basicInfo.postalCodeContactsTwo }}</span>
+            </a-col>
+          </a-row>
+          <a-row :gutter="24">
+            <a-col :span="12" class="detail-item">
+              <label>企业联系人2地址：</label>
+              <span><j-ellipsis :value="basicInfo.contactAddressTwo" :length="16"></j-ellipsis></span>
+            </a-col>
+            <a-col :span="12" class="detail-item">
+              <label>企业联系人2备注：</label>
+              <span><j-ellipsis :value="basicInfo.remarksTwo" :length="16"></j-ellipsis></span>
+            </a-col>
+          </a-row>
+        </template>
+        <!--        企业联系人3-->
+        <template v-if="basicInfo.nameThree">
+          <a-row :gutter="24">
+            <a-col :span="12" class="detail-item">
+              <label>企业联系人3：</label>
+              <span><j-ellipsis :value="basicInfo.nameThree" :length="16"></j-ellipsis></span>
+            </a-col>
+            <a-col :span="12">
+              <label>企业联系人3性别：</label>
+              <span>{{ basicInfo.genderThree_dictText }}</span>
+            </a-col>
+          </a-row>
+          <a-row :gutter="24">
+            <a-col :span="12" class="detail-item">
+              <label>企业联系人3职务：</label>
+              <span><j-ellipsis :value="basicInfo.postThree" :length="16"></j-ellipsis></span>
+            </a-col>
+            <a-col :span="12" class="detail-item">
+              <label>企业联系人3电话：</label>
+              <span>{{ basicInfo.phoneThree }}</span>
+            </a-col>
+          </a-row>
+          <a-row :gutter="24">
+            <a-col :span="12" class="detail-item">
+              <label>企业联系人3邮箱：</label>
+              <span>{{ basicInfo.emailThree }}</span>
+            </a-col>
+            <a-col :span="12" class="detail-item">
+              <label>企业联系人3邮编：</label>
+              <span>{{ basicInfo.postalCodeContactsThree }}</span>
+            </a-col>
+          </a-row>
+          <a-row :gutter="24">
+            <a-col :span="12" class="detail-item">
+              <label>企业联系人3地址：</label>
+              <span><j-ellipsis :value="basicInfo.contactAddressThree" :length="16"></j-ellipsis></span>
+            </a-col>
+            <a-col :span="12" class="detail-item">
+              <label>企业联系人3备注：</label>
+              <span><j-ellipsis :value="basicInfo.remarksThree" :length="16"></j-ellipsis></span>
+            </a-col>
+          </a-row>
+        </template>
+      </template>
+      <!--      工作组项目有企业联系人2、3-->
       <a-row :gutter="24">
         <a-col :span="12" class="detail-item">
           <label>是否需要发票：</label>
@@ -305,7 +405,6 @@ export default {
           console.log('未查到相应的信息')
         }
       })
-
     },
     handleCancel() {
       this.visible = false

src/components/tools/HeaderNotice.vue

@@ -15,6 +15,7 @@
           <a-list-item :key="index" v-for="(record, index) in announcement2">
             <div style="margin-left: 5%;width: 80%">
               <p><a @click="showAnnouncement(record)">{{ record.titile }}</a></p>
+              <div v-html="record.msgContent" style="margin: 0"></div>
               <p style="color: rgba(0,0,0,.45);margin-bottom: 0px">{{ record.createTime }} 发布</p>
             </div>
             <div style="text-align: right">

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

@@ -226,7 +226,7 @@ export default {
           validateTrigger: 'change'
         },
         orderCode: {
-          rules: [{required: true, message: '请输入订单号后四位'}],
+          rules: [{required: true, validator: this.validateOrderCode}],
           validateTrigger: 'blur'
         },
         postAddress: {
@@ -396,6 +396,19 @@ export default {
       }
     },
     /*
+    * 校验后四位
+    * */
+    validateOrderCode(rule, value, callback){
+      if (value === undefined || value === '' || value === null) {
+        callback('请输入订单号后四位')
+      }
+      if (value && value.length === 4 ) {
+        callback()
+      } else {
+        callback('请输入四位订单号后四位')
+      }
+    },
+    /*
     * 线上缴费才有订单后四位
     * */
     changePayMode(e) {

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

@@ -127,14 +127,13 @@
                           date-format="YYYY-MM-DD"/>
                 </a-form-item>
               </a-col>
-            </a-row>
-            <a-row>
               <a-col :xxl="12" :xl="16" :sm="24">
                 <a-form-item label="合同约定主要时点" :labelCol="longLabelCol" :wrapperCol="longWrapperCol">
                   <!--                  20211022需求变更将input改为textarea-->
                   <a-textarea placeholder="请输入合同约定主要时点"
                               v-decorator="['contractTimePoints']"
                               :maxLength='200'
+                              autosize
                               @change="e => {e.target.value = (e.target.value + '').trim()}"></a-textarea>
                 </a-form-item>
               </a-col>
@@ -808,7 +807,7 @@ export default {
       this.$refs.projectTypeSelection.open()
     },
     /**
-     * 项目类型选择回调，动态传入表头数据
+     * 项目类型选择
      * @param type
      */
     selectProjectTypeOk(type) {
@@ -872,6 +871,7 @@ export default {
      * 项目选中回调
      */
     selectProjectOk() {
+      this.edit(this.model.id)
       this.$refs.associatedProject.loadAssociatedProject()
     },
     /**

src/views/incomePayments/meetManage/Attendance.vue

@@ -259,7 +259,7 @@
              v-has:[authorCode.auditRecord]="'attendance:auditCredentials'">审核凭证</a>
             <!-- 只有工作组会议与分标委会议才有审核报名信息-->
           <a @click="handleAuditSignUp(record)"
-             v-show="(currentMeetingInfo.meetingType === '1' || currentMeetingInfo.meetingType === '5') && record.registerCheckResult !== 1 "
+             v-show="(currentMeetingInfo.meetingType === '1' || currentMeetingInfo.meetingType === '5') && record.registerCheckResult === 0 "
              v-has:[authorCode.auditSignUpInfo]="'attendance:auditSignUp'">审核报名信息</a>
           <a @click="handleEdit(record)" v-has:[authorCode.edit]="'attendance:edit'">编辑</a>
             <!--删除参会人需要判断改参会人是否与合同关联-->

src/views/mailManagement/BillMail.vue

@@ -87,7 +87,7 @@
           </template>
 
           <span slot="print" slot-scope="text, record" class="action-span-cell">
-            <a-button type="primary" :disabled="record.sendMethod === 2 || record.postStatus === 0">打印</a-button>
+            <a-button type="primary" :disabled="record.sendMethod === 2 || record.postStatus === 0" @click="goPrint(record)">打印</a-button>
           </span>
           <span slot="action" slot-scope="text, record" class="action-span-cell">
             <a @click="handleAdd(record)" v-if="record.postStatus === 0" v-has="'billMail:mail'">邮寄</a>
@@ -233,6 +233,20 @@ export default {
       const com = Number(record.sendMethod) === 1 && 'ems' || 'shunfeng'
       window.open(`https://www.kuaidi100.com/chaxun?com=${ com }&nu=${ record.postNo }`)
     },
+    /**
+     * 打印，新标签打开页面，打印页面
+     * @param record
+     */
+    goPrint(record) {
+      console.log(record)
+      let routerUrl = this.$router.resolve({
+        path: '/mailManagement/PrintPage',
+        query: {
+          record: JSON.stringify(record)
+        }
+      })
+      window.open(routerUrl.href, '_blank')
+    },
     handleAdd: function (record) {
       this.$refs.modalForm.add(record, 1)
       this.$refs.modalForm.title = '邮寄'

src/views/mailManagement/ContractMail.vue

@@ -7,27 +7,27 @@
       <div class="table-page-search-wrapper">
         <a-form layout="inline" @keyup.enter.native="searchQuery">
           <a-row :gutter="24">
-            <a-col :xl="5" :lg="8" :md="8" :sm="24">
+            <a-col :xxl="4" :xl="8" :lg="8" :md="8" :sm="24">
               <a-form-item label="合同编号">
                 <a-input placeholder="请输入合同编号" v-model="queryParam.contractNum" :maxLength='50'></a-input>
               </a-form-item>
             </a-col>
-            <a-col :xl="5" :lg="8" :md="8" :sm="24">
+            <a-col :xxl="4" :xl="8" :lg="8" :md="8" :sm="24">
               <a-form-item label="合同名称">
                 <a-input placeholder="请输入合同名称" v-model="queryParam.contractName" :maxLength='50'></a-input>
               </a-form-item>
             </a-col>
-            <a-col :xl="5" :lg="12" :md="16" :sm="24">
+            <a-col :xxl="4" :xl="8" :lg="8" :md="8" :sm="24">
               <a-form-item label="签订单位">
                 <a-input placeholder="请输入签订单位" v-model="queryParam.signedCompanyTemporaryName" :maxLength='50'></a-input>
               </a-form-item>
             </a-col>
-            <a-col :xl="5" :lg="8" :md="8" :sm="24">
+            <a-col :xxl="4" :xl="8" :lg="8" :md="8" :sm="24">
               <a-form-item label="负责人">
                 <select-principal v-model="queryParam.principalId" placeholder="请选择负责人"></select-principal>
               </a-form-item>
             </a-col>
-            <a-col :xl="4" :lg="7" :md="8" :sm="24">
+            <a-col :xxl="6" :xl="8" :lg="8" :md="8" :sm="24">
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
               <a-button type="primary" @click="searchQuery" icon="search" v-has="'contractMail:search'">查询</a-button>
               <a-button @click="searchReset" icon="reload" class="reset-button" style="margin-left: 8px">重置</a-button>
@@ -51,7 +51,7 @@
           size="middle"
           bordered
           rowKey="id"
-          :scroll="{x:true}"
+          :scroll="{x:1600}"
           :columns="columns"
           :dataSource="dataSource"
           :pagination="ipagination"
@@ -116,6 +116,7 @@ export default {
           title: '序号',
           dataIndex: '',
           key: 'rowIndex',
+          width: 60,
           align: 'center',
           customRender: function (t, r, index) {
             return parseInt(index) + 1

src/views/mailManagement/PrintPage.vue

@@ -0,0 +1,200 @@
+<template>
+  <div>
+    <div id="needPrint">
+      <div class="sheet-box">
+
+        <div class="sendName">{{ userInfo.realname }}</div>
+        <div class="sendPhone">{{ userInfo.phone }}</div>
+
+        <div class="sendCompanyName">{{ sendCompanyName }}</div>
+        <div class="sendCode"></div>
+
+        <div class="sendAddress">{{ sendAddress }}</div>
+
+        <div class="sendPostNo">{{ mailDetail.billNo }}</div>
+        <div class="sendPostCode">{{ sendPostCode }}</div>
+
+
+        <div class="arriveName">{{ mailDetail.contactName }}</div>
+        <div class="arrivePhone">{{ mailDetail.contactMobile }}</div>
+
+        <div class="arriveCompanyName">{{ mailDetail.chargeCompanyName }}</div>
+        <div class="arriveCode"></div>
+
+        <div class="arriveAddress">{{ mailDetail.chargeCompanyName }}</div>
+
+        <div class="arriveCity"></div>
+        <div class="arrivePostNo">{{ mailDetail.postNo }}</div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import Vue from 'vue'
+import { USER_INFO } from '../../store/mutation-types'
+
+export default {
+  name: 'PrintPage',
+  data() {
+    return {
+      // 邮寄项目信息
+      mailDetail: {},
+      // 用户信息
+      userInfo: {},
+      sendCompanyName: '',
+      sendAddress: '',
+      sendPostCode: ''
+    }
+  },
+  created() {
+    this.sendCompanyName = window._CONFIG['sendCompanyName']
+    this.sendAddress = window._CONFIG['sendAddress']
+    this.sendPostCode = window._CONFIG['sendPostCode']
+    this.userInfo = Vue.ls.get(USER_INFO)
+    // 从路由参数获取项目信息
+    this.mailDetail = JSON.parse(this.$route.query.record)
+    console.log(this.mailDetail)
+  },
+  mounted() {
+    // 打印
+    this.print()
+  },
+  methods: {
+    /**
+     * 打印
+     */
+    print() {
+      // 获取需要打印部分的dom元素
+      let printDom = document.getElementById('needPrint').innerHTML
+      // 保留原始页面dom，打印后可以恢复页面展示（更换为路由跳转新页面后就不用了）
+      let oldDom = window.document.body.innerHTML
+      // 将整体dom替换为需要打印的部分
+      window.document.body.innerHTML = printDom
+      // 调用页面的打印方法打印整个页面
+      window.print()
+      // 恢复原页面显示
+      window.document.body.innerHTML = oldDom
+      // 关闭本标签页
+      window.close()
+    }
+  }
+}
+</script>
+
+<style scoped lang="less">
+.sheet-box {
+  position: relative;
+  font-size: 10px;
+  line-height: 12px;
+}
+
+#needPrint {
+  border: black 1px solid;
+}
+
+.mail-content {
+  white-space: pre-wrap;
+  word-break: break-all;
+}
+
+.sendName {
+  position: absolute;
+  left: 57pt;
+  top: 74pt;
+}
+
+.sendPhone {
+  position: absolute;
+  top: 74pt;
+  left: 181pt;
+}
+
+.sendCompanyName {
+  position: absolute;
+  left: 65pt;
+  top: 94pt;
+}
+
+.sendCode {
+  position: absolute;
+  left: 236pt;
+  top: 96pt;
+}
+
+.sendAddress {
+  position: absolute;
+  left: 48pt;
+  top: 110pt;
+  width: 236pt;
+  word-break: break-all;
+  white-space: pre-wrap;
+}
+
+.sendPostNo {
+  position: absolute;
+  left: 64pt;
+  top: 135pt;
+}
+
+.sendPostCode {
+  position: absolute;
+  left: 218pt;
+  top: 134pt;
+  font-size: 16px;
+  letter-spacing: 9pt;
+}
+
+.arriveName {
+  position: absolute;
+  left: 53pt;
+  top: 163pt;
+  word-break: break-all;
+  white-space: pre-wrap;
+  width: 97pt;
+}
+
+.arrivePhone {
+  position: absolute;
+  top: 163pt;
+  left: 183pt;
+}
+
+.arriveCompanyName {
+  position: absolute;
+  left: 66pt;
+  top: 180pt;
+  width: 138pt;
+  word-break: break-all;
+  white-space: pre-wrap;
+}
+
+.arriveCode {
+  position: absolute;
+  left: 240pt;
+  top: 180pt;
+}
+
+.arriveAddress {
+  position: absolute;
+  left: 48pt;
+  top: 195pt;
+  width: 270pt;
+  word-break: break-all;
+  white-space: pre-wrap;
+}
+
+.arriveCity {
+  position: absolute;
+  left: 69pt;
+  top: 247pt;
+}
+
+.arrivePostNo {
+  position: absolute;
+  left: 218pt;
+  top: 246pt;
+  font-size: 16px;
+  letter-spacing: 9pt;
+}
+</style>

src/views/packManagement/modules/PackCompanyModule.vue

@@ -213,7 +213,7 @@ export default {
         if (!err) {
           // 判断选中企业是否改变
           if (values.company.id === this.model.companyId) {
-            values.companyId = this.model.companyTemporaryId
+            values.companyId = this.model.companyTemporaryId || values.company.id
           } else {
             values.companyId = values.company.id
           }

src/views/projectManagement/modules/WorkingGroupMemberUnitModule.vue

@@ -56,10 +56,33 @@
                                v-decorator="['contactsIdTwo',validatorRules.contactsRepeat]"
                                :maxLength='50'
                                ref="selectContacts2"
+                               @change="contactsTwoChange"
                                @ok="addContactsTwoOk"></select-contacts>
             </a-form-item>
           </a-col>
         </a-row>
+        <a-row>
+          <a-col :xl="12" :sm="24">
+            <a-form-item label="备注1" :labelCol="labelCol" :wrapperCol="wrapperCol" v-show="hasContactOne">
+              <a-input
+                placeholder="请输入备注1"
+                v-decorator="['remarksOne']"
+                :maxLength='50'
+                @change="e => {e.target.value = (e.target.value + '').trim()}">
+              </a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="12" :sm="24">
+            <a-form-item label="备注2" :labelCol="labelCol" :wrapperCol="wrapperCol" v-show="hasContactTwo">
+              <a-input
+                placeholder="请输入备注2"
+                v-decorator="['remarksTwo']"
+                :maxLength='50'
+                @change="e => {e.target.value = (e.target.value + '').trim()}">
+              </a-input>
+            </a-form-item>
+          </a-col>
+        </a-row>
         <a-row>
           <a-col :xl="12" :sm="24">
             <a-form-item label="企业联系人3" :labelCol="labelCol" :wrapperCol="wrapperCol">
@@ -69,6 +92,7 @@
                                v-decorator="['contactsIdThree',validatorRules.contactsRepeat]"
                                :maxLength='50'
                                ref="selectContacts3"
+                               @change="contactsThreeChange"
                                @ok="addContactsThreeOk"></select-contacts>
             </a-form-item>
           </a-col>
@@ -84,6 +108,18 @@
             </a-form-item>
           </a-col>
         </a-row>
+        <a-row>
+          <a-col :xl="12" :sm="24">
+            <a-form-item label="备注3" :labelCol="labelCol" :wrapperCol="wrapperCol" v-show="hasContactThree">
+              <a-input
+                placeholder="请输入备注3"
+                v-decorator="['remarksThree']"
+                :maxLength='50'
+                @change="e => {e.target.value = (e.target.value + '').trim()}">
+              </a-input>
+            </a-form-item>
+          </a-col>
+        </a-row>
         <a-row>
           <a-col :xl="12" :sm="24">
             <a-form-item label="来款方式" :labelCol="labelCol" :wrapperCol="wrapperCol">
@@ -140,11 +176,11 @@
           </a-col>
           <a-col :xl="12" :sm="24">
             <a-form-item label="合同号" :labelCol="labelCol" :wrapperCol="wrapperCol">
-<!--              <a-input placeholder="请输入合同号"-->
+              <!--              <a-input placeholder="请输入合同号"-->
-<!--                       v-decorator="['contractNum',validatorRules.contractNum]"-->
+              <!--                       v-decorator="['contractNum',validatorRules.contractNum]"-->
-<!--                       :maxLength='50'-->
+              <!--                       :maxLength='50'-->
-<!--                       :disabled="isContractNumDisabled || isAssociatedContract"-->
+              <!--                       :disabled="isContractNumDisabled || isAssociatedContract"-->
-<!--                       @change="e => {e.target.value = (e.target.value + '').trim()}"></a-input>-->
+              <!--                       @change="e => {e.target.value = (e.target.value + '').trim()}"></a-input>-->
               <select-revenue-contract
                 placeholder="请选择合同号"
                 :company="selectedCompany"
@@ -364,6 +400,9 @@ export default {
       workingGroupList: [],
       disabledCompany: false, // 企业是否禁用
       isAssociatedContract: false, // 是否关联合同
+      hasContactOne: false, // 是否选择联系人1
+      hasContactTwo: false, // 是否选择联系人2
+      hasContactThree: false, // 是否选择联系人3
       url: {
         add: '/project/payWorkingGroupSubitem/add',
         edit: '/project/payWorkingGroupSubitem/edit'
@@ -420,7 +459,6 @@ 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
@@ -453,12 +491,22 @@ export default {
           id: this.model.mailContactsTemporaryId,
           name: this.model.mailContactsTemporaryName
         }
+        // 是否需要显示联系人备注信息
+        if (this.model.contactsTemporaryIdOne) {
+          this.hasContactOne = true
+        }
+        if (this.model.contactsTemporaryIdTwo) {
+          this.hasContactTwo = true
+        }
+        if (this.model.contactsTemporaryIdThree) {
+          this.hasContactThree = true
+        }
       }
       this.chargeWayType = record.chargeWay
       this.pickChargeNoticeType(record.charge, true)
       this.visible = true
       this.$nextTick(() => {
-        this.form.setFieldsValue(pick(this.model, 'chargeCompany', 'contactsIdOne', 'contactsIdTwo', 'contactsIdThree', 'mailContactsId', 'chargeWay', 'charge', 'receivableAmount', 'contractNum', 'receivableAmount', 'chargeNoticeId', 'needInvoice', 'remarks'))
+        this.form.setFieldsValue(pick(this.model, 'chargeCompany', 'contactsIdOne', 'contactsIdTwo', 'contactsIdThree', 'mailContactsId', 'chargeWay', 'charge', 'receivableAmount', 'contractNum', 'receivableAmount', 'chargeNoticeId', 'needInvoice', 'remarks', 'remarksOne', 'remarksTwo', 'remarksThree'))
       })
     },
     close() {
@@ -473,6 +521,10 @@ export default {
       // 清除企业、来款方式、合同号的限制
       this.isAssociatedContract = false
       this.disabledCompany = false
+      // 清除联系人备注信息
+      this.hasContactOne = false
+      this.hasContactTwo = false
+      this.hasContactThree = false
       this.visible = false
     },
     handleOk() {
@@ -677,6 +729,16 @@ export default {
      * @param value
      */
     contactsChange(value) {
+      if (!value) {
+        this.hasContactOne = false
+        this.form.setFieldsValue({remarksOne: null})
+        return
+      }
+      this.hasContactOne = true
+      // 判断联系人是否和原来的一致，不一致则清空备注内容
+      if (value !== this.model.contactsTemporaryIdOne) {
+        this.form.setFieldsValue({remarksOne: null})
+      }
       let mailContact = Object.values(this.form.getFieldValue(['mailContactsId']))[0]
       // 邮寄联系人非undefined时赋值
       if (!mailContact) {
@@ -685,6 +747,38 @@ export default {
           this.form.setFieldsValue(pick(this.model, 'mailContactsId'))
         })
       }
+    },
+    /**
+     * 企业联系人2变化
+     * @param value
+     */
+    contactsTwoChange (value) {
+      if (!value) {
+        this.hasContactTwo = false
+        this.form.setFieldsValue({remarksTwo: null})
+        return
+      }
+      this.hasContactTwo = true
+      // 判断联系人是否和原来的一致，不一致则清空备注内容
+      if (value !== this.model.contactsTemporaryIdTwo) {
+        this.form.setFieldsValue({remarksTwo: null})
+      }
+    },
+    /**
+     * 企业联系人3变化
+     * @param value
+     */
+    contactsThreeChange (value) {
+      if (!value) {
+        this.hasContactThree = false
+        this.form.setFieldsValue({remarksThree: null})
+        return
+      }
+      this.hasContactThree = true
+      // 判断联系人是否和原来的一致，不一致则清空备注内容
+      if (value !== this.model.contactsTemporaryIdThree) {
+        this.form.setFieldsValue({remarksThree: null})
+      }
     }
   }
 }

src/views/system/DepartList.vue

@@ -10,10 +10,10 @@
             <a-button @click="handleAdd(2)" type="primary" v-has="'sys:depart:addLowerLevel'">添加下级</a-button>
             <a-button type="primary" icon="download" @click="handleExportXls('部门信息')" v-has="'sys:depart:export'">导出
             </a-button>
-            <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader"
+<!--            <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader"-->
-                      :action="importExcelUrl" @change="handleImportExcel" v-has="'sys:depart:import'">
+<!--                      :action="importExcelUrl" @change="handleImportExcel" v-has="'sys:depart:import'">-->
-              <a-button type="primary" icon="import">导入</a-button>
+<!--              <a-button type="primary" icon="import">导入</a-button>-->
-            </a-upload>
+<!--            </a-upload>-->
             <a-button @click="batchDel" type="danger" icon="delete" v-has="'sys:depart:batchDel'">批量删除</a-button>
             <!--<a-button @click="refresh" type="default" icon="reload" :loading="loading">刷新</a-button>-->
           </a-row>

src/views/system/UserAnnouncementList.vue

@@ -133,7 +133,20 @@ export default {
         {
           name: '企业通知',
           value: '5'
+        },
+        {
+          name: '到账通知',
+          value: '9'
+        },
+        {
+          name: '开票通知',
+          value: '10'
+        },
+        {
+          name: '邮寄通知',
+          value: '7'
         }
+
       ],
       IconImg,
       columns: [

src/views/system/UserList.vue

@@ -88,7 +88,7 @@
           bordered
           size="middle"
           rowKey="id"
-          :scroll="{x:true}"
+          :scroll="{x: 1600}"
           :columns="columns"
           :dataSource="dataSource"
           :pagination="ipagination"
@@ -163,13 +163,13 @@ export default {
           title: '用户账号',
           align: 'center',
           dataIndex: 'username',
-          width: 120,
+          width: 280,
           scopedSlots: { customRender: 'text' }
         },
         {
           title: '用户姓名',
           align: 'center',
-          width: 160,
+          width: 280,
           dataIndex: 'realname',
           scopedSlots: { customRender: 'text' }
         },
@@ -190,14 +190,14 @@ export default {
         {
           title: '角色类型',
           align: 'center',
-          width: 100,
+          width: 280,
           dataIndex: 'roleName',
           scopedSlots: { customRender: 'text' }
         },
         {
           title: '组织机构',
           align: 'center',
-          width: 180,
+          width: 280,
           dataIndex: 'departIds_dictText',
           scopedSlots: { customRender: 'text' }
         },
@@ -230,6 +230,7 @@ export default {
         {
           title: '操作',
           dataIndex: 'action',
+          fixed: 'right',
           scopedSlots: { customRender: 'action' },
           align: 'center'
         }