lilei 2 år sedan
förälder
incheckning
5081ee4f51
27 ändrade filer med 193 tillägg och 150 borttagningar
  1. 22 22
      src/libs/getDate.js
  2. 1 0
      src/views/allocationManagement/transferOut/list.vue
  3. 14 4
      src/views/common/rangeDate.vue
  4. 2 2
      src/views/dowloadFile/list.vue
  5. 1 1
      src/views/expenseManagement/expenseReimbursement/list.vue
  6. 9 11
      src/views/financialManagement/collectionDetailStatic/list.vue
  7. 4 4
      src/views/financialManagement/financialCollection/list.vue
  8. 0 2
      src/views/power/OperateJournal/OperateJournal.vue
  9. 3 30
      src/views/productManagement/productInfo/list.vue
  10. 4 4
      src/views/productManagement/productPricing/editModal.vue
  11. 69 2
      src/views/productManagement/productPricing/list.vue
  12. 2 2
      src/views/promotionRulesManagement/promotionRules/list.vue
  13. 3 3
      src/views/reportData/allocationPresentation/list.vue
  14. 1 5
      src/views/reportData/hPriceDifferenceDetailReport/list.vue
  15. 11 11
      src/views/reportData/salesDetails/list.vue
  16. 16 16
      src/views/reportData/salesOrderTotal/list.vue
  17. 3 3
      src/views/reportData/salesPresentation/list.vue
  18. 3 3
      src/views/reportData/salesReturnDetailReport/list.vue
  19. 3 3
      src/views/reportData/warehousingOrder/list.vue
  20. 3 3
      src/views/reportData/warehousingOrderDetail/list.vue
  21. 4 4
      src/views/salesManagement/receiptPrint/list.vue
  22. 4 4
      src/views/salesManagement/salesCollection/list.vue
  23. 4 4
      src/views/salesReturnManagement/billOfLading/list.vue
  24. 2 2
      src/views/salesReturnManagement/pickUp/list.vue
  25. 2 2
      src/views/setting/notice/list.vue
  26. 1 1
      src/views/supplierManagement/associatedProductDetails/list.vue
  27. 2 2
      vue.config.js

+ 22 - 22
src/libs/getDate.js

@@ -12,8 +12,8 @@ export default {
       starttime: '',
       endtime: ''
     }
-    obj.starttime = moment(moment().startOf('day').valueOf()).format('YYYY-MM-DD')
-    obj.endtime = moment(moment().valueOf()).format('YYYY-MM-DD')
+    obj.starttime = moment(moment().startOf('day').valueOf()).format('YYYY-MM-DD 00:00:00')
+    obj.endtime = moment(moment().valueOf()).format('YYYY-MM-DD 23:59:59')
     return obj
   },
   // 获取今日的开始结束时间  年月日时分秒
@@ -32,8 +32,8 @@ export default {
       starttime: '',
       endtime: ''
     }
-    obj.starttime = moment().subtract('days', 6).format('YYYY-MM-DD')
-    obj.endtime = moment(moment().valueOf()).format('YYYY-MM-DD')
+    obj.starttime = moment().subtract('days', 6).format('YYYY-MM-DD 00:00:00')
+    obj.endtime = moment(moment().valueOf()).format('YYYY-MM-DD 23:59:59')
     return obj
   },
   //  近7天  年月日时分秒
@@ -52,8 +52,8 @@ export default {
       starttime: '',
       endtime: ''
     }
-    obj.starttime = moment().subtract('days', 2).format('YYYY-MM-DD')
-    obj.endtime = moment(moment().valueOf()).format('YYYY-MM-DD')
+    obj.starttime = moment().subtract('days', 2).format('YYYY-MM-DD 00:00:00')
+    obj.endtime = moment(moment().valueOf()).format('YYYY-MM-DD 23:59:59')
     return obj
   },
   // 获取昨日的开始结束时间
@@ -62,8 +62,8 @@ export default {
       starttime: '',
       endtime: ''
     }
-    obj.starttime = moment(moment().add(-1, 'days').startOf('day').valueOf()).format('YYYY-MM-DD')
-    obj.endtime = moment(moment().add(-1, 'days').endOf('day').valueOf()).format('YYYY-MM-DD')
+    obj.starttime = moment(moment().add(-1, 'days').startOf('day').valueOf()).format('YYYY-MM-DD 00:00:00')
+    obj.endtime = moment(moment().add(-1, 'days').endOf('day').valueOf()).format('YYYY-MM-DD 23:59:59')
     return obj
   },
   // 获取当前周的开始到当天结束时间
@@ -72,8 +72,8 @@ export default {
       starttime: '',
       endtime: ''
     }
-    obj.starttime = moment(moment().week(moment().week()).startOf('week').add('days').valueOf()).format('YYYY-MM-DD')
-    obj.endtime = moment(moment().valueOf()).format('YYYY-MM-DD')
+    obj.starttime = moment(moment().week(moment().week()).startOf('week').add('days').valueOf()).format('YYYY-MM-DD 00:00:00')
+    obj.endtime = moment(moment().valueOf()).format('YYYY-MM-DD 23:59:59')
     return obj
   },
   // 获取上一周的开始结束时间
@@ -82,8 +82,8 @@ export default {
       starttime: '',
       endtime: ''
     }
