库存明细

ghsApp/src/pagesStorehouse/stockWarn/detailed.vue

@@ -6,25 +6,18 @@
 				<block v-if="!$util.isEmpty(list.data)">
 					<t-table :headerBackgroundColor="'#F0F2F6'">
 						<t-tr header>
-							<t-th v-for="(item, index) in columns" :key="index" :align="item.align">
-								{{ item.name }}
-							</t-th>
+							<t-th>时间</t-th>
+							<t-th><view style="width:180upx;">事项</view></t-th>
+							<t-th>名称</t-th>
+							<t-th>变动</t-th>
+							<t-th>剩余</t-th>
 						</t-tr>
 						<t-tr v-for="(item, index) in list.data" :key="index">
-							<t-td v-for="(column, colIndex) in columns" :key="colIndex" :align="column.align" :color="column.color">
-								<view v-if="column.custom == 'change'">
-									{{ `${parseFloat(item.itemNum)}` }}
-								</view>
-								<view v-else-if="column.custom == 'stock'">
-									{{ `${parseFloat(item.newStock)}` }}
-								</view>
-								<view v-else-if="column.custom == 'time'">
-									<view class="icon-info"><view class="info-name">{{ item.addTime.substr(5,11) }}</view></view>
-								</view>
-								<view v-else>
-									{{ item[column.dataIndex] || "" }}
-								</view>
-							</t-td>
+							<t-td><view>{{ item.addTime.substr(5,11) }}</view></t-td>
+							<t-td><view style="width:180upx;">{{item.typeName}}</view></t-td>
+							<t-td><view>{{item.relateName}}</view></t-td>
+							<t-td><view>{{parseFloat(item.itemNum)}}</view></t-td>
+							<t-td><view>{{parseFloat(item.newStock)}}</view></t-td>
 						</t-tr>
 					</t-table>
 				</block>
@@ -40,7 +33,6 @@
 const Month = (new Date().getMonth()+1)<10?'0'+(new Date().getMonth()+1):new Date().getMonth()+1
 const time = `${new Date().getFullYear()}-${Month}-${new Date().getDate()}`;
 import AppWrapperEmpty from "@/components/app-wrapper-empty";
-
 import SelectList from "@/components/plugin/selectList";
 import { getStockDetailApi } from "@/api/storehouse/stock";
 import { list,selectShop } from "@/mixins";
