Parcourir la source

Merge branch 'develop_yh28' of jianguan-web/jg-ocs-html into develop_yh29

李磊 il y a 1 an
Parent
commit
3280dce30a
25 fichiers modifiés avec 353 ajouts et 285 suppressions
  1. 1 1
      public/version.json
  2. 1 1
      src/config/router.config.js
  3. 55 1
      src/views/allocationManagement/transferOut/detail.vue
  4. 16 16
      src/views/allocationManagement/transferOut/edit.vue
  5. 2 2
      src/views/allocationManagement/transferOut/list.vue
  6. 9 9
      src/views/allocationManagement/transfersPrint/list.vue
  7. 15 10
      src/views/productManagement/productPricing/editModal.vue
  8. 5 5
      src/views/promotionRulesManagement/dealerPromotions/chooseImportDealerModal.vue
  9. 1 1
      src/views/promotionRulesManagement/dealerPromotions/chooseImportModal.vue
  10. 2 3
      src/views/promotionRulesManagement/dealerPromotions/editActiveEndTime.vue
  11. 27 25
      src/views/promotionRulesManagement/dealerPromotions/tableType3.vue
  12. 3 3
      src/views/reportData/actualSalesReport/list.vue
  13. 16 14
      src/views/reportData/productRebateReport/detailList.vue
  14. 3 3
      src/views/reportData/promotionSalesRealTimeReport/index.vue
  15. 2 2
      src/views/reportData/promotionSalesRealTimeReport/list.vue
  16. 34 34
      src/views/reportData/regionTypeSalesReport/list.vue
  17. 3 3
      src/views/reportData/salesAmountReport/list.vue
  18. 15 14
      src/views/reportData/salesDetails/list.vue
  19. 11 11
      src/views/reportData/salesOrderTotal/list.vue
  20. 3 3
      src/views/reportData/salesSlipReport/list.vue
  21. 10 10
      src/views/salesManagement/priceInquiry/list.vue
  22. 82 83
      src/views/salesManagement/pushOrderManagement/list.vue
  23. 4 4
      src/views/salesManagement/shortageStatisticsP/list.vue
  24. 27 21
      src/views/salesManagement/stockPrint/list.vue
  25. 6 6
      src/views/salesReturnManagement/salesReturn/list.vue

+ 1 - 1
public/version.json

@@ -1,4 +1,4 @@
 {
-    "version": "2.2.26",
+    "version": "2.2.28",
     "message": "发现有新版本发布,确定更新系统?"
 }

+ 1 - 1
src/config/router.config.js

