From f7a785e40f2279bd73a5ab4301d18947412ffba4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E5=89=8D=E6=98=8E?= <909355014@qq.com>
Date: Fri, 17 Jun 2022 10:46:01 +0800
Subject: [PATCH] =?UTF-8?q?request=20=E8=AF=B7=E6=B1=82=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/model/common.js          |   4 +-
 src/api/model/hrm.js             |  15 +-
 src/components/scTable/index.vue |   2 +-
 src/views/hrm/employee.vue       |   2 +-
 src/views/hrm/ep_form.vue        | 320 ++++++++++++++-----------------
 5 files changed, 159 insertions(+), 184 deletions(-)

diff --git a/src/api/model/common.js b/src/api/model/common.js
index 47c5b0f5..61012f7d 100644
--- a/src/api/model/common.js
+++ b/src/api/model/common.js
@@ -3,14 +3,14 @@ import http from "@/utils/request"
 
 export default {
 	upload: {
-		url: `${config.API_URL}/upload`,
+		url: `${config.API_URL}/file/`,
 		name: "文件上传",
 		post: async function(data, config={}){
 			return await http.post(this.url, data, config);
 		}
 	},
 	uploadFile: {
-		url: `${config.API_URL}/uploadFile`,
+		url: `${config.API_URL}/file/`,
 		name: "附件上传",
 		post: async function(data, config={}){
 			return await http.post(this.url, data, config);
diff --git a/src/api/model/hrm.js b/src/api/model/hrm.js
index 90dcd8e4..d9908d55 100644
--- a/src/api/model/hrm.js
+++ b/src/api/model/hrm.js
@@ -3,12 +3,15 @@ import http from "@/utils/request"
 
 export default {
 	employee: {
-		list: {
-			url: `${config.API_URL}/hrm/employee/`,
-			name: "获取企业员工",
-			get: async function(data){
-				return await http.get(this.url, data);
-			}
+		list: async function(data){
+			return await http.get(
+				`${config.API_URL}/hrm/employee/`, 
+				data);
+		},
+		update: async function(id, data){
+			return await http.put(
+				`${config.API_URL}/hrm/employee/${id}/`, 
+				data);
 		}
 	},
 }
\ No newline at end of file
diff --git a/src/components/scTable/index.vue b/src/components/scTable/index.vue
index c1fcd76f..3fdaccfb 100644
--- a/src/components/scTable/index.vue
+++ b/src/components/scTable/index.vue
@@ -279,7 +279,7 @@ export default {
       Object.assign(reqData, this.tableParams);
 
       try {
-        var res = await this.apiObj.get(reqData);
+        var res = await this.apiObj(reqData);
         if (this.hidePagination) {
           this.tableData = res;
           if (res.length == 0) {
diff --git a/src/views/hrm/employee.vue b/src/views/hrm/employee.vue
index b7a9371e..6de9b7a3 100644
--- a/src/views/hrm/employee.vue
+++ b/src/views/hrm/employee.vue
@@ -14,7 +14,7 @@
 			</div>
 		</el-header>
 		<el-main class="nopadding">
-			<scTable ref="table" :apiObj="apiObj" row-key="id" @selection-change="selectionChange" stripe :resetQuery="resetQuery"  >
+			<scTable ref="table" :apiObj="apiObj" row-key="id" @selection-change="selectionChange" stripe @resetQuery="resetQuery"  >
 				<el-table-column type="selection" width="50"></el-table-column>
 				<el-table-column label="#" type="index" width="50"></el-table-column>
 				<el-table-column label="姓名" prop="name" width="150"></el-table-column>
diff --git a/src/views/hrm/ep_form.vue b/src/views/hrm/ep_form.vue
index 2b861012..3fa3d437 100644
--- a/src/views/hrm/ep_form.vue
+++ b/src/views/hrm/ep_form.vue
@@ -1,181 +1,153 @@
 <template>
-	<el-drawer :title="titleMap[mode]" v-model="visible" :size="1000" destroy-on-close @closed="$emit('closed')">
-		<el-container v-loading="loading">
-			<el-main style="padding:0 20px 20px 20px">
-
-				<el-form ref="dialogForm" :model="form" :rules="rules" label-width="100px" label-position="top">
-					<sc-title title="基础"></sc-title>
-					<el-row :gutter="20">
-						<el-col :span="16">
-							<el-form-item label="表格名称" prop="name">
-								<el-input v-model="form.name" placeholder="请输入中文描述标题"></el-input>
-							</el-form-item>
-						</el-col>
-						<el-col :span="8">
-							<el-form-item label="标识" prop="code">
-								<el-input v-model="form.code" placeholder="请输入唯一标识"></el-input>
-							</el-form-item>
-						</el-col>
-					</el-row>
-					<el-form-item>
-						<el-checkbox v-model="form.remoteSort" label="远程排序"></el-checkbox>
-						<el-checkbox v-model="form.remoteFilter" label="远程过滤"></el-checkbox>
-					</el-form-item>
-					<sc-title title="表格列"></sc-title>
-					<el-form-item prop="column">
-						<sc-form-table v-model="form.column" :addTemplate="addTemplate" drag-sort placeholder="暂无数据">
-							<el-table-column prop="label" label="名称">
-								<template #default="scope">
-									<el-input v-model="scope.row.label" placeholder="请输入名称"></el-input>
-								</template>
-							</el-table-column>
-							<el-table-column prop="prop" label="字段" width="150">
-								<template #default="scope">
-									<el-input v-model="scope.row.prop" placeholder="请输入字段"></el-input>
-								</template>
-							</el-table-column>
-							<el-table-column prop="width" label="宽度" width="100">
-								<template #default="scope">
-									<el-input v-model="scope.row.width" placeholder="请输入宽度"></el-input>
-								</template>
-							</el-table-column>
-							<el-table-column prop="hide" label="隐藏" width="80" align="center">
-								<template #default="scope">
-									<el-checkbox v-model="scope.row.hide"></el-checkbox>
-								</template>
-							</el-table-column>
-							<el-table-column prop="sortable" label="排序" width="80" align="center">
-								<template #default="scope">
-									<el-checkbox v-model="scope.row.sortable"></el-checkbox>
-								</template>
-							</el-table-column>
-							<el-table-column prop="filters" label="过滤项" width="90" align="center">
-								<template #default="scope">
-									<el-button text size="small" :type="scope.row.filters.length==0?'':'primary'" @click="setFilters(scope.row.filters)">过滤项</el-button>
-								</template>
-							</el-table-column>
-							<el-table-column prop="fixed" label="固定" width="80" align="center">
-								<template #default="scope">
-									<el-checkbox v-model="scope.row.fixed"></el-checkbox>
-								</template>
-							</el-table-column>
-						</sc-form-table>
-					</el-form-item>
-				</el-form>
-			</el-main>
-			<el-footer>
-				<el-button type="primary" :loading="isSaveing" @click="submit">保存</el-button>
-				<el-button @click="visible=false">取消</el-button>
-			</el-footer>
-		</el-container>
-
-		<el-drawer title="过滤项配置" v-model="setFiltersVisible" :size="500" destroy-on-close>
-			<el-main style="padding:0 20px 20px 20px">
-				<sc-form-table v-model="selectionFilters" :addTemplate="filtersAddTemplate" drag-sort placeholder="暂无数据">
-					<el-table-column prop="text" label="名称">
-						<template #default="scope">
-							<el-input v-model="scope.row.text" placeholder="请输入名称"></el-input>
-						</template>
-					</el-table-column>
-					<el-table-column prop="value" label="值" width="150">
-						<template #default="scope">
-							<el-input v-model="scope.row.value" placeholder="请输入值"></el-input>
-						</template>
-					</el-table-column>
-				</sc-form-table>
-			</el-main>
-		</el-drawer>
-
-
-	</el-drawer>
+  <el-drawer
+    :title="titleMap[mode]"
+    v-model="visible"
+    :size="1000"
+    destroy-on-close
+    @closed="$emit('closed')"
+  >
+    <el-container v-loading="loading">
+      <el-main style="padding: 0 20px 20px 20px">
+        <el-form
+          ref="dialogForm"
+          :model="form"
+          :rules="rules"
+		  label-width="80px"
+        >
+          <sc-title title="详细信息"></sc-title>
+          <el-row>
+            <el-col :md="8" :sm="12" :xs="24">
+				<el-form-item label="姓名">
+				 <el-input v-model="form.name" type="text" clearable></el-input>
+				</el-form-item>
+			</el-col>
+			<el-col :md="8" :sm="12" :xs="24">
+				<el-form-item label="工号">
+				 <el-input v-model="form.number" type="text" clearable></el-input>
+				</el-form-item>
+			</el-col>
+			<el-col :md="8" :sm="12" :xs="24">
+				<el-form-item label="手机号">
+				 <el-input v-model="form.phone" type="text" clearable></el-input>
+				</el-form-item>
+			</el-col>
+			<el-col :md="8" :sm="12" :xs="24">
+				<el-form-item label="邮箱号">
+				 <el-input v-model="form.email" type="text" clearable></el-input>
+				</el-form-item>
+			</el-col>
+			<el-col :md="8" :sm="12" :xs="24">
+				<el-form-item label="身份证号">
+				 <el-input v-model="form.id_number" type="text" clearable></el-input>
+				</el-form-item>
+			</el-col>
+			<el-col :md="8" :sm="12" :xs="24">
+				<el-form-item label="学历">
+				 <el-input v-model="form.qualification" type="text" clearable></el-input>
+				</el-form-item>
+			</el-col>
+          </el-row>
+        </el-form>
+		<el-row>
+			<el-col :md="8" :sm="12" :xs="24">
+				<el-form-item label="证件照" label-width="80px">
+				 <sc-upload v-model="form.photo" title="头像"></sc-upload>
+				</el-form-item>
+			</el-col>
+		</el-row>
+      </el-main>
+      <el-footer>
+        <el-button type="primary" :loading="isSaveing" @click="submit"
+          >保存</el-button
+        >
+        <el-button @click="visible = false">取消</el-button>
+      </el-footer>
+    </el-container>
+  </el-drawer>
 </template>
 
 <script>
-	export default {
-		emits: ['success', 'closed'],
-		data() {
-			return {
-				loading: false,
-				mode: "add",
-				titleMap: {
-					add: '新增',
-					edit: '编辑'
-				},
-				form: {},
-				rules: {
-					name: [
-						{required: true, message: '请输入表格名称', trigger: 'blur'}
-					],
-					code: [
-						{required: true, message: '请输入唯一标识', trigger: 'blur'}
-					]
-				},
-				addTemplate: {
-					label: '',
-					prop: '',
-					width: '100',
-					hide: false,
-					sortable: false,
-					fixed: false,
-					filters: []
-				},
-				visible: false,
-				isSaveing: false,
-				selectionFilters: [],
-				filtersAddTemplate: {
-					text: '',
-					value: ''
-				},
-				setFiltersVisible: false
-			}
-		},
-		mounted() {
-
-		},
-		methods: {
-			//显示
-			open(mode='add'){
-				this.mode = mode;
-				this.visible = true;
-				return this;
-			},
-			//表单提交方法
-			submit(){
-				this.$refs.dialogForm.validate(async (valid) => {
-					if (valid) {
-						this.isSaveing = true;
-						var res = await this.$API.demo.post.post(this.form);
-						this.isSaveing = false;
-						if(res.code == 200){
-							this.$emit('success', this.form, this.mode)
-							this.visible = false;
-							this.$message.success("操作成功")
-						}else{
-							this.$alert(res.message, "提示", {type: 'error'})
-						}
-					}
-				})
-			},
-			//表单注入数据
-			setData(data){
-				// this.loading = true
-				// const params = {
-				// 	id: data.id
-				// }
-				// setTimeout(async ()=>{
-				// 	var res = await this.$API.system.table.info.get(params)
-				// 	this.loading = false
-				// 	this.form = res.data
-				// },400)
-                Object.assign(this.form, data)
-			},
-			//设置过滤项
-			setFilters(filters){
-				this.selectionFilters = filters
-				this.setFiltersVisible = true
-			}
-		}
-	}
+export default {
+  emits: ["success", "closed"],
+  data() {
+    return {
+      loading: false,
+      mode: "add",
+      titleMap: {
+        add: "新增",
+        edit: "编辑",
+        show: "查看",
+      },
+      form: {},
+      rules: {
+        name: [{ required: true, message: "请输入表格名称", trigger: "blur" }],
+        code: [{ required: true, message: "请输入唯一标识", trigger: "blur" }],
+      },
+      addTemplate: {
+        label: "",
+        prop: "",
+        width: "100",
+        hide: false,
+        sortable: false,
+        fixed: false,
+        filters: [],
+      },
+      visible: false,
+      isSaveing: false,
+      selectionFilters: [],
+      filtersAddTemplate: {
+        text: "",
+        value: "",
+      },
+      setFiltersVisible: false,
+    };
+  },
+  mounted() {},
+  methods: {
+    //显示
+    open(mode = "add") {
+      this.mode = mode;
+      this.visible = true;
+      return this;
+    },
+    //表单提交方法
+    submit() {
+      this.$refs.dialogForm.validate(async (valid) => {
+        if (valid) {
+          this.isSaveing = true;
+          this.$API.hrm.employee.update(this.form.id, this.form).then(res=>{
+			  this.isSaveing = false;
+			  this.visible = false;
+			  this.$emit("success", this.form, this.mode);
+			  this.$message.success("操作成功");
+			  return res
+		  }).catch(err=>{
+			  this.isSaveing = false;
+			  return err
+		  })
+        }
+      });
+    },
+    //表单注入数据
+    setData(data) {
+      // this.loading = true
+      // const params = {
+      // 	id: data.id
+      // }
+      // setTimeout(async ()=>{
+      // 	var res = await this.$API.system.table.info.get(params)
+      // 	this.loading = false
+      // 	this.form = res.data
+      // },400)
+      Object.assign(this.form, data);
+    },
+    //设置过滤项
+    setFilters(filters) {
+      this.selectionFilters = filters;
+      this.setFiltersVisible = true;
+    },
+  },
+};
 </script>
 
 <style>