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

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

Browse Source
This commit is contained in:
super_liu
2022-01-12 16:41:22 +08:00
parent 326179a65f da70c6dfbf
commit 591f3ec97d
7 changed files with 494 additions and 455 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/details/otherStandardDetails/index.vue
+8 -2
View File
@@ -269,10 +269,16 @@
<!-- <p class="half" v-if="saveStandType === 'INLAND_STAND'"><label style=" margin-right: 150px;">标准性质</label><span>{{--> <!-- <p class="half" v-if="saveStandType === 'INLAND_STAND'"><label style=" margin-right: 150px;">标准性质</label><span>{{-->
<!-- standMap[sarStandardsInfoEO.standNature] || '-'--> <!-- standMap[sarStandardsInfoEO.standNature] || '-'-->
<!-- }}</span></p>--> <!-- }}</span></p>-->
<p class="half" v-if="saveStandType === 'INLAND_STAND'"><label <!--<p class="half" v-if="saveStandType === 'INLAND_STAND'"><label
style=" margin-right: 150px;">标准体系</label><span>{{ style=" margin-right: 150px;">标准体系</label><span>{{
sarStandardsInfoEO.standSystem || '-' sarStandardsInfoEO.standSystem || '-'
}}</span></p> }}</span>
</p>-->
<p class="half"><label
style=" margin-right: 150px;">标准体系</label><span>{{
sarStandardsInfoEO.standSystem || '-'
}}</span>
</p>
<p class="half"> <p class="half">
<label style=" margin-right: 84px;">是否纳入认证清单</label><span>{{ <label style=" margin-right: 84px;">是否纳入认证清单</label><span>{{
sarStandardsInfoEO.isRelateAccess ? (sarStandardsInfoEO.isRelateAccess === '1' ? '是' : '否') : '-' sarStandardsInfoEO.isRelateAccess ? (sarStandardsInfoEO.isRelateAccess === '1' ? '是' : '否') : '-'
src/pages/localTool/standardWarning.vue
+11 -8
View File
@@ -152,39 +152,40 @@
<a @click="handlePreview(scope.row)">{{ scope.row.standName }}</a> <a @click="handlePreview(scope.row)">{{ scope.row.standName }}</a>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="itemsNum" label="条款编号" width="200" align="center"> <el-table-column prop="itemsNum" label="条款编号" width="120" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<a @click="handlePreview(scope.row)">{{ scope.row.itemsNum }}</a> <a @click="handlePreview(scope.row)">{{ scope.row.itemsNum }}</a>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="itemsName" width="320" label="条款名称" align="center"> <el-table-column prop="itemsName" width="320" label="条款名称" align="center" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<a @click="handlePreview(scope.row)">{{ scope.row.itemsName }}</a> <a @click="handlePreview(scope.row)">{{ scope.row.itemsName }}</a>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="termsConditions" label="条款内容" width="400" align="center" show-overflow-tooltip></el-table-column>
<el-table-column prop="issueTime" label="发布日期" width="120" align="center"> <el-table-column prop="issueTime" label="发布日期" width="120" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.issueTime ? scope.row.issueTime.substring(0, 10) : '' }}</span> <span>{{ scope.row.issueTime ? scope.row.issueTime.substring(0, 10) : '' }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="ssrq" label="实施日期" width="120" align="center"> <el-table-column prop="ssrq" label="实施日期" width="200" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.ssrq }}</span> <span>{{ scope.row.ssrq }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="xcxssrq" label="新车型实施日期" width="150" align="center"> <el-table-column prop="xcxssrq" label="新车型实施日期" width="200" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.xcxssrq }}</span> <span>{{ scope.row.xcxssrq }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="zccssrq" label="在产车实施日期" width="150" align="center"> <el-table-column prop="zccssrq" label="在产车实施日期" width="200" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.zccssrq }}</span> <span>{{ scope.row.zccssrq }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="applyType" label="适用车型" align="center"> <el-table-column prop="applyType" label="适用车型" width="150" align="center">
</el-table-column> </el-table-column>
<!-- <el-table-column label="操作" width="100" align="center" v-if="isShowBtn" fixed="right"> <el-table-column label="操作" width="100" align="center" v-if="isShowBtn" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
size="mini" size="mini"
@@ -192,7 +193,7 @@
@click="cancelWarning(scope.$index, scope.row)">取消预警 @click="cancelWarning(scope.$index, scope.row)">取消预警
</el-button> </el-button>
</template> </template>
</el-table-column>--> </el-table-column>
</el-table> </el-table>
<pagination <pagination
style="position: static;" style="position: static;"
@@ -549,12 +550,14 @@ export default {
this.$http.get('sys/EarlyWarning/ChangePermissions', { this.$http.get('sys/EarlyWarning/ChangePermissions', {
id: row.id, id: row.id,
}, {}, res => { }, {}, res => {
if (res.ok === true) {
this.pageConfig.page = 1 this.pageConfig.page = 1
this.pageConfig.newPolicyPage = 1 this.pageConfig.newPolicyPage = 1
this.pageConfig.oldPolicyPage = 1 this.pageConfig.oldPolicyPage = 1
this.searchBtnClick() this.searchBtnClick()
this.getEarlyDate() this.getEarlyDate()
} }
}
) )
}).catch(() => { }).catch(() => {
this.$message.warning('取消事件') this.$message.warning('取消事件')
src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+2 -1
View File
@@ -128,7 +128,8 @@
</el-radio-group> </el-radio-group>
<el-button @click="form.isRelateAccess = ''" v-show="form.isRelateAccess !== null>0" size="mini" type="primary" circle icon="el-icon-close" style="margin-left: 10px;margin-bottom: 3px"></el-button> <el-button @click="form.isRelateAccess = ''" v-show="form.isRelateAccess !== null>0" size="mini" type="primary" circle icon="el-icon-close" style="margin-left: 10px;margin-bottom: 3px"></el-button>
</el-form-item> </el-form-item>
<el-form-item v-if="verifySarStandard && form.standInData === '0' " label="标准体系" prop="standSystem" class="add-form-item form-item-disabled"> <!--v-if="verifySarStandard && form.standInData === '0' " -->
<el-form-item label="标准体系" prop="standSystem" class="add-form-item form-item-disabled">
<el-input v-model="form.standSystem" clearable placeholder="选择标准体系" @click.native="choiceZRR1('standSystem', '标准体系', form.standSystem)"></el-input> <el-input v-model="form.standSystem" clearable placeholder="选择标准体系" @click.native="choiceZRR1('standSystem', '标准体系', form.standSystem)"></el-input>
<tree-select-new <tree-select-new
:key="key" :key="key"
src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
+1 -1
View File
@@ -132,7 +132,7 @@
<el-radio label="2">否</el-radio> <el-radio label="2">否</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item v-if="form.standInData === '0'" label="标准体系" prop="standSystem" class="add-form-item form-item-disabled"> <el-form-item label="标准体系" prop="standSystem" class="add-form-item form-item-disabled">
<el-input v-model="form.standSystem" disabled></el-input> <el-input v-model="form.standSystem" disabled></el-input>
</el-form-item> </el-form-item>
<el-form-item v-if="form.standInData === '1'" label="标签" prop="gxhbq" class="add-form-item form-item-disabled"> <el-form-item v-if="form.standInData === '1'" label="标签" prop="gxhbq" class="add-form-item form-item-disabled">
src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
+1 -1
View File
@@ -131,7 +131,7 @@
<el-radio label="2">否</el-radio> <el-radio label="2">否</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item v-if="form.standInData === '0'" label="标准体系" prop="standSystem" class="add-form-item form-item-disabled"> <el-form-item label="标准体系" prop="standSystem" class="add-form-item form-item-disabled">
<el-input v-model="form.standSystem" disabled></el-input> <el-input v-model="form.standSystem" disabled></el-input>
</el-form-item> </el-form-item>
<el-form-item v-if="form.standInData === '1'" label="标签" prop="gxhbq" class="add-form-item form-item-disabled"> <el-form-item v-if="form.standInData === '1'" label="标签" prop="gxhbq" class="add-form-item form-item-disabled">
src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
+1 -1
View File
@@ -127,7 +127,7 @@
</el-radio-group> </el-radio-group>
<el-button @click="form.isRelateAccess = ''" v-show="form.isRelateAccess !== null>0" size="mini" type="primary" circle icon="el-icon-close" style="margin-left: 10px;margin-bottom: 3px"></el-button> <el-button @click="form.isRelateAccess = ''" v-show="form.isRelateAccess !== null>0" size="mini" type="primary" circle icon="el-icon-close" style="margin-left: 10px;margin-bottom: 3px"></el-button>
</el-form-item> </el-form-item>
<el-form-item v-if="form.standInData === '0'" label="标准体系" prop="standSystem" class="add-form-item form-item-disabled"> <el-form-item label="标准体系" prop="standSystem" class="add-form-item form-item-disabled">
<el-input v-model="form.standSystem" placeholder="选择标准体系" @click.native="choiceZRR1('standSystem', '标准体系', form.standSystem)"></el-input> <el-input v-model="form.standSystem" placeholder="选择标准体系" @click.native="choiceZRR1('standSystem', '标准体系', form.standSystem)"></el-input>
<tree-select-new <tree-select-new
:key="key" :key="key"
src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+37 -8
View File
@@ -997,17 +997,15 @@
<el-option value="2" label="否" key="2"></el-option> <el-option value="2" label="否" key="2"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<!-- <el-form-item <el-form-item
prop="standSystem" prop="standSystem"
label-width="150px" label-width="150px"
class="add-form-item" class="add-form-item"
> >
<template slot="label">标准体系</template> <template slot="label">标准体系</template>
<tree-select <el-input v-model="sarStandardsInfoEO.standSystem" placeholder="选择标准体系"
:data="standSystemOptions" @click.native="choiceZRR1('standSystem', '标准体系', sarStandardsInfoEO.standSystem)"></el-input>
:defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys" </el-form-item>
:nodeKey="nodeKey" @popoverHide="popoverHide"></tree-select>
</el-form-item>-->
</template> </template>
<template v-for="field in displayLocation.child"> <template v-for="field in displayLocation.child">
<template v-if="field.attrField === 'EOPSSRQ'"> <template v-if="field.attrField === 'EOPSSRQ'">
@@ -1717,6 +1715,16 @@
:nodeList="nodeListZRBM" :nodeList="nodeListZRBM"
@checkedRole="drawerCheckZRBM" @checkedRole="drawerCheckZRBM"
/> />
<tree-select-new
:multiple=false
:lazy=false
:modalShowFlag="modalShowFlag1"
:drawerTitle="drawerTitle"
width="500"
:data="standSystemOptions"
:defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys"
:nodeKey="nodeKey" @popoverHide="popoverHide" @popoverHideCancel="popoverHideCancel"></tree-select-new>
</div> </div>
</template> </template>
@@ -2453,7 +2461,7 @@ export default {
orgData: [], orgData: [],
delLoading: false, delLoading: false,
standState: '', standState: '',
filterText: '' filterText: '',
} }
}, },
props: {}, props: {},
@@ -2649,8 +2657,18 @@ export default {
}, },
popoverHide(checkedIds, checkedData) { popoverHide(checkedIds, checkedData) {
if (checkedData) { if (checkedData) {
this.sarStandardsInfoEO.standSystem = checkedData.id if (checkedData.length > 0) {
this.sarStandardsInfoEO.standSystem = checkedData.map(item => item.menuName).join(",")
} else {
this.sarStandardsInfoEO.standSystem = checkedData.menuName
} }
}
this.modalShowFlag1 = false
this.$forceUpdate()
},
popoverHideCancel() {
this.modalShowFlag1 = false
}, },
closeModal() { closeModal() {
this.productModal = false this.productModal = false
@@ -5053,6 +5071,11 @@ export default {
this.advanceSearchMapping['ZRBM'] = nameList this.advanceSearchMapping['ZRBM'] = nameList
} }
}, },
choiceZRR1(type, title, id) {
this.drawerTitle = title
this.modalShowFlag1 = true
},
}, },
computed: { computed: {
// 是否拥有拖拽权限 // 是否拥有拖拽权限
@@ -5154,6 +5177,7 @@ export default {
/deep/ .el-table--scrollable-x .el-table__body-wrapper { /deep/ .el-table--scrollable-x .el-table__body-wrapper {
overflow-x: scroll; overflow-x: scroll;
} }
#left { #left {
width: calc(30% - 5px); width: calc(30% - 5px);
height: 100%; height: 100%;
@@ -5172,9 +5196,11 @@ export default {
width: 70%; width: 70%;
height: 100%; height: 100%;
} }
/deep/ .contentTitle { /deep/ .contentTitle {
width: 100%; width: 100%;
} }
/deep/ .el-drawer__container { /deep/ .el-drawer__container {
.prc-content-border { .prc-content-border {
/*border: none;*/ /*border: none;*/
@@ -5182,6 +5208,7 @@ export default {
padding: 0 20px 0; padding: 0 20px 0;
} }
} }
/deep/ .icon-tree { /deep/ .icon-tree {
margin: 0 5px 0 10px; margin: 0 5px 0 10px;
position: relative; position: relative;
@@ -5286,6 +5313,7 @@ export default {
/deep/ .label-input-form .add-form-item .el-form-item__content .el-input .el-input__inner { /deep/ .label-input-form .add-form-item .el-form-item__content .el-input .el-input__inner {
width: 280px; width: 280px;
} }
//background: #fff; //background: #fff;
display: flex; display: flex;
height: 100%; height: 100%;
@@ -5340,6 +5368,7 @@ export default {
overflow: hidden; overflow: hidden;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
.collection-btn { .collection-btn {
padding: 0; padding: 0;
border: none; border: none;