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
+360 -335
View File
@@ -221,30 +221,30 @@
</a-col> </a-col>
</a-row> </a-row>
<a-row :gutter="24"> <a-row :gutter="24">
<!-- <a-col :span="12">--> <!-- <a-col :span="12">-->
<!-- <div class="box-title-text">--> <!-- <div class="box-title-text">-->
<!-- <div class="title-text">--> <!-- <div class="title-text">-->
<!-- <span class="Required" v-if="formInline.roleCodeIndex == 0">*</span>--> <!-- <span class="Required" v-if="formInline.roleCodeIndex == 0">*</span>-->
<!-- <span class="title-text-text" :title="$t('certifiedEngineer')">{{$t('certifiedEngineer')}}</span>--> <!-- <span class="title-text-text" :title="$t('certifiedEngineer')">{{$t('certifiedEngineer')}}</span>-->
<!-- </div>--> <!-- </div>-->
<!-- <a-form-model-item class="itemModel" :prop="'homologationEngineerId'">--> <!-- <a-form-model-item class="itemModel" :prop="'homologationEngineerId'">-->
<!-- <a-select :placeholder="$t('PleaseSelect')+$t('certifiedEngineer')"--> <!-- <a-select :placeholder="$t('PleaseSelect')+$t('certifiedEngineer')"-->
<!-- class="box-input"--> <!-- class="box-input"-->
<!-- allowClear--> <!-- allowClear-->
<!-- :getPopupContainer="triggerNode=> triggerNode.parentNode"--> <!-- :getPopupContainer="triggerNode=> triggerNode.parentNode"-->
<!-- :disabled="formInline.roleCodeIndex == 0 ? false : true"--> <!-- :disabled="formInline.roleCodeIndex == 0 ? false : true"-->
<!-- v-model="formInline.homologationEngineerId">--> <!-- v-model="formInline.homologationEngineerId">-->
<!-- <a-select-option v-for="(item, key) in certificationEngineerList"--> <!-- <a-select-option v-for="(item, key) in certificationEngineerList"-->
<!-- :key="key"--> <!-- :key="key"-->
<!-- :value="item.value">--> <!-- :value="item.value">-->
<!-- <span style="display: inline-block;width: 100%" :title=" item.name ">--> <!-- <span style="display: inline-block;width: 100%" :title=" item.name ">-->
<!-- {{ item.name}}--> <!-- {{ item.name}}-->
<!-- </span>--> <!-- </span>-->
<!-- </a-select-option>--> <!-- </a-select-option>-->
<!-- </a-select>--> <!-- </a-select>-->
<!-- </a-form-model-item>--> <!-- </a-form-model-item>-->
<!-- </div>--> <!-- </div>-->
<!-- </a-col>--> <!-- </a-col>-->
<a-col :span="12"> <a-col :span="12">
<div class="box-title-text"> <div class="box-title-text">
<div class="title-text"> <div class="title-text">
@@ -252,13 +252,13 @@
<span class="title-text-text" :title="$t('engineeringInterfacePerson')">{{$t('engineeringInterfacePerson')}}</span> <span class="title-text-text" :title="$t('engineeringInterfacePerson')">{{$t('engineeringInterfacePerson')}}</span>
</div> </div>
<a-form-model-item class="itemModel" :prop="'engineeringInterfacePerson'"> <a-form-model-item class="itemModel" :prop="'engineeringInterfacePerson'">
<!-- <PersonnelSelection--> <!-- <PersonnelSelection-->
<!-- :query="{db_field_name:'engineeringInterfacePerson',db_field_txt:$t('engineeringInterfacePerson')}"--> <!-- :query="{db_field_name:'engineeringInterfacePerson',db_field_txt:$t('engineeringInterfacePerson')}"-->
<!-- :isSingleChoice="true"--> <!-- :isSingleChoice="true"-->
<!-- :personneQuery="formInline"--> <!-- :personneQuery="formInline"-->
<!-- v-if="visible"--> <!-- v-if="visible"-->
<!-- @change="PersonnelSelectionChange"--> <!-- @change="PersonnelSelectionChange"-->
<!-- v-model="formInline.engineeringInterfacePersonName"/>--> <!-- v-model="formInline.engineeringInterfacePersonName"/>-->
<a-select :placeholder="$t('PleaseSelect')+$t('engineeringInterfacePerson')" <a-select :placeholder="$t('PleaseSelect')+$t('engineeringInterfacePerson')"
class="box-input" class="box-input"
allowClear allowClear
@@ -276,41 +276,41 @@
</div> </div>
</a-col> </a-col>
</a-row> </a-row>
<!-- <a-row :gutter="24">--> <!-- <a-row :gutter="24">-->
<!-- <a-col :span="12">--> <!-- <a-col :span="12">-->
<!-- <div class="box-title-text">--> <!-- <div class="box-title-text">-->
<!-- <div class="title-text">--> <!-- <div class="title-text">-->
<!-- <span class="title-text-text"--> <!-- <span class="title-text-text"-->
<!-- :title="$t('zoneOfApplication')">{{$t('zoneOfApplication')}}</span>--> <!-- :title="$t('zoneOfApplication')">{{$t('zoneOfApplication')}}</span>-->
<!-- </div>--> <!-- </div>-->
<!-- <a-form-model-item class="itemModel-multi" prop="region">--> <!-- <a-form-model-item class="itemModel-multi" prop="region">-->
<!-- &lt;!&ndash; <a-input class="box-input"&ndash;&gt;--> <!-- &lt;!&ndash; <a-input class="box-input"&ndash;&gt;-->
<!-- &lt;!&ndash; :disabled="true"&ndash;&gt;--> <!-- &lt;!&ndash; :disabled="true"&ndash;&gt;-->
<!-- &lt;!&ndash; v-model="formInline.region_dictText"/>&ndash;&gt;--> <!-- &lt;!&ndash; v-model="formInline.region_dictText"/>&ndash;&gt;-->
<!-- <j-multi-select-tag class="box-input" v-model="formInline.region"--> <!-- <j-multi-select-tag class="box-input" v-model="formInline.region"-->
<!-- :placeholder="$t('PleaseSelect')+$t('zoneOfApplication')"--> <!-- :placeholder="$t('PleaseSelect')+$t('zoneOfApplication')"-->
<!-- :type="'select'"--> <!-- :type="'select'"-->
<!-- :triggerChange="false" :dictCode="'region'"/>--> <!-- :triggerChange="false" :dictCode="'region'"/>-->
<!-- </a-form-model-item>--> <!-- </a-form-model-item>-->
<!-- </div>--> <!-- </div>-->
<!-- </a-col>--> <!-- </a-col>-->
<!-- </a-row>--> <!-- </a-row>-->
<a-row :gutter="24"> <a-row :gutter="24">
<a-col :span="24"> <a-col :span="24">
<div class="box-title-text"> <div class="box-title-text">
<div class="title-text"> <div class="title-text">
<span class="title-text-text" :title="$t('remarks')">{{$t('remarks')}}</span> <span class="title-text-text" :title="$t('remarks')">{{$t('remarks')}}</span>
</div> </div>
<a-form-model-item class="itemModel-text" :prop="'remarks'"> <a-form-model-item class="itemModel-text" :prop="'remarks'">
<a-textarea <a-textarea
style="width: 100%" style="width: 100%"
:placeholder="$t('PleaseEnter')+$t('remarks')" :placeholder="$t('PleaseEnter')+$t('remarks')"
:disabled="false" :disabled="false"
v-model="formInline.remark" :rows="4"/> v-model="formInline.remark" :rows="4"/>
</a-form-model-item> </a-form-model-item>
</div> </div>
</a-col> </a-col>
</a-row> </a-row>
<div class="header-text"> <div class="header-text">
&nbsp;{{$t('confirmationOfDesignConformity')}} &nbsp;{{$t('confirmationOfDesignConformity')}}
</div> </div>
@@ -326,21 +326,22 @@
: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')"-->
<!-- :getPopupContainer="triggerNode=> triggerNode.parentNode"--> <!-- :getPopupContainer="triggerNode=> triggerNode.parentNode"-->
<!-- class="box-input"--> <!-- class="box-input"-->
<!-- allowClear--> <!-- allowClear-->
<!-- v-model="formInline.designDutyId">--> <!-- v-model="formInline.designDutyId">-->
<!-- <a-select-option v-for="(item, key) in designDutyList"--> <!-- <a-select-option v-for="(item, key) in designDutyList"-->
<!-- :key="key"--> <!-- :key="key"-->
<!-- :value="item.value">--> <!-- :value="item.value">-->
<!-- <span style="display: inline-block;width: 100%" :title=" item.name ">--> <!-- <span style="display: inline-block;width: 100%" :title=" item.name ">-->
<!-- {{ item.name }}--> <!-- {{ item.name }}-->
<!-- </span>--> <!-- </span>-->
<!-- </a-select-option>--> <!-- </a-select-option>-->
<!-- </a-select>--> <!-- </a-select>-->
<!-- <j-dict-select-tag class="box-input" v-model="formInline.designDuty"--> <!-- <j-dict-select-tag class="box-input" v-model="formInline.designDuty"-->
<!-- :disabled="formInline.roleCode == 0 ? false : true"--> <!-- :disabled="formInline.roleCode == 0 ? false : true"-->
<!-- @input="handleInput('designDuty')"--> <!-- @input="handleInput('designDuty')"-->
@@ -361,66 +362,67 @@
: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%"/>
</a-form-model-item> </a-form-model-item>
</div> </div>
</a-col> </a-col>
<!-- <a-col :span="12">--> <!-- <a-col :span="12">-->
<!-- <div class="box-title-text">--> <!-- <div class="box-title-text">-->
<!-- <div class="title-text">--> <!-- <div class="title-text">-->
<!-- <span class="title-text-text"--> <!-- <span class="title-text-text"-->
<!-- :title="$t('Sponsor')">{{$t('Sponsor')}}</span>--> <!-- :title="$t('Sponsor')">{{$t('Sponsor')}}</span>-->
<!-- </div>--> <!-- </div>-->
<!-- <a-form-model-item class="itemModel" prop="designInitiatorId">--> <!-- <a-form-model-item class="itemModel" prop="designInitiatorId">-->
<!-- <a-select :placeholder="$t('PleaseSelect')+$t('Sponsor')"--> <!-- <a-select :placeholder="$t('PleaseSelect')+$t('Sponsor')"-->
<!-- :disabled="formInline.roleCodeIndex == 0 ? false : true"--> <!-- :disabled="formInline.roleCodeIndex == 0 ? false : true"-->
<!-- :getPopupContainer="triggerNode=> triggerNode.parentNode"--> <!-- :getPopupContainer="triggerNode=> triggerNode.parentNode"-->
<!-- class="box-input"--> <!-- class="box-input"-->
<!-- allowClear--> <!-- allowClear-->
<!-- v-model="formInline.designInitiatorId">--> <!-- v-model="formInline.designInitiatorId">-->
<!-- <a-select-option v-for="(item, key) in designInitiatorList"--> <!-- <a-select-option v-for="(item, key) in designInitiatorList"-->
<!-- :key="key"--> <!-- :key="key"-->
<!-- :value="item.value">--> <!-- :value="item.value">-->
<!-- <span style="display: inline-block;width: 100%" :title=" item.name ">--> <!-- <span style="display: inline-block;width: 100%" :title=" item.name ">-->
<!-- {{ item.name }}--> <!-- {{ item.name }}-->
<!-- </span>--> <!-- </span>-->
<!-- </a-select-option>--> <!-- </a-select-option>-->
<!-- </a-select>--> <!-- </a-select>-->
<!-- &lt;!&ndash; <j-dict-select-tag class="box-input" v-model="formInline.designInitiator"&ndash;&gt;--> <!-- &lt;!&ndash; <j-dict-select-tag class="box-input" v-model="formInline.designInitiator"&ndash;&gt;-->
<!-- &lt;!&ndash; :disabled="formInline.roleCode == 0 ? false : true"&ndash;&gt;--> <!-- &lt;!&ndash; :disabled="formInline.roleCode == 0 ? false : true"&ndash;&gt;-->
<!-- &lt;!&ndash; @input="handleInput('designInitiator')"&ndash;&gt;--> <!-- &lt;!&ndash; @input="handleInput('designInitiator')"&ndash;&gt;-->
<!-- &lt;!&ndash; :placeholder="$t('PleaseSelect')+$t('Sponsor')"&ndash;&gt;--> <!-- &lt;!&ndash; :placeholder="$t('PleaseSelect')+$t('Sponsor')"&ndash;&gt;-->
<!-- &lt;!&ndash; :type="'select'"&ndash;&gt;--> <!-- &lt;!&ndash; :type="'select'"&ndash;&gt;-->
<!-- &lt;!&ndash; :triggerChange="false" :dictCode="'fa1_qi3_ren2'"/>&ndash;&gt;--> <!-- &lt;!&ndash; :triggerChange="false" :dictCode="'fa1_qi3_ren2'"/>&ndash;&gt;-->
<!-- </a-form-model-item>--> <!-- </a-form-model-item>-->
<!-- </div>--> <!-- </div>-->
<!-- </a-col>--> <!-- </a-col>-->
</a-row> </a-row>
<!-- <a-row :gutter="24" v-if="formInline.roleCodeIndex == 0 ||--> <!-- <a-row :gutter="24" v-if="formInline.roleCodeIndex == 0 ||-->
<!-- (formInline.roleCodeIndex == 4 && formInline.designInitiatorId == formInline.homologationEngineerId &&--> <!-- (formInline.roleCodeIndex == 4 && formInline.designInitiatorId == formInline.homologationEngineerId &&-->
<!-- formInline.homologationEngineerId == userInfoQuery.id) ||--> <!-- formInline.homologationEngineerId == userInfoQuery.id) ||-->
<!-- (formInline.roleCodeIndex == 4 && formInline.designInitiatorId == formInline.regulationOwnerId &&--> <!-- (formInline.roleCodeIndex == 4 && formInline.designInitiatorId == formInline.regulationOwnerId &&-->
<!-- formInline.regulationOwnerId == userInfoQuery.id)">--> <!-- formInline.regulationOwnerId == userInfoQuery.id)">-->
<!-- <a-col :span="12">--> <!-- <a-col :span="12">-->
<!-- <div class="box-title-text">--> <!-- <div class="box-title-text">-->
<!-- <div class="title-text">--> <!-- <div class="title-text">-->
<!-- <span class="title-text-text"--> <!-- <span class="title-text-text"-->
<!-- :title="$t('cutoffTime')">{{$t('cutoffTime')}}</span>--> <!-- :title="$t('cutoffTime')">{{$t('cutoffTime')}}</span>-->
<!-- </div>--> <!-- </div>-->
<!-- <a-form-model-item class="itemModel" :prop="'designDueDate'">--> <!-- <a-form-model-item class="itemModel" :prop="'designDueDate'">-->
<!-- <a-date-picker class="box-input"--> <!-- <a-date-picker class="box-input"-->
<!-- :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"-->
<!-- :getCalendarContainer="(trigger) => trigger.parentNode"--> <!-- :getCalendarContainer="(trigger) => trigger.parentNode"-->
<!-- v-model="formInline.designDueDate"--> <!-- v-model="formInline.designDueDate"-->
<!-- style="width: 100%"/>--> <!-- style="width: 100%"/>-->
<!-- </a-form-model-item>--> <!-- </a-form-model-item>-->
<!-- </div>--> <!-- </div>-->
<!-- </a-col>--> <!-- </a-col>-->
<!-- </a-row>--> <!-- </a-row>-->
<a-row :gutter="24"> <a-row :gutter="24">
<a-col :span="12"> <a-col :span="12">
<div class="box-title-text"> <div class="box-title-text">
@@ -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,177 +478,178 @@
<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>
</div> </div>
</a-col> </a-col>
</a-row> </a-row>
<!-- <div class="header-text" v-if="formInline.roleCodeIndex == 0 ||--> <!-- <div class="header-text" v-if="formInline.roleCodeIndex == 0 ||-->
<!-- (formInline.roleCodeIndex == 4 && formInline.prehomoInitiatorId == formInline.homologationEngineerId &&--> <!-- (formInline.roleCodeIndex == 4 && formInline.prehomoInitiatorId == formInline.homologationEngineerId &&-->
<!-- formInline.homologationEngineerId == userInfoQuery.id) ||--> <!-- formInline.homologationEngineerId == userInfoQuery.id) ||-->
<!-- (formInline.roleCodeIndex == 4 && formInline.prehomoInitiatorId == formInline.regulationOwnerId &&--> <!-- (formInline.roleCodeIndex == 4 && formInline.prehomoInitiatorId == formInline.regulationOwnerId &&-->
<!-- formInline.regulationOwnerId == userInfoQuery.id)">--> <!-- formInline.regulationOwnerId == userInfoQuery.id)">-->
<!-- &nbsp;{{$t('PrehomoConfirmation')}}--> <!-- &nbsp;{{$t('PrehomoConfirmation')}}-->
<!-- </div>--> <!-- </div>-->
<!-- <a-row :gutter="24" v-if="formInline.roleCodeIndex == 0 ||--> <!-- <a-row :gutter="24" v-if="formInline.roleCodeIndex == 0 ||-->
<!-- (formInline.roleCodeIndex == 4 && formInline.prehomoInitiatorId == formInline.homologationEngineerId &&--> <!-- (formInline.roleCodeIndex == 4 && formInline.prehomoInitiatorId == formInline.homologationEngineerId &&-->
<!-- formInline.homologationEngineerId == userInfoQuery.id) ||--> <!-- formInline.homologationEngineerId == userInfoQuery.id) ||-->
<!-- (formInline.roleCodeIndex == 4 && formInline.prehomoInitiatorId == formInline.regulationOwnerId &&--> <!-- (formInline.roleCodeIndex == 4 && formInline.prehomoInitiatorId == formInline.regulationOwnerId &&-->
<!-- formInline.regulationOwnerId == userInfoQuery.id)">--> <!-- formInline.regulationOwnerId == userInfoQuery.id)">-->
<!-- <a-col :span="12">--> <!-- <a-col :span="12">-->
<!-- <div class="box-title-text">--> <!-- <div class="box-title-text">-->
<!-- <div class="title-text">--> <!-- <div class="title-text">-->
<!-- <span class="title-text-text"--> <!-- <span class="title-text-text"-->
<!-- :title="$t('Sponsor')">{{$t('Sponsor')}}</span>--> <!-- :title="$t('Sponsor')">{{$t('Sponsor')}}</span>-->
<!-- </div>--> <!-- </div>-->
<!-- <a-form-model-item class="itemModel" prop="prehomoInitiatorId">--> <!-- <a-form-model-item class="itemModel" prop="prehomoInitiatorId">-->
<!-- <a-select :placeholder="$t('PleaseSelect')+$t('Sponsor')"--> <!-- <a-select :placeholder="$t('PleaseSelect')+$t('Sponsor')"-->
<!-- :disabled="formInline.roleCodeIndex == 0 ? false : true"--> <!-- :disabled="formInline.roleCodeIndex == 0 ? false : true"-->
<!-- class="box-input"--> <!-- class="box-input"-->
<!-- :getPopupContainer="triggerNode=> triggerNode.parentNode"--> <!-- :getPopupContainer="triggerNode=> triggerNode.parentNode"-->
<!-- allowClear--> <!-- allowClear-->
<!-- v-model="formInline.prehomoInitiatorId">--> <!-- v-model="formInline.prehomoInitiatorId">-->
<!-- <a-select-option v-for="(item, key) in prehomoInitiatorList"--> <!-- <a-select-option v-for="(item, key) in prehomoInitiatorList"-->
<!-- :key="key"--> <!-- :key="key"-->
<!-- :value="item.value">--> <!-- :value="item.value">-->
<!-- <span style="display: inline-block;width: 100%" :title=" item.name ">--> <!-- <span style="display: inline-block;width: 100%" :title=" item.name ">-->
<!-- {{ item.name }}--> <!-- {{ item.name }}-->
<!-- </span>--> <!-- </span>-->
<!-- </a-select-option>--> <!-- </a-select-option>-->
<!-- </a-select>--> <!-- </a-select>-->
<!-- &lt;!&ndash; <j-dict-select-tag class="box-input" v-model="formInline.prehomoInitiator"&ndash;&gt;--> <!-- &lt;!&ndash; <j-dict-select-tag class="box-input" v-model="formInline.prehomoInitiator"&ndash;&gt;-->
<!-- &lt;!&ndash; :disabled="formInline.roleCode == 0 ? false : true"&ndash;&gt;--> <!-- &lt;!&ndash; :disabled="formInline.roleCode == 0 ? false : true"&ndash;&gt;-->
<!-- &lt;!&ndash; @input="handleInput('prehomoInitiator')"&ndash;&gt;--> <!-- &lt;!&ndash; @input="handleInput('prehomoInitiator')"&ndash;&gt;-->
<!-- &lt;!&ndash; :placeholder="$t('PleaseSelect')+$t('Sponsor')"&ndash;&gt;--> <!-- &lt;!&ndash; :placeholder="$t('PleaseSelect')+$t('Sponsor')"&ndash;&gt;-->
<!-- &lt;!&ndash; :type="'select'"&ndash;&gt;--> <!-- &lt;!&ndash; :type="'select'"&ndash;&gt;-->
<!-- &lt;!&ndash; :triggerChange="false" :dictCode="'fa1_qi3_ren2'"/>&ndash;&gt;--> <!-- &lt;!&ndash; :triggerChange="false" :dictCode="'fa1_qi3_ren2'"/>&ndash;&gt;-->
<!-- </a-form-model-item>--> <!-- </a-form-model-item>-->
<!-- </div>--> <!-- </div>-->
<!-- </a-col>--> <!-- </a-col>-->
<!-- <a-col :span="12">--> <!-- <a-col :span="12">-->
<!-- <div class="box-title-text">--> <!-- <div class="box-title-text">-->
<!-- <div class="title-text">--> <!-- <div class="title-text">-->
<!-- <span class="title-text-text"--> <!-- <span class="title-text-text"-->
<!-- :title="$t('personLiable')">{{$t('personLiable')}}</span>--> <!-- :title="$t('personLiable')">{{$t('personLiable')}}</span>-->
<!-- </div>--> <!-- </div>-->
<!-- <a-form-model-item class="itemModel" prop="prehomoDutyId">--> <!-- <a-form-model-item class="itemModel" prop="prehomoDutyId">-->
<!-- <a-select :placeholder="$t('PleaseSelect')+$t('personLiable')"--> <!-- <a-select :placeholder="$t('PleaseSelect')+$t('personLiable')"-->
<!-- class="box-input"--> <!-- class="box-input"-->
<!-- allowClear--> <!-- allowClear-->
<!-- :getPopupContainer="triggerNode=> triggerNode.parentNode"--> <!-- :getPopupContainer="triggerNode=> triggerNode.parentNode"-->
<!-- v-model="formInline.prehomoDutyId">--> <!-- v-model="formInline.prehomoDutyId">-->
<!-- <a-select-option v-for="(item, key) in prehomoDutyList"--> <!-- <a-select-option v-for="(item, key) in prehomoDutyList"-->
<!-- :key="key"--> <!-- :key="key"-->
<!-- :value="item.value">--> <!-- :value="item.value">-->
<!-- <span style="display: inline-block;width: 100%" :title=" item.name ">--> <!-- <span style="display: inline-block;width: 100%" :title=" item.name ">-->
<!-- {{ item.name }}--> <!-- {{ item.name }}-->
<!-- </span>--> <!-- </span>-->
<!-- </a-select-option>--> <!-- </a-select-option>-->
<!-- </a-select>--> <!-- </a-select>-->
<!-- &lt;!&ndash; <j-dict-select-tag class="box-input" v-model="formInline.prehomoDuty"&ndash;&gt;--> <!-- &lt;!&ndash; <j-dict-select-tag class="box-input" v-model="formInline.prehomoDuty"&ndash;&gt;-->
<!-- &lt;!&ndash; :disabled="formInline.roleCode == 0 ? false : true"&ndash;&gt;--> <!-- &lt;!&ndash; :disabled="formInline.roleCode == 0 ? false : true"&ndash;&gt;-->
<!-- &lt;!&ndash; @input="handleInput('prehomoDuty')"&ndash;&gt;--> <!-- &lt;!&ndash; @input="handleInput('prehomoDuty')"&ndash;&gt;-->
<!-- &lt;!&ndash; :placeholder="$t('PleaseSelect')+$t('personLiable')"&ndash;&gt;--> <!-- &lt;!&ndash; :placeholder="$t('PleaseSelect')+$t('personLiable')"&ndash;&gt;-->
<!-- &lt;!&ndash; :type="'select'"&ndash;&gt;--> <!-- &lt;!&ndash; :type="'select'"&ndash;&gt;-->
<!-- &lt;!&ndash; :triggerChange="false" :dictCode="'ze2_ren4_ren2'"/>&ndash;&gt;--> <!-- &lt;!&ndash; :triggerChange="false" :dictCode="'ze2_ren4_ren2'"/>&ndash;&gt;-->
<!-- </a-form-model-item>--> <!-- </a-form-model-item>-->
<!-- </div>--> <!-- </div>-->
<!-- </a-col>--> <!-- </a-col>-->
<!-- </a-row>--> <!-- </a-row>-->
<!-- <a-row :gutter="24" v-if="formInline.roleCodeIndex == 0 ||--> <!-- <a-row :gutter="24" v-if="formInline.roleCodeIndex == 0 ||-->
<!-- (formInline.roleCodeIndex == 4 && formInline.prehomoInitiatorId == formInline.homologationEngineerId &&--> <!-- (formInline.roleCodeIndex == 4 && formInline.prehomoInitiatorId == formInline.homologationEngineerId &&-->
<!-- formInline.homologationEngineerId == userInfoQuery.id) ||--> <!-- formInline.homologationEngineerId == userInfoQuery.id) ||-->
<!-- (formInline.roleCodeIndex == 4 && formInline.prehomoInitiatorId == formInline.regulationOwnerId &&--> <!-- (formInline.roleCodeIndex == 4 && formInline.prehomoInitiatorId == formInline.regulationOwnerId &&-->
<!-- formInline.regulationOwnerId == userInfoQuery.id)">--> <!-- formInline.regulationOwnerId == userInfoQuery.id)">-->
<!-- <a-col :span="12">--> <!-- <a-col :span="12">-->
<!-- <div class="box-title-text">--> <!-- <div class="box-title-text">-->
<!-- <div class="title-text">--> <!-- <div class="title-text">-->
<!-- <span class="title-text-text"--> <!-- <span class="title-text-text"-->
<!-- :title="$t('cutoffTime')">{{$t('cutoffTime')}}</span>--> <!-- :title="$t('cutoffTime')">{{$t('cutoffTime')}}</span>-->
<!-- </div>--> <!-- </div>-->
<!-- <a-form-model-item class="itemModel" :prop="'prehomoDueDate'">--> <!-- <a-form-model-item class="itemModel" :prop="'prehomoDueDate'">-->
<!-- <a-date-picker class="box-input"--> <!-- <a-date-picker class="box-input"-->
<!-- :placeholder="$t('PleaseSelect')+$t('cutoffTime')"--> <!-- :placeholder="$t('PleaseSelect')+$t('cutoffTime')"-->
<!-- @change="dateChange({db_field_name:'prehomoDueDate'})"--> <!-- @change="dateChange({db_field_name:'prehomoDueDate'})"-->
<!-- format="YYYY-MM-DD"--> <!-- format="YYYY-MM-DD"-->
<!-- :getCalendarContainer="(trigger) => trigger.parentNode"--> <!-- :getCalendarContainer="(trigger) => trigger.parentNode"-->
<!-- v-model="formInline.prehomoDueDate"--> <!-- v-model="formInline.prehomoDueDate"-->
<!-- style="width: 100%"/>--> <!-- style="width: 100%"/>-->
<!-- </a-form-model-item>--> <!-- </a-form-model-item>-->
<!-- </div>--> <!-- </div>-->
<!-- </a-col>--> <!-- </a-col>-->
<!-- </a-row>--> <!-- </a-row>-->
<!-- <a-row :gutter="24" v-if="formInline.roleCodeIndex == 0 ||--> <!-- <a-row :gutter="24" v-if="formInline.roleCodeIndex == 0 ||-->
<!-- (formInline.roleCodeIndex == 4 && formInline.prehomoInitiatorId == formInline.homologationEngineerId &&--> <!-- (formInline.roleCodeIndex == 4 && formInline.prehomoInitiatorId == formInline.homologationEngineerId &&-->
<!-- formInline.homologationEngineerId == userInfoQuery.id) ||--> <!-- formInline.homologationEngineerId == userInfoQuery.id) ||-->
<!-- (formInline.roleCodeIndex == 4 && formInline.prehomoInitiatorId == formInline.regulationOwnerId &&--> <!-- (formInline.roleCodeIndex == 4 && formInline.prehomoInitiatorId == formInline.regulationOwnerId &&-->
<!-- formInline.regulationOwnerId == userInfoQuery.id)">--> <!-- formInline.regulationOwnerId == userInfoQuery.id)">-->
<!-- <a-col :span="12">--> <!-- <a-col :span="12">-->
<!-- <div class="box-title-text">--> <!-- <div class="box-title-text">-->
<!-- <div class="title-text">--> <!-- <div class="title-text">-->
<!-- <span class="title-text-text"--> <!-- <span class="title-text-text"-->
<!-- :title="$t('typeOfDeliverables')">{{$t('typeOfDeliverables')}}</span>--> <!-- :title="$t('typeOfDeliverables')">{{$t('typeOfDeliverables')}}</span>-->
<!-- </div>--> <!-- </div>-->
<!-- <a-form-model-item class="itemModel" prop="prehomoDeliverableType">--> <!-- <a-form-model-item class="itemModel" prop="prehomoDeliverableType">-->
<!-- <a-tree-select--> <!-- <a-tree-select-->
<!-- tree-node-filter-prop="title"--> <!-- tree-node-filter-prop="title"-->
<!-- v-model="formInline.prehomoDeliverableType"--> <!-- v-model="formInline.prehomoDeliverableType"-->
<!-- :maxTagCount="1"--> <!-- :maxTagCount="1"-->
<!-- :getPopupContainer="triggerNode=> triggerNode.parentNode"--> <!-- :getPopupContainer="triggerNode=> triggerNode.parentNode"-->
<!-- class="box-input"--> <!-- class="box-input"-->
<!-- style="width: 100%"--> <!-- style="width: 100%"-->
<!-- :tree-data="DeliverableTreeList"--> <!-- :tree-data="DeliverableTreeList"-->
<!-- tree-checkable--> <!-- tree-checkable-->
<!-- :placeholder="$t('PleaseSelect')+$t('typeOfDeliverables')"--> <!-- :placeholder="$t('PleaseSelect')+$t('typeOfDeliverables')"-->
<!-- />--> <!-- />-->
<!-- &lt;!&ndash; <j-dict-select-tag class="box-input" v-model="formInline.prehomoDeliverableType"&ndash;&gt;--> <!-- &lt;!&ndash; <j-dict-select-tag class="box-input" v-model="formInline.prehomoDeliverableType"&ndash;&gt;-->
<!-- &lt;!&ndash; :disabled="formInline.taskAffirmStatus != 'Not started' && !formInline.prehomoDeliverableType ? true : false"&ndash;&gt;--> <!-- &lt;!&ndash; :disabled="formInline.taskAffirmStatus != 'Not started' && !formInline.prehomoDeliverableType ? true : false"&ndash;&gt;-->
<!-- &lt;!&ndash; @input="handleInput('prehomoDeliverableType')"&ndash;&gt;--> <!-- &lt;!&ndash; @input="handleInput('prehomoDeliverableType')"&ndash;&gt;-->
<!-- &lt;!&ndash; :placeholder="$t('PleaseSelect')+$t('typeOfDeliverables')"&ndash;&gt;--> <!-- &lt;!&ndash; :placeholder="$t('PleaseSelect')+$t('typeOfDeliverables')"&ndash;&gt;-->
<!-- &lt;!&ndash; :type="'select'"&ndash;&gt;--> <!-- &lt;!&ndash; :type="'select'"&ndash;&gt;-->
<!-- &lt;!&ndash; :triggerChange="false" :dictCode="'deliverable_template'"/>&ndash;&gt;--> <!-- &lt;!&ndash; :triggerChange="false" :dictCode="'deliverable_template'"/>&ndash;&gt;-->
<!-- </a-form-model-item>--> <!-- </a-form-model-item>-->
<!-- </div>--> <!-- </div>-->
<!-- </a-col>--> <!-- </a-col>-->
<!-- <a-col :span="12">--> <!-- <a-col :span="12">-->
<!-- <div class="box-title-text">--> <!-- <div class="box-title-text">-->
<!-- <div class="title-text">--> <!-- <div class="title-text">-->
<!-- <span class="title-text-text"--> <!-- <span class="title-text-text"-->
<!-- :title="$t('deliverableTemplate')">{{$t('deliverableTemplate')}}</span>--> <!-- :title="$t('deliverableTemplate')">{{$t('deliverableTemplate')}}</span>-->
<!-- </div>--> <!-- </div>-->
<!-- <a-form-model-item class="itemModel" prop="prehomoDeliverableTemplate">--> <!-- <a-form-model-item class="itemModel" prop="prehomoDeliverableTemplate">-->
<!-- <a-button type="primary" class="button-text"--> <!-- <a-button type="primary" class="button-text"-->
<!-- @click="clickButtonToUpload('prehomoDeliverableTemplate')">--> <!-- @click="clickButtonToUpload('prehomoDeliverableTemplate')">-->
<!-- {{ (formInline.prehomoDeliverableTemplate === 'null' || formInline.prehomoDeliverableTemplate === ''--> <!-- {{ (formInline.prehomoDeliverableTemplate === 'null' || formInline.prehomoDeliverableTemplate === ''-->
<!-- ||--> <!-- ||-->
<!-- formInline.prehomoDeliverableTemplate == null) ? $t('clickUpload') : $t('viewUploadedFiles')--> <!-- formInline.prehomoDeliverableTemplate == null) ? $t('clickUpload') : $t('viewUploadedFiles')-->
<!-- }}--> <!-- }}-->
<!-- </a-button>--> <!-- </a-button>-->
<!-- </a-form-model-item>--> <!-- </a-form-model-item>-->
<!-- </div>--> <!-- </div>-->
<!-- </a-col>--> <!-- </a-col>-->
<!-- </a-row>--> <!-- </a-row>-->
<!-- <a-row :gutter="24" v-if="formInline.roleCodeIndex == 0 ||--> <!-- <a-row :gutter="24" v-if="formInline.roleCodeIndex == 0 ||-->
<!-- (formInline.roleCodeIndex == 4 && formInline.prehomoInitiatorId == formInline.homologationEngineerId &&--> <!-- (formInline.roleCodeIndex == 4 && formInline.prehomoInitiatorId == formInline.homologationEngineerId &&-->
<!-- formInline.homologationEngineerId == userInfoQuery.id) ||--> <!-- formInline.homologationEngineerId == userInfoQuery.id) ||-->
<!-- (formInline.roleCodeIndex == 4 && formInline.prehomoInitiatorId == formInline.regulationOwnerId &&--> <!-- (formInline.roleCodeIndex == 4 && formInline.prehomoInitiatorId == formInline.regulationOwnerId &&-->
<!-- formInline.regulationOwnerId == userInfoQuery.id)">--> <!-- formInline.regulationOwnerId == userInfoQuery.id)">-->
<!-- <a-col :span="24">--> <!-- <a-col :span="24">-->
<!-- <div class="box-title-text">--> <!-- <div class="box-title-text">-->
<!-- <div class="title-text">--> <!-- <div class="title-text">-->
<!-- <span class="title-text-text"--> <!-- <span class="title-text-text"-->
<!-- :title="$t('descriptionDeliverables')">{{$t('descriptionDeliverables')}}</span>--> <!-- :title="$t('descriptionDeliverables')">{{$t('descriptionDeliverables')}}</span>-->
<!-- </div>--> <!-- </div>-->
<!-- <a-form-model-item class="itemModel-text" :prop="'prehomoRemark'">--> <!-- <a-form-model-item class="itemModel-text" :prop="'prehomoRemark'">-->
<!-- <a-textarea--> <!-- <a-textarea-->
<!-- style="width: 100%"--> <!-- style="width: 100%"-->
<!-- :placeholder="$t('PleaseEnter')+$t('descriptionDeliverables')"--> <!-- :placeholder="$t('PleaseEnter')+$t('descriptionDeliverables')"-->
<!-- v-model="formInline.prehomoRemark" :rows="4"/>--> <!-- v-model="formInline.prehomoRemark" :rows="4"/>-->
<!-- </a-form-model-item>--> <!-- </a-form-model-item>-->
<!-- </div>--> <!-- </div>-->
<!-- </a-col>--> <!-- </a-col>-->
<!-- </a-row>--> <!-- </a-row>-->
<div class="header-text"> <div class="header-text">
&nbsp;{{$t('verificationAndConformityconfirmation')}} &nbsp;{{$t('verificationAndConformityconfirmation')}}
</div> </div>
@@ -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,50 +682,51 @@
: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%"/>
</a-form-model-item> </a-form-model-item>
</div> </div>
</a-col> </a-col>
<!-- <a-col :span="12">--> <!-- <a-col :span="12">-->
<!-- <div class="box-title-text">--> <!-- <div class="box-title-text">-->
<!-- <div class="title-text">--> <!-- <div class="title-text">-->
<!-- <span class="title-text-text"--> <!-- <span class="title-text-text"-->
<!-- :title="$t('Sponsor')">{{$t('Sponsor')}}</span>--> <!-- :title="$t('Sponsor')">{{$t('Sponsor')}}</span>-->
<!-- </div>--> <!-- </div>-->
<!-- <a-form-model-item class="itemModel" prop="verifyInitiatorId">--> <!-- <a-form-model-item class="itemModel" prop="verifyInitiatorId">-->
<!-- <a-select :placeholder="$t('PleaseSelect')+$t('Sponsor')"--> <!-- <a-select :placeholder="$t('PleaseSelect')+$t('Sponsor')"-->
<!-- class="box-input"--> <!-- class="box-input"-->
<!-- allowClear--> <!-- allowClear-->
<!-- :getPopupContainer="triggerNode=> triggerNode.parentNode"--> <!-- :getPopupContainer="triggerNode=> triggerNode.parentNode"-->
<!-- :disabled="formInline.roleCodeIndex == 0 ? false : true"--> <!-- :disabled="formInline.roleCodeIndex == 0 ? false : true"-->
<!-- v-model="formInline.verifyInitiatorId">--> <!-- v-model="formInline.verifyInitiatorId">-->
<!-- <a-select-option v-for="(item, key) in verifyInitiatorList"--> <!-- <a-select-option v-for="(item, key) in verifyInitiatorList"-->
<!-- :key="key"--> <!-- :key="key"-->
<!-- :value="item.value">--> <!-- :value="item.value">-->
<!-- <span style="display: inline-block;width: 100%" :title=" item.name ">--> <!-- <span style="display: inline-block;width: 100%" :title=" item.name ">-->
<!-- {{ item.name }}--> <!-- {{ item.name }}-->
<!-- </span>--> <!-- </span>-->
<!-- </a-select-option>--> <!-- </a-select-option>-->
<!-- </a-select>--> <!-- </a-select>-->
<!-- &lt;!&ndash; <j-dict-select-tag class="box-input" v-model="formInline.verifyInitiator"&ndash;&gt;--> <!-- &lt;!&ndash; <j-dict-select-tag class="box-input" v-model="formInline.verifyInitiator"&ndash;&gt;-->
<!-- &lt;!&ndash; :disabled="formInline.roleCode == 0 ? false : true"&ndash;&gt;--> <!-- &lt;!&ndash; :disabled="formInline.roleCode == 0 ? false : true"&ndash;&gt;-->
<!-- &lt;!&ndash; @input="handleInput('verifyInitiator')"&ndash;&gt;--> <!-- &lt;!&ndash; @input="handleInput('verifyInitiator')"&ndash;&gt;-->
<!-- &lt;!&ndash; :placeholder="$t('PleaseSelect')+$t('Sponsor')"&ndash;&gt;--> <!-- &lt;!&ndash; :placeholder="$t('PleaseSelect')+$t('Sponsor')"&ndash;&gt;-->
<!-- &lt;!&ndash; :type="'select'"&ndash;&gt;--> <!-- &lt;!&ndash; :type="'select'"&ndash;&gt;-->
<!-- &lt;!&ndash; :triggerChange="false" :dictCode="'fa1_qi3_ren2'"/>&ndash;&gt;--> <!-- &lt;!&ndash; :triggerChange="false" :dictCode="'fa1_qi3_ren2'"/>&ndash;&gt;-->
<!-- </a-form-model-item>--> <!-- </a-form-model-item>-->
<!-- </div>--> <!-- </div>-->
<!-- </a-col>--> <!-- </a-col>-->
</a-row> </a-row>
<!-- <a-row :gutter="24" v-if="formInline.roleCodeIndex == 0 ||--> <!-- <a-row :gutter="24" v-if="formInline.roleCodeIndex == 0 ||-->
<!-- (formInline.roleCodeIndex == 4 && formInline.verifyInitiatorId == formInline.homologationEngineerId &&--> <!-- (formInline.roleCodeIndex == 4 && formInline.verifyInitiatorId == formInline.homologationEngineerId &&-->
<!-- formInline.homologationEngineerId == userInfoQuery.id) ||--> <!-- formInline.homologationEngineerId == userInfoQuery.id) ||-->
<!-- (formInline.roleCodeIndex == 4 && formInline.verifyInitiatorId == formInline.regulationOwnerId &&--> <!-- (formInline.roleCodeIndex == 4 && formInline.verifyInitiatorId == formInline.regulationOwnerId &&-->
<!-- formInline.regulationOwnerId == userInfoQuery.id)">--> <!-- formInline.regulationOwnerId == userInfoQuery.id)">-->
<!-- --> <!-- -->
<!-- </a-row>--> <!-- </a-row>-->
<a-row :gutter="24"> <a-row :gutter="24">
<a-col :span="12"> <a-col :span="12">
<div class="box-title-text"> <div class="box-title-text">
@@ -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 = {