Pārlūkot izejas kodu

Merge branch 'develop_yh37' of http://git.chelingzhu.com/jianguan-web/qpls-md-html into pre-release

# Conflicts:
#	src/views/common/rangeDate.vue
lilei 1 gadu atpakaļ
vecāks
revīzija
6ec04e5f7d

+ 1 - 1
public/version.json

@@ -1,5 +1,5 @@
 {
   "message": "发现有新版本发布,确定更新系统?",
   "vendorJsVersion": "",
-  "version": 1710991960808
+  "version": 1711008139552
 }

+ 3 - 2
src/views/chainReportData/chainPurchaseReceiptReport/purchaseReceiptDetail.vue

@@ -136,10 +136,11 @@ export default {
       advanced: true, // 高级搜索 展开/关闭
       exportLoading: false,
       columns: [
-        { title: '采购单号', dataIndex: 'purchaseBillNo', width: '14%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
+        { title: '采购单号', dataIndex: 'purchaseBillNo', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '采购入库单号', dataIndex: 'receivingBillNo', width: '14%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品编码', dataIndex: 'productEntity.code', width: '11%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品名称', dataIndex: 'productEntity.name', width: '16%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '产品名称', dataIndex: 'productEntity.name', width: '14%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '单位', dataIndex: 'productEntity.unit', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '采购数量', dataIndex: 'qty', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '入库数量', dataIndex: 'putQty', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },

+ 3 - 2
src/views/chainReportData/chainPurchaseReceiptReport/purchaseReceiptOrder.vue

@@ -100,8 +100,9 @@ export default {
       disabled: false, //  查询、重置按钮是否可操作
       exportLoading: false,
       columns: [
-        { title: '采购单号', dataIndex: 'purchaseBillNo', width: '17%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '采购入库单号', dataIndex: 'receivingBillNo', width: '17%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
+        { title: '采购单号', dataIndex: 'purchaseBillNo', width: '14%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '采购入库单号', dataIndex: 'receivingBillNo', width: '16%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '入库款数', dataIndex: 'totalPutCategory', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '采购数量', dataIndex: 'totalQty', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '入库数量', dataIndex: 'totalPutQty', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },

+ 1 - 0
src/views/chainReportData/chainReceivedSendStorageReport/list.vue

@@ -142,6 +142,7 @@ export default {
       disabled: false, //  查询、重置按钮是否可操作
       exportLoading: false,
       columns: [
+        { title: '序号', dataIndex: 'no', width: 50, align: 'center' },
         { title: '产品编码', dataIndex: 'productCode', width: 120, align: 'left', customRender: function (text) { return text || '--' }, sorter: true },
         { title: '产品名称', dataIndex: 'productEntity.name', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '品牌', dataIndex: 'productEntity.productBrandName', width: 130, align: 'left', customRender: function (text) { return text || '--' } },

+ 2 - 2
src/views/chainReportData/chainSalesDetailReport/list.vue

@@ -75,7 +75,7 @@
                 <a-input id="chainSalesDetailReportList-name" v-model.trim="queryParam.productEntity.name" allowClear placeholder="请输入产品名称"/>
               </a-form-model-item>
             </a-col>
-            <a-col :md="6" :sm="24">
+            <!-- <a-col :md="6" :sm="24">
               <a-form-model-item label="仓库仓位">
                 <a-cascader
                   v-model="queryParam.warehouseCascade"
@@ -88,7 +88,7 @@
                   allowClear
                   style="width: 100%;" />
               </a-form-model-item>
-            </a-col>
+            </a-col> -->
             <a-col :md="6" :sm="24">
               <a-form-model-item label="单号">
                 <a-input id="chainSalesDetailReportList-salesBillNo" v-model.trim="queryParam.salesBillNo" allowClear placeholder="请输入单号"/>

+ 6 - 1
src/views/chainReportData/chainSalesDetailsCountReport/list.vue

@@ -100,7 +100,8 @@ export default {
       disabled: false, //  查询、重置按钮是否可操作
       exportLoading: false,
       columns: [
-        { title: '门店', dataIndex: 'salesTargetName', width: '16%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
+        { title: '门店', dataIndex: 'salesTargetName', width: '12%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         {
           title: '所有品牌',
           children: [
@@ -159,6 +160,10 @@ export default {
           let data
           if (res.status == 200) {
             data = res.data
+            const no = 0
+            for (var i = 0; i < data.length; i++) {
+              data[i].no = no + i + 1
+            }
             this.disabled = false
           }
           this.spinning = false

+ 6 - 1
src/views/chainReportData/chainSalesReturnDetailReport/list.vue

@@ -94,7 +94,8 @@ export default {
       disabled: false, //  查询、重置按钮是否可操作
       exportLoading: false,
       columns: [
-        { title: '门店', dataIndex: 'salesTargetName', width: '16%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
+        { title: '门店', dataIndex: 'salesTargetName', width: '12%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         {
           title: '所有品牌',
           children: [
@@ -153,6 +154,10 @@ export default {
           let data
           if (res.status == 200) {
             data = res.data
+            const no = 0
+            for (var i = 0; i < data.length; i++) {
+              data[i].no = no + i + 1
+            }
             this.disabled = false
           }
           this.spinning = false

+ 6 - 3
src/views/common/rangeDate.vue

@@ -22,7 +22,8 @@
         <a-button @click="setVal('date2')" type="link" size="small">近一个月</a-button>
         <a-button @click="setVal('date3')" type="link" size="small">本月</a-button>
         <a-button @click="setVal('date4')" type="link" size="small">上月</a-button>
-        <a-button @click="setVal('date5')" type="link" size="small">近一年</a-button>
+        <a-button @click="setVal('date5')" v-if="showShortcut" type="link" size="small">近一年</a-button>
+        <a-button @click="setVal('date6')" v-else type="link" size="small">近三个月</a-button>
       </div>
     </a-date-picker>
     </div>
@@ -49,7 +50,8 @@
         <a-button @click="setVal('date2')" type="link" size="small">近一个月</a-button>
         <a-button @click="setVal('date3')" type="link" size="small">本月</a-button>
         <a-button @click="setVal('date4')" type="link" size="small">上月</a-button>
-        <a-button @click="setVal('date5')" type="link" size="small">近一年</a-button>
+        <a-button @click="setVal('date5')" v-if="showShortcut" type="link" size="small">近一年</a-button>
+        <a-button @click="setVal('date6')" v-else type="link" size="small">近三个月</a-button>
       </div>
     </a-date-picker>
     </div>
@@ -95,7 +97,8 @@ export default {
         'date2': [moment().subtract(1, 'months'), moment()],
         'date3': [moment().startOf('month'), moment()],
         'date4': [moment().subtract(1, 'months').startOf('month'), moment().subtract(1, 'months').endOf('month')],
-        'date5': [moment().subtract(1, 'years'), moment()]
+        'date5': [moment().subtract(1, 'years'), moment()],
+        'date6': [moment().subtract(3, 'months').startOf('month'), moment().subtract(3, 'months').endOf('month')]
       },
       startMode:'',
       endMode: ''

+ 15 - 9
src/views/reportData/receivedSendStorageReport/list.vue

@@ -16,7 +16,7 @@
           <a-row :gutter="15">
             <a-col :md="6" :sm="24">
               <a-form-model-item label="日期" prop="time">
-                <rangeDate ref="rangeDate" :showShortcut="false" @change="dateChange" />
+                <rangeDate ref="rangeDate" :showShortcut="false" :value="queryParam.time" @change="dateChange" />
               </a-form-model-item>
             </a-col>
             <a-col :md="6" :sm="24">
@@ -92,6 +92,7 @@
 <script>
 import { commonMixin } from '@/utils/mixin'
 import { STable, VSelect } from '@/components'
+import getDate from '@/libs/getDate.js'
 import rangeDate from '@/views/common/rangeDate.vue'
 import { downloadExcel } from '@/libs/JGPrint.js'
 import ProductType from '../../common/productType.js'
@@ -108,9 +109,14 @@ export default {
       spinning: false,
       tableHeight: 0,
       queryParam: { //  查询条件
-        time: [],
-        beginDate: '',
-        endDate: '',
+        time: [
+          // getDate.getMonthDays(3).starttime,
+          // getDate.getMonthDays(3).endtime
+        ],
+        // beginDate: getDate.getMonthDays(3).starttime,
+        // endDate: getDate.getMonthDays(3).endtime,
+        beginDate:'',
+        endDate:'',
         productEntity: {
           code: '', //  产品编码
           name: '', //  产品名称
@@ -201,7 +207,7 @@ export default {
       this.$refs.ruleForm.validate(valid => {
         if (valid) {
           const a = moment(this.queryParam.beginDate)
-          const b = moment(this.queryParam.endDate)
+          const b = moment(this.queryParam.endDate).subtract(1, 'days')
           if (b.diff(a, 'month') > 2) {
             this.$message.info('最多只能查询3个月')
             return false
@@ -225,8 +231,10 @@ export default {
     },
     //  重置
     resetSearchForm () {
+      // this.$refs.rangeDate.resetDate(this.queryParam.time)
+      // this.queryParam.beginDate = getDate.getMonthDays(3).starttime
+      // this.queryParam.endDate = getDate.getMonthDays(3).endtime
       this.$refs.rangeDate.resetDate()
-      this.queryParam.time = []
       this.queryParam.beginDate = ''
       this.queryParam.endDate = ''
       this.queryParam.productEntity.code = ''
@@ -236,9 +244,9 @@ export default {
       this.queryParam.productEntity.productTypeSn2 = ''
       this.queryParam.productEntity.productTypeSn3 = ''
       this.productType = []
-      this.$refs.ruleForm.resetFields()
       this.totalData = null
       this.$refs.table.clearTable()
+      this.$refs.ruleForm.resetFields()
     },
     //  导出
     handleExport () {
@@ -269,14 +277,12 @@ export default {
   },
   mounted () {
     if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
-      this.pageInit()
       this.resetSearchForm()
     }
   },
   activated () {
     // 如果是新页签打开,则重置当前页面
     if (this.$store.state.app.isNewTab) {
-      this.pageInit()
       this.resetSearchForm()
     }
   },