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

Merge branch 'develop' into 'FOTON'

Browse Source 
Develop

See merge request LAWS/laws-system-front-FOTON!257
This commit is contained in:
王夏晖
2021-12-27 18:54:18 +08:00
parent 0f6eff3c74 4d4e92dc9c
commit e179416f2d
8 changed files with 332 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+12 -12
View File
@@ -2125,14 +2125,15 @@ export default {
const json = Object.assign(bringData, bringData.attrInfoCaseMap);
this.form = JSON.parse(JSON.stringify(json))
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 !== '[]' ? JSON.parse(JSON.stringify(json)).wssmr.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 !== '[]' ? JSON.parse(JSON.stringify(json)).zrbm.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 !== '[]' ? JSON.parse(JSON.stringify(json)).sycpx.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 !== '[]' ? JSON.parse(JSON.stringify(json)).cllx.split(',') : ''
console.log(this.form)
this.form.qcdw = JSON.parse(JSON.stringify(json)).qcdw && JSON.parse(JSON.stringify(json)).qcdw !== '[]' ? JSON.parse(JSON.stringify(json)).qcdw : ''
this.form.wssmr = JSON.parse(JSON.stringify(json)).wssmr && JSON.parse(JSON.stringify(json)).wssmr !== '[]' ? JSON.parse(JSON.stringify(json)).wssmr : ''
this.form.zrgcs = JSON.parse(JSON.stringify(json)).zrgcs && JSON.parse(JSON.stringify(json)).zrgcs !== '[]' ? JSON.parse(JSON.stringify(json)).zrgcs : ''
this.form.zrbm = JSON.parse(JSON.stringify(json)).zrbm && JSON.parse(JSON.stringify(json)).zrbm !== '[]' ? JSON.parse(JSON.stringify(json)).zrbm : ''
this.form.syrz = JSON.parse(JSON.stringify(json)).syrz && JSON.parse(JSON.stringify(json)).syrz !== '[]' ? JSON.parse(JSON.stringify(json)).syrz : ''
this.form.sycpx = JSON.parse(JSON.stringify(json)).sycpx && JSON.parse(JSON.stringify(json)).sycpx !== '[]' ? JSON.parse(JSON.stringify(json)).sycpx : ''
this.form.nylx = JSON.parse(JSON.stringify(json)).nylx && JSON.parse(JSON.stringify(json)).nylx !== '[]' ? JSON.parse(JSON.stringify(json)).nylx : ''
this.form.cllx = JSON.parse(JSON.stringify(json)).cllx && JSON.parse(JSON.stringify(json)).cllx !== '[]' ? JSON.parse(JSON.stringify(json)).cllx : ''
this.defaultCheckedKeys = [this.form.standSystem];
this.defaultCheckedKeys1 = [this.form.cycvppsbm];
this.defaultCheckedKeys2 = [this.form.kccvppsbm];
@@ -2143,10 +2144,9 @@ export default {
this.key3++
this.form.standType = this.form.standInData === '0' ? 'INLAND' : 'FOREIGN'
this.form.standYear = bringData.standYear ? parseInt(bringData.standYear) : ''
console.log(this.form)
this.form.ssrq = this.form.ssrq ? this.$moment(this.form.ssrq).format("YYYY-MM-DD") : null
this.form.zccssrq = this.form.zccssrq ? this.$moment(this.form.zccssrq).format("YYYY-MM-DD") : null
this.form.xcxssrq = this.form.xcxssrq ? this.$moment(this.form.xcxssrq).format("YYYY-MM-DD") : null
// this.form.ssrq = this.form.ssrq ? this.$moment(this.form.ssrq).format("YYYY-MM-DD") : null
// this.form.zccssrq = this.form.zccssrq ? this.$moment(this.form.zccssrq).format("YYYY-MM-DD") : null
// this.form.xcxssrq = this.form.xcxssrq ? this.$moment(this.form.xcxssrq).format("YYYY-MM-DD") : null
this.form.prcNum = this.prcNum
this.form.prcName = this.prcName
this.form['id'] = bringData.id
src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
+25
View File
@@ -365,6 +365,14 @@
- -
</div>
</el-form-item>
<el-form-item v-if="form.standInData === '1'" label="修订本" prop="xdbName" class="add-form-item form-item-disabled">
<div v-if="xdbFileMap.length>0" v-for="(value,index) in this.xdbFileMap" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile('xdb',value.id)">
{{value.name}}
</div>
<div v-else>
- -
</div>
</el-form-item>
<!-- ************************************* 2021/11/9 把"解读文件"改为"相关文件"*************************************-->
<el-form-item v-if="form.standInData === '0'" label="相关文件" prop="jdwjName" class="add-form-item form-item-disabled">
<!-- ************************************* 2021/11/9 把"解读文件"改为"相关文件"*************************************-->
@@ -548,6 +556,17 @@
></el-option>
</el-select>
</el-form-item>
<el-form-item v-show="form.standInData === '0'" label="我司参与制标排名" prop="cyzbpm" class="add-form-item form-item-disabled">
<el-select :popper-append-to-body="false" v-model="form.cyzbpm" placeholder="请选择我司参与制标排名" clearable>
<el-option
v-for="item in cyzbpmOptions"
placeholder="请选择"
:key="item.value"
:value="item.value"
:label="item.label"
></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
</div>
@@ -797,6 +816,7 @@
zqyjgFileMap: [],
jdwjFileMap: [],
kwjFileMap: [],
xdbFileMap: [],
glwjFileMap: [],
caFileMap: [],
zbjbdFileMap: [],
@@ -896,6 +916,7 @@
qcdw: '', // 起草单位
wssmr: '', // 我司署名人
cysd: '', // 我司参与深度
cyzbpm:[],// 我司参与制标排名
cllx: '', // 适用车型
nylx: '',// 能源类型
sycpx: '',// 适用产品线
@@ -953,6 +974,7 @@
categoryOptions: [], // 能源类型
applyAuthOptions: [], // 适用认证
cysdOptions: [], // 我司参与深度
cyzbpmOptions:[], // 我司参与制标排名
wssmrOptions: [], // 我司署名人
qcdwOptions: [], // 起草单位
sycpxOptions: [], // 适用产品线
@@ -1137,6 +1159,8 @@
// jdwjFileMap: {},
this.kwjFileMap=this.assemble(processForm.kwj,processForm.kwjName);
// kwjFileMap: {},
this.xdbFileMap=this.assemble(processForm.xdb,processForm.xdbName);
// xdbFileMap: {},
this.glwjFileMap=this.assemble(processForm.glwj,processForm.glwjName);
// glwjFileMap: {},
this.caFileMap=this.assemble(processForm.ca,processForm.caName);
@@ -1305,6 +1329,7 @@
this.categoryOptions = res.data.NYLXCLASS // 能源类型
this.applyAuthOptions = res.data.SYRZCLASS // 适用认证
this.cysdOptions = res.data.WSCYSD // 我司参与深度
this.cyzbpmOptions = res.data.CYZBPM // 我司参与制标排名
this.wssmrOptions = res.data.WSSMR // 我司署名人
this.qcdwOptions = res.data.QCDW // 起草单位
this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线
src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
+1 -1
View File
@@ -2374,7 +2374,7 @@ export default {
}).then(res => {
if (res) {
const processForm = JSON.parse(res.mesg)
this.commentText = processForm.commentText
// this.commentText = processForm.commentText
if (processForm.form === undefined) {
this.getFormFieldList(processForm)
} else {
src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue
+1 -1
View File
@@ -578,7 +578,7 @@ export default {
if (valid) {
this.isSubmit = true
let paramsInfo = new FormData()
paramsInfo.append('id', this.bpnId || '')
// paramsInfo.append('id', this.bpnId || '')
paramsInfo.append('createUser', this.$store.getters.userInfo.userId)
paramsInfo.append('createUserName', this.$store.getters.userInfo.userName)
paramsInfo.append('type', '8')
src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue
+1 -1
View File
@@ -290,13 +290,13 @@ export default {
this.$message.warning("请选择至少一条数据进行分发责任人");
} else {
this.nodeList = []
this.drawerTitle = '选择分发责任人'
this.nodeList.push(id)
this.modalshowflag = true
}
},
// 每行选择负责人点击操作
clickOpen(val, id) {
console.log(val)
this.$refs.multipleTable.clearSelection()
this.rowDutyPeople = val
this.nodeList = []
src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue
+8 -6
View File
@@ -77,7 +77,7 @@
:rows="3"
resize="none"
placeholder="请输入意见"
v-model="commentText">
v-model="textarea">
</el-input>
</div>
</el-collapse-item>
@@ -186,7 +186,7 @@ export default {
passInfo: 0,
detailData: [],
loading: false,
commentText: '', // 意见
textarea: '', // 意见
title: '', // 新增编辑抽屉标题
ListModel: false, // 新增编辑抽屉开关
nonSearch: {
@@ -266,6 +266,7 @@ export default {
if (fileData[i].name.slice(0,fileData[i].name.indexOf('(')) === this.$store.getters.userInfo.userName) {
this.dataList = fileData[0].standardInfoList
this.standardInfoList = this.dataList
this.textarea = JSON.parse(JSON.stringify(item)).textarea
}
}
} else {
@@ -274,6 +275,7 @@ export default {
if (fileData[i].name.slice(0,fileData[i].name.indexOf('(')) === this.$store.getters.userInfo.userName) {
this.dataList = fileData[i].standardInfoList
this.standardInfoList = this.dataList
this.textarea = JSON.parse(JSON.stringify(item)).commentText
}
}
}
@@ -311,12 +313,12 @@ export default {
},
// 退回按钮
handleSubmitNo() {
if (this.commentText) {
if (this.textarea) {
var json = {
passInfo: 1,
actionFlag: 1,
commentText: this.commentText,
commentText: this.textarea,
standardInfoList: this.standardInfoList,
}
const params = new FormData();
@@ -370,7 +372,7 @@ export default {
_formData.append('json', JSON.stringify({
// roleForm: this.roleForm,
dockUserList: list,
commentText: this.commentText
textarea: this.textarea
}))
saveTaskForPub(_formData).then(res => {
this.saveLoading = false
@@ -411,7 +413,7 @@ export default {
let json = {
passInfo: this.passInfo,
responUserList: list,
commentText: this.commentText,
commentText: this.textarea,
actionFlag: 0
}
if(flag)return;
src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
-1
View File
@@ -4566,7 +4566,6 @@ export default {
this.standNatureOptions = res.data.SARPROPERTY // 标准性质
this.standStateOptions = res.data.TEXTSTATUSBUSS // 文本状态
this.standSystemOptions = res.data.TXLBBUSS // 标准体系
console.log(this.standSystemOptions);
this.applyArcticOptions.options = res.data.ENERGYTYPES // 适用车型
this.categoryOptions.options = res.data.NYLXCLASS // 能源类型
this.applyAuthOptions.options = res.data.SYRZCLASS // 适用认证
src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue
+284 -29
View File
@@ -263,40 +263,42 @@
v-model="addForm.unit">
</el-input>
<el-input
:key="addForm.unit"
:config="addForm"
clearable
v-model="addForm.unitName"
placeholder="请选择起草责任单位"
readonly
@click.native="choiceZRBM(addForm.unit)">
</el-input>
<!-- <el-tooltip v-if="addForm.unit" class="item" effect="dark" :content="addForm.unit" placement="top-start">-->
<!-- <el-input-->
<!-- :disabled="DrawerType === 'see'"-->
<!-- clearable-->
<!-- v-model="addForm.unit"-->
<!-- placeholder="选择或输入起草单位">-->
<!-- </el-input>-->
<!-- </el-tooltip>-->
<!-- <div v-else>-->
<!-- <el-input-->
<!-- :disabled="DrawerType === 'see'"-->
<!-- clearable-->
<!-- v-model="addForm.unit"-->
<!-- placeholder="选择或输入起草单位">-->
<!-- </el-input>-->
<!-- </div>-->
<!-- <div>-->
<!-- <el-button-->
<!-- :disabled="DrawerType === 'see'"-->
<!-- size="mini"-->
<!-- type="primary"-->
<!-- @click="QCDWClick"-->
<!-- class="common-button-primary">手动查找</el-button>-->
<!-- </div>-->
</div>
</el-form-item>
<el-form-item label="企业标准" style="width: 100%; margin-right:10px" class="add-form-item" prop="rqbJson" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
<div style="display: flex;justify-content: space-between;align-items: center;">
<el-input
style="display: none;"
v-model="addForm.rqbJson">
</el-input>
<el-input
clearable
v-model="addForm.rqbName"
placeholder="请选择企业标准"
readonly
@click.native="choiceQYBZ(addForm.rqbJson)">
</el-input>
</div>
</el-form-item>
<el-form-item label="体系结构" style="width: 100%; margin-right:10px" class="add-form-item" prop="tsJson" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
<div style="display: flex;justify-content: space-between;align-items: center;">
<el-input
style="display: none;"
v-model="addForm.tsJson">
</el-input>
<el-input
clearable
v-model="addForm.tsJsonName"
placeholder="请选择体系结构"
readonly
@click.native="choiceTXJG(addForm.tsJson)">
</el-input>
</div>
</el-form-item>
</el-form>
@@ -361,6 +363,128 @@
:nodeList="nodeListZRBM"
@checkedRole="drawerCheckZRBM"
/>
<el-drawer
title="选择企业标准"
:visible.sync="QYBZmodal"
size="900px"
custom-class="demo-drawer"
>
<div class="standardForComments">
<div class="content" style="height: 100%;">
<!-- 顶部工具栏 -->
<div class="search-area">
<el-form :model="QYBZform" inline class="label-input-form">
<el-formItem label="标准号" prop="numberName" class="search-item">
<el-input v-model="QYBZform.standCode" clearable placeholder="根据标准号查找" :maxlength="100"/>
</el-formItem>
<el-formItem label="标准名称" prop="standName" class="search-item">
<el-input v-model="QYBZform.standName" clearable placeholder="根据标准名称查找" :maxlength="100"/>
</el-formItem>
<el-formItem class="search-item btn-box">
<el-button
type="primary"
size="mini"
class="common-button-primary"
@click="QYBZget">查询
</el-button>
<el-button
class="common-button-default"
size="mini"
@click="clearQYBZ">清空
</el-button>
</el-formItem>
</el-form>
</div>
<div class="table-wrap" style="height: 100%;">
<div style="position: absolute;height: calc(100% - 10px);width: 100%;">
<el-table
ref="selection"
:data="QYBZList"
tooltip-effect="dark"
style="width: 100%;padding:0 0 20px 0;"
height="100%"
border
@selection-change="handleSelectionQYBZ"
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
<el-table-column type="selection" width="55" align="center"/>
<el-table-column
label="企标编号"
prop="standCode"
>
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="standName"
label="中文名称"
>
</el-table-column>
<el-table-column
prop="issueTime"
label="发布日期"
width="120"
>
<template slot-scope="scope">
<span>{{scope.row.issueTime ? scope.row.issueTime.slice(0, 10) : ''}}</span>
</template>
</el-table-column>
<el-table-column
prop="putTime"
label="实施日期"
sortable
width="120"
>
<template slot-scope="scope">
<span>{{scope.row.putTime ? scope.row.putTime.slice(0, 10) : ''}}</span>
</template>
</el-table-column>
<el-table-column
prop="standStatusShow"
label="文本状态"
width="110"
>
<template slot-scope="scope">
<span>{{scope.row.standStatusShow}}</span>
</template>
</el-table-column>
</el-table>
</div>
<pagination :page="QYBZform.page" :total="QYBZform.total" @pageChange="QYBZpageChange" @pageSizeChange="QYBZpageSizeChange"></pagination>
<loading :loading="QYBZShow">数据加载中……</loading>
</div>
</div>
<div class="demo-drawer-footer">
<el-button size="mini" @click="QYBZcloseDrawer">取消</el-button>
<el-button type="primary" size="mini" @click="QYBZenterDrawer">导入</el-button>
</div>
</div>
</el-drawer>
<el-drawer
title="选择体系结构"
:visible.sync="TXJGmodal"
size="900px"
custom-class="demo-drawer"
>
<div class="standardForComments">
<div class="content" style="height: 100%;">
<el-tree
v-if="TXJGmodal"
ref="TXJGTree"
:data="standSystemOptions"
show-checkbox
node-key="id"
default-expand-all
check-strictly
:default-checked-keys="TXJGList"
:props="defaultProps">
</el-tree>
</div>
<div class="demo-drawer-footer">
<el-button size="mini" @click="TXJGcloseDrawer">取消</el-button>
<el-button type="primary" size="mini" @click="TXJGenterDrawer">确定</el-button>
</div>
</div>
</el-drawer>
</div>
</div>
</template>
@@ -371,9 +495,28 @@
components: {},
data() {
return {
TXJGList: [],
TXJGmodal: false,
standSystemOptions: [],
defaultProps: {
children: 'children',
label: 'menuName'
},
QYBZShow: false,
QYBZList: [],
modalshowflagZRBM: false,
nodeListZRBM: [],
QYBZformSelect: [],
QYBZmodal: false,
QYBZform: {
page: 1,
pageSzie: this.$store.getters.userInfo.configContent,
validFlag: '0',
userId: this.$store.getters.userInfo.userId,
standCode: '',
standName: '',
total: 0,
},
QCDWmodal: false,
QCDWValue: [],
QCDWList: [],
@@ -390,6 +533,10 @@
DrawerType: '',
ids: [],
addForm: {
tsJson: '',
tsJsonName: '',
rqbJson: '',
rqbName: '',
unit: '', // 单位
unitName: '',
esName: '', // 企标名称
@@ -450,6 +597,83 @@
props: {},
watch: {},
methods: {
TXJGcloseDrawer () {
this.TXJGmodal = false
},
TXJGenterDrawer () {
let list = this.$refs.TXJGTree.getCheckedNodes()
let id = ''
let name = ''
list.map(item => {
if (id.length > 0) {
id += ','
id += item.id
name += ','
name += item.menuName
} else {
id = item.id
name = item.menuName
}
})
this.addForm.tsJson = id
this.addForm.tsJsonName = name
this.TXJGmodal = false
},
choiceTXJG (id) {
if (id) {
this.TXJGList = id.split(',')
} else {
this.TXJGList = []
}
this.TXJGmodal = true
},
QYBZcloseDrawer () {
this.clearQYBZ()
},
QYBZenterDrawer () {
if (this.QYBZformSelect.length > 1) {
this.$message.warning('请选择一条标准')
} else if (this.QYBZformSelect.length < 1){
this.$message.warning('请选择要带入的标准')
} else {
this.addForm.rqbJson = this.QYBZformSelect[0].id
this.addForm.rqbName = this.QYBZformSelect[0].standName
this.clearQYBZ()
this.QYBZmodal = false
}
},
handleSelectionQYBZ (val) {
this.QYBZformSelect = val
},
QYBZpageChange (page) {
this.QYBZform.page = page
this.QYBZget()
},
QYBZpageSizeChange (pageSize) {
this.QYBZform.pageSize = pageSize
this.QYBZget()
},
QYBZget () {
this.$http.get('lawss/sarBussionessStand/getSarBussionStandPage', this.QYBZform, {
_this: this, loading: 'QYBZShow'
}, res => {
this.QYBZList = res.data.list
this.QYBZform.total = res.data.count
}, e => {
})
},
clearQYBZ () {
this.QYBZform = {
page: 1,
standCode: '',
standName: '',
}
},
choiceQYBZ (id) {
this.QYBZformSelect = []
this.QYBZget()
this.QYBZmodal = true
},
drawerCheckZRBM (data) {
let list = ''
let listName = ''
@@ -718,6 +942,7 @@
_this: this
}, res => {
this.QCDWList = res.data.QCDW // 起草单位
this.standSystemOptions = res.data.TXLBBUSS // 体系结构
}, e => {
})
},
@@ -730,6 +955,36 @@
#enterpriseStandardPlan {
height: 100%;
background: #fff;
.standardForComments {
height: calc(~'100% - 56px');
background: #fff;
flex-direction: column;
.action-bar {
margin-bottom: 5px;
padding: 0;
}
.content {
flex: auto;
overflow: hidden;
display: flex;
flex-direction: column;
.table-wrap {
flex: auto;
overflow: hidden;
position: relative;
}
}
& > .pagination {
position: static;
/deep/ .pagination-slot {
padding: 0;
}
}
}
/deep/.table-wrap {
.el-table__fixed {
height: calc(~'100% - 20px') !important;