孙一石 增加 售后订单状态

src/utils/timeout_utils.js

@@ -0,0 +1,9 @@
+
+
+
+let time1 = null;
+let time2 = null;
+
+function checktime() {
+
+}

src/views/data/afterSalesOrder/index.vue

@@ -74,15 +74,27 @@
       </el-table-column>
       <el-table-column prop="gameName" label="游戏名称">
       </el-table-column>
-      <el-table-column prop="status" label="售后状态" width="100px">
+      <!--<el-table-column prop="status" label="售后状态" width="100px">-->
+        <!--<template slot-scope="scope">-->
+          <!--<span v-if="scope.row.status=='0'">处理中</span>-->
+          <!--<span v-if="scope.row.status=='1'">处理失败</span>-->
+          <!--<span v-if="scope.row.status=='2'">处理成功</span>-->
+          <!--<span v-if="scope.row.status=='3'">售后已退款</span>-->
+          <!--<span v-if="scope.row.status=='4'">售后已还号</span>-->
+        <!--</template>-->
+      <!--</el-table-column>-->
+      <el-table-column prop="afterorderStatus" label="售后订单状态">
         <template slot-scope="scope">
-          <span v-if="scope.row.status=='0'">处理中</span>
-          <span v-if="scope.row.status=='1'">处理失败</span>
-          <span v-if="scope.row.status=='2'">处理成功</span>
-          <span v-if="scope.row.status=='3'">售后已退款</span>
-          <span v-if="scope.row.status=='4'">售后已还号</span>
+          <span v-if="scope.row.afterorderStatus == null">正常</span>
+          <span v-if="scope.row.afterorderStatus=='0'">处理中</span>
+          <span v-if="scope.row.afterorderStatus=='1'">售后已退款</span>
+          <span v-if="scope.row.afterorderStatus=='2'">售后已解决</span>
+          <span v-if="scope.row.afterorderStatus=='3'">待处理</span>
         </template>
       </el-table-column>
+
+
+
       <el-table-column prop="aftermarketType" label="售后类型">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.after_sales_type" :value="scope.row.aftermarketType"/>

src/views/data/informationReview/index.vue

@@ -964,4 +964,4 @@
 		color: green;
 		margin-right: 5px;
 	}
-</style>
+</style>

src/views/data/money/index.vue

@@ -137,6 +137,14 @@
 					</el-option>
 				</el-select>
 			</el-form-item>
+
+      <el-form-item label="售后订单状态" prop="aftermarketStatus">
+        <el-select v-model="queryParams.afterorderStatus" style="width: 200px" clearable placeholder="售后订单状态">
+          <el-option v-for="(item,index) in dict.type.afterorder_status" :label="item.label" :value="item.value">
+          </el-option>
+        </el-select>
+      </el-form-item>
+
 			<el-form-item v-if="bpLr3" label="付款方式" prop="paymentMethod">
 				<el-select v-model="queryParams.paymentMethod" style="width: 200px" clearable placeholder="请选择付款状方式">
 					<el-option v-for="(item,index) in options12" :label="item.label" :value="item.value">
@@ -318,9 +326,11 @@
 
       <el-table-column prop="afterorderStatus" label="售后订单状态">
         <template slot-scope="scope">
-          <span v-if="scope.row.afterorderStatus=='0' || scope.row.afterorderStatus == null">处理中</span>
+          <span v-if="scope.row.afterorderStatus == null">正常</span>
+          <span v-if="scope.row.afterorderStatus=='0'">处理中</span>
           <span v-if="scope.row.afterorderStatus=='1'">售后已退款</span>
           <span v-if="scope.row.afterorderStatus=='2'">售后已解决</span>
+          <span v-if="scope.row.afterorderStatus=='3'">待处理</span>
         </template>
       </el-table-column>
 
@@ -1881,7 +1891,7 @@
 		getDicts
 	} from "../../../api/system/dict/data";
 	export default {
-		dicts: ['game_platform_mapping', 'after_sales_type'],
+		dicts: ['game_platform_mapping', 'after_sales_type','afterorder_status'],
 		data() {
 			return {
 				userName:'',
@@ -2417,7 +2427,6 @@
 		},
 		methods: {
 			sqSh(item) {
-			  console.log("####",item)
 				const result = this.findObjectById(this.deptOptions1,item.shopId);
 				const result1 = this.gameList.find(res=>res.gameName===item.gameName);
 				this.zhshform = {};

src/views/data/orderDetails/index.vue

@@ -131,7 +131,7 @@
 		    <el-button :loading='loadingTx' type="primary" @click="submitForm2()">确 定</el-button>
 		  </span>
 		</el-dialog>
-		</el-dialog>
+
 		<el-dialog v-if="open3" title="入账明细" :show-close='false' :visible.sync="open3" append-to-body width="1200px">
 			<div>
 				<el-form :inline="true">
@@ -619,7 +619,9 @@
 				this.queryParamsYetjmx.beginTime = '';
 				this.queryParamsYetjmx.endTime = '';
 			},
+      handleClose(){
 
+      }
 
 
 		}
@@ -674,4 +676,4 @@
 		color: green;
 		margin-right: 5px;
 	}
-</style>
+</style>

src/views/data/retrieveDetails/index.vue

@@ -126,6 +126,17 @@
           <span v-if="scope.row.status=='2'">已处理(成功)</span>
         </template>
       </el-table-column>
+
+      <el-table-column prop="afterorderStatus" label="售后订单状态">
+        <template slot-scope="scope">
+          <span v-if="scope.row.afterorderStatus == null">正常</span>
+          <span v-if="scope.row.afterorderStatus=='0'">处理中</span>
+          <span v-if="scope.row.afterorderStatus=='1'">售后已退款</span>
+          <span v-if="scope.row.afterorderStatus=='2'">售后已解决</span>
+          <span v-if="scope.row.afterorderStatus=='3'">待处理</span>
+        </template>
+      </el-table-column>
+
       <el-table-column prop="createBy" label="申报人">
       </el-table-column>
       <el-table-column prop="createTime" label="申报日期">
@@ -265,7 +276,7 @@
               </el-form-item>
 
 
-              <el-form-item label="售后订单状态" prop="status" v-show="form1.paymentId != 0">
+              <el-form-item label="售后订单状态" prop="status">
                 <el-select style="width: 100%" v-model="form1.afterorderStatus" placeholder="请选择状态">
                   <el-option v-for="item in dict.type.afterorder_status" :key="item.value" :label="item.label"
                              :value="item.value">