手动合并 一次性物流信息导入代码

src/components/disposable/index.vue

@@ -19,7 +19,7 @@
           <div class="search-btn-wrapper">
             <el-button type="primary" plain @click="getList">搜索</el-button>
             <!--<el-button v-if="!$store.state.readonly" type="primary" plain @click="downLoad()">excel模板下载</el-button>-->
-            <el-button type="success" plain @click="exportTable" v-if="$store.state.export">导出</el-button>
+            <!--<el-button type="warning" plain v-if="$store.state.import">导入</el-button>-->
             <el-upload
               style="margin-left: 10px;"
               v-if="$store.state.import"
@@ -27,9 +27,11 @@
               :onSuccess="fileSuccess"
               :headers="uploadHeader"
               :data="{param_token:param_token}"
-              action="/api/admin/order/deliver/list/import">
-              <el-button type="success" plain>导入发货信息</el-button>
+              accept="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet,application/vnd.ms-excel"
+              action="/api/admin/deliver/once/import">
+              <el-button type="warning" plain>导入发货信息</el-button>
             </el-upload>
+            <el-button style="margin-left: 10px;" type="success" plain @click="exportTable" v-if="$store.state.export">导出</el-button>
           </div>
         </el-form-item>
       </el-form>
@@ -80,8 +82,8 @@
             <div style="color: #67c23a;">{{scope.row.status|LogisticsStatusFil}}</div>
           </template>
           <!--<template v-if="scope.row.status == 1">-->
-            <template v-if="scope.row.express_name">{{scope.row.express_name}}：</template>
-            <a v-if="scope.row.express_no" :href="`https://m.baidu.com/from=1013755s/s?word=${scope.row.express_no}&sa=tb&ts=2790568&t_kt=0&ie=utf-8&rsv_t=cbe2F%252FT5T3MIzkRl%252Fg8ZUw%252FEPHZmn2wHIrB8cLvgNlEKyyDqUNPrTyDEEDjkAb8&rsv_pq=11793168499026332712&ss=110000000001&tj=1&rqlang=zh&rsv_sug4=4111&inputT=3178&oq=快递单号查询`" target="_blank">{{scope.row.express_no}}</a>
+          <template v-if="scope.row.express_name">{{scope.row.express_name}}：</template>
+          <a v-if="scope.row.express_no" :href="`https://m.baidu.com/from=1013755s/s?word=${scope.row.express_no}&sa=tb&ts=2790568&t_kt=0&ie=utf-8&rsv_t=cbe2F%252FT5T3MIzkRl%252Fg8ZUw%252FEPHZmn2wHIrB8cLvgNlEKyyDqUNPrTyDEEDjkAb8&rsv_pq=11793168499026332712&ss=110000000001&tj=1&rqlang=zh&rsv_sug4=4111&inputT=3178&oq=快递单号查询`" target="_blank">{{scope.row.express_no}}</a>
           <!--</template>-->
         </template>
       </el-table-column>
@@ -170,9 +172,9 @@
       editAddress(row) {
         console.log(row);
         //if (row.status == 1) {
-          this.dialogObj.express_no = row.express_no;
-          this.dialogObj.express_name = row.express_name;
-          this.dialogObj.status = row.status;
+        this.dialogObj.express_no = row.express_no;
+        this.dialogObj.express_name = row.express_name;
+        this.dialogObj.status = row.status;
         //}
         this.dialogObj.receive_address = row.receive_address;
         this.dialogObj.receive_mobile = row.receive_mobile;

src/components/system/role.vue

@@ -48,7 +48,7 @@
                   <el-checkbox v-model="data.classTakeUnlimited" v-if="data.cover ==='2-3'|| data.cover=== '3-1'|| data.cover=== '3-2' || data.cover=== '3-6' || data.cover=== '3-7' ">添加带班班(无限制)</el-checkbox>
                   <el-checkbox v-model="data.distribution" v-if="data.cover ==='5-9'||data.cover ==='7-9'" @change="distribution">批量分配</el-checkbox>
                   <el-checkbox v-model="data.exportFinish" v-if="data.cover === '2-3'">导出完课用户</el-checkbox>
-                  <el-checkbox v-model="data.import" v-if="data.cover ==='6-3'||data.cover ==='5-3'||data.cover ==='5-9'">导入</el-checkbox>
+                  <el-checkbox v-model="data.import" v-if="data.cover ==='6-3'||data.cover ==='5-3'||data.cover ==='5-9'||data.cover ==='6-4'">导入</el-checkbox>
                   <el-checkbox v-model="data.export" v-if="exportMenuList.indexOf(data.cover) >-1">导出</el-checkbox>
                   <el-checkbox v-model="data.readonly">只读</el-checkbox>
                   <el-checkbox v-model="data.delete">删除</el-checkbox>
@@ -128,7 +128,7 @@
                   j.delete = false;
                   if (this.exportMenuList.indexOf(j.cover) > -1) j.export = false;
                   if (j.cover === "5-9" || j.cover === "7-9") j.distribution = false;
-                  if (j.cover === "6-3" || j.cover === "5-3" || j.cover === "5-9") j.import = false;
+                  if (j.cover === "6-3" || j.cover === "5-3" || j.cover === "5-9"|| j.cover === "6-4") j.import = false;
                   if (j.name === '月课订单列表' || j.name === '日课订单列表' || j.name === "来源码管理"
                     || j.cover === "5-9" || j.cover === "2-3" || j.cover === "3-1" || j.cover === '3-2' || j.cover === "3-6" || j.cover === "3-7") j.refund = false;
                   if (j.cover === "2-3" || j.cover === "3-1" || j.cover === '3-2' || j.cover === "3-6" || j.cover === "3-7") {
@@ -179,7 +179,7 @@
                   j.delete = false;
                   if (this.exportMenuList.indexOf(j.cover) > -1) j.export = false;
                   if (j.cover === "5-9" || j.cover === "7-9") j.distribution = false;
-                  if (j.cover === "6-3" || j.cover === "5-3" || j.cover === "5-9") j.import = false;
+                  if (j.cover === "6-3" || j.cover === "5-3" || j.cover === "5-9"|| j.cover === "6-4") j.import = false;
                   if (j.name === '月课订单列表' || j.name === '日课订单列表' || j.name === "来源码管理"
                     || j.cover === "5-9" || j.cover === "2-3" || j.cover === "3-1" || j.cover === '3-2' || j.cover === "3-6" || j.cover === "3-7") j.refund = false;
                   if (j.cover === "2-3" || j.cover === "3-1" || j.cover === '3-2' || j.cover === "3-6" || j.cover === "3-7") {
@@ -219,7 +219,7 @@
                           x.classManageUnlimited = !!i.classManageUnlimited;
                           x.classTakeUnlimited = !!i.classTakeUnlimited;
                         }
-                        if (i.cover === "6-3" || i.cover === "5-3" || i.cover === "5-9") {
+                        if (i.cover === "6-3" || i.cover === "5-3" || i.cover === "5-9"|| i.cover === "6-4") {
                           x.import = !!i.import;
                         }
                         if (i.cover === "5-9" || i.cover === "7-9") {