@@ -53,10 +45,10 @@ export default {
 		return {
 			isShow:false,
 			customizationTime:'',
-			menuTimeObj:'',//时间分类-类型
-			menuShopObj:'',//门店分类-类型
-			selectTimeId:'',//选择时间id
-			shopId:'',//选择分店id
+			menuTimeObj:'',
+			menuShopObj:'',
+			selectTimeId:'',
+			shopId:'',
 			itemId:'',
 			selectListData: [
 				{
@@ -90,37 +82,6 @@ export default {
 			showTimeDropdown: false,
 			nowShop: "",
 			showShopDropdown: false,
-			columns: [
-				{
-					name: "事项",
-					dataIndex: "typeName",
-					color: "info"
-				},
-				{
-					name: "名称",
-					dataIndex: "relateName",
-					color: "info"
-				},
-				{
-					name: "变动",
-					custom: "change",
-					color: "info",
-					width: 120,
-					align: "center"
-				},
-				{
-					name: "剩余",
-					custom: "stock",
-					color: "info",
-					align: "center"
-				},
-				{
-					name: "时间",
-					align: "right",
-					custom: "time",
-					color: "info"
-				}
-			],
 			dataList: [],
 			params:{
 				itemId: '',

hdApp/src/admin/home/apply.vue

@@ -19,7 +19,7 @@
 </template>
 <script>
 import NotLogin from "@/components/not-login";
-export default { // 应用页面
+export default {
   name: 'apply',
   components: {
     NotLogin
@@ -28,11 +28,15 @@ export default { // 应用页面
     return {
       menuList: [
         {
-            title:'花材',
+            title:'商品花材',
             list:[
                 {name: "花材",img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`,url: "/admin/item/list"},
                 {name: "停用花材",img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`,url: "/admin/item/list?delStatus=1"},
-                {name: "花材分类",img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`,url: "/admin/itemClass/list"}
+                {name: "花材分类",img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`,url: "/admin/itemClass/list"},
+                { name: "商品", img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`, url: "/admin/goodsManage/list" },
+                { name: "商品分类", img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`, url: "/admin/goodsManage/category" },
+                { name: "涨价设置", img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`, url: "/admin/goodsManage/price-increase" },
+                { name: "运费规则", img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`, url: "/admin/goodsManage/freight" }
             ]
         },
         {
@@ -51,25 +55,25 @@ export default { // 应用页面
           ]
         },
         {
-          title: '商品',
+          title: '数据统计',
           list: [
-            { name: "商品", img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`, url: "/admin/goodsManage/list" },
-            { name: "商品分类", img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`, url: "/admin/goodsManage/category" },
-            { name: "涨价设置", img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`, url: "/admin/goodsManage/price-increase" },
-            { name: "运费规则", img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`, url: "/admin/goodsManage/freight" }
+            {name: "利润表",img: `${this.$constant.imgUrl}/ghs/home/jyzk.png`,url: "/admin/statistics/profit"},
+            {name: "收入渠道",img: `${this.$constant.imgUrl}/ghs/home/jyzk.png`,url: "/admin/statistics/kdIncome"},
+            {name: "花材销售榜",img: `${this.$constant.imgUrl}/ghs/home/jyzk.png`,url: "/admin/statistics/productSale"},
+            {name: "客户下单榜",img: `${this.$constant.imgUrl}/ghs/home/jyzk.png`,url: "/admin/statistics/customSale"},
+            {name: "采购统计",img: `${this.$constant.imgUrl}/ghs/home/jyzk.png`,url: "/admin/statistics/cgStat"}
           ]
         },
         {
-          title: '赚钱分红',
+          title: '代理商',
           list: [
+            // {name: "新客福利",img: `${this.$constant.imgUrl}/ghs/home/yqyl.png`,url: "/admin/hb/xrFl"},
+            // {name: "推荐福利",img: `${this.$constant.imgUrl}/ghs/home/yqyl.png`,url: "/admin/hb/tjFl"},
+            // {name: "充值福利",img: `${this.$constant.imgUrl}/ghs/home/yqyl.png`,url: "/admin/item/rechargeHb"},
+            // {name: "充值记录",img: `${this.$constant.imgUrl}/ghs/home/yqyl.png`,url: "/admin/hb/rechargeList"},
+            // {name: "已发红包",img: `${this.$constant.imgUrl}/ghs/home/yqyl.png`,url: "/admin/hb/list"},
             { name: "邀请开店", img: `${this.$constant.imgUrl}/ghs/home/yqyl.png`, url: "/pagesInvite/list" }
           ]
-        },
-        {
-          title: '数据统计',
-          list: [
-            { name: "经营概况", img: `${this.$constant.imgUrl}/ghs/home/jyzk.png`, url: "/pagesStatistics/business" }
-          ]
         }
       ]
     }
@@ -120,4 +124,4 @@ export default { // 应用页面
     }
   }
 }
-</style>
+</style>

hdApp/src/pagesStorehouse/stockWarn/detailed.vue

@@ -6,25 +6,18 @@
 				<block v-if="!$util.isEmpty(list.data)">
 					<t-table :headerBackgroundColor="'#F0F2F6'">
 						<t-tr header>
-							<t-th v-for="(item, index) in columns" :key="index" :align="item.align">
-								{{ item.name }}
-							</t-th>
+							<t-th>时间</t-th>
+							<t-th><view style="width:180upx;">事项</view></t-th>
+							<t-th>名称</t-th>
+							<t-th>变动</t-th>
+							<t-th>剩余</t-th>
 						</t-tr>
 						<t-tr v-for="(item, index) in list.data" :key="index">
-							<t-td v-for="(column, colIndex) in columns" :key="colIndex" :align="column.align" :color="column.color">
-								<view v-if="column.custom == 'change'">
-									{{ `${parseFloat(item.itemNum)}` }}
-								</view>
-								<view v-else-if="column.custom == 'stock'">
-									{{ `${parseFloat(item.newStock)}` }}
-								</view>
-								<view v-else-if="column.custom == 'time'">
-									<view class="icon-info"><view class="info-name">{{ item.addTime.substr(5,11) }}</view></view>
-								</view>
-								<view v-else>
-									{{ item[column.dataIndex] || "" }}
-								</view>
-							</t-td>
+							<t-td><view>{{ item.addTime.substr(5,11) }}</view></t-td>
+							<t-td><view style="width:180upx;">{{item.typeName}}</view></t-td>
+							<t-td><view>{{item.relateName}}</view></t-td>
+							<t-td><view>{{parseFloat(item.itemNum)}}</view></t-td>
+							<t-td><view>{{parseFloat(item.newStock)}}</view></t-td>
 						</t-tr>
 					</t-table>
 				</block>
@@ -52,10 +45,10 @@ export default {
 		return {
 			isShow:false,
 			customizationTime:'',
-			menuTimeObj:'',//时间分类-类型
-			menuShopObj:'',//门店分类-类型
-			selectTimeId:'',//选择时间id
-			shopId:'',//选择分店id
+			menuTimeObj:'',
+			menuShopObj:'',
+			selectTimeId:'',
+			shopId:'',
 			itemId:'',
 			selectListData: [
 				{
@@ -89,37 +82,6 @@ export default {
 			showTimeDropdown: false,
 			nowShop: "",
 			showShopDropdown: false,
-			columns: [
-				{
-					name: "事项",
-					dataIndex: "typeName",
-					color: "info"
-				},
-				{
-					name: "名称",
-					dataIndex: "relateName",
-					color: "info"
-				},
-				{
-					name: "变动",
-					custom: "change",
-					color: "info",
-					width: 120,
-					align: "center"
-				},
-				{
-					name: "剩余",
-					custom: "stock",
-					color: "info",
-					align: "center"
-				},
-				{
-					name: "时间",
-					align: "right",
-					custom: "time",
-					color: "info"
-				}
-			],
 			dataList: [],
 			params:{
 				itemId: '',