lilei 2 år sedan
förälder
incheckning
56683d750e
1 ändrade filer med 110 tillägg och 72 borttagningar
  1. 110 72
      src/views/salesReturnManagement/billOfLading/detail.vue

+ 110 - 72
src/views/salesReturnManagement/billOfLading/detail.vue

@@ -1,10 +1,10 @@
 <template>
-  <div class="billOfLadingEdit-wrap">
+  <div class="billOfLadingDetail-wrap">
     <a-spin :spinning="spinning" tip="Loading...">
-      <a-page-header :ghost="false" :backIcon="false" class="billOfLadingEdit-header" >
+      <a-page-header :ghost="false" :backIcon="false" class="billOfLadingDetail-header" >
         <!-- 自定义的二级文字标题 -->
         <template slot="subTitle">
-          <a id="billOfLadingEdit-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
+          <a id="billOfLadingDetail-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
         </template>
       </a-page-header>
       <a-form-model
@@ -13,63 +13,67 @@
         :rules="rules"
         :label-col="formItemLayout.labelCol"
         :wrapper-col="formItemLayout.wrapperCol">
-        <a-card :bordered="false" class="billOfLadingEdit-cont">
+        <a-card :bordered="false" class="billOfLadingDetail-cont" v-if="form">
           <a-row>
             <a-col :xs="24" :sm="24" :md="12" :lg="12" :xl="12">
-              <a-form-model-item style="margin-bottom:0" label="申请人" prop="applyPersonSn">
-                往来款
+              <a-form-model-item style="margin-bottom:0" label="申请人">
+                {{ form.applyPersonName||'--' }}
               </a-form-model-item>
             </a-col>
             <a-col :xs="24" :sm="24" :md="12" :lg="12" :xl="12">
-              <a-form-model-item style="margin-bottom:0" label="主题" prop="code">
-                关于提货事宜
+              <a-form-model-item style="margin-bottom:0" label="主题">
+                {{ form.theme||'--' }}
               </a-form-model-item>
             </a-col>
             <a-col :xs="24" :sm="24" :md="12" :lg="12" :xl="12">
-              <a-form-model-item style="margin-bottom:0" label="物流公司" prop="origCode">
-                龙兴物流
+              <a-form-model-item style="margin-bottom:0" label="物流公司">
+                {{ form.logisticsCompany||'--' }}
               </a-form-model-item>
             </a-col>
             <a-col :xs="24" :sm="24" :md="12" :lg="12" :xl="12">
-              <a-form-model-item style="margin-bottom:0" label="物流点" prop="otherCode">
-                东莞市茶山镇茶南路龙兴物流
+              <a-form-model-item style="margin-bottom:0" label="物流点">
+                {{ form.logisticsPoint }}
               </a-form-model-item>
             </a-col>
             <a-col :xs="24" :sm="24" :md="12" :lg="12" :xl="12">
               <a-form-model-item style="margin-bottom:0" label="发货方">
-                箭冠汽配湛江赤坎店
+                {{ form.dealerEntity&&form.dealerEntity.dealerName||'--' }}
               </a-form-model-item>
             </a-col>
             <a-col :xs="24" :sm="24" :md="12" :lg="12" :xl="12">
-              <a-form-model-item style="margin-bottom:0" label="收货人" prop="qrCode">
-                宋志谋
+              <a-form-model-item style="margin-bottom:0" label="收货人">
+                {{ form.receiverName||'--' }}
               </a-form-model-item>
             </a-col>
             <a-col :xs="24" :sm="24" :md="12" :lg="12" :xl="12">
-              <a-form-model-item style="margin-bottom:0" label="电话" prop="qrCode">
-                18800001111
+              <a-form-model-item style="margin-bottom:0" label="电话">
+                {{ form.receiverPhone||'--' }}
               </a-form-model-item>
             </a-col>
             <a-col :xs="24" :sm="24" :md="12" :lg="12" :xl="12">
-              <a-form-model-item style="margin-bottom:0" label="件数" prop="packQty">
-                2件
+              <a-form-model-item style="margin-bottom:0" label="件数">
+                {{ form.goodsNum||'--' }}
               </a-form-model-item>
             </a-col>
             <a-col :span="24">
               <a-form-model-item style="margin-bottom:0" label="运费" :label-col="{span:2}" :wrapper-col="{span:20}">
