FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

合并分支 'dev_20230216' 到 'master'

Browse Source 
Dev 20230216

查看合并请求 laws-foton-slrs/foton-laws-system-front!67
This commit is contained in:
高嵩
2023-04-24 18:27:44 +08:00
parent 21e7d73f05 5c282797c4
commit 1409c2b662
5 changed files with 68 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/qbfs/common/formList.vue
+2 -2
View File
@@ -490,12 +490,12 @@
</el-form-item>
</el-col>
</el-row>
<el-form-item v-show="(form.reviewResults === '2' || form.reviewResults === '3') && opinionsShow2" label="复审理由" prop="reviewResultsContent" style="margin-left: 0;margin-bottom:0;" class="add-form-item form-item-disabled">
<el-form-item v-show="(form.reviewResults === '2' || form.reviewResults === '3') && opinionsShow2" label="理由" prop="reviewResultsContent" style="margin-left: 0;margin-bottom:0;" class="add-form-item form-item-disabled">
<el-input
type="textarea"
:rows="3"
resize="none"
placeholder="请输入复审理由"
placeholder="请输入理由"
v-model="form.reviewResultsContent">
</el-input>
</el-form-item>
src/pages/processCenter/pages/creatProcess/qbfs/step1.vue
+18
View File
@@ -526,6 +526,20 @@
value-format="yyyy-MM-dd"
clearable></el-datePicker>
</el-form-item>
<el-form-item label="起草单位" class="search-item">
<el-input
v-model="replaceLawsNumForm.QCDW"
placeholder="根据起草单位查找"
clearable
:maxlength="100"></el-input>
</el-form-item>
<el-form-item label="标准类别" class="search-item">
<el-input
v-model="replaceLawsNumForm.menuId"
placeholder="根据标准类别查找"
clearable
:maxlength="100"></el-input>
</el-form-item>
<el-form-item class="search-item btn-box">
<el-button
type="primary"
@@ -721,6 +735,8 @@ export default {
pageSize: this.$store.getters.userInfo.configContent,
total: 0,
validFlag: '0',
menuId: "", // 标准类别
QCDW: '' // 起草单位
},
ListModel: false,
saveLoading: false,
@@ -916,6 +932,8 @@ export default {
pageSize: this.$store.getters.userInfo.configContent,
total: 0,
validFlag: '0',
menuId: "", // 标准类别
QCDW: '' // 起草单位
}
this.getReplaceLawsNumRow()
},
src/pages/regulatoryRepository/dataCenter/dataCenterDetail.vue
+18 -2
View File
@@ -37,6 +37,13 @@
class="icon-download"
v-btn-permission="'85f32cb652c38e39c84e4507cc2955c2'"
/>
<i
v-if="isTemplate"
title="下载"
@click="downloadFile(item.id)"
class="icon-download"
v-btn-permission="'85f32cb652c38e39c84e4507cc295555'"
/>
<!-- <i-->
<!-- title="下载带水印"-->
<!-- @click="downloadFileByWater(item.id,item.name)"-->
@@ -59,7 +66,8 @@ export default {
return {
detailInfoForm: {},
detailInfoId: '',
fileList: []
fileList: [],
isTemplate: false
}
},
methods: {
@@ -130,11 +138,19 @@ export default {
}, e => {
});
},
verifyTemplate(){
const id = this.$route.query.treeId
this.$http._getData('/fileMaterialCenter/zlTree/getMoBan',{ id }).then(res => {
if(res.data){
this.isTemplate = res.data.data
}
})
}
},
created() {
this.detailInfoId = this.$route.query.id
console.log('13', this.$route.query.id)
this.verifyTemplate()
},
mounted() {
let fileId
src/pages/regulatoryRepository/dataCenter/index.vue
+6 -2
View File
@@ -492,7 +492,8 @@ export default {
]
},
productModal: false,
productTitle: ''
productTitle: '',
treeId: '',
}
},
methods: {
@@ -601,6 +602,7 @@ export default {
}
if(list1.length > 0){
this.treeList = list1
this.treeId = this.treeList[0].id
}
},
treeClick(treeNode,a,b) {
@@ -610,6 +612,7 @@ export default {
this.attributeEO.treeId = treeNode.id === '1' ? '' : treeNode.id
this.attributeEO.treeName = treeNode.name
this.searchInfo()
this.treeId = treeNode.id
},
selectTreeClick(treeNode) {
this.attributeEO.treeId = treeNode.id === '1' ? '' : treeNode.id
@@ -780,7 +783,8 @@ export default {
this.$router.push({
name: "dataCenterDetail",
query: {
id: row.id
id: row.id,
treeId: this.treeId
}
});
},
src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+24
View File
@@ -1502,6 +1502,20 @@
value-format="yyyy-MM-dd"
clearable></el-datePicker>
</el-form-item>
<el-form-item label="起草单位" class="search-item">
<el-input
v-model="replaceLawsNumForm.QCDW"
placeholder="根据起草单位查找"
clearable
:maxlength="100"></el-input>
</el-form-item>
<el-form-item label="标准类别" class="search-item">
<el-input
v-model="replaceLawsNumForm.menuId"
placeholder="根据标准类别查找"
clearable
:maxlength="100"></el-input>
</el-form-item>
<el-form-item class="search-item btn-box">
<el-button
type="primary"
@@ -1535,6 +1549,12 @@
<a v-if="scope.row.standCode" class="table-jump" @click="handlePreview(scope.row,'fs')">{{ scope.row.standCode }}</a>
</template>
</el-table-column>
<el-table-column
label="企标名称">
<template slot-scope="scope">
<a v-if="scope.row.standName" class="table-jump" @click="handlePreview(scope.row,'fs')">{{ scope.row.standName }}</a>
</template>
</el-table-column>
<el-table-column
prop="issueTime"
label="发布日期"
@@ -1804,6 +1824,8 @@ export default {
pageSize: this.$store.getters.userInfo.configContent,
total: 0,
validFlag: '0',
menuId: "", // 标准类别
QCDW: '' // 起草单位
},
OCRType: '',
OCRTitle: '',
@@ -2667,6 +2689,8 @@ export default {
pageSize: this.$store.getters.userInfo.configContent,
total: 0,
validFlag: '0',
QCDW: '',
menuId: ''
}
this.getReplaceLawsNumRow()
},