lilei 2 år sedan
förälder
incheckning
4b6a8caae7

+ 1 - 1
public/version.json

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

+ 115 - 0
src/api/reportData.js

@@ -755,4 +755,119 @@ export const reportStockImportDetailExport  = (params) => {
     method: 'post',
     method: 'post',
     responseType: 'blob'
     responseType: 'blob'
   })
   })
+}
+
+// 连锁调入明细-分页列表
+export const reportAllocLinkagePutDetailList = (params) => {
+  const url = `/report/reportAllocLinkagePut/detail/reportPage/${params.pageNo}/${params.pageSize}`
+  delete params.pageNo
+  delete params.pageSize
+  return axios({
+    url: url,
+    data: params,
+    method: 'post'
+  })
+}
+// 连锁调入明细-列表合计
+export const reportAllocLinkagePutDetailCount = (params) => {
+  return axios({
+    url: '/report/reportAllocLinkagePut/detail/reportCount',
+    data: params,
+    method: 'post'
+  })
+}
+// 连锁调入明细-报表导出
+export const reportAllocLinkagePutDetailExport = params => {
+  return axios.request({
+    url: `/report/reportAllocLinkagePut/detail/reportExport`,
+    data: params,
+    method: 'post',
+    responseType: 'blob'
+  })
+}
+
+// 连锁调入-分页列表
+export const reportAllocLinkagePutList = (params) => {
+  const url = `/report/reportAllocLinkagePut/reportPage/${params.pageNo}/${params.pageSize}`
+  delete params.pageNo
+  delete params.pageSize
+  return axios({
+    url: url,
+    data: params,
+    method: 'post'
+  })
+}
+// 连锁调入-列表合计
+export const reportAllocLinkagePutCount = (params) => {
+  return axios({
+    url: '/report/reportAllocLinkagePut/reportCount',
+    data: params,
+    method: 'post'
+  })
+}
+// 连锁调入-报表导出
+export const reportAllocLinkagePutExport = params => {
+  return axios.request({
+    url: `/report/reportAllocLinkagePut/reportExport`,
+    data: params,
+    method: 'post',
+    responseType: 'blob'
+  })
+}
+
+// 连锁调出-分页列表
+export const reportAllocLinkageOutList = (params) => {
+  const url = `/report/reportAllocLinkageOut/reportPage/${params.pageNo}/${params.pageSize}`
+  delete params.pageNo
+  delete params.pageSize
+  return axios({
+    url: url,
+    data: params,
+    method: 'post'
+  })
+}
+// 连锁调出-列表合计
+export const reportAllocLinkageOutCount = (params) => {
+  return axios({
+    url: '/report/reportAllocLinkageOut/reportCount',
+    data: params,
+    method: 'post'
+  })
+}
+// 连锁调出-报表导出
+export const reportAllocLinkageOutExport = params => {
+  return axios.request({
+    url: `/report/reportAllocLinkageOut/reportExport`,
+    data: params,
+    method: 'post',
+    responseType: 'blob'
+  })
+}
+// 连锁调出明细-分页列表
+export const reportAllocLinkageOutDetailList = (params) => {
+  const url = `/report/reportAllocLinkageOut/detail/reportPage/${params.pageNo}/${params.pageSize}`
+  delete params.pageNo
+  delete params.pageSize
+  return axios({
+    url: url,
+    data: params,
+    method: 'post'
+  })
+}
+// 连锁调出明细-列表合计
+export const reportAllocLinkageOutDetailCount = (params) => {
+  return axios({
+    url: '/report/reportAllocLinkageOut/detail/reportCount',
+    data: params,
+    method: 'post'
+  })
+}
+// 连锁调出明细-报表导出
+export const reportAllocLinkageOutDetailExport = params => {
+  return axios.request({
+    url: `/report/reportAllocLinkageOut/detail/reportExport`,
+    data: params,
+    method: 'post',
+    responseType: 'blob'
+  })
 }
 }

+ 57 - 38
src/views/chainReportData/chainCallReport/detailList.vue

@@ -14,32 +14,37 @@
         @keyup.enter.native="handleSearch" >
         @keyup.enter.native="handleSearch" >
         <a-row :gutter="15">
         <a-row :gutter="15">
           <a-col :md="6" :sm="24">
           <a-col :md="6" :sm="24">
-            <a-form-model-item label="入库时间" prop="time">
+            <a-form-model-item label="审核时间" prop="time">
               <rangeDate ref="rangeDate" @change="dateChange" />
               <rangeDate ref="rangeDate" @change="dateChange" />
             </a-form-model-item>
             </a-form-model-item>
           </a-col>
           </a-col>
           <a-col :md="6" :sm="24">
           <a-col :md="6" :sm="24">
-            <a-form-model-item label="连锁调入单号">
-              <a-input id="chainTransferInReport-allocationLinkagePutNo" v-model.trim="queryParam.allocationLinkagePutNo" allowClear placeholder="请输入连锁调入单号"/>
-            </a-form-model-item>
-          </a-col>
-          <a-col :md="4" :sm="24">
-            <a-form-item label="调出对象">
-              <outTenant id="chainTransferInReport-outTenantSn" v-model="queryParam.outTenantSn"></outTenant>
+            <a-form-item label="出库时间">
+              <rangeDate ref="outWareRangeDate" :value="outWareTime" @change="outWareDateChange" />
             </a-form-item>
             </a-form-item>
           </a-col>
           </a-col>