-    obj.starttime = moment(moment().week(moment().week() - 1).startOf('week').add('days').valueOf()).format('YYYY-MM-DD')
-    obj.endtime = moment(moment().week(moment().week() - 1).endOf('week').add('days').valueOf()).format('YYYY-MM-DD')
+    obj.starttime = moment(moment().week(moment().week() - 1).startOf('week').add('days').valueOf()).format('YYYY-MM-DD 00:00:00')
+    obj.endtime = moment(moment().week(moment().week() - 1).endOf('week').add('days').valueOf()).format('YYYY-MM-DD 23:59:59')
     return obj
   },
   // 获取上一月的今天到当月的今天
@@ -92,8 +92,8 @@ export default {
       starttime: '',
       endtime: ''
     }
-    obj.starttime = moment(moment().month(moment().month() - 1).valueOf()).format('YYYY-MM-DD')
-    obj.endtime = moment(moment().valueOf()).format('YYYY-MM-DD')
+    obj.starttime = moment(moment().month(moment().month() - 1).valueOf()).format('YYYY-MM-DD 00:00:00')
+    obj.endtime = moment(moment().valueOf()).format('YYYY-MM-DD 23:59:59')
     return obj
   },
   // 获取当前月的开始到当天结束时间
@@ -102,8 +102,8 @@ export default {
       starttime: '',
       endtime: ''
     }
-    obj.starttime = moment(moment().month(moment().month()).startOf('month').valueOf()).format('YYYY-MM-DD')
-    obj.endtime = moment(moment().valueOf()).format('YYYY-MM-DD')
+    obj.starttime = moment(moment().month(moment().month()).startOf('month').valueOf()).format('YYYY-MM-DD 00:00:00')
+    obj.endtime = moment(moment().valueOf()).format('YYYY-MM-DD 23:59:59')
     return obj
   },
   // 获取上一个月的开始结束时间
@@ -112,8 +112,8 @@ export default {
       starttime: '',
       endtime: ''
     }
-    obj.starttime = moment(moment().month(moment().month() - 1).startOf('month').valueOf()).format('YYYY-MM-DD')
-    obj.endtime = moment(moment().month(moment().month() - 1).endOf('month').valueOf()).format('YYYY-MM-DD')
+    obj.starttime = moment(moment().month(moment().month() - 1).startOf('month').valueOf()).format('YYYY-MM-DD 00:00:00')
+    obj.endtime = moment(moment().month(moment().month() - 1).endOf('month').valueOf()).format('YYYY-MM-DD 23:59:59')
     return obj
   },
   // 获取三月前的今天到当月的今天
@@ -122,8 +122,8 @@ export default {
       starttime: '',
       endtime: ''
     }
-    obj.starttime = moment(moment().month(moment().month() - 3).valueOf()).format('YYYY-MM-DD')
-    obj.endtime = moment(moment().month(moment().month() - 3).endOf('month').valueOf()).format('YYYY-MM-DD')
+    obj.starttime = moment(moment().month(moment().month() - 3).valueOf()).format('YYYY-MM-DD 00:00:00')
+    obj.endtime = moment(moment().month(moment().month() - 3).endOf('month').valueOf()).format('YYYY-MM-DD 23:59:59')
     return obj
   },
   // 获取近三个月的开始结束时间
@@ -132,8 +132,8 @@ export default {
       starttime: '',
       endtime: ''
     }
-    obj.starttime = moment(moment().month(moment().month() - 2).startOf('month').valueOf()).format('YYYY-MM-DD')
-    obj.endtime = moment(moment().month(moment().month() - 2).endOf('month').valueOf()).format('YYYY-MM-DD')
+    obj.starttime = moment(moment().month(moment().month() - 2).startOf('month').valueOf()).format('YYYY-MM-DD 00:00:00')
+    obj.endtime = moment(moment().month(moment().month() - 2).endOf('month').valueOf()).format('YYYY-MM-DD 23:59:59')
     return obj
   }
 }

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

