Merge branch 'feat' into develop

src/views/basic_data/dealer/components/dealer_list-detail.vue

@@ -374,7 +374,7 @@ export default {
       })
     },
     onSubmit() {
-      if (this.radio.length) {
+      if (!this.radio.length) {
         this.$errorMsg('必须选择一种提货方式')
         return
       }

src/views/supply/engin/home_list.vue

@@ -9,7 +9,14 @@
             <el-button size="mini" type="primary" @click="submitScreenForm">搜索</el-button>
           </template>
           <template #left_btn>
-            <el-checkbox-group v-model="screenForm.status" @change="currentPage = 1;getList()" size="mini">
+            <el-checkbox-group
+              v-model="screenForm.status"
+              @change="
+                currentPage = 1
+                getList()
+              "
+              size="mini"
+            >
               <el-checkbox-button v-for="(item, index) in statusList" :key="index" :label="item.value">{{
                 item.label
               }}</el-checkbox-button>
@@ -46,7 +53,7 @@
                     <el-date-picker
                       v-model="screenForm.date"
                       type="datetimerange"
-:default-time="['00:00:00','23:59:59']"
+                      :default-time="['00:00:00', '23:59:59']"
                       range-separator="至"
                       style="width: 100%"
                       value-format="yyyy-MM-dd HH:mm:ss"
@@ -163,7 +170,7 @@
                     <el-date-picker
                       v-model="screenForm.orderTime"
                       type="datetimerange"
-:default-time="['00:00:00','23:59:59']"
+                      :default-time="['00:00:00', '23:59:59']"
                       range-separator="至"
                       style="width: 100%"
                       value-format="yyyy-MM-dd HH:mm:ss"
@@ -206,8 +213,12 @@
         </Collapse>
       </div>
       <ul class="ulStyle">
-        <li class="title">金额：<span class="num">{{numSum.amountC || 0}}</span></li>
-        <li class="title">数量：<span class="num">{{numSum.totalC || 0}}</span></li>
+        <li class="title">
+          金额：<span class="num">{{ (Number(numSum.amountC) || 0) | numToFixed }}</span>
+        </li>
+        <li class="title">
+          数量：<span class="num">{{ Number(numSum.totalC) || 0 | numToFixed }}</span>
+        </li>
       </ul>
       <div class="mymain-container">
         <div class="btn-group clearfix">
@@ -376,7 +387,7 @@
                 {{ scope.row.isDirectTransfer ? '是' : '否' }}
               </template>
             </el-table-column>
-    <el-table-column
+            <el-table-column
               align="right"
               label="出库数量"
               prop="hasSendQty"
@@ -601,7 +612,15 @@
 </template>
 
 <script>
-import { getOrderList, applyHome, withdrawHome, deleteHome, editDateHome, abandonHome,getEnginCountList } from '@/api/supply/engin'
+import {
+  getOrderList,
+  applyHome,
+  withdrawHome,
+  deleteHome,
+  editDateHome,
+  abandonHome,
+  getEnginCountList
+} from '@/api/supply/engin'
 import { getSalesmanList, getTypeList } from '@/api/common'
 import HomeDetail from '@/views/supply/engin/components/home_detail'
 import HomeForm from '@/views/supply/engin/components/home_form'
@@ -695,9 +714,9 @@ export default {
       salesTypeList: [],
       NoRebateWalletList: [],
       typeList: [],
-      numSum:{
-        totalC:0,
-        amountC:0
+      numSum: {
+        totalC: 0,
+        amountC: 0
       }
     }
   },
@@ -749,7 +768,6 @@ export default {
     this.getSalesTypeList()
     this.getSalesmanList()
     this.getList()
-
   },
 
   methods: {
@@ -859,12 +877,11 @@ export default {
 
         refPromiseProvide: this.screenForm.refPromiseProvide,
         enginOrderType: 'HOME' // TRADE=商用 HOME=家用
-      }).then(res=>{
-        if (res.data){
+      }).then(res => {
+        if (res.data) {
           this.numSum = res.data
         }
       })
-
     },
 
     // 提交筛选表单
@@ -875,7 +892,7 @@ export default {
 
     // 重置筛选表单
     resetScreenForm() {
-        this.$refs.screenForm.resetFields()
+      this.$refs.screenForm.resetFields()
       this.currentPage = 1
       this.getList()
     },
@@ -1009,19 +1026,19 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.ulStyle{
+.ulStyle {
   list-style: none;
   margin: 0;
   padding: 10px 0;
   background-color: #ffffff;
   z-index: 1;
 }
-.title{
+.title {
   display: inline-block;
   font-weight: 700;
   margin-right: 20px;
 }
-.num{
+.num {
   padding-left: 6px;
   font-weight: 400;
 }

src/views/supply/pickup/sum_list.vue

@@ -149,16 +149,6 @@
               {{ scope.row.printNum ? '已打单' : '未打单' }}
             </template>
           </el-table-column>
-          <el-table-column align="left" label="是否上楼" prop="isUp" min-width="160" show-overflow-tooltip>
-            <template slot-scope="scope">
-              {{ scope.row.isUp == 'YES' ? '是' : '否' }}
-            </template>
-          </el-table-column>
-          <el-table-column align="left" label="是否卸货" prop="isDischarge" min-width="160" show-overflow-tooltip>
-            <template slot-scope="scope">
-              {{ scope.row.isDischarge == 'YES' ? '是' : '否' }}
-            </template>
-          </el-table-column>
           <el-table-column align="left" label="打单日期" prop="printTime" min-width="160" show-overflow-tooltip />
           <!-- <el-table-column align="left" label="信息密钥" prop="informationKey" min-width="100" show-overflow-tooltip>
             <template slot-scope="scope">
@@ -268,6 +258,11 @@
             </template>
           </el-table-column>
           <el-table-column align="left" label="备注" prop="remark" min-width="100" show-overflow-tooltip />
+          <el-table-column fixed="right" label="操作" width="100" >
+            <template slot-scope="scope">
+              <el-button v-if="scope.row.pickType != '1' " @click="handLogistics(scope.row)" type="text" size="small">物流信息</el-button>
+            </template>
+          </el-table-column>
         </el-table>
       </div>
     </div>
@@ -303,14 +298,14 @@
             </el-col>
           </el-row>
         </el-timeline-item>
-      </el-timeline>
-      <div v-else class="tip">暂无物流信息</div>
+      </el-timeline>   
+      <div v-else class="tip">暂无物流信息</div>   
     </el-dialog>
   </div>
 </template>
 
 <script>
-import { getPickupList, getPickupManList, getListOrderTrack } from '@/api/supply/pickup'
+import { getPickupList, getPickupManList,getListOrderTrack } from '@/api/supply/pickup'
 import { getLogisticsList } from '@/api/basic_data/logistics'
 import { getWarehouseList } from '@/api/supply/engin'
 export default {
@@ -448,9 +443,30 @@ export default {
     handleCurrentChange(val) {
       this.currentPage = val
       this.getList()
+    },
+    handLogistics(row) {
+      getListOrderTrack({ orderId: row.invoiceId }).then(res => {
+        this.logisticsDetail = res.data
+      })
+      this.orderId = row.invoiceId
+      this.visible = true
+    },
+    onClose() {
+      this.logisticsDetail = []
+      this.orderId = ''
+      this.visible = false
     }
   }
 }
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+.logistics-title{
+  padding-bottom: 10px;
+}
+.tip{
+  height: 200px;
+    text-align: center;
+    line-height: 200px;
+}
+</style>