收入

ghsApp/src/admin/home/apply.vue

@@ -50,7 +50,7 @@ export default {
                     title:'统计',
                     list:[
                         {name: "利润表",img: `${this.$constant.imgUrl}/ghs/home/jyzk.png`,url: "/admin/stat/profit"},
-                        {name: "各渠道进账",img: `${this.$constant.imgUrl}/ghs/home/jyzk.png`,url: "/admin/stat/kdIncome"},
+                        {name: "各渠道收入",img: `${this.$constant.imgUrl}/ghs/home/jyzk.png`,url: "/admin/stat/kdIncome"},
                         {name: "花材销量",img: `${this.$constant.imgUrl}/ghs/home/jyzk.png`,url: "/admin/stat/productSale"},
                         {name: "客户下单榜",img: `${this.$constant.imgUrl}/ghs/home/jyzk.png`,url: "/admin/stat/customSale"},
                         {name: "采购统计",img: `${this.$constant.imgUrl}/ghs/home/jyzk.png`,url: "/admin/stat/cgStat"},

ghsApp/src/pages.json

@@ -228,7 +228,7 @@
 			"pages": [
 				{"path": "profit","style": {"navigationBarTitleText": "利润表"}},
 				{"path": "productSale","style": {"navigationBarTitleText": "花材销量"}},
-				{"path": "kdIncome","style": {"navigationBarTitleText": "各渠道进账"}},
+				{"path": "kdIncome","style": {"navigationBarTitleText": "各渠道收入"}},
 				{"path": "customSale","style": {"navigationBarTitleText": "客户下单排行"}},
 				{"path": "incomeStat","style": {"navigationBarTitleText": "应收款"}},
 				{"path": "cgStat","style": {"navigationBarTitleText": "采购统计"}},

ghsApp/src/pagesStorehouse/allot/allotEx.vue

@@ -10,6 +10,7 @@
 					<view class="info">
 						<view class="info-order">{{ item.orderSn }}</view>
 							<view class="info-name">门店：{{ item.inShopName }}</view>
+							<view class="info-name">价格：¥{{ item.price?parseFloat(item.price):0 }}</view>
 							<view class="info-name">数量：<text v-if="Number(item.bigNum)>0">{{ item.bigNum }}扎</text><text v-if="Number(item.smallNum)>0">{{ item.smallNum }}支</text></view>
 						<view class="info-name">时间：{{ item.updateTime?item.updateTime.substr(5,11):'' }}</view>
 					</view>

ghsApp/src/pagesStorehouse/allot/allotPut.vue

@@ -20,25 +20,12 @@
 					<view class="info">
 						<view class="info-order">{{ item.orderSn }}</view>
 						<view class="info-name">门店：{{ item.outShopName }}</view>
-						<view class="info-name">数量：{{ item.bigNum}}/{{ item.smallNum}}</view>
-            <view class="info-name">时间：{{ item.updateTime }}</view>
+						<view class="info-name">价格：¥{{ item.price?parseFloat(item.price):0 }}</view>
+						<view class="info-name">数量：<text v-if="Number(item.bigNum)>0">{{ item.bigNum}}扎</text><text v-if="Number(item.smallNum)>0">{{ item.smallNum}}支</text></view>
+            			<view class="info-name">时间：{{ item.updateTime.substr(5,11) }}</view>
 					</view>
-					<view
-						:class="[
-							'status',
-							item.status == PUT_STATUS.DONE
-								? 'primary'
-								: item.status == PUT_STATUS.CONFIRM
-								? 'warn'
-								: 'gray'
-						]"
-					>
-						<view
-							:class="[
-								'iconfont',
-								item.status == PUT_STATUS.CANCEL ? 'iconcaozuojihuo' : 'icondairuku'
-							]"
-						></view>
+					<view :class="[ 'status', item.status == PUT_STATUS.DONE ? 'primary' : item.status == PUT_STATUS.CONFIRM ? 'warn' : 'gray' ]" >
+						<view :class="[ 'iconfont', item.status == PUT_STATUS.CANCEL ? 'iconcaozuojihuo' : 'icondairuku' ]" ></view>
 						<view :class="['status-name']">{{ item.statusName }}</view>
 					</view>
 				</view>
@@ -47,9 +34,6 @@
 				<AppWrapperEmpty title="暂无数据" :is-empty="$util.isEmpty(list.data)" />
 			</block>
 		</scroll-view>
-		<!--<view class="app-footer open_btn">-->
-			<!--<view @click="addEvent" class="admin-button-com big blue">新增入库</view>-->
-		<!--</view>-->
 	</view>
 </view>
 </template>

ghsApp/src/pagesStorehouse/allot/exDetails.vue

@@ -35,12 +35,10 @@
 						<t-tr v-for="(item, index) in outData.itemInfo" :key="index">
 							<t-td v-for="(column, colIndex) in columns" :key="colIndex" :align="column.align" :color="column.color" >
 								<view v-if="column.custom == 'icon'" class="list-icon">
-									<image class="icon-image" :src="item.itemCover" />
 									<view class="icon-info">
 										<view class="info-name">
 											{{ item.itemName }}
 										</view>
-										<view class="info-type"></view>
 									</view>
 								</view>
 								<view v-else-if="column.custom == 'stock'">
@@ -51,6 +49,9 @@
 									<text v-if="Number(item.bigNum)>0"> {{ item.bigNum }}扎</text>
 									<text v-if="Number(item.smallNum)>0">{{ item.smallNum }}支</text>
 								</view>
+								<view v-else-if="column.custom == 'itemPrice'">
+									<text> ¥{{ item.itemPrice?parseFloat(item.itemPrice):0 }}</text>
+								</view>
 								<view v-else>
 									{{ item[column.dataIndex] || "" }}
 								</view>
@@ -64,7 +65,7 @@
 			</view>
 		</view>
 		<view class="bar-view">
-			<view class="info-view"> 出库数量：{{ sumCount }} </view>
+			<view class="info-view">{{ sumCount }}&nbsp;&nbsp;&nbsp;¥{{outData.price?parseFloat(outData.price):0}}</view>
 			<view class="btn-view" v-if="outData.status">
 				<button v-if="outData.status != OUT_STATUS.CANCEL && outData.statusName != '已出库'" class="admin-button-com middle" @click="cancelEvent" > 取消 </button>
 				<button v-if="outData.status == OUT_STATUS.CONFIRM" class="admin-button-com middle" @click="confirmEventPop" > 确认 </button>
@@ -84,9 +85,10 @@ export default {
 			orderSn: "",
 			outData: {},
 			columns: [
-				{ name: "花材名称", custom: "icon" },
+				{ name: "名称", custom: "icon" },
 				{ name: "库存", custom: "stock", width: 120, align: "center" },
-				{ name: "出库数量", custom: "put", width: 120, align: "center" }
+				{ name: "出库数", custom: "put", width: 120, align: "center" },
+				{ name: "成本", custom: "itemPrice", width: 120, align: "center" }
 			]
 		};
 	},

