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:
11528
2022-03-22 18:02:54 +08:00
parent fbe05218ad 93373bb143
commit 95ae8adc6c
26 changed files with 221 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/components/ProcessMixin.vue
+6 -6
View File
@@ -101,17 +101,17 @@ export default {
value: "22"
},
{
label: "企标复审流程",
value: "23"
},
{
label: '企标废止流程',
label: "企标废止流程",
value: "24"
},
{
label: '企标制修订计划管控',
label: "企标制修订计划管控",
value: "25"
},
{
label: "企标制修订立项",
value: "26"
}
],
formDisableFlag: false,
pickerOptions: {
src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
+55 -53
View File
@@ -428,59 +428,61 @@
<div v-if="itermsConditions" v-html="itermsConditions" class="itemsTextBox" style="margin: 5px; padding: 5px; width: 100%; overflow: auto;"></div>
<div v-else style="margin: 5px; padding: 5px; width: 100%; overflow: auto;">无内容</div>
</div>
<el-form :model="plForm" class="label-input-form" ref="plForm" label-width=150 :style="PLmodalType === 2 ? 'width: 100%;' : ''">
<el-form-item label="核心技术要求" prop="technicalRequir" class="add-form-item" v-if="!form.itemsNum1">
<el-input
type="textarea"
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
type="textarea"
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
type="textarea"
:autosize="{ minRows: 4, maxRows: 14}"
v-model="plForm.changePoint"
placeholder="请输入上一版本差异点"
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>
<el-form-item label="责任人" prop="zrUserId" class="add-form-item">
<el-input
style="display: none;"
v-model="plForm.zrUserId"
></el-input>
<el-input
@click.native="choiceZRRS(plForm.zrUserId, PLmodalType, PLmodalIndex)"
placeholder="请选择责任人"
v-model="plForm.zrUserName"
></el-input>
</el-form-item>
</el-form>
<div style="width: 80%">
<el-form :model="plForm" class="label-input-form" ref="plForm" label-width=150 :style="PLmodalType === 2 ? 'width: 100%;' : ''">
<el-form-item label="核心技术要求" prop="technicalRequir" class="add-form-item" v-if="!form.itemsNum1">
<el-input
type="textarea"
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
type="textarea"
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
type="textarea"
:autosize="{ minRows: 4, maxRows: 14}"
v-model="plForm.changePoint"
placeholder="请输入上一版本差异点"
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>
<el-form-item label="责任人" prop="zrUserId" class="add-form-item">
<el-input
style="display: none;"
v-model="plForm.zrUserId"
></el-input>
<el-input
@click.native="choiceZRRS(plForm.zrUserId, PLmodalType, PLmodalIndex)"
placeholder="请选择责任人"
v-model="plForm.zrUserName"
></el-input>
</el-form-item>
</el-form>
</div>
</div>
</div>
<div id="roleFormButton2" class="demo-drawer-footer">
src/pages/processCenter/pages/creatProcess/bzpg/step1.vue
+6
View File
@@ -80,6 +80,7 @@
</el-form-item>
<el-form-item label="截止日期" prop="endTime" class="add-form-item form-item-disabled">
<el-date-picker
:picker-options="pickerOptions"
v-model="listForm.endTime"
type="date"
placeholder="请选择截止日期"
@@ -508,6 +509,11 @@ export default {
},
data() {
return {
pickerOptions: {
disabledDate(time) {
return time.getTime() < Date.now() - 8.64e7;
},
},
submitFlag: '',
managementHostName: [], //管理主体名称下拉框
developmentHostName: [], //开发主体名称下拉框
src/pages/processCenter/pages/creatProcess/bzpg/step3.vue
+29 -18
View File
@@ -638,25 +638,36 @@ export default {
} else if(this.dataList.length > 5) {
this.$message.warning('您最多只能选择五条数据')
}else{
this.listForm.dataList = this.dataList;
this.listForm.breakdownList = this.breakdownList
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,
json: json
}, {
_this: this
}, res => {
if (res.success) {
this.$message.success(res.message);
this.$router.push("/processCenter");
let subFlag = true
this.dataList.forEach(item => {
if(!item.unameId){
subFlag = false
return
}
this.isSubmit = false;
}, e => {
});
})
if(subFlag){
this.listForm.dataList = this.dataList;
this.listForm.breakdownList = this.breakdownList
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,
json: json
}, {
_this: this
}, res => {
if (res.success) {
this.$message.success(res.message);
this.$router.push("/processCenter");
}
this.isSubmit = false;
}, e => {
});
}else{
this.$message.warning('请选择项目经理')
}
}
},
src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+1
View File
@@ -2456,6 +2456,7 @@ export default {
if (this.form.standType === '') {
this.$message.warning('请选择标准来源')
} else {
this.standardSearchForm.page = 1
this.standardDrawer = true
this.$nextTick(() => {
// 动态设置表格高度
src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue
+1 -1
View File
@@ -831,7 +831,7 @@ export default {
if (valid) {
this.isSubmit = true
this.$http.post('lawss/activiti/startProcessRollBack', {
id: this.bpnId || '',
id: '',
createUser: this.$store.getters.userInfo.userId,
createUserName: this.$store.getters.userInfo.userName,
type: '3',
src/pages/processCenter/pages/creatProcess/qbrk/step2.vue
+4 -4
View File
@@ -1195,11 +1195,11 @@
},
calScope(){
if(this.evaluationMap){
const hqSum = this.evaluationMap["会签征求意见"]
const jsWySum = this.evaluationMap["技术委员会评审/评审意见修改评审"]
const fsSum = this.evaluationMap["复审"]
const hqSum = this.evaluationMap["征求意见"]
const jsWySum = this.evaluationMap["技术委员会评审、评审意见修改"]
const fsSum = this.evaluationMap["标准化复审"]
const shSum = this.evaluationMap["标准法规部高级经理审核"]
const aveCount = (hqSum ? hqSum * 0.3 : 0) + (jsWySum ? jsWySum * 0.4 : 0) + (fsSum ? fsSum * 0.3 : 0) + (shSum ? shSum * 0.3 : 0)
const aveCount = (hqSum ? hqSum * 0.3 : 0) + (jsWySum ? jsWySum * 0.4 : 0) + ((parseFloat(fsSum) + parseFloat(shSum)) / 2 * 0.3)
return parseFloat(aveCount).toFixed(1)
}
return 0
src/pages/processCenter/pages/creatProcess/qbrk/step9.vue
+2 -2
View File
@@ -1218,9 +1218,9 @@
if(this.evaluationMap){
const hqSum = this.evaluationMap["征求意见"]
const jsWySum = this.evaluationMap["技术委员会评审、评审意见修改"]
const fsSum = this.evaluationMap["标准化复审"]
const fsSum = this.evaluationMap["标准化复审"] ? this.evaluationMap["标准化复审"] : 0
const shSum = this.form.evaluationData && this.form.evaluationData.length > 0 ? this.form.evaluationData[0].sum : 0
const aveCount = (hqSum ? hqSum * 0.3 : 0) + (jsWySum ? jsWySum * 0.4 : 0) + ((fsSum ? fsSum : 0) + (shSum ? shSum: 0)) / 2 * 0.3
const aveCount = (hqSum ? hqSum * 0.3 : 0) + (jsWySum ? jsWySum * 0.4 : 0) + ((parseFloat(fsSum) + parseFloat(shSum)) / 2 * 0.3)
return parseFloat(aveCount).toFixed(1)
}
return 0
src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue
+1 -1
View File
@@ -1222,7 +1222,7 @@
const jsWySum = this.evaluationMap["技术委员会评审、评审意见修改"]
const fsSum = this.evaluationMap["标准化复审"]
const shSum = this.evaluationMap["标准法规部高级经理审核"]
const aveCount = (hqSum ? hqSum * 0.3 : 0) + (jsWySum ? jsWySum * 0.4 : 0) + ((fsSum ? fsSum : 0) + (shSum ? shSum: 0)) / 2 * 0.3
const aveCount = (hqSum ? hqSum * 0.3 : 0) + (jsWySum ? jsWySum * 0.4 : 0) + ((parseFloat(fsSum) + parseFloat(shSum)) / 2 * 0.3)
return parseFloat(aveCount).toFixed(1)
}
return 0
src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue
+7 -1
View File
@@ -104,6 +104,7 @@
<el-timeline>
<el-form
ref="roleForm"
:rules="roleFormRules"
:model="roleForm"
class="label-input-form">
<el-timeline-item timestamp="起草" placement="top" :color="roleForm.startUser ? '#66b1ff' : ''">
@@ -419,6 +420,11 @@ export default {
dockUser: '',
dockUserName: '',
},
roleFormRules:{
dockUserName: [
{required: true, message: '请选择责任工程师', trigger: 'change'},
],
},
// 上传路径
uploadPath: 'api/att/attFile/upload',
acceptShow: false,
@@ -977,7 +983,7 @@ export default {
}
if (finishCount === jsonData.length) {
this.isSubmit = false
this.$router.push("/processCenter");
this.$router.push('/processCenter')
}
this.isSubmit = false
} else {
src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
+6
View File
@@ -46,6 +46,7 @@
</el-form-item>
<el-form-item label="截止日期" prop="endTime" class="add-form-item form-item-disabled">
<el-date-picker
:picker-options="pickerOptions"
v-model="listForm.endTime"
type="date"
placeholder="请选择截止日期"
@@ -454,6 +455,11 @@ export default {
},
data() {
return {
pickerOptions: {
disabledDate(time) {
return time.getTime() < Date.now() - 8.64e7;
},
},
managementHostName: [], //管理主体名称下拉框
developmentHostName: [], //开发主体名称下拉框
categoryName: [], //项目细分类下拉框
src/pages/processCenter/pages/processList/tabComponents/alreadyProcess/index.vue
+1 -1
View File
@@ -187,7 +187,7 @@ export default {
size: this.$store.getters.userInfo.configContent,
userId: this.$store.getters.userInfo.userId,
prcName: this.searchForm.prcName,
prcType: parseInt(this.searchForm.prcType) || '',
prcType: parseInt(this.searchForm.prcType) || this.searchForm.prcType || '',
prcNum: this.searchForm.prcNum
}, {
loading: 'loading',
src/pages/processCenter/pages/processList/tabComponents/alreadySend/index.vue
+1 -1
View File
@@ -216,7 +216,7 @@ export default {
size: this.$store.getters.userInfo.configContent,
userId: this.$store.getters.userInfo.userId,
prcName: this.searchForm.prcName,
prcType: parseInt(this.searchForm.prcType) || '',
prcType: parseInt(this.searchForm.prcType) || this.searchForm.prcType ||'',
prcNum: this.searchForm.prcNum
},
{
src/pages/processCenter/pages/processList/tabComponents/newProcess/index.vue
+5 -5
View File
@@ -1,7 +1,7 @@
<!--新建流程页面-->
<template>
<div id="NewProcess">
<div v-if="bzfggllc">
<div >
<el-divider content-position="left"><h2>标准法规政策相关流程</h2></el-divider>
<div class="process-box">
<div class="process-name">
@@ -612,10 +612,10 @@ export default {
* 标准法规管理流程
* @returns {boolean}
*/
bzfggllc() {
const idArray = ['2564bd61852551b99e0fe3d49a89b288', '2d0f99ba961c551b1d8cad8ad5223731', '7751d25f72d0a6515e4110ae41837db8', '90c7bae6308595f053c6f6f90167e493', '9adff72ab464793564c5d1de20b45620', 'a151f5e2ee44f8df81e201b8696fca31', 'f4eeb9ed48eac5686a456a5582508d9c', 'fc25b770ad3752cdec52f3bd7b35a6a1']
return this.checkPermission(idArray)
},
// bzfggllc() {
// const idArray = ['2564bd61852551b99e0fe3d49a89b288', '2d0f99ba961c551b1d8cad8ad5223731', '7751d25f72d0a6515e4110ae41837db8', '90c7bae6308595f053c6f6f90167e493', '9adff72ab464793564c5d1de20b45620', 'a151f5e2ee44f8df81e201b8696fca31', 'f4eeb9ed48eac5686a456a5582508d9c', 'fc25b770ad3752cdec52f3bd7b35a6a1']
// return this.checkPermission(idArray)
// },
/**
* 政策管理流程
* @returns {boolean}
src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
+3 -3
View File
@@ -254,7 +254,7 @@ export default {
size: parseInt(this.$store.getters.userInfo.configContent),
userId: this.$store.getters.userInfo.usid || this.$store.getters.userInfo.userId,
prcName: this.searchForm.prcName,
prcType: parseInt(this.searchForm.prcType) || '',
prcType: parseInt(this.searchForm.prcType) || this.searchForm.prcType ||'',
prcNum: this.searchForm.prcNum
},
{
@@ -421,7 +421,7 @@ export default {
prcType: row.prcType
}
})
}else if (row.taskInfo === '批准'){
}else if (row.taskInfo === '起草单位高级经理审核'){
this.$router.push({
name: 'bussLibrary8',
query: {
@@ -454,7 +454,7 @@ export default {
prcType: row.prcType
}
})
}else if (row.taskInfo === '培训'){
}else if (row.taskInfo === '批准'){
this.$router.push({
name: 'bussLibrary11',
query: {
src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue
+2 -2
View File
@@ -394,7 +394,7 @@ export default {
verifySarStandard: true,
}
})
}else if (mes.taskInfo === '批准'){
}else if (mes.taskInfo === '起草单位高级经理审核'){
this.$router.push({
name: 'bussLibrary8',
query: {
@@ -426,7 +426,7 @@ export default {
verifySarStandard: true,
}
})
}else if (mes.taskInfo === '培训'){
}else if (mes.taskInfo === '批准'){
this.$router.push({
name: 'bussLibrary11',
query: {