冻结页面，人工和财务账单bug

assets/css/common.css

@@ -81,3 +81,6 @@ textarea:focus {
 .trcenter tr th {
 	text-align: center;
 }
+.marginr30 {
+	margin-right: 30px;
+}

pages/main/index/artificial_orders.vue

@@ -13,15 +13,15 @@
     </div>
     <!-- </section> -->
     <!-- </section> -->
-    <div class="trcenter">
+    <div class="trcenter" style="height: calc(100%) ">
       <!-- height="250" -->
-      <el-table :data="finaceList" border style="width: 100%">
+      <el-table :data="finaceList" border style="width: 100%;" height="100%">
         <el-table-column label="订单名称">
           <template slot-scope="scope">
             <!-- @click="clickDev(scope.row.uid)"  -->
             <span class="lblue point">
               <nuxt-link
-                :to="{path:'/main/orders_detail?id='+scope.row.uid}"
+                :to="{path:'/main/orders_detail?id='+scope.row.id}"
               >{{scope.row.product_title}}</nuxt-link>
             </span>
           </template>
@@ -29,9 +29,8 @@
         <el-table-column prop="uid" label="用户"></el-table-column>
         <el-table-column label="实际金额">
           <template slot-scope="scope">
-            <span
-              :class="parseInt(scope.row.real_amount)>=0?'green':'orange'"
-            >{{scope.row.real_amount}}</span>
+            <span v-if="parseInt(scope.row.real_amount)>=0" class="green">+{{scope.row.real_amount}}</span>
+            <span v-else class="orange">+{{scope.row.real_amount}}</span>
           </template>
         </el-table-column>
         <el-table-column label="收支类型">
@@ -72,7 +71,7 @@
         <el-table-column label="编辑">
           <template slot-scope="scope">
             <!-- 需求是状态等于“待提交的时候显示”给我一个状态_name 或者是待提交的id -->
-            <span v-if="scope.row.order_state_name=='待提交'" class="lblue point">编辑</span>
+            <span v-if="scope.row.status==0" class="lblue point">编辑</span>
           </template>
         </el-table-column>
       </el-table>
@@ -248,7 +247,28 @@ export default {
       var hour = now.getHours();
       var minute = now.getMinutes();
       var second = now.getSeconds();
-      return year + "-" + month + "-" + date;
+      if (hour < 10) {
+        hour = "0" + hour;
+      }
+      if (minute < 10) {
+        minute = "0" + minute;
+      }
+      if (second < 10) {
+        second = "0" + second;
+      }
+      return (
+        year +
+        "-" +
+        month +
+        "-" +
+        date +
+        " " +
+        hour +
+        ":" +
+        minute +
+        ":" +
+        second
+      );
     },
 
     // 获取列表数据

pages/main/index/orders.vue

@@ -155,15 +155,15 @@
       </section>
       <el-button @click="clickExport" type="primary">导出</el-button>
     </section>-->
-    <div class="trcenter">
+    <div class="trcenter changeheight" width="100%">
       <!-- height="250" -->
-      <el-table :data="finaceList" border style="width: 100%">
+      <el-table :data="finaceList" border height="100%" width="100%">
         <el-table-column label="订单名称">
           <template slot-scope="scope">
             <!-- @click="clickDev(scope.row.uid)"  -->
             <span class="lblue point">
               <nuxt-link
-                :to="{path:'/main/orders_detail?id='+scope.row.uid}"
+                :to="{path:'/main/orders_detail?id='+scope.row.id}"
               >{{scope.row.product_title}}</nuxt-link>
             </span>
           </template>
@@ -171,9 +171,8 @@
         <el-table-column prop="uid" label="用户"></el-table-column>
         <el-table-column label="实际金额">
           <template slot-scope="scope">
-            <span
-              :class="parseInt(scope.row.real_amount)>=0?'green':'orange'"
-            >{{scope.row.real_amount}}</span>
+            <span v-if="parseInt(scope.row.real_amount)>=0" class="green">+{{scope.row.real_amount}}</span>
+            <span v-else class="orange">+{{scope.row.real_amount}}</span>
           </template>
         </el-table-column>
         <el-table-column prop="channel" label="支付方式"></el-table-column>
@@ -232,6 +231,7 @@
 export default {
   data() {
     return {
+      finaceList: [],
       successCount: 0,
       totalHave: 0,
       totalSuccess: 0,
@@ -323,7 +323,7 @@ export default {
           {
             text: "全部",
             onClick(picker) {
-              alert("获取全部数据");
+              picker.$emit("pick", []);
             }
           },
           {
@@ -500,7 +500,28 @@ export default {
       var hour = now.getHours();
       var minute = now.getMinutes();
       var second = now.getSeconds();
-      return year + "-" + month + "-" + date;
+      if (hour < 10) {
+        hour = "0" + hour;
+      }
+      if (minute < 10) {
+        minute = "0" + minute;
+      }
+      if (second < 10) {
+        second = "0" + second;
+      }
+      return (
+        year +
+        "-" +
+        month +
+        "-" +
+        date +
+        " " +
+        hour +
+        ":" +
+        minute +
+        ":" +
+        second
+      );
     },
     // 改变订单类型
     changeOrder() {
@@ -752,6 +773,10 @@ export default {
       var data = res.data;
       console.log(data);
       this.orderTypesOption = data.order_types;
+      this.orderTypesOption.unshift({
+        id: "",
+        name: "全部"
+      });
       this.orderStateOption = data.order_state;
       this.payList = data.channels;
       this.payList.unshift({
@@ -788,6 +813,9 @@ export default {
   overflow-x: scroll;
   height: calc(100% - 40px);
 }
+.changeheight {
+  height: calc(100%) !important;
+}
 .top {
   display: flex;
   flex-direction: column;

pages/main/index/orders_detail.vue

@@ -4,7 +4,7 @@
     <h3 style="font-size:24px">整包协作开发者认证</h3>
     <span class="lines"></span>
     <div class="order-infos">
-      <span v-if="successTF">
+      <span v-if="status==1">
         <i class="el-icon-success icons-s"></i>
         <span>交易成功</span>
       </span>
@@ -15,51 +15,54 @@
       <div class="pays-info">
         <p>
           <span class="pays-title">实际金额：</span>
-          <span v-if="statusTF" class="detail-pays orange font20">+¥59.00</span>
-          <span v-else class="detail-pays green font20">-¥59.00</span>
+          <span
+            v-if="inforDetail.real_amount>=0"
+            class="detail-pays green font20"
+          >+{{inforDetail.real_amount}}</span>
+          <span v-else class="detail-pays orange font20">-¥{{inforDetail.real_amount}}</span>
         </p>
         <p>
           <span class="pays-title">原始金额：</span>
-          <span v-if="statusTF" class>+¥59.00</span>
-          <span v-else class>-¥59.00</span>
+          <span v-if="inforDetail.amount>=0" class>+¥{{inforDetail.amount}}</span>
+          <span v-else class>-¥{{inforDetail.amount}}</span>
         </p>
         <p>
           <span class="pays-title">支付方式：</span>
-          <span>账户余额</span>
+          <span>{{inforDetail.channel_name}}</span>
         </p>
       </div>
       <div class="pays-others">
         <p>
           <span>创建时间：</span>
-          <span>2019-08-20 13:30</span>
+          <span>{{inforDetail.created_at?(formatDate(inforDetail.created_at)):""}}</span>
         </p>
-        <p>
+        <!-- <p>
           <span>提交时间：</span>
-          <span>2019-08-20 13:30</span>
-        </p>
+          <span>{{inforDetail.updated_at?(formatDate(inforDetail.updated_at)):""}}</span>
+        </p>-->
         <p>
           <span>到账时间：</span>
-          <span>2019-08-20 13:30</span>
+          <span>{{inforDetail.pay_time?(formatDate(inforDetail.pay_time)):""}}</span>
         </p>
         <p>
           <span>订单编号：</span>
-          <span>39984849394894</span>
+          <span>{{inforDetail.order_no}}</span>
         </p>
         <p>
           <span>支付编号：</span>
-          <span>2334443423233</span>
+          <span>{{inforDetail.out_order_id}}</span>
         </p>
-        <p>
+        <!-- <p>
           <span>创建时间：</span>
           <span>2019-08-20 13:30</span>
         </p>
         <p>
           <span>到账时间：</span>
           <span>2019-08-20 13:30</span>
-        </p>
+        </p>-->
         <p>
           <span>备注说明：</span>
-          <span>对方空间对方看看风景地方</span>
+          <span>{{inforDetail.remark}}</span>
         </p>
       </div>
       <span class="lines"></span>
@@ -67,11 +70,11 @@
       <div class="pays-others" style="padding-bottom:40px">
         <p>
           <span>订单类型：</span>
-          <span>资质认证</span>
+          <span>{{inforDetail.product_type_name}}</span>
         </p>
         <p>
           <span>交易类型：</span>
-          <span>购买</span>
+          <span>{{inforDetail.order_type_name}}</span>
         </p>
         <p>
           <span>关联项目：</span>
@@ -83,32 +86,36 @@
         </p>
         <p>
           <span>人工财务：</span>
-          <span>是</span>
+          <span>{{inforDetail.artificial_mark==1?"是":"否"}}</span>
         </p>
         <p>
+          <span>支付账号：</span>
+          <span>2334443423233</span>
+        </p>
+        <!-- <p>
           <span>出账账号：</span>
           <span>2334443423233</span>
         </p>
         <p>
           <span>入账账号：</span>
           <span>2334443423233</span>
-        </p>
-        <p class="clear">
+        </p>-->
+        <!-- <p class="clear">
           <span class="floatl">数据备注：</span>
           <span
             class="mark-width floatl"
           >接口的咖啡饿的发呆发呆发呆发呆发呆发呆地方地方机看对方空间对方看当看到反馈的风景看对方空间发的快点放假放的看对方空间对方</span>
           <span class="blue point floatl" @click="centerDialogVisible=true">查看详情</span>
-        </p>
+        </p>-->
         <p>
           <span>内部备注：</span>
-          <span>2334443423233</span>
+          <span>{{inforDetail.private_comment}}</span>
         </p>
       </div>
     </div>
     <div class="person-img floatr">
-      <img src="@/assets/img/head.png" alt />
-      <p class="textc">王大锤</p>
+      <img :src="iconUrl" alt />
+      <p class="textc">{{nikeName}}</p>
     </div>
     <el-dialog title="数据备注" :visible.sync="centerDialogVisible" width="50%" center>
       <p>接口的咖啡饿的发呆发呆发呆发呆发呆发呆地方地方机看对方空间对方看当看到反馈的风景看对方空间发的快点放假放的看对方空间对方</p>
@@ -125,30 +132,37 @@
 export default {
   data() {
     return {
+      ids: 0,
       successTF: true,
       statusTF: true,
-      centerDialogVisible: false
+      centerDialogVisible: false,
+      currentPage: 1,
+      currentPageSize: 1,
+      inforDetail: {},
+      status: 1,
+      iconUrl: "",
+      nikeName: ""
     };
   },
 
   computed: {
-    clickDev(uid) {},
-    isTest() {
-      return this.localData.env === "test";
-    },
-    whole() {
-      return this.totalData.whole || {};
-    },
-    totalDeposit() {
-      return this.whole.total_deposit;
-    },
-    totalFee() {
-      return this.whole.total_fee;
-    }
+    // clickDev(uid) {},
+    // isTest() {
+    //   return this.localData.env === "test";
+    // },
+    // whole() {
+    //   return this.totalData.whole || {};
+    // },
+    // totalDeposit() {
+    //   return this.whole.total_deposit;
+    // },
+    // totalFee() {
+    //   return this.whole.total_fee;
+    // }
   },
   mounted() {
-    this.getTableData();
-    this.getEnum();
+    this.getFinanceList();
+    // this.getEnum();
   },
   methods: {
     getUrlParam(name) {
@@ -157,189 +171,48 @@ export default {
       if (r != null) return decodeURI(r[2]);
       return null; //返回参数值
     },
-    // 改变订单类型
-    changeOrder() {
-      var haveAll = false;
-      for (var i = 0; i < this.orderType.length; i++) {
-        if (this.orderType[i] == 0) {
-          haveAll = true;
-        }
-      }
-
-      // 选择其他的时候，去掉全部,全部在第一位
-      if (
-        this.orderType[0] == 0 &&
-        1 < this.orderType.length < this.TypeList.length
-      ) {
-        var arr = [];
-        for (var i = 0; i < this.orderType.length; i++) {
-          if (this.orderType[i] != 0) {
-            arr.push(this.orderType[i]);
-          }
-        }
-
-        this.orderType = arr;
-      }
-      // 选择全部的时候去掉其他，全部在最后一位
-      if (this.orderType[this.orderType.length - 1] == 0) {
-        this.orderType = [0];
-      }
-      if (!haveAll && this.orderType.length == this.TypeList.length - 1) {
-        this.orderType = [0];
-      }
-      if (this.orderType.length == 0) {
-        console.log("sss:", this.orderType);
-        this.orderType = [0];
-      }
-    },
-
-    // 改变支付方式
-    changePay() {
-      var haveAll = false;
-      for (var i = 0; i < this.payType.length; i++) {
-        if (this.payType[i] == 0) {
-          haveAll = true;
-        }
-      }
-
-      // 选择其他的时候，去掉全部,全部在第一位
-      if (
-        this.payType[0] == 0 &&
-        1 < this.payType.length < this.payList.length
-      ) {
-        var arr = [];
-        for (var i = 0; i < this.payType.length; i++) {
-          if (this.payType[i] != 0) {
-            arr.push(this.payType[i]);
-          }
-        }
-
-        this.payType = arr;
-      }
-      // 选择全部的时候去掉其他，全部在最后一位
-      if (this.payType[this.payType.length - 1] == 0) {
-        this.payType = [0];
-      }
-      if (!haveAll && this.payType.length == this.payList.length - 1) {
-        this.payType = [0];
-      }
-      if (this.payType.length == 0) {
-        console.log("sss:", this.orderType);
-        this.payType = [0];
-      }
-    },
-    clickExport() {
-      window.open("/api/admin/job/get_all_periods?action=export");
-    },
-    /**
-     * 获取筛选值
-     */
-    async getEnum() {
-      let { data } = await this.$get("/api/admin/job/getEnum");
-      console.log(data);
-      if (data) {
-        let { jobStatusList, periodStatusList } = data;
-        this.jobStatusList = jobStatusList;
-        this.periodStatusList = periodStatusList;
-      }
-    },
-    // 点击操作
-    clickOperate({ job_id, id }) {
-      if (this.isTest)
-        window.open(
-          `https://dev.test-rooter.proginn.com/main/wage_settlement?job_id=${job_id}&period_id=${id}`
-        );
-      else
-        window.open(
-          `https://rooter.proginn.com/main/wage_settlement?job_id=${job_id}&period_id=${id}`
-        );
-    },
-    // 点击账单
-    clickOrder(i) {
-      if (this.isTest)
-        window.open(
-          `https://dev.test-rooter.proginn.com/main/wage_details?job_id=${i.job_id}&period_id=${i.id}`
-        );
-      else
-        window.open(
-          `https://rooter.proginn.com/main/wage_details?job_id=${i.job_id}&period_id=${i.id}`
-        );
-    },
-    // 点击开发者
-    clickDev(uid) {
-      if (this.isTest)
-        window.open(`https://dev.test.proginn.com/rooter/user/${uid}`);
-      else window.open(`https://www.proginn.com/rooter/user/${uid}`);
-    },
-    // 点击企业
-    clickCompany(uid) {
-      if (this.isTest)
-        window.open(`https://dev.test.proginn.com/rooter/user/${uid}`);
-      else window.open(`https://www.proginn.com/rooter/user/${uid}`);
-    },
-    // 点击账单id
-    clickJobID(jobID) {
-      if (this.isTest)
-        window.open(
-          `https://dev.test.proginn.com/rooter/cloudjobitem/${jobID}`
-        );
-      else window.open(`https://www.proginn.com/rooter/cloudjobitem/${jobID}`);
-    },
-    // 点击重试
-    async clickRetry(id) {
-      const res = await this.$post("/api/admin/payment/redoDraw", { id });
-      // console.log(res)
-    },
-    // 根据状态显示图表样式
-    tableRowClassName({ row, rowIndex }) {
-      // console.log({row, rowIndex})
-      let className = "";
-      if (row.j_status_name === "结束合作") className = "end-row";
-      // console.log(className)
-      return className;
-    },
-    // 格式化列表数据
-    formatTableData(data) {
-      return data.map(i => ({
-        ...i,
-        payAround: `${i.start_time}<br>${i.end_time}`,
-        pre_send_salary_timeShow: new Date(
-          i.pre_send_salary_time * 1000
-        ).toLocaleDateString()
-      }));
-    },
-    /**
-     * 点击筛选确认
-     */
-    clickSearchConfirm() {
-      this.currentPage = 1;
-      this.getTableData();
+    formatDate(time) {
+      var now = new Date(time * 1000);
+      var year = now.getFullYear();
+      var month = now.getMonth() + 1;
+      var date = now.getDate();
+      var hour = now.getHours();
+      var minute = now.getMinutes();
+      var second = now.getSeconds();
+      return (
+        year +
+        "-" +
+        month +
+        "-" +
+        date +
+        " " +
+        hour +
+        ":" +
+        minute +
+        ":" +
+        second
+      );
     },
     changePageSize(pageSize) {
       this.currentPageSize = pageSize;
-      this.getTableData();
+      // this.getTableData();
     },
-    // 获取列表数据
-    async getTableData() {
-      this.tableData = [];
-      let url = "/api/admin/job/get_all_periods";
-      let body = { page: this.currentPage, page_size: this.currentPageSize };
-      if (this.status) body.j_status = this.status;
-      if (this.period) body.p_status = this.period;
-      if (this.checkUser) body.chk_user = this.checkUser;
-      if (this.jobID) body.job_id = this.jobID;
-      const res = await this.$post(url, body);
-      const data = res.data;
-      this.tableData = this.formatTableData(data.list);
-      this.totalData = data;
-      // // console.log(this.tableData)
-      this.totalCount = Number(data.total);
-      this.totalPage = data.totalPage;
-      this.localData.env = data.current_env;
+    async getFinanceList() {
+      let body = {
+        order_id: this.ids
+      };
+      const res = await this.$post("/api/admin/order/get", body);
+      var data = res.data;
+      this.inforDetail = data;
+      (this.iconUrl = data.user_info.icon_url),
+        (this.nikeName = data.user_info.nickname),
+        (this.status = res.status);
     }
   },
   created() {
-    console.log(this.getUrlParam("id"));
+    // this.ids = this.getUrlParam("id");
+    console.log(this.$route.query.id);
+    this.ids = this.$route.query.id;
   }
 };
 </script>

pages/main/index/orders_frozen.vue

@@ -4,42 +4,10 @@
       <!-- <h3>交易订单中心</h3> -->
       <section>
         <div class="type-boxs">
-          <span class="vsub">订单类型:</span>
-          <div class="inlineb">
-            <el-checkbox-group v-model="orderType" @change="changeOrder" size="mini">
-              <el-checkbox-button v-for="itm in TypeList" :label="itm.id" :key="itm.id">{{itm.type}}</el-checkbox-button>
-            </el-checkbox-group>
-          </div>
-          <div class="inlineb vsub">
-            <span>交易类型：</span>
-            <el-select v-model="status" placeholder="交易类型">
-              <el-option
-                v-for="item of jobStatusList"
-                :key="item.id"
-                :label="item.name"
-                :value="item.id"
-              ></el-option>
-            </el-select>
-          </div>
-        </div>
-        <!-- <div class="type-boxs">
-          <span class="vsub">交易类型:</span>
-          <div class="inlineb">
-            <el-checkbox-group v-model="tradeType" @change="changeTrade" size="mini">
-              <el-checkbox-button
-                v-for="itm in tradeList"
-                :label="itm.id"
-                :key="itm.id"
-              >{{itm.type}}</el-checkbox-button>
-            </el-checkbox-group>
-          </div>
-        </div>-->
-        <div class="type-boxs">
-          <span class="vsub">支付方式:</span>
-          <div class="inlineb">
-            <el-checkbox-group v-model="payType" @change="changePay" size="mini">
-              <el-checkbox-button v-for="itm in payList" :label="itm.id" :key="itm.id">{{itm.type}}</el-checkbox-button>
-            </el-checkbox-group>
+          <div>
+            <span class="marginr30">待解冻金额：880.00</span>
+            <span class="marginr30">冻结订单数：888</span>
+            <span class="marginr30">待解冻订单数：10</span>
           </div>
         </div>
         <div class="type-boxs">
@@ -56,79 +24,33 @@
               :picker-options="pickerOptions2"
             ></el-date-picker>
           </div>
-          <div class="inlineb">
-            <span class>时间类型:</span>
-            <el-select v-model="timeType" placeholder="请选择">
-              <el-option
-                v-for="item in timeOptions"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              ></el-option>
-            </el-select>
-          </div>
-          <div class="inlineb">
-            <span class>状态:</span>
-            <div class="inlineb">
-              <el-select v-model="status" placeholder="项目状态">
-                <el-option
-                  v-for="item of jobStatusList"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
-                ></el-option>
-              </el-select>
-            </div>
-          </div>
-          <el-checkbox v-model="checked">人工财务</el-checkbox>
         </div>
         <div class="type-boxs">
           <div class="inlineb">
-            <span class>编号:</span>
-            <div class="inlineb">
-              <el-input style="width: 230px;" v-model="searchId" placeholder="订单编号/订单名称/支付编号"></el-input>
-            </div>
-          </div>
-          <div class="inlineb">
             <span class>用户:</span>
             <div class="inlineb">
               <el-input style="width: 180px;" v-model="checkUser" placeholder="uid/昵称/姓名"></el-input>
             </div>
           </div>
           <div class="inlineb">
-            <span class>项目:</span>
-            <div class="inlineb">
-              <el-select v-model="status" placeholder="项目状态">
-                <el-option
-                  v-for="item of jobStatusList"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
-                ></el-option>
-              </el-select>
-            </div>
-            <div class="inlineb">
-              <el-input style="width: 100px;" v-model="checkUser" placeholder="项目ID"></el-input>
-            </div>
+            <span class>订单ID:</span>
+            <el-input style="width: 180px;" v-model="checkUser" placeholder="输入订单ID"></el-input>
+          </div>
+          <div class="inlineb">
+            <span class>状态:</span>
+            <el-select v-model="status">
+              <el-option
+                v-for="item of jobStatusList"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              ></el-option>
+            </el-select>
           </div>
 
           <el-button type="primary">筛选</el-button>
           <el-button>导出报表</el-button>
         </div>
-        <div class="type-boxs">
-          <div>
-            <span>订单数量：34000(成功31203)，</span>
-            <span>
-              收入金额：
-              <span class="green">120334元(成功123220元)</span>
-            </span>
-            ,
-            <span>
-              支出金额：
-              <span class="orange">134953元(成功12342元)</span>
-            </span>
-          </div>
-        </div>
       </section>
     </section>
     <!-- <section class="selector-box">
@@ -158,7 +80,7 @@
     <div class>
       <!-- height="250" -->
       <el-table :data="tableData3" border style="width: 100%">
-        <el-table-column label="订单名称">
+        <el-table-column label="项目名称">
           <template slot-scope="scope">
             <!-- @click="clickDev(scope.row.uid)"  -->
             <span class="lblue point">
@@ -167,28 +89,26 @@
           </template>
         </el-table-column>
         <el-table-column prop="name" label="用户"></el-table-column>
-        <el-table-column label="实际金额">
+        <!-- <el-table-column label="实际金额">
           <template slot-scope="scope">
             <span :class="parseInt(scope.row.money)>0?'green':'orange'">{{scope.row.money}}</span>
           </template>
-        </el-table-column>
-        <el-table-column prop="name" label="支付方式"></el-table-column>
-        <el-table-column prop="name" label="订单状态"></el-table-column>
-        <el-table-column prop="name" label="创建时间"></el-table-column>
-        <el-table-column prop="name" label="到账时间"></el-table-column>
-        <el-table-column prop="name" label="订单编号"></el-table-column>
-        <el-table-column prop="name" label="支付编号"></el-table-column>
-        <el-table-column prop="name" width="100" label="订单类型">
+        </el-table-column>-->
+        <el-table-column prop="name" label="关联订单ID"></el-table-column>
+        <el-table-column prop="name" label="类型"></el-table-column>
+        <el-table-column prop="name" label="冻结金额"></el-table-column>
+        <el-table-column prop="name" label="冻结方式"></el-table-column>
+        <el-table-column prop="name" label="创建日期"></el-table-column>
+        <el-table-column prop="name" label="解冻日期"></el-table-column>
+        <!-- <el-table-column prop="name" width="100" label="订单类型">
           <template slot-scope="scope">
             <span v-if="scope.row.state==1" class="state-success state-border">成功</span>
             <span v-if="scope.row.state==2" class="state-wait state-border">待提交</span>
             <span v-if="scope.row.state==3" class="state-load state-border">提交中</span>
             <span v-if="scope.row.state==4" class="state-faile state-border">失败</span>
           </template>
-        </el-table-column>
-        <el-table-column prop="name" label="交易类型"></el-table-column>
-        <el-table-column prop="name" label="关联项目"></el-table-column>
-        <el-table-column prop="name" label="人工"></el-table-column>
+        </el-table-column>-->
+        <el-table-column prop="name" label="当前状态"></el-table-column>
       </el-table>
     </div>
     <div class="order-footer">
@@ -356,7 +276,7 @@ export default {
           {
             text: "全部",
             onClick(picker) {
-              alert("获取全部数据");
+              picker.$emit("pick", []);
             }
           },
           {
@@ -739,7 +659,7 @@ export default {
   display: flex;
   flex-direction: column;
   justify-content: center;
-  height: 270px;
+  height: 160px;
 }
 .selector-box {
   /* margin-top: 10px; */