-          <a-col :md="4" :sm="24">
-            <a-form-item label="调拨产品类型">
-              <v-select
-                v-model="queryParam.allocationType"
-                ref="allocationType"
-                id="chainTransferInReport-allocationType"
-                code="ALLOCATION_LINKAGE_PRODUCT_TYPE"
-                placeholder="请选择调拨产品类型"
-                allowClear></v-select>
-            </a-form-item>
+          <a-col :md="6" :sm="24">
+            <a-form-model-item label="连锁调出单号">
+              <a-input id="chainTransferInReport-allocationLinkageOutNo" v-model.trim="queryParam.allocationLinkageOutNo" allowClear placeholder="请输入连锁调入单号"/>
+            </a-form-model-item>
           </a-col>
           </a-col>
           <template v-if="advanced">
           <template v-if="advanced">
+            <a-col :md="4" :sm="24">
+              <a-form-item label="调往对象">
+                <outTenant id="chainTransferInReport-putTenantSn" v-model="queryParam.putTenantSn"></outTenant>
+              </a-form-item>
+            </a-col>
+            <a-col :md="4" :sm="24">
+              <a-form-item label="调拨产品类型">
+                <v-select
+                  v-model="queryParam.allocationType"
+                  ref="allocationType"
+                  id="chainTransferInReport-allocationType"
+                  code="ALLOCATION_LINKAGE_PRODUCT_TYPE"
+                  placeholder="请选择调拨产品类型"
+                  allowClear></v-select>
+              </a-form-item>
+            </a-col>
             <a-col :md="4" :sm="24">
             <a-col :md="4" :sm="24">
               <a-form-model-item label="产品编码">
               <a-form-model-item label="产品编码">
                 <a-input id="chainTransferInReport-code" v-model.trim="queryParam.productEntity.code" allowClear placeholder="请输入产品编码"/>
                 <a-input id="chainTransferInReport-code" v-model.trim="queryParam.productEntity.code" allowClear placeholder="请输入产品编码"/>
@@ -113,7 +118,7 @@ import ProductType from '../../common/productType.js'
 import ProductBrand from '../../common/productBrand.js'
 import ProductBrand from '../../common/productBrand.js'
 import supplier from '@/views/common/supplier'
 import supplier from '@/views/common/supplier'
 import outTenant from '@/views/common/outTenant.js'
 import outTenant from '@/views/common/outTenant.js'
