【fix】- 起草组修改bug
This commit is contained in:
@@ -5,19 +5,19 @@
|
|||||||
<div class="progress" v-if="(data.allPayment + data.partPayment + data.notPayment) !== 0">
|
<div class="progress" v-if="(data.allPayment + data.partPayment + data.notPayment) !== 0">
|
||||||
<!-- 将全部付款和部分付款放入一个div中-->
|
<!-- 将全部付款和部分付款放入一个div中-->
|
||||||
<div class="full-and-partial"
|
<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 + '%'}"
|
<div :style="{width: data.allPayment/(data.allPayment + data.partPayment) * 100 + '%'}"
|
||||||
class="progress-item pay-in-full" v-if="data.allPayment !== 0">
|
class="progress-item pay-in-full" v-if="data.allPayment !== 0">
|
||||||
{{ data.allPayment }}
|
{{ data.allPayment }}
|
||||||
</div>
|
</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">
|
class="progress-item partial-payment" v-if="data.partPayment !== 0">
|
||||||
{{ data.partPayment }}
|
{{ data.partPayment }}
|
||||||
</div>
|
</div>
|
||||||
</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">
|
class="progress-item non-payment" v-if="data.notPayment !== 0">
|
||||||
{{ data.notPayment }}
|
{{ data.notPayment }}
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -77,6 +77,7 @@ export default {
|
|||||||
this.$refs.businessSelect.visible = true
|
this.$refs.businessSelect.visible = true
|
||||||
if (!this.isMultiple) {
|
if (!this.isMultiple) {
|
||||||
this.$refs.businessSelect.selectedRowKeys[0] = this.value.id
|
this.$refs.businessSelect.selectedRowKeys[0] = this.value.id
|
||||||
|
this.$refs.businessSelect.selectedCompany = this.value
|
||||||
} else {
|
} else {
|
||||||
// 很重要 内部的删除像没有作用一样
|
// 很重要 内部的删除像没有作用一样
|
||||||
if(this.value.id) {
|
if(this.value.id) {
|
||||||
@@ -93,7 +94,7 @@ export default {
|
|||||||
* @param value
|
* @param value
|
||||||
*/
|
*/
|
||||||
handleOk(value) {
|
handleOk(value) {
|
||||||
console.log('--------value---------', 'value')
|
console.log('--------value---------', value)
|
||||||
let company = {id: undefined, companyName: undefined}
|
let company = {id: undefined, companyName: undefined}
|
||||||
// 多选的时候 全部放在一起,以逗号分隔
|
// 多选的时候 全部放在一起,以逗号分隔
|
||||||
if (this.isMultiple) {
|
if (this.isMultiple) {
|
||||||
|
|||||||
@@ -45,7 +45,6 @@
|
|||||||
<a-col :xl="12" :sm="24">
|
<a-col :xl="12" :sm="24">
|
||||||
<a-form-item :label="`企业联系人${index + 1}`" :labelCol="labelCol" :wrapperCol="wrapperCol">
|
<a-form-item :label="`企业联系人${index + 1}`" :labelCol="labelCol" :wrapperCol="wrapperCol">
|
||||||
<select-contacts :selected-company="selectedCompany"
|
<select-contacts :selected-company="selectedCompany"
|
||||||
:init-contacts="model.payDraftingGroupSubItemContactsList[index]"
|
|
||||||
:placeholder="`请选择企业联系人${index + 1}`"
|
:placeholder="`请选择企业联系人${index + 1}`"
|
||||||
v-decorator="[`payDraftingGroupSubItemContactsList[${index}].contactsId`, {rules: [{ required: index === 0, validator: index === 0 ? validateContactRequired : validateContact }],validateTrigger: 'change'}]"
|
v-decorator="[`payDraftingGroupSubItemContactsList[${index}].contactsId`, {rules: [{ required: index === 0, validator: index === 0 ? validateContactRequired : validateContact }],validateTrigger: 'change'}]"
|
||||||
:maxLength='50'
|
:maxLength='50'
|
||||||
|
|||||||
@@ -135,7 +135,7 @@
|
|||||||
<!-- @change="changeConvoke"-->
|
<!-- @change="changeConvoke"-->
|
||||||
<!-- v-decorator="['convokeLocale',validatorRules.convokeLocale]"-->
|
<!-- v-decorator="['convokeLocale',validatorRules.convokeLocale]"-->
|
||||||
<!-- ></j-area-linkage>-->
|
<!-- ></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-form-item>
|
||||||
</a-col>
|
</a-col>
|
||||||
<a-col :xxl='8' :xl="12" :sm="24">
|
<a-col :xxl='8' :xl="12" :sm="24">
|
||||||
|
|||||||
@@ -249,7 +249,8 @@
|
|||||||
dictCode="invoice_project"/>
|
dictCode="invoice_project"/>
|
||||||
</a-form-item>
|
</a-form-item>
|
||||||
</a-col>
|
</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="会议名称">
|
<a-form-item label="会议名称">
|
||||||
<j-multi-select-tag
|
<j-multi-select-tag
|
||||||
v-model="queryParam.choiceTopic_regexp"
|
v-model="queryParam.choiceTopic_regexp"
|
||||||
|
|||||||
@@ -412,7 +412,7 @@ export default {
|
|||||||
}
|
}
|
||||||
return true
|
return true
|
||||||
},
|
},
|
||||||
handleChange(info) {
|
async handleChange(info) {
|
||||||
if (info.file.status !== 'uploading') {
|
if (info.file.status !== 'uploading') {
|
||||||
console.log(info.file, info.fileList)
|
console.log(info.file, info.fileList)
|
||||||
}
|
}
|
||||||
@@ -436,8 +436,8 @@ export default {
|
|||||||
} else {
|
} else {
|
||||||
this.$message.success(info.file.response.message || `${info.file.name} 文件上传成功`)
|
this.$message.success(info.file.response.message || `${info.file.name} 文件上传成功`)
|
||||||
}
|
}
|
||||||
|
let newFile = await this.getFileInfoArr(info.file.response.result.id)
|
||||||
this.fileList.push(info.file.response.result)
|
this.fileList.push(newFile[0])
|
||||||
} else {
|
} else {
|
||||||
this.messageLineFeed('文件导入错误', info.file.response.message)
|
this.messageLineFeed('文件导入错误', info.file.response.message)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -45,7 +45,6 @@
|
|||||||
<a-col :xl="12" :sm="24">
|
<a-col :xl="12" :sm="24">
|
||||||
<a-form-item :label="`企业联系人${index + 1}`" :labelCol="labelCol" :wrapperCol="wrapperCol">
|
<a-form-item :label="`企业联系人${index + 1}`" :labelCol="labelCol" :wrapperCol="wrapperCol">
|
||||||
<select-contacts :selected-company="selectedCompany"
|
<select-contacts :selected-company="selectedCompany"
|
||||||
:init-contacts="model.payWorkingGroupSubItemContactsList[index]"
|
|
||||||
:placeholder="`请选择企业联系人${index + 1}`"
|
:placeholder="`请选择企业联系人${index + 1}`"
|
||||||
v-decorator="[`payWorkingGroupSubItemContactsList[${index}].contactsId`, {rules: [{ required: index === 0, validator: index === 0 ? validateContactRequired : validateContact }],validateTrigger: 'change'}]"
|
v-decorator="[`payWorkingGroupSubItemContactsList[${index}].contactsId`, {rules: [{ required: index === 0, validator: index === 0 ? validateContactRequired : validateContact }],validateTrigger: 'change'}]"
|
||||||
:maxLength='50'
|
:maxLength='50'
|
||||||
|
|||||||
Reference in New Issue
Block a user