From cb0a06de99bd629c2021e3d9b32fe8eae8c54879 Mon Sep 17 00:00:00 2001
From: Mr Ke <kelq@hugeinfo.com.cn>
Date: Wed, 24 Jun 2020 17:36:39 +0800
Subject: [PATCH] 文本回填
---
src/components/oa/merits/meritsDetail/index.jsx | 61 +++++++++++++++---------------
src/menu/menu.oa.js | 2
src/api/httpurl.js | 4 +-
3 files changed, 34 insertions(+), 33 deletions(-)
diff --git a/src/api/httpurl.js b/src/api/httpurl.js
index 9e1f0dc..1cbb703 100644
--- a/src/api/httpurl.js
+++ b/src/api/httpurl.js
@@ -1,7 +1,7 @@
//内网测试地址
// let StagingUrl = 'http://192.168.3.12:9072';
-let StagingUrl = "http://localhost:9072";
-// let StagingUrl = "http://120.79.193.119:9075";
+// let StagingUrl = "http://localhost:9072";
+let StagingUrl = "http://120.79.193.119:9072";
//mock地址
let MockUrl = 'http://localhost:3721/';
diff --git a/src/components/oa/merits/meritsDetail/index.jsx b/src/components/oa/merits/meritsDetail/index.jsx
index d12f3ca..893bc71 100644
--- a/src/components/oa/merits/meritsDetail/index.jsx
+++ b/src/components/oa/merits/meritsDetail/index.jsx
@@ -76,9 +76,9 @@
url: `api/merits/assess/modifyGrade`,
method: 'POST',
data: {
- id : meritsAssessId,
- meritsGrade : meritsGrade,
- meritsContent : meritsContent
+ id: meritsAssessId,
+ meritsGrade: meritsGrade,
+ meritsContent: meritsContent
}
}).then(res => {
if (res) {
@@ -116,8 +116,8 @@
{
title: '权重(%)', dataIndex: 'weight', width: '5%'
},
- {
- title: '取值范围', dataIndex: 'valueRange', width: '5%'
+ {
+ title: '取值范围', dataIndex: 'valueRange', width: '5%'
},
{
title: '计算方式', dataIndex: 'countMethod', width: '10%', render: (cur, item) => {
@@ -126,39 +126,40 @@
}}></div>
}
},
- {
- title: '计算结果', dataIndex: 'alculation', width: '10%'
+ {
+ title: '计算结果', dataIndex: 'alculation', width: '10%'
},
- this.props.match.params.boolean == 'true'?
- {
- title: '评分意见', dataIndex: 'meritsContent', width: '13%', render: (cur, item, index) => {
- return <TextArea autoSize={{ minRows: 3, maxRows: 10 }} value={cur} onChange={(value) => {
- item['meritsContent'] = value.targrt.value;
+ this.props.match.params.boolean == 'true' ?
+ {
+ title: '评分意见', dataIndex: 'meritsContent', width: '13%', render: (cur, item, index) => {
+ return <TextArea autoSize={{ minRows: 3, maxRows: 10 }} value={cur} onChange={({ target: { value } }) => {
+ console.log('value', value);
+ item['meritsContent'] = value;
this.refs['table-view'].onSetDataSource({ index, data: item })
}} />
+ }
}
- }
- :
- {
- title: '评分意见', dataIndex: 'meritsContent', width: '13%'
- },
+ :
+ {
+ title: '评分意见', dataIndex: 'meritsContent', width: '13%'
+ },
// {
// title: '配分(分)', dataIndex: 'allotment', width: '6%'
// },
- this.props.match.params.boolean == 'true'?
- {
- title: '考评得分(分)', dataIndex: 'meritsGrade', width: '6%', render: (cur, item, index) => {
- return <InputNumber size="small" min={0}
- max={100} formatter={cur => `${cur}分`} parser={value => value.replace('分', '')} value={cur || 0} onChange={(value) => {
- item['meritsGrade'] = value;
- this.refs['table-view'].onSetDataSource({ index, data: item })
- }} />
+ this.props.match.params.boolean == 'true' ?
+ {
+ title: '考评得分(分)', dataIndex: 'meritsGrade', width: '6%', render: (cur, item, index) => {
+ return <InputNumber size="small" min={0}
+ max={100} formatter={cur => `${cur}分`} parser={value => value.replace('分', '')} value={cur || 0} onChange={(value) => {
+ item['meritsGrade'] = value;
+ this.refs['table-view'].onSetDataSource({ index, data: item })
+ }} />
+ }
}
- }
- :
- {
- title: '考评得分(分)', dataIndex: 'meritsGrade', width: '6%'
- },
+ :
+ {
+ title: '考评得分(分)', dataIndex: 'meritsGrade', width: '6%'
+ },
];
if (this.props.match.params.boolean == 'true') {
console.log(this.props.match.params.boolean);
diff --git a/src/menu/menu.oa.js b/src/menu/menu.oa.js
index 0fcf654..8778773 100644
--- a/src/menu/menu.oa.js
+++ b/src/menu/menu.oa.js
@@ -3,7 +3,7 @@
* key, path需要保持唯一
* permKey表示权限Key值
*/
-const menus = [
+const menus = [-
{
key: '/',
name: '首页',
--
Gitblit v1.8.0