diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue
index 0b3afea18..9e3374a4a 100644
--- a/jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue
+++ b/jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue
@@ -296,6 +296,12 @@
if (dataList[i].evaluationMethods && dataList[i].evaluationMethods instanceof Array) {
dataList[i].evaluationMethods = dataList[i].evaluationMethods.join(',')
}
+ Object.keys(dataList[i]).forEach(res=>{
+ if (dataList[i][res] && typeof dataList[i][res] == 'string') {
+ dataList[i][res] = dataList[i][res].replace(/\"/g, '“')
+ dataList[i][res] = dataList[i][res].replace(/\'/g, '‘')
+ }
+ })
dataList[i].lawsTechnologyEvaluationId = this.$route.query.lawsTechnologyEvaluationId || this.getUUID
if (!dataList[i].evaluatorIds) {
this.$message.warning(this.$t('pleaseCompleteTheEvaluationMethodorEvaluator'))
diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/standardDecompositionSheet.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/standardDecompositionSheet.vue
index b96b40da0..7390426d6 100644
--- a/jero-web/src/views/businessSupport/technologyAssessment/components/standardDecompositionSheet.vue
+++ b/jero-web/src/views/businessSupport/technologyAssessment/components/standardDecompositionSheet.vue
@@ -55,9 +55,9 @@
{{$t('informationCategory')}}
+ :placeholder="$t('PleaseSelect')+$t('informationCategory')"
+ :type="'select'"
+ :triggerChange="false" :dictCode="'information_category'"/>
@@ -136,7 +136,7 @@
confirmLoading: false,
selectedRowKeys: [],
sarFileSplitInfoList: [],
- informationCategoryList:[],
+ informationCategoryList: [],
url: {
list: '/split/sarFileSplitItems/getSplitItemsByPage'
},
@@ -244,14 +244,18 @@
}
},
searchQuery() {
- this.pageNo = 1
- this.replacePage()
+ if (this.queryParam.info_id) {
+ this.pageNo = 1
+ this.replacePage()
+ }
},
searchReset() {
- this.pageNo = 1
this.queryParam = {}
this.queryParam.info_id = this.sarFileSplitInfoList && this.sarFileSplitInfoList.length > 0 ? this.sarFileSplitInfoList[0].id : ''
- this.replacePage()
+ if (this.queryParam.info_id) {
+ this.pageNo = 1
+ this.replacePage()
+ }
},
onChange(page, pageSize) {
this.pageNo = page
@@ -270,15 +274,15 @@
let pageNo = JSON.parse(JSON.stringify(this.pageNo))
let pageSize = JSON.parse(JSON.stringify(this.pageSize))
let queryParam = JSON.parse(JSON.stringify(this.queryParam))
- if (queryParam.technology_territory && queryParam.technology_territory.length > 0){
+ if (queryParam.technology_territory && queryParam.technology_territory.length > 0) {
queryParam.technology_territory = queryParam.technology_territory.join(',')
}
let query = {
pageNo: pageNo + '',
pageSize: pageSize + '',
info_id: this.queryParam.info_id,
- technology_territory:queryParam.technology_territory,
- information_category:queryParam.information_category,
+ technology_territory: queryParam.technology_territory,
+ information_category: queryParam.information_category,
menu_id: ''
}
this.loading = true
diff --git a/jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue b/jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue
index 529f97588..3b8473872 100644
--- a/jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue
+++ b/jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue
@@ -345,6 +345,12 @@
this.$message.warning(this.$t('PleaseCompleteList'))
return
}
+ Object.keys(this.dataSource[i]).forEach(res=>{
+ if (this.dataSource[i][res] && typeof this.dataSource[i][res] == 'string') {
+ this.dataSource[i][res] = this.dataSource[i][res].replace(/\"/g, '“')
+ this.dataSource[i][res] = this.dataSource[i][res].replace(/\'/g, '‘')
+ }
+ })
}
if (this.$route.query.taskDefinitionKey == 'pgrqr'){
let feedbackTime = moment(new Date()).format('YYYY-MM-DD HH:mm:ss')
diff --git a/jero-web/src/views/projectManagement/components/addModel.vue b/jero-web/src/views/projectManagement/components/addModel.vue
index fd880aadc..47e7685e3 100644
--- a/jero-web/src/views/projectManagement/components/addModel.vue
+++ b/jero-web/src/views/projectManagement/components/addModel.vue
@@ -348,6 +348,7 @@
this.getNameList()
this.formInline.studioEngineerName = this.userInfo().username
this.formInline.studioEngineer = this.userInfo().id
+ this.formInline = {...this.formInline}
this.$nextTick(() => {
this.$refs.ruleForm.clearValidate()
})
diff --git a/jero-web/src/views/regulationsKanban/components/addModel.vue b/jero-web/src/views/regulationsKanban/components/addModel.vue
index 5e959a562..cb6a3b8e9 100644
--- a/jero-web/src/views/regulationsKanban/components/addModel.vue
+++ b/jero-web/src/views/regulationsKanban/components/addModel.vue
@@ -296,8 +296,14 @@
},
verifyTaskClick(val, num, isTrue) {
let query = {}
+ let isDisplay = false
switch (num) {
case 1:
+ if (val.designTaskStatus == 'NotDone'){
+ isDisplay = true
+ }else{
+ isDisplay = false
+ }
query = {
taskIds: val.designTaskId,
actiProcInstId: val.designPId,
@@ -307,7 +313,7 @@
studioEngineer: val.studioEngineer,
serialNumber: val.serialNumber,
TaskKey: val.designTaskDefinitionKey,
- isDisplay: isTrue,
+ isDisplay: isDisplay,
flowType: 2,
Sponsor: 'designInitiatorName',
personLiable: 'designDutyName',
@@ -323,6 +329,11 @@
}
break
case 2:
+ if (val.prehomoTaskStatus == 'NotDone'){
+ isDisplay = true
+ }else{
+ isDisplay = false
+ }
query = {
taskIds: val.prehomoTaskId,
actiProcInstId: val.prehomoPId,
@@ -348,6 +359,11 @@
}
break
case 3:
+ if (val.verifyTaskStatus == 'NotDone'){
+ isDisplay = true
+ }else{
+ isDisplay = false
+ }
query = {
taskIds: val.verifyTaskId,
actiProcInstId: val.verifyPId,