Merge remote-tracking branch 'origin/master'

src/views/kanban/equipment/index.vue

@@ -62,8 +62,8 @@
                       <td style="width: 18%;">{{n.equipmentName}}</td>
                       <td style="width: 20%;">{{n.department}}</td>
                       <td style="width: 10%;">{{n.equipmentStatus}}</td>
-                      <td style="width: 12%;">{{n.failureRate !=null ?n.failureRate+'%':'--'}}</td>
-                      <td style="width: 12%;">{{n.utilizationRatio !=null?n.utilizationRatio+'%':'--'}}</td>
+                      <td style="width: 12%;">{{n.failureRate !=null ?n.failureRate.toFix(2)+'%':'--'}}</td>
+                      <td style="width: 12%;">{{n.utilizationRatio !=null?n.utilizationRatio.toFix(2)+'%':'--'}}</td>
                     </tr>
                   </tbody>
                 </table>

src/views/wms/outorder/index.vue

@@ -203,6 +203,11 @@ export default {
 				produceCode: '',
 				warehouseNo: '',
 			},
+			queryParams2: {
+				orderNo: '',
+				warehouseNo: '',
+				orderLines:[],
+			},
 			// 表单参数
 			form: {},
 			// 表单校验
@@ -420,7 +425,10 @@ export default {
 						// 	this.getList();
 						// });
 					} else {
-						addPurchaseOrderOutbound(_this.selectedRows).then(response => {
+						this.queryParams2.orderNo = this.queryParams1.produceCode
+						this.queryParams2.warehouseCode = this.queryParams1.warehouseCode
+						this.queryParams2.orderLines = _this.selectedRows
+						addPurchaseOrderOutbound(_this.queryParams2).then(response => {
 							if (response.data) {
 								this.$modal.msgSuccess("新增成功");
 								this.open = false;