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

Merge branch 'develop_new' into develop

Browse Source
This commit is contained in:
CD
2022-12-01 21:15:32 +08:00
parent e088a8672f b85acf1f82
commit 1a617fe22f
50 changed files with 18019 additions and 10751 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/common/onlineEdit/index.js
+1 -1
View File
@@ -20,7 +20,7 @@ export default (id,nodeName,userId,userName) => {
editFileInfo.pId = editFileInfo.pid editFileInfo.pId = editFileInfo.pid
} }
const nowTime = new Date().getTime() const nowTime = new Date().getTime()
window.open(onlyOfficeUrl+'/editor?fileId='+editFileInfo.id+'&pid='+editFileInfo.pId+'&taskIds='+editFileInfo.taskId+'&editType='+editFileInfo.editType+'&oldFileName=' + showName + '&fileType=' + 'docx' + '&attId=' + editFileInfo.id + '&fileUrl=' + editFileInfo.downLoadUrl + '&key=' + editFileInfo.id + nowTime+'&filePath='+editFileInfo.filePath+'&fileName='+editFileInfo.fileName+'&userId='+editFileInfo.userId+'&userName='+editFileInfo.userName) window.open(onlyOfficeUrl+'/editor?fileId='+editFileInfo.id+'&pid='+editFileInfo.pId+'&taskIds='+editFileInfo.taskId+'&editType='+editFileInfo.editType+'&oldFileName=' + showName + '&fileType=' + 'docx' + '&attId=' + editFileInfo.id + '&fileUrl=' + editFileInfo.downLoadUrl + '&key=' + editFileInfo.id +'&filePath='+editFileInfo.filePath+'&fileName='+editFileInfo.fileName+'&userId='+editFileInfo.userId+'&userName='+editFileInfo.userName)
} }
}).catch(e => { }).catch(e => {
}) })
src/components/CustomFormComponents/DatePickerGroup.vue
+5
View File
@@ -7,6 +7,7 @@
:label-width="labelWidth" :label-width="labelWidth"
class="add-form-item" class="add-form-item"
:class="{'form-item-disabled': disabled}" :class="{'form-item-disabled': disabled}"
:required="required"
> >
<el-input <el-input
v-show="false" v-show="false"
@@ -89,6 +90,10 @@ export default {
labelWidth: { labelWidth: {
type: String, type: String,
default: '210px' default: '210px'
},
required:{
type:Boolean,
default:false
} }
}, },
components: {}, components: {},
src/pages/home2/components/releaseZL/index.vue
+3
View File
@@ -44,6 +44,9 @@
width="250" width="250"
label="上传时间" label="上传时间"
align="center"> align="center">
<template slot-scope="scope">
<span>{{ $moment(scope.row.dataUploadTime).format("YYYY-MM-DD") }}</span>
</template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<div class="more" v-if="!pageVerify" @click="togo">更多 ⋙</div> <div class="more" v-if="!pageVerify" @click="togo">更多 ⋙</div>
src/pages/home2/components/todoList/index.vue
+36
View File
@@ -495,6 +495,31 @@ export default {
prcType: row.prcType 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; break;
case '2': case '2':
@@ -1698,6 +1723,17 @@ export default {
prcType: row.prcType prcType: row.prcType
} }
}) })
}else if(row.taskInfo === '技术标准起草') {
this.$router.push({
name: 'qbzxdjhgkStep6',
query:{
taskIds: row.taskIds,
prcId: row.prcId,
prcNum: row.prcNum,
prcName: row.prcName,
prcType: row.prcType
}
})
} }
break; break;
case "26": case "26":
src/pages/processCenter/pages/components/ProcessFooter.vue
+16
View File
@@ -97,6 +97,15 @@
v-if="showOver3" v-if="showOver3"
>驳回</el-button> >驳回</el-button>
</el-popover> </el-popover>
<el-button
type="primary"
size="small"
class="common-button-primary"
icon="el-icon-check"
@click="handleReceive"
:loading="submitLoading"
v-if="showReceive"
>接收任务</el-button>
<el-button <el-button
type="danger" type="danger"
size="small" size="small"
@@ -215,6 +224,10 @@ export default {
type: Boolean, type: Boolean,
default: false default: false
}, },
showReceive: {
type: Boolean,
default: false
},
visible: { visible: {
type: Boolean, type: Boolean,
default: false default: false
@@ -383,6 +396,9 @@ export default {
handleSubmit() { handleSubmit() {
this.$emit('submit') this.$emit('submit')
}, },
handleReceive() {
this.$emit('receive')
},
handleAccept() { handleAccept() {
this.$emit('accept') this.$emit('accept')
}, },
src/pages/processCenter/pages/creatProcess/bzdy/step3.vue
+24 -16
View File
@@ -303,14 +303,17 @@
ProcessTitle ProcessTitle
}, },
methods: { methods: {
clickButtonToUpload2(file) { // clickButtonToUpload2(file) {
let attId = "" // let attId = ""
if(file && file.id){ // if(file && file.id){
attId = file.id // attId = file.id
}else { // }else {
attId = file.response.data.id // attId = file.response.data.id
} // }
this.$preview(attId) // this.$preview(attId)
// },
clickButtonToUpload2(fileId) {
this.$preview(fileId)
}, },
clickButtonToUpload(file) { clickButtonToUpload(file) {
let attId = "" let attId = ""
@@ -386,11 +389,11 @@
var fileSuffix = filename.substring(index1, index2) var fileSuffix = filename.substring(index1, index2)
// const fileSuffix = file.name.split('.')[1] // 后缀名 // 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 return true
} else { } else {
this.spinShow = false 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 return false
} }
// 判断文件上传大小 // 判断文件上传大小
@@ -412,7 +415,7 @@
this.form.fileName = response.data.name this.form.fileName = response.data.name
this.form.fileList.push(response.data) this.form.fileList.push(response.data)
this.$message({ this.$message({
showClose: true, // showClose: true,
message: response.message, message: response.message,
type: 'success' type: 'success'
}) })
@@ -495,7 +498,7 @@
this.acceptShow = false this.acceptShow = false
this.submitShow = true this.submitShow = true
} }
this.commentText3 = data.commentText3 || '' // this.commentText3 = data.commentText3 || ''
this.todoId = res.id this.todoId = res.id
this.form.title = data.title || data.form.title this.form.title = data.title || data.form.title
this.form.processName = data.processName || data.form.processName this.form.processName = data.processName || data.form.processName
@@ -505,11 +508,16 @@
this.form.modelList = data.modelList || data.form.modelList this.form.modelList = data.modelList || data.form.modelList
this.form.responUserList = data.form ? data.form.responUserList : data.responUserList this.form.responUserList = data.form ? data.form.responUserList : data.responUserList
this.form.responUserListName = data.form ? data.form.responUserListName : data.responUserListName this.form.responUserListName = data.form ? data.form.responUserListName : data.responUserListName
this.form.fileName = data.form? data.form.fileName : '' // this.form.fileName = data.form? data.form.fileName : ''
this.form.fileId = data.form ? data.form.fileId : '' // this.form.fileId = data.form ? data.form.fileId : ''
this.form.dyhz = data.form ? data.form.dyhz : '' // this.form.dyhz = data.form ? data.form.dyhz : ''
this.newDocUser = data.docUser 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 => { }).catch(e => {
}) })
}) })
src/pages/processCenter/pages/creatProcess/bzdy/step4.vue
+11 -8
View File
@@ -279,14 +279,17 @@
ProcessTitle ProcessTitle
}, },
methods: { methods: {
clickButtonToUpload2(file) { // clickButtonToUpload2(file) {
let attId = "" // let attId = ""
if(file && file.id){ // if(file && file.id){
attId = file.id // attId = file.id
}else { // }else {
attId = file.response.data.id // attId = file.response.data.id
} // }
this.$preview(attId) // this.$preview(attId)
// },
clickButtonToUpload2(fileId) {
this.$preview(fileId)
}, },
clickButtonToUpload(file) { clickButtonToUpload(file) {
let attId = "" let attId = ""
src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
+7 -5
View File
@@ -435,7 +435,7 @@
</div> </div>
<div style="width: 80%"> <div style="width: 80%">
<el-form :model="plForm" class="label-input-form" ref="plForm" label-width=150 :style="PLmodalType === 2 ? 'width: 100%;' : ''"> <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" <el-input :disabled="disabledXX"
type="textarea" type="textarea"
v-model="plForm.technicalRequir" v-model="plForm.technicalRequir"
@@ -444,7 +444,7 @@
:autosize="{minRows:10,maxRows:10}" :autosize="{minRows:10,maxRows:10}"
></el-input> ></el-input>
</el-form-item> </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" <el-input :disabled="disabledXX"
type="textarea" type="textarea"
v-model="plForm.changePoint" v-model="plForm.changePoint"
@@ -453,7 +453,7 @@
:autosize="{minRows:10,maxRows:10}" :autosize="{minRows:10,maxRows:10}"
></el-input> ></el-input>
</el-form-item> </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" <el-input :disabled="disabledXX"
type="textarea" type="textarea"
:autosize="{ minRows: 4, maxRows: 14}" :autosize="{ minRows: 4, maxRows: 14}"
@@ -466,18 +466,20 @@
class="myDataPick" class="myDataPick"
:config="{attrName: '新车型实施日期'}" :config="{attrName: '新车型实施日期'}"
v-model="plForm.newData" v-model="plForm.newData"
:required="true"
></custom-date-pick-group> ></custom-date-pick-group>
<custom-date-pick-group <custom-date-pick-group
class="myDataPick" class="myDataPick"
:config="{attrName: '在产车实施日期'}" :config="{attrName: '在产车实施日期'}"
v-model="plForm.onlineData" v-model="plForm.onlineData"
:required="true"
></custom-date-pick-group> ></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-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-option v-for="(item,index) in cxList" :value="item.label" :label="item.label" :key="index"></el-option>
</el-select> </el-select>
</el-form-item> </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" <el-input :disabled="disabledXX"
style="display: none;" style="display: none;"
v-model="plForm.zrUserId" 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 v-else style="margin: 5px; padding: 5px; width: 100%; overflow: auto;">无内容</div>
</div> </div>
<el-form :model="editForm" class="label-input-form" ref="plForm" label-width=150> <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 <el-input
type="textarea" type="textarea"
v-model="editForm.technicalRequir" v-model="editForm.technicalRequir"
@@ -391,7 +391,7 @@
:autosize="{minRows:10,maxRows:10}" :autosize="{minRows:10,maxRows:10}"
></el-input> ></el-input>
</el-form-item> </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 <el-input
type="textarea" type="textarea"
v-model="editForm.changePoint" v-model="editForm.changePoint"
@@ -400,7 +400,7 @@
:autosize="{minRows:10,maxRows:10}" :autosize="{minRows:10,maxRows:10}"
></el-input> ></el-input>
</el-form-item> </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 <el-input
type="textarea" type="textarea"
:autosize="{ minRows: 4, maxRows: 14}" :autosize="{ minRows: 4, maxRows: 14}"
@@ -413,18 +413,20 @@
class="myDataPick" class="myDataPick"
:config="{attrName: '新车型实施日期'}" :config="{attrName: '新车型实施日期'}"
v-model="editForm.newData" v-model="editForm.newData"
:required="true"
></custom-date-pick-group> ></custom-date-pick-group>
<custom-date-pick-group <custom-date-pick-group
class="myDataPick" class="myDataPick"
:config="{attrName: '在产车实施日期'}" :config="{attrName: '在产车实施日期'}"
v-model="editForm.onlineData" v-model="editForm.onlineData"
:required="true"
></custom-date-pick-group> ></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-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-option v-for="(item,index) in cxList" :value="item.label" :label="item.label" :key="index"></el-option>
</el-select> </el-select>
</el-form-item> </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 <el-select
v-model="editForm.complianceRequir" v-model="editForm.complianceRequir"
placeholder="请选择符合性要求"> placeholder="请选择符合性要求">
@@ -432,7 +434,7 @@
<el-option value="2" label="不符合"></el-option> <el-option value="2" label="不符合"></el-option>
</el-select> </el-select>
</el-form-item> </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 <el-input
v-model="editForm.complianceState" v-model="editForm.complianceState"
placeholder="请输入合规性分析" placeholder="请输入合规性分析"
src/pages/processCenter/pages/creatProcess/bzpg/step1.vue
+3 -2
View File
@@ -373,7 +373,8 @@
custom-class="demo-drawer" custom-class="demo-drawer"
> >
<div class="demo-drawer-content"> <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 style="position: absolute;bottom: 55px;top: 0;right: 0;left: 0">
<div class="left"> <div class="left">
<el-form :modal="projectSearch" :inline="true" class="label-input-form" style="margin-left:10px"> <el-form :modal="projectSearch" :inline="true" class="label-input-form" style="margin-left:10px">
@@ -438,7 +439,7 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
<div style="height: calc(100% - 65px); overflow: auto"> <div style="height: calc(100% - 125px); overflow: auto">
<el-table <el-table
:data="productData" :data="productData"
tooltip-effect="dark" tooltip-effect="dark"
src/pages/processCenter/pages/creatProcess/bzpg/step2.vue
+2 -1
View File
@@ -348,7 +348,8 @@ export default {
_this: this _this: this
}, res => { }, res => {
if (res.success) { if (res.success) {
this.$message.success(res.message) // this.$message.success(res.message)
this.$message.success('驳回成功')
this.$router.push('/processCenter') this.$router.push('/processCenter')
} }
this.isSubmit = false this.isSubmit = false
src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
+5 -2
View File
@@ -253,7 +253,7 @@
custom-class="demo-drawer" custom-class="demo-drawer"
> >
<div class="demo-drawer-content"> <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 style="position: absolute;bottom: 55px;top: 0;right: 0;left: 0">
<div class="left"> <div class="left">
<el-form :modal="sarSarAccessEOSearch" :inline="true" class="label-input-form" <el-form :modal="sarSarAccessEOSearch" :inline="true" class="label-input-form"
@@ -291,7 +291,7 @@
tooltip-effect="dark" tooltip-effect="dark"
style="width: 100%" style="width: 100%"
border border
height="100%" height="calc(100% - 64px)"
:header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px', :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}" fontWeight: 'bold', height: '48px'}"
@row-click="rowClick" @row-click="rowClick"
@@ -1080,6 +1080,7 @@ export default {
this.listForm.commentText = this.commentText this.listForm.commentText = this.commentText
this.listForm.fileName = this.fileInfoList this.listForm.fileName = this.fileInfoList
this.listForm.dataList = this.dataList this.listForm.dataList = this.dataList
this.listForm.listType = this.listType
let json = Object.assign(this.listForm, this.roleForm); let json = Object.assign(this.listForm, this.roleForm);
this.$refs["qdfbForm"].validate((valid) => { this.$refs["qdfbForm"].validate((valid) => {
if (valid) { if (valid) {
@@ -1517,6 +1518,8 @@ export default {
this.dataList = this.listForm.dataList this.dataList = this.listForm.dataList
this.roleForm = mes.roleForm this.roleForm = mes.roleForm
this.commentText = mes.commentText this.commentText = mes.commentText
this.listType = mes.form.listType
console.log(this.listForm)
}) })
}, },
}, },
src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+2 -1
View File
@@ -2492,7 +2492,7 @@
bringData.standInData = this.form.standInData && this.form.standInData != '' ? this.form.standInData : '0' bringData.standInData = this.form.standInData && this.form.standInData != '' ? this.form.standInData : '0'
const json = Object.assign(bringData, bringData.attrInfoCaseMap); const json = Object.assign(bringData, bringData.attrInfoCaseMap);
this.form = JSON.parse(JSON.stringify(json)) 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.getListTree(bringData)
this.form.standId = bringData.id this.form.standId = bringData.id
if (this.form.country) { if (this.form.country) {
@@ -2538,6 +2538,7 @@
this.modelFunc() this.modelFunc()
this.menu2("",this.form.standSystem) this.menu2("",this.form.standSystem)
this.$forceUpdate() this.$forceUpdate()
this.ccc = false
} }
// 遍历对象初始化文件信息 // 遍历对象初始化文件信息
for (const p in this.form) { for (const p in this.form) {
src/pages/processCenter/pages/creatProcess/qbfs/step2.vue
+8 -3
View File
@@ -146,7 +146,6 @@
></Role-tree> ></Role-tree>
<!-- 选择责任人--> <!-- 选择责任人-->
<Role-tree <Role-tree
check-box
:is-title="drawerTitle" :is-title="drawerTitle"
:is-visible.sync="modalshowflag" :is-visible.sync="modalshowflag"
@checkedRole="checkedRole" @checkedRole="checkedRole"
@@ -413,8 +412,14 @@ export default {
this.modalshowflag = true; this.modalshowflag = true;
}, },
checkedRole (data) { checkedRole (data) {
this.qbfsForm.bussFsSubUser2 = data[0].id; let idList = []
this.qbfsForm.bussFsSubUser2Name = data[0].name; 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; this.modalShowFlag = false;
}, },
checkedRole2(data) { checkedRole2(data) {
src/pages/processCenter/pages/creatProcess/qbfs/step3.vue
+5 -2
View File
@@ -321,13 +321,13 @@ export default {
async getFsFile(){ async getFsFile(){
let fileObj = await this.getSaveFile("model_fs") let fileObj = await this.getSaveFile("model_fs")
if(fileObj){ if(fileObj){
this.qbfsForm.FSD = fileObj.id this.qbfsForm.FSD = this.qbfsForm.FSD ? this.qbfsForm.FSD : fileObj.id
if(this.qbfsForm.standName){ if(this.qbfsForm.standName){
this.qbfsForm.FSDName = this.qbfsForm.standName + '-复审单' this.qbfsForm.FSDName = this.qbfsForm.standName + '-复审单'
}else { }else {
this.qbfsForm.FSDName = '复审单' this.qbfsForm.FSDName = '复审单'
} }
this.FSDList=this.assemble(fileObj.id,this.qbfsForm.FSDName); this.FSDList=this.assemble(this.qbfsForm.FSD,this.qbfsForm.FSDName);
this.formKey++ this.formKey++
} }
}, },
@@ -464,6 +464,9 @@ export default {
}).then(res => { }).then(res => {
if (res) { if (res) {
const processForm = JSON.parse(res.mesg) const processForm = JSON.parse(res.mesg)
if(processForm.FSD && processForm.FSD != ''){
this.qbfsForm.FSD = processForm.FSD
}
if (processForm.qbfsForm === undefined) { if (processForm.qbfsForm === undefined) {
this.getFormFieldList(processForm) this.getFormFieldList(processForm)
} else { } 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 !== '') { if (this.$route.query.bpnId && this.$route.query.bpnId !== '') {
let taskId = { let taskId = {
id: this.$route.query.bpnId id: this.$route.query.bpnId,
} }
taskDel(taskId).then(res=>{ taskDel(taskId).then(res=>{
return res return res
@@ -646,6 +646,7 @@ export default {
// }else{ // }else{
// this.qbfsForm.qcflag = 1 // this.qbfsForm.qcflag = 1
// } // }
this.qbfsForm.prcId = this.$route.query.prcId
let json = JSON.stringify(this.qbfsForm); let json = JSON.stringify(this.qbfsForm);
this.$http.post('lawss/activiti/completeTask', { this.$http.post('lawss/activiti/completeTask', {
taskIds: this.$route.query.taskIds, taskIds: this.$route.query.taskIds,
src/pages/processCenter/pages/creatProcess/qbfs/step6.vue
+1 -1
View File
@@ -6,7 +6,7 @@
</ProcessHeader> </ProcessHeader>
<div class="headerTabs"> <div class="headerTabs">
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div> <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 class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">人员信息</div>
</div> </div>
<div class="content"> <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
+3 -3
View File
@@ -243,7 +243,7 @@
<el-table <el-table
:data="standinfoList" :data="standinfoList"
tooltip-effect="dark" tooltip-effect="dark"
style="width: 100%" style="width: 100%;height: 79%"
border border
class="table-height" class="table-height"
:header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px', :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
@@ -335,14 +335,14 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
</div>
<pagination <pagination
:page="page" :page="page"
:pageSize="pageSize" :pageSize="pageSize"
:total="total" :total="total"
@pageChange="pageChange" @pageChange="pageChange"
@pageSizeChange="pageSizeChange" @pageSizeChange="pageSizeChange"
/> ></pagination>
</div>
</div> </div>
</div> </div>
<div class="demo-drawer-footer"> <div class="demo-drawer-footer">
src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue
+2 -3
View File
@@ -1008,12 +1008,11 @@
standNum: [ standNum: [
{ required: true, message: '请输入企标顺序号', trigger: 'blur' }, { required: true, message: '请输入企标顺序号', trigger: 'blur' },
{ min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }, { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
{validator: validateStandNumber, trigger: 'change'} {validator: validateStandNumber, trigger: 'blur'}
], ],
standNumNotRule: [], standNumNotRule: [],
standYear: [ standYear: [
{ required: true, message: '请输入标准年份'}, { required: true, message: '请输入标准年份',trigger: 'blur'},
], ],
standName: [ standName: [
{ required: true, message: '请输入企标中文名称', trigger: 'blur' }, { required: true, message: '请输入企标中文名称', trigger: 'blur' },
src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue
+49 -2
View File
@@ -1246,6 +1246,7 @@
this.XGDFileList = list3 this.XGDFileList = list3
this.QTWJBUSSFileList = list4 this.QTWJBUSSFileList = list4
this.GLWJBUSSFileList = list5 this.GLWJBUSSFileList = list5
console.log(fileType)
if(fileMadel){ if(fileMadel){
this.fileType = fileType this.fileType = fileType
this.fileUpload(fileType) this.fileUpload(fileType)
@@ -2134,42 +2135,88 @@
// fileList = fileList.splice(0, 1) // fileList = fileList.splice(0, 1)
// } // }
if (response.ok) { if (response.ok) {
// debugger
for(let i = 0 ; i < fileList.length ; i++){
const fileObj = {} const fileObj = {}
fileObj.id = file.response.data.id console.log(fileList[i],'fileList[i]')
fileObj.name = file.response.data.name 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){ switch (this.fileType){
case 'FBGBUSS': 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) this.FBGBUSSFileList.push(fileObj)
}
break; break;
case 'BZSMBUSS' : 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) this.BZSMBUSSFileList.push(fileObj)
break; break;
case 'LSBBBUSS': 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) this.LSBBBUSSFileList.push(fileObj)
break; break;
case 'QTWJBUSS': 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) this.QTWJBUSSFileList.push(fileObj)
break; break;
case 'GLWJBUSS': 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) this.GLWJBUSSFileList.push(fileObj)
break; break;
case 'XGD': 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) this.XGDFileList.push(fileObj)
break; break;
default : ; 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.formKey++
this.$message({ this.$message({
showClose: true, showClose: true,
message: response.message, message: response.message,
type: 'success' type: 'success'
}) })
this.fileMadel = false
} }
}, },
downloadFile (data) { downloadFile (data) {
src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue
+4 -1
View File
@@ -31,7 +31,10 @@
</el-form-item> </el-form-item>
<el-form-item label="制修订类型" prop="reviseStatus" class="add-form-item form-item-disabled" > <el-form-item label="制修订类型" prop="reviseStatus" class="add-form-item form-item-disabled" >
<template> <template>
<div style="padding-left: 10px; color: #666666;">{{ !form.reviseStatus || form.reviseStatus === ''? '' : (form.reviseStatus === '1'? '制定' : '修订') }}</div> <div style="padding-left: 10px; color: #666666;" v-if="form.reviseStatus === '1'">制定</div>
<div style="padding-left: 10px; color: #666666;" v-else-if="form.reviseStatus === '2'">修订</div>
<div style="padding-left: 10px; color: #666666;" v-else-if="form.reviseStatus === '3'">修改</div>
<div style="padding-left: 10px; color: #666666;" v-else></div>
</template> </template>
</el-form-item> </el-form-item>
<!-- <el-form-item label="文本状态" prop="textStatusBuss" class="add-form-item form-item-disabled">--> <!-- <el-form-item label="文本状态" prop="textStatusBuss" class="add-form-item form-item-disabled">-->
src/pages/processCenter/pages/creatProcess/qbrk/common/formEditListFb.vue
+4 -1
View File
@@ -19,7 +19,10 @@
</el-form-item> </el-form-item>
<el-form-item label="制修订类型" prop="reviseStatus" class="add-form-item form-item-disabled" > <el-form-item label="制修订类型" prop="reviseStatus" class="add-form-item form-item-disabled" >
<template> <template>
<div style="padding-left: 10px; color: #666666;">{{ !form.reviseStatus || form.reviseStatus === ''? '' : (form.reviseStatus === '1'? '制定' : '修订') }}</div> <div style="padding-left: 10px; color: #666666;" v-if="form.reviseStatus === '1'">制定</div>
<div style="padding-left: 10px; color: #666666;" v-else-if="form.reviseStatus === '2'">修订</div>
<div style="padding-left: 10px; color: #666666;" v-else-if="form.reviseStatus === '3'">修改</div>
<div style="padding-left: 10px; color: #666666;" v-else></div>
</template> </template>
</el-form-item> </el-form-item>
<el-form-item label="中文名称" prop="standName" class="add-form-item form-item-disabled"> <el-form-item label="中文名称" prop="standName" class="add-form-item form-item-disabled">
src/pages/processCenter/pages/creatProcess/qbrk/common/formList.vue
+4 -1
View File
@@ -24,7 +24,10 @@
</el-form-item> </el-form-item>
<el-form-item label="制修订类型" prop="reviseStatus" class="add-form-item form-item-disabled" > <el-form-item label="制修订类型" prop="reviseStatus" class="add-form-item form-item-disabled" >
<template> <template>
<div style="padding-left: 10px; color: #666666;">{{ form.reviseStatus === ''? '' : (form.reviseStatus === '1'? '制定' : '修订') }}</div> <div style="padding-left: 10px; color: #666666;" v-if="form.reviseStatus === '1'">制定</div>
<div style="padding-left: 10px; color: #666666;" v-else-if="form.reviseStatus === '2'">修订</div>
<div style="padding-left: 10px; color: #666666;" v-else-if="form.reviseStatus === '3'">修改</div>
<div style="padding-left: 10px; color: #666666;" v-else></div>
</template> </template>
</el-form-item> </el-form-item>
<!-- <el-form-item label="文本状态" prop="textStatusBuss" class="add-form-item form-item-disabled">--> <!-- <el-form-item label="文本状态" prop="textStatusBuss" class="add-form-item form-item-disabled">-->
src/pages/processCenter/pages/creatProcess/qbrk/common/formListIn.vue
+4 -1
View File
@@ -18,7 +18,10 @@
</el-form-item> </el-form-item>
<el-form-item label="制修订类型" prop="reviseStatus" class="add-form-item form-item-disabled" > <el-form-item label="制修订类型" prop="reviseStatus" class="add-form-item form-item-disabled" >
<template> <template>
<div style="padding-left: 10px; color: #666666;">{{ form.reviseStatus === ''? '' : (form.reviseStatus === '1'? '制定' : '修订') }}</div> <div style="padding-left: 10px; color: #666666;" v-if="form.reviseStatus === '1'">制定</div>
<div style="padding-left: 10px; color: #666666;" v-else-if="form.reviseStatus === '2'">修订</div>
<div style="padding-left: 10px; color: #666666;" v-else-if="form.reviseStatus === '3'">修改</div>
<div style="padding-left: 10px; color: #666666;" v-else></div>
</template> </template>
</el-form-item> </el-form-item>
<el-form-item label="中文名称" prop="standName" class="add-form-item form-item-disabled"> <el-form-item label="中文名称" prop="standName" class="add-form-item form-item-disabled">
src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue
+3409
View File
File diff suppressed because it is too large Load Diff
src/pages/processCenter/pages/creatProcess/qbrk/step1.vue
+416 -259
View File
@@ -6,7 +6,7 @@
</ProcessHeader> </ProcessHeader>
<div class="headerTabs"> <div class="headerTabs">
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div> <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="active === '2' ? 'active' : ''" @click="handleTabs('2')">模块信息</div>-->
<div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">人员信息</div> <div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">人员信息</div>
</div> </div>
<div class="content"> <div class="content">
@@ -46,53 +46,64 @@
</el-form-item> </el-form-item>
<el-form-item label="制修订类型" prop="reviseStatus" class="add-form-item form-item-disabled" > <el-form-item label="制修订类型" prop="reviseStatus" class="add-form-item form-item-disabled" >
<template> <template>
<div style="padding-left: 10px; color: #666666;">{{ form.reviseStatus === ''? '' : (form.reviseStatus === '1'? '制定' : '修订') }}</div> <div style="padding-left: 10px; color: #666666;" v-if="form.reviseStatus === '1'">制定</div>
<div style="padding-left: 10px; color: #666666;" v-else-if="form.reviseStatus === '2'">修订</div>
<div style="padding-left: 10px; color: #666666;" v-else-if="form.reviseStatus === '3'">修改</div>
<div style="padding-left: 10px; color: #666666;" v-else></div>
</template> </template>
<!-- <el-select v-model="form.reviseStatus" filterable clearable>-->
<!-- <el-option-->
<!-- v-for="item in opinionsStand"-->
<!-- :key="item.value"-->
<!-- :value="item.value"-->
<!-- :label="item.label"-->
<!-- ></el-option>-->
<!-- </el-select>-->
</el-form-item> </el-form-item>
<!-- <el-form-item label="文本状态" prop="textStatusBuss" class="add-form-item form-item-disabled">--> <!-- <el-form-item label="文本状态" prop="textStatusBuss" class="add-form-item form-item-disabled">-->
<!-- <el-select :disabled="disabledXX" :popper-append-to-body="false" v-model="form.textStatusBuss" placeholder="请选择文本状态">--> <!-- <el-select :disabled="disabledXX" :popper-append-to-body="false" v-model="form.textStatusBuss" placeholder="请选择文本状态">-->
<!-- <el-option--> <!-- <el-option-->
<!-- v-for="item in standStateOptions"--> <!-- v-for="item in standStateOptions"-->
<!-- placeholder="请选择"--> <!-- placeholder="请选择"-->
<!-- :key="item.value"--> <!-- :key="item.value"-->
<!-- :value="item.value"--> <!-- :value="item.value"-->
<!-- :label="item.label"--> <!-- :label="item.label"-->
<!-- ></el-option>--> <!-- ></el-option>-->
<!-- </el-select>--> <!-- </el-select>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<!-- <el-form-item v-show="verifySarStandard" label="标准年份" prop="standYear" class="add-form-item form-item-disabled">--> <!-- <el-form-item v-show="verifySarStandard" label="标准年份" prop="standYear" class="add-form-item form-item-disabled">-->
<!-- <el-input :disabled="disabledXX" v-model="form.standYear"--> <!-- <el-input :disabled="disabledXX" v-model="form.standYear"-->
<!-- placeholder="请输入标准年份"--> <!-- placeholder="请输入标准年份"-->
<!-- clearable></el-input>--> <!-- clearable></el-input>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<!-- <el-form-item v-show="verifySarStandard" label="复审日期" prop="FSRQBUSS" class="add-form-item form-item-disabled">--> <!-- <el-form-item v-show="verifySarStandard" label="复审日期" prop="FSRQBUSS" class="add-form-item form-item-disabled">-->
<!-- <el-datePicker :disabled="disabledXX" v-model="form.FSRQBUSS"--> <!-- <el-datePicker :disabled="disabledXX" v-model="form.FSRQBUSS"-->
<!-- :editable="false"--> <!-- :editable="false"-->
<!-- disabled--> <!-- disabled-->
<!-- placeholder="请选择废止日期"--> <!-- placeholder="请选择废止日期"-->
<!-- value-format="yyyy-MM-dd"--> <!-- value-format="yyyy-MM-dd"-->
<!-- clearable></el-datePicker>--> <!-- clearable></el-datePicker>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<!-- <el-form-item label="国家/地区" prop="country" class="add-form-item form-item-disabled">--> <!-- <el-form-item label="国家/地区" prop="country" class="add-form-item form-item-disabled">-->
<!-- <el-select :disabled="disabledXX" :popper-append-to-body="false" v-model="form.country" multiple placeholder="国家/地区">--> <!-- <el-select :disabled="disabledXX" :popper-append-to-body="false" v-model="form.country" multiple placeholder="国家/地区">-->
<!-- <el-option--> <!-- <el-option-->
<!-- v-for="item in countryOptions"--> <!-- v-for="item in countryOptions"-->
<!-- placeholder="请选择"--> <!-- placeholder="请选择"-->
<!-- :key="item.value"--> <!-- :key="item.value"-->
<!-- :value="item.value"--> <!-- :value="item.value"-->
<!-- :label="item.label"--> <!-- :label="item.label"-->
<!-- ></el-option>--> <!-- ></el-option>-->
<!-- </el-select>--> <!-- </el-select>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<!-- <el-form-item label="企标编号" prop="standNumber" class="add-form-item form-item-disabled">--> <!-- <el-form-item label="企标编号" prop="standNumber" class="add-form-item form-item-disabled">-->
<!-- <el-input :disabled="disabledXX" --> <!-- <el-input :disabled="disabledXX" -->
<!-- v-model="form.standNumber"--> <!-- v-model="form.standNumber"-->
<!-- placeholder="请输入企标编号"--> <!-- placeholder="请输入企标编号"-->
<!-- clearable--> <!-- clearable-->
<!-- ></el-input>--> <!-- ></el-input>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<el-form-item class="add-form-item form-item-disabled" style="margin-left: -210px"> <el-form-item class="add-form-item form-item-disabled" style="margin-left: -210px">
<el-button :disabled="disabledXX" <el-button :disabled="disabledXX"
type="primary" type="primary"
@@ -115,18 +126,18 @@
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
></el-datePicker> ></el-datePicker>
</el-form-item> </el-form-item>
<!-- <el-form-item v-show="verifySarStandard" label="发布日期" prop="issueTime" class="add-form-item form-item-disabled">--> <!-- <el-form-item v-show="verifySarStandard" label="发布日期" prop="issueTime" class="add-form-item form-item-disabled">-->
<!-- <el-datePicker :disabled="disabledXX" v-model="form.issueTime"--> <!-- <el-datePicker :disabled="disabledXX" v-model="form.issueTime"-->
<!-- :editable="false"--> <!-- :editable="false"-->
<!-- placeholder="请选择发布日期"></el-datePicker>--> <!-- placeholder="请选择发布日期"></el-datePicker>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<!-- <el-form-item v-show="verifySarStandard" label="废止日期" prop="FZRQBUSS" class="add-form-item form-item-disabled">--> <!-- <el-form-item v-show="verifySarStandard" label="废止日期" prop="FZRQBUSS" class="add-form-item form-item-disabled">-->
<!-- <el-datePicker :disabled="disabledXX" v-model="form.FZRQBUSS"--> <!-- <el-datePicker :disabled="disabledXX" v-model="form.FZRQBUSS"-->
<!-- :editable="false"--> <!-- :editable="false"-->
<!-- placeholder="请选择废止日期"--> <!-- placeholder="请选择废止日期"-->
<!-- value-format="yyyy-MM-dd"--> <!-- value-format="yyyy-MM-dd"-->
<!-- clearable></el-datePicker>--> <!-- clearable></el-datePicker>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
</el-col> </el-col>
</el-row> </el-row>
</div> </div>
@@ -274,12 +285,12 @@
<el-form-item label="关联模块--卡车VPPS编码" title="关联模块--卡车VPPS编码" class="add-form-item form-item-disabled"> <el-form-item label="关联模块--卡车VPPS编码" title="关联模块--卡车VPPS编码" class="add-form-item form-item-disabled">
<el-input :disabled="disabledXX" v-model="form.KCVPPSBMBUSS" readonly="readonly" placeholder="关联模块--卡车VPPS编码" @click.native="choiceZRR3('struck', '关联模块--卡车VPPS编码', form.KCVPPSBMBUSS,false)"></el-input> <el-input :disabled="disabledXX" v-model="form.KCVPPSBMBUSS" readonly="readonly" placeholder="关联模块--卡车VPPS编码" @click.native="choiceZRR3('struck', '关联模块--卡车VPPS编码', form.KCVPPSBMBUSS,false)"></el-input>
</el-form-item> </el-form-item>
<!-- <el-form-item label="模块结构单元变型号(卡车)" title="模块结构单元变型号(卡车)" class="add-form-item form-item-disabled">--> <!-- <el-form-item label="模块结构单元变型号(卡车)" title="模块结构单元变型号(卡车)" class="add-form-item form-item-disabled">-->
<!-- <el-input :disabled="disabledXX" v-model="form.DYBXHBUSS" readonly="readonly" placeholder="选择模块结构单元变型号(卡车)" @click.native="choiceZRR4('TRUCK', '模块结构单元变型号(卡车)', form.DYBXHBUSS,false)"></el-input>--> <!-- <el-input :disabled="disabledXX" v-model="form.DYBXHBUSS" readonly="readonly" placeholder="选择模块结构单元变型号(卡车)" @click.native="choiceZRR4('TRUCK', '模块结构单元变型号(卡车)', form.DYBXHBUSS,false)"></el-input>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<!-- <el-form-item label="模块结构单元变型号(乘用车)" title="模块结构单元变型号(乘用车)" class="add-form-item form-item-disabled">--> <!-- <el-form-item label="模块结构单元变型号(乘用车)" title="模块结构单元变型号(乘用车)" class="add-form-item form-item-disabled">-->
<!-- <el-input :disabled="disabledXX" v-model="form.CYCDYBXHBUSS" readonly="readonly" placeholder="选择模块结构单元变型号(乘用车)" @click.native="choiceZRR5('CAR', '模块结构单元变型号(乘用车)', form.CYCDYBXHBUSS,false)"></el-input>--> <!-- <el-input :disabled="disabledXX" v-model="form.CYCDYBXHBUSS" readonly="readonly" placeholder="选择模块结构单元变型号(乘用车)" @click.native="choiceZRR5('CAR', '模块结构单元变型号(乘用车)', form.CYCDYBXHBUSS,false)"></el-input>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<el-form-item label="体系类别" prop="TXLBBUSS" class="add-form-item form-item-disabled"> <el-form-item label="体系类别" prop="TXLBBUSS" class="add-form-item form-item-disabled">
<el-input :disabled="disabledXX" v-model="form.TXLBBUSS" placeholder="选择体系类别" clearable @click.native="choiceZRR1('TXLBBUSS', '体系类别', form.TXLBBUSS)"></el-input> <el-input :disabled="disabledXX" v-model="form.TXLBBUSS" placeholder="选择体系类别" clearable @click.native="choiceZRR1('TXLBBUSS', '体系类别', form.TXLBBUSS)"></el-input>
</el-form-item> </el-form-item>
@@ -322,12 +333,12 @@
<el-form-item label="关联模块--卡车VPPS编码" prop="KCVPPSCNBUSS" class="add-form-item form-item-disabled"> <el-form-item label="关联模块--卡车VPPS编码" prop="KCVPPSCNBUSS" class="add-form-item form-item-disabled">
<el-input :disabled="disabledXX" v-model="form.KCVPPSCNBUSS" placeholder="关联模块--卡车VPPS编码" clearable disabled></el-input> <el-input :disabled="disabledXX" v-model="form.KCVPPSCNBUSS" placeholder="关联模块--卡车VPPS编码" clearable disabled></el-input>
</el-form-item> </el-form-item>
<!-- <el-form-item label="模块结构单元名称(卡车)" prop="DYMCBUSS" class="add-form-item form-item-disabled">--> <!-- <el-form-item label="模块结构单元名称(卡车)" prop="DYMCBUSS" class="add-form-item form-item-disabled">-->
<!-- <el-input :disabled="disabledXX" v-model="form.DYMCBUSS" placeholder="模块结构单元名称(卡车)" clearable disabled></el-input>--> <!-- <el-input :disabled="disabledXX" v-model="form.DYMCBUSS" placeholder="模块结构单元名称(卡车)" clearable disabled></el-input>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<!-- <el-form-item label="模块结构单元名称(乘用车)" prop="CYCDYMCBUSS" class="add-form-item form-item-disabled">--> <!-- <el-form-item label="模块结构单元名称(乘用车)" prop="CYCDYMCBUSS" class="add-form-item form-item-disabled">-->
<!-- <el-input :disabled="disabledXX" v-model="form.CYCDYMCBUSS" placeholder="模块结构单元名称(乘用车)" clearable disabled></el-input>--> <!-- <el-input :disabled="disabledXX" v-model="form.CYCDYMCBUSS" placeholder="模块结构单元名称(乘用车)" clearable disabled></el-input>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
</el-col> </el-col>
</el-row> </el-row>
</div> </div>
@@ -384,20 +395,20 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<!-- <el-form-item label="被代替企标编号" prop="BDTWJHLAWS" class="add-form-item form-item-disabled">--> <!-- <el-form-item label="被代替企标编号" prop="BDTWJHLAWS" class="add-form-item form-item-disabled">-->
<!-- <el-input :disabled="disabledXX" --> <!-- <el-input :disabled="disabledXX" -->
<!-- v-model="form.BDTWJHLAWS"--> <!-- v-model="form.BDTWJHLAWS"-->
<!-- placeholder="请输入被代替企标编号"--> <!-- placeholder="请输入被代替企标编号"-->
<!-- clearable--> <!-- clearable-->
<!-- ></el-input>--> <!-- ></el-input>-->
<!-- <el-button :disabled="disabledXX" --> <!-- <el-button :disabled="disabledXX" -->
<!-- type="primary"--> <!-- type="primary"-->
<!-- class="common-button-primary"--> <!-- class="common-button-primary"-->
<!-- size="mini"--> <!-- size="mini"-->
<!-- style="position:absolute;top: 10px;right: 0;"--> <!-- style="position:absolute;top: 10px;right: 0;"-->
<!-- @click="selectLaws('bfbdtbzh'),config.attrName = '被代替企标编号'"--> <!-- @click="selectLaws('bfbdtbzh'),config.attrName = '被代替企标编号'"-->
<!-- >{{'手动查找'}}</el-button>--> <!-- >{{'手动查找'}}</el-button>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<el-form-item label="上传时间" prop="XCSJBUSS" class="add-form-item form-item-disabled"> <el-form-item label="上传时间" prop="XCSJBUSS" class="add-form-item form-item-disabled">
<el-input :disabled="disabledXX" <el-input :disabled="disabledXX"
v-model="form.XCSJBUSS" v-model="form.XCSJBUSS"
@@ -458,85 +469,85 @@
</el-collapse-item> </el-collapse-item>
</el-collapse> </el-collapse>
</div> </div>
<!-- <div class="block" id="active2" v-show="active === '2'">--> <!-- <div class="block" id="active2" v-show="active === '2'">-->
<!-- <ProcessTitle>--> <!-- <ProcessTitle>-->
<!-- <template slot="title">模块信息</template>--> <!-- <template slot="title">模块信息</template>-->
<!-- </ProcessTitle>--> <!-- </ProcessTitle>-->
<!-- <template>--> <!-- <template>-->
<!-- <div class="prc-content-border" style="height: 66vh;position: relative;">--> <!-- <div class="prc-content-border" style="height: 66vh;position: relative;">-->
<!-- <div class="action-bar">--> <!-- <div class="action-bar">-->
<!-- <el-button :disabled="disabledXX" type="primary" class="common-button-primary add-button" size="mini" @click="choiceZRRS('', 2, '')">--> <!-- <el-button :disabled="disabledXX" type="primary" class="common-button-primary add-button" size="mini" @click="choiceZRRS('', 2, '')">-->
<!-- 批量编辑--> <!-- 批量编辑-->
<!-- </el-button>--> <!-- </el-button>-->
<!-- <el-button :disabled="disabledXX" --> <!-- <el-button :disabled="disabledXX" -->
<!-- type="primary"--> <!-- type="primary"-->
<!-- size="mini"--> <!-- size="mini"-->
<!-- class="common-button-primary add-button"--> <!-- class="common-button-primary add-button"-->
<!-- @click="createRow"--> <!-- @click="createRow"-->
<!-- >创建模块</el-button>--> <!-- >创建模块</el-button>-->
<!-- </div>--> <!-- </div>-->
<!-- <el-table--> <!-- <el-table-->
<!-- ref="selection"--> <!-- ref="selection"-->
<!-- tooltip-effect="dark"--> <!-- tooltip-effect="dark"-->
<!-- style="width: 100%;margin-bottom: 20px;overflow-y:auto;height:56vh;border-bottom: 1px solid #EBEEF5;"--> <!-- style="width: 100%;margin-bottom: 20px;overflow-y:auto;height:56vh;border-bottom: 1px solid #EBEEF5;"-->
<!-- :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',--> <!-- :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',-->
<!-- fontWeight: 'bold', height: '48px'}"--> <!-- fontWeight: 'bold', height: '48px'}"-->
<!-- @selection-change="handleSelectionChange"--> <!-- @selection-change="handleSelectionChange"-->
<!-- row-key="id"--> <!-- row-key="id"-->
<!-- :data="form.modelData"--> <!-- :data="form.modelData"-->
<!-- border--> <!-- border-->
<!-- default-expand-all--> <!-- default-expand-all-->
<!-- :tree-props="{children: 'children', hasChildren: 'hasChildren'}">--> <!-- :tree-props="{children: 'children', hasChildren: 'hasChildren'}">-->
<!-- <el-table-column type="selection" min-width="5%" :selectable="checkSelect" align="center"/>--> <!-- <el-table-column type="selection" min-width="5%" :selectable="checkSelect" align="center"/>-->
<!-- <el-table-column--> <!-- <el-table-column-->
<!-- prop="modelNum"--> <!-- prop="modelNum"-->
<!-- label="序号"--> <!-- label="序号"-->
<!-- min-width="15%"--> <!-- min-width="15%"-->
<!-- align="center"--> <!-- align="center"-->
<!-- :tree-props="{children: 'children', hasChildren: 'hasChildren'}">--> <!-- :tree-props="{children: 'children', hasChildren: 'hasChildren'}">-->
<!-- </el-table-column>--> <!-- </el-table-column>-->
<!-- <el-table-column--> <!-- <el-table-column-->
<!-- label="名称"--> <!-- label="名称"-->
<!-- align="center"--> <!-- align="center"-->
<!-- min-width="30%">--> <!-- min-width="30%">-->
<!-- <template slot-scope="scope">--> <!-- <template slot-scope="scope">-->
<!-- <el-form-item--> <!-- <el-form-item-->
<!-- style="margin-left: 0;margin-bottom:0;"--> <!-- style="margin-left: 0;margin-bottom:0;"-->
<!-- >--> <!-- >-->
<!-- <el-input :disabled="disabledXX" v-model="scope.row.modelName" :disabled="scope.row.disabled" placeholder="请维护模块名称" @blur="modelNameFunc(scope.row)"/>--> <!-- <el-input :disabled="disabledXX" v-model="scope.row.modelName" :disabled="scope.row.disabled" placeholder="请维护模块名称" @blur="modelNameFunc(scope.row)"/>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<!-- </template>--> <!-- </template>-->
<!-- </el-table-column>--> <!-- </el-table-column>-->
<!-- <el-table-column--> <!-- <el-table-column-->
<!-- label="责任人"--> <!-- label="责任人"-->
<!-- min-width="15%"--> <!-- min-width="15%"-->
<!-- align="center">--> <!-- align="center">-->
<!-- <template slot-scope="scope">--> <!-- <template slot-scope="scope">-->
<!-- <el-form-item--> <!-- <el-form-item-->
<!-- style="margin-left: 0;margin-bottom:0;"--> <!-- style="margin-left: 0;margin-bottom:0;"-->
<!-- >--> <!-- >-->
<!-- <el-input :disabled="disabledXX" v-model="scope.row.zrUserIdName" v-if="scope.row.pid === '0'" placeholder="请选择责任人" @click.native="choiceZRRS(scope.row.zrUserId, 1, scope.$index)"/>--> <!-- <el-input :disabled="disabledXX" v-model="scope.row.zrUserIdName" v-if="scope.row.pid === '0'" placeholder="请选择责任人" @click.native="choiceZRRS(scope.row.zrUserId, 1, scope.$index)"/>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<!-- </template>--> <!-- </template>-->
<!-- </el-table-column>--> <!-- </el-table-column>-->
<!-- <el-table-column label="操作" align="center" min-width="5%">--> <!-- <el-table-column label="操作" align="center" min-width="5%">-->
<!-- <template slot-scope="scope">--> <!-- <template slot-scope="scope">-->
<!-- <div @click.stop style="display: inline-block">--> <!-- <div @click.stop style="display: inline-block">-->
<!-- <el-dropdown trigger="click" @command="handleCommand">--> <!-- <el-dropdown trigger="click" @command="handleCommand">-->
<!-- <i class="iconfont">&#xe61e;</i>--> <!-- <i class="iconfont">&#xe61e;</i>-->
<!-- <el-dropdown-menu slot="dropdown">--> <!-- <el-dropdown-menu slot="dropdown">-->
<!--&lt;!&ndash; <el-dropdown-item :command="[scope.$index,scope.row, '新增']" v-btn-permission="''">新增</el-dropdown-item>&ndash;&gt;--> <!--&lt;!&ndash; <el-dropdown-item :command="[scope.$index,scope.row, '新增']" v-btn-permission="''">新增</el-dropdown-item>&ndash;&gt;-->
<!-- <el-dropdown-item :command="[scope.$index,scope.row, '维护']" v-btn-permission="''">维护</el-dropdown-item>--> <!-- <el-dropdown-item :command="[scope.$index,scope.row, '维护']" v-btn-permission="''">维护</el-dropdown-item>-->
<!-- <el-dropdown-item :command="[scope.$index,scope.row, '删除']" v-btn-permission="''">删除</el-dropdown-item>--> <!-- <el-dropdown-item :command="[scope.$index,scope.row, '删除']" v-btn-permission="''">删除</el-dropdown-item>-->
<!-- </el-dropdown-menu>--> <!-- </el-dropdown-menu>-->
<!-- </el-dropdown>--> <!-- </el-dropdown>-->
<!-- </div>--> <!-- </div>-->
<!-- </template>--> <!-- </template>-->
<!-- </el-table-column>--> <!-- </el-table-column>-->
<!-- </el-table>--> <!-- </el-table>-->
<!-- </div>--> <!-- </div>-->
<!-- </template>--> <!-- </template>-->
<!-- </div>--> <!-- </div>-->
<div class="block" style="padding-top: 20px;" v-show="active === '3'"> <div class="block" style="padding-top: 20px;" v-show="active === '3'">
<el-timeline> <el-timeline>
<el-form <el-form
@@ -679,7 +690,7 @@
</div> </div>
</el-form> </el-form>
</div> </div>
<!-- 保存||提交--> <!-- 保存||提交-->
<ProcessFooter <ProcessFooter
v-show="verifySarStandard && !disabledXX" v-show="verifySarStandard && !disabledXX"
show-save show-save
@@ -824,38 +835,38 @@
@checkedRole="checkedRole" @checkedRole="checkedRole"
:nodeList="nodeList" :nodeList="nodeList"
></Role-tree> ></Role-tree>
<!-- <el-drawer v-if="!disabledXX" --> <!-- <el-drawer v-if="!disabledXX" -->
<!-- :title="drawerTitle"--> <!-- :title="drawerTitle"-->
<!-- :visible.sync="modalShowFlag"--> <!-- :visible.sync="modalShowFlag"-->
<!-- :wrapperClosable="false"--> <!-- :wrapperClosable="false"-->
<!-- size="800px">--> <!-- size="800px">-->
<!-- <el-input :disabled="disabledXX" --> <!-- <el-input :disabled="disabledXX" -->
<!-- style="width:70%;padding: 10px"--> <!-- style="width:70%;padding: 10px"-->
<!-- placeholder="请输入姓名"--> <!-- placeholder="请输入姓名"-->
<!-- v-model="filterText">--> <!-- v-model="filterText">-->
<!-- </el-input>--> <!-- </el-input>-->
<!-- <el-tree--> <!-- <el-tree-->
<!-- :filter-node-method="filterNode"--> <!-- :filter-node-method="filterNode"-->
<!-- v-if="modalShowFlag"--> <!-- v-if="modalShowFlag"-->
<!-- node-key="id"--> <!-- node-key="id"-->
<!-- style="height: 100%; overflow: auto;"--> <!-- style="height: 100%; overflow: auto;"-->
<!-- class="filter-tree"--> <!-- class="filter-tree"-->
<!-- :data="treeData"--> <!-- :data="treeData"-->
<!-- :props="defaultUserProps"--> <!-- :props="defaultUserProps"-->
<!-- :default-checked-keys="nodeList"--> <!-- :default-checked-keys="nodeList"-->
<!-- highlight-current--> <!-- highlight-current-->
<!-- check-strictly--> <!-- check-strictly-->
<!-- @check="drawerCheck"--> <!-- @check="drawerCheck"-->
<!-- default-expand-all--> <!-- default-expand-all-->
<!-- :expand-on-click-node="false"--> <!-- :expand-on-click-node="false"-->
<!-- show-checkbox--> <!-- show-checkbox-->
<!-- ref="tree">--> <!-- ref="tree">-->
<!-- </el-tree>--> <!-- </el-tree>-->
<!-- <div id="roleFormButton" class="demo-drawer-footer">--> <!-- <div id="roleFormButton" class="demo-drawer-footer">-->
<!-- <el-button :disabled="disabledXX" class="common-button-primary" size="mini" icon="el-icon-check" type="primary" @click="saveUserInfo">确定</el-button>--> <!-- <el-button :disabled="disabledXX" class="common-button-primary" size="mini" icon="el-icon-check" type="primary" @click="saveUserInfo">确定</el-button>-->
<!-- <el-button :disabled="disabledXX" class="common-button-default" size="mini" icon="el-icon-close" @click="cancelUserInfo">取消</el-button>--> <!-- <el-button :disabled="disabledXX" class="common-button-default" size="mini" icon="el-icon-close" @click="cancelUserInfo">取消</el-button>-->
<!-- </div>--> <!-- </div>-->
<!-- </el-drawer>--> <!-- </el-drawer>-->
<!-- 选择标准的弹框 --> <!-- 选择标准的弹框 -->
<el-drawer v-if="!disabledXX" <el-drawer v-if="!disabledXX"
ref="standard" ref="standard"
@@ -868,28 +879,28 @@
<div class="content"> <div class="content">
<div class="standard-table-search"> <div class="standard-table-search">
<el-form :model="standardSearchForm" inline class="label-input-form search-area" style="justify-content:left"> <el-form :model="standardSearchForm" inline class="label-input-form search-area" style="justify-content:left">
<!-- <el-form-item label="计划状态" style="margin-right:-20px" prop="planStatus" class="search-item" >--> <!-- <el-form-item label="计划状态" style="margin-right:-20px" prop="planStatus" class="search-item" >-->
<!-- <el-select :disabled="disabledXX" v-model="standardSearchForm.planStatus" placeholder="请选择计划状态">--> <!-- <el-select :disabled="disabledXX" v-model="standardSearchForm.planStatus" placeholder="请选择计划状态">-->
<!-- <el-option label="制定" value="2"></el-option>--> <!-- <el-option label="制定" value="2"></el-option>-->
<!-- <el-option label="修订" value="1"></el-option>--> <!-- <el-option label="修订" value="1"></el-option>-->
<!-- <el-option label="完成" value="0"></el-option>--> <!-- <el-option label="完成" value="0"></el-option>-->
<!-- </el-select>--> <!-- </el-select>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<!-- <el-form-item label="制修订状态" style="margin-right:-20px" prop="reviseStatus" class="search-item" >--> <!-- <el-form-item label="制修订状态" style="margin-right:-20px" prop="reviseStatus" class="search-item" >-->
<!-- <el-select :disabled="disabledXX" v-model="standardSearchForm.reviseStatus" placeholder="请选择制修订状态">--> <!-- <el-select :disabled="disabledXX" v-model="standardSearchForm.reviseStatus" placeholder="请选择制修订状态">-->
<!-- <el-option label="制定完成" value="0"></el-option>--> <!-- <el-option label="制定完成" value="0"></el-option>-->
<!-- <el-option label="制定中" value="1"></el-option>--> <!-- <el-option label="制定中" value="1"></el-option>-->
<!-- <el-option label="未制定" value="2"></el-option>--> <!-- <el-option label="未制定" value="2"></el-option>-->
<!-- </el-select>--> <!-- </el-select>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<el-form-item label="企标名称" style="margin-right:20px" prop="esName" class="search-item" > <el-form-item v-if="this.form.reviseStatus === '1' || this.form.reviseStatus === '2'" label="企标名称" style="margin-right:20px" prop="esName" class="search-item" >
<el-input :disabled="disabledXX" <el-input :disabled="disabledXX"
v-model="standardSearchForm.esName" v-model="standardSearchForm.esName"
placeholder="请输入企标名称" placeholder="请输入企标名称"
clearable clearable
:maxlength="100"></el-input> :maxlength="100"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="起草责任单位" style="margin-right:20px" prop="unit" class="search-item" > <el-form-item v-if="this.form.reviseStatus === '1' || this.form.reviseStatus === '2'" label="起草责任单位" style="margin-right:20px" prop="unit" class="search-item" >
<el-input :disabled="disabledXX" <el-input :disabled="disabledXX"
style="width:176px" style="width:176px"
v-model="standardSearchForm.unit" v-model="standardSearchForm.unit"
@@ -897,6 +908,30 @@
clearable clearable
:maxlength="100"></el-input> :maxlength="100"></el-input>
</el-form-item> </el-form-item>
<el-form-item v-if="this.form.reviseStatus === '3'" label="企标编号" style="margin-right:20px" prop="unit" class="search-item" >
<el-input :disabled="disabledXX"
style="width:176px"
v-model="standardSearchForm.standCode"
placeholder="请输入企标编号"
clearable
:maxlength="100"></el-input>
</el-form-item>
<el-form-item v-if="this.form.reviseStatus === '3'" label="起草单位" style="margin-right:20px" prop="unit" class="search-item" >
<el-input :disabled="disabledXX"
style="width:176px"
v-model="standardSearchForm.QCDW"
placeholder="请输入起草单位"
clearable
:maxlength="100"></el-input>
</el-form-item>
<el-form-item v-if="this.form.reviseStatus === '3'" label="中文名称" style="margin-right:20px" prop="unit" class="search-item" >
<el-input :disabled="disabledXX"
style="width:176px"
v-model="standardSearchForm.standName"
placeholder="请输入中文名称"
clearable
:maxlength="100"></el-input>
</el-form-item>
<el-form-item class="search-item btn-box"> <el-form-item class="search-item btn-box">
<el-button :disabled="disabledXX" <el-button :disabled="disabledXX"
type="primary" type="primary"
@@ -938,18 +973,21 @@
align="center" align="center"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
v-if="this.form.reviseStatus === '1' || this.form.reviseStatus === '2'"
prop="bussSort" prop="bussSort"
label="企标类别" label="企标类别"
align="center" align="center"
width="120"> width="120">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
v-if="this.form.reviseStatus === '1' || this.form.reviseStatus === '2'"
prop="esName" prop="esName"
label="企标名称" label="企标名称"
align="center" align="center"
width="120"> width="120">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
v-if="this.form.reviseStatus === '1' || this.form.reviseStatus === '2'"
prop="planStatus" prop="planStatus"
label="计划状态" label="计划状态"
align="center" align="center"
@@ -959,6 +997,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
v-if="this.form.reviseStatus === '1' || this.form.reviseStatus === '2'"
prop="reviseStatus" prop="reviseStatus"
width="150" width="150"
align="center" align="center"
@@ -968,24 +1007,28 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
v-if="this.form.reviseStatus === '1' || this.form.reviseStatus === '2'"
prop="drafterName" prop="drafterName"
width="120" width="120"
align="center" align="center"
label="起草人"> label="起草人">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
v-if="this.form.reviseStatus === '1' || this.form.reviseStatus === '2'"
prop="resPersonName" prop="resPersonName"
width="120" width="120"
align="center" align="center"
label="评审责任人"> label="评审责任人">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
v-if="this.form.reviseStatus === '1' || this.form.reviseStatus === '2'"
prop="wgLeaderName" prop="wgLeaderName"
width="120" width="120"
align="center" align="center"
label="工作组组长"> label="工作组组长">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
v-if="this.form.reviseStatus === '1' || this.form.reviseStatus === '2'"
prop="draftTime" prop="draftTime"
width="200" width="200"
align="center" align="center"
@@ -995,6 +1038,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
v-if="this.form.reviseStatus === '1' || this.form.reviseStatus === '2'"
width="200" width="200"
prop="releaseTime" prop="releaseTime"
align="center" align="center"
@@ -1004,20 +1048,63 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
v-if="this.form.reviseStatus === '1' || this.form.reviseStatus === '2'"
align="center" align="center"
prop="unitName" prop="unitName"
label="起草责任单位"> label="起草责任单位">
</el-table-column> </el-table-column>
<!-- <el-table-column label="操作" align="center" width="80">--> <el-table-column
<!-- <template slot-scope="scope">--> v-if="this.form.reviseStatus === '3'"
<!-- <el-button :disabled="disabledXX" --> align="center"
<!-- class="opera-btn"--> prop="standCode"
<!-- size="mini"--> label="企标编号">
<!-- type="primary"--> </el-table-column>
<!-- @click="handlePreview(scope.row)">查看--> <el-table-column
<!-- </el-button>--> v-if="this.form.reviseStatus === '3'"
<!-- </template>--> align="center"
<!-- </el-table-column>--> prop="standName"
label="中文名称">
</el-table-column>
<el-table-column
v-if="this.form.reviseStatus === '3'"
align="center"
prop="standStatusShow"
label="文本状态">
</el-table-column>
<el-table-column
v-if="this.form.reviseStatus === '3'"
align="center"
prop="dtqbbhbuss"
label="代替企标编号">
</el-table-column>
<el-table-column
v-if="this.form.reviseStatus === '3'"
align="center"
prop="issueTime"
label="发布日期">
</el-table-column>
<el-table-column
v-if="this.form.reviseStatus === '3'"
align="center"
prop="putTime"
label="实施日期">
</el-table-column>
<!-- <el-table-column-->
<!-- v-if="this.form.reviseStatus === '3'"-->
<!-- align="center"-->
<!-- prop="revisionStatus"-->
<!-- label="企标制修订状态">-->
<!-- </el-table-column>-->
<!-- <el-table-column label="操作" align="center" width="80">-->
<!-- <template slot-scope="scope">-->
<!-- <el-button :disabled="disabledXX" -->
<!-- class="opera-btn"-->
<!-- size="mini"-->
<!-- type="primary"-->
<!-- @click="handlePreview(scope.row)">查看-->
<!-- </el-button>-->
<!-- </template>-->
<!-- </el-table-column>-->
</el-table> </el-table>
</div> </div>
<pagination <pagination
@@ -1110,21 +1197,21 @@
:nodeKey="nodeKeyModel" @popoverHide="popoverCarHideModel" :nodeKey="nodeKeyModel" @popoverHide="popoverCarHideModel"
@popoverHideCancel="popoverCarHideModelCancel()"></tree-select-module> @popoverHideCancel="popoverCarHideModelCancel()"></tree-select-module>
<loading :loading="ccc">加载数据</loading> <loading :loading="ccc">加载数据</loading>
</div> </div>
</template> </template>
<script> <script>
import ProcessHeader from '../../components/ProcessHeader' import ProcessHeader from '../../components/ProcessHeader'
import ProcessFooter from '../../components/ProcessFooter' import ProcessFooter from '../../components/ProcessFooter'
import ProcessTitle from '../../components/ProcessTitle' import ProcessTitle from '../../components/ProcessTitle'
import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,taskDel} from "api/process"; import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,taskDel} from "api/process";
import TreeSelect from '@/components/treeSelect/treeSelect.vue'; import TreeSelect from '@/components/treeSelect/treeSelect.vue';
import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue'; import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
import treeSelectModule from "@/components/treeSelect/treeSelectModule.vue"; import treeSelectModule from "@/components/treeSelect/treeSelectModule.vue";
let Base64 = require('js-base64').Base64; let Base64 = require('js-base64').Base64;
export default { export default {
name: "bussLibrary1", name: "bussLibrary1",
components: { components: {
ProcessHeader, ProcessHeader,
@@ -1221,6 +1308,11 @@
ccc:false, ccc:false,
disabledXX:!!this.$route.query.disabledXX, disabledXX:!!this.$route.query.disabledXX,
bpnId: this.$route.query.bpnId, bpnId: this.$route.query.bpnId,
opinionsStand:[
{value: '1',label: '制定'},
{value: '2',label: '修订'},
{value: '3',label: '修改'},
],
fileList: [], fileList: [],
FBGBUSSFileList: [], FBGBUSSFileList: [],
BZSMBUSSFileList: [], BZSMBUSSFileList: [],
@@ -1246,6 +1338,9 @@
loadSarStandard: false, loadSarStandard: false,
verifySarStandard: true, verifySarStandard: true,
standardSearchForm: { standardSearchForm: {
standName:'',
standCode:'',
QCDW:'',
page: 1, page: 1,
pageSize: this.$store.getters.userInfo.configContent, pageSize: this.$store.getters.userInfo.configContent,
unit: '', unit: '',
@@ -1992,26 +2087,42 @@
// 带入 // 带入
case 2: case 2:
if (this.standardCheckedList.length === 1) { if (this.standardCheckedList.length === 1) {
this.form.standName = this.standardCheckedList[0].esName console.log(this.standardCheckedList);
this.form.standSort = this.standardCheckedList[0].bussSort this.form.standName = this.standardCheckedList[0].esName || this.standardCheckedList[0].standName
this.form.standSort = this.standardCheckedList[0].bussSort || this.standardCheckedList[0].standSort
this.form.planId = this.standardCheckedList[0].id this.form.planId = this.standardCheckedList[0].id
this.form.planStatus = this.standardCheckedList[0].planStatus this.form.planStatus = this.standardCheckedList[0].planStatus
this.form.reviseStatus = this.standardCheckedList[0].reviseStatus this.form.reviseStatus = this.form.reviseStatus === '3'? this.form.reviseStatus :this.standardCheckedList[0].reviseStatus
// 代替企标编号 this.$http.get('lawss/sarBussionessStand/getStandInfoUpdateById', {
this.form.DTQBBHBUSS = this.filterDate(this.standardCheckedList[0].rqbName) id: this.standardCheckedList[0].id
// 标准编号 }, {
this.form.standNum = this.filterDate(this.standardCheckedList[0].standNum) _this: this
// 适用车型 }, res => {
this.form.SYCXCLASS = this.filterObj(this.standardCheckedList[0].area) console.log(res.data);
// 采标程度 this.form.standEnName = res.data.standEnName
this.form.CYCD = this.filterDate(this.standardCheckedList[0].useLevel) this.form.putTime = res.data.putTime
// 采用标准drafter this.form.QCDW = res.data.attrInfoMap.QCDW
this.form.CYBZ = this.filterDate(this.standardCheckedList[0].esStandRelations) this.form.WJSCRYBUSSName = res.data.attrInfoMap.WJSCRYBUSS
// 引用标准 this.form.NYLXCLASS = res.data.attrInfoMap.NYLXCLASS.split(',')
this.form.YYBZ = this.filterDate(this.standardCheckedList[0].esMatingRelations) this.form.SYCXCLASS = res.data.attrInfoMap.SYCXCLASS.split(',')
// 起草人带入 this.form.CYCVPPSBMBUSS = res.data.attrInfoMap.CYCVPPSBMBUSS
this.form.QCRBUSS = this.filterStringDate(this.standardCheckedList[0].drafterName) this.form.KCVPPSBMBUSS = res.data.attrInfoMap.KCVPPSBMBUSS
this.form.QCRBUSSID = this.filterStringDate(this.standardCheckedList[0].drafter) this.form.SYCPXCLASS = res.data.attrInfoMap.SYCPXCLASS.split(',')
this.form.CYCD = res.data.attrInfoMap.CYCD.split(',')
this.form.TXLBBUSS = res.data.attrInfoMap.TXLBBUSS
this.form.QCRBUSS = res.data.attrInfoMap.QCRBUSS
this.form.CYCVPPSCNBUSS = res.data.attrInfoMap.CYCVPPSCNBUSS
this.form.KCVPPSCNBUSS = res.data.attrInfoMap.KCVPPSCNBUSS
this.form.DTQBBHBUSS = res.data.attrInfoMap.DTQBBHBUSS
this.form.CYBZ = res.data.attrInfoMap.CYBZ
this.form.YYBZ = res.data.attrInfoMap.YYBZ
this.form.XCSJBUSS = res.data.attrInfoMap.XCSJBUSS
this.BZSMBUSSFileList=this.assemble(res.data.attrInfoMap.BZSMBUSS.substring(0, res.data.attrInfoMap.BZSMBUSS.lastIndexOf(',')),res.data.attrInfoMap.BZSMBUSSName);
this.FBGBUSSFileList=this.assemble(res.data.attrInfoMap.FBGBUSS.substring(0, res.data.attrInfoMap.FBGBUSS.lastIndexOf(',')),res.data.attrInfoMap.FBGBUSSName);
this.LSBBBUSSFileList=this.assemble(res.data.attrInfoMap.LSBBBUSS.substring(0, res.data.attrInfoMap.LSBBBUSS.lastIndexOf(',')),res.data.attrInfoMap.LSBBBUSSName);
this.QTWJBUSSFileList=this.assemble(res.data.attrInfoMap.QTWJBUSS.substring(0, res.data.attrInfoMap.QTWJBUSS.lastIndexOf(',')),res.data.attrInfoMap.QTWJBUSSName);
this.GLWJBUSSFileList=this.assemble(res.data.attrInfoMap.GLWJBUSS.substring(0, res.data.attrInfoMap.GLWJBUSS.lastIndexOf(',')),res.data.attrInfoMap.GLWJBUSSName);
})
// 起草部门带入 // 起草部门带入
this.form.QCDW = this.filterStringDate(this.standardCheckedList[0].unitName) this.form.QCDW = this.filterStringDate(this.standardCheckedList[0].unitName)
this.form.QCDWID = this.filterStringDate(this.standardCheckedList[0].unit) this.form.QCDWID = this.filterStringDate(this.standardCheckedList[0].unit)
@@ -2117,6 +2228,9 @@
this.standardSearchForm.unit = '' this.standardSearchForm.unit = ''
this.standardSearchForm.esName = '' this.standardSearchForm.esName = ''
this.standardSearchForm.planStatus = '0,3,6' this.standardSearchForm.planStatus = '0,3,6'
this.standardSearchForm.standCode = ''
this.standardSearchForm.standName = ''
this.standardSearchForm.QCDW = ''
this.standardSearchForm.reviseStatus = '' this.standardSearchForm.reviseStatus = ''
setTimeout(() => { setTimeout(() => {
this.handleSearchStandard() this.handleSearchStandard()
@@ -2130,8 +2244,25 @@
done() done()
}, },
getDomesticStandardTable () { getDomesticStandardTable () {
console.log(this.form.reviseStatus);
this.loadSarStandard = true this.loadSarStandard = true
this.$http.post('esRevisePlan/es-revise-plan/queryAllPlans', this.standardSearchForm, { let url = ''
let userInfo;
userInfo = JSON.parse(localStorage.getItem('userInfo'));
if(this.form.reviseStatus === '3'){
url = 'lawss/sarBussionessStand/getSarBussionStandPage'
}else{
url = 'esRevisePlan/es-revise-plan/queryAllPlans'
}
this.standardSearchForm = {...this.standardSearchForm}
if(this.form.reviseStatus === '3'){
this.standardSearchForm.userId = userInfo.userId
this.standardSearchForm.isKu = 1
this.standardSearchForm.vaildFlag = 0
delete this.standardSearchForm.planStatus
}
if(this.form.reviseStatus === '3'){
this.$http.get(url, this.standardSearchForm, {
_this: this _this: this
}, res => { }, res => {
this.loadSarStandard = false this.loadSarStandard = false
@@ -2142,8 +2273,25 @@
}, e => { }, e => {
this.loadSarStandard = false this.loadSarStandard = false
}) })
}else{
this.$http.post(url, this.standardSearchForm, {
_this: this
}, res => {
this.loadSarStandard = false
if (res.ok) {
this.tableData.standardData = res.data.list
this.tableCount = res.data.count
}
}, e => {
this.loadSarStandard = false
})
}
}, },
handleSearchStandard () { handleSearchStandard () {
if(!this.form.reviseStatus){
this.$message.warning('请先选择制修订类型')
}else {
this.tableData.standardData = []
this.standardDrawer = true this.standardDrawer = true
this.$nextTick(() => { this.$nextTick(() => {
// 动态设置表格高度 // 动态设置表格高度
@@ -2153,6 +2301,7 @@
} }
}) })
this.getDomesticStandardTable() this.getDomesticStandardTable()
}
}, },
saveUserInfo () { saveUserInfo () {
this.filterText = '' this.filterText = ''
@@ -2953,6 +3102,11 @@
json.applyUpdUserId = this.form.applyUpdUserId json.applyUpdUserId = this.form.applyUpdUserId
json.prcCreateUser = this.form.prcCreateUser json.prcCreateUser = this.form.prcCreateUser
json.prcCreateUserName = this.form.prcCreateUserName json.prcCreateUserName = this.form.prcCreateUserName
if(this.form.reviseStatus == '3'){
json.standCode = this.standardCheckedList[0].standCode
json.id = this.standardCheckedList[0].id
}
this.$http.post('lawss/activiti/startProcessRollBack', { this.$http.post('lawss/activiti/startProcessRollBack', {
createUser: this.$store.getters.userInfo.userId, createUser: this.$store.getters.userInfo.userId,
createUserName: this.$store.getters.userInfo.userName, createUserName: this.$store.getters.userInfo.userName,
@@ -3045,6 +3199,9 @@
mounted () { mounted () {
this.getTaskId() this.getTaskId()
this.getTree() this.getTree()
if(this.$route.query){
this.form.reviseStatus = this.$route.query.reviseStatus
}
this.$http.get('sys/dictype/getDicTypeListCode', '', { this.$http.get('sys/dictype/getDicTypeListCode', '', {
_this: this _this: this
}, res => { }, res => {
@@ -3077,18 +3234,18 @@
}) })
} }
} }
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
@import '~@/assets/styles/style'; @import '~@/assets/styles/style';
/deep/ .fileClass{ /deep/ .fileClass{
line-height: 22px !important; line-height: 22px !important;
} }
/deep/ #active2 .el-form-item__content{ /deep/ #active2 .el-form-item__content{
margin-left: 0px !important; margin-left: 0px !important;
} }
.bzrkStep1 { .bzrkStep1 {
/deep/.el-drawer__container { /deep/.el-drawer__container {
.prc-content-border { .prc-content-border {
border: none; border: none;
@@ -3137,8 +3294,8 @@
} }
} }
} }
} }
.standard-content { .standard-content {
height: 100%; height: 100%;
padding: 10px 0 0; padding: 10px 0 0;
.content { .content {
@@ -3157,5 +3314,5 @@
} }
} }
} }
} }
</style> </style>
src/pages/processCenter/pages/creatProcess/qbrk/step13.vue
+5 -1
View File
@@ -2683,6 +2683,7 @@
*/ */
getFormFieldList (item) { getFormFieldList (item) {
this.$nextTick(() => { this.$nextTick(() => {
console.log(item);
this.form = JSON.parse(JSON.stringify(item)) this.form = JSON.parse(JSON.stringify(item))
this.form.topId = this.pId this.form.topId = this.pId
this.form.prcNum = this.prcNum this.form.prcNum = this.prcNum
@@ -2801,7 +2802,10 @@
this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
} }
this.formKey++ this.formKey++
}else { } else if(this.form.reviseStatus === '3'){
this.form.standCode = this.form.standCode
this.formKey++
} else {
this.$http.get('lawss/sarBussionessStand/getStandInfoByReviseStatus',{reviseStatus:'buss1_'+this.form.reviseStatus,standSort:this.form.standSort,taskId: this.taskIds}, { this.$http.get('lawss/sarBussionessStand/getStandInfoByReviseStatus',{reviseStatus:'buss1_'+this.form.reviseStatus,standSort:this.form.standSort,taskId: this.taskIds}, {
_this: this _this: this
}, res => { }, res => {
src/pages/processCenter/pages/creatProcess/qbrk/step7.vue
+1
View File
@@ -2488,6 +2488,7 @@
} }
}) })
}else{ }else{
this.$message.warning('请确认审批意见是否填写完整')
} }
}) })
}, },
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue
+14 -16
View File
@@ -403,16 +403,14 @@ export default {
}) })
}, },
methods: { methods: {
validateForm () { validateForm (callback) {
let flag = null
this.$refs['qbfsForm'].validate((valid) => { this.$refs['qbfsForm'].validate((valid) => {
if (valid) { if (valid) {
flag = true callback && callback()
} else { } else{
flag = false this.$message.warning("请完善基础信息");
} }
}) })
return flag
}, },
choiceShow(){ choiceShow(){
this.getStandDataBtn() this.getStandDataBtn()
@@ -423,22 +421,22 @@ export default {
this.$http.post('esRevisePlan/es-revise-plan/queryAllPlans',{ this.$http.post('esRevisePlan/es-revise-plan/queryAllPlans',{
reviseStatus: this.standardSearch.reviseStatus || '', reviseStatus: this.standardSearch.reviseStatus || '',
esName: this.standardSearch.standName, esName: this.standardSearch.standName,
planStatus: '0', planStatus: '1,2,3,6',
page: this.page, page: this.page,
pageSize: this.pageSize, pageSize: this.pageSize,
}, { }, {
_this: this, _this: this,
}, res => { }, res => {
this.standinfoList = [] this.standinfoList = res.data.list
//展示的数据只能是未开始的 //展示的数据只能是未开始的
res.data.list.forEach(item => { // res.data.list.forEach(item => {
if(item.planStatus === '0'){ // if(item.planStatus === '0'){
if(item.isRelate && item.isRelate === 'null'){ // if(item.isRelate && item.isRelate === 'null'){
item.isRelate = "" // item.isRelate = ""
} // }
this.standinfoList.push(item) // this.standinfoList.push(item)
} // }
}) // })
this.total = this.standinfoList.length this.total = this.standinfoList.length
}) })
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue
+13 -13
View File
@@ -425,16 +425,14 @@ export default {
}) })
}, },
methods: { methods: {
validateForm () { validateForm (callback) {
let flag = null
this.$refs['qbfsForm'].validate((valid) => { this.$refs['qbfsForm'].validate((valid) => {
if (valid) { if (valid) {
flag = true callback && callback()
} else { } else{
flag = false this.$message.warning("请完善基础信息");
} }
}) })
return flag
}, },
choiceShow(){ choiceShow(){
this.getStandDataBtn() this.getStandDataBtn()
@@ -445,19 +443,19 @@ export default {
this.$http.post('esRevisePlan/es-revise-plan/queryAllPlans',{ this.$http.post('esRevisePlan/es-revise-plan/queryAllPlans',{
reviseStatus: this.standardSearch.reviseStatus || '', reviseStatus: this.standardSearch.reviseStatus || '',
esName: this.standardSearch.standName, esName: this.standardSearch.standName,
planStatus: '0', planStatus: '1,2,3,6',
page: this.page, page: this.page,
pageSize: this.pageSize, pageSize: this.pageSize,
}, { }, {
_this: this, _this: this,
}, res => { }, res => {
this.standinfoList = [] this.standinfoList = res.data.list
//展示的数据只能是未开始的 //展示的数据只能是未开始的
res.data.list.forEach(item => { // res.data.list.forEach(item => {
if(item.planStatus === '0'){ // if(item.planStatus === '0'){
this.standinfoList.push(item) // this.standinfoList.push(item)
} // }
}) // })
this.total = this.standinfoList.length this.total = this.standinfoList.length
}) })
@@ -501,7 +499,9 @@ export default {
} }
this.qbfsForm.rqbName = this.selectList[0].rqbName this.qbfsForm.rqbName = this.selectList[0].rqbName
this.qbfsForm.tsJsonName = this.selectList[0].tsJsonName this.qbfsForm.tsJsonName = this.selectList[0].tsJsonName
if(this.qbfsForm.isRelate){
this.qbfsForm.isRelate = this.selectList[0].isRelate.indexOf("null") !== -1 ? "":this.selectList[0].isRelate this.qbfsForm.isRelate = this.selectList[0].isRelate.indexOf("null") !== -1 ? "":this.selectList[0].isRelate
}
this.qbfsForm.useLevel = this.selectList[0].useLevel this.qbfsForm.useLevel = this.selectList[0].useLevel
this.qbfsForm.esStandRelations = this.selectList[0].esStandRelations this.qbfsForm.esStandRelations = this.selectList[0].esStandRelations
this.qbfsForm.technologic = this.selectList[0].technologic this.qbfsForm.technologic = this.selectList[0].technologic
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue
+6 -9
View File
@@ -431,8 +431,8 @@ export default {
props: ['message'], props: ['message'],
data(){ data(){
const validateFsOnlineFile = async (rule, value, callback) => { const validateFsOnlineFile = async (rule, value, callback) => {
if(this.qbfsForm.FSD){ if(this.qbfsForm.LXD){
let fileObj = await this.processEditFile(this.qbfsForm.FSD) let fileObj = await this.processEditFile(this.qbfsForm.LXD)
if (fileObj) { if (fileObj) {
const editFileInfo = fileObj const editFileInfo = fileObj
if (editFileInfo && editFileInfo.editStatus === '1') { if (editFileInfo && editFileInfo.editStatus === '1') {
@@ -446,7 +446,6 @@ export default {
} }
}; };
const standNameVerify = async (rule, value, callback) => { const standNameVerify = async (rule, value, callback) => {
debugger
if (value === '' || value === null) { if (value === '' || value === null) {
return callback(new Error('请输入企标名称')) return callback(new Error('请输入企标名称'))
} else { } else {
@@ -1021,16 +1020,14 @@ export default {
this.$refs.qbfsForm.validateField('resPersonName'); this.$refs.qbfsForm.validateField('resPersonName');
} }
}, },
validateForm () { validateForm (callback) {
let flag = null
this.$refs['qbfsForm'].validate((valid) => { this.$refs['qbfsForm'].validate((valid) => {
if (valid) { if (valid) {
flag = true callback && callback()
} else { } else{
flag = false this.$message.warning("请完善基础信息");
} }
}) })
return flag
} }
}, },
}; };
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue
+13 -14
View File
@@ -1021,16 +1021,14 @@ export default {
this.$refs.qbfsForm.validateField('resPersonName'); this.$refs.qbfsForm.validateField('resPersonName');
} }
}, },
validateForm () { validateForm (callback) {
let flag = null
this.$refs['qbfsForm'].validate((valid) => { this.$refs['qbfsForm'].validate((valid) => {
if (valid) { if (valid) {
flag = true callback && callback()
} else { } else{
flag = false this.$message.warning("请完善基础信息");
} }
}) })
return flag
}, },
choiceShow(){ choiceShow(){
this.showType = 'one' this.showType = 'one'
@@ -1081,19 +1079,20 @@ export default {
this.$http.post('esRevisePlan/es-revise-plan/queryAllPlans',{ this.$http.post('esRevisePlan/es-revise-plan/queryAllPlans',{
reviseStatus: this.standardSearch.reviseStatus || '', reviseStatus: this.standardSearch.reviseStatus || '',
esName: this.standardSearch.standName, esName: this.standardSearch.standName,
planStatus: '0', planStatus: '1,2,3,6',
page: this.page, page: this.page,
pageSize: this.pageSize, pageSize: this.pageSize,
}, { }, {
_this: this, _this: this,
}, res => { }, res => {
this.standinfoList = [] this.standinfoList = res.data.list
//展示的数据只能是未开始的 // this.standinfoList = []
res.data.list.forEach(item => { // //展示的数据只能是未开始的
if(item.planStatus === '0'){ // res.data.list.forEach(item => {
this.standinfoList.push(item) // if(item.planStatus === '0'){
} // this.standinfoList.push(item)
}) // }
// })
this.total = this.standinfoList.length this.total = this.standinfoList.length
this.replaceLoading = false this.replaceLoading = false
}) })
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue
+5 -7
View File
@@ -412,16 +412,14 @@ export default {
}) })
}, },
methods: { methods: {
validateForm () { validateForm (callback) {
let flag = null
this.$refs['qbfsForm'].validate((valid) => { this.$refs['qbfsForm'].validate((valid) => {
if (valid) { if (valid) {
flag = true callback && callback()
} else { } else{
flag = false this.$message.warning("请完善基础信息");
} }
}) })
return flag
}, },
choiceShow(){ choiceShow(){
this.getStandDataBtn() this.getStandDataBtn()
@@ -432,7 +430,7 @@ export default {
this.$http.post('esRevisePlan/es-revise-plan/queryAllPlans',{ this.$http.post('esRevisePlan/es-revise-plan/queryAllPlans',{
reviseStatus: this.standardSearch.reviseStatus || '', reviseStatus: this.standardSearch.reviseStatus || '',
esName: this.standardSearch.standName, esName: this.standardSearch.standName,
planStatus: '0', planStatus: '1,2,3,6',
page: this.page, page: this.page,
pageSize: this.pageSize, pageSize: this.pageSize,
}, { }, {
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue
+88 -35
View File
@@ -95,7 +95,7 @@
<el-card> <el-card>
<el-form-item prop="countersignerName" style="margin-bottom: 0"> <el-form-item prop="countersignerName" style="margin-bottom: 0">
<h4>创新技术委员会成员/标准体系工作组成员(必选)</h4> <h4>创新技术委员会成员/标准体系工作组成员(必选)</h4>
<h4>二级研发(部所所长、总工、中心主任/研究院院长)(必选)</h4> <h4>二级研发(部所所长、总工、中心主任/研究院院长)(可选)</h4>
<h4>质量相关人员(可选)</h4> <h4>质量相关人员(可选)</h4>
<h4>制造部相关人员(可选)</h4> <h4>制造部相关人员(可选)</h4>
<h4>采购部相关人员(可选)</h4> <h4>采购部相关人员(可选)</h4>
@@ -127,30 +127,30 @@
:color="roleForm.approver ? '#66b1ff' : ''"> :color="roleForm.approver ? '#66b1ff' : ''">
<el-card> <el-card>
<el-form-item prop="approverName" style="margin-bottom: 0"> <el-form-item prop="approverName" style="margin-bottom: 0">
<h4>总院技术委员会覆盖领域企业标准：专委会主任/总院技术委员会未覆盖领域企业标准：总院院长或总院主管副院长</h4> <h4>标准法规部高级经理</h4>
<div style="margin-top: 10px;width: 300px;"> <div style="margin-top: 10px;width: 300px;">
<el-input :disabled="disabledXX" v-model="roleForm.approver" style="display: none;"></el-input> <el-input :disabled="disabledXX" v-model="roleForm.approver" style="display: none;"></el-input>
<el-input :disabled="disabledXX" v-model="roleForm.approverName" readonly placeholder="选择总院技术委员会覆盖领域企业标准：专委会主任/总院技术委员会未覆盖领域企业标准：总院院长或总院主管副院长" <el-input :disabled="disabledXX" v-model="roleForm.approverName" readonly placeholder="选择标准法规部高级经理"
@click.native="choiceZRR('approver', '选择总院技术委员会覆盖领域企业标准：专委会主任/总院技术委员会未覆盖领域企业标准：总院院长或总院主管副院长', roleForm.approver)"> @click.native="choiceZRR('approver', '选择标准法规部高级经理', roleForm.approver)">
</el-input>
</div>
</el-form-item>
</el-card>
</el-timeline-item>
<el-timeline-item timestamp="抄送" placement="top"
:color="roleForm.engineer ? '#66b1ff' : ''">
<el-card>
<el-form-item prop="engineerName" style="margin-bottom: 0">
<h4>相关单位、工程研究总院标准法规部</h4>
<div style="margin-top: 10px;width: 300px;">
<el-input :disabled="disabledXX" v-model="roleForm.engineer" style="display: none;"></el-input>
<el-input :disabled="disabledXX" v-model="roleForm.engineerName" readonly placeholder="选择相关单位、工程研究总院标准法规部"
@click.native="choiceZRR('engineer', '选择相关单位、工程研究总院标准法规部', roleForm.engineer)">
</el-input> </el-input>
</div> </div>
</el-form-item> </el-form-item>
</el-card> </el-card>
</el-timeline-item> </el-timeline-item>
<!-- <el-timeline-item timestamp="抄送" placement="top"-->
<!-- :color="roleForm.engineer ? '#66b1ff' : ''">-->
<!-- <el-card>-->
<!-- <el-form-item prop="engineerName" style="margin-bottom: 0">-->
<!-- <h4>相关单位、工程研究总院标准法规部</h4>-->
<!-- <div style="margin-top: 10px;width: 300px;">-->
<!-- <el-input :disabled="disabledXX" v-model="roleForm.engineer" style="display: none;"></el-input>-->
<!-- <el-input :disabled="disabledXX" v-model="roleForm.engineerName" readonly placeholder="选择相关单位、工程研究总院标准法规部"-->
<!-- @click.native="choiceZRR('engineer', '选择相关单位、工程研究总院标准法规部', roleForm.engineer)">-->
<!-- </el-input>-->
<!-- </div>-->
<!-- </el-form-item>-->
<!-- </el-card>-->
<!-- </el-timeline-item>-->
</el-form> </el-form>
</el-timeline> </el-timeline>
</div> </div>
@@ -527,13 +527,13 @@ export default {
this.$message.warning('企标名称已存在,请更改!') this.$message.warning('企标名称已存在,请更改!')
}else { }else {
if (this.$route.query.prcNum === undefined) { if (this.$route.query.prcNum === undefined) {
let flag = this.$refs["childForm"].validateForm(); this.$refs["childForm"].validateForm(()=>{
let qbzxdFrom = this.$refs["childForm"].qbfsForm; let qbzxdFrom = this.$refs["childForm"].qbfsForm;
if (flag) {
this.$refs["roleForm"].validate((valid) => { this.$refs["roleForm"].validate((valid) => {
if (valid) { if (valid) {
this.isSubmit = true; this.isSubmit = true;
qbzxdFrom.commentText = this.commentText; qbzxdFrom.commentText = this.commentText;
qbzxdFrom.addFlag = '0'
let json = Object.assign(qbzxdFrom, this.roleForm); let json = Object.assign(qbzxdFrom, this.roleForm);
this.$http.post("lawss/activiti/startProcessRollBack", { this.$http.post("lawss/activiti/startProcessRollBack", {
createUser: this.$store.getters.userInfo.userId, createUser: this.$store.getters.userInfo.userId,
@@ -557,7 +557,64 @@ export default {
}, res => { }, res => {
if (res.success) { if (res.success) {
this.$message.success(res.message); this.$message.success(res.message);
this.addLog(qbzxdFrom) // 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.$message.warning("请完善人员信息");
}
});
});
// if (flag) {
//
// } else {
// this.$message.warning("请完善基础信息");
// }
} else {
let flag = this.$refs["childForm"].validateForm(() => {
let qbzxdFrom = this.$refs["childForm"].qbfsForm;
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) { if (this.bpnId !== '' && this.bpnId !== undefined) {
let taskId = { let taskId = {
id: this.bpnId id: this.bpnId
@@ -573,21 +630,12 @@ export default {
}); });
} }
}); });
} else { }else {
this.$message.warning("请完善人员信息");
}
});
} else {
this.$message.warning("请完善基础信息");
}
} else {
let flag = this.$refs["childForm"].validateForm();
let qbzxdFrom = this.$refs["childForm"].qbfsForm;
if (flag) {
this.$refs["roleForm"].validate((valid) => { this.$refs["roleForm"].validate((valid) => {
if (valid) { if (valid) {
this.isSubmit = true; this.isSubmit = true;
qbzxdFrom.commentText = this.commentText; qbzxdFrom.commentText = this.commentText;
qbzxdFrom.addFlag = '0'
var json = Object.assign(qbzxdFrom, this.roleForm); var json = Object.assign(qbzxdFrom, this.roleForm);
this.$http.post("lawss/activiti/completeTask", { this.$http.post("lawss/activiti/completeTask", {
taskIds: this.$route.query.taskIds, taskIds: this.$route.query.taskIds,
@@ -599,7 +647,7 @@ export default {
if (res.success) { if (res.success) {
this.$message.success(res.message); this.$message.success(res.message);
this.isSubmit = false; this.isSubmit = false;
this.addLog(qbzxdFrom) // this.addLog(qbzxdFrom)
this.$router.push({ path: "/processCenter?tabsName=ProcessCenter" }); this.$router.push({ path: "/processCenter?tabsName=ProcessCenter" });
} }
}); });
@@ -607,9 +655,14 @@ export default {
this.$message.warning("请完善人员信息"); this.$message.warning("请完善人员信息");
} }
}); });
} else {
this.$message.warning("请完善基础信息");
} }
});
// if (flag) {
//
// } else {
// this.$message.warning("请完善基础信息");
// }
} }
} }
}, },
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue
+10
View File
@@ -527,6 +527,7 @@ export default {
_this: this _this: this
}, res => { }, res => {
if (res.success) { if (res.success) {
this.addLog(this.qbfsForm)
this.$message.success(res.message) this.$message.success(res.message)
this.$router.push('/processCenter') this.$router.push('/processCenter')
} }
@@ -534,6 +535,15 @@ export default {
}, e => { }, e => {
}); });
}, },
addLog(qbzxdFrom){
let json = Object.assign(qbzxdFrom);
this.$http.post("esRevisePlanLog/log/addLog", {
json: JSON.stringify(json)
}, {
_this: this
}, res => {
});
},
beforeBack(){ beforeBack(){
if(!this.commentText){ if(!this.commentText){
this.$message.warning('请填写审批意见') this.$message.warning('请填写审批意见')
src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue
+12 -2
View File
@@ -693,26 +693,36 @@ export default {
choiceZRRS(type) { choiceZRRS(type) {
this.roleType = type this.roleType = type
if(type === '1' ){ if(type === '1' ){
this.drawerTitle2 = '请选择起草人' this.drawerTitle = '请选择起草人'
this.nodeList2 = []; this.nodeList2 = [];
if (this.addQblxData.drafter !== undefined) { if (this.addQblxData.drafter !== undefined) {
this.nodeList2 = this.addQblxData.drafter.split(","); this.nodeList2 = this.addQblxData.drafter.split(",");
} }
this.modalshowflag = true;
}else if(type === '2'){ }else if(type === '2'){
this.drawerTitle2 = '请选择评审责任人' this.drawerTitle2 = '请选择评审责任人'
this.nodeList2 = []; this.nodeList2 = [];
if (this.addQblxData.resPerson !== undefined) { if (this.addQblxData.resPerson !== undefined) {
this.nodeList2 = this.addQblxData.resPerson.split(","); this.nodeList2 = this.addQblxData.resPerson.split(",");
} }
}
this.modalshowflag2 = true; this.modalshowflag2 = true;
}
}, },
checkedRole(data) { checkedRole(data) {
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, 'wgLeader', data[0].id)
this.$set(this.addQblxData, 'wgLeaderName', data[0].name) this.$set(this.addQblxData, 'wgLeaderName', data[0].name)
}
if(this.addQblxData.wgLeaderName){ if(this.addQblxData.wgLeaderName){
this.$refs.qblx_pageData.validateField('wgLeaderName') this.$refs.qblx_pageData.validateField('wgLeaderName')
} }
if(this.addQblxData.drafterName){
this.$refs.qblx_pageData.validateField('drafterName');
}
this.modalshowflag = false; this.modalshowflag = false;
}, },
checkedRole2(data) { checkedRole2(data) {
src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue
+28 -20
View File
@@ -125,7 +125,7 @@
placeholder="请选择立项完成时间"> placeholder="请选择立项完成时间">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item prop="tsJson" label="体系结构" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled"> <el-form-item prop="tsJsonName" label="体系结构" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
<el-input <el-input
style="display: none;" style="display: none;"
v-model="qbfsForm.tsJson"> v-model="qbfsForm.tsJson">
@@ -193,19 +193,19 @@
v-model="qbfsForm.esMatingRelations" v-model="qbfsForm.esMatingRelations"
></custom-input-for-all-standards2> ></custom-input-for-all-standards2>
</template> </template>
<!-- <el-form-item label="立项原因" style="width: 100%; margin-right:10px" prop="newReason" class="add-form-item form-item-disabled">--> <!-- <el-form-item label="立项原因" style="width: 100%; margin-right:10px" prop="newReason" class="add-form-item form-item-disabled">-->
<!-- <el-input--> <!-- <el-input-->
<!-- type="textarea"--> <!-- type="textarea"-->
<!-- v-model="qbfsForm.newReason"--> <!-- v-model="qbfsForm.newReason"-->
<!-- placeholder="请输入立项原因"--> <!-- placeholder="请输入立项原因"-->
<!-- :maxlength="500"/>--> <!-- :maxlength="500"/>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<el-form-item label="立项单" prop="LXDName" class="add-form-item form-item-disabled"> <el-form-item label="立项单" prop="LXDName" class="add-form-item form-item-disabled">
<div v-if="LXDList.length > 0" v-for="(item,index) in LXDList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass"> <div v-if="LXDList.length > 0" v-for="(item,index) in LXDList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
<span style="width: 80%;" @click="handleFilePreview(item,'preview')">{{ item.name }}</span> <span style="width: 80%;" @click="handleFilePreview(item,'preview')">{{ item.name }}</span>
<!-- <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">--> <!-- <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">-->
<!-- <el-button type="primary" size="mini" plain icon="el-icon-download" @click="handleFilePreview(item,'down')"></el-button>--> <!-- <el-button type="primary" size="mini" plain icon="el-icon-download" @click="handleFilePreview(item,'down')"></el-button>-->
<!-- </span>--> <!-- </span>-->
<span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''"> <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
<el-button type="primary" size="mini" plain icon="el-icon-edit" @click="handleFilePreview(item,'onlineEdit')"></el-button> <el-button type="primary" size="mini" plain icon="el-icon-edit" @click="handleFilePreview(item,'onlineEdit')"></el-button>
</span> </span>
@@ -558,6 +558,12 @@
@checkedRole="checkedRolePeoples" @checkedRole="checkedRolePeoples"
:nodeList="nodeList2" :nodeList="nodeList2"
></Role-tree> ></Role-tree>
<Mechanism-tree v-if="!disabledXX"
is-title="选择起草责任单位"
:is-visible.sync="modalshowflagZRBM"
:nodeList="nodeListZRBM"
@checkedRole="drawerCheckZRBM"
/>
<!-- 单选人--> <!-- 单选人-->
<Role-tree <Role-tree
check-box check-box
@@ -757,7 +763,7 @@ export default {
endTime: [ endTime: [
{ required: true, message: "请选择立项完成时间", trigger: "change" } { required: true, message: "请选择立项完成时间", trigger: "change" }
], ],
tsJson: [ tsJsonName: [
{ required: true, message: "请选择体系结构", trigger: "change" } { required: true, message: "请选择体系结构", trigger: "change" }
], ],
area: [ area: [
@@ -842,12 +848,13 @@ export default {
if (res.success) { if (res.success) {
const _formData = new FormData() const _formData = new FormData()
_formData.append('infoJson', JSON.stringify(this.qbfsForm)) _formData.append('infoJson', JSON.stringify(this.qbfsForm))
processCreatePlan(_formData).then(res => { // processCreatePlan(_formData).then(res => {
this.qbfsForm.planId = res.data // this.qbfsForm.planId = res.data
if (res.code === '200' || res.message === '入库成功'){ // if (res.code === '200' || res.message === '入库成功'){
this.isSubmit = true; this.isSubmit = true;
this.qbfsForm.type = '5' this.qbfsForm.type = '5'
this.qbfsForm.commentText = this.commentText; this.qbfsForm.commentText = this.commentText;
this.qbfsForm.addFlag = '0'
let json = Object.assign(this.qbfsForm, this.roleForm); let json = Object.assign(this.qbfsForm, this.roleForm);
this.$http.post("lawss/activiti/startProcessRollBack", { this.$http.post("lawss/activiti/startProcessRollBack", {
createUser: this.$store.getters.userInfo.userId, createUser: this.$store.getters.userInfo.userId,
@@ -870,7 +877,7 @@ export default {
_this: this _this: this
}, res => { }, res => {
if (res.success) { if (res.success) {
this.$message.success("企标制修订立项计划-立项已完成"); this.$message.success("提交成功");
if (this.bpnId !== '') { if (this.bpnId !== '') {
let taskId = { let taskId = {
id: this.bpnId id: this.bpnId
@@ -879,16 +886,16 @@ export default {
return res return res
}) })
} }
this.isSubmit = false;
this.$router.push({ path: "/processCenter?tabsName=ProcessCenter" }); this.$router.push({ path: "/processCenter?tabsName=ProcessCenter" });
// this.isSubmit = false;
} }
}); });
} }
}); });
// }
// })
} }
}) // this.isSubmit = false
}
this.isSubmit = false
}, e => { }, e => {
}); });
} else { } else {
@@ -1205,6 +1212,7 @@ export default {
this.QYBZget() this.QYBZget()
}, },
choiceZRBM(type, title, id) { choiceZRBM(type, title, id) {
console.log(1);
this.nodeListZRBM = [] this.nodeListZRBM = []
this.nodeListZRBM.push(id) this.nodeListZRBM.push(id)
this.drawerTitle = title this.drawerTitle = title
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-input v-model="listForm.projectName" clearable disabled placeholder="请输入项目名称"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="截止日期" prop="endTime" class="add-form-item form-item-disabled"> <el-form-item label="截止日期" prop="endTime" class="add-form-item form-item-disabled">
<!-- :picker-options="pickerOptions"-->
<el-date-picker <el-date-picker
:picker-options="pickerOptions"
v-model="listForm.endTime" v-model="listForm.endTime"
type="date" type="date"
placeholder="请选择截止日期" placeholder="请选择截止日期"
@@ -458,6 +459,11 @@ export default {
this.listForm.children = dataListChildren; this.listForm.children = dataListChildren;
this.listForm.dataList = this.dataList; this.listForm.dataList = this.dataList;
const json = JSON.stringify(this.listForm); const json = JSON.stringify(this.listForm);
if(this.nodeList.length == 0){
this.$message.warning('请先分发责任人')
this.isSubmit = false;
return
}
this.$http.post("lawss/activiti/completeTask", { this.$http.post("lawss/activiti/completeTask", {
taskIds: this.taskIds, taskIds: this.taskIds,
userId: this.userId, userId: this.userId,
src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue
+7
View File
@@ -391,6 +391,7 @@ export default {
}, },
//提交事件 //提交事件
handleSubmit() { handleSubmit() {
debugger
let dataChildren = []; let dataChildren = [];
let dataListChildren = []; let dataListChildren = [];
this.dataList.forEach(item => { this.dataList.forEach(item => {
@@ -404,6 +405,8 @@ export default {
this.listForm.children = dataListChildren; this.listForm.children = dataListChildren;
this.listForm.dataList = this.dataList; this.listForm.dataList = this.dataList;
const json = JSON.stringify(this.listForm); const json = JSON.stringify(this.listForm);
// this.$refs['listForm'].validate((valid) => {
// if (valid) {
this.$http.post("lawss/activiti/completeTask", { this.$http.post("lawss/activiti/completeTask", {
taskIds: this.taskIds, taskIds: this.taskIds,
userId: this.userId, userId: this.userId,
@@ -418,6 +421,10 @@ export default {
this.isSubmit = false; this.isSubmit = false;
}, e => { }, e => {
}); });
// }else {
// this.$message.warning('请确认复审评分是否填写完整')
// }
// })
}, },
//批量分发按钮 //批量分发按钮
choiceZRRS(row, type, index) { choiceZRRS(row, type, index) {
src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue
+16 -2
View File
@@ -437,6 +437,18 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </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-form-item class="search-item btn-box">
<el-button :disabled="disabledXX" <el-button :disabled="disabledXX"
size="small" size="small"
@@ -863,7 +875,8 @@ export default {
projectName: "", projectName: "",
managementHostName: "", //管理主体 managementHostName: "", //管理主体
developmentHostName: "", //开发主体 developmentHostName: "", //开发主体
categoryName: "" //项目细分类 categoryName: "", //项目细分类
carType: ""
}, },
qdform: { qdform: {
projectId:"", projectId:"",
@@ -1027,6 +1040,7 @@ export default {
this.handleSelectForm.standNumber = '' this.handleSelectForm.standNumber = ''
this.handleSelectForm.lawsNumber = '' this.handleSelectForm.lawsNumber = ''
this.handleSelectForm.standCode = '' this.handleSelectForm.standCode = ''
this.handleSelectForm.applyArctic = ''
//清空标准名称/政策名称的查询 //清空标准名称/政策名称的查询
this.handleSelectForm.lawName = '' this.handleSelectForm.lawName = ''
this.handleSelectForm.standName = '' this.handleSelectForm.standName = ''
@@ -1409,7 +1423,7 @@ export default {
} }
}); });
} else { } else {
return this.$message.warning("请选择清单"); //return this.$message.warning("请选择清单");
} }
}); });
}, },
src/pages/processCenter/pages/processList/tabComponents/newProcess/index.vue
+4 -1
View File
@@ -429,7 +429,10 @@ export default {
case 'buss1': case 'buss1':
// 企标制修订-技术标准 // 企标制修订-技术标准
this.$router.push({ this.$router.push({
name: 'bussLibrary1' name: 'bussLibrary1',
query:{
reviseStatus:'3'
},
}) })
break break
case 'buss2': case 'buss2':
src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
+26
View File
@@ -729,6 +729,19 @@ export default {
bpnId:row.id 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; break;
case '2': case '2':
@@ -2191,6 +2204,19 @@ export default {
}else if(row.taskInfo === '重新起草') { }else if(row.taskInfo === '重新起草') {
this.$router.push({ this.$router.push({
name: 'qbzxdjhgkStep1', name: 'qbzxdjhgkStep1',
query:{
taskIds: row.taskIds,
prcId: row.prcId,
prcNum: row.prcNum,
prcName: row.prcName,
taskInfo: row.taskInfo,
prcType: row.prcType
}
})
}
else if(row.taskInfo === '技术标准起草') {
this.$router.push({
name: 'qbzxdjhgkStep6',
query:{ query:{
taskIds: row.taskIds, taskIds: row.taskIds,
prcId: row.prcId, prcId: row.prcId,
src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue
+15
View File
@@ -898,6 +898,18 @@ export default {
break break
//企标制修订计划管控 //企标制修订计划管控
case '25': case '25':
if(mes !== null && mes.taskInfo !== null && mes.taskInfo !== undefined) {
if (mes.taskInfo === '技术标准起草'){
this.$router.push({
name: 'qbzxdjhgkStep6',
query: {
type: '25',
processName: '企标制修订计划管控',
bpnId: id,
verifySarStandard: true,
}
})
}else {
this.$router.push({ this.$router.push({
name: 'qbzxdjhgkStep1', name: 'qbzxdjhgkStep1',
query: { query: {
@@ -906,6 +918,9 @@ export default {
bpnId: id bpnId: id
} }
}) })
}
}
break break
//企标制修订立项计划 //企标制修订立项计划
case '26': case '26':
src/pages/regulatoryRepository/dataCenter/index.vue
+109 -26
View File
@@ -63,11 +63,28 @@
<div class="search-area"> <div class="search-area">
<el-form :modal="dataCenterSearch" :inline="true"> <el-form :modal="dataCenterSearch" :inline="true">
<el-form-item label="类型:"> <el-form-item label="类型:">
<el-input <!-- <el-input-->
size="small" <!-- size="small"-->
v-model="dataCenterSearch.dataType" <!-- v-model="dataCenterSearch.dataType"-->
placeholder="请输入类型" <!-- placeholder="请输入类型"-->
></el-input> <!-- ></el-input>-->
<el-select ref="treeSelect" class="tree-select" v-model="dataCenterSearch.treeId" 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> </el-form-item>
<el-form-item label="资料标题:"> <el-form-item label="资料标题:">
<el-input <el-input
@@ -77,16 +94,32 @@
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="上传时间:"> <el-form-item label="上传开始时间:">
<!-- <el-date-picker-->
<!-- v-model="dataCenterSearch.dataUploadTime"-->
<!-- clearable-->
<!-- value-format="yyyy-MM-dd"-->
<!-- size="small"-->
<!-- type="daterange"-->
<!-- range-separator="至"-->
<!-- start-placeholder="开始日期"-->
<!-- end-placeholder="结束日期">-->
<!-- </el-date-picker>-->
<el-date-picker <el-date-picker
v-model="dataCenterSearch.dataUploadTime" v-model="dataCenterSearch.startDataUploadTime"
clearable
value-format="yyyy-MM-dd"
size="small" size="small"
type="daterange" type="date"
range-separator="至" value-format="yyyy-MM-dd"
start-placeholder="开始日期" placeholder="请选择上传开始时间">
end-placeholder="结束日期"> </el-date-picker>
</el-form-item>
<el-form-item label="上传结束时间:">
<el-date-picker
v-model="dataCenterSearch.endDataUploadTime"
size="small"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择上传结束时间">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
@@ -271,11 +304,28 @@
prop="dataType" prop="dataType"
class="add-form-item" class="add-form-item"
> >
<el-input <el-select ref="treeSelect" class="tree-select" v-model="attributeEO.dataType" value-key="id" placeholder="请选择类型">
v-model="attributeEO.dataType" <el-option class="tree-select-option" :value="attributeEO.dataType" :label="attributeEO.dataType">
placeholder="请输入类型" <el-tree
clearable 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>
<el-form-item <el-form-item
label="资料标题" label="资料标题"
@@ -283,6 +333,7 @@
class="add-form-item" class="add-form-item"
> >
<el-input <el-input
class="dataTitle"
v-model="attributeEO.dataTitle" v-model="attributeEO.dataTitle"
placeholder="请输入资料标题" placeholder="请输入资料标题"
clearable clearable
@@ -403,12 +454,14 @@ export default {
dataCenterSearch: { dataCenterSearch: {
dataType: '', dataType: '',
dataTitle: '', dataTitle: '',
treeId: '',
dataUploadTime: [], dataUploadTime: [],
page: 1, page: 1,
pageSize: this.$store.getters.userInfo.configContent, pageSize: this.$store.getters.userInfo.configContent,
total: 0 total: 0
}, },
dataCenterTable: [], dataCenterTable: [],
cbcdOptions: [],
productModelAdd: { productModelAdd: {
name: '', name: '',
parentId: '', parentId: '',
@@ -492,9 +545,29 @@ export default {
this.searchInfo() this.searchInfo()
}, },
selectTreeClick(treeNode) { selectTreeClick(treeNode) {
this.dataCenterSearch.treeId = treeNode.id === '1' ? '' : treeNode.id
this.attributeEO.treeId = treeNode.id === '1' ? '' : treeNode.id this.attributeEO.treeId = treeNode.id === '1' ? '' : treeNode.id
this.attributeEO.treeName = treeNode.name 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) { mouseenter(data) {
@@ -730,12 +803,17 @@ export default {
}, },
searchInfo() { searchInfo() {
this.loading = true this.loading = true
if(this.dataCenterSearch.dataUploadTime && this.dataCenterSearch.dataUploadTime.length !== 0){ // if(this.dataCenterSearch.dataUploadTime && this.dataCenterSearch.dataUploadTime.length !== 0){
this.dataCenterSearch.startDataUploadTime = this.dataCenterSearch.dataUploadTime[0] // this.dataCenterSearch.startDataUploadTime = this.dataCenterSearch.dataUploadTime[0]
this.dataCenterSearch.endDataUploadTime = this.dataCenterSearch.dataUploadTime[1] // this.dataCenterSearch.endDataUploadTime = this.dataCenterSearch.dataUploadTime[1]
}else{ // }else{
this.dataCenterSearch.startDataUploadTime ='' // this.dataCenterSearch.startDataUploadTime =''
this.dataCenterSearch.endDataUploadTime = '' // this.dataCenterSearch.endDataUploadTime = ''
// }
if(this.dataCenterSearch.endDataUploadTime < this.dataCenterSearch.startDataUploadTime){
this.$message.warning('结束时间不能小于开始时间')
this.loading = false
return
} }
this.$http.get('fileMaterialCenter/file-material', this.dataCenterSearch, { this.$http.get('fileMaterialCenter/file-material', this.dataCenterSearch, {
_this: this _this: this
@@ -1032,7 +1110,12 @@ export default {
} }
} }
} }
/deep/.dataTitle .el-input__inner{
width: 560px !important;
}
/deep/.el-input__inner{
width: 180px !important;
}
/deep/ .icon-tree { /deep/ .icon-tree {
margin: 0 5px 0 10px; margin: 0 5px 0 10px;
position: relative; position: relative;
src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+4 -1
View File
@@ -1,4 +1,4 @@
<!--企业标准库--> <!--企业标准库-->
<template> <template>
<div id="EnterpriseStandardDatabase" :class="{ 'tree-close': sideClose }" class="v-class"> <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> </style>
src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue
+35 -3
View File
@@ -11,7 +11,7 @@
<el-option label="修订中" value="2"></el-option> <el-option label="修订中" value="2"></el-option>
<el-option label="已取消" value="3"></el-option> <el-option label="已取消" value="3"></el-option>
<el-option label="已完成" value="4"></el-option> <el-option label="已完成" value="4"></el-option>
<el-option label="立项已完成" value="5"></el-option> <!-- <el-option label="立项已完成" value="5"></el-option>-->
<el-option label="计划已确认" value="6"></el-option> <el-option label="计划已确认" value="6"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
@@ -1220,16 +1220,48 @@
tips = '添加' tips = '添加'
} }
let arr = JSON.parse(JSON.stringify(this.addForm)) let arr = JSON.parse(JSON.stringify(this.addForm))
this.addForm.unitName = arr.unitName
arr.area = arr.area.join(',') arr.area = arr.area.join(',')
this.addForm = {...this.addForm}
this.$http.post(url, this.addForm, { this.$http.post(url, this.addForm, {
_this: this _this: this
}, res => { }, res => {
this.submitLoading = false
if (res.ok) { if (res.ok) {
if (res.data === '操作成功') { if (res.data === '操作成功') {
this.addDrawer = false
this.$message.success(tips + '成功') this.$message.success(tips + '成功')
this.getData() this.getData()
if(this.DrawerType === 'add'){
this.addForm.addFlag = '1'
this.addForm.prcCreateUser = this.$store.getters.userInfo.userId
this.addForm.prcCreateUserName = this.$store.getters.userInfo.userName
this.addForm.nowEsId = res.message
this.addForm.type = '5'
var json = Object.assign(this.addForm)
this.$http.post('lawss/activiti/startProcessRollBack', {
createUser: this.$store.getters.userInfo.userId,
createUserName: this.$store.getters.userInfo.userName,
type: '25',
json: JSON.stringify({
qbfsForm: this.addForm
})
}, {}, 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.submitLoading = false
this.addDrawer = false
// this.$message.success(res.message)
}
})
}
})
}
} else { } else {
this.addDrawer = false this.addDrawer = false
this.$message.warning(res.data) this.$message.warning(res.data)
src/router/index.js
+18
View File
@@ -2137,6 +2137,15 @@ const routes = [
title: '企标复审流程' title: '企标复审流程'
} }
}, },
{
path: '/bussFs7',
name: 'bussFs7',
component: () => import('@/pages/processCenter/pages/creatProcess/qbfs/step7.vue'),
meta: {
requireAuth: true,
title: '企标复审流程'
}
},
//企标复审流程 //企标复审流程
{ {
path: '/qbfsStep1', path: '/qbfsStep1',
@@ -2275,6 +2284,15 @@ const routes = [
title: '企标制修订计划管控流程' title: '企标制修订计划管控流程'
} }
}, },
{
path: '/qbzxdjhgkStep6',
name: 'qbzxdjhgkStep6',
component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue'),
meta: {
requireAuth: true,
title: '企标制修订计划管控流程'
}
},
{ {
path: '/qbzxdjhgkStep1-5', path: '/qbzxdjhgkStep1-5',
name: 'qbzxdjhgkStep1-5', name: 'qbzxdjhgkStep1-5',
src/sysConfig/index.js
+10 -7
View File
@@ -5,12 +5,13 @@
*/ */
// 服务器地址 // 服务器地址
// const devIp = '39.98.140.126' // const devIp = '39.98.140.126'
// const devInterfacePORT = '10005' // const devInterfacePORT = '4202'
// const devIp = '192.168.1.42' // const devIp = '192.168.1.42'
// const devInterfacePORT = '9999' // const devInterfacePORT = '9999'
// const devIp = '39.98.140.126' // const devIp = '10.10.10.46'
// const devInterfacePORT = '4202' // const devInterfacePORT = '4202'
const devIp = '10.0.3.10' // const devIp = '10.0.3.10'
const devIp = 'localhost'
const devInterfacePORT = '10086' const devInterfacePORT = '10086'
// const devIp = '62.234.136.153' // const devIp = '62.234.136.153'
// const devInterfacePORT = '8033' // const devInterfacePORT = '8033'
@@ -22,8 +23,8 @@ const devWebUrl = 'http://62.234.136.153:8038/#/'
const webLoginType = 'dev' const webLoginType = 'dev'
// 配置onlyOffice 前端服务 // 配置onlyOffice 前端服务
// const onlyOfficeUrl = 'http://127.0.0.1:8080' const onlyOfficeUrl = 'http://127.0.0.1:8080'
const onlyOfficeUrl = 'http://10.10.10.46:8103' // const onlyOfficeUrl = 'http://10.10.10.46:8103'
// 云端端口号 // 云端端口号
const DEV_CLOUD_RES_INTERFACE_PORT = '7777' const DEV_CLOUD_RES_INTERFACE_PORT = '7777'
@@ -47,8 +48,10 @@ const processPort = '17210'
*****************************************************************/ *****************************************************************/
// 生产环境配置 // 生产环境配置
const prodIp = '39.98.140.126' // const prodIp = '39.98.140.126'
const prodInterfacePORT = '4201' // const prodInterfacePORT = '4201'
const prodIp = '10.10.10.46'
const prodInterfacePORT = '4202'
// const prodIp = 'slrs.foton.com.cn' // const prodIp = 'slrs.foton.com.cn'
// const prodInterfacePORT = '' // const prodInterfacePORT = ''
yarn.lock
+7081 -7232
View File
File diff suppressed because it is too large Load Diff