Merge remote-tracking branch 'origin/branch20211008'

src/components/ProjectDetailModal.vue

@@ -104,7 +104,7 @@
         <template>
           <a-row :gutter="24">
             <a-col :span="12" class="detail-item">
-              <label>企业联系人1备注：</label>
+              <label>企业联系人备注：</label>
               <span><j-ellipsis :value="basicInfo.remarksOne" :length="16"></j-ellipsis></span>
             </a-col>
           </a-row>

src/components/jero/JImageUpload.vue

@@ -18,7 +18,7 @@
       @preview="handlePreview"
       :class="!isMultiple?'imgupload':''">
       <div :style="{'width':(!isMultiple?'104px':'auto'),'height':(!isMultiple?'104px':'auto')}">
-        <img v-if="!isMultiple && picUrl" :src="getAvatarView()" style="width:100%;height:100%"/>
+        <img v-if="!isMultiple && picUrl" :src="getAvatarView()" style="width:100%;height:100%" @click="clickFunc"/>
         <!--<img v-if="!isMultiple && picUrl" src="http://localhost:3000/jero-boot/sys/common/download/1379989167782797313?token=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJleHAiOjE2MTc4NTA1OTgsInVzZXJuYW1lIjoiYWRtaW4ifQ.1xRpivI0TzTqAnISJICNm-PoMxSDUITH5uaEcvwheIQ&fullfilename=3.jpeg" style="width:100%;height:100%"/>-->
         <div v-else class="iconp">
           <a-icon :type="uploadLoading ? 'loading' : 'plus'" />
@@ -215,6 +215,13 @@
           this.handlePathChange()
         }
       },
