From cda975cf8b03853a9260ea9976f751d8602c97c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E5=89=8D=E6=98=8E?= <909355014@qq.com>
Date: Wed, 15 Jun 2022 17:47:52 +0800
Subject: [PATCH] config xiugai

---
 src/components/scUpload/file.vue     |  13 +--
 src/components/scUpload/index.vue    |  13 +--
 src/components/scUpload/multiple.vue |  13 +--
 src/config/fileSelect.js             |  16 ++--
 src/config/upload.js                 |   8 +-
 src/views/hrm/ep_form.vue            | 124 +++++++++++++--------------
 6 files changed, 92 insertions(+), 95 deletions(-)

diff --git a/src/components/scUpload/file.vue b/src/components/scUpload/file.vue
index acffe5fd..ab03b745 100644
--- a/src/components/scUpload/file.vue
+++ b/src/components/scUpload/file.vue
@@ -149,12 +149,13 @@
 						param.onProgress({percent: complete})
 					}
 				}).then(res => {
-					var response = config.parseData(res);
-					if(response.code == config.successCode){
-						param.onSuccess(res)
-					}else{
-						param.onError(response.msg || "未知错误")
-					}
+					config.parseData(res);
+					param.onSuccess(res)
+					// if(response.code == config.successCode){
+					// 	param.onSuccess(res)
+					// }else{
+					// 	param.onError(response.msg || "未知错误")
+					// }
 				}).catch(err => {
 					param.onError(err)
 				})
diff --git a/src/components/scUpload/index.vue b/src/components/scUpload/index.vue
index ffe05c18..6b93f843 100644
--- a/src/components/scUpload/index.vue
+++ b/src/components/scUpload/index.vue
@@ -233,12 +233,13 @@
 						param.onProgress({percent: complete})
 					}
 				}).then(res => {
-					var response = config.parseData(res);
-					if(response.code == config.successCode){
-						param.onSuccess(res)
-					}else{
-						param.onError(response.msg || "未知错误")
-					}
+					config.parseData(res);
+					param.onSuccess(res)
+					// if(response.code == config.successCode){
+					// 	param.onSuccess(res)
+					// }else{
+					// 	param.onError(response.msg || "未知错误")
+					// }
 				}).catch(err => {
 					param.onError(err)
 				})
diff --git a/src/components/scUpload/multiple.vue b/src/components/scUpload/multiple.vue
index 2178f81b..f36103df 100644
--- a/src/components/scUpload/multiple.vue
+++ b/src/components/scUpload/multiple.vue
@@ -197,12 +197,13 @@
 						param.onProgress({percent: complete})
 					}
 				}).then(res => {
-					var response = config.parseData(res);
-					if(response.code == config.successCode){
-						param.onSuccess(res)
-					}else{
-						param.onError(response.msg || "未知错误")
-					}
+					config.parseData(res);
+					param.onSuccess(res)
+					// if(response.code == config.successCode){
+					// 	param.onSuccess(res)
+					// }else{
+					// 	param.onError(response.msg || "未知错误")
+					// }
 				}).catch(err => {
 					param.onError(err)
 				})
