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

@@ -135,7 +135,7 @@
 </template>
 
 <script>
-import { listOutorder, getOutorder, delOutorder, PurchaseOrderOutboundPda, addPurchaseOrderOutbound,getlistCK } from "@/api/wms/outorder";
+import { listOutorder, getOutorder, delOutorder, PurchaseOrderOutboundPda, addPurchaseOrderOutbound, getlistCK } from "@/api/wms/outorder";
 
 export default {
 	name: "Outorder",
@@ -203,6 +203,11 @@ export default {
 				produceCode: '',
 				warehouseNo: '',
 			},
+			queryParams2: {
+				orderNo: '',
+				warehouseNo: '',
+				orderLines:[],
+			},
 			// 表单参数
 			form: {},
 			// 表单校验
@@ -239,23 +244,23 @@ export default {
 					stationNo: 'LJ5',
 					stationname: '榄菊5',
 				},
-        {
-          stationNo: 'LJ6',
-          stationname: '榄菊6',
-        },
-        {
-          stationNo: 'LJ7',
-          stationname: '榄菊7',
-        },
-        {
-          stationNo: 'LJ8',
-          stationname: '榄菊8',
-        },
+				{
+					stationNo: 'LJ6',
+					stationname: '榄菊6',
+				},
+				{
+					stationNo: 'LJ7',
+					stationname: '榄菊7',
+				},
+				{
+					stationNo: 'LJ8',
+					stationname: '榄菊8',
+				},
 
 			],
 			selectedRows: [],
 			stationNo: '',
-			addoutorderList:[],
+			addoutorderList: [],
 		};
 	},
 	created() {
@@ -279,19 +284,19 @@ export default {
 			this.loading = true;
 			PurchaseOrderOutboundPda(this.queryParams1).then(response => {//000100220987
 				this.addoutorderList = response.data.list;
-        console.log(this.addoutorderList)
+				console.log(this.addoutorderList)
 				// this.total = response.total;
 				// this.loading = false;
 			});
 		},
 		getselect() {
-    //  config.headers['poolName'] = localStorage.getItem('USER_POOL_NAME_CURRENT');
-     let factoryCode=localStorage.getItem('USER_POOL_NAME_CURRENT').substring(3)
-      let params = { factoryCode: factoryCode }; // 构造一个包含工厂代码的对象
-      let paramsJSON = JSON.stringify(params); // 将对象转换为JSON字符串
-      console.log( factoryCode)
+			//  config.headers['poolName'] = localStorage.getItem('USER_POOL_NAME_CURRENT');
+			let factoryCode = localStorage.getItem('USER_POOL_NAME_CURRENT').substring(3)
+			let params = { factoryCode: factoryCode }; // 构造一个包含工厂代码的对象
+			let paramsJSON = JSON.stringify(params); // 将对象转换为JSON字符串
+			console.log(factoryCode)
 			getlistCK(paramsJSON).then(response => {
-        this.Optionlistck=response.data
+				this.Optionlistck = response.data
 				console.log(this.Optionlistck)
 
 
@@ -407,7 +412,7 @@ export default {
 					}
 					var bull = _this.selectedRows.some((item) => {
 						// console.log(item.stationNo ==  undefined || item.stationNo == '',item.stationNo)
-						return  item.stationNo ==  undefined || item.stationNo == ''
+						return item.stationNo == undefined || item.stationNo == ''
 					})
 					if (bull) {
 						_this.$modal.msgError("请选择包装线");
@@ -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;