财务优化

src/views/modules/finance/customer-account-detail.vue

@@ -0,0 +1,125 @@
+<template>
+  <!-- <el-dialog
+    title="查看"
+    width="70%"
+    :close-on-click-modal="false"
+    :visible.sync="visible"> -->
+  <div>
+    <div class="my-title">查看</div>
+    <div style="margin-left: 20px;margin-right: 20px">
+      <e-desc title="基本信息" column="3">
+        <e-desc-item label="账款编码">{{dataForm.customerAccountCode}}</e-desc-item>
+        <e-desc-item label="账款类型">{{typeFormat(dataForm)}}</e-desc-item>
+        <e-desc-item label="合同号">{{dataForm.contractNumber}}</e-desc-item>
+        <e-desc-item label="收付款时间">{{dataForm.receivedPaidTime}}</e-desc-item>
+        <e-desc-item label="币种">{{currencyFormat(dataForm)}}</e-desc-item>
+        <e-desc-item label="收付款金额">{{dataForm.receivedPaidAmount}}</e-desc-item>
+        <e-desc-item label="备注说明" span="3">{{dataForm.notes}}</e-desc-item>
+      </e-desc>
+      <e-desc title="附件">
+        <upload-component :display="true" :display-title="false" :accept="'*'" :file-obj-list="fileList"/>
+      </e-desc>
+    </div>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="onChose">返回</el-button>
+    </span>
+  </div>
+  <!-- </el-dialog> -->
+</template>
+
+<script>
+  import EDesc from '../common/e-desc'
+  import EDescItem from '../common/e-desc-item'
+  import uploadComponent from '../common/upload-component'
+  export default {
+    name: 'customer-account-detail',
+    components: {
+      EDesc,
+      EDescItem,
+      uploadComponent
+    },
+    data () {
+      return {
+        isFlow: false,
+        visible: false,
+        id: 0,
+        dataForm: {},
+        cusRCommProductVOS: [],
+        fileList: [],
+        typeState: [ // 账款类别映射关系
+          {
+            code: '1',
+            value: '订单收款'
+          },
+          {
+            code: '2',
+            value: '订单退款'
+          }
+        ],
+        currencyType: [ // 币种映射关系
+          {
+            code: '1',
+            value: '人民币'
+          }
+        ]
+      }
+    },
+    methods: {
+      onChose () {
+        this.$emit('onChose')
+      },
+      // 转换类别
+      typeFormat (row) {
+        for (let i = 0; i < this.typeState.length; i++) {
+          if (this.typeState[i].code === String(row.type)) {
+            return this.typeState[i].value
+          }
+        }
+      },
+      // 转换币种
+      // 转换属性“级别”
+      currencyFormat (row) {
+        for (let i = 0; i < this.currencyType.length; i++) {
+          if (this.currencyType[i].code === String(row.currency)) {
+            return this.currencyType[i].value
+          }
+        }
+      },
+      async init (id, customerAccount, customerId) {
+        this.visible = true
+        this.id = id || 0
+        this.fileList = []
+        if (id && customerAccount) {
+          this.dataForm = {
+            customerAccountId: id,
+            customerAccountCode: customerAccount.customerAccountCode,
+            type: customerAccount.type,
+            contractNumber: customerAccount.contractNumber,
+            receivedPaidTime: customerAccount.receivedPaidTime,
+            currency: customerAccount.currency,
+            receivedPaidAmount: customerAccount.receivedPaidAmount,
+            notes: customerAccount.notes
+          }
+          customerAccount.attachList && customerAccount.attachList.forEach((item) => {
+            this.fileList.push({
+              name: item.fileName,
+              url: item.url,
+              id: item.url
+            })
+          })
+        }
+        this.dataForm.customerId = customerId
+      }
+    }
+  }
+</script>
+
+<style scoped>
+.my-line{
+  border-bottom: 1px solid #c0c4cc;
+  margin-bottom: 10px;
+}
+.title{
+  padding: 10px 0 ;
+}
+</style>

