孙一石 增加 售后订单状态

src/views/data/afterSalesOrder/index.vue

@@ -573,15 +573,7 @@
         }, {
           value: '2',
           label: '处理成功'
-        },
-          {
-            value: '3',
-            label: '售后已退款'
-          },
-          {
-            value: '4',
-            label: '售后已还号'
-          }],
+        }],
         gameList: [],
         deptOptions: [],
         tableData: [],

src/views/data/money/index.vue

@@ -315,16 +315,26 @@
 						v-if="scope.row.paymentStatus=='DH'&&bpLr3">已驳回</span>
 				</template>
 			</el-table-column>
-			<el-table-column prop="aftermarketStatus" label="售后状态">
-				<template slot-scope="scope">
-					<span v-if="scope.row.aftermarketStatus=='0'">处理中</span>
-					<span v-if="scope.row.aftermarketStatus=='1'">处理失败</span>
-					<span v-if="scope.row.aftermarketStatus=='2'">处理成功</span>
-          <span v-if="scope.row.aftermarketStatus=='3'">售后已退款</span>
-          <span v-if="scope.row.aftermarketStatus=='4'">售后已还号</span>
-					<span v-if="scope.row.aftermarketStatus==null">正常</span>
-				</template>
-			</el-table-column>
+
+      <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=='1'">售后已退款</span>
+          <span v-if="scope.row.afterorderStatus=='2'">售后已解决</span>
+        </template>
+      </el-table-column>
+
+
+			<!--<el-table-column prop="aftermarketStatus" label="售后状态">-->
+      <!--<template slot-scope="scope">-->
+        <!--<span v-if="scope.row.aftermarketStatus=='0'">处理中</span>-->
+        <!--<span v-if="scope.row.aftermarketStatus=='1'">处理失败</span>-->
+        <!--<span v-if="scope.row.aftermarketStatus=='2'">处理成功</span>-->
+        <!--<span v-if="scope.row.aftermarketStatus=='3'">售后已退款</span>-->
+        <!--<span v-if="scope.row.aftermarketStatus=='4'">售后已还号</span>-->
+        <!--<span v-if="scope.row.aftermarketStatus==null">正常</span>-->
+      <!--</template>-->
+    <!--</el-table-column>-->
 
 			<el-table-column v-if="bpLr3" key="paymentMethod" prop="paymentMethod" label="付款方式">
 				<template slot-scope="scope">
@@ -2358,14 +2368,7 @@
 				}, {
 					value: '2',
 					label: '处理成功'
-				},{
-          value: '3',
-          label: '售后已退款'
-        },
-          {
-            value: '4',
-            label: '售后已还号'
-          }
+				}
 
         ],
 				options5: [{
@@ -2414,6 +2417,7 @@
 		},
 		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/retrieveDetails/index.vue

@@ -139,6 +139,16 @@
       <el-table-column prop="remark" label="备注">
       </el-table-column>
 
+      <el-table-column  label="是否已支付">
+        <template slot-scope="scope">
+          <div v-if="scope.row.paymentId != 0" style="background: #00ff00;">
+            是
+          </div>
+        </template>
+      </el-table-column>
+
+
+
       <el-table-column label="操作" align="center" width="200px" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button type="primary" v-hasPermi="['system:gameAftermarket:edit']"
@@ -253,15 +263,20 @@
                   </el-option>
                 </el-select>
               </el-form-item>
-            </el-col>
 
-            <el-col :span="12">
-              <el-form-item label="订单编号" prop="paymentId">
-                <el-input v-model="form1.paymentId"></el-input>
+
+              <el-form-item label="售后订单状态" prop="status" v-show="form1.paymentId != 0">
+                <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">
+                  </el-option>
+                </el-select>
               </el-form-item>
-              (说明：填入订单编号，用户追踪订单，当售后状态为“售后已退款”是，改变状态为“已退款”)，
-              当找到下订单页面或接口时，就可以自动带入这个数据了，详细咨询（孙一石）
+
+
             </el-col>
+
+
             <!-- <el-col :span="12" v-if="title=='修改找回信息'">
                             <el-form-item label="申报人" prop="createName">
                                 <el-input v-model="form1.createName" placeholder="请输入申报人" />
@@ -276,6 +291,7 @@
               <el-form-item label="备注" prop="remark">
                 <el-input v-model="form1.remark" placeholder="请输入备注"/>
               </el-form-item>
+
             </el-col>
           </el-row>
           <el-row>
@@ -290,7 +306,7 @@
                   </div>
                 </div>
                 <el-upload ref="upload" :action="uploadImgUrl" list-type="picture-card"
-                           :before-upload="beforeAvatarUpload" :on-success="handleAvatarSuccess"
+                           :on-success="handleAvatarSuccess"
                            :on-remove="handleRemove" :on-change="changeUpload" :show-file-list="true"
                            accept="image/png, image/jpeg, application/pdf" :multiple="true" :headers="headers">
                 </el-upload>
@@ -314,7 +330,7 @@
     <!-- 处理进度 -->
     <el-dialog title="处理进度" :visible.sync="cljd" width="80%">
       <div>
-        <el-form ref="form3" :model="form3" :rules="rules3" label-width="120px">
+        <el-form ref="form3" :model="form3" label-width="120px">
           <el-row>
             <el-col :span="12">
               <el-form-item label="进度类型" prop="status">
@@ -510,7 +526,7 @@
 
   export default {
 
-    dicts: ['pallet_type', 'service_name', 'collection_source', 'after_sales_type'],
+    dicts: ['pallet_type', 'service_name', 'collection_source', 'after_sales_type', 'afterorder_status'],
     data() {
       var checkPhone = (rule, value, callback) => { // 手机号验证
         if (!value) {
@@ -803,15 +819,7 @@
         }, {
           value: '2',
           label: '已处理(成功)'
-        },
-          {
-            value: '3',
-            label: '售后已退款'
-          },
-          {
-            value: '4',
-            label: '售后已还号'
-          }
+        }
         ],
         gameList: [],
         deptOptions: [],