Browse Source

项目状态

HW 4 years ago
parent
commit
6f8989ddc9

+ 21 - 85
js/component/dataDic.js

@@ -2927,26 +2927,26 @@ module.exports = {
   //项目状态层级选择
   projectStatusCascader:[
     {
-      value: '高新',
+      value:0,
+      label:'未启动',
+    },
+    {
+      value:1,
+      label:'进行中',
+    },
+    {
+      value:2,
+      label:'暂停(客户通知暂停)',
+    },
+    {
+      value:3,
+      label:'暂停(业务线通知暂停)',
+    },
+    {
+      value: '',
       label: '高新',
       children:[
         {
-          value:0,
-          label:'未启动',
-        },
-        {
-          value:1,
-          label:'进行中',
-        },
-        {
-          value:2,
-          label:'暂停(客户通知暂停)',
-        },
-        {
-          value:3,
-          label:'暂停(业务线通知暂停)',
-        },
-        {
           value:4,
           label:'已提交',
         },
@@ -2985,26 +2985,10 @@ module.exports = {
       ]
     },
     {
-      value: '科技',
+      value: '',
       label: '科技',
       children:[
         {
-          value:0,
-          label:'未启动',
-        },
-        {
-          value:1,
-          label:'进行中',
-        },
-        {
-          value:2,
-          label:'暂停(客户通知暂停)',
-        },
-        {
-          value:3,
-          label:'暂停(业务线通知暂停)',
-        },
-        {
           value:4,
           label:'已提交',
         },
@@ -3051,26 +3035,10 @@ module.exports = {
       ]
     },
     {
-      value: '专利',
+      value: '',
       label: '专利',
       children:[
         {
-          value:0,
-          label:'未启动',
-        },
-        {
-          value:1,
-          label:'进行中',
-        },
-        {
-          value:2,
-          label:'暂停(客户通知暂停)',
-        },
-        {
-          value:3,
-          label:'暂停(业务线通知暂停)',
-        },
-        {
           value:4,
           label:'已提交',
         },
@@ -3093,26 +3061,10 @@ module.exports = {
       ]
     },
     {
-      value: '通用',
+      value: '',
       label: '通用',
       children:[
         {
-          value:0,
-          label:'未启动',
-        },
-        {
-          value:1,
-          label:'进行中',
-        },
-        {
-          value:2,
-          label:'暂停(客户通知暂停)',
-        },
-        {
-          value:3,
-          label:'暂停(业务线通知暂停)',
-        },
-        {
           value:4,
           label:'已提交',
         },
@@ -3127,26 +3079,10 @@ module.exports = {
       ]
     },
     {
-      value: '会员',
+      value: '',
       label: '会员',
       children:[
         {
-          value:0,
-          label:'未启动',
-        },
-        {
-          value:1,
-          label:'进行中',
-        },
-        {
-          value:2,
-          label:'暂停(客户通知暂停)',
-        },
-        {
-          value:3,
-          label:'暂停(业务线通知暂停)',
-        },
-        {
           value:21,
           label:'第1年进行中',
         },

+ 2 - 2
js/component/manageCenter/components/checkProject/index.jsx

@@ -11,7 +11,7 @@ import {
   Tooltip,
   Popconfirm,
 } from 'antd'
-import {getProjectStatus,} from '@/tools'
+import {getProjectName,} from '@/tools'
 import { getMaterialStatus, getUrgentStatus } from '@/tools'
 import ApplyPaymentModal from './applyPaymentModal';
 import PayRecord from './payRecord';
@@ -1076,7 +1076,7 @@ class CheckProject extends Component {
                         <div>供应商信息(普通单)</div>
                   }
                   <div style={{marginLeft:'auto'}}>
-                    <span style={{color:'#58a3ff'}}>项目状态:</span>{getProjectStatus(this.props.projectStatus)}
+                    <span style={{color:'#58a3ff'}}>项目状态:</span>{getProjectName(this.props.projectStatus)}
                   </div>
                 </div>
                 {

+ 2 - 2
js/component/manageCenter/project/task/myTask.jsx

@@ -119,7 +119,7 @@ const Task = React.createClass({
         contractNo: this.state.contractNoSearch, //合同编号
         taskId: this.state.taskNoSearch, //项目编号
         taskStatus: this.state.taskStatuSearch, //项目状态
-        projectStatus: this.state.projectStatusSearch ? this.state.projectStatusSearch[1] || undefined : undefined, //项目状态
+        projectStatus: this.state.projectStatusSearch ? this.state.projectStatusSearch[0] || this.state.projectStatusSearch[1] || undefined : undefined, //项目状态
         adminName: this.state.adminName, //项目受理人
         approval: this.state.approvalSearch, //特批状态搜索
         outsourceStatus:
@@ -313,7 +313,7 @@ const Task = React.createClass({
           dataIndex: 'projectStatus',
           key: 'projectStatus',
           render: (text) => {
-            return getProjectStatus(text)
+            return getProjectName(parseInt(text))
           },
         },
         {

+ 1 - 1
js/component/manageCenter/project/task/myTaskOutsource.jsx

@@ -120,7 +120,7 @@ const MyTaskOutsource = React.createClass({
         adminName: this.state.adminName, //项目受理人
         outsource: 1,
         approval: this.state.approvalSearch, //特批状态搜索
-        projectStatus: this.state.projectStatusSearch ? this.state.projectStatusSearch[1] || undefined : undefined, //项目状态
+        projectStatus: this.state.projectStatusSearch ? this.state.projectStatusSearch[0] || this.state.projectStatusSearch[1] || undefined : undefined, //项目状态
       },
       success: function (data) {
         ShowModal(this);