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:
yanyizhou
2021-12-21 14:10:53 +08:00
parent 73c1c23f10 8d1400bd91
commit f4c9ab0c1c
14 changed files with 537 additions and 269 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/bzdy/step1.vue
+10 -2
View File
@@ -559,8 +559,16 @@ export default {
this.$refs['Form'].validate((valid) => {
if (valid) {
this.isSubmit = true
this.$http.get('lawss/activiti/startProcess', {
type: '2'
this.$http.get('lawss/activiti/startProcessRollBack', {
id: this.bpnId || '',
createUser: this.$store.getters.userInfo.userId,
createUserName: this.$store.getters.userInfo.userName,
type: '2',
json: JSON.stringify({
form: this.form,
roleForm: this.roleForm,
commentText: this.commentText
})
}, {}, res => {
if (res.ok) {
var json = Object.assign(this.form, this.roleForm)
src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue
+2
View File
@@ -462,6 +462,8 @@ export default {
comityOptionsOne: [],
comityOptionsTwo: [],
comityOptionsTree: [],
comityOpRole: '',
comityOpRoleId: '',
},
comityRoleOptions: [
{value: '0', label: '委员'},
src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue
+33 -4
View File
@@ -113,8 +113,9 @@
</ProcessTitle>
<el-form-item class="add-form-item" label="入会人员:">
<el-input
:disabled="true"
style="width: 30%"
placeholder="请选择入会成员"
style="width: 50%"
@click.native="choiceRole"
v-model="rh_pageData.comityOpRole"
/>
</el-form-item>
@@ -212,6 +213,13 @@
@submit="handleSubmit"
>
</ProcessFooter>
<Role-tree
is-title="选择入会人员"
:is-visible.sync="roleShowflag"
:nodeList="nodeList"
@checkedRole="drawerCheck"
/>
</div>
</template>
@@ -257,7 +265,7 @@ export default {
workPath: '',
comityTel: [],
comityOpRole: '',
comityInRoleId: '',
comityOpRoleId: '',
},
roleForm: {},
commentText: '',
@@ -317,7 +325,6 @@ export default {
getFormFieldList(item) {
this.$nextTick(() => {
this.rh_pageData = JSON.parse(JSON.stringify(item)).rh_pageData
this.rh_pageData.comityOpRole = this.$store.getters.userInfo.userName
this.roleForm = JSON.parse(JSON.stringify(item)).roleList
this.infoSourcesLength = this.rh_pageData.infoSources.length
// this.rh_pageData.comityFileNum = this.fileTextList
@@ -371,6 +378,28 @@ export default {
window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
}
},
/** 选择入会人员 */
choiceRole(id) {
this.nodeList = []
this.nodeList.push(id)
this.roleShowflag = true
},
drawerCheck(data) {
var idList = ''
var nameList = ''
data.forEach(item => {
if (nameList.length > 0) {
nameList += ','
idList += ','
}
idList += item.id;
nameList += item.name;
})
this.rh_pageData.comityOpRole = nameList
this.rh_pageData.comityOpRoleId = idList
this.roleShowflag = false
},
// 退回按钮
handleSubmitNo() {
if (this.commentText === '') {
src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue
+18 -3
View File
@@ -78,8 +78,8 @@
<el-form-item class="add-form-item" label="会议时间:">
<el-date-picker
v-model="ch_pageData.meetingStartTime"
type="date"
value-format="yyyy-MM-dd"
type="datetime"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="选择日期时间"
align="right">
</el-date-picker>
@@ -452,7 +452,22 @@ export default {
type: 0
}
workGroup(type).then(res => {
this.ch_pageData.associaOptionsOne = res.data.children
if (res.data.children !== null) {
this.ch_pageData.associaOptionsOne = res.data.children
this.ch_pageData.associaName = this.ch_pageData.associaOptionsOne[0].id
this.ch_pageData.associaOptionsOne.forEach(item => {
if (item.children !== null && item.id === this.ch_pageData.associaName) {
this.ch_pageData.associaOptionsTwo = item.children
this.ch_pageData.associaNameOne = this.ch_pageData.associaOptionsTwo[0].id
}
})
this.ch_pageData.associaOptionsTwo.forEach(item => {
if (item.children !== null && item.id === this.ch_pageData.associaNameOne) {
this.ch_pageData.associaOptionsTree = item.children
this.ch_pageData.associaNameTwo = this.ch_pageData.associaOptionsTree[0].id
}
})
}
})
},
methods: {
src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
+12 -2
View File
@@ -1185,8 +1185,18 @@ export default {
this.$message.warning('请选择责任人')
} else {
this.isSubmit = true
this.$http.get('lawss/activiti/startProcess', {
type: '9'
this.$http.post('lawss/activiti/startProcessRollBack', {
id: this.bpnId || '',
createUser: this.$store.getters.userInfo.userId,
createUserName: this.$store.getters.userInfo.userName,
type: '9',
json: JSON.stringify({
form: this.form,
roleForm: this.roleForm,
commentText: this.commentText,
itemList: this.itemList,
sarType: this.sarType
})
}, {}, res => {
if (res.ok) {
var json = Object.assign(this.form, this.roleForm)
src/pages/processCenter/pages/creatProcess/bzjd/step2.vue
+25 -8
View File
@@ -140,7 +140,16 @@
label="在产车型实施日期"
align="center">
</el-table-column>
<el-table-column
prop="applyArctic"
width="200"
label="适用车型"
show-overflow-tooltip
align="center">
<template slot-scope="scope">
{{ scope.row.applyArctic.toString() }}
</template>
</el-table-column>
<el-table-column
label="执行人"
width="170"
@@ -387,15 +396,23 @@
if (this.type === 1) {
this.itemList[this.zxIndex].zxUserId = data[0].id
this.itemList[this.zxIndex].zxUserIdName = data[0].name
let row = JSON.parse(JSON.stringify(this.itemList[this.zxIndex]))
row.zxUserId = data[0].id
row.zxUserIdName = data[0].name
this.$set(this.itemList, this.zxIndex, row)
} else {
this.itemList.forEach( item => {
this.zxIdList.forEach( items => {
if (item.id === items) {
item.zxUserId = data[0].id
item.zxUserIdName = data[0].name
for (let a = 0; a < this.itemList.length; a++) {
for (let b = 0; b < this.zxIdList.length; b++) {
if (this.itemList[a].id === this.zxIdList[b]) {
this.itemList[a].zxUserId = data[0].id
this.itemList[a].zxUserIdName = data[0].name
let row = JSON.parse(JSON.stringify(this.itemList[a]))
row.zxUserId = data[0].id
row.zxUserIdName = data[0].name
this.$set(this.itemList, a, row)
}
})
})
}
}
}
this.modalshowflag = false
},
src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
+101 -133
View File
@@ -178,7 +178,7 @@
<el-table-column
label="责任人"
width="170"
prop="zrUserIdName"
prop="zrUserName"
show-overflow-tooltip
align="center">
</el-table-column>
@@ -292,27 +292,27 @@
size="800px">
<div class="demo-drawer-content">
<el-form :model="plForm" class="label-input-form" ref="plForm" label-width=150>
<el-form-item label="核心技术要求" prop="technicalRequir" class="add-form-item" v-if="!form.itemsNum1">
<el-input
v-model="plForm.technicalRequir"
placeholder="请输入核心技术要求"
maxlength="500"
></el-input>
</el-form-item>
<el-form-item label="国内标准的差异点" prop="changePoint" class="add-form-item" v-if="sarType !== 'INLAND' && form.itemsNum1">
<el-input
v-model="plForm.changePoint"
placeholder="请输入国内标准的差异点"
maxlength="500"
></el-input>
</el-form-item>
<el-form-item label="上一版本差异点" prop="changePoint" class="add-form-item" v-if="sarType === 'INLAND' && form.itemsNum1">
<el-input
v-model="plForm.changePoint"
placeholder="请输入上一版本差异点"
maxlength="500"
></el-input>
</el-form-item>
<!-- <el-form-item label="核心技术要求" prop="technicalRequir" class="add-form-item" v-if="!form.itemsNum1">-->
<!-- <el-input-->
<!-- v-model="plForm.technicalRequir"-->
<!-- placeholder="请输入核心技术要求"-->
<!-- maxlength="500"-->
<!-- ></el-input>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="国内标准的差异点" prop="changePoint" class="add-form-item" v-if="sarType !== 'INLAND' && form.itemsNum1">-->
<!-- <el-input-->
<!-- v-model="plForm.changePoint"-->
<!-- placeholder="请输入国内标准的差异点"-->
<!-- maxlength="500"-->
<!-- ></el-input>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="上一版本差异点" prop="changePoint" class="add-form-item" v-if="sarType === 'INLAND' && form.itemsNum1">-->
<!-- <el-input-->
<!-- v-model="plForm.changePoint"-->
<!-- placeholder="请输入上一版本差异点"-->
<!-- maxlength="500"-->
<!-- ></el-input>-->
<!-- </el-form-item>-->
<el-form-item label="符合性要求" prop="complianceRequir" class="add-form-item" >
<el-select
v-model="plForm.complianceRequir"
@@ -328,21 +328,21 @@
maxlength="500"
></el-input>
</el-form-item>
<custom-date-pick-group
class="myDataPick"
:config="{attrName: '新车型实施日期'}"
v-model="plForm.newData"
></custom-date-pick-group>
<custom-date-pick-group
class="myDataPick"
:config="{attrName: '在产车实施日期'}"
v-model="plForm.onlineData"
></custom-date-pick-group>
<el-form-item label="适用车型" prop="applyArctic" class="add-form-item" >
<el-select multiple v-model="plForm.applyArctic">
<el-option v-for="(item,index) in cxList" :value="item.label" :label="item.label" :key="index"></el-option>
</el-select>
</el-form-item>
<!-- <custom-date-pick-group-->
<!-- class="myDataPick"-->
<!-- :config="{attrName: '新车型实施日期'}"-->
<!-- v-model="plForm.newData"-->
<!-- ></custom-date-pick-group>-->
<!-- <custom-date-pick-group-->
<!-- class="myDataPick"-->
<!-- :config="{attrName: '在产车实施日期'}"-->
<!-- v-model="plForm.onlineData"-->
<!-- ></custom-date-pick-group>-->
<!-- <el-form-item label="适用车型" prop="applyArctic" class="add-form-item" >-->
<!-- <el-select multiple v-model="plForm.applyArctic">-->
<!-- <el-option v-for="(item,index) in cxList" :value="item.label" :label="item.label" :key="index"></el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
</el-form>
</div>
<div id="roleFormButton2" class="demo-drawer-footer">
@@ -358,27 +358,27 @@
<div class="demo-drawer-content">
<el-form :model="editForm" class="label-input-form" ref="plForm" label-width=150>
<el-button style="margin: 10px 0 0 10px;" class="common-button-primary" size="mini" type="primary" @click="checkBD(editForm.itemsId, editForm.itemsId2)">查看比对</el-button>
<el-form-item label="核心技术要求" prop="technicalRequir" class="add-form-item" v-if="!form.itemsNum1">
<el-input
v-model="editForm.technicalRequir"
placeholder="请输入核心技术要求"
maxlength="500"
></el-input>
</el-form-item>
<el-form-item label="国内标准的差异点" prop="changePoint" class="add-form-item" v-if="sarType !== 'INLAND' && form.itemsNum1">
<el-input
v-model="editForm.changePoint"
placeholder="请输入国内标准的差异点"
maxlength="500"
></el-input>
</el-form-item>
<el-form-item label="上一版本差异点" prop="changePoint" class="add-form-item" v-if="sarType === 'INLAND' && form.itemsNum1">
<el-input
v-model="editForm.changePoint"
placeholder="请输入上一版本差异点"
maxlength="500"
></el-input>
</el-form-item>
<!-- <el-form-item label="核心技术要求" prop="technicalRequir" class="add-form-item" v-if="!form.itemsNum1">-->
<!-- <el-input-->
<!-- v-model="editForm.technicalRequir"-->
<!-- placeholder="请输入核心技术要求"-->
<!-- maxlength="500"-->
<!-- ></el-input>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="国内标准的差异点" prop="changePoint" class="add-form-item" v-if="sarType !== 'INLAND' && form.itemsNum1">-->
<!-- <el-input-->
<!-- v-model="editForm.changePoint"-->
<!-- placeholder="请输入国内标准的差异点"-->
<!-- maxlength="500"-->
<!-- ></el-input>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="上一版本差异点" prop="changePoint" class="add-form-item" v-if="sarType === 'INLAND' && form.itemsNum1">-->
<!-- <el-input-->
<!-- v-model="editForm.changePoint"-->
<!-- placeholder="请输入上一版本差异点"-->
<!-- maxlength="500"-->
<!-- ></el-input>-->
<!-- </el-form-item>-->
<el-form-item label="符合性要求" prop="complianceRequir" class="add-form-item" >
<el-select
v-model="editForm.complianceRequir"
@@ -394,21 +394,21 @@
maxlength="500"
></el-input>
</el-form-item>
<custom-date-pick-group
class="myDataPick"
:config="{attrName: '新车型实施日期'}"
v-model="editForm.newData"
></custom-date-pick-group>
<custom-date-pick-group
class="myDataPick"
:config="{attrName: '在产车实施日期'}"
v-model="editForm.onlineData"
></custom-date-pick-group>
<el-form-item label="适用车型" prop="applyArctic" class="add-form-item" >
<el-select multiple v-model="editForm.applyArctic">
<el-option v-for="(item,index) in cxList" :value="item.label" :label="item.label" :key="index"></el-option>
</el-select>
</el-form-item>
<!-- <custom-date-pick-group-->
<!-- class="myDataPick"-->
<!-- :config="{attrName: '新车型实施日期'}"-->
<!-- v-model="editForm.newData"-->
<!-- ></custom-date-pick-group>-->
<!-- <custom-date-pick-group-->
<!-- class="myDataPick"-->
<!-- :config="{attrName: '在产车实施日期'}"-->
<!-- v-model="editForm.onlineData"-->
<!-- ></custom-date-pick-group>-->
<!-- <el-form-item label="适用车型" prop="applyArctic" class="add-form-item" >-->
<!-- <el-select multiple v-model="editForm.applyArctic">-->
<!-- <el-option v-for="(item,index) in cxList" :value="item.label" :label="item.label" :key="index"></el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
</el-form>
</div>
<div id="roleFormButton3" class="demo-drawer-footer">
@@ -485,13 +485,13 @@
applyArctic: '', // 适用车型
},
editForm: {
technicalRequir: '', // 核心技术要求
changePoint: '', // 国内标准的差异点
// technicalRequir: '', // 核心技术要求
// changePoint: '', // 国内标准的差异点
complianceRequir: '1', // 符合性要求
complianceState: '', // 合规性分析
newData: '', // 新车型实施日期
onlineData: '', // 在产车实施日期
applyArctic: '', // 适用车型
// newData: '', // 新车型实施日期
// onlineData: '', // 在产车实施日期
// applyArctic: '', // 适用车型
itemsId: '',
},
modalshowflag: false,
@@ -580,13 +580,13 @@
this.itemId = row.id
this.modalshowflag2 = true
this.editForm = {
technicalRequir: row.technicalRequir, // 核心技术要求
changePoint: row.changePoint, // 国内标准的差异点
// technicalRequir: row.technicalRequir, // 核心技术要求
// changePoint: row.changePoint, // 国内标准的差异点
complianceRequir: row.complianceRequir || '1', // 符合性要求
complianceState: row.complianceState, // 合规性分析
newData: row.newData, // 新车型实施日期
onlineData: row.onlineData, // 在产车实施日期
applyArctic: row.applyArctic, // 适用车型
// newData: row.newData, // 新车型实施日期
// onlineData: row.onlineData, // 在产车实施日期
// applyArctic: row.applyArctic, // 适用车型
itemsId: row.itemsId,
itemsId2: row.itemsId2
}
@@ -594,13 +594,13 @@
saveUserInfo2 () {
for( let a = 0; a < this.itemList.length; a++) {
if (this.itemList[a].id === this.itemId) {
this.itemList[a].technicalRequir = this.editForm.technicalRequir
this.itemList[a].changePoint = this.editForm.changePoint
// this.itemList[a].technicalRequir = this.editForm.technicalRequir
// this.itemList[a].changePoint = this.editForm.changePoint
this.itemList[a].complianceRequir = this.editForm.complianceRequir
this.itemList[a].complianceState = this.editForm.complianceState
this.itemList[a].newData = this.editForm.newData
this.itemList[a].onlineData = this.editForm.onlineData
this.itemList[a].applyArctic = this.editForm.applyArctic
// this.itemList[a].newData = this.editForm.newData
// this.itemList[a].onlineData = this.editForm.onlineData
// this.itemList[a].applyArctic = this.editForm.applyArctic
}
}
this.modalshowflag2 = false
@@ -663,13 +663,13 @@
for( let a = 0; a < this.itemList.length; a++) {
for ( let b = 0; b < this.idList.length; b++) {
if (this.itemList[a].id === this.idList[b]) {
this.itemList[a].technicalRequir = this.plForm.technicalRequir
this.itemList[a].changePoint = this.plForm.changePoint
// this.itemList[a].technicalRequir = this.plForm.technicalRequir
// this.itemList[a].changePoint = this.plForm.changePoint
this.itemList[a].complianceRequir = this.plForm.complianceRequir
this.itemList[a].complianceState = this.plForm.complianceState
this.itemList[a].newData = this.plForm.newData
this.itemList[a].onlineData = this.plForm.onlineData
this.itemList[a].applyArctic = this.plForm.applyArctic
// this.itemList[a].newData = this.plForm.newData
// this.itemList[a].onlineData = this.plForm.onlineData
// this.itemList[a].applyArctic = this.plForm.applyArctic
}
}
}
@@ -686,7 +686,7 @@
this.plForm.complianceState = ''
this.plForm.newData = ''
this.plForm.onlineData = ''
this.plForm.applyArctic = ''
this.plForm.applyArctic = []
this.modalshowflag = true
} else {
this.$message.warning('请选择要编辑的数据')
@@ -735,51 +735,14 @@
handleSubmit() {
this.$refs['bzzqyjForm'].validate((valid) => {
if (valid) {
let num1 = 0, num2 = 0, num3 = 0, num4 = 0, num5 = 0, num6 = 0
let num3 = 0
for (let a = 0; a < this.itemList.length; a++) {
if (!this.itemList[a].technicalRequir) {
num1++
}
if (!this.itemList[a].changePoint) {
num2++
}
if (!this.itemList[a].complianceRequir) {
num3++
}
if (!this.itemList[a].newData) {
num4++
}
if (!this.itemList[a].onlineData) {
num5++
}
if (!this.itemList[a].applyArctic) {
num6++
}
}
if (!this.form.itemsNum1) {
if (num1 > 0) {
this.$message.warning('请输入核心技术要求')
return
}
} else {
if (num2 > 0) {
if (this.sarType === 'INLAND') {
this.$message.warning('请输入国内标准的差异点')
return
} else {
this.$message.warning('请输入基于上一版本差异')
return
}
}
}
if (num3 > 0) {
this.$message.warning('请输入符合性要求')
} else if (num4 > 0) {
this.$message.warning('请输入新车型实施日期')
} else if (num5 > 0) {
this.$message.warning('请输入在产车实施日期')
} else if (num6 > 0) {
this.$message.warning('请选择适用车型')
} else {
this.isSubmit = true
var json = this.json
@@ -836,6 +799,7 @@
} else {
itemList = data.itemList
}
console.log(itemList);
itemList.forEach(item => {
item.unitDeptName = this.$store.getters.userInfo.institutionName
item.onlineData = item.onlineData || ''
@@ -846,7 +810,11 @@
item.changePoint = item.changePoint || ''
item.technicalRequir = item.technicalRequir || ''
item.itemsTitle = item.itermsConditions
item.applyArctic = item.applyArctic || []
if (typeof (item.applyArctic) === 'string') {
item.applyArctic = JSON.parse(item.applyArctic) || []
} else {
item.applyArctic = item.applyArctic || []
}
})
this.getBDList()
this.itemList = itemList
src/pages/processCenter/pages/creatProcess/bzjd/step4.vue
+1 -1
View File
@@ -171,7 +171,7 @@
<el-table-column
label="责任人"
width="170"
prop="zrUserIdName"
prop="zrUserName"
align="center">
</el-table-column>
<el-table-column
src/pages/processCenter/pages/creatProcess/bzjd/step5.vue
+1 -1
View File
@@ -171,7 +171,7 @@
<el-table-column
label="责任人"
width="170"
prop="zrUserIdName"
prop="zrUserName"
align="center">
</el-table-column>
<el-table-column
src/pages/processCenter/pages/creatProcess/bzjd/step6.vue
+1 -1
View File
@@ -172,7 +172,7 @@
<el-table-column
label="责任人"
width="170"
prop="zrUserIdName"
prop="zrUserName"
align="center">
</el-table-column>
<el-table-column
src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue
+10 -2
View File
@@ -617,7 +617,7 @@ export default {
window.open('/static/pdf/phone/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id))
},
addfjList() {
this.$http.get('lawss/sarStandFile/queryFileInfo', {
this.$http.get('lawss/sarStandFile/querySourceFileInfo', {
standId: this.form.standId
}, {
_this: this
@@ -830,7 +830,15 @@ export default {
if (valid) {
this.isSubmit = true
this.$http.get('lawss/activiti/startProcess', {
type: '3'
id: this.bpnId || '',
createUser: this.$store.getters.userInfo.userId,
createUserName: this.$store.getters.userInfo.userName,
type: '3',
json: JSON.stringify({
form: this.form,
roleForm: this.roleForm,
commentText: this.commentText
})
}, {}, res => {
if (res.ok) {
var json = Object.assign(this.form, this.roleForm)
src/pages/processCenter/pages/creatProcess/qbrk/step1.vue
+2 -2
View File
@@ -977,7 +977,7 @@
width = "500"
:data="standSystemOptions"
:defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys"
:nodeKey="nodeKey" @popoverHide="popoverHide"></tree-select-new>
:nodeKey="nodeKey" @popoverHide="popoverHide" @popoverHideCancel="popoverHideCancel"></tree-select-new>
<tree-select-new
width = "500"
:lazy=true
@@ -988,7 +988,7 @@
:url="url"
:urlChild="urlChild"
:defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys1"
:nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs"></tree-select-new>
:nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs" @popoverHideCancel="popoverHideBusVsCancel"></tree-select-new>
</div>
</template>
src/pages/processCenter/pages/creatProcess/xmpg/step3.vue
+273 -63
View File
@@ -10,13 +10,13 @@
<div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
</div>
<div class="content" v-show="active === '1'">
<div style="flex: auto; overflow: auto">
<div style=" overflow: auto">
<process-title>
<template slot="title">基础信息</template>
</process-title>
<el-collapse-transition>
<el-form
v-if="foldFormFlag === false"
<div class="prc-content-border" v-if="foldFormFlag === false">
<el-form
:model="listForm"
class="label-input-form prc-content-border"
label-width="150px"
@@ -72,6 +72,7 @@
</el-col>
</el-row>
</el-form>
</div>
</el-collapse-transition>
<el-button v-if="foldFormFlag === false" style="width: 100%" icon="el-icon-caret-top" @click="foldForm">隐藏基础信息</el-button>
<el-button v-if="foldFormFlag === true" style="width: 100%" icon="el-icon-caret-bottom" @click="foldForm">展开基础信息</el-button>
@@ -136,13 +137,18 @@
</process-title>
<div class="tableTitle">
<div class="tableButton">
<el-button plain class="common-button-primary" size="mini" @click="choiceZRRS('', 2, '')">批量分发落实人
<el-button class="common-button-primary" plain size="mini" @click="addProject">添加
</el-button>
<el-button plain class="common-button-primary" type="primary" size="mini" @click="deleteList">批量删除
</el-button>
<el-button plain class="common-button-primary" type="primary" size="mini" @click="choiceZRRS('', 2, '')">
批量分发落实人
</el-button>
</div>
</div>
<el-table
ref="multipleTable"
:data="listForm.breakdownList.slice((currentPage - 1) * pageSize, currentPage * pageSize ) "
:data="breakdownList"
style="width: 100%; border: 1px solid #cccccc;height: 400px"
height="48%"
border
@@ -220,14 +226,14 @@
</template>
</el-table-column>
</el-table>
<el-pagination
layout="total,sizes, prev, pager, next"
background
:page-sizes="[20, 40, 60]"
:total="total"
@current-change="handleCurrentChange"
>
</el-pagination>
<!-- <el-pagination-->
<!-- layout="total,sizes, prev, pager, next"-->
<!-- background-->
<!-- :page-sizes="[20, 40, 60]"-->
<!-- :total="total"-->
<!-- @size-change="handleSizeChange"-->
<!-- @current-change="handleCurrentChange"-->
<!-- />-->
<!-- 选择责任人-->
<Role-tree
is-title="选择落实人"
@@ -305,7 +311,102 @@
<loading :loading="loading">流程列表加载中</loading>
</div>
</div>
<!-- 添加项目抽屉-->
<el-drawer
title="添加项目"
:visible.sync="projectModel"
size="900px"
custom-class="demo-drawer"
>
<div class="demo-drawer-content">
<div style="position: absolute;bottom: 48px;top:60px;left: 0;right: 0">
<div style="position: absolute;bottom: 55px;top: 0;right: 0;left: 0">
<div class="left">
<el-form :modal="standardSearch" :inline="true" class="label-input-form"
style="margin-left:10px">
<el-form-item label="项目编号" class="search-item search-item-last">
<el-input
v-model="standardSearch.projectNumber"
placeholder="请输入项目编号"
></el-input>
</el-form-item>
<el-form-item label="项目名称" class="search-item search-item-last">
<el-input
v-model="standardSearch.projectName"
placeholder="请输入项目名称"
></el-input>
</el-form-item>
<el-form-item class="search-item btn-box">
<el-button
type="primary"
class="common-button-primary"
size="small"
@click="getProject">
查询
</el-button>
</el-form-item>
<el-form-item class="search-item btn-box">
<el-button
class="common-button-default"
size="small"
@click="clearStandSearch">清空
</el-button>
</el-form-item>
</el-form>
</div>
<el-table
:data="projectData"
tooltip-effect="dark"
style="width: 100%"
border
ref="table"
height="100%"
:header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"
@selection-change="selectThree"
>
<el-table-column
type="selection"
width="55"
align="center">
</el-table-column>
<el-table-column
prop="productLine"
align="center"
label="产品线"
/>
<el-table-column
prop="projectName"
min-width="300"
align="center"
label="项目名称"
/>
<el-table-column
prop="projectNumber"
align="center"
label="项目编号"
/>
<el-table-column
prop="projectGroup"
align="center"
label="项目群"
/>
</el-table>
</div>
<pagination
:page="pageNo"
:pageSize="pageSizeNo"
:total="totalNo"
@pageChange="pageChangeNo"
@pageSizeChange="pageSizeChangeNo"
/>
</div>
</div>
<div class="demo-drawer-footer">
<el-button size="mini" @click="cancelStand">取消</el-button>
<el-button type="primary" size="mini" @click="okStand">添加</el-button>
</div>
</el-drawer>
<ProcessFooter
show-save
show-transfer
@@ -333,7 +434,7 @@
import ProcessHeader from "../../components/ProcessHeader";
import ProcessFooter from "../../components/ProcessFooter";
import ProcessTitle from "../../components/ProcessTitle";
import { inboundLiaisonDetail, saveTaskForPub, changeAssigneeNew } from "api/process";
import { changeAssigneeNew, inboundLiaisonDetail, saveTaskForPub } from "api/process";
export default {
name: "xmpgStep3",
@@ -344,6 +445,22 @@ export default {
},
data() {
return {
projectModel: false,
projectData: [],
projectLineId: [],
projectJson: {},
totalNo: 0,
selectProject: [],
//查询添加标准相关数据
standardSearch: {
projectNumber: "",
projectName: "",
pageNo: 1,
pageSizeNo: this.$store.getters.userInfo.configContent
},
breakdownList: [],
pageNo: 1,
pageSizeNo: this.$store.getters.userInfo.configContent,
//折叠的标志，true为折叠，false为不折叠
foldFormFlag: false,
currentPage: 1,
@@ -520,6 +637,9 @@ export default {
handleCurrentChange(currentPage) {
this.currentPage = currentPage;
},
handleSizeChange(pageSize) {
this.pageSize = pageSize;
},
getData() {
return new Promise((resolve, reject) => {
inboundLiaisonDetail({
@@ -539,53 +659,143 @@ export default {
*/
getFormFieldList(item) {
console.log(item);
this.projectJson = JSON.parse(JSON.stringify(item));
this.listForm = JSON.parse(JSON.stringify(item));
if (item.form === undefined) {
this.listForm.prcNum = this.prcNum;
this.listForm.prcName = this.prcName;
this.listForm["id"] = item.id;
this.listForm = JSON.parse(JSON.stringify(item.pepdtos[0]));
this.listForm.breakdownList = [];
for (let i = 0; i < item.pepdtos.length; i++) {
for (let j = 0; j < item.pepdtos[i].breakdownList.length; j++) {
if (item.pepdtos[i].xcxssrq === null) {
item.pepdtos[i].xcxssrq = "";
}
if (item.pepdtos[i].zccssrq === null) {
item.pepdtos[i].zccssrq = "";
}
this.listForm.breakdownList.push({
itemsName: item.pepdtos[i].breakdownList[j].itemsName,
itemNum: item.pepdtos[i].breakdownList[j].itemsNum,
technicalRequir: item.pepdtos[i].breakdownList[j].technicalRequir,
changePoint: item.pepdtos[i].breakdownList[j].changePoint,
responsibleEngineer: item.pepdtos[i].breakdownList[j].responsibleEngineer,
responsibleUnit: item.pepdtos[i].breakdownList[j].responsibleUnit,
productLine: item.pepdtos[i].sarStandProjectLibraries.productLine,
projectNumber: item.pepdtos[i].sarStandProjectLibraries.projectNumber,
projectName: item.pepdtos[i].sarStandProjectLibraries.projectName,
implementer: item.pepdtos[i].breakdownList[j].implementer || null,
distributePerson: item.pepdtos[i].distributePerson,
distributePersonId: item.pepdtos[i].distributePersonId,
uname: item.pepdtos[i].uname,
projectManager: item.pepdtos[i].projectManager,
certifiedEngineerName: item.pepdtos[i].certifiedEngineerName,
qualityEngineerName: item.pepdtos[i].qualityEngineerName,
standNumber: item.pepdtos[i].standNumber,
standName: item.pepdtos[i].standName,
id: item.pepdtos[0].id,
xcxssrq: item.pepdtos[i].XCXSSRQ,
zccssrq: item.pepdtos[i].ZCCSSRQ
});
this.total = this.listForm.breakdownList.length
}
}
let projectLineList = item.pepdtos[0].dataList;
let ids = []
projectLineList.forEach(item => {
ids.push(item.productLine);
});
this.projectLineId = ids.join(',')
this.getProject();
} else {
this.listForm = item.form;
this.listForm.breakdownList = item.form.breakdownList;
this.breakdownList = item.form.breakdownList;
}
},
getProject() {
this.$http.get("sarStandProjectLibrary/queryProjectUnderLine", {
productLine: this.projectLineId,
current: this.pageNo,
PageSize: this.pageSizeNo,
projectName: this.standardSearch.projectName,
projectNumber: this.standardSearch.projectNumber
}, {
_this: this
}, res => {
this.projectData = res.data.records;
this.totalNo = res.data.total;
});
},
clearStandSearch() {
this.standardSearch = {
projectName: "",
projectNumber: ""
};
this.getProject();
},
okStand() {
if (!this.selectProject.length) {
this.$message.warning("请至少选择一条产品线进行添加");
} else {
let proList = this.projectJson.pepdtos[0].dataList;
this.selectProject.map(item => {
proList.forEach(items => {
if (item.productLine === items.productLine) {
items.sarStandProjectLibraries.push(item);
}
});
});
this.projectJson.pepdtos[0].dataList = proList;
this.$http.post("activityData/backData", {
json: JSON.stringify(this.projectJson.pepdtos[0])
}, {
_this: this
}, res => {
let item = JSON.parse(res.data);
for (let i = 0; i < item.pepdtos.length; i++) {
for (let j = 0; j < item.pepdtos[i].breakdownList.length; j++) {
if (item.pepdtos[i].xcxssrq === null) {
item.pepdtos[i].xcxssrq = "";
}
if (item.pepdtos[i].zccssrq === null) {
item.pepdtos[i].zccssrq = "";
}
this.breakdownList.push({
itemsName: item.pepdtos[i].breakdownList[j].itemsName,
itemNum: item.pepdtos[i].breakdownList[j].itemsNum,
technicalRequir: item.pepdtos[i].breakdownList[j].technicalRequir,
changePoint: item.pepdtos[i].breakdownList[j].changePoint,
responsibleEngineer: item.pepdtos[i].breakdownList[j].responsibleEngineer,
responsibleUnit: item.pepdtos[i].breakdownList[j].responsibleUnit,
productLine: item.pepdtos[i].sarStandProjectLibraries.productLine,
projectNumber: item.pepdtos[i].sarStandProjectLibraries.projectNumber,
projectName: item.pepdtos[i].sarStandProjectLibraries.projectName,
implementer: item.pepdtos[i].breakdownList[j].implementer || null,
distributePerson: item.pepdtos[i].distributePerson,
distributePersonId: item.pepdtos[i].distributePersonId,
uname: item.pepdtos[i].uname,
projectManager: item.pepdtos[i].projectManager,
certifiedEngineerName: item.pepdtos[i].certifiedEngineerName,
qualityEngineerName: item.pepdtos[i].qualityEngineerName,
standNumber: item.pepdtos[i].standNumber,
standName: item.pepdtos[i].standName,
id: item.pepdtos[0].id,
xcxssrq: item.pepdtos[i].XCXSSRQ,
zccssrq: item.pepdtos[i].ZCCSSRQ
});
this.total = this.breakdownList.length;
}
}
});
this.projectModel = false;
}
},
//批量删除
deleteList() {
if (!this.selectList.length) {
this.$message.warning("请至少选择一条数据进行删除");
} else {
this.$confirm("您确认删除这些数据?", "提示", {
confirmButtonText: "确认",
confirmButtonClass: "common-button-primary",
cancelButtonText: "取消",
type: "warning"
}).then(() => {
let exits = [];
this.selectList.map(item => {
let index;
index = this.breakdownList.findIndex(items => {
return items.itemsName === item.itemsName;
});
if (index > -1) {
this.breakdownList.splice(index, 1);
}
exits.push(item);
});
this.selectList = [];
}).catch(() => {
});
}
},
cancelStand() {
this.projectModel = false;
},
pageChangeNo(page) {
this.pageNo = page;
this.getProject();
},
pageSizeChangeNo(pageSize) {
this.pageSizeNo = pageSize;
this.getProject();
},
checkedRole(data) {
var idList = "";
var nameList = "";
@@ -598,10 +808,10 @@ export default {
nameList += item.name;
});
if (this.type === 1) {
this.listForm.breakdownList[this.lsIndex].implementerId = idList;
this.listForm.breakdownList[this.lsIndex].implementer = nameList;
this.breakdownList[this.lsIndex].implementerId = idList;
this.breakdownList[this.lsIndex].implementer = nameList;
} else if (this.type === 2) {
this.listForm.breakdownList.forEach(item => {
this.breakdownList.forEach(item => {
this.selectStandList.forEach(items => {
if (item === items) {
item.implementerId = idList;
@@ -613,20 +823,20 @@ export default {
}
this.modalshowflag = false;
},
cancleUserInfo() {
this.modalshowflag = false;
addProject() {
this.projectModel = true;
},
choiceZRRS(row, type, index) {
this.selectStandList = this.selectList
this.selectStandList = this.selectList;
this.type = type;
if (type === 1) {
this.drawerTitle = "选择责任人";
this.nodeList = [];
this.lsIndex = index;
this.lsType = type;
if(row.implementerId){
if (row.implementerId) {
this.nodeList = row.implementerId.split(",");
}else{
} else {
this.nodeList.push(row);
}
this.modalshowflag = true;
@@ -678,9 +888,9 @@ export default {
//提交事件
handleSubmit() {
let standList = []
this.listForm.breakdownList.forEach(item => {
this.breakdownList.forEach(item => {
if (item.implementer) {
standList.push(item)
standList.push(item);
}
});
this.listForm.breakdownList = standList
@@ -722,8 +932,8 @@ export default {
console.log(data);
this.selectList = data;
},
selectThree() {
selectThree(data) {
this.selectProject = data;
},
pageChange(page) {
this.page = page;
src/pages/processCenter/pages/creatProcess/zcrk/step1.vue
+48 -47
View File
@@ -162,10 +162,10 @@
></el-option>
</el-select>
</el-form-item>
<el-form-item v-show="verifySarStandard" label="适用车型" prop="lawsSyqy" class="add-form-item form-item-disabled">
<el-select :popper-append-to-body="false" v-model="form.lawsSyqy" multiple placeholder="请选择适用车型">
<el-form-item v-show="verifySarStandard" label="适用车型" prop="lawsSycx" class="add-form-item form-item-disabled">
<el-select :popper-append-to-body="false" v-model="form.lawsSycx" multiple placeholder="请选择适用车型">
<el-option
v-for="item in lawsSyqyOptions"
v-for="item in lawsSycxOptions"
placeholder="请选择适用车型"
:key="item.value"
:value="item.value"
@@ -467,36 +467,6 @@
<!-- style="position:absolute;top: 10px;right: 0;"-->
<!-- @click="selectLaws('dtbjh'),config.attrName = '代替标准号'"-->
<!-- >{{'手动查找'}}</el-button>-->
</el-form-item>
<el-form-item label="引用标准&政策" prop="YYBZZCLAWS" class="add-form-item form-item-disabled">
<el-input
v-model="form.YYBZZCLAWS"
placeholder="请输入引用标准&政策"
clearable
></el-input>
</el-form-item>
<!-- <el-form-item label="相关流程" prop="xglc" class="add-form-item form-item-disabled">-->
<!-- <el-input-->
<!-- v-model="form.xglc"-->
<!-- placeholder="请输入相关流程"-->
<!-- clearable-->
<!-- ></el-input>-->
<!-- </el-form-item>-->
</el-col>
<el-col :span="12">
<el-form-item label="被代替文件号" prop="BDTWJHLAWS" class="add-form-item form-item-disabled">
<el-input
v-model="form.BDTWJHLAWS"
placeholder="请输入被代替文件号"
clearable
></el-input>
<!-- <el-button-->
<!-- type="primary"-->
<!-- class="common-button-primary"-->
<!-- size="mini"-->
<!-- style="position:absolute;top: 10px;right: 0;"-->
<!-- @click="selectLaws('bfbdtbzh'),config.attrName = '部分代替标准号'"-->
<!-- >{{'手动查找'}}</el-button>-->
</el-form-item>
<el-form-item label="关联文件" prop="GLWJLAWSName" class="add-form-item form-item-disabled">
<el-input
@@ -528,6 +498,43 @@
</el-button>
</div>
</el-form-item>
<!-- <el-form-item label="相关流程" prop="xglc" class="add-form-item form-item-disabled">-->
<!-- <el-input-->
<!-- v-model="form.xglc"-->
<!-- placeholder="请输入相关流程"-->
<!-- clearable-->
<!-- ></el-input>-->
<!-- </el-form-item>-->
</el-col>
<el-col :span="12">
<el-form-item label="引用标准&政策" prop="YYBZZCLAWS" class="add-form-item form-item-disabled">
<el-input
v-model="form.YYBZZCLAWS"
placeholder="请输入引用标准&政策"
clearable
></el-input>
<el-button
type="primary"
class="common-button-primary"
size="mini"
style="position:absolute;top: 10px;right: 0;"
@click="selectLaws('YYBZZCLAWS'),config.attrName = '引用标准&政策'"
>{{'手动查找'}}</el-button>
</el-form-item>
<!-- <el-form-item label="被代替文件号" prop="BDTWJHLAWS" class="add-form-item form-item-disabled">-->
<!-- <el-input-->
<!-- v-model="form.BDTWJHLAWS"-->
<!-- placeholder="请输入被代替文件号"-->
<!-- clearable-->
<!-- ></el-input>-->
<!--&lt;!&ndash; <el-button&ndash;&gt;-->
<!--&lt;!&ndash; type="primary"&ndash;&gt;-->
<!--&lt;!&ndash; class="common-button-primary"&ndash;&gt;-->
<!--&lt;!&ndash; size="mini"&ndash;&gt;-->
<!--&lt;!&ndash; style="position:absolute;top: 10px;right: 0;"&ndash;&gt;-->
<!--&lt;!&ndash; @click="selectLaws('bfbdtbzh'),config.attrName = '部分代替标准号'"&ndash;&gt;-->
<!--&lt;!&ndash; >{{'手动查找'}}</el-button>&ndash;&gt;-->
<!-- </el-form-item>-->
</el-col>
</el-row>
</div>
@@ -651,7 +658,7 @@
</el-form-item>
<el-form-item label="编号/名称" class="search-item">
<el-input
v-model="replaceLawsNumForm.standNumber"
v-model.trim="replaceLawsNumForm.numberName"
placeholder="根据编号/名称查找"
clearable
:maxlength="100"></el-input>
@@ -694,12 +701,11 @@
<el-table-column
label="标准编号">
<template slot-scope="scope">
<a v-if="scope.row.standYear" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSort }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
<a v-else class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSort }} {{ scope.row.standNumber }}</a>
<a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.lawsNumber }}</a>
</template>
</el-table-column>
<el-table-column
prop="standName"
prop="lawsName"
label="标准名称">
</el-table-column>
<el-table-column
@@ -1808,7 +1814,7 @@
}
this.replaceLawsNumForm.page = 1
this.replacePage = 1
this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', this.replaceLawsNumForm, {
this.$http.get('lawss/sarLawsInfo/page', this.replaceLawsNumForm, {
_this: this,
loading: 'replaceLoading'
}, res => {
@@ -1881,20 +1887,15 @@
})
}
this.selectedListRep.map((item) => {
let texts = ''
if (item.standYear != null && item.standYear !== '') {
texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber + '-' + item.standYear : item.standNumber + '-' + item.standYear
} else {
texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber : item.standNumber
}
let texts = item.lawsNumber
textArr.push(texts)
textArr = [...new Set(textArr)]
this.replaceLawsNumModel = false
})
// this.SarLawsInfoEO.replaceLawsNum = textArr.join(',')
// 解决 标准入库流程--圈住的字段，先手动输入，然后再手动查找，点提交就会把手动输入的标准号覆盖
if(this.replaceLawType === 'dtbjh'){
this.form.dtbjh = this.form.dtbjh ? this.form.dtbjh + ',' + textArr.join(',') : textArr.join(',')
if(this.replaceLawType === 'YYBZZCLAWS'){
this.form.YYBZZCLAWS = this.form.YYBZZCLAWS ? this.form.YYBZZCLAWS + ',' + textArr.join(',') : textArr.join(',')
}else if(this.replaceLawType === 'yybj'){
this.form.yybj = this.form.yybj ? this.form.yybj + ',' +textArr.join(',') : textArr.join(',')
}else if(this.replaceLawType === 'cbbh'){
@@ -1949,7 +1950,7 @@
this.replaceLawsNumForm.quoteIdList = ''
}
this.replaceLawsNumForm.standType = this.form.standInData === '1' ? 'FOREIGN' : 'INLAND'
this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', this.replaceLawsNumForm, {
this.$http.get('lawss/sarLawsInfo/page', this.replaceLawsNumForm, {
_this: this,
loading: 'replaceLoading'
}, res => {