src/views/modules/finance/customer-account-list.vue

@@ -81,7 +81,7 @@
           width="150"
           label="操作">
           <template slot-scope="scope">
-            <el-button v-if="true" type="text" size="small" @refreshDataList="getDataList" @click="addOrUpdateHandle(scope.row.customerAccountId, scope.row, true)">详情</el-button>
+            <el-button v-if="true" type="text" size="small"  @click="detailHandle(scope.row.customerAccountId, scope.row)">详情</el-button>
             <el-button v-if="true" type="text" size="small" @refreshDataList="getDataList" @click="addOrUpdateHandle(scope.row.customerAccountId, scope.row, false)">编辑</el-button>
           </template>
         </el-table-column>
@@ -98,16 +98,18 @@
     </template>
     <!-- 弹窗, 新增 / 修改 -->
     <add-or-update v-if="addOrUpdateVisible" @refreshDataList="getDataList" ref="addOrUpdate" @onChose="onClose"/>
+    <detail v-if="detailVisible" ref="detail" @onChose="onClose"/>
   </div>
 </template>
 
 <script>
   import { getCustomerAccountInfo } from '@/api/finance'
   import AddOrUpdate from './customer-account-add-or-update'
+  import Detail from './customer-account-detail'
   export default {
     name: 'customer-account',
     components: {
-      AddOrUpdate
+      AddOrUpdate, Detail
     },
     props: {
       customerId: {
@@ -209,11 +211,13 @@
           }
         }
       },
