ZQ/laws-sinotruk-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[update] 删除common.less中重复样式，修改多选时间组件和用户组织机构选择组件，搜索组件结构调整

Browse Source
This commit is contained in:
lideqin
2023-08-29 15:18:28 +08:00
parent a3041d05ae
commit b241a91cd6
6 changed files with 191 additions and 211 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/assets/less/common.less
+1 -67
View File
@@ -169,61 +169,6 @@
}
}
.item-model {
width: calc(100% - 130px);
display: inline-block;
margin-top: 2px;
height: 40px;
margin-bottom: 24px;
/deep/ .ant-form-item-control-wrapper {
width: 100%;
}
}
.item-model-textarea {
width: calc(100% - 130px);
display: inline-block;
margin-top: 2px;
/deep/ .ant-form-item-control-wrapper {
width: 100% !important;
}
}
.box-input {
/deep/ .ant-select-selection--single {
height: 38px;
}
/deep/ .ant-select-selection--multiple {
height: 38px;
.ant-select-selection__rendered > ul > li {
margin-top: 6px;
}
}
/deep/ .ant-select-selection__rendered {
line-height: 38px;
height: 38px;
}
/deep/ .ant-calendar-picker {
line-height: 38px;
height: 38px;
}
/deep/ .ant-calendar-picker-input {
height: 38px;
}
/deep/ .ant-input-number-input-wrap {
line-height: 38px;
height: 38px;
}
}
.box-title-text {
line-height: 1.4;
display: flex;
@@ -252,7 +197,7 @@
width: calc(100% - 130px);
display: inline-block;
margin-top: 2px;
height: 100%;
height: 40px;
margin-bottom: 24px;
/deep/ .ant-form-item-control-wrapper {
@@ -308,17 +253,6 @@
}
}
.box-input {
display: inline-block;
height: 38px;
width: 100%;
}
.required {
color: red;
margin-right: 4px;
}
.title-text-text {
margin-top: 9px;
}
src/common/lang/zh-cn.js
+1 -1
View File
@@ -7,7 +7,7 @@ module.exports = {
pleaseSelect: '请选择',
pleaseEnter: '请输入',
query: '查询',
reset: '重置',
reset: '清空',
putAway: '收起',
open: '展开',
edit: '编辑',
src/components/JMultipleDatePicker.vue
+25 -18
View File
@@ -1,8 +1,10 @@
<template>
<a-date-picker
:id="fieldName"
:show-time="false"
:open="open"
dropdownClassName="j-multiple-date-picker"
:ref="fieldName"
:dropdownClassName="'j-multiple-date-picker ' + fieldName + '-drop'"
@openChange="handleOpenChange"
style="width: 100%"
>
@@ -11,9 +13,9 @@
{{current.date()}}
</div>
</template>
<template slot="renderExtraFooter" slot-scope="">
<a class="ant-calendar-ok-btn" @click="handleOk">确定</a>
</template>
<!-- <template slot="renderExtraFooter" slot-scope="">-->
<!-- <a class="ant-calendar-ok-btn" @click="handleOk">确定</a>-->
<!-- </template>-->
</a-date-picker>
</template>
@@ -24,13 +26,17 @@ export default {
value: {
type: String,
default: ''
},
fieldName: {
type: String,
default: ''
}
},
watch: {
value (val) {
if (!val) {
this.checkedValue = []
document.getElementsByClassName('ant-calendar-picker-input')[0].value = ''
document.getElementById(this.fieldName).children[0].children[0].value = ''
this.$emit('change', '')
}
}
@@ -47,12 +53,12 @@ export default {
if (open) {
this.open = open
setTimeout(() => {
document.getElementsByClassName('ant-calendar-input')[0].value = this.checkedValue.join(',')
document.getElementsByClassName(this.fieldName + '-drop')[0].children[0].children[0].children[0].children[0].children[0].value = this.checkedValue.join(',')
}, 100)
} else {
this.open = open
this.$nextTick(() => {
document.getElementsByClassName('ant-calendar-picker-input')[0].value = this.checkedValue.join(',')
document.getElementById(this.fieldName).children[0].children[0].value = this.checkedValue.join(',')
})
}
},
@@ -62,30 +68,31 @@ export default {
return true
}
},
// 点击日期，加日期或者减日期
clickCalendarDate (current) {
const currentStr = current.format('YYYY-MM-DD')
if (!this.checkedValue.includes(currentStr)) {
console.log('加日期')
this.checkedValue.push(currentStr)
// event.target.className += ' blue'
} else {
console.log('减日期')
this.checkedValue = this.checkedValue.filter(item => item !== currentStr)
// console.log(event.target.className)
// // 选中日期不存在该日期，该日期有blue类时删掉该类
// if (event.target.className.split(' ').includes('blue')) {
// event.target.className = event.target.className.split(' ').filter(item => item !== 'blue').join(' ')
// }
}
document.getElementsByClassName('ant-calendar-input')[0].value = this.checkedValue.join(',')
},
handleOk () {
this.open = false
this.$nextTick(() => {
document.getElementsByClassName('ant-calendar-picker-input')[0].value = this.checkedValue.join(',')
document.getElementsByClassName(this.fieldName + '-drop')[0].children[0].children[0].children[0].children[0].children[0].value = this.checkedValue.join(',')
})
this.$emit('change', this.checkedValue.join(','))
}
// 点击日期弹出框中的确定按钮
// handleOk () {
// this.open = false
// this.$nextTick(() => {
// // 改变外侧日期显示框的数据
// document.getElementById(this.fieldName).children[0].children[0].value = this.checkedValue.join(',')
// // document.getElementsByClassName(this.fieldName)[0].children[0].children[0].value = this.checkedValue.join(',')
// })
// this.$emit('change', this.checkedValue.join(','))
// }
},
model: {
prop: 'value',
src/components/customField/AddForm.vue
+22 -22
View File
@@ -63,7 +63,7 @@
<span class="title-text-text" :title="item.dbFieldTxt">{{item.dbFieldTxt}}</span>
</div>
<a-form-model-item class="item-model" :prop="item.dbFieldName">
<j-multiple-date-picker class="box-input" v-model="formInline[item.dbFieldName]"
<j-multiple-date-picker class="box-input" v-model="formInline[item.dbFieldName]" :fieldName="item.dbFieldName"
:disabled="disabled"/>
</a-form-model-item>
</div>
@@ -184,27 +184,27 @@
</a-form-model-item>
</div>
</a-col>
<!-- 树选择 -->
<!-- <a-col :span="12" v-else-if="item.fieldShowType === FieldType.TREE.value">-->
<!-- <div class="box-title-text" :title="item.dbFieldTxt">-->
<!-- <div class="title-text">-->
<!-- <span class="required" v-if="item.fieldMustInput === '1'">*</span>-->
<!-- <span class="title-text-text">{{item.dbFieldTxt}}</span>-->
<!-- </div>-->
<!-- <a-form-model-item class="item-model" :prop="item.dbFieldName">-->
<!-- <a-tree-select-->
<!-- tree-node-filter-prop="title"-->
<!-- v-model="formInline[item.dbFieldName]"-->
<!-- :maxTagCount="1"-->
<!-- :getPopupContainer="triggerNode=> triggerNode.parentNode"-->
<!-- style="width: 100%"-->
<!-- :tree-data="item.tree"-->
<!-- tree-checkable-->
<!-- :placeholder="$t('PleaseSelect')+item.dbFieldTxt"-->
<!-- />-->
<!-- </a-form-model-item>-->
<!-- </div>-->
<!-- </a-col>-->
<!-- 12, 树选择 -->
<a-col :span="12" v-else-if="item.fieldShowType === FieldType.TREE.value">
<div class="box-title-text" :title="item.dbFieldTxt">
<div class="title-text">
<span class="required" v-if="item.fieldMustInput === '1'">*</span>
<span class="title-text-text">{{item.dbFieldTxt}}</span>
</div>
<a-form-model-item class="item-model" :prop="item.dbFieldName">
<a-tree-select
tree-node-filter-prop="title"
v-model="formInline[item.dbFieldName]"
:maxTagCount="1"
:getPopupContainer="triggerNode=> triggerNode.parentNode"
style="width: 100%"
:tree-data="item.tree"
tree-checkable
:placeholder="$t('PleaseSelect')+item.dbFieldTxt"
/>
</a-form-model-item>
</div>
</a-col>
</div>
</a-row>
src/components/customField/Search.vue
+96 -97
View File
@@ -1,82 +1,91 @@
<template>
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
<a-col :md="(24 / (minLength + 1))" :sm="(24 / minLength)" v-for="(item,index) in searchList" :key="index" style="line-height: 48px">
<template v-if="index < minLength">
<!-- 树形选择器 -->
<!-- <template v-if="item.fieldShowType === FieldType.TREE.value">-->
<!-- <a-form-item :label="item.dbFieldTxt" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
<!-- <a-tree-select-->
<!-- tree-node-filter-prop="title"-->
<!-- v-model="queryParam[item.dbFieldName]"-->
<!-- :maxTagCount="1"-->
<!-- :getPopupContainer="triggerNode=> triggerNode.parentNode"-->
<!-- :tree-data="item.tree"-->
<!-- tree-checkable-->
<!-- :placeholder="$t('pleaseSelect')+item.dbFieldTxt"-->
<!-- />-->
<!-- </a-form-item>-->
<!-- </template>-->
<!-- 输入框 -->
<template
v-if="[FieldType.TEXT_BOX.value, FieldType.TEXTAREA.value,FieldType.USER_SINGLE.value,
FieldType.ORGAN_SINGLE.value, FieldType.STANDARD_MORE.value, FieldType.ORGAN_MORE.value]
.includes(item.fieldShowType)">
<a-form-item :label="item.dbFieldTxt" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input :placeholder="$t('pleaseEnter')+item.dbFieldTxt"
v-model="queryParam[item.dbFieldName]"></a-input>
</a-form-item>
</template>
<!-- 数字输入框 -->
<!-- <template v-else-if="item.fieldShowType === FieldType.TEXT_NUMBER.value">-->
<!-- <a-form-item :label="item.dbFieldTxt" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
<!-- <a-input-number :placeholder="$t('pleaseEnter')+item.dbFieldTxt"-->
<!-- v-model="queryParam[item.dbFieldName]" :min="1" :max="99999999"/>-->
<!-- </a-form-item>-->
<!-- </template>-->
<!-- 字典多选框 -->
<!-- <template v-else-if="item.fieldShowType === FieldType.OPTION_SINGLE.value">-->
<!-- <a-form-item :label="item.dbFieldTxt" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
<!-- <j-multi-select-tag v-model="queryParam[item.dbFieldName]"-->
<!-- :placeholder="$t('pleaseSelect')+item.dbFieldTxt" :type="'select'"-->
<!-- :triggerChange="false" :dictCode="item.dict_field"/>-->
<!-- </a-form-item>-->
<!-- </template>-->
<!-- 日期区间 -->
<template v-else-if="[FieldType.DATE_SINGLE.value, FieldType.DATE_MORE.value].includes(item.fieldShowType)">
<a-form-item :label="item.dbFieldTxt" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-range-picker v-model="queryParam[item.dbFieldName]"
:placeholder="$t('pleaseSelect')+item.dbFieldTxt"
format="YYYY-MM-DD" value-format="YYYY-MM-DD"
@change="onChange(item.dbFieldName)"></a-range-picker>
</a-form-item>
</template>
<!-- 字典单选框 -->
<template v-else-if="item.fieldShowType === FieldType.OPTION_SINGLE.value || item.fieldShowType === FieldType.OPTION_MORE.value">
<a-form-item :label="item.dbFieldTxt" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-dict-select-tag v-model="queryParam[item.dbFieldName]"
:placeholder="$t('pleaseSelect')+item.dbFieldTxt"
:type="'select'"
:triggerChange="false" :dictCode="item.dict_field"/>
</a-form-item>
</template>
<a-col :md="(24 / (minLength + 1))" :sm="(24 / minLength)" v-for="(item,index) in searchList.slice(0, 3)" :key="index" style="line-height: 48px">
<!-- 树形选择器 -->
<!-- <template v-if="item.fieldShowType === FieldType.TREE.value">-->
<!-- <a-form-item :label="item.dbFieldTxt" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
<!-- <a-tree-select-->
<!-- tree-node-filter-prop="title"-->
<!-- v-model="queryParam[item.dbFieldName]"-->
<!-- :maxTagCount="1"-->
<!-- :getPopupContainer="triggerNode=> triggerNode.parentNode"-->
<!-- :tree-data="item.tree"-->
<!-- tree-checkable-->
<!-- :placeholder="$t('pleaseSelect')+item.dbFieldTxt"-->
<!-- />-->
<!-- </a-form-item>-->
<!-- </template>-->
<!-- 输入框 -->
<template
v-if="[FieldType.TEXT_BOX.value, FieldType.TEXTAREA.value,FieldType.USER_SINGLE.value,
FieldType.ORGAN_SINGLE.value, FieldType.STANDARD_MORE.value, FieldType.ORGAN_MORE.value]
.includes(item.fieldShowType)">
<a-form-item :label="item.dbFieldTxt" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input :placeholder="$t('pleaseEnter')+item.dbFieldTxt"
v-model="queryParam[item.dbFieldName]"></a-input>
</a-form-item>
</template>
<template v-if="index >= minLength && toggleSearchStatus">
<!-- 数字输入框 -->
<!-- <template v-else-if="item.fieldShowType === FieldType.TEXT_NUMBER.value">-->
<!-- <a-form-item :label="item.dbFieldTxt" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
<!-- <a-input-number :placeholder="$t('pleaseEnter')+item.dbFieldTxt"-->
<!-- v-model="queryParam[item.dbFieldName]" :min="1" :max="99999999"/>-->
<!-- </a-form-item>-->
<!-- </template>-->
<!-- 字典多选框 -->
<!-- <template v-else-if="item.fieldShowType === FieldType.OPTION_SINGLE.value">-->
<!-- <a-form-item :label="item.dbFieldTxt" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
<!-- <j-multi-select-tag v-model="queryParam[item.dbFieldName]"-->
<!-- :placeholder="$t('pleaseSelect')+item.dbFieldTxt" :type="'select'"-->
<!-- :triggerChange="false" :dictCode="item.dict_field"/>-->
<!-- </a-form-item>-->
<!-- </template>-->
<!-- 日期区间 -->
<template v-else-if="[FieldType.DATE_SINGLE.value, FieldType.DATE_MORE.value].includes(item.fieldShowType)">
<a-form-item :label="item.dbFieldTxt" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-range-picker v-model="queryParam[item.dbFieldName]"
:placeholder="$t('pleaseSelect')+item.dbFieldTxt"
format="YYYY-MM-DD" value-format="YYYY-MM-DD"
@change="onChange(item.dbFieldName)"></a-range-picker>
</a-form-item>
</template>
<!-- 字典单选框 -->
<template v-else-if="item.fieldShowType === FieldType.OPTION_SINGLE.value || item.fieldShowType === FieldType.OPTION_MORE.value">
<a-form-item :label="item.dbFieldTxt" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-dict-select-tag v-model="queryParam[item.dbFieldName]"
:placeholder="$t('pleaseSelect')+item.dbFieldTxt"
:type="'select'"
:triggerChange="false" :dictCode="item.dict_field"/>
</a-form-item>
</template>
</a-col>
<div style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
<a-button type="primary" @click="searchQuery">{{$t('query')}}</a-button>
<a-button style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
<a style="margin-left: 8px" @click="handleToggleSearch" v-if="searchList.length > minLength">
{{ !toggleSearchStatus ? $t('open') : $t('putAway') }}
<a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
</a>
</div>
</a-row>
<a-row :gutter="24">
<a-col :md="(24 / (minLength + 1))" :sm="(24 / minLength)" v-for="(item,index) in searchList.slice(3)" :key="index" style="line-height: 48px">
<template v-if="index > minLength && toggleSearchStatus">
<!-- 树形选择器 -->
<!-- <template v-if="item.fieldShowType === FieldType.TREE.value">-->
<!-- <a-form-item :label="item.dbFieldTxt" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
<!-- <a-tree-select-->
<!-- tree-node-filter-prop="title"-->
<!-- v-model="queryParam[item.dbFieldName]"-->
<!-- :maxTagCount="1"-->
<!-- :getPopupContainer="triggerNode=> triggerNode.parentNode"-->
<!-- :tree-data="item.tree"-->
<!-- tree-checkable-->
<!-- :placeholder="$t('pleaseSelect')+item.dbFieldTxt"-->
<!-- />-->
<!-- </a-form-item>-->
<!-- </template>-->
<!-- <template v-if="item.fieldShowType === FieldType.TREE.value">-->
<!-- <a-form-item :label="item.dbFieldTxt" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
<!-- <a-tree-select-->
<!-- tree-node-filter-prop="title"-->
<!-- v-model="queryParam[item.dbFieldName]"-->
<!-- :maxTagCount="1"-->
<!-- :getPopupContainer="triggerNode=> triggerNode.parentNode"-->
<!-- :tree-data="item.tree"-->
<!-- tree-checkable-->
<!-- :placeholder="$t('pleaseSelect')+item.dbFieldTxt"-->
<!-- />-->
<!-- </a-form-item>-->
<!-- </template>-->
<!-- 输入框 -->
<template v-if="[FieldType.TEXT_BOX.value, FieldType.TEXTAREA.value,FieldType.USER_SINGLE.value,
FieldType.ORGAN_SINGLE.value, FieldType.STANDARD_MORE.value, FieldType.ORGAN_MORE.value]
@@ -87,20 +96,20 @@
</a-form-item>
</template>
<!-- 数字输入框 -->
<!-- <template v-else-if="item.fieldShowType === FieldType.TEXT_NUMBER.value">-->
<!-- <a-form-item :label="item.dbFieldTxt" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
<!-- <a-input-number :placeholder="$t('pleaseEnter')+item.dbFieldTxt"-->
<!-- v-model="queryParam[item.dbFieldName]" :min="1" :max="99999999"/>-->
<!-- </a-form-item>-->
<!-- </template>-->
<!-- <template v-else-if="item.fieldShowType === FieldType.TEXT_NUMBER.value">-->
<!-- <a-form-item :label="item.dbFieldTxt" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
<!-- <a-input-number :placeholder="$t('pleaseEnter')+item.dbFieldTxt"-->
<!-- v-model="queryParam[item.dbFieldName]" :min="1" :max="99999999"/>-->
<!-- </a-form-item>-->
<!-- </template>-->
<!-- 字典多选框 -->
<!-- <template v-else-if="item.fieldShowType === FieldType.OPTION_MORE.value">-->
<!-- <a-form-item :label="item.dbFieldTxt" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
<!-- <j-multi-select-tag v-model="queryParam[item.dbFieldName]"-->
<!-- :placeholder="$t('pleaseSelect')+item.dbFieldTxt" :type="'select'"-->
<!-- :triggerChange="false" :dictCode="item.dict_field"/>-->
<!-- </a-form-item>-->
<!-- </template>-->
<!-- <template v-else-if="item.fieldShowType === FieldType.OPTION_MORE.value">-->
<!-- <a-form-item :label="item.dbFieldTxt" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
<!-- <j-multi-select-tag v-model="queryParam[item.dbFieldName]"-->
<!-- :placeholder="$t('pleaseSelect')+item.dbFieldTxt" :type="'select'"-->
<!-- :triggerChange="false" :dictCode="item.dict_field"/>-->
<!-- </a-form-item>-->
<!-- </template>-->
<!-- 日期区间选择器 -->
<template v-else-if="[FieldType.DATE_SINGLE.value, FieldType.DATE_MORE.value].includes(item.fieldShowType)">
<a-form-item :label="item.dbFieldTxt" :labelCol="labelCol" :wrapperCol="wrapperCol">
@@ -120,16 +129,6 @@
</template>
</template>
</a-col>
<span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
<a-col :md="6" :sm="24">
<a @click="handleToggleSearch" v-if="searchList.length > 3">
{{ !toggleSearchStatus ? $t('open') : $t('putAway') }}
<a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
</a>
<a-button style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
<a-button style="margin-left: 8px" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
</a-col>
</span>
</a-row>
</a-form>
</template>
src/components/selection/UserOrOrganSelection.vue
+46 -6
View File
@@ -1,9 +1,24 @@
<template>
<div>
<div class="box-title-text">
<div @click="selectClick">
<div v-for="item in selectValue" :key="item.id">{{item.label}}</div>
</div>
<div class="user-organ-wrap">
<!-- <div @click="selectClick">-->
<!-- <div v-for="item in selectValue" :key="item.id">{{item.label}}</div>-->
<!-- </div>-->
<a-select
class="user-organ-select"
mode="multiple"
:open="false"
:showSearch="false"
:filterOption="false"
:placeholder="$t('pleaseSelect')"
:maxTagCount="1"
:value="checkedValue"
@click="selectClick"
>
<a-select-option v-for="(item, index) in selectType" :key="index">
{{ item }}
</a-select-option>
</a-select>
<a-button type="primary" class="button-box" @click="selectClick">
{{this.$t('userOrOrganSelect.select')}}
</a-button>
@@ -42,10 +57,11 @@ export default {
}
},
mounted () {
console.log(this.type)
this.checkedValue = this.value.map(item => item.value)
},
data () {
return {
checkedValue: [],
selectValue: []
}
},
@@ -59,6 +75,7 @@ export default {
} else {
this.selectValue = arrOne
}
this.checkedValue = this.selectValue.map(item => item.value)
this.$emit('change', this.selectType)
}
},
@@ -69,6 +86,29 @@ export default {
}
</script>
<style scoped>
<style scoped lang="less">
.user-organ-wrap {
width: 100%;
position: relative;
.user-organ-select {
width: calc(100% - 70px);
/deep/ .ant-select-selection--multiple {
height: 38px;
.ant-select-selection__rendered > ul > li {
margin-top: 6px;
}
}
/deep/ .ant-select-selection__rendered {
line-height: 38px;
height: 38px;
}
}
.button-box {
height: 38px;
margin-left: 5px;
position: absolute;
top: 0;
}
}
</style>