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

合并分支 'develop' 到 'FOTON'

Browse Source 
Develop

查看合并请求 laws-foton-slrs/foton-laws-system-front!2
This commit is contained in:
李雅玮
2022-12-07 16:06:46 +08:00
parent 010d8a2e6f da7cd3c0ec
commit f6b093be6e
52 changed files with 4027 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/CustomFormComponents/DatePickerGroup.vue
+5
View File
@@ -7,6 +7,7 @@
:label-width="labelWidth"
class="add-form-item"
:class="{'form-item-disabled': disabled}"
:required="required"
>
<el-input
v-show="false"
@@ -89,6 +90,10 @@ export default {
labelWidth: {
type: String,
default: '210px'
},
required:{
type:Boolean,
default:false
}
},
components: {},
src/components/roleTree/index.vue
+18 -11
View File
@@ -26,6 +26,7 @@
</el-form-item>
</el-form>
<div class="divTree">
<!-- 当前tree展示全部人员 -->
<el-tree
v-if="open1 && isVisible"
node-key="id"
@@ -50,6 +51,7 @@
<span> {{ node.label }} </span>
</span>
</el-tree>
<!-- 当前tree展示搜索出的人员 -->
<el-tree
v-if="!open1 && isVisible"
node-key="id"
@@ -67,7 +69,8 @@
@check="drawerCheck"
show-checkbox
ref="tree"
:lazy="false">
:lazy="false"
:key="treeKey">
<span class="custom-tree-node" slot-scope="{ node, data }">
<span :class="node.disabled ? 'is-show' : 'is-leaf-none'"></span>
<span> {{ node.label }} </span>
@@ -113,7 +116,7 @@
props: {
checkBox: { // 单选/多选
type: Boolean,
default: false,
default: false,//默认false多选
},
isTitle: { // 标题
type: String
@@ -135,16 +138,17 @@
},
data () {
return {
defaultKey: [],
treeKey:1,
defaultKey: [],//默认展开的节点的 key 的数组
visible: false,
selectList: [],
nodeList2: [],
nodeList2: [],//默认勾选的节点的 key 的数组
delList: [],
roleList: [],
filterText: '',
defaultProps: {
children: 'children',
label: 'name',
defaultProps: {//配置选项
children: 'children',//指定子树为节点对象的某个属性值
label: 'name',//指定节点标签为节点对象的某个属性值
},
treeData1: [],
treeData: [],
@@ -198,8 +202,9 @@
)
},
searchChange(){
// 查询
if (this.filterText.length) {
this.open1 = false
this.open1 = false // 显示第二个tree
this.treeLoading = true
this.defaultKey = []
this.$http.get('SarInstitution/institution/getNextTwo', {
@@ -211,8 +216,7 @@
})
this.treeLoading = false
})
// this.treeKey++
// this.$http.get('SarInstitution/institution/institutionAndUser', {
@@ -265,6 +269,7 @@
}
},
checkChange (row, type, c) {
//节点选中状态发生变化时的回调(传递给 data 属性的数组中该节点所对应的对象、节点本身是否被选中、节点的子树中是否有被选中的节点)
if (this.checkBox) {
} else {
if (type) {
@@ -328,7 +333,8 @@
}
this.open1 = true
},
drawerCheck (data) {
drawerCheck (data) {//当复选框被点击的时候触发
//共两个参数，依次为：传递给 data 属性的数组中该节点所对应的对象、树目前的选中状态对象，包含 checkedNodes、checkedKeys、halfCheckedNodes、halfCheckedKeys 四个属性
if (this.checkBox) { // 单选
// 单选判断
let getlist = this.$refs.tree.getCheckedNodes()
@@ -363,6 +369,7 @@
}
},
loadNode(node, resolve) {
//加载子树数据的方法，仅当 lazy 属性为true 时生效
if (node.level === 0) {
return resolve(this.treeData);
}
src/pages/config/pages/roleManage/index.vue
+8
View File
@@ -896,6 +896,14 @@ export default {
getTree2() {
this.$http.get('lawss/sarMenu', {}, {}, res => {
if (res.ok) {
res.data.forEach(item => {
if (item.id && item.id == 'asdfadf') {
item.disabled = true;
// if (item.childNodes && item.childNodes.length !== 0) {
// this.addAttr(item.childNodes);
// }
}
})
this.treeData2 = res.data
this.twoLoading = false
}
src/pages/home2/components/releaseZL/index.vue
+14 -3
View File
@@ -35,15 +35,18 @@
label="资料标题"
:show-overflow-tooltip="true"
align="center">
<!-- <template slot-scope="scope">-->
<!-- <span @click.stop="toDetail(scope.row)" style="cursor:pointer;color: #409eff">{{ scope.row.dataTitle }}</span>-->
<!-- </template>-->
<template slot-scope="scope">
<span @click.stop="toDetail(scope.row)" style="cursor:pointer;color: #409eff">{{ scope.row.dataTitle }}</span>
</template>
</el-table-column>
<el-table-column
prop="dataUploadTime"
width="250"
label="上传时间"
align="center">
<template slot-scope="scope">
<span>{{ $moment(scope.row.dataUploadTime).format("YYYY-MM-DD") }}</span>
</template>
</el-table-column>
</el-table>
<div class="more" v-if="!pageVerify" @click="togo">更多 ⋙</div>
@@ -111,6 +114,14 @@ export default {
getDate (date) {
return date != null ? date.substring(0, date.indexOf(' ')) : ''
},
toDetail(row){
this.$router.push({
name: "dataCenterDetail",
query: {
id: row.id
}
});
},
//获取数据
getAdvice() {
this.loading = true
src/pages/home2/components/todoList/index.vue
+25
View File
@@ -495,6 +495,31 @@ export default {
prcType: row.prcType
}
})
}else if (row.taskInfo === '产品标准起草'){
this.$router.push({
name: 'bussFs6',
query: {
taskIds: row.taskIds,
prcId: row.prcId,
prcNum: row.prcNum,
prcName: row.prcName,
prcType: row.prcType,
bpnId:row.id
}
})
}else if (row.taskInfo === '技术标准起草'){
this.$router.push({
name: 'bussFs7',
query: {
taskIds: row.taskIds,
prcId: row.prcId,
prcNum: row.prcNum,
prcName: row.prcName,
prcType: row.prcType,
bpnId:row.id,
verifySarStandard:true,
}
})
}
break;
case '2':
src/pages/processCenter/pages/creatProcess/bzdy/step3.vue
+24 -16
View File
@@ -303,14 +303,17 @@
ProcessTitle
},
methods: {
clickButtonToUpload2(file) {
let attId = ""
if(file && file.id){
attId = file.id
}else {
attId = file.response.data.id
}
this.$preview(attId)
// clickButtonToUpload2(file) {
// let attId = ""
// if(file && file.id){
// attId = file.id
// }else {
// attId = file.response.data.id
// }
// this.$preview(attId)
// },
clickButtonToUpload2(fileId) {
this.$preview(fileId)
},
clickButtonToUpload(file) {
let attId = ""
@@ -386,11 +389,11 @@
var fileSuffix = filename.substring(index1, index2)
// const fileSuffix = file.name.split('.')[1] // 后缀名
// 判断上传文件格式
if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx' || fileSuffix === '.XLS' || fileSuffix === '.XLSX' || fileSuffix === '.pdf' || fileSuffix === '.PDF') {
if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.DOC' || fileSuffix === '.doc' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx' || fileSuffix === '.XLS' || fileSuffix === '.XLSX' || fileSuffix === '.pdf' || fileSuffix === '.PDF'|| fileSuffix === '.ZIP'|| fileSuffix === '.zip'|| fileSuffix === '.RAR'|| fileSuffix === '.rar') {
return true
} else {
this.spinShow = false
this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS,PDF文件')
this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS,PDF,ZIP,RAR,DOC文件')
return false
}
// 判断文件上传大小
@@ -412,7 +415,7 @@
this.form.fileName = response.data.name
this.form.fileList.push(response.data)
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})
@@ -495,7 +498,7 @@
this.acceptShow = false
this.submitShow = true
}
this.commentText3 = data.commentText3 || ''
// this.commentText3 = data.commentText3 || ''
this.todoId = res.id
this.form.title = data.title || data.form.title
this.form.processName = data.processName || data.form.processName
@@ -505,11 +508,16 @@
this.form.modelList = data.modelList || data.form.modelList
this.form.responUserList = data.form ? data.form.responUserList : data.responUserList
this.form.responUserListName = data.form ? data.form.responUserListName : data.responUserListName
this.form.fileName = data.form? data.form.fileName : ''
this.form.fileId = data.form ? data.form.fileId : ''
this.form.dyhz = data.form ? data.form.dyhz : ''
// this.form.fileName = data.form? data.form.fileName : ''
// this.form.fileId = data.form ? data.form.fileId : ''
// this.form.dyhz = data.form ? data.form.dyhz : ''
this.newDocUser = data.docUser
this.form.fileList = data.form ? data.form.fileList : []
// this.form.fileList = data.form ? data.form.fileList : []
this.commentText3 = data.commentText3 || data.commentText || ''
this.form.fileName = data.form? data.form.fileName : data.fileName || ''
this.form.fileId = data.form ? data.form.fileId : data.fileId || ''
this.form.dyhz = data.form ? data.form.dyhz : data.dyhz || ''
this.form.fileList = data.form ? data.form.fileList : data.fileList || []
}).catch(e => {
})
})
src/pages/processCenter/pages/creatProcess/bzdy/step4.vue
+12 -9
View File
@@ -279,14 +279,17 @@
ProcessTitle
},
methods: {
clickButtonToUpload2(file) {
let attId = ""
if(file && file.id){
attId = file.id
}else {
attId = file.response.data.id
}
this.$preview(attId)
// clickButtonToUpload2(file) {
// let attId = ""
// if(file && file.id){
// attId = file.id
// }else {
// attId = file.response.data.id
// }
// this.$preview(attId)
// },
clickButtonToUpload2(fileId) {
this.$preview(fileId)
},
clickButtonToUpload(file) {
let attId = ""
@@ -385,7 +388,7 @@
this.isSubmit = false
})
} else {
this.$message.warning('请输入反馈意见')
this.$message.warning('请输入审批意见')
}
},
getData() {
src/pages/processCenter/pages/creatProcess/bzdy/step6.vue
+1 -1
View File
@@ -415,7 +415,7 @@
this.isSubmit = false
})
} else {
this.$message.warning('请输入反馈意见')
this.$message.warning('请输入审批意见')
}
},
getData() {
src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
+7 -5
View File
@@ -435,7 +435,7 @@
</div>
<div style="width: 80%">
<el-form :model="plForm" class="label-input-form" ref="plForm" label-width=150 :style="PLmodalType === 2 ? 'width: 100%;' : ''">
<el-form-item label="核心技术要求" prop="technicalRequir" class="add-form-item" v-if="!form.itemsNum1">
<el-form-item label="核心技术要求" prop="technicalRequir" class="add-form-item" v-if="!form.itemsNum1" required>
<el-input :disabled="disabledXX"
type="textarea"
v-model="plForm.technicalRequir"
@@ -444,7 +444,7 @@
:autosize="{minRows:10,maxRows:10}"
></el-input>
</el-form-item>
<el-form-item label="国内标准的差异点" prop="changePoint" class="add-form-item" v-if="sarType === 'INLAND' && form.itemsNum1">
<el-form-item label="国内标准的差异点" prop="changePoint" class="add-form-item" v-if="sarType === 'INLAND' && form.itemsNum1" required>
<el-input :disabled="disabledXX"
type="textarea"
v-model="plForm.changePoint"
@@ -453,7 +453,7 @@
:autosize="{minRows:10,maxRows:10}"
></el-input>
</el-form-item>
<el-form-item label="上一版本差异点" prop="changePoint" class="add-form-item" v-if="sarType !== 'INLAND' && form.itemsNum1">
<el-form-item label="上一版本差异点" prop="changePoint" class="add-form-item" v-if="sarType !== 'INLAND' && form.itemsNum1" required>
<el-input :disabled="disabledXX"
type="textarea"
:autosize="{ minRows: 4, maxRows: 14}"
@@ -466,18 +466,20 @@
class="myDataPick"
:config="{attrName: '新车型实施日期'}"
v-model="plForm.newData"
:required="true"
></custom-date-pick-group>
<custom-date-pick-group
class="myDataPick"
:config="{attrName: '在产车实施日期'}"
v-model="plForm.onlineData"
:required="true"
></custom-date-pick-group>
<el-form-item label="适用车型" prop="applyArctic" class="add-form-item" >
<el-form-item label="适用车型" prop="applyArctic" class="add-form-item" required>
<el-select :disabled="disabledXX" multiple v-model="plForm.applyArctic">
<el-option v-for="(item,index) in cxList" :value="item.label" :label="item.label" :key="index"></el-option>
</el-select>
</el-form-item>
<el-form-item label="责任人" prop="zrUserId" class="add-form-item">
<el-form-item label="责任人" prop="zrUserId" class="add-form-item" required>
<el-input :disabled="disabledXX"
style="display: none;"
v-model="plForm.zrUserId"
src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
+8 -6
View File
@@ -382,7 +382,7 @@
<div v-else style="margin: 5px; padding: 5px; width: 100%; overflow: auto;">无内容</div>
</div>
<el-form :model="editForm" class="label-input-form" ref="plForm" label-width=150>
<el-form-item label="核心技术要求" prop="technicalRequir" class="add-form-item" v-if="!form.itemsNum1">
<el-form-item label="核心技术要求" prop="technicalRequir" class="add-form-item" v-if="!form.itemsNum1" required>
<el-input
type="textarea"
v-model="editForm.technicalRequir"
@@ -391,7 +391,7 @@
:autosize="{minRows:10,maxRows:10}"
></el-input>
</el-form-item>
<el-form-item label="国内标准的差异点" prop="changePoint" class="add-form-item" v-if="sarType !== 'INLAND' && form.itemsNum1">
<el-form-item label="国内标准的差异点" prop="changePoint" class="add-form-item" v-if="sarType !== 'INLAND' && form.itemsNum1" required>
<el-input
type="textarea"
v-model="editForm.changePoint"
@@ -400,7 +400,7 @@
:autosize="{minRows:10,maxRows:10}"
></el-input>
</el-form-item>
<el-form-item label="上一版本差异点" prop="changePoint" class="add-form-item" v-if="sarType === 'INLAND' && form.itemsNum1">
<el-form-item label="上一版本差异点" prop="changePoint" class="add-form-item" v-if="sarType === 'INLAND' && form.itemsNum1" required>
<el-input
type="textarea"
:autosize="{ minRows: 4, maxRows: 14}"
@@ -413,18 +413,20 @@
class="myDataPick"
:config="{attrName: '新车型实施日期'}"
v-model="editForm.newData"
:required="true"
></custom-date-pick-group>
<custom-date-pick-group
class="myDataPick"
:config="{attrName: '在产车实施日期'}"
v-model="editForm.onlineData"
:required="true"
></custom-date-pick-group>
<el-form-item label="适用车型" prop="applyArctic" class="add-form-item" >
<el-form-item label="适用车型" prop="applyArctic" class="add-form-item" required>
<el-select multiple v-model="editForm.applyArctic">
<el-option v-for="(item,index) in cxList" :value="item.label" :label="item.label" :key="index"></el-option>
</el-select>
</el-form-item>
<el-form-item label="符合性要求" prop="complianceRequir" class="add-form-item" >
<el-form-item label="符合性要求" prop="complianceRequir" class="add-form-item" required>
<el-select
v-model="editForm.complianceRequir"
placeholder="请选择符合性要求">
@@ -432,7 +434,7 @@
<el-option value="2" label="不符合"></el-option>
</el-select>
</el-form-item>
<el-form-item label="合规性分析" prop="complianceState" class="add-form-item" >
<el-form-item label="合规性分析" prop="complianceState" class="add-form-item" required>
<el-input
v-model="editForm.complianceState"
placeholder="请输入合规性分析"
src/pages/processCenter/pages/creatProcess/bzjd/step6.vue
+2
View File
@@ -263,6 +263,8 @@
show-transfer
@transfer="handleTransfer"
submitBTNText="同意"
showOver2
@over2="handleSubmitNo"
>
</ProcessFooter>
<Role-tree
src/pages/processCenter/pages/creatProcess/bzpg/step1.vue
+3 -2
View File
@@ -373,7 +373,8 @@
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: 48px;top:60px;left: 0;right: 0">-->
<div style="position: absolute;bottom: 115px;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">
@@ -438,7 +439,7 @@
</el-form-item>
</el-form>
</div>
<div style="height: calc(100% - 65px); overflow: auto">
<div style="height: calc(100% - 125px); overflow: auto">
<el-table
:data="productData"
tooltip-effect="dark"
src/pages/processCenter/pages/creatProcess/bzpg/step2.vue
+2 -1
View File
@@ -348,7 +348,8 @@ export default {
_this: this
}, res => {
if (res.success) {
this.$message.success(res.message)
// this.$message.success(res.message)
this.$message.success('驳回成功')
this.$router.push('/processCenter')
}
this.isSubmit = false
src/pages/processCenter/pages/creatProcess/bzpg/step4.vue
+12 -7
View File
@@ -434,12 +434,15 @@ export default {
this.dataList.map(item => {
delete item.termsConditions
})
this.dataList.forEach(item => {
if(item.implementer){
comFlag = true
return
}
})
console.log( this.dataList)
// this.dataList.forEach(item => {
// if(item.implementer){
// comFlag = true
// return
// }
// })
if(this.dataList.every(item => item.implementer)) comFlag = true
if(!comFlag){
this.$message.warning('请选择落实人')
}else{
@@ -520,11 +523,13 @@ export default {
this.selectProject = data
},
choiceZRRS(row, type, index) {
let _index = this.dataList.findIndex(item => item.id===row.id&&item.projectName===row.projectName)
localStorage.setItem('selectProject', JSON.stringify(this.selectProject))
this.type = type;
if (type === 1) {
this.nodeList2 = [];
this.lsIndex = index;
// this.lsIndex = index;
this.lsIndex = _index;
if (row.implementerId) {
this.nodeList2 = row.implementerId.split(",");
} else {
src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
+5 -2
View File
@@ -253,7 +253,7 @@
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: 120px;top:60px;left: 0;right: 0">
<div style="position: absolute;bottom: 55px;top: 0;right: 0;left: 0">
<div class="left">
<el-form :modal="sarSarAccessEOSearch" :inline="true" class="label-input-form"
@@ -291,7 +291,7 @@
tooltip-effect="dark"
style="width: 100%"
border
height="100%"
height="calc(100% - 64px)"
:header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"
@row-click="rowClick"
@@ -1080,6 +1080,7 @@ export default {
this.listForm.commentText = this.commentText
this.listForm.fileName = this.fileInfoList
this.listForm.dataList = this.dataList
this.listForm.listType = this.listType
let json = Object.assign(this.listForm, this.roleForm);
this.$refs["qdfbForm"].validate((valid) => {
if (valid) {
@@ -1517,6 +1518,8 @@ export default {
this.dataList = this.listForm.dataList
this.roleForm = mes.roleForm
this.commentText = mes.commentText
this.listType = mes.form.listType
console.log(this.listForm)
})
},
},
src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+37 -11
View File
@@ -2390,17 +2390,26 @@
clearFormData(data) {
this.form = {
// 基础信息
standInData: '0', // 标准来源
standSort: '', // 标准类别
country: '', // 国家
standSystem: '', // 标准体系
standNumber: '', // 标准编号
standNature: '', // 标准性质
standEnName: '', // 英文名称
standName: '', // 中文名称
signFlag: '1', // 是否需要会签
textStatus: '', // 文本状态
standYear: '', // 标准年份
standInData: data.standInData ? data.standInData : '0', // 标准类型
standSort: data.standSort ? data.standSort : '', // 标准类别
country: data.country ? data.country : '', // 国家
standSystem: data.standSystem ? data.standSystem : '', // 标准体系
standNumber: data.standNumber ? data.standNumber : '', // 标准编号
standNature: data.standNature ? data.standNature : '', // 标准性质
standEnName: data.standEnName ? data.standEnName : '', // 英文名称
standName: data.standName ? data.standName : '', // 中文名称
signFlag: data.signFlag ? data.signFlag : '1', // 是否需要会签
// standInData: data.standInData ? data.standInData : '0', // 标准类型
// standSort: data.standSort ? data.standSort : '', // 标准类别
// country: data.country ? data.country : '', // 国家
// standSystem: data.standSystem ? data.standSystem : '', // 标准体系
// standNumber: data.standNumber ? data.standNumber : '', // 标准编号
// standNature: data.standNature ? data.standNature : '', // 标准性质
// standEnName: data.standEnName ? data.standEnName : '', // 英文名称
// standName: data.standName ? data.standName : '', // 中文名称
// signFlag: data.signFlag ? data.signFlag : '1', // 是否需要会签
issueTime: '', // 发布时间
isRelateAccess: '', // 是否纳入认证清单
standSystemName: '',// 标准体系名称
@@ -2465,6 +2474,20 @@
treeListName: ''
} // 标准信息
},
clearFileListData(){
// 文本信息文件
this.xgdFileList =[] // 修改单
this.FBGBJBDFileList=[]//发布稿 原文
this.FBGYWBDFileList=[]// 发布稿 译文
this.ssgFileList=[]// 送审稿
this.caFileList=[]// 草案
this.zbjbdFileList=[]// 增补件
this.xdbFileList=[]//修订本
this.kwjFileList=[]// 勘误件
this.jdwjFileList=[]//相关文件
this.bpgFileList=[]//报批稿
this.zqyjgFileList=[]//征求意见稿
},
handleProcessStandardNext(status) {
this.submitType = status
switch (status) {
@@ -2475,7 +2498,9 @@
this.standardCheckedList = []
this.standardDrawer = false
this.verifySarStandard = true
this.clearFormData(this.form)
// this.clearFormData(this.form)
this.clearFormData()
this.clearFileListData()
break
// 带入（确认）
case 2:
@@ -2492,7 +2517,7 @@
bringData.standInData = this.form.standInData && this.form.standInData != '' ? this.form.standInData : '0'
const json = Object.assign(bringData, bringData.attrInfoCaseMap);
this.form = JSON.parse(JSON.stringify(json))
this.form.textStatus = this.form.textStatus === 'jjxoynfepp' || this.form.textStatus === 'vsaga7nwub' ? '' : this.form.textStatus
this.form.textStatus = this.form.textStatus === 'jjxoynfepp' || this.form.textStatus === 'vsaga7nwub' || this.form.textStatus === 'hb0iy9z23c' || this.form.textStatus === 'chblaarg77' || this.form.textStatus === 'qke0ckro2p' || this.form.textStatus === 'ylmfkii1jt' ? '' : this.form.textStatus
this.getListTree(bringData)
this.form.standId = bringData.id
if (this.form.country) {
@@ -2538,6 +2563,7 @@
this.modelFunc()
this.menu2("",this.form.standSystem)
this.$forceUpdate()
this.ccc = false
}
// 遍历对象初始化文件信息
for (const p in this.form) {
src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
+2 -1
View File
@@ -1337,7 +1337,8 @@ export default {
}, res => {
if (res.success) {
if (this.formTongGuo.approvalOpinion == "1") {
this.$message.warning("驳回成功");
// this.$message.warning("驳回成功");
this.$message.success("驳回成功");
this.isSubmit = false;
this.formTongGuo.commentText = "";
// 流程提交之后，应该流转至待办任务页面
src/pages/processCenter/pages/creatProcess/qbfs/common/formListStep5.vue
+27 -2
View File
@@ -426,9 +426,15 @@
<!-- </span>-->
<!-- </div>-->
<!-- </el-form-item>-->
<el-form-item label="复审人" prop="reviewUserName" class="add-form-item form-item-disabled">
<!-- <el-form-item label="复审人" prop="reviewUserName" class="add-form-item form-item-disabled">-->
<!-- <el-input-->
<!-- v-model="form.reviewUserName" :disabled="disabledState"-->
<!-- clearable-->
<!-- ></el-input>-->
<!-- </el-form-item>-->
<el-form-item label="复审人" prop="reviewUserName" class="add-form-item form-item-disabled">
<el-input
v-model="form.reviewUserName" :disabled="disabledState"
:value="cutChinese(form.bussFsSubUser2Name)" :disabled="disabledState"
clearable
></el-input>
</el-form-item>
@@ -878,6 +884,25 @@ export default {
})
})
},
cutChinese(str){
// 截取中文 张兰英(zhanglanying),陈春梅(chenchunmei) => 张兰英,陈春梅
let result = '', flag = false
if(str){
for(let i = 0 ; i < str.length ; i++){
if(str[i]==='('){
flag = true
i++
}
if(str[i]===')'){
flag = false
if(i===str.length-1) break
i++
}
if(!flag) result+= str[i]
}
}
return result
}
},
mounted () {
if(this.formSub && this.formSub.standSort && this.formSub.standSort !== ''){
src/pages/processCenter/pages/creatProcess/qbfs/step2.vue
+8 -3
View File
@@ -146,7 +146,6 @@
></Role-tree>
<!-- 选择责任人-->
<Role-tree
check-box
:is-title="drawerTitle"
:is-visible.sync="modalshowflag"
@checkedRole="checkedRole"
@@ -413,8 +412,14 @@ export default {
this.modalshowflag = true;
},
checkedRole (data) {
this.qbfsForm.bussFsSubUser2 = data[0].id;
this.qbfsForm.bussFsSubUser2Name = data[0].name;
let idList = []
let nameList = []
data.forEach((item,index) => {
idList.push(item.id)
nameList.push(item.name)
})
this.qbfsForm.bussFsSubUser2 = idList.join(',');
this.qbfsForm.bussFsSubUser2Name = nameList.join(',');
this.modalShowFlag = false;
},
checkedRole2(data) {
src/pages/processCenter/pages/creatProcess/qbfs/step3.vue
+15 -12
View File
@@ -318,19 +318,19 @@ export default {
},
},
methods:{
async getFsFile(){
let fileObj = await this.getSaveFile("model_fs")
if(fileObj){
this.qbfsForm.FSD = fileObj.id
if(this.qbfsForm.standName){
this.qbfsForm.FSDName = this.qbfsForm.standName + '-复审单'
}else {
this.qbfsForm.FSDName = '复审单'
}
this.FSDList=this.assemble(fileObj.id,this.qbfsForm.FSDName);
this.formKey++
async getFsFile(){
let fileObj = await this.getSaveFile("model_fs")
if(fileObj){
this.qbfsForm.FSD = this.qbfsForm.FSD ? this.qbfsForm.FSD : fileObj.id
if(this.qbfsForm.standName){
this.qbfsForm.FSDName = this.qbfsForm.standName + '-复审单'
}else {
this.qbfsForm.FSDName = '复审单'
}
},
this.FSDList=this.assemble(this.qbfsForm.FSD,this.qbfsForm.FSDName);
this.formKey++
}
},
getSaveFile(model) {
return new Promise((resolve, reject) => {
this.$http.get('/lawss/activiti/saveEditFile', {
@@ -464,6 +464,9 @@ export default {
}).then(res => {
if (res) {
const processForm = JSON.parse(res.mesg)
if(processForm.FSD && processForm.FSD != ''){
this.qbfsForm.FSD = processForm.FSD
}
if (processForm.qbfsForm === undefined) {
this.getFormFieldList(processForm)
} else {
src/pages/processCenter/pages/creatProcess/qbfs/step5.vue
+2 -1
View File
@@ -587,7 +587,7 @@ export default {
// }
if (this.$route.query.bpnId && this.$route.query.bpnId !== '') {
let taskId = {
id: this.$route.query.bpnId
id: this.$route.query.bpnId,
}
taskDel(taskId).then(res=>{
return res
@@ -646,6 +646,7 @@ export default {
// }else{
// this.qbfsForm.qcflag = 1
// }
this.qbfsForm.prcId = this.$route.query.prcId
let json = JSON.stringify(this.qbfsForm);
this.$http.post('lawss/activiti/completeTask', {
taskIds: this.$route.query.taskIds,
src/pages/processCenter/pages/creatProcess/qbfs/step6.vue
+1 -1
View File
@@ -6,7 +6,7 @@
</ProcessHeader>
<div class="headerTabs">
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
<!-- <div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">模块信息</div>-->
<!-- <div class="headerTabsItem" :class="actchoiceZRRListive === '2' ? 'active' : ''" @click="handleTabs('2')">模块信息</div>-->
<div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">人员信息</div>
</div>
<div class="content">
src/pages/processCenter/pages/creatProcess/qbfs/step7.vue
+3417
View File
File diff suppressed because it is too large Load Diff
src/pages/processCenter/pages/creatProcess/qbfz/step1.vue
+10 -9
View File
@@ -24,7 +24,8 @@
<el-row :gutter="24">
<el-col :span="24">
<el-form-item label="选择标准" prop="orgName" class="add-form-item form-item-disabled">
<el-button :disabled="disabledXX" size="mini" type="primary" style="margin-left: 10px;" @click="choiceShow">根据企标编号、名称、类别查询</el-button>
<!-- <el-button :disabled="disabledXX" size="mini" type="primary" style="margin-left: 10px;" @click="choiceShow">根据企标编号、名称、类别查询</el-button>-->
<el-button :disabled="disabledXX" size="mini" type="primary" style="margin-left: 10px;" @click="choiceShow">根据企标编号、名称查询</el-button>
</el-form-item>
<el-form-item label="企标编号" prop="standCode" class="add-form-item form-item-disabled">
<el-input :disabled="disabledXX"
@@ -243,7 +244,7 @@
<el-table
:data="standinfoList"
tooltip-effect="dark"
style="width: 100%"
style="width: 100%;height: 79%"
border
class="table-height"
:header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
@@ -335,14 +336,14 @@
</template>
</el-table-column>
</el-table>
<pagination
:page="page"
:pageSize="pageSize"
:total="total"
@pageChange="pageChange"
@pageSizeChange="pageSizeChange"
></pagination>
</div>
<pagination
:page="page"
:pageSize="pageSize"
:total="total"
@pageChange="pageChange"
@pageSizeChange="pageSizeChange"
/>
</div>
</div>
<div class="demo-drawer-footer">
src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue
+2 -3
View File
@@ -1008,12 +1008,11 @@
standNum: [
{ required: true, message: '请输入企标顺序号', trigger: 'blur' },
{ min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
{validator: validateStandNumber, trigger: 'change'}
{validator: validateStandNumber, trigger: 'blur'}
],
standNumNotRule: [],
standYear: [
{ required: true, message: '请输入标准年份'},
{ required: true, message: '请输入标准年份',trigger: 'blur'},
],
standName: [
{ required: true, message: '请输入企标中文名称', trigger: 'blur' },
src/pages/processCenter/pages/creatProcess/qbrk-product/step2.vue
+1 -1
View File
@@ -964,7 +964,7 @@
{ required: false, message: '请选择企标发布日期', trigger: 'change' }
],
FBGBUSSName: [
{ required: true, message: '请上传发布稿',validator: validateFBGBUSS, trigger: 'blur' }
{ required: false, message: '请上传发布稿',validator: validateFBGBUSS, trigger: 'blur' }
],
BZSMBUSSName: [
{ required: true, message: '请上传编制说明',validator: validateBZSMBUSS, trigger: 'blur' }
src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue
+64 -17
View File
@@ -1246,6 +1246,7 @@
this.XGDFileList = list3
this.QTWJBUSSFileList = list4
this.GLWJBUSSFileList = list5
console.log(fileType)
if(fileMadel){
this.fileType = fileType
this.fileUpload(fileType)
@@ -2134,42 +2135,88 @@
// fileList = fileList.splice(0, 1)
// }
if (response.ok) {
const fileObj = {}
fileObj.id = file.response.data.id
fileObj.name = file.response.data.name
switch (this.fileType){
// debugger
for(let i = 0 ; i < fileList.length ; i++){
const fileObj = {}
console.log(fileList[i],'fileList[i]')
fileObj.id = fileList[i].response ? fileList[i].response.data.id : fileList[i].id
fileObj.name =fileList[i].response? fileList[i].response.data.name : fileList[i].name
switch (this.fileType){
case 'FBGBUSS':
this.FBGBUSSFileList = this.FBGBUSSFileList.filter ( item => item.response === undefined);
this.FBGBUSSFileList = this.FBGBUSSFileList.filter ( item => item.response === undefined);
if(this.FBGBUSSFileList.every((item)=>item.id !== fileObj.id) && fileObj.id!==undefined){
this.FBGBUSSFileList.push(fileObj)
break;
}
break;
case 'BZSMBUSS' :
this.BZSMBUSSFileList = this.BZSMBUSSFileList.filter ( item => item.response === undefined);
this.BZSMBUSSFileList = this.BZSMBUSSFileList.filter ( item => item.response === undefined);
if(this.BZSMBUSSFileList.every((item)=>item.id !== fileObj.id) && fileObj.id!==undefined)
this.BZSMBUSSFileList.push(fileObj)
break;
break;
case 'LSBBBUSS':
this.LSBBBUSSFileList = this.LSBBBUSSFileList.filter ( item => item.response === undefined);
this.LSBBBUSSFileList = this.LSBBBUSSFileList.filter ( item => item.response === undefined);
if(this.LSBBBUSSFileList.every((item)=>item.id !== fileObj.id) && fileObj.id!==undefined)
this.LSBBBUSSFileList.push(fileObj)
break;
break;
case 'QTWJBUSS':
this.QTWJBUSSFileList = this.QTWJBUSSFileList.filter ( item => item.response === undefined);
this.QTWJBUSSFileList = this.QTWJBUSSFileList.filter ( item => item.response === undefined);
if(this.QTWJBUSSFileList.every((item)=>item.id !== fileObj.id) && fileObj.id!==undefined)
this.QTWJBUSSFileList.push(fileObj)
break;
break;
case 'GLWJBUSS':
this.GLWJBUSSFileList = this.GLWJBUSSFileList.filter ( item => item.response === undefined);
this.GLWJBUSSFileList = this.GLWJBUSSFileList.filter ( item => item.response === undefined);
if(this.GLWJBUSSFileList.every((item)=>item.id !== fileObj.id) && fileObj.id!==undefined)
this.GLWJBUSSFileList.push(fileObj)
break;
break;
case 'XGD':
this.XGDFileList = this.XGDFileList.filter ( item => item.response === undefined);
this.XGDFileList = this.XGDFileList.filter ( item => item.response === undefined);
if(this.XGDFileList.every((item)=>item.id !== fileObj.id) && fileObj.id!==undefined)
this.XGDFileList.push(fileObj)
break;
break;
default : ;
}
}
// }
console.log(this.FBGBUSSFileList)
}
// const fileObj = {}
// fileObj.id = file.response.data.id
// fileObj.name = file.response.data.name
// console.log(fileObj.name,'fileObj.name')
// switch (this.fileType){
// case 'FBGBUSS':
// this.FBGBUSSFileList = this.FBGBUSSFileList.filter ( item => item.response === undefined);
// this.FBGBUSSFileList.push(fileObj)
// break;
// case 'BZSMBUSS' :
// this.BZSMBUSSFileList = this.BZSMBUSSFileList.filter ( item => item.response === undefined);
// this.BZSMBUSSFileList.push(fileObj)
// break;
// case 'LSBBBUSS':
// this.LSBBBUSSFileList = this.LSBBBUSSFileList.filter ( item => item.response === undefined);
// this.LSBBBUSSFileList.push(fileObj)
// break;
// case 'QTWJBUSS':
// this.QTWJBUSSFileList = this.QTWJBUSSFileList.filter ( item => item.response === undefined);
// this.QTWJBUSSFileList.push(fileObj)
// break;
// case 'GLWJBUSS':
// this.GLWJBUSSFileList = this.GLWJBUSSFileList.filter ( item => item.response === undefined);
// this.GLWJBUSSFileList.push(fileObj)
// break;
// case 'XGD':
// this.XGDFileList = this.XGDFileList.filter ( item => item.response === undefined);
// this.XGDFileList.push(fileObj)
// break;
// default : ;
// }
this.formKey++
this.$message({
showClose: true,
message: response.message,
type: 'success'
})
this.fileMadel = false
}
},
downloadFile (data) {
src/pages/processCenter/pages/creatProcess/qbrk-product/step5.vue
+1
View File
@@ -1482,6 +1482,7 @@
zrDeptIdName:this.$store.getters.userInfo.institutionName,
children:[],
};
if(!this.form.modelData) this.form.modelData=[]
this.form.modelData.push(list);
this.$message.success("新增成功")
this.showForm.modelNum = ""
src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue
+4 -1
View File
@@ -119,7 +119,7 @@
<ProcessTitle v-show="verifySarStandard">
<template slot="title">过程稿件</template>
</ProcessTitle>
<div class="prc-content-border" v-show="verifySarStandard">
<div class="prc-content-border process-manuscript" v-show="verifySarStandard">
<el-row :gutter="24">
<el-col :span="12">
<el-form-item label="发布稿" prop="FBGBUSSName" class="add-form-item form-item-disabled">
@@ -1016,4 +1016,7 @@ export default {
/deep/ .fileClass{
line-height: 22px !important;
}
.process-manuscript /deep/ .el-form-item__error{
right:45px !important;
}
</style>
src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue
+4 -3
View File
@@ -1991,9 +1991,10 @@ export default {
}
},
assemble(ids,names){
let id = ids.substring(0, ids.lastIndexOf(','))
let list= new Array();
if(ids && ids !== '' && names && names !== ''){
let idArray=ids.split(',');
if(id && id !== '' && names && names !== ''){
let idArray=id.split(',');
let nameArray=names.split(',');
for(let i=0; i<idArray.length; i++){
list.push({id:idArray[i],name:nameArray[i]});
@@ -3252,7 +3253,7 @@ export default {
this.form.planId = processForm.nowEsId
this.nowEsId = processForm.nowEsId
this.form.reviseStatus = processForm.reviseStatus
this.form.standName = processForm.esName
this.form.standName = processForm.renameEs ? processForm.renameEs : processForm.esName
this.form.QCDW = processForm.unitName
this.form.QCDWID = processForm.unit
this.form.QCRBUSSID = processForm.drafter
src/pages/processCenter/pages/creatProcess/qbrk/step1.vue
+4 -1
View File
@@ -144,7 +144,7 @@
<ProcessTitle v-show="verifySarStandard">
<template slot="title">过程稿件</template>
</ProcessTitle>
<div class="prc-content-border" v-show="verifySarStandard">
<div class="prc-content-border process-manuscript" v-show="verifySarStandard">
<el-row :gutter="24">
<el-col :span="12">
<el-form-item label="发布稿" prop="FBGBUSSName" class="add-form-item form-item-disabled">
@@ -3315,4 +3315,7 @@ export default {
}
}
}
.process-manuscript /deep/ .el-form-item__error{
right:45px !important;
}
</style>
src/pages/processCenter/pages/creatProcess/qbrk/step4.vue
+4 -1
View File
@@ -2264,7 +2264,10 @@
this.$message.success(res.message)
}
})
}})
}else{
this.$message.warning("请输入意见")
}
})
},
busVsFunc(){
this.$http.get('sarVppsTree/list', '', {
src/pages/processCenter/pages/creatProcess/qbrk/step7.vue
+1
View File
@@ -2488,6 +2488,7 @@
}
})
}else{
this.$message.warning('请确认审批意见是否填写完整')
}
})
},
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue
+6 -2
View File
@@ -200,7 +200,8 @@
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: 48px;top:60px;left: 0;right: 0">-->
<div style="position: absolute;bottom: 120px;top:60px;left: 0;right: 0">
<div style="position: absolute;bottom: 55px;top: 0;right: 0;left: 0">
<div class="left">
<el-form :modal="standardSearch" :inline="true" class="label-input-form" style="margin-left:10px">
@@ -239,7 +240,7 @@
tooltip-effect="dark"
style="width: 100%"
border
height="100%"
height="calc(100% - 64px)"
:header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"
@selection-change="selectListChange"
@@ -438,6 +439,9 @@ export default {
// }
// })
this.total = this.standinfoList.length
this.$nextTick(()=>{
this.$refs.selection.doLayout();
})
})
},
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue
+6 -2
View File
@@ -216,7 +216,8 @@
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: 48px;top:60px;left: 0;right: 0">-->
<div style="position: absolute;bottom: 120px;top:60px;left: 0;right: 0">
<div style="position: absolute;bottom: 55px;top: 0;right: 0;left: 0">
<div class="left">
<el-form :modal="standardSearch" :inline="true" class="label-input-form" style="margin-left:10px">
@@ -255,7 +256,7 @@
tooltip-effect="dark"
style="width: 100%"
border
height="100%"
height="calc(100% - 64px)"
:header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"
@selection-change="selectListChange"
@@ -457,6 +458,9 @@ export default {
// }
// })
this.total = this.standinfoList.length
this.$nextTick(()=>{
this.$refs.selection.doLayout();
})
})
},
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue
+2 -1
View File
@@ -541,7 +541,8 @@ export default {
{ required: true, message: "请选择代替企标编号", trigger: "blur" }
],
area: [
{ required: true, message: "请选择适用车型", trigger: "change" }
// { required: true, message: "请选择适用车型", trigger: "change" }
{ required: true, message: "请选择适用车型", trigger: "blur" }
],
reviseStatus: [
{ required: true, message: "请选择制修订类型", trigger: "blur" }
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue
+6 -2
View File
@@ -214,7 +214,8 @@
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: 48px;top:60px;left: 0;right: 0">-->
<div style="position: absolute;bottom: 120px;top:60px;left: 0;right: 0">
<div style="position: absolute;bottom: 55px;top: 0;right: 0;left: 0">
<div class="left">
<el-form :modal="standardSearch" :inline="true" class="label-input-form" style="margin-left:10px">
@@ -254,7 +255,7 @@
tooltip-effect="dark"
style="width: 100%"
border
height="100%"
height="calc(100% - 64px)"
:header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"
@selection-change="selectListChange"
@@ -1095,6 +1096,9 @@ export default {
// })
this.total = this.standinfoList.length
this.replaceLoading = false
this.$nextTick(()=>{
this.$refs.selection.doLayout();
})
})
},
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue
+6 -2
View File
@@ -207,7 +207,8 @@
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: 48px;top:60px;left: 0;right: 0">-->
<div style="position: absolute;bottom: 120px;top:60px;left: 0;right: 0">
<div style="position: absolute;bottom: 55px;top: 0;right: 0;left: 0">
<div class="left">
<el-form :modal="standardSearch" :inline="true" class="label-input-form" style="margin-left:10px">
@@ -246,7 +247,7 @@
tooltip-effect="dark"
style="width: 100%"
border
height="100%"
height="calc(100% - 64px)"
:header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"
@selection-change="selectListChange"
@@ -444,6 +445,9 @@ export default {
// }
// })
this.total = this.standinfoList.length
this.$nextTick(()=>{
this.$refs.selection.doLayout()
})
})
},
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue
+71 -26
View File
@@ -557,7 +557,7 @@ export default {
}, res => {
if (res.success) {
this.$message.success(res.message);
this.addLog(qbzxdFrom)
// this.addLog(qbzxdFrom)
if (this.bpnId !== '' && this.bpnId !== undefined) {
let taskId = {
id: this.bpnId
@@ -566,7 +566,6 @@ export default {
return res
})
}
this.isSubmit = false;
this.$router.push({ path: "/processCenter?tabsName=ProcessCenter" });
}
@@ -577,6 +576,7 @@ export default {
this.$message.warning("请完善人员信息");
}
});
});
// if (flag) {
@@ -587,30 +587,75 @@ export default {
} else {
let flag = this.$refs["childForm"].validateForm(() => {
let qbzxdFrom = this.$refs["childForm"].qbfsForm;
this.$refs["roleForm"].validate((valid) => {
if (valid) {
this.isSubmit = true;
qbzxdFrom.commentText = this.commentText;
qbzxdFrom.addFlag = '0'
var json = Object.assign(qbzxdFrom, this.roleForm);
this.$http.post("lawss/activiti/completeTask", {
taskIds: this.$route.query.taskIds,
userId: this.$store.getters.userInfo.userId,
json: JSON.stringify(json)
}, {
_this: this
}, res => {
if (res.success) {
this.$message.success(res.message);
this.isSubmit = false;
this.addLog(qbzxdFrom)
this.$router.push({ path: "/processCenter?tabsName=ProcessCenter" });
}
});
} else {
this.$message.warning("请完善人员信息");
}
});
if(this.$route.query.taskInfo == '重新起草'){
this.isSubmit = true;
qbzxdFrom.commentText = this.commentText;
qbzxdFrom.addFlag = '0'
let json = Object.assign(qbzxdFrom, this.roleForm);
this.$http.post("lawss/activiti/startProcessRollBack", {
createUser: this.$store.getters.userInfo.userId,
createUserName: this.$store.getters.userInfo.userName,
type: '25',
json: JSON.stringify({
roleForm: this.roleForm,
qbfsForm: qbzxdFrom,
commentText: this.commentText
})
}, {
_this: this
}, res => {
if (res.ok) {
this.$http.post("lawss/activiti/completeTask", {
taskIds: res.data,
userId: this.$store.getters.userInfo.userId,
json: JSON.stringify(json)
}, {
_this: this
}, res => {
if (res.success) {
this.$message.success(res.message);
// this.addLog(qbzxdFrom)
if (this.bpnId !== '' && this.bpnId !== undefined) {
let taskId = {
id: this.bpnId
}
taskDel(taskId).then(res=>{
return res
})
}
this.isSubmit = false;
this.$router.push({ path: "/processCenter?tabsName=ProcessCenter" });
}
});
}
});
}else {
this.$refs["roleForm"].validate((valid) => {
if (valid) {
this.isSubmit = true;
qbzxdFrom.commentText = this.commentText;
qbzxdFrom.addFlag = '0'
var json = Object.assign(qbzxdFrom, this.roleForm);
this.$http.post("lawss/activiti/completeTask", {
taskIds: this.$route.query.taskIds,
userId: this.$store.getters.userInfo.userId,
json: JSON.stringify(json)
}, {
_this: this
}, res => {
if (res.success) {
this.$message.success(res.message);
this.isSubmit = false;
// this.addLog(qbzxdFrom)
this.$router.push({ path: "/processCenter?tabsName=ProcessCenter" });
}
});
} else {
this.$message.warning("请完善人员信息");
}
});
}
});
// if (flag) {
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue
+10
View File
@@ -527,6 +527,7 @@ export default {
_this: this
}, res => {
if (res.success) {
this.addLog(this.qbfsForm)
this.$message.success(res.message)
this.$router.push('/processCenter')
}
@@ -534,6 +535,15 @@ export default {
}, e => {
});
},
addLog(qbzxdFrom){
let json = Object.assign(qbzxdFrom);
this.$http.post("esRevisePlanLog/log/addLog", {
json: JSON.stringify(json)
}, {
_this: this
}, res => {
});
},
beforeBack(){
if(!this.commentText){
this.$message.warning('请填写审批意见')
src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue
+14 -4
View File
@@ -693,26 +693,36 @@ export default {
choiceZRRS(type) {
this.roleType = type
if(type === '1' ){
this.drawerTitle2 = '请选择起草人'
this.drawerTitle = '请选择起草人'
this.nodeList2 = [];
if (this.addQblxData.drafter !== undefined) {
this.nodeList2 = this.addQblxData.drafter.split(",");
}
this.modalshowflag = true;
}else if(type === '2'){
this.drawerTitle2 = '请选择评审责任人'
this.nodeList2 = [];
if (this.addQblxData.resPerson !== undefined) {
this.nodeList2 = this.addQblxData.resPerson.split(",");
}
this.modalshowflag2 = true;
}
this.modalshowflag2 = true;
},
checkedRole(data) {
this.$set(this.addQblxData, 'wgLeader', data[0].id)
this.$set(this.addQblxData, 'wgLeaderName', data[0].name)
if(this.roleType === '1'){
this.$set(this.addQblxData, 'drafter', data[0].id)
this.$set(this.addQblxData, 'drafterName', data[0].name)
}else {
this.$set(this.addQblxData, 'wgLeader', data[0].id)
this.$set(this.addQblxData, 'wgLeaderName', data[0].name)
}
if(this.addQblxData.wgLeaderName){
this.$refs.qblx_pageData.validateField('wgLeaderName')
}
if(this.addQblxData.drafterName){
this.$refs.qblx_pageData.validateField('drafterName');
}
this.modalshowflag = false;
},
checkedRole2(data) {
src/pages/processCenter/pages/creatProcess/xmpg/step2.vue
+7 -1
View File
@@ -23,8 +23,9 @@
<el-input v-model="listForm.projectName" clearable disabled placeholder="请输入项目名称"></el-input>
</el-form-item>
<el-form-item label="截止日期" prop="endTime" class="add-form-item form-item-disabled">
<!-- :picker-options="pickerOptions"-->
<el-date-picker
:picker-options="pickerOptions"
v-model="listForm.endTime"
type="date"
placeholder="请选择截止日期"
@@ -458,6 +459,11 @@ export default {
this.listForm.children = dataListChildren;
this.listForm.dataList = this.dataList;
const json = JSON.stringify(this.listForm);
if(this.nodeList.length == 0){
this.$message.warning('请先分发责任人')
this.isSubmit = false;
return
}
this.$http.post("lawss/activiti/completeTask", {
taskIds: this.taskIds,
userId: this.userId,
src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue
+21 -14
View File
@@ -391,6 +391,7 @@ export default {
},
//提交事件
handleSubmit() {
debugger
let dataChildren = [];
let dataListChildren = [];
this.dataList.forEach(item => {
@@ -404,20 +405,26 @@ export default {
this.listForm.children = dataListChildren;
this.listForm.dataList = this.dataList;
const json = JSON.stringify(this.listForm);
this.$http.post("lawss/activiti/completeTask", {
taskIds: this.taskIds,
userId: this.userId,
json: json
}, {
_this: this
}, res => {
if (res.success) {
this.$message.success(res.message);
this.$router.push("/processCenter");
}
this.isSubmit = false;
}, e => {
});
// this.$refs['listForm'].validate((valid) => {
// if (valid) {
this.$http.post("lawss/activiti/completeTask", {
taskIds: this.taskIds,
userId: this.userId,
json: json
}, {
_this: this
}, res => {
if (res.success) {
this.$message.success(res.message);
this.$router.push("/processCenter");
}
this.isSubmit = false;
}, e => {
});
// }else {
// this.$message.warning('请确认复审评分是否填写完整')
// }
// })
},
//批量分发按钮
choiceZRRS(row, type, index) {
src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue
+14 -13
View File
@@ -282,18 +282,6 @@
placeholder="请输入项目名称"
></el-input>
</el-form-item>
<el-form-item label="适用车型" class="search-item search-item-last">
<el-select :disabled="disabledXX" v-model="projectSearch.carType"
placeholder="请选择适用车型" filterable clearable>
<el-option
v-for="(item, index) in energyKindOptions"
:key="index.value"
:value="item.value"
:label="item.label"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item class="search-item btn-box">
<el-button :disabled="disabledXX"
type="primary"
@@ -449,6 +437,18 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item label="适用车型" class="search-item search-item-last">
<el-select :disabled="disabledXX" v-model="handleSelectForm.applyArctic"
placeholder="请选择适用车型" filterable clearable>
<el-option
v-for="(item, index) in energyKindOptions"
:key="index.value"
:value="item.value"
:label="item.label"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item class="search-item btn-box">
<el-button :disabled="disabledXX"
size="small"
@@ -1040,6 +1040,7 @@ export default {
this.handleSelectForm.standNumber = ''
this.handleSelectForm.lawsNumber = ''
this.handleSelectForm.standCode = ''
this.handleSelectForm.applyArctic = ''
//清空标准名称/政策名称的查询
this.handleSelectForm.lawName = ''
this.handleSelectForm.standName = ''
@@ -1422,7 +1423,7 @@ export default {
}
});
} else {
return this.$message.warning("请选择清单");
//return this.$message.warning("请选择清单");
}
});
},
src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
+14
View File
@@ -729,6 +729,19 @@ export default {
bpnId:row.id
}
})
}else if (row.taskInfo === '技术标准起草'){
this.$router.push({
name: 'bussFs7',
query: {
taskIds: row.taskIds,
prcId: row.prcId,
prcNum: row.prcNum,
prcName: row.prcName,
prcType: row.prcType,
bpnId:row.id,
verifySarStandard:true,
}
})
}
break;
case '2':
@@ -2196,6 +2209,7 @@ export default {
prcId: row.prcId,
prcNum: row.prcNum,
prcName: row.prcName,
taskInfo: row.taskInfo,
prcType: row.prcType
}
})
src/pages/regulatoryRepository/dataCenter/index.vue
+69 -12
View File
@@ -68,12 +68,21 @@
<!-- v-model="dataCenterSearch.dataType"-->
<!-- placeholder="请输入类型"-->
<!-- ></el-input>-->
<el-select size="small" v-model="dataCenterSearch.dataType" filterable placeholder="请输入类型" style="width: 100%;">
<el-option
v-for="(item, index) in cbcdOptions"
:key="index"
:value="item.value"
:label="item.label">
<el-select ref="treeSelect" class="tree-select" filterable clearable v-model="dataCenterSearch.treeId" @clear="setValueNull" value-key="id" placeholder="请选择类型">
<el-option class="tree-select-option" :value="dataCenterSearch.treeId" :label="dataCenterSearch.dataType">
<el-tree
ref="tree"
node-key="id"
class="tree-line"
icon-class="icon-tree"
:indent="0"
:props="props"
:data="treeList"
:default-expanded-keys="['1']"
highlight-current
@node-click="selectTreeClick2"
:filter-node-method="filterNode">
</el-tree>
</el-option>
</el-select>
</el-form-item>
@@ -295,11 +304,28 @@
prop="dataType"
class="add-form-item"
>
<el-input
v-model="attributeEO.dataType"
placeholder="请输入类型"
clearable
/>
<el-select ref="treeSelect" class="tree-select" v-model="attributeEO.dataType" value-key="id" placeholder="请选择类型">
<el-option class="tree-select-option" :value="attributeEO.dataType" :label="attributeEO.dataType">
<el-tree
ref="tree"
node-key="id"
class="tree-line"
icon-class="icon-tree"
:indent="0"
:props="props"
:data="treeList"
:default-expanded-keys="['1']"
highlight-current
@node-click="selectTreeClick3"
:filter-node-method="filterNode">
</el-tree>
</el-option>
</el-select>
<!-- <el-input-->
<!-- v-model="attributeEO.dataType"-->
<!-- placeholder="请输入类型"-->
<!-- clearable-->
<!-- />-->
</el-form-item>
<el-form-item
label="资料标题"
@@ -307,6 +333,7 @@
class="add-form-item"
>
<el-input
class="dataTitle"
v-model="attributeEO.dataTitle"
placeholder="请输入资料标题"
clearable
@@ -427,6 +454,7 @@ export default {
dataCenterSearch: {
dataType: '',
dataTitle: '',
treeId: '',
dataUploadTime: [],
page: 1,
pageSize: this.$store.getters.userInfo.configContent,
@@ -517,9 +545,29 @@ export default {
this.searchInfo()
},
selectTreeClick(treeNode) {
this.dataCenterSearch.treeId = treeNode.id === '1' ? '' : treeNode.id
this.attributeEO.treeId = treeNode.id === '1' ? '' : treeNode.id
this.attributeEO.treeName = treeNode.name
this.$http.get('fileMaterialCenter/zlTree/queryTree', {
treeId : this.attributeEO.treeId
}, {
_this: this
}, res => {
if(res.ok){
// this.attributeEO.dataType = res.data.id
this.attributeEO.dataType = res.data.name
}
})
},
selectTreeClick2(treeNode) {
this.dataCenterSearch.treeId = treeNode.id === '1' ? '' : treeNode.id
this.dataCenterSearch.dataType = treeNode.name
},
selectTreeClick3(treeNode) {
// this.attributeEO.dataType = treeNode.id === '1' ? '' : treeNode.id
this.attributeEO.dataType = treeNode.name
},
// 树节点鼠标移入移出
mouseenter(data) {
@@ -718,6 +766,9 @@ export default {
},
handlePreview(file) {
},
setValueNull(){
this.dataCenterSearch.dataType = ''
},
handleExceed(files, fileList) {
this.$message.warning(`当前限制选择 50 个文件，本次选择了 ${files.length} 个文件，共选择了 ${files.length + fileList.length} 个文件`);
},
@@ -767,6 +818,9 @@ export default {
this.loading = false
return
}
if(this.dataCenterSearch.treeId){
delete this.dataCenterSearch.treeId
}
this.$http.get('fileMaterialCenter/file-material', this.dataCenterSearch, {
_this: this
}, res => {
@@ -1062,6 +1116,9 @@ export default {
}
}
}
/deep/.dataTitle .el-input__inner{
width: 560px !important;
}
/deep/.el-input__inner{
width: 180px !important;
}
src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+3
View File
@@ -6524,4 +6524,7 @@ export default {
}
}
}
.search-area /deep/ input.el-input__inner {
width: 168px !important;
}
</style>
src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+4 -1
View File
@@ -1,4 +1,4 @@
<!--企业标准库-->
<!--企业标准库-->
<template>
<div id="EnterpriseStandardDatabase" :class="{ 'tree-close': sideClose }" class="v-class">
<!--左侧树-->
@@ -5827,4 +5827,7 @@ export default {
}
}
}
/deep/.el-table__fixed-body-wrapper .el-table__body {
padding-bottom: 20px;
}
</style>
src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue
+2 -2
View File
@@ -1226,10 +1226,8 @@
this.$http.post(url, this.addForm, {
_this: this
}, res => {
this.submitLoading = false
if (res.ok) {
if (res.data === '操作成功') {
this.addDrawer = false
this.$message.success(tips + '成功')
this.getData()
if(this.DrawerType === 'add'){
@@ -1256,6 +1254,8 @@
_this: this
}, res => {
if (res.success) {
this.submitLoading = false
this.addDrawer = false
// this.$message.success(res.message)
}
})
src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue
+12
View File
@@ -1233,6 +1233,9 @@ export default {
this.xmztOptions = this.notProjectStatus
this.total = res.data.notMaintenance.total;
}
this.$nextTick(() => {
this.$refs.multipleTable.doLayout();
})
}, e => {
});
// this.$refs.selection.selectAll(false)
@@ -1266,6 +1269,9 @@ export default {
this.xmztOptions = this.notProjectStatus
this.total = res.data.notMaintenance.total;
}
this.$nextTick(() => {
this.$refs.multipleTable.doLayout();
})
}, e => {
});
// this.$refs.selection.selectAll(false)
@@ -1727,4 +1733,10 @@ export default {
}
}
}
/deep/ .el-table__fixed{
height:100% !important;
}
/deep/ .el-table__fixed-right{
height:100% !important;
}
</style>
src/pages/regulatoryRepository/standardForComments/pags/AddFileDetails.vue
+1
View File
@@ -111,6 +111,7 @@
this.opinionContent.newText = ''
// this.opinionContent.cause = ''
this.opinionContent.chapterName = ''
this.$message.success(res.message)
}
})
}
src/router/index.js
+9
View File
@@ -2137,6 +2137,15 @@ const routes = [
title: '企标复审流程'
}
},
{
path: '/bussFs7',
name: 'bussFs7',
component: () => import('@/pages/processCenter/pages/creatProcess/qbfs/step7.vue'),
meta: {
requireAuth: true,
title: '企标复审流程'
}
},
//企标复审流程
{
path: '/qbfsStep1',