Bladeren bron

feat:
订单列表 - 打印单商品名称宽度固定
旧机管理 - 工单类型判空处理

Moss 1 jaar geleden
bovenliggende
commit
07ee76ea95

+ 1 - 1
src/views/mallManagement/old_machine/index.vue

@@ -687,7 +687,7 @@ export default {
         if (valid) {
           if(this.oldList.some(o => o.isEdit)) return this.$errorMsg('旧机信息存在未保存信息');
 
-          let orderSmallTypeText = this.orderTypeList.find(o => o.id == this.formData.orderSmallType).orderSmallTypeText;
+          let orderSmallTypeText = this.formData.orderSmallType ? this.orderTypeList.find(o => o.id == this.formData.orderSmallType).orderSmallTypeText : '';
           let oldList = this.oldList.map(item => {
             return {
               id: item.specId,

+ 2 - 2
src/views/mallManagement/order/order_list/index.vue

@@ -1762,8 +1762,8 @@ export default {
 	          word-wrap: break-word;
 	          word-break: break-all;">
 				<tr align="center">
-					<td>商品名称</td>
-					<td>规格</td>
+					<td width="300">商品名称</td>
+					<td width="100">规格</td>
 					<td>单位</td>
 					<td>数量</td>
 					<td>单价</td>

+ 4 - 3
src/views/mallManagement/order/sales_return_order_list/index.vue

@@ -805,9 +805,10 @@ export default {
 
                 data.orderOfflineRefundItems.forEach(item => {
                   item.waitRefundNum = item.refundNum;
-                  item.waitRefundPrice = item.refundAmount;
+                  item.waitRefundPrice = item.payAmount;
                   item.refundNum = item.retiredNum;
-                  item.refundAmount = item.retiredAmount;
+                  // item.refundAmount = item.retiredAmount;
+                  item.refundAmount = item.payAmount;
                 })
 
                 this.goodsList = data.orderOfflineRefundItems;
@@ -998,7 +999,7 @@ export default {
         this.formData.deliverStorageName = data.storageStockName;
         data.orderDetailSendList.forEach(item => {
           item.waitRefundNum = item.sendNum;
-          item.waitRefundPrice = item.price;
+          item.waitRefundPrice = item.payAmount;
         })
         this.goodsList = data.orderDetailSendList;
       })