Merge branch 'master' of http://192.168.60.201/root/dsk-operate-sys

dsk-operate-ui/src/views/custom/customList/index.vue

@@ -345,8 +345,7 @@ export default {
       getCustomerList(this.searchParam).then(result=>{
         this.tableData = result
         this.tableData.rows.forEach(item=>{
-          item.registerCapital.replace('万','')
-          item.registerCapital.replace('元','')
+          item.registerCapital.replace(/^\D*(\d*(?:\.\d{0,6})?).*$/g, '$1')
           if(item.mainBusiness != "" && item.mainBusiness != null && item.mainBusiness.length>84){
             item.mainBusiness1 = item.mainBusiness.substring(0,81)
             item.sq1 = true

dsk-operate-ui/src/views/project/projectList/component/xgqy.vue

@@ -17,7 +17,7 @@
         <el-table
           :data="tableData.rows"
           style="width: 100%"
-          :default-sort = "{prop: 'depth', order: 'ascending'}"
+          :default-sort = "{prop: 'depth', order: 'descending'}"
         >
           <template slot="empty">
             <div class="empty">

dsk-operate-ui/src/views/project/projectList/component/zlwd.vue

@@ -61,7 +61,7 @@
         <el-table
           :data="fileDatas.rows"
           style="width: 100%"
-          :default-sort = "{prop: 'creatTime', order: 'ascending'}"
+          :default-sort = "{prop: 'creatTime', order: 'descending'}"
         >
           <template slot="empty">
             <div class="empty">