WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev_2nd_LCYH' into dev_2nd_LCYH

Browse Source
This commit is contained in:
cuijiaming
2023-03-28 18:08:29 +08:00
parent fbb33e9d6a 6a2ad09628
commit dd5f754427
1 changed files with 360 additions and 335 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/views/projectManagement/components/listEditModel.vue
+26 -1
View File
@@ -326,6 +326,7 @@
:isSingleChoice="true" :isSingleChoice="true"
:personneQuery="formInline" :personneQuery="formInline"
v-if="visible" v-if="visible"
:disabled="isEdit(this.formInline)"
@change="PersonnelSelectionChange" @change="PersonnelSelectionChange"
v-model="formInline.designDutyIdName"/> v-model="formInline.designDutyIdName"/>
<!-- <a-select :placeholder="$t('PleaseSelect')+$t('personLiable')"--> <!-- <a-select :placeholder="$t('PleaseSelect')+$t('personLiable')"-->
@@ -361,6 +362,7 @@
:placeholder="$t('PleaseSelect')+$t('cutoffTime')" :placeholder="$t('PleaseSelect')+$t('cutoffTime')"
@change="dateChange({db_field_name:'designDueDate'})" @change="dateChange({db_field_name:'designDueDate'})"
format="YYYY-MM-DD" format="YYYY-MM-DD"
:disabled="isEdit(this.formInline)"
:getCalendarContainer="(trigger) => trigger.parentNode" :getCalendarContainer="(trigger) => trigger.parentNode"
v-model="formInline.designDueDate" v-model="formInline.designDueDate"
style="width: 100%"/> style="width: 100%"/>
@@ -436,6 +438,7 @@
:getPopupContainer="triggerNode=> triggerNode.parentNode" :getPopupContainer="triggerNode=> triggerNode.parentNode"
class="box-input" class="box-input"
style="width: 100%" style="width: 100%"
:disabled="isEdit(this.formInline)"
:tree-data="DeliverableTreeList" :tree-data="DeliverableTreeList"
tree-checkable tree-checkable
:placeholder="$t('PleaseSelect')+$t('typeOfDeliverables')" :placeholder="$t('PleaseSelect')+$t('typeOfDeliverables')"
@@ -475,6 +478,7 @@
<a-form-model-item class="itemModel-text" :prop="'designRemark'"> <a-form-model-item class="itemModel-text" :prop="'designRemark'">
<a-textarea <a-textarea
style="width: 100%" style="width: 100%"
:disabled="isEdit(this.formInline)"
:placeholder="$t('PleaseEnter')+$t('descriptionDeliverables')" :placeholder="$t('PleaseEnter')+$t('descriptionDeliverables')"
v-model="formInline.designRemark" :rows="4"/> v-model="formInline.designRemark" :rows="4"/>
</a-form-model-item> </a-form-model-item>
@@ -661,6 +665,7 @@
:isSingleChoice="true" :isSingleChoice="true"
:personneQuery="formInline" :personneQuery="formInline"
v-if="visible" v-if="visible"
:disabled="isEditVerifi(this.formInline)"
@change="PersonnelSelectionChange" @change="PersonnelSelectionChange"
v-model="formInline.verifyDutyIdName"/> v-model="formInline.verifyDutyIdName"/>
</a-form-model-item> </a-form-model-item>
@@ -677,6 +682,7 @@
:placeholder="$t('PleaseSelect')+$t('cutoffTime')" :placeholder="$t('PleaseSelect')+$t('cutoffTime')"
@change="dateChange({db_field_name:'verifyDueDate'})" @change="dateChange({db_field_name:'verifyDueDate'})"
format="YYYY-MM-DD" format="YYYY-MM-DD"
:disabled="isEditVerifi(this.formInline)"
:getCalendarContainer="(trigger) => trigger.parentNode" :getCalendarContainer="(trigger) => trigger.parentNode"
v-model="formInline.verifyDueDate" v-model="formInline.verifyDueDate"
style="width: 100%"/> style="width: 100%"/>
@@ -736,6 +742,7 @@
:getPopupContainer="triggerNode=> triggerNode.parentNode" :getPopupContainer="triggerNode=> triggerNode.parentNode"
class="box-input" class="box-input"
style="width: 100%" style="width: 100%"
:disabled="isEditVerifi(this.formInline)"
:tree-data="DeliverableTreeList" :tree-data="DeliverableTreeList"
tree-checkable tree-checkable
:placeholder="$t('PleaseSelect')+$t('typeOfDeliverables')" :placeholder="$t('PleaseSelect')+$t('typeOfDeliverables')"
@@ -776,6 +783,7 @@
<a-form-model-item class="itemModel-text" :prop="'verifyRemark'"> <a-form-model-item class="itemModel-text" :prop="'verifyRemark'">
<a-textarea <a-textarea
style="width: 100%" style="width: 100%"
:disabled="isEditVerifi(this.formInline)"
:placeholder="$t('PleaseEnter')+$t('descriptionDeliverables')" :placeholder="$t('PleaseEnter')+$t('descriptionDeliverables')"
v-model="formInline.verifyRemark" :rows="4"/> v-model="formInline.verifyRemark" :rows="4"/>
</a-form-model-item> </a-form-model-item>
@@ -827,7 +835,8 @@
</a-row> </a-row>
</div> </div>
<div class="header-text" v-if="rejectCauseListOne && rejectCauseListOne.length > 0 && formInline.roleCodeIndex == 0"> <div class="header-text"
v-if="rejectCauseListOne && rejectCauseListOne.length > 0 && formInline.roleCodeIndex == 0">
{{$t('verifyComplianceConfirmReturnReason')}} {{$t('verifyComplianceConfirmReturnReason')}}
</div> </div>
@@ -984,6 +993,22 @@
this.userInfoQuery = this.userInfo() this.userInfoQuery = this.userInfo()
}, },
methods: { methods: {
isEdit(val) {
if (val.designFlowStatus == 'Task to be confirmed' || val.designFlowStatus == 'Results to be submitted' ||
val.designFlowStatus == 'Results to be reviewed') {
return true
} else {
return false
}
},
isEditVerifi(val){
if (val.verifyFlowStatus == 'Task to be confirmed' || val.verifyFlowStatus == 'Results to be submitted' ||
val.verifyFlowStatus == 'Results to be reviewed') {
return true
} else {
return false
}
},
...mapGetters(['userInfo']), ...mapGetters(['userInfo']),
getRejectCause(id) { getRejectCause(id) {
let query = { let query = {