到账信息
-
- {{ item.paymentDate }}到账{{ item.amountReceived }}元
+
-
- {
return range[0] + '-' + range[1] + ' 共' + total + '条'
},
@@ -284,7 +284,7 @@ export const JeroListMixin = {
param['selections'] = this.selectedRowKeys.join(',')
}
console.log('导出参数', param)
- downloadFile(this.url.exportXlsUrl, fileName + '.xls', param)
+ downloadFile(this.url.exportXlsUrl, fileName + '.xlsx', param)
},
/*
* 下载模板
@@ -293,7 +293,7 @@ export const JeroListMixin = {
if (!fileName || typeof fileName != 'string') {
fileName = '模板文件'
}
- downloadFile(this.url.downTemplateUrl, fileName + '.xls')
+ downloadFile(this.url.downTemplateUrl, fileName + '.xlsx')
},
/* 导入 */
handleImportExcel(info) {
diff --git a/src/views/businessManagement/ContactManagement.vue b/src/views/businessManagement/ContactManagement.vue
index 5ec5584..4b7181b 100644
--- a/src/views/businessManagement/ContactManagement.vue
+++ b/src/views/businessManagement/ContactManagement.vue
@@ -134,7 +134,7 @@ export default {
}, {
title: '职务',
align: 'center',
- width: 160,
+ width: 280,
dataIndex: 'post',
scopedSlots: { customRender: 'text' }
}, {
@@ -149,6 +149,7 @@ export default {
}, {
title: '企业名称',
align: 'center',
+ width: 280,
dataIndex: 'companyName',
scopedSlots: { customRender: 'text' }
}, {
diff --git a/src/views/contractManagement/expenditureContract/modules/ExpenditureContractModule.vue b/src/views/contractManagement/expenditureContract/modules/ExpenditureContractModule.vue
index 9396337..204373c 100644
--- a/src/views/contractManagement/expenditureContract/modules/ExpenditureContractModule.vue
+++ b/src/views/contractManagement/expenditureContract/modules/ExpenditureContractModule.vue
@@ -650,6 +650,9 @@ export default {
case 'accountsReceivableAmount':
callback('请输入应收金额')
break
+ case 'noTaxAmount':
+ callback('请输入未税金额')
+ break
case 'amountReceived':
callback('请输入已收金额')
break
diff --git a/src/views/contractManagement/revenueContract/modules/RevenueContractModule.vue b/src/views/contractManagement/revenueContract/modules/RevenueContractModule.vue
index 3b79e87..7a402c3 100644
--- a/src/views/contractManagement/revenueContract/modules/RevenueContractModule.vue
+++ b/src/views/contractManagement/revenueContract/modules/RevenueContractModule.vue
@@ -36,7 +36,7 @@
@change="handleSignedCompanyChange">
-
+
{
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.confirmLoading = false
@@ -535,18 +536,12 @@ export default {
})
},
handleCancle() {
- this.model = this.temporaryModel
- // 处理联系人信息回显
- this.isCancel = true
- this.model.signedContactsId = this.model.signedContactsTemporaryId
- this.selectedContact = {
- id: this.model.signedContactsTemporaryId,
- name: this.model.signedContactsTemporaryName
+ if (this.model.id) {
+ this.edit(this.model.id)
+ } else {
+ this.form.resetFields()
+ this.$refs.installmentForm.form.resetFields()
}
- 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.confirmLoading = false
- })
},
installmentFormOk(value) {
this.installmentList = value.installmentList
@@ -762,6 +757,9 @@ export default {
case 'accountsReceivableAmount':
callback('请输入应收金额')
break
+ case 'noTaxAmount':
+ callback('请输入未税金额')
+ break
case 'amountReceived':
callback('请输入已收金额')
break
diff --git a/src/views/dataNetworkDiskManagement/committee/CommitteeMaintenance.vue b/src/views/dataNetworkDiskManagement/committee/CommitteeMaintenance.vue
index d51d829..cc5348a 100644
--- a/src/views/dataNetworkDiskManagement/committee/CommitteeMaintenance.vue
+++ b/src/views/dataNetworkDiskManagement/committee/CommitteeMaintenance.vue
@@ -256,7 +256,7 @@ export default {
param['ids'] = this.selectedRowKeys.join(',')
}
console.log('导出参数', param)
- downloadFile(this.url.exportXlsUrl, fileName + '.xls', param)
+ downloadFile(this.url.exportXlsUrl, fileName + '.xlsx', param)
},
/**
* 新增成员
diff --git a/src/views/dataNetworkDiskManagement/committee/modules/CommitteeModule.vue b/src/views/dataNetworkDiskManagement/committee/modules/CommitteeModule.vue
index dd78b7f..a1b76b8 100644
--- a/src/views/dataNetworkDiskManagement/committee/modules/CommitteeModule.vue
+++ b/src/views/dataNetworkDiskManagement/committee/modules/CommitteeModule.vue
@@ -80,7 +80,7 @@ export default {
this.model = Object.assign({}, record)
this.visible = true
this.$nextTick(() => {
- this.form.setFieldsValue(pick(this.model, 'name', 'remark'))
+ this.form.setFieldsValue(pick(this.model, 'name', 'remarks'))
})
},
close() {
diff --git a/src/views/dataNetworkDiskManagement/dataDownloadRecord/DataDownloadRecord.vue b/src/views/dataNetworkDiskManagement/dataDownloadRecord/DataDownloadRecord.vue
index a237e12..9546b8e 100644
--- a/src/views/dataNetworkDiskManagement/dataDownloadRecord/DataDownloadRecord.vue
+++ b/src/views/dataNetworkDiskManagement/dataDownloadRecord/DataDownloadRecord.vue
@@ -264,7 +264,7 @@ export default {
if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
param['ids'] = this.selectedRowKeys.join(',')
}
- downloadFile(this.url.exportXlsUrl, fileName + '.xls', param)
+ downloadFile(this.url.exportXlsUrl, fileName + '.xlsx', param)
},
handleCancel() {
this.visible = false
diff --git a/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue b/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue
index 760ae88..3202450 100644
--- a/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue
+++ b/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue
@@ -8,8 +8,8 @@
-
-
+
diff --git a/src/views/incomePayments/meetManage/OtherMeetingForm.vue b/src/views/incomePayments/meetManage/OtherMeetingForm.vue
index 4bd6555..91030eb 100644
--- a/src/views/incomePayments/meetManage/OtherMeetingForm.vue
+++ b/src/views/incomePayments/meetManage/OtherMeetingForm.vue
@@ -89,21 +89,22 @@
-
-
-
-
+
+
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -111,7 +112,7 @@
diff --git a/src/views/system/DepartList.vue b/src/views/system/DepartList.vue
index 82f0126..17a8002 100644
--- a/src/views/system/DepartList.vue
+++ b/src/views/system/DepartList.vue
@@ -429,7 +429,7 @@ export default {
param['selections'] = this.checkedKeys.join(',')
}
console.log('导出参数', param)
- downloadFile(this.url.exportXlsUrl, fileName + '.xls', param)
+ downloadFile(this.url.exportXlsUrl, fileName + '.xlsx', param)
},
nodeModalOk() {
this.loadTree()
diff --git a/src/views/system/UserAnnouncementList.vue b/src/views/system/UserAnnouncementList.vue
index efb82ee..21c809b 100644
--- a/src/views/system/UserAnnouncementList.vue
+++ b/src/views/system/UserAnnouncementList.vue
@@ -64,7 +64,7 @@
-
+
diff --git a/src/views/system/modules/UserModal.vue b/src/views/system/modules/UserModal.vue
index 057b4b3..e3dbde2 100644
--- a/src/views/system/modules/UserModal.vue
+++ b/src/views/system/modules/UserModal.vue
@@ -1,13 +1,13 @@
+ :title="title"
+ :maskClosable="true"
+ :width="drawerWidth"
+ placement="right"
+ :closable="true"
+ @close="handleCancel"
+ :visible="visible"
+ style="height: 100%;overflow: auto;padding-bottom: 53px;">
+ 到账信息
+
+
@@ -142,7 +147,7 @@
class="j-table-force-nowrap"
>
- 查看物流
+ 查看物流
@@ -227,7 +232,7 @@ const columns = [
{
title: '快递',
align: 'center',
- dataIndex: 'sendMethod'
+ dataIndex: 'sendMethod_dictText'
},
{
title: '快递单号',
@@ -324,8 +329,9 @@ export default {
/*
* 查看物流
* */
- lookLogistics() {
- window.open('https://www.ems.com.cn/', '_blank')
+ lookLogistics(record) {
+ const com = Number(record.sendMethod) === 1 && 'ems' || 'shunfeng'
+ window.open(`https://www.kuaidi100.com/chaxun?com=${ com }&nu=${ record.postNo }`)
},
/*
* 去合同详情 传入合同id
@@ -402,6 +408,10 @@ h3.title::before {
.payment-info {
margin-bottom: 14px;
+ &-box {
+ border: 1px solid #ccc;
+ }
+
&-title {
text-align: center;
font-size: 14px;
@@ -413,11 +423,12 @@ h3.title::before {
}
&-content {
+ border: 1px solid #ccc;
color: #424242;
//background: #efefef;
padding: 5px;
padding-left: 10px;
- border: 1px solid #ccc;
+ //border: 1px solid #ccc;
border-top: none;
}
diff --git a/src/components/form/InstallmentForm.vue b/src/components/form/InstallmentForm.vue
index 96f9ff5..deb699b 100644
--- a/src/components/form/InstallmentForm.vue
+++ b/src/components/form/InstallmentForm.vue
@@ -67,6 +67,7 @@
import JDate from '../tools/JDate'
import pick from 'lodash.pick'
import { addZero } from '../../utils/util'
+import { money } from '../../utils/validate'
export default {
name: 'InstallmentForm',
@@ -89,11 +90,11 @@ export default {
validateTrigger: 'blur'
},
accountsReceivableAmount: {
- rules: [{ required: true, message: '请输入金额' }],
+ rules: [{ required: true, validator: this.checkMoney }],
validateTrigger: 'blur'
},
paidAmount: {
- rules: [{ required: false, message: '请输入金额' }],
+ rules: [{ required: false, validator: this.checkMoney }],
validateTrigger: 'blur'
}
},
@@ -147,6 +148,25 @@ export default {
this.$emit('ok', values)
}
})
+ },
+ /**
+ * 校验金额格式
+ * @param rules
+ * @param value
+ * @param callback
+ */
+ checkMoney(rules, value, callback) {
+ if (value) {
+ if (money(value)) {
+ callback()
+ return
+ }
+ callback('请输入正确格式的金额')
+ }
+ if (rules.field === 'accountsReceivableAmount') {
+ callback('请输入金额')
+ }
+ callback()
}
}
}
diff --git a/src/components/tools/StatusSlot.vue b/src/components/tools/StatusSlot.vue
index 72ed18b..59db5c9 100644
--- a/src/components/tools/StatusSlot.vue
+++ b/src/components/tools/StatusSlot.vue
@@ -1,9 +1,9 @@
+ {{ item.paymentDate }}到账{{ item.amountReceived }}元
+
+
+
+
![]()
-
@@ -147,6 +146,7 @@ export default {
},
/**
* 显示的模板数据，即根据返回值怎么处理数据
+ * 判断是否存在一句话里所有变量为null，存在就不显示那句话了
* @param item -传入的item的值
* @return 返回一个模板字符串用于后续显示，可按照需求进行更改
*/
@@ -155,11 +155,17 @@ export default {
console.log(item)
// 来款
if (this.statusKey === 'paymentRecord') {
- result = `${ item.paymentDate }到账${ item.amountReceived }`
+ if (item.paymentDate || item.amountReceived) {
+ result = `${ item.paymentDate }到账${ item.amountReceived }元`
+ }
} else if (this.statusKey === 'bill') {
- result = `${ item.billDate }新增发票，发票单号：${ item.billNo }`
+ if (item.billDate || item.billNo) {
+ result = `${ item.billDate }新增发票，发票单号：${ item.billNo }`
+ }
} else if (this.statusKey === 'mail') {
- result = `${ item.sendDate }新增邮寄信息，邮寄单号：${ item.postNo }`
+ if (item.sendDate || item.postNo) {
+ result = `${ item.sendDate }新增邮寄信息，邮寄单号：${ item.postNo }`
+ }
}
return result
}
@@ -175,4 +181,8 @@ export default {
.status-tooltip .ant-tooltip-inner {
white-space: pre-wrap !important;
}
+
+.ant-tooltip {
+ max-width: 16rem;
+}
diff --git a/src/components/tools/UserPassword.vue b/src/components/tools/UserPassword.vue
index 558b282..c82c11a 100644
--- a/src/components/tools/UserPassword.vue
+++ b/src/components/tools/UserPassword.vue
@@ -17,14 +17,14 @@
@paste.native.capture.prevent="handleOperate"
autocomplete="new-password"
label="旧密码">
-
@@ -23,26 +23,32 @@
-
-
-
-
@@ -53,101 +59,105 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
@@ -155,10 +165,10 @@
-
-
-
-
+
+
+
+
@@ -179,11 +189,11 @@ import moment from 'moment'
import Vue from 'vue'
import {ACCESS_TOKEN} from '@/store/mutation-types'
import {getAction} from '@/api/manage'
-import {addUser, editUser, queryUserRole, queryall,queryallRoles, queryDepartTreeList} from '@/api/api'
+import {addUser, editUser, queryUserRole, queryall, queryallRoles, queryDepartTreeList} from '@/api/api'
import {disabledAuthFilter} from '@/utils/authFilter'
-import { passwordReg} from '@/utils/validate'
-import {checkPhone,checkEmail,checkUserName} from '@/utils/validateOnly'
-import { getRSAPublicKey } from '@/api/login.js'
+import {passwordReg} from '@/utils/validate'
+import {checkPhone, checkEmail, checkUserName} from '@/utils/validateOnly'
+import {getRSAPublicKey} from '@/api/login.js'
import {encrypt} from '@/utils/util'
@@ -198,9 +208,9 @@ export default {
modaltoggleFlag: true,
confirmDirty: false,
// 组织机构 下拉数据
- treeDepartData:[],
+ treeDepartData: [],
// 角色类型下拉数据
- treeRoleData:[],
+ treeRoleData: [],
selectedDepartKeys: [], //保存用户选择部门id
checkedDepartKeys: [],
checkedDepartNames: [], // 保存部门的名称 =>title
@@ -217,7 +227,7 @@ export default {
}],
validateTrigger: 'blur'
},
- emailPassword:{
+ emailPassword: {
rules: [{
required: true,
message: '请输入邮箱密码'
@@ -242,7 +252,7 @@ export default {
validateTrigger: 'blur'
},
realname: {rules: [{required: true, message: '请输入用户姓名'}], validateTrigger: 'blur'},
- phone: {rules: [{required: true,validator: this.validatePhone}], validateTrigger: 'blur'},
+ phone: {rules: [{required: true, validator: this.validatePhone}], validateTrigger: 'blur'},
email: {
rules: [{
required: true,
@@ -250,8 +260,8 @@ export default {
},],
validateTrigger: 'blur'
},
- selectedroles:{rules: [{required: true, message:'请选择角色类型'}], validateTrigger: ['change']},
- selecteddeparts:{rules: [{required: true, message:'请选择组织机构'}], validateTrigger: ['change']}
+ selectedroles: {rules: [{required: true, message: '请选择角色类型'}], validateTrigger: ['change']},
+ selecteddeparts: {rules: [{required: true, message: '请选择组织机构'}], validateTrigger: ['change']}
// sex:{initialValue:((!this.model.sex)?"": (this.model.sex+""))}
},
departIdShow: false,
@@ -286,7 +296,7 @@ export default {
tenantList: [],
currentTenant: [],
// 公钥
- rsaPublicKey:'',
+ rsaPublicKey: '',
disabledEdit: false, // 用户账号是否可编辑
}
},
@@ -372,7 +382,7 @@ export default {
// eslint-disable-next-line no-prototype-builtins
if (record.hasOwnProperty('id')) {
that.loadUserRoles(record.id).then(res => {
- that.form.setFieldsValue({selectedroles:res})
+ that.form.setFieldsValue({selectedroles: res})
})
setTimeout(() => {
this.fileList = record.avatar
@@ -387,9 +397,9 @@ export default {
that.disabledEdit = false
}
// 组织机构修改成了单选，此处不需要了
- if(record.departIds !== '' && record.id){
+ if (record.departIds !== '' && record.id) {
// 部门是数组的时候以逗号拼接
- if(Object.prototype.toString.call(record.departIds) === '[object Array]') {
+ if (Object.prototype.toString.call(record.departIds) === '[object Array]') {
that.model.selecteddeparts = record.departIds.split(',')
} else {
that.model.selecteddeparts = record.departIds
@@ -397,7 +407,7 @@ export default {
}
that.$nextTick(() => {
- that.form.setFieldsValue(pick(this.model, 'username', 'realname', 'email', 'phone', 'post','selecteddeparts','emailPassword'))
+ that.form.setFieldsValue(pick(this.model, 'username', 'realname', 'email', 'phone', 'post', 'selecteddeparts', 'emailPassword'))
})
//身份为上级显示负责部门，否则不显示
if (this.model.userIdentity == '2') {
@@ -420,13 +430,13 @@ export default {
//update-end-author:taoyan date:2020710 for:多租户配置
},
// 组织机构下拉数据
- loadDepartTreeData(){
+ loadDepartTreeData() {
const that = this
queryDepartTreeList().then((res) => {
- if(res.success){
+ if (res.success) {
that.treeDepartData = []
let treeList = res.result
- for(let a=0;a {
- if(res.success){
+ if (res.success) {
that.treeRoleData = []
let treeList = res.result
- for(let a=0;a {
@@ -523,28 +533,34 @@ export default {
// 公钥参数
formData.rsaPublicKey = that.rsaPublicKey
// 新建 JSEncrypt 对象
- formData.password =encrypt(that.rsaPublicKey,values.password)
- formData.confirmpassword = formData.password
- formData.phone = encrypt(that.rsaPublicKey,values.phone)
- formData.email = encrypt(that.rsaPublicKey,values.email)
+ formData.password = encrypt(that.rsaPublicKey, values.password)
+ formData.confirmpassword = formData.password
+ formData.phone = encrypt(that.rsaPublicKey, values.phone)
+ formData.email = encrypt(that.rsaPublicKey, values.email)
// 加密邮箱密码
- formData.emailPassword = encrypt(that.rsaPublicKey,values.emailPassword)
+ formData.emailPassword = encrypt(that.rsaPublicKey, values.emailPassword)
//update-begin-author:taoyan date:2020710 for:多租户配置
formData.relTenantIds = this.currentTenant.length > 0 ? this.currentTenant.join(',') : ''
//update-end-author:taoyan date:2020710 for:多租户配置
formData.selectedroles = values.selectedroles.length > 0 ? values.selectedroles.join(',') : ''
+
// 部门由多选改成单选 所以不需要单独处理了，但为了历史数据可以使用，对values.selecteddeparts类型进行判断，如果是数组则以逗号分隔转成字符串，若是字符串则直接显示
- if(Object.prototype.toString.call(values.selecteddeparts) === '[object Array]') {
+ if (Object.prototype.toString.call(values.selecteddeparts) === '[object Array]') {
formData.selecteddeparts = values.selecteddeparts.length > 0 ? values.selecteddeparts.join(',') : ''
}
// formData.selecteddeparts = values.selecteddeparts.length > 0 ? values.selecteddeparts.join(',') : ''
+
+ // 不知道为啥 之前不要这两个字段 后面出bug了 说是这两个没传
+ formData.departIds = values.selecteddeparts
+ formData.roleIds = formData.selectedroles
+ //
formData.userIdentity = this.identity
//如果是上级择传入departIds,否则为空
- if (this.identity === '2') {
- formData.departIds = this.departIds.join(',')
- } else {
- formData.departIds = ''
- }
+ // if (this.identity === '2') {
+ // formData.departIds = this.departIds.join(',')
+ // } else {
+ // formData.departIds = ''
+ // }
// that.addDepartsToUser(that,formData); // 调用根据当前用户添加部门信息的方法
let obj
if (!this.model.id) {
@@ -567,7 +583,7 @@ export default {
that.userDepartModel.departIdList = {userId: '', departIdList: []}
})
- }else {
+ } else {
that.confirmLoading = false
}
})
@@ -600,29 +616,29 @@ export default {
}
},
validatePhone(rule, value, callback) {
- checkPhone(value,this.userId).then(res => {
- if(res.success){
+ checkPhone(value, this.userId).then(res => {
+ if (res.success) {
callback()
- }else {
- callback(res.code === 500 ? '手机号已存在': res)
+ } else {
+ callback(res.code === 500 ? '手机号已存在' : res)
}
})
},
validateEmail(rule, value, callback) {
- checkEmail(value,this.userId).then(res => {
- if(res.success){
+ checkEmail(value, this.userId).then(res => {
+ if (res.success) {
callback()
- }else {
- callback(res.code === 500 ? '邮箱已存在': res)
+ } else {
+ callback(res.code === 500 ? '邮箱已存在' : res)
}
})
},
validateUsername(rule, value, callback) {
- checkUserName(value,this.userId).then(res => {
- if(res.success){
+ checkUserName(value, this.userId).then(res => {
+ if (res.success) {
callback()
- }else {
- callback(res.code === 500 ? '用户账号已存在': res)
+ } else {
+ callback(res.code === 500 ? '用户账号已存在' : res)
}
})
},
diff --git a/src/views/user/Login.vue b/src/views/user/Login.vue
index f5b3626..c36b422 100644
--- a/src/views/user/Login.vue
+++ b/src/views/user/Login.vue
@@ -24,14 +24,14 @@
-
+
-
+
-
+