police-mailbox
/
mailbox-lan-vue
7
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'master' of http://gitea.biutag.com/police-mailbox/mailbox-lan-vue

master
wxc 2 years ago
parent
ca6dc7cfa3 4af222a928
commit
b1c9b0af72
8 changed files with 35 additions and 49 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      src/views/duty/edit.vue
  2. 3
      src/views/organization/department/edit.vue
  3. 1
      src/views/permission/admin/edit.vue
  4. 1
      src/views/permission/admin/index.vue
  5. 1
      src/views/permission/menu/edit.vue
  6. 34
      src/views/work/Dissatisfied.vue
  7. 42
      src/views/work/Query.vue
  8. 1
      src/views/work/components/templates/ThreeHandling.vue

1
src/views/duty/edit.vue
Unescape View File

@ -26,7 +26,6 @@
}
}"
check-strictly
:default-expand-all="true"
placeholder="请选择部门"
/>
</el-form-item>

3
src/views/organization/department/edit.vue
Unescape View File

@ -20,8 +20,7 @@
value: 'id',
label: 'name'
}"
check-strictly
:default-expand-all="true"
check-strictly
placeholder="请选择上级部门"
/>
</el-form-item>

1
src/views/permission/admin/edit.vue
Unescape View File

@ -57,7 +57,6 @@
}
}"
check-strictly
:default-expand-all="true"
placeholder="请选择上级部门"
/>
</el-form-item>

1
src/views/permission/admin/index.vue
Unescape View File

@ -64,7 +64,6 @@
}
}"
check-strictly
:default-expand-all="true"
placeholder="请选择上级部门"
style="width: 180px"
/>

1
src/views/permission/menu/edit.vue
Unescape View File

@ -26,7 +26,6 @@
:props="{
label: 'menuName'
}"
:default-expand-all="true"
placeholder="请选择父级菜单"
check-strictly
/>

34
src/views/work/Dissatisfied.vue
Unescape View File

@ -1,7 +1,7 @@
<template>
<div class="container">
<header>
<el-form :inline="true" :model="form" class="demo-form-inline" :label-width="120">
<el-form :model="form" :label-width="120">
<el-row>
<el-col :span="6">
<el-form-item label="来信时间">
@ -12,7 +12,7 @@
</el-col>
<el-col :span="6">
<el-form-item label="信件来源">
<el-select v-model="query.source" placeholder="" clearable style="width: 280px">
<el-select v-model="query.source" placeholder="" clearable st>
<el-option v-for="item in dictData.mail_source" :key="item.value" :label="item.name"
:value="item.value" />
</el-select>
@ -26,14 +26,13 @@
<el-option label="身份证" value="idCard" />
<el-option label="联系电话" value="phone" />
</el-select>
<el-input v-model="query.contactFieldValue" placeholder="请输入姓名" clearable
style="width: 172px" />
<el-input v-model="query.contactFieldValue" placeholder="请输入姓名" clearable />
</div>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="信件等级">
<el-select v-model="query.mailLevel" placeholder="" clearable style="width: 280px">
<el-select v-model="query.mailLevel" placeholder="" clearable st>
<el-option v-for="item in dictData.mail_level" :key="item.value" :label="item.name"
:value="item.value" />
</el-select>
@ -44,12 +43,12 @@
<el-col :span="6">
<el-form-item label="信件分类">
<el-tree-select v-model="query.mailCategory" :data="mailStore.mailCategorys" check-strictly
filterable style="width: 280px" />
filterable />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="信件状态">
<el-select v-model="query.mailState" placeholder="" clearable style="width: 280px">
<el-select v-model="query.mailState" placeholder="" clearable st>
<el-option v-for="item in dictData.mail_state" :key="item.value" :label="item.name"
:value="item.value" />
</el-select>
@ -57,22 +56,19 @@
</el-col>
<el-col :span="6">
<el-form-item label="办理单位">
<div class="flex gap">
<el-tree-select class="flex-1" v-model="query.deptId" :data="optionsData.dept" clearable
node-key="id" filterable :props="{
value: 'id',
label: 'name',
disabled(data: any) {
return !!data.isStop
}
}" check-strictly :default-expand-all="true" placeholder="请选择上级部门"
style="width: 280px" />
</div>
<el-tree-select class="flex-1" v-model="query.deptId" :data="optionsData.dept" clearable
node-key="id" filterable :props="{
value: 'id',
label: 'name',
disabled(data: any) {
return !!data.isStop
}
}" check-strictly placeholder="请选择上级部门" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="申诉状态">
<el-select v-model="query.complaint" placeholder="" clearable style="width: 280px">
<el-select v-model="query.complaint" placeholder="" clearable st>
</el-select>
</el-form-item>
</el-col>