ghsApp/src/pagesStorehouse/allot/putDetails.vue

@@ -9,7 +9,7 @@
 				</view>
 				<view class="info-cell">
 					<view class="cell-label"> 日期</view>
-					<view class="cell-value"> {{ putData.updateTime || "" }}</view>
+					<view class="cell-value"> {{ putData.updateTime.substr(5,11) }}</view>
 				</view>
 				<view class="info-cell">
 					<view class="cell-label"> 制单人</view>
@@ -39,12 +39,10 @@
 						<t-tr v-for="(item, index) in putData.itemInfo" :key="index">
 							<t-td v-for="(column, colIndex) in columns" :key="colIndex" :align="column.align" :color="column.color" >
 								<view v-if="column.custom == 'icon'" class="list-icon">
-									<image class="icon-image" :src="item.itemCover" alt="商品图" />
 									<view class="icon-info">
 										<view class="info-name">
 											{{ item.itemName }}
 										</view>
-										<view class="info-type"> {{ item.rank }}级 </view>
 									</view>
 								</view>
 								<view v-else-if="column.custom == 'stock'">
@@ -55,6 +53,9 @@
 									<text v-if="Number(item.bigNum)>0"> {{ item.bigNum }}扎</text>
 									<text v-if="Number(item.smallNum)>0">{{ item.smallNum }}支</text>
 								</view>
+								<view v-else-if="column.custom == 'itemPrice'">
+									<text> ¥{{ item.itemPrice?parseFloat(item.itemPrice):0 }}</text>
+								</view>
 								<view v-else>
 									{{ item[column.dataIndex] || "" }}
 								</view>
@@ -68,7 +69,7 @@
 			</view>
 		</view>
 		<view class="bar-view">
-			<view class="info-view"> 入库数量：{{ sumCount }} </view>
+			<view class="info-view">{{ sumCount }}&nbsp;&nbsp;&nbsp;¥{{putData.price?parseFloat(putData.price):0}}</view>
 			<view class="btn-view" v-if="putData.status == PUT_STATUS.CONFIRM">
 				<button class="admin-button-com middle" @click="cancelPutEvent"> 取消入库 </button>
 				<button class="admin-button-com middle" @click="confirmPutEvent"> 确认入库 </button>
@@ -89,24 +90,10 @@ export default {
 			orderSn: "",
 			putData: {},
 			columns: [
-				{
-					name: "花材名称",
-					custom: "icon"
-				},
-				{
-					name: "库存",
-					custom: "stock",
-					// color: "success",
-					width: 120,
-					align: "center"
-				},
-				{
-					name: "入库数量",
-					custom: "put",
-					// color: "warn",
-					width: 120,
-					align: "center"
-				}
+				{ name: "名称", custom: "icon" },
+				{ name: "库存", custom: "stock", width: 120, align: "center" },
+				{ name: "入库数", custom: "put", width: 120, align: "center" },
+				{ name: "成本", custom: "itemPrice", width: 120, align: "center" },
 			]
 		};
 	},