Browse Source

页面优化

chenrui 3 years ago
parent
commit
c1f6adfccc

+ 1 - 1
src/views/allocationManagement/warehouseAllocation/detail.vue

@@ -91,7 +91,7 @@ export default {
       columns: [
         { title: '序号', dataIndex: 'no', width: 80, align: 'center', fixed: 'left' },
         { title: '产品编码', dataIndex: 'productCode', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品名称', dataIndex: 'productName', width: 200, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品名称', dataIndex: 'productName', width: 200, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '原厂编码', dataIndex: 'productOrigCode', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '类别', scopedSlots: { customRender: 'productType' }, width: 160, align: 'center' },
         { title: '数量', dataIndex: 'allocationQty', width: 100, align: 'center' },

+ 14 - 12
src/views/customerManagement/customerInfo/detailModal.vue

@@ -10,18 +10,20 @@
     :width="960">
     <!-- 客户详情 -->
     <div>
-      <a-descriptions :column="3" bordered size="small" v-if="detailData">
-        <a-descriptions-item label="客户名称:">{{ detailData.customerName || '--' }}</a-descriptions-item>
-        <a-descriptions-item label="联系人:">{{ detailData.contactName || '--' }}</a-descriptions-item>
-        <a-descriptions-item label="联系电话:">{{ detailData.contactTel || '--' }}</a-descriptions-item>
-        <a-descriptions-item label="客户地址:" :span="3">{{ addressStr }}</a-descriptions-item>
-        <a-descriptions-item label="客户传真:">{{ detailData.fax || '--' }}</a-descriptions-item>
-        <a-descriptions-item label="配送方式:">{{ detailData.dispatchTypeDictValue || '--' }}</a-descriptions-item>
-        <a-descriptions-item label="是否卫星仓客户:">{{ detailData.satelliteFlagDictValue || '--' }}</a-descriptions-item>
-        <a-descriptions-item label="价格类型:">{{ detailData.priceTypeDictValue || '--' }}</a-descriptions-item>
-        <a-descriptions-item label="收款方式:">{{ detailData.settleStyleName || '--' }}</a-descriptions-item>
-        <a-descriptions-item label="客户类型:">{{ detailData.customerTypeName || '--' }}</a-descriptions-item>
-      </a-descriptions>
+      <a-spin :spinning="!detailData" tip="Loading...">
+        <a-descriptions :column="3" bordered size="small" v-if="detailData">
+          <a-descriptions-item label="客户名称:">{{ detailData.customerName || '--' }}</a-descriptions-item>
+          <a-descriptions-item label="联系人:">{{ detailData.contactName || '--' }}</a-descriptions-item>
+          <a-descriptions-item label="联系电话:">{{ detailData.contactTel || '--' }}</a-descriptions-item>
+          <a-descriptions-item label="客户地址:" :span="3">{{ addressStr }}</a-descriptions-item>
+          <a-descriptions-item label="客户传真:">{{ detailData.fax || '--' }}</a-descriptions-item>
+          <a-descriptions-item label="配送方式:">{{ detailData.dispatchTypeDictValue || '--' }}</a-descriptions-item>
+          <a-descriptions-item label="是否卫星仓客户:">{{ detailData.satelliteFlagDictValue || '--' }}</a-descriptions-item>
+          <a-descriptions-item label="价格类型:">{{ detailData.priceTypeDictValue || '--' }}</a-descriptions-item>
+          <a-descriptions-item label="收款方式:">{{ detailData.settleStyleName || '--' }}</a-descriptions-item>
+          <a-descriptions-item label="客户类型:">{{ detailData.customerTypeName || '--' }}</a-descriptions-item>
+        </a-descriptions>
+      </a-spin>
       <div class="btn-cont"><a-button id="customer-management-detail-modal-back" @click="isShow = false">返回列表</a-button></div>
     </div>
   </a-modal>

+ 3 - 3
src/views/customerManagement/customerInfo/list.vue

@@ -90,7 +90,7 @@
       :rowKey="(record) => record.id"
       :columns="columns"
       :data="loadData"
-      :scroll="{ x: 1190, y: tableHeight }"
+      :scroll="{ x: 1240, y: tableHeight }"
       bordered>
       <!-- 操作 -->
       <template slot="action" slot-scope="text, record">
@@ -160,8 +160,8 @@ export default {
         { title: '联系电话', dataIndex: 'contactTel', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '最后销售时间', dataIndex: 'lastSaleTime', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '是否卫星仓', dataIndex: 'satelliteFlagDictValue', width: 110, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '启用禁用', scopedSlots: { customRender: 'enableAction' }, width: 200, align: 'center', fixed: 'right' },
-        { title: '操作', scopedSlots: { customRender: 'action' }, width: 200, align: 'center', fixed: 'right' }
+        { title: '启用禁用', scopedSlots: { customRender: 'enableAction' }, width: 100, align: 'center', fixed: 'right' },
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: 130, align: 'center', fixed: 'right' }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {

+ 3 - 3
src/views/financialManagement/withdrawalManagement/cashOutModal.vue

@@ -80,8 +80,8 @@ export default {
   },
   computed: {
     maxAmount () {
-      const balance = this.nowData.balance || 0
-      const serviceCharge = this.nowData.serviceCharge || 0
+      const balance = this.nowData && this.nowData.balance ? this.nowData.balance : 0
+      const serviceCharge = this.nowData && this.nowData.serviceCharge ? this.nowData.serviceCharge : 0
       if ((Number(balance) * 100 - Number(serviceCharge) * 100) <= 0) {
         return 0
       } else {
@@ -90,7 +90,7 @@ export default {
     },
     deductionAmount () {
       const amount = this.form.amount || 0
-      const serviceCharge = this.nowData.serviceCharge || 0
+      const serviceCharge = this.nowData && this.nowData.serviceCharge ? this.nowData.serviceCharge : 0
       if (amount == 0) {
         return 0
       } else {

+ 0 - 1
src/views/salesManagement/salesQuery/detail.vue

@@ -150,7 +150,6 @@ export default {
     //  返回
     handleBack () {
       this.$router.push({ name: 'salesQueryList' })
-      // this.$router.back()
     },
     // 编辑
     handleEdit () {