Browse Source

0和空 区别显示

chenrui 3 năm trước cách đây
mục cha
commit
bf61833eb3
54 tập tin đã thay đổi với 339 bổ sung247 xóa
  1. 7 3
      src/views/allocationManagement/transferOut/detail.vue
  2. 5 1
      src/views/allocationManagement/transferOut/edit.vue
  3. 1 1
      src/views/allocationManagement/transferOut/list.vue
  4. 1 1
      src/views/basicData/warehouse/storingLocation/list.vue
  5. 6 6
      src/views/dealerManagement/dealerAccountManagement/detailModal.vue
  6. 1 1
      src/views/dealerManagement/marketingDivisionSet/list.vue
  7. 49 35
      src/views/dealerManagement/merchantInfoManagement/detailModal.vue
  8. 2 2
      src/views/dealerManagement/merchantInfoManagement/list.vue
  9. 1 1
      src/views/financialManagement/financialCollection/list.vue
  10. 4 4
      src/views/financialManagement/returnConfirmation/detailModal.vue
  11. 1 1
      src/views/inventoryManagement/intelligentReplenishment/detailModal.vue
  12. 4 1
      src/views/inventoryManagement/inventoryQuery/warehouseDetail.vue
  13. 1 1
      src/views/productManagement/priceChangeRecord/list.vue
  14. 7 6
      src/views/productManagement/productBrand/detailModal.vue
  15. 1 1
      src/views/productManagement/productBrand/list.vue
  16. 1 1
      src/views/productManagement/productCategory/list.vue
  17. 21 17
      src/views/productManagement/productInfo/detailModal.vue
  18. 1 1
      src/views/productManagement/productLaunchAudit/list.vue
  19. 1 1
      src/views/productManagement/productLevel/list.vue
  20. 1 1
      src/views/productManagement/productOfflineAudit/list.vue
  21. 23 13
      src/views/productManagement/productPricing/auditModal.vue
  22. 1 1
      src/views/productManagement/productPricing/editModal.vue
  23. 9 3
      src/views/productManagement/productPricing/list.vue
  24. 1 1
      src/views/promotionRulesManagement/orderStatistics/detailModal.vue
  25. 7 7
      src/views/promotionRulesManagement/orderStatistics/list.vue
  26. 3 3
      src/views/promotionRulesManagement/productStatistics/list.vue
  27. 1 1
      src/views/promotionRulesManagement/promotionRules/detail.vue
  28. 2 2
      src/views/promotionRulesManagement/promotionRules/list.vue
  29. 1 1
      src/views/promotionRulesManagement/promotionRules/rule.vue
  30. 4 1
      src/views/purchasingManagement/bulkWarehousingOrder/detailModal.vue
  31. 4 1
      src/views/purchasingManagement/bulkWarehousingOrder/edit.vue
  32. 1 1
      src/views/purchasingManagement/bulkWarehousingOrder/list.vue
  33. 3 3
      src/views/salesManagement/backorder/detailModal.vue
  34. 4 4
      src/views/salesManagement/examineVerify/list.vue
  35. 13 13
      src/views/salesManagement/outboundOrder/detail.vue
  36. 5 3
      src/views/salesManagement/pushOrderManagement/detail.vue
  37. 3 3
      src/views/salesManagement/pushOrderManagement/list.vue
  38. 24 12
      src/views/salesManagement/salesQuery/detail.vue
  39. 6 6
      src/views/salesManagement/salesQuery/edit.vue
  40. 12 12
      src/views/salesManagement/salesQuery/list.vue
  41. 8 8
      src/views/salesManagement/salesReturn/detail.vue
  42. 3 3
      src/views/salesManagement/salesReturn/list.vue
  43. 1 1
      src/views/salesManagement/salesReturn/salesReturnCheck.vue
  44. 3 3
      src/views/salesManagement/salesReturn/salesReturnEdit.vue
  45. 3 3
      src/views/salesManagement/salesReturn/salesReturnGrabEdit.vue
  46. 11 11
      src/views/salesManagement/shortageStatisticsC/list.vue
  47. 4 4
      src/views/salesManagement/shortageStatisticsP/list.vue
  48. 4 4
      src/views/salesManagement/waitDispatch/edit.vue
  49. 10 2
      src/views/salesManagement/waitDispatch/queryPart.vue
  50. 21 12
      src/views/setting/notice/detailModal.vue
  51. 22 13
      src/views/setting/noticeManagement/detailModal.vue
  52. 3 3
      src/views/setting/noticeManagement/list.vue
  53. 2 2
      src/views/supplierManagement/associatedProductDetails/list.vue
  54. 1 1
      src/views/supplierManagement/supplierInfo/list.vue

+ 7 - 3
src/views/allocationManagement/transferOut/detail.vue

@@ -35,7 +35,11 @@
       <a-card size="small" :bordered="false" class="allocateBillDetail-cont">
         <!-- 总计 -->
         <a-alert type="info" showIcon style="margin-bottom:15px">
-          <div slot="message">总数量:<strong>{{ (productTotal&&productTotal.totalQty) || 0 }}</strong> ,总成本(¥):<strong>{{ (productTotal&&productTotal.totalCost) || 0 }}</strong> ,总售价(¥):<strong>{{ (productTotal&&productTotal.totalPrice) || 0 }}</strong></div>
+          <div slot="message">
+            总数量:<strong>{{ (productTotal&&(productTotal.totalQty || productTotal.totalQty==0)) ? productTotal.totalQty : '--' }}</strong> ,
+            总成本(¥):<strong>{{ (productTotal&&(productTotal.totalCost || productTotal.totalCost==0)) ? productTotal.totalCost : '--' }}</strong> ,
+            总售价(¥):<strong>{{ (productTotal&&(productTotal.totalPrice || productTotal.totalPrice==0)) ? productTotal.totalPrice : '--' }}</strong>
+          </div>
         </a-alert>
         <!-- 列表 -->
         <s-table
