roose 5 年之前
父節點
當前提交
f27d584308

+ 1 - 1
public/index.html

@@ -5,7 +5,7 @@
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
   <meta name="viewport" content="width=device-width,initial-scale=1.0">
   <link rel="icon" href="<%= BASE_URL %>favicon.ico">
-  <title>吉企银通政府机构端管理后台</title>
+  <title>吉企银通金控机构端管理后台</title>
 </head>
 <body>
 <noscript>

二進制
src/assets/loading.png


+ 33 - 1
src/layout/companyuser/companyuserList.vue

@@ -4,6 +4,9 @@
       <el-col :span="24">
         <el-col :span="24">
           <el-table
+                  v-loading = "pictLoading"
+                  element-loading-text = "数据正在加载中"
+                  element-loading-spinner = "el-icon-loading"
             ref="debtTable"
             :data="debtTable"
             tooltip-effect="dark"
@@ -55,13 +58,25 @@ export default {
   props: {
     debtTable: null,
     total: null,
+      ISLoading: {
+          type:Boolean,
+          default : true
+      }
   },
   components: {},
   data: () => ({
     currentPage: 0,
     pageSize: 10,
+      pictLoading:true,
   }),
-  created() {},
+    watch:{
+        debtTable(){
+            this.pictLoading = false;
+        },
+    },
+    created() {
+        this.pictLoading = this.ISLoading;
+    },
   computed: {},
   methods: {
     handleSelectionChange(val) {
@@ -76,6 +91,7 @@ export default {
     },
     handleCurrentChange(currentPage) {
       console.log(currentPage);
+        this.$set(this, `pictLoading`, true);
       this.$emit('handleCurrentChange', { skip: currentPage,limit: this.pageSize, currentPage });
     },
     handleClick(id) {
@@ -146,4 +162,20 @@ export default {
     font-size: 16px;
     visibility: hidden;
 }
+
+/deep/.el-loading-spinner .el-loading-text {
+    color: #e9021d;
+    margin: 3px 0;
+    font-size: 14px;
+}
+/deep/ .el-icon-loading {
+    background: url(../../assets/loading.png) center no-repeat;
+    background-size: cover;
+    width: 25px;
+    height: 25px;
+}
+/deep/ .el-icon-loading:before {
+    content: "替";
+    visibility: hidden;
+}
 </style>

+ 3 - 2
src/layout/financeclaims/financeClaimInfoadd.vue

@@ -19,7 +19,8 @@
         components: {},
         data: () => ({
             innewname: '',
-            name: ''
+            name: '',
+            isLoading : true
         }),
         created() {
         },
@@ -29,7 +30,7 @@
                 let finaldata = {};
                 finaldata.innewname = this.innewname;
                 finaldata.name = this.name;
-                this.$emit('clickBtn', finaldata);
+                this.$emit('clickBtn', finaldata,this.isLoading);
             },
         },
     };

+ 91 - 50
src/layout/financeclaims/financeclaimsList.vue

@@ -2,14 +2,18 @@
     <div id="claimList">
         <el-row>
             <el-col :span="24">
-                <el-table ref="debtTable"
-                          :data="debtTable"
-                          style="width: 100%"
-                          :header-cell-style="{background:'#F5F6FA',color:'#909399'}"
+                <el-table
+                        v-loading="ISLoading"
+                        element-loading-text="数据正在加载中"
+                        element-loading-spinner="el-icon-loading"
+                        ref="debtTable"
+                        :data="debtTable"
+                        style="width: 100%"
+                        :header-cell-style="{background:'#F5F6FA',color:'#909399'}"
                 >
-                    <el-table-column type="index" label="序号" width="50" align="center"> </el-table-column>
-                    <el-table-column property="name" label="产品名称" align="center"> </el-table-column>
-                    <el-table-column property="innewname" label="机构名称" align="center"> </el-table-column>
+                    <el-table-column type="index" label="序号" width="50" align="center"></el-table-column>
+                    <el-table-column property="name" label="产品名称" align="center"></el-table-column>
+                    <el-table-column property="innewname" label="机构名称" align="center"></el-table-column>
                     <el-table-column label="利率范围" align="center">
                         <template slot-scope="scope">
                             <span style="margin-left: 10px">{{ scope.row.mongey_min_rate }}%~{{ scope.row.mongey_max_rate }}%</span>
@@ -22,7 +26,9 @@
                     </el-table-column>
                     <el-table-column fixed="right" label="操作" align="center">
                         <template slot-scope="scope">
-                            <el-button @click="$router.push({ path: '/financeclaims/financeLookClaimDetail', query: { id: scope.row._id } })" type="text" icon="el-icon-search" title="查看详情"></el-button>
+                            <el-button
+                                    @click="$router.push({ path: '/financeclaims/financeLookClaimDetail', query: { id: scope.row._id } })"
+                                    type="text" icon="el-icon-search" title="查看详情"></el-button>
                         </template>
                     </el-table-column>
                 </el-table>
@@ -44,46 +50,59 @@
 </template>
 
 <script>
-  export default {
-    name: 'claimList',
-    props: {
-      debtTable: null,
-      total: null,
-    },
-    components: {},
-    data: () => ({
-      currentPage: 1,
-    }),
-    created() {},
-    computed: {},
-    methods: {
-      deleteRow(id) {
-        this.$emit('deleteRow', id);
-      },
-      clickRest(id) {
-        this.$emit('clickRest', id);
-      },
-      handleSizeChange(val) {
-        console.log(`每页 ${val} 条`);
-      },
-      handleCurrentChange(val) {
-        this.$emit('pagechange', { skip: val});
-      },
-      formatTen(num) {
-        return num > 9 ? (num + "") : ("0" + num);
-      },
-      formatDate(date) {
-        var date = new Date(date);
-        var year = date.getFullYear();
-        var month = date.getMonth() + 1;
-        var day = date.getDate();
-        var hour = date.getHours();
-        var minute = date.getMinutes();
-        var second = date.getSeconds();
-        return year + "-" + this.formatTen(month) + "-" + this.formatTen(day) + " " + this.formatTen(hour) + ":" + this.formatTen(minute) + ":" + this.formatTen(second);
-      },
-    },
-  };
+    export default {
+        name: 'claimList',
+        props: {
+            debtTable: null,
+            total: null,
+            ISLoading: {
+                type: Boolean,
+                default: true
+            }
+        },
+        components: {},
+        data: () => ({
+            currentPage: 1,
+            pictLoading:true,
+        }),
+        watch: {
+            debtTable() {
+                this.ISLoading = false;
+            },
+        },
+        created() {
+            this.pictLoading = this.ISLoading;
+        },
+        computed: {},
+        methods: {
+            deleteRow(id) {
+                this.$emit('deleteRow', id);
+            },
+            clickRest(id) {
+                this.$emit('clickRest', id);
+            },
+            handleSizeChange(val) {
+                console.log(`每页 ${val} 条`);
+            },
+            handleCurrentChange(val) {
+                this.$set(this, `ISLoading`, true);
+                this.$emit('pagechange', {skip: val});
+            },
+            formatTen(num) {
+                return num > 9 ? (num + "") : ("0" + num);
+            },
+            formatDate(date) {
+                var date = new Date(date);
+                var year = date.getFullYear();
+                var month = date.getMonth() + 1;
+                var day = date.getDate();
+                var hour = date.getHours();
+                var minute = date.getMinutes();
+                var second = date.getSeconds();
+                return year + "-" + this.formatTen(month) + "-" + this.formatTen(day) + " " + this.formatTen(hour) + ":" + this.formatTen(minute) + ":" + this.formatTen(second);
+            },
+        },
+    };
 </script>
 
 <style lang="less" scoped>
@@ -91,16 +110,20 @@
         /*text-align: center;*/
         padding: 26px 20px;
     }