42
src/views/work/Query.vue
Unescape View File

@ -1,17 +1,18 @@
<template>
<div class="container">
<header>
<el-form :inline="true" class="demo-form-inline" :label-width="120">
<el-form :label-width="120">
<el-row>
<el-col :span="6">
<el-form-item label="来信时间">
<el-date-picker v-model="query.mailTime" value-format="YYYY-MM-DD" type="daterange"
range-separator="~" start-placeholder="开始日期" end-placeholder="结束日期" @change="handleMailTimeQuery"/>
range-separator="~" start-placeholder="开始日期" end-placeholder="结束日期"
@change="handleMailTimeQuery" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="信件来源">
<el-select v-model="query.source" placeholder="" clearable style="width: 280px">
<el-select v-model="query.source" placeholder="" clearable>
<el-option v-for="item in dictData.mail_source" :key="item.value" :label="item.name"
:value="item.value" />
</el-select>
@ -25,14 +26,13 @@
<el-option label="身份证" value="idCard" />
<el-option label="联系电话" value="phone" />
</el-select>
<el-input v-model="query.contactFieldValue" :placeholder="placeholderText" clearable
style="width: 172px" />
<el-input v-model="query.contactFieldValue" :placeholder="placeholderText" clearable />
</div>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="信件等级">
<el-select v-model="query.mailLevel" placeholder="" clearable style="width: 280px">
<el-select v-model="query.mailLevel" placeholder="" clearable>
<el-option v-for="item in dictData.mail_level" :key="item.value" :label="item.name"
:value="item.value" />
</el-select>
@ -43,12 +43,12 @@
<el-col :span="6">
<el-form-item label="信件分类">
<el-tree-select v-model="query.mailCategory" :data="mailStore.mailCategorys" check-strictly
filterable style="width: 280px" />
filterable />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="信件状态">
<el-select v-model="query.mailState" placeholder="" clearable style="width: 280px">
<el-select v-model="query.mailState" placeholder="" clearable>
<el-option v-for="item in dictData.mail_state" :key="item.value" :label="item.name"
:value="item.value" />
</el-select>
@ -56,22 +56,19 @@
</el-col>
<el-col :span="6">
<el-form-item label="办理单位">
<div class="flex gap">
<el-tree-select class="flex-1" v-model="query.deptId" :data="optionsData.dept" clearable
node-key="id" filterable :props="{
value: 'id',
label: 'name',
disabled(data: any) {
return !!data.isStop
}
}" check-strictly :default-expand-all="true" placeholder="请选择上级部门"
style="width: 280px" />
</div>
<el-tree-select class="flex-1" v-model="query.deptId" :data="optionsData.dept" clearable
node-key="id" filterable :props="{
value: 'id',
label: 'name',
disabled(data: any) {
return !!data.isStop
}
}" check-strictly placeholder="请选择上级部门" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="流程阶段">
<el-select v-model="query.flowKey" placeholder="" clearable style="width: 280px">
<el-select v-model="query.flowKey" placeholder="" clearable>
</el-select>
</el-form-item>
</el-col>
@ -79,8 +76,7 @@
<el-row>
<el-col :span="6">
<el-form-item label="信件标签">
<el-select v-model="query.mailLabels" placeholder="请选择标签" multiple clearable
style="width: 280px">
<el-select v-model="query.mailLabels" placeholder="请选择标签" multiple clearable>
<el-option v-for="item in optionsData.labels" :key="item.id" :label="item.labelName"
:value="item.id" />
</el-select>
@ -336,7 +332,7 @@ const handleMailTimeQuery = (val: any) => {
if (val) {
query.value.mailTimeStart = val[0];
query.value.mailTimeEnd = val[1];
}else{
} else {
delete query.value.mailTimeStart
delete query.value.mailTimeEnd
}

1
src/views/work/components/templates/ThreeHandling.vue
Unescape View File

@ -208,7 +208,6 @@
label: 'name',
}"
check-strictly
:default-expand-all="true"
placeholder="请选择部门"
@change="handleChangeDept"
/>

Write Preview
Loading…
Cancel
Save