-import { reportStoreCallOutDetailList, reportStoreCallOutDetailTotal, reportStoreCallOutDetailExport } from '@/api/reportData'
+import { reportAllocLinkageOutDetailList, reportAllocLinkageOutDetailCount, reportAllocLinkageOutDetailExport } from '@/api/reportData'
 export default {
 export default {
   components: { STable, VSelect, rangeDate, ProductType, ProductBrand, supplier, outTenant },
   components: { STable, VSelect, rangeDate, ProductType, ProductBrand, supplier, outTenant },
   mixins: [commonMixin],
   mixins: [commonMixin],
@@ -126,8 +131,11 @@ export default {
       tableHeight: 0,
       tableHeight: 0,
       outWareTime: [],
       outWareTime: [],
       queryParam: { //  查询条件
       queryParam: { //  查询条件
-        beginDate: '',
-        endDate: '',
+        time:[],
+        auditBeginDate: '',
+        auditEndDate: '',
+        outWarehouseBeginDate:'',
+        outWarehouseEndDate:'',
         productEntity: {
         productEntity: {
           productBrandSn: undefined, //  产品品牌
           productBrandSn: undefined, //  产品品牌
           productTypeSn1: '', //  产品一级分类
           productTypeSn1: '', //  产品一级分类
@@ -137,9 +145,9 @@ export default {
           name: '' //  产品名称
           name: '' //  产品名称
         },
         },
         productType: undefined,
         productType: undefined,
-        outTenantSn:undefined,
+        putTenantSn:undefined,
         allocationType: undefined,
         allocationType: undefined,
-        allocationLinkagePutNo: ''
+        allocationLinkageOutNo: ''
       },
       },
       rules: {
       rules: {
         'time': [{ required: true, message: '请选择审核时间', trigger: 'change' }]
         'time': [{ required: true, message: '请选择审核时间', trigger: 'change' }]
@@ -152,7 +160,7 @@ export default {
         const params = Object.assign(parameter, this.queryParam)
         const params = Object.assign(parameter, this.queryParam)
         this.spinning = true
         this.spinning = true
         delete params.time
         delete params.time
-        return reportStoreCallOutDetailList(params).then(res => {
+        return reportAllocLinkageOutDetailList(params).then(res => {
           let data
           let data
           if (res.status == 200) {
           if (res.status == 200) {
             data = res.data
             data = res.data
@@ -175,15 +183,15 @@ export default {
     columns () {
     columns () {
       const arr = [
       const arr = [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
-        { title: '连锁调入单号', dataIndex: 'allocationLinkagePutNo', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '调出对象', dataIndex: 'outTenantName', width: '15%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '连锁调出单号', dataIndex: 'allocationLinkageOutNo', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '调往对象', dataIndex: 'putTenantName', width: '15%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '产品编码', dataIndex: 'productEntity.code', width: '13%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品编码', dataIndex: 'productEntity.code', width: '13%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品名称', dataIndex: 'productEntity.name', width: '14%', 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: '4%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '单位', dataIndex: 'productEntity.unit', width: '4%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '数量', dataIndex: 'outQty', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '数量', dataIndex: 'outQty', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         // { title: '成本', dataIndex: 'outCost', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         // { title: '成本', dataIndex: 'outCost', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '入库时间', dataIndex: 'auditTime', width: '11%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '调拨产品类型', dataIndex: 'allocationTypeDictValue', width: '10%', align: 'center', customRender: function (text) { return text || '--' } }
+        { title: '出库时间', dataIndex: 'outWarehouseTime', width: '11%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '调拨类型', dataIndex: 'allocationTypeDictValue', width: '10%', align: 'center', customRender: function (text) { return text || '--' } }
       ]
       ]
       if (this.$hasPermissions('M_ShowAllCost')) {
       if (this.$hasPermissions('M_ShowAllCost')) {
         arr.splice(8, 0, { title: '成本', dataIndex: 'outCost', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
         arr.splice(8, 0, { title: '成本', dataIndex: 'outCost', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
@@ -194,7 +202,7 @@ export default {
   methods: {
   methods: {
     // 合计
     // 合计
     getCount (params) {
     getCount (params) {
-      reportStoreCallOutDetailTotal(params).then(res => {
+      reportAllocLinkageOutDetailCount(params).then(res => {
         if (res.status == 200) {
         if (res.status == 200) {
           this.totalData = res.data
           this.totalData = res.data
         } else {
         } else {
@@ -204,8 +212,13 @@ export default {
     },
     },
     //  创建时间  change
     //  创建时间  change
     dateChange (date) {
     dateChange (date) {
-      this.queryParam.beginDate = date[0] || ''
-      this.queryParam.endDate = date[1] || ''
+      this.queryParam.time = date
+      this.queryParam.auditBeginDate = date[0] || ''
+      this.queryParam.auditEndDate = date[1] || ''
+    },
+    outWareDateChange (date) {
+      this.queryParam.outWarehouseBeginDate = date[0]
+      this.queryParam.outWarehouseEndDate = date[1]
     },
     },
     //  查询
     //  查询
     handleSearch () {
     handleSearch () {
@@ -220,11 +233,17 @@ export default {
     //  重置
     //  重置
     resetSearchForm () {
     resetSearchForm () {
       this.$refs.rangeDate.resetDate()
       this.$refs.rangeDate.resetDate()
-      this.queryParam.beginDate = ''
-      this.queryParam.endDate = ''
+      this.queryParam.time = []
+      this.queryParam.auditBeginDate = ''
+      this.queryParam.auditEndDate = ''
+      this.$refs.outWareRangeDate.resetDate('')
+      this.outWareTime = []
+      this.queryParam.outWarehouseBeginDate = ''
+      this.queryParam.outWarehouseEndDate = ''
+      
       this.queryParam.allocationType = undefined
       this.queryParam.allocationType = undefined
-      this.queryParam.outTenantSn = undefined
-      this.queryParam.allocationLinkagePutNo = ''
+      this.queryParam.putTenantSn = undefined
+      this.queryParam.allocationLinkageOutNo = ''
       this.queryParam.productEntity.productBrandSn = undefined
       this.queryParam.productEntity.productBrandSn = undefined
       this.queryParam.productEntity.productTypeSn1 = ''
       this.queryParam.productEntity.productTypeSn1 = ''
       this.queryParam.productEntity.productTypeSn2 = ''
       this.queryParam.productEntity.productTypeSn2 = ''
@@ -242,11 +261,11 @@ export default {
       this.$refs.ruleForm.validate(valid => {
       this.$refs.ruleForm.validate(valid => {
         if (valid) {
         if (valid) {
           const params = _this.queryParam
           const params = _this.queryParam
-          params.showCost = this.$hasPermissions('M_ShowAllCost') ? '1' : '0'
+          params.costFlag = this.$hasPermissions('M_ShowAllCost') ? '1' : '0'
           _this.exportLoading = true
           _this.exportLoading = true
           _this.spinning = true
           _this.spinning = true
-          reportStoreCallOutDetailExport(params).then(res => {
-            downloadExcel(res, '连锁调细报表')
+          reportAllocLinkageOutDetailExport(params).then(res => {
+            downloadExcel(res, '连锁调出明细报表')
             _this.exportLoading = false
             _this.exportLoading = false
             _this.spinning = false
             _this.spinning = false
           })
           })

+ 66 - 41
src/views/chainReportData/chainCallReport/list.vue

@@ -14,31 +14,38 @@
         @keyup.enter.native="handleSearch" >
         @keyup.enter.native="handleSearch" >
         <a-row :gutter="15">
         <a-row :gutter="15">
           <a-col :md="6" :sm="24">
           <a-col :md="6" :sm="24">
-            <a-form-model-item label="入库时间" prop="time">
+            <a-form-model-item label="审核时间" prop="time">
               <rangeDate ref="rangeDate" @change="dateChange" />
               <rangeDate ref="rangeDate" @change="dateChange" />
             </a-form-model-item>
             </a-form-model-item>
           </a-col>
           </a-col>
           <a-col :md="6" :sm="24">
           <a-col :md="6" :sm="24">
-            <a-form-model-item label="连锁调出单号">
-              <a-input id="chainTransferInReport-allocationLinkagePutNo" v-model.trim="queryParam.allocationLinkagePutNo" allowClear placeholder="请输入连锁调出单号"/>
-            </a-form-model-item>
-          </a-col>
-          <a-col :md="4" :sm="24">
-            <a-form-item label="调往对象">
-              <outTenant id="chainTransferInReport-outTenantSn" v-model="queryParam.outTenantSn"></outTenant>
+            <a-form-item label="出库时间">
+              <rangeDate ref="outWareRangeDate" :value="outWareTime" @change="outWareDateChange" />
             </a-form-item>
             </a-form-item>
           </a-col>
           </a-col>
-          <a-col :md="4" :sm="24">
-            <a-form-item label="调拨产品类型">
-              <v-select
-                v-model="queryParam.allocationType"
-                ref="allocationType"
-                id="chainTransferInReport-allocationType"
-                code="ALLOCATION_LINKAGE_PRODUCT_TYPE"
-                placeholder="请选择调拨产品类型"
-                allowClear></v-select>
-            </a-form-item>
+          <a-col :md="6" :sm="24">
+            <a-form-model-item label="连锁调出单号">
+              <a-input id="chainTransferInReport-allocationLinkageOutNo" v-model.trim="queryParam.allocationLinkageOutNo" allowClear placeholder="请输入连锁调出单号"/>
+            </a-form-model-item>
           </a-col>
           </a-col>
+          <template v-if="advanced">
+            <a-col :md="4" :sm="24">
+              <a-form-item label="调往对象">
+                <outTenant id="chainTransferInReport-putTenantSn" v-model="queryParam.putTenantSn"></outTenant>
+              </a-form-item>
+            </a-col>
+             <a-col :md="4" :sm="24">
+               <a-form-item label="调拨产品类型">
+                 <v-select
+                   v-model="queryParam.allocationType"
+                   ref="allocationType"
+                   id="chainTransferInReport-allocationType"
+                   code="ALLOCATION_LINKAGE_PRODUCT_TYPE"
+                   placeholder="请选择调拨产品类型"
+                   allowClear></v-select>
+               </a-form-item>
+             </a-col>
+          </template>
           <a-col :md="4" :sm="24" style="margin-bottom: 10px;">
           <a-col :md="4" :sm="24" style="margin-bottom: 10px;">
             <a-button type="primary" @click="handleSearch" :disabled="disabled" id="chainTransferInReport-refresh">查询</a-button>
             <a-button type="primary" @click="handleSearch" :disabled="disabled" id="chainTransferInReport-refresh">查询</a-button>
             <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="chainTransferInReport-reset">重置</a-button>
             <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="chainTransferInReport-reset">重置</a-button>
@@ -51,6 +58,10 @@
               v-if="$hasPermissions('M_storeTransferOutReportExport')"
               v-if="$hasPermissions('M_storeTransferOutReportExport')"
               class="button-warning"
               class="button-warning"
               id="chainTransferInReport-export-btn">导出</a-button>
               id="chainTransferInReport-export-btn">导出</a-button>
+              <a @click="advanced=!advanced" style="margin-left: 5px">
+                {{ advanced ? '收起' : '展开' }}
+                <a-icon :type="advanced ? 'up' : 'down'"/>
+              </a>
           </a-col>
           </a-col>
         </a-row>
         </a-row>
       </a-form-model>
       </a-form-model>
@@ -58,7 +69,7 @@
     <!-- 合计 -->
     <!-- 合计 -->
     <a-alert type="info" style="margin-bottom:10px">
     <a-alert type="info" style="margin-bottom:10px">
       <div class="ftext" slot="message">
       <div class="ftext" slot="message">
-        总单数:<strong>{{ (totalData && (totalData.productTotalCategory || totalData.productTotalCategory==0)) ? totalData.productTotalCategory : '--' }}</strong>;
+        总单数:<strong>{{ (totalData && (totalData.totalCount || totalData.totalCount==0)) ? totalData.totalCount : '--' }}</strong>;
         产品总数量:<strong>{{ (totalData && (totalData.productTotalQty || totalData.productTotalQty==0)) ? totalData.productTotalQty : '--' }}</strong>;
         产品总数量:<strong>{{ (totalData && (totalData.productTotalQty || totalData.productTotalQty==0)) ? totalData.productTotalQty : '--' }}</strong>;
         <div v-if="$hasPermissions('M_ShowAllCost')" style="display: inline-block;">
         <div v-if="$hasPermissions('M_ShowAllCost')" style="display: inline-block;">
           调入总成本:<strong>{{ (totalData && (totalData.productTotalCost || totalData.productTotalCost==0)) ? '¥'+totalData.productTotalCost : '--' }}</strong>;
           调入总成本:<strong>{{ (totalData && (totalData.productTotalCost || totalData.productTotalCost==0)) ? '¥'+totalData.productTotalCost : '--' }}</strong>;
@@ -85,7 +96,7 @@ import { STable, VSelect } from '@/components'
 import rangeDate from '@/views/common/rangeDate.vue'
 import rangeDate from '@/views/common/rangeDate.vue'
 import { downloadExcel } from '@/libs/JGPrint.js'
 import { downloadExcel } from '@/libs/JGPrint.js'
 import outTenant from '@/views/common/outTenant.js'
 import outTenant from '@/views/common/outTenant.js'
-import { reportStoreCallOutPageList, reportStoreCallOutListTotal, reportStoreCallOutExport } from '@/api/reportData'
+import { reportAllocLinkageOutList, reportAllocLinkageOutCount, reportAllocLinkageOutExport } from '@/api/reportData'
 export default {
 export default {
   components: { STable, VSelect, rangeDate, outTenant },
   components: { STable, VSelect, rangeDate, outTenant },
   mixins: [commonMixin],
   mixins: [commonMixin],
@@ -96,15 +107,19 @@ export default {
       wrapperCol: { span: 16 },
       wrapperCol: { span: 16 },
       advanced: false, // 高级搜索 展开/关闭
       advanced: false, // 高级搜索 展开/关闭
       tableHeight: 0,
       tableHeight: 0,
+      outWareTime: [],
       queryParam: { //  查询条件
       queryParam: { //  查询条件
-        beginDate: '',
-        endDate: '',
-        outTenantSn:undefined,
+        time:[],
+        auditBeginDate: '',
+        auditEndDate: '',
+        outWarehouseBeginDate:'',
+        outWarehouseEndDate:'',
+        putTenantSn:undefined,
         allocationType: undefined,
         allocationType: undefined,
-        allocationLinkagePutNo: ''
+        allocationLinkageOutNo: ''
       },
       },
       rules: {
       rules: {
-        'time': [{ required: true, message: '请选择入库时间', trigger: 'change' }]
+        'time': [{ required: true, message: '请选择审核时间', trigger: 'change' }]
       },
       },
       disabled: false, //  查询、重置按钮是否可操作
       disabled: false, //  查询、重置按钮是否可操作
       exportLoading: false,
       exportLoading: false,
@@ -114,7 +129,7 @@ export default {
         const params = Object.assign(parameter, this.queryParam)
         const params = Object.assign(parameter, this.queryParam)
         this.spinning = true
         this.spinning = true
         delete params.time
         delete params.time
-        return reportStoreCallOutPageList(params).then(res => {
+        return reportAllocLinkageOutList(params).then(res => {
           let data
           let data
           if (res.status == 200) {
           if (res.status == 200) {
             data = res.data
             data = res.data
@@ -131,19 +146,18 @@ export default {
         })
         })
       },
       },
       totalData: null, //  合计
       totalData: null, //  合计
-      storeCallOutTypeList: [] //  调拨类型
     }
     }
   },
   },
   computed: {
   computed: {
     columns () {
     columns () {
       const arr = [
       const arr = [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
-        { title: '连锁调入单号', dataIndex: 'allocationLinkagePutNo', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '调出对象', dataIndex: 'outTenantName', width: '15%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '连锁调出单号', dataIndex: 'allocationLinkageOutNo', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '调往对象', dataIndex: 'putTenantName', width: '15%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '款数', dataIndex: 'productTotalCategory', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '款数', dataIndex: 'productTotalCategory', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '数量', dataIndex: 'productTotalQty', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '数量', dataIndex: 'productTotalQty', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '入库时间', dataIndex: 'putWarehouseTime', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '调拨产品类型', dataIndex: 'allocationTypeDictValue', width: '10%', align: 'center', customRender: function (text) { return text || '--' } }
+        { title: '出库时间', dataIndex: 'outWarehouseTime', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '调拨类型', dataIndex: 'allocationTypeDictValue', width: '10%', align: 'center', customRender: function (text) { return text || '--' } }
       ]
       ]
       if (this.$hasPermissions('M_ShowAllCost')) {
       if (this.$hasPermissions('M_ShowAllCost')) {
         arr.splice(5, 0, { title: '成本', dataIndex: 'productTotalCost', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
         arr.splice(5, 0, { title: '成本', dataIndex: 'productTotalCost', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
@@ -154,7 +168,7 @@ export default {
   methods: {
   methods: {
     // 合计
     // 合计
     getCount (params) {
     getCount (params) {
-      reportStoreCallOutListTotal(params).then(res => {
+      reportAllocLinkageOutCount(params).then(res => {
         if (res.status == 200) {
         if (res.status == 200) {
           this.totalData = res.data
           this.totalData = res.data
         } else {
         } else {
@@ -164,8 +178,13 @@ export default {
     },
     },
     //  创建时间  change
     //  创建时间  change
     dateChange (date) {
     dateChange (date) {
-      this.queryParam.beginDate = date[0] || ''
-      this.queryParam.endDate = date[1] || ''
+      this.queryParam.time = date
+      this.queryParam.auditBeginDate = date[0] || ''
+      this.queryParam.auditEndDate = date[1] || ''
+    },
+    outWareDateChange (date) {
+      this.queryParam.outWarehouseBeginDate = date[0]
+      this.queryParam.outWarehouseEndDate = date[1]
     },
     },
     //  查询
     //  查询
     handleSearch () {
     handleSearch () {
@@ -180,11 +199,17 @@ export default {
     //  重置
     //  重置
     resetSearchForm () {
     resetSearchForm () {
       this.$refs.rangeDate.resetDate()
       this.$refs.rangeDate.resetDate()
-      this.queryParam.beginDate = ''
-      this.queryParam.endDate = ''
+      this.queryParam.time = []
+      this.queryParam.auditBeginDate = ''
+      this.queryParam.auditEndDate = ''
+      this.$refs.outWareRangeDate.resetDate('')
+      this.outWareTime = []
+      this.queryParam.outWarehouseBeginDate = ''
+      this.queryParam.outWarehouseEndDate = ''
+      
       this.queryParam.allocationType = undefined
       this.queryParam.allocationType = undefined
-      this.queryParam.outTenantSn = undefined
-      this.queryParam.allocationLinkagePutNo = ''
+      this.queryParam.putTenantSn = undefined
+      this.queryParam.allocationLinkageOutNo = ''
       this.$refs.ruleForm.resetFields()
       this.$refs.ruleForm.resetFields()
       this.totalData = null
       this.totalData = null
       this.$refs.table.clearTable()
       this.$refs.table.clearTable()
@@ -195,11 +220,11 @@ export default {
       this.$refs.ruleForm.validate(valid => {
       this.$refs.ruleForm.validate(valid => {
         if (valid) {
         if (valid) {
           const params = _this.queryParam
           const params = _this.queryParam
-          params.showCost = this.$hasPermissions('M_ShowAllCost') ? '1' : '0'
+          params.costFlag = this.$hasPermissions('M_ShowAllCost') ? '1' : '0'
           _this.exportLoading = true
           _this.exportLoading = true
           _this.spinning = true
           _this.spinning = true
-          reportStoreCallOutExport(params).then(res => {
-            downloadExcel(res, '连锁调报表')
+          reportAllocLinkageOutExport(params).then(res => {
+            downloadExcel(res, '连锁调报表')
             _this.exportLoading = false
             _this.exportLoading = false
             _this.spinning = false
             _this.spinning = false
           })
           })

+ 16 - 13
src/views/chainReportData/chainTransferReport/detailList.vue

@@ -84,9 +84,9 @@
     <!-- 合计 -->
     <!-- 合计 -->
     <a-alert type="info" style="margin-bottom:10px">
     <a-alert type="info" style="margin-bottom:10px">
       <div class="ftext" slot="message">
       <div class="ftext" slot="message">
-        产品总数量:<strong>{{ (totalData && (totalData.outQty || totalData.outQty==0)) ? totalData.outQty : '--' }}</strong>;
+        产品总数量:<strong>{{ (totalData && (totalData.putQty || totalData.putQty==0)) ? totalData.putQty : '--' }}</strong>;
         <div v-if="$hasPermissions('M_ShowAllCost')" style="display: inline-block;">
         <div v-if="$hasPermissions('M_ShowAllCost')" style="display: inline-block;">
-          调入总成本:<strong>{{ (totalData && (totalData.outCost || totalData.outCost==0)) ? '¥'+totalData.outCost : '--' }}</strong>;
+          调入总成本:<strong>{{ (totalData && (totalData.putCost || totalData.putCost==0)) ? '¥'+totalData.putCost : '--' }}</strong>;
         </div>
         </div>
       </div>
       </div>
     </a-alert>
     </a-alert>
@@ -113,7 +113,7 @@ import ProductType from '../../common/productType.js'
 import ProductBrand from '../../common/productBrand.js'
 import ProductBrand from '../../common/productBrand.js'
 import supplier from '@/views/common/supplier'
 import supplier from '@/views/common/supplier'
 import outTenant from '@/views/common/outTenant.js'
 import outTenant from '@/views/common/outTenant.js'
-import { reportStoreCallOutDetailList, reportStoreCallOutDetailTotal, reportStoreCallOutDetailExport } from '@/api/reportData'
+import { reportAllocLinkagePutDetailList, reportAllocLinkagePutDetailCount, reportAllocLinkagePutDetailExport } from '@/api/reportData'
 export default {
 export default {
   components: { STable, VSelect, rangeDate, ProductType, ProductBrand, supplier, outTenant },
   components: { STable, VSelect, rangeDate, ProductType, ProductBrand, supplier, outTenant },
   mixins: [commonMixin],
   mixins: [commonMixin],
@@ -126,6 +126,7 @@ export default {
       tableHeight: 0,
       tableHeight: 0,
       outWareTime: [],
       outWareTime: [],
       queryParam: { //  查询条件
       queryParam: { //  查询条件
+        time:[],
         beginDate: '',
         beginDate: '',
         endDate: '',
         endDate: '',
         productEntity: {
         productEntity: {
@@ -142,7 +143,7 @@ export default {
         allocationLinkagePutNo: ''
         allocationLinkagePutNo: ''
       },
       },
       rules: {
       rules: {
-        'time': [{ required: true, message: '请选择审核时间', trigger: 'change' }]
+        'time': [{ required: true, message: '请选择入库时间', trigger: 'change' }]
       },
       },
       disabled: false, //  查询、重置按钮是否可操作
       disabled: false, //  查询、重置按钮是否可操作
       exportLoading: false,
       exportLoading: false,
@@ -152,7 +153,7 @@ export default {
         const params = Object.assign(parameter, this.queryParam)
         const params = Object.assign(parameter, this.queryParam)
         this.spinning = true
         this.spinning = true
         delete params.time
         delete params.time
-        return reportStoreCallOutDetailList(params).then(res => {
+        return reportAllocLinkagePutDetailList(params).then(res => {
           let data
           let data
           if (res.status == 200) {
           if (res.status == 200) {
             data = res.data
             data = res.data
@@ -180,13 +181,13 @@ export default {
         { title: '产品编码', dataIndex: 'productEntity.code', width: '13%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品编码', dataIndex: 'productEntity.code', width: '13%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品名称', dataIndex: 'productEntity.name', width: '14%', 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: '4%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '单位', dataIndex: 'productEntity.unit', width: '4%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '数量', dataIndex: 'outQty', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        // { title: '成本', dataIndex: 'outCost', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '入库时间', dataIndex: 'auditTime', width: '11%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '数量', dataIndex: 'putQty', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        // { title: '成本', dataIndex: 'putCost', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '入库时间', dataIndex: 'putWarehouseTime', width: '11%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '调拨产品类型', dataIndex: 'allocationTypeDictValue', width: '10%', align: 'center', customRender: function (text) { return text || '--' } }
         { title: '调拨产品类型', dataIndex: 'allocationTypeDictValue', width: '10%', align: 'center', customRender: function (text) { return text || '--' } }
       ]
       ]
       if (this.$hasPermissions('M_ShowAllCost')) {
       if (this.$hasPermissions('M_ShowAllCost')) {
-        arr.splice(8, 0, { title: '成本', dataIndex: 'outCost', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
+        arr.splice(8, 0, { title: '成本', dataIndex: 'putCost', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
       }
       }
       return arr
       return arr
     }
     }
@@ -194,7 +195,7 @@ export default {
   methods: {
   methods: {
     // 合计
     // 合计
     getCount (params) {
     getCount (params) {
-      reportStoreCallOutDetailTotal(params).then(res => {
+      reportAllocLinkagePutDetailCount(params).then(res => {
         if (res.status == 200) {
         if (res.status == 200) {
           this.totalData = res.data
           this.totalData = res.data
         } else {
         } else {
@@ -204,6 +205,7 @@ export default {
     },
     },
     //  创建时间  change
     //  创建时间  change
     dateChange (date) {
     dateChange (date) {
+      this.queryParam.time = date
       this.queryParam.beginDate = date[0] || ''
       this.queryParam.beginDate = date[0] || ''
       this.queryParam.endDate = date[1] || ''
       this.queryParam.endDate = date[1] || ''
     },
     },
@@ -219,6 +221,7 @@ export default {
     },
     },
     //  重置
     //  重置
     resetSearchForm () {
     resetSearchForm () {
+      this.queryParam.time = []
       this.$refs.rangeDate.resetDate()
       this.$refs.rangeDate.resetDate()
       this.queryParam.beginDate = ''
       this.queryParam.beginDate = ''
       this.queryParam.endDate = ''
       this.queryParam.endDate = ''
@@ -242,11 +245,11 @@ export default {
       this.$refs.ruleForm.validate(valid => {
       this.$refs.ruleForm.validate(valid => {
         if (valid) {
         if (valid) {
           const params = _this.queryParam
           const params = _this.queryParam
-          params.showCost = this.$hasPermissions('M_ShowAllCost') ? '1' : '0'
+          params.costFlag = this.$hasPermissions('M_ShowAllCost') ? '1' : '0'
           _this.exportLoading = true
           _this.exportLoading = true
           _this.spinning = true
           _this.spinning = true
-          reportStoreCallOutDetailExport(params).then(res => {
-            downloadExcel(res, '连锁调入细报表')
+          reportAllocLinkagePutDetailExport(params).then(res => {
+            downloadExcel(res, '连锁调入细报表')
             _this.exportLoading = false
             _this.exportLoading = false
             _this.spinning = false
             _this.spinning = false
           })
           })

+ 10 - 7
src/views/chainReportData/chainTransferReport/list.vue

@@ -3,7 +3,7 @@
     <!-- 搜索条件 -->
     <!-- 搜索条件 -->
     <div class="table-page-search-wrapper">
     <div class="table-page-search-wrapper">
       <a-form-model
       <a-form-model
-        id="storeTransOutReport-form"
+        id="chainTransferInReport-form"
         ref="ruleForm"
         ref="ruleForm"
         class="form-model-con"
         class="form-model-con"
         layout="inline"
         layout="inline"
@@ -58,7 +58,7 @@
     <!-- 合计 -->
     <!-- 合计 -->
     <a-alert type="info" style="margin-bottom:10px">
     <a-alert type="info" style="margin-bottom:10px">
       <div class="ftext" slot="message">
       <div class="ftext" slot="message">
-        总单数:<strong>{{ (totalData && (totalData.productTotalCategory || totalData.productTotalCategory==0)) ? totalData.productTotalCategory : '--' }}</strong>;
+        总单数:<strong>{{ (totalData && (totalData.totalCount || totalData.totalCount==0)) ? totalData.totalCount : '--' }}</strong>;
         产品总数量:<strong>{{ (totalData && (totalData.productTotalQty || totalData.productTotalQty==0)) ? totalData.productTotalQty : '--' }}</strong>;
         产品总数量:<strong>{{ (totalData && (totalData.productTotalQty || totalData.productTotalQty==0)) ? totalData.productTotalQty : '--' }}</strong>;
         <div v-if="$hasPermissions('M_ShowAllCost')" style="display: inline-block;">
         <div v-if="$hasPermissions('M_ShowAllCost')" style="display: inline-block;">
           调入总成本:<strong>{{ (totalData && (totalData.productTotalCost || totalData.productTotalCost==0)) ? '¥'+totalData.productTotalCost : '--' }}</strong>;
           调入总成本:<strong>{{ (totalData && (totalData.productTotalCost || totalData.productTotalCost==0)) ? '¥'+totalData.productTotalCost : '--' }}</strong>;
@@ -85,7 +85,7 @@ import { STable, VSelect } from '@/components'
 import rangeDate from '@/views/common/rangeDate.vue'
 import rangeDate from '@/views/common/rangeDate.vue'
 import { downloadExcel } from '@/libs/JGPrint.js'
 import { downloadExcel } from '@/libs/JGPrint.js'
 import outTenant from '@/views/common/outTenant.js'
 import outTenant from '@/views/common/outTenant.js'
-import { reportStoreCallOutPageList, reportStoreCallOutListTotal, reportStoreCallOutExport } from '@/api/reportData'
+import { reportAllocLinkagePutList, reportAllocLinkagePutCount, reportAllocLinkagePutExport } from '@/api/reportData'
 export default {
 export default {
   components: { STable, VSelect, rangeDate, outTenant },
   components: { STable, VSelect, rangeDate, outTenant },
   mixins: [commonMixin],
   mixins: [commonMixin],
@@ -97,6 +97,7 @@ export default {
       advanced: false, // 高级搜索 展开/关闭
       advanced: false, // 高级搜索 展开/关闭
       tableHeight: 0,
       tableHeight: 0,
       queryParam: { //  查询条件
       queryParam: { //  查询条件
+        time:[],
         beginDate: '',
         beginDate: '',
         endDate: '',
         endDate: '',
         outTenantSn:undefined,
         outTenantSn:undefined,
@@ -114,7 +115,7 @@ export default {
         const params = Object.assign(parameter, this.queryParam)
         const params = Object.assign(parameter, this.queryParam)
         this.spinning = true
         this.spinning = true
         delete params.time
         delete params.time
-        return reportStoreCallOutPageList(params).then(res => {
+        return reportAllocLinkagePutList(params).then(res => {
           let data
           let data
           if (res.status == 200) {
           if (res.status == 200) {
             data = res.data
             data = res.data
@@ -154,7 +155,7 @@ export default {
   methods: {
   methods: {
     // 合计
     // 合计
     getCount (params) {
     getCount (params) {
-      reportStoreCallOutListTotal(params).then(res => {
+      reportAllocLinkagePutCount(params).then(res => {
         if (res.status == 200) {
         if (res.status == 200) {
           this.totalData = res.data
           this.totalData = res.data
         } else {
         } else {
@@ -164,6 +165,7 @@ export default {
     },
     },
     //  创建时间  change
     //  创建时间  change
     dateChange (date) {
     dateChange (date) {
+      this.queryParam.time = date
       this.queryParam.beginDate = date[0] || ''
       this.queryParam.beginDate = date[0] || ''
       this.queryParam.endDate = date[1] || ''
       this.queryParam.endDate = date[1] || ''
     },
     },
@@ -179,6 +181,7 @@ export default {
     },
     },
     //  重置
     //  重置
     resetSearchForm () {
     resetSearchForm () {
+      this.queryParam.time = []
       this.$refs.rangeDate.resetDate()
       this.$refs.rangeDate.resetDate()
       this.queryParam.beginDate = ''
       this.queryParam.beginDate = ''
       this.queryParam.endDate = ''
       this.queryParam.endDate = ''
@@ -195,10 +198,10 @@ export default {
       this.$refs.ruleForm.validate(valid => {
       this.$refs.ruleForm.validate(valid => {
         if (valid) {
         if (valid) {
           const params = _this.queryParam
           const params = _this.queryParam
-          params.showCost = this.$hasPermissions('M_ShowAllCost') ? '1' : '0'
+          params.costFlag = this.$hasPermissions('M_ShowAllCost') ? '1' : '0'
           _this.exportLoading = true
           _this.exportLoading = true
           _this.spinning = true
           _this.spinning = true
-          reportStoreCallOutExport(params).then(res => {
+          reportAllocLinkagePutExport(params).then(res => {
             downloadExcel(res, '连锁调入报表')
             downloadExcel(res, '连锁调入报表')
             _this.exportLoading = false
             _this.exportLoading = false
             _this.spinning = false
             _this.spinning = false

+ 1 - 1
vue.config.js

@@ -211,7 +211,7 @@ const vueConfig = {
     // If you want to turn on the proxy, please remove the mockjs /src/main.jsL11
     // If you want to turn on the proxy, please remove the mockjs /src/main.jsL11
     proxy: {
     proxy: {
       '/api': {
       '/api': {
-        target: 'http://192.168.0.103/qpls-md',
+        target: 'http://192.168.0.216:8076/qpls-md',
         // target: 'http://p.iscm.360arrow.com/qpls-md',
         // target: 'http://p.iscm.360arrow.com/qpls-md',
         // ws: false,
         // ws: false,
         ws: true,
         ws: true,