Alex 9 miesięcy temu
rodzic
commit
1a9316ecfb

+ 4 - 1
src/views/recycleOrder/components/order-page-all.vue

@@ -204,10 +204,12 @@
             >
               [修改地址]
             </el-button>
+
+            <!-- v-if="['8', '9', '10', '11'].includes(row.status)" -->
             <el-button
               type="success"
               link
-              v-if="['8', '9', '10', '11'].includes(row.status)"
+              v-if="row.status > 2"
               v-permission="usePermission('sendSMS')"
               @click="handleSendSMS(row)"
             >
@@ -378,6 +380,7 @@
     },
     { label: '时间', prop: 'time', slot: 'time', minWidth: 210 },
     { label: '备注', prop: 'remarks', slot: 'remarks' },
+    { label: '售后', prop: 'refundStatusName' },
     {
       columnKey: 'action',
       label: '操作',

+ 8 - 4
src/views/recycleOrder/components/order-search.vue

@@ -41,13 +41,18 @@
       type: 'input',
       label: '发件人地址(仅查询7天内数据)',
       prop: 'sendAddressLike',
-      colProps: { span: 5 }
     },
     {
       type: 'input',
       label: '用户名',
       prop: 'userName'
     },
+    {
+      type: 'dictSelect',
+      label: '售后状态',
+      prop: 'refundStatus',
+      props: { code: 'recycle_refund_status' }
+    },
     {
       type: 'autocomplete',
       label: '全部备注',
@@ -66,7 +71,6 @@
       label: '收货仓库',
       prop: 'godownId',
       options: [],
-      colProps: { span: 3 }
     },
     {
       type: 'dictSelect',
@@ -124,13 +128,13 @@
       type: 'input',
       label: '订单编号(多个以中文逗号、空格或换行分割)',
       prop: 'orderIds',
-      colProps: { span: 7 }
+      colProps: { span: 8 }
     },
     {
       type: 'input',
       label: '物流单号(多个以中文逗号、空格或换行分割)',
       prop: 'waybillCodes',
-      colProps: { span: 7 }
+      colProps: { span: 8 }
     }
   ]);
 

+ 2 - 1
src/views/recycleOrder/components/send-SMS.vue

@@ -101,7 +101,8 @@
   const columns = reactive([
     { label: '发送人', prop: 'createName', width: 100 },
     { label: '发送内容', prop: 'smsContent' },
-    { label: '发送时间', prop: 'createTime', width: 160 }
+    { label: '发送时间', prop: 'createTime', width: 120 },
+    { label: '发送状态', prop: 'status', width: 80, formatter: (row) => row.status == 1 ? '成功' : '失败' }
   ]);
 
   /** 关闭弹窗 */

+ 9 - 1
src/views/recycleOrder/detail/order-base-info.vue

@@ -64,7 +64,9 @@
         </div>
         <div class="common-text">
           <el-text>电 话:</el-text>
-          <el-text v-if="!isShowPhone">{{ formatPhone(detail.sendMobile) }}</el-text>
+          <el-text v-if="!isShowPhone">{{
+            formatPhone(detail.sendMobile)
+          }}</el-text>
           <el-text v-else>{{ detail.sendMobile }}</el-text>
         </div>
         <div class="common-text">
@@ -173,6 +175,12 @@
       formatter: (row) =>
         typeof row.finalMoney == 'number' ? '¥' + row.finalMoney : '待核算'
     },
+    {
+      label: '快递重量',
+      prop: 'chargeWeight',
+      width: 120,
+      formatter: (row) => row.chargeWeight ? row.chargeWeight + 'kg' : '-'
+    },
     { label: '下单时间', prop: 'orderTime', slot: 'orderTime', width: 200 },
     { label: '交易状态', prop: 'status', slot: 'status', width: 240 }
   ]);

+ 21 - 0
src/views/recycleOrder/detail/order-book-list.vue

@@ -124,6 +124,7 @@
           style="width: 120px"
           :disabled="!(detail.status == 8 || detail.status == 9)"
           @change="(value) => handleAuditInfo(value, row)"
+          :class="row.sts == 1 ? 'class-green' : 'class-red'"
         >
           <el-radio :value="1">品相良好</el-radio>
           <el-radio :value="2" disabled>品相一般</el-radio>
@@ -564,6 +565,26 @@
     }
   }
 
+  .class-green {
+    :deep(.el-radio.is-checked .el-radio__inner) {
+      background: #399420;
+      border-color: #399420;
+    }
+    :deep(.el-radio__input.is-checked + .el-radio__label) {
+      color: #399420;
+    }
+  }
+
+  .class-red {
+    :deep(.el-radio.is-checked .el-radio__inner) {
+      background: #F56C6C;
+      border-color: #F56C6C;
+    }
+    :deep(.el-radio__input.is-checked + .el-radio__label) {
+      color: #F56C6C;
+    }
+  }
+
   .order-books {
     .action-btns {
       display: flex;