@@ -354,6 +354,7 @@ export default {
     handleExport () {
       const _this = this
       const params = this.queryParam
+      params.showCostFlag = this.$hasPermissions('B_isShowCost')
       this.exportLoading = true
       this.spinning = true
       hdExportExcel(allocateBillExport, params, '调拨列表', function () {

+ 14 - 4
src/views/common/rangeDate.vue

@@ -1,10 +1,10 @@
 <template>
   <a-range-picker
     style="width:100%"
-    :size="size"
+    :ranges="ranges"
     :value="date"
+    :size="size"
     :disabledDate="disabledDate"
-    :allowClear="allowClear"
     :format="dateFormat"
     @change="dateChange"
     @calendarChange="dateCalendarChange"
@@ -24,7 +24,7 @@ export default {
       type: String,
       default: 'default'
     },
-    allowClear: {
+    showTime: {
       type: Boolean,
       default: true
     }
@@ -33,7 +33,12 @@ export default {
     return {
       date: this.value,
       dateFormat: 'YYYY-MM-DD',
-      selectPriceDate: ''
+      selectPriceDate: '',
+      ranges: {
+        '今天': [moment(), moment()],
+        '近一个月': [moment().subtract(1, 'months'), moment()],
+        '本月': [moment().startOf('month'), moment()],
+        '上月': [moment().subtract(1, 'months').startOf('month'), moment().subtract(1, 'months').endOf('month')] }
     }
   },
   methods: {
@@ -60,6 +65,11 @@ export default {
       this.date = date
       if (dateStrings[0] == '' && dateStrings[1] == '') {
         dateStrings = []
+      } else {
+        if (this.showTime) {
+          dateStrings[0] = dateStrings[0] + ' 00:00:00'
+          dateStrings[1] = dateStrings[1] + ' 23:59:59'
+        }
       }
       this.$emit('change', dateStrings)
     },

+ 2 - 2
src/views/dowloadFile/list.vue

@@ -118,8 +118,8 @@ export default {
     },
     //  时间  change
     dateChange (date) {
-      this.queryParam.beginDate = date[0] ? date[0] + ' 00:00:00' : ''
-      this.queryParam.endDate = date[1] ? date[1] + ' 23:59:59' : ''
+      this.queryParam.beginDate = date[0] ? date[0] : ''
+      this.queryParam.endDate = date[1] ? date[1] : ''
     },
     //  重置
     resetSearchForm () {

+ 1 - 1
src/views/expenseManagement/expenseReimbursement/list.vue

@@ -168,7 +168,7 @@ export default {
       tableHeight: 0,
       // 查询参数
       queryParam: {
-        expenseDate: undefined, // 月份
+        expenseDate: moment().format('YYYY-MM'), // 月份
         expenseAccountNo: '', // 费用单号
         title: '', //  主题
         expenseType: undefined, // 费用类型

+ 9 - 11
src/views/financialManagement/collectionDetailStatic/list.vue

@@ -131,8 +131,8 @@ export default {
       tableHeight: 0,
       queryParam: { //  查询条件
         bookNo: '',
-        auditBeginDate: getDate.getCurrMonthDays().starttime + ' 00:00:00',
-        auditEndDate: getDate.getCurrMonthDays().endtime + ' 23:59:59',
+        auditBeginDate: getDate.getCurrMonthDays().starttime,
+        auditEndDate: getDate.getCurrMonthDays().endtime,
         receiptBeginDate: '',
         receiptEndDate: '',
         applyPersonSn: undefined,
@@ -207,29 +207,27 @@ export default {
     },
     //  创建时间  change
     receiptDateChange (date) {
-      this.queryParam.receiptBeginDate = date[0] ? date[0] + ' 00:00:00' : ''
-      this.queryParam.receiptEndDate = date[1] ? date[1] + ' 23:59:59' : ''
+      this.queryParam.receiptBeginDate = date[0] ? date[0] : ''
+      this.queryParam.receiptEndDate = date[1] ? date[1] : ''
     },
     //  审核时间  change
     dateAuditChange (date) {
-      this.queryParam.auditBeginDate = date[0] ? date[0] + ' 00:00:00' : ''
-      this.queryParam.auditEndDate = date[1] ? date[1] + ' 23:59:59' : ''
+      this.queryParam.auditBeginDate = date[0] ? date[0] : ''
+      this.queryParam.auditEndDate = date[1] ? date[1] : ''
     },
     //  重置
     resetSearchForm () {
       this.receiptDate = []
       this.queryParam.receiptBeginDate = ''
       this.queryParam.receiptEndDate = ''
-      if (this.advanced) {
-        this.$refs.receiptDate.resetDate(this.receiptDate)
-      }
+      this.$refs.receiptDate.resetDate(this.receiptDate)
       this.auditDate = [
         getDate.getCurrMonthDays().starttime,
         getDate.getCurrMonthDays().endtime
       ]
       this.$refs.rangeAuditDate.resetDate(this.auditDate)
-      this.queryParam.auditBeginDate = getDate.getCurrMonthDays().starttime + ' 00:00:00'
-      this.queryParam.auditEndDate = getDate.getCurrMonthDays().endtime + ' 23:59:59'
+      this.queryParam.auditBeginDate = getDate.getCurrMonthDays().starttime
+      this.queryParam.auditEndDate = getDate.getCurrMonthDays().endtime
 
       this.queryParam.bookNo = ''
       this.queryParam.dispatchBillNo = ''

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

@@ -218,13 +218,13 @@ export default {
   methods: {
     //  创建时间  change
     dateChange (date) {
-      this.queryParam.beginDate = date[0] ? date[0] + ' 00:00:00' : ''
-      this.queryParam.endDate = date[1] ? date[1] + ' 23:59:59' : ''
+      this.queryParam.beginDate = date[0] ? date[0] : ''
+      this.queryParam.endDate = date[1] ? date[1] : ''
     },
     //  审核时间  change
     dateAuditChange (date) {
-      this.queryParam.auditBeginDate = date[0] ? date[0] + ' 00:00:00' : ''
-      this.queryParam.auditEndDate = date[1] ? date[1] + ' 23:59:59' : ''
+      this.queryParam.auditBeginDate = date[0] ? date[0] : ''
+      this.queryParam.auditEndDate = date[1] ? date[1] : ''
     },
     //  重置
     resetSearchForm () {

+ 0 - 2
src/views/power/OperateJournal/OperateJournal.vue

@@ -82,8 +82,6 @@ export default {
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         this.disabled = true
-        this.queryParam.beginDate = this.queryParam.beginDate + ' 00:00:00'
-        this.queryParam.endDate = this.queryParam.endDate + ' 23:59:59'
         return journalList(Object.assign(parameter, this.queryParam)).then(res => {
           let data
           if (res.status == 200) {

+ 3 - 30
src/views/productManagement/productInfo/list.vue

@@ -204,13 +204,13 @@
 
 <script>
 import { commonMixin } from '@/utils/mixin'
-import moment from 'moment'
 import { STable, VSelect } from '@/components'
 import productInfoDetailModal from './detailModal.vue'
 import productInfoOfflineModal from './offlineModal.vue'
 import { productBrandQuery } from '@/api/productBrand'
 import { productTypeQueryAll } from '@/api/productType'
 import ProductBrand from '@/views/common/productBrand.js'
+import { exportExcel } from '@/libs/JGPrint.js'
 import { productList, productAudit, productBatchAudit, productDel, productOnline, productBatchOnline, productExport } from '@/api/product'
 export default {
   name: 'ProductInfoList',
@@ -515,38 +515,11 @@ export default {
     handleExport () {
       const _this = this
       const params = this.queryParam
-      this.exportLoading = true
-      _this.spinning = true
-      productExport(params).then(res => {
-        this.exportLoading = false
+      this.spinning = true
+      exportExcel(productExport, params, '产品列表', function () {
         _this.spinning = false
-        if (res.type == 'application/json') {
-          var reader = new FileReader()
-          reader.addEventListener('loadend', function () {
-            const obj = JSON.parse(reader.result)
-            _this.$notification.error({
-              message: '提示',
-              description: obj.message
-            })
-          })
-          reader.readAsText(res)
-        } else {
-          this.download(res)
-        }
       })
     },
-    download (data) {
-      if (!data) { return }
-      const url = window.URL.createObjectURL(new Blob([data]))
-      const link = document.createElement('a')
-      link.style.display = 'none'
-      link.href = url
-      const a = moment().format('YYYYMMDDHHmmss')
-      const fname = '产品列表' + a
-      link.setAttribute('download', fname + '.xlsx')
-      document.body.appendChild(link)
-      link.click()
-    },
     //  产品分类  change
     changeProductType (val, opt) {
       this.queryParam.productTypeSn1 = val[0] ? val[0] : ''

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

@@ -160,7 +160,7 @@ export default {
           this.form.afterSpecialPrice = res.data.afterSpecialPrice || ''
           this.form.afterTerminalPrice = res.data.afterTerminalPrice || ''
           this.form.afterCarOwnersPrice = res.data.afterCarOwnersPrice || ''
-          this.form.changeReason = res.data.changeReason || undefined
+          this.form.changeReason = res.data.id ? '价格修改' : '首次定价'
         } else {
           this.detailData = null
           this.$refs.ruleForm.resetFields()
@@ -226,11 +226,11 @@ export default {
         this.$emit('close')
         this.costPrice = ''
         this.$refs.ruleForm.resetFields()
-      }else{
+      } else {
         // 默认首项获取焦点
         const _this = this
-        setTimeout(()=>{
-          if(_this.$refs['afterProvincePrice']){
+        setTimeout(() => {
+          if (_this.$refs['afterProvincePrice']) {
             _this.$refs['afterProvincePrice'].focus()
           }
         }, 300)

+ 69 - 2
src/views/productManagement/productPricing/list.vue

@@ -45,6 +45,13 @@
             <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
               <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="productPricingList-refresh">查询</a-button>
               <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="productPricingList-reset">重置</a-button>
+              <a-button
+                style="margin-left: 5px"
+                type="primary"
+                class="button-warning"
+                @click="handleExport"
+                :disabled="disabled"
+                id="productInfoList-export">导出</a-button>
               <a @click="advanced=!advanced" style="margin-left: 5px">
                 {{ advanced ? '收起' : '展开' }}
                 <a-icon :type="advanced ? 'up' : 'down'"/>
@@ -53,12 +60,26 @@
           </a-row>
         </a-form>
       </div>
+      <!-- 操作按钮 -->
+      <div class="table-operator">
+        <a-button
+          id="productPricingList-batchAudit"
+          type="primary"
+          class="button-warning"
+          :loading="spinning"
+          @click="handleBatchAudit"
+          style="margin: 0 15px 0 0;">批量审核</a-button>
+        <span>已选{{ rowSelectionInfo&&rowSelectionInfo.selectedRowKeys?rowSelectionInfo.selectedRowKeys.length:0 }}项</span>
+        <a-button style="margin: 0 0 0 15px;" id="productPricingList-add" type="primary" class="button-error">定价导入</a-button>
+      </div>
       <!-- 列表 -->
       <s-table
         class="sTable fixPagination"
         ref="table"
         :style="{ height: tableHeight+84.5+'px' }"
         size="small"
+        :row-selection="{ columnWidth: 40, getCheckboxProps: record => ({ props: { disabled: record.pricingState=='WAIT_PRICING_AUDIT' } })}"
+        @rowSelection="rowSelectionFun"
         :rowKey="(record) => record.id"
         :columns="columns"
         :data="loadData"
@@ -110,6 +131,7 @@
 <script>
 import { commonMixin } from '@/utils/mixin'
 import { STable, VSelect } from '@/components'
+import { exportExcel } from '@/libs/JGPrint.js'
 import productPricingEditModal from './editModal.vue'
 import productPricingAuditModal from './auditModal.vue'
 import { productBrandQuery } from '@/api/productBrand'
@@ -160,7 +182,8 @@ export default {
       openAuditModal: false, //  审核  弹框
       itemSn: '', //  当前产品sn
       productBrandList: [], //  品牌下拉数据
-      productTypeList: [] //  分类下拉数据
+      productTypeList: [], //  分类下拉数据
+      rowSelectionInfo: null
     }
   },
   computed: {
@@ -212,6 +235,10 @@ export default {
     }
   },
   methods: {
+    // 表格选中项
+    rowSelectionFun (obj) {
+      this.rowSelectionInfo = obj || null
+    },
     //  重置
     resetSearchForm () {
       this.queryParam.name = ''
@@ -229,6 +256,46 @@ export default {
       this.itemSn = row.productSn
       this.openAuditModal = true
     },
+    // 批量审核
+    handleBatchAudit () {
+      const _this = this
+      if (!_this.rowSelectionInfo || (_this.rowSelectionInfo && _this.rowSelectionInfo.selectedRowKeys.length < 1)) {
+        _this.$message.warning('请先选择产品!')
+        return
+      }
+      const obj = []
+      _this.rowSelectionInfo && _this.rowSelectionInfo.selectedRows.map(item => {
+        obj.push(item.productSn)
+      })
+
+      this.$confirm({
+        title: '提示',
+        content: '确认要审核通过吗?',
+        centered: true,
+        onOk () {
+          _this.spinning = true
+          productBatchAudit(obj).then(res => {
+            if (res.status == 200) {
+              _this.$refs.table.clearSelected() // 清空表格选中项
+              _this.$message.success(res.message)
+              _this.$refs.table.refresh()
+              _this.spinning = false
+            } else {
+              _this.spinning = false
+            }
+          })
+        }
+      })
+    },
+    //  导出
+    handleExport () {
+      const _this = this
+      const params = this.queryParam
+      this.spinning = true
+      exportExcel(productExport, params, '产品价格导出', function () {
+        _this.spinning = false
+      })
+    },
     //  编辑
     handleEdit (row) {
       this.itemSn = row.productSn
@@ -280,7 +347,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 195
+      this.tableHeight = window.innerHeight - tableSearchH - 235
     }
   },
   watch: {

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

@@ -159,8 +159,8 @@ export default {
   methods: {
     //  时间  change
     dateChange (date) {
-      this.queryParam.beginDate = date[0] ? date[0] + ' 00:00:00' : ''
-      this.queryParam.endDate = date[1] ? date[1] + ' 23:59:59' : ''
+      this.queryParam.beginDate = date[0] ? date[0] : ''
+      this.queryParam.endDate = date[1] ? date[1] : ''
     },
     //  重置
     resetSearchForm () {

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

@@ -14,7 +14,7 @@
           <a-row :gutter="15">
             <a-col :md="6" :sm="24">
               <a-form-model-item label="调拨日期" prop="time">
-                <rangeDateTime ref="rangeDate" :value="queryParam.time" @change="dateChange" />
+                <rangeDate ref="rangeDate" :value="queryParam.time" @change="dateChange" />
               </a-form-model-item>
             </a-col>
             <a-col :md="6" :sm="24">
@@ -137,7 +137,7 @@
 <script>
 import { commonMixin } from '@/utils/mixin'
 import { STable, VSelect } from '@/components'
-import rangeDateTime from '@/views/common/rangeDateTime.vue'
+import rangeDate from '@/views/common/rangeDate.vue'
 import reportModal from '@/views/common/reportModal.vue'
 import subarea from '@/views/common/subarea.js'
 import { getArea } from '@/api/data'
@@ -146,7 +146,7 @@ import { reportAllocateDbjdReportList, reportAllocateDbjdReportCount, reportAllo
 export default {
   name: 'AllocationPresentationList',
   mixins: [commonMixin],
-  components: { STable, VSelect, rangeDateTime, subarea, reportModal },
+  components: { STable, VSelect, rangeDate, subarea, reportModal },
   data () {
     return {
       spinning: false,

+ 1 - 5
src/views/reportData/hPriceDifferenceDetailReport/list.vue

@@ -89,7 +89,6 @@
                 class="button-warning"
                 @click="handleExport"
                 :disabled="disabled"
-                :loading="exportLoading"
                 id="shortageStatisticsCList-export">导出</a-button>
               <a @click="advanced=!advanced" style="margin-left: 5px">
                 {{ advanced ? '收起' : '展开' }}
@@ -155,7 +154,6 @@ export default {
         ],
         beginDate: getDate.getCurrMonthDays().starttime,
         endDate: getDate.getCurrMonthDays().endtime,
-        exportLoading: false,
         bizNo: '',
         dealer: {
           dealerSn: undefined,
@@ -222,7 +220,7 @@ export default {
         { title: '省份', dataIndex: 'dealer.provinceName', width: 90, align: 'center', customRender: function (text) { return text || '--' } },
         { 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: 'dealer.dealerName', width: 120,align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '客户名称', dataIndex: 'dealer.dealerName', width: 120, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '客户级别', dataIndex: 'dealer.dealerLevelDictValue', width: 120, 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 || '--' } },
@@ -252,10 +250,8 @@ export default {
         if (valid) {
           const params = _this.queryParam
           _this.showExport = true
-          _this.exportLoading = true
           _this.spinning = true
           hdExportExcel(headRebateDetailReportExport, params, '总部差价明细报表', function () {
-            _this.exportLoading = false
             _this.spinning = false
           })
         } else {

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

@@ -14,7 +14,7 @@
           <a-row :gutter="15">
             <a-col :md="6" :sm="24">
               <a-form-model-item label="销售日期" prop="time">
-                <rangeDateTime ref="rangeDate" :value="queryParam.time" @change="dateChange" />
+                <rangeDate ref="rangeDate" :value="queryParam.time" @change="dateChange" />
               </a-form-model-item>
             </a-col>
             <a-col :md="5" :sm="24">
@@ -164,7 +164,7 @@
 import { commonMixin } from '@/utils/mixin'
 import getDate from '@/libs/getDate.js'
 import { STable, VSelect } from '@/components'
-import rangeDateTime from '@/views/common/rangeDateTime.vue'
+import rangeDate from '@/views/common/rangeDate.vue'
 import subarea from '@/views/common/subarea.js'
 import custList from '@/views/common/custList.vue'
 import reportModal from '@/views/common/reportModal.vue'
@@ -176,7 +176,7 @@ import { reportSalesBillDetailList, reportSalesBillDetailCount, reportSalesBillD
 export default {
   name: 'SalesDetailsList',
   mixins: [commonMixin],
-  components: { STable, VSelect, rangeDateTime, custList, subarea, ProductBrand, reportModal },
+  components: { STable, VSelect, rangeDate, custList, subarea, ProductBrand, reportModal },
   data () {
     return {
       spinning: false,
@@ -185,11 +185,11 @@ export default {
       showExport: false,
       queryParam: { //  查询条件
         time: [
-          getDate.getCurrMonthDays().starttime + ' 00:00:00',
-          getDate.getCurrMonthDays().endtime + ' 23:59:59'
+          getDate.getCurrMonthDays().starttime,
+          getDate.getCurrMonthDays().endtime
         ],
-        beginDate: getDate.getCurrMonthDays().starttime + ' 00:00:00',
-        endDate: getDate.getCurrMonthDays().endtime + ' 23:59:59',
+        beginDate: getDate.getCurrMonthDays().starttime,
+        endDate: getDate.getCurrMonthDays().endtime,
         salesBillNo: '',
         productCode: '',
         productName: '',
@@ -323,12 +323,12 @@ export default {
     //  重置
     resetSearchForm () {
       this.queryParam.time = [
-        getDate.getCurrMonthDays().starttime + ' 00:00:00',
-        getDate.getCurrMonthDays().endtime + ' 23:59:59'
+        getDate.getCurrMonthDays().starttime,
+        getDate.getCurrMonthDays().endtime
       ]
       this.$refs.rangeDate.resetDate(this.queryParam.time)
-      this.queryParam.beginDate = getDate.getCurrMonthDays().starttime + ' 00:00:00'
-      this.queryParam.endDate = getDate.getCurrMonthDays().endtime + ' 23:59:59'
+      this.queryParam.beginDate = getDate.getCurrMonthDays().starttime
+      this.queryParam.endDate = getDate.getCurrMonthDays().endtime
       this.queryParam.salesBillNo = ''
       this.queryParam.productCode = ''
       this.queryParam.productName = ''

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

@@ -14,7 +14,7 @@
           <a-row :gutter="15">
             <a-col :md="6" :sm="24">
               <a-form-model-item label="销售日期" prop="time">
-                <rangeDateTime ref="rangeDate" :value="queryParam.time" @change="dateChange" />
+                <rangeDate ref="rangeDate" :value="queryParam.time" @change="dateChange" />
               </a-form-model-item>
             </a-col>
             <a-col :md="5" :sm="24">
@@ -42,9 +42,9 @@
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="操作员">
                   <a-select
-                    id="salesOrderTotalList-creatorId"
+                    id="salesOrderTotalList-operatorSn"
                     allowClear
-                    v-model="queryParam.creatorId"
+                    v-model="queryParam.operatorSn"
                     placeholder="请选择操作员"
                     :showSearch="true"
                     option-filter-prop="children"
@@ -128,7 +128,7 @@
 import { commonMixin } from '@/utils/mixin'
 import getDate from '@/libs/getDate.js'
 import { STable, VSelect } from '@/components'
-import rangeDateTime from '@/views/common/rangeDateTime.vue'
+import rangeDate from '@/views/common/rangeDate.vue'
 import subarea from '@/views/common/subarea.js'
 import custList from '@/views/common/custList.vue'
 import reportModal from '@/views/common/reportModal.vue'
@@ -139,7 +139,7 @@ import { reportSalesBillList, reportSalesBillCount, reportSalesBillExport } from
 export default {
   name: 'SalesOrderTotalList',
   mixins: [commonMixin],
-  components: { STable, VSelect, rangeDateTime, custList, subarea, reportModal },
+  components: { STable, VSelect, rangeDate, custList, subarea, reportModal },
   data () {
     return {
       spinning: false,
@@ -148,15 +148,15 @@ export default {
       showExport: false,
       queryParam: { //  查询条件
         time: [
-          getDate.getCurrMonthDays().starttime + ' 00:00:00',
-          getDate.getCurrMonthDays().endtime + ' 23:59:59'
+          getDate.getCurrMonthDays().starttime,
+          getDate.getCurrMonthDays().endtime
         ],
-        beginDate: getDate.getCurrMonthDays().starttime + ' 00:00:00',
-        endDate: getDate.getCurrMonthDays().endtime + ' 23:59:59',
+        beginDate: getDate.getCurrMonthDays().starttime,
+        endDate: getDate.getCurrMonthDays().endtime,
         salesBillNo: '',
         dealerName: '',
         dealerLevel: undefined,
-        creatorId: undefined,
+        operatorSn: undefined,
         subareaSn: undefined,
         dealerProvinceSn: undefined
       },
@@ -196,7 +196,7 @@ export default {
         { title: '销售单号', dataIndex: 'salesBillNo', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '开单日期', dataIndex: 'createDate', width: 130, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '销售日期', dataIndex: 'auditDate', width: 130, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '客户名称', dataIndex: 'dealerName', width: 120,align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '客户名称', dataIndex: 'dealerName', width: 120, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '客户级别', dataIndex: 'dealerLevelDictValue', width: 120, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { 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 },
@@ -277,16 +277,16 @@ export default {
     //  重置
     resetSearchForm () {
       this.queryParam.time = [
-        getDate.getCurrMonthDays().starttime + ' 00:00:00',
-        getDate.getCurrMonthDays().endtime + ' 23:59:59'
+        getDate.getCurrMonthDays().starttime,
+        getDate.getCurrMonthDays().endtime
       ]
       this.$refs.rangeDate.resetDate(this.queryParam.time)
-      this.queryParam.beginDate = getDate.getCurrMonthDays().starttime + ' 00:00:00'
-      this.queryParam.endDate = getDate.getCurrMonthDays().endtime + ' 23:59:59'
+      this.queryParam.beginDate = getDate.getCurrMonthDays().starttime
+      this.queryParam.endDate = getDate.getCurrMonthDays().endtime
       this.queryParam.salesBillNo = ''
       this.queryParam.dealerName = ''
       this.queryParam.dealerLevel = undefined
-      this.queryParam.creatorId = undefined
+      this.queryParam.operatorSn = undefined
       this.queryParam.subareaSn = undefined
       this.queryParam.dealerProvinceSn = undefined
       this.totalData = null

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

@@ -14,7 +14,7 @@
           <a-row :gutter="15">
             <a-col :md="6" :sm="24">
               <a-form-model-item label="备货销售日期" prop="time">
-                <rangeDateTime ref="rangeDate" :value="queryParam.time" @change="dateChange" />
+                <rangeDate ref="rangeDate" :value="queryParam.time" @change="dateChange" />
               </a-form-model-item>
             </a-col>
             <a-col :md="6" :sm="24">
@@ -147,7 +147,7 @@
 <script>
 import { commonMixin } from '@/utils/mixin'
 import { STable, VSelect } from '@/components'
-import rangeDateTime from '@/views/common/rangeDateTime.vue'
+import rangeDate from '@/views/common/rangeDate.vue'
 import custList from '@/views/common/custList.vue'
 import subarea from '@/views/common/subarea.js'
 import reportModal from '@/views/common/reportModal.vue'
@@ -157,7 +157,7 @@ import { reportDispatchReportList, reportDispatchReportCount, reportDispatchRepo
 export default {
   name: 'SalesPresentationList',
   mixins: [commonMixin],
-  components: { STable, VSelect, rangeDateTime, subarea, custList, reportModal },
+  components: { STable, VSelect, rangeDate, subarea, custList, reportModal },
   data () {
     return {
       spinning: false,

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

@@ -14,7 +14,7 @@
           <a-row :gutter="15">
             <a-col :md="6" :sm="24">
               <a-form-model-item label="退货完成日期" prop="time">
-                <rangeDateTime ref="rangeDate" :value="queryParam.time" @change="dateChange" />
+                <rangeDate ref="rangeDate" :value="queryParam.time" @change="dateChange" />
               </a-form-model-item>
             </a-col>
             <a-col :md="5" :sm="24">
@@ -168,7 +168,7 @@
 import { commonMixin } from '@/utils/mixin'
 import getDate from '@/libs/getDate.js'
 import { STable, VSelect } from '@/components'
-import rangeDateTime from '@/views/common/rangeDateTime.vue'
+import rangeDate from '@/views/common/rangeDate.vue'
 import subarea from '@/views/common/subarea.js'
 import custList from '@/views/common/custList.vue'
 import reportModal from '@/views/common/reportModal.vue'
@@ -181,7 +181,7 @@ import { reportSalesReturnDetailList, reportSalesReturnDetailCount, reportSalesR
 export default {
   name: 'SalesReturnDetailReportList',
   mixins: [commonMixin],
-  components: { STable, VSelect, rangeDateTime, custList, subarea, ProductBrand, reportModal },
+  components: { STable, VSelect, rangeDate, custList, subarea, ProductBrand, reportModal },
   data () {
     return {
       spinning: false,

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

@@ -14,7 +14,7 @@
           <a-row :gutter="15">
             <a-col :md="6" :sm="24">
               <a-form-model-item label="完成日期" prop="time">
-                <rangeDateTime ref="rangeDate" :value="queryParam.time" @change="dateChange" />
+                <rangeDate ref="rangeDate" :value="queryParam.time" @change="dateChange" />
               </a-form-model-item>
             </a-col>
             <a-col :md="5" :sm="24">
@@ -102,14 +102,14 @@
 <script>
 import { commonMixin } from '@/utils/mixin'
 import { STable, VSelect } from '@/components'
-import rangeDateTime from '@/views/common/rangeDateTime.vue'
+import rangeDate from '@/views/common/rangeDate.vue'
 import { hdExportExcel } from '@/libs/exportExcel'
 import reportModal from '@/views/common/reportModal.vue'
 import { reportStockPutList, reportStockPutCount, reportStockPutExport } from '@/api/reportData'
 export default {
   name: 'WarehousingOrderList',
   mixins: [commonMixin],
-  components: { STable, VSelect, rangeDateTime, reportModal },
+  components: { STable, VSelect, rangeDate, reportModal },
   data () {
     return {
       spinning: false,

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

@@ -14,7 +14,7 @@
           <a-row :gutter="15">
             <a-col :md="6" :sm="24">
               <a-form-model-item label="完成日期" prop="time">
-                <rangeDateTime ref="rangeDate" :value="queryParam.time" @change="dateChange" />
+                <rangeDate ref="rangeDate" :value="queryParam.time" @change="dateChange" />
               </a-form-model-item>
             </a-col>
             <a-col :md="5" :sm="24">
@@ -117,14 +117,14 @@
 <script>
 import { commonMixin } from '@/utils/mixin'
 import { STable, VSelect } from '@/components'
-import rangeDateTime from '@/views/common/rangeDateTime.vue'
+import rangeDate from '@/views/common/rangeDate.vue'
 import { hdExportExcel } from '@/libs/exportExcel'
 import reportModal from '@/views/common/reportModal.vue'
 import { reportStockPutDetailList, reportStockPutDetailCount, reportStockPutDetailExport } from '@/api/reportData'
 export default {
   name: 'WarehousingOrderDetailList',
   mixins: [commonMixin],
-  components: { STable, VSelect, rangeDateTime, reportModal },
+  components: { STable, VSelect, rangeDate, reportModal },
   data () {
     return {
       spinning: false,

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

@@ -286,13 +286,13 @@ export default {
     },
     //  时间  change
     dateChange (date) {
-      this.queryParam.beginDate = date[0] ? date[0] + ' 00:00:00' : ''
-      this.queryParam.endDate = date[1] ? date[1] + ' 23:59:59' : ''
+      this.queryParam.beginDate = date[0] ? date[0] : ''
+      this.queryParam.endDate = date[1] ? date[1] : ''
     },
     //  收款时间  change
     dateSettleChange (date) {
-      this.queryParam.beginDateSettle = date[0] ? date[0] + ' 00:00:00' : ''
-      this.queryParam.endDateSettle = date[1] ? date[1] + ' 23:59:59' : ''
+      this.queryParam.beginDateSettle = date[0] ? date[0] : ''
+      this.queryParam.endDateSettle = date[1] ? date[1] : ''
     },
     custChange (val) {
       this.queryParam.settleClientName = val.name

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

@@ -342,13 +342,13 @@ export default {
     },
     //  审核时间  change
     dateAuditChange (date) {
-      this.queryParam.beginDate = date[0] ? date[0] + ' 00:00:00' : ''
-      this.queryParam.endDate = date[1] ? date[1] + ' 23:59:59' : ''
+      this.queryParam.beginDate = date[0] ? date[0] : ''
+      this.queryParam.endDate = date[1] ? date[1] : ''
     },
     //  收款时间  change
     dateSettleChange (date) {
-      this.queryParam.beginDateSettle = date[0] ? date[0] + ' 00:00:00' : ''
-      this.queryParam.endDateSettle = date[1] ? date[1] + ' 23:59:59' : ''
+      this.queryParam.beginDateSettle = date[0] ? date[0] : ''
+      this.queryParam.endDateSettle = date[1] ? date[1] : ''
     },
     searchTable () {
       this.$refs.table.refresh(true)

+ 4 - 4
src/views/salesReturnManagement/billOfLading/list.vue

@@ -222,13 +222,13 @@ export default {
   methods: {
     //  创建时间  change
     dateCreateChange (date) {
-      this.queryParam.beginDate = date[0] ? (date[0] + ' 00:00:00') : ''
-      this.queryParam.endDate = date[1] ? (date[1] + ' 23:59:59') : ''
+      this.queryParam.beginDate = date[0] ? (date[0]) : ''
+      this.queryParam.endDate = date[1] ? (date[1]) : ''
     },
     //  审核时间  change
     dateExamineChange (date) {
-      this.queryParam.auditBeginDate = date[0] ? (date[0] + ' 00:00:00') : ''
-      this.queryParam.auditEndDate = date[1] ? (date[1] + ' 23:59:59') : ''
+      this.queryParam.auditBeginDate = date[0] ? (date[0]) : ''
+      this.queryParam.auditEndDate = date[1] ? (date[1]) : ''
     },
     custChange (val) {
       this.queryParam.senderSn = val.key

+ 2 - 2
src/views/salesReturnManagement/pickUp/list.vue

@@ -171,8 +171,8 @@ export default {
   methods: {
     //  审核时间  change
     dateExamineChange (date) {
-      this.queryParam.auditBeginDate = date[0] ? date[0] + ' 00:00:00' : ''
-      this.queryParam.auditEndDate = date[1] ? date[1] + ' 23:59:59' : ''
+      this.queryParam.auditBeginDate = date[0] ? date[0] : ''
+      this.queryParam.auditEndDate = date[1] ? date[1] : ''
     },
     custChange (val) {
       this.queryParam.senderSn = val.key

+ 2 - 2
src/views/setting/notice/list.vue

@@ -105,8 +105,8 @@ export default {
     ]),
     //  时间  change
     dateChange (date) {
-      this.queryParam.beginDate = date[0] ? date[0] + ' 00:00:00' : ''
-      this.queryParam.endDate = date[1] ? date[1] + ' 23:59:59' : ''
+      this.queryParam.beginDate = date[0] ? date[0] : ''
+      this.queryParam.endDate = date[1] ? date[1] : ''
     },
     // 查询列表
     handelSearch (pageNo) {

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

@@ -57,7 +57,7 @@
         bordered>
         <!-- 产品分类 -->
         <template slot="productType" slot-scope="text, record">
-          <span v-if="record.product.productTypeName2 || record.product.productTypeName3">{{ record.product.productTypeName2 }} {{ record.product.productTypeName3 ? '>' : '' }} {{ record.product.productTypeName3 }}</span>
+          <span v-if="record.product&&(record.product.productTypeName2 || record.product.productTypeName3)">{{ record.product.productTypeName2 }} {{ record.product.productTypeName3 ? '>' : '' }} {{ record.product.productTypeName3 }}</span>
           <span v-else>--</span>
         </template>
       </s-table>

+ 2 - 2
vue.config.js

@@ -107,9 +107,9 @@ const vueConfig = {
     // If you want to turn on the proxy, please remove the mockjs /src/main.jsL11
     proxy: {
       '/api': {
-        // target: 'http://192.168.0.102:8602/ocs-admin',
+        target: 'http://192.168.0.115:8003/ocs-admin',
         // target: 'https://t.ocs.360arrow.com/ocs-admin', //  Á·Ï°
-        target: 'http://p.ocs.360arrow.com/ocs-admin', //  Ô¤·¢²¼
+        // target: 'http://p.ocs.360arrow.com/ocs-admin', //  Ô¤·¢²¼
         ws: false,
         changeOrigin: true,
         pathRewrite: {