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

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

Browse Source
This commit is contained in:
super_liu
2021-08-04 18:04:24 +08:00
parent 45345d44a2 6157d38a03
commit c6aa87467b
39 changed files with 276 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue
+1
View File
@@ -18,6 +18,7 @@
:showRMenu="jurisdictionCheckForTree"
:isHideRNode="jurisdictionCheckForTree"
:editable="jurisdictionCheckForTree"
expandFirst
showCopyBtn
deptSelect
autoSelect
src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
+7 -1
View File
@@ -530,7 +530,12 @@
this.form.itemsName1 = data.itemsName1
this.sarType = data.standInData
this.json = data
const itemList = JSON.parse(data.itemList)
let itemList
if (typeof (data.itemList) == 'string') {
itemList = JSON.parse(data.itemList)
} else {
itemList = data.itemList
}
itemList.forEach(item => {
item.unitDeptName = this.$store.getters.userInfo.orgName
item.onlineData = ''
@@ -542,6 +547,7 @@
item.technicalRequir = ''
item.itemsTitle = item.itermsConditions
})
console.log(2);
this.itemList = itemList
this.loading = false
}).catch(e => {
src/pages/processCenter/pages/creatProcess/bzjd/step5.vue
+1 -1
View File
@@ -363,7 +363,7 @@
this.sarType = data.standInData
this.json = data
this.itemList = data.itemList
this.loading = true
this.loading = false
}).catch(e => {
})
})
src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue
+2
View File
@@ -1057,6 +1057,7 @@ export default {
if (valid) {
this.$refs["Form"].validate((valid) => {
if (valid) {
this.isSubmit = true
this.$http.get("lawss/activiti/startProcess", { type: "4" }, {
_this: this
}, res => {
@@ -1072,6 +1073,7 @@ export default {
this.$message.success(res.message);
this.$router.push("/processCenter");
}
this.isSubmit = false
});
}
});
src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
+3 -2
View File
@@ -208,7 +208,7 @@
<!-- </el-card>-->
<!-- </el-timeline-item>-->
<el-timeline-item timestamp="根据会签意见修订" placement="top"
:color="roleForm.ministerUser ? '#66b1ff' : ''">
:color="roleForm.ministerUser ? '#66b1ff' : ''" v-if="signFlag === '1'">
<el-card>
<el-form-item prop="ministerUserName" style="margin-bottom: 0">
<h4>标准/政策法规工程师</h4>
@@ -1024,11 +1024,11 @@ export default {
this.$message.warning("标准不能为空");
} else {
var json = Object.assign(this.listForm, this.roleForm);
console.log(json)
this.$refs["qdfbForm"].validate((valid) => {
if (valid) {
this.$refs["Form"].validate((valid) => {
if (valid) {
this.isSubmit = true
this.$http.get("lawss/activiti/startProcess", { type: "4" }, {
_this: this
}, res => {
@@ -1044,6 +1044,7 @@ export default {
this.$message.success(res.message);
this.$router.push("/processCenter");
}
this.isSubmit = false
});
}
});
src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue
+2
View File
@@ -390,6 +390,7 @@ export default {
if (this.commentText === null || this.commentText === undefined || this.commentText === "") {
this.$message.warning("请填写会签意见");
}else{
this.isSubmit = true
this.listForm.commentText = this.commentText;
this.listForm.approvalOpinion = "";
this.listForm.signFlag = "";
@@ -405,6 +406,7 @@ export default {
this.$message.success(res.message);
this.$router.push("/processCenter");
}
this.isSubmit = false
}, e => {
});
src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue
+2
View File
@@ -712,6 +712,7 @@ export default {
//提交事件
handleSubmit() {
const json = JSON.stringify(this.listForm);
this.isSubmit = true
this.$http.post('lawss/activiti/completeTask', {
taskIds: this.taskIds,
userId: this.userId,
@@ -723,6 +724,7 @@ export default {
this.$message.success(res.message)
this.$router.push('/processCenter')
}
this.isSubmit = false
});
},
//标准表格选择框改变
src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue
+2
View File
@@ -404,6 +404,7 @@ export default {
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);
this.$http.post("lawss/activiti/completeTask", {
@@ -417,6 +418,7 @@ export default {
this.$message.success(res.message);
this.$router.push("/processCenter");
}
this.isSubmit = false
});
}
},
src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+11 -4
View File
@@ -1528,10 +1528,16 @@
this.zrUserIds = nameList
},
checkedRole (data) {
if (this.userType === 'jlUserId') {
this.roleForm.jlUserId = data.id
this.roleForm.jlUserName = data.name
}
if (this.userType === 'jlUserId') {
this.roleForm.jlUserId = data[0].id
this.roleForm.jlUserName = data[0].name
}else if(this.userType === 'zrUserId'){
this.roleForm.zrUserId=data[0].id;
this.roleForm.zrUserName=data[0].name;
}
},
// z责任人会签姓名搜索
filterNode(value, data) {
@@ -1834,6 +1840,7 @@
},
getTree () {
this.$http.get('SarInstitution/institution/institutionAndUser', {}, {}, res=> {
this.treeData = res.data
})
},
src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue
+4 -4
View File
@@ -234,7 +234,7 @@ import ProcessHeader from '../../components/ProcessHeader'
import ProcessFooter from '../../components/ProcessFooter'
import ProcessTitle from '../../components/ProcessTitle'
import { roleTreeData } from "@/api/unqualProcess.js"
import {completeTask, inboundLiaisonDetail, saveinboundTask} from "@/api/process.js"
import {completeTask, inboundLiaisonDetail, saveinboundTask, saveTaskForPub} from "@/api/process.js"
export default {
name: "wfhxzgStep2",
@@ -373,10 +373,10 @@ export default {
_formData.append('taskIds', this.taskIds)
_formData.append('json', JSON.stringify({
// roleForm: this.roleForm,
itemsList: this.dataList,
standardInfoList: this.dataList,
commentText: this.commentText
}))
saveinboundTask(_formData).then(res => {
saveTaskForPub(_formData).then(res => {
this.saveLoading = false
this.$message.success('保存成功')
this.bpnId = res.result
@@ -388,7 +388,7 @@ export default {
handleSubmit() {
this.isSubmit = true
let zqa = new Map();
for (let lastDataListElement of this.lastDataList) {
for (let lastDataListElement of this.dataList) {
let a = zqa.get(lastDataListElement.dutyPeopleInfoId)
if( a == null){
a = {
src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue
+37 -3
View File
@@ -241,7 +241,7 @@
import ProcessHeader from '../../components/ProcessHeader'
import ProcessFooter from '../../components/ProcessFooter'
import ProcessTitle from '../../components/ProcessTitle'
import {completeTask, inboundLiaisonDetail} from "@/api/process.js";
import {completeTask, inboundLiaisonDetail, saveTaskForPub} from "@/api/process.js";
export default {
name: "wfhxzgStep3",
@@ -405,7 +405,41 @@ export default {
window.open(routeUrl.href, '_blank')
},
// 保存按钮
handleSave() {},
handleSave() {
this.isSubmit = true
let zqa = new Map();
for (let lastDataListElement of this.dataList) {
let a = zqa.get(lastDataListElement.dutyPeopleInfoId)
if( a == null){
a = {
id: lastDataListElement.dutyPeopleInfoId,
name: lastDataListElement.dutyPeopleInfo,
standardInfoList: []
}
}
a.standardInfoList.push(lastDataListElement);
zqa.set(a.id, a);
}
let list = [];
for(let item of zqa) {
list.push(item[1])
}
this.saveLoading = true
let _formData = new FormData()
_formData.append('taskIds', this.taskIds)
_formData.append('json', JSON.stringify({
// roleForm: this.roleForm,
dockUserList: list,
commentText: this.commentText
}))
saveTaskForPub(_formData).then(res => {
this.saveLoading = false
this.$message.success('保存成功')
this.bpnId = res.result
}).catch(e => {
this.saveLoading = false
})
},
// 提交按钮
handleSubmit() {
this.isSubmit = true
@@ -418,7 +452,7 @@ export default {
})
if(flag)return this.$message.warning('请选择负责人填入')
let zqa = new Map();
for (let lastDataListElement of this.lastDataList) {
for (let lastDataListElement of this.dataList) {
let a = zqa.get(lastDataListElement.dutyPeopleId)
if( a == null){
a = {
src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue
+43 -13
View File
@@ -230,7 +230,7 @@ import ProcessHeader from '../../components/ProcessHeader'
import ProcessFooter from '../../components/ProcessFooter'
import ProcessTitle from '../../components/ProcessTitle'
import {uploadFile} from '@/api/unqualProcess.js';
import {inboundLiaisonDetail, completeTask} from "@/api/process"
import {inboundLiaisonDetail, completeTask, saveTaskForPub} from "@/api/process"
export default {
name: "wfhxzgStep4",
@@ -306,11 +306,13 @@ export default {
},
getFormFieldList (item) {
this.$nextTick(() => {
this.dataList = [JSON.parse(JSON.stringify(item.responUserInfo.info))]
this.newDataList = []
console.log(this.dataList)
this.dataList.forEach(item => {
let listJSON = JSON.parse(JSON.stringify(item.responUserInfo.info))
if (listJSON.length !== undefined) {
this.dataList = listJSON
} else {
this.dataList = [listJSON]
}
this.dataList.forEach(item => {
if (item.fileText.length !== 0) {
item.fileText.forEach(item1 => {
this.fileTextList.push({
@@ -337,12 +339,7 @@ export default {
id: res.data.attId,
name: res.data.standName
})
this.newDataList.forEach(item =>{
this.fileListData.fileText.push({
id: item.id,
name: item.name
})
})
this.fileListData.fileText = this.newDataList
this.$message({
showClose: true,
message: res.message,
@@ -402,7 +399,40 @@ export default {
window.open(routeUrl.href, '_blank')
},
// 保存按钮
handleSave() {},
handleSave() {
let zqa = new Map();
for (let lastDataListElement of this.dataList) {
let a = zqa.get(lastDataListElement.dutyPeopleId)
if( a == null){
a = {
standardInfoList: []
}
}
a.standardInfoList.push(lastDataListElement);
zqa.set(a.id, a);
}
let list = []
for(let item of zqa) {
list.push(item[1].standardInfoList)
}
this.saveLoading = true
let _formData = new FormData()
_formData.append('taskIds', this.taskIds)
_formData.append('json', JSON.stringify({
// roleForm: this.roleForm,
responUserInfo: {
info: this.dataList.splice(-1, 1)
},
commentText: this.commentText
}))
saveTaskForPub(_formData).then(res => {
this.saveLoading = false
this.$message.success('保存成功')
this.bpnId = res.result
}).catch(e => {
this.saveLoading = false
})
},
// 提交按钮
handleSubmit() {
this.isSubmit = true
src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue
+29 -10
View File
@@ -107,15 +107,9 @@
</el-table-column>
<el-table-column prop="responsibleUnit" label="责任部门" align="center"/>
<el-table-column prop="dutyPeople" label="负责人" align="center"/>
<el-table-column prop="fileText" label="佐证材料" align="center" show-overflow-tooltip>
<el-table-column prop="fileText" label="佐证材料" align="center">
<template slot-scope="scope">
<el-upload
:action="''"
name="file"
:file-list="fileTextList"
:on-preview="handleOnPreview"
>
</el-upload>
<el-button type="primary" size="small" @click="queryFile(scope.row)">查看</el-button>
</template>
</el-table-column>
</el-table>
@@ -212,6 +206,15 @@
submitBTNText="同意"
>
</ProcessFooter>
<el-dialog width='400px' :visible.sync="fileMadel" title="上传文件">
<el-upload
:action="''"
name="file"
:file-list="fileTextList"
:on-preview="handleOnPreview"
>
</el-upload>
</el-dialog>
</div>
</template>
@@ -226,6 +229,7 @@ export default {
name: "wfhxzgStep5",
data() {
return {
fileMadel: false,
detailData: [],
loading: false,
commentText: '',
@@ -271,6 +275,10 @@ export default {
}
},
methods: {
queryFile(row) {
this.fileTextList = row.fileText
this.fileMadel = true
},
processTable() {
this.$http.get("lawss/activiti/get_list_by_instance", {
prcNum: this.$route.query.prcNum,
@@ -297,14 +305,14 @@ export default {
getFormFieldList (item) {
this.$nextTick(() => {
this.dataList = JSON.parse(JSON.stringify(item)).info.fileDataList
this.dataList.forEach(item => {
/*this.dataList.forEach(item => {
item.fileText.forEach(item1 => {
this.fileTextList.push({
id: item1.id,
name: item1.name
})
})
})
})*/
})
},
@@ -351,6 +359,9 @@ export default {
handleSubmitNo() {
if (this.commentText) {
var json = {
responUserInfo: {
info: this.dataList
},
actionFlag: 1,
commentText: this.commentText
}
@@ -361,6 +372,7 @@ export default {
}, {}, res => {
if (res.success) {
this.$message.success('驳回成功')
this.fileTextList = []
this.$router.push('/processCenter')
}
})
@@ -452,6 +464,13 @@ export default {
/deep/.el-upload{
display: block;
}
// 上传信息回显多余隐藏
/deep/.el-upload-list__item .el-icon-close {
font-size: 0;
}
/deep/.el-upload-list__item .el-icon-close-tip {
font-size: 0;
}
.content-center {
padding: 10px 0px 10px 10px;
}
src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue
+2 -1
View File
@@ -681,7 +681,7 @@ export default {
this.$message.warning("请选择分发责任人");
} else {
var json = Object.assign(this.listForm, this.roleForm);
console.log(json);
this.isSubmit = true
this.$refs["listForm"].validate((valid) => {
if (valid) {
this.$refs["roleForm"].validate((valid) => {
@@ -701,6 +701,7 @@ export default {
this.$message.success(res.message);
this.$router.push("/processCenter");
}
this.isSubmit = false
});
}
});
src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
+7 -1
View File
@@ -451,6 +451,8 @@ export default {
listForm: {
standNumber: "", //标准编号
standName: "",//标准名称
XCXSSRQ: "", //新车型实施日期
ZCCSSRQ: "", //在产车实施日期
certifiedEngineer: "", //认证工程师
qualityEngineer: "", //质量工程师
breakdownList: [{
@@ -655,6 +657,7 @@ export default {
if (item.distributePerson === "" || item.distributePerson === null || item.distributePerson === undefined) {
this.$message.warning("请选择分发责任人");
} else {
this.isSubmit = true
var json = Object.assign(this.listForm, this.roleForm);
this.$refs["listForm"].validate((valid) => {
if (valid) {
@@ -675,6 +678,7 @@ export default {
this.$message.success(res.message);
this.$router.push("/processCenter");
}
this.isSubmit = false
});
}
});
@@ -708,9 +712,11 @@ export default {
//选择拆分标准确定事件
OkDrawer() {
if (this.selectedList.length == 1) {
if (this.selectedList.length === 1) {
this.listForm.standNumber = this.selectedList[0].standSortShow + '-' + this.selectedList[0].standNumber + '-' + this.selectedList[0].standYear ;
this.listForm.standName = this.selectedList[0].standName;
this.listForm.XCXSSRQ = this.selectedList[0].xcxssrqgj
this.listForm.ZCCSSRQ = this.selectedList[0].zccssrqgj
this.listForm.id = this.selectedList[0].id;
this.$http.get("SarStandItems/sar-stand-items/findAllItems", {
ids: this.listForm.id,
src/pages/processCenter/pages/creatProcess/xmpg/step2.vue
+2
View File
@@ -341,6 +341,7 @@ export default {
}else{
this.listForm.commentText = this.commentText
const json = JSON.stringify(this.listForm);
this.isSubmit = true
this.$http.post('lawss/activiti/completeTask', {
taskIds: this.taskIds,
userId: this.userId,
@@ -352,6 +353,7 @@ export default {
this.$message.success(res.message)
this.$router.push('/processCenter')
}
this.isSubmit = false
}, e => {
});
}
src/pages/processCenter/pages/creatProcess/xmpg/step3.vue
+46 -48
View File
@@ -57,7 +57,7 @@
</process-title>
<div class="tableTitle">
<div class="tableButton">
<el-button plain class="common-button-primary" size="mini" @click="batchOperation">批量分发落实人</el-button>
<el-button plain class="common-button-primary" size="mini" @click="choiceZRRS('', 2, '')">批量分发落实人</el-button>
</div>
</div>
<el-table
@@ -116,14 +116,13 @@
<span>{{ scope.row.zCCSSRQ ? $moment(scope.row.zCCSSRQ).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column label="落实人" prop="implementer" align="center">
<el-table-column
label="责任人"
width="170"
align="center">
<template slot-scope="scope">
<div v-if="scope.row.implementer == undefined">
{{ "请选择落实人" }}
</div>
<div v-else class="fileClass">
{{ scope.row.implementer || "-" }}
</div>
<el-input v-model="scope.row.implementerId" style="display: none;"/>
<el-input v-model="scope.row.implementer" placeholder="请选择落实人" @click.native="choiceZRRS(scope.row.implementerId, 1, scope.$index)"/>
</template>
</el-table-column>
</el-table>
@@ -260,6 +259,8 @@ export default {
tabValue: "listOfCountries",
selectedList: [], //选择清单的选择框
selectList: [], //选择标准的选择框
lsIndex: '',
lsType: '',
bringData: [],
commentText: "", //填写会签意见
page: 1,
@@ -346,7 +347,7 @@ export default {
taskIds: this.taskIds,
pId: this.pId
}).then(res => {
console.log(res);
console.log(res.mesg)
if (res) {
const processForm = JSON.parse(res.mesg);
this.getFormFieldList(processForm);
@@ -355,11 +356,6 @@ export default {
});
});
},
createItemId() {
return Number(Math.random().toString().substr(3,18) + Date.now()).toString(36);
},
/**
* @description: 动态表单读取
*/
@@ -373,7 +369,6 @@ export default {
for (let i = 0; i < item.pepdtos.length; i++) {
for (let j = 0; j < item.pepdtos[i].breakdownList.length; j++) {
this.listForm.breakdownList.push({
itemId: this.createItemId(),
itemsName: item.pepdtos[i].breakdownList[j].itemsName,
itemNum: item.pepdtos[i].breakdownList[j].itemsNum,
responsibleEngineer: item.pepdtos[i].breakdownList[j].responsibleEngineer,
@@ -395,46 +390,47 @@ export default {
});
}
}
console.log(this.listForm.breakdownList);
},
//批量操作按钮
batchOperation(id) {
if (this.selectList.length === 0) {
this.$message.warning("请至少选择一条数据进行批量分发");
} else {
this.nodeList = [];
this.nodeList.push(id);
this.modalshowflag = true;
checkedRole (data) {
if (this.type === 1) {
this.listForm.breakdownList[this.lsIndex].implementerId = data[0].id
this.listForm.breakdownList[this.lsIndex].implementer = data[0].name
} else if(this.type === 2) {
this.listForm.breakdownList.forEach( item => {
this.selectList.forEach( items => {
if (item === items) {
item.implementerId = data[0].id
item.implementer = data[0].name
}
})
})
}
},
checkedRole(data) {
// 选取负责人时的操作
let mis = [];
let miss = [];
this.selectList.forEach(item => {
item.implementer = data[0].name;
item.implementerId = data[0].id;
mis.push(item.projectNumber);
miss.push(item.itemNum)
});
this.listForm.breakdownList.forEach(item => {
if (!mis.includes(item.projectNumber) && !miss.includes(item.itemsNum)) {
this.selectList.push(item);
}
});
this.listForm.breakdownList = this.selectList;
this.$refs.selection.clearSelection();
this.modalshowflag = false;
this.modalshowflag = false
},
cancleUserInfo() {
this.modalshowflag = false;
},
choiceZRRS(scope) {
if (scope != null) this.dsadadadsada = scope.$index;
this.nodeList = [];
if (this.roleForm.implementer.length > 0) {
this.nodeList = this.roleForm.implementer.split(",");
choiceZRRS (row, type, index) {
this.type = type
if (type === 1) {
this.drawerTitle = '选择责任人'
this.nodeList = []
this.lsIndex = index
this.lsType = type
this.nodeList.push(row)
this.modalshowflag = true
} else if (type === 2) {
// 批量
if (this.selectList.length > 0) {
this.lsType = type
this.nodeList = []
this.modalshowflag = true
this.drawerTitle = '批量选择责任人'
} else {
this.$message.warning('请选择要分发的数据')
}
}
this.modalshowflag2 = true;
},
getTree() {
this.$http.get("SarInstitution/institution/institutionAndUser", {}, {}, res => {
@@ -463,6 +459,7 @@ export default {
this.listForm.approvalOpinion = "";
this.listForm.signFlag = "";
const json = JSON.stringify(this.listForm.breakdownList);
this.isSubmit = true
this.$http.post("lawss/activiti/completeTask", {
taskIds: this.taskIds,
userId: this.userId,
@@ -474,6 +471,7 @@ export default {
this.$message.success(res.message);
this.$router.push("/processCenter");
}
this.isSubmit = false
}, e => {
});
} else {
src/pages/processCenter/pages/creatProcess/xmpg/step4.vue
+2
View File
@@ -493,6 +493,7 @@ export default {
this.listForm.signFlag = "";
this.listForm.dataList = this.dataList;
const json = JSON.stringify(this.listForm);
this.isSubmit = true
this.$http.post("lawss/activiti/completeTask", {
taskIds: this.taskIds,
userId: this.userId,
@@ -504,6 +505,7 @@ export default {
this.$message.success(res.message);
this.$router.push("/processCenter");
}
this.isSubmit = false
}, e => {
});
src/pages/processCenter/pages/creatProcess/xmpg/step5.vue
+2
View File
@@ -480,6 +480,7 @@ export default {
this.listForm.dataList = this.dataList
this.listForm.fenFlag = '2'
const json = JSON.stringify(this.listForm);
this.isSubmit = true
this.$http.post('lawss/activiti/completeTask', {
taskIds: this.taskIds,
userId: this.userId,
@@ -491,6 +492,7 @@ export default {
this.$message.success(res.message)
this.$router.push('/processCenter')
}
this.isSubmit = false
}, e => {
});
}
src/pages/processCenter/pages/creatProcess/xmpg/step6.vue
+2
View File
@@ -455,6 +455,7 @@ export default {
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;
this.listForm.prcCreateUserName = this.$store.getters.userInfo.account;
@@ -475,6 +476,7 @@ export default {
this.$message.success(res.message)
this.$router.push('/processCenter')
}
this.isSubmit = false
}, e => {
});
src/pages/processCenter/pages/creatProcess/xmpg/step7.vue
+2
View File
@@ -463,6 +463,7 @@ export default {
this.listForm.fenFlag = "1";
this.listForm.dataList = this.dataList
const json = JSON.stringify(this.listForm);
this.isSubmit = true
this.$http.post('lawss/activiti/completeTask', {
taskIds: this.taskIds,
userId: this.userId,
@@ -474,6 +475,7 @@ export default {
this.$message.success(res.message)
this.$router.push('/processCenter')
}
this.isSubmit = false
}, e => {
});
src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue
+4
View File
@@ -30,6 +30,7 @@
<el-input
v-model="listForm.projectNumber"
placeholder="请输入项目编号"
disabled
clearable
></el-input>
</el-form-item>
@@ -37,6 +38,7 @@
<el-input
v-model="listForm.projectName"
placeholder="请输入项目名称"
disabled
clearable
></el-input>
</el-form-item>
@@ -232,12 +234,14 @@
<el-input
v-model="projectSearch.projectNumber"
placeholder="请输入项目编号"
disabled
></el-input>
</el-form-item>
<el-form-item label="项目名称" class="search-item search-item-last">
<el-input
v-model="projectSearch.projectName"
placeholder="请输入项目名称"
disabled
></el-input>
</el-form-item>
<el-form-item class="search-item btn-box">
src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue
+2
View File
@@ -30,6 +30,7 @@
<el-input
v-model="listForm.projectNumber"
placeholder="请输入项目编号"
disabled
clearable
></el-input>
</el-form-item>
@@ -37,6 +38,7 @@
<el-input
v-model="listForm.projectName"
placeholder="请输入项目名称"
disabled
clearable
></el-input>
</el-form-item>
src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue
+2
View File
@@ -24,6 +24,7 @@
<el-input
v-model="listForm.projectNumber"
placeholder="请输入项目编号"
disabled
clearable
></el-input>
</el-form-item>
@@ -31,6 +32,7 @@
<el-input
v-model="listForm.projectName"
placeholder="请输入项目名称"
disabled
clearable
></el-input>
</el-form-item>
src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue
+2
View File
@@ -24,6 +24,7 @@
<el-input
v-model="listForm.projectNumber"
placeholder="请输入项目编号"
disabled
clearable
></el-input>
</el-form-item>
@@ -31,6 +32,7 @@
<el-input
v-model="listForm.projectName"
placeholder="请输入项目名称"
disabled
clearable
></el-input>
</el-form-item>
src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue
+2
View File
@@ -24,6 +24,7 @@
<el-input
v-model="listForm.projectNumber"
placeholder="请输入项目编号"
disabled
clearable
></el-input>
</el-form-item>
@@ -31,6 +32,7 @@
<el-input
v-model="listForm.projectName"
placeholder="请输入项目名称"
disabled
clearable
></el-input>
</el-form-item>
src/pages/processCenter/pages/creatProcess/xmpg2/step2.vue
+2
View File
@@ -24,6 +24,7 @@
<el-input
v-model="listForm.projectNumber"
placeholder="请输入项目编号"
disabled
clearable
></el-input>
</el-form-item>
@@ -31,6 +32,7 @@
<el-input
v-model="listForm.projectName"
placeholder="请输入项目名称"
disabled
clearable
></el-input>
</el-form-item>
src/pages/processCenter/pages/creatProcess/xmpg2/step3.vue
+2
View File
@@ -24,12 +24,14 @@
<el-input
v-model="listForm.projectNumber"
placeholder="请输入项目编号"
disabled
clearable
></el-input>
</el-form-item>
<el-form-item label="项目名称" prop="projectName" class="add-form-item form-item-disabled">
<el-input
v-model="listForm.projectName"
disabled
placeholder="请输入项目名称"
clearable
></el-input>
src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue
+2
View File
@@ -24,6 +24,7 @@
<el-input
v-model="listForm.projectNumber"
placeholder="请输入项目编号"
disabled
clearable
></el-input>
</el-form-item>
@@ -31,6 +32,7 @@
<el-input
v-model="listForm.projectName"
placeholder="请输入项目名称"
disabled
clearable
></el-input>
</el-form-item>
src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue
+2
View File
@@ -24,6 +24,7 @@
<el-input
v-model="listForm.projectNumber"
placeholder="请输入项目编号"
disabled
clearable
></el-input>
</el-form-item>
@@ -31,6 +32,7 @@
<el-input
v-model="listForm.projectName"
placeholder="请输入项目名称"
disabled
clearable
></el-input>
</el-form-item>
src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue
+2
View File
@@ -24,6 +24,7 @@
<el-input
v-model="listForm.projectNumber"
placeholder="请输入项目编号"
disabled
clearable
></el-input>
</el-form-item>
@@ -31,6 +32,7 @@
<el-input
v-model="listForm.projectName"
placeholder="请输入项目名称"
disabled
clearable
></el-input>
</el-form-item>
src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue
+2
View File
@@ -24,6 +24,7 @@
<el-input
v-model="listForm.projectNumber"
placeholder="请输入项目编号"
disabled
clearable
></el-input>
</el-form-item>
@@ -31,6 +32,7 @@
<el-input
v-model="listForm.projectName"
placeholder="请输入项目名称"
disabled
clearable
></el-input>
</el-form-item>
src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue
+2
View File
@@ -24,6 +24,7 @@
<el-input
v-model="listForm.projectNumber"
placeholder="请输入项目编号"
disabled
clearable
></el-input>
</el-form-item>
@@ -31,6 +32,7 @@
<el-input
v-model="listForm.projectName"
placeholder="请输入项目名称"
disabled
clearable
></el-input>
</el-form-item>
src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue
+2
View File
@@ -24,6 +24,7 @@
<el-input
v-model="listForm.projectNumber"
placeholder="请输入项目编号"
disabled
clearable
></el-input>
</el-form-item>
@@ -31,6 +32,7 @@
<el-input
v-model="listForm.projectName"
placeholder="请输入项目名称"
disabled
clearable
></el-input>
</el-form-item>
src/pages/processCenter/pages/processDetail/index.vue
+2 -1
View File
@@ -178,6 +178,7 @@ export default {
let row = {...this.detailData[index]}
row.taskIds = row.id
row.taskInfo = row.name
console.log(row.name)
row.tabsName = this.$route.query.tabsName
let prcType = this.detailData[index].prcType // 流程类型
// 判断当前流程是否已全部办理完成
@@ -205,7 +206,7 @@ export default {
this.toProcessDetail('bzqdfbStep4',row)
}else if (prcType === '5'){
//标准项目合规评估 标准维度
if(row.taskInfo === '标准法规部部长审批'){
if(row.taskInfo === '标准法规部领导审核'){
this.toProcessDetail('xmpgStep7',row)
}else{
this.toProcessDetail('xmpgStep2',row)
src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue
+16 -16
View File
@@ -4,22 +4,22 @@
<div class="search-area">
<el-form :inline="true" :model="searchForm" ref="processSearch" class="label-input-form">
<div class="search-area-item">
<el-form-item label="流程名称" class="search-item" @keyup.enter.native="selectProcessBtn">
<el-input
v-model.trim="searchForm.prcName"
placeholder="按流程名称查找"
:maxlength="100"
clearable
></el-input>
</el-form-item>
<el-form-item label="流程编号" class="search-item" @keyup.enter.native="selectProcessBtn">
<el-input
v-model.trim="searchForm.prcNum"
placeholder="按流程编号查找"
:maxlength="100"
clearable
></el-input>
</el-form-item>
<!-- <el-form-item label="流程名称" class="search-item" @keyup.enter.native="selectProcessBtn">-->
<!-- <el-input-->
<!-- v-model.trim="searchForm.prcName"-->
<!-- placeholder="按流程名称查找"-->
<!-- :maxlength="100"-->
<!-- clearable-->
<!-- ></el-input>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="流程编号" class="search-item" @keyup.enter.native="selectProcessBtn">-->
<!-- <el-input-->
<!-- v-model.trim="searchForm.prcNum"-->
<!-- placeholder="按流程编号查找"-->
<!-- :maxlength="100"-->
<!-- clearable-->
<!-- ></el-input>-->
<!-- </el-form-item>-->
<el-form-item label="流程类型" class="search-item" @keyup.enter.native="selectProcessBtn">
<el-select
v-model="searchForm.prcType"
src/pages/regulatoryRepository/nonConfomity/pages/historicalData.vue
+4 -2
View File
@@ -201,7 +201,7 @@
style="width: 100%;"
:model="historySeeForm"
>
<el-form-item class="add-form-item" label="标准编号:">
<el-form-item class="add-form-item" label="标准号:">
<div class="seeItem">{{historySeeForm.standSerialNumber}}</div>
</el-form-item>
<el-form-item class="add-form-item" label="标准名称:">
@@ -232,7 +232,7 @@
<div class="seeItem">{{historySeeForm.qaEngineer}}</div>
</el-form-item>
<el-form-item class="add-form-item" label="要求关闭时间:">
<div class="seeItem">{{historySeeForm.actualCloseTime}}</div>
<div class="seeItem">{{historySeeForm.actualCloseTime ? historySeeForm.actualCloseTime.substring(0, 11) : '-'}}</div>
</el-form-item>
</el-form>
</div>
@@ -566,6 +566,7 @@ export default {
this.$nextTick(() => {
const arr = []
let questionType = []
if (this.historySeeForm.quesType){
questionType = this.historySeeForm.quesType.split(',')
questionType.map((item) => {
this.optionList.map((opr) => {
@@ -576,6 +577,7 @@ export default {
})
})
this.historySeeForm.quesType = arr.toString()
}
})
},
// 分页事件
src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
+15 -12
View File
@@ -5,7 +5,7 @@
<div class="content-top">
<el-form :modal="nonConformitySearch" inline class="label-input-form">
<el-form-item label="标准号/标准名称" class="search-item">
<el-input v-model="nonConformitySearch.standId"
<el-input v-model="nonConformitySearch.standSerialNumber"
placeholder="请输入"
clearable
:maxlength="100"></el-input>
@@ -269,7 +269,7 @@
<div class="seeItem">{{historySeeForm.qaEngineer}}</div>
</el-form-item>
<el-form-item class="add-form-item" label="计划关闭时间:">
<div class="seeItem">{{historySeeForm.planCloseTime}}</div>
<div class="seeItem">{{historySeeForm.planCloseTime ? historySeeForm.planCloseTime.substring(0, 11) : '-'}}</div>
</el-form-item>
</el-form>
</div>
@@ -384,7 +384,7 @@
</div>
<div class="typeitems">
<div class="itemsLeft">验证时间:</div>
<div class="itemsRight">{{(item.validTime ? item.validTime.substring(0, 11): '')}}</div>
<div class="itemsRight">{{(item.validTime ? item.validTime.substring(0, 11) : '')}}</div>
</div>
<div class="typeitems">
<div class="itemsLeft">验证结果:</div>
@@ -430,6 +430,7 @@ export default {
pageNo: 1,
nonConformitySearch: {
standId: '', // 标准号/名称
standSerialNumber:'',
productName: '', // 项目名称
responsibleUnit: '' // 责任部门
},
@@ -591,16 +592,18 @@ export default {
this.$nextTick(() => {
const arr = []
let questionType = []
questionType = this.historySeeForm.quesType.split(',')
questionType.map((item) => {
this.optionList.map((opr) => {
if (item === opr.value) {
item = opr.label
arr.push(item)
}
if (this.historySeeForm.quesType) {
questionType = this.historySeeForm.quesType.split(',')
questionType.map((item) => {
this.optionList.map((opr) => {
if (item === opr.value) {
item = opr.label
arr.push(item)
}
})
})
})
this.historySeeForm.quesType = arr.toString()
this.historySeeForm.quesType = arr.toString()
}
})
},
//点击编辑按钮事件
src/sysConfig/index.js
+2 -2
View File
@@ -6,7 +6,7 @@
// 服务器地址
// const devIp = '10.96.10.171'
// const devInterfacePORT = '9999'
const devIp = '10.96.170.156'
const devIp = '127.0.0.1'
const devInterfacePORT = '9999'
// 云端端口号
const DEV_CLOUD_RES_INTERFACE_PORT = '7777'
@@ -31,7 +31,7 @@ const processPort = '17210'
*****************************************************************/
// 生产环境配置
const prodIp = '62.234.136.153'
const prodInterfacePORT = '8033'
const prodInterfacePORT = '8038'
// 判断环境