FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev_20230216' into dev_20230216

Browse Source
This commit is contained in:
gaojiabao
2023-05-11 17:06:09 +08:00
parent 1337208e4c cdc141288e
commit 1bfa665dff
6 changed files with 247 additions and 1660 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/home2/components/todoList/index.vue
+203 -1632
View File
File diff suppressed because it is too large Load Diff
src/pages/processCenter/pages/creatProcess/bzpg/step1.vue
+2 -2
View File
@@ -243,9 +243,9 @@
size="900px"
custom-class="demo-drawer"
>
<div class="demo-drawer-content">
<div class="demo-drawer-content" style="position: relative">
<loading :loading="tableLoading">数据获取中</loading>
<div style="position: absolute;bottom: 48px;top:60px;left: 0;right: 0">
<div style="">
<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">
src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+1 -1
View File
@@ -2406,7 +2406,7 @@
standNature: this.form.standNature, // 标准性质
standEnName: this.form.standEnName, // 英文名称
standName: this.form.standName, // 中文名称
signFlag: '1', // 是否需要会签
signFlag: '2', // 是否需要会签
textStatus: '', // 文本状态
standYear: '', // 标准年份
// standInData: data.standInData ? data.standInData : '0', // 标准类型
src/pages/processCenter/pages/creatProcess/qbrk/step13.vue
+38 -22
View File
@@ -2532,35 +2532,35 @@
},
fileInfoHandle(){
//拼接文件名和id 提交到流程Activity
// this.form.FBGBUSS=this.FBGBUSSFileList.map(item => item.id).join(",")
// 修复将文件删除为一个后提交不显示的bug
this.form.FBGBUSS=this.FBGBUSSFileList.map(item => item.id ? item.id : item.response.data.id).join(",")
this.form.FBGBUSSName=this.FBGBUSSFileList.map(item => item.name).join(",")
//拼接文件名和id 提交到流程Activity
// this.form.FBGBUSS=this.FBGBUSSFileList.map(item => item.id).join(",")
// 修复将文件删除为一个后提交不显示的bug
this.form.FBGBUSS=this.FBGBUSSFileList.map(item => item.id ? item.id : item.response.data.id).join(",")
this.form.FBGBUSSName=this.FBGBUSSFileList.map(item => item.name).join(",")
// this.form.BZSMBUSS=this.BZSMBUSSFileList.map(item => item.id).join(",")
this.form.BZSMBUSS=this.BZSMBUSSFileList.map(item => item.id ? item.id : item.response.data.id).join(",")
this.form.BZSMBUSSName=this.BZSMBUSSFileList.map(item => item.name).join(",")
// this.form.BZSMBUSS=this.BZSMBUSSFileList.map(item => item.id).join(",")
this.form.BZSMBUSS=this.BZSMBUSSFileList.map(item => item.id ? item.id : item.response.data.id).join(",")
this.form.BZSMBUSSName=this.BZSMBUSSFileList.map(item => item.name).join(",")
// this.form.LSBBBUSS=this.LSBBBUSSFileList.map(item => item.id).join(",")
this.form.LSBBBUSS=this.LSBBBUSSFileList.map(item => item.id ? item.id : item.response.data.id).join(",")
this.form.LSBBBUSSName=this.LSBBBUSSFileList.map(item => item.name).join(",")
this.form.LSBBBUSS=this.LSBBBUSSFileList.map(item => item.id ? item.id : item.response.data.id).join(",")
this.form.LSBBBUSSName=this.LSBBBUSSFileList.map(item => item.name).join(",")
// this.form.QTWJBUSS=this.QTWJBUSSFileList.map(item => item.id).join(",")
this.form.QTWJBUSS=this.QTWJBUSSFileList.map(item => item.id ? item.id : item.response.data.id).join(",")
this.form.QTWJBUSSName=this.QTWJBUSSFileList.map(item => item.name).join(",")
// this.form.QTWJBUSS=this.QTWJBUSSFileList.map(item => item.id).join(",")
this.form.QTWJBUSS=this.QTWJBUSSFileList.map(item => item.id ? item.id : item.response.data.id).join(",")
this.form.QTWJBUSSName=this.QTWJBUSSFileList.map(item => item.name).join(",")
// this.form.GLWJBUSS=this.GLWJBUSSFileList.map(item => item.id).join(",")
this.form.GLWJBUSS=this.GLWJBUSSFileList.map(item => item.id ? item.id : item.response.data.id).join(",")
this.form.GLWJBUSSName=this.GLWJBUSSFileList.map(item => item.name).join(",")
// this.form.GLWJBUSS=this.GLWJBUSSFileList.map(item => item.id).join(",")
this.form.GLWJBUSS=this.GLWJBUSSFileList.map(item => item.id ? item.id : item.response.data.id).join(",")
this.form.GLWJBUSSName=this.GLWJBUSSFileList.map(item => item.name).join(",")
// this.form.summaryFile=this.summaryFileList.map(item => item.id).join(",")
this.form.summaryFile=this.summaryFileList.map(item => item.id ? item.id : item.response.data.id).join(",")
this.form.summaryFileName=this.summaryFileList.map(item => item.name).join(",")
// this.form.summaryFile=this.summaryFileList.map(item => item.id).join(",")
this.form.summaryFile=this.summaryFileList.map(item => item.id ? item.id : item.response.data.id).join(",")
this.form.summaryFileName=this.summaryFileList.map(item => item.name).join(",")
// this.form.madelSub=this.madelSubList.map(item => item.id).join(",")
this.form.madelSub=this.madelSubList.map(item => item.id ? item.id : item.response.data.id).join(",")
this.form.madelSubName=this.madelSubList.map(item => item.name).join(",")
// this.form.madelSub=this.madelSubList.map(item => item.id).join(",")
this.form.madelSub=this.madelSubList.map(item => item.id ? item.id : item.response.data.id).join(",")
this.form.madelSubName=this.madelSubList.map(item => item.name).join(",")
},
// 删除方法
@@ -2828,7 +2828,23 @@
}
return "";
},
// 截取字符前后的逗号
subComma(str){
if(str && str!== ''){
if(str.indexOf(',') === 0){
str = str.slice(1)
}
if(str.lastIndexOf(',') === str.length - 1){
str = str.slice(0, -1)
}
return str
}else{
return ''
}
},
assemble(ids,names){
ids = this.subComma(ids)
names = this.subComma(names)
let list= new Array();
if(ids && ids !== '' && names && names !== ''){
let idArray=ids.split(',');
src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+1 -1
View File
@@ -2879,7 +2879,7 @@ export default {
standNumber: [
{required: true, type: 'string', message: '标准编号不能为空', trigger: 'change'},
{type: 'string', max: 100, message: '标准编号不能超过100个字符', trigger: 'change'},
{validator: this.verify.validateStandardItem, trigger: 'change'}
{validator: this.verify.validateStandardItem2, trigger: 'change'}
],
standYear: [
{required: true, message: '标准年份不能为空', trigger: 'change'},
src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+2 -2
View File
@@ -2434,7 +2434,7 @@ export default {
standNumber: [
{required: true, type: 'string', message: '标准编号不能为空', trigger: 'change'},
{type: 'string', max: 100, message: '标准编号不能超过100个字符', trigger: 'change'},
{type: 'string', validator: this.verify.validateStandardItem, trigger: 'change'}
{type: 'string', validator: this.verify.validateStandardItem2, trigger: 'change'}
],
synopsis: [
{type: 'string', max: 1000, message: '文本说明不能超过1000个字符', trigger: 'change'}
@@ -2468,7 +2468,7 @@ export default {
standNumber: [
{required: true, type: 'string', message: '标准编号不能为空', trigger: 'change'},
{type: 'string', max: 100, message: '标准编号不能超过100个字符', trigger: 'change'},
{type: 'string', validator: this.verify.validateStandardItem, trigger: 'change'}
{type: 'string', validator: this.verify.validateStandardItem2, trigger: 'change'}
],
standYear: [
// {required: true, message: '标准年份/系列不能为空', trigger: 'change'},