-      detailHandle (id) {
+      // 详情展示
+      detailHandle (id, customerAccount) {
         this.detailVisible = true
-        // this.$nextTick(() => {
-        //   this.$refs.detail.init(id)
-        // })
+        this.$nextTick(() => {
+          this.$refs.detail.init(id, customerAccount, this.customerId)
+        })
+        this.$emit('changeDetailShow', true)
       },
       // 新增/修改
       addOrUpdateHandle (id, customerAccount, disable) {

src/views/modules/finance/purchase-invoice-detail.vue

@@ -0,0 +1,143 @@
+<template>
+  <!-- <el-dialog
+    title="查看"
+    width="70%"
+    :close-on-click-modal="false"
+    :visible.sync="visible"> -->
+  <div>
+    <div class="my-title">查看</div>
+    <div style="margin-left: 20px;margin-right: 20px">
+      <e-desc title="基本信息" column="3">
+        <e-desc-item label="采购发票编码">{{dataForm.code}}</e-desc-item>
+        <e-desc-item label="发票类型">{{typeFormat(dataForm)}}</e-desc-item>
+        <e-desc-item label="发票类别代码">{{dataForm.typeCode}}</e-desc-item>
+        <e-desc-item label="发票号">{{dataForm.invoiceNumber}}</e-desc-item>
+        <e-desc-item label="开票电话">{{dataForm.phone}}</e-desc-item>
+        <e-desc-item label="发票金额">{{dataForm.invoiceAmount}}</e-desc-item>
+        <e-desc-item label="币种">{{currencyFormat(dataForm)}}</e-desc-item>
+        <e-desc-item label="供应商">{{dataForm.supplierName}}</e-desc-item>
+        <e-desc-item label="收付款金额">{{dataForm.receivedPaidAmount}}</e-desc-item>
+        <e-desc-item label="备注说明" span="3">{{dataForm.notes}}</e-desc-item>
+      </e-desc>
+      <e-desc title="附件">
+        <upload-component :display="true" :display-title="false" :accept="'*'" :file-obj-list="fileList"/>
+      </e-desc>
+      <e-desc title="客户信息" column="3">
+        <e-desc-item label="发票抬头">{{dataForm.invoiceTitle}}</e-desc-item>
+        <e-desc-item label="企业税号">{{dataForm.taxNumber}}</e-desc-item>
+        <e-desc-item label="开户银行">{{dataForm.bank}}</e-desc-item>
+        <e-desc-item label="银行账号">{{dataForm.account}}</e-desc-item>
+        <e-desc-item label="电话">{{dataForm.contactTel}}</e-desc-item>
+        <e-desc-item label="传真">{{dataForm.fax}}</e-desc-item>
+      </e-desc>
+    </div>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="onChose">返回</el-button>
+    </span>
+  </div>
+  <!-- </el-dialog> -->
+</template>
+
+<script>
+  // import { getSupplierNameList, getSupplierDetail } from '@/api/sale'
+  import { getPurchaseInvoiceDetail } from '@/api/finance'
+  import EDesc from '../common/e-desc'
+  import EDescItem from '../common/e-desc-item'
+  import uploadComponent from '../common/upload-component'
+  export default {
+    name: 'purchase-invoice-detail',
+    components: {
+      EDesc,
+      EDescItem,
+      uploadComponent
+    },
+    data () {
+      return {
+        isFlow: false,
+        visible: false,
+        id: 0,
+        dataForm: {},
+        cusRCommProductVOS: [],
+        fileList: [],
+        typeState: [ // 发票类型映射关系
+          {
+            code: '1',
+            value: '增值税专用发票'
+          },
+          {
+            code: '2',
+            value: '增值税普通发票'
+          },
+          {
+            code: '3',
+            value: '形式发票'
+          }
+        ],
+        currencyType: [ // 币种映射关系
+          {
+            code: '1',
+            value: '人民币'
+          }
+        ]
+      }
+    },
+    methods: {
+      onChose () {
+        this.$emit('onChose')
+      },
+      // 转换类别
+      typeFormat (row) {
+        for (let i = 0; i < this.typeState.length; i++) {
+          if (this.typeState[i].code === String(row.type)) {
+            return this.typeState[i].value
+          }
+        }
+      },
+      // 转换币种
+      // 转换属性“级别”
+      currencyFormat (row) {
+        for (let i = 0; i < this.currencyType.length; i++) {
+          if (this.currencyType[i].code === String(row.currency)) {
+            return this.currencyType[i].value
+          }
+        }
+      },
+      async init (id) {
+        this.visible = true
+        this.id = id || 0
+        // await getSupplierNameList().then(({data}) => {
+        //   if (data && data.code === '200') {
+        //     this.optionsCus = data.data
+        //   }
+        // })
+        if (!id) return
+        await getPurchaseInvoiceDetail(this.id).then(({data}) => {
+          if (data && data.code === '200') {
+            this.dataForm = data.data
+            // 文件列表
+            this.fileList = []
+            if (data.data.attachList) {
+              data.data.attachList.forEach((item) => {
+                this.fileList.push({
+                  name: item.fileName,
+                  url: item.url,
+                  id: item.url
+                })
+              })
+            }
+          }
+        })
+      }
+    }
+  }
+</script>
+
+<style scoped>
+.my-line{
+  border-bottom: 1px solid #c0c4cc;
+  margin-bottom: 10px;
+}
+.title{
+  padding: 10px 0 ;
+}
+</style>

src/views/modules/finance/purchase-invoice.vue

@@ -1,7 +1,7 @@
 <template>
   <!-- 采购发票管理 -->
   <div class="purchase-invoice">
-    <template v-if="!addOrUpdateVisible">
+    <template v-if="!addOrUpdateVisible && !detailVisible">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="search()">
         <el-form-item label="发票号">
           <el-input v-model="dataForm.invoiceNumber" placeholder="发票号" clearable/>
@@ -123,7 +123,7 @@
           width="150"
           label="操作">
           <template slot-scope="scope">
-            <el-button v-if="isAuth('finance:purchase-invoice:info')" type="text" size="small" @click="addOrUpdateHandle(scope.row.purchaseInvoiceId, true)">详情</el-button>
+            <el-button v-if="isAuth('finance:purchase-invoice:info')" type="text" size="small" @click="detailHandle(scope.row.purchaseInvoiceId)">详情</el-button>
             <el-button v-if="isAuth('finance:purchase-invoice:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.purchaseInvoiceId, false)">编辑</el-button>
           </template>
         </el-table-column>
@@ -140,6 +140,7 @@
     </template>
     <!-- 弹窗, 新增 / 修改 -->
     <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @onChose="onChose"/>
+    <detail v-if="detailVisible" ref="detail" @onChose="onChose"/>
     <!-- 文件预览 -->
     <preview-component v-if="previewVisible" ref="preview"/>
   </div>
@@ -147,17 +148,19 @@
 
 <script>
   import AddOrUpdate from './purchase-invoice-add-or-update'
+  import Detail from './purchase-invoice-detail'
   import PreviewComponent from '../common/preview-component'
   import { getPurchaseInvoiceList } from '@/api/finance'
 
   export default {
     name: 'purchaseInvoice',
     components: {
-      AddOrUpdate, PreviewComponent
+      AddOrUpdate, PreviewComponent, Detail
     },
     data () {
       return {
         addOrUpdateVisible: false,
+        detailVisible: false,
         previewVisible: false,
         dataForm: {
           invoiceNumber: '',
@@ -198,6 +201,7 @@
     methods: {
       onChose () {
         this.addOrUpdateVisible = false
+        this.detailVisible = false
       },
       // 查询
       search () {
@@ -258,6 +262,12 @@
           this.$refs.preview.init(fileName, url)
         })
       },
+      detailHandle (id) {
+        this.detailVisible = true
+        this.$nextTick(() => {
+          this.$refs.detail.init(id)
+        })
+      },
       // 新增/修改
       addOrUpdateHandle (id, disable) {
         this.addOrUpdateVisible = true

src/views/modules/finance/sale-invoice-detail.vue

@@ -0,0 +1,143 @@
+<template>
+  <!-- <el-dialog
+    title="查看"
+    width="70%"
+    :close-on-click-modal="false"
+    :visible.sync="visible"> -->
+  <div>
+    <div class="my-title">查看</div>
+    <div style="margin-left: 20px;margin-right: 20px">
+      <e-desc title="基本信息" column="3">
+        <e-desc-item label="销售发票编码">{{dataForm.code}}</e-desc-item>
+        <e-desc-item label="发票类型">{{typeFormat(dataForm)}}</e-desc-item>
+        <e-desc-item label="发票类别代码">{{dataForm.typeCode}}</e-desc-item>
+        <e-desc-item label="发票号">{{dataForm.invoiceNumber}}</e-desc-item>
+        <!-- <e-desc-item label="开票电话">{{dataForm.phone}}</e-desc-item> -->
+        <e-desc-item label="发票金额">{{dataForm.invoiceAmount}}</e-desc-item>
+        <e-desc-item label="币种">{{currencyFormat(dataForm)}}</e-desc-item>
+        <e-desc-item label="客户名称">{{dataForm.customerName}}</e-desc-item>
+        <!-- <e-desc-item label="收付款金额">{{dataForm.receivedPaidAmount}}</e-desc-item> -->
+        <e-desc-item label="备注说明" span="3">{{dataForm.notes}}</e-desc-item>
+      </e-desc>
+      <e-desc title="附件">
+        <upload-component :display="true" :display-title="false" :accept="'*'" :file-obj-list="fileList"/>
+      </e-desc>
+      <e-desc title="客户信息" column="3">
+        <e-desc-item label="发票抬头">{{dataForm.invoiceTitle}}</e-desc-item>
+        <e-desc-item label="企业税号">{{dataForm.taxNumber}}</e-desc-item>
+        <e-desc-item label="开户银行">{{dataForm.bank}}</e-desc-item>
+        <e-desc-item label="银行账号">{{dataForm.account}}</e-desc-item>
+        <e-desc-item label="电话">{{dataForm.contactTel}}</e-desc-item>
+        <e-desc-item label="传真">{{dataForm.fax}}</e-desc-item>
+      </e-desc>
+    </div>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="onChose">返回</el-button>
+    </span>
+  </div>
+  <!-- </el-dialog> -->
+</template>
+
+<script>
+  // import { getSupplierNameList, getSupplierDetail } from '@/api/sale'
+  import { getSaleInvoiceDetail } from '@/api/finance'
+  import EDesc from '../common/e-desc'
+  import EDescItem from '../common/e-desc-item'
+  import uploadComponent from '../common/upload-component'
+  export default {
+    name: 'sale-invoice-detail',
+    components: {
+      EDesc,
+      EDescItem,
+      uploadComponent
+    },
+    data () {
+      return {
+        isFlow: false,
+        visible: false,
+        id: 0,
+        dataForm: {},
+        cusRCommProductVOS: [],
+        fileList: [],
+        typeState: [ // 发票类型映射关系
+          {
+            code: '1',
+            value: '增值税专用发票'
+          },
+          {
+            code: '2',
+            value: '增值税普通发票'
+          },
+          {
+            code: '3',
+            value: '形式发票'
+          }
+        ],
+        currencyType: [ // 币种映射关系
+          {
+            code: '1',
+            value: '人民币'
+          }
+        ]
+      }
+    },
+    methods: {
+      onChose () {
+        this.$emit('onChose')
+      },
+      // 转换类别
+      typeFormat (row) {
+        for (let i = 0; i < this.typeState.length; i++) {
+          if (this.typeState[i].code === String(row.type)) {
+            return this.typeState[i].value
+          }
+        }
+      },
+      // 转换币种
+      // 转换属性“级别”
+      currencyFormat (row) {
+        for (let i = 0; i < this.currencyType.length; i++) {
+          if (this.currencyType[i].code === String(row.currency)) {
+            return this.currencyType[i].value
+          }
+        }
+      },
+      async init (id) {
+        this.visible = true
+        this.id = id || 0
+        // await getSupplierNameList().then(({data}) => {
+        //   if (data && data.code === '200') {
+        //     this.optionsCus = data.data
+        //   }
+        // })
+        if (!id) return
+        await getSaleInvoiceDetail(this.id).then(({data}) => {
+          if (data && data.code === '200') {
+            this.dataForm = data.data
+            // 文件列表
+            this.fileList = []
+            if (data.data.attachList) {
+              data.data.attachList.forEach((item) => {
+                this.fileList.push({
+                  name: item.fileName,
+                  url: item.url,
+                  id: item.url
+                })
+              })
+            }
+          }
+        })
+      }
+    }
+  }
+</script>
+
+<style scoped>
+.my-line{
+  border-bottom: 1px solid #c0c4cc;
+  margin-bottom: 10px;
+}
+.title{
+  padding: 10px 0 ;
+}
+</style>

src/views/modules/finance/sale-invoice.vue

@@ -1,7 +1,7 @@
 <template>
   <!-- 销售发票管理 -->
   <div class="sale-invoice">
-    <template v-if="!addOrUpdateVisible">
+    <template v-if="!addOrUpdateVisible && !detailVisible">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="search()">
         <el-form-item label="发票号">
           <el-input v-model="dataForm.invoiceNumber" placeholder="发票号" clearable/>
@@ -123,7 +123,7 @@
           width="150"
           label="操作">
           <template slot-scope="scope">
-            <el-button v-if="isAuth('finance:sale-invoice:info')" type="text" size="small" @click="addOrUpdateHandle(scope.row.salesInvoiceId, true)">详情</el-button>
+            <el-button v-if="isAuth('finance:sale-invoice:info')" type="text" size="small" @click="detailHandle(scope.row.salesInvoiceId)">详情</el-button>
             <el-button v-if="isAuth('finance:sale-invoice:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.salesInvoiceId, false)">编辑</el-button>
           </template>
         </el-table-column>
@@ -140,6 +140,7 @@
     </template>
     <!-- 弹窗, 新增 / 修改 -->
     <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @onChose="onChose"/>
+    <detail v-if="detailVisible" ref="detail" @onChose="onChose"/>
     <!-- 文件预览 -->
     <preview-component v-if="previewVisible" ref="preview"/>
   </div>
@@ -147,17 +148,19 @@
 
 <script>
   import AddOrUpdate from './sale-invoice-add-or-update'
+  import Detail from './sale-invoice-detail'
   import PreviewComponent from '../common/preview-component'
   import { getSaleInvoiceList } from '@/api/finance'
 
   export default {
     name: 'saleInvoice',
     components: {
-      AddOrUpdate, PreviewComponent
+      AddOrUpdate, PreviewComponent, Detail
     },
     data () {
       return {
         addOrUpdateVisible: false,
+        detailVisible: false,
         previewVisible: false,
         dataForm: {
           invoiceNumber: '',
@@ -198,6 +201,7 @@
     methods: {
       onChose () {
         this.addOrUpdateVisible = false
+        this.detailVisible = false
       },
       // 查询
       search () {
@@ -258,6 +262,12 @@
           this.$refs.preview.init(fileName, url)
         })
       },
+      detailHandle (id) {
+        this.detailVisible = true
+        this.$nextTick(() => {
+          this.$refs.detail.init(id)
+        })
+      },
       // 新增/修改
       addOrUpdateHandle (id, disable) {
         this.addOrUpdateVisible = true

src/views/modules/finance/supplier-account-detail.vue

@@ -0,0 +1,124 @@
+<template>
+  <!-- <el-dialog
+    title="查看"
+    width="70%"
+    :close-on-click-modal="false"
+    :visible.sync="visible"> -->
+  <div>
+    <div class="my-title">查看</div>
+    <div style="margin-left: 20px;margin-right: 20px">
+      <e-desc title="基本信息" column="3">
+        <e-desc-item label="账款类型">{{typeFormat(dataForm)}}</e-desc-item>
+        <e-desc-item label="合同号">{{dataForm.contractNumber}}</e-desc-item>
+        <e-desc-item label="收付款时间">{{dataForm.receivedPaidTime}}</e-desc-item>
+        <e-desc-item label="币种">{{currencyFormat(dataForm)}}</e-desc-item>
+        <e-desc-item label="收付款金额">{{dataForm.receivedPaidAmount}}</e-desc-item>
+        <e-desc-item label="备注说明" span="3">{{dataForm.notes}}</e-desc-item>
+      </e-desc>
+      <e-desc title="附件">
+        <upload-component :display="true" :display-title="false" :accept="'*'" :file-obj-list="fileList"/>
+      </e-desc>
+    </div>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="onChose">返回</el-button>
+    </span>
+  </div>
+  <!-- </el-dialog> -->
+</template>
+
+<script>
+  import EDesc from '../common/e-desc'
+  import EDescItem from '../common/e-desc-item'
+  import uploadComponent from '../common/upload-component'
+  export default {
+    name: 'supplier-account-detail',
+    components: {
+      EDesc,
+      EDescItem,
+      uploadComponent
+    },
+    data () {
+      return {
+        isFlow: false,
+        visible: false,
+        id: 0,
+        dataForm: {},
+        cusRCommProductVOS: [],
+        fileList: [],
+        typeState: [ // 账款类别映射关系
+          {
+            code: '1',
+            value: '采购付款'
+          },
+          {
+            code: '2',
+            value: '采购退款'
+          }
+        ],
+        currencyType: [ // 币种映射关系
+          {
+            code: '1',
+            value: '人民币'
+          }
+        ]
+      }
+    },
+    methods: {
+      onChose () {
+        this.$emit('onChose')
+      },
+      // 转换类别
+      typeFormat (row) {
+        for (let i = 0; i < this.typeState.length; i++) {
+          if (this.typeState[i].code === String(row.type)) {
+            return this.typeState[i].value
+          }
+        }
+      },
+      // 转换币种
+      // 转换属性“级别”
+      currencyFormat (row) {
+        for (let i = 0; i < this.currencyType.length; i++) {
+          if (this.currencyType[i].code === String(row.currency)) {
+            return this.currencyType[i].value
+          }
+        }
+      },
+      async init (id, supplierAccount, supplierId) {
+        this.visible = true
+        this.id = id || 0
+        this.fileList = []
+        if (id && supplierAccount) {
+          this.dataForm = {
+            supplierAccountId: id,
+            supplierAccountCode: supplierAccount.supplierAccountCode,
+            type: supplierAccount.type,
+            contractNumber: supplierAccount.contractNumber,
+            receivedPaidTime: supplierAccount.receivedPaidTime,
+            currency: supplierAccount.currency,
+            receivedPaidAmount: supplierAccount.receivedPaidAmount,
+            notes: supplierAccount.notes
+          }
+          supplierAccount.attachList && supplierAccount.attachList.forEach((item) => {
+            this.fileList.push({
+              name: item.fileName,
+              url: item.url,
+              id: item.url
+            })
+          })
+        }
+        this.dataForm.supplierId = supplierId
+      }
+    }
+  }
+</script>
+
+<style scoped>
+.my-line{
+  border-bottom: 1px solid #c0c4cc;
+  margin-bottom: 10px;
+}
+.title{
+  padding: 10px 0 ;
+}
+</style>

src/views/modules/finance/supplier-account-list.vue

@@ -81,7 +81,7 @@
           width="150"
           label="操作">
           <template slot-scope="scope">
-            <el-button v-if="true" type="text" size="small" @refreshDataList="getDataList" @click="addOrUpdateHandle(scope.row.supplierAccountId, scope.row, true)">详情</el-button>
+            <el-button v-if="true" type="text" size="small" @refreshDataList="getDataList" @click="detailHandle(scope.row.supplierAccountId, scope.row)">详情</el-button>
             <el-button v-if="true" type="text" size="small" @refreshDataList="getDataList" @click="addOrUpdateHandle(scope.row.supplierAccountId, scope.row, false)">编辑</el-button>
           </template>
         </el-table-column>
@@ -98,16 +98,18 @@
     </template>
     <!-- 弹窗, 新增 / 修改 -->
     <add-or-update v-if="addOrUpdateVisible" @refreshDataList="getDataList" ref="addOrUpdate" @onChose="onClose"/>
+    <detail v-if="detailVisible" ref="detail" @onChose="onClose"/>
   </div>
 </template>
 
 <script>
   import { getSupplierAccountInfo } from '@/api/finance'
   import AddOrUpdate from './supplier-account-add-or-update'
+  import Detail from './supplier-account-detail'
   export default {
     name: 'supplier-account',
     components: {
-      AddOrUpdate
+      AddOrUpdate, Detail
     },
     props: {
       supplierId: {
@@ -200,11 +202,12 @@
           }
         }
       },
-      detailHandle (id) {
+      detailHandle (id, supplierAccount) {
         this.detailVisible = true
-        // this.$nextTick(() => {
-        //   this.$refs.detail.init(id)
-        // })
+        this.$nextTick(() => {
+          this.$refs.detail.init(id, supplierAccount, this.supplierId)
+        })
+        this.$emit('changeDetailShow', true)
       },
       // 新增/修改
       addOrUpdateHandle (id, supplierAccount, disable) {

src/views/modules/trace/order-list.vue

@@ -48,7 +48,7 @@
           label="下单时间">
         </el-table-column>
         <el-table-column
-          prop="contactDate"
+          prop="deliveryDate"
           header-align="center"
           align="center"
           min-width="160"