-                快递费134元,送货费55元,合计189元(成品仓付)
+                {{ form.freight||'--' }}
               </a-form-model-item>
             </a-col>
           </a-row>
           <a-row>
             <a-col :spna="24">
               <a-form-model-item style="margin-bottom:0" label="备注" prop="size" :label-col="{span:2}" :wrapper-col="{span:20}">
-                --
+                {{ form.remarks||'--' }}
               </a-form-model-item>
             </a-col>
             <a-col :spna="24">
               <a-form-model-item style="margin-bottom:10px" label="附件" :label-col="{span:2}" :wrapper-col="{span:20}">
-                <a href="#">附件.excel</a>
+                <div style="line-height:26px;">
+                  <div v-for="item in form.attachmentList" :key="item.id">
+                    <a :href="item.filePath">{{ item.fileName }}</a>
+                  </div>
+                </div>
               </a-form-model-item>
             </a-col>
             <a-col :spna="24">
@@ -89,16 +93,18 @@
             <a-col :spna="24">
               <a-form-model-item label="审核进度" :label-col="{span:2}" :wrapper-col="{span:20}">
                 <div>以下信息来自钉钉</div>
-                <a-table :columns="auditColumns" :scroll="{ y: 400 }" :pagination="false" :data-source="auditData" bordered>
-                  <!-- 编号 -->
-                  <template slot="no" slot-scope="text, record,index">
-                    <span>{{ index+1 }}</span>
-                  </template>
-                  <!-- 单号 -->
-                  <template slot="salesReturnBillNo" slot-scope="text, record">
-                    <span>{{ record.salesReturnBillNo }}</span>
-                  </template>
-                </a-table>
+                <s-table
+                  class="sTable fixPagination"
+                  ref="table"
+                  size="small"
+                  :rowKey="(record) => record.id"
+                  :columns="auditColumns"
+                  :data="loadData"
+                  :scroll="{ y: 400 }"
+                  :showPagination="false"
+                  :defaultLoadData="true"
+                  bordered>
+                </s-table>
               </a-form-model-item>
             </a-col>
           </a-row>
@@ -111,12 +117,12 @@
 <script>
 import { commonMixin } from '@/utils/mixin'
 import { STable, VSelect, Upload } from '@/components'
