Bladeren bron

设备发货管理表格字段缺少补充

刘洋 1 jaar geleden
bovenliggende
commit
aae48ae001

+ 12 - 0
src/assets/icons/icon-device-send.svg

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="20px" height="20px" viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon-设备发货管理</title>
+    <g id="SOP第四期" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="02-设备发货管理" transform="translate(-96, -184)">
+            <g id="icon-设备发货管理" transform="translate(96, 184)">
+                <rect id="backtop-rectangle-(Background)" opacity="0" x="0" y="0" width="20" height="20"></rect>
+                <path d="M16.2487817,2.49862671 C16.9391382,2.49862671 17.4987793,3.05827342 17.4987793,3.74862939 L17.4987793,5.62462671 L17.5,6.875 L17.4987793,6.87462671 L17.4987793,16.2486291 C17.4987793,16.8958383 17.0069041,17.428161 16.3765844,17.4921731 L16.2487793,17.4986267 L3.74877878,17.4986267 C3.05842288,17.4986267 2.4987793,16.938982 2.4987793,16.2486267 L2.4987793,3.74862641 C2.4987793,3.05827051 3.05842578,2.49862671 3.74878168,2.49862671 Z M16.2487793,6.87462671 L3.7487793,6.87462671 L3.748779,16.2486267 L16.2487793,16.2486291 L16.2487793,6.87462671 Z M10.1211812,8.05 L13.5242195,11.5170556 L10.1121218,15.0156122 L9.23651292,14.1235309 L11.1610211,12.1502578 L6.4001049,12.1503311 L6.4,10.8867633 L11.1543883,10.8866899 L9.24842432,8.94487195 L10.1211812,8.05 Z M16.2487817,3.74862909 L3.74878153,3.74862686 L3.7487793,5.62462671 L16.2487793,5.62462671 L16.2487817,3.74862909 Z" id="backtop-rectangle" fill="#165DFF"></path>
+            </g>
+        </g>
+    </g>
+</svg>

+ 1 - 1
src/router/modules/resourceGuard.js

@@ -66,7 +66,7 @@ export default {
             title: '设备发货管理',
             sort: 1,
             alias: 'deviceDelivery',
-            icon: 'device-outin',
+            icon: 'device-send',
           },
         },
         {

+ 45 - 2
src/views/resource-guard/device-guard/device-send/index.vue

@@ -102,10 +102,18 @@
         @select-change="selectChange"
       >
         <template #serviceName="{ row }">
-          {{ row.serviceName || '-' }}
+          {{ row.serviceName || '--' }}
         </template>
         <template #crmNo="{ row }">
-          {{ row.crmNo || '-' }}
+          {{ row.crmNo || '--' }}
+        </template>
+        <template #expressPhotoPath="{ row }">
+          <image-view
+            v-if="row.expressPhotoPath"
+            :width="80"
+            :height="80"
+            :images="[row.expressPhotoPath]"
+          ></image-view>
         </template>
         <template #operate="{ row }">
           <div class="table-operations" @click.stop v-if="row.effect">
@@ -377,6 +385,41 @@ const columns = [
     colKey: 'consignee',
     width: 90,
   },
+  {
+    title: '收件人电话',
+    colKey: 'consigneePhone',
+    width: 110,
+  },
+  {
+    title: '快递单号',
+    colKey: 'expressNo',
+    width: 110,
+  },
+  {
+    title: '快递单截图',
+    colKey: 'expressPhotoPath',
+    width: 110,
+  },
+  {
+    title: '发货状态',
+    colKey: 'statusStr',
+    width: 90,
+  },
+  {
+    title: '发货时间',
+    colKey: 'deliverTimeStr',
+    width: 90,
+  },
+  {
+    title: '发货人',
+    colKey: 'deliverUserName',
+    width: 90,
+  },
+  {
+    title: '签收时间',
+    colKey: 'receiveTimeStr',
+    width: 90,
+  },
   {
     title: '管理',
     colKey: 'operate',