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

Merge branch 'develop' of http://gitlab.91isoft.com:90/LAWS/laws-system-front-FOTON into develop

Browse Source
This commit is contained in:
宋伟佳
2021-07-30 17:39:43 +08:00
parent 9bb7f70aa4 fca46dfa9f
commit ca5bb5ce1f
7 changed files with 84 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
+36 -32
View File
@@ -233,20 +233,20 @@
label="标准号/政策号" label="标准号/政策号"
width="170" width="170"
align="center"> align="center">
<template slot-scope="scope"> <!-- <template slot-scope="scope">-->
<div v-if=" scope.row.splitStatus === '0'">{{ scope.row.standNumSplit }}</div> <!-- <div v-if=" scope.row.splitStatus === '0'">{{ scope.row.standNumSplit }}</div>-->
<div v-else>{{ scope.row.showNumber }}</div> <!-- <div v-else>{{ scope.row.showNumber }}</div>-->
</template> <!-- </template>-->
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="standName" prop="standName"
label="标准名称/政策名称" label="标准名称/政策名称"
show-overflow-tooltip show-overflow-tooltip
align="center"> align="center">
<template slot-scope="scope"> <!-- <template slot-scope="scope">-->
<span v-if=" scope.row.splitStatus === '0'">{{ scope.row.standNameSplit }}</span> <!-- <span v-if=" scope.row.splitStatus === '0'">{{ scope.row.standNameSplit }}</span>-->
<span v-else>{{ scope.row.standName }}</span> <!-- <span v-else>{{ scope.row.standName }}</span>-->
</template> <!-- </template>-->
</el-table-column> </el-table-column>
</el-table> </el-table>
</div> </div>
@@ -287,20 +287,20 @@
label="标准号/政策号" label="标准号/政策号"
width="170" width="170"
align="center"> align="center">
<template slot-scope="scope"> <!-- <template slot-scope="scope">-->
<div v-if=" scope.row.splitStatus === '0'">{{ scope.row.standNumSplit }}</div> <!-- <div v-if=" scope.row.splitStatus === '0'">{{ scope.row.standNumSplit }}</div>-->
<div v-else>{{ scope.row.showNumber }}</div> <!-- <div v-else>{{ scope.row.showNumber }}</div>-->
</template> <!-- </template>-->
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="standName" prop="standName"
label="标准名称/政策名称" label="标准名称/政策名称"
show-overflow-tooltip show-overflow-tooltip
align="center"> align="center">
<template slot-scope="scope"> <!-- <template slot-scope="scope">-->
<span v-if=" scope.row.splitStatus === '0'">{{ scope.row.standNameSplit }}</span> <!-- <span v-if=" scope.row.splitStatus === '0'">{{ scope.row.standNameSplit }}</span>-->
<span v-else>{{ scope.row.standName }}</span> <!-- <span v-else>{{ scope.row.standName }}</span>-->
</template> <!-- </template>-->
</el-table-column> </el-table-column>
</el-table> </el-table>
</div> </div>
@@ -374,7 +374,7 @@
page: 1, page: 1,
pageSize: this.$store.getters.userInfo.configContent, pageSize: this.$store.getters.userInfo.configContent,
result: '1', result: '1',
sarType: 'INLAND' standType: 'INLAND'
}, },
spinShow: false, spinShow: false,
standInfoList: [], standInfoList: [],
@@ -513,15 +513,17 @@
for (let i = 0; i < this.selectedList.length; i++) { for (let i = 0; i < this.selectedList.length; i++) {
bringData.push(deposit.get(this.selectedList[i])); bringData.push(deposit.get(this.selectedList[i]));
} }
if (bringData[0].splitStatus === '0') { this.form.itemsNum = bringData[0].showNumber
this.form.itemsNum = bringData[0].standNumSplit this.form.itemsName = bringData[0].standName
this.form.itemsName = bringData[0].standNameSplit // if (bringData[0].splitStatus === '0') {
} else { // this.form.itemsNum = bringData[0].standNumSplit
this.form.itemsNum = bringData[0].showNumber // this.form.itemsName = bringData[0].standNameSplit
this.form.itemsName = bringData[0].standName // } else {
} // this.form.itemsNum = bringData[0].showNumber
// this.form.itemsName = bringData[0].standName
// }
this.form.standId = bringData[0].id this.form.standId = bringData[0].id
this.sarType = bringData[0].sarType this.sarType = bringData[0].standType
this.standId = bringData[0].standId this.standId = bringData[0].standId
this.listModel = false; this.listModel = false;
this.listModel2 = true this.listModel2 = true
@@ -560,13 +562,15 @@
for (let i = 0; i < this.selectedList2.length; i++) { for (let i = 0; i < this.selectedList2.length; i++) {
bringData.push(deposit.get(this.selectedList2[i])); bringData.push(deposit.get(this.selectedList2[i]));
} }
if (bringData[0].splitStatus === '0') { // if (bringData[0].splitStatus === '0') {
this.form.itemsNum1 = bringData[0].standNumSplit // this.form.itemsNum1 = bringData[0].standNumSplit
this.form.itemsName1 = bringData[0].standNameSplit // this.form.itemsName1 = bringData[0].standNameSplit
} else { // } else {
this.form.itemsNum1 = bringData[0].showNumber // this.form.itemsNum1 = bringData[0].showNumber
this.form.itemsName1 = bringData[0].standName // this.form.itemsName1 = bringData[0].standName
} // }
this.form.itemsNum1 = bringData[0].showNumber
this.form.itemsName1 = bringData[0].standName
this.form.oldNumber = bringData[0].id this.form.oldNumber = bringData[0].id
this.listModel2 = false this.listModel2 = false
} else if (this.selectedList2.length > 1) { } else if (this.selectedList2.length > 1) {
src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+8 -8
View File
@@ -1607,14 +1607,14 @@
const json = Object.assign(bringData, bringData.attrInfoCaseMap); const json = Object.assign(bringData, bringData.attrInfoCaseMap);
this.form = JSON.parse(JSON.stringify(json)) this.form = JSON.parse(JSON.stringify(json))
console.log(json,'AAAAAAA') console.log(json,'AAAAAAA')
this.form.qcdw = JSON.parse(JSON.stringify(json)).qcdw ? JSON.parse(JSON.stringify(json)).qcdw.split(',') : [] this.form.qcdw = JSON.parse(JSON.stringify(json)).qcdw && JSON.parse(JSON.stringify(json)).qcdw !== '[]' ? JSON.parse(JSON.stringify(json)).qcdw.split(',') : []
this.form.wssmr = JSON.parse(JSON.stringify(json)).wssmr ? JSON.parse(JSON.stringify(json)).wssmr.split(',') : [] this.form.wssmr = JSON.parse(JSON.stringify(json)).wssmr && JSON.parse(JSON.stringify(json)).wssmr !== '[]' ? JSON.parse(JSON.stringify(json)).wssmr.split(',') : []
this.form.zrgcs = JSON.parse(JSON.stringify(json)).zrgcs ? JSON.parse(JSON.stringify(json)).zrgcs.split(',') : [] this.form.zrgcs = JSON.parse(JSON.stringify(json)).zrgcs && JSON.parse(JSON.stringify(json)).zrgcs !== '[]' ? JSON.parse(JSON.stringify(json)).zrgcs.split(',') : []
this.form.zrbm = JSON.parse(JSON.stringify(json)).zrbm ? JSON.parse(JSON.stringify(json)).zrbm.split(',') : [] this.form.zrbm = JSON.parse(JSON.stringify(json)).zrbm && JSON.parse(JSON.stringify(json)).zrbm !== '[]' ? JSON.parse(JSON.stringify(json)).zrbm.split(',') : []
this.form.syrz = JSON.parse(JSON.stringify(json)).syrz ? JSON.parse(JSON.stringify(json)).syrz.split(',') : [] this.form.syrz = JSON.parse(JSON.stringify(json)).syrz && JSON.parse(JSON.stringify(json)).syrz !== '[]' ? JSON.parse(JSON.stringify(json)).syrz.split(',') : []
this.form.sycpx = JSON.parse(JSON.stringify(json)).sycpx ? JSON.parse(JSON.stringify(json)).sycpx.split(',') : [] this.form.sycpx = JSON.parse(JSON.stringify(json)).sycpx && JSON.parse(JSON.stringify(json)).sycpx !== '[]' ? JSON.parse(JSON.stringify(json)).sycpx.split(',') : []
this.form.nylx = JSON.parse(JSON.stringify(json)).nylx ? JSON.parse(JSON.stringify(json)).nylx.split(',') : [] this.form.nylx = JSON.parse(JSON.stringify(json)).nylx && JSON.parse(JSON.stringify(json)).nylx !== '[]' ? JSON.parse(JSON.stringify(json)).nylx.split(',') : []
this.form.cllx = JSON.parse(JSON.stringify(json)).cllx ? JSON.parse(JSON.stringify(json)).cllx.split(',') : [] this.form.cllx = JSON.parse(JSON.stringify(json)).cllx && JSON.parse(JSON.stringify(json)).cllx !== '[]' ? JSON.parse(JSON.stringify(json)).cllx.split(',') : []
this.defaultCheckedKeys = [this.form.standSystem]; this.defaultCheckedKeys = [this.form.standSystem];
this.defaultCheckedKeys1 = [this.form.cycvppsbm]; this.defaultCheckedKeys1 = [this.form.cycvppsbm];
this.defaultCheckedKeys2 = [this.form.kccvppsbm]; this.defaultCheckedKeys2 = [this.form.kccvppsbm];
src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
+28 -28
View File
@@ -666,13 +666,13 @@
<el-option v-for="item in cbcdOptions" :key="item.value" :label="item.label" :value="item.value"></el-option> <el-option v-for="item in cbcdOptions" :key="item.value" :label="item.label" :value="item.value"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="相关流程" prop="xglc" class="add-form-item form-item-disabled"> <!-- <el-form-item label="相关流程" prop="xglc" class="add-form-item form-item-disabled">-->
<el-input <!-- <el-input-->
v-model="form.xglc" <!-- v-model="form.xglc"-->
placeholder="请输入相关流程" <!-- placeholder="请输入相关流程"-->
clearable <!-- clearable-->
></el-input> <!-- ></el-input>-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item label="关联文件" prop="glwjName" class="add-form-item form-item-disabled"> <el-form-item label="关联文件" prop="glwjName" class="add-form-item form-item-disabled">
<el-input <el-input
disabled disabled
@@ -738,27 +738,27 @@
@click="selectLaws('cbbh'),config.attrName = '采标编号'" @click="selectLaws('cbbh'),config.attrName = '采标编号'"
>{{'手动查找'}}</el-button> >{{'手动查找'}}</el-button>
</el-form-item> </el-form-item>
<el-form-item label="被引用标准" prop="byybj" class="add-form-item form-item-disabled"> <!-- <el-form-item label="被引用标准" prop="byybj" class="add-form-item form-item-disabled">-->
<el-input <!-- <el-input-->
v-model="form.byybj" <!-- v-model="form.byybj"-->
placeholder="请输入被引用标准" <!-- placeholder="请输入被引用标准"-->
clearable <!-- clearable-->
></el-input> <!-- ></el-input>-->
<el-button <!-- <el-button-->
type="primary" <!-- type="primary"-->
class="common-button-primary" <!-- class="common-button-primary"-->
size="mini" <!-- size="mini"-->
style="position:absolute;top: 10px;right: 0;" <!-- style="position:absolute;top: 10px;right: 0;"-->
@click="selectLaws('byybj'),config.attrName = '被引用标准'" <!-- @click="selectLaws('byybj'),config.attrName = '被引用标准'"-->
>{{'手动查找'}}</el-button> <!-- >{{'手动查找'}}</el-button>-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item v-if="form.standInData === '0'" label="参会记录" prop="chjl" class="add-form-item form-item-disabled"> <!-- <el-form-item v-if="form.standInData === '0'" label="参会记录" prop="chjl" class="add-form-item form-item-disabled">-->
<el-input <!-- <el-input-->
v-model="form.chjl" <!-- v-model="form.chjl"-->
placeholder="请输入参会记录" <!-- placeholder="请输入参会记录"-->
clearable <!-- clearable-->
></el-input> <!-- ></el-input>-->
</el-form-item> <!-- </el-form-item>-->
</el-col> </el-col>
</el-row> </el-row>
</div> </div>
src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+1 -1
View File
@@ -4090,7 +4090,7 @@ export default {
// 取最外层目录id // 取最外层目录id
search.menuId = this.selectSarMenu.id search.menuId = this.selectSarMenu.id
search.idlist = [] search.idlist = []
search.sarType = 'INLAND' search.standType = 'INLAND'
if (flag === 1) { if (flag === 1) {
this.$confirm('确定移除该条标准?', '提示', { this.$confirm('确定移除该条标准?', '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+1 -1
View File
@@ -3672,7 +3672,7 @@ export default {
// 取最外层目录id // 取最外层目录id
search.menuId = this.selectSarMenu.id search.menuId = this.selectSarMenu.id
search.idlist = [] search.idlist = []
search.sarType = 'FOREIGN' search.standType = 'FOREIGN'
if (flag === 1) { if (flag === 1) {
this.$confirm('确定移除该条标准?', '提示', { this.$confirm('确定移除该条标准?', '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
+6 -6
View File
@@ -60,7 +60,7 @@
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="standNumber" prop="standNumber"
label="项目编号" label="标准号"
fixed="left" fixed="left"
width="260px" width="260px"
> >
@@ -580,7 +580,7 @@ export default {
this.active = -1 this.active = -1
} }
} }
// 考虑如果没有当前时间， 颜色怎么设置 // 考虑如果没有当前时间，颜色怎么设置
}) })
this.selectTableDataList() this.selectTableDataList()
}, },
@@ -611,8 +611,8 @@ export default {
} }
const exportURL = interfaceUrl + 'sarStandProjectLibrary/exportStandAttrInfoExcel?' + const exportURL = interfaceUrl + 'sarStandProjectLibrary/exportStandAttrInfoExcel?' +
'exportType' + this.saveExportType + '&ids=' + ids + '&exportName=' + this.exportName + '&id=' + this.localProEO.id 'exportType' + this.saveExportType + '&ids=' + ids + '&exportName=' + this.exportName + '&id=' + this.localProEO.id
console.log(exportURL) console.log(exportURL,'_self')
window.open(exportURL) window.open(exportURL,'_self')
this.$message.success('导出信息成功') this.$message.success('导出信息成功')
} }
} else if (this.saveExportType === 'all') { } else if (this.saveExportType === 'all') {
@@ -629,8 +629,8 @@ export default {
} }
const exportURL = interfaceUrl + 'sarStandProjectLibrary/exportStandAttrInfoExcel?' + const exportURL = interfaceUrl + 'sarStandProjectLibrary/exportStandAttrInfoExcel?' +
'exportType' + this.saveExportType + '&ids=' + ids + '&exportName=' + this.exportName + '&id=' + this.localProEO.id 'exportType' + this.saveExportType + '&ids=' + ids + '&exportName=' + this.exportName + '&id=' + this.localProEO.id
console.log(exportURL) console.log(exportURL,'_self')
window.open(exportURL) window.open(exportURL,'_self')
this.$message.success('导出信息成功') this.$message.success('导出信息成功')
} }
} }
src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
+4 -4
View File
@@ -119,7 +119,7 @@
align="center"> align="center">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="standId" prop="standSerialNumber"
fixed="left" fixed="left"
width="180" width="180"
label="标准号"> label="标准号">
@@ -128,7 +128,7 @@
<!--&lt;!&ndash; {{ scope.row.standId }}&ndash;&gt;--> <!--&lt;!&ndash; {{ scope.row.standId }}&ndash;&gt;-->
<!-- </template>--> <!-- </template>-->
<template slot-scope="scope"> <template slot-scope="scope">
<a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standId }}</a> <a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSerialNumber }}</a>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -137,7 +137,7 @@
width="180" width="180"
label="标准名称"> label="标准名称">
<template slot-scope="scope"> <template slot-scope="scope">
<a @click="detailsStandard(scope.row)" class="table-jump">{{ scope.row.standName }}</a> <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -613,7 +613,7 @@ export default {
let routeUrl = this.$router.resolve({ let routeUrl = this.$router.resolve({
name: 'OtherStandardDetails', name: 'OtherStandardDetails',
params: { params: {
id: item.id, id: item.standId,
pageType: 'FOREIGN_STAND' pageType: 'FOREIGN_STAND'
// pageType: item.standType + '_STAND' // pageType: item.standType + '_STAND'
} }