|
|
@@ -145,18 +145,19 @@
|
|
|
</template>
|
|
|
|
|
|
<script>
|
|
|
-import tableList from '@/mixins/tableList'
|
|
|
+import tableListMixins from '@/mixins/tableList'
|
|
|
import DialogEdit from './dialog.edit'
|
|
|
import DialogAdd from './dialog.add'
|
|
|
import {json} from'./json'
|
|
|
/** 引入节点树接口*/
|
|
|
import { deptTreeSelect } from "@/api/system/public";
|
|
|
+import { tableList } from "./api";
|
|
|
|
|
|
export default {
|
|
|
/** 得先引入字典才能使用 */
|
|
|
dicts: ['sys_business_type'],
|
|
|
/** 引入基础minxins*/
|
|
|
- mixins:[tableList],
|
|
|
+ mixins:[tableListMixins],
|
|
|
components: {DialogEdit,DialogAdd},
|
|
|
data() {
|
|
|
//初始化查询日期
|
|
|
@@ -229,19 +230,22 @@ export default {
|
|
|
/** 查询列表 */
|
|
|
getList(id) {
|
|
|
//this.loading = true;
|
|
|
- console.log(this.queryParams,111);
|
|
|
- console.log(this.addDateRange(this.queryParams, this.dateRange),2222);
|
|
|
- this.tableList = json.content;
|
|
|
- // tableList(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
|
|
|
- // //兼容框架userId字段
|
|
|
- // response.rows.forEach(v=>{v.userId = v.id});
|
|
|
- // this.userList = response.rows;
|
|
|
- // this.total = response.total;
|
|
|
- // this.loading = false;
|
|
|
- // }
|
|
|
- // ).catch(err=>{
|
|
|
- // this.loading = false;
|
|
|
- // })
|
|
|
+ //console.log(this.queryParams,111);
|
|
|
+ //console.log(this.addDateRange(this.queryParams, this.dateRange),2222);
|
|
|
+ //this.tableList = json.content;
|
|
|
+ this.addDateRange(this.queryParams, this.dateRange)
|
|
|
+ let data = this.queryParams;
|
|
|
+ data.range
|
|
|
+ tableList().then(response => {
|
|
|
+ //兼容框架userId字段
|
|
|
+ response.rows.forEach(v=>{v.userId = v.id});
|
|
|
+ this.userList = response.rows;
|
|
|
+ this.total = response.total;
|
|
|
+ this.loading = false;
|
|
|
+ }
|
|
|
+ ).catch(err=>{
|
|
|
+ this.loading = false;
|
|
|
+ })
|
|
|
},
|
|
|
/** 查询机构树 */
|
|
|
getDeptTree() {
|