WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
zer0Black
2022-06-16 13:27:22 +08:00
parent f50320bc27 676eaad008
commit dd6168c739
8 changed files with 765 additions and 705 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
+2 -2
View File
@@ -4399,10 +4399,10 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
if (fileList.size() != 0) { if (fileList.size() != 0) {
//文件 //文件
if(CutEnum.CN.getValue().equals(cut)){ if(CutEnum.CN.getValue().equals(cut)){
String file = StringUtils.join(fileList, ",") + "字段为文件属性,填写时需要在本文件同级目录下以标准号为名称建立文件夹,并在文件夹下放置文件,假设在AAA标准号下放置了B.pdf,则应填写AAA/B.pdf\n"; String file = StringUtils.join(fileList, ",") + "字段为文件属性,填写时需要在本文件同级目录下以标准号为名称建立文件夹,并在文件夹下放置文件且该文件夹下只能有一层级,假设在AAA标准号下放置了B.pdf,则应填写AAA/B.pdf\n";
sbTwo.append(count++ + "." + file); sbTwo.append(count++ + "." + file);
}else{ }else{
String file = StringUtils.join(fileList, ",") + " When filling in the field, you need to create a folder in the directory of the same level as the file with the name of the standard number and place the file in the folder. Assume that the file is saved in the AAA standard numberB.pdf,Should fill inAAA/B.pdf\n"; String file = StringUtils.join(fileList, ",") + " When filling in the field, you need to create a folder in the directory of the same level as the file with the name of the standard number and place the file in the folder and can be only one level under this folder, Assume that the file is saved in the AAA standard numberB.pdf,Should fill inAAA/B.pdf\n";
sbTwo.append(count++ + "." + file); sbTwo.append(count++ + "." + file);
} }
} }
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/common/FileUnZip.java
+2 -2
View File
@@ -136,8 +136,8 @@ public class FileUnZip {
String filenameOne = ""; String filenameOne = "";
String filenameTwo = ""; String filenameTwo = "";
if(filename.contains("/")){ if(filename.contains("/")){
filenameOne = filename.split("/")[0]; filenameOne = filename.split("/")[1];
filenameTwo = filename.split("/")[1]; filenameTwo = filename.split("/")[2];
} }
List<File> resultlist = new ArrayList<>(); List<File> resultlist = new ArrayList<>();
if (StringUtil.isNotEmpty(path)){ if (StringUtil.isNotEmpty(path)){
jero-web/src/common/lang/en-us.js
+3 -2
View File
@@ -554,8 +554,8 @@ module.exports = {
newNode: 'New node', newNode: 'New node',
modifyNode: 'Modify Node', modifyNode: 'Modify Node',
deleteNode: 'Delete Node', deleteNode: 'Delete Node',
ImplementationDate: 'New Type Execute Date', ImplementationDate: 'New Type Execution Date',
vehicleInProductionDate: 'New Vehicle Execute Date', vehicleInProductionDate: 'New Vehicle Execution Date',
deleteNodes: 'If there are child nodes under this node, they will be deleted synchronously. Are you sure to delete this data?', deleteNodes: 'If there are child nodes under this node, they will be deleted synchronously. Are you sure to delete this data?',
leastTwo: 'Please Select at Least two pieces of data', leastTwo: 'Please Select at Least two pieces of data',
mergeTerms: 'Determine Merger Terms', mergeTerms: 'Determine Merger Terms',
@@ -937,5 +937,6 @@ module.exports = {
documentLibraryDetails: 'Document library details', documentLibraryDetails: 'Document library details',
question:'Question', question:'Question',
ConfirmQuestion:'Confirm Question', ConfirmQuestion:'Confirm Question',
disableInput:'Disable input',
OnlyOrTaskconfirmationOut:'Only when the list confirmation status or task confirmation status is to be confirmed can the reminder be carried out', OnlyOrTaskconfirmationOut:'Only when the list confirmation status or task confirmation status is to be confirmed can the reminder be carried out',
} }
jero-web/src/common/lang/zh-cn.js
+1
View File
@@ -943,4 +943,5 @@ module.exports = {
question: '催办', question: '催办',
ConfirmQuestion: '确认催办？', ConfirmQuestion: '确认催办？',
OnlyOrTaskconfirmationOut:'只有清单确认状态或任务确认状态为待确认时才可以进行催办', OnlyOrTaskconfirmationOut:'只有清单确认状态或任务确认状态为待确认时才可以进行催办',
disableInput:'禁止输入',
} }
jero-web/src/views/documentManage/tags/dialog/DicList.vue
+52 -27
View File
@@ -19,16 +19,22 @@
<a-icon type="plus"/> <a-icon type="plus"/>
{{$t('add')}} {{$t('add')}}
</div> </div>
<div class="operator-text" @click="batDelete" v-has="dictVal=='list'?'dictItem:logicDeleteBatch':'sys:category:logicDeleteBatch'"> <div class="operator-text" @click="batDelete"
v-has="dictVal=='list'?'dictItem:logicDeleteBatch':'sys:category:logicDeleteBatch'">
<a-icon type="delete"/> <a-icon type="delete"/>
{{$t('BatchDelete')}} {{$t('BatchDelete')}}
</div> </div>
</div> </div>
<div class="dic-list-table"> <div class="dic-list-table">
<list-table v-if="dictVal=='list'&&dataFlag" :tableData="tableData" @editDict="editDict" @deleteDict="deleteDict" :total="total" :queryParams="queryParams" @selected="selectedKeys" @ok="ok"></list-table> <list-table v-if="dictVal=='list'&&dataFlag" :tableData="tableData" @editDict="editDict"
<tree-table v-if="dictVal=='tree'&&dataFlag" :tabletreeData="tabletreeData" :record="record" :queryParams="queryParams" @editDict="editTreeDict" @selectedKeys="selectedKeys" @ok="ok" :total="total" :isPagination="false"></tree-table> @deleteDict="deleteDict" :total="total" :queryParams="queryParams" @selected="selectedKeys"
@ok="ok"></list-table>
<tree-table v-if="dictVal=='tree'&&dataFlag" :tabletreeData="tabletreeData" :record="record"
:queryParams="queryParams" @editDict="editTreeDict" @selectedKeys="selectedKeys" @ok="ok"
:total="total" :isPagination="false"></tree-table>
</div> </div>
<a-modal class="dict-module" v-model="newVisible" :title="title" :ok-text="$t('preservation')" :cancel-text="$t('cancel')" @ok="hideModal" @cancel="cancelModel" v-if="newVisible"> <a-modal class="dict-module" v-model="newVisible" :title="title" :ok-text="$t('preservation')"
:cancel-text="$t('cancel')" @ok="hideModal" @cancel="cancelModel" v-if="newVisible">
<a-form-model <a-form-model
v-if="newVisible" v-if="newVisible"
class="dic-form-module" class="dic-form-module"
@@ -58,7 +64,8 @@
</a-select> </a-select>
</a-form-model-item> </a-form-model-item>
<a-form-model-item :label="$t('DisplayOrder')" prop="sortOrder"> <a-form-model-item :label="$t('DisplayOrder')" prop="sortOrder">
<a-input-number v-model="form.sortOrder" :placeholder="$t('PleaseEnterDisplayOrder')" style="width: 100%" :min="1" :max="99999" :formatter="limitNumber" :parser="limitNumber" /> <a-input-number v-model="form.sortOrder" :placeholder="$t('PleaseEnterDisplayOrder')" style="width: 100%"
:min="1" :max="99999" :formatter="limitNumber" :parser="limitNumber"/>
</a-form-model-item> </a-form-model-item>
<a-form-model-item :label="$t('describe')" prop="description"> <a-form-model-item :label="$t('describe')" prop="description">
<a-input v-model.trim="form.description" :placeholder="$t('PleaseEnterDescription')"/> <a-input v-model.trim="form.description" :placeholder="$t('PleaseEnterDescription')"/>
@@ -76,7 +83,8 @@
import ListTable from './ListTable' import ListTable from './ListTable'
import TreeTable from './TreeTable' import TreeTable from './TreeTable'
import Vue from 'vue' import Vue from 'vue'
import { UI_CACHE_DB_DICT_DATA } from "@/store/mutation-types" import { UI_CACHE_DB_DICT_DATA } from '@/store/mutation-types'
export default { export default {
name: 'dicList', name: 'dicList',
components: { components: {
@@ -103,13 +111,15 @@
name: [ name: [
{ required: true, message: this.$t('enterName'), trigger: 'blur' }, { required: true, message: this.$t('enterName'), trigger: 'blur' },
{ min: 1, max: 100, message: this.$t('cantExeed') + '100' + this.$t('characters'), trigger: 'blur' }, { min: 1, max: 100, message: this.$t('cantExeed') + '100' + this.$t('characters'), trigger: 'blur' },
{ validator: this.test }
], ],
itemText: [ itemText: [
{ required: true, message: this.$t('enterName'), trigger: 'blur' }, { required: true, message: this.$t('enterName'), trigger: 'blur' },
{ min: 1, max: 100, message: this.$t('cantExeed') + '100' + this.$t('characters'), trigger: 'blur' }, { min: 1, max: 100, message: this.$t('cantExeed') + '100' + this.$t('characters'), trigger: 'blur' },
{ validator: this.test }
], ],
sortOrder: [ sortOrder: [
{ required: true, message: this.$t('PleaseEnterDisplayOrder'),trigger: 'blur'}, { required: true, message: this.$t('PleaseEnterDisplayOrder'), trigger: 'blur' }
], ],
// itemValue:[ // itemValue:[
// { required: true, message: this.$t('enterDataValue'), trigger: 'blur' }, // { required: true, message: this.$t('enterDataValue'), trigger: 'blur' },
@@ -118,10 +128,11 @@
enName: [ enName: [
{ required: true, message: this.$t('PleaseEnterYourEnglishName'), trigger: 'blur' }, { required: true, message: this.$t('PleaseEnterYourEnglishName'), trigger: 'blur' },
{ min: 1, max: 100, message: this.$t('cantExeed') + '100' + this.$t('characters'), trigger: 'blur' }, { min: 1, max: 100, message: this.$t('cantExeed') + '100' + this.$t('characters'), trigger: 'blur' },
{ validator: this.test }
], ],
description: [ description: [
// { required: true, message: this.$t('PleaseEnterDescription'), trigger: 'blur' }, // { required: true, message: this.$t('PleaseEnterDescription'), trigger: 'blur' },
{ min:1, max: 200, message: this.$t('cantExeed')+'200'+this.$t('characters'), trigger: 'blur' }, { min: 1, max: 200, message: this.$t('cantExeed') + '200' + this.$t('characters'), trigger: 'blur' }
] ]
}, },
tableData: [], tableData: [],
@@ -146,7 +157,7 @@
}, },
editPId() { editPId() {
this.parentData = this.getParents this.parentData = this.getParents
}, }
}, },
mounted() { mounted() {
@@ -164,9 +175,17 @@
}) })
} }
return parents return parents
}, }
}, },
methods: { methods: {
test(rule, value, callback) {
var money = /[,]|[，]/g
if (money.test(value)) {
callback(new Error(this.$t('disableInput') + ','))
} else {
callback()
}
},
//获取列表数据 //获取列表数据
loadData() { loadData() {
this.dataFlag = false this.dataFlag = false
@@ -214,29 +233,29 @@
//将数据拼成树形结构 //将数据拼成树形结构
toTree(config) { toTree(config) {
config.forEach(function(item) { config.forEach(function(item) {
delete item.children; delete item.children
}); })
// 将数据存储为 以 id 为 KEY 的 map 索引数据列 // 将数据存储为 以 id 为 KEY 的 map 索引数据列
let map = {}; let map = {}
config.forEach((item) => { config.forEach((item) => {
// 树 的label // 树 的label
item.label = item.name; item.label = item.name
item.key=item.id; item.key = item.id
map[item.id] = item; map[item.id] = item
}); })
let val = []; let val = []
config.forEach((item) => { config.forEach((item) => {
// 以当前遍历项，的pid,去map对象中找到索引的id // 以当前遍历项，的pid,去map对象中找到索引的id
let parent = map[item.pid]; let parent = map[item.pid]
// 如果找到索引，那么说明此项不在顶级当中,那么需要把此项添加到，他对应的父级中 // 如果找到索引，那么说明此项不在顶级当中,那么需要把此项添加到，他对应的父级中
if (parent) { if (parent) {
(parent.children || (parent.children = [])).push(item); (parent.children || (parent.children = [])).push(item)
} else { } else {
//如果没有在map中找到对应的索引ID,那么直接把 当前的item添加到 val结果集中，作为顶级 //如果没有在map中找到对应的索引ID,那么直接把 当前的item添加到 val结果集中，作为顶级
val.push(item); val.push(item)
} }
}); })
return val; return val
}, },
//搜索 //搜索
@@ -256,7 +275,7 @@
dicAdd() { dicAdd() {
this.title = this.$t('add') this.title = this.$t('add')
this.isEdit = false this.isEdit = false
this.newVisible=true; this.newVisible = true
this.form = {} this.form = {}
if (this.dictVal == 'list') { if (this.dictVal == 'list') {
this.parentVisible = false this.parentVisible = false
@@ -374,7 +393,7 @@
}, },
//取消 //取消
cancelModel() { cancelModel() {
this.newVisible=false; this.newVisible = false
}, },
//列表编辑 //列表编辑
editDict(rec, val) { editDict(rec, val) {
@@ -412,14 +431,14 @@
// sys/dictItem/delete // sys/dictItem/delete
getAction(`sys/dictItem/logicDelete`, params).then(res => { getAction(`sys/dictItem/logicDelete`, params).then(res => {
if (res.success) { if (res.success) {
this.$message.success(this.$t('OperationSuccessful')); this.$message.success(this.$t('OperationSuccessful'))
this.reFresh() this.reFresh()
if (this.tableData && this.tableData.length == 1 && this.queryParams.pageNo != 1) { if (this.tableData && this.tableData.length == 1 && this.queryParams.pageNo != 1) {
this.queryParams.pageNo = this.queryParams.pageNo - 1 this.queryParams.pageNo = this.queryParams.pageNo - 1
} }
this.loadData() this.loadData()
} else { } else {
this.$message.warning(res.message); this.$message.warning(res.message)
} }
}) })
} }
@@ -493,26 +512,31 @@
<style lang="less" scoped> <style lang="less" scoped>
@import '~@assets/less/common.less'; @import '~@assets/less/common.less';
.dic-list { .dic-list {
.dic-list-content { .dic-list-content {
.dic-list-header { .dic-list-header {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
.form-btn { .form-btn {
.form-btn-search { .form-btn-search {
margin-right: 10px; margin-right: 10px;
} }
} }
} }
.dic-list-module { .dic-list-module {
margin-bottom: 20px; margin-bottom: 20px;
} }
.dic-list-table { .dic-list-table {
margin-top: 20px; margin-top: 20px;
} }
} }
} }
.dict-module { .dict-module {
.ant-modal-footer { .ant-modal-footer {
align: center; align: center;
@@ -525,6 +549,7 @@
text-align: center; text-align: center;
} }
} }
.dic-list { .dic-list {
.dic-list-content { .dic-list-content {
.table-operator { .table-operator {
jero-web/src/views/documentManage/tags/dialog/TagForm.vue
+76 -55
View File
@@ -36,19 +36,22 @@
<!-- 属性名称--> <!-- 属性名称-->
<a-col :span="24"> <a-col :span="24">
<a-form-model-item :label="$t('AttributeName')" prop="dbFieldTxt"> <a-form-model-item :label="$t('AttributeName')" prop="dbFieldTxt">
<a-input v-model="form.dbFieldTxt" :placeholder="$t('PleaseEnterPropertyName')" :maxLength="120" ></a-input> <a-input v-model="form.dbFieldTxt" :placeholder="$t('PleaseEnterPropertyName')"
:maxLength="120"></a-input>
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
<!-- 英文名称--> <!-- 英文名称-->
<a-col :span="24"> <a-col :span="24">
<a-form-model-item :label="$t('enName')" prop="dbFieldEnName"> <a-form-model-item :label="$t('enName')" prop="dbFieldEnName">
<a-input v-model="form.dbFieldEnName" :placeholder="$t('PleaseEnterYourEnglishName')" :maxLength="120" ></a-input> <a-input v-model="form.dbFieldEnName" :placeholder="$t('PleaseEnterYourEnglishName')"
:maxLength="120"></a-input>
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
<!-- 属性类型--> <!-- 属性类型-->
<a-col :span="24"> <a-col :span="24">
<a-form-model-item :label="$t('AttributeType')" prop="fieldShowType"> <a-form-model-item :label="$t('AttributeType')" prop="fieldShowType">
<j-dict-select-tag type="list" v-model="form.fieldShowType" dictCode="field_show_type" :placeholder="$t('PleaseSelectAttributeType')" :disabled="disabledEdit" /> <j-dict-select-tag type="list" v-model="form.fieldShowType" dictCode="field_show_type"
:placeholder="$t('PleaseSelectAttributeType')" :disabled="disabledEdit"/>
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
<a-col :span="24" v-if="isTagContent"> <a-col :span="24" v-if="isTagContent">
@@ -65,17 +68,20 @@
</a-col> </a-col>
<a-col :span="24" v-if="isLength"> <a-col :span="24" v-if="isLength">
<a-form-model-item :label="$t('FieldLength')" prop="dbLength"> <a-form-model-item :label="$t('FieldLength')" prop="dbLength">
<a-input-number v-model="form.dbLength" :min="1" :max="200" :placeholder="$t('PleaseEnterFieldLength')" style="width: 100%" :formatter="limitNumber" :parser="limitNumber" /> <a-input-number v-model="form.dbLength" :min="1" :max="200" :placeholder="$t('PleaseEnterFieldLength')"
style="width: 100%" :formatter="limitNumber" :parser="limitNumber"/>
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
<a-col :span="24"> <a-col :span="24">
<a-form-model-item :label="$t('DisplayOrder')" prop="orderNum"> <a-form-model-item :label="$t('DisplayOrder')" prop="orderNum">
<a-input-number v-model="form.orderNum" :placeholder="$t('PleaseEnterDisplayOrder')" style="width: 100%" :min="1" :max="99999" :formatter="limitNumber" :parser="limitNumber" /> <a-input-number v-model="form.orderNum" :placeholder="$t('PleaseEnterDisplayOrder')" style="width: 100%"
:min="1" :max="99999" :formatter="limitNumber" :parser="limitNumber"/>
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
<a-col :span="24"> <a-col :span="24">
<a-form-model-item :label="$t('Required')" prop="fieldMustInput"> <a-form-model-item :label="$t('Required')" prop="fieldMustInput">
<j-dict-select-tag type="list" v-model="form.fieldMustInput" dictCode="yn" :placeholder="$t('selectWhetherRequired')" /> <j-dict-select-tag type="list" v-model="form.fieldMustInput" dictCode="yn"
:placeholder="$t('selectWhetherRequired')"/>
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
<p class="tag-info">{{submitKey == 1?$t('DocumentLibraryModuleDisplay'):$t('documentSplitDisplay')}}</p> <p class="tag-info">{{submitKey == 1?$t('DocumentLibraryModuleDisplay'):$t('documentSplitDisplay')}}</p>
@@ -103,7 +109,8 @@
</a-col> </a-col>
<a-col :span="24" v-if="isSearch"> <a-col :span="24" v-if="isSearch">
<a-form-model-item :label="$t('Search')" prop="isQuery"> <a-form-model-item :label="$t('Search')" prop="isQuery">
<j-dict-select-tag type="list" v-model="form.isQuery" dictCode="yn" :placeholder="$t('SelectWhetherToSearch')" /> <j-dict-select-tag type="list" v-model="form.isQuery" dictCode="yn"
:placeholder="$t('SelectWhetherToSearch')"/>
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
@@ -111,12 +118,14 @@
<a-divider dashed v-if="submitKey == 1"/> <a-divider dashed v-if="submitKey == 1"/>
<a-col :span="24" v-if="submitKey == 1"> <a-col :span="24" v-if="submitKey == 1">
<a-form-model-item :label="$t('RegulationsListDisplay')" prop="isShowLawsList"> <a-form-model-item :label="$t('RegulationsListDisplay')" prop="isShowLawsList">
<j-dict-select-tag type="list" v-model="form.isShowLawsList" dictCode="yn" :placeholder="$t('selectDisplayListRegulations')" /> <j-dict-select-tag type="list" v-model="form.isShowLawsList" dictCode="yn"
:placeholder="$t('selectDisplayListRegulations')"/>
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
<a-col :span="24" v-if="submitKey == 1"> <a-col :span="24" v-if="submitKey == 1">
<a-form-model-item :label="$t('SearchCenterDisplay')" prop="isShowSearch"> <a-form-model-item :label="$t('SearchCenterDisplay')" prop="isShowSearch">
<j-dict-select-tag type="list" v-model="form.isShowSearch" dictCode="yn" :placeholder="$t('selectSearchCenterDisplayed')" /> <j-dict-select-tag type="list" v-model="form.isShowSearch" dictCode="yn"
:placeholder="$t('selectSearchCenterDisplayed')"/>
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
<!-- <a-col v-if="showFlowSubmitButton" :span="24" style="text-align: center">--> <!-- <a-col v-if="showFlowSubmitButton" :span="24" style="text-align: center">-->
@@ -138,13 +147,13 @@ import { validateDuplicateValue } from '@/utils/util'
export default { export default {
name: 'TagForm', name: 'TagForm',
components: { components: {},
},
props: { props: {
//流程表单data //流程表单data
formData: { formData: {
type: Object, type: Object,
default: ()=>{}, default: () => {
},
required: false required: false
}, },
//表单模式：true流程表单 false普通表单 //表单模式：true流程表单 false普通表单
@@ -161,7 +170,7 @@ export default {
}, },
drawerVisible: { drawerVisible: {
type: Boolean, type: Boolean,
default: false, default: false
}, },
editData: { editData: {
type: Object, type: Object,
@@ -190,65 +199,68 @@ export default {
model: {}, model: {},
labelCol: { labelCol: {
xs: { span: 24 }, xs: { span: 24 },
sm: { span: 6 }, sm: { span: 6 }
}, },
wrapperCol: { wrapperCol: {
xs: { span: 24 }, xs: { span: 24 },
sm: { span: 16 }, sm: { span: 16 }
}, },
confirmLoading: false, confirmLoading: false,
validatorRules: { validatorRules: {
isModel: [ isModel: [
{ required: true, message: this.$t('PleaseSelectModule'),trigger: 'change'}, { required: true, message: this.$t('PleaseSelectModule'), trigger: 'change' }
], ],
dbFieldTxt: [ dbFieldTxt: [
{ required: true, message: this.$t('PleaseEnterPropertyName'), trigger: 'blur' }, { required: true, message: this.$t('PleaseEnterPropertyName'), trigger: 'blur' },
{ min: 1, max: 20, message: this.$t('cantExeed') + '20' + this.$t('characters'), trigger: 'blur' }, { min: 1, max: 20, message: this.$t('cantExeed') + '20' + this.$t('characters'), trigger: 'blur' },
{ validator: this.test }
], ],
dbFieldName: [ dbFieldName: [
{ required: true, message: this.$t('PleaseEnterYourEnglishName'), trigger: 'blur' }, { required: true, message: this.$t('PleaseEnterYourEnglishName'), trigger: 'blur' },
{ min: 1, max: 20, message: this.$t('cantExeed') + '20' + this.$t('characters'), trigger: 'blur' }, { min: 1, max: 20, message: this.$t('cantExeed') + '20' + this.$t('characters'), trigger: 'blur' },
{ validator: this.test }
], ],
dbFieldEnName: [ dbFieldEnName: [
{ required: true, message: this.$t('PleaseEnterYourEnglishName'), trigger: 'change' }, { required: true, message: this.$t('PleaseEnterYourEnglishName'), trigger: 'change' },
{ max: 50, message: this.$t('cantExeed') + '50' + this.$t('characters'), trigger: 'blur' }, { max: 50, message: this.$t('cantExeed') + '50' + this.$t('characters'), trigger: 'blur' },
{ validator: this.test }
], ],
fieldShowType: [ fieldShowType: [
{ required: true, message: this.$t('PleaseSelectAttributeType'),trigger: 'change'}, { required: true, message: this.$t('PleaseSelectAttributeType'), trigger: 'change' }
], ],
dictId: [ dictId: [
{ required: true, message: this.$t('PleaseSelectOptionContent'),trigger: 'change'}, { required: true, message: this.$t('PleaseSelectOptionContent'), trigger: 'change' }
], ],
dbLength: [ dbLength: [
{ required: true, message: this.$t('PleaseEnterFieldLength'),trigger: 'blur'}, { required: true, message: this.$t('PleaseEnterFieldLength'), trigger: 'blur' }
], ],
orderNum: [ orderNum: [
{ required: true, message: this.$t('PleaseEnterDisplayOrder'),trigger: 'blur'}, { required: true, message: this.$t('PleaseEnterDisplayOrder'), trigger: 'blur' }
], ],
fieldMustInput: [ fieldMustInput: [
{ required: true, message: this.$t('selectWhetherRequired'),trigger: 'change'}, { required: true, message: this.$t('selectWhetherRequired'), trigger: 'change' }
], ],
isShowList: [ isShowList: [
{ required: true, message: this.$t('selectDisplayList'),trigger: 'change'}, { required: true, message: this.$t('selectDisplayList'), trigger: 'change' }
], ],
showArea: [ showArea: [
{ required: true, message: this.$t('SelectDisplayArea'),trigger: 'change'}, { required: true, message: this.$t('SelectDisplayArea'), trigger: 'change' }
], ],
isQuery: [ isQuery: [
{ required: true, message: this.$t('SelectWhetherToSearch'),trigger: 'change'}, { required: true, message: this.$t('SelectWhetherToSearch'), trigger: 'change' }
], ],
isShowLawsList: [ isShowLawsList: [
{ required: true, message: this.$t('selectDisplayListRegulations'),trigger: 'change'}, { required: true, message: this.$t('selectDisplayListRegulations'), trigger: 'change' }
], ],
isShowSearch: [ isShowSearch: [
{ required: true, message: this.$t('selectSearchCenterDisplayed'),trigger: 'change'}, { required: true, message: this.$t('selectSearchCenterDisplayed'), trigger: 'change' }
], ]
}, },
addVisible: false, addVisible: false,
url: { url: {
add: "tag/onlCgformTag/add", add: 'tag/onlCgformTag/add',
edit: "tag/onlCgformTag/edit", edit: 'tag/onlCgformTag/edit',
queryById: "tag/onlCgformTag/queryById" queryById: 'tag/onlCgformTag/queryById'
}, },
//展示区域选项内容 //展示区域选项内容
areaOptions: [], areaOptions: [],
@@ -294,7 +306,7 @@ export default {
}, },
disableEdit() { disableEdit() {
}, }
}, },
computed: { computed: {
@@ -321,7 +333,7 @@ export default {
}, },
created() { created() {
//如果是流程中表单，则需要加载流程表单data //如果是流程中表单，则需要加载流程表单data
this.showFlowData(); this.showFlowData()
}, },
mounted() { mounted() {
// console.log('disableEdit',this.disableEdit) // console.log('disableEdit',this.disableEdit)
@@ -352,9 +364,17 @@ export default {
// console.log('this.form.isModel',this.form.isModel) // console.log('this.form.isModel',this.form.isModel)
}, },
methods: { methods: {
test(rule, value, callback) {
var money = /[,]|[，]/g
if (money.test(value)) {
callback(new Error(this.$t('disableInput') + ','))
} else {
callback()
}
},
//获取选项内容 //获取选项内容
loadContent() { loadContent() {
let params = {}; let params = {}
getAction(`sys/dict/queryDictName`, params).then((res) => { getAction(`sys/dict/queryDictName`, params).then((res) => {
if (res.success) { if (res.success) {
let data = [...res.result] let data = [...res.result]
@@ -377,25 +397,25 @@ export default {
this.isTagContent = false this.isTagContent = false
} }
} }
}); })
}, },
//获取展示区域 //获取展示区域
loadShowArea() { loadShowArea() {
let params = {}; let params = {}
getAction(`tag/onlCgformArea/queryShowArea`, params).then((res) => { getAction(`tag/onlCgformArea/queryShowArea`, params).then((res) => {
if (res.success) { if (res.success) {
this.areaOptions = res.result this.areaOptions = res.result
} }
}); })
}, },
add() { add() {
this.edit({}); this.edit({})
}, },
edit(record) { edit(record) {
this.form.resetFields(); this.form.resetFields()
this.model = Object.assign({}, record); this.model = Object.assign({}, record)
this.visible = true; this.visible = true
this.$nextTick(() => { this.$nextTick(() => {
// this.form.setFieldsValue(pick(this.model,'isModel','dbFieldTxt','dbFieldName','fieldShowType','dictName','dbLength','orderNum','fieldMustInput','isShowList','showArea','isQuery','isShowLawsList','isShowSearch')) // this.form.setFieldsValue(pick(this.model,'isModel','dbFieldTxt','dbFieldName','fieldShowType','dictName','dbLength','orderNum','fieldMustInput','isShowList','showArea','isQuery','isShowLawsList','isShowSearch'))
}) })
@@ -403,12 +423,12 @@ export default {
//渲染流程表单数据 //渲染流程表单数据
showFlowData() { showFlowData() {
if (this.formBpm === true) { if (this.formBpm === true) {
let params = {id:this.formData.dataId}; let params = { id: this.formData.dataId }
getAction(this.url.queryById, params).then((res) => { getAction(this.url.queryById, params).then((res) => {
if (res.success) { if (res.success) {
this.edit (res.result); this.edit(res.result)
} }
}); })
} }
}, },
submitForm() { submitForm() {
@@ -423,18 +443,18 @@ export default {
if (valid) { if (valid) {
if (!this.flag) { if (!this.flag) {
this.flag = true this.flag = true
this.confirmLoading = true; this.confirmLoading = true
let httpurl = ''; let httpurl = ''
let method = ''; let method = ''
// console.log('this.editId',this.editId) // console.log('this.editId',this.editId)
if (this.submitEdit == 'add') { if (this.submitEdit == 'add') {
httpurl+=this.url.add; httpurl += this.url.add
method = 'post'; method = 'post'
this.form.id = '' this.form.id = ''
this.form.isReadOnly = 0 this.form.isReadOnly = 0
} else if (this.submitEdit == 'edit') { } else if (this.submitEdit == 'edit') {
httpurl+=this.url.edit; httpurl += this.url.edit
method = 'put'; method = 'put'
this.form.id = this.editId this.form.id = this.editId
} }
@@ -461,16 +481,16 @@ export default {
} }
httpAction(httpurl, this.form, method).then((res) => { httpAction(httpurl, this.form, method).then((res) => {
if (res.success) { if (res.success) {
this.$message.success(this.$t('OperationSuccessful')); this.$message.success(this.$t('OperationSuccessful'))
postAction(`online/cgform/api/doDbSynch/${onlineId}/normal postAction(`online/cgform/api/doDbSynch/${onlineId}/normal
`, {}).then(res => { `, {}).then(res => {
}) })
this.$emit('ok',false); this.$emit('ok', false)
} else { } else {
this.$message.warning(res.message); this.$message.warning(res.message)
} }
}).finally(() => { }).finally(() => {
this.confirmLoading = false; this.confirmLoading = false
this.flag = false this.flag = false
}) })
} }
@@ -492,7 +512,7 @@ export default {
}, },
handleChange(value) { handleChange(value) {
// console.log(`selected ${value}`); // console.log(`selected ${value}`);
}, }
} }
} }
</script> </script>
@@ -501,6 +521,7 @@ export default {
.tag-content { .tag-content {
} }
} }
.tag-info { .tag-info {
margin-left: 30px; margin-left: 30px;
} }
jero-web/src/views/documentManage/tags/tabs/TagContent.vue
+17 -5
View File
@@ -53,7 +53,8 @@
:placeholder="$t('PleaseSelectLabelType')"/> :placeholder="$t('PleaseSelectLabelType')"/>
</a-form-model-item> </a-form-model-item>
<a-form-model-item :label="$t('DisplayOrder')" prop="orderNum" class="tag-item"> <a-form-model-item :label="$t('DisplayOrder')" prop="orderNum" class="tag-item">
<a-input-number v-model="form.orderNum" :placeholder="$t('PleaseEnterDisplayOrder')" style="width: 100%" :min="1" :max="99999" :formatter="limitNumber" :parser="limitNumber" /> <a-input-number v-model="form.orderNum" :placeholder="$t('PleaseEnterDisplayOrder')" style="width: 100%"
:min="1" :max="99999" :formatter="limitNumber" :parser="limitNumber"/>
</a-form-model-item> </a-form-model-item>
<a-form-model-item ref="describe" :label="$t('describe')" prop="description" class="tag-item"> <a-form-model-item ref="describe" :label="$t('describe')" prop="description" class="tag-item">
<a-input <a-input
@@ -174,14 +175,16 @@
wrapperCol: { span: 16 }, wrapperCol: { span: 16 },
form: {}, form: {},
rules: { rules: {
dictName: [{ required: true, message: this.$t('PleaseEnterLabelName'), trigger: 'change' }, dictName: [
{ min: 1, max: 100, message: this.$t('cantExeed') + '100' + this.$t('characters'), trigger: 'blur' }], { required: true, message: this.$t('PleaseEnterLabelName'), trigger: 'change' },
{ min: 1, max: 100, message: this.$t('cantExeed') + '100' + this.$t('characters'), trigger: 'blur' },
{ validator: this.test }
],
attributeType: [ attributeType: [
{ required: true, message: this.$t('PleaseSelectLabelType'), trigger: 'blur' } { required: true, message: this.$t('PleaseSelectLabelType'), trigger: 'blur' }
], ],
orderNum: [ orderNum: [
{ required: true, message: this.$t('PleaseEnterDisplayOrder'),trigger: 'blur'}, { required: true, message: this.$t('PleaseEnterDisplayOrder'), trigger: 'blur' }
], ],
description: [ description: [
{ min: 1, max: 200, message: this.$t('cantExeed') + '200' + this.$t('characters'), trigger: 'blur' } { min: 1, max: 200, message: this.$t('cantExeed') + '200' + this.$t('characters'), trigger: 'blur' }
@@ -200,6 +203,14 @@
this.loadData() this.loadData()
}, },
methods: { methods: {
test(rule, value, callback) {
var money = /[,]|[，]/g
if (money.test(value)) {
callback(new Error(this.$t('disableInput') + ','))
} else {
callback()
}
},
//正则替换小数点 //正则替换小数点
limitNumber(value) { limitNumber(value) {
if (typeof value === 'string') { if (typeof value === 'string') {
@@ -476,6 +487,7 @@
width: 100%; width: 100%;
} }
} }
.box-title-text { .box-title-text {
line-height: 1.4; line-height: 1.4;
display: flex; display: flex;
jero-web/src/views/projectManagement/projectStatusBoard/components/TaskPlanList.vue
+4 -4
View File
@@ -54,7 +54,8 @@
<img v-else-if="val.status == 2" src="../../../../assets/open.svg" <img v-else-if="val.status == 2" src="../../../../assets/open.svg"
class="process-content-left" class="process-content-left"
alt=""> alt="">
<img v-else-if="val.status == 3" src="../../../../assets/inprogress.svg" class="process-content-left" <img v-else-if="val.status == 3" src="../../../../assets/inprogress.svg"
class="process-content-left"
alt=""> alt="">
</a-tooltip> </a-tooltip>
<!-- <div class="process-content-right-button">{{val.time.slice(0,11)}}</div>--> <!-- <div class="process-content-right-button">{{val.time.slice(0,11)}}</div>-->
@@ -228,8 +229,8 @@
} }
contentRightText[0].style = 'display:none' contentRightText[0].style = 'display:none'
contentRightXian[0].style = 'display:none' contentRightXian[0].style = 'display:none'
let clientWidthOne = dataList[0].clientWidth * dataList.length let clientWidthOne = dataList[0].clientWidth
clientWidthOne = clientWidthOne / timeList.length clientWidthOne = clientWidthOne / length
let num = Math.ceil(clientWidthOne / 31) * parseInt(this.handlingTime.slice(8, 10)) let num = Math.ceil(clientWidthOne / 31) * parseInt(this.handlingTime.slice(8, 10))
timeList.forEach((res, index) => { timeList.forEach((res, index) => {
if (res.slice(0, 7) == this.handlingTime.slice(0, 7)) { if (res.slice(0, 7) == this.handlingTime.slice(0, 7)) {
@@ -389,7 +390,6 @@
border-bottom: 1px #EAEAEC solid; border-bottom: 1px #EAEAEC solid;
flex: 1; flex: 1;
height: 36px; height: 36px;
padding-left: 10px;
color: #54565A; color: #54565A;
font-weight: bold; font-weight: bold;
font-size: 14px; font-size: 14px;