Skip to content

bdc / bdcdj-web

Go to a project
Toggle navigation
Toggle navigation pinning
e6bee497 by renchao@pashanhoo.com
Options

Merge branch 'dev'

2 parents c17c8196 b6b19e3a
Inline Side-by-side
Showing 6 changed files with 38 additions and 15 deletions
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-07-24 14:10:29 4 * @LastEditTime: 2023-07-24 15:00:14
5 --> 5 -->
6 <template> 6 <template>
7 <section class="app-main"> 7 <section class="app-main">
8 <transition name="fade-transform" mode="out-in"> 8 <transition name="fade-transform" mode="out-in">
9 <keep-alive :include="['dbx', 'ybx','jtfc', 'dydjb', 'sqcxjl', 'jdcx','djbcx', 9 <keep-alive :exclude="['home','ywsq']">
10 'lpcx','zslqcx', 'zxgcdycx', 'zsrk', 'zsff','zssyjl','dictionaries', 'sqywgz', 'qtjfjmb',
11 'xttz','flfg']">
12 <router-view /> 10 <router-view />
13 </keep-alive> 11 </keep-alive>
14 </transition> 12 </transition>
......
...@@ -36,14 +36,14 @@ ...@@ -36,14 +36,14 @@
36 <el-row> 36 <el-row>
37 <el-col :span="6"> 37 <el-col :span="6">
38 <el-form-item label="开始日期" class="marginbtm0"> 38 <el-form-item label="开始日期" class="marginbtm0">
39 <el-date-picker class="width100" v-model="queryForm.kssj" type="date" placeholder="开始日期" 39 <el-date-picker class="width100" v-model="queryForm.startTime" :picker-options="pickerOptionsStart" type="date" placeholder="开始日期"
40 value-format="yyyy-MM-dd" clearable> 40 value-format="yyyy-MM-dd" clearable>
41 </el-date-picker> 41 </el-date-picker>
42 </el-form-item> 42 </el-form-item>
43 </el-col> 43 </el-col>
44 <el-col :span="6"> 44 <el-col :span="6">
45 <el-form-item label="结束日期" class="marginbtm0"> 45 <el-form-item label="结束日期" class="marginbtm0">
46 <el-date-picker class="width100" v-model="queryForm.jssj" type="date" placeholder="结束日期" 46 <el-date-picker class="width100" v-model="queryForm.endTime" :picker-options="pickerOptionsEnd" type="date" placeholder="结束日期"
47 value-format="yyyy-MM-dd" clearable> 47 value-format="yyyy-MM-dd" clearable>
48 </el-date-picker> 48 </el-date-picker>
49 </el-form-item> 49 </el-form-item>
...@@ -79,10 +79,32 @@ ...@@ -79,10 +79,32 @@
79 }, 79 },
80 data () { 80 data () {
81 return { 81 return {
82 // 开始结束日期限制
83 pickerOptionsStart: {
84 disabledDate: (time) => {
85 if (this.queryForm.endTime) {
86 return (
87 time.getTime() >= new Date(this.queryForm.endTime).getTime()
88 );
89 }
90 }
91 },
92 // 结束日期限制
93 pickerOptionsEnd: {
94 disabledDate: (time) => {
95 if (this.queryForm.startTime) {
96 return (
97 time.getTime() <= new Date(this.queryForm.startTime).getTime()
98 );
99 }
100 }
101 },
82 queryForm: { 102 queryForm: {
83 cxbh: "", 103 cxbh: "",
84 sqr: "", 104 sqr: "",
85 ywh: "", 105 ywh: "",
106 startTime: "",
107 endTime: ""
86 }, 108 },
87 tableData: { 109 tableData: {
88 columns: datas.columns(), 110 columns: datas.columns(),
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-07-24 11:25:15 4 * @LastEditTime: 2023-07-24 15:03:20
5 --> 5 -->
6 <template> 6 <template>
7 <div class="from-clues"> 7 <div class="from-clues">
...@@ -133,9 +133,6 @@ ...@@ -133,9 +133,6 @@
133 }, 133 },
134 mounted () { 134 mounted () {
135 sendThis(this); 135 sendThis(this);
136 window["getBpageList"] = () => {
137 this.queryClick();
138 }
139 }, 136 },
140 watch: { 137 watch: {
141 queryForm: { 138 queryForm: {
...@@ -145,6 +142,9 @@ ...@@ -145,6 +142,9 @@
145 }, 142 },
146 activated () { 143 activated () {
147 this.queryClick(); 144 this.queryClick();
145 window["getBpageList"] = () => {
146 this.queryClick();
147 }
148 }, 148 },
149 methods: { 149 methods: {
150 // 列表渲染接口 150 // 列表渲染接口
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-07-24 11:26:06 4 * @LastEditTime: 2023-07-24 15:03:46
5 --> 5 -->
6 <template> 6 <template>
7 <div class="from-clues"> 7 <div class="from-clues">
...@@ -137,9 +137,6 @@ ...@@ -137,9 +137,6 @@
137 components: { searchBox }, 137 components: { searchBox },
138 mixins: [table, searchMin], 138 mixins: [table, searchMin],
139 mounted () { 139 mounted () {
140 window["getBpageList"] = () => {
141 this.queryClick();
142 };
143 sendThis(this); 140 sendThis(this);
144 }, 141 },
145 computed: { 142 computed: {
...@@ -167,7 +164,10 @@ ...@@ -167,7 +164,10 @@
167 }; 164 };
168 }, 165 },
169 activated () { 166 activated () {
170 this.queryClick(); 167 this.queryClick()
168 window["getBpageList"] = () => {
169 this.queryClick()
170 }
171 }, 171 },
172 methods: { 172 methods: {
173 // 列表渲染接口 173 // 列表渲染接口
......
...@@ -25,6 +25,7 @@ class data extends filter { ...@@ -25,6 +25,7 @@ class data extends filter {
25 { 25 {
26 prop: "ywlymc", 26 prop: "ywlymc",
27 label: "业务来源", 27 label: "业务来源",
28 width: '100',
28 }, 29 },
29 { 30 {
30 label: "流程状态", 31 label: "流程状态",
...@@ -48,6 +49,7 @@ class data extends filter { ...@@ -48,6 +49,7 @@ class data extends filter {
48 }, 49 },
49 { 50 {
50 label: "业务号", 51 label: "业务号",
52 width: '90',
51 render: (h, scope) => { 53 render: (h, scope) => {
52 return <el-button type="text" onClick={() => { vm.ywhClick(scope.row) }}>{scope.row.ywh}</el-button> 54 return <el-button type="text" onClick={() => { vm.ywhClick(scope.row) }}>{scope.row.ywh}</el-button>
53 } 55 }
......
...@@ -93,6 +93,7 @@ ...@@ -93,6 +93,7 @@
93 <script> 93 <script>
94 import { getCollectBiz, getleftMenu, getNextNode, getRepairBiz, getTogetherBiz, addCollectBiz, deleteCollectBiz } from "@/api/businessApply.js" 94 import { getCollectBiz, getleftMenu, getNextNode, getRepairBiz, getTogetherBiz, addCollectBiz, deleteCollectBiz } from "@/api/businessApply.js"
95 export default { 95 export default {
96 name: 'ywsq',
96 data () { 97 data () {
97 return { 98 return {
98 //申请业务类型集合 99 //申请业务类型集合
......