+
     /deep/ .el-pagination.is-background .el-pager li:not(.disabled).active {
         background-color: red;
     }
-    /deep/.el-table th {
+
+    /deep/ .el-table th {
         background-color: #f5f6fa;
         padding: 8px 0;
     }
-    /deep/.el-table td {
+
+    /deep/ .el-table td {
         padding: 11px 0;
     }
+
     /deep/ .el-icon-search {
         background: url(../../assets/xiangqing.png) center no-repeat;
         background-size: cover;
@@ -114,4 +137,22 @@
         visibility: hidden;
     }
 
+    /deep/ .el-loading-spinner .el-loading-text {
+        color: #e9021d;
+        margin: 3px 0;
+        font-size: 14px;
+    }
+
+    /deep/ .el-icon-loading {
+        background: url(../../assets/loading.png) center no-repeat;
+        background-size: cover;
+        width: 25px;
+        height: 25px;
+    }
+
+    /deep/ .el-icon-loading:before {
+        content: "替";
+        visibility: hidden;
+    }
+
 </style>

+ 112 - 62
src/layout/financeclaims/financeclaimsListadd.vue

@@ -2,15 +2,19 @@
     <div id="claimList">
         <el-row>
             <el-col :span="24">
-                <el-table ref="debtTable"
-                          :data="debtTable"
-                          style="width: 100%"
-                          tooltip-effect="dark"
-                          :header-cell-style="{background:'#F5F6FA',color:'#909399'}"
+                <el-table
+                        v-loading="pictLoading"
+                        element-loading-text="数据正在加载中"
+                        element-loading-spinner="el-icon-loading"
+                        ref="debtTable"
+                        :data="debtTable"
+                        style="width: 100%"
+                        tooltip-effect="dark"
+                        :header-cell-style="{background:'#F5F6FA',color:'#909399'}"
                 >
-                    <el-table-column type="index" label="序号" width="50" align="center"> </el-table-column>
-                    <el-table-column property="name" label="产品名称" align="center"> </el-table-column>
-                    <el-table-column property="innewname" label="机构名称" align="center"> </el-table-column>
+                    <el-table-column type="index" label="序号" width="50" align="center"></el-table-column>
+                    <el-table-column property="name" label="产品名称" align="center"></el-table-column>
+                    <el-table-column property="innewname" label="机构名称" align="center"></el-table-column>
                     <el-table-column label="利率范围" align="center">
                         <template slot-scope="scope">
                             <span style="margin-left: 10px">{{ scope.row.mongey_min_rate }}%~{{ scope.row.mongey_max_rate }}%</span>
@@ -23,9 +27,14 @@
                     </el-table-column>
                     <el-table-column fixed="right" label="操作" align="center">
                         <template slot-scope="scope">
-                            <el-button class="edit" @click="$router.push({ path: '/financeclaims/financeClaimDetailadd', query: { id: scope.row._id } })" type="text" icon="el-icon-edit" title="修改"></el-button>
-                            <el-button @click="$router.push({ path: '/financeclaims/financeLookClaimDetailadd', query: { id: scope.row._id } })" type="text" icon="el-icon-search" title="查看详情"></el-button>
-                            <el-button @click="ljdelete(scope.row._id)" type="text" icon="el-icon-delete" title="删除"></el-button>
+                            <el-button class="edit"
+                                       @click="$router.push({ path: '/financeclaims/financeClaimDetailadd', query: { id: scope.row._id } })"
+                                       type="text" icon="el-icon-edit" title="修改"></el-button>
+                            <el-button
+                                    @click="$router.push({ path: '/financeclaims/financeLookClaimDetailadd', query: { id: scope.row._id } })"
+                                    type="text" icon="el-icon-search" title="查看详情"></el-button>
+                            <el-button @click="ljdelete(scope.row._id)" type="text" icon="el-icon-delete"
+                                       title="删除"></el-button>
                         </template>
                     </el-table-column>
                 </el-table>
@@ -47,54 +56,71 @@
 </template>
 
 <script>
-  export default {
-    name: 'claimList',
-    props: {
-      debtTable: null,
-      total: null,
-    },
-    components: {},
-    data: () => ({
-      currentPage: 1,
-    }),
-    created() {},
-    computed: {},
-    methods: {
-      deleteRow(id) {
-        this.$emit('deleteRow', id);
-      },
-      clickRest(id) {
-        this.$emit('clickRest', id);
-      },
-      handleSizeChange(val) {
-        console.log(`每页 ${val} 条`);
-      },
-      handleCurrentChange(val) {
-        this.$emit('pagechange', { skip: val});
-      },
-      ljdelete(val) {
-        this.$emit('ljdelete',{ delid: val});
-      },
-      showtime(val){
-        let finaltime = val.substring(0,10);
-        return finaltime;
-      },
-      formatTen(num) {
-        return num > 9 ? (num + "") : ("0" + num);
-      },
-      formatDate(date) {
-        var date = new Date(date);
-        var year = date.getFullYear();
-        var month = date.getMonth() + 1;
-        var day = date.getDate();
-        var hour = date.getHours();
-        var minute = date.getMinutes();
-        var second = date.getSeconds();
-        return year + "-" + this.formatTen(month) + "-" + this.formatTen(day) + " " + this.formatTen(hour) + ":" + this.formatTen(minute) + ":" + this.formatTen(second);
-  },
+    export default {
+        name: 'claimList',
+        props: {
+            debtTable: null,
+            total: null,
+            ISLoading: {
+                type:Boolean,
+                default : true
+            }
+        },
+        components: {},
+        data: () => ({
+            currentPage: 1,
+            pictLoading:true,
+        }),
+        watch: {
+            debtTable(){
+                this.pictLoading = false;
+            },
+            ISLoading(){
+                this.pictLoading = false;
+            }
+        },
+        mounted() {
+            this.pictLoading = this.ISLoading;
+            console.log(this.ISLoading,"hhhhhhhhhhhhh")
+        },
+        computed: {},
+        methods: {
+            deleteRow(id) {
+                this.$emit('deleteRow', id);
+            },
+            clickRest(id) {
+                this.$emit('clickRest', id);
+            },
+            handleSizeChange(val) {
+                console.log(`每页 ${val} 条`);
+            },
+            handleCurrentChange(val) {
+                this.$set(this, `pictLoading`, true);
+                this.$emit('pagechange', {skip: val});
+            },
+            ljdelete(val) {
+                this.$emit('ljdelete', {delid: val});
+            },
+            showtime(val) {
+                let finaltime = val.substring(0, 10);
+                return finaltime;
+            },
+            formatTen(num) {
+                return num > 9 ? (num + "") : ("0" + num);
+            },
+            formatDate(date) {
+                var date = new Date(date);
+                var year = date.getFullYear();
+                var month = date.getMonth() + 1;
+                var day = date.getDate();
+                var hour = date.getHours();
+                var minute = date.getMinutes();
+                var second = date.getSeconds();
+                return year + "-" + this.formatTen(month) + "-" + this.formatTen(day) + " " + this.formatTen(hour) + ":" + this.formatTen(minute) + ":" + this.formatTen(second);
+            },
 
-    },
-  };
+        },
+    };
 </script>
 
 <style lang="less" scoped>
@@ -102,16 +128,20 @@
         /*text-align: center;*/
         padding: 15px 0;
     }
+
     /deep/ .el-pagination.is-background .el-pager li:not(.disabled).active {
         background-color: red;
     }
-    /deep/.el-table th {
+
+    /deep/ .el-table th {
         background-color: #f5f6fa;
         padding: 8px 0;
     }
-    /deep/.el-table td {
+
+    /deep/ .el-table td {
         padding: 11px 0;
     }
+
     /deep/ .el-icon-edit {
         background: url(../../assets/xiugaixinxi.png) center no-repeat;
         background-size: cover;
@@ -124,6 +154,7 @@
         font-size: 16px;
         visibility: hidden;
     }
+
     /deep/ .el-icon-delete {
         background: url(../../assets/shanchu.png) center no-repeat;
         background-size: cover;
@@ -136,6 +167,7 @@
         font-size: 16px;
         visibility: hidden;
     }
+
     /deep/ .el-icon-search {
         background: url(../../assets/xiangqing.png) center no-repeat;
         background-size: cover;
@@ -148,11 +180,29 @@
         font-size: 16px;
         visibility: hidden;
     }
-    /deep/.el-button + .el-button {
+
+    /deep/ .el-button + .el-button {
         margin-left: 10px;
         margin-right: 10px;
     }
-    /deep/ .el-table__row .cell  .edit:first-child  {
+
+    /deep/ .el-table__row .cell .edit:first-child {
         margin-right: 10px;
     }
+
+    /deep/.el-loading-spinner .el-loading-text {
+        color: #e9021d;
+        margin: 3px 0;
+        font-size: 14px;
+    }
+    /deep/ .el-icon-loading {
+        background: url(../../assets/loading.png) center no-repeat;
+        background-size: cover;
+        width: 25px;
+        height: 25px;
+    }
+    /deep/ .el-icon-loading:before {
+        content: "替";
+        visibility: hidden;
+    }
 </style>

+ 55 - 13
src/layout/financingTNewAssign/tNewAssignList.vue

@@ -3,28 +3,25 @@
         <el-row>
             <el-col :span="24">
                 <el-col :span="24" class="search">
-                    <el-col :span="5">
                         <span>筛选条件:</span>
-                        <el-select v-model="search.is_exist" placeholder="请选择指派状态">
+                        <el-select class="input" clearable v-model="search.is_exist" placeholder="请选择指派状态">
                             <el-option label="已指派" value="1"></el-option>
                             <el-option label="未指派" value="2"></el-option>
                         </el-select>
-                    </el-col>
-                    <el-col :span="4">
                         <span>输入条件:</span>
-                        <el-input v-model="search.company_name" :placeholder="placeholder" class="input"></el-input>
-                    </el-col>
+                        <el-input v-model="search.company_name" clearable :placeholder="placeholder" class="input"></el-input>
                     <!--<el-col :span="7">
                       <span>时间选择:</span>
                       <el-date-picker v-model="search.date" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"> </el-date-picker>
                     </el-col>-->
-                    <el-col :span="8">
                         <el-button class="btnSearch" @click="toQuery">查询</el-button>
-                        <el-button class="btnSearch qing" @click="toClear">清空</el-button>
-                    </el-col>
+
                 </el-col>
                 <el-col :span="24">
                     <el-table
+                            v-loading = "pictLoading"
+                            element-loading-text = "数据正在加载中"
+                            element-loading-spinner = "el-icon-loading"
                             ref="tableData"
                             :data="tableData"
                             tooltip-effect="dark"
@@ -118,7 +115,13 @@
             input:'',
             confirm:'确定',
             cancel:'取消',
+            pictLoading:true,
         }),
+        watch:{
+            tableData(){
+                this.pictLoading = false;
+            }
+        },
         created() {
         },
         computed: {
@@ -136,10 +139,12 @@
                 this.$emit('select', {skip: 0, limit: val, ...this.search});
             },
             handleCurrentChange(val) {
+                this.$set(this, `pictLoading`, true);
                 this.$emit('select', {skip: (val - 1) * this.limit, limit: this.limit, ...this.search});
             },
             toQuery() {
                 this.$set(this, `currentPage`, 1);
+                this.$set(this, `pictLoading`, true);
                 this.$emit('select', {skip: 0, limit: this.limit, ...this.search});
             },
             toClear() {
@@ -331,12 +336,9 @@
 
     .input {
         width: 150px;
+        margin-right: 10px;
     }
 
-    /deep/ .el-input__inner {
-        height: 35px;
-        line-height: 35px;
-    }
     /deep/  .el-table .cell {
         overflow: hidden;
         text-overflow: ellipsis;
@@ -373,4 +375,44 @@
     .list {
         padding: 0 20px;
     }
+    /deep/ .el-input__suffix {
+        .el-input__suffix-inner {
+            border-color: unset;
+
+            .el-icon-circle-close:before {
+                content: "\e79d" !important;
+                font-size: 20px;
+            }
+        }
+    }
+
+    /deep/ .el-icon-view:before {
+        content: "替";
+        font-size: 16px;
+        visibility: hidden;
+    }
+    /deep/ .el-icon-view {
+        background: url(../../assets/xiangqing.png) center no-repeat;
+        background-size: cover;
+        width: 25px;
+        height: 25px;
+    }
+
+    /deep/.el-loading-spinner .el-loading-text {
+        color: #e9021d;
+        margin: 3px 0;
+        font-size: 14px;
+    }
+    /deep/ .el-icon-loading {
+        background: url(../../assets/loading.png) center no-repeat;
+        background-size: cover;
+        width: 25px;
+        height: 25px;
+    }
+    /deep/ .el-icon-loading:before {
+        content: "替";
+        visibility: hidden;
+    }
+
+
 </style>

+ 139 - 77
src/layout/financingTUrgeHandle/tUrgeHandleList.vue

@@ -3,28 +3,24 @@
         <el-row>
             <el-col :span="24">
                 <el-col :span="24" class="search">
-                    <el-col :span="5">
-                        <span>筛选条件:</span>
-                        <el-select v-model="search.is_exist" placeholder="请选择催办状态">
-                            <el-option label="已催办" value="1"></el-option>
-                            <el-option label="未催办" value="2"></el-option>
-                        </el-select>
-                    </el-col>
-                    <el-col :span="4">
-                        <span>输入条件:</span>
-                        <el-input v-model="search.company_name" :placeholder="placeholder" class="input"></el-input>
-                    </el-col>
+                    <span>筛选条件:</span>
+                    <el-select class="input" clearable v-model="search.is_exist" placeholder="请选择催办状态">
+                        <el-option label="已催办" value="1"></el-option>
+                        <el-option label="未催办" value="2"></el-option>
+                    </el-select>
+                    <span>输入条件:</span>
+                    <el-input v-model="search.company_name" clearable :placeholder="placeholder" class="input"></el-input>
                     <!--<el-col :span="7">
                       <span>时间选择:</span>
                       <el-date-picker v-model="search.date" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"> </el-date-picker>
                     </el-col>-->
-                    <el-col :span="8">
-                        <el-button class="btnSearch" @click="toQuery">查询</el-button>
-                        <el-button class="btnSearch qing" @click="toClear">清空</el-button>
-                    </el-col>
+                    <el-button class="btnSearch" @click="toQuery">查询</el-button>
                 </el-col>
                 <el-col :span="24">
                     <el-table
+                            v-loading = "pictLoading"
+                            element-loading-text = "数据正在加载中"
+                            element-loading-spinner = "el-icon-loading"
                             ref="tableData"
                             :data="tableData"
                             tooltip-effect="dark"
@@ -35,8 +31,9 @@
                     >
                         <!--<el-table-column type="selection" align="center"> </el-table-column>-->
                         <el-table-column type="index" label="序号" width="50" align="center"></el-table-column>
-                        <el-table-column property="company_name" label="企业名称" align="center"  width="300"> </el-table-column>
-                        <el-table-column property="money" label="融资金额(万元)" align="center"> </el-table-column>
+                        <el-table-column property="company_name" label="企业名称" align="center"
+                                         width="300"></el-table-column>
+                        <el-table-column property="money" label="融资金额(万元)" align="center"></el-table-column>
 
                         <el-table-column label="需求状态" align="center">
                             <template slot-scope="scope">
@@ -50,9 +47,9 @@
                             </template>
                         </el-table-column>
 
-                        <el-table-column property="person" label="联系人" align="center"> </el-table-column>
-                        <el-table-column property="institution_name" label="金融机构名称" align="center"> </el-table-column>
-                        <el-table-column property="product_name" label="产品名称" align="center"> </el-table-column>
+                        <el-table-column property="person" label="联系人" align="center"></el-table-column>
+                        <el-table-column property="institution_name" label="金融机构名称" align="center"></el-table-column>
+                        <el-table-column property="product_name" label="产品名称" align="center"></el-table-column>
 
                         <el-table-column label="催办状态" align="center">
                             <template slot-scope="scope">
@@ -127,17 +124,22 @@
             limit: 10,
             dialogVisible: false,
             elImage: '',
-            tempId:'',
-            tempState:'',
+            tempId: '',
+            tempState: '',
             dialogFormVisible: false,
-            input:'',
-            confirm:'确定',
-            cancel:'取消',
+            input: '',
+            confirm: '确定',
+            cancel: '取消',
+            pictLoading:true,
         }),
-        created() {
+        watch:{
+            tableData(){
+                this.pictLoading = false;
+            }
         },
-        computed: {
+        created() {
         },
+        computed: {},
         methods: {
             handleSelectionChange(val) {
                 this.multipleSelection = val;
@@ -151,9 +153,11 @@
                 this.$emit('select', {skip: 0, limit: val, ...this.search});
             },
             handleCurrentChange(val) {
+                this.$set(this, `pictLoading`, true);
                 this.$emit('select', {skip: (val - 1) * this.limit, limit: this.limit, ...this.search});
             },
             toQuery() {
+                this.$set(this, `pictLoading`, true);
                 this.$set(this, `currentPage`, 1);
                 this.$emit('select', {skip: 0, limit: this.limit, ...this.search});
             },
@@ -164,39 +168,42 @@
                 }
             },
             showImage(image) {
-                if(image){
+                if (image) {
                     this.$set(this, `elImage`, image);
                     this.$set(this, `dialogVisible`, true);
-                }else{
+                } else {
                     this.$set(this, `dialogVisible`, false);
                 }
             },
             getDate(val) {
-                if(val){
-                    return this.format(new Date(Number(val)),'yyyy年MM月dd');
+                if (val) {
+                    return this.format(new Date(Number(val)), 'yyyy年MM月dd');
                 }
                 return '';
             },
-            format(date,formatStr){
-                formatStr=formatStr.replace(/yyyy|YYYY/,date.getFullYear());
-                formatStr=formatStr.replace(/MM/,(date.getMonth()+1)>9?(date.getMonth()+1).toString():'0' + (date.getMonth()+1));
-                formatStr=formatStr.replace(/dd|DD/,date.getDate()>9?date.getDate().toString():'0' + date.getDate());
+            format(date, formatStr) {
+                formatStr = formatStr.replace(/yyyy|YYYY/, date.getFullYear());
+                formatStr = formatStr.replace(/MM/, (date.getMonth() + 1) > 9 ? (date.getMonth() + 1).toString() : '0' + (date.getMonth() + 1));
+                formatStr = formatStr.replace(/dd|DD/, date.getDate() > 9 ? date.getDate().toString() : '0' + date.getDate());
                 return formatStr;
             },
-            publish(row){
-                if(row.publish_state === '1'){
+            publish(row) {
+                if (row.publish_state === '1') {
                     this.$message.error('已发布');
-                    return ;
+                    return;
                 }
-                this.$emit('publish', {row:row,skip: (this.currentPage - 1) * this.limit, limit: this.limit, ...this.search});
+                this.$emit('publish', {
+                    row: row,
+                    skip: (this.currentPage - 1) * this.limit,
+                    limit: this.limit, ...this.search
+                });
             },
-            openDialog(){
+            openDialog() {
                 this.$set(this, `input`, '');
             },
-            confirmClick(){
+            confirmClick() {
                 this.$set(this, `dialogFormVisible`, false);
-                switch(this.tempState)
-                {
+                switch (this.tempState) {
                     case '0':
                         break;
                     case '1':
@@ -204,20 +211,37 @@
                     case '2':
                         break;
                     case '3':
-                        this.$emit('updateState', {id:this.tempId,state:this.tempState,result:this.input,skip: (this.currentPage - 1) * this.limit, limit: this.limit, ...this.search});
+                        this.$emit('updateState', {
+                            id: this.tempId,
+                            state: this.tempState,
+                            result: this.input,
+                            skip: (this.currentPage - 1) * this.limit,
+                            limit: this.limit, ...this.search
+                        });
                         break;
                     case '-2':
-                        this.$emit('updateState', {id:this.tempId,state:'1',result:this.input,skip: (this.currentPage - 1) * this.limit, limit: this.limit, ...this.search});
+                        this.$emit('updateState', {
+                            id: this.tempId,
+                            state: '1',
+                            result: this.input,
+                            skip: (this.currentPage - 1) * this.limit,
+                            limit: this.limit, ...this.search
+                        });
                         break;
                     case '9':
-                        this.$emit('updateState', {id:this.tempId,state:this.tempState,result:this.input,skip: (this.currentPage - 1) * this.limit, limit: this.limit, ...this.search});
+                        this.$emit('updateState', {
+                            id: this.tempId,
+                            state: this.tempState,
+                            result: this.input,
+                            skip: (this.currentPage - 1) * this.limit,
+                            limit: this.limit, ...this.search
+                        });
                         break;
                 }
             },
-            cancelClick(){
+            cancelClick() {
                 this.$set(this, `dialogFormVisible`, false);
-                switch(this.tempState)
-                {
+                switch (this.tempState) {
                     case '0':
                         break;
                     case '1':
@@ -227,17 +251,22 @@
                     case '3':
                         break;
                     case '-2':
-                        this.$emit('updateState', {id:this.tempId,state:'2',result:this.input,skip: (this.currentPage - 1) * this.limit, limit: this.limit, ...this.search});
+                        this.$emit('updateState', {
+                            id: this.tempId,
+                            state: '2',
+                            result: this.input,
+                            skip: (this.currentPage - 1) * this.limit,
+                            limit: this.limit, ...this.search
+                        });
                         break;
                     case '9':
                         break;
                 }
             },
-            updateState(row,state){
+            updateState(row, state) {
                 this.$set(this, `tempId`, row.id);
                 this.$set(this, `tempState`, state);
-                switch(state)
-                {
+                switch (state) {
                     case '0':
                         break;
                     case '1':
@@ -245,9 +274,9 @@
                     case '2':
                         break;
                     case '3':
-                        if(row.current_state === state){
+                        if (row.current_state === state) {
                             this.$message.error('已停用');
-                        }else{
+                        } else {
                             this.$set(this, `confirm`, '停用');
                             this.$set(this, `cancel`, '取消');
                             this.$set(this, `dialogFormVisible`, true);
@@ -266,8 +295,7 @@
                 }
             },
             getState(val) {
-                switch(val)
-                {
+                switch (val) {
                     case '0':
                         return '未审核';
                     case '1':
@@ -282,8 +310,7 @@
             },
             getDemandState(val) {
                 let match = val.intelligent_follow.creditStatus;
-                switch(match)
-                {
+                switch (match) {
                     case '0':
                         return '已接单';
                     case '1':
@@ -299,26 +326,25 @@
             getTimeoutState(val) {
                 let match = val.intelligent_follow.creditStatus;
                 let timeout = val.next_is_timeout === '1' ? '已超时' : '未超时';
-                switch(match)
-                {
+                switch (match) {
                     case '0':
-                        return '审批'+ timeout;
+                        return '审批' + timeout;
                     case '1':
                         return '';
                     case '2':
-                        return '放款'+ timeout;
+                        return '放款' + timeout;
                     case '3':
                         return '';
                     case '9':
-                        return '接单'+ timeout;
+                        return '接单' + timeout;
                 }
             },
-            tableRowClassName({ row, rowIndex }) {
-                console.log(row.creditStatus, rowIndex);
-                if (row.next_is_timeout == '1') {
-                    return 'warning-row';
+            tableRowClassName({row, rowIndex}) {
+                console.log(row.creditStatus, rowIndex);
+                if (row.next_is_timeout == '1') {
+                    return 'warning-row';
                 }
-                return '';
+                return '';
             },
         },
     };
@@ -343,13 +369,15 @@
     /deep/ .el-table td {
         padding: 11px 0;
     }
-    /deep/  .el-table .cell {
+
+    /deep/ .el-table .cell {
         overflow: hidden;
         text-overflow: ellipsis;
         white-space: nowrap;
     }
-    /deep/.el-table  .warning-row {
-        background:oldlace;
+
+    /deep/ .el-table  .warning-row  {
+        background: oldlace;
     }
 
     .other {
@@ -378,11 +406,7 @@
 
     .input {
         width: 150px;
-    }
-
-    /deep/ .el-input__inner {
-        height: 35px;
-        line-height: 35px;
+        margin-right: 10px;
     }
 
     .btnSearch {
@@ -414,4 +438,42 @@
     .list {
         padding: 0 20px;
     }
+
+    /deep/ .el-icon-view:before {
+        content: "替";
+        font-size: 16px;
+        visibility: hidden;
+    }
+    /deep/ .el-icon-view {
+        background: url(../../assets/xiangqing.png) center no-repeat;
+        background-size: cover;
+        width: 25px;
+        height: 25px;
+    }
+
+    /deep/.el-loading-spinner .el-loading-text {
+        color: #e9021d;
+        margin: 3px 0;
+        font-size: 14px;
+    }
+    /deep/ .el-icon-loading {
+        background: url(../../assets/loading.png) center no-repeat;
+        background-size: cover;
+        width: 25px;
+        height: 25px;
+    }
+    /deep/ .el-icon-loading:before {
+        content: "替";
+        visibility: hidden;
+    }
+    /deep/ .el-input__suffix {
+        .el-input__suffix-inner {
+            border-color: unset;
+
+            .el-icon-circle-close:before {
+                content: "\e79d" !important;
+                font-size: 20px;
+            }
+        }
+    }
 </style>

+ 33 - 2
src/layout/institution/newsInfo.vue

@@ -4,6 +4,9 @@
       <el-col :span="24">
         <el-col :span="24">
           <el-table
+                  v-loading = "pictLoading"
+                  element-loading-text = "数据正在加载中"
+                  element-loading-spinner = "el-icon-loading"
             ref="debtTable"
             :data="debtTable"
             tooltip-effect="dark"
@@ -70,6 +73,10 @@ export default {
     total: null,
     totals: null,
     totalss: null,
+      ISLoading: {
+          type:Boolean,
+          default : true
+      }
   },
   components: {},
   data: () => ({
@@ -77,8 +84,16 @@ export default {
     pageSize: 10,
     dialogVisible: false,
     elImage: '',
+      pictLoading:true,
   }),
-  created() {},
+    watch:{
+        debtTable(){
+            this.pictLoading = false;
+        },
+    },
+    created() {
+        this.pictLoading = this.ISLoading;
+    },
   computed: {},
   methods: {
     handleSelectionChange(val) {
@@ -92,7 +107,7 @@ export default {
     },
     handleCurrentChange(currentPage) {
       console.log(currentPage);
-
+        this.$set(this, `pictLoading`, true);
       this.$emit('handleCurrentChange', { skip: (currentPage - 1) * this.pageSize, limit: this.pageSize, currentPage });
     },
     handleClick(id) {
@@ -174,4 +189,20 @@ export default {
 /deep/ .el-table__row .cell  .edit:first-child  {
     margin-right: 10px;
 }
+/deep/.el-loading-spinner .el-loading-text {
+    color: #e9021d;
+    margin: 3px 0;
+    font-size: 14px;
+}
+/deep/ .el-icon-loading {
+    background: url(../../assets/loading.png) center no-repeat;
+    background-size: cover;
+    width: 25px;
+    height: 25px;
+}
+/deep/ .el-icon-loading:before {
+    content: "替";
+    visibility: hidden;
+}
+
 </style>

+ 2 - 1
src/layout/intelligentDocking/intelligentDockingsearchInfo.vue

@@ -29,6 +29,7 @@ export default {
   data: () => ({
     region: '',
     companyName:'',
+    isLoading : true
     // address:'',
     // managerName:'',
     // jlList:[],
@@ -43,7 +44,7 @@ export default {
   methods: {
     // ...otheruser(['fetch', 'query']),
     handleCurrentChange() {
-      this.$emit('handleCurrentChange', this.region, this.companyName);
+      this.$emit('handleCurrentChange', this.region, this.companyName ,this.isLoading);
     },
     // async setjlList() {
     //   var userid = this.user.uid;

+ 38 - 3
src/layout/intelligentDocking/list.vue

@@ -2,7 +2,13 @@
   <div id="list">
     <el-row>
       <el-col :span="24" class="list">
-        <el-table ref="debtTable" :data="debtTable" style="width: 100%">
+        <el-table
+                v-loading = "ISLoading"
+                element-loading-text = "数据正在加载中"
+                element-loading-spinner = "el-icon-loading"
+                  ref="debtTable"
+                  :data="debtTable"
+                  style="width: 100%">
           <el-table-column type="index" label="序号" width="50" align="center"> </el-table-column>
           <el-table-column property="companyName" label="企业名称" align="center"> </el-table-column>
           <el-table-column property="institution" label="金融机构" align="center"> </el-table-column>
@@ -76,19 +82,33 @@ export default {
   props: {
     debtTable: null,
     total: null,
+    ISLoading: {
+     type:Boolean,
+      default : true
+    }
   },
   components: {},
   data: () => ({
     currentPage: 0,
     pageSize: 10,
+    pictLoading:true,
   }),
-  created() {},
-  computed: {},
+  watch:{
+    debtTable(){
+      this.pictLoading = false;
+    },
+  },
+  created() {
+    this.pictLoading = this.ISLoading;
+  },
+  computed: {
+  },
   methods: {
     handleSizeChange(val) {
       console.log(`每页 ${val} 条`);
     },
     handleCurrentChange(val) {
+      this.$set(this, `ISLoading`, true);
       this.$emit('pagechange', { skip: val});
     },
     formatTen(num) {
@@ -163,4 +183,19 @@ export default {
   font-size: 16px;
   visibility: hidden;
 }
+/deep/.el-loading-spinner .el-loading-text {
+  color: #e9021d;
+  margin: 3px 0;
+  font-size: 14px;
+}
+/deep/ .el-icon-loading {
+  background: url(../../assets/loading.png) center no-repeat;
+  background-size: cover;
+  width: 25px;
+  height: 25px;
+}
+/deep/ .el-icon-loading:before {
+  content: "替";
+  visibility: hidden;
+}
 </style>

+ 33 - 2
src/layout/otheruser/otheruserList.vue

@@ -4,6 +4,9 @@
       <el-col :span="24">
         <el-col :span="24">
           <el-table
+                  v-loading = "pictLoading"
+                  element-loading-text = "数据正在加载中"
+                  element-loading-spinner = "el-icon-loading"
             ref="debtTable"
             :data="debtTable"
             tooltip-effect="dark"
@@ -68,13 +71,25 @@ export default {
   props: {
     debtTable: null,
     total: null,
+      ISLoading: {
+          type:Boolean,
+          default : true
+      }
   },
   components: {},
   data: () => ({
     currentPage: 0,
     pageSize: 10,
+      pictLoading:true,
   }),
-  created() {},
+    watch:{
+        debtTable(){
+            this.pictLoading = false;
+        },
+    },
+  created() {
+      this.pictLoading = this.ISLoading;
+  },
   computed: {},
   methods: {
     handleSelectionChange(val) {
@@ -92,7 +107,7 @@ export default {
 
     handleCurrentChange(currentPage) {
       console.log(currentPage);
-
+        this.$set(this, `pictLoading`, true);
       this.$emit('handleCurrentChange', { skip: (currentPage - 1) * this.pageSize, limit: this.pageSize, currentPage });
     },
   },
@@ -179,5 +194,21 @@ export default {
 /deep/ .el-table__row .cell  .edit:first-child  {
     margin-right: 10px;
 }
+/deep/.el-loading-spinner .el-loading-text {
+    color: #e9021d;
+    margin: 3px 0;
+    font-size: 14px;
+}
+/deep/ .el-icon-loading {
+    background: url(../../assets/loading.png) center no-repeat;
+    background-size: cover;
+    width: 25px;
+    height: 25px;
+}
+/deep/ .el-icon-loading:before {
+    content: "替";
+    visibility: hidden;
+}
+
 
 </style>

+ 26 - 1
src/layout/tNewAssign/tNewAssignList.vue

@@ -19,6 +19,9 @@
                 </el-col>
                 <el-col :span="24">
                     <el-table
+                            v-loading = "pictLoading"
+                            element-loading-text = "数据正在加载中"
+                            element-loading-spinner = "el-icon-loading"
                             ref="tableData"
                             :data="tableData"
                             tooltip-effect="dark"
@@ -112,7 +115,13 @@
             input:'',
             confirm:'确定',
             cancel:'取消',
+            pictLoading:true,
         }),
+        watch:{
+            tableData(){
+                this.pictLoading = false;
+            }
+        },
         created() {
         },
         computed: {
@@ -130,10 +139,12 @@
                 this.$emit('select', {skip: 0, limit: val, ...this.search});
             },
             handleCurrentChange(val) {
+                this.$set(this, `pictLoading`, true);
                 this.$emit('select', {skip: (val - 1) * this.limit, limit: this.limit, ...this.search});
             },
             toQuery() {
                 this.$set(this, `currentPage`, 1);
+                this.$set(this, `pictLoading`, true);
                 this.$emit('select', {skip: 0, limit: this.limit, ...this.search});
             },
             toClear() {
@@ -391,5 +402,19 @@
         width: 25px;
         height: 25px;
     }
-
+    /deep/.el-loading-spinner .el-loading-text {
+        color: #e9021d;
+        margin: 3px 0;
+        font-size: 14px;
+    }
+    /deep/ .el-icon-loading {
+        background: url(../../assets/loading.png) center no-repeat;
+        background-size: cover;
+        width: 25px;
+        height: 25px;
+    }
+    /deep/ .el-icon-loading:before {
+        content: "替";
+        visibility: hidden;
+    }
 </style>

+ 27 - 0
src/layout/tUrgeHandle/tUrgeHandleList.vue

@@ -20,6 +20,9 @@
                 </el-col>
                 <el-col :span="24">
                     <el-table
+                            v-loading = "pictLoading"
+                            element-loading-text = "数据正在加载中"
+                            element-loading-spinner = "el-icon-loading"
                             ref="tableData"
                             :data="tableData"
                             tooltip-effect="dark"
@@ -128,7 +131,13 @@
             input:'',
             confirm:'确定',
             cancel:'取消',
+            pictLoading:true,
         }),
+        watch:{
+            tableData(){
+                this.pictLoading = false;
+            }
+        },
         created() {
         },
         computed: {
@@ -146,10 +155,12 @@
                 this.$emit('select', {skip: 0, limit: val, ...this.search});
             },
             handleCurrentChange(val) {
+                this.$set(this, `pictLoading`, true);
                 this.$emit('select', {skip: (val - 1) * this.limit, limit: this.limit, ...this.search});
             },
             toQuery() {
                 this.$set(this, `currentPage`, 1);
+                this.$set(this, `pictLoading`, true);
                 this.$emit('select', {skip: 0, limit: this.limit, ...this.search});
             },
             toClear() {
@@ -432,4 +443,20 @@
         width: 25px;
         height: 25px;
     }
+
+    /deep/.el-loading-spinner .el-loading-text {
+        color: #e9021d;
+        margin: 3px 0;
+        font-size: 14px;
+    }
+    /deep/ .el-icon-loading {
+        background: url(../../assets/loading.png) center no-repeat;
+        background-size: cover;
+        width: 25px;
+        height: 25px;
+    }
+    /deep/ .el-icon-loading:before {
+        content: "替";
+        visibility: hidden;
+    }
 </style>

+ 28 - 0
src/layout/zhidao/zhidaoList.vue

@@ -21,6 +21,9 @@
                 </el-col>
                 <el-col :span="24">
                     <el-table
+                            v-loading = "pictLoading"
+                            element-loading-text = "数据正在加载中"
+                            element-loading-spinner = "el-icon-loading"
                             ref="tableData"
                             :data="tableData"
                             tooltip-effect="dark"
@@ -87,7 +90,13 @@
             limit: 10,
             dialogVisible: false,
             elImage: '',
+            pictLoading:true,
         }),
+        watch:{
+            tableData(){
+                this.pictLoading = false;
+            }
+        },
         created() {
         },
         computed: {},
@@ -115,10 +124,12 @@
                 this.$emit('select', {skip: 0, limit: val, ...this.search});
             },
             handleCurrentChange(val) {
+                this.$set(this, `pictLoading`, true);
                 this.$emit('select', {skip: (val - 1) * this.limit, limit: this.limit, ...this.search});
             },
             toQuery() {
                 this.$set(this, `currentPage`, 1);
+                this.$set(this, `pictLoading`, true);
                 this.$emit('select', {skip: 0, limit: this.limit, ...this.search});
             },
             toClear() {
@@ -260,4 +271,21 @@
     /deep/ .el-table__row .cell  .edit:first-child  {
         margin-right: 10px;
     }
+
+
+    /deep/.el-loading-spinner .el-loading-text {
+        color: #e9021d;
+        margin: 3px 0;
+        font-size: 14px;
+    }
+    /deep/ .el-icon-loading {
+        background: url(../../assets/loading.png) center no-repeat;
+        background-size: cover;
+        width: 25px;
+        height: 25px;
+    }
+    /deep/ .el-icon-loading:before {
+        content: "替";
+        visibility: hidden;
+    }
 </style>

+ 7 - 3
src/views/financeclaims/financeClaimIndexadd.vue

@@ -38,8 +38,8 @@
             debtTable: [],
             total: '',
             cpname: '',
-            jgname: ''
-
+            jgname: '',
+            ISLoading:true,
         }),
         created() {
             this.financeclaimsList();
@@ -51,6 +51,7 @@
             ...financeclaims(['fclaimsList', 'orUpdate', 'one', 'dupdate', 'fetch', 'update']),
             async financeclaimsList({skip = 1, limit = 10, uid = this.user.userid, type = 0} = {}) {
                 const res = await this.fclaimsList({skip, limit, uid, type});
+                this.$set(this, `ISLoading`, false);
                 this.$set(this, `debtTable`, res.res);
                 this.$set(this, `total`, res.total);
             },
@@ -69,7 +70,8 @@
                 this.$set(this, `total`, res.total);
             },
             //查询
-            async clickBtn(data) {
+            async clickBtn(data ,ISLoading) {
+                // console.log(ISLoading,"chuan三十岁")
                 var innewname = data.innewname;
                 var name = data.name;
                 this.cpname = data.name;
@@ -77,7 +79,9 @@
                 var skip = 0;
                 var limit = 10;
                 var type = 0;
+                // this.ISLoading = ISLoading;
                 const res = await this.fclaimsList({skip, limit, type, innewname, name});
+                this.$set(this, `ISLoading`, true);
                 this.$set(this, `debtTable`, res.res);
                 this.$set(this, `total`, res.total);
             },

+ 7 - 2
src/views/intelligentDocking/index.vue

@@ -9,7 +9,7 @@
             <search @handleCurrentChange="handleCurrentChange"></search>
           </el-col>
           <el-col :span="24" class="main">
-            <list :debtTable="debtTable" :total="total" @pagechange="pagechange"></list>
+            <list  :ISLoading="ISLoading" :debtTable="debtTable" :total="total" @pagechange="pagechange"></list>
           </el-col>
         </el-col>
       </el-col>
@@ -38,6 +38,7 @@ export default {
     total: 0,
     region:'',
     companyName:'',
+    ISLoading:true,  //表格加载圈圈
   }),
   created() {
     this.searchInfo();
@@ -50,8 +51,10 @@ export default {
     // 查询列表
     async searchInfo({ skip = 1, limit = 10, ...info } = {}) {
       const res = await this.dockingSearch({ skip, limit, ...info });
+      this.$set(this, `ISLoading`, false);
       this.$set(this, `debtTable`, res.result);
       this.$set(this, `total`, res.total);
+
     },
     // 分页
     async pagechange(data) {
@@ -69,12 +72,14 @@ export default {
       this.$set(this, `debtTable`, res.result);
       this.$set(this, `total`, res.total);
     },
-    async handleCurrentChange(region,companyName) {
+    async handleCurrentChange(region,companyName,ISLoading) {
       this.companyName = companyName;
       this.region = region;
+      this.ISLoading = ISLoading;
       var skip = 0;
       var limit = 10;
       const res = await this.dockingSearch({ skip, limit,region, companyName });
+      this.$set(this, `ISLoading`, false);
       this.$set(this, `debtTable`, res.result);
       this.$set(this, `total`, res.total);
     },