申购统计 模块bug修改

src/components/dateSelect/dateSelect.vue

@@ -8,6 +8,7 @@
 			placement="bottom-end"
 			placeholder="请选择月份"
 			style="width: 200px; margin-right: 10px"
+			:style="dataArea2 ? 'border:1px solid #3f92f9;border-radius:5px' : ''"
 		>
 		</DatePicker>
 		<div class="date-filter">
@@ -35,6 +36,7 @@
 			</Poptip>
 		</div>
 		<DatePicker
+			:style="selectType == 3 ? 'border:1px solid #3f92f9;border-radius:5px' : ''"
 			:clearable="false"
 			@on-change="dateClick"
 			v-model="dataArea"
@@ -65,6 +67,7 @@ export default {
 	},
 	data() {
 		return {
+			selectType: 0,
 			modalTimeList: [
 				{
 					name: '昨日',
@@ -92,7 +95,7 @@ export default {
 				},
 			],
 			modalTimeType: null,
-			dateTabIndex: 0,
+			dateTabIndex: 3,
 			dateTabs: [
 				{ label: '本日' },
 				{ label: '本周' },
@@ -107,6 +110,7 @@ export default {
 	methods: {
         /* 选项卡切换 */
 		dateTabToggle(index) {
+			this.selectType = 0
 			this.dateTabIndex = index
             this.dataArea2 = null
 			if (index === 0) {
@@ -170,6 +174,7 @@ export default {
 			this.$emit('change')
 		},
 		modalTimeSelect(_type) {
+			this.selectType = 0
             const format = (timeStamp) => {
                 var date = new Date();
                 date.setTime(timeStamp * 1);
@@ -184,7 +189,7 @@ export default {
                 var second = date.getSeconds();
                 minute = minute < 10 ? ('0' + minute) : minute;
                 second = second < 10 ? ('0' + second) : second;
-                return y + '-' + m + '-' + d + ' ' + h + ':' + minute + ':' + second;
+                return y + '-' + m + '-' + d;
             }
 			const v = this
 			const todayNum = new Date(new Date().toLocaleDateString()).getTime()
@@ -199,15 +204,16 @@ export default {
 			const day = today.getDate()
 			if (_type == 1) {
 				v.value.beginTime = format(todayNum - 86400000)
-				v.value.endTime = format(todayNum)
+				v.value.endTime = format(todayNum - 86400000)
 			}
 			if (_type == 2) {
 				v.value.beginTime = format(todayNum - 86400000 * 2)
-				v.value.endTime = format(todayNum - 86400000)
+				v.value.endTime = format(todayNum - 86400000 * 2)
 			}
 			if (_type == 3) {
+				console.log(nows)
 				v.value.beginTime = format(todayNum - 86400000 * (nows + 6))
-				v.value.endTime = format(todayNum - 86400000 * (nows - 1))
+				v.value.endTime = format(todayNum - 86400000 * (nows))
 			}
 			if (_type == 4) {
 				if (month == 1) {
@@ -253,32 +259,39 @@ export default {
 					v.value.endTime = format(today.getTime())
 				}
 			}
-			v.time = [v.value.beginTime, v.value.endTime]
+			v.dataArea = [v.value.beginTime, v.value.endTime]
             v.dateTabIndex = 5
             this.$emit('change')
 		},
 		dateClick2(date) {
 			const dateDayNum = new Date(date).getDate()
-			const dateMonthNum = new Date(date).getMonth()
+			const dateMonthNum = new Date(date).getMonth() + 1
 			const dateYearNum = new Date(date).getFullYear()
+			this.dateTabIndex = null
 			this.value.beginTime = dateYearNum + '-' + dateMonthNum + '-1'
 			this.value.endTime =
 				dateYearNum +
 				'-' +
 				dateMonthNum +
 				'-' +
-				new Date(dateYearNum, dateMonthNum * 1 + 2, 0).getDate()
+				new Date(dateYearNum, dateMonthNum * 1, 0).getDate()
 			this.dataArea = []
+			this.selectType = 0
             this.$emit('change')
 		},
 		dateClick(date) {
 			this.value.beginTime = date[0]
 			this.value.endTime = date[1]
+			this.dateTabIndex = null
 			this.dataArea2 = null
+			this.selectType = 3
             console.log(this.value)
             this.$emit('change')
 		},
 	},
+	created(){
+		console.log(this.dateTabIndex)
+	},
 }
 </script>
 <style scoped lang="less">
@@ -295,6 +308,7 @@ export default {
 .date-filter-wrap {
 	display: flex;
 	align-items: center;
+	overflow: hidden;
 	.date-filter {
 		width: 300px;
 		overflow: hidden;

src/locale/lang/zh-CN.js

@@ -59,5 +59,6 @@ export default {
   store_update_old: '物料修正（旧）',
   quality_record_detail: '质检详情',
   provider_tag_manage: '合同标签',
-  error_out: '异常出库'
+  error_out: '异常出库',
+  purchaseTotal: '* 申购统计'
 }

src/router/index.js

@@ -13,7 +13,7 @@ const router = new Router({
   mode: 'history'
 })
 const LOGIN_PAGE_NAME = 'login'
-console.log(window.location)
+
 const turnTo = (to, access, next) => {
   if (canTurnTo(to.name, access, routes)) next() // 有权限，可访问
   else next({ replace: true, name: 'error_401' }) // 无权限，重定向到401页面
@@ -26,7 +26,7 @@ Router.prototype.push = function push (location) {
 }
 
 router.beforeEach((to, from, next) => {
-  console.log(to, from, next)
+  
   iView.LoadingBar.start()
   const token = getToken()
   if (!token && ['technology_board'].includes(to.name)) {

src/view/material-manege/pay/pay2.vue

@@ -878,7 +878,7 @@ export default {
 		},
         getContractPayment(_total,_yinfuNum){
             const v = this
-            axios.get('http://120.79.80.64:8055/javaApi/contractPayment',{}).then(res=>{
+            axios.get('/javaApi/contractPayment',{}).then(res=>{
                 console.log(res)
                 var dateDayNum = new Date().getDate();
                 var dateMonthNum = new Date().getMonth();
@@ -1131,7 +1131,7 @@ export default {
 			}).then((res) => {
 				if (res.code === 0) {
 					
-					axios.post('http://120.79.80.64:8055/javaApi/selectDetails',{beginTime:this.params.payTime})
+					axios.post('/javaApi/selectDetails',{beginTime:this.params.payTime})
 						.then((res2) => {
 							
 							for (

src/view/material-manege/purchaseTotal/purchaseTotal.vue

@@ -1,43 +1,11 @@
 <template>
 	<div class="purchaseTotal">
-		<div class="bar-title">
+		<div class="bar-title" style="overflow: hidden;">
 			<span style="font-size: 16px; font-weight: bold; color: #000"
-				>申购金额统计</span
-			>
+				>申购统计</span
+			> <span v-if="this.params.beginTime">({{(this.params.beginTime ?  this.params.beginTime.slice(0,11) : '') + '-' + (this.params.endTime ?  this.params.endTime.slice(0,11) : '')}})</span>
             <date-select v-model="params" @change="selectTime"></date-select>
-			<div class="date-filter-wrap" style="float: right;display: none;">
-                <DatePicker
-					:clearable="false"
-					@on-change="dateClick2"
-					v-model="dataArea2"
-					type="month"
-					placement="bottom-end"
-					placeholder="请选择月份"
-					style="width: 200px; margin-right: 10px"
-				>
-				</DatePicker>
-				<div class="date-filter">
-					<div
-						class="date-tab"
-						v-for="(item, index) in dateTabs"
-						:key="index"
-						:class="index === dateTabIndex ? 'active' : ''"
-						@click="dateTabToggle(index)"
-					>
-						{{ item.label }}
-					</div>
-				</div>
-				<DatePicker
-					:clearable="false"
-					@on-change="dateClick"
-					v-model="dataArea"
-					type="daterange"
-					placement="bottom-end"
-					placeholder="请选择日期"
-					style="width: 200px; margin-left: 10px"
-				>
-				</DatePicker>
-			</div>
+			
 		</div>
 		<div class="total-header" style="padding-top:10px">
 			<div class="card-warp" style="width: 13.5%; margin-right: 1%">
@@ -275,6 +243,11 @@ export default {
             if(_id == null){
                 this.params.supplierIdList = ''
                 this.params.supplierIdListCopy = ''
+				if(this.company.length == 0){
+					this.params.pageNum = 1
+					this.listData = []
+					return
+				}
                 for (let i = 0; i < this.company.length; i++) {
                     const element = this.company[i];
                     if(i == this.company.length){
@@ -393,7 +366,7 @@ export default {
 		},
 		getList() {
             this.$Spin.show()
-            axios.post('/stockWater/subscriptionAmountPage',{
+            axios.post('/cloudApi/stockWater/subscriptionAmountPage',{
                 ...this.params,
             }).then(res=>{
                 console.log(res)
@@ -403,7 +376,7 @@ export default {
             })
 		},
         getTotal(){
-            axios.post('/stockWater/subscriptionAmountStatistics',{
+            axios.post('/cloudApi/stockWater/subscriptionAmountStatistics',{
 				 ...this.params,
             }).then(res=>{
                 this.totalData = res.data.data

src/view/store-manage/store-report/store-report.vue

@@ -1,15 +1,30 @@
 <!-- 库存报表 -->
 <template>
 	<div class="container">
-		<div>
-      <div style="overflow: hidden;">
-        <date-select v-model="params7" @change="selectTime"></date-select>
-      </div>
-      <div style="height:500px">
-        <tree-table :data="data7" arrow-icon-right="ios-arrow-forward" arrow-icon-down="ios-arrow-down" :Columns="columns2" bottom-line border>
-			  </tree-table>
-      </div>
+		<div style="overflow: hidden;">
+			<date-select v-model="params7" @change="selectTime"></date-select>
 		</div>
+		<!-- <div class="total-warp">
+			<div class="left-total" style="padding-right: 1px">
+				<div class="total-header">
+					<div class="title">面料</br>领用</div>
+					<div>卷数</br><span>12312312</span></div>
+					<div>米数</br><span>12312312</span></div>
+					<div>面积</br><span>12312312</span></div>
+					<div>金额</br><span>12312312</span></div>
+				</div>
+				<div>
+					<Table :columns="columns7" :data="data7"></Table>
+				</div>
+			</div>
+			<div class="right-total">
+				<div class="total-header"></div>
+				<div>
+					<Table :columns="columns8" :data="data8"></Table>
+				</div>
+			</div>
+		</div> -->
+		
 		<Tabs :value="tabName" @on-click="tabClick">
 			<TabPane label="盘盈亏单" name="1">
 				<my-table
@@ -34,6 +49,7 @@
 				></my-table>
 			</TabPane>
 			<TabPane label="领料序时簿" name="3">
+				
 				<my-table
 					ref="llsxb"
 					:data="data3"
@@ -103,13 +119,15 @@ import MyModalMaterial from '_c/my-modal-form/my-modal-material'
 import TreeTable from 'iview-tree-table'
 import axios from 'axios'
 import  dateSelect  from '@/components/dateSelect/dateSelect'
+import expandRow from './table-expand.vue';
 export default {
 	name: 'store_report',
 	components: {
 		MyTable,
 		MyModalMaterial,
 		TreeTable,
-    dateSelect
+		expandRow,
+    	dateSelect
 	},
 	data() {
 		return {
@@ -122,7 +140,8 @@ export default {
 			data4: [],
 			data5: [],
 			data6: [],
-      data7:[],
+      		data7: [],
+			data8: [],
 			columns1: [
 				{
 					title: '序号',
@@ -659,6 +678,66 @@ export default {
 					minWidth: 150,
 				},
 			],
+			columns7: [
+				{
+					type: 'expand',
+					width: 50,
+					render: (h, params) => {
+						return h(expandRow, {
+							props: {
+								row: params
+							}
+						})
+					}
+				},
+				{
+					title: '领料人',
+					key: 'name',
+					minWidth: 100,
+				},
+				{
+					title: '卷数',
+					key: 'total',
+					minWidth: 100,
+				},
+				{
+					title: '米数',
+					key: 'length',
+					minWidth: 100,
+				},
+				{
+					title: '面积',
+					key: 'measureArea',
+					minWidth: 100,
+				},
+				{
+					title: '金额',
+					key: 'money',
+					minWidth: 100,
+				},
+			],
+			columns8: [
+				{
+					title: '领料人',
+					key: 'userName',
+					minWidth: 100,
+				},
+				{
+					title: '件数',
+					key: 'total',
+					minWidth: 100,
+				},
+				{
+					title: '公斤',
+					key: 'weight',
+					minWidth: 100,
+				},
+				{
+					title: '金额',
+					key: 'money',
+					minWidth: 100,
+				},
+			],
 			tableFilter1: [
 				{
 					name: 'Input',
@@ -845,12 +924,13 @@ export default {
     selectTime(){},
 		getPickingPage() {
 
-			axios.post('/stockWater/getPickingStatistics', {
+			axios.post('/cloudApi/stockWater/getPickingStatistics', {
 					...this.params,
 				})
 				.then((res) => {
           
-					//this.data7 = [{}]
+					this.data7 = res.data.data.fabricTree
+					this.data8 = res.data.data.inkDetails
 					console.log(this.data7)
 					
 				})
@@ -1074,8 +1154,34 @@ export default {
 	},
 }
 </script>
-
+<style>
+.ivu-table-expanded-cell{
+	padding-right:0px!important;
+}
+</style>
 <style lang="less" scoped>
+.total-warp{
+	display: flex;
+	justify-content: space-between;
+	.left-total,.right-total{
+		width: 49%;
+		.total-header{
+			width: 100%;
+			height: 60px;
+			border: 1px solid #dcdcdc;
+		}
+	}
+	.left-total{
+		.total-header{
+			padding-left: 40px;
+			div{
+				width: 20%;
+				float: left;
+				padding: 0 16px;
+			}
+		}
+	}
+}
 .container {
 	height: 100%;
 }

src/view/store-manage/store-report/table-expand.vue

@@ -0,0 +1,35 @@
+// table-expand.vue
+<style scoped>
+    .expand-row{
+        margin-bottom: 16px;
+        overflow: hidden;
+    }
+    .expand-row li{
+        width: 20%;
+        padding: 0 16px;
+        float: left;
+        list-style: none;
+    }
+</style>
+<template>
+    <div>
+        <ul class="expand-row" v-for="i in row.row.children" :key="i.materialType">
+            <li>{{i.name}}</li>
+            <li>{{i.total}}</li>
+            <li>{{i.length}}</li>
+            <li>{{i.measureArea}}</li>
+            <li>{{i.money}}</li>
+        </ul>
+        
+    </div>
+</template>
+<script>
+    export default {
+        props: {
+            row: Object
+        },
+        created(){
+            console.log(this.row)
+        },
+    };
+</script>

vue.config.js

@@ -34,9 +34,19 @@ module.exports = {
       'Access-Control-Allow-Origin': '*',
     },
     proxy: {
-      '/stockWater': {
+      '/cloudApi': {
         //本地服务接口地址
-        target: 'http://192.168.1.112:8300',
+        target: 'http://120.79.80.64:8050',
+        //远程演示服务地址,可用于直接启动项目
+        //target: 'https://saber.bladex.vip/api',
+        ws: true,
+        pathRewrite: {
+          '^/api': '/'
+        }
+      },
+      '/javaApi': {
+        //本地服务接口地址
+        target: 'http://120.79.80.64:8050',
         //远程演示服务地址,可用于直接启动项目
         //target: 'https://saber.bladex.vip/api',
         ws: true,