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

src/views/audit/agencyGoods/index.vue

@@ -188,6 +188,9 @@
 					name: [{
 						required: true, message: '请输入名称', trigger: 'blur'
 					}],
+					parentName: [{
+						required: true, message: '请选择父级', trigger: 'change'
+					}],
 				}
 			},
 			columns: [

src/views/audit/order/index.vue

@@ -219,10 +219,10 @@
 				},
 				table: {
 					attr: {
-						height: 600,
+						height: 620,
 						size: 'mini',
 						seq: true,
-						align: 'center',
+						align: 'left',
 						checkbox: true
 					},
 					columns: [
@@ -231,6 +231,7 @@
 							title: '单据编号',
 							field: 'orderNumber',
 							isDetail: true,
+							fixed: 'left'
 						},
 						{
 							width: 180,

src/views/audit/orderTask/index.vue

@@ -289,7 +289,7 @@
 						height: 620,
 						size: 'mini',
 						seq: true,
-						align: 'center',
+						align: 'left',
 						checkbox: true
 					},
 					columns: [
@@ -298,6 +298,7 @@
 							title: '单据编号',
 							field: 'orderNumber',
 							isDetail: true,
+							fixed: 'left'
 						},
 						{
 							width: 180,
@@ -440,7 +441,7 @@
 						height: 620,
 						size: 'mini',
 						seq: true,
-						align: 'center',
+						align: 'left',
 						checkbox: true
 					},
 					columns: [
@@ -449,6 +450,7 @@
 							title: '单据编号',
 							field: 'orderNumber',
 							isDetail: true,
+							fixed: 'left'
 						},
 						{
 							width: 180,
@@ -592,7 +594,7 @@
 						height: 620,
 						size: 'mini',
 						seq: true,
-						align: 'center',
+						align: 'left',
 						checkbox: true
 					},
 					columns: [
@@ -601,6 +603,7 @@
 							title: '单据编号',
 							field: 'orderNumber',
 							isDetail: true,
+							fixed: 'left'
 						},
 						{
 							width: 180,
@@ -741,7 +744,7 @@
 						height: 620,
 						size: 'mini',
 						seq: true,
-						align: 'center',
+						align: 'left',
 						checkbox: true
 					},
 					columns: [
@@ -750,6 +753,7 @@
 							title: '单据编号',
 							field: 'orderNumber',
 							isDetail: true,
+							fixed: 'left'
 						},
 						{
 							width: 180,
@@ -819,7 +823,7 @@
 		}
 		// 获取机构数据
 		getSupplierModal(e : any) {
-			console.log('获取机构数据 ==> ',e);
+			console.log('获取机构数据 ==> ', e);
 			this.supplierInfo = e;
 		}
 		// 监听表格数据变化
@@ -1078,7 +1082,11 @@
 			if (parames.type === 'draftsBox') query.submitState = 0 // 草稿箱数据
 			if (parames.type === 'smt') query.submitState = 1 // 已提交数据
 			console.log('搜索 ==> ', query);
-			this.getPageList(query, parames.type) // 获取分页数据
+			if (this.tabType === 'recycleBin') {
+				this.getSelectDeleteList(query); // 回收站分页数据
+			} else {
+				this.getPageList(query, parames.type) // 获取分页数据
+			}
 		}
 		// 刷新
 		onRefresh(e : any) {

src/views/audit/productClassification/index.vue

@@ -182,7 +182,7 @@
 						required: true, message: '请输入名称', trigger: 'blur'
 					}],
 					parentName: [{
-						required: true, message: '请选择父级', trigger: 'blur'
+						required: true, message: '请选择父级', trigger: 'change'
 					}],
 				}
 			},

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

@@ -27,13 +27,7 @@
 
 <style scoped lang="scss">
 	.orderType {
-		position: relative;
-		color: #0089ff;
-		cursor: pointer;
 		.typeText {
-			position: absolute;
-			top: 8px;
-			right: -6px;
 			width: 40px;
 			height: 18px;
 			line-height: 18px;
@@ -42,6 +36,7 @@
 			border-radius: 12px;
 			color: #fff;
 			font-size: 12px;
+			margin-left: -10px;
 		}
 
 		.typeText2 {

src/views/audit/saleOrder/index.vue

@@ -308,19 +308,16 @@
 					},
 					columns: [
 						{
-							width: 190,
+							width: 144,
 							title: '单据编号',
 							field: 'orderNumber',
-							component: OrderType,
-							// compConfig: {
-							// 	attr: {
-							// 		placeholder: '请输入单据编号',
-							// 		clearable: true
-							// 	}
-							// },
-							align: 'left',
+							// component: OrderType,
 							isDetail: true,
 						},
+						{
+							width: 50,
+							component: OrderType,
+						},
 						{
 							width: 180,
 							title: '机构名称',
@@ -437,18 +434,19 @@
 				},
 				table: {
 					attr: {
-						height: 600,
+						height: 620,
 						size: 'mini',
 						seq: true,
-						align: 'center',
+						align: 'left',
 						checkbox: true
 					},
 					columns: [
 						{
-							width: 178,
+							width: 168,
 							title: '单据编号',
 							field: 'orderNumber',
 							isDetail: true,
+							fixed: 'left'
 						},
 						{
 							width: 180,

src/views/audit/virtually/index.vue

@@ -181,6 +181,9 @@
 					name: [{
 						required: true, message: '请输入名称', trigger: 'blur'
 					}],
+					parentName: [{
+						required: true, message: '请选择父级', trigger: 'change'
+					}],
 				}
 			},
 			columns: [