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/components/mechanismTree/index.vue
+1
View File
@@ -8,6 +8,7 @@
@close="handleTreeDrawerCancel" @close="handleTreeDrawerCancel"
size="400px"> size="400px">
<el-form <el-form
@submit.native.prevent
ref="attributeEO" ref="attributeEO"
class="label-input-form" class="label-input-form"
:inline="true" :inline="true"
src/pages/config/pages/roleManage/index.vue
+7 -2
View File
@@ -183,7 +183,7 @@
<div slot="footer"> <div slot="footer">
<el-button class="common-button-default" size="mini" icon="el-icon-close" @click="closeDialogData">取消 <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="closeDialogData">取消
</el-button> </el-button>
<el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" @click="confirmDialogData"> <el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" :loading="btnLoading" @click="confirmDialogData">
确定 确定
</el-button> </el-button>
</div> </div>
@@ -214,7 +214,7 @@
<div slot="footer"> <div slot="footer">
<el-button class="common-button-default" size="mini" icon="el-icon-close" @click="closeDialogData2">取消 <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="closeDialogData2">取消
</el-button> </el-button>
<el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" @click="confirmDialogData2"> <el-button class="common-button-primary" size="mini" icon="el-icon-check" :loading="btnLoading" type="primary" @click="confirmDialogData2">
确定 确定
</el-button> </el-button>
</div> </div>
@@ -438,6 +438,7 @@ export default {
label: 'menuName' label: 'menuName'
}, },
nodeList2: [], nodeList2: [],
btnLoading: false,
nodeList4: [], nodeList4: [],
modalflag: false, modalflag: false,
modalflag2: false, modalflag2: false,
@@ -683,6 +684,7 @@ export default {
}) })
}, },
confirmDialogData() { confirmDialogData() {
this.btnLoading = true
this.$http.postData('sarRole/role/resource', { this.$http.postData('sarRole/role/resource', {
resourceIds: this.$refs.tree3.getCheckedKeys().concat(this.$refs.tree3.getHalfCheckedKeys()), resourceIds: this.$refs.tree3.getCheckedKeys().concat(this.$refs.tree3.getHalfCheckedKeys()),
roleId: this.id roleId: this.id
@@ -691,10 +693,12 @@ export default {
this.$message.success('设置权限成功') this.$message.success('设置权限成功')
this.modalflag = false this.modalflag = false
} }
this.btnLoading = false
}) })
}, },
//配置数据确定按钮 //配置数据确定按钮
confirmDialogData2(){ confirmDialogData2(){
this.btnLoading = true
let menuIds = this.$refs.tree4.getCheckedKeys().join(',') let menuIds = this.$refs.tree4.getCheckedKeys().join(',')
this.$http.postData('tsRoleMeunData/ts-role-menu-data/saveBatch', { this.$http.postData('tsRoleMeunData/ts-role-menu-data/saveBatch', {
menuIds: menuIds, menuIds: menuIds,
@@ -706,6 +710,7 @@ export default {
}else{ }else{
this.$message.warning(res.message) this.$message.warning(res.message)
} }
this.btnLoading = false
}) })
}, },
closeDialogData() { closeDialogData() {
src/pages/details/otherBussStandardDetails/index.vue
+1 -1
View File
@@ -2275,7 +2275,7 @@ export default {
_this: this _this: this
}, res => { }, res => {
this.sarStandardsInfoEO = res.data || {} this.sarStandardsInfoEO = res.data || {}
if (this.sarStandardsInfoEO.standCode.indexOf('Q/FT P') !== -1) { if (this.sarStandardsInfoEO.standCode && this.sarStandardsInfoEO.standCode.indexOf('Q/FT P') !== -1) {
this.QFTP = true this.QFTP = true
} }
// this.textOptions.forEach(item => { // this.textOptions.forEach(item => {
src/pages/details/otherStandardDetails/components/RelatedTermsSelect.vue
+6 -1
View File
@@ -48,6 +48,7 @@
tooltip-effect="dark" tooltip-effect="dark"
style="width: 100%;" style="width: 100%;"
height="100%" height="100%"
@selection-change="handleSelectionChange"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}" fontWeight: 'bold', height: '48px'}"
row-key="id" row-key="id"
@@ -115,6 +116,7 @@ export default {
return { return {
tableDataLoading: false, tableDataLoading: false,
total: 0, total: 0,
handleList: [],
selectRoleId: '', selectRoleId: '',
searchForm: { searchForm: {
standardKey: '', standardKey: '',
@@ -170,6 +172,10 @@ export default {
// this.resetSearchForm() // this.resetSearchForm()
this.queryTablePage() this.queryTablePage()
}, },
handleSelectionChange(data){
this.handleList = data
this.$emit('func',this.handleList)
},
pageChange (page) { pageChange (page) {
this.pageNo = page this.pageNo = page
@@ -183,7 +189,6 @@ export default {
resetPageNo() { resetPageNo() {
this.pageNo = 1 this.pageNo = 1
}, },
// 查询、加载表格 // 查询、加载表格
queryTablePage () { queryTablePage () {
const formData = { const formData = {
src/pages/details/otherStandardDetails/index.vue
+40 -30
View File
@@ -69,27 +69,28 @@
<label style="margin-right: 164px;">{{ child.attrName }}</label> <label style="margin-right: 164px;">{{ child.attrName }}</label>
<template v-if="child.value && child.value.length > 0"> <template v-if="child.value && child.value.length > 0">
<!-- 单个文件时--> <!-- 单个文件时-->
<div v-for="(file, fileIndex) in child1Func(child.value)" style="position: relative;display: flex;"> <div style="position: relative;">
<div v-for="(file, fileIndex) in child1Func(child.value)" style="display: flex;">
<span v-if="child.value && child.value.length > 0 && child.value.length === 1" style="display: flex; align-items: center;"> <span v-if="child.value && child.value.length > 0 && child.value.length === 1" style="display: flex; align-items: center;">
<a style="font-size: 16px;color: #409EFF;cursor: pointer;" <a style="font-size: 16px;color: #409EFF;cursor: pointer;"
@click="openFileInPdf(file.id, file.oldFileName)" target="_blank" @click="openFileInPdf(file.id, file.oldFileName)" target="_blank"
:title="file.oldFileName">{{ file.oldFileName }}</a> :title="file.oldFileName">{{ file.oldFileName }}</a>
<i <i
title="下载" title="下载"
@click="downloadFile(file.id)" @click="downloadFile(file.id)"
class="icon-download" class="icon-download"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : 'a772afab2a6708883335500f3f86e771'" v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : 'a772afab2a6708883335500f3f86e771'"
/> />
<i <i
title="下载带水印" title="下载带水印"
@click="downloadFileByWater(file.id, file.fileSuffix)" @click="downloadFileByWater(file.id, file.fileSuffix)"
class="icon-download2" class="icon-download2"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : '824f3bf9edef83fc7488917136167232'" v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : '824f3bf9edef83fc7488917136167232'"
/> />
<!-- <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>--> <!-- <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>-->
</span> </span>
<!-- 多个文件时--> <!-- 多个文件时-->
<div v-else-if="child.value && child.value.length > 0"> <div v-else-if="child.value && child.value.length > 0">
<span style="margin-left: 19%;display: flex; align-items: center;"> <span style="margin-left: 19%;display: flex; align-items: center;">
<a style="font-size: 16px;color: #409EFF;cursor: pointer" <a style="font-size: 16px;color: #409EFF;cursor: pointer"
@click="openFileInPdf(file.id, file.oldFileName)" target="_blank" @click="openFileInPdf(file.id, file.oldFileName)" target="_blank"
@@ -107,16 +108,15 @@
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : '824f3bf9edef83fc7488917136167232'" v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : '824f3bf9edef83fc7488917136167232'"
/> />
</span> </span>
<!-- <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>--> <!-- <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>-->
</div> </div>
<el-button </div>
v-if="child.attrField === itemNam" <el-button
v-for="(itemNam,index) in itemExistList" v-if="child.attrField === 'FBGBJBD'"
:key="index"
@click="showItemsModel(child.attrField)" @click="showItemsModel(child.attrField)"
class="decomposition-btn" class="decomposition-btn"
>标准分解单 >标准分解单
</el-button> </el-button>
</div> </div>
<!-- <el-button v-if="child.value && child.value.length > 1"--> <!-- <el-button v-if="child.value && child.value.length > 1"-->
<!-- style="color:#409EFF;border: 1px solid #409EFF;background: rgba(64, 158, 255, 0.1);"--> <!-- style="color:#409EFF;border: 1px solid #409EFF;background: rgba(64, 158, 255, 0.1);"-->
@@ -1734,6 +1734,7 @@
> >
<div class="demo-drawer-content"> <div class="demo-drawer-content">
<related-terms-select <related-terms-select
@func="handleChangeList"
ref="relatedTermsSelect" ref="relatedTermsSelect"
:fileType="fileType" :fileType="fileType"
:stand-id="standId" :stand-id="standId"
@@ -1787,6 +1788,7 @@ export default {
}, },
data() { data() {
return { return {
handleList: [],
CycxOptions: [], CycxOptions: [],
activeNames: ['基础信息', '过程稿件', '实施日期'], activeNames: ['基础信息', '过程稿件', '实施日期'],
activeState: true, activeState: true,
@@ -2112,6 +2114,9 @@ export default {
props: {}, props: {},
watch: {}, watch: {},
methods: { methods: {
handleChangeList(data){
this.handleList = data
},
child1Func(child1) { child1Func(child1) {
const list = [] const list = []
if (child1 && child1.length > 1) { if (child1 && child1.length > 1) {
@@ -3647,17 +3652,22 @@ export default {
this.$refs['relatedTermsSelect'].handleCancel() this.$refs['relatedTermsSelect'].handleCancel()
}, },
//关联成功的提示
handleRelatedTermsDrawerSubmit() { handleRelatedTermsDrawerSubmit() {
this.btnLoading = true this.btnLoading = true
this.$refs['relatedTermsSelect'].handleSubmit(() => { if(this.handleList.length){
this.selectSarStandItems() this.$refs['relatedTermsSelect'].handleSubmit(() => {
this.selectSarStandItems()
this.btnLoading = false
this.$message({
message: '关联成功',
type: 'success'
});
})
}else{
this.$message.warning('请至少勾选一条条款进行关联')
this.btnLoading = false this.btnLoading = false
this.$message({ }
message: '关联成功',
type: 'success'
});
})
}, },
closeRelatedTermsDrawer() { closeRelatedTermsDrawer() {
this.$refs['relatedTermsDrawer'].closeDrawer() this.$refs['relatedTermsDrawer'].closeDrawer()
src/pages/home2/components/todoList/index.vue
+2 -2
View File
@@ -205,7 +205,7 @@ export default {
prcType: row.prcType prcType: row.prcType
} }
}) })
}else if (row.taskInfo === '批准'){ }else if (row.taskInfo === '起草单位高级经理审核'){
this.$router.push({ this.$router.push({
name: 'bussLibrary8', name: 'bussLibrary8',
query: { query: {
@@ -238,7 +238,7 @@ export default {
prcType: row.prcType prcType: row.prcType
} }
}) })
}else if (row.taskInfo === '培训'){ }else if (row.taskInfo === '批准'){
this.$router.push({ this.$router.push({
name: 'bussLibrary11', name: 'bussLibrary11',
query: { query: {
src/pages/localTool/standAutoSplit/index.vue
+18 -13
View File
@@ -993,19 +993,24 @@ export default {
}, { }, {
_this: this, loading: 'loading' _this: this, loading: 'loading'
}, res => { }, res => {
res.data.list.map((item, index) => { if(res.data.list.length){
if (item.collectId != null && item.collectId !== '') { res.data.list.map((item, index) => {
item.showNumber= item.splitStatus=='0' ? item.showNumber : item.standNumSplit if (item.collectId != null && item.collectId !== '') {
item.standName=item.splitStatus=='0' ? item.standName : item.standNameSplit item.showNumber= item.splitStatus=='0' ? item.showNumber : item.standNumSplit
item.collectBtn = false item.standName=item.splitStatus=='0' ? item.standName : item.standNameSplit
} else { item.collectBtn = false
item.showNumber= item.splitStatus=='0' ? item.showNumber : item.standNumSplit } else {
item.standName=item.splitStatus=='0' ? item.standName : item.standNameSplit item.showNumber= item.splitStatus=='0' ? item.showNumber : item.standNumSplit
item.collectBtn = true item.standName=item.splitStatus=='0' ? item.standName : item.standNameSplit
} item.collectBtn = true
}) }
this.standInfoList = res.data.list })
this.total = res.data.count this.standInfoList = res.data.list
this.total = res.data.count
}else{
this.splitInfoPage = 1
this.getSarFileSplitInfoEOPage()
}
}, e => { }, e => {
}) })
}, },
src/pages/processCenter/pages/components/ProcessMixin.vue
+6 -6
View File
@@ -101,17 +101,17 @@ export default {
value: "22" value: "22"
}, },
{ {
label: "企标复审流程", label: "企标废止流程",
value: "23"
},
{
label: '企标废止流程',
value: "24" value: "24"
}, },
{ {
label: '企标制修订计划管控', label: "企标制修订计划管控",
value: "25" value: "25"
}, },
{
label: "企标制修订立项",
value: "26"
}
], ],
formDisableFlag: false, formDisableFlag: false,
pickerOptions: { 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-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 v-else style="margin: 5px; padding: 5px; width: 100%; overflow: auto;">无内容</div>
</div> </div>
<el-form :model="plForm" class="label-input-form" ref="plForm" label-width=150 :style="PLmodalType === 2 ? 'width: 100%;' : ''"> <div style="width: 80%">
<el-form-item label="核心技术要求" prop="technicalRequir" class="add-form-item" v-if="!form.itemsNum1"> <el-form :model="plForm" class="label-input-form" ref="plForm" label-width=150 :style="PLmodalType === 2 ? 'width: 100%;' : ''">
<el-input <el-form-item label="核心技术要求" prop="technicalRequir" class="add-form-item" v-if="!form.itemsNum1">
type="textarea" <el-input
v-model="plForm.technicalRequir" type="textarea"
placeholder="请输入核心技术要求" v-model="plForm.technicalRequir"
maxlength="500" placeholder="请输入核心技术要求"
></el-input> maxlength="500"
</el-form-item> ></el-input>
<el-form-item label="国内标准的差异点" prop="changePoint" class="add-form-item" v-if="sarType !== 'INLAND' && form.itemsNum1"> </el-form-item>
<el-input <el-form-item label="国内标准的差异点" prop="changePoint" class="add-form-item" v-if="sarType !== 'INLAND' && form.itemsNum1">
type="textarea" <el-input
v-model="plForm.changePoint" type="textarea"
placeholder="请输入国内标准的差异点" v-model="plForm.changePoint"
maxlength="500" placeholder="请输入国内标准的差异点"
></el-input> maxlength="500"
</el-form-item> ></el-input>
<el-form-item label="上一版本差异点" prop="changePoint" class="add-form-item" v-if="sarType === 'INLAND' && form.itemsNum1"> </el-form-item>
<el-input <el-form-item label="上一版本差异点" prop="changePoint" class="add-form-item" v-if="sarType === 'INLAND' && form.itemsNum1">
type="textarea" <el-input
:autosize="{ minRows: 4, maxRows: 14}" type="textarea"
v-model="plForm.changePoint" :autosize="{ minRows: 4, maxRows: 14}"
placeholder="请输入上一版本差异点" v-model="plForm.changePoint"
maxlength="500" placeholder="请输入上一版本差异点"
></el-input> maxlength="500"
</el-form-item> ></el-input>
<custom-date-pick-group </el-form-item>
class="myDataPick" <custom-date-pick-group
:config="{attrName: '新车型实施日期'}" class="myDataPick"
v-model="plForm.newData" :config="{attrName: '新车型实施日期'}"
></custom-date-pick-group> v-model="plForm.newData"
<custom-date-pick-group ></custom-date-pick-group>
class="myDataPick" <custom-date-pick-group
:config="{attrName: '在产车实施日期'}" class="myDataPick"
v-model="plForm.onlineData" :config="{attrName: '在产车实施日期'}"
></custom-date-pick-group> v-model="plForm.onlineData"
<el-form-item label="适用车型" prop="applyArctic" class="add-form-item" > ></custom-date-pick-group>
<el-select multiple v-model="plForm.applyArctic"> <el-form-item label="适用车型" prop="applyArctic" class="add-form-item" >
<el-option v-for="(item,index) in cxList" :value="item.label" :label="item.label" :key="index"></el-option> <el-select multiple v-model="plForm.applyArctic">
</el-select> <el-option v-for="(item,index) in cxList" :value="item.label" :label="item.label" :key="index"></el-option>
</el-form-item> </el-select>
<el-form-item label="责任人" prop="zrUserId" class="add-form-item"> </el-form-item>
<el-input <el-form-item label="责任人" prop="zrUserId" class="add-form-item">
style="display: none;" <el-input
v-model="plForm.zrUserId" style="display: none;"
></el-input> v-model="plForm.zrUserId"
<el-input ></el-input>
@click.native="choiceZRRS(plForm.zrUserId, PLmodalType, PLmodalIndex)" <el-input
placeholder="请选择责任人" @click.native="choiceZRRS(plForm.zrUserId, PLmodalType, PLmodalIndex)"
v-model="plForm.zrUserName" placeholder="请选择责任人"
></el-input> v-model="plForm.zrUserName"
</el-form-item> ></el-input>
</el-form> </el-form-item>
</el-form>
</div>
</div> </div>
</div> </div>
<div id="roleFormButton2" class="demo-drawer-footer"> <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>
<el-form-item label="截止日期" prop="endTime" class="add-form-item form-item-disabled"> <el-form-item label="截止日期" prop="endTime" class="add-form-item form-item-disabled">
<el-date-picker <el-date-picker
:picker-options="pickerOptions"
v-model="listForm.endTime" v-model="listForm.endTime"
type="date" type="date"
placeholder="请选择截止日期" placeholder="请选择截止日期"
@@ -508,6 +509,11 @@ export default {
}, },
data() { data() {
return { return {
pickerOptions: {
disabledDate(time) {
return time.getTime() < Date.now() - 8.64e7;
},
},
submitFlag: '', submitFlag: '',
managementHostName: [], //管理主体名称下拉框 managementHostName: [], //管理主体名称下拉框
developmentHostName: [], //开发主体名称下拉框 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) { } else if(this.dataList.length > 5) {
this.$message.warning('您最多只能选择五条数据') this.$message.warning('您最多只能选择五条数据')
}else{ }else{
this.listForm.dataList = this.dataList; let subFlag = true
this.listForm.breakdownList = this.breakdownList this.dataList.forEach(item => {
this.listForm.commentText = this.commentText; if(!item.unameId){
const json = JSON.stringify(this.listForm); subFlag = false
this.isSubmit = true; return
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 => { 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 === '') { if (this.form.standType === '') {
this.$message.warning('请选择标准来源') this.$message.warning('请选择标准来源')
} else { } else {
this.standardSearchForm.page = 1
this.standardDrawer = true this.standardDrawer = true
this.$nextTick(() => { this.$nextTick(() => {
// 动态设置表格高度 // 动态设置表格高度
src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue
+1 -1
View File
@@ -831,7 +831,7 @@ export default {
if (valid) { if (valid) {
this.isSubmit = true this.isSubmit = true
this.$http.post('lawss/activiti/startProcessRollBack', { this.$http.post('lawss/activiti/startProcessRollBack', {
id: this.bpnId || '', id: '',
createUser: this.$store.getters.userInfo.userId, createUser: this.$store.getters.userInfo.userId,
createUserName: this.$store.getters.userInfo.userName, createUserName: this.$store.getters.userInfo.userName,
type: '3', type: '3',
src/pages/processCenter/pages/creatProcess/qbrk/step2.vue
+4 -4
View File
@@ -1195,11 +1195,11 @@
}, },
calScope(){ calScope(){
if(this.evaluationMap){ if(this.evaluationMap){
const hqSum = this.evaluationMap["会签征求意见"] const hqSum = this.evaluationMap["征求意见"]
const jsWySum = this.evaluationMap["技术委员会评审/评审意见修改评审"] const jsWySum = this.evaluationMap["技术委员会评审、评审意见修改"]
const fsSum = this.evaluationMap["复审"] const fsSum = this.evaluationMap["标准化复审"]
const shSum = 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 parseFloat(aveCount).toFixed(1)
} }
return 0 return 0
src/pages/processCenter/pages/creatProcess/qbrk/step9.vue
+2 -2
View File
@@ -1218,9 +1218,9 @@
if(this.evaluationMap){ if(this.evaluationMap){
const hqSum = this.evaluationMap["征求意见"] const hqSum = this.evaluationMap["征求意见"]
const jsWySum = 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 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 parseFloat(aveCount).toFixed(1)
} }
return 0 return 0
src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue
+1 -1
View File
@@ -1222,7 +1222,7 @@
const jsWySum = this.evaluationMap["技术委员会评审、评审意见修改"] const jsWySum = this.evaluationMap["技术委员会评审、评审意见修改"]
const fsSum = this.evaluationMap["标准化复审"] const fsSum = this.evaluationMap["标准化复审"]
const shSum = 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 parseFloat(aveCount).toFixed(1)
} }
return 0 return 0
src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue
+7 -1
View File
@@ -104,6 +104,7 @@
<el-timeline> <el-timeline>
<el-form <el-form
ref="roleForm" ref="roleForm"
:rules="roleFormRules"
:model="roleForm" :model="roleForm"
class="label-input-form"> class="label-input-form">
<el-timeline-item timestamp="起草" placement="top" :color="roleForm.startUser ? '#66b1ff' : ''"> <el-timeline-item timestamp="起草" placement="top" :color="roleForm.startUser ? '#66b1ff' : ''">
@@ -419,6 +420,11 @@ export default {
dockUser: '', dockUser: '',
dockUserName: '', dockUserName: '',
}, },
roleFormRules:{
dockUserName: [
{required: true, message: '请选择责任工程师', trigger: 'change'},
],
},
// 上传路径 // 上传路径
uploadPath: 'api/att/attFile/upload', uploadPath: 'api/att/attFile/upload',
acceptShow: false, acceptShow: false,
@@ -977,7 +983,7 @@ export default {
} }
if (finishCount === jsonData.length) { if (finishCount === jsonData.length) {
this.isSubmit = false this.isSubmit = false
this.$router.push("/processCenter"); this.$router.push('/processCenter')
} }
this.isSubmit = false this.isSubmit = false
} else { } else {
src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
+6
View File
@@ -46,6 +46,7 @@
</el-form-item> </el-form-item>
<el-form-item label="截止日期" prop="endTime" class="add-form-item form-item-disabled"> <el-form-item label="截止日期" prop="endTime" class="add-form-item form-item-disabled">
<el-date-picker <el-date-picker
:picker-options="pickerOptions"
v-model="listForm.endTime" v-model="listForm.endTime"
type="date" type="date"
placeholder="请选择截止日期" placeholder="请选择截止日期"
@@ -454,6 +455,11 @@ export default {
}, },
data() { data() {
return { return {
pickerOptions: {
disabledDate(time) {
return time.getTime() < Date.now() - 8.64e7;
},
},
managementHostName: [], //管理主体名称下拉框 managementHostName: [], //管理主体名称下拉框
developmentHostName: [], //开发主体名称下拉框 developmentHostName: [], //开发主体名称下拉框
categoryName: [], //项目细分类下拉框 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, size: this.$store.getters.userInfo.configContent,
userId: this.$store.getters.userInfo.userId, userId: this.$store.getters.userInfo.userId,
prcName: this.searchForm.prcName, prcName: this.searchForm.prcName,
prcType: parseInt(this.searchForm.prcType) || '', prcType: parseInt(this.searchForm.prcType) || this.searchForm.prcType || '',
prcNum: this.searchForm.prcNum prcNum: this.searchForm.prcNum
}, { }, {
loading: 'loading', 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, size: this.$store.getters.userInfo.configContent,
userId: this.$store.getters.userInfo.userId, userId: this.$store.getters.userInfo.userId,
prcName: this.searchForm.prcName, prcName: this.searchForm.prcName,
prcType: parseInt(this.searchForm.prcType) || '', prcType: parseInt(this.searchForm.prcType) || this.searchForm.prcType ||'',
prcNum: this.searchForm.prcNum prcNum: this.searchForm.prcNum
}, },
{ {
src/pages/processCenter/pages/processList/tabComponents/newProcess/index.vue
+5 -5
View File
@@ -1,7 +1,7 @@
<!--新建流程页面--> <!--新建流程页面-->
<template> <template>
<div id="NewProcess"> <div id="NewProcess">
<div v-if="bzfggllc"> <div >
<el-divider content-position="left"><h2>标准法规政策相关流程</h2></el-divider> <el-divider content-position="left"><h2>标准法规政策相关流程</h2></el-divider>
<div class="process-box"> <div class="process-box">
<div class="process-name"> <div class="process-name">
@@ -612,10 +612,10 @@ export default {
* 标准法规管理流程 * 标准法规管理流程
* @returns {boolean} * @returns {boolean}
*/ */
bzfggllc() { // bzfggllc() {
const idArray = ['2564bd61852551b99e0fe3d49a89b288', '2d0f99ba961c551b1d8cad8ad5223731', '7751d25f72d0a6515e4110ae41837db8', '90c7bae6308595f053c6f6f90167e493', '9adff72ab464793564c5d1de20b45620', 'a151f5e2ee44f8df81e201b8696fca31', 'f4eeb9ed48eac5686a456a5582508d9c', 'fc25b770ad3752cdec52f3bd7b35a6a1'] // const idArray = ['2564bd61852551b99e0fe3d49a89b288', '2d0f99ba961c551b1d8cad8ad5223731', '7751d25f72d0a6515e4110ae41837db8', '90c7bae6308595f053c6f6f90167e493', '9adff72ab464793564c5d1de20b45620', 'a151f5e2ee44f8df81e201b8696fca31', 'f4eeb9ed48eac5686a456a5582508d9c', 'fc25b770ad3752cdec52f3bd7b35a6a1']
return this.checkPermission(idArray) // return this.checkPermission(idArray)
}, // },
/** /**
* 政策管理流程 * 政策管理流程
* @returns {boolean} * @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), size: parseInt(this.$store.getters.userInfo.configContent),
userId: this.$store.getters.userInfo.usid || this.$store.getters.userInfo.userId, userId: this.$store.getters.userInfo.usid || this.$store.getters.userInfo.userId,
prcName: this.searchForm.prcName, prcName: this.searchForm.prcName,
prcType: parseInt(this.searchForm.prcType) || '', prcType: parseInt(this.searchForm.prcType) || this.searchForm.prcType ||'',
prcNum: this.searchForm.prcNum prcNum: this.searchForm.prcNum
}, },
{ {
@@ -421,7 +421,7 @@ export default {
prcType: row.prcType prcType: row.prcType
} }
}) })
}else if (row.taskInfo === '批准'){ }else if (row.taskInfo === '起草单位高级经理审核'){
this.$router.push({ this.$router.push({
name: 'bussLibrary8', name: 'bussLibrary8',
query: { query: {
@@ -454,7 +454,7 @@ export default {
prcType: row.prcType prcType: row.prcType
} }
}) })
}else if (row.taskInfo === '培训'){ }else if (row.taskInfo === '批准'){
this.$router.push({ this.$router.push({
name: 'bussLibrary11', name: 'bussLibrary11',
query: { query: {
src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue
+2 -2
View File
@@ -394,7 +394,7 @@ export default {
verifySarStandard: true, verifySarStandard: true,
} }
}) })
}else if (mes.taskInfo === '批准'){ }else if (mes.taskInfo === '起草单位高级经理审核'){
this.$router.push({ this.$router.push({
name: 'bussLibrary8', name: 'bussLibrary8',
query: { query: {
@@ -426,7 +426,7 @@ export default {
verifySarStandard: true, verifySarStandard: true,
} }
}) })
}else if (mes.taskInfo === '培训'){ }else if (mes.taskInfo === '批准'){
this.$router.push({ this.$router.push({
name: 'bussLibrary11', name: 'bussLibrary11',
query: { query: {
src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+5 -5
View File
@@ -2747,11 +2747,11 @@ export default {
synopsis: [ synopsis: [
{type: 'string', max: 500, message: '文本说明不能超过500个字符', trigger: 'change'} {type: 'string', max: 500, message: '文本说明不能超过500个字符', trigger: 'change'}
], ],
standYear: [ // standYear: [
{required: true, message: '标准年份不能为空', trigger: 'change'}, // {required: true, message: '标准年份不能为空', trigger: 'change'},
// {validator: this.verify.testNumberCode, trigger: 'change'}, // // {validator: this.verify.testNumberCode, trigger: 'change'},
{type: 'string', max: 100, message: '标准年份不能超过100个字符', trigger: 'change'} // {type: 'string', max: 100, message: '标准年份不能超过100个字符', trigger: 'change'}
], // ],
standName: [ standName: [
{required: true, message: '中文名称不能为空', trigger: 'change'}, {required: true, message: '中文名称不能为空', trigger: 'change'},
{type: 'string', max: 500, message: '中文名称不能超过500个字符', trigger: 'change'} {type: 'string', max: 500, message: '中文名称不能超过500个字符', trigger: 'change'}
src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+5 -10
View File
@@ -1396,17 +1396,11 @@
border border
:height="300" :height="300"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}" fontWeight: 'bold', height: '48px'}">
@selection-change="selectReplaceStandNumRowChange">
<el-table-column
type="selection"
width="55"
align="center">
</el-table-column>
<el-table-column <el-table-column
label="企标编号"> label="企标编号">
<template slot-scope="scope"> <template slot-scope="scope">
<a v-if="scope.row.standCode" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standCode }}</a> <a v-if="scope.row.standCode" class="table-jump" @click="handlePreview(scope.row,'fs')">{{ scope.row.standCode }}</a>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -3366,7 +3360,7 @@ export default {
}) })
}, },
// 点击查看 // 点击查看
handlePreview(item) { handlePreview(item,fs) {
// const mj = item.attrInfoMap.QBMJ // const mj = item.attrInfoMap.QBMJ
// if (mj === 'GXNX7D6H59') { // if (mj === 'GXNX7D6H59') {
// // C1所有人都可查看 // // C1所有人都可查看
@@ -3444,10 +3438,11 @@ export default {
let routeUrl = this.$router.resolve({ let routeUrl = this.$router.resolve({
name: 'OtherBussStandardDetails', name: 'OtherBussStandardDetails',
params: { params: {
id: item.id, id: fs ? (fs === 'fs' ? item.standId:item.id) : item.id,
pageType: 'BUSINESS_STAND' pageType: 'BUSINESS_STAND'
} }
}) })
console.log(routeUrl)
window.open(routeUrl.href, '_blank') window.open(routeUrl.href, '_blank')
}, },
// 编辑 // 编辑
src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue
+6 -4
View File
@@ -1419,13 +1419,13 @@
}, },
productModelAdd: { productModelAdd: {
id : "", id : "",
sorDivide : "INLAND_STAND", sorDivide : "FOREIGN_LAWS",
menuName : "", menuName : "",
parentId : null, parentId : null,
parentIds : null, parentIds : null,
parentIdsName : "", parentIdsName : "",
displaySeq : "", displaySeq : "",
validFlag : "", validFlag : "0",
creationTime : "", creationTime : "",
modifyTime : "", modifyTime : "",
remarks : "", remarks : "",
@@ -2257,6 +2257,8 @@
saveProduct (name) { saveProduct (name) {
this.$refs[name].validate((valid) => { this.$refs[name].validate((valid) => {
if (valid) { if (valid) {
this.productModelAdd.sorDivide = 'FOREIGN_LAWS'
this.productModelAdd.validFlag = '0'
if (this.modalType === 1) { if (this.modalType === 1) {
this.$http.postData('sarResource/ts-resource/add', this.productModelAdd, { this.$http.postData('sarResource/ts-resource/add', this.productModelAdd, {
_this: this _this: this
@@ -2337,11 +2339,11 @@
if(row.parentIds.indexOf(res.data.id) != -1){ if(row.parentIds.indexOf(res.data.id) != -1){
this.productModelAdd.parentIds = row.parentIds this.productModelAdd.parentIds = row.parentIds
}else { }else {
this.productModelAdd.parentIds = row.parentIds + ',' + res.data.id this.productModelAdd.parentIds = row.parentIds + res.data.id+','
idsName = row.parentIdsName + ',' + res.data.menuName idsName = row.parentIdsName + ',' + res.data.menuName
} }
}else { }else {
this.productModelAdd.parentIds = res.data.id this.productModelAdd.parentIds = +','+res.data.id+','
idsName = res.data.menuName; idsName = res.data.menuName;
} }
this.productModelAdd.parentId = res.data.id this.productModelAdd.parentId = res.data.id