1、整合多店铺生产

.env.development

@@ -2,8 +2,8 @@
 ENV = 'development'
 
 // api接口请求地址
-VUE_APP_BASE_API = 'http://lymall-platform.58for.com/apis'
-//VUE_APP_BASE_API = 'http://127.0.0.1:8088'
+//VUE_APP_BASE_API = 'http://lymall-platform.58for.com/apis'
+VUE_APP_BASE_API = 'http://127.0.0.1:8088'
 
 // 客服api接口请求地址
 //VUE_APP_IM_API = 'https://b2b2c-im.mall4j.com'

src/views/modules/afterSales/returnDelivery.vue

@@ -55,7 +55,7 @@
             </template>
           </el-table-column>
           <!-- 订单号 -->
-          <el-table-column label="订单号" prop="orderNumber" align="center">
+          <el-table-column label="订单号" prop="orderNumber" align="center" width="200">
             <template slot-scope="scope">
               <span>{{ scope.row.orderNumber}}</span>
             </template>

src/views/modules/afterSales/thirdAfterSales.vue

@@ -258,7 +258,7 @@
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button v-if="changeMoney" @click="wxRefundVisible2=false">关闭</el-button>
+        <el-button v-if="changeMoney" @click="wxRefundVisible2=false, wxRefundVisible = false">关闭</el-button>
         <el-button v-else type="primary" @click="handleWxRefund(false)">确认退款</el-button>
       </div>
     </el-dialog>
@@ -342,7 +342,6 @@ export default {
       this.wxRefundBalanceVisible = true;
     },
     beforeRefound (row) {
-      console.log(row)
       this.refoundRow = row
       if (row.refundAmount) {
         this.wxRefundData.orderNumber = row.orderNumber

src/views/modules/order/mergeOrder.vue

@@ -5,7 +5,7 @@
       <el-form
         :inline="true"
         :model="dataForm"
-        @keyup.enter.native="getDataList(this.page)"
+        @keyup.enter.native="userId === 1? getDataList(this.page) : getWaitPrintDeliveryPage(this.page)"
         size="small"
       >
         <div class="input-row">
@@ -160,35 +160,35 @@
         <!-- 导航 -->
         <div class="order-status-nav clearfix">
           <ul class="nav-list clearfix">
-            <li
+            <li v-if="userId === 1"
               :class="['nav-item', activeName == 0 ? 'selected' : '']"
               data-sts="0"
               @click="selectNav($event)"
             >
               全部
             </li>
-            <li
+            <li v-if="userId === 1"
               :class="['nav-item', activeName == 1 ? 'selected' : '']"
               data-sts="1"
               @click="selectNav($event)"
             >
               {{ $t('order.pendingPayment') }}
             </li>
-            <li
+            <li v-if="userId === 1"
               :class="['nav-item', activeName == 3 ? 'selected' : '']"
               data-sts="3"
               @click="selectNav($event)"
             >
               {{ $t('order.pendingReceipt') }}
             </li>
-            <li
+            <li v-if="userId === 1"
               :class="['nav-item', activeName == 5 ? 'selected' : '']"
               data-sts="5"
               @click="selectNav($event)"
             >
               {{ $t('order.successfulTransaction') }}
             </li>
-            <li
+            <li v-if="userId === 1"
               :class="['nav-item', activeName == 6 ? 'selected' : '']"
               data-sts="6"
               @click="selectNav($event)"
@@ -202,7 +202,7 @@
             >
               {{ $t("group.waitGroup") }}
             </li>-->
-            <li
+            <li v-if="userId === 1"
               :class="['nav-item', activeName == 8 ? 'selected' : '']"
               data-sts="8"
               @click="selectNav($event)"
@@ -858,6 +858,7 @@
   export default {
     data () {
       return {
+        userId: this.$store.state.user.id,
         // 是否全选
         skuList: [{key: 'yxk', label: '圆角小卡', value: '圆角小卡'},
           {key: 'zjxk', label: '直角小卡', value: '直角小卡'},
@@ -1060,7 +1061,11 @@
       this.status = this.sts === 0 ? null : Number(this.sts)
 
       // 携带参数查询
-      this.getDataList(this.page, this.$route.query)
+      if(this.userId === 1){
+        this.getDataList(this.page, this.$route.query)
+      }else{
+        this.getWaitPrintDeliveryPage(this.page, this.$route.query)
+      }
 
       // 请求物流公司
       this.getLogisticsList()
@@ -1069,7 +1074,11 @@
       // 携带参数查询
       var query = this.$route.query
       if (Object.keys(query).length > 0) {
-        this.getDataList(this.page, query)
+        if(this.userId === 1){
+          this.getDataList(this.page, query)
+        }else{
+          this.getWaitPrintDeliveryPage(this.page, query)
+        }
       }
     },
     mounted () {
@@ -1098,7 +1107,11 @@
         } else if (this.status == 10) {
           this.getWaitNormalPrintPage(this.page)
         } else {
-          this.getDataList(this.page)
+          if(this.userId === 1){
+            this.getDataList(this.page)
+          }else{
+            this.getWaitPrintDeliveryPage(this.page)
+          }
         }
         // this.getDataList(this.page, null, 0, newData)
       },
@@ -1156,7 +1169,11 @@
               data: _this.$http.adornData(dataBody)
             }).then(({data}) => {
               _this.$message.success('下单确认成功')
-              _this.getDataList(this.page)
+              if(this.userId === 1){
+                _this.getDataList(this.page)
+              }else{
+                this.getWaitPrintDeliveryPage(this.page)
+              }
             })
           })
         }