diff --git a/src/config/fileSelect.js b/src/config/fileSelect.js
index f3e31423..16c4f4a0 100644
--- a/src/config/fileSelect.js
+++ b/src/config/fileSelect.js
@@ -11,22 +11,22 @@ export default {
 	max: 99,
 	uploadParseData: function (res) {
 		return {
-			id: res.data.id,
-			fileName: res.data.fileName,
-			url: res.data.src
+			id: res.id,
+			fileName: res.name,
+			url: res.path
 		}
 	},
 	listParseData: function (res) {
 		return {
-			rows: res.data.rows,
-			total: res.data.total,
-			msg: res.message,
-			code: res.code
+			rows: res.results,
+			total: res.count,
+			// msg: res.message,
+			// code: res.code
 		}
 	},
 	request: {
 		page: 'page',
-		pageSize: 'pageSize',
+		pageSize: 'page_size',
 		keyword: 'keyword',
 		menuKey: 'groupId'
 	},
diff --git a/src/config/upload.js b/src/config/upload.js
index aa4d282b..afc80e82 100644
--- a/src/config/upload.js
+++ b/src/config/upload.js
@@ -9,10 +9,10 @@ export default {
 	maxSize: 10,						//最大文件大小 默认10MB
 	parseData: function (res) {
 		return {
-			code: res.code,				//分析状态字段结构
-			fileName: res.data.fileName,//分析文件名称
-			src: res.data.src,			//分析图片远程地址结构
-			msg: res.message			//分析描述字段结构
+			// code: res.code,				//分析状态字段结构
+			fileName: res.name,//分析文件名称
+			src: res.path,			//分析图片远程地址结构
+			// msg: res.message			//分析描述字段结构
 		}
 	},
 	apiObjFile: API.common.uploadFile,	//附件上传请求API对象
diff --git a/src/views/hrm/ep_form.vue b/src/views/hrm/ep_form.vue
index b397f245..2b861012 100644
--- a/src/views/hrm/ep_form.vue
+++ b/src/views/hrm/ep_form.vue
@@ -3,58 +3,65 @@
 		<el-container v-loading="loading">
 			<el-main style="padding:0 20px 20px 20px">
 
-<el-form :model="formData" ref="vForm" :rules="rules" label-position="left" label-width="150px"
-    size="medium" @submit.prevent>
-    <div class="static-content-item">
-      <div>单列表单</div>
-    </div>
-    <div class="static-content-item">
-      <el-divider direction="horizontal"></el-divider>
-    </div>
-    <el-form-item label="发件人姓名" prop="input12931" class="required label-right-align">
-      <el-input v-model="formData.input12931" type="text" clearable></el-input>
-    </el-form-item>
-    <el-form-item label="是否保密" prop="switch96070" class="label-right-align">
-      <el-switch v-model="formData.switch96070"></el-switch>
-    </el-form-item>
-    <el-form-item label="发件人号码" prop="input23031" class="required label-right-align">
-      <el-input v-model="formData.input23031" type="text" clearable></el-input>
-    </el-form-item>
-    <el-form-item label="发件人地址" prop="textarea21654" class="required label-right-align">
-      <el-input type="textarea" v-model="formData.textarea21654" rows="3"></el-input>
-    </el-form-item>
-    <div class="static-content-item">
-      <el-divider direction="horizontal"></el-divider>
-    </div>
-    <el-form-item label="收件人姓名" prop="input113152" class="required label-right-align">
-      <el-input v-model="formData.input113152" type="text" clearable></el-input>
-    </el-form-item>
-    <el-form-item label="接收时间段" prop="checkbox63174" class="required label-right-align">
-      <el-checkbox-group v-model="formData.checkbox63174">
-        <el-checkbox v-for="(item, index) in checkbox63174Options" :key="index" :label="item.value"
-          :disabled="item.disabled" style="{display: inline}">{{item.label}}</el-checkbox>
-      </el-checkbox-group>
-    </el-form-item>
-    <el-form-item label="收件人号码" prop="input40240" class="required label-right-align">
-      <el-input v-model="formData.input40240" type="text" clearable></el-input>
-    </el-form-item>
-    <el-form-item label="收件人地址" prop="input78584" class="required label-right-align">
-      <el-input v-model="formData.input78584" type="text" clearable></el-input>
-    </el-form-item>
-    <div class="static-content-item">
-      <el-divider direction="horizontal"></el-divider>
-    </div>
-    <el-form-item label="送货时间" prop="timerange47503" class="required label-right-align">
-      <el-time-picker is-range v-model="formData.timerange47503" class="full-width-input" format="HH:mm:ss"
-        value-format="HH:mm:ss" clearable></el-time-picker>
-    </el-form-item>
-    <el-form-item label="价格保护" prop="slider54714" class="label-right-align">
-      <el-slider v-model="formData.slider54714" :step="10"></el-slider>
-    </el-form-item>
-    <el-form-item label="其他信息" prop="textarea64794" class="label-right-align">
-      <el-input type="textarea" v-model="formData.textarea64794" rows="3"></el-input>
-    </el-form-item>
-  </el-form>
+				<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>
@@ -103,19 +110,6 @@
 						{required: true, message: '请输入唯一标识', trigger: 'blur'}
 					]
 				},
-                formData: {
-          input12931: "",
-          switch96070: true,
-          input23031: "",
-          textarea21654: "",
-          input113152: "",
-          checkbox63174: [],
-          input40240: "",
-          input78584: "",
-          timerange47503: null,
-          slider54714: null,
-          textarea64794: "",
-        },
 				addTemplate: {
 					label: '',
 					prop: '',