浏览代码

修改bug

chenrui 1 年之前
父节点
当前提交
3a3713679d

+ 1 - 1
src/views/productManagement/productSourcePath/importGuideModal.vue

@@ -89,7 +89,7 @@ export default {
     return {
       isShow: this.openModal, //  是否打开弹框
       openImportModal: false, //  导入
-      attachAction: process.env.VUE_APP_API_BASE_URL + '/sendBill/importSendBill',
+      attachAction: process.env.VUE_APP_API_BASE_URL + '/report/tracecode/importParse',
       paramsData: null,
       uploadParams: {
         savePathType: 'local'

+ 4 - 14
src/views/productManagement/productSourcePath/list.vue

@@ -123,12 +123,6 @@
           bordered>
           <!-- 操作 -->
           <template slot="action" slot-scope="text, record">
-            <!-- <a-button
-              size="small"
-              type="link"
-              class="button-warning"
-              @click="openRecordModal = true"
-            >流转记录</a-button> -->
             <a-button
               size="small"
               type="link"
@@ -140,8 +134,6 @@
       </a-spin>
       <!-- 质保信息-->
       <warranty-info-modal v-drag :openModal="openInfoModal" @close="openInfoModal = false" />
-      <!-- 流转记录 -->
-      <roam-record-modal v-drag :openModal="openRecordModal" @close="openRecordModal = false" />
       <!-- 导入轮胎唯一码 -->
       <importGuideModal :openModal="openGuideModal" @close="openGuideModal=false" @ok="handleGuideOk" />
     </a-card>
@@ -162,7 +154,6 @@ import custList from '@/views/common/custList.vue'
 import reportModal from '@/views/common/reportModal.vue'
 import AreaList from '@/views/common/areaList.js'
 import warrantyInfoModal from './warrantyInfoModal.vue'
-import roamRecordModal from './roamRecordModal.vue'
 import importGuideModal from './importGuideModal.vue'
 import {
   hdExportExcel
@@ -186,7 +177,6 @@ export default {
     reportModal,
     AreaList,
     warrantyInfoModal,
-    roamRecordModal,
     importGuideModal
   },
   data () {
@@ -214,15 +204,15 @@ export default {
       openRecordModal: false, // 流转记录弹窗
       columns: [
         { title: '序号', dataIndex: 'no', width: '5%', align: 'center' },
+        { title: '业务单号', dataIndex: 'salesBillNo', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '审核时间', dataIndex: 'giftQty1', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '导入时间', dataIndex: 'giftQty4', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品编码', dataIndex: 'indirectDealerName', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '唯一码', dataIndex: 'giftQty', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '业务单号', dataIndex: 'salesBillNo', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '出库时间', dataIndex: 'giftQty1', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品名称', dataIndex: 'totalQty2', width: '12%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '客户名称', dataIndex: 'dealerName', width: '12%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '出库仓库', dataIndex: 'createDate', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '当前所在客户', dataIndex: 'giftQty3', width: '12%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '质保状态', dataIndex: 'giftQty4', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '质保时间', dataIndex: 'giftQty3', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '12%', align: 'center' }
       ],
       rules: {

+ 0 - 111
src/views/productManagement/productSourcePath/roamRecordModal.vue

@@ -1,111 +0,0 @@
-<template>
-  <a-modal
-    centered
-    class="warrantyInfo-modal"
-    :footer="null"
-    :maskClosable="false"
-    title="流转记录"
-    v-model="isShow"
-    @cancel="isShow=false"
-    :width="600">
-    <a-spin :spinning="spinning" tip="Loading...">
-      <a-timeline mode="alternate">
-        <a-timeline-item>Create a services site 2015-09-01</a-timeline-item>
-        <a-timeline-item color="green">
-          Solve initial network problems 2015-09-01
-        </a-timeline-item>
-        <a-timeline-item>
-          <a-icon slot="dot" type="clock-circle-o" style="font-size: 16px;" />
-          Sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium doloremque
-          laudantium, totam rem aperiam, eaque ipsa quae ab illo inventore veritatis et quasi architecto
-          beatae vitae dicta sunt explicabo.
-        </a-timeline-item>
-        <a-timeline-item color="red">
-          Network problems being solved 2015-09-01
-        </a-timeline-item>
-        <a-timeline-item>Create a services site 2015-09-01</a-timeline-item>
-        <a-timeline-item>
-          <a-icon slot="dot" type="clock-circle-o" style="font-size: 16px;" />
-          Technical testing 2015-09-01
-        </a-timeline-item>
-      </a-timeline>
-      <div class="btn-cont">
-        <a-button id="warrantyInfo-back" @click="isShow = false">关闭</a-button>
-      </div>
-    </a-spin>
-  </a-modal>
-</template>
-
-<script>
-import { productPricingSnDetail } from '@/api/product'
-export default {
-  name: 'ProductPricingAuditModal',
-  props: {
-    openModal: { //  弹框显示状态
-      type: Boolean,
-      default: false
-    }
-  },
-  data () {
-    return {
-      isShow: this.openModal, //  是否打开弹框
-      spinning: false,
-      detailsData: null //  详情数据
-    }
-  },
-  methods: {
-    //  获取详情
-    getDetail () {
-      productPricingSnDetail({ sn: this.itemSn }).then(res => {
-        if (res.status == 200) {
-          this.detailsData = res.data
-        } else {
-          this.detailsData = null
-        }
-      })
-    }
-  },
-  watch: {
-    //  父页面传过来的弹框状态
-    openModal (newValue, oldValue) {
-      this.isShow = newValue
-    },
-    //  重定义的弹框状态
-    isShow (newValue, oldValue) {
-      if (!newValue) {
-        this.$emit('close')
-      }
-    }
-  }
-}
-</script>
-
-<style lang="less">
-  .warrantyInfo-modal{
-    .ant-modal-body {
-      padding: 30px 40px 24px;
-    }
-    .infoList {
-      margin-bottom:26px;
-      .ant-descriptions-title{
-        margin-bottom:10px !important;
-      }
-      .ant-descriptions-row > th, .ant-descriptions-row > td{
-        padding-bottom: 5px !important;
-      }
-    }
-    .infoTopList{
-      display:flex;
-      .ant-descriptions-row:nth-child(2),.ant-descriptions-row:nth-child(3){
-        font-weight: bold;
-      }
-      .ant-descriptions-row:nth-child(2) .ant-descriptions-item > span,.ant-descriptions-row:nth-child(3) .ant-descriptions-item > span{
-        font-weight: bold;
-      }
-    }
-    .btn-cont {
-      text-align: center;
-      margin: 35px 0 20px;
-    }
-  }
-</style>

+ 40 - 27
src/views/productManagement/productSourcePath/warrantyInfoModal.vue

@@ -9,26 +9,32 @@
     @cancel="isShow=false"
     :width="600">
     <a-spin :spinning="spinning" tip="Loading...">
-      <div class="infoList infoTopList">
-        <img
-          style="margin-right:20px;"
-          src="https://img2.baidu.com/it/u=2868393532,862853407&fm=253&fmt=auto&app=120&f=JPEG?w=1280&h=800"
-          alt=""
-          width="120"
-          height="80"
-          align="middle" />
-        <a-descriptions :column="1">
-          <a-descriptions-item label="轮胎名称">
-            Zhou Maomao
-          </a-descriptions-item >
-          <a-descriptions-item label="轮胎唯一码">
-            1810000000
-          </a-descriptions-item>
-          <a-descriptions-item label="质保时间">
-            Hangzhou, Zhejiang
-          </a-descriptions-item>
-        </a-descriptions>
-        <img src="@/assets/img/ongoing.png" alt="" width="60" height="60">
+      <div class="infoList">
+        <div class="infoTopList">
+          <a-descriptions :column="1">
+            <a-descriptions-item label="轮胎名称">
+              Zhou Maomao
+            </a-descriptions-item >
+            <a-descriptions-item label="轮胎唯一码">
+              1810000000
+            </a-descriptions-item>
+            <a-descriptions-item label="质保时间">
+              Hangzhou, Zhejiang
+            </a-descriptions-item>
+          </a-descriptions>
+        </div>
+        <div class="imgBox">
+          <img
+            style="margin-bottom:6px;"
+            src="https://img2.baidu.com/it/u=2868393532,862853407&fm=253&fmt=auto&app=120&f=JPEG?w=1280&h=800"
+            alt=""
+            width="86"
+            height="55"
+            align="middle" />
+          <div style="text-align:center;">
+            <img src="@/assets/img/ongoing.png" alt="" width="50" height="50">
+          </div>
+        </div>
       </div>
       <div class="infoList">
         <a-descriptions title="门店信息" :column="1">
@@ -132,16 +138,23 @@ export default {
       .ant-descriptions-row > th, .ant-descriptions-row > td{
         padding-bottom: 5px !important;
       }
-    }
-    .infoTopList{
-      display:flex;
-      .ant-descriptions-row:nth-child(2),.ant-descriptions-row:nth-child(3){
-        font-weight: bold;
+      .infoTopList{
+        max-width:50%;
+        position: relative;
+        .ant-descriptions-row:nth-child(2),.ant-descriptions-row:nth-child(3){
+          font-weight: bold;
+        }
+        .ant-descriptions-row:nth-child(2) .ant-descriptions-item > span,.ant-descriptions-row:nth-child(3) .ant-descriptions-item > span{
+          font-weight: bold;
+        }
       }
-      .ant-descriptions-row:nth-child(2) .ant-descriptions-item > span,.ant-descriptions-row:nth-child(3) .ant-descriptions-item > span{
-        font-weight: bold;
+      .imgBox{
+        position:absolute;
+        top:0;
+        left:51%;
       }
     }
+
     .btn-cont {
       text-align: center;
       margin: 35px 0 20px;