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 FOTON

Browse Source
This commit is contained in:
liyawei
2022-11-08 19:27:36 +08:00
parent 67d5bc2bd2 8550435321
commit cd05f0b6e7
28 changed files with 251 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/common/index.js
+6 -6
View File
@@ -6,7 +6,7 @@ import base64 from './base64'
import dateFormat from './date'
import hasPermission from './hasPermission'
import preview from './preview'
import previewZl from './previewZL'
// import previewZl from './previewZL'
import onlineEdit from './onlineEdit'
import onlinePreview from './onlinePreview'
import onlineEditPreview from './onlineEditPreview'
@@ -43,11 +43,11 @@ const install = function (Vue) {
return preview
}
},
$previewZl: {
get () {
return previewZl
}
},
// $previewZl: {
// get () {
// return previewZl
// }
// },
$onlinePreview: {
get () {
return onlinePreview
src/components/treeSelect/treeSelectNew.vue
+15
View File
@@ -8,6 +8,7 @@
:before-close="cancelUserInfo"
:show-checkbox="showCheckBox"
>
<el-tree class="common-tree" :style="style" ref="tree" :data="data" :props="defaultProps"
:load="loadNode"
v-if="modalShowFlag"
@@ -150,6 +151,7 @@
created(){
},
mounted () {
// this.$refs.tree.setCheckedKeys(this.checkedKeys)
if (this.checkedKeys.length > 0) {
if (this.multiple) {
this.defaultCheckedKeys = this.checkedKeys;
@@ -274,8 +276,21 @@
cancelUserInfo () {
this.$emit('popoverHideCancel', this.checkedIds, this.checkedData,false);
},
// setTreeVal(val) {
// this.$nextTick(() => {
// this.$refs.tree.setCheckedKeys(val);
//
// })
// }
},
watch: {
modalShowFlag(val){
if(val){
this.$nextTick(() => {
this.$refs.tree.setCheckedKeys(this.checkedKeys);
})
}
}
}
}
</script>
src/pages/config/pages/roleManage/index.vue
+25 -10
View File
@@ -243,9 +243,10 @@
<el-input v-model="addForm.parentId" style="display: none;"
clearable></el-input>
<el-input v-model="addForm.parent"
readonly
placeholder="请选择上级角色"
@click.native="SuperiorRole"
clearable></el-input>
></el-input>
</el-form-item>
<el-form-item label="角色描述" prop="remarks" label-width="100px" class="add-form-item">
<el-input v-model="addForm.remarks"
@@ -285,14 +286,14 @@
:props="defaultProps"
style="height: 100%; overflow: auto;"
default-expand-all
check-strictly
:check-strictly="true"
node-key="id"
:default-checked-keys="nodeList3"
show-checkbox
:show-checkbox="true"
highlight-current
@check="drawerCheck"
:expand-on-click-node="false"
ref="tree4">
ref="tree9">
</el-tree>
<div id="roleFormButton" class="demo-drawer-footer">
<el-button
@@ -553,16 +554,28 @@ export default {
});
},
drawerCheck(data) {
var getlist = this.$refs.tree4.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes());
if (getlist.length == 1) {
var getlist = this.$refs.tree9.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes());
// if (getlist.length == 1) {
// } else {
// this.$refs.tree9.setCheckedKeys([data.id]);
// }
if (getlist.length > 1) {
this.$message.warning('只能选择一个角色')
} else {
this.$refs.tree4.setCheckedKeys([data.id]);
}
this.SuperiorRoleData = data
console.log(getlist)
this.SuperiorRoleData = getlist
},
SuperiorRoleOk() { // 上级角色确定
this.addForm.parentId = this.SuperiorRoleData.id
this.addForm.parent = this.SuperiorRoleData.name
console.log(this.SuperiorRoleData)
if(this.SuperiorRoleData.length != 0){
this.addForm.parentId = this.SuperiorRoleData[0].id
this.addForm.parent = this.SuperiorRoleData[0].name
}else{
this.addForm.parentId = ''
this.addForm.parent = ''
}
this.nodeList3 = []
this.nodeList3.push(this.addForm.parentId)
this.SuperiorRoleModel = false
@@ -621,6 +634,8 @@ export default {
this.addForm.parentId = ''
this.addForm.parent = ''
this.addForm.id = ''
this.nodeList3 = []
this.nodeList3.push(this.addForm.parentId)
} else {
this.addRoleTitle = '编辑角色'
this.addForm.name = row.name
src/pages/phone/databaseSearch.vue
+1
View File
@@ -132,6 +132,7 @@ export default {
selectIndex: 'fulltextserch',
selectValue: this.searchKey,
selectType: 'titleSearch',
clientType:2,
page: this.page,
pageSize: 20
},{
src/pages/processCenter/pages/creatProcess/bzpg/step1.vue
+5
View File
@@ -412,6 +412,11 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item label="项目群" class="search-item search-item-last">
<el-input v-model="projectSearch.projectGroup"
placeholder="请输入项目群"
></el-input>
</el-form-item>
<el-form-item class="search-item btn-box">
<el-button :disabled="disabledXX"
:loading="searching"
src/pages/processCenter/pages/creatProcess/bzpg/step3.vue
+5
View File
@@ -276,6 +276,11 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item label="项目名称" class="search-item search-item-last">
<el-input v-model="projectSearch.projectName"
placeholder="请输入项目名称"
></el-input>
</el-form-item>
<el-form-item class="search-item btn-box">
<el-button
type="primary"
src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+44 -4
View File
@@ -637,8 +637,9 @@
></custom-select-array>
</template>
<el-form-item label="关联模块--乘用车VPPS编码" prop="cycvppsbm" class="add-form-item form-item-disabled">
<el-input :disabled="disabledXX" v-model="form.cycvppsbm" placeholder="选择乘用车VPPS编码" clearable @click.native="choiceZRR2('cycvppsbm', '乘用车VPPS', form.cycvppsbm)"></el-input>
<el-input :disabled="disabledXX" v-model="form.cycvppsbm" placeholder="选择乘用车VPPS编码" clearable @clear="clear" @focus="choiceZRR2('cycvppsbm', '乘用车VPPS', form.cycvppsbm)"></el-input>
<tree-select-new v-if="!disabledXX"
ref="treeSelectNew"
width="800"
:key="key1"
:lazy=true
@@ -654,8 +655,9 @@
:nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs" @popoverHideCancel="popoverHideBusVsCancel"></tree-select-new>
</el-form-item>
<el-form-item label="关联模块--卡车VPPS编码" prop="kccvppsbm" class="add-form-item form-item-disabled">
<el-input :disabled="disabledXX" v-model="form.kccvppsbm" placeholder="选择卡车VPPS编码" clearable @click.native="choiceZRR3('kccvppsbm', '卡车VPPS', form.kccvppsbm)"></el-input>
<el-input :disabled="disabledXX" v-model="form.kccvppsbm" placeholder="选择卡车VPPS编码" clearable @clear="clear1()" @focus="choiceZRR3('kccvppsbm', '卡车VPPS', form.kccvppsbm)"></el-input>
<tree-select-new v-if="!disabledXX"
ref="treeSelectNew"
width="800"
:key="key2"
:lazy=true
@@ -705,9 +707,15 @@
<!-- :nodeKey="nodeKeyModel" @popoverHide="popoverHideModel2" @popoverHideCancel="popoverHideModelCancel2"></tree-select-module>-->
<!-- </el-form-item>-->
<el-form-item v-show="form.standInData === '0'" label="归口管理部门" prop="gkdw" class="add-form-item form-item-disabled">
<el-select :disabled="disabledXX" :popper-append-to-body="false" filterable clearable v-model="form.gkdw" placeholder="请选择归口管理部门">
<el-select :disabled="disabledXX" style="width: 82%;" :popper-append-to-body="false" filterable clearable v-model="form.gkdw" placeholder="请选择归口管理部门">
<el-option v-for="item in gkglbmOptions" :value="item.value" :key="item.value" :label="item.label"></el-option>
</el-select>
<el-button class="common-button-primary add-button"
:disabled="disabledXX"
type="primary"
icon="add"
size="small"
@click="productAddGk">维护</el-button>
</el-form-item>
<el-form-item v-show="form.standInData === '0'" label="起草单位" prop="qcdw" class="add-form-item form-item-disabled">
<el-select :disabled="disabledXX" style="width: 82%;" :popper-append-to-body="false" multiple filterable clearable v-model="form.qcdw" placeholder="请选择起草单位">
@@ -1584,7 +1592,7 @@
// 描述
describes: '',
// 唯一辨识
dicId: '4upkjyo34koluwmld5us' // 写死 数据字段ID
dicId: '' // 写死 数据字段ID
},
productRules: {
dicTypeName: [
@@ -2109,6 +2117,11 @@
this.productTitle = '维护起草单位'
this.productModelAdd.dicTypeCode = ''
},
productAddGk() {
this.productModal = true
this.productTitle = '维护归口管理部门'
this.productModelAdd.dicTypeCode = ''
},
checkIsOnly() {
let standType = ''
if(this.submitType !== 1){
@@ -2806,6 +2819,13 @@
this.modalShowFlag1 = true
this.key++
},
clear(){
this.defaultCheckedKeys1 = []
},
clear1(){
this.form.kccvppscn = ''
this.defaultCheckedKeys2 = []
},
choiceZRR2(type, title, id) {
this.drawerTitle = title
this.modalShowFlag2 = true
@@ -3397,6 +3417,8 @@
this.modalShowTree = false
},
popoverHideBusVs(checkedIds, checkedData, isShow, isLoadChild, topId) {
// this.nodeKeyCode = checkedIds
let arr = []
if (checkedData && checkedData.length != 0) {
if (checkedData.length > 0 && checkedData.length != 0) {
this.form.cycvppsbm = checkedData.map(item => item.code).join(",")
@@ -3405,6 +3427,12 @@
this.form.cycvppsbm = checkedData.code
this.form.cycvppscn = checkedData.chineseName
}
checkedData.forEach((item,index) => {
if(item.code){
arr.push(item.code)
}
})
this.defaultCheckedKeys1 = arr
this.modalShowFlag2 = false
}
@@ -3413,6 +3441,7 @@
this.modalShowFlag2 = false
},
popoverHideCarVs(checkedIds, checkedData, isShow, isLoadChild, topId) {
let arrnew = []
if (checkedData && checkedData.length != 0) {
if (checkedData.length > 0) {
this.form.kccvppsbm = checkedData.map(item => item.code).join(",")
@@ -3421,6 +3450,12 @@
this.form.kccvppsbm = checkedData.code
this.form.kccvppscn = checkedData.chineseName
}
checkedData.forEach((item,index) => {
if(item.code){
arrnew.push(item.code)
}
})
this.defaultCheckedKeys2 = arrnew
this.modalShowFlag3 = false
}
@@ -3466,6 +3501,11 @@
saveProduct (name) {
this.$refs[name].validate((valid) => {
if (valid) {
if(this.productTitle == '维护归口管理部门'){
this.productModelAdd.dicId = 'DNDYWNSJKH4H8LYTV2CJ'
} else if(this.productTitle == '维护起草单位'){
this.productModelAdd.dicId = '4upkjyo34koluwmld5us'
}
this.$http.postData('sys/dictype/create', this.productModelAdd, {
_this: this
}, res => {
src/pages/processCenter/pages/creatProcess/qbfz/step3.vue
+1 -1
View File
@@ -2,7 +2,7 @@
<div class="qbfz-step2">
<ProcessHeader toggle>
<template slot="proName">企标废止流程</template>
<template slot="proNode">会签</template>
<template slot="proNode">会签意见</template>
</ProcessHeader>
<div class="headerTabs">
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
src/pages/processCenter/pages/creatProcess/qbrk/step2.vue
+9 -2
View File
@@ -918,7 +918,7 @@
defaultCheckedKeys3: [],
fileUrl: 'api/att/attFile/uploadNew',
fileMadel: false,
fileType: '',
fileType: 'footFile',
countryArr:'',
commentCycleDate:'',
form: {
@@ -2168,6 +2168,8 @@
// if (fileList.length > 1) {
// this.fileList = fileList.splice(0, 1)
// }
console.log(fileList)
console.log(this.fileType)
if (response.ok) {
switch (this.fileType){
@@ -2187,11 +2189,14 @@
this.GLWJBUSSFileList = fileList
break;
case 'footFile':
console.log(fileList)
this.footFileList = fileList
this.uploadFileStatus = this.footFileList !== undefined ? (this.footFileList.length <= 0) : true
break;
default : ;
}
this.formKey++
console.log(this.footFileList)
this.$message({
showClose: true,
message: response.message,
@@ -2257,6 +2262,8 @@
break;
default : ;
}
this.formKey++
},
popoverHideBusVs (checkedIds, checkedData,isShow,isLoadChild,topId) {
if(checkedData) {
@@ -2371,7 +2378,7 @@
this.drawerTitle = '转办处理人'
},
handleUploadFile(){
this.fileType = '';
// this.fileType = '';
this.fileType = 'footFile';
this.fileList=this.footFileList
src/pages/processCenter/pages/creatProcess/qbrk/step5.vue
+7 -2
View File
@@ -1098,7 +1098,7 @@
replaceLoading: true,
replacePage: 1,
ListModel: false, // 新增编辑抽屉开关
active: '1', // 默认显示
active: '2', // 默认显示
isSubmit: false,
saveLoading: false,
defaultProps: {
@@ -2872,7 +2872,12 @@
this.$message.success(res.message)
}
})
}})
}else {
this.$message.warning('请确认是否填写完整')
}
})
}else {
this.$message.warning('请确认会签评分是否填写完整')
}
})
},
src/pages/processCenter/pages/creatProcess/qbrk/step6.vue
+7 -2
View File
@@ -1075,7 +1075,7 @@
replaceLoading: true,
replacePage: 1,
ListModel: false, // 新增编辑抽屉开关
active: '1', // 默认显示
active: '2', // 默认显示
isSubmit: false,
uploadFileStatus: true,
saveLoading: false,
@@ -2967,7 +2967,12 @@
// console.log(e)
// // this.$message.warning('文件不存在,预览失败')
// })
}})
}else {
this.$message.warning('请确认是否填写完整')
}
})
}else {
this.$message.warning('请确认评分是否填写完整')
}
})
},
src/pages/processCenter/pages/creatProcess/qbrk/step7.vue
+6 -2
View File
@@ -858,7 +858,7 @@
replaceLoading: true,
replacePage: 1,
ListModel: false, // 新增编辑抽屉开关
active: '1', // 默认显示
active: '2', // 默认显示
isSubmit: false,
saveLoading: false,
defaultProps: {
@@ -2315,6 +2315,8 @@
this.$refs['form'].validate((valid) => {
if (valid) {
this.handleSubmit()
}else {
this.$message.warning('请确认复审评分是否填写完整')
}
})
},
@@ -2485,7 +2487,9 @@
this.$message.success(res.message)
}
})
}})
}else{
}
})
},
busVsFunc(){
this.$http.get('sarVppsTree/list', '', {
src/pages/processCenter/pages/creatProcess/qbrk/step9.vue
+3 -1
View File
@@ -871,7 +871,7 @@
replaceLoading: true,
replacePage: 1,
ListModel: false, // 新增编辑抽屉开关
active: '1', // 默认显示
active: '2', // 默认显示
isSubmit: false,
saveLoading: false,
defaultProps: {
@@ -2469,6 +2469,8 @@
this.$refs['form'].validate((valid) => {
if (valid) {
this.handleSubmit()
}else{
this.$message.warning('请检查是否填写完整')
}
})
},
src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue
+3 -2
View File
@@ -921,7 +921,7 @@
replaceLoading: true,
replacePage: 1,
ListModel: false, // 新增编辑抽屉开关
active: '1', // 默认显示
active: '2', // 默认显示
isSubmit: false,
saveLoading: false,
defaultProps: {
@@ -2463,7 +2463,6 @@
this.fileMadel = true;
},
removeOneFile(file, fileList) {
switch (this.fileType){
case 'FBGBUSS':
this.FBGBUSSFileList = fileList
@@ -2487,7 +2486,9 @@
this.madelSubList = fileList
break;
default : ;
}
this.formKey++
},
popoverHide (checkedIds, checkedData,isShow,isLoadChild,topId) {
if(checkedData) {
src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue
+3 -1
View File
@@ -1075,7 +1075,7 @@
replaceLoading: true,
replacePage: 1,
ListModel: false, // 新增编辑抽屉开关
active: '1', // 默认显示
active: '2', // 默认显示
isSubmit: false,
uploadFileStatus: true,
saveLoading: false,
@@ -2966,6 +2966,8 @@
// // this.$message.warning('文件不存在,预览失败')
// })
}})
}else{
this.$message.warning('请检查是否填写完整')
}
})
},
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue
+35
View File
@@ -419,6 +419,7 @@ import ProcessTitle from "process/components/ProcessTitle";
import MechanismTree from "@/components/mechanismTree";
import CustomInputForAllStandards from '@/components/CustomFormComponents/InputForAllStandards'
import CustomInputForAllStandards2 from '@/components/CustomFormComponents/InputForAllStandards2'
import {processEditFile } from "api/process";
export default {
name: "establish",
components: {
@@ -429,6 +430,21 @@ export default {
},
props: ['message'],
data(){
const validateFsOnlineFile = async (rule, value, callback) => {
if(this.qbfsForm.FSD){
let fileObj = await this.processEditFile(this.qbfsForm.FSD)
if (fileObj) {
const editFileInfo = fileObj
if (editFileInfo && editFileInfo.editStatus === '1') {
callback()
} else {
callback(new Error('请先在线编辑,再提交流程！'))
}
}
}else {
callback(new Error('请先在线编辑,再提交流程！'))
}
};
const standNameVerify = async (rule, value, callback) => {
debugger
if (value === '' || value === null) {
@@ -567,6 +583,9 @@ export default {
newReason: [
{required: true, message: '请输入立项原因', trigger: 'blur'},
],
LXDName: [
{ required: true, validator: validateFsOnlineFile, trigger: 'blur' }
],
},
}
@@ -635,6 +654,22 @@ export default {
}
},
methods: {
processEditFile(id) {
return new Promise((resolve, reject) => {
processEditFile({
id
}).then(res => {
if (res) {
const history = res;
resolve(history)
} else {
reject()
}
}).catch(e => {
reject(e)
})
})
},
saveEditFile(){
if(this.$route.query.bpnId === undefined && this.$route.query.taskIds === undefined){
this.$http.get('/lawss/activiti/saveEditFile', {
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue
+1 -1
View File
@@ -23,7 +23,7 @@
></el-input>
</el-form-item>
<el-form-item prop="bussSort" label="企标类别" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
<el-select :disabled="disabledXX" disabled v-model="qbfsForm.bussSort" multiple filterable placeholder="请选择企标类别" style="width: 100%;">
<el-select :disabled="disabledXX" v-model="qbfsForm.bussSort" multiple filterable placeholder="请选择企标类别" style="width: 100%;">
<el-option
v-for="(item, index) in standSortOptions"
:key="index"
src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue
+1 -1
View File
@@ -534,7 +534,7 @@ export default {
_this: this
}, res => {
res.data.BUSSSTANDCLASS.forEach(item => {
if(item.label){
if(!item.label.indexOf('Q/FT')){
this.standSortOptions.push(item) //企标类别
}
})
src/pages/processCenter/pages/creatProcess/xmpg/step3.vue
+7
View File
@@ -528,6 +528,11 @@ export default {
},
data() {
return {
pickerOptions: {
disabledDate(time) {
return time.getTime() < Date.now() - 8.64e7;
},
},
comFlag: 0,
total: 0,
currentPage: 1,
@@ -661,6 +666,8 @@ export default {
}
});
});
console.log(this.dataList)
this.dataList = [...this.dataList]
this.modalShowFlag = false;
},
cancelBatchEditForm() {
src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue
+1 -1
View File
@@ -617,7 +617,7 @@ export default {
},
//查询项目下的标准
getStandData() {
this.$http.get("sarStandProjectLibrary/queryStandInfo", { id: this.projectId }, {
this.$http.get("sarStandProjectLibrary/queryStandInfoNew", { id: this.projectId }, {
_this: this
}, res => {
res.data.records.forEach(item => {
src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue
+2 -3
View File
@@ -90,8 +90,7 @@
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-if="scope.row.standYear" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSort + scope.row.standNumber}}-{{ scope.row.standYear}}</a>
<a v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSort }}
{{ scope.row.standNumber }}</a>
</template>
@@ -1284,7 +1283,7 @@ export default {
this.$http.get("sarStandProjectLibrary/queryStandInfoNew", {
id: id,
page: 1,
Size: 100
Size: 999
}, {
_this: this
}, res => {
src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue
+4 -3
View File
@@ -759,7 +759,7 @@ export default {
}, res => {
this.energyKindOptions = res.data.ENERGYTYPES; //适用车型
this.standSortOptions = res.data.STANDCLASSIFY; // 标准类别
this.setMap(res.data.WBZTCLASS);// 文本状态
this.setMap(res.data.WBZTCLASS,res.data.TEXTSTATUSBUSS);// 文本状态
this.setMap(this.zrbmMap, res.data.ZRBMCLASS);
this.textState = res.data.WBZTCLASS // 文本状态
this.showLocalProductData(this.getLocalPro);
@@ -821,8 +821,9 @@ export default {
this.selectPeople = row
},
// 将文本状态的id与name对应
setMap(data) {
data.forEach(item => {
setMap(data,res) {
var arr = data.concat(res)
arr.forEach(item => {
this.$set(this.textStatusMap, item.value, item.label)
})
},
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
+9 -1
View File
@@ -293,6 +293,7 @@
</el-table-column>
<el-table-column
prop="standName"
show-overflow-tooltip
:label="standLabelName"
align="center"
width="260px"
@@ -305,6 +306,7 @@
prop="standEnName"
align="center"
width="180px"
show-overflow-tooltip
label="英文名称">
<template slot-scope="scope">
<a @click="handlePreview(scope.row)">{{ scope.row.standEnName }}</a>
@@ -314,30 +316,35 @@
prop="typeApplicable"
align="center"
width="180px"
show-overflow-tooltip
label="适用车型">
</el-table-column>
<el-table-column
prop="nylx"
align="center"
width="180px"
show-overflow-tooltip
label="能源类型">
</el-table-column>
<el-table-column
prop="syrz"
align="center"
width="180px"
show-overflow-tooltip
label="适用认证">
</el-table-column>
<el-table-column
prop="ssrq"
align="center"
width="210px"
show-overflow-tooltip
label="标准实施日期">
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="zccssrqgj"
width="210px"
show-overflow-tooltip
align="center"
label="在产车实施日期">
</el-table-column>
@@ -345,12 +352,13 @@
prop="xcxssrqgj"
align="center"
width="210px"
show-overflow-tooltip
label="新车型实施日期">
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="zrbm"
width="210px"
show-overflow-tooltip
align="center"
label="责任部门">
</el-table-column>
src/pages/regulatoryRepository/dataCenter/dataCenterDetail.vue
+1
View File
@@ -77,6 +77,7 @@ export default {
this.downloadFile(attId)
return true
}else{
// this.$previewZl(attId) 39部署注释
this.$preview(attId)
}
},
src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+1 -1
View File
@@ -5449,7 +5449,7 @@ export default {
},
'sarBussionessStandEO.issueTime': {
handler: function () {
if (this.sarBussionessStandEO.issueTime !== undefined && this.sarBussionessStandEO.issueTime !== null && this.sarBussionessStandEO.issueTime !== '') {
if (this.sarBussionessStandEO.issueTime !== undefined && this.sarBussionessStandEO.issueTime !== null && this.sarBussionessStandEO.issueTime !== '' && this.sarBussionessStandEO["FSRQBUSS"] == null && !this.sarBussionessStandEO["FSRQBUSS"] && this.sarBussionessStandEO["FSRQBUSS"] == '') {
let date = new Date(this.$moment(this.sarBussionessStandEO.issueTime).format('YYYY-MM-DD'))
// const FSRQBUSS = date.getFullYear()+ 5 + '-' + date.getMonth() + '-' + date.getDate()
// this.sarBussionessStandEO["FSRQBUSS"] = FSRQBUSS
src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue
+3 -3
View File
@@ -267,12 +267,12 @@
</el-form-item>
<el-form-item prop="planStatus" label="计划状态" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
<el-select :disabled="DrawerType === 'see' || DrawerType === 'add' " v-model="addForm.planStatus" placeholder="请选择计划状态">
<el-option label="未完成" value="0"></el-option>
<!-- <el-option label="未完成" value="0"></el-option>-->
<el-option label="制定中" value="1"></el-option>
<el-option label="修订中" value="2"></el-option>
<el-option label="已取消" value="3"></el-option>
<el-option label="已完成" value="4"></el-option>
<el-option label="立项已完成" value="5"></el-option>
<!-- <el-option label="立项已完成" value="5"></el-option>-->
<el-option label="计划已确认" value="6"></el-option>
</el-select>
</el-form-item>
@@ -1279,7 +1279,7 @@
LXDName:'',
}
this.DrawerType = 'add'
this.addForm.planStatus = '0'
this.addForm.planStatus = '6'
this.$http.get('/lawss/activiti/saveEditFile', {
model: 'model_lx'
},{
src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
+41 -16
View File
@@ -89,14 +89,9 @@
width="190px"
>
<template slot-scope="scope">
<span v-if="scope.row.standSortShow === undefined"
style="margin-left: 10px">{{
scope.row.standSort + ' ' + scope.row.standNumber + '-' + scope.row.standYear
}}</span>
<span v-else
style="margin-left: 10px">{{
scope.row.standSortShow + ' ' + scope.row.standNumber + '-' + scope.row.standYear
}}</span>
<a class="table-jump" style="margin-left: 10px"
@click="handlePreview(scope.row)" v-if="scope.row.standSortShow === undefined" >{{scope.row.standSort + ' ' + scope.row.standNumber + '-' + scope.row.standYear}}</a>
<a class="table-jump" style="margin-left: 10px" @click="handlePreview(scope.row)" v-else >{{scope.row.standSortShow + ' ' + scope.row.standNumber + '-' + scope.row.standYear}}</a>
</template>
</el-table-column>
<el-table-column
@@ -105,6 +100,9 @@
min-width="300"
show-overflow-tooltip
>
<template slot-scope="scope">
<a class="table-jump" style="margin-left: 10px" @click="handlePreview(scope.row)">{{scope.row.standName}}</a>
</template>
</el-table-column>
<el-table-column
prop="standEnName"
@@ -112,6 +110,9 @@
min-width="300"
show-overflow-tooltip
>
<template slot-scope="scope">
<a class="table-jump" style="margin-left: 10px" @click="handlePreview(scope.row)">{{scope.row.standEnName}}</a>
</template>
</el-table-column>
<el-table-column
prop="ssrq"
@@ -823,14 +824,38 @@ export default {
},
// 点击查看
handlePreview(item) {
let routeUrl = this.$router.resolve({
name: 'OtherStandardDetails',
params: {
id: item.id,
pageType: 'INLAND_STAND'
}
})
window.open(routeUrl.href, '_blank')
switch (item.standType) {
case 'FOREIGN':
let routeUrl = this.$router.resolve({
name: 'OtherStandardDetails',
params: {
id: item.standId,
pageType: 'FOREIGN_STAND'
}
})
window.open(routeUrl.href, '_blank')
break;
case 'INLAND':
let routeUrl1 = this.$router.resolve({
name: 'OtherStandardDetails',
params: {
id: item.standId,
pageType: 'INLAND_STAND'
}
})
window.open(routeUrl1.href, '_blank')
break;
case 'BUSINESS_STAND':
let routeUrl2 = this.$router.resolve({
name: 'OtherBussStandardDetails',
params: {
id: item.standId,
pageType: 'BUSINESS_STAND'
}
})
window.open(routeUrl2.href, '_blank')
break;
}
},
back() {
this.$router.push({
src/pages/searchCenter/pages/advancedSearch.vue
+5 -8
View File
@@ -341,13 +341,6 @@
></el-input>
</el-form-item>
</el-col>
<!-- <el-col :span="12">-->
<!-- <el-form-item label="模块结构单元变型号" prop="dybxh" class="add-form-item form-item-disabled">-->
<!-- <el-input v-model="standForm.dybxh" placeholder="选择模块结构单元变型号" clearable></el-input>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
</el-row>
<el-row type="flex" justify="space-around" class="code-row-bg">
<el-col :span="12">
<el-form-item label="采标程度" prop="standNumber">
<el-select :popper-append-to-body="false" v-model="standForm.cbcd" placeholder="请选择采标程度" clearable>
@@ -355,6 +348,8 @@
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row type="flex" justify="space-around" class="code-row-bg">
<el-col :span="12">
<el-form-item label="引用标准" prop="nameShow">
<el-input
@@ -364,6 +359,8 @@
></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
</el-col>
</el-row>
</el-form>
</div>
@@ -469,7 +466,7 @@
v-for="item in lawsSyqyOptions"
placeholder="请选择"
:key="item.value"
:value="item.value"
:value="item.label"
:label="item.label"
></el-option>
</el-select>