员工管理

src/api/admin/userManagement/index.js

@@ -112,7 +112,7 @@ export function jobs(obj) {
 // 添加员工
 export function addEditor(obj) {
   return fetch({
-    url: '/api/admin/postion/admin/addUserPostion',
+    url: '/api/admin/postion/admin/updUserPostion',
     method: 'post',
     data: obj
   });
@@ -187,3 +187,12 @@ export function updAddPositionChangeRecord(params) {
     data: params
   });
 }
+
+// 信息修改
+// export function updUserPostion(params) {
+//   return fetch({
+//     url: 'api/admin/postion/admin/updUserPostion',
+//     method: 'post',
+//     data: params
+//   });
+// }
\ No newline at end of file

src/views/interior/employeesInput.vue

@@ -243,9 +243,9 @@
 				<p v-for="(item,index) in staffInfo.record" :key="index">
 					<b v-show="!!item.jobRemark">{{item.relTime}}</b>  
 					<span v-if="item.jobRemark == 1" v-show="!!item.relTime">入职</span>
-					<span v-if="item.jobRemark == 4">(人事调动)  {{item.oldCompanyName}} => {{item.newCompanyName}}</span>
-					<span v-if="item.jobRemark == 2">(职位变更)   {{item.oldJobName}} => {{item.newJobName}}</span>
-					<span v-if="item.jobRemark == 3">(身份变更)  {{item.oldPositionName}} => {{item.newPositionName}}</span>
+					<span v-else-if="item.jobRemark == 4">(人事调动)  {{item.oldCompanyName}} => {{item.newCompanyName}}</span>
+					<span v-else-if="item.jobRemark == 2">(职位变更)   {{item.oldJobName}} => {{item.newJobName}}</span>
+					<span v-else-if="item.jobRemark == 3">(身份变更)  {{item.oldPositionName}} => {{item.newPositionName}}</span>
 					<span v-if="item.jobRemark == 5">离职</span>
 					<!-- <span v-else></span> -->
 				</p>
@@ -531,12 +531,30 @@ export default {
 					this.setApi(this.amendCompany)
 				}
 			} else {
+				let params = {};
 				let name = this.companyList.filter(item => item.id == this.amendCompany.companyId)
-				this.amendCompany.companyName = name[0].name
-				this.amendCompany.jobId = this.staffTitleFrom.jobId
-				this.amendCompany.positionId = this.staffTitleFrom.positionId
-				this.amendCompany.isQuit  = this.staffTitleFrom.isQuit == '在职' ? 0 : 1
-				this.setApi(this.amendCompany)
+				console.log(name)
+				params.companyName = name[0].name
+				params.companyId = name[0].id
+				params.positionId = this.staffTitleFrom.positionId
+				// params.isQuit  = this.staffTitleFrom.isQuit == '在职' ? 0 : 1
+				// params.changeStatus = 2
+				// params.jobId = this.staffTitleFrom.jobId
+				params.name = this.staffTitleFrom.name
+				params.phone = this.staffTitleFrom.phone
+				params.id = this.staffTitleFrom.id
+				console.log(params)
+				// this.setApi(this.amendCompany)
+				editorUpd(params).then(data=>{
+					if (data.status == 200) {
+						this.$message.success('编辑成功')
+						this.amendPop = false;
+						this.bulkUploadMember = false
+						this.getList()
+					}else{
+						this.$message.error(data.message)
+					}
+				})
 			}
 		},
 		setApi(params){
@@ -855,6 +873,7 @@ export default {
 					this.$message('职位不能为空')
 				}else{
 					if (!!this.staffTitleFrom.relTime)  this.staffTitleFrom.relTime = formatDate(new Date(this.staffTitleFrom.relTime),'yyyy-MM-dd hh:mm:ss')
+				
 					addEditor(this.staffTitleFrom).then(data => {
 						if (data.status == 200) {
 							this.$notify({
@@ -877,6 +896,7 @@ export default {
 				}
 			} else {
 				this.staffTitleFrom.id = this.activeId
+				delete this.staffTitleFrom.isQuit
 				editorUpd(this.staffTitleFrom).then(data => {
 					if (data.status == 200) {
 						this.$notify({

src/views/statistics/orderStatistics.vue

@@ -227,8 +227,6 @@ export default {
 		},
 		//搜索
 		search() {
-			console.log(!!this.time && !!this.time[0])
-
 			if (!!this.time && !!this.time[0]) {
 				this.listQuery.startDate =
 					formatDate(new Date(this.time[0]), 'yyyy-MM-dd') +