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:
Superman_Main
2021-11-29 21:18:14 +08:00
parent 48215f7da6 3a6455839f
commit 1064e572be
11 changed files with 490 additions and 602 deletions
Download Patch File Download Diff File Expand all files Collapse all files
package-lock.json
Generated
+88
View File
@@ -4734,6 +4734,94 @@
}
}
},
"vue-loader-v16": {
"version": "npm:vue-loader@16.5.0",
"resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.5.0.tgz",
"integrity": "sha512-WXh+7AgFxGTgb5QAkQtFeUcHNIEq3PGVQ8WskY5ZiFbWBkOwcCPRs4w/2tVyTbh2q6TVRlO3xfvIukUtjsu62A==",
"dev": true,
"optional": true,
"requires": {
"chalk": "^4.1.0",
"hash-sum": "^2.0.0",
"loader-utils": "^2.0.0"
},
"dependencies": {
"ansi-styles": {
"version": "4.3.0",
"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
"dev": true,
"optional": true,
"requires": {
"color-convert": "^2.0.1"
}
},
"big.js": {
"version": "5.2.2",
"resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
"integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
"dev": true,
"optional": true
},
"chalk": {
"version": "4.1.2",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
"dev": true,
"optional": true,
"requires": {
"ansi-styles": "^4.1.0",
"supports-color": "^7.1.0"
}
},
"emojis-list": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
"integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
"dev": true,
"optional": true
},
"has-flag": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
"dev": true,
"optional": true
},
"json5": {
"version": "2.2.0",
"resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz",
"integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==",
"dev": true,
"optional": true,
"requires": {
"minimist": "^1.2.5"
}
},
"loader-utils": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
"integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
"dev": true,
"optional": true,
"requires": {
"big.js": "^5.2.2",
"emojis-list": "^3.0.0",
"json5": "^2.1.2"
}
},
"supports-color": {
"version": "7.2.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
"dev": true,
"optional": true,
"requires": {
"has-flag": "^4.0.0"
}
}
}
},
"vue-style-loader": {
"version": "4.1.2",
"resolved": "https://registry.npmjs.org/vue-style-loader/-/vue-style-loader-4.1.2.tgz",
src/components/mechanismTree/index.vue
+7
View File
@@ -23,6 +23,7 @@
class="filter-tree tree-line"
:data="treeData"
:props="defaultProps"
icon-class="icon-tree"
:check-strictly="true"
:current-node-key="nodeKeyId"
node-key="id"
@@ -169,6 +170,12 @@ export default {
</script>
<style lang="less" scoped>
/deep/ .icon-tree {
margin: 0 5px 0 10px;
position: relative;
background: url('~@/assets/images/shangqi/img/tree-add.png');
background-size: 100% 100%;
}
/deep/ .el-tree-node__content {
padding-left: 0px !important;
}
src/components/roleTree/index.vue
+8
View File
@@ -25,6 +25,7 @@
node-key="id"
style="height: 100%; overflow: auto;"
class="filter-tree tree-line"
icon-class="icon-tree"
@check-change="checkChange"
:data="treeData"
:props="defaultProps"
@@ -47,6 +48,7 @@
node-key="id"
style="height: 100%; overflow: auto;"
class="filter-tree tree-line"
icon-class="icon-tree"
:data="treeData1"
:props="defaultProps"
@check-change="checkChange2"
@@ -249,6 +251,12 @@
</script>
<style lang="less" scoped>
/deep/ .icon-tree {
margin: 0 5px 0 10px;
position: relative;
background: url('~@/assets/images/shangqi/img/tree-add.png');
background-size: 100% 100%;
}
/deep/.el-tree-node__content {
padding-left: 0px !important;
}
src/pages/details/otherBussStandardDetails/index.vue
+6 -6
View File
@@ -22,7 +22,7 @@
style="border-top:none;position: absolute;right: 36px;">
<div class="modular-header" style="height: 50px;">
<div class="modular-header-btn">
<el-button v-if="sarStandardsInfoEO.collectId" @click="collectClick(sarStandardsInfoEO.collectId)" title="取消收藏" class="collection-btn" icon="icon-collection" :loading="isSubmit"></el-button>
<el-button v-if="sarStandardsInfoEO.collectId" @click="collectClick(sarStandardsInfoEO.collectId)" title="取消收藏" class="collection-btn" icon="el-icon-star-on" :loading="isSubmit"></el-button>
<el-button v-else @click="collectClick()" title="收藏" class="collection-btn" icon="el-icon-star-off" :loading="isSubmit"></el-button>
<el-button class="relation-btn" icon="icon-relation" @click="relateEvent()">更新记录</el-button>
</div>
@@ -43,11 +43,11 @@
<template v-if = "item.label === '基础信息'">
<div class="details-content-modular basic-information" style="margin-bottom: 0">
<div class="basic-information-content">
<p class="half" style="color: #C42626;"><label style=" margin-right: 171px;">企标号</label><span>{{ sarStandardsInfoEO.standCode }}</span></p>
<p class="" style="color: #C42626;"><label style=" margin-right: 171px;">企标号</label><span>{{ sarStandardsInfoEO.standCode }}</span></p>
<template v-for="(child, childIndex) in item.child1">
<p class="half files-title"
<p class="files-title"
>
<label style=" margin-right: 102px;">{{ child.attrName }}</label>
<label style=" margin-right: 172px;">{{ child.attrName }}</label>
<template v-if="child.value && child.value.length > 0" v-for="(file, fileIndex) in child1Func(child.value)">
<span>
<a style="font-size: 16px;color: #409EFF;cursor: pointer" @click="openFileInPdf(file.id, file.oldFileName)" target="_blank" :title="file.oldFileName">{{ file.oldFileName | ellipsis }}</a>
@@ -985,8 +985,8 @@ export default {
},
data () {
return {
activeNames: ['基础信息'],
activeState: false,
activeNames: ['基础信息','过程稿件','实施日期'],
activeState: true,
visiblePlanCheck: false,
form: {},
relateDialog: false,
src/pages/details/otherLawsStandDetails/index.vue
+2 -2
View File
@@ -20,7 +20,7 @@
style="border-top:none;position: absolute;right: 36px;border: none">
<div class="modular-header" style="height: 50px;">
<div class="modular-header-btn">
<el-button v-if="sarStandardsInfoEO.collectId" @click="collectClick(sarStandardsInfoEO.collectId)" title="取消收藏" class="collection-btn" icon="icon-collection" :loading="isSubmit"></el-button>
<el-button v-if="sarStandardsInfoEO.collectId" @click="collectClick(sarStandardsInfoEO.collectId)" title="取消收藏" class="collection-btn" icon="el-icon-star-on" :loading="isSubmit"></el-button>
<el-button v-else @click="collectClick()" title="收藏" class="collection-btn" icon="el-icon-star-off" :loading="isSubmit"></el-button>
<el-button class="relation-btn" icon="icon-relation" @click="relateEvent()">更新LOG</el-button>
</div>
@@ -913,7 +913,7 @@ export default {
data () {
return {
activeNames: ['基础信息'],
activeState: false,
activeState: true,
visiblePlanCheck: false,
form: {},
relateDialog: false,
src/pages/details/otherStandardDetails/index.vue
+76 -64
View File
@@ -23,7 +23,7 @@
<div class="modular-header" style="height: 50px;">
<div class="modular-header-btn">
<el-button v-if="sarStandardsInfoEO.collectId" @click="collectClick(sarStandardsInfoEO.collectId)"
title="取消收藏" class="collection-btn" icon="icon-collection" :loading="isSubmit"></el-button>
title="取消收藏" class="collection-btn" icon="el-icon-star-on" :loading="isSubmit"></el-button>
<el-button v-else @click="collectClick()" title="收藏" class="collection-btn" icon="el-icon-star-off"
:loading="isSubmit"></el-button>
<el-button class="relation-btn" icon="icon-relation" @click="relateEvent()">更新记录</el-button>
@@ -32,7 +32,7 @@
</div>
</div>
</div>
<el-collapse-item :name="item.label" @click.native="handleChange1(item.label)">
<el-collapse-item :name="item.label" @click.native="handleChange1(item.label)">
<template slot="title">
<div class="modular-header" v-if="item.label === '基础信息'">
<div class="modular-header-title"><i class="icon-modular-title"/><span>{{ item.label }}</span></div>
@@ -42,11 +42,11 @@
</div>
</template>
<div class="modular-content">
<template v-if="item.label === '基础信息'" >
<template v-if="item.label === '基础信息'">
<div class="details-content-modular basic-information" style="border-top:none">
<div class="basic-information-content">
<!-- <p><label style=" margin-right: 150px;">标准类别</label><span>{{ sarStandardsInfoEO.standSort || '-' }}</span></p>-->
<p style="color: #C42626;" class="half">
<p style="color: #C42626;" class="">
<label style=" margin-right: 164px;">标准号</label>
<span v-if="sarStandardsInfoEO.standYear">{{
sarStandardsInfoEO.standSortShow + ' ' + sarStandardsInfoEO.standNumber + '-' + sarStandardsInfoEO.standYear
@@ -55,12 +55,14 @@
</p>
<!-- <p><label style=" margin-right: 150px;">标准年份</label><span>{{ sarStandardsInfoEO.standYear || '-' }}</span></p>-->
<template v-for="(child, childIndex) in item.child1">
<p class="half files-title"
>
<label style=" margin-right: 102px;">{{ child.attrName }}</label>
<template v-if="child.value && child.value.length > 0" v-for="(file, fileIndex) in child1Func(child.value)">
<p class="files-title">
<label style=" margin-right: 164px;">{{ child.attrName }}</label>
<template v-if="child.value && child.value.length > 0"
v-for="(file, fileIndex) in child1Func(child.value)">
<span>
<a style="font-size: 16px;color: #409EFF;cursor: pointer" @click="openFileInPdf(file.id, file.oldFileName)" target="_blank" :title="file.oldFileName">{{ file.oldFileName | ellipsis }}</a>
<a style="font-size: 16px;color: #409EFF;cursor: pointer"
@click="openFileInPdf(file.id, file.oldFileName)" target="_blank"
:title="file.oldFileName">{{ file.oldFileName | ellipsis }}</a>
<i
title="下载"
@click="downloadFile(file.id)"
@@ -85,10 +87,13 @@
icon="icon-separate"
>标准分解单
</el-button>
<el-button v-if="child.value && child.value.length > 1" style="color:#409EFF;border: 1px solid #409EFF;background: rgba(64, 158, 255, 0.1);"
class="decomposition-btn" icon="icon-relation" @click="relateEvent1(child.value)">更多</el-button>
<el-button v-if="child.value && child.value.length > 1"
style="color:#409EFF;border: 1px solid #409EFF;background: rgba(64, 158, 255, 0.1);"
class="decomposition-btn" icon="icon-relation" @click="relateEvent1(child.value)">
更多
</el-button>
</template>
<template v-if="child.value === null" >-</template>
<template v-if="child.value === null">-</template>
</p>
</template>
<p><label style=" margin-right: 150px;">中文名称</label><span>{{
@@ -110,7 +115,8 @@
standMap[sarStandardsInfoEO.standNature] || '-'
}}</span></p>
<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>{{
sarStandardsInfoEO.standSystem || '-'
}}</span></p>
<p class="half">
@@ -120,7 +126,7 @@
</p>
<template v-for="(child, childIndex) in item.child2">
<p class="half">
<label style=" margin-right: 143px;">{{child.attrName}}</label>
<label style=" margin-right: 143px;">{{ child.attrName }}</label>
<span>{{ child.value || '-' }}</span>
</p>
</template>
@@ -390,7 +396,9 @@
<template v-if="child.attrField === 'XGD' || child.attrField === 'FBGBJBD' || child.attrField === 'BPG'
|| child.attrField === 'SSG'|| child.attrField === 'ZQYJG'|| child.attrField === 'CA'
|| child.attrField === 'JDWJ' || child.attrField === 'GLWJ'">
<a @click="openFileInPdf(file.id, file.oldFileName)" target="_blank" :title="file.oldFileName">{{ file.oldFileName | ellipsis }}</a>
<a @click="openFileInPdf(file.id, file.oldFileName)" target="_blank" :title="file.oldFileName">{{
file.oldFileName | ellipsis
}}</a>
<i
title="下载"
@click="downloadFile(file.id)"
@@ -411,7 +419,9 @@
<!-- <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>-->
</template>
<template v-else>
<a @click="openFileInPdf(file.id, file.oldFileName)" target="_blank" :title="file.oldFileName">{{ file.oldFileName | ellipsis }}</a>
<a @click="openFileInPdf(file.id, file.oldFileName)" target="_blank" :title="file.oldFileName">{{
file.oldFileName | ellipsis
}}</a>
<i
title="下载"
@click="downloadFile(file.id)"
@@ -742,7 +752,7 @@
label="符合性状态"
width="100">
<template slot-scope="scope">
{{scope.row.complianceRequire ? (scope.row.complianceRequire === '1' ? '是' : '否') : '-'}}
{{ scope.row.complianceRequire ? (scope.row.complianceRequire === '1' ? '是' : '否') : '-' }}
</template>
</el-table-column>
<el-table-column
@@ -1061,7 +1071,8 @@
style="margin-bottom: 10px;line-height: 20px;max-height: 300px"
>
{{ index + 1 }}.
<a style="font-size: 16px;color: #409EFF;cursor: pointer" @click="openFileInPdf(file.id, file.oldFileName)" target="_blank" :title="file.oldFileName">{{ file.oldFileName }}</a>
<a style="font-size: 16px;color: #409EFF;cursor: pointer" @click="openFileInPdf(file.id, file.oldFileName)"
target="_blank" :title="file.oldFileName">{{ file.oldFileName }}</a>
<i
title="下载"
@click="downloadFile(file.id)"
@@ -1404,19 +1415,19 @@ export default {
RelatedTermsSelect
},
filters: {
ellipsis (value) {
ellipsis(value) {
if (!value) return ''
if (value.length > 12) {
return value.slice(0,12) + '...'
return value.slice(0, 12) + '...'
}
return value
}
},
data() {
return {
activeNames: ['基础信息'],
activeState: false,
itemExistList:[],
activeNames: ['基础信息','过程稿件','实施日期'],
activeState: true,
itemExistList: [],
interpretationContent: '',
relatedTermsDrawerVisible: false,
btnLoading: false,
@@ -1444,8 +1455,8 @@ export default {
knowType: '',
KnowTitle: '',
knowIdList: '',
order:'',
orderBy:'',
order: '',
orderBy: '',
total7: 0,
page7: 1,
pageSize7: this.$store.getters.userInfo.configContent,
@@ -1712,28 +1723,28 @@ export default {
props: {},
watch: {},
methods: {
child1Func(child1){
child1Func(child1) {
const list = []
if(child1 && child1.length > 1){
if (child1 && child1.length > 1) {
list.push(child1[0])
return list
}
return child1
},
handleChange(val) {
console.log(val)
console.log('1724', val)
},
handleChange1(val) {
if(val && val === '基础信息'){
if (val && val === '基础信息') {
this.activeState = true;
}
},
judgeSuffix(fileName){
if ('pdf'===fileName.substring(fileName.lastIndexOf('.') + 1)){
judgeSuffix(fileName) {
if ('pdf' === fileName.substring(fileName.lastIndexOf('.') + 1)) {
return true;
}else return false;
} else return false;
},
ocrFunction(file){
ocrFunction(file) {
return "ocr"
},
FormatDate(date) {
@@ -2328,8 +2339,8 @@ export default {
_this: this
}, res => {
this.sarStandardsInfoEO = res.data || {}
this.itemExistList=this.sarStandardsInfoEO.attrInfoMap.itemExistList;
console.log("hllo",this.sarStandardsInfoEO);
this.itemExistList = this.sarStandardsInfoEO.attrInfoMap.itemExistList;
console.log("hllo", this.sarStandardsInfoEO);
if (this.sarStandardsInfoEO.issueTime != null && this.sarStandardsInfoEO.issueTime !== '') {
this.sarStandardsInfoEO.issueTime = this.sarStandardsInfoEO.issueTime.split(' ')[0]
}
@@ -2455,7 +2466,7 @@ export default {
_this: this
}, res => {
console.log("res.data",res.data);
console.log("res.data", res.data);
if (res.data) {
let fileObj = {}
fileObj.fileId = res.data.attId
@@ -2553,9 +2564,9 @@ export default {
}.bind(this)
})
},
sort(column){
this.order=column.order;
this.orderBy=column.prop;
sort(column) {
this.order = column.order;
this.orderBy = column.prop;
this.selectSarStandItems();
},
// 分解单----查看标准条款相关
@@ -2564,7 +2575,7 @@ export default {
this.standItemSearch.fileType = this.fileType
this.$http.get('SarStandItems/sar-stand-items/querySarItemAndInterpretation', {
...this.standItemSearch,
pageSize: this.pageSize7, page: this.page7,order:this.order,orderBy:this.orderBy
pageSize: this.pageSize7, page: this.page7, order: this.order, orderBy: this.orderBy
}, {}, res => {
this.selectedItemList = []
if (res.ok) {
@@ -2617,9 +2628,9 @@ export default {
this.standItemSearch.parts = ''
this.standItemSearch.nameOrRequest = ''
this.standItemSearch.fileType = ''
this.standItemSearch.itemsName=''
this.standItemSearch.ZCCSSRQ=''
this.standItemSearch.XCXSSRQ=''
this.standItemSearch.itemsName = ''
this.standItemSearch.ZCCSSRQ = ''
this.standItemSearch.XCXSSRQ = ''
this.selectSarStandItems()
},
inputChange() {
@@ -2918,7 +2929,7 @@ export default {
collectResId: this.sarStandardsInfoEO.id,
collectTitle: collectTitle,
collectType: this.$route.params.pageType, // 国内收藏type
userId : this.$store.getters.userInfo.userId
userId: this.$store.getters.userInfo.userId
}
this.$http.postData('person/personCollect', personCollect, {
@@ -2931,7 +2942,7 @@ export default {
})
}
},
relateEvent1(list){
relateEvent1(list) {
this.relateDialog1 = true
this.relateNowList1 = list
},
@@ -3082,7 +3093,7 @@ export default {
this.setMap(res.data.SARPROPERTY) // 标准性质
}, e => {
})
Promise.all([this.queryDisplayLocation(), this.selectStandMessage(), this.getAddFormFieldList()]).then ((values) => {
Promise.all([this.queryDisplayLocation(), this.selectStandMessage(), this.getAddFormFieldList()]).then((values) => {
const [displayLocation, standEO, formFieldList] = values
const dynamicFormField = standEO ? standEO.attrInfoMap : {}
formFieldList.forEach((field) => {
@@ -3120,34 +3131,34 @@ export default {
console.log(displayLocation)
displayLocation.forEach(location => {
// 动态属性字段-FBGBJBD 单独添加至基础信息
const list = displayLocation.filter ( item => item.label === '过程稿件');
const list = displayLocation.filter(item => item.label === '过程稿件');
console.log()
if(location.label === '基础信息' && list && list.length > 0){
if (location.label === '基础信息' && list && list.length > 0) {
if (!list[0].child) {
location['child1'] = []
}else {
const childList = list[0].child.filter ( item => item.attrField === 'FBGBJBD');
} else {
const childList = list[0].child.filter(item => item.attrField === 'FBGBJBD');
location['child1'] = childList
}
}
// 动态属性字段-SYRZ 单独添加至基础信息
const list2 = displayLocation.filter ( item => item.label === '适用范围');
if(location.label === '基础信息' && list2 && list2.length > 0){
const list2 = displayLocation.filter(item => item.label === '适用范围');
if (location.label === '基础信息' && list2 && list2.length > 0) {
if (!list2[0].child) {
location['child2'] = []
}else {
const childList = list2[0].child.filter ( item => item.attrField === 'SYRZ');
} else {
const childList = list2[0].child.filter(item => item.attrField === 'SYRZ');
location['child2'] = childList
}
}
for (let i = 0; i < displayLocation.length; i++) {
// sss
if(displayLocation[i].label !== '基础信息' && displayLocation[i].label !== '过程稿件'){
const childList = displayLocation[i].child.filter ( item => item.value !== null && item.value !== '');
if(childList.length === 0){
displayLocation.splice(i,1)
if (displayLocation[i].label !== '基础信息' && displayLocation[i].label !== '过程稿件') {
const childList = displayLocation[i].child.filter(item => item.value !== null && item.value !== '');
if (childList.length === 0) {
displayLocation.splice(i, 1)
}
}
}
@@ -3159,7 +3170,7 @@ export default {
if (['DATE_PICKER', 'SEL_OPTION', 'INPUT_NUM'].includes(field.attrType)) {
half.push(field)
} else {
if(field.attrField && field.attrField !== 'FBGBJBD' && field.attrField !== 'SYRZ'){
if (field.attrField && field.attrField !== 'FBGBJBD' && field.attrField !== 'SYRZ') {
one.push(field)
}
}
@@ -3247,11 +3258,11 @@ export default {
}
}
/deep/ .el-collapse{
/deep/ .el-collapse {
border: none;
}
/deep/ .el-collapse-item__wrap{
/deep/ .el-collapse-item__wrap {
border: none;
}
@@ -3417,6 +3428,7 @@ export default {
width: 100%;
height: 50px;
border-bottom: 1px solid #E5E5E5;
.modular-header-title {
font-size: 18px;
font-weight: bold;
@@ -3431,8 +3443,7 @@ export default {
background-position: center center;
background-image: url("~assets/images/shangqi/standardDetails/modular-title.png");
position: relative;
top: 2px;
;
top: 2px;;
}
& > span {
@@ -3732,7 +3743,8 @@ export default {
overflow-y: auto;
}
}
.over{
.over {
word-break: break-all;
overflow: hidden;
text-overflow: ellipsis;
src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue
+199 -201
View File
@@ -5,36 +5,22 @@
<template slot="proNode">选择分发责任人</template>
</ProcessHeader>
<div class="headerTabs">
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
<div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
<div :class="active === '1' ? 'active' : ''" class="headerTabsItem" @click="handleTabs('1')">基础信息</div>
<div :class="active === '3' ? 'active' : ''" class="headerTabsItem" @click="handleTabs('3')">审批历史</div>
</div>
<div class="content" v-show="active === '1'">
<div v-show="active === '1'" class="content">
<div style="flex: auto; overflow: auto">
<process-title>
<template slot="title">基础信息</template>
</process-title>
<el-form
:model="listForm"
class="label-input-form prc-content-border"
label-width="150px"
>
<el-form :model="listForm" class="label-input-form prc-content-border" label-width="150px">
<el-row :gutter="24">
<el-col :span="24">
<el-form-item label="项目编号" prop="projectNumber" class="add-form-item form-item-disabled">
<el-input
v-model="listForm.projectNumber"
placeholder="请输入项目编号"
disabled
clearable
></el-input>
<el-form-item class="add-form-item form-item-disabled" label="项目编号" prop="projectNumber">
<el-input v-model="listForm.projectNumber" clearable disabled placeholder="请输入项目编号"></el-input>
</el-form-item>
<el-form-item label="项目名称" prop="projectName" class="add-form-item form-item-disabled">
<el-input
v-model="listForm.projectName"
placeholder="请输入项目名称"
disabled
clearable
></el-input>
<el-form-item class="add-form-item form-item-disabled" label="项目名称" prop="projectName">
<el-input v-model="listForm.projectName" clearable disabled placeholder="请输入项目名称"></el-input>
</el-form-item>
</el-col>
</el-row>
@@ -42,75 +28,53 @@
<process-title>
<template slot="title">填写信息</template>
</process-title>
<!-- <div class="tableTitle">-->
<!-- <div class="tableButton">-->
<!-- <el-button plain class="common-button-primary" size="mini" @click="choiceZRRS('', 2, '')">批量分发责任人-->
<!-- </el-button>-->
<!-- </div>-->
<!-- </div>-->
<el-table
:data="dataList"
style="width: 100%"
row-key="standId"
v-if="refreshTable"
height="70%"
border
ref="myTable"
@selection-change="selectStandChange"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"
>
<el-table-column
type="selection"
width="55"
align="center">
<div class="tableTitle">
<div class="tableButton">
<el-button class="common-button-primary" plain size="mini" @click="choiceZRRS('', 2, '')">批量分发责任人
</el-button>
</div>
</div>
<el-table v-if="refreshTable" ref="myTable" :data="dataList" :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}" border height="70%"
row-key="standId" style="width: 100%" @select="select" @select-all="selectAll"
@selection-change="selectStandChange">
<el-table-column align="center" type="selection" width="55">
</el-table-column>
<el-table-column
prop="standNumber"
label="标准号"
>
<el-table-column label="标准号" prop="standNumber">
<template slot-scope="scope">
<a v-if="scope.row.standYear" class="table-jump"
@click="handlePreview(scope.row)">{{ scope.row.standSort }} {{ scope.row.standNumber
}}-{{ scope.row.standYear }}</a>
<a v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSort }}
<a v-else class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSort }}
{{ scope.row.standNumber }}</a>
</template>
</el-table-column>
<el-table-column
prop="standName"
label="标准名称"
>
<el-table-column label="标准名称" prop="standName">
<template slot-scope="scope">
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
<a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standName }}</a>
</template>
</el-table-column>
<el-table-column
prop="itemsNum"
label="条款号"
>
<el-table-column label="条款号" prop="itemsNum">
</el-table-column>
<el-table-column
prop="itemsName"
label="条款名称"
>
<el-table-column label="条款名称" prop="itemsName">
</el-table-column>
<el-table-column label="责任人" prop="workPeople" align="center">
<template slot-scope="scope" >
<el-table-column align="center" label="责任人" prop="workPeople">
<template slot-scope="scope">
<div v-if="selectList.length<=1">
<el-input v-if="scope.row.workPeople" v-model="scope.row.workPeopleId" style="display: none;" readonly/>
<el-input v-if="scope.row.workPeople" v-model="scope.row.workPeopleId" readonly
style="display: none;" />
<el-input v-if="scope.row.workPeople" v-model="scope.row.workPeople" placeholder="请选择分发责任人"
@click.native="choiceZRRS(scope.row, 1, scope.$index)" readonly/>
readonly @click.native="choiceZRRS(scope.row, 1, scope.$index)" />
</div>
<div v-else>
<el-input v-if="scope.row.workPeople" v-model="scope.row.workPeopleId" style="display: none;" readonly/>
<el-input v-if="scope.row.workPeople" v-model="scope.row.workPeopleId" readonly
style="display: none;" />
<el-input v-if="scope.row.workPeople" v-model="scope.row.workPeople" placeholder="请选择分发责任人"
@click.native="choiceZRRS('', 2, '')" readonly/>
readonly @click.native="choiceZRRS('', 2, '')" />
</div>
<el-button style="width: 98%" :loading="buttonLoading" v-if="!scope.row.workPeople" size="small" type="primary" @click="choiceZRRS(scope.row, 3, '')">{{ "批量分发该标准下的责任人" }}</el-button>
<!-- <el-button style="width: 98%" :loading="buttonLoading" v-if="!scope.row.workPeople" size="small" type="primary" @click="choiceZRRS(scope.row, 3, '')">{{ "批量分发该标准下的责任人" }}</el-button>-->
</template>
<!-- <template slot-scope="scope">-->
<!-- <div :class="{'fileClass': !scope.row.workPeople}">-->
@@ -124,77 +88,41 @@
<el-collapse accordion>
<el-collapse-item title="回执说明">
<div style="margin: 10px 0;">
<el-input
type="textarea"
:rows="3"
resize="none"
placeholder="请输入意见"
v-model="commentText">
<el-input v-model="commentText" :rows="3" placeholder="请输入意见" resize="none" type="textarea">
</el-input>
</div>
</el-collapse-item>
</el-collapse>
</div>
</div>
<div class="content" v-show="active === '3'">
<div v-show="active === '3'" class="content">
<div class="flow-list" style="height: 100%">
<el-table
height="100%"
ref="selection"
:data="detailData"
tooltip-effect="dark"
style="width: 100%"
border
row-key="id"
:no-data-text="listNoDataText"
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
>
<el-table-column
type="selection"
width="55"
align="center">
<el-table ref="selection" :data="detailData" :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
:no-data-text="listNoDataText" border height="100%"
row-key="id" style="width: 100%"
tooltip-effect="dark">
<el-table-column align="center" type="selection" width="55">
</el-table-column>
<el-table-column
prop="name"
label="任务步骤"
align="center"
>
<el-table-column align="center" label="任务步骤" prop="name">
</el-table-column>
<el-table-column
prop="assignee"
label="任务受理人"
align="center"
>
<el-table-column align="center" label="任务受理人" prop="assignee">
</el-table-column>
<el-table-column
prop="createTime"
label="创建时间"
sortable="custom"
align="center">
<el-table-column align="center" label="创建时间" prop="createTime" sortable="custom">
<template slot-scope="scope">
<span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
prop="endTime"
label="完成时间"
align="center">
<el-table-column align="center" label="完成时间" prop="endTime">
<template slot-scope="scope">
<span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
prop="comment"
label="流程信息"
align="center">
<el-table-column align="center" label="流程信息" prop="comment">
<template slot-scope="scope">
<span>{{ scope.row.commentText }}</span>
</template>
</el-table-column>
<el-table-column
prop="completeFlag"
label="状态"
align="center">
<el-table-column align="center" label="状态" prop="completeFlag">
<template slot-scope="scope">
<span>{{ scope.row.endTime ? "已完成" : "未完成" }}</span>
</template>
@@ -203,34 +131,16 @@
<loading :loading="loading">流程列表加载中</loading>
</div>
</div>
<ProcessFooter
show-save
show-submit
show-transfer
:submitLoading="isSubmit"
:transfer-loading="isTransfer"
:saveLoading="saveLoading"
@save="handleSave"
@transfer="handleTransfer"
@submit="handleSubmit"
>
<ProcessFooter :saveLoading="saveLoading" :submitLoading="isSubmit" :transfer-loading="isTransfer" show-save
show-submit
show-transfer @save="handleSave" @submit="handleSubmit" @transfer="handleTransfer">
</ProcessFooter>
<!-- 福田全公司选人解决方案 -->
<Role-tree
check-box
:is-title="drawerTitle"
:is-visible.sync="drawerModal"
@checkedRole="checkedTransferRole"
:nodeList="nodeList"
></Role-tree>
<Role-tree :is-title="drawerTitle" :is-visible.sync="drawerModal" :nodeList="nodeList" check-box
@checkedRole="checkedTransferRole"></Role-tree>
<!-- 选择责任人-->
<Role-tree
check-box
is-title="选择责任人"
:is-visible.sync="modalshowflag"
@checkedRole="checkedRole"
:nodeList="nodeList"
></Role-tree>
<Role-tree :is-visible.sync="modalshowflag" :nodeList="nodeList" is-title="选择责任人"
@checkedRole="checkedRole"></Role-tree>
</div>
</template>
@@ -238,7 +148,7 @@
import ProcessHeader from "../../components/ProcessHeader";
import ProcessFooter from "../../components/ProcessFooter";
import ProcessTitle from "../../components/ProcessTitle";
import { inboundLiaisonDetail, saveTaskForPub ,changeAssigneeNew } from "api/process";
import { changeAssigneeNew, inboundLiaisonDetail, saveTaskForPub } from "api/process";
export default {
name: "xmpg2Step5",
@@ -252,7 +162,7 @@ export default {
isTransfer: false,
// 调整处理人抽屉状态
drawerModal: false,
workPeopleList:[],
workPeopleList: [],
//防止按钮点击过快的按钮loading
buttonLoading: false,
//刷新表格
@@ -282,8 +192,8 @@ export default {
},
//表单的数据
listForm: {
projectNumber: "", //项目编号
projectName: "", //项目名称
projectNumber: "", //项目编号
projectName: "", //项目名称
dataList: [], //项目下的标准数据
children: [] //标准下的分解单数据
},
@@ -298,45 +208,45 @@ export default {
},
methods: {
//确认转办
checkedTransferRole (data) {
this.assigneeNewLoading = true
checkedTransferRole(data) {
this.assigneeNewLoading = true;
changeAssigneeNew({
taskId: this.$route.query.taskIds, // 任务id
assignee: data[0].id, // 被委托人
userId: this.$store.getters.userInfo.userId, // 委托人
pId: this.$route.query.prcId // 流程实例
}).then(res => {
this.isTransfer = false
this.isTransfer = false;
if (res.success) {
this.drawerModal = false
this.$message.success('调整成功')
this.drawerModal = false;
this.$message.success("调整成功");
this.$router.push("/processCenter");
this.processNum()
this.processNum();
} else {
this.$message.warning(res.message)
this.$message.warning(res.message);
}
})
});
},
// 请求转换流程图
processNum (row) {
processNum(row) {
axios.request({
url: '/api/lawss/activiti/getImg?_t=' + new Date().getTime(),
responseType: 'blob',
method: 'get',
url: "/api/lawss/activiti/getImg?_t=" + new Date().getTime(),
responseType: "blob",
method: "get",
params: {
prcNum: this.$route.query.prcNum
}
}).then(res => {
// let blob = new Blob([res.data], {type: 'image/jpg'})
// let url = window.URL.createObjectURL(res.data)
this.processStep = window.URL.createObjectURL(res.data)
})
this.processStep = window.URL.createObjectURL(res.data);
});
},
//转办事件
handleTransfer(){
this.drawerModal = true
this.drawerTitle = '转办处理人'
this.selectPeople = row
handleTransfer() {
this.drawerModal = true;
this.drawerTitle = "转办处理人";
this.selectPeople = row;
},
// 点击查看
handlePreview(item) {
@@ -407,6 +317,7 @@ export default {
},
//动态表单读取
getFormFieldList(item) {
console.log(item);
this.$nextTick(() => {
this.listForm = JSON.parse(JSON.stringify(item));
if (item.form === undefined) {
@@ -444,9 +355,18 @@ export default {
}
});
this.listForm.children = children;
this.dataList.forEach(item => {
this.$set(item, "workPeople", "请选择责任人");
});
console.log(this.dataList);
} else {
this.listForm = item.form;
this.dataList = item.form.dataList;
this.dataList.forEach(item => {
this.$set(item, "workPeople", "请选择责任人");
this.$set(item, "workPeopleId", "");
});
console.log(this.dataList);
}
});
},
@@ -471,19 +391,21 @@ export default {
},
//提交事件
handleSubmit() {
let dataChildren = []
let dataListChildren = []
let dataChildren = [];
let dataListChildren = [];
this.dataList.forEach(item => {
dataChildren.push(item.children)
})
dataChildren.forEach((item,index) => {
dataListChildren = dataListChildren.concat(item)
})
dataChildren.push(item.children);
});
dataChildren.forEach((item, index) => {
dataListChildren = dataListChildren.concat(item);
});
this.isSubmit = true;
this.listForm.commentText = this.commentText;
this.listForm.children = dataListChildren
this.listForm.dataList = this.dataList
this.listForm.children = dataListChildren;
this.listForm.dataList = this.dataList;
const json = JSON.stringify(this.listForm);
console.log(json);
return;
this.$http.post("lawss/activiti/completeTask", {
taskIds: this.taskIds,
userId: this.userId,
@@ -501,7 +423,8 @@ export default {
},
//批量分发按钮
choiceZRRS(row, type, index) {
this.selectedId = row.id;
console.log(row);
this.selectedId = row.id || row.standId;
this.type = type;
if (type === 1) {
this.drawerTitle = "选择责任人";
@@ -522,24 +445,86 @@ export default {
}
}
//批量分发某标准下的责任人
else if (type === 3){
else if (type === 3) {
//弹出选人框
// if (this.tableExpand === false){
this.modalshowflag = true;
this.drawerTitle = "批量选择责任人";
this.modalshowflag = true;
this.drawerTitle = "批量选择责任人";
// }
//展开表格
this.workPeopleList = row
this.workPeopleList = row;
// console.log('279',row.children)
this.refreshTable = false
this.refreshTable = false;
// this.tableExpand = !this.tableExpand
this.$nextTick(() => {
this.refreshTable = true
this.refreshTable = true;
});
}
},
setChildren(children, type) {
// 编辑多个子层级
children.map(j => {
this.toggleSelection(j, type);
if (j.children) {
this.setChildren(j.children, type);
}
});
},
// 选中父节点时，子节点一起选中取消
select(selection, row) {
const hasSelect = selection.some(el => {
return row.id === el.id;
});
if (hasSelect) {
if (row.children) {
// 解决子组件没有被勾选到
this.setChildren(row.children, true);
}
} else {
if (row.children) {
this.setChildren(row.children, false);
}
}
},
toggleSelection(row, select) {
if (row) {
this.$nextTick(() => {
this.$refs.myTable &&
this.$refs.myTable.toggleRowSelection(row, select);
});
}
},
// 选择全部
selectAll(selection) {
// dataList第一层只要有在selection里面就是全选
const isSelect = selection.some(el => {
const dataListIds = this.dataList.map(j => j.id);
return dataListIds.includes(el.id);
});
// dataList第一层只要有不在selection里面就是全不选
const isCancel = !this.dataList.every(el => {
const selectIds = selection.map(j => j.id);
return selectIds.includes(el.id);
});
if (isSelect) {
selection.map(el => {
if (el.children) {
// 解决子组件没有被勾选到
this.setChildren(el.children, true);
}
});
}
if (isCancel) {
this.dataList.map(el => {
if (el.children) {
// 解决子组件没有被勾选到
this.setChildren(el.children, false);
}
});
}
},
//标准表格选择框改变
selectStandChange(data) {
this.selectList = data;
@@ -559,14 +544,28 @@ export default {
}
},
checkedRole(data) {
var idList = "";
var nameList = "";
data.forEach(item => {
if (nameList.length > 0) {
nameList += ",";
idList += ",";
}
idList += item.id;
nameList += item.name;
});
//单选操作
if (this.type === 1) {
this.dataList.forEach(item => {
if(item.standId === this.selectedId){
item.workPeople = nameList;
item.workPeopleId = idList;
}
if (item.children) {
item.children.forEach(items => {
if (items.id === this.selectedId) {
items.workPeople = data[0].name;
items.workPeopleId = data[0].id;
items.workPeople = nameList;
items.workPeopleId = idList;
// this.$set(items,'workPeople',data[0].name)
//this.$set(items,'workPeopleId',data[0].id)
}
@@ -577,37 +576,37 @@ export default {
} else if (this.type === 2) {
this.selectList.forEach(item => {
this.dataList.map(items => {
if (item.id === items.id) {
items.workPeople = "";
items.workPeopleId = "";
this.$message.warning('您只能针对条款进行分发')
if (item.standId === items.standId) {
items.workPeople = nameList;
items.workPeopleId = idList;
// this.$message.warning('您只能针对条款进行分发')
}
if (items.children.length) {
if (items.children) {
items.children.map(childrenItem => {
if (childrenItem.id === item.id) {
childrenItem.workPeople = data[0].name;
childrenItem.workPeopleId = data[0].id;
childrenItem.workPeople = nameList;
childrenItem.workPeopleId = idList;
}
});
}
});
});
this.dataList = JSON.parse(JSON.stringify(this.dataList));
}else if (this.type === 3){
} else if (this.type === 3) {
// console.log("529",this.workPeopleList)
for (let i=0;i<this.workPeopleList.children.length;i++){
for (let i = 0; i < this.workPeopleList.children.length; i++) {
this.workPeopleList.children[i].workPeople = data[0].name
this.workPeopleList.children[i].workPeopleId = data[0].id
this.workPeopleList.children[i].workPeople = data[0].name;
this.workPeopleList.children[i].workPeopleId = data[0].id;
// console.log(row.children[i].id)
// console.log(row.children[i].workPeople)
}
// items.children.map(childrenItem => {
//
// childrenItem.workPeople = data[0].name;
// childrenItem.workPeopleId = data[0].id;
// })
// items.children.map(childrenItem => {
//
// childrenItem.workPeople = data[0].name;
// childrenItem.workPeopleId = data[0].id;
// })
}
this.modalshowflag = false;
@@ -704,4 +703,3 @@ export default {
}
}
</style>
src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+4 -4
View File
@@ -308,7 +308,7 @@
</el-table-column>
<el-table-column fixed="right"
v-if="isPermission('cac1eb379eb8e3b987cbb2e4599adb50,247cebaefa7cf1683092af160af11502,dbaf9df2990a595c8abea28e68b1a681')>0"
label="收藏" align="center" width="50"
label="收藏" align="center" width="200"
>
<template slot-scope="scope">
<div
@@ -343,7 +343,7 @@
@click="handleCommand([scope.row, '收藏'])"
>
</el-button>
<el-button title="取消收藏" class="collection-btn" icon="el-icon-star-off" style="color: #f56c6c;"
<el-button title="取消收藏" class="collection-btn" icon="el-icon-star-on"
v-btn-permission="'cac1eb379eb8e3b987cbb2e4599adb50'"
v-else
@click="handleCommand([scope.row, '取消收藏'])"
@@ -5690,7 +5690,7 @@ export default {
.tree-content {
background: #fff;
width: 20%;
width: 16%;
position: relative;
.tree {
@@ -5741,7 +5741,7 @@ export default {
.collection-btn {
padding: 0;
border: none;
color: #4788c0;
color: #F2CB51;
font-size: 18px;
width: 18px;
height: 18px;
src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+2 -2
View File
@@ -417,7 +417,7 @@
@click="handleCommand([scope.row, '收藏'])"
>
</el-button>
<el-button title="取消收藏" class="collection-btn" icon="el-icon-star-off" style="color: #f56c6c;" v-btn-permission="'d9730d984627af948053df56a2db7997'"
<el-button title="取消收藏" class="collection-btn" icon="el-icon-star-on" v-btn-permission="'d9730d984627af948053df56a2db7997'"
v-else
@click="handleCommand([scope.row, '取消收藏'])"
>
@@ -4460,7 +4460,7 @@ export default {
.collection-btn {
padding: 0;
border: none;
color: #4788c0;
color: #F2CB51;
font-size: 18px;
width: 18px;
height: 18px;
src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+2 -2
View File
@@ -350,7 +350,7 @@
@click="handleCommand([scope.row, '收藏'])"
>
</el-button>
<el-button title="取消收藏" class="collection-btn" icon="el-icon-star-off" style="color: #f56c6c;" v-btn-permission="'f9745194958bc9ed3ee5127459795dbc'"
<el-button title="取消收藏" class="collection-btn" icon="el-icon-star-on" v-btn-permission="'f9745194958bc9ed3ee5127459795dbc'"
v-else
@click="handleCommand([scope.row, '取消收藏'])"
>
@@ -5191,7 +5191,7 @@ export default {
.collection-btn {
padding: 0;
border: none;
color: #4788c0;
color: #F2CB51;
font-size: 18px;
width: 18px;
height: 18px;
src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
+96 -321
View File
@@ -108,10 +108,6 @@
fixed="left"
width="180"
label="标准号">
<!-- <template slot-scope="scope">-->
<!-- <a @click="detailsStandard(scope.row)" class="table-jump">{{ scope.row.standId }}</a>-->
<!--&lt;!&ndash; {{ scope.row.standId }}&ndash;&gt;-->
<!-- </template>-->
<template slot-scope="scope">
<a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSerialNumber }}</a>
</template>
@@ -403,178 +399,6 @@
@click="exportTestItem">提交</el-button>
</span>
</el-dialog>
<!-- 选择项目抽屉-->
<el-drawer
title="选择项目"
:visible.sync="projectModel"
size="900px"
custom-class="demo-drawer"
>
<div class="demo-drawer-content">
<div style="position: absolute;bottom: 48px;top:60px;left: 0;right: 0">
<div style="position: absolute;bottom: 55px;top: 0;right: 0;left: 0">
<div class="left">
<el-form :modal="projectSearch" :inline="true" class="label-input-form" style="margin-left:10px">
<el-form-item label="项目编号" class="search-item search-item-last">
<el-input
v-model="projectSearch.projectNumber"
placeholder="请输入项目编号"
></el-input>
</el-form-item>
<el-form-item label="项目名称" class="search-item search-item-last">
<el-input
v-model="projectSearch.projectName"
placeholder="请输入项目名称"
></el-input>
</el-form-item>
<el-form-item class="search-item btn-box">
<el-button
type="primary"
class="common-button-primary"
size="small"
v-btn-permission="''"
@click="getProjectDataBtn">
查询
</el-button>
</el-form-item>
<el-form-item class="search-item btn-box">
<el-button
class="common-button-default"
size="small"
v-btn-permission="''"
@click="clearSearch">清空
</el-button>
</el-form-item>
</el-form>
</div>
<el-table
:data="ProjectDatas"
tooltip-effect="dark"
style="width: 100%;"
border
height="100%"
:header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"
@selection-change="selectListChange"
@select="handleSelectionChanges"
ref="listSelection"
>
<el-table-column
type="selection"
width="55"
align="center" />
<el-table-column
prop="projectNumber"
align="center"
label="项目编号"
/>
<el-table-column
prop="projectName"
align="center"
label="项目名称"
/>
<el-table-column
prop="projectClassification"
align="center"
label="项目分类"
/>
<el-table-column
prop="uname"
align="center"
label="项目经理"
/>
</el-table>
</div>
<pagination
:page="page"
:pageSize="pageSize"
:total="total"
@pageChange="pageChange"
@pageSizeChange="pageSizeChange"
/>
</div>
</div>
<div class="demo-drawer-footer">
<el-button size="mini" @click="closeDrawer">取消</el-button>
<el-button type="primary" size="mini" @click="OkDrawer">带入</el-button>
</div>
</el-drawer>
<!-- 选择项目下标准抽屉-->
<el-drawer
title="选择标准"
:visible.sync="listModel"
size="900px"
custom-class="demo-drawer"
>
<div class="demo-drawer-content">
<div style="position: absolute;bottom: 48px;top:60px;left: 0;right: 0">
<div style="position: absolute;bottom: 55px;top: 0;right: 0;left: 0">
<el-table
:data="dataList"
border
ref="selection"
height="100%"
style="width: 100%; border:1px solid #ccc"
@selection-change="selectStandChange"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}">
<el-table-column
type="selection"
width="55"
align="center">
</el-table-column>
<el-table-column
align="center"
label="标准号"
>
<template slot-scope="scope">
<a v-if="scope.row.standYear" class="table-jump"
@click="handlePreview(scope.row)">{{ scope.row.standSort
}} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
<a v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSort }}
{{ scope.row.standNumber }}</a>
</template>
</el-table-column>
<el-table-column
prop="standName"
align="center"
label="中文名称"
>
<template slot-scope="scope">
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
</template>
</el-table-column>
<el-table-column
prop="ssrq"
align="center"
sortable
label="标准实施日期">
<template slot-scope="scope">
<span>{{ scope.row.ssrq ? $moment(scope.row.ssrq).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
prop="zrbm"
label="责任部门"
align="center"
>
</el-table-column>
</el-table>
</div>
<pagination
:page="standPage"
:pageSize="standPageSize"
:total="standTotal"
@pageChange="standPageChange"
@pageSizeChange="standPageSizeChange"
/>
</div>
</div>
<div class="demo-drawer-footer">
<el-button size="mini" @click="closeStand">取消</el-button>
<el-button type="primary" size="mini" @click="OkStand">带入</el-button>
</div>
</el-drawer>
<!-- 填写未符合项信息表单-->
<el-drawer
size="700px"
@@ -588,16 +412,52 @@
<el-col :span="24">
<el-form :model="addForm" inline class="label-input-form" :rules="formRules" label-width="180px"
ref="addForm">
<el-form-item prop="standSerialNumber" label="标准号" style="width: 100%; margin-right:10px"
<el-form-item prop="productName" label="项目名称" style="width: 100%; margin-right:10px"
class="add-form-item">
<el-select v-model="addForm.productName"@change="handleChange" placeholder="请选择项目名称">
<el-option
v-for="item in ProjectDatas"
:key="item.id"
:label="item.projectName"
:value="item"
></el-option>
</el-select>
</el-form-item>
<el-form-item prop="productType" label="产品类型" style="width: 100%; margin-right:10px"
class="add-form-item">
<el-input
v-model="addForm.standSerialNumber"
placeholder="请输入标准号"
:disabled="true"
v-model="addForm.productType"
placeholder="请输入产品类型"
:maxlength="500" />
</el-form-item>
<el-form-item prop="productLine" label="产品线" style="width: 100%; margin-right:10px"
class="add-form-item">
<el-input
:disabled="true"
v-model="addForm.productLine"
placeholder="请输入产品线"
:maxlength="500" />
</el-form-item>
<el-form-item prop="standSerialNumber" label="标准号" style="width: 100%; margin-right:10px"
class="add-form-item">
<el-select
v-model="addForm.standSerialNumber"
:disabled="serialNumber"
@change="standChange"
placeholder="请选择标准号">
<el-option
v-for="item in dataList"
:key="item.standId"
:label="item.standSort + '-' + item.standNumber + '-' + item.standYear"
:value="item"
></el-option>
</el-select>
</el-form-item>
<el-form-item prop="standName" label="标准名称" style="width: 100%; margin-right:10px"
class="add-form-item">
<el-input
:disabled="true"
v-model="addForm.standName"
placeholder="请输入标准名称"
:maxlength="500" />
@@ -610,13 +470,6 @@
:maxlength="500">
</el-input>
</el-form-item>
<!-- <el-button-->
<!-- type="primary"-->
<!-- class="common-button-primary"-->
<!-- size="mini"-->
<!-- @click="handSeek"-->
<!-- style="position:absolute;top: 10px; float: right;"-->
<!-- >手动查找</el-button>-->
<el-form-item prop="itemsName" label="条款名称" style="width: 100%; margin-right:10px"
class="add-form-item">
<el-input
@@ -624,25 +477,12 @@
placeholder="请输入条款名称"
:maxlength="500" />
</el-form-item>
<el-form-item prop="productType" label="产品类型" style="width: 100%; margin-right:10px"
<el-form-item prop="responsibleUnit" label="责任部门" style="width: 100%; margin-right:10px"
class="add-form-item">
<el-input
v-model="addForm.productType"
placeholder="请输入产品类型"
:maxlength="500" />
</el-form-item>
<el-form-item prop="productLine" label="产品线" style="width: 100%; margin-right:10px"
class="add-form-item">
<el-input
v-model="addForm.productLine"
placeholder="请输入产品线"
:maxlength="500" />
</el-form-item>
<el-form-item prop="productName" label="项目名称" style="width: 100%; margin-right:10px"
class="add-form-item">
<el-input
v-model="addForm.productName"
placeholder="请输入项目名称"
:disabled="true"
v-model="addForm.responsibleUnit"
placeholder="请输入责任部门"
:maxlength="500" />
</el-form-item>
<el-form-item prop="reason" label="不合规项目" style="width: 100%; margin-right:10px"
@@ -652,13 +492,6 @@
placeholder="请输入不合规项目"
:maxlength="500" />
</el-form-item>
<el-form-item prop="responsibleUnit" label="责任部门" style="width: 100%; margin-right:10px"
class="add-form-item">
<el-input
v-model="addForm.responsibleUnit"
placeholder="请输入责任部门"
:maxlength="500" />
</el-form-item>
<el-form-item prop="dutyEngineer" label="责任工程师" style="width: 100%; margin-right:10px"
class="add-form-item">
<el-input
@@ -711,50 +544,6 @@
</el-button>
</div>
</el-drawer>
<!-- 条款弹窗-->
<el-dialog title="条款信息" :append-to-body="true" width="875px" :visible.sync="itemModel">
<el-table
ref="selections"
:data="itemsData"
tooltip-effect="dark"
style="width: 100%;overflow-y: auto;overflow-x: hidden;"
border
:height="300"
@selection-change="selectReplaceStandNumRowChange"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}">
<el-table-column
type="selection"
width="55"
align="center">
</el-table-column>
<el-table-column
prop="itemsNum"
label="条款号"
align="center"
>
</el-table-column>
<el-table-column
prop="itemsName"
label="条款名称"
align="center"
>
</el-table-column>
</el-table>
<loading :loading="replaceLoading">数据获取中</loading>
<!--分页-->
<pagination
style="position: relative;"
:page="replacePage"
:page-size="replacePageSize"
:total="replaceTotal"
@pageChange="pageChangeReplace"
@pageSizeChange="pageSizeChangeReplace"></pagination>
<div slot="footer" class="demo-drawer-footer">
<el-button class="common-button-default" @click="itemModel = false">取消</el-button>
<el-button type="primary" class="common-button-primary" @click="replaceLawsNumModelBt">带入</el-button>
</div>
</el-dialog>
</div>
</template>
@@ -872,7 +661,10 @@ export default {
},
//数据查看
historySee: false,
historySeeForm: {}
historySeeForm: {},
// 新增编辑框的disabled
serialNumber: true,
addFormEdit: {}
};
},
methods: {
@@ -1032,11 +824,6 @@ export default {
}
},
//项目查询按钮
getProjectDataBtn() {
this.page = 1;
this.getProjectData();
},
//获取项目数据
getProjectData() {
this.$http.get("sarStandProjectLibrary/queryProjectWorkFlow", {
@@ -1116,7 +903,7 @@ export default {
editUn(closeState, standSerialNumber, standName, itemsNum, itemsName, productType,
productLine, productName, reason, responsibleUnit, dutyEngineer, authEngineer, qaEngineer, planCloseTime, id).then(res => {
if (res.ok) {
this.$message.success("新增成功");
this.$message.success("编辑成功");
this.drawerTable = false;
this.getTableByPage();
}
@@ -1204,8 +991,8 @@ export default {
}
},
//查询项目下的标准
getStandData() {
this.$http.get("sarStandProjectLibrary/queryStandInfo", { id: this.projectId }, {
getStandData(val) {
this.$http.get("sarStandProjectLibrary/queryStandInfo", { id: val.id }, {
_this: this
}, res => {
res.data.records.forEach(item => {
@@ -1230,61 +1017,21 @@ export default {
});
});
},
//条款的多选框改变
selectReplaceStandNumRowChange(data) {
this.selectItems = data;
},
//标准的多选框改变
selectStandChange(data) {
this.standList = data;
},
//项目的多选框改变
selectListChange(data) {
this.selectList = data;
},
//单选逻辑
handleSelectionChanges(selection, val) {
if (selection.length > 1) {
let del_row = selection.shift();
this.$refs.listSelection.toggleRowSelection(del_row, false);
}
},
standPageChange(page) {
this.standPage = page;
this.getStandData();
},
standPageSizeChange(pageSize) {
this.standPageSize = pageSize;
this.getStandData();
},
//条款分页
pageChangeReplace(page) {
this.replacePage = page;
this.getItem();
},
pageSizeChangeReplace(pageSize) {
this.replacePageSize = pageSize;
this.getItem();
},
pageChange(page) {
this.page = page;
this.getProjectData();
},
pageSizeChange(pageSize) {
this.pageSize = pageSize;
this.getProjectData();
},
//新增事件
addModel() {
this.addForm = {};
this.projectModel = true;
this.dataList = []
this.serialNumber = true
this.drawerTitle = "新增";
this.getProjectData()
this.drawerTable = true
},
//编辑事件
projectEdit(row) {
this.drawerTitle = "编辑";
this.addForm = row;
this.addFormEdit = row
this.getProjectData()
this.drawerTable = true;
console.log(row);
},
//点击查看按钮事件
showUser(row) {
@@ -1307,10 +1054,6 @@ export default {
}
});
},
//点击编辑按钮事件
openEditModal(item) {
console.log(item);
},
// 点击查看
handlePreview(item) {
let routeUrl = this.$router.resolve({
@@ -1361,7 +1104,29 @@ export default {
pageSizeChangeNo(pageSize) {
this.pageSizeNo = pageSize;
this.getTableByPage();
},
/** 项目名称change事件 */
handleChange(val) {
if (this.drawerTitle === '编辑') {
this.addForm.standName = ''
this.addForm.standSerialNumber = ''
this.addForm.responsibleUnit = ''
}
this.addForm.productLine = val.productLine
this.addForm.productName = val.projectName
this.addForm.productType = val.projectPlatfor
this.serialNumber = false
this.getStandData(val)
},
/** 标准号change事件 */
standChange(item) {
this.addForm.standName = item.standName
this.addForm.standSerialNumber = item.standSort + '-' + item.standNumber + '-' + item.standYear
this.addForm.responsibleUnit = item.zrbm || "--";
}
},
mounted() {
//查询已维护的项目
@@ -1382,13 +1147,6 @@ export default {
<style lang="less" scoped>
//.el-table {
// .el-table__fixed {
// height:auto !important; // 此处的important表示优先于element.style
// bottom:17px; // 改为自动高度后，设置与父容器的底部距离，则高度会动态改变
// }
//}
#rectification-dataBase {
/deep/ .table-wrap {
.el-table__fixed {
@@ -1448,5 +1206,22 @@ export default {
height: 49px;
float: right;
}
.demo-drawer-content {
.content {
.standard-table-search {
/deep/.el-input.is-disabled .el-input__inner {
background-color: #fff;
color: #7e8083;
}
/deep/.el-select-dropdown__item.selected {
color: #8d8e91;
}
}
}
}
/deep/.el-select-dropdown__item.selected {
color: #8d8e91 !important;
}
}
</style>