@@ -74,8 +78,8 @@ export default {
         { title: '成本价', dataIndex: 'cost', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '售价', dataIndex: 'price', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '调出数量', dataIndex: 'qty', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '成本小计(¥)', dataIndex: 'costSubtotal', width: 115, align: 'center' },
-        { title: '售价小计(¥)', dataIndex: 'priceSubtotal', width: 100, align: 'center' }
+        { title: '成本小计(¥)', dataIndex: 'costSubtotal', width: 115, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '售价小计(¥)', dataIndex: 'priceSubtotal', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {

+ 5 - 1
src/views/allocationManagement/transferOut/edit.vue

@@ -68,7 +68,11 @@
           <a-collapse-panel key="1" header="已选产品">
             <!-- 总计 -->
             <a-alert type="info" showIcon style="margin-bottom:15px">
-              <div slot="message">总数量:<strong>{{ (productTotal&&productTotal.totalQty) || 0 }}</strong> ,总成本(¥):<strong>{{ (productTotal&&productTotal.totalCost) || 0 }}</strong> ,总售价(¥):<strong>{{ (productTotal&&productTotal.totalPrice) || 0 }}</strong></div>
+              <div slot="message">
+                总数量:<strong>{{ (productTotal&&(productTotal.totalQty || productTotal.totalQty==0)) ? productTotal.totalQty : '--' }}</strong> ,
+                总成本(¥):<strong>{{ (productTotal&&(productTotal.totalCost || productTotal.totalCost==0)) ? productTotal.totalCost : '--' }}</strong> ,
+                总售价(¥):<strong>{{ (productTotal&&(productTotal.totalPrice || productTotal.totalPrice==0)) ? productTotal.totalPrice : '--' }}</strong>
+              </div>
             </a-alert>
             <!-- 筛选条件 -->
             <a-row :gutter="15">

+ 1 - 1
src/views/allocationManagement/transferOut/list.vue

@@ -148,7 +148,7 @@ export default {
       exportLoading: false,
       columns: [
         { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
-        { title: '创建时间', dataIndex: 'createDate', width: 160, align: 'center' },
+        { title: '创建时间', dataIndex: 'createDate', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '调拨单号', scopedSlots: { customRender: 'allocateNo' }, align: 'center' },
         { title: '调往对象', dataIndex: 'targetName', width: 220, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '客户类型', dataIndex: 'dealerLevelDictValue', width: 160, align: 'center', customRender: function (text) { return text || '--' } },

+ 1 - 1
src/views/basicData/warehouse/storingLocation/list.vue

@@ -82,7 +82,7 @@ export default {
       disabled: false, //  查询、重置按钮是否可操作
       columns: [
         { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
-        { title: '仓位名称', dataIndex: 'name', align: 'center', ellipsis: true },
+        { title: '仓位名称', dataIndex: 'name', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: 160, align: 'center' }
       ],
       // 加载数据方法 必须为 Promise 对象

+ 6 - 6
src/views/dealerManagement/dealerAccountManagement/detailModal.vue

@@ -8,13 +8,13 @@
     v-model="isShow"
     @cancle="isShow=false"
     :width="800">
-    <div v-if="detailData">
+    <div>
       <a-descriptions bordered size="small" :column="2">
-        <a-descriptions-item label="经销商名称:">{{ (detailData.org&&detailData.org.name) || '--' }}</a-descriptions-item>
-        <a-descriptions-item label="管理员姓名:">{{ detailData.name || '--' }}</a-descriptions-item>
-        <a-descriptions-item label="管理员手机:">{{ detailData.phone || '--' }}</a-descriptions-item>
-        <a-descriptions-item label="管理员账号:">{{ detailData.loginName || '--' }}</a-descriptions-item>
-        <a-descriptions-item label="最大可开通用户数(含管理员账号):">{{ (detailData.org&&detailData.org.childUserMaxNum) || '--' }}</a-descriptions-item>
+        <a-descriptions-item label="经销商名称:">{{ (detailData&&detailData.org&&detailData.org.name) ? detailData.org.name : '--' }}</a-descriptions-item>
+        <a-descriptions-item label="管理员姓名:">{{ detailData&&detailData.name ? detailData.name : '--' }}</a-descriptions-item>
+        <a-descriptions-item label="管理员手机:">{{ detailData&&detailData.phone ? detailData.phone : '--' }}</a-descriptions-item>
+        <a-descriptions-item label="管理员账号:">{{ detailData&&detailData.loginName ? detailData.loginName : '--' }}</a-descriptions-item>
+        <a-descriptions-item label="最大可开通用户数(含管理员账号):">{{ (detailData&&detailData.org&&detailData.org.childUserMaxNum) ? detailData.org.childUserMaxNum : '--' }}</a-descriptions-item>
       </a-descriptions>
       <div class="btn-cont"><a-button id="dealerAccountDetail-modal-back" @click="isShow = false">关闭</a-button></div>
     </div>

+ 1 - 1
src/views/dealerManagement/marketingDivisionSet/list.vue

@@ -63,7 +63,7 @@ export default {
       disabled: false, //  查询、重置按钮是否可操作
       columns: [
         { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
-        { title: '分区名', dataIndex: 'subareaName', width: 200, align: 'center' },
+        { title: '分区名', dataIndex: 'subareaName', width: 200, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '省份/市', scopedSlots: { customRender: 'cityArea' }, align: 'left' },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: 150, align: 'center' }
       ],

+ 49 - 35
src/views/dealerManagement/merchantInfoManagement/detailModal.vue

@@ -9,19 +9,24 @@
     @cancle="isShow=false"
     :width="960">
     <a-spin :spinning="spinning" tip="Loading...">
-      <div v-if="form">
+      <div>
         <a-collapse :activeKey="['1','2','3']" class="merchantInfoManagement-cont-m">
           <a-collapse-panel key="1" header="基础信息">
             <a-descriptions :column="2" bordered size="small">
-              <a-descriptions-item label="经销商名称">{{ form.dealerName || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="经销商别名">{{ form.dealerAlias || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="商户类型">{{ form.dealerTypeDictValue || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="联系人1">{{ form.contact || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="联系手机1">{{ form.contactMobile || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="联系角色1">{{ form.contactRole || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="联系电话">{{ form.dealerTelephone || '--' }}</a-descriptions-item>
+              <a-descriptions-item label="经销商名称">{{ form&&form.dealerName ? form.dealerName : '--' }}</a-descriptions-item>
+              <a-descriptions-item label="经销商别名">{{ form&&form.dealerAlias ? form.dealerAlias : '--' }}</a-descriptions-item>
+              <a-descriptions-item label="商户类型">{{ form&&form.dealerTypeDictValue ? form.dealerTypeDictValue : '--' }}</a-descriptions-item>
+              <a-descriptions-item label="联系人1">{{ form&&form.contact ? form.contact : '--' }}</a-descriptions-item>
+              <a-descriptions-item label="联系手机1">{{ form&&form.contactMobile ? form.contactMobile : '--' }}</a-descriptions-item>
+              <a-descriptions-item label="联系角色1">{{ form&&form.contactRole ? form.contactRole : '--' }}</a-descriptions-item>
+              <a-descriptions-item label="联系电话">{{ form&&form.dealerTelephone ? form.dealerTelephone : '--' }}</a-descriptions-item>
               <a-descriptions-item label="地址">
-                <span v-if="form.provinceName || form.cityName || form.districtName || form.address">{{ form.provinceName }}{{ form.cityName }}{{ form.districtName }}{{ form.address }}</span>
+                <span v-if="form&&(form.provinceName || form.cityName || form.districtName || form.address)">
+                  {{ form&&form.provinceName ? form.provinceName : '' }}
+                  {{ form&&form.cityName ? form.cityName : '' }}
+                  {{ form&&form.districtName ? form.districtName : '' }}
+                  {{ form&&form.address ? form.address : '' }}
+                </span>
                 <span v-else>--</span>
               </a-descriptions-item>
             </a-descriptions>
@@ -30,44 +35,49 @@
         <a-collapse class="merchantInfoManagement-cont-m">
           <a-collapse-panel key="2" header="公司信息">
             <a-descriptions :column="2" bordered size="small">
-              <a-descriptions-item label="经营方式">{{ form.busniessMode || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="经营项目">{{ form.busniessItmes || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="公司规模">{{ form.busniessScope || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="成立时间">{{ form.buildDate || '--' }}</a-descriptions-item>
+              <a-descriptions-item label="经营方式">{{ form&&form.busniessMode ? form.busniessMode : '--' }}</a-descriptions-item>
+              <a-descriptions-item label="经营项目">{{ form&&form.busniessItmes ? form.busniessItmes : '--' }}</a-descriptions-item>
+              <a-descriptions-item label="公司规模">{{ form&&form.busniessScope ? form.busniessScope : '--' }}</a-descriptions-item>
+              <a-descriptions-item label="成立时间">{{ form&&form.buildDate ? form.buildDate : '--' }}</a-descriptions-item>
               <a-descriptions-item label="一般纳税人">
-                <span v-if="form.isTaxpayer">{{ form.isTaxpayer == 1 ? '是':'否' }}</span>
+                <span v-if="form&&form.isTaxpayer">{{ form&&form.isTaxpayer == 1 ? '是':'否' }}</span>
                 <span v-else>--</span>
               </a-descriptions-item>
-              <a-descriptions-item label="身份证号码">{{ form.indentityCard || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="生日">{{ form.brithday || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="籍贯">{{ form.nativePlace || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="邮箱">{{ form.mail || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="联系人2">{{ form.contact2 || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="联系角色2">{{ form.contractRole2 || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="联系手机2">{{ form.contactMobile2 || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="邮政编码">{{ form.zipCode || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="收货人">{{ form.receiveContact || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="收货人电话">{{ form.receiveMobile || '--' }}</a-descriptions-item>
+              <a-descriptions-item label="身份证号码">{{ form&&form.indentityCard ? form.indentityCard : '--' }}</a-descriptions-item>
+              <a-descriptions-item label="生日">{{ form&&form.brithday ? form.brithday : '--' }}</a-descriptions-item>
+              <a-descriptions-item label="籍贯">{{ form&&form.nativePlace ? form.nativePlace : '--' }}</a-descriptions-item>
+              <a-descriptions-item label="邮箱">{{ form&&form.mail ? form.mail : '--' }}</a-descriptions-item>
+              <a-descriptions-item label="联系人2">{{ form&&form.contact2 ? form.contact2 : '--' }}</a-descriptions-item>
+              <a-descriptions-item label="联系角色2">{{ form&&form.contractRole2 ? form.contractRole2 : '--' }}</a-descriptions-item>
+              <a-descriptions-item label="联系手机2">{{ form&&form.contactMobile2 ? form.contactMobile2 : '--' }}</a-descriptions-item>
+              <a-descriptions-item label="邮政编码">{{ form&&form.zipCode ? form.zipCode : '--' }}</a-descriptions-item>
+              <a-descriptions-item label="收货人">{{ form&&form.receiveContact ? form.receiveContact : '--' }}</a-descriptions-item>
+              <a-descriptions-item label="收货人电话">{{ form&&form.receiveMobile ? form.receiveMobile : '--' }}</a-descriptions-item>
               <a-descriptions-item label="收货地址">
-                <span v-if="form.receiveProvinceName || form.receiveCityName || form.receiveDistrictName || form.receiveAddress">{{ form.receiveProvinceName }}{{ form.receiveCityName }}{{ form.receiveDistrictName }}{{ form.receiveAddress }}</span>
+                <span v-if="form&&(form.receiveProvinceName || form.receiveCityName || form.receiveDistrictName || form.receiveAddress)">
+                  {{ form&&form.receiveProvinceName ? form.receiveProvinceName : '' }}
+                  {{ form&&form.receiveCityName ? form.receiveCityName : '' }}
+                  {{ form&&form.receiveDistrictName ? form.receiveDistrictName : '' }}
+                  {{ form&&form.receiveAddress ? form.receiveAddress : '' }}
+                </span>
                 <span v-else>--</span>
               </a-descriptions-item>
-              <a-descriptions-item label="银行账户">{{ form.tradeAccountName || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="开户行">{{ form.tradeBankName || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="银行账号">{{ form.tradeBankAccount || '--' }}</a-descriptions-item>
+              <a-descriptions-item label="银行账户">{{ form&&form.tradeAccountName ? form.tradeAccountName : '--' }}</a-descriptions-item>
+              <a-descriptions-item label="开户行">{{ form&&form.tradeBankName ? form.tradeBankName : '--' }}</a-descriptions-item>
+              <a-descriptions-item label="银行账号">{{ form&&form.tradeBankAccount ? form.tradeBankAccount : '--' }}</a-descriptions-item>
             </a-descriptions>
           </a-collapse-panel>
         </a-collapse>
         <a-collapse class="merchantInfoManagement-cont-m">
           <a-collapse-panel key="3" header="总部信息">
             <a-descriptions :column="2" bordered size="small">
-              <a-descriptions-item label="箭冠汽配代码">{{ form.jgAutoPartsCode || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="门头更换日期">{{ form.jgDoorHeaderChangeTime || '--' }}</a-descriptions-item>
+              <a-descriptions-item label="箭冠汽配代码">{{ form&&form.jgAutoPartsCode ? form.jgAutoPartsCode : '--' }}</a-descriptions-item>
+              <a-descriptions-item label="门头更换日期">{{ form&&form.jgDoorHeaderChangeTime ? form.jgDoorHeaderChangeTime : '--' }}</a-descriptions-item>
               <a-descriptions-item label="特约价是否可见">
-                <span v-if="form.isShowSpecialPrice">{{ form.isShowSpecialPrice == 1 ? '是':'否' }}</span>
+                <span v-if="form&&form.isShowSpecialPrice">{{ form&&form.isShowSpecialPrice == 1 ? '是':'否' }}</span>
                 <span v-else>--</span>
               </a-descriptions-item>
-              <a-descriptions-item label="备注">{{ form.remark || '--' }}</a-descriptions-item>
+              <a-descriptions-item label="备注">{{ form&&form.remark ? form.remark : '--' }}</a-descriptions-item>
             </a-descriptions>
           </a-collapse-panel>
         </a-collapse>
@@ -83,9 +93,6 @@
           <a-button id="merchantInfoManagement-back" size="large" @click="isShow = false" style="font-size: 12px;">返回列表</a-button>
         </div>
       </div>
-      <div style="padding: 50px;text-align: center;" v-else>
-        <a-spin />
-      </div>
     </a-spin>
     <!-- 审核 -->
     <auditModal :openModal="visibleAudit" @close="visibleAudit=false" @ok="auditOrder('PASS')" @fail="auditOrder('REJECT')" />
@@ -139,16 +146,23 @@ export default {
     },
     // 详情编辑
     getDetail () {
+      this.spinning = true
       if (this.isAudit) {
         dealerFindUpdateInfoBySn({ sn: this.itemId }).then(res => {
           if (res.status == 200) {
             this.form = res.data
+            this.spinning = false
+          } else {
+            this.spinning = false
           }
         })
       } else {
         dealerDetailBySn({ sn: this.itemId }).then(res => {
           if (res.status == 200) {
             this.form = res.data
+            this.spinning = false
+          } else {
+            this.spinning = false
           }
         })
       }

+ 2 - 2
src/views/dealerManagement/merchantInfoManagement/list.vue

@@ -130,7 +130,7 @@ export default {
       total: 0,
       columns: [
         { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
-        { title: '创建时间', dataIndex: 'createDate', width: 160, align: 'center' },
+        { title: '创建时间', dataIndex: 'createDate', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '区域', scopedSlots: { customRender: 'area' }, width: 200, align: 'center' },
         { title: '商户名称', scopedSlots: { customRender: 'dealerName' }, align: 'center', ellipsis: true },
         { title: '商户别名', dataIndex: 'dealerAlias', width: 200, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
@@ -154,7 +154,7 @@ export default {
         return dealerQueryList(Object.assign(parameter, this.queryParam)).then(res => {
           const data = res.data
           const no = (data.pageNo - 1) * data.pageSize
-          this.total = data.count
+          this.total = data.count || 0
           for (var i = 0; i < data.list.length; i++) {
             data.list[i].no = no + i + 1
           }

+ 1 - 1
src/views/financialManagement/financialCollection/list.vue

@@ -209,7 +209,7 @@ export default {
           for (var i = 0; i < data.list.length; i++) {
             data.list[i].no = no + i + 1
           }
-          this.total = data.count
+          this.total = data.count || 0
           this.disabled = false
           return data
         })

+ 4 - 4
src/views/financialManagement/returnConfirmation/detailModal.vue

@@ -21,10 +21,10 @@
               <a-descriptions-item label="客户名称">{{ detailData&&detailData.buyerName || '--' }}</a-descriptions-item>
               <a-descriptions-item label="销退单号">{{ detailData&&detailData.salesReturnBillNo || '--' }}</a-descriptions-item>
               <a-descriptions-item label="创建时间">{{ detailData&&detailData.createDate || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="退货数量">{{ detailData&&detailData.totalQty || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="坏件数量">{{ detailData&&detailData.totalBadQty || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="返库数量">{{ detailData&&detailData.totalBackStockQty || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="退货金额">{{ detailData&&detailData.totalAmount || '--' }}</a-descriptions-item>
+              <a-descriptions-item label="退货数量">{{ detailData&&(detailData.totalQty || detailData.totalQty==0) ? detailData.totalQty : '--' }}</a-descriptions-item>
+              <a-descriptions-item label="坏件数量">{{ detailData&&(detailData.totalBadQty || detailData.totalBadQty==0) ? detailData.totalBadQty : '--' }}</a-descriptions-item>
+              <a-descriptions-item label="返库数量">{{ detailData&&(detailData.totalBackStockQty || detailData.totalBackStockQty==0) ? detailData.totalBackStockQty : '--' }}</a-descriptions-item>
+              <a-descriptions-item label="退货金额">{{ detailData&&(detailData.totalAmount || detailData.totalAmount==0) ? detailData.totalAmount : '--' }}</a-descriptions-item>
             </a-descriptions>
           </a-collapse-panel>
         </a-collapse>

+ 1 - 1
src/views/inventoryManagement/intelligentReplenishment/detailModal.vue

@@ -14,7 +14,7 @@
       </a-alert>
       <div class="module-cont" v-if="detailData">
         <p class="title">产品范围</p>
-        <a-tag color="blue" style="margin-bottom: 10px;">{{ detailData.stockPredictRange==0?'自选产品':'全部产品' }}</a-tag>
+        <a-tag color="blue" style="margin-bottom: 10px;">{{ detailData&&detailData.stockPredictRange==0?'自选产品':'全部产品' }}</a-tag>
         <a-table
           class="sTable"
           ref="table"

+ 4 - 1
src/views/inventoryManagement/inventoryQuery/warehouseDetail.vue

@@ -65,7 +65,10 @@
       </div>
       <!-- 合计 -->
       <a-alert type="info" showIcon style="margin-bottom:15px">
-        <div class="ftext" slot="message">当前库存总数量(个):<strong>{{ (productTotal&&productTotal.totalQty) ? productTotal.totalQty : 0 }}</strong>;当前库存总成本(¥):<strong>{{ (productTotal&&productTotal.totalCost) ? productTotal.totalCost : 0 }}</strong>。</div>
+        <div class="ftext" slot="message">
+          当前库存总数量(个):<strong>{{ (productTotal&&(productTotal.totalQty || productTotal.totalQty==0)) ? productTotal.totalQty : '--' }}</strong>;
+          当前库存总成本(¥):<strong>{{ (productTotal&&(productTotal.totalCost || productTotal.totalCost==0)) ? productTotal.totalCost : '--' }}</strong>。
+        </div>
       </a-alert>
       <!-- 列表 -->
       <s-table

+ 1 - 1
src/views/productManagement/priceChangeRecord/list.vue

@@ -154,7 +154,7 @@ export default {
         { title: '序号', dataIndex: 'no', width: 80, align: 'center', fixed: 'left' },
         { title: '变更时间', dataIndex: 'updateDate', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品名称', dataIndex: 'productEntity.name', align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
-        { title: '产品编码', dataIndex: 'productEntity.code', width: 220, align: 'center' },
+        { title: '产品编码', dataIndex: 'productEntity.code', width: 220, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '品牌', dataIndex: 'productEntity.productBrandName', width: 200, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品分类', scopedSlots: { customRender: 'productType' }, width: 200, align: 'center' },
         { title: '单位', dataIndex: 'productEntity.unit', width: 100, align: 'center', customRender: function (text) { return text || '--' } },

+ 7 - 6
src/views/productManagement/productBrand/detailModal.vue

@@ -8,16 +8,17 @@
     v-model="isShow"
     @cancle="isShow=false"
     :width="960">
-    <div v-if="detailsData">
+    <div>
       <a-descriptions bordered size="default" :column="1">
-        <a-descriptions-item label="品牌名称:">{{ detailsData.brandName || '--' }}</a-descriptions-item>
-        <a-descriptions-item label="品牌分类:">{{ detailsData.brandTypeDictValue || '--' }}</a-descriptions-item>
-        <a-descriptions-item label="排序字母:">{{ detailsData.sortChar || '--' }}</a-descriptions-item>
+        <a-descriptions-item label="品牌名称:">{{ detailsData&&detailsData.brandName || '--' }}</a-descriptions-item>
+        <a-descriptions-item label="品牌分类:">{{ detailsData&&detailsData.brandTypeDictValue || '--' }}</a-descriptions-item>
+        <a-descriptions-item label="排序字母:">{{ detailsData&&detailsData.sortChar || '--' }}</a-descriptions-item>
         <a-descriptions-item label="品牌图片:">
-          <img :src="detailsData.imageUrl" title="点击查看大图" class="productPic" @click="getPreview(detailsData.imageUrl)" />
+          <img v-if="detailsData&&detailsData.imageUrl" :src="detailsData.imageUrl" title="点击查看大图" class="productPic" @click="getPreview(detailsData.imageUrl)" />
+          <span v-else>--</span>
         </a-descriptions-item>
         <a-descriptions-item label="品牌介绍:">
-          <div v-if="detailsData.brandIntroduce" v-html="detailsData.brandIntroduce"></div>
+          <div v-if="detailsData&&detailsData.brandIntroduce" v-html="detailsData.brandIntroduce"></div>
           <span v-else>--</span>
         </a-descriptions-item>
       </a-descriptions>

+ 1 - 1
src/views/productManagement/productBrand/list.vue

@@ -113,7 +113,7 @@ export default {
       disabled: false, //  查询、重置按钮是否可操作
       columns: [
         { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
-        { title: '创建时间', dataIndex: 'createDate', width: 160, align: 'center' },
+        { title: '创建时间', dataIndex: 'createDate', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '品牌图片', scopedSlots: { customRender: 'imageUrl' }, width: 140, align: 'center' },
         { title: '品牌名称', dataIndex: 'brandName', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '品牌分类', dataIndex: 'brandTypeDictValue', align: 'center', customRender: function (text) { return text || '--' } },

+ 1 - 1
src/views/productManagement/productCategory/list.vue

@@ -68,7 +68,7 @@ export default {
       },
       columns: [
         { title: '分类名称', dataIndex: 'productTypeName', align: 'left' },
-        { title: '创建时间', dataIndex: 'createDate', width: 320, align: 'center' },
+        { title: '创建时间', dataIndex: 'createDate', width: 320, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: 300, align: 'center' }
       ],
       // 加载数据方法 必须为 Promise 对象

+ 21 - 17
src/views/productManagement/productInfo/detailModal.vue

@@ -9,16 +9,20 @@
     @cancle="isShow=false"
     :width="800">
     <!-- 产品详情 -->
-    <div v-if="detailsData">
+    <div>
       <a-descriptions bordered size="small" :column="2">
-        <a-descriptions-item label="产品名称:">{{ detailsData.name || '--' }}</a-descriptions-item>
-        <a-descriptions-item label="产品编码:">{{ detailsData.code || '--' }}</a-descriptions-item>
-        <a-descriptions-item label="原厂编码:">{{ detailsData.origCode || '--' }}</a-descriptions-item>
-        <a-descriptions-item label="产品品牌:">{{ detailsData.productBrandName || '--' }}</a-descriptions-item>
+        <a-descriptions-item label="产品名称:">{{ detailsData&&detailsData.name || '--' }}</a-descriptions-item>
+        <a-descriptions-item label="产品编码:">{{ detailsData&&detailsData.code || '--' }}</a-descriptions-item>
+        <a-descriptions-item label="原厂编码:">{{ detailsData&&detailsData.origCode || '--' }}</a-descriptions-item>
+        <a-descriptions-item label="产品品牌:">{{ detailsData&&detailsData.productBrandName || '--' }}</a-descriptions-item>
         <a-descriptions-item label="产品分类:">{{ productTypeName || '--' }}</a-descriptions-item>
-        <a-descriptions-item label="其他编码:">{{ detailsData.otherCode || '--' }}</a-descriptions-item>
-        <a-descriptions-item label="包装数:">{{ detailsData.packQty || '--' }}{{ detailsData.unit || '--' }}/{{ detailsData.packQtyUnit || '--' }}</a-descriptions-item>
-        <a-descriptions-item label="箭冠产品:">{{ detailsData.arrowFalgDictValue || '--' }}</a-descriptions-item>
+        <a-descriptions-item label="其他编码:">{{ detailsData&&detailsData.otherCode || '--' }}</a-descriptions-item>
+        <a-descriptions-item label="包装数:">
+          {{ detailsData&&detailsData.packQty || '--' }}
+          {{ detailsData&&detailsData.unit || '--' }}/
+          {{ detailsData&&detailsData.packQtyUnit || '--' }}
+        </a-descriptions-item>
+        <a-descriptions-item label="箭冠产品:">{{ detailsData&&detailsData.arrowFalgDictValue || '--' }}</a-descriptions-item>
         <a-descriptions-item label="产品图片:" :span="2">
           <div style="display: flex;">
             <p class="pic-box" v-for="(item,index) in fileList" :key="index">
@@ -27,17 +31,17 @@
           </div>
           <span v-if="fileList.length == 0">--</span>
         </a-descriptions-item>
-        <a-descriptions-item label="单位:">{{ detailsData.unit || '--' }}</a-descriptions-item>
-        <a-descriptions-item label="产品尺寸:">{{ detailsData.size || '--' }}</a-descriptions-item>
-        <a-descriptions-item label="产品内盒尺寸:">{{ detailsData.boxSize || '--' }}</a-descriptions-item>
-        <a-descriptions-item label="产品重量:">{{ detailsData.weight || '--' }}</a-descriptions-item>
-        <a-descriptions-item label="颜色:" span="2">{{ detailsData.color || '--' }}</a-descriptions-item>
+        <a-descriptions-item label="单位:">{{ detailsData&&detailsData.unit || '--' }}</a-descriptions-item>
+        <a-descriptions-item label="产品尺寸:">{{ detailsData&&detailsData.size || '--' }}</a-descriptions-item>
+        <a-descriptions-item label="产品内盒尺寸:">{{ detailsData&&detailsData.boxSize || '--' }}</a-descriptions-item>
+        <a-descriptions-item label="产品重量:">{{ detailsData&&detailsData.weight || '--' }}</a-descriptions-item>
+        <a-descriptions-item label="颜色:" span="2">{{ detailsData&&detailsData.color || '--' }}</a-descriptions-item>
         <a-descriptions-item label="产品说明:" span="2">
-          <div v-html="detailsData.description" v-if="detailsData.description" style="overflow-y: scroll;height: 300px;"></div>
+          <div v-html="detailsData.description" v-if="detailsData&&detailsData.description" style="overflow-y: scroll;height: 300px;"></div>
           <div v-else>--</div>
         </a-descriptions-item>
         <a-descriptions-item label="其他说明:" span="2">
-          <div v-html="detailsData.otherDesc" v-if="detailsData.otherDesc"></div>
+          <div v-html="detailsData.otherDesc" v-if="detailsData&&detailsData.otherDesc"></div>
           <div v-else>--</div>
         </a-descriptions-item>
       </a-descriptions>
@@ -65,8 +69,8 @@ export default {
   },
   computed: {
     productTypeName () {
-      const productTypeName2 = this.detailsData.productTypeName2 ? this.detailsData.productTypeName2 : ''
-      const productTypeName3 = this.detailsData.productTypeName3 ? ' > ' + this.detailsData.productTypeName3 : ''
+      const productTypeName2 = this.detailsData && this.detailsData.productTypeName2 ? this.detailsData.productTypeName2 : ''
+      const productTypeName3 = this.detailsData && this.detailsData.productTypeName3 ? ' > ' + this.detailsData.productTypeName3 : ''
       return productTypeName2 + productTypeName3
     }
   },

+ 1 - 1
src/views/productManagement/productLaunchAudit/list.vue

@@ -88,7 +88,7 @@ export default {
       disabled: false, //  查询、重置按钮是否可操作
       columns: [
         { title: '产品名称', dataIndex: 'name', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '产品编码', dataIndex: 'code', width: 220, align: 'center' },
+        { title: '产品编码', dataIndex: 'code', width: 220, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品分类', scopedSlots: { customRender: 'productType' }, width: 200, align: 'center' },
         { title: '提交时间', dataIndex: 'onlineSubmitTime', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '提交人', dataIndex: 'onlineSubmitPerson', width: 140, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },

+ 1 - 1
src/views/productManagement/productLevel/list.vue

@@ -125,7 +125,7 @@ export default {
       columns: [
         { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
         { title: '产品名称', dataIndex: 'name', align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
-        { title: '产品编码', dataIndex: 'code', width: 220, align: 'center' },
+        { title: '产品编码', dataIndex: 'code', width: 220, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '原厂编码', dataIndex: 'origCode', width: 220, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '品牌', dataIndex: 'productBrandName', width: 200, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品分类', scopedSlots: { customRender: 'productType' }, width: 200, align: 'center' },

+ 1 - 1
src/views/productManagement/productOfflineAudit/list.vue

@@ -142,7 +142,7 @@ export default {
       disabled: false, //  查询、重置按钮是否可操作
       columns: [
         { title: '产品名称', dataIndex: 'name', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '产品编码', dataIndex: 'code', width: 220, align: 'center' },
+        { title: '产品编码', dataIndex: 'code', width: 220, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品分类', scopedSlots: { customRender: 'productType' }, width: 200, align: 'center' },
         { title: '提交时间', dataIndex: 'offlineSubmitTime', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '提交人', dataIndex: 'offlineSubmitPerson', width: 140, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },

+ 23 - 13
src/views/productManagement/productPricing/auditModal.vue

@@ -10,35 +10,45 @@
     :width="800">
     <a-spin :spinning="spinning" tip="Loading...">
       <!-- 定价审核 -->
-      <div v-if="detailsData">
+      <div>
         <a-descriptions bordered :column="1">
           <a-descriptions-item label="成本价">
             <div v-if="detailsData && detailsData.supplierProductList" style="margin-top: 8px;">
-              <p v-for="(item, index) in detailsData.supplierProductList" :key="index" style="margin: 0;">{{ ((item.cost || item.cost==0) ? item.cost.toFixed(2) : '--') + ' 元 -- ' + item.supplierName + ';' }}</p>
+              <p v-for="(item, index) in detailsData.supplierProductList" :key="index" style="margin: 0;">{{ ((item.cost || item.cost==0) ? item.cost.toFixed(2) : '--') + ' 元 -- ' + (item.supplierName||'') + ';' }}</p>
             </div>
             <span v-else>--</span>
           </a-descriptions-item>
           <a-descriptions-item label="省级价">
-            {{ detailsData.afterProvincePrice }}
-            <span v-if="detailsData.afterProvincePrice != detailsData.beforeProvincePrice">(原{{ detailsData.beforeProvincePrice }})</span>
+            {{ detailsData && (detailsData.afterProvincePrice || detailsData.afterProvincePrice==0) ? detailsData.afterProvincePrice : '--' }}
+            <span v-if="detailsData && (detailsData.afterProvincePrice != detailsData.beforeProvincePrice)">
+              (原{{ (detailsData.beforeProvincePrice || detailsData.beforeProvincePrice==0) ? detailsData.beforeProvincePrice : '--' }})
+            </span>
           </a-descriptions-item>
           <a-descriptions-item label="市级价">
-            {{ detailsData.afterCityPrice }}
-            <span v-if="detailsData.afterCityPrice != detailsData.beforeCityPrice">(原{{ detailsData.beforeCityPrice }})</span>
+            {{ detailsData && (detailsData.afterCityPrice || detailsData.afterCityPrice==0) ? detailsData.afterCityPrice : '--' }}
+            <span v-if="detailsData && (detailsData.afterCityPrice != detailsData.beforeCityPrice)">
+              (原{{ (detailsData.beforeCityPrice || detailsData.beforeCityPrice==0) ? detailsData.beforeCityPrice : '--' }})
+            </span>
           </a-descriptions-item>
           <a-descriptions-item label="特约价">
-            {{ detailsData.afterSpecialPrice }}
-            <span v-if="detailsData.afterSpecialPrice != detailsData.beforeSpecialPrice">(原{{ detailsData.beforeSpecialPrice }})</span>
+            {{ detailsData && (detailsData.afterSpecialPrice || detailsData.afterSpecialPrice==0) ? detailsData.afterSpecialPrice : '--' }}
+            <span v-if="detailsData && (detailsData.afterSpecialPrice != detailsData.beforeSpecialPrice)">
+              (原{{ (detailsData.beforeSpecialPrice || detailsData.beforeSpecialPrice==0) ? detailsData.beforeSpecialPrice : '--' }})
+            </span>
           </a-descriptions-item>
           <a-descriptions-item label="终端价">
-            {{ detailsData.afterTerminalPrice }}
-            <span v-if="detailsData.afterTerminalPrice != detailsData.beforeTerminalPrice">(原{{ detailsData.beforeTerminalPrice }})</span>
+            {{ detailsData && (detailsData.afterTerminalPrice || detailsData.afterTerminalPrice==0) ? detailsData.afterTerminalPrice : '--' }}
+            <span v-if="detailsData && (detailsData.afterTerminalPrice != detailsData.beforeTerminalPrice)">
+              (原{{ (detailsData.beforeTerminalPrice || detailsData.beforeTerminalPrice==0) ? detailsData.beforeTerminalPrice : '--' }})
+            </span>
           </a-descriptions-item>
           <a-descriptions-item label="车主价">
-            {{ detailsData.afterCarOwnersPrice }}
-            <span v-if="detailsData.afterCarOwnersPrice != detailsData.beforeCarOwnersPrice">(原{{ detailsData.beforeCarOwnersPrice }})</span>
+            {{ detailsData && (detailsData.afterCarOwnersPrice || detailsData.afterCarOwnersPrice==0) ? detailsData.afterCarOwnersPrice : '--' }}
+            <span v-if="detailsData && (detailsData.afterCarOwnersPrice != detailsData.beforeCarOwnersPrice)">
+              (原{{ (detailsData.beforeCarOwnersPrice || detailsData.beforeCarOwnersPrice==0) ? detailsData.beforeCarOwnersPrice : '--' }})
+            </span>
           </a-descriptions-item>
-          <a-descriptions-item label="变更原因">{{ detailsData.changeReason }}</a-descriptions-item>
+          <a-descriptions-item label="变更原因">{{ detailsData && detailsData.changeReason || '--' }}</a-descriptions-item>
         </a-descriptions>
         <div class="btn-cont">
           <a-button type="primary" id="productPricingAudit-save" @click="handleAudit">审核通过</a-button>

+ 1 - 1
src/views/productManagement/productPricing/editModal.vue

@@ -21,7 +21,7 @@
         >
           <a-form-model-item label="成本价">
             <div v-if="detailData && detailData.supplierProductList" style="margin-top: 8px;">
-              <p v-for="(item, index) in detailData.supplierProductList" :key="index" style="margin: 0;line-height: 1.5em;">{{ ((item.cost || item.cost==0) ? item.cost.toFixed(2) : '--') + ' 元 -- ' + item.supplierName + ';' }}</p>
+              <p v-for="(item, index) in detailData.supplierProductList" :key="index" style="margin: 0;line-height: 1.5em;">{{ ((item.cost || item.cost==0) ? item.cost.toFixed(2) : '--') + ' 元 -- ' + (item.supplierName||'') + ';' }}</p>
             </div>
             <span v-else>--</span>
           </a-form-model-item>

+ 9 - 3
src/views/productManagement/productPricing/list.vue

@@ -88,7 +88,7 @@
         <div v-if="record.supplierProductList">
           <p v-for="(item, index) in record.supplierProductList" :key="index" style="margin: 0;">
             <span>{{ (item.cost || item.cost==0) ? item.cost.toFixed(2):'--' }}</span>元 -
-            <span>{{ item.supplierName }}</span>;
+            <span>{{ (item.supplierName||'') }}</span>;
           </p>
         </div>
         <span v-else>--</span>
@@ -102,7 +102,13 @@
           class="button-warning"
           @click="handleAudit(record)"
           id="productPricingList-audit-btn">审核</a-button>
-        <a-button size="small" type="link" v-if="$hasPermissions('B_productPricing_edit')" class="button-info" @click="handleEdit(record)" id="productPricingList-edit-btn">编辑</a-button>
+        <a-button
+          size="small"
+          type="link"
+          v-if="$hasPermissions('B_productPricing_edit')"
+          class="button-info"
+          @click="handleEdit(record)"
+          id="productPricingList-edit-btn">编辑</a-button>
         <span v-if="!(record.pricingState=='WAIT_PRICING_AUDIT' && $hasPermissions('B_productPricing_audit')) && !$hasPermissions('B_productPricing_edit')">--</span>
       </template>
     </s-table>
@@ -141,7 +147,7 @@ export default {
         { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
         { title: '创建时间', dataIndex: 'createDate', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品名称', dataIndex: 'name', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '产品编码', dataIndex: 'code', width: 220, align: 'center' },
+        { title: '产品编码', dataIndex: 'code', width: 220, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '原厂编码', dataIndex: 'origCode', width: 220, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '品牌', dataIndex: 'productBrandName', width: 200, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品分类', scopedSlots: { customRender: 'productType' }, width: 200, align: 'center' },

+ 1 - 1
src/views/promotionRulesManagement/orderStatistics/detailModal.vue

@@ -56,7 +56,7 @@ export default {
       // 表头
       columns: [
         { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
-        { title: '产品编码', dataIndex: 'productEntity.code', width: 220, align: 'center' },
+        { title: '产品编码', dataIndex: 'productEntity.code', width: 220, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品名称', dataIndex: 'productEntity.name', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '原价', dataIndex: 'origPrice', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '促销价', dataIndex: 'price', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },

+ 7 - 7
src/views/promotionRulesManagement/orderStatistics/list.vue

@@ -54,12 +54,12 @@
     <!-- alert -->
     <a-alert type="info" showIcon style="margin-bottom:15px">
       <div slot="message">
-        促销品原价总额:<strong>{{ productTotal ? ((productTotal.totalOrigAmount || productTotal.totalOrigAmount==0) ? productTotal.totalOrigAmount : '--') : '--' }}</strong>,
-        促销品促销价总额:<strong>{{ productTotal ? ((productTotal.totalAmount || productTotal.totalAmount==0) ? productTotal.totalAmount : '--') : '--' }}</strong>,
-        节省总额:<strong>{{ productTotal ? ((productTotal.totalEconomizeAmount || productTotal.totalEconomizeAmount==0) ? productTotal.totalEconomizeAmount : '--') : '--' }}</strong>,
-        总单数:<strong>{{ productTotal ? ((productTotal.totalRecord || productTotal.totalRecord==0) ? productTotal.totalRecord : '--') : '--' }}</strong>,
-        总款数:<strong>{{ productTotal ? ((productTotal.totalCategory || productTotal.totalCategory==0) ? productTotal.totalCategory : '--') : '--' }}</strong>,
-        总数量:<strong>{{ productTotal ? ((productTotal.totalQty || productTotal.totalQty==0) ? productTotal.totalQty : '--') : '--' }}</strong>
+        促销品原价总额:<strong>{{ productTotal && (productTotal.totalOrigAmount || productTotal.totalOrigAmount==0) ? productTotal.totalOrigAmount : '--' }}</strong>,
+        促销品促销价总额:<strong>{{ productTotal && (productTotal.totalAmount || productTotal.totalAmount==0) ? productTotal.totalAmount : '--' }}</strong>,
+        节省总额:<strong>{{ productTotal && (productTotal.totalEconomizeAmount || productTotal.totalEconomizeAmount==0) ? productTotal.totalEconomizeAmount : '--' }}</strong>,
+        总单数:<strong>{{ productTotal && (productTotal.totalRecord || productTotal.totalRecord==0) ? productTotal.totalRecord : '--' }}</strong>,
+        总款数:<strong>{{ productTotal && (productTotal.totalCategory || productTotal.totalCategory==0) ? productTotal.totalCategory : '--' }}</strong>,
+        总数量:<strong>{{ productTotal && (productTotal.totalQty || productTotal.totalQty==0) ? productTotal.totalQty : '--' }}</strong>
       </div>
     </a-alert>
     <!-- 列表 -->
@@ -121,7 +121,7 @@ export default {
       // 表头
       columns: [
         { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
-        { title: '创建时间', dataIndex: 'createDate', width: 160, align: 'center' },
+        { title: '创建时间', dataIndex: 'createDate', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '单据来源', dataIndex: 'salesBillSourceDictValue', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '销售单号', dataIndex: 'salesBillNo', width: 220, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '促销名称', dataIndex: 'promoName', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },

+ 3 - 3
src/views/promotionRulesManagement/productStatistics/list.vue

@@ -63,8 +63,8 @@
     <!-- alert -->
     <a-alert type="info" showIcon style="margin-bottom:15px">
       <div slot="message">
-        节省总金额:<strong>{{ productTotal ? ((productTotal.totalEconomizeAmount || productTotal.totalEconomizeAmount==0) ? productTotal.totalEconomizeAmount : '--') : '--' }}</strong>,
-        总数量:<strong>{{ productTotal ? ((productTotal.totalQty || productTotal.totalQty==0) ? productTotal.totalQty : '--') : '--' }}</strong>
+        节省总金额:<strong>{{ productTotal && (productTotal.totalEconomizeAmount || productTotal.totalEconomizeAmount==0) ? productTotal.totalEconomizeAmount : '--' }}</strong>,
+        总数量:<strong>{{ productTotal && (productTotal.totalQty || productTotal.totalQty==0) ? productTotal.totalQty : '--' }}</strong>
       </div>
     </a-alert>
     <!-- 列表 -->
@@ -129,7 +129,7 @@ export default {
         { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
         { title: '品牌', dataIndex: 'productEntity.productBrandName', width: 220, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '产品名称', dataIndex: 'productEntity.name', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '产品编码', dataIndex: 'productEntity.code', width: 220, align: 'center' },
+        { title: '产品编码', dataIndex: 'productEntity.code', width: 220, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '数量', dataIndex: 'qty', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '单位', dataIndex: 'productEntity.unit', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '节省金额', dataIndex: 'totalEconomizeAmount', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? '¥' + text : '--') } },

+ 1 - 1
src/views/promotionRulesManagement/promotionRules/detail.vue

@@ -99,7 +99,7 @@ export default {
       detailsData: null,
       columns: [
         { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
-        { title: '创建时间', dataIndex: 'createDate', width: 160, align: 'center' },
+        { title: '创建时间', dataIndex: 'createDate', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '促销类型', dataIndex: 'promoRuleTypeDictValue', width: 200, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '促销规则', dataIndex: 'promoRule', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: 200, align: 'center', fixed: 'right' }

+ 2 - 2
src/views/promotionRulesManagement/promotionRules/list.vue

@@ -117,7 +117,7 @@ export default {
       disabled: false, //  查询、重置按钮是否可操作
       columns: [
         { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
-        { title: '创建时间', dataIndex: 'createDate', width: 160, align: 'center' },
+        { title: '创建时间', dataIndex: 'createDate', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '促销名称', dataIndex: 'name', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '促销时间', scopedSlots: { customRender: 'activeDate' }, width: 200, align: 'center' },
         { title: '参与客户', dataIndex: 'promoBuyerName', width: 220, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
@@ -144,7 +144,7 @@ export default {
             str = str.substr(0, str.length - 1)
             data.list[i].promoBuyerName = str || '全部客户'
           }
-          this.total = data.count
+          this.total = data.count || 0
           this.disabled = false
           return data
         })

+ 1 - 1
src/views/promotionRulesManagement/promotionRules/rule.vue

@@ -57,7 +57,7 @@ export default {
       disabled: false, //  查询、重置按钮是否可操作
       columns: [
         { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
-        { title: '创建时间', dataIndex: 'createDate', width: 160, align: 'center' },
+        { title: '创建时间', dataIndex: 'createDate', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '促销类型', dataIndex: 'promoRuleTypeDictValue', width: 200, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '促销规则', dataIndex: 'promoRule', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: 200, align: 'center', fixed: 'right' }

+ 4 - 1
src/views/purchasingManagement/bulkWarehousingOrder/detailModal.vue

@@ -30,7 +30,10 @@
     <a-card size="small" :bordered="false" class="bulkWarehousingOrderDetail-cont">
       <!-- 总计 -->
       <a-alert type="info" showIcon style="margin-bottom:15px">
-        <div slot="message">入库数量 <strong>{{ (productTotal&&productTotal.totalQty) || 0 }}</strong> ,入库金额 <strong>{{ (productTotal&&productTotal.totalPrice) || 0 }}</strong></div>
+        <div slot="message">
+          入库数量 <strong>{{ (productTotal&&(productTotal.totalQty || productTotal.totalQty==0)) ? productTotal.totalQty : '--' }}</strong> ,
+          入库金额 <strong>{{ (productTotal&&(productTotal.totalPrice || productTotal.totalPrice==0)) ? productTotal.totalPrice : '--' }}</strong>
+        </div>
       </a-alert>
       <!-- 列表 -->
       <s-table

+ 4 - 1
src/views/purchasingManagement/bulkWarehousingOrder/edit.vue

@@ -35,7 +35,10 @@
         </div>
         <!-- 总计 -->
         <a-alert type="info" showIcon style="margin-bottom:15px">
-          <div slot="message">入库数量 <strong>{{ (productTotal&&productTotal.totalQty) || 0 }}</strong> ,入库金额 <strong>{{ (productTotal&&productTotal.totalPrice) || 0 }}</strong></div>
+          <div slot="message">
+            入库数量 <strong>{{ (productTotal&&(productTotal.totalQty || productTotal.totalQty==0)) ? productTotal.totalQty : '--' }}</strong> ,
+            入库金额 <strong>{{ (productTotal&&(productTotal.totalPrice || productTotal.totalPrice==0)) ? productTotal.totalPrice : '--' }}</strong>
+          </div>
         </a-alert>
         <!-- 列表 -->
         <s-table

+ 1 - 1
src/views/purchasingManagement/bulkWarehousingOrder/list.vue

@@ -104,7 +104,7 @@ export default {
       },
       // 表头
       columns: [
-        { title: '创建时间', dataIndex: 'createDate', width: 160, align: 'center' },
+        { title: '创建时间', dataIndex: 'createDate', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '入库单号', scopedSlots: { customRender: 'sparePartsNo' }, width: 220, align: 'center' },
         { title: '商户名称', dataIndex: 'supplierName', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '入库数量', dataIndex: 'productTotalQty', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },

+ 3 - 3
src/views/salesManagement/backorder/detailModal.vue

@@ -27,9 +27,9 @@
         <!-- alert -->
         <a-alert type="info" showIcon style="margin-bottom:10px">
           <div slot="message">
-            缺货总款数:<strong>{{ detailData ? ((detailData.totalCategory || detailData.totalCategory==0) ? detailData.totalCategory : '--') : '--' }}</strong>,
-            缺货总数量:<strong>{{ detailData ? ((detailData.totalQty || detailData.totalQty==0) ? detailData.totalQty : '--') : '--' }}</strong>,
-            缺货总售价:<strong>{{ detailData ? ((detailData.totalAmount || detailData.totalAmount==0) ? detailData.totalAmount : '--') : '--' }}</strong>
+            缺货总款数:<strong>{{ detailData && (detailData.totalCategory || detailData.totalCategory==0) ? detailData.totalCategory : '--' }}</strong>,
+            缺货总数量:<strong>{{ detailData && (detailData.totalQty || detailData.totalQty==0) ? detailData.totalQty : '--' }}</strong>,
+            缺货总售价:<strong>{{ detailData && (detailData.totalAmount || detailData.totalAmount==0) ? detailData.totalAmount : '--' }}</strong>
           </div></a-alert>
         <!-- 列表 -->
         <s-table

+ 4 - 4
src/views/salesManagement/examineVerify/list.vue

@@ -68,10 +68,10 @@
       <!-- alert -->
       <a-alert type="info" showIcon style="margin-bottom:15px">
         <div slot="message">
-          总售价:<strong>{{ totalData.totalAmount }}</strong>元;
-          总单数:<strong>{{ totalData.totalRecord }}</strong>;
-          总款数:<strong>{{ totalData.totalCategory }}</strong>;
-          总数量:<strong>{{ totalData.totalQty }}</strong>;
+          总售价:<strong>{{ totalData&&(totalData.totalAmount || totalData.totalAmount==0) ? totalData.totalAmount : '--' }}</strong>元;
+          总单数:<strong>{{ totalData&&(totalData.totalRecord || totalData.totalRecord==0) ? totalData.totalRecord : '--' }}</strong>;
+          总款数:<strong>{{ totalData&&(totalData.totalCategory || totalData.totalCategory==0) ? totalData.totalCategory : '--' }}</strong>;
+          总数量:<strong>{{ totalData&&(totalData.totalQty || totalData.totalQty==0) ? totalData.totalQty : '--' }}</strong>;
         </div>
       </a-alert>
       <!-- 列表 -->

+ 13 - 13
src/views/salesManagement/outboundOrder/detail.vue

@@ -15,22 +15,22 @@
     <a-card size="small" :bordered="false" class="outboundOrderDetail-cont">
       <a-collapse :activeKey="['1']">
         <a-collapse-panel key="1" header="基础信息">
-          <a-descriptions size="small" :column="2" v-if="detailData">
-            <a-descriptions-item label="客户名称">{{ detailData.buyerName || '--' }}</a-descriptions-item>
+          <a-descriptions size="small" :column="2">
+            <a-descriptions-item label="客户名称">{{ detailData&&detailData.buyerName || '--' }}</a-descriptions-item>
             <a-descriptions-item label="收货地址">
-              <span v-if="(detailData.salesBillExtEntity) && (detailData.salesBillExtEntity.shippingAddrProvinceName || detailData.salesBillExtEntity.shippingAddrCityName || detailData.salesBillExtEntity.shippingAddrCountyName || detailData.salesBillExtEntity.shippingAddr)">
-                {{ detailData.salesBillExtEntity.shippingAddrProvinceName }}
-                {{ detailData.salesBillExtEntity.shippingAddrCityName }}
-                {{ detailData.salesBillExtEntity.shippingAddrCountyName }}
-                {{ detailData.salesBillExtEntity.shippingAddr }}
+              <span v-if="detailData&&detailData.salesBillExtEntity && (detailData.salesBillExtEntity.shippingAddrProvinceName || detailData.salesBillExtEntity.shippingAddrCityName || detailData.salesBillExtEntity.shippingAddrCountyName || detailData.salesBillExtEntity.shippingAddr)">
+                {{ (detailData && detailData.salesBillExtEntity && detailData.salesBillExtEntity.shippingAddrProvinceName) ? detailData.salesBillExtEntity.shippingAddrProvinceName : '' }}
+                {{ (detailData && detailData.salesBillExtEntity && detailData.salesBillExtEntity.shippingAddrCityName) ? detailData.salesBillExtEntity.shippingAddrCityName : '--' }}
+                {{ (detailData && detailData.salesBillExtEntity && detailData.salesBillExtEntity.shippingAddrCountyName) ? detailData.salesBillExtEntity.shippingAddrCountyName : '--' }}
+                {{ (detailData && detailData.salesBillExtEntity && detailData.salesBillExtEntity.shippingAddr) ? detailData.salesBillExtEntity.shippingAddr : '--' }}
               </span>
               <span v-else>--</span>
             </a-descriptions-item>
-            <a-descriptions-item label="收款方式">{{ detailData.salesBillExtEntity&&detailData.salesBillExtEntity.settleStyleSnDictValue || '--' }}</a-descriptions-item>
-            <a-descriptions-item label="收货人">{{ detailData.salesBillExtEntity&&detailData.salesBillExtEntity.consigneeName || '--' }}</a-descriptions-item>
-            <a-descriptions-item label="收货电话">{{ detailData.salesBillExtEntity&&detailData.salesBillExtEntity.consigneeTel || '--' }}</a-descriptions-item>
-            <a-descriptions-item label="备注">{{ detailData.salesBillExtEntity&&detailData.salesBillExtEntity.remarks || '--' }}</a-descriptions-item>
-            <a-descriptions-item label="业务状态">{{ detailData.billStatusDictValue || '--' }}</a-descriptions-item>
+            <a-descriptions-item label="收款方式">{{ (detailData && detailData.salesBillExtEntity&&detailData.salesBillExtEntity.settleStyleSnDictValue) || '--' }}</a-descriptions-item>
+            <a-descriptions-item label="收货人">{{ (detailData && detailData.salesBillExtEntity&&detailData.salesBillExtEntity.consigneeName) || '--' }}</a-descriptions-item>
+            <a-descriptions-item label="收货电话">{{ (detailData && detailData.salesBillExtEntity&&detailData.salesBillExtEntity.consigneeTel) || '--' }}</a-descriptions-item>
+            <a-descriptions-item label="备注">{{ (detailData && detailData.salesBillExtEntity&&detailData.salesBillExtEntity.remarks) || '--' }}</a-descriptions-item>
+            <a-descriptions-item label="业务状态">{{ (detailData && detailData.billStatusDictValue) || '--' }}</a-descriptions-item>
           </a-descriptions>
         </a-collapse-panel>
       </a-collapse>
@@ -113,7 +113,7 @@ export default {
     getDetailCount () {
       stockOutDetailCount({ sn: this.$route.params.sn }).then(res => {
         if (res.status == 200) {
-          this.totalOutQty = res.data.totalOutQty || 0
+          this.totalOutQty = res.data && res.data.totalOutQty || 0
         } else {
           this.totalOutQty = 0
         }

+ 5 - 3
src/views/salesManagement/pushOrderManagement/detail.vue

@@ -61,9 +61,11 @@
         <!-- alert -->
         <a-alert type="info" style="margin-bottom: 10px;" v-if="detailData!=null">
           <div slot="message">
-            <span v-if="$route.params.type!='stockOut'">总销售数量:<strong>{{ detailData.totalSalesQty || 0 }}</strong>;</span>
-            本次下推数量:<strong>{{ detailData.totalQty || 0 }}</strong>;
-            </strong></strong></div>
+            <span v-if="$route.params.type!='stockOut'">
+              总销售数量:<strong>{{ detailData&&(detailData.totalSalesQty || detailData.totalSalesQty==0) ? detailData.totalSalesQty : '--' }}</strong>;
+            </span>
+            本次下推数量:<strong>{{ detailData&&(detailData.totalQty || detailData.totalQty==0) ? detailData.totalQty : '--' }}</strong>;
+          </div>
         </a-alert>
         <!-- 列表 -->
         <s-table

+ 3 - 3
src/views/salesManagement/pushOrderManagement/list.vue

@@ -53,9 +53,9 @@
     <!-- alert -->
     <a-alert type="info" showIcon style="margin-bottom:15px">
       <div slot="message">
-        下推总单数::<strong>{{ totalData.totalRecord }}</strong>;
-        下推总数量:<strong>{{ totalData.totalQty }}</strong>;
-        下推总金额:<strong>{{ totalData.totalAmount }}</strong>元;
+        下推总单数::<strong>{{ totalData&&(totalData.totalRecord || totalData.totalRecord==0) ? totalData.totalRecord : '--' }}</strong>;
+        下推总数量:<strong>{{ totalData&&(totalData.totalQty || totalData.totalQty==0) ? totalData.totalQty : '--' }}</strong>;
+        下推总金额:<strong>{{ totalData&&(totalData.totalAmount || totalData.totalAmount==0) ? totalData.totalAmount : '--' }}</strong>元;
       </div>
     </a-alert>
     <!-- 列表 -->

+ 24 - 12
src/views/salesManagement/salesQuery/detail.vue

@@ -22,28 +22,40 @@
     <a-card size="small" :bordered="false" class="salesDetail-cont">
       <a-collapse :activeKey="['1']">
         <a-collapse-panel key="1" header="基础信息">
-          <a-descriptions size="small" :column="3" v-if="detailData">
-            <a-descriptions-item label="客户名称">{{ detailData.buyerName || '--' }}</a-descriptions-item>
+          <a-descriptions size="small" :column="3">
+            <a-descriptions-item label="客户名称">{{ detailData&&detailData.buyerName || '--' }}</a-descriptions-item>
             <a-descriptions-item label="收货地址">
               {{ shippingAddress }}
             </a-descriptions-item>
-            <a-descriptions-item label="收款方式">{{ detailData.settleStyleSnDictValue || '--' }}</a-descriptions-item>
-            <a-descriptions-item label="收货人">{{ detailData.salesBillExtEntity.consigneeName || '--' }}</a-descriptions-item>
-            <a-descriptions-item label="收货电话">{{ detailData.salesBillExtEntity.consigneeTel || '--' }}</a-descriptions-item>
-            <a-descriptions-item label="备注">{{ detailData.remarks || '--' }}</a-descriptions-item>
-            <a-descriptions-item label="审核时间">{{ detailData.auditDate || '--' }}</a-descriptions-item>
-            <a-descriptions-item label="业务状态">{{ detailData.billStatusDictValue || '--' }}</a-descriptions-item>
-            <a-descriptions-item label="财务状态">{{ detailData.financialStatusDictValue || '--' }}</a-descriptions-item>
+            <a-descriptions-item label="收款方式">{{ detailData&&detailData.settleStyleSnDictValue || '--' }}</a-descriptions-item>
+            <a-descriptions-item label="收货人">{{ detailData&&detailData.salesBillExtEntity.consigneeName || '--' }}</a-descriptions-item>
+            <a-descriptions-item label="收货电话">{{ detailData&&detailData.salesBillExtEntity.consigneeTel || '--' }}</a-descriptions-item>
+            <a-descriptions-item label="备注">{{ detailData&&detailData.remarks || '--' }}</a-descriptions-item>
+            <a-descriptions-item label="审核时间">{{ detailData&&detailData.auditDate || '--' }}</a-descriptions-item>
+            <a-descriptions-item label="业务状态">{{ detailData&&detailData.billStatusDictValue || '--' }}</a-descriptions-item>
+            <a-descriptions-item label="财务状态">{{ detailData&&detailData.financialStatusDictValue || '--' }}</a-descriptions-item>
           </a-descriptions>
         </a-collapse-panel>
       </a-collapse>
     </a-card>
     <a-card size="small" :bordered="false" class="pages-wrap">
       <!-- alert -->
-      <a-alert type="info" style="margin-bottom: 10px;" v-if="detailData">
+      <a-alert type="info" style="margin-bottom: 10px;">
         <div slot="message">
-          总销售数量:<strong>{{ detailData.totalQty || 0 }}</strong>;已取消数量:<strong>{{ detailData.totalCancelQty || 0 }}</strong>;已下推数量:<strong>{{ detailData.totalPushedQty || 0 }}</strong>;待下推数量:<strong>{{ detailData.totalUnpushedQty || 0 }}</strong>;已发货数量:<strong>{{ detailData.totalDispatchQty || 0 }}</strong>;待发货数量:<strong>{{ detailData.totalUndispatchQty || 0 }}</strong>;<br/>
-          总售价:<strong>{{ detailData.totalAmount || 0 }}</strong>;总成本:<strong>{{ detailData.totalCost || 0 }}</strong>;总毛利:<strong>{{ detailData.grossProfit || 0 }}</strong>;已取消金额:<strong>{{ detailData.totalCancelAmount || 0 }}</strong>;已下推金额:<strong>{{ detailData.totalPushedAmount || 0 }}</strong>;待下推金额:<strong>{{ detailData.totalUnpushedAmount || 0 }}</strong>;已发货金额:<strong>{{ detailData.totalDispatchAmount || 0 }}</strong>;待发货金额:<strong>{{ detailData.totalUndispatchAmount || 0 }}</strong>;
+          总销售数量:<strong>{{ detailData&&(detailData.totalQty || detailData.totalQty==0) ? detailData.totalQty : '--' }}</strong>;
+          已取消数量:<strong>{{ detailData&&(detailData.totalCancelQty || detailData.totalCancelQty==0) ? detailData.totalCancelQty : '--' }}</strong>;
+          已下推数量:<strong>{{ detailData&&(detailData.totalPushedQty || detailData.totalPushedQty==0) ? detailData.totalPushedQty : '--' }}</strong>;
+          待下推数量:<strong>{{ detailData&&(detailData.totalUnpushedQty || detailData.totalUnpushedQty==0) ? detailData.totalUnpushedQty : '--' }}</strong>;
+          已发货数量:<strong>{{ detailData&&(detailData.totalDispatchQty || detailData.totalDispatchQty==0) ? detailData.totalDispatchQty : '--' }}</strong>;
+          待发货数量:<strong>{{ detailData&&(detailData.totalUndispatchQty || detailData.totalUndispatchQty==0) ? detailData.totalUndispatchQty : '--' }}</strong>;<br/>
+          总售价:<strong>{{ detailData&&(detailData.totalAmount || detailData.totalAmount==0) ? detailData.totalAmount : '--' }}</strong>;
+          总成本:<strong>{{ detailData&&(detailData.totalCost || detailData.totalCost==0) ? detailData.totalCost : '--' }}</strong>;
+          总毛利:<strong>{{ detailData&&(detailData.grossProfit || detailData.grossProfit==0) ? detailData.grossProfit : '--' }}</strong>;
+          已取消金额:<strong>{{ detailData&&(detailData.totalCancelAmount || detailData.totalCancelAmount==0) ? detailData.totalCancelAmount : '--' }}</strong>;
+          已下推金额:<strong>{{ detailData&&(detailData.totalPushedAmount || detailData.totalPushedAmount==0) ? detailData.totalPushedAmount : '--' }}</strong>;
+          待下推金额:<strong>{{ detailData&&(detailData.totalUnpushedAmount || detailData.totalUnpushedAmount==0) ? detailData.totalUnpushedAmount : '--' }}</strong>;
+          已发货金额:<strong>{{ detailData&&(detailData.totalDispatchAmount || detailData.totalDispatchAmount==0) ? detailData.totalDispatchAmount : '--' }}</strong>;
+          待发货金额:<strong>{{ detailData&&(detailData.totalUndispatchAmount || detailData.totalUndispatchAmount==0) ? detailData.totalUndispatchAmount : '--' }}</strong>;
         </div>
       </a-alert>
       <!-- 列表 -->

+ 6 - 6
src/views/salesManagement/salesQuery/edit.vue

@@ -54,9 +54,9 @@
         <a-alert type="info">
           <div slot="message" class="total-bar">
             <div>
-              总售价:<strong>¥{{ detailData&&detailData.totalCommonAmount || 0 }}</strong>;
-              总款数:<strong>{{ detailData&&detailData.totalCommonCategory || 0 }}</strong>;
-              总数量:<strong>{{ detailData&&detailData.totalCommonQty || 0 }}</strong>;
+              总售价:<strong>¥{{ detailData&&(detailData.totalCommonAmount || detailData.totalCommonAmount==0) ? detailData.totalCommonAmount : '--' }}</strong>;
+              总款数:<strong>{{ detailData&&(detailData.totalCommonCategory || detailData.totalCommonCategory==0) ? detailData.totalCommonCategory : '--' }}</strong>;
+              总数量:<strong>{{ detailData&&(detailData.totalCommonQty || detailData.totalCommonQty==0) ? detailData.totalCommonQty : '--' }}</strong>;
             </div>
             <div>
             </div>
@@ -119,9 +119,9 @@
         <a-alert type="info">
           <div slot="message" class="total-bar">
             <div>
-              总成本:<strong>¥{{ detailData&&detailData.totalPromoCost || 0 }}</strong>;
-              总款数:<strong>{{ detailData&&detailData.totalPromoCategory || 0 }}</strong>;
-              总数量:<strong>{{ detailData&&detailData.totalPromoQty || 0 }}</strong>;
+              总成本:<strong>¥{{ detailData&&(detailData.totalPromoCost || detailData.totalPromoCost==0) ? detailData.totalPromoCost : '--' }}</strong>;
+              总款数:<strong>{{ detailData&&(detailData.totalPromoCategory || detailData.totalPromoCategory==0) ? detailData.totalPromoCategory : '--' }}</strong>;
+              总数量:<strong>{{ detailData&&(detailData.totalPromoQty || detailData.totalPromoQty==0) ? detailData.totalPromoQty : '--' }}</strong>;
             </div>
             <div>
             </div>

+ 12 - 12
src/views/salesManagement/salesQuery/list.vue

@@ -81,20 +81,20 @@
       <a-alert type="info" showIcon style="margin-bottom:15px">
         <div slot="message">
           <div>
-            总单数:<strong>{{ totalData.totalRecord }}</strong>;
-            总款数:<strong>{{ totalData.totalCategory }}</strong>;
-            总数量:<strong>{{ totalData.totalQty }}</strong>;
-            已下推数量:<strong>{{ totalData.totalPushedQty }}</strong>;
-            已发货数量:<strong>{{ totalData.totalDispatchQty }}</strong>;
-            已取消数量:<strong>{{ totalData.totalCancelQty }}</strong>;
-            待下推数量:<strong>{{ totalData.totalUnpushedQty }}</strong>;
+            总单数:<strong>{{ totalData&&(totalData.totalRecord || totalData.totalRecord==0) ? totalData.totalRecord : '--' }}</strong>;
+            总款数:<strong>{{ totalData&&(totalData.totalCategory || totalData.totalCategory==0) ? totalData.totalCategory : '--' }}</strong>;
+            总数量:<strong>{{ totalData&&(totalData.totalQty || totalData.totalQty==0) ? totalData.totalQty : '--' }}</strong>;
+            已下推数量:<strong>{{ totalData&&(totalData.totalPushedQty || totalData.totalPushedQty==0) ? totalData.totalPushedQty : '--' }}</strong>;
+            已发货数量:<strong>{{ totalData&&(totalData.totalDispatchQty || totalData.totalDispatchQty==0) ? totalData.totalDispatchQty : '--' }}</strong>;
+            已取消数量:<strong>{{ totalData&&(totalData.totalCancelQty || totalData.totalCancelQty==0) ? totalData.totalCancelQty : '--' }}</strong>;
+            待下推数量:<strong>{{ totalData&&(totalData.totalUnpushedQty || totalData.totalUnpushedQty==0) ? totalData.totalUnpushedQty : '--' }}</strong>;
           </div>
           <div>
-            总售价:<strong>{{ totalData.totalAmount }}</strong>元;
-            已下推金额::<strong>{{ totalData.totalPushedAmount }}</strong>元;
-            已取消金额::<strong>{{ totalData.totalCancelAmount }}</strong>元;
-            待下推金额::<strong>{{ totalData.totalUnpushedAmount }}</strong>元;
-            已发货金额::<strong>{{ totalData.totalDispatchAmount }}</strong>元;
+            总售价:<strong>{{ totalData&&(totalData.totalAmount || totalData.totalAmount==0) ? totalData.totalAmount : '--' }}</strong>元;
+            已下推金额::<strong>{{ totalData&&(totalData.totalPushedAmount || totalData.totalPushedAmount==0) ? totalData.totalPushedAmount : '--' }}</strong>元;
+            已取消金额::<strong>{{ totalData&&(totalData.totalCancelAmount || totalData.totalCancelAmount==0) ? totalData.totalCancelAmount : '--' }}</strong>元;
+            待下推金额::<strong>{{ totalData&&(totalData.totalUnpushedAmount || totalData.totalUnpushedAmount==0) ? totalData.totalUnpushedAmount : '--' }}</strong>元;
+            已发货金额::<strong>{{ totalData&&(totalData.totalDispatchAmount || totalData.totalDispatchAmount==0) ? totalData.totalDispatchAmount : '--' }}</strong>元;
           </div>
         </div>
       </a-alert>

+ 8 - 8
src/views/salesManagement/salesReturn/detail.vue

@@ -17,14 +17,14 @@
       <a-card size="small" :bordered="false" class="salesReturnDetail-cont">
         <a-collapse :activeKey="['1']">
           <a-collapse-panel key="1" header="基础信息">
-            <a-descriptions size="small" :column="3" v-if="detailData">
-              <a-descriptions-item label="客户名称">{{ detailData.buyerName || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="销退单号">{{ detailData.salesReturnBillNo || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="创建时间">{{ detailData.createDate || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="退货数量">{{ detailData.totalQty || detailData.totalQty == 0 ? detailData.totalQty : '--' }}</a-descriptions-item>
-              <a-descriptions-item label="坏件数量">{{ detailData.totalBadQty || detailData.totalBadQty == 0 ? detailData.totalBadQty : '--' }}</a-descriptions-item>
-              <a-descriptions-item label="返库数量">{{ detailData.totalBackStockQty || detailData.totalBackStockQty == 0 ? detailData.totalBackStockQty : '--' }}</a-descriptions-item>
-              <a-descriptions-item label="退货金额">{{ detailData.totalAmount || detailData.totalAmount == 0 ? detailData.totalAmount : '--' }}元</a-descriptions-item>
+            <a-descriptions size="small" :column="3">
+              <a-descriptions-item label="客户名称">{{ detailData&&detailData.buyerName || '--' }}</a-descriptions-item>
+              <a-descriptions-item label="销退单号">{{ detailData&&detailData.salesReturnBillNo || '--' }}</a-descriptions-item>
+              <a-descriptions-item label="创建时间">{{ detailData&&detailData.createDate || '--' }}</a-descriptions-item>
+              <a-descriptions-item label="退货数量">{{ detailData&&(detailData.totalQty || detailData.totalQty == 0) ? detailData.totalQty : '--' }}</a-descriptions-item>
+              <a-descriptions-item label="坏件数量">{{ detailData&&(detailData.totalBadQty || detailData.totalBadQty == 0) ? detailData.totalBadQty : '--' }}</a-descriptions-item>
+              <a-descriptions-item label="返库数量">{{ detailData&&(detailData.totalBackStockQty || detailData.totalBackStockQty == 0) ? detailData.totalBackStockQty : '--' }}</a-descriptions-item>
+              <a-descriptions-item label="退货金额">{{ detailData&&(detailData.totalAmount || detailData.totalAmount == 0) ? detailData.totalAmount : '--' }}元</a-descriptions-item>
             </a-descriptions>
           </a-collapse-panel>
         </a-collapse>

+ 3 - 3
src/views/salesManagement/salesReturn/list.vue

@@ -74,9 +74,9 @@
       <!-- alert -->
       <a-alert type="info" style="margin-bottom: 10px;">
         <div slot="message">
-          退货总金额:<strong>{{ countData&&countData.totalAmount }}</strong>元;
-          总单数:<strong>{{ countData&&countData.totalRecord }}</strong>;
-          总数量:<strong>{{ countData&&countData.totalQty }}</strong>;
+          退货总金额:<strong>{{ countData&&(countData.totalAmount || countData.totalAmount==0) ? countData.totalAmount : '--' }}</strong>元;
+          总单数:<strong>{{ countData&&(countData.totalRecord || countData.totalRecord==0) ? countData.totalRecord : '--' }}</strong>;
+          总数量:<strong>{{ countData&&(countData.totalQty || countData.totalQty==0) ? countData.totalQty : '--' }}</strong>;
         </div>
       </a-alert>
       <!-- 列表 -->

+ 1 - 1
src/views/salesManagement/salesReturn/salesReturnCheck.vue

@@ -4,7 +4,7 @@
       <!-- 自定义的二级文字标题 -->
       <template slot="subTitle">
         <a id="salesReturnCheck-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
-        <span style="margin: 0 15px;color: #666;">客户名称:{{ ordeDetail&&ordeDetail.buyerName }}</span>
+        <span style="margin: 0 15px;color: #666;">客户名称:{{ ordeDetail&&ordeDetail.buyerName || '--' }}</span>
       </template>
     </a-page-header>
     <a-spin :spinning="spinning" tip="Loading...">

+ 3 - 3
src/views/salesManagement/salesReturn/salesReturnEdit.vue

@@ -4,7 +4,7 @@
       <!-- 自定义的二级文字标题 -->
       <template slot="subTitle">
         <a id="salesReturnEdit-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
-        <span style="margin: 0 15px;color: #666;">客户名称:{{ ordeDetail&&ordeDetail.buyerName }}</span>
+        <span style="margin: 0 15px;color: #666;">客户名称:{{ ordeDetail&&ordeDetail.buyerName || '--' }}</span>
       </template>
       <!-- 操作区,位于 title 行的行尾 -->
       <!-- <template slot="extra">
@@ -22,8 +22,8 @@
         <a-alert style="margin-bottom: 10px;" type="info">
           <div slot="message" class="total-bar">
             <div>
-              <span>退货总金额:{{ ordeDetail&&ordeDetail.totalAmount }}元;</span>
-              <span>退货总数量:{{ ordeDetail&&ordeDetail.totalQty }};</span>
+              <span>退货总金额:{{ ordeDetail&&(ordeDetail.totalAmount || ordeDetail.totalAmount==0) ? ordeDetail.totalAmount : '--' }}元;</span>
+              <span>退货总数量:{{ ordeDetail&&(ordeDetail.totalQty || ordeDetail.totalQty==0) ? ordeDetail.totalQty : '--' }};</span>
             </div>
             <div>
             </div>

+ 3 - 3
src/views/salesManagement/salesReturn/salesReturnGrabEdit.vue

@@ -4,7 +4,7 @@
       <!-- 自定义的二级文字标题 -->
       <template slot="subTitle">
         <a id="salesReturnEdit-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
-        <span style="margin: 0 15px;color: #666;">客户名称:{{ ordeDetail&&ordeDetail.buyerName }}</span>
+        <span style="margin: 0 15px;color: #666;">客户名称:{{ ordeDetail&&ordeDetail.buyerName || '--' }}</span>
       </template>
       <!-- 操作区,位于 title 行的行尾 -->
       <!-- <template slot="extra">
@@ -22,8 +22,8 @@
         <a-alert style="margin-bottom: 10px;" type="info">
           <div slot="message" class="total-bar">
             <div>
-              <span>退货总金额:{{ ordeDetail&&ordeDetail.totalAmount }}元;</span>
-              <span>退货总数量:{{ ordeDetail&&ordeDetail.totalQty }};</span>
+              <span>退货总金额:{{ ordeDetail&&(ordeDetail.totalAmount || ordeDetail.totalAmount==0) ? ordeDetail.totalAmount : '--' }}元;</span>
+              <span>退货总数量:{{ ordeDetail&&(ordeDetail.totalQty || ordeDetail.totalQty==0) ? ordeDetail.totalQty : '--' }};</span>
             </div>
           </div>
         </a-alert>

+ 11 - 11
src/views/salesManagement/shortageStatisticsC/list.vue

@@ -75,18 +75,18 @@
       <a-alert type="info" showIcon style="margin-bottom:10px">
         <div slot="message">
           <div>
-            总客户数:<strong>{{ productTotal ? ((productTotal.totalBuyerQty || productTotal.totalBuyerQty==0) ? productTotal.totalBuyerQty : '--') : '--' }}</strong>,
-            总单数:<strong>{{ productTotal ? ((productTotal.totalRecord || productTotal.totalRecord==0) ? productTotal.totalRecord : '--') : '--' }}</strong>,
-            缺货总款数:<strong>{{ productTotal ? ((productTotal.totalCategory || productTotal.totalCategory==0) ? productTotal.totalCategory : '--') : '--' }}</strong>,
-            缺货总数量:<strong>{{ productTotal ? ((productTotal.totalQty || productTotal.totalQty==0) ? productTotal.totalQty : '--') : '--' }}</strong>,
-            缺货总金额(¥):<strong>{{ productTotal ? ((productTotal.totalAmount || productTotal.totalAmount==0) ? productTotal.totalAmount : '--') : '--' }}</strong>
+            总客户数:<strong>{{ productTotal && (productTotal.totalBuyerQty || productTotal.totalBuyerQty==0) ? productTotal.totalBuyerQty : '--' }}</strong>,
+            总单数:<strong>{{ productTotal && (productTotal.totalRecord || productTotal.totalRecord==0) ? productTotal.totalRecord : '--' }}</strong>,
+            缺货总款数:<strong>{{ productTotal && (productTotal.totalCategory || productTotal.totalCategory==0) ? productTotal.totalCategory : '--' }}</strong>,
+            缺货总数量:<strong>{{ productTotal && (productTotal.totalQty || productTotal.totalQty==0) ? productTotal.totalQty : '--' }}</strong>,
+            缺货总金额(¥):<strong>{{ productTotal && (productTotal.totalAmount || productTotal.totalAmount==0) ? productTotal.totalAmount : '--' }}</strong>
           </div>
           <div>
-            本页客户数:<strong>{{ currentTotal ? ((currentTotal.totalBuyerQty || currentTotal.totalBuyerQty==0) ? currentTotal.totalBuyerQty : '--') : '--' }}</strong>,
-            本页总单数:<strong>{{ currentTotal ? ((currentTotal.totalRecord || currentTotal.totalRecord==0) ? currentTotal.totalRecord : '--') : '--' }}</strong>,
-            本页缺货总款数:<strong>{{ currentTotal ? ((currentTotal.totalCategory || currentTotal.totalCategory==0) ? currentTotal.totalCategory : '--') : '--' }}</strong>,
-            本页缺货总数量:<strong>{{ currentTotal ? ((currentTotal.totalQty || currentTotal.totalQty==0) ? currentTotal.totalQty : '--') : '--' }}</strong>,
-            本页缺货总金额(¥):<strong>{{ currentTotal ? ((currentTotal.totalAmount || currentTotal.totalAmount==0) ? currentTotal.totalAmount : '--') : '--' }}</strong>
+            本页客户数:<strong>{{ currentTotal && (currentTotal.totalBuyerQty || currentTotal.totalBuyerQty==0) ? currentTotal.totalBuyerQty : '--' }}</strong>,
+            本页总单数:<strong>{{ currentTotal && (currentTotal.totalRecord || currentTotal.totalRecord==0) ? currentTotal.totalRecord : '--' }}</strong>,
+            本页缺货总款数:<strong>{{ currentTotal && (currentTotal.totalCategory || currentTotal.totalCategory==0) ? currentTotal.totalCategory : '--' }}</strong>,
+            本页缺货总数量:<strong>{{ currentTotal && (currentTotal.totalQty || currentTotal.totalQty==0) ? currentTotal.totalQty : '--' }}</strong>,
+            本页缺货总金额(¥):<strong>{{ currentTotal && (currentTotal.totalAmount || currentTotal.totalAmount==0) ? currentTotal.totalAmount : '--' }}</strong>
           </div>
         </div></a-alert>
       <!-- 列表 -->
@@ -145,7 +145,7 @@ export default {
       ], //  创建时间
       columns: [
         { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
-        { title: '创建时间', dataIndex: 'createDate', width: 160, align: 'center' },
+        { title: '创建时间', dataIndex: 'createDate', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '销售单号', scopedSlots: { customRender: 'salesBillNo' }, align: 'center' },
         { title: '产品编码', dataIndex: 'productCode', width: 220, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品名称', dataIndex: 'productName', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },

+ 4 - 4
src/views/salesManagement/shortageStatisticsP/list.vue

@@ -41,12 +41,12 @@
     <a-alert type="info" showIcon style="margin:10px 0">
       <div slot="message">
         <div>
-          总缺货数量:<strong>{{ productTotal ? ((productTotal.totalQty || productTotal.totalQty==0) ? productTotal.totalQty : '--') : '--' }}</strong>,
-          总缺货金额(¥):<strong>{{ productTotal ? ((productTotal.totalAmount || productTotal.totalAmount==0) ? productTotal.totalAmount : '--') : '--' }}</strong>
+          总缺货数量:<strong>{{ productTotal && (productTotal.totalQty || productTotal.totalQty==0) ? productTotal.totalQty : '--' }}</strong>,
+          总缺货金额(¥):<strong>{{ productTotal && (productTotal.totalAmount || productTotal.totalAmount==0) ? productTotal.totalAmount : '--' }}</strong>
         </div>
         <div>
-          本页缺货数量:<strong>{{ currentTotal ? ((currentTotal.totalQty || currentTotal.totalQty==0) ? currentTotal.totalQty : '--') : '--' }}</strong>,
-          本页缺货金额(¥):<strong>{{ currentTotal ? ((currentTotal.totalAmount || currentTotal.totalAmount==0) ? currentTotal.totalAmount : '--') : '--' }}</strong>
+          本页缺货数量:<strong>{{ currentTotal && (currentTotal.totalQty || currentTotal.totalQty==0) ? currentTotal.totalQty : '--' }}</strong>,
+          本页缺货金额(¥):<strong>{{ currentTotal && (currentTotal.totalAmount || currentTotal.totalAmount==0) ? currentTotal.totalAmount : '--' }}</strong>
         </div>
       </div></a-alert>
     <!-- 列表 -->

+ 4 - 4
src/views/salesManagement/waitDispatch/edit.vue

@@ -4,7 +4,7 @@
       <!-- 自定义的二级文字标题 -->
       <template slot="subTitle">
         <a id="waitDispatch-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
-        <span style="margin: 0 15px;color: #666;">客户名称:{{ detailData&&detailData.buyerName }}</span>
+        <span style="margin: 0 15px;color: #666;">客户名称:{{ detailData&&detailData.buyerName || '--' }}</span>
         <!-- <a-button id="waitDispatch-edit-btn" size="small" @click="handleEdit" style="margin-left:10px" key="0">编辑</a-button> -->
       </template>
       <!-- 操作区,位于 title 行的行尾 -->
@@ -39,11 +39,11 @@
             id="waitDispatch-del-all">批量移除</a-button>
         </div>
         <!-- 总计 -->
-        <a-alert type="info" v-if="totalData">
+        <a-alert type="info">
           <div slot="message" class="total-bar">
             <div>
-              本次下推款数:<strong>¥{{ totalData&&totalData.totalCategory || 0 }}</strong>;
-              本次下推数量:<strong>{{ totalData&&totalData.totalQty || 0 }}</strong>;
+              本次下推款数:<strong>¥{{ totalData&&(totalData.totalCategory || totalData.totalCategory==0) ? totalData.totalCategory : '--' }}</strong>;
+              本次下推数量:<strong>{{ totalData&&(totalData.totalQty || totalData.totalQty==0) ? totalData.totalQty : '--' }}</strong>;
             </div>
             <div>
             </div>

+ 10 - 2
src/views/salesManagement/waitDispatch/queryPart.vue

@@ -59,8 +59,16 @@
     <!-- alert -->
     <a-alert type="info" style="margin-bottom: 10px;" v-if="detailData">
       <div slot="message">
-        总销售数量:<strong>{{ detailData.totalQty || 0 }}</strong>;已取消数量:<strong>{{ detailData.totalCancelQty || 0 }}</strong>;已下推数量:<strong>{{ detailData.totalPushedQty || 0 }}</strong>;待下推数量:<strong>{{ detailData.totalUnpushedQty || 0 }}</strong>;<br/>
-        总售价:<strong>{{ detailData.totalAmount || 0 }}</strong>;总成本:<strong>{{ detailData.totalCost || 0 }}</strong>;总毛利:<strong>{{ detailData.grossProfit || 0 }}</strong>;已取消金额:<strong>{{ detailData.totalCancelAmount || 0 }}</strong>;已下推金额:<strong>{{ detailData.totalPushedAmount || 0 }}</strong>;待下推金额:<strong>{{ detailData.totalUnpushedAmount || 0 }}</strong>;
+        总销售数量:<strong>{{ detailData&&(detailData.totalQty || detailData.totalQty==0) ? detailData.totalQty : '--' }}</strong>;
+        已取消数量:<strong>{{ detailData&&(detailData.totalCancelQty || detailData.totalCancelQty==0) ? detailData.totalCancelQty : '--' }}</strong>;
+        已下推数量:<strong>{{ detailData&&(detailData.totalPushedQty || detailData.totalPushedQty==0) ? detailData.totalPushedQty : '--' }}</strong>;
+        待下推数量:<strong>{{ detailData&&(detailData.totalUnpushedQty || detailData.totalUnpushedQty==0) ? detailData.totalUnpushedQty : '--' }}</strong>;<br/>
+        总售价:<strong>{{ detailData&&(detailData.totalAmount || detailData.totalAmount==0) ? detailData.totalAmount : '--' }}</strong>;
+        总成本:<strong>{{ detailData&&(detailData.totalCost || detailData.totalCost==0) ? detailData.totalCost : '--' }}</strong>;
+        总毛利:<strong>{{ detailData&&(detailData.grossProfit || detailData.grossProfit==0) ? detailData.grossProfit : '--' }}</strong>;
+        已取消金额:<strong>{{ detailData&&(detailData.totalCancelAmount || detailData.totalCancelAmount==0) ? detailData.totalCancelAmount : '--' }}</strong>;
+        已下推金额:<strong>{{ detailData&&(detailData.totalPushedAmount || detailData.totalPushedAmount==0) ? detailData.totalPushedAmount :'--' }}</strong>;
+        待下推金额:<strong>{{ detailData&&(detailData.totalUnpushedAmount || detailData.totalUnpushedAmount==0) ? detailData.totalUnpushedAmount : '--' }}</strong>;
       </div>
     </a-alert>
 

+ 21 - 12
src/views/setting/notice/detailModal.vue

@@ -8,14 +8,15 @@
     v-model="isShow"
     @cancle="isShow=false"
     :width="800">
-    <div v-if="detailsData">
+    <div>
       <a-descriptions bordered size="small" :column="2">
         <a-descriptions-item label="类别">{{ typeDictValue }}</a-descriptions-item>
         <a-descriptions-item label="可见性">{{ toAppNameDictValue }}</a-descriptions-item>
-        <a-descriptions-item label="公告标题">{{ detailsData.title||'--' }}</a-descriptions-item>
-        <a-descriptions-item label="发布时间">{{ detailsData.releaseDate||'--' }}</a-descriptions-item>
+        <a-descriptions-item label="公告标题">{{ detailsData&&detailsData.title||'--' }}</a-descriptions-item>
+        <a-descriptions-item label="发布时间">{{ detailsData&&detailsData.releaseDate||'--' }}</a-descriptions-item>
         <a-descriptions-item label="公告内容" :span="2">
-          <div v-html="detailsData.content" class="editor-box"></div>
+          <div v-if="detailsData&&detailsData.content" v-html="detailsData.content" class="editor-box"></div>
+          <span v-else>--</span>
         </a-descriptions-item>
         <a-descriptions-item label="图片" :span="2">
           <div style="display: flex;">
@@ -61,11 +62,11 @@ export default {
   computed: {
     typeDictValue () { //  类别  数据字典name
       let str = ''
-      if (this.detailsData.type == 'notity') {
+      if (this.detailsData && this.detailsData.type == 'notity') {
         str = '公告'
-      } else if (this.detailsData.type == 'news_company') {
+      } else if (this.detailsData && this.detailsData.type == 'news_company') {
         str = '企业新闻'
-      } else if (this.detailsData.type == 'news_trade') {
+      } else if (this.detailsData && this.detailsData.type == 'news_trade') {
         str = '行业咨询'
       } else {
         str = '--'
@@ -74,11 +75,11 @@ export default {
     },
     toAppNameDictValue () { //  可见性  数据字典name
       let str = ''
-      if (this.detailsData.toAppName == '1,2') {
+      if (this.detailsData && this.detailsData.toAppName == '1,2') {
         str = '所有'
-      } else if (this.detailsData.toAppName == '2') {
+      } else if (this.detailsData && this.detailsData.toAppName == '2') {
         str = '经销商'
-      } else if (this.detailsData.toAppName == '1') {
+      } else if (this.detailsData && this.detailsData.toAppName == '1') {
         str = '总部'
       } else {
         str = '--'
@@ -86,10 +87,18 @@ export default {
       return str
     },
     imgPathsArr () { //  图片数组
-      return this.detailsData.imgPaths ? this.detailsData.imgPaths.split(',') : []
+      let arr = []
+      if (this.detailsData && this.detailsData.imgPaths) {
+        arr = this.detailsData.imgPaths.split(',')
+      }
+      return arr
     },
     attachPathsArr () { //  附件数组
-      return this.detailsData.attachList ? this.detailsData.attachList : []
+      let arr = []
+      if (this.detailsData && this.detailsData.attachList) {
+        arr = this.detailsData.attachList
+      }
+      return arr
     }
   },
   data () {

+ 22 - 13
src/views/setting/noticeManagement/detailModal.vue

@@ -8,14 +8,15 @@
     v-model="isShow"
     @cancle="isShow=false"
     :width="960">
-    <div v-if="detailsData">
+    <div>
       <a-descriptions bordered size="small" :column="2">
         <a-descriptions-item label="类别">{{ typeDictValue }}</a-descriptions-item>
         <a-descriptions-item label="可见性">{{ toAppNameDictValue }}</a-descriptions-item>
-        <a-descriptions-item label="公告标题">{{ detailsData.title||'--' }}</a-descriptions-item>
-        <a-descriptions-item label="发布时间">{{ detailsData.releaseDate||'--' }}</a-descriptions-item>
+        <a-descriptions-item label="公告标题">{{ detailsData&&detailsData.title||'--' }}</a-descriptions-item>
+        <a-descriptions-item label="发布时间">{{ detailsData&&detailsData.releaseDate||'--' }}</a-descriptions-item>
         <a-descriptions-item label="公告内容" :span="2">
-          <div v-html="detailsData.content" class="editor-box"></div>
+          <div v-if="detailsData&&detailsData.content" v-html="detailsData.content" class="editor-box"></div>
+          <span v-else>--</span>
         </a-descriptions-item>
         <a-descriptions-item label="图片" :span="2">
           <div style="display: flex;">
@@ -67,11 +68,11 @@ export default {
   computed: {
     typeDictValue () { //  类别  数据字典name
       let str = ''
-      if (this.detailsData.type == 'notity') {
+      if (this.detailsData && this.detailsData.type == 'notity') {
         str = '公告'
-      } else if (this.detailsData.type == 'news_company') {
+      } else if (this.detailsData && this.detailsData.type == 'news_company') {
         str = '企业新闻'
-      } else if (this.detailsData.type == 'news_trade') {
+      } else if (this.detailsData && this.detailsData.type == 'news_trade') {
         str = '行业咨询'
       } else {
         str = '--'
@@ -80,11 +81,11 @@ export default {
     },
     toAppNameDictValue () { //  可见性  数据字典name
       let str = ''
-      if (this.detailsData.toAppName == '1,2') {
+      if (this.detailsData && this.detailsData.toAppName == '1,2') {
         str = '所有'
-      } else if (this.detailsData.toAppName == '2') {
+      } else if (this.detailsData && this.detailsData.toAppName == '2') {
         str = '经销商'
-      } else if (this.detailsData.toAppName == '1') {
+      } else if (this.detailsData && this.detailsData.toAppName == '1') {
         str = '总部'
       } else {
         str = '--'
@@ -92,10 +93,18 @@ export default {
       return str
     },
     imgPathsArr () { //  图片数组
-      return this.detailsData.imgPaths ? this.detailsData.imgPaths.split(',') : []
+      let arr = []
+      if (this.detailsData && this.detailsData.imgPaths) {
+        arr = this.detailsData.imgPaths.split(',')
+      }
+      return arr
     },
     attachPathsArr () { //  附件数组
-      return this.detailsData.attachList ? this.detailsData.attachList : []
+      let arr = []
+      if (this.detailsData && this.detailsData.attachList) {
+        arr = this.detailsData.attachList
+      }
+      return arr
     }
   },
   methods: {
@@ -138,7 +147,7 @@ export default {
 <style lang="less">
   .announcementDetail-modal{
     .ant-modal-body {
-    	padding: 40px 40px 24px;
+      padding: 40px 40px 24px;
     }
     .ant-descriptions-item-label.ant-descriptions-item-colon{
       width: 90px;

+ 3 - 3
src/views/setting/noticeManagement/list.vue

@@ -97,8 +97,8 @@ export default {
       disabled: false, //  查询、重置按钮是否可操作
       columns: [
         { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
-        { title: '创建时间', dataIndex: 'createDate', width: 160, align: 'center' },
-        { title: '类别', dataIndex: 'typeDictValue', width: 200, align: 'center' },
+        { title: '创建时间', dataIndex: 'createDate', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '类别', dataIndex: 'typeDictValue', width: 200, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '标题', dataIndex: 'title', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '可见性', dataIndex: 'toAppNameDictValue', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '发布时间', dataIndex: 'releaseDate', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
@@ -120,7 +120,7 @@ export default {
             data.list[i].sendStatusDictValue = data.list[i].sendStatus == 1 ? '已发布' : data.list[i].sendStatus == 0 ? '未发布' : '--'
             data.list[i].toAppNameDictValue = data.list[i].toAppName == '1,2' ? '所有' : data.list[i].toAppName == '2' ? '经销商' : data.list[i].toAppName == '1' ? '总部' : '--'
           }
-          this.total = data.count
+          this.total = data.count || 0
           this.disabled = false
           return data
         })

+ 2 - 2
src/views/supplierManagement/associatedProductDetails/list.vue

@@ -91,9 +91,9 @@ export default {
         { title: '品牌', dataIndex: 'product.productBrandName', width: 200, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品分类', scopedSlots: { customRender: 'productType' }, width: 200, align: 'center' },
         { title: '产品名称', dataIndex: 'product.name', width: 220, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '产品编码', dataIndex: 'product.code', width: 220, align: 'center' },
+        { title: '产品编码', dataIndex: 'product.code', width: 220, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '成本价(¥)', dataIndex: 'cost', width: 110, align: 'center', customRender: function (text) { return ((text || text == 0) ? '¥' + text : '--') } },
-        { title: '原厂编码', dataIndex: 'product.origCode', width: 220, align: 'center', customRender: function (text) { return text == '' ? '--' : text } }
+        { title: '原厂编码', dataIndex: 'product.origCode', width: 220, align: 'center', customRender: function (text) { return text || '--' } }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {

+ 1 - 1
src/views/supplierManagement/supplierInfo/list.vue

@@ -89,7 +89,7 @@ export default {
         this.disabled = true
         return supplierList(Object.assign(parameter, this.queryParam)).then(res => {
           const data = res.data
-          this.total = data.count
+          this.total = data.count || 0
           const no = (data.pageNo - 1) * data.pageSize
           for (var i = 0; i < data.list.length; i++) {
             data.list[i].no = no + i + 1