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

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

Browse Source
This commit is contained in:
gaosong
2022-08-11 14:32:36 +08:00
parent 1c7c779a7f 7713aa5e41
commit a6c283dde0
11 changed files with 99 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/LawsComplianceBoardMapper.xml
+2 -2
View File
@@ -16,8 +16,8 @@
LEFT JOIN project_task_inventory pti ON ( pli.id = pti.project_laws_inventory_id )
WHERE
(
bdl.id IN ( SELECT DISTINCT stand_id FROM laws_opinion_gather)
OR bdl.id IN ( SELECT DISTINCT stand_id FROM laws_technology_evaluation)
bdl.id IN ( SELECT DISTINCT stand_id FROM laws_opinion_gather where gather_result = #{params.gatherResult})
OR bdl.id IN ( SELECT DISTINCT stand_id FROM laws_technology_evaluation where flow_status = #{params.flowStatus})
or pti.design_p_id IS NOT NULL
OR pti.prehomo_p_id IS NOT NULL
OR pti.verify_p_id IS NOT NULL
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/LawsComplianceBoardServiceImpl.java
+6
View File
@@ -10,6 +10,7 @@ import com.jero.modules.document.enums.FieldTypeEnum;
import com.jero.modules.document.service.IBussDocumentLibraryEOService;
import com.jero.modules.document.vo.QueryConditionVO;
import com.jero.modules.lawsOpinionGather.entity.LawsOpinionGatherEO;
import com.jero.modules.lawsOpinionGather.enums.GatherResultEnum;
import com.jero.modules.lawsOpinionGather.service.ILawsOpinionGatherEOService;
import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationEO;
import com.jero.modules.lawsTechnologyEvaluation.service.ILawsTechnologyEvaluationEOService;
@@ -68,6 +69,9 @@ public class LawsComplianceBoardServiceImpl implements ILawsComplianceBoardServi
//封装查询条件(包含高级搜索)
String condition = this.getConditionStr(params);
params.put("condition",condition);
//只查询 法规技术评估流程状态、法规意见收集 收集结果 为已完成的数据
params.put("flowStatus", GatherResultEnum.COMPLETED.getValue());
params.put("gatherResult", GatherResultEnum.COMPLETED.getValue());
IPage page = new Page(pageNo, pageSize);
IPage infoPage = this.lawsComplianceBoardMapper.queryPageList(page, params);
List records = infoPage.getRecords();
@@ -139,12 +143,14 @@ public class LawsComplianceBoardServiceImpl implements ILawsComplianceBoardServi
//查询当前数据是否有法规意见收集流程数据
QueryWrapper<LawsOpinionGatherEO> opinionGatherEOQueryWrapper = new QueryWrapper<>();
opinionGatherEOQueryWrapper.lambda().eq(LawsOpinionGatherEO::getStandId,id);
opinionGatherEOQueryWrapper.lambda().eq(LawsOpinionGatherEO::getGatherResult,GatherResultEnum.COMPLETED.getValue());
int opinionGatherCount = this.lawsOpinionGatherEOService.count(opinionGatherEOQueryWrapper);
result.put("opinionGather",opinionGatherCount);
//查询当前数据是否有法规技术评估流程数据
QueryWrapper<LawsTechnologyEvaluationEO> evaluationEOQueryWrapper = new QueryWrapper<>();
evaluationEOQueryWrapper.lambda().eq(LawsTechnologyEvaluationEO::getStandId,id);
evaluationEOQueryWrapper.lambda().eq(LawsTechnologyEvaluationEO::getFlowStatus,GatherResultEnum.COMPLETED.getValue());
int evaluationCount = this.lawsTechnologyEvaluationEOService.count(evaluationEOQueryWrapper);
result.put("technologyEvaluation",evaluationCount);
return result;
jero-web/src/common/lang/en-us.js
+4 -3
View File
@@ -355,7 +355,7 @@ module.exports = {
templateDownload: 'Download Template',
textInformation: 'Document Files',
relatedInformation: 'Relevant Information',
RetrieveFiles: 'Retrieve Library File',
RetrieveFiles: 'Select Stored File',
SplitText: 'Split Library File',
ImportResults: 'Import Split Results',
copy: 'Copy',
@@ -589,7 +589,7 @@ module.exports = {
withdraw: 'Withdraw',
maintenanceList: 'Maintain',
instructionForUse: 'Instruction',
subtitle: 'Sub-Title',
subtitle: 'Sub-title',
scopeOfApplication: 'Scope',
correspondingStandard: 'Compare EU/CN',
implementationCategory: 'Usage',
@@ -1134,7 +1134,7 @@ module.exports = {
feedbackEvaluation: 'Feedback Evaluation',
clauseEvaluation: 'Clause Evaluation',
standardDocuments: 'Standard Documents',
pleaseCompleteTheEvaluationMethodorEvaluator: 'Please complete the evaluation method or evaluator in the list',
pleaseCompleteTheEvaluationMethodorEvaluator: 'Please complete the evaluator in the list',
reviewComments: 'Review comments',
PleaseCompleteList: 'Please complete the compliance results in the list',
sponsorFeedback: 'Sponsor feedback',
@@ -1256,4 +1256,5 @@ module.exports = {
HaveReleased:'Have released',
forward:'Forward',
issuedBy:'Issued by',
pleaseDecompositionStandardOrder:'Please import or bring in at least one decomposition standard order',
}
jero-web/src/common/lang/zh-cn.js
+2 -2
View File
@@ -1139,7 +1139,6 @@ module.exports = {
feedbackEvaluation: '反馈评估',
clauseEvaluation: '条款评估',
standardDocuments: '标准文件',
pleaseCompleteTheEvaluationMethodorEvaluator: '请补全列表中评估方式或评估人',
reviewComments: '审核意见',
PleaseCompleteList: '请补全列表中符合性结果',
sponsorFeedback: '发起人反馈',
@@ -1240,7 +1239,7 @@ module.exports = {
feedbackEvaluation: '反馈评估',
clauseEvaluation: '条款评估',
standardDocuments: '标准文件',
pleaseCompleteTheEvaluationMethodorEvaluator: '请补全列表中评估方式或评估人',
pleaseCompleteTheEvaluationMethodorEvaluator: '请补全列表中评估人',
reviewComments: '审核意见',
PleaseCompleteList: '请补全列表中符合性结果',
sponsorFeedback: '发起人反馈',
@@ -1359,4 +1358,5 @@ module.exports = {
HaveReleased:'已发布',
forward:'转发',
issuedBy:'发布人',
pleaseDecompositionStandardOrder:'请导入或带入至少一条分解标准单',
}
jero-web/src/components/OcrTable/DocTable.vue
+8 -8
View File
@@ -150,14 +150,14 @@
if (res.success) {
var jsonHead = res.result
this.columns = []
this.columns.push(
{
title: this.$t('serialNumber'),
dataIndex: 'index',
key: 'index',
align: 'center',
customRender: (text, record, index) => `${index + 1}`
})
// this.columns.push(
// {
// title: this.$t('serialNumber'),
// dataIndex: 'index',
// key: 'index',
// align: 'center',
// customRender: (text, record, index) => `${index + 1}`
// })
jsonHead.forEach((res, index) => {
this.columns.push({
title: res.db_field_txt,
jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue
+33 -8
View File
@@ -164,16 +164,22 @@
},
submitData(callback) {
let dataList = JSON.parse(JSON.stringify(this.dataList))
for (let i = 0; i < dataList.length; i++) {
if (dataList[i].evaluationMethods && dataList[i].evaluationMethods instanceof Array) {
dataList[i].evaluationMethods = dataList[i].evaluationMethods.join(',')
}
dataList[i].lawsTechnologyEvaluationId = this.$route.query.lawsTechnologyEvaluationId || this.getUUID
if (!dataList[i].evaluationMethods || !dataList[i].evaluatorIds) {
this.$message.warning(this.$t('pleaseCompleteTheEvaluationMethodorEvaluator'))
return
if (dataList && dataList.length > 0) {
for (let i = 0; i < dataList.length; i++) {
if (dataList[i].evaluationMethods && dataList[i].evaluationMethods instanceof Array) {
dataList[i].evaluationMethods = dataList[i].evaluationMethods.join(',')
}
dataList[i].lawsTechnologyEvaluationId = this.$route.query.lawsTechnologyEvaluationId || this.getUUID
if (!dataList[i].evaluatorIds) {
this.$message.warning(this.$t('pleaseCompleteTheEvaluationMethodorEvaluator'))
return
}
}
} else {
this.$message.warning(this.$t('pleaseDecompositionStandardOrder'))
return
}
callback && callback(dataList)
},
handleModule() {
@@ -202,4 +208,23 @@
text-justify: inter-ideograph;
word-break: break-all
}
::v-deep .ant-select-tree-treenode-switcher-close {
width: 255px;
}
::v-deep .ant-select-tree-node-content-wrapper {
text-align: left;
float: right;
margin-top: -2px !important;
}
::v-deep .ant-select-tree-title {
width: 100%;
display: block;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
</style>
jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue
-2
View File
@@ -100,7 +100,6 @@
<a-form-model-item class="itemModel" prop="processBackground">
<a-textarea :placeholder="$t('pleaseEnter')+$t('processBackground')"
v-model="formInline.processBackground"
:disabled="!whetherDisplay"
:rows="4"/>
</a-form-model-item>
</div>
@@ -115,7 +114,6 @@
<a-form-model-item class="itemModel" prop="remark">
<a-textarea :placeholder="$t('pleaseEnter')+$t('remarks')"
v-model="formInline.remark"
:disabled="!whetherDisplay"
:rows="4"/>
</a-form-model-item>
</div>
jero-web/src/views/businessSupport/technologyAssessment/components/standardDecompositionSheet.vue
+11 -5
View File
@@ -49,7 +49,7 @@
</div>
<a-table
:columns="columns"
rowKey="id"
:rowKey="(record)=>JSON.stringify(record)"
:scroll="{x: '100%'}"
:data-source="dataList"
:pagination="false"
@@ -174,10 +174,10 @@
},
getRowList(value) {
if (value && value.itemId) {
this.selectedRowKeys = this.selectedRowKeys.filter(res=>{
return value.itemId != res
this.selectedRowKeys = this.selectedRowKeys.filter(res => {
return !res.includes(value.itemId)
})
this.selectedRowKeysData = this.selectedRowKeysData.filter(res=>{
this.selectedRowKeysData = this.selectedRowKeysData.filter(res => {
return value.itemId != res.id
})
}
@@ -239,8 +239,14 @@
}
},
onSelectChange(value, record) {
this.selectedRowKeysData = []
this.selectedRowKeys = value
this.selectedRowKeysData = record
if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
this.selectedRowKeys.forEach(res => {
this.selectedRowKeysData.push(JSON.parse(res))
})
}
// this.selectedRowKeysData = record
}
}
}
jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue
+9 -5
View File
@@ -10,7 +10,7 @@
ref="table"
:loading="loading"
:pagination="false"
:scroll="{x: '100%'}"
:scroll="{x: '100%',y:500}"
:data-source="dataSource"
:columns="columns"
>
@@ -26,18 +26,21 @@
<span slot="nameTechnicalDocument" slot-scope="text,result">
<a-input class="box-input"
:maxLength="100"
v-model="result.technicalFileName"
onkeyup="this.value=this.value.replace(/(^\s+)|(\s+$)/g, '')"
v-model.trim="result.technicalFileName"
:placeholder="$t('PleaseEnter')+$t('nameTechnicalDocument')"/>
</span>
<span slot="chapter" slot-scope="text,result">
<a-textarea :placeholder="$t('pleaseEnter')+$t('chapter')"
v-model="result.section"
v-model.trim="result.section"
onkeyup="this.value=this.value.replace(/(^\s+)|(\s+$)/g, '')"
:maxLength="300"
:rows="2"/>
</span>
<span slot="opinion" slot-scope="text,result">
<a-textarea :placeholder="$t('pleaseEnter')+$t('opinion')"
v-model="result.opinion"
v-model.trim="result.opinion"
onkeyup="this.value=this.value.replace(/(^\s+)|(\s+$)/g, '')"
:maxLength="300"
:rows="2"/>
</span>
@@ -75,7 +78,8 @@
</span>
<span slot="sponsorFeedback" slot-scope="text,result">
<a-textarea :placeholder="$t('pleaseEnter')+$t('sponsorFeedback')"
v-model="result.sponsorFeedback"
v-model.trim="result.sponsorFeedback"
onkeyup="this.value=this.value.replace(/(^\s+)|(\s+$)/g, '')"
:maxLength="300"
:rows="2"/>
</span>
jero-web/src/views/regulationsKanban/components/addModel.vue
+19 -4
View File
@@ -12,10 +12,16 @@
<a-row :gutter='24'>
<a-col :span='9'>
<a-form-model-item :label="$t('areaOfResponsibility')">
<j-dict-select-tag class="box-input" v-model="formData.dutyTerritory"
:placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
:type="'select'"
:triggerChange="false" :dictCode="'duty_territory'"/>
<a-select class="box-input" v-model="formData.dutyTerritory"
:placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')">
<a-select-option v-for="(element,index) in dutyTerritory" :key="element.value" :value="element.value">
{{element.text}}
</a-select-option>
</a-select>
<!-- <j-dict-select-tag class="box-input" v-model="formData.dutyTerritory"-->
<!-- :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"-->
<!-- :type="'select'"-->
<!-- :triggerChange="false" :dictCode="'duty_territory'"/>-->
</a-form-model-item>
</a-col>
<a-col :span='9'>
@@ -99,6 +105,7 @@ export default {
loading: false,
editId: '',
RelatedItemList:[],
dutyTerritory:[],
columns: [
{
title: this.$t('areaOfResponsibility'),
@@ -180,6 +187,7 @@ export default {
mounted() {
this.loadData()
this.getRelatedItemList()
this.getdutyTerritory()
},
methods: {
getRelatedItemList(){
@@ -207,6 +215,13 @@ export default {
}
})
},
getdutyTerritory(){
getAction('sys/dict/getDictItems/duty_territory', { }).then((res) => {
if (res.success) {
this.dutyTerritory = res.result
}
})
},
// 法规技术评估列表
handletechnical(){
jero-web/src/views/regulationsKanban/index.vue
+5 -3
View File
@@ -83,9 +83,9 @@
:row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
:columns="columns"
>
<span slot="projectName" slot-scope="text,record" :title="text">
<span slot="technicalField" slot-scope="text,record" :title="text">
<a @click="entryNameClick(record)">
{{ text && text.length > 15 ? text.slice(0, 14) + '...' : text }}
{{ text && text.length > 23 ? text.slice(0, 22) + '...' : text }}
</a>
</span>
<span slot="operation" slot-scope="text,record">
@@ -183,7 +183,9 @@ export default {
{
title: this.$t('technicalField'),
align: 'center',
dataIndex: 'technologyTerritory_dicText'
dataIndex: 'technologyTerritory_dicText',
width: 350,
scopedSlots: { customRender: 'technicalField' }
},
{
title: this.$t('RegulatoryProcessEvaluationResults'),