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

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
zhutianqi
2021-08-05 18:01:31 +08:00
parent deca70a11f bb761254cc
commit e970a3f211
48 changed files with 1320 additions and 1180 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/components/ProcessFooter.vue
+6 -1
View File
@@ -53,7 +53,7 @@
size="small"
class="common-button-danger"
@click="beforeBack"
:loading="isSubmit"
:loading="isSubmitBack"
v-if="showBack">
<i class="iconfont" style="font-size: 12px;">&#xe615;</i>
{{ backBTNText }}</el-button>
@@ -151,6 +151,11 @@ export default {
type: Boolean,
default: false
},
// 保存按钮loading
isSubmitBack: {
type: Boolean,
default: false
},
// 是否默认委托事件
defaultEntrust: {
type: Boolean,
src/pages/processCenter/pages/creatProcess/bzdy/step1.vue
+20 -13
View File
@@ -45,18 +45,23 @@
v-model="form.modelName"
clearable
></el-input>
<div v-if="form.modelName" @click="fileUpload" class="fileClass">
{{ form.modelName }}
</div>
<div v-else>
<el-button
type="primary"
class="common-button-primary"
@click="fileUpload"
size="mini">
点击上传
<!-- <div v-if="form.modelName" @click="fileUpload" class="fileClass">-->
<!-- {{ form.modelName }}-->
<!-- </div>-->
<!-- <div v-else>-->
<!-- <el-button-->
<!-- type="primary"-->
<!-- class="common-button-primary"-->
<!-- @click="fileUpload"-->
<!-- size="mini">-->
<!-- 点击上传-->
<!-- </el-button>-->
<el-button type="primary" @click="fileUpload">
<i class="el-icon-upload el-icon--right"></i>
{{isFileUploadStr}}
</el-button>
</div>
<!-- </div>-->
</el-form-item>
</el-col>
</el-row>
@@ -179,7 +184,7 @@
:before-upload="beginImportFile"
:on-success="importFileSuccess"
:on-progress="progressFile"
:show-file-list="false"
:show-file-list="true"
>
<div style="padding: 20px 0">
<i class="el-icon-upload" style="color: #3399ff"></i>
@@ -201,6 +206,7 @@ export default {
name: "bzdyStep1",
data() {
return {
isFileUploadStr:'点击上传',
progressType: false,
loadProgress: 0,
commentText: '',
@@ -350,7 +356,8 @@ export default {
// 导入标准数据成功后执行
importFileSuccess (response, file) {
if (response.ok) {
this.fileMadel = false
this.isFileUploadStr='点击查看已上传文件';
this.fileMadel = true;
this.loadProgress = 0
this.progressType = false
this.form.model = response.data.id
src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue
+17
View File
@@ -155,6 +155,21 @@
</el-table-column>
</el-table>
</div>
<div>
<el-collapse accordion>
<el-collapse-item title="意见填写">
<div style="margin: 10px 0;">
<el-input
type="textarea"
:rows="3"
resize="none"
placeholder="请输入意见"
v-model="commentText">
</el-input>
</div>
</el-collapse-item>
</el-collapse>
</div>
</div>
<div class="content" v-show="active === '2'">
<div class="block" style="padding-top: 20px;">
@@ -735,6 +750,7 @@ export default {
pageSizeNo: this.$store.getters.userInfo.configContent
},
standList: [], //新添加的标准
commentText: '',
modalshowflag: false, // drawer开关
modalshowflag2: false,
nodeList2: [],
@@ -1052,6 +1068,7 @@ export default {
if (this.dataList.length < 1) {
this.$message.warning("标准不能为空");
} else {
this.listForm.commentText = this.commentText
var json = Object.assign(this.listForm, this.roleForm);
this.$refs["qdfbForm"].validate((valid) => {
if (valid) {
src/pages/processCenter/pages/creatProcess/bzqdfb/step1-3.vue
+17
View File
@@ -134,6 +134,21 @@
</el-table-column>
</el-table>
</div>
<div>
<el-collapse accordion>
<el-collapse-item title="意见填写">
<div style="margin: 10px 0;">
<el-input
type="textarea"
:rows="3"
resize="none"
placeholder="请输入意见"
v-model="commentText">
</el-input>
</div>
</el-collapse-item>
</el-collapse>
</div>
</div>
<div class="content" v-show="active === '3'">
<div class="flow-list">
@@ -421,6 +436,7 @@ export default {
totalNo: 0,
prcNum: '',
pageSizeNo: this.$store.getters.userInfo.configContent,
commentText:'',
listForm: {
listName: "", //清单名称
// applyRegion: "", //适用区域
@@ -677,6 +693,7 @@ export default {
},
//提交事件
handleSubmit() {
this.listForm.commentText = this.commentText
const json = JSON.stringify(this.listForm);
this.$http.post('lawss/activiti/completeTask', {
taskIds: this.taskIds,
src/pages/processCenter/pages/creatProcess/bzqdfb/step1-4.vue
+6 -6
View File
@@ -384,14 +384,15 @@ export default {
},
//驳回事件
beforeBack() {
this.listForm.approvalOpinion = "1";
this.handleSubmit();
},
//提交事件
handleSubmit() {
if (this.commentText === null || this.commentText === undefined || this.commentText === "") {
this.$message.warning("请填写审批意见");
} else {
this.listForm.approvalOpinion = "1";
this.handleSubmit();
}
},
//提交事件
handleSubmit() {
this.isSubmit = true
this.listForm.commentText = this.commentText;
const json = JSON.stringify(this.listForm);
@@ -408,7 +409,6 @@ export default {
}
this.isSubmit = false
});
}
},
//选择标准取消事件
closeDrawer() {
src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
+17
View File
@@ -158,6 +158,21 @@
</el-table-column>
</el-table>
</div>
<div>
<el-collapse accordion>
<el-collapse-item title="意见填写">
<div style="margin: 10px 0;">
<el-input
type="textarea"
:rows="3"
resize="none"
placeholder="请输入意见"
v-model="commentText">
</el-input>
</div>
</el-collapse-item>
</el-collapse>
</div>
</div>
<div class="content" v-show="active === '2'">
<div class="block" style="padding-top: 20px;">
@@ -712,6 +727,7 @@ export default {
pageSizeNo: this.$store.getters.userInfo.configContent
},
standList: [], //新添加的标准
commentText: '',
modalshowflag: false, // drawer开关
modalshowflag2: false,
nodeList2: [],
@@ -1024,6 +1040,7 @@ export default {
if (this.dataList.length < 1) {
this.$message.warning("标准不能为空");
} else {
this.listForm.commentText = this.commentText
var json = Object.assign(this.listForm, this.roleForm);
this.$refs["qdfbForm"].validate((valid) => {
if (valid) {
src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue
-4
View File
@@ -387,9 +387,6 @@ export default {
},
//提交事件
handleSubmit() {
if (this.commentText === null || this.commentText === undefined || this.commentText === "") {
this.$message.warning("请填写会签意见");
}else{
this.isSubmit = true
this.listForm.commentText = this.commentText;
this.listForm.approvalOpinion = "";
@@ -410,7 +407,6 @@ export default {
}, e => {
});
}
},
//选择标准取消事件
closeDrawer() {
src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue
+17
View File
@@ -149,6 +149,21 @@
</el-table-column>
</el-table>
</div>
<div>
<el-collapse accordion>
<el-collapse-item title="意见填写">
<div style="margin: 10px 0;">
<el-input
type="textarea"
:rows="3"
resize="none"
placeholder="请输入意见"
v-model="commentText">
</el-input>
</div>
</el-collapse-item>
</el-collapse>
</div>
</div>
<div class="content" v-show="active === '3'">
<div class="flow-list">
@@ -392,6 +407,7 @@ export default {
// 当前流程类型(1待办/2已办)
processType: 1,
searching: false,
commentText:'',
standardTypeOptions: [
{
value: "INLAND",
@@ -711,6 +727,7 @@ export default {
},
//提交事件
handleSubmit() {
this.listForm.commentText = this.commentText
const json = JSON.stringify(this.listForm);
this.isSubmit = true
this.$http.post('lawss/activiti/completeTask', {
src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue
-4
View File
@@ -401,9 +401,6 @@ export default {
},
//提交事件
handleSubmit() {
if (this.commentText === null || this.commentText === undefined || this.commentText === "") {
this.$message.warning("请填写审批意见");
} else {
this.isSubmit = true
this.listForm.commentText = this.commentText;
const json = JSON.stringify(this.listForm);
@@ -420,7 +417,6 @@ export default {
}
this.isSubmit = false
});
}
},
//选择标准取消事件
closeDrawer() {
src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
+11 -4
View File
@@ -862,8 +862,13 @@
},
methods: {
downloadFile (fileType) {
//文件id中出现了','字符,去除掉
if(fileType === 'fbgbjbd'){
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.fbgbjbdFileId
if(this.fbgbjbdFileId.search(',')){
this.fbgbjbdFileId=this.fbgbjbdFileId.replace(",","");
console.log(this.fbgbjbdFileId);
}
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.fbgbjbdFileId
}else if(fileType === 'xgd'){
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.xgdFileId
}else if(fileType === 'bpg'){
@@ -885,11 +890,12 @@
}
},
getRule(){
if (this.formTongGuo.approvalOpinion === '0') {
this.rules.commentText.required = false
this.rules.commentText[0].required = false;
this.$refs.formTongGuo.clearValidate('commentText')
} else {
this.rules.commentText.required = true
}else {
this.rules.commentText[0].required = true;
}
},
popoverHide (checkedIds, checkedData) {
@@ -964,6 +970,7 @@
this.caFileId = processForm.ca
this.zbjbdFileId = processForm.zbjbd
this.getFormFieldList(processForm)
console.log(processForm);
}
}).catch(e => {
})
src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
+4
View File
@@ -836,6 +836,10 @@ export default {
methods: {
downloadFile (fileType) {
if(fileType === 'fbgbjbd'){
if(this.fbgbjbdFileId.search(',')){
this.fbgbjbdFileId=this.fbgbjbdFileId.replace(",","");
console.log(this.fbgbjbdFileId);
}
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.fbgbjbdFileId
}else if(fileType === 'xgd'){
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.xgdFileId
src/pages/processCenter/pages/creatProcess/bzrk/step5.vue
+4
View File
@@ -815,6 +815,10 @@
methods: {
downloadFile (fileType) {
if(fileType === 'fbgbjbd'){
if(this.fbgbjbdFileId.search(',')){
this.fbgbjbdFileId=this.fbgbjbdFileId.replace(",","");
console.log(this.fbgbjbdFileId);
}
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.fbgbjbdFileId
}else if(fileType === 'xgd'){
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.xgdFileId
src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue
+8 -7
View File
@@ -31,7 +31,7 @@
<el-table-column type="selection" width="55" align="center"/>
<el-table-column prop="standSerialNumber" label="标准号" show-overflow-tooltip align="center">
<template slot-scope="scope">
<a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSerialNumber }}</a>
<a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standId }}</a>
</template>
</el-table-column>
<el-table-column prop="standName" align="center" show-overflow-tooltip label="标准名称">
@@ -102,7 +102,7 @@
<h4>确认+选择责任人</h4>
<div style="margin-top: 10px;width: 300px;">
<el-input v-model="roleForm.dutyUser" style="display: none;"></el-input>
<el-input v-model="roleForm.dutyUserName" :disabled="true" placeholder="确认+选择责任人" @click.native="choiceZRR('dockUser', '选择标准法规工程师', roleForm.dockUser)">
<el-input v-model="roleForm.dutyUserName" :disabled="true" placeholder="确认+选择责任人">
</el-input>
</div>
</el-form-item>
@@ -114,7 +114,7 @@
<h4>负责人</h4>
<div style="margin-top: 10px;width: 300px;">
<el-input v-model="roleForm.uploadUser" style="display: none;"></el-input>
<el-input v-model="roleForm.uploadUserName" :disabled="true" placeholder="选择负责人" @click.native="choiceZRR('dockUser', '选择标准法规工程师', roleForm.dockUser)">
<el-input v-model="roleForm.uploadUserName" :disabled="true" placeholder="负责人">
</el-input>
</div>
</el-form-item>
@@ -126,7 +126,7 @@
<h4>分发负责人</h4>
<div style="margin-top: 10px;width: 300px;">
<el-input v-model="roleForm.checkUser" style="display: none;"></el-input>
<el-input v-model="roleForm.checkUserName" :disabled="true" placeholder="分发负责人" @click.native="choiceZRR('dockUser', '选择标准法规工程师', roleForm.dockUser)">
<el-input v-model="roleForm.checkUserName" :disabled="true" placeholder="分发负责人">
</el-input>
</div>
</el-form-item>
@@ -148,7 +148,7 @@
<el-form :modal="queryUnqualidiedData" inline class="label-input-form">
<el-form-item label="标准号/标准名称" class="search-item">
<el-input
v-model="queryUnqualidiedData.standSerialNumber"
v-model="queryUnqualidiedData.standId"
placeholder="请输入"
clearable
:maxlength="100"></el-input>
@@ -210,9 +210,9 @@
@selection-change="selectedChange"
>
<el-table-column type="selection" width="55" align="center"/>
<el-table-column prop="standSerialNumber" align="center" show-overflow-tooltip label="标准号">
<el-table-column prop="standId" align="center" show-overflow-tooltip label="标准号">
<template slot-scope="scope">
<a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSerialNumber }}</a>
<a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standId }}</a>
</template>
</el-table-column>
<el-table-column prop="standName" align="center" show-overflow-tooltip label="标准名称">
@@ -291,6 +291,7 @@ export default {
pageSize: 10,
total: 0,
closeState: '1',
standId: '',
standSerialNumber: '', // 标准号/名称
productName: '', // 项目名称
responsibleUnit: '' // 责任部门
src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue
+2 -2
View File
@@ -97,9 +97,9 @@
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}">
<el-table-column type="selection" width="55" align="center"/>
<el-table-column prop="standSerialNumber" show-overflow-tooltip label="标准号" align="center">
<el-table-column prop="standId" show-overflow-tooltip label="标准号" align="center">
<template slot-scope="scope">
<a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSerialNumber }}</a>
<a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standId }}</a>
</template>
</el-table-column>
<el-table-column prop="standName" align="center" show-overflow-tooltip label="标准名称">
src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue
+2 -2
View File
@@ -99,9 +99,9 @@
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}">
<el-table-column type="selection" width="55" align="center"/>
<el-table-column prop="standSerialNumber" show-overflow-tooltip label="标准号" align="center">
<el-table-column prop="standId" show-overflow-tooltip label="标准号" align="center">
<template slot-scope="scope">
<a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSerialNumber }}</a>
<a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standId }}</a>
</template>
</el-table-column>
<el-table-column prop="standName" align="center" show-overflow-tooltip label="标准名称">
src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue
+23 -16
View File
@@ -87,9 +87,9 @@
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}">
<el-table-column type="selection" width="55" align="center"/>
<el-table-column prop="standSerialNumber" align="center" show-overflow-tooltip label="标准号">
<el-table-column prop="standId" align="center" show-overflow-tooltip label="标准号">
<template slot-scope="scope">
<a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSerialNumber }}</a>
<a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standId }}</a>
</template>
</el-table-column>
<el-table-column prop="standName" align="center" show-overflow-tooltip label="标准名称">
@@ -118,6 +118,7 @@
accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx"
:before-upload="handleBeforeUpload"
:before-remove="handleBeforeRemove"
:on-remove="handleONRemove"
:on-success="handleOnsuccess"
>
<el-button
@@ -314,12 +315,7 @@ export default {
}
this.dataList.forEach(item => {
if (item.fileText.length !== 0) {
item.fileText.forEach(item1 => {
this.fileTextList.push({
id: item1.id,
name: item1.name
})
})
this.fileTextList = item.fileText
}
})
})
@@ -335,10 +331,18 @@ export default {
// 文件上传成功
handleOnsuccess(res, file, fileList) {
if (res.ok) {
this.newDataList.push({
id: res.data.attId,
name: res.data.standName
})
if (this.fileTextList !== null) {
this.newDataList = this.fileTextList
this.newDataList.push({
id: res.data.attId,
name: res.data.standName
})
} else {
this.newDataList.push({
id: res.data.attId,
name: res.data.standName
})
}
this.fileListData.fileText = this.newDataList
this.$message({
showClose: true,
@@ -377,14 +381,17 @@ export default {
},
// 移除上传的文件
handleBeforeRemove(file, fileList) {
this.fileListData.fileText = fileList
this.fileTextList = fileList
this.newDataList.forEach((item, index) => {
/* this.newDataList.forEach((item, index) => {
if (file.name === item.name || file.id === item.id) {
this.newDataList.splice(index, 1)
}
})
},
console.log(this.dataList)
}
})*/
},
handleONRemove() {},
/************ ********* *****************/
// 点击查看
handlePreview (item) {
src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue
+6 -4
View File
@@ -87,9 +87,9 @@
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}">
<el-table-column type="selection" width="55" align="center"/>
<el-table-column prop="standSerialNumber" align="center" show-overflow-tooltip label="标准号">
<el-table-column prop="standId" align="center" show-overflow-tooltip label="标准号">
<template slot-scope="scope">
<a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSerialNumber }}</a>
<a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standId }}</a>
</template>
</el-table-column>
<el-table-column prop="standName" align="center" show-overflow-tooltip label="标准名称">
@@ -201,7 +201,7 @@
approval
@back="handleSubmitNo"
:submitLoading="isSubmit"
:saveLoading="saveLoading"
:isSubmitBack="backLoading"
@submit="handleSubmit"
submitBTNText="同意"
>
@@ -357,6 +357,7 @@ export default {
})
},
handleSubmitNo() {
this.backLoading = true
if (this.commentText) {
var json = {
responUserInfo: {
@@ -372,12 +373,13 @@ export default {
}, {}, res => {
if (res.success) {
this.$message.success('驳回成功')
this.fileTextList = []
this.$router.push('/processCenter')
this.backLoading = false
}
})
} else {
this.$message.warning('请输入反馈意见')
this.backLoading = false
}
},
//未整改项抽屉中的查询按钮
src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue
+16
View File
@@ -114,6 +114,21 @@
</el-table>
</div>
</div>
<div>
<el-collapse accordion>
<el-collapse-item title="意见填写">
<div style="margin: 10px 0;">
<el-input
type="textarea"
:rows="3"
resize="none"
placeholder="请输入意见"
v-model="commentText">
</el-input>
</div>
</el-collapse-item>
</el-collapse>
</div>
<div class="content" v-show="active === '2'">
<div class="block" style="padding-top: 20px;">
<el-timeline>
@@ -390,6 +405,7 @@ export default {
drawerTitle: "", //drawer标题
// 查询相关参数
searching: false,
commentText:'',
standardSearch: {
standType: "",
standName: ""
src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
+17
View File
@@ -101,6 +101,21 @@
</el-table>
</div>
</div>
<div>
<el-collapse accordion>
<el-collapse-item title="意见填写">
<div style="margin: 10px 0;">
<el-input
type="textarea"
:rows="3"
resize="none"
placeholder="请输入意见"
v-model="commentText">
</el-input>
</div>
</el-collapse-item>
</el-collapse>
</div>
<div class="content" v-show="active === '2'">
<div class="block" style="padding-top: 20px;">
<el-timeline>
@@ -374,6 +389,7 @@ export default {
productData: [], //添加抽屉的数据
standList: [], //新添加的标准
modalshowflag: false, // drawer开关
commentText: '',
drawerTitle: "", //drawer标题
// 查询相关参数
searching: false,
@@ -658,6 +674,7 @@ export default {
this.$message.warning("请选择分发责任人");
} else {
this.isSubmit = true
this.listForm.commentText = this.commentText;
var json = Object.assign(this.listForm, this.roleForm);
this.$refs["listForm"].validate((valid) => {
if (valid) {
src/pages/processCenter/pages/creatProcess/xmpg/step2.vue
+1 -5
View File
@@ -336,9 +336,6 @@ export default {
},
//提交事件
handleSubmit() {
if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
this.$message.warning('请填写审批意见')
}else{
this.listForm.commentText = this.commentText
const json = JSON.stringify(this.listForm);
this.isSubmit = true
@@ -356,7 +353,7 @@ export default {
this.isSubmit = false
}, e => {
});
}
},
//标准表格选择框改变
selectStandChange(data) {
@@ -464,4 +461,3 @@ export default {
}
}
</style>
src/pages/processCenter/pages/creatProcess/xmpg/step3.vue
+1
View File
@@ -126,6 +126,7 @@
</template>
</el-table-column>
</el-table>
<!-- 选择责任人-->
<Role-tree
check-box
src/pages/processCenter/pages/creatProcess/xmpg/step4.vue
+15 -17
View File
@@ -246,21 +246,21 @@
</el-table-column>
</el-table>
</div>
<!-- <div>-->
<!-- <el-collapse accordion>-->
<!-- <el-collapse-item title="填写评估反馈">-->
<!-- <div style="margin: 10px 0;">-->
<!-- <el-input-->
<!-- type="textarea"-->
<!-- :rows="3"-->
<!-- resize="none"-->
<!-- placeholder="请输入您的评估分析"-->
<!-- v-model="commentText">-->
<!-- </el-input>-->
<!-- </div>-->
<!-- </el-collapse-item>-->
<!-- </el-collapse>-->
<!-- </div>-->
<div>
<el-collapse accordion>
<el-collapse-item title="意见填写">
<div style="margin: 10px 0;">
<el-input
type="textarea"
:rows="3"
resize="none"
placeholder="请输入意见"
v-model="commentText">
</el-input>
</div>
</el-collapse-item>
</el-collapse>
</div>
</div>
<div class="content" v-show="active === '3'">
@@ -616,5 +616,3 @@ export default {
}
}
</style>
src/pages/processCenter/pages/creatProcess/xmpg/step5.vue
+3 -12
View File
@@ -447,9 +447,6 @@ export default {
},
//驳回事件
beforeBack () {
if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
this.$message.warning('请填写审批意见')
} else {
this.listForm.applyUpdUserId = this.dataList[0].distributePersonId
this.listForm.commentText = this.commentText;
this.listForm.dataList = this.dataList
@@ -468,17 +465,13 @@ export default {
}
}, e => {
});
}
},
//提交事件
handleSubmit() {
if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
this.$message.warning('请填写审批意见')
}else {
this.listForm.applyUpdUserId = this.dataList[0].distributePersonId
this.listForm.commentText = this.commentText;
this.listForm.dataList = this.dataList
this.listForm.fenFlag = '2'
this.listForm.commentText = this.commentText;
const json = JSON.stringify(this.listForm);
this.isSubmit = true
this.$http.post('lawss/activiti/completeTask', {
@@ -495,7 +488,7 @@ export default {
this.isSubmit = false
}, e => {
});
}
},
//标准表格选择框改变
selectStandChange(data) {
@@ -602,6 +595,4 @@ export default {
margin-top: 10px;
}
}
</style>
</style>>
src/pages/processCenter/pages/creatProcess/xmpg/step6.vue
+1 -6
View File
@@ -452,9 +452,6 @@ export default {
},
//提交事件
handleSubmit() {
if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
this.$message.warning('请填写审批意见')
} else {
this.isSubmit = true
this.listForm.prcCreateUser = this.$store.getters.userInfo.userId;
this.listForm.applyUpdUserId = this.$store.getters.userInfo.userId;
@@ -480,7 +477,7 @@ export default {
}, e => {
});
}
},
//标准表格选择框改变
selectStandChange(data) {
@@ -588,5 +585,3 @@ export default {
}
}
</style>
src/pages/processCenter/pages/creatProcess/xmpg/step7.vue
-5
View File
@@ -451,9 +451,6 @@ export default {
},
//提交事件
handleSubmit() {
if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
this.$message.warning('请填写审批意见')
} else {
this.listForm.prcCreateUser = this.$store.getters.userInfo.userId;
this.listForm.applyUpdUserId = this.$store.getters.userInfo.userId;
this.listForm.prcCreateUserName = this.$store.getters.userInfo.account;
@@ -479,7 +476,6 @@ export default {
}, e => {
});
}
},
//标准表格选择框改变
selectStandChange(data) {
@@ -514,7 +510,6 @@ export default {
<style lang="less" scoped>
@import '~@/assets/styles/style';
.xmpg-step7 {
/deep/ .el-drawer__container {
.prc-content-border {
src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue
+23 -5
View File
@@ -87,22 +87,22 @@
</template>
</el-table-column>
<el-table-column
prop="xcxssrqgj"
prop="xcxssrq"
width="190px"
align="center"
label="新车型实施日期">
<template slot-scope="scope">
<span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format("YYYY-MM-DD") : "" }}</span>
<span>{{ scope.row.xcxssrq ? $moment(scope.row.xcxssrq).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
prop="zccssrqgj"
prop="zccssrq"
align="center"
sortable
width="190px"
label="在产车实施日期">
<template slot-scope="scope">
<span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format("YYYY-MM-DD") : "" }}</span>
<span>{{ scope.row.zccssrq ? $moment(scope.row.zccssrq).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
@@ -140,6 +140,21 @@
</el-table-column>
</el-table>
</div>
<div>
<el-collapse accordion>
<el-collapse-item title="意见填写">
<div style="margin: 10px 0;">
<el-input
type="textarea"
:rows="3"
resize="none"
placeholder="请输入意见"
v-model="commentText">
</el-input>
</div>
</el-collapse-item>
</el-collapse>
</div>
</div>
<div class="content" v-show="active === '2'">
<div class="block" style="padding-top: 20px;">
@@ -337,6 +352,7 @@ export default {
active: "1", //当前选中的type
isSubmit: false,
saveLoading: false,
commentText: '',
//表单的数据
listForm: {
projectNumber: "", //项目编号
@@ -406,7 +422,6 @@ export default {
queryTaskFirst({
bpnId: this.$route.query.bpnId
}).then(res => {
console.log(res.mes);
let mes = JSON.parse(res.mes);
this.listForm = mes.form;
this.dataList = mes.form.dataList;
@@ -522,6 +537,7 @@ export default {
},
//流程提交事件
handleSubmit(){
this.listForm.commentText = this.commentText;
var json = Object.assign(this.listForm, this.roleForm)
json.prcCreateUser = this.$store.getters.userInfo.userId;
json.prcCreateUserName = this.$store.getters.userInfo.uName;
@@ -530,6 +546,7 @@ export default {
if (valid) {
this.$refs['roleForm'].validate((valid) => {
if (valid) {
this.isSubmit = true
this.$http.get("lawss/activiti/startProcess", { type: "6" }, {
_this: this
}, res => {
@@ -545,6 +562,7 @@ export default {
this.$message.success(res.message);
this.$router.push("/processCenter");
}
this.isSubmit = false
});
}
});
src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue
+70 -53
View File
@@ -140,6 +140,21 @@
</el-table-column>
</el-table>
</div>
<div>
<el-collapse accordion>
<el-collapse-item title="意见填写">
<div style="margin: 10px 0;">
<el-input
type="textarea"
:rows="3"
resize="none"
placeholder="请输入意见"
v-model="commentText">
</el-input>
</div>
</el-collapse-item>
</el-collapse>
</div>
</div>
<div class="content" v-show="active === '2'">
<div class="block" style="padding-top: 20px;">
@@ -340,7 +355,7 @@ export default {
projectNumber: "", //项目编号
projectName: "", //项目名称
dataList: [], //项目下的标准数据
breakdownList: [], //标准下的分解单数据
breakdownList: [] //标准下的分解单数据
},
dataList: [], //下面标准的数据
breakdownList: [], //标准下的条款数据
@@ -379,6 +394,7 @@ export default {
modalshowflag: false, // drawer开关
drawerTitle: "", //drawer标题
nodeList: [],
commentText: "",
projectModel: false, //项目抽屉开关
projectId: "", //项目id 用来查询标准
standId: [], //标准id 用来条款
@@ -457,17 +473,17 @@ export default {
this.listForm.dataList.forEach(item => {
// 责任部门转换
if (item.zrbm !== null || item.zrbm !== "") {
let k = (item.zrbm || "").split(',')
let k = (item.zrbm || "").split(",");
for (let i in this.zrbmOptions) {
for (let m = 0; m< k.length; m++) {
for (let m = 0; m < k.length; m++) {
if (this.zrbmOptions[i].value === k[m]) {
k[m] = this.zrbmOptions[i].label
k[m] = this.zrbmOptions[i].label;
}
item.zrbm = k.join(',')
item.zrbm = k.join(",");
}
}
}
})
});
let ids = [];
this.dataList.forEach(item => {
ids.push(item.standId);
@@ -485,7 +501,7 @@ export default {
{
_this: this
}, res => {
this.listForm.breakdownList = res.data
this.listForm.breakdownList = res.data;
});
},
//标准的多选框改变
@@ -502,64 +518,65 @@ export default {
},
//流程保存事件
handleSave(){
this.saveLoading = true
let _formData = new FormData()
_formData.append('id', this.bpnId || '')
_formData.append('createUser', this.$store.getters.userInfo.userId)
_formData.append('createUserName', this.$store.getters.userInfo.userName)
_formData.append('prcType', '6')
_formData.append('json', JSON.stringify({
form: this.form,
handleSave() {
this.saveLoading = true;
let _formData = new FormData();
_formData.append("id", this.bpnId || "");
_formData.append("createUser", this.$store.getters.userInfo.userId);
_formData.append("createUserName", this.$store.getters.userInfo.userName);
_formData.append("prcType", "6");
_formData.append("json", JSON.stringify({
form: this.listForm,
roleForm: this.roleForm,
commentText: this.commentText
}))
}));
saveTaskFirst(_formData).then(res => {
this.saveLoading = false
this.$message.success('保存成功')
this.bpnId = res.result
this.saveLoading = false;
this.$message.success("保存成功");
this.bpnId = res.result;
}).catch(e => {
this.saveLoading = false
})
this.saveLoading = false;
});
},
//流程提交事件
handleSubmit(){
var json = Object.assign(this.listForm, this.roleForm)
json.prcCreateUser = this.$store.getters.userInfo.userId;
json.prcCreateUserName = this.$store.getters.userInfo.uName;
json.standId = this.listForm.standId;
this.$refs['listForm'].validate((valid) => {
handleSubmit() {
this.listForm.commentText = this.commentText;
var json = Object.assign(this.listForm, this.roleForm);
json.prcCreateUser = this.$store.getters.userInfo.userId;
json.prcCreateUserName = this.$store.getters.userInfo.uName;
json.standId = this.listForm.standId;
this.$refs["listForm"].validate((valid) => {
if (valid) {
this.$refs["roleForm"].validate((valid) => {
if (valid) {
this.$refs['roleForm'].validate((valid) => {
if (valid) {
this.isSubmit = true
this.$http.get("lawss/activiti/startProcess", { type: "6" }, {
this.isSubmit = true;
this.$http.get("lawss/activiti/startProcess", { type: "6" }, {
_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.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.$router.push("/processCenter");
}
this.isSubmit = false
});
if (res.success) {
this.$message.success(res.message);
this.$router.push("/processCenter");
}
this.isSubmit = false;
});
} else {
return this.$message.warning("请完善人员信息");
}
});
} else {
return this.$message.warning("请完善基础信息");
return this.$message.warning("请完善人员信息");
}
});
} else {
return this.$message.warning("请完善基础信息");
}
});
},
choiceZRR(type, title, id) {
this.nodeList = [];
@@ -584,13 +601,13 @@ export default {
mounted() {
this.getProjectData();
// 查询各下拉框数据
this.$http.get('sys/dictype/getDicTypeListCode', '', {
this.$http.get("sys/dictype/getDicTypeListCode", "", {
_this: this,
loading: 'loading'
loading: "loading"
}, res => {
this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
this.zrbmOptions = res.data.ZRBMCLASS; // 责任部门
}, e => {
})
});
}
};
</script>
src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue
-4
View File
@@ -431,9 +431,6 @@ export default {
},
//提交事件
handleSubmit() {
if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
this.$message.warning('请填写审批意见')
}else{
this.listForm.bzFlag = "1";
this.listForm.commentText = this.commentText;
const json = JSON.stringify(this.listForm);
@@ -451,7 +448,6 @@ export default {
}
}, e => {
});
}
},
},
computed: {
src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue
-29
View File
@@ -275,12 +275,10 @@
</div>
</div>
<ProcessFooter
show-back
show-submit
:submitLoading="isSubmit"
:saveLoading="saveLoading"
:approval="true"
@back="beforeBack"
@submit="handleSubmit"
>
</ProcessFooter>
@@ -407,34 +405,8 @@ export default {
this.listForm.breakdownList = item.breakdownList;
});
},
//驳回事件
beforeBack() {
if (this.commentText === null || this.commentText === undefined || this.commentText === '') {
this.$message.warning('请填写审批意见')
} else {
this.listForm.bzFlag = "2";
this.listForm.commentText = this.commentText;
const json = JSON.stringify(this.listForm);
this.$http.post("lawss/activiti/completeTask", {
taskIds: this.taskIds,
userId: this.userId,
json: json
}, {
_this: this
}, res => {
if (res.success) {
this.$message.success(res.message);
this.$router.push("/processCenter");
}
}, e => {
});
}
},
//提交事件
handleSubmit() {
if (this.commentText === null || this.commentText === undefined || this.commentText === '') {
this.$message.warning('请填写审批意见')
} else {
this.listForm.bzFlag = "1";
this.listForm.commentText = this.commentText;
const json = JSON.stringify(this.listForm);
@@ -451,7 +423,6 @@ export default {
}
}, e => {
});
}
},
},
src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue
+1 -5
View File
@@ -2,7 +2,7 @@
<div class="xmpg2-step12">
<ProcessHeader toggle>
<template slot="proName">项目合规评估流程-项目</template>
<template slot="proNode">责任人审核</template>
<template slot="proNode">标准法规部部长审核</template>
</ProcessHeader>
<div class="headerTabs">
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
@@ -431,9 +431,6 @@ export default {
},
//提交事件
handleSubmit() {
if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
this.$message.warning('请填写审批意见')
}else{
this.listForm.dlFlag = "1";
this.listForm.commentText = this.commentText;
const json = JSON.stringify(this.listForm);
@@ -450,7 +447,6 @@ export default {
}
}, e => {
});
}
},
},
computed: {
src/pages/processCenter/pages/creatProcess/xmpg2/step2.vue
-4
View File
@@ -337,9 +337,6 @@ export default {
},
//提交事件
handleSubmit() {
if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
this.$message.warning('审批意见不能为空')
}else{
this.isSubmit = true
this.listForm.BZFlag = "1";
this.listForm.commentText = this.commentText;
@@ -359,7 +356,6 @@ export default {
}, e => {
});
}
}
},
computed: {
listNoDataText() {
src/pages/processCenter/pages/creatProcess/xmpg2/step3.vue
+15 -4
View File
@@ -106,6 +106,21 @@
</el-table-column>
</el-table>
</div>
<div>
<el-collapse accordion>
<el-collapse-item title="意见填写">
<div style="margin: 10px 0;">
<el-input
type="textarea"
:rows="3"
resize="none"
placeholder="请输入意见"
v-model="commentText">
</el-input>
</div>
</el-collapse-item>
</el-collapse>
</div>
</div>
<div class="content" v-show="active === '3'">
<div class="flow-list" style="height: 100%">
@@ -333,9 +348,6 @@ export default {
},
//提交事件
handleSubmit() {
if (this.listForm.jgUser == null || this.listForm.jgUser == undefined ) {
this.$message.warning("请选择架构经理");
} else {
this.isSubmit = true
this.listForm.commentText = this.commentText;
const json = JSON.stringify(this.listForm);
@@ -353,7 +365,6 @@ export default {
this.isSubmit = false
}, e => {
});
}
},
choiceZRR(scope, type, title, id) {
if (scope != null) {
src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue
+19 -6
View File
@@ -112,6 +112,21 @@
</el-table-column>
</el-table>
</div>
<div>
<el-collapse accordion>
<el-collapse-item title="意见填写">
<div style="margin: 10px 0;">
<el-input
type="textarea"
:rows="3"
resize="none"
placeholder="请输入意见"
v-model="commentText">
</el-input>
</div>
</el-collapse-item>
</el-collapse>
</div>
</div>
<div class="content" v-show="active === '3'">
<div class="flow-list" style="height: 100%">
@@ -406,17 +421,15 @@ export default {
}
},
checkedRole (data) {
let roleId = data[0].id
let roleName = data[0].name
if (this.type === 1) {
this.dataList[this.zrIndex].liablePeopleId = roleId
this.dataList[this.zrIndex].liablePeople = roleName
this.dataList[this.zrIndex].liablePeopleId = data[0].id
this.dataList[this.zrIndex].liablePeople = data[0].name
} else if(this.type === 2) {
this.dataList.forEach( item => {
this.selectList.forEach( items => {
if (item.standId === items.standId) {
item.liablePeopleId = roleId
item.liablePeople = roleName
item.liablePeopleId = data[0].id
item.liablePeople = data[0].name
}
})
})
src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue
+15
View File
@@ -98,6 +98,21 @@
</el-table-column>
</el-table>
</div>
<div>
<el-collapse accordion>
<el-collapse-item title="意见填写">
<div style="margin: 10px 0;">
<el-input
type="textarea"
:rows="3"
resize="none"
placeholder="请输入意见"
v-model="commentText">
</el-input>
</div>
</el-collapse-item>
</el-collapse>
</div>
</div>
<div class="content" v-show="active === '3'">
<div class="flow-list" style="height: 100%">
src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue
+15
View File
@@ -236,6 +236,21 @@
</el-table-column>
</el-table>
</div>
<div>
<el-collapse accordion>
<el-collapse-item title="意见填写">
<div style="margin: 10px 0;">
<el-input
type="textarea"
:rows="3"
resize="none"
placeholder="请输入意见"
v-model="commentText">
</el-input>
</div>
</el-collapse-item>
</el-collapse>
</div>
</div>
<div class="content" v-show="active === '3'">
<div class="flow-list" style="height: 100%">
src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue
-4
View File
@@ -432,9 +432,6 @@
},
//提交事件
handleSubmit() {
if (this.commentText === null || this.commentText === undefined || this.commentText === '') {
this.$message.warning('请填写审批意见')
} else {
this.listForm.ffFlag = "1";
this.listForm.commentText = this.commentText;
const json = JSON.stringify(this.listForm);
@@ -450,7 +447,6 @@
this.$router.push("/processCenter");
}
});
}
},
},
computed: {
src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue
-4
View File
@@ -431,9 +431,6 @@ export default {
},
//提交事件
handleSubmit() {
if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
this.$message.warning('请填写审批意见')
}else{
this.listForm.jgFlag = "1";
this.listForm.commentText = this.commentText;
const json = JSON.stringify(this.listForm);
@@ -450,7 +447,6 @@ export default {
}
}, e => {
});
}
},
},
computed: {
src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue
-4
View File
@@ -431,9 +431,6 @@ export default {
},
//提交事件
handleSubmit() {
if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
this.$message.warning('请填写审批意见')
}else{
this.listForm.gcFlag = "1";
this.listForm.commentText = this.commentText;
const json = JSON.stringify(this.listForm);
@@ -450,7 +447,6 @@ export default {
}
}, e => {
});
}
},
},
computed: {