-import employee from '../../expenseManagement/expenseReimbursement/employee.js'
-import dealerSubareaScopeList from '@/views/common/dealerSubareaScopeList.vue'
+import { pickUpDetail, pickUpDetailQueryList } from '@/api/pickUp'
+import { getProcessInstance } from '@/api/expenseManagement'
 export default {
   name: 'ProductInfoEdit',
   mixins: [commonMixin],
-  components: { VSelect, Upload, STable, employee, dealerSubareaScopeList },
+  components: { VSelect, Upload, STable },
   data () {
     return {
       spinning: false,
@@ -126,36 +132,27 @@ export default {
         wrapperCol: { span: 16 }
       },
       form: {
-        applyPersonSn: '', // 申请人
-        applyPersonName: '',
-        code: '', //  产品编码
-        origCode: '', //  原厂编码
-        otherCode: '', // 其他编码
-        productBrandSn: undefined, //  产品品牌
-        productTypeSn1: '', //  产品一级分类
-        productTypeSn2: '', //  产品二级分类
-        productTypeSn3: '', //  产品三级分类
-        productType: [], //  产品分类
-        unit: undefined, //  单位
-        packQty: '', // 包装数
-        packQtyUnit: undefined, // 包装数单位
-        arrowFalg: undefined, // 是否箭冠产品
-        qrCode: '',
-        productMsg: '', //  产品图片
-        size: '', // 产品尺寸
-        weight: '', // 产品重量
-        color: undefined, // 颜色
-        boxSize: '', // 内核尺寸
-        description: '', // 产品说明
-        otherDesc: '' // 其他说明
+        applyPersonSn: undefined, // 申请人
+        applyPersonName: undefined,
+        theme: '', //  主题
+        logisticsCompany: undefined, //  物流公司
+        logisticsPoint: undefined, //  物流点
+        senderName: '', //  发货方
+        senderSn: '',
+        receiverName: '', //  收货人
+        receiverPhone: '', // 电话
+        goodsNum: '', // 件数
+        freight: '', // 运费
+        remarks: '',
+        attachmentList: [] // 附件
       },
       rules: {},
       chooseData: [],
       columns: [
         { title: '序号', scopedSlots: { customRender: 'no' }, width: '8%', align: 'center' },
-        { title: '总部销退单号', scopedSlots: { customRender: 'salesReturnBillNo' }, width: '15%', align: 'center' },
+        { title: '总部销退单号', scopedSlots: { customRender: 'salesReturnNo' }, width: '15%', align: 'center' },
         { title: '客户名称', dataIndex: 'buyerName', width: '20%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '申请退货数量', dataIndex: 'totalQty', width: '15%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '申请退货数量', dataIndex: 'totalBackStockQty', width: '15%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '审核时间', dataIndex: 'auditTime', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '业务状态', dataIndex: 'billStatusDictValue', width: '15%', align: 'center', customRender: function (text) { return text || '--' } }
       ],
@@ -168,22 +165,49 @@ export default {
         { title: '审批意见', dataIndex: 'remark', width: '20%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '附件', dataIndex: 'hasAttachments', width: '20%', align: 'center', customRender: function (text) { return text != '0' ? '请在钉钉中查看附件内容' : '--' } },
         { title: '操作时间', dataIndex: 'date', width: '20%', align: 'center', customRender: function (text) { return text || '--' } }
-      ]
+      ],
+      // 加载数据方法 必须为 Promise 对象
+      loadData: parameter => {
+        this.spinning = true
+        delete parameter.tableId
+        delete parameter.index
+        return getProcessInstance({ businessType: 'PICK_UP', businessSn: this.$route.params.sn }).then(res => {
+          let data
+          if (res.status == 200) {
+            data = res.data
+            const no = 0
+            for (var i = 0; i < data.length; i++) {
+              data[i].no = no + i + 1
+            }
+            this.disabled = false
+          } else {
+            this.isShow = false
+            return []
+          }
+          this.spinning = false
+          return data
+        })
+      }
     }
   },
   methods: {
+    // 关联销售退货单
+    getReturnOrderList () {
+      pickUpDetailQueryList({ pickUpSn: this.$route.params.sn }).then(res => {
+        this.chooseData = []
+        res.data.map(item => {
+          this.chooseData.push(item.salesReturnBillEntity)
+        })
+      })
+    },
     //  详情
     getDetail () {
       this.spinning = true
       this.disabled = true
-      expenseAccountDetail({ expenseAccountSn: this.expenseAccountSn }).then(res => {
+      pickUpDetail({ pickUpSn: this.$route.params.sn }).then(res => {
         if (res.status == 200) {
           const data = res.data
           this.form = Object.assign(this.form, data)
-          // 获取附件列表
-          this.form.expenseAccountFilesList = ''
-          this.attachList = res.data.expenseAccountFilesList
-          this.$refs.attachList.setFileList(this.attachList)
         } else {
           this.$refs.ruleForm.resetFields()
         }
@@ -196,11 +220,25 @@ export default {
       this.$router.push({ name: 'billOfLadingList' })
     },
     pageInit () {
-      this.attachList = []
-      this.form.expenseAccountFilesList = ''
+      this.form = {
+        applyPersonSn: undefined, // 申请人
+        applyPersonName: undefined,
+        theme: '', //  主题
+        logisticsCompany: undefined, //  物流公司
+        logisticsPoint: undefined, //  物流点
+        senderName: '', //  发货方
+        senderSn: '',
+        receiverName: '', //  收货人
+        receiverPhone: '', // 电话
+        goodsNum: '', // 件数
+        freight: '', // 运费
+        remarks: '',
+        attachmentList: [] // 附件
+      }
       this.$refs.ruleForm.resetFields()
-      if (this.$route.params.id) { //  编辑页
+      if (this.$route.params.sn) { //  编辑页
         this.getDetail()
+        this.getReturnOrderList()
       }
     }
   },
@@ -222,16 +260,16 @@ export default {
 </script>
 
 <style lang="less">
-  .billOfLadingEdit-wrap{
+  .billOfLadingDetail-wrap{
     position: relative;
     height: 100%;
     background-color:#fff;
-    .billOfLadingEdit-cont{
+    .billOfLadingDetail-cont{
       height:100%;
       overflow: auto;
     }
-    .billOfLadingEdit-header{
-      border-bottom: 5px solid #f8f8f8;
+    .billOfLadingDetail-header{
+      border-bottom: 8px solid #eee;
     }
     .affix{
       .ant-affix{