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

未符合项新增编辑弹框修改

Browse Source
This commit is contained in:
zyx.net
2023-09-05 11:53:27 +08:00
parent 537c5c0e91
commit 5f2beaf67c
4 changed files with 185 additions and 229 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/views/projectManagement/components/addModelconformance.vue
+64 -64
View File
@@ -47,7 +47,7 @@
<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">*</span>--> <!-- <span class="Required">*</span>-->
<span class="title-text-text" <span class="title-text-text"
:title="'PS-issue'">{{'PS-issue'}}</span> :title="'PS-issue'">{{'PS-issue'}}</span>
</div> </div>
@@ -170,7 +170,7 @@
<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="Required">*</span>--> <!-- <span class="Required">*</span>-->
<span class="title-text-text" <span class="title-text-text"
:title="$t('descriptions')">{{$t('descriptions')}}</span> :title="$t('descriptions')">{{$t('descriptions')}}</span>
</div> </div>
@@ -184,36 +184,36 @@
</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="Required">*</span>--> <!-- <span class="Required">*</span>-->
<span class="title-text-text" <span class="title-text-text"
:title="$t('documents')">{{$t('documents')}}</span> :title="$t('documents')">{{$t('documents')}}</span>
</div>
<a-form-model-item class="itemModel" prop="fileLink">
<div v-for="(item,index) in formInline.fileLinkList" :key="index">
<a-input class="box-input"
style='width: 89%'
v-model='item.fileLink'
:disabled="disabled"
:placeholder="$t('PleaseEnter')+$t('Addresslink')"/>
<a-icon class="icon-text" @click="addClick(index)" style='margin-left: 10px;font-size: 18px;'
v-if="formInline.fileLinkList.length - 1 == index"
type="plus"/>
<a-icon class="icon-text" v-if="formInline.fileLinkList.length > 1 && formInline.fileLinkList.length - 1 !== index" style='margin-left: 10px;font-size: 18px;'
@click="deleteClick(index)"
type="minus"/>
</div>
<a-button type="primary" class="button-text"
@click="clickButtonToUpload('file')">
{{ (formInline.file === 'null' || formInline.file === '' ||
formInline.file == null) ? $t('Fileupload') : $t('viewUploadedFiles')
}}
</a-button>
</a-form-model-item>
</div> </div>
</a-col> <a-form-model-item class="itemModel" prop="fileLink">
<div v-for="(item,index) in formInline.fileLinkList" :key="index">
<a-input class="box-input"
style='width: 89%'
v-model='item.fileLink'
:disabled="disabled"
:placeholder="$t('PleaseEnter')+$t('Addresslink')"/>
<a-icon class="icon-text" @click="addClick(index)" style='margin-left: 10px;font-size: 18px;'
v-if="formInline.fileLinkList.length - 1 == index"
type="plus"/>
<a-icon class="icon-text" v-if="formInline.fileLinkList.length > 1 && formInline.fileLinkList.length - 1 !== index" style='margin-left: 10px;font-size: 18px;'
@click="deleteClick(index)"
type="minus"/>
</div>
<a-button type="primary" class="button-text"
@click="clickButtonToUpload('file')">
{{ (formInline.file === 'null' || formInline.file === '' ||
formInline.file == null) ? $t('Fileupload') : $t('viewUploadedFiles')
}}
</a-button>
</a-form-model-item>
</div>
</a-col>
</a-row> </a-row>
<a-row :gutter="24"> <a-row :gutter="24">
<a-col :span="24"> <a-col :span="24">
@@ -225,7 +225,7 @@
</div> </div>
<a-form-model-item class="itemModel" prop="progresstracking"> <a-form-model-item class="itemModel" prop="progresstracking">
<div v-for="(item,index) in formInline.progressTrackingList" :key="index"> <div v-for="(item,index) in formInline.progressTrackingList" :key="index">
<!-- <span>{{item}}</span>--> <!-- <span>{{item}}</span>-->
<a-input class="box-input" <a-input class="box-input"
style='width: 89%' style='width: 89%'
v-model='item.progressTracking' v-model='item.progressTracking'
@@ -295,7 +295,7 @@
</a-button> </a-button>
</div> </div>
</a-drawer> </a-drawer>
<!-- <addModel ref="addModelRef" @addModelForm="addModelForm"/>--> <!-- <addModel ref="addModelRef" @addModelForm="addModelForm"/>-->
<a-modal <a-modal
:title="$t('progresstracking')" :title="$t('progresstracking')"
:width="600" :width="600"
@@ -453,7 +453,7 @@ export default {
}, },
StandardselectionChange(value, id) { StandardselectionChange(value, id) {
console.log(id) console.log(id)
this.formInline.documentId = id this.formInline.lawsId = id
this.formInline = { ...this.formInline } this.formInline = { ...this.formInline }
}, },
clickButtonToUpload(item) { clickButtonToUpload(item) {
@@ -485,7 +485,7 @@ export default {
this.templateDisabled = false this.templateDisabled = false
this.getNameList() this.getNameList()
this.getFirstLevelDutyTerritory() this.getFirstLevelDutyTerritory()
this.title = this.$t('newlyAdded1') this.title = this.$t('newlyAdded')
this.visible = true this.visible = true
this.disabled = false this.disabled = false
this.formInline = { this.formInline = {
@@ -566,7 +566,7 @@ export default {
this.formInline.progressTrackingList.splice(0,1) this.formInline.progressTrackingList.splice(0,1)
} }
}) })
this.formInline.progressTrackingList.splice(this.index+1, 1, {progressTracking:progressTracking}) this.formInline.progressTrackingList.splice(this.index+1, 1, {progressTracking:text})
this.visibletrack = false this.visibletrack = false
} }
}) })
@@ -575,36 +575,36 @@ export default {
console.log(this.formInline) console.log(this.formInline)
this.$refs.ruleForm.validate(valid => { this.$refs.ruleForm.validate(valid => {
if (valid) { if (valid) {
this.confirmLoading = true this.confirmLoading = true
let url = '' let url = ''
let action = '' let action = ''
if (this.formInline.id) { if (this.formInline.id) {
url = this.url.edit url = this.url.edit
action = putAction action = putAction
} else {
url = this.url.add
action = postAction
}
let formInline = JSON.parse(JSON.stringify(this.formInline))
// Object.keys(formInline).forEach(res => {
// if (formInline[res] && formInline[res] instanceof Array) {
// formInline[res] = formInline[res].join(',')
// }
// })
let query = {
problemManagementEO:formInline
}
action(url, query).then((res) => {
if (res.success) {
this.$message.success(this.$t('OperationSuccessful'))
this.visible = false
this.confirmLoading = false
this.$emit('fillAddForm')
} else { } else {
url = this.url.add this.confirmLoading = false
action = postAction this.$message.warning(this.$t('operationFailed'))
} }
let formInline = JSON.parse(JSON.stringify(this.formInline)) })
// Object.keys(formInline).forEach(res => {
// if (formInline[res] && formInline[res] instanceof Array) {
// formInline[res] = formInline[res].join(',')
// }
// })
let query = {
problemManagementEO:formInline
}
action(url, query).then((res) => {
if (res.success) {
this.$message.success(this.$t('OperationSuccessful'))
this.visible = false
this.confirmLoading = false
this.$emit('fillAddForm')
} else {
this.confirmLoading = false
this.$message.warning(this.$t('operationFailed'))
}
})
} }
}) })
} }
jero-web/src/views/projectManagement/components/nonConformance.vue
+2 -1
View File
@@ -211,7 +211,8 @@
align: 'left', align: 'left',
dataIndex: 'title', dataIndex: 'title',
width: 170, width: 170,
sorter:true sorter:true,
ellipsis: true
}, },
{ {
title: this.$t('Relevantlawsregulations'), title: this.$t('Relevantlawsregulations'),
jero-web/src/views/projectManagement/projectNonConformance/index.vue
+12 -12
View File
@@ -8,8 +8,8 @@
<div class="title-text" :title="$t('title')"> <div class="title-text" :title="$t('title')">
<span>{{$t('title')}}</span> <span>{{$t('title')}}</span>
</div> </div>
<j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('title')" <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('title')"
v-model="queryParam.title"></j-input> v-model="queryParam.title"></a-input>
</div> </div>
</a-col> </a-col>
<a-col :md="6" :sm="8"> <a-col :md="6" :sm="8">
@@ -17,8 +17,8 @@
<div class="title-text" :title="$t('Relevantlawsregulations')"> <div class="title-text" :title="$t('Relevantlawsregulations')">
<span>{{$t('Relevantlawsregulations')}}</span> <span>{{$t('Relevantlawsregulations')}}</span>
</div> </div>
<j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('Relevantlawsregulations')" <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('Relevantlawsregulations')"
v-model="queryParam.serialNumber"></j-input> v-model="queryParam.lawsName"></a-input>
</div> </div>
</a-col> </a-col>
<a-col :md="6" :sm="8"> <a-col :md="6" :sm="8">
@@ -28,7 +28,7 @@
</div> </div>
<a-select allowClear <a-select allowClear
class="box-input" class="box-input"
v-model="queryParam.projectName" v-model="queryParam.projectId"
:getPopupContainer="triggerNode=> triggerNode.parentNode" :getPopupContainer="triggerNode=> triggerNode.parentNode"
showSearch showSearch
optionFilterProp="label" optionFilterProp="label"
@@ -37,7 +37,7 @@
<a-select-option v-for="(item, key) in projectNameList" <a-select-option v-for="(item, key) in projectNameList"
:key="key" :key="key"
:label="item.projectName" :label="item.projectName"
:value="item.projectName"> :value="item.id">
<span style="display: inline-block;width: 100%" :title=" item.projectName "> <span style="display: inline-block;width: 100%" :title=" item.projectName ">
{{ item.projectName}} {{ item.projectName}}
</span> </span>
@@ -75,7 +75,7 @@
</div> </div>
<a-select allowClear <a-select allowClear
class="box-input" class="box-input"
v-model="queryParam.flowType" v-model="queryParam.problemState"
:getPopupContainer="triggerNode=> triggerNode.parentNode" :getPopupContainer="triggerNode=> triggerNode.parentNode"
showSearch showSearch
optionFilterProp="label" optionFilterProp="label"
@@ -214,15 +214,15 @@
{ {
title: this.$t('title'), title: this.$t('title'),
align: 'left', align: 'left',
dataIndex: 'serialNumber', dataIndex: 'title',
width: 170, width: 170,
sorter:true, sorter:true,
scopedSlots: { customRender: 'standard' } ellipsis: true
}, },
{ {
title: this.$t('Relevantlawsregulations'), title: this.$t('Relevantlawsregulations'),
align: 'left', align: 'left',
dataIndex: 'title', dataIndex: 'lawsName',
width: 170, width: 170,
sorter:true, sorter:true,
ellipsis: true ellipsis: true
@@ -230,7 +230,7 @@
{ {
title: this.$t('RelatedItems'), title: this.$t('RelatedItems'),
align: 'left', align: 'left',
dataIndex: 'RelatedItems', dataIndex: 'projectName',
width: 170, width: 170,
sorter:true, sorter:true,
ellipsis: true ellipsis: true
@@ -263,7 +263,7 @@
{ {
title: this.$t('Problemstate'), title: this.$t('Problemstate'),
align: 'left', align: 'left',
dataIndex: 'Problemstate', dataIndex: 'problemState',
width: 120, width: 120,
sorter:true, sorter:true,
ellipsis: true ellipsis: true
jero-web/src/views/projectManagement/projectNonConformance/moudles/addModel.vue
+107 -152
View File
@@ -47,51 +47,19 @@
<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">*</span>--> <!-- <span class="Required">*</span>-->
<span class="title-text-text" <span class="title-text-text"
:title="'PS-issue'">{{'PS-issue'}}</span> :title="'PS-issue'">{{'PS-issue'}}</span>
</div> </div>
<a-form-model-item class="itemModel" prop="issue"> <a-form-model-item class="itemModel" prop="issue">
<a-input class="box-input" <a-input class="box-input"
v-model='formInline.issue' v-model='formInline.psIssue'
:disabled="disabled" :disabled="disabled"
:placeholder="$t('PleaseEnter')+'PS-issue'"/> :placeholder="$t('PleaseEnter')+'PS-issue'"/>
</a-form-model-item> </a-form-model-item>
</div> </div>
</a-col> </a-col>
</a-row> </a-row>
<!-- <a-row :gutter="24">-->
<!-- <a-col :span="12">-->
<!-- <div class="box-title-text">-->
<!-- <div class="title-text">-->
<!--&lt;!&ndash; <span class="Required">*</span>&ndash;&gt;-->
<!-- <span class="title-text-text"-->
<!-- :title="$t('creator')">{{$t('creator')}}</span>-->
<!-- </div>-->
<!-- <a-form-model-item class="itemModel-multi" prop="creator">-->
<!-- <a-input class="box-input"-->
<!-- v-model='formInline.creator'-->
<!-- :disabled="true"-->
<!-- :placeholder="$t('PleaseEnter')+$t('creator')"/>-->
<!-- </a-form-model-item>-->
<!-- </div>-->
<!-- </a-col>-->
<!-- <a-col :span="12">-->
<!-- <div class="box-title-text">-->
<!-- <div class="title-text">-->
<!-- &lt;!&ndash; <span class="Required">*</span>&ndash;&gt;-->
<!-- <span class="title-text-text"-->
<!-- :title="$t('createTime')">{{$t('createTime')}}</span>-->
<!-- </div>-->
<!-- <a-form-model-item class="itemModel" prop="createTime">-->
<!-- <a-input class="box-input"-->
<!-- v-model='formInline.createTime'-->
<!-- :disabled="true"-->
<!-- :placeholder="$t('PleaseEnter')+$t('createTime')"/>-->
<!-- </a-form-model-item>-->
<!-- </div>-->
<!-- </a-col>-->
<!-- </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">
@@ -102,11 +70,11 @@
</div> </div>
<a-form-model-item class="itemModel-multi" prop="creator"> <a-form-model-item class="itemModel-multi" prop="creator">
<Standardselection <Standardselection
:query="{'db_field_txt':$t('standard')}" :query="{'db_field_txt':$t('Relevantlawsregulations')}"
:standard="formInline" :standard="formInline"
:disabled="false" :disabled="false"
@change="StandardselectionChange" @change="StandardselectionChange"
v-model="formInline.serialNumber"/> v-model="formInline.lawsId"/>
</a-form-model-item> </a-form-model-item>
</div> </div>
</a-col> </a-col>
@@ -120,7 +88,7 @@
<a-form-model-item class="itemModel" prop="contentTemplate"> <a-form-model-item class="itemModel" prop="contentTemplate">
<a-select allowClear <a-select allowClear
class="box-input" class="box-input"
v-model="formInline.projectName" v-model="formInline.projectId"
:getPopupContainer="triggerNode=> triggerNode.parentNode" :getPopupContainer="triggerNode=> triggerNode.parentNode"
showSearch showSearch
mode="multiple" mode="multiple"
@@ -130,7 +98,7 @@
<a-select-option v-for="(item, key) in projectNameList" <a-select-option v-for="(item, key) in projectNameList"
:key="key" :key="key"
:label="item.projectName" :label="item.projectName"
:value="item.projectName"> :value="item.id">
<span style="display: inline-block;width: 100%" :title=" item.projectName "> <span style="display: inline-block;width: 100%" :title=" item.projectName ">
{{ item.projectName}} {{ item.projectName}}
</span> </span>
@@ -156,7 +124,7 @@
class="box-input-search" class="box-input-search"
optionFilterProp="label" optionFilterProp="label"
:getPopupContainer="triggerNode=> triggerNode.parentNode" :getPopupContainer="triggerNode=> triggerNode.parentNode"
v-model="formInline.firstLevelDutyTerritory"> v-model="formInline.dutyTerritory">
<a-select-option v-for="(item, key) in firstLevelDutyTerritoryList" <a-select-option v-for="(item, key) in firstLevelDutyTerritoryList"
:key="key" :key="key"
:label="item.key" :label="item.key"
@@ -179,7 +147,7 @@
<a-form-model-item class="itemModel" prop="contentTemplate"> <a-form-model-item class="itemModel" prop="contentTemplate">
<a-select allowClear <a-select allowClear
class="box-input" class="box-input"
v-model="formInline.flowType" v-model="formInline.problemState"
:getPopupContainer="triggerNode=> triggerNode.parentNode" :getPopupContainer="triggerNode=> triggerNode.parentNode"
showSearch showSearch
optionFilterProp="label" optionFilterProp="label"
@@ -202,13 +170,13 @@
<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="Required">*</span>--> <!-- <span class="Required">*</span>-->
<span class="title-text-text" <span class="title-text-text"
:title="$t('descriptions')">{{$t('descriptions')}}</span> :title="$t('descriptions')">{{$t('descriptions')}}</span>
</div> </div>
<a-form-model-item class="itemModel" prop="descriptions"> <a-form-model-item class="itemModel" prop="descriptions">
<a-input class="box-input" <a-input class="box-input"
v-model='formInline.descriptions' v-model='formInline.description'
:disabled="disabled" :disabled="disabled"
:placeholder="$t('PleaseEnter')+$t('descriptions')"/> :placeholder="$t('PleaseEnter')+$t('descriptions')"/>
</a-form-model-item> </a-form-model-item>
@@ -216,36 +184,36 @@
</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="Required">*</span>--> <!-- <span class="Required">*</span>-->
<span class="title-text-text" <span class="title-text-text"
:title="$t('documents')">{{$t('documents')}}</span> :title="$t('documents')">{{$t('documents')}}</span>
</div>
<a-form-model-item class="itemModel" prop="xgwj">
<div v-for="(item,index) in formInline.list" :key="index">
<a-input class="box-input"
style='width: 89%'
v-model='item.xgwj'
:disabled="disabled"
:placeholder="$t('PleaseEnter')+$t('Addresslink')"/>
<a-icon class="icon-text" @click="addClick(index)" style='margin-left: 10px;font-size: 18px;'
v-if="formInline.list.length - 1 == index"
type="plus"/>
<a-icon class="icon-text" v-if="formInline.list.length > 1 && formInline.list.length - 1 !== index" style='margin-left: 10px;font-size: 18px;'
@click="deleteClick(index)"
type="minus"/>
</div>
<a-button type="primary" class="button-text"
@click="clickButtonToUpload('accessory_id')">
{{ (formInline.accessory_id === 'null' || formInline.accessory_id === '' ||
formInline.accessory_id == null) ? $t('Fileupload') : $t('viewUploadedFiles')
}}
</a-button>
</a-form-model-item>
</div> </div>
</a-col> <a-form-model-item class="itemModel" prop="fileLink">
<div v-for="(item,index) in formInline.fileLinkList" :key="index">
<a-input class="box-input"
style='width: 89%'
v-model='item.fileLink'
:disabled="disabled"
:placeholder="$t('PleaseEnter')+$t('Addresslink')"/>
<a-icon class="icon-text" @click="addClick(index)" style='margin-left: 10px;font-size: 18px;'
v-if="formInline.fileLinkList.length - 1 == index"
type="plus"/>
<a-icon class="icon-text" v-if="formInline.fileLinkList.length > 1 && formInline.fileLinkList.length - 1 !== index" style='margin-left: 10px;font-size: 18px;'
@click="deleteClick(index)"
type="minus"/>
</div>
<a-button type="primary" class="button-text"
@click="clickButtonToUpload('file')">
{{ (formInline.file === 'null' || formInline.file === '' ||
formInline.file == null) ? $t('Fileupload') : $t('viewUploadedFiles')
}}
</a-button>
</a-form-model-item>
</div>
</a-col>
</a-row> </a-row>
<a-row :gutter="24"> <a-row :gutter="24">
<a-col :span="24"> <a-col :span="24">
@@ -256,15 +224,15 @@
:title="$t('progresstracking')">{{$t('progresstracking')}}</span> :title="$t('progresstracking')">{{$t('progresstracking')}}</span>
</div> </div>
<a-form-model-item class="itemModel" prop="progresstracking"> <a-form-model-item class="itemModel" prop="progresstracking">
<div v-for="(item,index) in formInline.progresstrackinglist" :key="index"> <div v-for="(item,index) in formInline.progressTrackingList" :key="index">
<!-- <span>{{item}}</span>--> <!-- <span>{{item}}</span>-->
<a-input class="box-input" <a-input class="box-input"
style='width: 89%' style='width: 89%'
v-model='item.text' v-model='item.progressTracking'
:disabled="true" :disabled="true"
:placeholder="$t('PleaseEnter')+$t('progresstracking')"/> :placeholder="$t('PleaseEnter')+$t('progresstracking')"/>
<a @click="addprogresstrackingClick(index)" style='margin-left: 10px' v-if="formInline.progresstrackinglist.length - 1 == index">{{$t('newlyAdded')}}</a> <a @click="addprogresstrackingClick(index)" style='margin-left: 10px' v-if="formInline.progressTrackingList.length - 1 == index">{{$t('newlyAdded')}}</a>
<a @click="deleteprogresstrackingClick(index,item)" v-if="formInline.progresstrackinglist.length > 0" :disabled="disabled" style='margin-left: 10px' >{{$t('delete')}}</a> <a @click="deleteprogresstrackingClick(index,item)" v-if="formInline.progressTrackingList.length > 0" :disabled="disabled" style='margin-left: 10px' >{{$t('delete')}}</a>
</div> </div>
</a-form-model-item> </a-form-model-item>
</div> </div>
@@ -278,9 +246,9 @@
<span class="title-text-text" <span class="title-text-text"
:title="$t('conculsion')">{{$t('conculsion')}}</span> :title="$t('conculsion')">{{$t('conculsion')}}</span>
</div> </div>
<a-form-model-item class="itemModel" prop="conculsion"> <a-form-model-item class="itemModel" prop="conclusion">
<a-input class="box-input" <a-input class="box-input"
v-model='formInline.conculsion' v-model='formInline.conclusion'
:disabled="disabled" :disabled="disabled"
:placeholder="$t('PleaseEnter')+$t('conculsion')"/> :placeholder="$t('PleaseEnter')+$t('conculsion')"/>
</a-form-model-item> </a-form-model-item>
@@ -295,24 +263,24 @@
<span class="title-text-text" <span class="title-text-text"
:title="$t('examineapproveevidence')">{{$t('examineapproveevidence')}}</span> :title="$t('examineapproveevidence')">{{$t('examineapproveevidence')}}</span>
</div> </div>
<a-form-model-item class="itemModel" prop="xgwj"> <a-form-model-item class="itemModel" prop="approvalEvidenceLink">
<div v-for="(item,index) in formInline.examineapproveevidencelist" :key="index"> <div v-for="(item,index) in formInline.approvalEvidenceLinkList" :key="index">
<a-input class="box-input" <a-input class="box-input"
style='width: 89%' style='width: 89%'
v-model='item.xgwj' v-model='item.approvalEvidenceLink'
:disabled="disabled" :disabled="disabled"
:placeholder="$t('PleaseEnter')+$t('Addresslink')"/> :placeholder="$t('PleaseEnter')+$t('Addresslink')"/>
<a-icon class="icon-text" @click="addvidenceClick(index)" style='margin-left: 10px;font-size: 18px;' <a-icon class="icon-text" @click="addvidenceClick(index)" style='margin-left: 10px;font-size: 18px;'
v-if="formInline.examineapproveevidencelist.length - 1 == index" v-if="formInline.approvalEvidenceLinkList.length - 1 == index"
type="plus"/> type="plus"/>
<a-icon class="icon-text" v-if="formInline.examineapproveevidencelist.length > 1 && formInline.examineapproveevidencelist.length - 1 !== index" <a-icon class="icon-text" v-if="formInline.approvalEvidenceLinkList.length > 1 && formInline.approvalEvidenceLinkList.length - 1 !== index"
style='margin-left: 10px;font-size: 18px;' @click="deletevidenceClick(index)" style='margin-left: 10px;font-size: 18px;' @click="deletevidenceClick(index)"
type="minus" :disabled="disabled"/> type="minus" :disabled="disabled"/>
</div> </div>
<a-button type="primary" class="button-text" <a-button type="primary" class="button-text"
@click="clickButtonToUpload('accessory_id')"> @click="clickButtonToUpload('approvalEvidence')">
{{ (formInline.examineapproveevidence === 'null' || formInline.examineapproveevidence === '' || {{ (formInline.approvalEvidence === 'null' || formInline.approvalEvidence === '' ||
formInline.examineapproveevidence == null) ? $t('Fileupload') : $t('viewUploadedFiles') formInline.approvalEvidence == null) ? $t('Fileupload') : $t('viewUploadedFiles')
}} }}
</a-button> </a-button>
</a-form-model-item> </a-form-model-item>
@@ -327,7 +295,7 @@
</a-button> </a-button>
</div> </div>
</a-drawer> </a-drawer>
<!-- <addModel ref="addModelRef" @addModelForm="addModelForm"/>--> <!-- <addModel ref="addModelRef" @addModelForm="addModelForm"/>-->
<a-modal <a-modal
:title="$t('progresstracking')" :title="$t('progresstracking')"
:width="600" :width="600"
@@ -346,9 +314,9 @@
<span class="title-text-text" :title="$t('progresstracking')"> <span class="title-text-text" :title="$t('progresstracking')">
{{$t('progresstracking')}}</span> {{$t('progresstracking')}}</span>
</div> </div>
<a-form-model-item class="itemModel" prop="text"> <a-form-model-item class="itemModel" prop="progressTracking">
<a-textarea :placeholder="$t('pleaseEnter')+$t('progresstracking')" <a-textarea :placeholder="$t('pleaseEnter')+$t('progresstracking')"
v-model="formInlinetracking.text" v-model="formInlinetracking.progressTracking"
style="width: 90%" style="width: 90%"
:maxLength="500" :maxLength="500"
:rows="4"/> :rows="4"/>
@@ -370,7 +338,7 @@
// import addModel from './a/ddModel' // import addModel from './a/ddModel'
import Standardselection from '@/components/Standardselection/index' import Standardselection from '@/components/Standardselection/index'
import uploadFile from '@/components/uploadFile/file' import uploadFile from '@/components/uploadFile/file'
import { getAction, postAction, downloadFile } from '@/api/manage' import { getAction, postAction,putAction, downloadFile } from '@/api/manage'
import moment from 'moment' import moment from 'moment'
import { mapGetters } from 'vuex' import { mapGetters } from 'vuex'
@@ -406,7 +374,7 @@ export default {
visible: false, visible: false,
visibletrack: false, visibletrack: false,
rulestracking:{ rulestracking:{
text: [ progressTracking: [
{ {
required: true, required: true,
message: this.$t('text') + this.$t('cannotEmpty'), message: this.$t('text') + this.$t('cannotEmpty'),
@@ -415,9 +383,9 @@ export default {
] ]
}, },
formInline: { formInline: {
list:[{}], fileLinkList:[{}],
examineapproveevidencelist:[{}], progressTrackingList:[{}],
progresstrackinglist:[{}] approvalEvidenceLink:[{}]
}, },
formInlinetracking:{}, formInlinetracking:{},
confirmLoading: false, confirmLoading: false,
@@ -449,8 +417,8 @@ export default {
], ],
index:'', index:'',
url: { url: {
add: '/report/lawsMonthlyReportWriteEO/add', add: '/project/problemManagementEO/add',
edit: '/report/lawsMonthlyReportWriteEO/edit', edit: '/project/problemManagementEO/edit',
queryById: '/report/lawsMonthlyReportWriteEO/queryById' queryById: '/report/lawsMonthlyReportWriteEO/queryById'
} }
} }
@@ -485,7 +453,7 @@ export default {
}, },
StandardselectionChange(value, id) { StandardselectionChange(value, id) {
console.log(id) console.log(id)
this.formInline.documentId = id this.formInline.lawsId = id
this.formInline = { ...this.formInline } this.formInline = { ...this.formInline }
}, },
clickButtonToUpload(item) { clickButtonToUpload(item) {
@@ -514,7 +482,6 @@ export default {
}, },
...mapGetters(['userInfo']), ...mapGetters(['userInfo']),
add() { add() {
console.log(this.userInfo())
this.templateDisabled = false this.templateDisabled = false
this.getNameList() this.getNameList()
this.getFirstLevelDutyTerritory() this.getFirstLevelDutyTerritory()
@@ -522,9 +489,9 @@ export default {
this.visible = true this.visible = true
this.disabled = false this.disabled = false
this.formInline = { this.formInline = {
list:[{}], fileLinkList:[{}],
examineapproveevidencelist:[{}], progressTrackingList:[{}],
progresstrackinglist:[{}] approvalEvidenceLink:[{}]
} }
this.$nextTick(() => { this.$nextTick(() => {
this.formInline = { ...this.formInline } this.formInline = { ...this.formInline }
@@ -544,19 +511,19 @@ export default {
}) })
}, },
addClick(index){ addClick(index){
this.formInline.list.splice(index + 1, 0, {}) this.formInline.fileLinkList.splice(index + 1, 0, {})
this.formInline = { ...this.formInline } this.formInline = { ...this.formInline }
}, },
deleteClick(index) { deleteClick(index) {
this.formInline.list.splice(index, 1) this.formInline.fileLinkList.splice(index, 1)
this.formInline = { ...this.formInline } this.formInline = { ...this.formInline }
}, },
addvidenceClick(index){ addvidenceClick(index){
this.formInline.examineapproveevidencelist.splice(index + 1, 0, {}) this.formInline.approvalEvidenceLinkList.splice(index + 1, 0, {})
this.formInline = { ...this.formInline } this.formInline = { ...this.formInline }
}, },
deletevidenceClick(index) { deletevidenceClick(index) {
this.formInline.examineapproveevidencelist.splice(index, 1) this.formInline.approvalEvidenceLinkList.splice(index, 1)
this.formInline = { ...this.formInline } this.formInline = { ...this.formInline }
}, },
addprogresstrackingClick(index){ addprogresstrackingClick(index){
@@ -570,11 +537,11 @@ export default {
}) })
}, },
deleteprogresstrackingClick(index,item) { deleteprogresstrackingClick(index,item) {
if(item.text && item.text != ''){ if(item.progressTracking && item.progressTracking != ''){
if(index == 0){ if(index == 0){
item.text = '' item.progressTracking = ''
}else{ }else{
this.formInline.progresstrackinglist.splice(index, 1) this.formInline.progressTrackingList.splice(index, 1)
} }
} }
this.formInline = { ...this.formInline } this.formInline = { ...this.formInline }
@@ -592,14 +559,14 @@ export default {
let time = moment(new Date()).format('YYYY-MM-DD HH:mm:ss') let time = moment(new Date()).format('YYYY-MM-DD HH:mm:ss')
this.$refs.ruleFormtracking.validate(valid => { this.$refs.ruleFormtracking.validate(valid => {
if (valid) { if (valid) {
let text = this.userInfo().username + ' ' + time + ' ' + this.formInlinetracking.text let text = this.userInfo().username + ' ' + time + ' ' + this.formInlinetracking.progressTracking
this.formInline.progresstrackinglist.forEach((item,index) => { this.formInline.progressTrackingList.forEach((item,index) => {
console.log(item.text) console.log(item.progressTracking)
if(!item.text){ if(!item.progressTracking){
this.formInline.progresstrackinglist.splice(0,1) this.formInline.progressTrackingList.splice(0,1)
} }
}) })
this.formInline.progresstrackinglist.splice(this.index+1, 1, {text:text}) this.formInline.progressTrackingList.splice(this.index+1, 1, {progressTracking:text})
this.visibletrack = false this.visibletrack = false
} }
}) })
@@ -608,47 +575,35 @@ export default {
console.log(this.formInline) console.log(this.formInline)
this.$refs.ruleForm.validate(valid => { this.$refs.ruleForm.validate(valid => {
if (valid) { if (valid) {
let text = '' this.confirmLoading = true
if (this.$refs.defaultTemplateRef) { let url = ''
text = 'defaultTemplateRef' let action = ''
} else if (this.$refs.solicitOpinionsRef) { if (this.formInline.id) {
text = 'solicitOpinionsRef' url = this.url.edit
} else if (this.$refs.releaseStandardRef) { action = putAction
text = 'releaseStandardRef' } else {
} else if (this.$refs.industryTemplateRef) { url = this.url.add
text = 'industryTemplateRef' action = postAction
} }
this.$refs[text].getData((val) => { let formInline = JSON.parse(JSON.stringify(this.formInline))
this.confirmLoading = true // Object.keys(formInline).forEach(res => {
let url = '' // if (formInline[res] && formInline[res] instanceof Array) {
if (this.formInline.id) { // formInline[res] = formInline[res].join(',')
url = this.url.edit // }
// })
let query = {
problemManagementEO:formInline
}
action(url, query).then((res) => {
if (res.success) {
this.$message.success(this.$t('OperationSuccessful'))
this.visible = false
this.confirmLoading = false
this.$emit('fillAddForm')
} else { } else {
url = this.url.add this.confirmLoading = false
this.$message.warning(this.$t('operationFailed'))
} }
let formInline = JSON.parse(JSON.stringify(this.formInline))
Object.keys(formInline).forEach(res => {
if (formInline[res] && formInline[res] instanceof Array) {
formInline[res] = formInline[res].join(',')
}
})
let query = Object.assign(val, {
month: formInline.month,
memoriesChapter: formInline.memoriesChapter,
contentTemplate: formInline.contentTemplate,
memoriesChapterOne:formInline.memoriesChapterOne
})
postAction(url, query).then((res) => {
if (res.success) {
this.$message.success(this.$t('OperationSuccessful'))
this.visible = false
this.confirmLoading = false
this.$emit('fillAddForm')
} else {
this.confirmLoading = false
this.$message.warning(this.$t('operationFailed'))
}
})
}) })
} }
}) })