Merge remote-tracking branch 'origin/yjb_ScrmStores' into yjb_ScrmStores

# Conflicts:
#	src/views/hisStore/components/productOrder.vue

src/api/hisStore/storeOrder.js

@@ -34,10 +34,11 @@ export function listPromotionOrder(query) {
   })
 }
 // 查询健康商城订单列表
-export function listHealthStoreOrder(query) {
+export function listHealthStoreOrder(query, param) {
   return request({
     url: '/store/store/storeOrder/healthList',
     method: 'post',
+    params: param,
     data: query
   })
 }

src/views/hisStore/components/productAfterSalesOrder.vue

@@ -68,16 +68,16 @@
                   <el-tag  v-for="(item, index) in salesStatusOptions"    v-if="afterSales.salesStatus==item.dictValue" >{{item.dictLabel}}</el-tag>
                 </span>
             </el-descriptions-item>
-          <el-descriptions-item label="溯源码"  >
-               <span v-if="afterSales!=null">
-                  {{afterSales.verifyCode}}
-                </span>
-          </el-descriptions-item>
-          <el-descriptions-item label="产品批号"  >
-               <span v-if="afterSales!=null">
-                  {{afterSales.batchNumber}}
-                </span>
-          </el-descriptions-item>
+<!--          <el-descriptions-item label="溯源码"  >-->
+<!--               <span v-if="afterSales!=null">-->
+<!--                  {{afterSales.verifyCode}}-->
+<!--                </span>-->
+<!--          </el-descriptions-item>-->
+<!--          <el-descriptions-item label="产品批号"  >-->
+<!--               <span v-if="afterSales!=null">-->
+<!--                  {{afterSales.batchNumber}}-->
+<!--                </span>-->
+<!--          </el-descriptions-item>-->
         </el-descriptions>
         <div style="margin: 20px 0px">
           <span class="font-small">收货信息</span>
@@ -133,14 +133,24 @@
               <p>{{JSON.parse(scope.row.jsonInfo).barCode}}</p>
             </template>
           </el-table-column>
-          <el-table-column label="商品组合编码" width="300" align="center">
+<!--          <el-table-column label="商品组合编码" width="300" align="center">-->
+<!--            <template slot-scope="scope">-->
+<!--              <p>{{JSON.parse(scope.row.jsonInfo).groupBarCode}}</p>-->
+<!--            </template>-->
+<!--          </el-table-column>-->
+          <el-table-column label="商品名称" width="300" align="center">
             <template slot-scope="scope">
-              <p>{{JSON.parse(scope.row.jsonInfo).groupBarCode}}</p>
+              <p>{{JSON.parse(scope.row.jsonInfo).productName}}</p>
             </template>
           </el-table-column>
-          <el-table-column label="商品名称" width="300" align="center">
+          <el-table-column label="溯源码" width="300" align="center">
             <template slot-scope="scope">
-              <p>{{JSON.parse(scope.row.jsonInfo).productName}}</p>
+              <p>{{scope.row.verifyCode}}</p>
+            </template>
+          </el-table-column>
+          <el-table-column label="批次号" width="300" align="center">
+            <template slot-scope="scope">
+              <p>{{scope.row.batchNumber}}</p>
             </template>
           </el-table-column>
           <el-table-column label="单价" width="240" align="center">

src/views/hisStore/components/productOrder.vue

@@ -193,16 +193,16 @@
                   {{order.merchantReply}}
                 </span>
             </el-descriptions-item>
-        <el-descriptions-item label="溯源码"  >
-               <span v-if="order!=null">
-                  {{order.verifyCode}}
-                </span>
-        </el-descriptions-item>
-        <el-descriptions-item label="产品批号"  >
-               <span v-if="order!=null">
-                  {{order.batchNumber}}
-                </span>
-        </el-descriptions-item>
+<!--        <el-descriptions-item label="溯源码"  >-->
+<!--               <span v-if="order!=null">-->
+<!--                  {{order.verifyCode}}-->
+<!--                </span>-->
+<!--        </el-descriptions-item>-->
+<!--        <el-descriptions-item label="产品批号"  >-->
+<!--               <span v-if="order!=null">-->
+<!--                  {{order.batchNumber}}-->
+<!--                </span>-->
+<!--        </el-descriptions-item>-->
       </el-descriptions>
       <div style="margin: 20px 0px"  v-if="order!=null && certificates != null">
         <span class="font-small">
@@ -238,11 +238,22 @@
             <p>{{JSON.parse(scope.row.jsonInfo).barCode}}</p>
           </template>
         </el-table-column>
-        <el-table-column label="商品组合编码" width="300" align="center">
+<!--        <el-table-column label="商品组合编码" width="300" align="center">-->
+<!--          <template slot-scope="scope">-->
+<!--            <p>{{JSON.parse(scope.row.jsonInfo).groupBarCode}}</p>-->
+<!--          </template>-->
+<!--        </el-table-column>-->
+        <el-table-column label="商品名称" width="300" align="center">
+          <template slot-scope="scope">
+            <p>{{JSON.parse(scope.row.jsonInfo).productName}}</p>
+          </template>
+        </el-table-column>
+        <el-table-column label="溯源码" width="300" align="center">
           <template slot-scope="scope">
-            <p>{{JSON.parse(scope.row.jsonInfo).groupBarCode}}</p>
+            <p>{{scope.row.verifyCode}}</p>
           </template>
         </el-table-column>
+        <el-table-column label="批次号" width="300" align="center">
 
         <el-table-column label="商品名称" width="300" align="center">
           <template slot-scope="scope">
@@ -259,6 +270,7 @@
         <el-table-column label="产品技术要求编号" width="180" align="center">
           <template slot-scope="scope">
             {{ JSON.parse(scope.row.jsonInfo).prodTechReqNo || '-' }}
+            <p>{{scope.row.batchNumber}}</p>
           </template>
         </el-table-column>
 

src/views/hisStore/storeOrder/healthStoreList.vue

@@ -1339,7 +1339,7 @@ export default {
         this.queryParams.deliverySendTimeRange = null
       }
 
-      listHealthStoreOrder(this.queryParams).then(response => {
+      listHealthStoreOrder(this.queryParams, {pageNum: this.queryParams.pageNum,pageSize: this.queryParams.pageSize}).then(response => {
         this.storeOrderList = response.rows
         this.total = response.total
         this.loading = false