Merge branch 'master' of ssh://gogs.zfire.top:2222/zfire-front/zfire-newmall-admin

src/views/auxiliaryFittings/settleAccountManagement/settleAccountOfflinePay/index.vue

@@ -86,7 +86,7 @@
 						<tbody>
 							<tr v-for="(item,index) in formData.settlementOrderItemList" :key="index">
 								<td align="center">{{item.goodsName}}</td>
-								<td align="center">{{item.chargeType=='ACC'?(item.goodsType == 'M'?'辅材':'配件')+'物料':item.chargeType=='SERV'?'服务收费':''}}</td>
+								<td align="center">{{item.chargeType == 'ACC' ? '配件物料': item.chargeType == 'SERV' ? '服务收费':'辅材物料'}}</td>
 								<td align="center">{{item.num}}</td>
 								<td align="center">{{item.goodsAmount}}</td>
 								<td align="center">{{item.totalAmount}}</td>

src/views/auxiliaryFittings/settleAccountManagement/settleAccountWeixinPay/index.vue

@@ -123,8 +123,7 @@
 						<tbody>
 							<tr v-for="(item, index) in formData.settlementOrderItemList" :key="index">
 								<td align="center">{{ item.goodsName }}</td>
-								<td align="center">{{ item.chargeType == 'ACC' ? (item.goodsType ==
-									'M' ? '辅材' : '配件') + '物料' : item.chargeType == 'SERV' ? '服务收费' : '' }}</td>
+								<td align="center">{{ item.chargeType == 'ACC' ? '配件物料': item.chargeType == 'SERV' ? '服务收费':'辅材物料' }}</td>
 								<td align="center">{{ item.num }}</td>
 								<td align="center">{{ item.goodsAmount }}</td>
 								<td align="center">{{ item.totalAmount }}</td>