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

对接认证清单引用交付物

Browse Source
This commit is contained in:
范强强
2023-03-14 17:33:46 +08:00
parent c148d867d3
commit ee39d9ca8f
6 changed files with 86 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/common/lang/en-us.js
+1
View File
@@ -1434,4 +1434,5 @@ module.exports = {
batchmodify:'Whether to batch modify', batchmodify:'Whether to batch modify',
onlyDataListReleasedAndCertificationReturnCanSelected:'Only data with the process status of list to be released and certification return can be selected', onlyDataListReleasedAndCertificationReturnCanSelected:'Only data with the process status of list to be released and certification return can be selected',
type:'type', type:'type',
select:'select',
} }
jero-web/src/common/lang/zh-cn.js
+1
View File
@@ -1536,4 +1536,5 @@ module.exports = {
batchmodify:'是否批量修改', batchmodify:'是否批量修改',
onlyDataListReleasedAndCertificationReturnCanSelected:'只能选择流程状态为清单待发布和认证退回的数据', onlyDataListReleasedAndCertificationReturnCanSelected:'只能选择流程状态为清单待发布和认证退回的数据',
type:'类型', type:'类型',
select:'选择',
} }
jero-web/src/views/documentManage/tags/dialog/DicList.vue
+5 -1
View File
@@ -123,10 +123,14 @@
id:'text', id:'text',
name:this.$t('text') name:this.$t('text')
}, },
{
id:'select',
name:this.$t('select')
},
{ {
id:'N/A', id:'N/A',
name:'NA' name:'NA'
} },
], ],
newVisible: false, newVisible: false,
rules: { rules: {
jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue
+8 -7
View File
@@ -361,7 +361,6 @@
class="box-input" class="box-input"
style="width: 100%" style="width: 100%"
:tree-data="DeliverableTreeList" :tree-data="DeliverableTreeList"
tree-checkable
:placeholder="$t('PleaseSelect')+$t('typeOfDeliverables')" :placeholder="$t('PleaseSelect')+$t('typeOfDeliverables')"
/> />
</a-form-model-item> </a-form-model-item>
@@ -611,7 +610,7 @@
} }
}, },
getDeliverableTree() { getDeliverableTree() {
getAction('/sys/category/getDeliverableTree', {}).then((res) => { getAction('/sys/category/getCertificationDeliverableTree', {}).then((res) => {
if (res.success) { if (res.success) {
this.DeliverableTreeList = res.result this.DeliverableTreeList = res.result
} else { } else {
@@ -632,18 +631,20 @@
}) })
}, },
editModel(value) { editModel(value) {
this.formInline = {} // this.formInline = {}
this.visible = true this.visible = true
this.formInline = value this.formInline = JSON.parse(JSON.stringify(value))
if (this.formInline.deliverableType) { // if (this.formInline.deliverableType) {
this.formInline.deliverableType = this.formInline.deliverableType.split(',') // this.formInline.deliverableType = this.formInline.deliverableType.split(',')
} // }
if (value.dutyTerritory) { if (value.dutyTerritory) {
this.queryPersonByProject(value.dutyTerritory) this.queryPersonByProject(value.dutyTerritory)
} }
this.getRegulationNo() this.getRegulationNo()
this.title = this.$t('edit') this.title = this.$t('edit')
this.$nextTick(() => { this.$nextTick(() => {
this.formInline = {...this.formInline}
console.log(this.formInline)
this.$refs.ruleForm.clearValidate() this.$refs.ruleForm.clearValidate()
}) })
}, },
jero-web/src/views/projectManagement/components/certificationList/components/batSetting.vue
+2 -2
View File
@@ -76,6 +76,7 @@
<span class="title-text-text" :title="$t('typeOfDeliverables')">{{$t('typeOfDeliverables')}}</span> <span class="title-text-text" :title="$t('typeOfDeliverables')">{{$t('typeOfDeliverables')}}</span>
</div> </div>
<a-form-model-item class="itemModel-multi"> <a-form-model-item class="itemModel-multi">
<!-- tree-checkable-->
<a-tree-select <a-tree-select
tree-node-filter-prop="title" tree-node-filter-prop="title"
v-model="formInline.deliverableType" v-model="formInline.deliverableType"
@@ -84,7 +85,6 @@
class="box-input" class="box-input"
style="width: 100%" style="width: 100%"
:tree-data="DeliverableTreeList" :tree-data="DeliverableTreeList"
tree-checkable
:placeholder="$t('PleaseSelect')+$t('typeOfDeliverables')" :placeholder="$t('PleaseSelect')+$t('typeOfDeliverables')"
/> />
</a-form-model-item> </a-form-model-item>
@@ -179,7 +179,7 @@
}, },
getDeliverableTree() { getDeliverableTree() {
getAction('/sys/category/getDeliverableTree', {}).then((res) => { getAction('/sys/category/getCertificationDeliverableTree', {}).then((res) => {
if (res.success) { if (res.success) {
this.DeliverableTreeList = res.result this.DeliverableTreeList = res.result
} else { } else {
jero-web/src/views/projectManagement/components/certificationList/index.vue
+69 -43
View File
@@ -280,18 +280,44 @@
</a> </a>
</span> </span>
<span slot="DeliverablesResult" slot-scope="text,record,index"> <span slot="DeliverablesResult" slot-scope="text,record,index">
<a-button type="primary" class="button-text" <span v-if="record.flowStatus == 'Results to be submitted'">
v-if="record.flowStatus == 'Results to be submitted'" <a-button type="primary" class="button-text"
@click="clickButtonToUpload('deliveryResult',index)"> v-if="record.valueType == 'file'"
@click="clickButtonToUpload('deliveryResult',index)">
{{ (record.deliveryResult === 'null' || record.deliveryResult === '' || {{ (record.deliveryResult === 'null' || record.deliveryResult === '' ||
record.deliveryResult == null) ? $t('clickUpload') : $t('viewUploadedFiles') record.deliveryResult == null) ? $t('clickUpload') : $t('viewUploadedFiles')
}} }}
</a-button> </a-button>
<a-input class="box-input-index"
v-else-if="record.valueType == 'text'"
:maxLength="200"
onkeyup="this.value=this.value.replace(/(^\s+)|(\s+$)/g, '')"
v-model.trim="record.deliveryResult"
:placeholder="$t('PleaseEnter')"/>
<a-radio-group v-else-if="record.valueType == 'select'"
v-model="record.deliveryResult">
<a-radio :value="'1'">
{{$t('yes')}}
</a-radio>
<a-radio :value="'2'">
{{$t('not')}}
</a-radio>
</a-radio-group>
<span v-else>--</span>
</span>
<span v-else> <span v-else>
<span class="viewFile" <span class="viewFile"
@click="viewFileClick(record.deliveryResult)" v-if="record.deliveryResult"> @click="viewFileClick(record.deliveryResult)"
v-if="record.deliveryResult && record.valueType == 'file'">
{{$t('viewFile')}} {{$t('viewFile')}}
</span> </span>
<span v-else-if="record.deliveryResult && record.valueType == 'text'">
{{record.deliveryResult}}
</span>
<span v-else-if="record.deliveryResult && record.valueType == 'select'">
{{record.deliveryResult == '1' ? $t('yes') :$t('not')}}
</span>
<span v-else>--</span> <span v-else>--</span>
</span> </span>
</span> </span>
@@ -355,41 +381,41 @@
<referenceDeliverablesList ref="referenceDeliverablesListRef" @referenceDeliverablesListForm="transferListForm"/> <referenceDeliverablesList ref="referenceDeliverablesListRef" @referenceDeliverablesListForm="transferListForm"/>
<SelectedBy ref="SelectedByRef" :title="$t('turnToDo')" @SelectedByForm="SelectedByForm"></SelectedBy> <SelectedBy ref="SelectedByRef" :title="$t('turnToDo')" @SelectedByForm="SelectedByForm"></SelectedBy>
<viewFileModel ref="viewFileModelRef"/> <viewFileModel ref="viewFileModelRef"/>
<!-- <a-modal--> <!-- <a-modal-->
<!-- :title="listTitle"--> <!-- :title="listTitle"-->
<!-- :width="500"--> <!-- :width="500"-->
<!-- :visible="visible"--> <!-- :visible="visible"-->
<!-- :confirm-loading="confirmLoading"--> <!-- :confirm-loading="confirmLoading"-->
<!-- :maskClosable="false"--> <!-- :maskClosable="false"-->
<!-- @ok="handleOk"--> <!-- @ok="handleOk"-->
<!-- @cancel="handleCancel"--> <!-- @cancel="handleCancel"-->
<!-- >--> <!-- >-->
<!-- <a-spin :spinning="confirmLoading">--> <!-- <a-spin :spinning="confirmLoading">-->
<!-- <a-form-model :model="formInline" class="formAdd" :rules="rules" ref="ruleForm">--> <!-- <a-form-model :model="formInline" class="formAdd" :rules="rules" ref="ruleForm">-->
<!-- <a-row :gutter="24">--> <!-- <a-row :gutter="24">-->
<!-- <a-col :span="24">--> <!-- <a-col :span="24">-->
<!-- <div class="box-title-text-index">--> <!-- <div class="box-title-text-index">-->
<!-- <div class="title-text-index">--> <!-- <div class="title-text-index">-->
<!-- <span class="Required">*</span>--> <!-- <span class="Required">*</span>-->
<!-- <span class="title-text-text"--> <!-- <span class="title-text-text"-->
<!-- :title="$t('TaskCutOffTime')">{{ $t('TaskCutOffTime') }}</span>--> <!-- :title="$t('TaskCutOffTime')">{{ $t('TaskCutOffTime') }}</span>-->
<!-- </div>--> <!-- </div>-->
<!-- <a-form-model-item class="itemModel" prop="endTime">--> <!-- <a-form-model-item class="itemModel" prop="endTime">-->
<!-- <a-date-picker class="box-input"--> <!-- <a-date-picker class="box-input"-->
<!-- :placeholder="$t('PleaseSelect')+$t('TaskCutOffTime')"--> <!-- :placeholder="$t('PleaseSelect')+$t('TaskCutOffTime')"-->
<!-- @change="dateChange({db_field_name:'endTime'})"--> <!-- @change="dateChange({db_field_name:'endTime'})"-->
<!-- format="YYYY-MM-DD"--> <!-- format="YYYY-MM-DD"-->
<!-- :disabledDate="disabledDate"--> <!-- :disabledDate="disabledDate"-->
<!-- :getCalendarContainer="(trigger) => trigger.parentNode"--> <!-- :getCalendarContainer="(trigger) => trigger.parentNode"-->
<!-- v-model="formInline.endTime"--> <!-- v-model="formInline.endTime"-->
<!-- 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-form-model>--> <!-- </a-form-model>-->
<!-- </a-spin>--> <!-- </a-spin>-->
<!-- </a-modal>--> <!-- </a-modal>-->
<a-modal <a-modal
:title="$t('roleSwitching')" :title="$t('roleSwitching')"
:width="500" :width="500"
@@ -487,7 +513,7 @@
{ {
type: 'string', type: 'string',
value: 'configItem', value: 'configItem',
text: this.$t('configurationItem'), text: this.$t('configurationItem')
}, },
{ {
type: 'string', type: 'string',
@@ -970,14 +996,14 @@
this.$message.warning(this.$t('selectLeastOne')) this.$message.warning(this.$t('selectLeastOne'))
} }
}, },
releaseData(ids, notConditions, data){ releaseData(ids, notConditions, data) {
let _this = this let _this = this
this.$confirm({ this.$confirm({
content: _this.$t('confirmRelease'), content: _this.$t('confirmRelease'),
onOk() { onOk() {
postAction('/project/projectCertificationInventoryEO/issue', { postAction('/project/projectCertificationInventoryEO/issue', {
ids: ids.join(','), ids: ids.join(','),
projectLibraryId: _this.$route.query.id, projectLibraryId: _this.$route.query.id
}).then((res) => { }).then((res) => {
if (res.success) { if (res.success) {
_this.$message.success(_this.$t('OperationSuccessful')) _this.$message.success(_this.$t('OperationSuccessful'))