损耗

ghsApp/src/admin/breakage/list.vue

@@ -18,7 +18,7 @@
 				<app-wrapper-empty title="暂无数据" :is-empty="$util.isEmpty(list.data)" />
 			</block>
       <view class="app-footer open_btn">
-        <view @click="selectProduct" class="admin-button-com big blue">新增报损</view>
+        <view @click="selectProduct" class="admin-button-com big blue">新增损耗</view>
       </view>
   </div>
 </template>

ghsApp/src/admin/home/apply.vue

@@ -50,8 +50,8 @@ export default {
                         {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"},
                         {name: "库存总览",img: `${this.$constant.imgUrl}/ghs/home/jyzk.png`,url: "/admin/stat/stock"},
-                        {name: "报损花材",img: `${this.$constant.imgUrl}/ghs/home/jyzk.png`,url: "/admin/stat/wastage"},
-                        {name: "报损总览",img: `${this.$constant.imgUrl}/ghs/home/jyzk.png`,url: "/admin/stat/waste"}
+                        {name: "损耗花材",img: `${this.$constant.imgUrl}/ghs/home/jyzk.png`,url: "/admin/stat/wastage"},
+                        {name: "损耗总览",img: `${this.$constant.imgUrl}/ghs/home/jyzk.png`,url: "/admin/stat/waste"}
                     ]
                 },
                 {
@@ -85,7 +85,7 @@ export default {
                         {name: "调拨入库",img: `${this.$constant.imgUrl}/ghs/home/dbrk.png`,url: "/pagesStorehouse/allot/allotPut"},
                         {name: "库存预警",img: `${this.$constant.imgUrl}/ghs/home/kcyjs.png`,url: "/admin/item/list?warning=1"},
                         {name: "盘点",img: `${this.$constant.imgUrl}/ghs/home/pandian.png`,url: "/pagesStorehouse/inventory/list"},
-                        {name: "报损单",img: `${this.$constant.imgUrl}/ghs/home/kcyjs.png`,url: "/admin/breakage/list"}
+                        {name: "损耗单",img: `${this.$constant.imgUrl}/ghs/home/kcyjs.png`,url: "/admin/breakage/list"}
                     ]
                 },
                 {

ghsApp/src/admin/home/workbench.vue

@@ -51,7 +51,7 @@
 					</div>
 				</navigator>
 				<navigator url="/admin/stat/wastage" class="info-list">
-					<div class="info-list-name">报损</div>
+					<div class="info-list-name">损耗</div>
 					<div class="info-list-value">
 						{{ $util.numberFormat(data.todayData.wastage) || 0 }}
 					</div>
@@ -192,7 +192,7 @@ export default {
 				{ name: "改价", img: 'ghs/home/gj.png', url: "/admin/changePrice/list" },
 				{ name: "花材", img: 'ghs/home/hcgl.png', url: "/admin/item/list" },
 				{ name: "采购", img: 'ghs/home/icon_caigou.png', url: "/pagesPurchase/order" },
-				{ name: "报损", img: 'ghs/home/kcyjs.png', url: "/admin/breakage/list" },
+				{ name: "损耗", img: 'ghs/home/kcyjs.png', url: "/admin/breakage/list" },
 				{ name: "预售", img: 'ghs/home/kcyjs.png', url: "/admin/order/statBook" },
 				{ name: "调拨入库", img: 'ghs/home/dbrk.png', url: "/pagesStorehouse/allot/allotPut" },
 				{ name: "调拨出库", img: 'ghs/home/dbck.png', url: "/pagesStorehouse/allot/allotEx" },

ghsApp/src/admin/stat/waste.vue

@@ -6,25 +6,26 @@
 				<block v-if="!$util.isEmpty(profile)">
 					<t-table :headerBackgroundColor="'#F0F2F6'">
 						<t-tr header>
-							<t-th><view style="width:100upx;">月份</view></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>
 						<view v-for="(item, index) in profile" :key="index" @click="goDetail(item)">
 							<t-tr>
-								<t-td><view style="color:#333333;font-size:28upx;width:100upx;">{{item.time}}</view></t-td>
-								<t-td><view style="color:#333333;font-size:28upx;">{{item.num ? parseFloat(item.num) : 0}}</view></t-td>
-								<t-td><view style="color:#333333;font-size:28upx;">¥{{item.cost ? parseFloat(item.cost) : 0}}</view></t-td>
-								<t-td><view style="color:#333333;font-size:28upx;">¥{{item.price ? parseFloat(item.price) : 0}}</view></t-td>
+								<t-td><view style="color:#333333;font-size:28upx;width:180upx;">{{item.time}}</view></t-td>
+								<t-td><view style="color:#333333;font-size:30upx;">{{item.num ? parseFloat(item.num) : 0}}</view></t-td>
+								<t-td><view style="color:#333333;font-size:30upx;">¥{{item.cost ? parseFloat(item.cost) : 0}}</view></t-td>
+								<t-td><view style="color:#333333;font-size:30upx;">¥{{item.price ? parseFloat(item.price) : 0}}</view></t-td>
 							</t-tr>
 						</view>
 					</t-table>
 				</block>
 			</view>
-			<view style="margin-top:30upx;margin-bottom:30upx;margin-left:30upx;font-size:30upx;">总计&nbsp;{{totalNum}}扎
-				<text style="margin-left:18upx;">成本 ¥{{totalCost}}</text>
-				<text style="margin-left:18upx;">售价 ¥{{totalPrice}}</text>
+			<view style="margin-top:30upx;margin-bottom:30upx;font-size:32upx;font-weight:bold;text-align:center;">
+				<text>总计&nbsp;{{totalNum}}扎</text>
+				<text style="margin-left:22upx;">成本 ¥{{totalCost}}</text>
+				<text style="margin-left:22upx;">售价 ¥{{totalPrice}}</text>
 			</view>
 		</view>
 	</view>

ghsApp/src/mixins/product.js

@@ -5,7 +5,7 @@ import { allProduct } from '@/api/product'
 export default {
 	data() {
 		return {
-			selectJobType: "bill",//业务类型，开单、采购、报损、盘点
+			selectJobType: "bill",//业务类型，开单、采购、损耗、盘点
 			selectJobId:0,//业务类型对应的主体ID等
 			isCut:false,
 			productInfoList: [], //商品信息

ghsApp/src/pages.json

@@ -129,7 +129,7 @@
 		{
 			"root": "admin/breakage",
 			"pages": [
-				{"path": "list","style": {"navigationBarTitleText": "报损单","enablePullDownRefresh": true}},
+				{"path": "list","style": {"navigationBarTitleText": "损耗单","enablePullDownRefresh": true}},
 				{"path": "info","style": {"navigationBarTitleText": "详情"}},
 				{"path": "index","style": {"navigationBarTitleText": "选择花材"}},
 				{"path": "confirm","style": {"navigationBarTitleText": "确认订单"}},
@@ -240,8 +240,8 @@
 				{"path": "cgStat","style": {"navigationBarTitleText": "采购统计"}},
 				{"path": "stock","style": {"navigationBarTitleText": "库存总览"}},
 				{"path": "mayPayStat","style": {"navigationBarTitleText": "应付款"}},
-				{"path": "wastage","style": {"navigationBarTitleText": "报损统计"}},
-				{"path": "waste","style": {"navigationBarTitleText": "报损总览"}}
+				{"path": "wastage","style": {"navigationBarTitleText": "损耗花材"}},
+				{"path": "waste","style": {"navigationBarTitleText": "损耗总览"}}
 			]
 		},
 		{