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
2021-09-27 15:38:48 +08:00
parent 31db4ba8b5 10dee2cbb7
commit ea6b80fe33
38 changed files with 332 additions and 249 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/config/pages/attributeCustom/components/stand.vue
+51 -52
View File
@@ -2,8 +2,8 @@
<template>
<div class="attribute-custom v-class">
<div class="action-bar1">
<el-button class="common-button-primary add-button" size="mini" v-btn-permission="''" type="primary" @click="showAddModel"><i class="iconfont">&#xe84e;</i>新增</el-button>
<el-button class="common-button-default" size="small" v-btn-permission="''" @click="showDisplayLocationDialog">展示区域管理</el-button>
<el-button size="mini" style="margin-right: 5px" class="common-button-primary add-button" type="primary" @click="showAddModel"><i class="iconfont">&#xe84e;</i>新增</el-button>
<el-button size="small" class="common-button-default" @click="showDisplayLocationDialog">展示区域管理</el-button>
</div>
<loading :loading="attributeDataLoading">数据处理中</loading>
<div class="content">
@@ -74,16 +74,16 @@
<template slot-scope="scope">
<div @click.stop style="display: inline-block">
<el-dropdown trigger="click" @command="handleCommand">
<i class="iconfont">&#xe61e;</i>
<i class="iconfont">&#xe61e;</i>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item v-btn-permission="''" :command="[scope.row, '编辑']">编辑</el-dropdown-item>
<el-dropdown-item v-btn-permission="''" :disabled="scope.row.isEdit==='1'" :command="[scope.row, '删除']">删除</el-dropdown-item>
<el-dropdown-item :command="[scope.row, '编辑']">编辑</el-dropdown-item>
<el-dropdown-item :disabled="scope.row.isEdit==='1'" :command="[scope.row, '删除']">删除</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</div>
</template>
</el-table-column>
</el-table>
</el-table>
</div>
<pagination :total="total" :pageChange="pageNo" :pageSizeChange="pageSize" @pageChange="pageChange" @pageSizeChange="pageSizeChange"></pagination>
<!-- 新建抽屉-->
@@ -104,7 +104,7 @@
label-width="150px"
>
<input v-model="attributeEO.id" v-show="false">
<el-form-item label="所属模块" class="add-form-item">
<el-form-item label="所属模块" prop="sarType" class="add-form-item">
<el-select
v-model="attributeEO.sarType"
placeholder="请选择"
@@ -118,13 +118,13 @@
></el-option>
</el-select>
</el-form-item>
<el-form-item label="属性字段" class="add-form-item" :class="{'form-item-disabled': addOrEdit === 'edit'}">
<el-form-item label="属性字段" prop="attrField" class="add-form-item" :class="{'form-item-disabled': addOrEdit === 'edit'}">
<el-input v-model.trim="attributeEO.attrField" :disabled="addOrEdit === 'edit'" placeholder="请输入属性字段" clearable/>
</el-form-item>
<el-form-item label="属性名称" class="add-form-item">
<el-form-item label="属性名称" prop="attrName" class="add-form-item">
<el-input v-model.trim="attributeEO.attrName" placeholder="请输入属性名称" clearable/>
</el-form-item>
<el-form-item label="属性类型" class="add-form-item" :class="{'form-item-disabled': addOrEdit === 'edit'}">
<el-form-item label="属性类型" prop="attrType" class="add-form-item" :class="{'form-item-disabled': addOrEdit === 'edit'}">
<el-select v-model="attributeEO.attrType" placeholder="请选择" :disabled="addOrEdit === 'edit'" filterable>
<el-option
v-for="item in attrTypeOptions"
@@ -134,8 +134,8 @@
></el-option>
</el-select>
</el-form-item>
<el-form-item label="选项值" class="add-form-item" v-if="attributeEO.attrType === 'SEL_OPTION' || attributeEO.attrType === 'SEL_OPTS'">
<el-select v-model="attributeEO.selVal" placeholder="请选择" filterable>
<el-form-item label="选项值" prop="selVal" class="add-form-item" v-if="attributeEO.attrType === 'SEL_OPTION' || attributeEO.attrType === 'SEL_OPTS'">
<el-select v-model="attributeEO.selVal" placeholder="请选择" :disabled="addOrEdit === 'edit'" filterable>
<el-option
v-for="item in relateDicIdOptions"
:label="item.label"
@@ -149,18 +149,18 @@
<!-- <Option v-for="opt in isMustOptions" :key="opt.value" :value="opt.value">{{ opt.label }}</Option>-->
<!-- </Select>-->
<!-- </el-form-item>-->
<el-form-item label="字段长度" class="add-form-item">
<el-form-item label="字段长度" prop="attrLen" class="add-form-item">
<el-input v-model.number="attributeEO.attrLen" :disabled="addOrEdit === 'edit'" placeholder="只允许输入正整数" number :maxlength="4"/>
</el-form-item>
<el-form-item label="展示顺序" class="add-form-item">
<el-form-item label="展示顺序" prop="orderNum" class="add-form-item">
<el-input v-model.number="attributeEO.orderNum" placeholder="只允许输入正整数" number :maxlength="3"/>
</el-form-item>
<el-form-item label="是否必填" class="add-form-item">
<el-form-item label="是否必填" prop="isMust" class="add-form-item">
<el-select v-model="attributeEO.isMust">
<el-option v-for="opt in isMustOptions" :key="opt.value" :value="opt.value" :label="opt.label">{{ opt.label }}</el-option>
</el-select>
</el-form-item>
<el-form-item label="是否展示" class="add-form-item">
<el-form-item label="是否展示" prop="isShowImp" class="add-form-item">
<el-select v-model="attributeEO.isShowImp">
<el-option
v-for="opt in isMustOptions"
@@ -170,7 +170,7 @@
></el-option>
</el-select>
</el-form-item>
<el-form-item label="展示区域" class="add-form-item" v-if="attributeEO.isShowImp === '0'">
<el-form-item label="展示区域" prop="showRegionId" class="add-form-item" v-if="attributeEO.isShowImp === '0'">
<el-select v-model="attributeEO.showRegionId">
<el-option
v-for="opt in showRegionOptions"
@@ -188,8 +188,8 @@
</el-form>
</div>
<div id="roleFormButton" class="demo-drawer-footer">
<el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" @click="saveInfo()">提交</el-button>
<el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancelModel">取消</el-button>
<el-button class="common-button-primary" icon="el-icon-check" type="primary" @click="saveInfo()">提交</el-button>
<el-button class="common-button-default" icon="el-icon-close" @click="cancelModel">取消</el-button>
</div>
</el-drawer>
@@ -199,7 +199,7 @@
width="400px"
>
<div style="margin-bottom: 10px;">
<el-button size="mini" class="common-button-primary add-button" v-btn-permission="'e128da8f053dd19113e75772f2c70f29'" type="primary" icon="add" @click="showAddDisplayLocationDialog(undefined)">新增</el-button>
<el-button class="common-button-primary add-button" type="primary" icon="add" @click="showAddDisplayLocationDialog(undefined)">新增</el-button>
</div>
<el-table
:loading="displayLocationDialogTableConfig.loading"
@@ -228,10 +228,10 @@
<template slot-scope="scope">
<div @click.stop style="display: inline-block">
<el-dropdown trigger="click" @command="handleCommand2">
<i class="iconfont">&#xe61e;</i>
<i class="iconfont">&#xe61e;</i>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item v-btn-permission="'2a788bca1cca66384e97f8ff722d4232'" :command="[scope.row, '修改']">修改</el-dropdown-item>
<el-dropdown-item v-btn-permission="'116a3f339f3600e639271d0073045912'" :disabled="scope.row.validFlag===1" :command="[scope.row, '删除']">删除</el-dropdown-item>
<el-dropdown-item :command="[scope.row, '修改']">修改</el-dropdown-item>
<el-dropdown-item :disabled="scope.row.validFlag===1" :command="[scope.row, '删除']">删除</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</div>
@@ -269,12 +269,12 @@
</el-select>
</el-form-item>
<el-form-item label="排序号" prop="showIndex" class="add-form-item">
<el-input v-model="displayLocationDialogFormData.showIndex" placeholder="请输入排序号"></el-input>
<el-input v-model.number="displayLocationDialogFormData.showIndex" placeholder="请输入排序号"></el-input>
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button size="mini" class="common-button-default" @click="handleDisplayLocationFormDialogReset('displayLocationDialogForm')">取 消</el-button>
<el-button size="mini" class="common-button-primary" type="primary" @click="handleDisplayLocationFormDialogSubmit('displayLocationDialogForm')">确 定</el-button>
<el-button class="common-button-default" @click="handleDisplayLocationFormDialogReset('displayLocationDialogForm')">取 消</el-button>
<el-button class="common-button-primary" type="primary" @click="handleDisplayLocationFormDialogSubmit('displayLocationDialogForm')">确 定</el-button>
</span>
</el-dialog>
</div>
@@ -319,7 +319,6 @@ export default {
},
displayLocationDialogFormData: {
areaName: '',
sarType: '',
showIndex: ''
},
displayLocationDialogFormRules: {
@@ -331,9 +330,8 @@ export default {
{required: true, message: '所属模块不能为空', trigger: 'change'}
],
showIndex: [
{ required: true, message: '排序号不能为空且为正整数', trigger: 'blur'},
{ type: 'string', validator: this.verify.validStandNumInCompile2, trigger: 'blur'},
{ min: 0, max: 999, message: '请输入0-999之间的整数', trigger: 'blur' }
{ type: 'number', required: true, message: '请输入排序号', trigger: 'blur' },
{ type: 'number', min: 0, max: 999, message: '请输入0-999之间的整数', trigger: 'blur' }
]
},
attributeDataLoading: false,
@@ -353,7 +351,7 @@ export default {
showRegionId: '',
selVal: '',
isSearch: '1',
sarType: 'STAND',
sarType: '',
isWarn: '1'
},
attrTypeOptions: [
@@ -561,7 +559,7 @@ export default {
queryDisplayLocationList (sarType) {
return new Promise((resolve, reject) => {
this.$http.get('lawssBase/utArea/getAreaList', {
sarType: sarType
sarType: sarType || 'INLAND_STAND'
}, {
_this: this
}, res => {
@@ -589,17 +587,17 @@ export default {
},
getAttrByPage () {
this.$http.get('lawss/sarStandAttrDetails/page', {
page: this.pageNo,
pageSize: this.pageSize,
sarType: this.sarType
}, {
_this: this,
loading: 'attributeDataLoading'
},
res => {
this.attributeList = res.data.list
this.total = res.data.count
}, e => {})
page: this.pageNo,
pageSize: this.pageSize,
sarType: this.sarType
}, {
_this: this,
loading: 'attributeDataLoading'
},
res => {
this.attributeList = res.data.list
this.total = res.data.count
}, e => {})
this.$refs.selections.clearSelection()
},
async showAddModel () {
@@ -609,7 +607,6 @@ export default {
this.addOrEdit = 'add'
this.attributeTitle = '新增'
this.showInfoModal = true
this.attributeEO = {}
this.$nextTick(() => {
this.$refs['attributeEO'].resetFields()
})
@@ -679,13 +676,13 @@ export default {
},
getDictionarySelList () {
this.$http.get('sys/dictionary/getDictionaryCodeSelList', {
sarType: this.sarType
}, {
_this: this
},
res => {
this.relateDicIdOptions = res.data
}, e => {})
sarType: this.sarType
}, {
_this: this
},
res => {
this.relateDicIdOptions = res.data
}, e => {})
},
getAttrTypeText (type) {
let texts = ''
@@ -725,7 +722,9 @@ export default {
this.addOrEdit = 'edit'
this.attributeTitle = '编辑'
this.showInfoModal = true
this.attributeEO = JSON.parse(JSON.stringify(params))
this.$nextTick(() => {
this.attributeEO = JSON.parse(JSON.stringify(params))
})
},
handleTableDelete (params) {
this.selectedList = []
src/pages/config/pages/mechanismManage/index.vue
+31 -16
View File
@@ -12,6 +12,8 @@
:data="treeData"
:props="defaultProps"
default-expand-all
:current-node-key="nodeKeyId"
node-key="id"
:filter-node-method="filterNode"
highlight-current
ref="tree"
@@ -166,6 +168,7 @@ export default {
name: 'MechanismManage',
data () {
return {
nodeKeyId:'',
searchForm: {
uname:"",
email:""
@@ -200,6 +203,7 @@ export default {
uname: "",
email: ""
}
this.page = 1
this.getData()
},
resetFormPost () {
@@ -278,8 +282,12 @@ export default {
_this: this,
loading: 'treeLoading'
}, res => {
console.log(res);
this.treeData = res.data
console.log(this.treeData);
this.nodeKeyId = this.treeData[0].id
this.$nextTick(function () {
this.$refs.tree.setCurrentKey(this.nodeKeyId)
})
this.id = res.data[0].id
this.getData()
}, e => {
@@ -394,22 +402,29 @@ export default {
}
</style>
<style lang="less" scoped>
/deep/.el-select__tags {
overflow-x: hidden;
}
/deep/.width-all{
width: 100%;
}
.filter-tree {
height: calc(~'100% - 50px')
}
.laws-tree{
/deep/.clearable {
top: 20px;
#mechanism-manage{
height: 100%;
.content {
height: calc(~'100% - 105px - 56px')
}
/deep/.el-select__tags {
overflow-x: hidden;
}
/deep/.width-all{
width: 100%;
}
.filter-tree {
height: calc(~'100% - 50px')
}
.laws-tree{
/deep/.clearable {
top: 20px;
}
}
.add-form-item {
display: flex;
}
}
.add-form-item {
display: flex;
}
</style>
src/pages/config/pages/roleManage/index.vue
+3 -2
View File
@@ -38,7 +38,7 @@
class="common-button-primary add-button"
@click="roleAddData"
v-btn-permission="'bb2571b08179edb36880aae169cb2e54'"
size="mini">配置数据权限
size="mini">配置法规库权限
</el-button>
<el-button type="primary"
class="common-button-primary add-button"
@@ -195,7 +195,8 @@
placeholder="请输入角色名称"
clearable></el-input>
</el-form-item>
<el-form-item label="上级角色" prop="parentId" label-width="100px" class="add-form-item">
<!-- 当前的需求是不允许更改父级节点-->
<el-form-item v-show="this.type === 1" label="上级角色" prop="parentId" label-width="100px" class="add-form-item">
<el-input v-model="addForm.parentId" style="display: none;"
clearable></el-input>
<el-input v-model="addForm.parent"
src/pages/details/otherStandardDetails/index.vue
+3 -3
View File
@@ -2883,9 +2883,9 @@
const dynamicFormField = standEO ? standEO.attrInfoMap : {}
formFieldList.forEach((field) => {
// 相关流程权限
if (field.attrField === 'XGLC' && !this.$_has('6A52PZCAX8BAUUJ2TSQ4')) {
return
}
// if (field.attrField === 'XGLC' && !this.$_has('6A52PZCAX8BAUUJ2TSQ4')) {
// return
// }
displayLocation.forEach((location) => {
location.isShowImp = '0'
if (dynamicFormField) {
src/pages/processCenter/pages/creatProcess/bzjd/step1-6.vue
+4 -4
View File
@@ -163,7 +163,7 @@
<el-table-column
show-overflow-tooltip
prop="technicalRequir"
width="150"
width="200"
label="核心技术要求"
align="center">
</el-table-column>
@@ -196,13 +196,13 @@
<el-table-column
show-overflow-tooltip
prop="complianceState"
width="150"
width="200"
label="合规性分析"
align="center">
</el-table-column>
<el-table-column
prop="newData"
width="250"
width="150"
label="新车型实施日期"
align="center">
<template slot-scope="scope">
@@ -211,7 +211,7 @@
</el-table-column>
<el-table-column
prop="onlineData"
width="250"
width="150"
label="在产车型实施日期"
align="center">
<template slot-scope="scope">
src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
+5 -5
View File
@@ -167,7 +167,7 @@
<el-table-column
v-if="!form.itemsNum1"
prop="technicalRequir"
width="150"
width="200"
label="核心技术要求"
align="center">
<template slot-scope="scope">
@@ -211,7 +211,7 @@
</el-table-column>
<el-table-column
prop="complianceState"
width="150"
width="200"
label="合规性分析"
align="center">
<template slot-scope="scope">
@@ -222,7 +222,7 @@
</el-table-column>
<el-table-column
prop="newData"
width="250"
width="150"
label="新车型实施日期"
align="center">
<template slot-scope="scope">
@@ -235,7 +235,7 @@
</el-table-column>
<el-table-column
prop="onlineData"
width="250"
width="150"
label="在产车型实施日期"
align="center">
<template slot-scope="scope">
@@ -364,7 +364,7 @@
:wrapperClosable="false"
size="800px">
<div class="demo-drawer-content">
<el-form :model="plForm" class="label-input-form" ref="plForm" label-width="150">
<el-form :model="plForm" class="label-input-form" ref="plForm" label-width=150">
<el-formItem label="核心技术要求" prop="technicalRequir" class="add-form-item" v-if="!form.itemsNum1">
<el-input
v-model="plForm.technicalRequir"
src/pages/processCenter/pages/creatProcess/bzjd/step4.vue
+4 -4
View File
@@ -162,7 +162,7 @@
<el-table-column
show-overflow-tooltip
prop="technicalRequir"
width="150"
width="200"
label="核心技术要求"
align="center">
</el-table-column>
@@ -195,13 +195,13 @@
<el-table-column
show-overflow-tooltip
prop="complianceState"
width="150"
width="200"
label="合规性分析"
align="center">
</el-table-column>
<el-table-column
prop="newData"
width="250"
width="150"
label="新车型实施日期"
align="center">
<template slot-scope="scope">
@@ -210,7 +210,7 @@
</el-table-column>
<el-table-column
prop="onlineData"
width="250"
width="150"
label="在产车型实施日期"
align="center">
<template slot-scope="scope">
src/pages/processCenter/pages/creatProcess/bzjd/step5.vue
+4 -4
View File
@@ -162,7 +162,7 @@
<el-table-column
show-overflow-tooltip
prop="technicalRequir"
width="150"
width="200"
label="核心技术要求"
align="center">
</el-table-column>
@@ -195,13 +195,13 @@
<el-table-column
show-overflow-tooltip
prop="complianceState"
width="150"
width="200"
label="合规性分析"
align="center">
</el-table-column>
<el-table-column
prop="newData"
width="250"
width="150"
label="新车型实施日期"
align="center">
<template slot-scope="scope">
@@ -210,7 +210,7 @@
</el-table-column>
<el-table-column
prop="onlineData"
width="250"
width="150"
label="在产车型实施日期"
align="center">
<template slot-scope="scope">
src/pages/processCenter/pages/creatProcess/bzjd/step6.vue
+4 -4
View File
@@ -163,7 +163,7 @@
<el-table-column
show-overflow-tooltip
prop="technicalRequir"
width="150"
width="200"
label="核心技术要求"
align="center">
</el-table-column>
@@ -196,13 +196,13 @@
<el-table-column
show-overflow-tooltip
prop="complianceState"
width="150"
width="200"
label="合规性分析"
align="center">
</el-table-column>
<el-table-column
prop="newData"
width="250"
width="150"
label="新车型实施日期"
align="center">
<template slot-scope="scope">
@@ -211,7 +211,7 @@
</el-table-column>
<el-table-column
prop="onlineData"
width="250"
width="150"
label="在产车型实施日期"
align="center">
<template slot-scope="scope">
src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
+1 -1
View File
@@ -569,7 +569,7 @@
style="width: 100%"
border
ref="table"
height="100%"
height="90%"
:header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"
@selection-change="selectThree"
src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue
+3
View File
@@ -779,6 +779,7 @@ export default {
* @description: 动态表单读取
*/
getFormFieldList (item) {
console.log(item.commentText);
this.$nextTick(() => {
this.listForm = JSON.parse(JSON.stringify(item))
if(item.form === undefined){
@@ -791,9 +792,11 @@ export default {
this.listForm.jlUserId = item.jlUserId
this.listForm.zrUserId = item.zrUserId
this.fileInfoList = item.fileName
this.commentText = item.commentText
} else {
this.listForm = item.form
this.dataList = item.form.dataList
this.commentText = item.commentText
this.listForm.dataList = item.form.dataList
this.fileInfoList = item.form.fileName
}
src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+23 -3
View File
@@ -1238,7 +1238,27 @@
TreeSelectNew
},
data () {
return {
const validateQcdw = (rule, value, callback) => {
if(this.form.standInData === '0'){
if (value === null || value.length === 0) {
callback(new Error('请选择起草单位！'))
} else {
callback()
}
}
callback()
};
const validateCysd = (rule, value, callback) => {
if(this.form.standInData === '0'){
if (value === '') {
callback(new Error('请选择我司参与深度！'))
} else {
callback()
}
}
callback()
}
return {
fileList: [],
caFileList: [],
FBGBJBDFileList: [],
@@ -1477,10 +1497,10 @@
{ required: true, message: '请选择标准发布日期', trigger: 'change' }
],
qcdw: [
{ required: true, message: '请选择起草单位', trigger: 'change' }
{ required: true, message: '请选择起草单位', validator: validateQcdw, trigger: 'change' }
],
cysd: [
{ required: true, message: '请选择我司参与深度', trigger: 'change' }
{ required: true, message: '请选择我司参与深度', validator: validateCysd, trigger: 'change' }
],
},
zrUserIds: [], // 选择多个会签责任人
src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue
+8 -2
View File
@@ -91,12 +91,15 @@
</el-table-column>
<el-table-column
prop="chapterNumber"
align="center"
label="章条编号"
width="170px">
width="101px">
</el-table-column>
<el-table-column
prop="chapterName"
label="章节名称">
align="center"
label="章节名称"
width="200px">
</el-table-column>
<el-table-column
align="center"
@@ -120,14 +123,17 @@
</el-table-column>
<el-table-column
prop="department"
align="center"
label="提出部门">
</el-table-column>
<el-table-column
prop="responUserName"
align="center"
label="提出人">
</el-table-column>
<el-table-column
prop="state"
align="center"
label="处理意见">
<template slot-scope="scope">
<div>{{ stateText(scope.row.state) }}</div>
src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue
+2 -2
View File
@@ -97,7 +97,7 @@
align="center"
sortable
label="章条编号"
width="170px">
width="101px">
<template slot-scope="scope">
<el-input style="margin: 10px 0;" v-model="scope.row.chapterNumber"></el-input>
</template>
@@ -106,7 +106,7 @@
prop="chapterName"
align="center"
label="章节名称"
width="170px">
width="200px">
<template slot-scope="scope">
<el-input style="margin: 10px 0;" v-model="scope.row.chapterName"></el-input>
</template>
src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue
+3 -2
View File
@@ -79,12 +79,13 @@
align="center"
sortable
label="章条编号"
width="170px">
width="101px">
</el-table-column>
<el-table-column
prop="chapterName"
align="center"
label="章节名称">
label="章节名称"
width="200px">
</el-table-column>
<el-table-column
align="center"
src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue
+2 -1
View File
@@ -79,11 +79,12 @@
align="center"
sortable
label="章条编号"
width="170px">
width="101px">
</el-table-column>
<el-table-column
prop="chapterName"
align="center"
width="200px"
label="章节名称">
</el-table-column>
<el-table-column
src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue
+2 -1
View File
@@ -91,11 +91,12 @@
align="center"
sortable
label="章条编号"
width="170px">
width="101px">
</el-table-column>
<el-table-column
prop="chapterName"
align="center"
width="200px"
label="章节名称">
</el-table-column>
<el-table-column
src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue
+2 -1
View File
@@ -91,11 +91,12 @@
align="center"
label="章条编号"
sortable
width="170px">
width="101px">
</el-table-column>
<el-table-column
prop="chapterName"
align="center"
width="200px"
label="章节名称">
</el-table-column>
<el-table-column
src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue
+2 -1
View File
@@ -91,11 +91,12 @@
sortable
align="center"
label="章条编号"
width="170px">
width="101px">
</el-table-column>
<el-table-column
prop="chapterName"
align="center"
width="200px"
label="章节名称">
</el-table-column>
<el-table-column
src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue
+2 -1
View File
@@ -91,11 +91,12 @@
align="center"
sortable
label="章条编号"
width="170px">
width="101px">
</el-table-column>
<el-table-column
prop="chapterName"
align="center"
width="200px"
label="章节名称">
</el-table-column>
<el-table-column
src/pages/processCenter/pages/creatProcess/xmpg/step1-7.vue
+4 -4
View File
@@ -197,7 +197,7 @@
<el-table-column
prop="noCompliance"
align="center"
width="160"
width="170"
label="不合规项目">
</el-table-column>
<el-table-column
@@ -209,7 +209,7 @@
<el-table-column
prop="completionTime"
align="center"
width="160"
width="120"
label="完成时间">
<template slot-scope="scope">
<span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format('YYYY-MM-DD') : '' }}</span>
@@ -233,7 +233,7 @@
<el-table-column
prop="zcNoCompliance"
align="center"
width="160"
width="170"
label="不合规项目">
</el-table-column>
<el-table-column
@@ -245,7 +245,7 @@
<el-table-column
prop="zcCompletionTime"
align="center"
width="160"
width="120"
label="完成时间">
<template slot-scope="scope">
<span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format('YYYY-MM-DD') : '' }}</span>
src/pages/processCenter/pages/creatProcess/xmpg/step4.vue
+4 -4
View File
@@ -204,7 +204,7 @@
<el-table-column
prop="researchNonCompliance"
align="center"
width="160"
width="170"
label="不合规项目">
<template slot-scope="scope">
<el-input
@@ -230,7 +230,7 @@
<el-table-column
prop="researchCompletionTime"
align="center"
width="160"
width="120"
label="完成时间">
<template slot-scope="scope">
<el-date-picker
@@ -265,7 +265,7 @@
<el-table-column
prop="productionNonCompliance"
align="center"
width="160"
width="170"
label="不合规项目">
<template slot-scope="scope">
<el-input
@@ -291,7 +291,7 @@
<el-table-column
prop="productionCompletionTime"
align="center"
width="160"
width="120"
label="完成时间">
<template slot-scope="scope">
<el-date-picker
src/pages/processCenter/pages/creatProcess/xmpg/step5.vue
+4 -4
View File
@@ -197,7 +197,7 @@
<el-table-column
prop="noCompliance"
align="center"
width="160"
width="170"
label="不合规项目">
</el-table-column>
<el-table-column
@@ -209,7 +209,7 @@
<el-table-column
prop="completionTime"
align="center"
width="160"
width="120"
label="完成时间">
<template slot-scope="scope">
<span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format('YYYY-MM-DD') : '' }}</span>
@@ -233,7 +233,7 @@
<el-table-column
prop="zcNoCompliance"
align="center"
width="160"
width="170"
label="不合规项目">
</el-table-column>
<el-table-column
@@ -245,7 +245,7 @@
<el-table-column
prop="zcCompletionTime"
align="center"
width="160"
width="120"
label="完成时间">
<template slot-scope="scope">
<span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format('YYYY-MM-DD') : '' }}</span>
src/pages/processCenter/pages/creatProcess/xmpg/step6.vue
+4 -4
View File
@@ -197,7 +197,7 @@
<el-table-column
prop="noCompliance"
align="center"
width="160"
width="170"
label="不合规项目">
</el-table-column>
<el-table-column
@@ -209,7 +209,7 @@
<el-table-column
prop="completionTime"
align="center"
width="160"
width="120"
label="完成时间">
<template slot-scope="scope">
<span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format('YYYY-MM-DD') : '' }}</span>
@@ -233,7 +233,7 @@
<el-table-column
prop="zcNoCompliance"
align="center"
width="160"
width="170"
label="不合规项目">
</el-table-column>
<el-table-column
@@ -245,7 +245,7 @@
<el-table-column
prop="zcCompletionTime"
align="center"
width="160"
width="120"
label="完成时间">
<template slot-scope="scope">
<span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format('YYYY-MM-DD') : '' }}</span>
src/pages/processCenter/pages/creatProcess/xmpg/step7.vue
+4 -4
View File
@@ -197,7 +197,7 @@
<el-table-column
prop="noCompliance"
align="center"
width="160"
width="170"
label="不合规项目">
</el-table-column>
<el-table-column
@@ -209,7 +209,7 @@
<el-table-column
prop="completionTime"
align="center"
width="160"
width="120"
label="完成时间">
<template slot-scope="scope">
<span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format('YYYY-MM-DD') : '' }}</span>
@@ -233,7 +233,7 @@
<el-table-column
prop="zcNoCompliance"
align="center"
width="160"
width="170"
label="不合规项目">
</el-table-column>
<el-table-column
@@ -245,7 +245,7 @@
<el-table-column
prop="zcCompletionTime"
align="center"
width="160"
width="120"
label="完成时间">
<template slot-scope="scope">
<span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format('YYYY-MM-DD') : '' }}</span>
src/pages/processCenter/pages/creatProcess/xmpg2/step1-12.vue
+4 -4
View File
@@ -127,7 +127,7 @@
<el-table-column
prop="noCompliance"
align="center"
width="160"
width="170"
label="不合规项目">
</el-table-column>
<el-table-column
@@ -139,7 +139,7 @@
<el-table-column
prop="completionTime"
align="center"
width="160"
width="120"
label="完成时间">
<template slot-scope="scope">
<span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format('YYYY-MM-DD') : '' }}</span>
@@ -163,7 +163,7 @@
<el-table-column
prop="zcNoCompliance"
align="center"
width="160"
width="170"
label="不合规项目">
</el-table-column>
<el-table-column
@@ -175,7 +175,7 @@
<el-table-column
prop="zcCompletionTime"
align="center"
width="160"
width="120"
label="完成时间">
<template slot-scope="scope">
<span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format('YYYY-MM-DD') : '' }}</span>
src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue
+4 -4
View File
@@ -130,7 +130,7 @@
<el-table-column
prop="noCompliance"
align="center"
width="160"
width="170"
label="不合规项目">
</el-table-column>
<el-table-column
@@ -142,7 +142,7 @@
<el-table-column
prop="completionTime"
align="center"
width="160"
width="120"
label="完成时间">
<template slot-scope="scope">
<span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format("YYYY-MM-DD") : ""
@@ -167,7 +167,7 @@
<el-table-column
prop="zcNoCompliance"
align="center"
width="160"
width="170"
label="不合规项目">
</el-table-column>
<el-table-column
@@ -179,7 +179,7 @@
<el-table-column
prop="zcCompletionTime"
align="center"
width="160"
width="120"
label="完成时间">
<template slot-scope="scope">
<span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format("YYYY-MM-DD") : ""
src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue
+4 -4
View File
@@ -130,7 +130,7 @@
<el-table-column
prop="noCompliance"
align="center"
width="160"
width="170"
label="不合规项目">
</el-table-column>
<el-table-column
@@ -142,7 +142,7 @@
<el-table-column
prop="completionTime"
align="center"
width="160"
width="120"
label="完成时间">
<template slot-scope="scope">
<span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format("YYYY-MM-DD") : ""
@@ -167,7 +167,7 @@
<el-table-column
prop="zcNoCompliance"
align="center"
width="160"
width="170"
label="不合规项目">
</el-table-column>
<el-table-column
@@ -179,7 +179,7 @@
<el-table-column
prop="zcCompletionTime"
align="center"
width="160"
width="120"
label="完成时间">
<template slot-scope="scope">
<span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format("YYYY-MM-DD") : ""
src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue
+4 -4
View File
@@ -130,7 +130,7 @@
<el-table-column
prop="noCompliance"
align="center"
width="160"
width="170"
label="不合规项目">
</el-table-column>
<el-table-column
@@ -142,7 +142,7 @@
<el-table-column
prop="completionTime"
align="center"
width="160"
width="120"
label="完成时间">
<template slot-scope="scope">
<span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format("YYYY-MM-DD") : ""
@@ -167,7 +167,7 @@
<el-table-column
prop="zcNoCompliance"
align="center"
width="160"
width="170"
label="不合规项目">
</el-table-column>
<el-table-column
@@ -179,7 +179,7 @@
<el-table-column
prop="zcCompletionTime"
align="center"
width="160"
width="120"
label="完成时间">
<template slot-scope="scope">
<span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format("YYYY-MM-DD") : ""
src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue
+108 -79
View File
@@ -49,11 +49,12 @@
</div>
</div>
<el-table
:data="dataList"
style="width: 100%; border: 1px solid #cccccc"
:data="dataList.slice((currentPage - 1) * pageSize, currentPage * pageSize ) "
style="width: 100%; border: 1px solid #cccccc;height: 400px"
row-key="standId"
height="70%"
border
highlight-current-row
@selection-change="selectStandChange"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold'}"
@@ -72,7 +73,8 @@
>
<template slot-scope="scope">
<a v-if="scope.row.standYear" class="table-jump"
@click="handlePreview(scope.row)">{{ scope.row.standSort }} {{ scope.row.standNumber
@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>
@@ -144,7 +146,7 @@
<el-table-column
prop="researchNonCompliance"
align="center"
width="160"
width="170"
label="不合规项目">
<template slot-scope="scope">
<el-input
@@ -170,7 +172,7 @@
<el-table-column
prop="researchCompletionTime"
align="center"
width="160"
width="120"
label="完成时间">
<template slot-scope="scope">
<el-date-picker
@@ -205,7 +207,7 @@
<el-table-column
prop="productionNonCompliance"
align="center"
width="160"
width="170"
label="不合规项目">
<template slot-scope="scope">
<el-input
@@ -231,7 +233,7 @@
<el-table-column
prop="productionCompletionTime"
align="center"
width="160"
width="120"
label="完成时间">
<template slot-scope="scope">
<el-date-picker
@@ -243,18 +245,26 @@
</el-table-column>
</el-table-column>
</el-table-column>
<!-- 以后全选可能用-->
<!-- <el-table-column-->
<!-- prop="productionCompletionTime"-->
<!-- align="center"-->
<!-- fixed="right"-->
<!-- width="160"-->
<!-- label="操作">-->
<!-- <template slot-scope="scope">-->
<!-- <el-button style="width: 98%" size="small" type="primary" @click="">{{ "批量编辑" }}</el-button>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- 以后全选可能用-->
<!-- <el-table-column-->
<!-- prop="productionCompletionTime"-->
<!-- align="center"-->
<!-- fixed="right"-->
<!-- width="160"-->
<!-- label="操作">-->
<!-- <template slot-scope="scope">-->
<!-- <el-button style="width: 98%" size="small" type="primary" @click="">{{ "批量编辑" }}</el-button>-->
<!-- </template>-->
<!-- </el-table-column>-->
</el-table>
<el-pagination
layout="total,sizes, prev, pager, next"
background
:page-sizes="[20, 40, 60]"
:total="total"
@current-change="handleCurrentChange"
>
</el-pagination>
</div>
<div>
<el-collapse accordion>
@@ -353,77 +363,80 @@
</ProcessFooter>
<!-- 福田全公司选人解决方案 -->
<Role-tree
check-box
:is-title="drawerTitle"
:is-visible.sync="drawerModal"
@checkedRole="checkedTransferRole"
:nodeList="nodeList"
check-box
:is-title="drawerTitle"
:is-visible.sync="drawerModal"
@checkedRole="checkedTransferRole"
:nodeList="nodeList"
></Role-tree>
<el-drawer
title="批量填写"
:visible.sync="modalshowflag"
:wrapperClosable="false"
size="800px">
title="批量填写"
:visible.sync="modalshowflag"
:wrapperClosable="false"
size="800px">
<div class="demo-drawer-content">
<el-form :model="batchEditForm" class="label-input-form" ref="projectComplianceForm" label-width="150">
<el-divider><span><b>在研产品</b></span></el-divider>
<el-formItem label="合规原因" class="add-form-item" >
<el-formItem label="合规原因" class="add-form-item">
<el-input
v-model="batchEditForm.complianceReasons"
placeholder="请输入合规原因"
v-model="batchEditForm.complianceReasons"
placeholder="请输入合规原因"
></el-input>
</el-formItem>
<el-form-item label="不合规项目" class="add-form-item" >
<el-form-item label="不合规项目" class="add-form-item">
<el-input
v-model="batchEditForm.noCompliance"
placeholder="请输入不合规项目"
v-model="batchEditForm.noCompliance"
placeholder="请输入不合规项目"
></el-input>
</el-form-item>
<el-form-item label="不合规应对措施" class="add-form-item" >
<el-form-item label="不合规应对措施" class="add-form-item">
<el-input
v-model="batchEditForm.countermeasures"
placeholder="请输入不合规应对措施"
v-model="batchEditForm.countermeasures"
placeholder="请输入不合规应对措施"
></el-input>
</el-form-item>
<el-form-item label="完成时间" class="add-form-item" >
<el-form-item label="完成时间" class="add-form-item">
<el-date-picker
v-model="batchEditForm.completionTime"
type="date"
placeholder="选择日期">
v-model="batchEditForm.completionTime"
type="date"
placeholder="选择日期">
</el-date-picker>
</el-form-item>
<br>
<el-divider><span><b>在产产品</b></span></el-divider>
<el-formItem label="合规原因" class="add-form-item" >
<el-formItem label="合规原因" class="add-form-item">
<el-input
v-model="batchEditForm.zcComplianceReasons"
placeholder="请输入合规原因"
v-model="batchEditForm.zcComplianceReasons"
placeholder="请输入合规原因"
></el-input>
</el-formItem>
<el-form-item label="不合规项目" class="add-form-item" >
<el-form-item label="不合规项目" class="add-form-item">
<el-input
v-model="batchEditForm.zcNoCompliance"
placeholder="请输入不合规项目"
v-model="batchEditForm.zcNoCompliance"
placeholder="请输入不合规项目"
></el-input>
</el-form-item>
<el-form-item label="不合规应对措施" class="add-form-item" >
<el-form-item label="不合规应对措施" class="add-form-item">
<el-input
v-model="batchEditForm.zcCountermeasures"
placeholder="请输入不合规应对措施"
v-model="batchEditForm.zcCountermeasures"
placeholder="请输入不合规应对措施"
></el-input>
</el-form-item>
<el-form-item label="完成时间" class="add-form-item" >
<el-form-item label="完成时间" class="add-form-item">
<el-date-picker
v-model="batchEditForm.zcCompletionTime"
type="date"
placeholder="选择日期">
v-model="batchEditForm.zcCompletionTime"
type="date"
placeholder="选择日期">
</el-date-picker>
</el-form-item>
</el-form>
</div>
<div class="demo-drawer-footer">
<el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" @click="saveBatchEditForm">确定</el-button>
<el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancelBatchEditForm">取消</el-button>
<el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" @click="saveBatchEditForm">
确定
</el-button>
<el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancelBatchEditForm">取消
</el-button>
</div>
</el-drawer>
</div>
@@ -433,7 +446,7 @@
import ProcessHeader from "../../components/ProcessHeader";
import ProcessFooter from "../../components/ProcessFooter";
import ProcessTitle from "../../components/ProcessTitle";
import { inboundLiaisonDetail, saveTaskForPub ,changeAssigneeNew } from "api/process";
import {inboundLiaisonDetail, saveTaskForPub, changeAssigneeNew} from "api/process";
export default {
name: "xmpg2Step6",
@@ -444,30 +457,33 @@ export default {
},
data() {
return {
nodeList:[],
total: 0,
currentPage: 1,
pageSize: 20,
nodeList: [],
isTransfer: false,
// 调整处理人抽屉状态
drawerModal: false,
batchEditForm: {
// 在研产品
// 合规
complianceReasons :'',
complianceReasons: '',
// 不合规
noCompliance :'',
noCompliance: '',
// 应对措施
countermeasures :'',
countermeasures: '',
// 完成时间
completionTime :'',
completionTime: '',
// 在产产品
// 合规
zcComplianceReasons :'',
zcComplianceReasons: '',
// 不合规
zcNoCompliance:'',
zcNoCompliance: '',
// 应对措施
zcCountermeasures:'',
zcCountermeasures: '',
// 完成时间
zcCompletionTime:''
zcCompletionTime: ''
},
hasChildren: true,
active: "1",
@@ -519,7 +535,7 @@ export default {
},
methods: {
//确认转办
checkedTransferRole (data) {
checkedTransferRole(data) {
this.assigneeNewLoading = true
changeAssigneeNew({
taskId: this.$route.query.taskIds, // 任务id
@@ -539,7 +555,7 @@ export default {
})
},
// 请求转换流程图
processNum (row) {
processNum(row) {
axios.request({
url: '/api/lawss/activiti/getImg?_t=' + new Date().getTime(),
responseType: 'blob',
@@ -554,7 +570,7 @@ export default {
})
},
//转办事件
handleTransfer(){
handleTransfer() {
this.drawerModal = true
this.drawerTitle = '转办处理人'
this.selectPeople = row
@@ -563,8 +579,8 @@ export default {
saveBatchEditForm() {
// console.log(this.selectList)
for( let a = 0; a < this.dataList.length; a++) {
for ( let b = 0; b < this.selectList.length; b++) {
for (let a = 0; a < this.dataList.length; a++) {
for (let b = 0; b < this.selectList.length; b++) {
if (this.dataList[a].id === this.selectList[b]) {
//合规
this.dataList[a].complianceReasons = this.batchEditForm.complianceReasons
@@ -582,9 +598,9 @@ export default {
this.dataList[a].zcCountermeasures = this.batchEditForm.zcCountermeasures
//完成时间
this.dataList[a].zcCompletionTime = this.batchEditForm.zcCompletionTime
}else {
for (let i=0;i<this.dataList[a].children.length;i++){
if (this.dataList[a].children[i].id === this.selectList[b]){
} else {
for (let i = 0; i < this.dataList[a].children.length; i++) {
if (this.dataList[a].children[i].id === this.selectList[b]) {
//合规
this.dataList[a].children[i].complianceReasons = this.batchEditForm.complianceReasons
//不合规
@@ -696,7 +712,6 @@ export default {
pId: this.pId
}).then(res => {
if (res) {
console.log(res.mesg);
const processForm = JSON.parse(res.mesg);
this.getFormFieldList(processForm);
}
@@ -713,15 +728,27 @@ export default {
this.listForm.prcName = this.prcName;
this.listForm["id"] = item.id;
// this.listForm.dataList = item.dataList;
this.dataList = this.listForm.dataList;
console.log(this.dataList);
this.dataList = this.listForm.dataList[0].children
this.dataList.map(item => {
this.$set(item, 'standName', this.listForm.dataList[0].standName)
this.$set(item, 'standEnName', this.listForm.dataList[0].standEnName)
this.$set(item, 'standYear', this.listForm.dataList[0].standYear)
this.$set(item, 'standSort', this.listForm.dataList[0].standSort)
this.$set(item, 'standNumber', this.listForm.dataList[0].standNumber)
})
this.total = this.listForm.dataList[0].children.length;
} else {
this.listForm = item.form;
this.dataList = item.form.dataList;
this.dataList = item.form.dataList[0].children
this.total = item.form.dataList[0].children.length;
}
});
},
// 分页
handleCurrentChange(currentPage) {
this.currentPage = currentPage;
},
//保存事件
handleSave() {
this.saveLoading = true;
@@ -874,10 +901,12 @@ export default {
.demo-drawer-content {
margin-top: 10px;
}
/deep/.el-table th > .cell{
/deep/ .el-table th > .cell {
font-size: 12px;
}
/deep/.el-table thead.is-group th{
/deep/ .el-table thead.is-group th {
padding: 0px;
}
}
src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue
+4 -4
View File
@@ -130,7 +130,7 @@
<el-table-column
prop="noCompliance"
align="center"
width="160"
width="170"
label="不合规项目">
</el-table-column>
<el-table-column
@@ -142,7 +142,7 @@
<el-table-column
prop="completionTime"
align="center"
width="160"
width="120"
label="完成时间">
<template slot-scope="scope">
<span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format("YYYY-MM-DD") : ""
@@ -167,7 +167,7 @@
<el-table-column
prop="zcNoCompliance"
align="center"
width="160"
width="170"
label="不合规项目">
</el-table-column>
<el-table-column
@@ -179,7 +179,7 @@
<el-table-column
prop="zcCompletionTime"
align="center"
width="160"
width="120"
label="完成时间">
<template slot-scope="scope">
<span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format("YYYY-MM-DD") : ""
src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue
+4 -4
View File
@@ -130,7 +130,7 @@
<el-table-column
prop="noCompliance"
align="center"
width="160"
width="170"
label="不合规项目">
</el-table-column>
<el-table-column
@@ -142,7 +142,7 @@
<el-table-column
prop="completionTime"
align="center"
width="160"
width="120"
label="完成时间">
<template slot-scope="scope">
<span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format('YYYY-MM-DD') : '' }}</span>
@@ -166,7 +166,7 @@
<el-table-column
prop="zcNoCompliance"
align="center"
width="160"
width="170"
label="不合规项目">
</el-table-column>
<el-table-column
@@ -178,7 +178,7 @@
<el-table-column
prop="zcCompletionTime"
align="center"
width="160"
width="120"
label="完成时间">
<template slot-scope="scope">
<span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format('YYYY-MM-DD') : '' }}</span>
src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue
+4 -4
View File
@@ -130,7 +130,7 @@
<el-table-column
prop="noCompliance"
align="center"
width="160"
width="170"
label="不合规项目">
</el-table-column>
<el-table-column
@@ -142,7 +142,7 @@
<el-table-column
prop="completionTime"
align="center"
width="160"
width="120"
label="完成时间">
<template slot-scope="scope">
<span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format("YYYY-MM-DD") : ""
@@ -167,7 +167,7 @@
<el-table-column
prop="zcNoCompliance"
align="center"
width="160"
width="170"
label="不合规项目">
</el-table-column>
<el-table-column
@@ -179,7 +179,7 @@
<el-table-column
prop="zcCompletionTime"
align="center"
width="160"
width="120"
label="完成时间">
<template slot-scope="scope">
<span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format("YYYY-MM-DD") : ""
src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue
+1 -4
View File
@@ -374,18 +374,15 @@ export default {
});
}
},
created() {
this.searchSarAccess();
},
mounted() {
// 分页查询数据
this.searchSarAccess();
// 从数据库中查询各下拉框数据
this.$http.get("sys/dictype/getDicTypeListCode", "", {
_this: this
}, res => {
this.countryOptions = res.data.COUNTRY;
this.setMap(this.countryOptions);
this.searchSarAccess();
}, e => {
});
}
src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+10 -3
View File
@@ -3192,7 +3192,10 @@ export default {
}
}
this.getDomesticStandardTable(this.tableFlag)
// this.getDomesticStandardTable(this.tableFlag)
//搜索后排序,应该以被搜索后的数据排序
this.getDomesticStandardTable(this.standCommonlySearch)
},
// 修改成表格样式后，选择项勾选改变
standSelectChange(data) {
@@ -4988,7 +4991,6 @@ export default {
background: url('~@/assets/images/shangqi/img/none-file.png');
background-size: 100% 100%;
}
/deep/ .is-show {
position: relative;
display: inline-block;
@@ -4997,7 +4999,12 @@ export default {
background: url('~@/assets/images/shangqi/img/tree.png');
background-size: 100% 100%;
}
#domesticStandardDatabase{
height: 100%;
.content {
height: calc(~'100% - 105px - 56px')
}
}
/deep/ .tree-line {
.el-tree-node {
position: relative;
src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue
+1 -1
View File
@@ -389,7 +389,7 @@ export default {
})
},
handleQueryPdf(file){
window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + file.id))
window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + file.attId))
}
},
mounted() {
src/pages/searchCenter/pages/standardSearch.vue
+1 -1
View File
@@ -243,7 +243,7 @@
<div class="AllBoxTitle">
<span v-html="item.indexType === 'stand' ? '国内标准法规' : (item.indexType === 'FOREIGN' ? '海外标准法规' : (item.indexType === 'laws' ? '国内外政策' : (item.indexType === 'bussstand' ? '企业标准' : (item.indexType === 'items' ? '数据化条目' : '动态&资料'))))" class="typetext"></span>
<span style="cursor:pointer;" class="AllBoxText" v-html="item.title" @click="toPage(item)"></span>
<span @click="checkItems(item)" class="more" style="cursor: pointer; position: absolute; right: 5px;">更多</span>
<span @click="checkItems(item)" class="more" style="cursor: pointer; position: absolute; right: 5px;">详情</span>
</div>
<div class="AllBoxContent" v-html="item.textContent"></div>
<div v-if="item.indexType !== 'items' && item.indexType !== 'msgdyinfo'" class="AllTime">
src/sysConfig/index.js
+4 -4
View File
@@ -4,10 +4,10 @@
* @date: 2018-09-04 17:47:46
*/
// 服务器地址
// const devIp = '62.234.136.153'
// const devInterfacePORT = '8033'
const devIp = '192.168.10.247'
const devInterfacePORT = '9999'
const devIp = '62.234.136.153'
const devInterfacePORT = '8033'
// const devIp = '192.168.10.247'
// const devInterfacePORT = '9999'
// 云端端口号
const DEV_CLOUD_RES_INTERFACE_PORT = '7777'
const simpleFilePath = 'att/attFile/upload'