Merge branch 'master' of http://47.107.53.207:3000/ymy/oms

src/views/audit/orderTask/index.vue

@@ -209,7 +209,7 @@
 											size: 'mini',
 											type: 'number',
 											defaultValue: 1,
-											// readonly: true
+											readonly: false
 										},
 									}
 								},
@@ -222,6 +222,7 @@
 										attr: {
 											size: 'mini',
 											type: 'number',
+											// readonly: true
 										},
 									}
 								},
@@ -240,6 +241,7 @@
 											size: 'mini',
 											type: 'number',
 											defaultValue: 0,
+											// readonly: true
 										},
 									}
 								},
@@ -325,14 +327,17 @@
 				tool: {
 					tools: {
 						search: true,
-						refresh: true
+						refresh: true,
+						// returnSmt:true
 					}
 				},
 				table: {
 					attr: {
 						size: 'mini',
 						align: 'left',
-						height: '620'
+						height: '620',
+						// radio: true,
+						// triggerRowCheck: 'row'
 					},
 					columns: [
 						{
@@ -1016,6 +1021,14 @@
 			if (isReturn) readonly.tool.tools = { return: true, returnSmt: true };
 			readonly.tableConfig[0].table.columns = readonly.tableConfig[0].table.columns.filter((v : any) => v.title != '操作');
 			readonly.tableConfig[0].tool.tools = {};
+
+			console.log(readonly.tableConfig[0].table);
+			
+			readonly.tableConfig[0].table.columns[4] = {
+				width: 120,
+				title: '数量',
+				field: 'number',
+			};
 			let data = e.suborderList;
 			(this.$refs.bill as any).setBillConfig(readonly);
 			(this.$refs.bill as any).setBillFormValue(e);// 设置单据表单数据