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-12-21 14:05:04 +08:00
parent c44ed30548 20edc0acfa
commit 8d1400bd91
10 changed files with 191 additions and 158 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/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
+10 -1
View File
@@ -140,6 +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"
@@ -495,7 +505,6 @@
item.zxUserIdName = item.zxUserIdName || ''
})
this.itemList = arr
console.log(this.itemList);
this.loading = false
}).catch(e => {
})
src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
+111 -144
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
@@ -837,18 +800,22 @@
itemList = data.itemList
}
console.log(itemList);
// itemList.forEach(item => {
// item.unitDeptName = this.$store.getters.userInfo.institutionName
// item.onlineData = item.onlineData || ''
// item.newData = item.newData || ''
// item.complianceState = item.complianceState || ''
// item.oldNumber = item.oldNumber || ''
// item.complianceRequir = item.complianceRequir || '1'
// item.changePoint = item.changePoint || ''
// item.technicalRequir = item.technicalRequir || ''
// item.itemsTitle = item.itermsConditions
// item.applyArctic = item.applyArctic || []
// })
itemList.forEach(item => {
item.unitDeptName = this.$store.getters.userInfo.institutionName
item.onlineData = item.onlineData || ''
item.newData = item.newData || ''
item.complianceState = item.complianceState || ''
item.oldNumber = item.oldNumber || ''
item.complianceRequir = item.complianceRequir || '1'
item.changePoint = item.changePoint || ''
item.technicalRequir = item.technicalRequir || ''
item.itemsTitle = item.itermsConditions
if (typeof (item.applyArctic) === 'string') {
item.applyArctic = JSON.parse(item.applyArctic) || []
} else {
item.applyArctic = item.applyArctic || []
}
})
this.getBDList()
this.itemList = itemList
this.loading = false
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)