LK/income_payments_client_external
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

【fix】- 起草组修改bug

Browse Source
This commit is contained in:
danshihao
2024-01-16 18:30:43 +08:00
parent 5c5ca99c44
commit 6051f667e3
7 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/ProgressBar.vue
+3 -3
View File
@@ -5,19 +5,19 @@
<div class="progress" v-if="(data.allPayment + data.partPayment + data.notPayment) !== 0">
<!-- 将全部付款和部分付款放入一个div中-->
<div class="full-and-partial"
:style="{width: (data.allPayment + data.partPayment)/(data.allPayment + data.partPayment + data.notPayment) * 100 + '%'}">
:style="{width: (data.allPayment + data.partPayment)/(data.allPayment + data.partPayment + data.notPayment) * 100 + '%', minWidth: 'fit-content'}">
<!-- 全部付款-->
<div :style="{width: data.allPayment/(data.allPayment + data.partPayment) * 100 + '%'}"
class="progress-item pay-in-full" v-if="data.allPayment !== 0">
{{ data.allPayment }}
</div>
<!-- 部分付款-->
<div :style="{width: data.partPayment/(data.allPayment + data.partPayment) * 100 + '%'}"
<div :style="{width: data.partPayment/(data.allPayment + data.partPayment) * 100 + '%', minWidth: 'fit-content'}"
class="progress-item partial-payment" v-if="data.partPayment !== 0">
{{ data.partPayment }}
</div>
</div>
<div :style="{width: data.notPayment/(data.allPayment + data.partPayment + data.notPayment) * 100 + '%'}"
<div :style="{width: data.notPayment/(data.allPayment + data.partPayment + data.notPayment) * 100 + '%', minWidth: 'fit-content'}"
class="progress-item non-payment" v-if="data.notPayment !== 0">
{{ data.notPayment }}
</div>
src/components/company/CompanySelect.vue
+2 -1
View File
@@ -77,6 +77,7 @@ export default {
this.$refs.businessSelect.visible = true
if (!this.isMultiple) {
this.$refs.businessSelect.selectedRowKeys[0] = this.value.id
this.$refs.businessSelect.selectedCompany = this.value
} else {
// 很重要 内部的删除像没有作用一样
if(this.value.id) {
@@ -93,7 +94,7 @@ export default {
* @param value
*/
handleOk(value) {
console.log('--------value---------', 'value')
console.log('--------value---------', value)
let company = {id: undefined, companyName: undefined}
// 多选的时候 全部放在一起，以逗号分隔
if (this.isMultiple) {
src/views/draftingGroup/modules/DraftingGroupMemberUnitModule.vue
-1
View File
@@ -45,7 +45,6 @@
<a-col :xl="12" :sm="24">
<a-form-item :label="`企业联系人${index + 1}`" :labelCol="labelCol" :wrapperCol="wrapperCol">
<select-contacts :selected-company="selectedCompany"
:init-contacts="model.payDraftingGroupSubItemContactsList[index]"
:placeholder="`请选择企业联系人${index + 1}`"
v-decorator="[`payDraftingGroupSubItemContactsList[${index}].contactsId`, {rules: [{ required: index === 0, validator: index === 0 ? validateContactRequired : validateContact }],validateTrigger: 'change'}]"
:maxLength='50'
src/views/incomePayments/meetManage/AddOrDetailMeet.vue
+1 -1
View File
@@ -135,7 +135,7 @@
<!-- @change="changeConvoke"-->
<!-- v-decorator="['convokeLocale',validatorRules.convokeLocale]"-->
<!-- ></j-area-linkage>-->
<a-input placeholder="请输入召开地点/腾讯会议" v-decorator="['venue',validatorRules.venue]"></a-input>
<a-input placeholder="请输入召开地点/腾讯会议" :maxLength='50' v-decorator="['venue',validatorRules.venue]"></a-input>
</a-form-item>
</a-col>
<a-col :xxl='8' :xl="12" :sm="24">
src/views/incomePayments/meetManage/Attendance.vue
+2 -1
View File
@@ -249,7 +249,8 @@
dictCode="invoice_project"/>
</a-form-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24" class="flex-width-zero">
<!-- 国际研讨会 且为 WASIC时显示 -->
<a-col :xl="6" :lg="7" :md="8" :sm="24" class="flex-width-zero" v-if="currentMeetingInfo.meetingType === '3' && currentMeetingInfo.isWasic">
<a-form-item label="会议名称">
<j-multi-select-tag
v-model="queryParam.choiceTopic_regexp"
src/views/incomePayments/meetManage/modules/UploadMeetFileModal.vue
+3 -3
View File
@@ -412,7 +412,7 @@ export default {
}
return true
},
handleChange(info) {
async handleChange(info) {
if (info.file.status !== 'uploading') {
console.log(info.file, info.fileList)
}
@@ -436,8 +436,8 @@ export default {
} else {
this.$message.success(info.file.response.message || `${info.file.name} 文件上传成功`)
}
this.fileList.push(info.file.response.result)
let newFile = await this.getFileInfoArr(info.file.response.result.id)
this.fileList.push(newFile[0])
} else {
this.messageLineFeed('文件导入错误', info.file.response.message)
}
src/views/projectManagement/modules/WorkingGroupMemberUnitModule.vue
-1
View File
@@ -45,7 +45,6 @@
<a-col :xl="12" :sm="24">
<a-form-item :label="`企业联系人${index + 1}`" :labelCol="labelCol" :wrapperCol="wrapperCol">
<select-contacts :selected-company="selectedCompany"
:init-contacts="model.payWorkingGroupSubItemContactsList[index]"
:placeholder="`请选择企业联系人${index + 1}`"
v-decorator="[`payWorkingGroupSubItemContactsList[${index}].contactsId`, {rules: [{ required: index === 0, validator: index === 0 ? validateContactRequired : validateContact }],validateTrigger: 'change'}]"
:maxLength='50'