@@ -1741,7 +1741,7 @@ export const asyncRouterMap = [
                 name: 'salesDetailsList',
                 component: () => import(/* webpackChunkName: "reportData" */ '@/views/reportData/salesDetails/list.vue'),
                 meta: {
-                  title: '销售明细列表',
+                  title: '销售明细(下推统计)列表',
                   icon: 'profile',
                   hidden: true,
                   permission: 'M_salesDetailsList'

+ 55 - 1
src/views/allocationManagement/transferOut/detail.vue

@@ -56,7 +56,7 @@
         </template>
       </a-page-header>
       <!-- 基础信息 -->
-      <div ref="tableSearch">
+      <div ref="tableSearch" v-if="!outBizSn">
         <a-card size="small" :bordered="false" class="allocateBillDetail-cont" v-show="showDetail">
           <div style="padding: 0;" ref="basicInformation">
             <a-descriptions :column="4">
@@ -109,6 +109,60 @@
           </div>
         </a-card>
       </div>
+      <div ref="tableSearch" style="padding: 0 12px;" v-else>
+        <a-collapse :activeKey="['1']">
+          <a-collapse-panel key="1" header="基础信息">
+            <a-descriptions :column="4">
+              <a-descriptions-item label="调往对象">{{ (basicInfoData&&basicInfoData.targetName) || '--' }}</a-descriptions-item>
+              <a-descriptions-item label="调出仓库">{{ (basicInfoData&&basicInfoData.warehouseName) || '--' }}</a-descriptions-item>
+              <a-descriptions-item label="发货编号">{{ (basicInfoData&&basicInfoData.sendNo) || '--' }}</a-descriptions-item>
+              <a-descriptions-item label="收货客户名称">{{ (basicInfoData&&basicInfoData.receiverName) || '--' }}</a-descriptions-item>
+              <a-descriptions-item label="调拨单号">{{ (basicInfoData&&basicInfoData.allocateNo) || '--' }}</a-descriptions-item>
+              <a-descriptions-item label="业务状态">{{ (basicInfoData&&basicInfoData.stateDictValue) || '--' }}</a-descriptions-item>
+              <a-descriptions-item label="打印状态">{{ (basicInfoData&&basicInfoData.printStateDictValue) || '--' }}</a-descriptions-item>
+              <a-descriptions-item label="费用类型">
+                {{ (basicInfoData&&basicInfoData.costTypeName) || '--' }}
+              </a-descriptions-item>
+              <a-descriptions-item label="调拨类型">
+                <div>
+                  <span v-if="basicInfoData&&basicInfoData.allocateSortName">{{ basicInfoData.allocateSortName || '--' }}</span>
+                  <span v-if="basicInfoData&&basicInfoData.allocateTypeName">/{{ basicInfoData.allocateTypeName || '--' }}</span>
+                </div>
+              </a-descriptions-item>
+              <a-descriptions-item label="费用归属品牌">
+                {{ (basicInfoData&&basicInfoData.productBrandName) || '--' }}
+              </a-descriptions-item>
+              <a-descriptions-item label="费用归属品类">
+                <div>
+                  <span v-if="basicInfoData&&basicInfoData.productTypeName1">{{ basicInfoData.productTypeName1 || '--' }}</span>
+                  <span v-else>--</span>
+                  <span v-if="basicInfoData&&basicInfoData.productTypeName2">/{{ basicInfoData.productTypeName2 || '--' }}</span>
+                  <span v-if="basicInfoData&&basicInfoData.productTypeName3">/{{ basicInfoData.productTypeName3 || '--' }}</span>
+                </div>
+              </a-descriptions-item>
+              <a-descriptions-item label="起止时间">
+                <span v-if="basicInfoData&&(basicInfoData.promoStartDate || basicInfoData.promoEndDate)">{{ (basicInfoData&&basicInfoData.promoStartDate) || '--' }} ~ {{ (basicInfoData&&basicInfoData.promoEndDate) || '--' }}</span>
+                <span v-else>--</span>
+              </a-descriptions-item>
+              <a-descriptions-item label="备注" :span="4">{{ (basicInfoData&&basicInfoData.remark) || '--' }}</a-descriptions-item>
+              <a-descriptions-item label="附件" :span="4">
+                <div v-if="basicInfoData&&basicInfoData.attachmentList&&basicInfoData.attachmentList.length">
+                  <a
+                    target="_blank"
+                    style="color: #00aaff;text-decoration: underline;margin-right: 15px;"
+                    :href="item.filePath"
+                    v-for="item in basicInfoData.attachmentList"
+                    :key="item.id">
+                    {{ item.fileName }}
+                  </a>
+                </div>
+                <span v-else>--</span>
+              </a-descriptions-item>
+            </a-descriptions>
+          </a-collapse-panel>
+        </a-collapse>
+      </div>
+
       <a-card size="small" :bordered="false" class="allocateBillDetail-cont">
         <!-- 总计 -->
         <div ref="countInfo">

+ 16 - 16
src/views/allocationManagement/transferOut/edit.vue

@@ -433,21 +433,21 @@ export default {
       const arr = [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
         { title: '产品编码', dataIndex: 'productCode', width: '10%', align: 'left', customRender: function (text) { return text || '--' } },
-        { title: '产品名称', dataIndex: 'productName', align: 'left', width: '26%', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '原厂编码', dataIndex: 'productOrigCode', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品名称', dataIndex: 'productName', align: 'left', width: '30%', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '原厂编码', dataIndex: 'productOrigCode', width: '24%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         // { title: '成本价', dataIndex: 'lastStockCost', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         // { title: '售价', dataIndex: 'productPrice', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '库存数量', dataIndex: 'currentStockQty', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '调出数量', scopedSlots: { customRender: 'qty' }, width: '8%', align: 'center' },
+        { title: '库存数量', dataIndex: 'currentStockQty', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '调出数量', scopedSlots: { customRender: 'qty' }, width: '6%', align: 'center' },
         { title: '单位', dataIndex: 'productUnit', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '操作', scopedSlots: { customRender: 'action1' }, width: '10%', align: 'center' }
+        { title: '操作', scopedSlots: { customRender: 'action1' }, width: '6%', align: 'center' }
       ]
       if (this.$hasPermissions('M_transferOut_edit_costPrice')) { //  成本价权限
-        arr.splice(4, 0, { title: '成本价', dataIndex: 'lastStockCost', width: '10%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.splice(4, 0, { title: '成本价', dataIndex: 'lastStockCost', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
       if (this.$hasPermissions('M_transferOut_edit_salesPrice')) { //  售价权限
         const ind = this.$hasPermissions('M_transferOut_edit_costPrice') ? 5 : 4
-        arr.splice(ind, 0, { title: '售价', dataIndex: 'productPrice', width: '10%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.splice(ind, 0, { title: '售价', dataIndex: 'productPrice', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
       return arr
     },
@@ -456,22 +456,22 @@ export default {
       const arr = [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
         { title: '产品编码', dataIndex: 'productEntity.code', width: '10%', align: 'left', customRender: function (text) { return text || '--' } },
-        { title: '产品名称', dataIndex: 'productEntity.name', width: '20%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '原厂编码', dataIndex: 'productEntity.origCode', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品名称', dataIndex: 'productEntity.name', width: '27%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '原厂编码', dataIndex: 'productEntity.origCode', width: '20%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         // { title: '成本价', dataIndex: 'cost', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         // { title: '售价', scopedSlots: { customRender: 'price' }, width: '10%', align: 'center' },
-        { title: '库存数量', dataIndex: 'currentStockQty', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '调出数量', scopedSlots: { customRender: 'qty' }, width: '10%', align: 'center' },
+        { title: '库存数量', dataIndex: 'currentStockQty', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '调出数量', scopedSlots: { customRender: 'qty' }, width: '6%', align: 'center' },
         { title: '费用归属部门', scopedSlots: { customRender: 'department' }, width: '10%', align: 'center' },
-        { title: '单位', dataIndex: 'productEntity.unit', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '单位', dataIndex: 'productEntity.unit', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '6%', align: 'center' }
       ]
       if (this.$hasPermissions('M_transferOut_edit_costPrice')) { //  成本价权限
-        arr.splice(4, 0, { title: '成本价', dataIndex: 'cost', width: '10%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.splice(4, 0, { title: '成本价', dataIndex: 'cost', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
       if (this.$hasPermissions('M_transferOut_edit_salesPrice')) { //  售价权限
         const ind = this.$hasPermissions('M_transferOut_edit_costPrice') ? 5 : 4
-        arr.splice(ind, 0, { title: '售价', scopedSlots: { customRender: 'price' }, width: '10%', align: 'right' })
+        arr.splice(ind, 0, { title: '售价', scopedSlots: { customRender: 'price' }, width: '6%', align: 'right' })
       }
       return arr
     }
@@ -814,10 +814,10 @@ export default {
         padding-bottom: 50px;
     }
     .allocateBillEdit-back{
-      margin-bottom: 10px;
+      margin-bottom: 6px;
     }
     .allocateBillEdit-cont{
-      margin-bottom: 10px;
+      margin-bottom: 6px;
       .sub-title{
         font-size: 12px;
         color: #808695;

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

@@ -272,11 +272,11 @@ export default {
         { title: '创建时间', dataIndex: 'createDate', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '调拨单号', scopedSlots: { customRender: 'allocateNo' }, align: 'center', width: '10%' },
         { title: '起止时间', scopedSlots: { customRender: 'promoDate' }, align: 'center', width: '6%' },
-        { title: '调往对象', dataIndex: 'targetName', width: '9%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '调往对象', dataIndex: 'targetName', width: '9%', align: 'left', customRender: function (text) { return text || '--' } },
         { title: '客户类型', dataIndex: 'dealerLevelDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '发货编号', dataIndex: 'sendNo', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '发货说明', dataIndex: 'explainInfo', width: '9%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '收货客户名称', dataIndex: 'receiverName', width: '9%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '收货客户名称', dataIndex: 'receiverName', width: '9%', align: 'left', customRender: function (text) { return text || '--' } },
         { title: '总数量', dataIndex: 'totalQty', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '审核时间', dataIndex: 'auditTime', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '费用类型', dataIndex: 'costTypeName', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },

+ 9 - 9
src/views/allocationManagement/transfersPrint/list.vue

@@ -270,18 +270,18 @@ export default {
       const _this = this
       const arr = [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
-        { title: '创建时间', dataIndex: 'createDate', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '创建时间', dataIndex: 'createDate', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '调拨单号', scopedSlots: { customRender: 'allocateNo' }, align: 'center', width: '8%' },
-        { title: '调往对象', dataIndex: 'targetName', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '发货编号', dataIndex: 'sendNo', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '发货说明', dataIndex: 'explainInfo', width: '8%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '收货客户名称', dataIndex: 'receiverName', width: '10%', align: 'left', customRender: function (text) { return text || '--' } },
-        { title: '总数量', dataIndex: 'totalQty', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '调往对象', dataIndex: 'targetName', width: '17%', align: 'left', customRender: function (text) { return text || '--' } },
+        { title: '发货编号', dataIndex: 'sendNo', width: '4%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '发货说明', dataIndex: 'explainInfo', width: '14%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '收货客户名称', dataIndex: 'receiverName', width: '17%', align: 'left', customRender: function (text) { return text || '--' } },
+        { title: '总数量', dataIndex: 'totalQty', width: '4%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '业务状态', dataIndex: 'stateDictValue', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '打印状态', scopedSlots: { customRender: 'printStatus' }, width: '5%', align: 'center' },
-        { title: '允许打印时间', dataIndex: 'allowPrintTime', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '打印次数', dataIndex: 'printCount', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '操作', scopedSlots: { customRender: 'action' }, width: '8%', align: 'center' }
+        { title: '允许打印时间', dataIndex: 'allowPrintTime', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '打印次数', dataIndex: 'printCount', width: '4%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: '6%', align: 'center' }
       ]
       if (this.isShowWarehouse) {
         arr.splice(4, 0, { title: '调出仓库', dataIndex: 'warehouseName', width: '6%', align: 'center', customRender: function (text) { return text || '--' } })

+ 15 - 10
src/views/productManagement/productPricing/editModal.vue

@@ -42,7 +42,7 @@
               id="productPricingEdit-afterCityPrice"
               v-model="form.afterCityPrice"
               :precision="2"
-              :min="form.afterProvincePrice||0.01"
+              :min="0.01"
               :max="999999"
               placeholder="请输入市级价"
               ref="afterCityPrice"
@@ -54,7 +54,7 @@
               id="productPricingEdit-afterSpecialPrice"
               v-model="form.afterSpecialPrice"
               :precision="2"
-              :min="form.afterCityPrice||0.01"
+              :min="0.01"
               :max="999999"
               placeholder="请输入特约价"
               ref="afterSpecialPrice"
@@ -66,7 +66,7 @@
               id="productPricingEdit-afterTerminalPrice"
               v-model="form.afterTerminalPrice"
               :precision="2"
-              :min="form.afterSpecialPrice||0.01"
+              :min="0.01"
               :max="999999"
               placeholder="请输入终端价"
               ref="afterTerminalPrice"
@@ -78,7 +78,7 @@
               id="productPricingEdit-afterCarOwnersPrice"
               v-model="form.afterCarOwnersPrice"
               :precision="2"
-              :min="form.afterTerminalPrice||0.01"
+              :min="0.01"
               :max="999999"
               placeholder="请输入车主价"
               ref="afterCarOwnersPrice"
@@ -131,11 +131,11 @@ export default {
         wrapperCol: { span: 17 }
       },
       form: {
-        afterProvincePrice: '',
-        afterCityPrice: '',
-        afterSpecialPrice: '',
-        afterTerminalPrice: '',
-        afterCarOwnersPrice: '',
+        afterProvincePrice: '', // 省级价
+        afterCityPrice: '', // 市级价
+        afterSpecialPrice: '', // 特约价
+        afterTerminalPrice: '', // 终端价
+        afterCarOwnersPrice: '', // 车主价
         changeReason: undefined
       },
       rules: {
@@ -173,11 +173,16 @@ export default {
         }
       })
     },
-    // 保存
+    // 保存    定价规则==>省级价<市级价<特约价<终端价<车主价
     handleSave () {
       const _this = this
       this.$refs.ruleForm.validate(valid => {
         if (valid) {
+          const newFormData = _this.form
+          if (newFormData.afterCityPrice * 1 < newFormData.afterProvincePrice * 1 || newFormData.afterCityPrice * 1 > newFormData.afterSpecialPrice * 1) {
+            _this.$message.error({ content: '价格设置规则:省级价≤市级价≤特约价', duration: 5 })
+            return
+          }
           const form = JSON.parse(JSON.stringify(_this.form))
           form.id = this.detailData.id || undefined
           form.productSn = _this.itemSn

+ 5 - 5
src/views/promotionRulesManagement/dealerPromotions/chooseImportDealerModal.vue

@@ -44,7 +44,7 @@
           type="primary"
           id="chooseImport-submit"
           size="large"
-          class="button-primary"
+          :class="loadData.length==0?'button-grey':'button-primary'"
           @click="handleSubmit"
           style="padding: 0 40px;">确认导入</a-button>
         <a-button
@@ -68,7 +68,7 @@
 <script>
 import { commonMixin } from '@/utils/mixin'
 import { hdExportExcel } from '@/libs/exportExcel'
-import {downDealerFail } from '@/api/promotion'
+import { downDealerFail } from '@/api/promotion'
 export default {
   name: 'ChooseImportModal',
   mixins: [commonMixin],
@@ -95,7 +95,7 @@ export default {
   computed: {
     nowColumns () {
       const _this = this
-      let columnsArr = [
+      const columnsArr = [
         { title: '序号', dataIndex: 'no', width: '10%', align: 'center' },
         { title: '经销商名称', dataIndex: 'dealerName', width: '90%', align: 'center', customRender: function (text) { return text || '--' } }
       ]
@@ -105,8 +105,8 @@ export default {
       const _this = this
       const unColumnsArr = [
         { title: '序号', dataIndex: 'no', width: '10%', align: 'center' },
-        { title: '经销商名称', dataIndex: 'dealerName', width: '50%', align: 'center', customRender: function (text) { return text || '--' },ellipsis: true },
-        { title: '备注',dataIndex: 'remarks',  width: '40%', align: 'center', customRender: function (text) { return text || '--' } ,ellipsis: true}
+        { title: '经销商名称', dataIndex: 'dealerName', width: '50%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '备注', dataIndex: 'remarks', width: '40%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true }
       ]
       return unColumnsArr
     }

+ 1 - 1
src/views/promotionRulesManagement/dealerPromotions/chooseImportModal.vue

@@ -54,7 +54,7 @@
           type="primary"
           id="chooseImport-submit"
           size="large"
-          class="button-primary"
+          :class="loadData.length==0?'button-grey':'button-primary'"
           @click="handleSubmit"
           style="padding: 0 40px;">确认导入</a-button>
         <a-button

+ 2 - 3
src/views/promotionRulesManagement/dealerPromotions/editActiveEndTime.vue

@@ -9,6 +9,7 @@
     @cancel="isShow=false"
     :width="500">
     <a-spin :spinning="spinning" tip="Loading...">
+      <div style="text-align: center;margin-bottom: 20px;font-weight: bold;">确定要变更{{ form.name }}的促销时间吗?</div>
       <a-form-model
         id="editActiveEndTime-basicInfo-form"
         ref="ruleForm"
@@ -16,9 +17,6 @@
         :rules="rules"
         :label-col="formItemLayout.labelCol"
         :wrapper-col="formItemLayout.wrapperCol" >
-        <a-form-model-item label="" prop="name">
-          <div style="margin-left:40px;">确定要变更{{ form.name }}的促销时间吗?</div>
-        </a-form-model-item>
         <a-form-model-item label="原结束日期" prop="time">
           <span>{{ form.timeEnd }}</span>
         </a-form-model-item>
@@ -118,6 +116,7 @@ export default {
           timeEnd: '',
           newTimeEnd: ''
         }
+        this.$refs.ruleForm.resetFields()
       }
     }
   }

+ 27 - 25
src/views/promotionRulesManagement/dealerPromotions/tableType3.vue

@@ -100,14 +100,15 @@
       <!-- 省价折扣 -->
       <template slot="provinceDiscount" slot-scope="text, record">
         <div v-if="record.dataSourceOrigin=='0'">
-          <a-input
-            v-model="record.provinceDiscountRate"
-            style="width:80%;"
-            type="number"
-            @input="record.provinceDiscountRate=record.provinceDiscountRate.match(/^\d{1,4}(\.?\d{0,2})/g) ? record.provinceDiscountRate.match(/^\d{1,4}(\.?\d{0,2})/g)[0] : ''"
-            :min="0"
-            placeholder="请输入"
-            size="small"/>%
+            <a-input-number
+              size="small"
+              style="width:80%;"
+              v-model="record.provinceDiscountRate"
+              :min="0"
+              :step="1"
+              :precision="2"
+              placeholder="请输入"
+              :max="999999"/>%
         </div>
         <span v-else>{{ (record.provinceDiscountRate||record.provinceDiscountRate==0)?record.provinceDiscountRate+'%':'--' }}</span>
       </template>
@@ -130,14 +131,15 @@
       <!-- 市价折扣 -->
       <template slot="cityDiscount" slot-scope="text, record">
         <div v-if="record.dataSourceOrigin=='0'">
-          <a-input
-            v-model="record.cityDiscountRate"
-            style="width:80%;"
-            type="number"
-            placeholder="请输入"
-            @input="record.cityDiscountRate=record.cityDiscountRate.match(/^\d{1,4}(\.?\d{0,2})/g) ? record.cityDiscountRate.match(/^\d{1,4}(\.?\d{0,2})/g)[0] : ''"
-            :min="0"
-            size="small"/>%
+            <a-input-number
+              size="small"
+              style="width:80%;"
+              v-model="record.cityDiscountRate"
+              :min="record.provinceDiscountRate ||0"
+              :step="1"
+              :precision="2"
+              placeholder="请输入"
+              :max="999999"/>%
         </div>
         <span v-else>{{ (record.cityDiscountRate||record.cityDiscountRate==0)?record.cityDiscountRate+'%':'--' }}</span>
       </template>
@@ -160,15 +162,15 @@
       <!-- 特约折扣 -->
       <template slot="specialDiscount" slot-scope="text, record">
         <div v-if="record.dataSourceOrigin=='0'">
-          <a-input
-            v-model="record.specialDiscountRate"
-            style="width:80%;"
-            type="number"
-            @input="record.specialDiscountRate=record.specialDiscountRate.match(/^\d{1,4}(\.?\d{0,2})/g) ? record.specialDiscountRate.match(/^\d{1,4}(\.?\d{0,2})/g)[0] : ''"
-            :min="0"
-            placeholder="请输入"
-            step="0.01"
-            size="small"/>%
+            <a-input-number
+              size="small"
+              style="width:80%;"
+              v-model="record.specialDiscountRate"
+              :min="record.cityDiscountRate ||0"
+              :step="1"
+              :precision="2"
+              placeholder="请输入"
+              :max="999999"/>%
         </div>
         <span v-else>{{ (record.specialDiscountRate||record.specialDiscountRate==0) ? record.specialDiscountRate+'%':'--' }}</span>
       </template>

+ 3 - 3
src/views/reportData/actualSalesReport/list.vue

@@ -13,7 +13,7 @@
           @keyup.enter.native="handleSearch">
           <a-row :gutter="15">
             <a-col :md="6" :sm="24">
-              <a-form-model-item label="下推日期" prop="time">
+              <a-form-model-item label="下推时间" prop="time">
                 <rangeDate ref="rangeDate" :value="queryParam.time" @change="dateChange" />
               </a-form-model-item>
             </a-col>
@@ -160,7 +160,7 @@ export default {
         }
       },
       rules: {
-        'time': [{ required: true, message: '请选择销售日期', trigger: 'change' }]
+        'time': [{ required: true, message: '请选择下推时间', trigger: 'change' }]
       },
       disabled: false, //  查询、重置按钮是否可操作
       exportLoading: false,
@@ -238,7 +238,7 @@ export default {
         if (valid) {
           _this.$refs.table.refresh(true)
         } else {
-          _this.$message.error('请选择销售日期')
+          _this.$message.error('请选择下推时间')
           return false
         }
       })

+ 16 - 14
src/views/reportData/productRebateReport/detailList.vue

@@ -99,8 +99,8 @@
           :columns="columns"
           :data="loadData"
           :pageSize="30"
-          :style="{ height: tableHeight+75+'px' }"
-          :scroll="{ x: 2200,y: tableHeight-20 }"
+          :style="{ height: tableHeight+110+'px' }"
+          :scroll="{ x: 2200,y: tableHeight }"
           :defaultLoadData="false"
           bordered>
           <template slot="footer">
@@ -191,23 +191,25 @@ export default {
       const arr = [
         { title: '序号', dataIndex: 'no', width: '60px', align: 'center' },
         { title: '订单号', dataIndex: 'bizNo', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '类型', dataIndex: 'rebateBill.bizTypeDictValue', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '客户级别', dataIndex: 'rebateBill.buyerLevelDictValue', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '类型', dataIndex: 'rebateBill.bizTypeDictValue', width: '80px', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '客户级别', dataIndex: 'rebateBill.buyerLevelDictValue', width: '90px', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '客户名称', dataIndex: 'rebateBill.buyerName', width: '150px', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '直接绑定客户名称', dataIndex: 'rebateBill.directDealerName', width: '150px', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '间接绑定客户名称', dataIndex: 'rebateBill.indirectDealerName', width: '150px', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '品牌', dataIndex: 'productEntity.productBrandName', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品分类', width: '200px', align: 'center', customRender: function (text, record) { return record.productEntity.productTypeName1 + (record.productEntity.productTypeName2 ? '>' : '') + (record.productEntity.productTypeName2 || '') } },
+        { title: '产品分类', width: '160px', align: 'center', customRender: function (text, record) { return record.productEntity.productTypeName1 + (record.productEntity.productTypeName2 ? '>' : '') + (record.productEntity.productTypeName2 || '') } },
         { title: '产品编码', dataIndex: 'productEntity.code', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品名称', dataIndex: 'productEntity.name', width: '150px', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '数量', dataIndex: 'qty', width: '100px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '分公司金额', dataIndex: 'wholesalePrice1', width: '100px', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-        { title: '加盟商金额', dataIndex: 'wholesalePrice2', width: '100px', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-        { title: '特约加盟店金额', dataIndex: 'wholesalePrice3', width: '100px', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-        { title: '总开单金额', dataIndex: 'totalAmount', width: '100px', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-        { title: '总实售金额', dataIndex: 'totalRealAmount', width: '100px', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-        { title: '直接差价金额', dataIndex: 'directRebateAmount', width: '100px', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-        { title: '间接差价金额', dataIndex: 'indirectRebateAmount', width: '100px', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } }
+        { title: '数量', dataIndex: 'qty', width: '60px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '分公司金额', dataIndex: 'provincePrice', width: '80px', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '加盟商金额', dataIndex: 'cityPrice', width: '80px', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '特约加盟店金额', dataIndex: 'specialPrice', width: '80px', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '总开单金额', dataIndex: 'totalAmount', width: '80px', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '总实售金额', dataIndex: 'totalRealAmount', width: '80px', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '直接差价', dataIndex: 'directRebatePrice', width: '80px', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '直接差价金额', dataIndex: 'directRebateAmount', width: '80px', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '间接差价', dataIndex: 'indirectRebatePrice', width: '80px', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '间接差价金额', dataIndex: 'indirectRebateAmount', width: '80px', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } }
       ]
       return arr
     }
@@ -311,7 +313,7 @@ export default {
       this.$nextTick(() => { // 页面渲染完成后的回调
         const tableSearchH = this.$refs.tableSearch1.offsetHeight
         console.log(tableSearchH)
-        this.tableHeight = window.innerHeight - tableSearchH - 250
+        this.tableHeight = window.innerHeight - tableSearchH - 280
       })
     },
   },

+ 3 - 3
src/views/reportData/promotionSalesRealTimeReport/index.vue

@@ -12,7 +12,7 @@
                 :model="queryParam">
                 <a-row :gutter="15">
                   <a-col :md="6" :sm="24">
-                    <a-form-model-item label="销售审核日期" prop="salesDate">
+                    <a-form-model-item label="销售审核时间" prop="salesDate">
                       <rangeDate ref="rangeDate" :value="queryParam.salesDate" @change="salesDateChange" />
                     </a-form-model-item>
                   </a-col>
@@ -328,7 +328,7 @@ export default {
     testForm (type) {
       const _this = this
       if (!_this.queryParam.salesDate[0] || !_this.queryParam.salesDate[1]) {
-        _this.$message.error('请选择销售审核日期')
+        _this.$message.error('请选择销售审核时间')
         return
       }
       _this.$refs.ruleForm.validate(valid => {
@@ -339,7 +339,7 @@ export default {
             _this.handleExport()
           }
         } else {
-          _this.$message.error('请选择销售审核日期')
+          _this.$message.error('请选择销售审核时间')
           return false
         }
       })

+ 2 - 2
src/views/reportData/promotionSalesRealTimeReport/list.vue

@@ -481,7 +481,7 @@ export default {
     testForm (type) {
       const _this = this
       if (!_this.newQueryParam.salesDate && (!_this.newQueryParam.salesDate[0] || !_this.newQueryParam.salesDate[1])) {
-        _this.$message.error('请选择销售审核日期')
+        _this.$message.error('请选择下推时间')
         return
       }
       _this.$refs.ruleForm.validate(valid => {
@@ -492,7 +492,7 @@ export default {
             _this.handleExport()
           }
         } else {
-          _this.$message.error('请选择销售审核日期')
+          _this.$message.error('请选择下推时间')
           return false
         }
       })

+ 34 - 34
src/views/reportData/regionTypeSalesReport/list.vue

@@ -8,38 +8,38 @@
       <a-card size="small">
         <div class="table-page-search-wrapper newTableSearchName" ref="tableSearch">
           <a-form-model
-          id="returnGoodsPresentationList-form"
-          ref="ruleForm"
-          class="form-model-con"
-          layout="inline"
-          :rules="rules"
-          :model="queryParam"
-          @keyup.enter.native="handleSearch">
-          <a-row :gutter="15">
-            <a-col :md="6" :sm="24">
-              <a-form-model-item label="销售审核时间" prop="time">
-                <rangeDate ref="rangeDate" :value="queryParam.time" @change="dateChange"/>
-              </a-form-model-item>
-            </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-model-item label="销售状态" prop="salesStatusType">
-                <v-select
-                  v-model="queryParam.salesStatusType"
-                  code="SALES_STATUS"
-                  placeholder="请选择销售状态"
-                  allowClear></v-select>
-              </a-form-model-item>
-            </a-col>
-            <a-col :md="6" :sm="24" v-if="activeKey==0">
-              <a-form-model-item label="所在区域">
-                <subarea id="returnGoodsPresentationList-subareaSn" ref="subarea" @change="subareaChange"></subarea>
-              </a-form-model-item>
-            </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-model-item label="区域负责人">
-                <BizUser v-model="queryParam.subareaArea.bizUserSn"></BizUser>
-              </a-form-model-item>
-            </a-col>
+            id="returnGoodsPresentationList-form"
+            ref="ruleForm"
+            class="form-model-con"
+            layout="inline"
+            :rules="rules"
+            :model="queryParam"
+            @keyup.enter.native="handleSearch">
+            <a-row :gutter="15">
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="销售审核时间" prop="time">
+                  <rangeDate ref="rangeDate" :value="queryParam.time" @change="dateChange"/>
+                </a-form-model-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="销售状态" prop="salesStatusType">
+                  <v-select
+                    v-model="queryParam.salesStatusType"
+                    code="SALES_STATUS"
+                    placeholder="请选择销售状态"
+                    allowClear></v-select>
+                </a-form-model-item>
+              </a-col>
+              <a-col :md="6" :sm="24" v-if="activeKey==0">
+                <a-form-model-item label="所在区域">
+                  <subarea id="returnGoodsPresentationList-subareaSn" ref="subarea" @change="subareaChange"></subarea>
+                </a-form-model-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="区域负责人">
+                  <BizUser v-model="queryParam.subareaArea.bizUserSn"></BizUser>
+                </a-form-model-item>
+              </a-col>
               <!--  <template v-if="advanced && activeKey==0">
               <a-col :md="6" :sm="24">
                 <a-form-model-item prop="dealerProvinceSn" style="margin: 0;" label="地区">
@@ -127,7 +127,7 @@ export default {
       exportLoading: false,
       tableHeight: 0,
       rules: {
-        'time': [{ required: true, message: '请选择审核时间', trigger: 'change' }],
+        'time': [{ required: true, message: '请选择销售审核时间', trigger: 'change' }],
         'salesStatusType': [{ required: true, message: '请选择销售状态', trigger: 'change' }]
       },
       // 加载数据方法 必须为 Promise 对象
@@ -177,7 +177,7 @@ export default {
         if (valid) {
           _this.$refs.table.refresh(true)
         } else {
-          _this.$message.error('请选择审核时间和销售状态')
+          _this.$message.error('请选择销售审核时间和销售状态')
           return false
         }
       })

+ 3 - 3
src/views/reportData/salesAmountReport/list.vue

@@ -13,7 +13,7 @@
           @keyup.enter.native="handleSearch">
           <a-row :gutter="15">
             <a-col :md="6" :sm="24">
-              <a-form-model-item label="下推日期" prop="time">
+              <a-form-model-item label="下推时间" prop="time">
                 <rangeDate ref="rangeDate" :value="queryParam.time" @change="dateChange" />
               </a-form-model-item>
             </a-col>
@@ -160,7 +160,7 @@ export default {
       countLabel: [],
       countBrandLabel: [],
       rules: {
-        'time': [{ required: true, message: '请选择销售日期', trigger: 'change' }]
+        'time': [{ required: true, message: '请选择下推时间', trigger: 'change' }]
       },
       disabled: false, //  查询、重置按钮是否可操作
       exportLoading: false,
@@ -235,7 +235,7 @@ export default {
         if (valid) {
           _this.$refs.table.refresh(true)
         } else {
-          _this.$message.error('请选择销售日期')
+          _this.$message.error('请选择下推时间')
           return false
         }
       })

+ 15 - 14
src/views/reportData/salesDetails/list.vue

@@ -13,7 +13,7 @@
           @keyup.enter.native="handleSearch">
           <a-row :gutter="15">
             <a-col :md="6" :sm="24">
-              <a-form-model-item label="下推日期" prop="time">
+              <a-form-model-item label="下推时间" prop="time">
                 <rangeDate ref="rangeDate" :value="queryParam.time" @change="dateChange" />
               </a-form-model-item>
             </a-col>
@@ -142,16 +142,16 @@
           :data="loadData"
           :pageSize="30"
           :style="{ height: tableHeight+84.5+'px' }"
-          :scroll="{ x: 2480 , y: tableHeight - 10 }"
+          :scroll="{ x: 2480 , y: tableHeight - 30 }"
           :defaultLoadData="false"
           bordered>
           <template slot="footer">
             <a-row :gutter="15">
-            <a-col :md="4" :sm="24">下推数量:{{ (totalData && (totalData.qty || totalData.qty==0)) ? totalData.qty : '--' }}</a-col>
-            <a-col :md="4" :sm="24" v-if="$hasPermissions('M_salesDetailsList_salesPrice')">实售金额:{{ (totalData && (totalData.totalRealSaleAmount || totalData.totalRealSaleAmount==0)) ? toThousands(totalData.totalRealSaleAmount) : '--' }}</a-col>
-            <a-col :md="4" :sm="24" v-if="$hasPermissions('M_salesDetailsList_salesPrice')">开单金额:{{ (totalData && (totalData.totalAmount || totalData.totalAmount==0)) ? toThousands(totalData.totalAmount) : '--' }}</a-col>
-            <a-col :md="4" :sm="24" v-if="$hasPermissions('M_salesDetailsList_costPrice')">成本金额:{{ (totalData && (totalData.totalRealCost || totalData.totalRealCost==0)) ? toThousands(totalData.totalRealCost) : '--' }}</a-col>
-            <a-col :md="4" :sm="24" v-if="$hasPermissions('M_salesDetailsList_salesPrice')">优惠金额:{{ (totalData && (totalData.discountAmount || totalData.discountAmount==0)) ? toThousands(totalData.discountAmount) : '--' }}</a-col>
+              <a-col :md="4" :sm="24">下推数量:{{ (totalData && (totalData.qty || totalData.qty==0)) ? totalData.qty : '--' }}</a-col>
+              <a-col :md="4" :sm="24" v-if="$hasPermissions('M_salesDetailsList_salesPrice')">实售金额:{{ (totalData && (totalData.totalRealAmount || totalData.totalRealAmount==0)) ? toThousands(totalData.totalRealAmount) : '--' }}</a-col>
+              <a-col :md="4" :sm="24" v-if="$hasPermissions('M_salesDetailsList_salesPrice')">开单金额:{{ (totalData && (totalData.totalAmount || totalData.totalAmount==0)) ? toThousands(totalData.totalAmount) : '--' }}</a-col>
+              <a-col :md="4" :sm="24" v-if="$hasPermissions('M_salesDetailsList_costPrice')">成本金额:{{ (totalData && (totalData.totalCost || totalData.totalCost==0)) ? toThousands(totalData.totalCost) : '--' }}</a-col>
+              <a-col :md="4" :sm="24" v-if="$hasPermissions('M_salesDetailsList_salesPrice')">优惠金额:{{ (totalData && (totalData.discountAmount || totalData.discountAmount==0)) ? toThousands(totalData.discountAmount) : '--' }}</a-col>
             <!--  <a-col :md="4" :sm="24" v-if="$hasPermissions('M_salesDetailsList_salesPrice')">折后金额:{{ (totalData && (totalData.discountedAmount || totalData.discountedAmount==0)) ? toThousands(totalData.discountedAmount) : '--' }}</a-col>
             <a-col :md="4" :sm="24" v-if="$hasPermissions('M_salesDetailsList_salesPrice')">折扣金额:{{ (totalData && (totalData.discountAmount || totalData.discountAmount==0)) ? toThousands(totalData.discountAmount) : '--' }}</a-col> -->
             </a-row>
@@ -220,7 +220,7 @@ export default {
       },
       productType: [],
       rules: {
-        'time': [{ required: true, message: '请选择销售日期', trigger: 'change' }]
+        'time': [{ required: true, message: '请选择下推时间', trigger: 'change' }]
       },
       disabled: false, //  查询、重置按钮是否可操作
       exportLoading: false,
@@ -263,15 +263,16 @@ export default {
         { title: '直接绑定客户名称', dataIndex: 'directDealerName', width: 120, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '间接绑定客户名称', dataIndex: 'indirectDealerName', width: 120, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '创建时间', dataIndex: 'createDate', width: 130, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '销售审核时间', dataIndex: 'salesTime', width: 130, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '销售审核时间', dataIndex: 'auditDate', width: 130, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '下推时间', dataIndex: 'pushedDate', width: 130, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '品牌', dataIndex: 'productBrandName', width: 130, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '二级分类', dataIndex: 'productTypeName2', width: 130, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品名称', dataIndex: 'productName', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '产品编码', dataIndex: 'productCode', width: 150, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '单位', dataIndex: 'productUnit', width: 50, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '下推数量', dataIndex: 'qty', width: 70, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
-        // { title: '成本价', dataIndex: 'totalRealCost', width: 70, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        // { title: '实售价', dataIndex: 'totalRealSaleAmount', width: 70, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        // { title: '成本价', dataIndex: 'totalCost', width: 70, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        // { title: '实售价', dataIndex: 'totalRealAmount', width: 70, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         // { title: '开单价', dataIndex: 'totalAmount', width: 70, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         // { title: '市级价', dataIndex: 'totalCityAmount', width: 70, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         // { title: '直接差价', dataIndex: 'directRebateAmount', width: 70, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
@@ -280,10 +281,10 @@ export default {
         // { title: '折扣金额', dataIndex: 'discountAmount', width: 70, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
       ]
       if (this.$hasPermissions('M_salesDetailsList_costPrice')) { //  成本价权限
-        arr.splice(20, 0, { title: '成本金额', dataIndex: 'totalRealCost', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.splice(21, 0, { title: '成本金额', dataIndex: 'totalCost', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
       if (this.$hasPermissions('M_salesDetailsList_salesPrice')) { //  售价权限
-        arr.push({ title: '实售金额', dataIndex: 'totalRealSaleAmount', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.push({ title: '实售金额', dataIndex: 'totalRealAmount', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
         arr.push({ title: '开单金额', dataIndex: 'totalAmount', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
       if (this.$hasPermissions('M_salesDetailsList_cityPrice')) { //  市级价权限
@@ -332,7 +333,7 @@ export default {
         if (valid) {
           _this.$refs.table.refresh(true)
         } else {
-          _this.$message.error('请选择销售日期')
+          _this.$message.error('请选择下推时间')
           return false
         }
       })

+ 11 - 11
src/views/reportData/salesOrderTotal/list.vue

@@ -133,13 +133,13 @@
           bordered>
           <template slot="footer">
             <a-row :gutter="15">
-            <a-col :md="4" :sm="24">下推数量:{{ (totalData && (totalData.totalQty || totalData.totalQty==0)) ? totalData.totalQty : '--' }}</a-col>
-            <a-col :md="4" :sm="24" v-if="$hasPermissions('M_salesOrderTotalList_salesPrice')">实售金额:{{ (totalData && (totalData.totalRealSaleAmount || totalData.totalRealSaleAmount==0)) ? toThousands(totalData.totalRealSaleAmount) : '--' }}</a-col>
-            <a-col :md="4" :sm="24" v-if="$hasPermissions('M_salesOrderTotalList_salesPrice')">开单金额:{{ (totalData && (totalData.totalAmount || totalData.totalAmount==0)) ? toThousands(totalData.totalAmount) : '--' }}</a-col>
-            <a-col :md="4" :sm="24" v-if="$hasPermissions('M_salesOrderTotalList_costPrice')">成本金额:{{ (totalData && (totalData.totalCost || totalData.totalCost==0)) ? toThousands(totalData.totalCost) : '--' }}</a-col>
-            <a-col :md="4" :sm="24" v-if="$hasPermissions('M_salesOrderTotalList_costPrice')&&$hasPermissions('M_salesOrderTotalList_salesPrice')">毛利:{{ (totalData && (totalData.grossProfit || totalData.grossProfit==0)) ? toThousands(totalData.grossProfit) : '--' }}</a-col>
-            <a-col :md="4" :sm="24" v-if="$hasPermissions('M_salesOrderTotalList_salesPrice')">返利:{{ (totalData && (totalData.rebateAmount || totalData.rebateAmount==0)) ? toThousands(totalData.rebateAmount) : '--' }}</a-col>
-            <a-col :md="4" :sm="24" v-if="$hasPermissions('M_salesOrderTotalList_salesPrice')">优惠金额:{{ (totalData && (totalData.discountAmount || totalData.discountAmount==0)) ? toThousands(totalData.discountAmount) : '--' }}</a-col>
+              <a-col :md="4" :sm="24">下推数量:{{ (totalData && (totalData.totalQty || totalData.totalQty==0)) ? totalData.totalQty : '--' }}</a-col>
+              <a-col :md="4" :sm="24" v-if="$hasPermissions('M_salesOrderTotalList_salesPrice')">实售金额:{{ (totalData && (totalData.totalRealAmount || totalData.totalRealAmount==0)) ? toThousands(totalData.totalRealAmount) : '--' }}</a-col>
+              <a-col :md="4" :sm="24" v-if="$hasPermissions('M_salesOrderTotalList_salesPrice')">开单金额:{{ (totalData && (totalData.totalAmount || totalData.totalAmount==0)) ? toThousands(totalData.totalAmount) : '--' }}</a-col>
+              <a-col :md="4" :sm="24" v-if="$hasPermissions('M_salesOrderTotalList_costPrice')">成本金额:{{ (totalData && (totalData.totalCost || totalData.totalCost==0)) ? toThousands(totalData.totalCost) : '--' }}</a-col>
+              <a-col :md="4" :sm="24" v-if="$hasPermissions('M_salesOrderTotalList_costPrice')&&$hasPermissions('M_salesOrderTotalList_salesPrice')">毛利:{{ (totalData && (totalData.grossProfit || totalData.grossProfit==0)) ? toThousands(totalData.grossProfit) : '--' }}</a-col>
+              <a-col :md="4" :sm="24" v-if="$hasPermissions('M_salesOrderTotalList_salesPrice')">返利:{{ (totalData && (totalData.rebateAmount || totalData.rebateAmount==0)) ? toThousands(totalData.rebateAmount) : '--' }}</a-col>
+              <a-col :md="4" :sm="24" v-if="$hasPermissions('M_salesOrderTotalList_salesPrice')">优惠金额:{{ (totalData && (totalData.discountAmount || totalData.discountAmount==0)) ? toThousands(totalData.discountAmount) : '--' }}</a-col>
             <!-- <a-col :md="4" :sm="24" v-if="$hasPermissions('M_salesOrderTotalList_salesPrice')">折扣金额:{{ (totalData && (totalData.totalDiscountAmount || totalData.totalDiscountAmount==0)) ? toThousands(totalData.totalDiscountAmount) : '--' }}</a-col>
             <a-col :md="4" :sm="24" v-if="$hasPermissions('M_salesOrderTotalList_salesPrice')">折后金额:{{ (totalData && (totalData.totalDiscountedAmount || totalData.totalDiscountedAmount==0)) ? toThousands(totalData.totalDiscountedAmount) : '--' }}</a-col> -->
             </a-row>
@@ -215,7 +215,7 @@ export default {
       rules: {
         'time': [{
           required: true,
-          message: '请选择销售日期',
+          message: '请选择下推时间',
           trigger: 'change'
         }]
       },
@@ -259,7 +259,7 @@ export default {
         { title: '间接绑定客户名称', dataIndex: 'indirectDealerName', width: 120, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '总下推数量', dataIndex: 'totalQty', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '下推数量(促)', dataIndex: 'giftQty', width: 90, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
-        // { title: '实售价', dataIndex: 'totalRealSaleAmount', width: 70, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        // { title: '实售价', dataIndex: 'totalRealAmount', width: 70, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         // { title: '开单价', dataIndex: 'totalAmount', width: 70, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         // { title: '成本价', dataIndex: 'totalCost', width: 70, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         // { title: '毛利', dataIndex: 'grossProfit', width: 70, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
@@ -274,7 +274,7 @@ export default {
 
       ]
       if (this.$hasPermissions('M_salesOrderTotalList_salesPrice')) {
-        arr.push({ title: '实售金额', dataIndex: 'totalRealSaleAmount', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.push({ title: '实售金额', dataIndex: 'totalRealAmount', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
         arr.push({ title: '开单金额', dataIndex: 'totalAmount', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
       if (this.$hasPermissions('M_salesOrderTotalList_costPrice')) { //  成本价权限
@@ -354,7 +354,7 @@ export default {
         if (valid) {
           _this.$refs.table.refresh(true)
         } else {
-          _this.$message.error('请选择销售日期')
+          _this.$message.error('请选择下推时间')
           return false
         }
       })

+ 3 - 3
src/views/reportData/salesSlipReport/list.vue

@@ -13,7 +13,7 @@
           @keyup.enter.native="handleSearch">
           <a-row :gutter="15">
             <a-col :md="6" :sm="24">
-              <a-form-model-item label="下推日期" prop="time">
+              <a-form-model-item label="下推时间" prop="time">
                 <rangeDate ref="rangeDate" :value="queryParam.time" @change="dateChange" />
               </a-form-model-item>
             </a-col>
@@ -166,7 +166,7 @@ export default {
       countLabel: [],
       countBrandLabel: [],
       rules: {
-        'time': [{ required: true, message: '请选择销售日期', trigger: 'change' }]
+        'time': [{ required: true, message: '请选择下推时间', trigger: 'change' }]
       },
       disabled: false, //  查询、重置按钮是否可操作
       exportLoading: false,
@@ -241,7 +241,7 @@ export default {
         if (valid) {
           _this.$refs.table.refresh(true)
         } else {
-          _this.$message.error('请选择销售日期')
+          _this.$message.error('请选择下推时间')
           return false
         }
       })

+ 10 - 10
src/views/salesManagement/priceInquiry/list.vue

@@ -187,24 +187,24 @@ export default {
   computed: {
     columns () {
       const arr = [
-        { title: '产品编码', dataIndex: 'code', scopedSlots: { customRender: 'detail' }, width: '15%', align: 'center' },
-        { title: '产品名称', dataIndex: 'name', width: '15%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '原厂编码', dataIndex: 'origCode', width: '14%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品状态', dataIndex: 'stateDictValue', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品编码', dataIndex: 'code', scopedSlots: { customRender: 'detail' }, width: '8%', align: 'center' },
+        { title: '产品名称', dataIndex: 'name', width: '36%', align: 'left', customRender: function (text) { return text || '--' }},
+        { title: '原厂编码', dataIndex: 'origCode', width: '14%', align: 'left', customRender: function (text) { return text || '--' } },
+        { title: '产品状态', dataIndex: 'stateDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
       ]
       if (this.$hasPermissions('M_priceInquiryList_provincePrice')) { //  售价权限
-        arr.push({ title: '省级价', dataIndex: 'provincePrice', width: '8%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
+        arr.push({ title: '省级价', dataIndex: 'provincePrice', width: '6%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
       }
       if (this.$hasPermissions('M_priceInquiryList_cityPrice')) { //  售价权限
-        arr.push({ title: '市级价', dataIndex: 'cityPrice', width: '8%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
+        arr.push({ title: '市级价', dataIndex: 'cityPrice', width: '6%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
       }
       if (this.$hasPermissions('M_priceInquiryList_specialPrice')) { //  售价权限
-        arr.push({ title: '特约价', dataIndex: 'specialPrice', width: '8%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
+        arr.push({ title: '特约价', dataIndex: 'specialPrice', width: '6%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
       }
        
-        arr.push({ title: '终端价', dataIndex: 'terminalPrice', width: '8%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
-        arr.push({ title: '车主价', dataIndex: 'carOwnersPrice', width: '8%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
-        arr.push({ title: '产品图片', scopedSlots: { customRender: 'imageUrl' }, width: '8%', align: 'center' })
+        arr.push({ title: '终端价', dataIndex: 'terminalPrice', width: '6%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
+        arr.push({ title: '车主价', dataIndex: 'carOwnersPrice', width: '6%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
+        arr.push({ title: '产品图片', scopedSlots: { customRender: 'imageUrl' }, width: '6%', align: 'center' })
       return arr
     }
   },

+ 82 - 83
src/views/salesManagement/pushOrderManagement/list.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-     <!-- 搜索条件 -->
+    <!-- 搜索条件 -->
     <a-card size="small" :bordered="false" class="searchBoxNormal">
       <div ref="tableSearch" class="table-page-search-wrapper">
         <a-form layout="inline">
@@ -105,89 +105,89 @@
         </a-form>
       </div>
     </a-card>
- 
-  <a-card size="small" :bordered="false" class="pushOrder-wrap">
-    <a-spin :spinning="spinning" tip="Loading...">
-      <div class="tongji-bar" style="margin-bottom:10px">
-       下推总单数:<strong>{{ totalData&&(totalData.totalRecord || totalData.totalRecord==0) ? totalData.totalRecord : '--' }}</strong>;
-         下推总数量:<strong>{{ totalData&&(totalData.totalQty || totalData.totalQty==0) ? totalData.totalQty : '--' }}</strong>;
-         <span v-if="$hasPermissions('M_pushOrderManagementList_salesPrice')">下推总金额:<strong>{{ totalData&&(totalData.totalAmount || totalData.totalAmount==0) ? toThousands(totalData.totalAmount) : '--' }}</strong>;</span>
-      </div>
-      <!-- 列表 -->
-      <s-table
-        class="sTable fixPagination"
-        ref="table"
-        :style="{ height: tableHeight+70+'px' }"
-        size="small"
-        :rowKey="(record) => record.id"
-        :columns="columns"
-        :data="loadData"
-        :scroll="{ y:tableHeight, x:1890 }"
-        :defaultLoadData="false"
-        bordered>
-        <!-- 销售单号 -->
-        <template slot="salesBillNo" slot-scope="text, record">
-          <span class="link-bule" v-if="$hasPermissions('B_salesDetail')" @click="handleDetail(record,0)">{{ record.salesBillNo }}</span>
-          <span v-else>{{ record.salesBillNo }}</span>
-        </template>
-        <!-- 备货单号 -->
-        <template slot="dispatchBillNo" slot-scope="text, record">
-          <span class="link-bule" v-if="$hasPermissions('B_dispatchDetail')" @click="handleDetail(record,1)">{{ record.dispatchBillNo }}</span>
-          <span v-else>{{ record.dispatchBillNo }}</span>
-        </template>
-        <!-- 发货说明  -->
-        <template slot="explainInfo" slot-scope="text, record">
-          <span class="link-bule" @click="handleExplainInfo(record)" :title="record.explainInfo">{{ record.explainInfo||'--' }}</span>
-        </template>
-        <!-- 操作 -->
-        <template slot="action" slot-scope="text, record">
-          <div>
-            <a-button
-              size="small"
-              type="link"
-              class="button-warning"
-              :loading="!!tipData"
-              v-if="(record.printStatus=='UNABLE_PRINT'||record.printStatus=='CANCEL_PRINT')&&record.voidFlag=='0'&&$hasPermissions('B_UNABLE_PRINT')"
-              @click="handlePrint(record,1)"
-            >允许打印</a-button>
-            <a-button
-              size="small"
-              type="link"
-              class="button-error"
-              :loading="!!tipData"
-              v-if="record.printStatus=='UNABLE_PRINT'&&record.voidFlag=='0'&&$hasPermissions('B_CANSEL_PRINT')"
-              @click="handlePrint(record,0)"
-            >取消打印</a-button>
-          </div>
-        </template>
-      </s-table>
 
-      <!-- 操作提示 -->
-      <commonModal modalTit="操作提示" :openModal="showTipModal" @cancel="canselModal" @ok="updatePrintStatus">
-        <div style="display:flex;flex-direction: column;align-items: center;">
-          <div style="margin-bottom: 15px;font-size: 14px;"><strong>{{ tipData&&tipData.printType==1?'确认允许此单进行备货打印吗?':'确认此单取消备货打印吗?' }}</strong></div>
-          <div style="line-height: 24px;">
-            <div>备货单号:{{ tipData&&tipData.dispatchBillNo }}</div>
-            <div>客户名称:{{ tipData&&tipData.buyerName }}</div>
-          </div>
+    <a-card size="small" :bordered="false" class="pushOrder-wrap">
+      <a-spin :spinning="spinning" tip="Loading...">
+        <div class="tongji-bar" style="margin-bottom:10px">
+          下推总单数:<strong>{{ totalData&&(totalData.totalRecord || totalData.totalRecord==0) ? totalData.totalRecord : '--' }}</strong>;
+          下推总数量:<strong>{{ totalData&&(totalData.totalQty || totalData.totalQty==0) ? totalData.totalQty : '--' }}</strong>;
+          <span v-if="$hasPermissions('M_pushOrderManagementList_salesPrice')">下推总金额:<strong>{{ totalData&&(totalData.totalAmount || totalData.totalAmount==0) ? toThousands(totalData.totalAmount) : '--' }}</strong>;</span>
         </div>
-      </commonModal>
+        <!-- 列表 -->
+        <s-table
+          class="sTable fixPagination"
+          ref="table"
+          :style="{ height: tableHeight+70+'px' }"
+          size="small"
+          :rowKey="(record) => record.id"
+          :columns="columns"
+          :data="loadData"
+          :scroll="{ y:tableHeight, x:1890 }"
+          :defaultLoadData="false"
+          bordered>
+          <!-- 销售单号 -->
+          <template slot="salesBillNo" slot-scope="text, record">
+            <span class="link-bule" v-if="$hasPermissions('B_salesDetail')" @click="handleDetail(record,0)">{{ record.salesBillNo }}</span>
+            <span v-else>{{ record.salesBillNo }}</span>
+          </template>
+          <!-- 备货单号 -->
+          <template slot="dispatchBillNo" slot-scope="text, record">
+            <span class="link-bule" v-if="$hasPermissions('B_dispatchDetail')" @click="handleDetail(record,1)">{{ record.dispatchBillNo }}</span>
+            <span v-else>{{ record.dispatchBillNo }}</span>
+          </template>
+          <!-- 发货说明  -->
+          <template slot="explainInfo" slot-scope="text, record">
+            <span class="link-bule" @click="handleExplainInfo(record)" :title="record.explainInfo">{{ record.explainInfo||'--' }}</span>
+          </template>
+          <!-- 操作 -->
+          <template slot="action" slot-scope="text, record">
+            <div>
+              <a-button
+                size="small"
+                type="link"
+                class="button-warning"
+                :loading="!!tipData"
+                v-if="(record.printStatus=='UNABLE_PRINT'||record.printStatus=='CANCEL_PRINT')&&record.voidFlag=='0'&&$hasPermissions('B_UNABLE_PRINT')"
+                @click="handlePrint(record,1)"
+              >允许打印</a-button>
+              <a-button
+                size="small"
+                type="link"
+                class="button-error"
+                :loading="!!tipData"
+                v-if="record.printStatus=='UNABLE_PRINT'&&record.voidFlag=='0'&&$hasPermissions('B_CANSEL_PRINT')"
+                @click="handlePrint(record,0)"
+              >取消打印</a-button>
+            </div>
+          </template>
+        </s-table>
 
-      <!-- 查看销售单或备货单详情 -->
-      <commonModal
-        modalTit="销售单详情"
-        bodyPadding="10px"
-        width="70%"
-        :showFooter="false"
-        :openModal="showDetailModal"
-        @cancel="closeDetailModal">
-        <salesDetail v-if="showDetailModal" ref="salesDetail" :bizSn="bizSn"></salesDetail>
-      </commonModal>
-      <!-- 发货说明 -->
-      <explainInfoModal v-drag :rowData="tipData" :openModal="showInfoModal" @close="canselModal"></explainInfoModal>
-    </a-spin>
-  </a-card>
-   </div>
+        <!-- 操作提示 -->
+        <commonModal modalTit="操作提示" :openModal="showTipModal" @cancel="canselModal" @ok="updatePrintStatus">
+          <div style="display:flex;flex-direction: column;align-items: center;">
+            <div style="margin-bottom: 15px;font-size: 14px;"><strong>{{ tipData&&tipData.printType==1?'确认允许此单进行备货打印吗?':'确认此单取消备货打印吗?' }}</strong></div>
+            <div style="line-height: 24px;">
+              <div>备货单号:{{ tipData&&tipData.dispatchBillNo }}</div>
+              <div>客户名称:{{ tipData&&tipData.buyerName }}</div>
+            </div>
+          </div>
+        </commonModal>
+
+        <!-- 查看销售单或备货单详情 -->
+        <commonModal
+          modalTit="销售单详情"
+          bodyPadding="10px"
+          width="70%"
+          :showFooter="false"
+          :openModal="showDetailModal"
+          @cancel="closeDetailModal">
+          <salesDetail v-if="showDetailModal" ref="salesDetail" :bizSn="bizSn"></salesDetail>
+        </commonModal>
+        <!-- 发货说明 -->
+        <explainInfoModal v-drag :rowData="tipData" :openModal="showInfoModal" @close="canselModal"></explainInfoModal>
+      </a-spin>
+    </a-card>
+  </div>
 </template>
 
 <script>
@@ -275,7 +275,7 @@ export default {
     columns () {
       const arr = [
         { title: '序号', dataIndex: 'no', width: '60px', align: 'center' },
-        { title: '下推时间', dataIndex: 'createDate', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '下推时间', dataIndex: 'pushedDate', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '销售单号', scopedSlots: { customRender: 'salesBillNo' }, width: '120px', align: 'center' },
         { title: '备货单号', scopedSlots: { customRender: 'dispatchBillNo' }, width: '120px', align: 'center' },
         { title: '发货编号', dataIndex: 'sendNo', width: '80px', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
@@ -427,4 +427,3 @@ export default {
   }
 }
 </script>
- 

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

@@ -175,14 +175,14 @@ export default {
     columns () {
       const arr = [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
-        { title: '产品编码', dataIndex: 'productCode', width: '16%', align: 'left', scopedSlots: { customRender: 'productCode' } },
-        { title: '产品名称', dataIndex: 'productName', width: '24%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '原厂编码', dataIndex: 'origCode', width: '16%', align: 'left', customRender: function (text) { return text || '--' } },
+        { title: '产品编码', dataIndex: 'productCode', width: '12%', align: 'left', scopedSlots: { customRender: 'productCode' } },
+        { title: '产品名称', dataIndex: 'productName', width: '38%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '原厂编码', dataIndex: 'origCode', width: '14%', align: 'left', customRender: function (text) { return text || '--' } },
         { title: '单位', dataIndex: 'unit', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '缺货数量', dataIndex: 'qty', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         // { title: '缺货金额', dataIndex: 'totalAmount', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '客户名称', dataIndex: 'buyerName', width: '18%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '仓库', dataIndex: 'warehouseName', width: '18%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '仓库', dataIndex: 'warehouseName', width: '10%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '产品状态', dataIndex: 'productShowStateDictValue', width: '8%', align: 'center', customRender: function (text) { return text || '--' } }
       ]
       if (this.$hasPermissions('M_shortageStatisticsPList_costPrice')) { // 成本权限

+ 27 - 21
src/views/salesManagement/stockPrint/list.vue

@@ -116,7 +116,6 @@
                 :maxTagCount="3"
                 :tree-data="colsArr"
                 tree-checkable
-                :show-checked-strategy="SHOW_PARENT"
                 placeholder="请选择要显示的列"
               />
           </div>
@@ -125,7 +124,7 @@
         <s-table
           class="sTable fixPagination"
           ref="table"
-          :style="{ height: tableHeight+84.5+'px' }"
+          :style="{ height: tableHeight+84.5+'px'}"
           size="small"
           :rowKey="(record) => record.id"
           :columns="columns"
@@ -286,6 +285,11 @@ export default {
       showInfoModal: false,
       showCols:[],
       colsArr:[
+        {
+          title: '销售单号',
+          value: 'salesBillNo',
+          key: 'salesBillNo'
+        },
         {
           title: '仓库',
           value: 'warehouseName',
@@ -317,41 +321,43 @@ export default {
   computed: {
     columns () {
       const arr = [
-        { title: '序号', dataIndex: 'no', width: '40px', align: 'center' },
-        { title: '创建时间', dataIndex: 'createDate', width: '70px', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '销售单号', scopedSlots: { customRender: 'salesBillNo' }, width: '90px', align: 'center' },
-        { title: '备货单号', scopedSlots: { customRender: 'dispatchBillNo' }, width: '90px', align: 'center' },
-        { title: '发货编号', dataIndex: 'sendNo', width: '40px', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '发货说明', scopedSlots: { customRender: 'explainInfo' }, width: '50px', align: 'center', ellipsis: true },
-        { title: '客户名称', dataIndex: 'buyerName', width: '100px', align: 'left', customRender: function (text) { return text || '--' } },
-        { title: '收货客户名称', dataIndex: 'receiverName', width: '100px', align: 'left', customRender: function (text) { return text || '--' } },
-        { title: '产品款数', dataIndex: 'totalCategory', width: '50px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '产品数量', dataIndex: 'totalQty', width: '50px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
+        { title: '序号', dataIndex: 'no', width: '30px', align: 'center' },
+        { title: '创建时间', dataIndex: 'createDate', width: '60px', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '备货单号', scopedSlots: { customRender: 'dispatchBillNo' }, width: '80px', align: 'center' },
+        { title: '发货编号', dataIndex: 'sendNo', width: '30px', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '发货说明', scopedSlots: { customRender: 'explainInfo' }, width: '100px', align: 'center', ellipsis: true },
+        { title: '客户名称', dataIndex: 'buyerName', width: '120px', align: 'left', customRender: function (text) { return text || '--' } },
+        { title: '收货客户名称', dataIndex: 'receiverName', width: '110px', align: 'left', customRender: function (text) { return text || '--' } },
+        { title: '产品款数', dataIndex: 'totalCategory', width: '30px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '产品数量', dataIndex: 'totalQty', width: '30px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
       ]
+      if(this.showCols.includes('salesBillNo')){
+        arr.splice(2, 0, { title: '销售单号', scopedSlots: { customRender: 'salesBillNo' }, width: '80px', align: 'center' })
+      }
 
       if (this.$hasPermissions('M_stockPrintList_salesPrice')) { //  售价权限
         const ind = this.isShowWarehouse ? 10 : 9
-        arr.splice(ind, 0, { title: '开单总金额', dataIndex: 'totalAmount', width: '60px', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
-        arr.splice(ind + 1, 0, { title: '正价总金额', dataIndex: 'normalTotalAmount', width: '60px', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
-		    arr.splice(ind + 2, 0, { slots: { title: 'costTitle' }, dataIndex: 'receiveTotalAmount', width: '60px', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
-        arr.splice(ind + 3, 0, { title: '易损件售价', dataIndex: 'receiveYsjTotalAmount', width: '60px', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
+        arr.splice(ind, 0, { title: '开单总金额', dataIndex: 'totalAmount', width: '50px', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
+        arr.splice(ind + 1, 0, { title: '正价总金额', dataIndex: 'normalTotalAmount', width: '50px', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
+		    arr.splice(ind + 2, 0, { slots: { title: 'costTitle' }, dataIndex: 'receiveTotalAmount', width: '50px', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
+        arr.splice(ind + 3, 0, { title: '易损件售价', dataIndex: 'receiveYsjTotalAmount', width: '50px', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
         arr.splice(ind + 4, 0, { title: '电池售价', dataIndex: 'receiveDcTotalAmount', width: '50px', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
         arr.splice(ind + 5, 0, { title: '机油售价', dataIndex: 'receiveJyTotalAmount', width: '50px', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
         arr.splice(ind + 6, 0, { title: '轮胎售价', dataIndex: 'receiveLtTotalAmount', width: '50px', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
       }
       
       if(this.showCols.includes('warehouseName')){
-        arr.push({ title: '仓库', dataIndex: 'warehouseName', width: '60px', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true })
+        arr.push({ title: '仓库', dataIndex: 'warehouseName', width: '50px', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true })
         }
       if(this.showCols.includes('billStatusDictValue')){
-        arr.push({ title: '业务状态', dataIndex: 'billStatusDictValue', width: '50px', align: 'center', customRender: function (text) { return text || '--' } })
+        arr.push({ title: '业务状态', dataIndex: 'billStatusDictValue', width: '40px', align: 'center', customRender: function (text) { return text || '--' } })
       }
       if(this.showCols.includes('voidFlagDictValue')){
-        arr.push({ title: '单据状态', dataIndex: 'voidFlagDictValue', width: '50px', align: 'center', customRender: function (text) { return text || '--' } })
+        arr.push({ title: '单据状态', dataIndex: 'voidFlagDictValue', width: '40px', align: 'center', customRender: function (text) { return text || '--' } })
       }
-      arr.push({ title: '备货打印状态', width: '50px', align: 'center', scopedSlots: { customRender: 'printStatus' } })
+      arr.push({ title: '备货打印状态', width: '40px', align: 'center', scopedSlots: { customRender: 'printStatus' } })
       if(this.showCols.includes('allowPrintTime')){
-        arr.push({ title: '允许打印时间', dataIndex: 'allowPrintTime', width: '70px', align: 'center', customRender: function (text) { return text || '--' } })
+        arr.push({ title: '允许打印时间', dataIndex: 'allowPrintTime', width: '50px', align: 'center', customRender: function (text) { return text || '--' } })
       }
       if(this.showCols.includes('stockUpPrintTimes')){
         arr.push({ title: '打印次数', dataIndex: 'stockUpPrintTimes', width: '40px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })

+ 6 - 6
src/views/salesReturnManagement/salesReturn/list.vue

@@ -336,12 +336,12 @@ export default {
         { title: '创建时间', dataIndex: 'createDate', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '单据来源', dataIndex: 'salesReturnBillSourceDictValue', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '退货仓库', dataIndex: 'warehouseName', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '同步给客户', dataIndex: 'syncFlag', width: '5%', align: 'center', customRender: function (text) { return text ? ['否', '是'][text] : '--' } },
-        { title: '客户采退申请单号', dataIndex: 'purchaseReturnApplyNo', width: '9%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '总部销退单号', scopedSlots: { customRender: 'salesReturnBillNo' }, width: '7%', align: 'center' },
-        { title: '客户名称', dataIndex: 'buyerName', width: '7%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '退货类别', dataIndex: 'goodFlagDictValue', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '退货类型', dataIndex: 'salesReturnTypeDictValue', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '同步给客户', dataIndex: 'syncFlag', width: '4%', align: 'center', customRender: function (text) { return text ? ['否', '是'][text] : '--' } },
+        { title: '客户采退申请单号', dataIndex: 'purchaseReturnApplyNo', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '总部销退单号', scopedSlots: { customRender: 'salesReturnBillNo' }, width: '10%', align: 'center' },
+        { title: '客户名称', dataIndex: 'buyerName', width: '8%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '退货类别', dataIndex: 'goodFlagDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '退货类型', dataIndex: 'salesReturnTypeDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '申请退货数量', dataIndex: 'totalInitialQty', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '仓库实收数量', dataIndex: 'totalReceiveQty', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '坏件数量', dataIndex: 'totalBadQty', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },