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

src/views/audit/depots/index.vue

@@ -258,22 +258,22 @@
 					search: true,
 					refresh: true
 				},
-				customTools: [
-					{
-						name: '注册', icon: 'el-icon-plus', audit: [''], event: {
-							click: () => {
-								(this as any).onAdd2();
-							}
-						}
-					},
-					{
-						name: '删除', icon: 'el-icon-delete', audit: [''], event: {
-							click: () => {
-								(this as any).onDelete('moduleView2', 'maindataStoringLocation')
-							}
-						}
-					},
-				]
+				// customTools: [
+				// 	{
+				// 		name: '注册', icon: 'el-icon-plus', audit: [''], event: {
+				// 			click: () => {
+				// 				(this as any).onAdd2();
+				// 			}
+				// 		}
+				// 	},
+				// 	{
+				// 		name: '删除', icon: 'el-icon-delete', audit: [''], event: {
+				// 			click: () => {
+				// 				(this as any).onDelete('moduleView2', 'maindataStoringLocation')
+				// 			}
+				// 		}
+				// 	},
+				// ]
 			},
 			table: {
 				attr: {

src/views/audit/saleOrder/components/settingConfig.vue

@@ -850,7 +850,7 @@
 		openSetting() {
 			this.setValue = true;
 			let loading = this.$loading({ target: '.main-container' });
-			api.single({ id: 1 }, "supplyFinanceSetting").then((res : any) => {
+			api.getSingle("supplyFinanceSetting").then((res : any) => {
 				loading.close();
 				if (res.data) {
 					this.baseInfo = res.data;