update: 字段修改

src/views/performance-manage/components/bulk-delivery-dialog.vue

 <template>
-  <el-dialog :visible.sync="visible" title="批量发货" width="510px" @closed="$emit('close')">
-    <div style="display:flex;position:relative">
-      <span style="flex-shrink:0;margin-top:10px"><span style="color:#FF5152;margin-right:5px">*</span>导入文件：</span>
-      <dm-upload-file
-        class="ml10 upload"
-        action="/api-welfare/delivery-order/batch-delivering"
-        :file-list="fileList"
-        :on-success="onSuccess"
-        :limit="1"
-        accept=".xls,.xlsx"
-        with-credentials
-        :headers="uploadHeader"
-        style="display:inline-block;">
-        <span slot="tip"></span>
-        <el-button icon="iconfont-components4 icon-cp-shangc upload-icon">上传</el-button>
-      </dm-upload-file>
-      <el-link class="ml20" style="position:absolute;right:20px;top:10px" type="primary" href="/static/批量发货模板.xlsx">下载批量发货的模版</el-link>
-    </div>
-    <div class="mt10" style="margin-left:90px">
-      成功<span style="color:#2f54eb">{{successCount}}</span>条，失败<span style="color:#F5222d">{{failedCount}}</span>条
-      <el-button class="ml10" type="text" @click="onViewDetail">查看详情</el-button>
-    </div>
-    <el-divider></el-divider>
-    <div style="color:#909399;font-size:12px">1.填入需要发货的发货单号、物流公司名称、物流公司编码、物流单号；</div>
-    <div style="color:#909399;font-size:12px;margin-top:8px">2.仅支持.xlsx .xls的文件导入，最多1000条信息，文件大小不超过2M；</div>
-    <div slot="footer">
-      <el-button @click="visible = false">取消</el-button>
-      <el-button type="primary" @click="handleConfirm">确认</el-button>
-    </div>
-  </el-dialog>
+  <div>
+    <el-dialog :visible.sync="visible" title="批量发货" width="510px" @closed="$emit('close')">
+      <div style="display:flex;position:relative">
+        <span style="flex-shrink:0;margin-top:10px"><span style="color:#FF5152;margin-right:5px">*</span>导入文件：</span>
+        <dm-upload-file
+          class="ml10 upload"
+          action="/api-welfare/delivery-order/batch-delivering"
+          :file-list="fileList"
+          :on-success="onSuccess"
+          :limit="1"
+          accept=".xls,.xlsx"
+          with-credentials
+          :headers="uploadHeader"
+          style="display:inline-block;">
+          <span slot="tip"></span>
+          <el-button icon="iconfont-components4 icon-cp-shangc upload-icon">上传</el-button>
+        </dm-upload-file>
+        <el-link class="ml20" style="position:absolute;right:20px;top:10px" type="primary" href="/static/批量发货模板.xlsx">下载批量发货的模版</el-link>
+      </div>
+      <div class="mt10" style="margin-left:90px">
+        成功<span style="color:#2f54eb">{{successCount}}</span>条，失败<span style="color:#F5222d">{{failedCount}}</span>条
+        <el-button class="ml10" type="text" @click="errorInfoDialog.visible = true">查看详情</el-button>
+      </div>
+      <el-divider></el-divider>
+      <div style="color:#909399;font-size:12px">1.填入需要发货的发货单号、物流公司名称、物流公司编码、物流单号；</div>
+      <div style="color:#909399;font-size:12px;margin-top:8px">2.仅支持.xlsx .xls的文件导入，最多1000条信息，文件大小不超过2M；</div>
+      <div slot="footer">
+        <el-button @click="visible = false">取消</el-button>
+        <el-button type="primary" @click="handleConfirm">确认</el-button>
+      </div>
+    </el-dialog>
+    <el-dialog :visible.sync="errorInfoDialog.visible" title="上传信息" width="510px">
+      <ul>
+        <li style="display:flex" v-for="(item, index) in errorInfos" :key="index">
+          <span>第{{item.line}}行</span>
+          <span class="ml10">{{item.errorMsg}}</span>
+        </li>
+      </ul>
+      <div slot="footer">
+        <el-button type="primary" @click="errorInfoDialog.visible = false">关闭</el-button>
+      </div>
+    </el-dialog>
+  </div>
 </template>
 
 <script>
@@ -44,6 +57,10 @@ export default {
         isControl: true,
       },
       fileList: [],
+      errorInfoDialog: {
+        visible: false
+      },
+      errorInfos: [],
     };
   },
   mounted() {
@@ -65,12 +82,9 @@ export default {
       const { result } = res;
       this.successCount = result.success;
       this.failedCount = result.failure;
-      this.detailMessage = '';
+      this.errorInfos = result.errorInfos || [];
       this.$emit('refresh');
     },
-    onViewDetail() {
-      this.$message.warning(this.detailMessage);
-    }
   }
 };
 </script>

src/views/performance-manage/delivery-detail.vue

@@ -116,6 +116,15 @@ export default {
     };
   },
   created() {
+    this.$emit('updateBread', [
+      {
+        breadName: '发货单处理',
+        breadPath: '/performance/delivery',
+      },
+      {
+        breadName: '发货单详情'
+      }
+    ]);
     this.getDeliveryDetail();
   },
   methods: {

src/views/performance-manage/delivery.vue

@@ -24,6 +24,13 @@ export default {
       count: 0,
     };
   },
+  mounted() {
+    this.$emit('updateBread', [
+      {
+        breadName: '发货单处理'
+      },
+    ]);
+  },
   methods: {
     setCount(value) {
       this.count = value;

src/views/performance-manage/record.vue

@@ -166,6 +166,11 @@ export default {
     };
   },
   created() {
+    this.$emit('updateBread', [
+      {
+        breadName: '履约记录'
+      },
+    ]);
     this.getApplicationList();
     this.getList();
   },
@@ -218,7 +223,8 @@ export default {
       });
     },
     linkToDetail(deliveryId) {
-      this.$router.push({ path: '/performance/delivery-detail', query: { deliveryId } });
+      // this.$router.push({ path: '/performance/delivery-detail', query: { deliveryId } });
+      window.open(`/performance/delivery-detail?deliveryId=${deliveryId}`);
     },
   },
   filters: {

src/views/performance-manage/refund.vue

@@ -78,13 +78,13 @@
                 <div><span>退货说明：</span><span>{{row.refundRemark}}</span></div>
               </template>
               <template v-else-if="row.refundFlag === 1">
-                <div><span>操作人：</span><span>{{row.processTime}}</span></div>
+                <div><span>操作人：</span><span>{{row.refundUserName}}</span></div>
                 <div><span>操作时间：</span><span>{{row.processTime | formatDate}}</span></div>
                 <div><span>退货原因：</span><span>{{row.refundReason}}</span></div>
                 <div><span>退货说明：</span><span>{{row.refundRemark}}</span></div>
               </template>
               <template v-else-if="row.refundFlag === 2">
-                <div><span>操作人：</span><span>{{row.processTime}}</span></div>
+                <div><span>操作人：</span><span>{{row.refundUserName}}</span></div>
                 <div><span>操作时间：</span><span>{{row.processTime | formatDate}}</span></div>
                 <div><span>拒绝原因：</span><span>{{row.refuseReason}}</span></div>
                 <div><span>退货原因：</span><span>{{row.refundReason}}</span></div>
@@ -283,6 +283,11 @@ export default {
     };
   },
   created() {
+    this.$emit('updateBread', [
+      {
+        breadName: '退货单处理'
+      },
+    ]);
     this.getApplicationList();
     this.handleChangeRefundFlag();
   },