Merge remote-tracking branch 'origin/qirui-v2' into qirui-v2

src/App.vue

@@ -448,7 +448,6 @@ export default {
         _that.submitApprovalTitle = _that.$t('dvp.project-approval');
         _that.$refs.submitApproval.inputArgs.dvpId = _that.$store.getters.dvpId;
         _that.$refs.submitApproval.inputArgs.dvpType = _that.dvpType;
-        _that.$refs.submitApproval.inputArgs.departmentId = _that.departmentId;
         if (_that.realLifeState === '10') {
           // 部门审批
           _that.$refs.submitApproval.inputArgs.approveType = '20';

src/components/SubmitApprovalModal/SubmitApprovalModal.vue

@@ -479,9 +479,6 @@ export default {
 		 */
 		handleUserSearch(val) {
 			let _that = this;
-			let b = JSON.parse(localStorage.getItem('userInfo'));
-			if (_that.inputArgs.approveType !== '20') {
-				// 非部门审批查询所有用户
 				_that.$api.getUserPageList({
 					pageNo: 1,
 					pageSize: 10,
@@ -500,27 +497,6 @@ export default {
 						_that.$notification.error({ message: res.message });
 					}
 				});
-			} else {
-				// 部门审批仅查询本部门用户
-				_that.$api.getUserPageList({
-					pageNo: 1,
-					pageSize: 10,
-					departmentId: _that.inputArgs.departmentId
-				}).then(res => {
-					if (res.flag) {
-						let resData = res.data.data;
-						_that.userList = [];
-						_that.userList = resData.map(item => {
-							return {
-								name: item.userName + '/' + item.account + '/' + item.departmentName,
-								value: item.userId
-							};
-						});
-					} else {
-						_that.$notification.error({ message: res.message });
-					}
-				});
-			}
 		},
 		/**
 		 * 处理延期至 -- 时间选择变化

src/views/componentsDVP/dvpPlan/editModal/editDvp.vue

@@ -256,7 +256,7 @@ export default {
           });
           // 工程师数据处理
           engineerList.forEach(data => {
-            let index = this.testOwnerList.findIndex(item => { item.value === data.userId });
+            let index = this.testOwnerList.findIndex(item => item.value === data.userId);
             if (index === -1) {
               let tempData = {
                 label: data.name,

src/views/componentsDVP/dvpPlan/editModal/editTableRow.vue

@@ -309,7 +309,7 @@ export default {
           });
           // 工程师数据处理
           engineerList.forEach(data => {
-            let index = this.testOwnerList.findIndex(item => { item.value === data.userId });
+            let index = this.testOwnerList.findIndex(item => item.value === data.userId);
             if (index === -1) {
               let tempData = {
                 label: data.name,