@@ -1682,7 +1699,11 @@
       sizeChangeHandle (val) {
         this.page.pageSize = val
         this.page.currentPage = 1
-        this.getDataList(this.page)
+        if(this.userId === 1){
+          this.getDataList(this.page)
+        }else{
+          this.getWaitPrintDeliveryPage(this.page)
+        }
       },
       // 当前页
       currentChangeHandle (val) {
@@ -1696,7 +1717,11 @@
         } else if (this.status == 10) {
           this.getWaitNormalPrintPage(this.page)
         } else {
-          this.getDataList(this.page)
+          if(this.userId === 1){
+            this.getDataList(this.page)
+          }else{
+            this.getWaitPrintDeliveryPage(this.page)
+          }
         }
       },
 
@@ -1715,7 +1740,11 @@
         } else if (this.status == 10) {
           this.getWaitNormalPrintPage(this.page)
         } else {
-          this.getDataList(this.page)
+          if(this.userId === 1){
+            this.getDataList(this.page)
+          }else{
+            this.getWaitPrintDeliveryPage(this.page)
+          }
         }
       },
       // 多选
@@ -1725,7 +1754,11 @@
       orderStatus (val) {
         this.status = val
         this.activeName = val + ''
-        this.getDataList(this.page)
+        if(this.userId === 1){
+          this.getDataList(this.page)
+        }else{
+          this.getWaitPrintDeliveryPage(this.page)
+        }
       },
       /**
        * 根据选项设置时间
@@ -1802,9 +1835,13 @@
             this.$message({
               message: this.$i18n.t('publics.operation'),
               type: 'success',
-              duration: 1500,
+              duration: 500,
               onClose: () => {
-                this.getDataList(this.page)
+                if(this.userId === 1){
+                  this.getDataList(this.page)
+                }else{
+                  this.getWaitPrintDeliveryPage(this.page)
+                }
               }
             })
           })
@@ -1818,7 +1855,7 @@
         })
       },
       getWaitingConsignmentExcel () {
-        this.getDataList(this.page)
+        // this.getDataList(this.page)
       },
       uploadSpu () {
         this.dataForm.startTime = this.dateRange === null ? null : this.dateRange[0]
@@ -1856,7 +1893,11 @@
         } else if (this.status === 10) {
           this.getWaitNormalPrintPage(this.page, null, newData)
         } else {
-          this.getDataList(this.page, null, newData)
+          if(this.userId === 1){
+            this.getDataList(this.page, null, newData)
+          }else{
+            this.getWaitPrintDeliveryPage(this.page, null, newData)
+          }
         }
       },
       /**

src/views/modules/order/order.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="mod-order-order">
     <div class="search-bar">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList(this.page)" size="small">
+      <el-form :inline="true" :model="dataForm" size="small">
         <div class="input-row">
           <!-- &nbsp;&nbsp;&nbsp; -->
           <el-form-item :label="this.$i18n.t('order.number') + '：'">
@@ -42,6 +42,16 @@
 <!--              -->
             </template>
           </el-form-item>
+          <el-form-item label="审阅状态" :label-width=" lang === 'en' ? '145px' : '85px'">
+            <el-select
+              v-model="dataForm.auditStatus"
+              clearable
+              placeholder="审阅状态"
+              size="small">
+              <el-option key="1" label="已审阅" value="1"></el-option>
+              <el-option key="0" label="待审阅" value="0"></el-option>
+            </el-select>
+          </el-form-item>
           <el-form-item label="是否推广:" :label-width="lang === 'en' ? '145px' : '85px'">
             <el-select v-model="dataForm.isPromotion" clearable placeholder="是否推广" size="small">
               <el-option key="1" label="是" value="1"></el-option>
@@ -170,29 +180,29 @@
         <!-- 导航 -->
         <div class="order-status-nav clearfix">
           <ul class="nav-list clearfix">
-            <li :class="['nav-item', sts == 0 ? 'selected' : '']" data-sts="0" @click="selectNav($event)">
+            <li v-if="userId === 1" :class="['nav-item', sts == 0 ? 'selected' : '']" data-sts="0" @click="selectNav($event)">
               {{ $t("date.a") }}
             </li>
-             <li :class="['nav-item', sts == 1 ? 'selected' : '']" data-sts="1" @click="selectNav($event)">
+             <li v-if="userId === 1" :class="['nav-item', sts == 1 ? 'selected' : '']" data-sts="1" @click="selectNav($event)">
               {{ $t("order.pendingPayment") }}
             </li>
-            <li :class="['nav-item', sts == 2 ? 'selected' : '']" data-sts="2" @click="selectNav($event)">
+            <li v-if="userId === 1" :class="['nav-item', sts == 2 ? 'selected' : '']" data-sts="2" @click="selectNav($event)">
               {{ $t("order.toBeShipped") }}
             </li>
-            <li :class="['nav-item', sts == 3 ? 'selected' : '']" data-sts="3" @click="selectNav($event)">
+            <li v-if="userId === 1" :class="['nav-item', sts == 3 ? 'selected' : '']" data-sts="3" @click="selectNav($event)">
               {{ $t("order.pendingReceipt") }}
             </li>
-            <li :class="['nav-item', sts == 5 ? 'selected' : '']" data-sts="5" @click="selectNav($event)">
+            <li  v-if="userId === 1" :class="['nav-item', sts == 5 ? 'selected' : '']" data-sts="5" @click="selectNav($event)">
               {{ $t("order.successfulTransaction") }}
             </li>
-            <li :class="['nav-item', sts == 6 ? 'selected' : '']" data-sts="6" @click="selectNav($event)">
+            <li v-if="userId === 1" :class="['nav-item', sts == 6 ? 'selected' : '']" data-sts="6" @click="selectNav($event)">
               {{ $t("order.transactionFailed") }}
             </li>
             <!-- <li :class="['nav-item', sts == 7 ? 'selected' : '']" data-sts="7" @click="selectNav($event)">
               {{ $t("group.waitGroup") }}
             </li> -->
-            <li :class="['nav-item', sts == 8 ? 'selected' : '']" data-sts="8" @click="selectNav($event)">
-              定制待打印
+            <li v-if="userId === 1" :class="['nav-item', sts == 8 ? 'selected' : '']" data-sts="8" @click="selectNav($event)">
+              定制未生成PDF
             </li>
             <li :class="['nav-item', sts == 9 ? 'selected' : '']" data-sts="9" @click="selectNav($event)">
               定制待发货
@@ -544,17 +554,17 @@
       :current-page="page.currentPage" :page-sizes="[10, 20, 50, 100]" :page-size="page.pageSize" :total="page.total"
       layout="total, sizes, prev, pager, next, jumper"></el-pagination>
     <!-- 弹窗, 新增 / 修改 -->
-    <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+    <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="userId === 1? getDataList: getWaitPrintDeliveryPage"></add-or-update>
     <orderAmount-update
       v-if="orderAmountUpdateVisible"
       ref="orderAmountUpdate"
-      @refreshOrderAmountUpdate="getDataList"
+      @refreshOrderAmountUpdate="userId === 1? getDataList: getWaitPrintDeliveryPage"
     ></orderAmount-update>
     <order-info ref="orderInfo"></order-info>
     <order-delivery-update
       v-if="devyVisible"
       ref="orderDeliveryUpdate"
-      @refreshOrderDeliveryUpdate="getDataList"
+      @refreshOrderDeliveryUpdate="userId === 1? getDataList: getWaitPrintDeliveryPage"
     ></order-delivery-update>
   </div>
 </template>
@@ -570,6 +580,7 @@ import {downloadXls} from "@/utils/excel"
 export default {
   data() {
     return {
+      userId: this.$store.state.user.id,
       devyVisible: false,
       skuList: [{key: 'yxk', label: '圆角小卡', value: '圆角小卡'},
         {key: 'zjxk', label: '直角小卡', value: '直角小卡'},
@@ -617,7 +628,7 @@ export default {
       },
         {
           value: 8,
-          label: '定制待打印'
+          label: '定制未生成PDF'
         },
         {
           value: 9,
@@ -735,27 +746,36 @@ export default {
     this.status = this.sts === 0 ? null : this.sts
 
     // 携带参数查询
-    this.getDataList(this.page, this.$route.query)
+    if(this.userId === 1){
+      this.getDataList(this.page, this.$route.query)
+    }else{
+      this.getWaitPrintDeliveryPage(this.page, this.$route.query)
+    }
+
   },
   activated() {
     // 携带参数查询
     var query = this.$route.query
     if (Object.keys(query).length > 0) {
-      this.getDataList(this.page, query)
+      if(this.userId === 1){
+        this.getDataList(this.page, query)
+      }else{
+        this.getWaitPrintDeliveryPage(this.page, query)
+      }
     }
   },
   mounted() {
     // 监听页面滚动
     this.getShopList()
-    window.addEventListener('scroll', this.scrollToTop)
+    // window.addEventListener('scroll', this.scrollToTop)
   },
   methods: {
     shopColor (name) {
       if (name.indexOf('玲珑') > -1) {
         return '#51d99d'
       }
-      if (name.indexOf('闪电') > -1) {
-        return '#87D2F1'
+      if (name.indexOf('易卡') > -1) {
+        return '#FB4A73'
       }
       if (name.indexOf('吃货堂') > -1) {
         return '#f49885'
@@ -766,8 +786,8 @@ export default {
       if (name.indexOf('饭团') > -1) {
         return '#6C96EB'
       }
-      if (name.indexOf('映卡') > -1) {
-        return '#9694fa'
+      if (name.indexOf('娱糖') > -1) {
+        return '#4DAE83'
       }
       if (name.indexOf('中二') > -1) {
         return '#FAC33A'
@@ -878,7 +898,11 @@ export default {
             data:_this.$http.adornData(dataBody)
           }).then(({ data }) => {
             _this.$message.success("下单确认成功")
-            _this.getDataList(this.page)
+            if(this.userId === 1){
+              _this.getDataList(this.page)
+            }else{
+              this.getWaitPrintDeliveryPage(this.page)
+            }
           })
         });
       }
@@ -1009,7 +1033,11 @@ export default {
     sizeChangeHandle(val) {
       this.page.pageSize = val
       this.page.currentPage = 1
-      this.getDataList(this.page, {}, 1)
+      if(this.userId === 1){
+        this.getDataList(this.page, {}, 1)
+      }else{
+        this.getWaitPrintDeliveryPage(this.page, {}, 1)
+      }
     },
     // 当前页
     currentChangeHandle(val) {
@@ -1023,7 +1051,12 @@ export default {
       } else if (this.status === 10) {
         this.getWaitNormalPrintPage(this.page)
       } else {
-        this.getDataList(this.page)
+        if(this.userId === 1){
+          this.getDataList(this.page);
+        }else{
+          this.getWaitPrintDeliveryPage(this.page)
+        }
+
       }
     },
 
@@ -1043,7 +1076,11 @@ export default {
       } else if (this.status == 10) {
         this.getWaitNormalPrintPage(this.page)
       } else {
-        this.getDataList(this.page)
+        if(this.userId === 1){
+          this.getDataList(this.page)
+        }else{
+          this.getWaitPrintDeliveryPage(this.page)
+        }
       }
     },
     // 多选
@@ -1059,14 +1096,22 @@ export default {
       } else if (this.status == 10) {
         this.getWaitNormalPrintPage(this.page)
       } else {
-        this.getDataList(this.page)
+        if(this.userId === 1){
+          this.getDataList(this.page)
+        }else{
+          this.getWaitPrintDeliveryPage()
+        }
       }
       // this.getDataList(this.page, null, 0, newData)
     },
     orderStatus(val) {
       this.status = val
       this.sts = val
-      this.getDataList()
+      if(this.userId === 1){
+        this.getDataList()
+      }else{
+        this.getWaitPrintDeliveryPage()
+      }
     },
     /**
      * 根据选项设置时间
@@ -1281,9 +1326,13 @@ export default {
           this.$message({
             message: this.$i18n.t('remindPop.succeeded'),
             type: 'success',
-            duration: 1500,
+            duration: 500,
             onClose: () => {
-              this.getDataList(this.page)
+              if(this.userId === 1){
+                this.getDataList(this.page)
+              }else{
+                this.getWaitPrintDeliveryPage(this.page)
+              }
             }
           })
         })
@@ -1321,7 +1370,11 @@ export default {
       } else if (this.status === 10) {
         this.getWaitNormalPrintPage(this.page, null, newData)
       } else {
-        this.getDataList(this.page, null, newData)
+        if(this.userId === 1){
+          this.getDataList(this.page, null, newData)
+        }else{
+          this.getWaitPrintDeliveryPage(this.page, null, newData)
+        }
       }
     },
     getSoldExcel() {

src/views/modules/order/orderInfo.vue

@@ -422,6 +422,7 @@
                   <div class="res" v-if="dataForm.printStatus == 0">未生成</div>
                   <div class="res" style="color: green;font-weight: bold" v-if="dataForm.printStatus == 1">已生成</div>
                   <div class="res" style="color: red;font-weight: bold" v-if="dataForm.printStatus == 2">生成失败</div>
+                  <div class="res" style="color: green;font-weight: bold" v-if="dataForm.printStatus == 3">已发货</div>
                   <div class="res" style="color: orange;font-weight: bold" v-if="dataForm.printStatus == 5">生成中</div>
                   <div class="res" style="color: orange;font-weight: bold" v-if="dataForm.printStatus == 6">已扫码</div>
                 </div>
@@ -437,31 +438,31 @@
                   </el-col> 提前注释-->
 
             </el-row>
-            <el-row>
-              <el-col :span="24">
+            <el-row :gutter="20">
+              <el-col :span="16">
                 <div class="item">
                   <div class="text">PDF文件：</div>
-                  <el-link v-if="dataForm.printStatus === 1 || dataForm.printStatus === 6" type="primary" :underline="false"
+                  <el-link v-if="!!pdfInfo && !!pdfInfo.pdfUrl" type="primary" :underline="false"
                     :href="resourcesUrl + pdfInfo.pdfUrl" target="_blank">查看文件</el-link>
                   <el-button type="primary" size="mini" @click="generatePdf">生成PDF</el-button>
                 </div>
               </el-col>
-
-              <!--<el-col :span="12">
-                    <div class="item" style="width:320px;">
-                      <div class="text">审阅状态：</div>
-                      <el-button v-if="dataForm.auditStatus==0" type="warning" size="mini" style="margin-right: 20px" @click="handleAuditStatus(dataForm.orderNumber)">待审阅</el-button>
-                      <el-button v-else-if="dataForm.auditStatus==1" type="success" size="mini" style="margin-right: 20px" @click="handleAuditStatus(dataForm.orderNumber)">已审阅</el-button>
-                      <el-button v-else type="warning" size="mini" style="margin-right: 20px" @click="handleAuditStatus(dataForm.orderNumber)">待审阅</el-button>
-                    </div>
-                  </el-col> 提前注释-->
-
+              <el-col :span="8">
+                <div class="item" style="width:320px;">
+                  <div class="text">审阅状态：</div>
+                  <el-button v-if="dataForm.auditStatus==0" type="warning" size="mini" style="margin-right: 20px" @click="handleAuditStatus(dataForm.orderNumber)">待审阅</el-button>
+                  <el-button v-else-if="dataForm.auditStatus==1" type="success" size="mini" style="margin-right: 20px" @click="handleAuditStatus(dataForm.orderNumber)">已审阅</el-button>
+                  <el-button v-else type="warning" size="mini" style="margin-right: 20px" @click="handleAuditStatus(dataForm.orderNumber)">待审阅</el-button>
+                </div>
+              </el-col>
             </el-row>
             <el-row>
               <el-col :span="24">
                 <div class="item">
-                  <div class="item" style="width:360px;">物流信息：{{ dataForm.logisticName }} | {{ dataForm.deliveryCode }}
+                  <div v-if="dataForm.deliveryExpresses.length > 0">
+                    <div class="item" style="width:360px;">物流信息：{{ dataForm.deliveryExpresses[0].deliveryDto.companyName }} | {{ dataForm.deliveryExpresses[0].deliveryDto.dvyFlowId }}</div>
                   </div>
+                  <div v-else class="item" style="width:360px;">物流信息：</div>
 <!--                  <el-button type="primary" size="mini" v-if="orderStatus == 2" @click="openDeliveryDialog">发货</el-button>-->
                 </div>
               </el-col>
@@ -737,6 +738,27 @@ export default {
     // this.init()
   },
   methods: {
+    handleAuditStatus(orderNumber){
+      this.$http({
+        url: this.$http.adornUrl('/platform/order/auditStatus/' + orderNumber),
+        method: 'post',
+      }).then(({ data }) => {
+        if(data.status === "success"){
+          this.$message({
+            message: data.msg,
+            type: 'success'
+          });
+          this.dataForm.auditStatus = this.dataForm.auditStatus == 0 || this.dataForm.auditStatus == null? 1:0;
+          let auditStatusReturn = {auditStatus: this.dataForm.auditStatus, orderNumber: orderNumber};
+          this.$emit('orderAuditStatusUpdate', auditStatusReturn)
+        }else{
+          this.$message({
+            message: data.msg,
+            type: 'error'
+          })
+        }
+      })
+    },
     modifyBuyerRemarks(){
       this.$http({
         url: this.$http.adornUrl('/platform/order/modifyRemarks'),