+      // 图片点击预览
+      clickFunc() {
+        if (!this.disabled) return
+        if (this.fileList.length > 0) {
+          this.handlePreview(this.fileList[0])
+        }
+      },
       // 预览
       handlePreview(file) {
         if (file && file.url) {

src/views/financialManagement/arriveAndInvoicing/modules/InvoicingModule.vue

@@ -50,6 +50,7 @@ import pick from 'lodash.pick'
 import { money } from '../../../../utils/validate'
 import { addPayBill, addPaymentPhase, editAmountPhase, editPayBill } from '../../../../api/incomePaymentsApi'
 import { addZero } from '../../../../utils/util'
+import { getContactsById } from '../../../../api/api'
 
 export default {
   name: 'InvoicingModule',
@@ -115,7 +116,8 @@ export default {
           rules: [{ required: true, message: '请选择开票日期' }],
           validateTrigger: 'change'
         }
-      }
+      },
+      postalCode: '', // 邮寄联系人邮编
     }
   },
   methods: {
@@ -126,11 +128,17 @@ export default {
     edit(record) {
       this.form.resetFields()
       this.model = Object.assign({}, record)
+      this.getMailContactPostalCode()
       this.visible = true
       this.$nextTick(() => {
         this.form.setFieldsValue(pick(this.model, 'invoiceAmount', 'billNo', 'billDate', 'remark'))
       })
     },
+    getMailContactPostalCode() {
+      getContactsById({id: this.mailContactsId}).then(res => {
+        this.postalCode = res.result.postalCode
+      })
+    },
     handleOk() {
       if (this.confirmLoading) {
         return
@@ -141,6 +149,7 @@ export default {
           // values.chargeCompanyName = this.chargeCompanyName
           values.projectName = this.projectName
           values.contactId = this.mailContactsId
+          values.postalCode = this.postalCode
           const formData = Object.assign(this.model, values)
           console.log('表单提交数据', formData)
           let okHttpMethod

src/views/mailManagement/ContractMail.vue

@@ -69,7 +69,7 @@
           </template>
 
           <span slot="print" slot-scope="text, record" class="action-span-cell">
-            <a-button type="primary" :disabled="record.sendMethod === '1' ? false : true">打印</a-button>
+            <a-button type="primary" :disabled="record.sendMethod === '1' ? false : true" @click="goPrint(record)">打印</a-button>
           </span>
           <span slot="action" slot-scope="text, record" class="action-span-cell">
             <a @click="handleAdd(record.id)" v-if="record.postStatus === '0'" v-has="'contractMail:mail'">邮寄</a>
@@ -207,6 +207,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) {
+      let routerUrl = this.$router.resolve({
+        path: '/mailManagement/PrintPage',
+        query: {
+          record: JSON.stringify(record),
+          type: 'contract'
+        }
+      })
+      window.open(routerUrl.href, '_blank')
+    },
     handleAdd (id) {
       let param = {
         id: id

src/views/mailManagement/PrintPage.vue

@@ -11,20 +11,20 @@
 
         <div class="sendAddress">{{ sendAddress }}</div>
 
-        <div class="sendPostNo">{{ mailDetail.billNo }}</div>
+        <div class="sendPostNo"></div>
         <div class="sendPostCode">{{ sendPostCode }}</div>
 
 
-        <div class="arriveName">{{ mailDetail.contactName }}</div>
+        <div class="arriveName">{{ isContract ? mailDetail.liaisonMan : mailDetail.contactName }}</div>
-        <div class="arrivePhone">{{ mailDetail.contactMobile }}</div>
+        <div class="arrivePhone">{{ isContract ? mailDetail.mobile : mailDetail.contactMobile }}</div>
 
-        <div class="arriveCompanyName">{{ mailDetail.chargeCompanyName }}</div>
+        <div class="arriveCompanyName">{{ isContract ? mailDetail.signedCompanyTemporaryName : mailDetail.chargeCompanyName }}</div>
         <div class="arriveCode"></div>
 
-        <div class="arriveAddress">{{ mailDetail.chargeCompanyName }}</div>
+        <div class="arriveAddress">{{ mailDetail.contactAddress }}</div>
 
         <div class="arriveCity"></div>
-        <div class="arrivePostNo">{{ mailDetail.postNo }}</div>
+        <div class="arrivePostNo">{{ mailDetail.postalCode }}</div>
       </div>
     </div>
   </div>
@@ -44,10 +44,12 @@ export default {
       userInfo: {},
       sendCompanyName: '',
       sendAddress: '',
-      sendPostCode: ''
+      sendPostCode: '',
+      isContract: false, // 是否合同
     }
   },
   created() {
+    this.isContract = this.$route.query.type === 'contract'
     this.sendCompanyName = window._CONFIG['sendCompanyName']
     this.sendAddress = window._CONFIG['sendAddress']
     this.sendPostCode = window._CONFIG['sendPostCode']
@@ -140,7 +142,7 @@ export default {
 .sendPostCode {
   position: absolute;
   left: 218pt;
-  top: 134pt;
+  top: 138pt;
   font-size: 16px;
   letter-spacing: 9pt;
 }
@@ -193,7 +195,7 @@ export default {
 .arrivePostNo {
   position: absolute;
   left: 218pt;
-  top: 246pt;
+  top: 240pt;
   font-size: 16px;
   letter-spacing: 9pt;
 }

src/views/system/RoleUserList.vue

@@ -47,7 +47,9 @@
           <span slot="action" class="action-span-cell" slot-scope="text, record">
             <a @click="handlePerssion(record.id)" v-has="'sys:role:perssion'">授权</a>
             <a @click="handleEdit(record)" v-has="'sys:role:edit'">编辑</a>
-            <a @click="handleDelete(record.id)" v-has="'sys:role:del'">删除</a>
+            <a
+              v-if="record.roleCode !== 'admin' && record.roleCode !== 'cwry' && record.roleCode !== 'yjry' && record.roleCode !== 'dbry' && record.roleCode !== 'sld' && record.roleCode !== 'bmfzr' && record.roleCode !== 'qyry'  && record.roleCode !== 'xmfzr' && record.roleCode !== 'memberManageCode'"
+              @click="handleDelete(record.id)" v-has="'sys:role:del'">删除</a>
           </span>
           <template slot-scope="text" slot="text">
             <j-ellipsis v-if="text" :length="20" :value="text"></j-ellipsis>