人工订单bug

pages/main/index/artificial_orders.vue

@@ -6,7 +6,9 @@
     <div class="type-boxs">
       <div class="clear">
         <div class="floatr">
-          <el-button type="primary">新增订单</el-button>
+          <nuxt-link :to="{path:'/main/order_detail'}">
+            <el-button type="primary">新增订单</el-button>
+          </nuxt-link>
           <el-button>导出报表</el-button>
         </div>
       </div>
@@ -26,11 +28,16 @@
             </span>
           </template>
         </el-table-column>
-        <el-table-column prop="uid" label="用户"></el-table-column>
+        <el-table-column label="用户">
+          <template slot-scope="scope">{{scope.row.user_info.nickname}}({{scope.row.uid }})</template>
+        </el-table-column>
         <el-table-column label="实际金额">
           <template slot-scope="scope">
-            <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>
+            <span
+              v-if="parseInt(scope.row.real_amount)>=0"
+              class="green"
+            >+{{scope.row.real_amount/100}}</span>
+            <span v-else class="orange">+{{scope.row.real_amount/100}}</span>
           </template>
         </el-table-column>
         <el-table-column label="收支类型">
@@ -44,7 +51,7 @@
             <span>{{scope.row.order_type_name}}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="product_type_name" width="100" label="订单类型">
+        <el-table-column prop="product_type_name" width="100" label="订单状态">
           <template slot-scope="scope">
             {{scope.row.product_type_name}}
             <!-- order_type -->
@@ -65,13 +72,19 @@
 
         <el-table-column label="关联项目">
           <template slot-scope="scope">
-            <span class="lblue">{{scope.row.related_project_name?related_project_id:"--"}}</span>
+            <a :href="scope.row.related_project.url?scope.row.related_project.url:'#'">
+              <span
+                class="lblue"
+              >{{scope.row.related_project.name?scope.row.related_project.name:"--"}}</span>
+            </a>
           </template>
         </el-table-column>
         <el-table-column label="编辑">
           <template slot-scope="scope">
             <!-- 需求是状态等于“待提交的时候显示”给我一个状态_name 或者是待提交的id -->
-            <span v-if="scope.row.status==0" class="lblue point">编辑</span>
+            <nuxt-link :to="{path:'/main/order_detail?id='+scope.row.id}">
+              <span v-if="scope.row.status==0" class="lblue point">编辑</span>
+            </nuxt-link>
           </template>
         </el-table-column>
       </el-table>

pages/main/index/orders.vue

@@ -113,7 +113,7 @@
           </div>
 
           <el-button type="primary" @click="getFinanceList">筛选</el-button>
-          <el-button>导出报表</el-button>
+          <el-button @click="downFinanceList">导出报表</el-button>
         </div>
         <div class="type-boxs">
           <div>
@@ -168,14 +168,19 @@
             </span>
           </template>
         </el-table-column>
-        <el-table-column prop="uid" label="用户"></el-table-column>
+        <el-table-column label="用户">
+          <template slot-scope="scope">{{scope.row.user_info.nickname}}({{scope.row.uid }})</template>
+        </el-table-column>
         <el-table-column label="实际金额">
           <template slot-scope="scope">
-            <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>
+            <span
+              v-if="parseInt(scope.row.real_amount)>=0"
+              class="green"
+            >+{{scope.row.real_amount/100}}</span>
+            <span v-else class="orange">+{{scope.row.real_amount/100}}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="channel" label="支付方式"></el-table-column>
+        <el-table-column prop="channel_name" label="支付方式"></el-table-column>
         <el-table-column prop="order_state_name" label="订单状态"></el-table-column>
         <el-table-column prop label="创建时间">
           <template slot-scope="scope">
@@ -206,7 +211,11 @@
         </el-table-column>
         <el-table-column label="关联项目">
           <template slot-scope="scope">
-            <span class="lblue">{{scope.row.related_project_name?related_project_id:"--"}}</span>
+            <a :href="scope.row.related_project.url?scope.row.related_project.url:'#'">
+              <span
+                class="lblue"
+              >{{scope.row.related_project.name?scope.row.related_project.name:"--"}}</span>
+            </a>
           </template>
         </el-table-column>
         <el-table-column prop="operator_uid" label="人工"></el-table-column>
@@ -249,7 +258,7 @@ export default {
       orderType: [0],
       tradeType: [0],
       payType: [0],
-      timeType: 1,
+      timeType: 2,
       timeOptions: [
         {
           value: 1,
@@ -703,6 +712,62 @@ export default {
       this.totalPage = data.totalPage;
       this.localData.env = data.current_env;
     },
+    async downFinanceList() {
+      var checkedTF = 0;
+      console.log(this.checked);
+      if (this.checked) {
+        console.log(333);
+        checkedTF = 1;
+      }
+      var arr1 = [];
+      if (this.productType[0] == 0) {
+        arr1 = "";
+      } else {
+        arr1 = this.productType.toString();
+      }
+      var arr2 = [];
+      if (this.payType[0] == 0) {
+        arr2 = "";
+      } else {
+        arr2 = this.payType.toString();
+      }
+
+      var time = 1;
+      if (this.timeType == "") {
+        time = "";
+      } else {
+        time = this.timeType;
+      }
+      var starTime = "";
+      var endTime = "";
+      if (this.timeRange.length) {
+        starTime = this.formatDate(this.timeRange[0] / 1000);
+        endTime = this.formatDate(this.timeRange[1] / 1000);
+      } else {
+        starTime = "";
+        endTime = "";
+      }
+
+      let body = {
+        // 1111
+        product_type: arr1,
+        order_type: this.orderTypes,
+        channel: arr2,
+        start_time: starTime,
+        end_time: endTime,
+        date_type: time,
+        status: this.orderState,
+        artificial_mark: checkedTF,
+        order: this.searchId,
+        user: this.checkUser,
+        // this.productTypes
+        product_id: this.productId,
+
+        page: this.currentPage,
+        page_size: this.currentPageSize
+      };
+      const res = await this.$post("/api/admin/order/export", body);
+    },
     async getFinanceList() {
       var checkedTF = 0;
       console.log(this.checked);

pages/main/index/orders_detail.vue

@@ -18,7 +18,7 @@
           <span
             v-if="inforDetail.real_amount>=0"
             class="detail-pays green font20"
-          >+{{inforDetail.real_amount}}</span>
+          >+{{inforDetail.real_amount/100}}</span>
           <span v-else class="detail-pays orange font20">-¥{{inforDetail.real_amount}}</span>
         </p>
         <p>
@@ -78,11 +78,15 @@
         </p>
         <p>
           <span>关联项目：</span>
-          <span>————</span>
+          <a :href="inforDetail.related_project.url?inforDetail.related_project.url:'#'">
+            <span
+              class="lblue"
+            >{{inforDetail.related_project.name?inforDetail.related_project.name:"--"}}</span>
+          </a>
         </p>
         <p>
           <span>关联订单：</span>
-          <span class="blue">将减肥咖啡|酒店客房</span>
+          <span class="lblue">将减肥咖啡|酒店客房</span>
         </p>
         <p>
           <span>人工财务：</span>
@@ -138,7 +142,7 @@ export default {
       centerDialogVisible: false,
       currentPage: 1,
       currentPageSize: 1,
-      inforDetail: {},
+      inforDetail: { related_project: "" },
       status: 1,
       iconUrl: "",
       nikeName: ""