Browse Source

开单签单样式修改

mentoswzq 5 years ago
parent
commit
fa09acfdb2

+ 1 - 1
js/component/manageCenter/financialManage/distribute/approvedOutsourcing.jsx

@@ -1131,7 +1131,7 @@ const approvedOutsourcing = React.createClass({
     });
   },
   componentWillMount() {
-    // this.loadData();
+    this.loadData();
     this.departmentList();
   },
   tableRowClick(record) {

+ 1 - 1
js/component/manageCenter/financialManage/distribute/approvedOutsourcingAll.jsx

@@ -1130,7 +1130,7 @@ const approvedOutsourcing = React.createClass({
     });
   },
   componentWillMount() {
-    // this.loadData();
+    this.loadData();
     this.departmentList();
   },
   tableRowClick(record) {

+ 1 - 1
js/component/manageCenter/financialManage/distribute/shouKuanAll.jsx

@@ -870,7 +870,7 @@ const ShouKuang = React.createClass({
     });
   },
   componentWillMount() {
-    // this.loadData();
+    this.loadData();
     this.departmentList();
   },
   tableRowClick(record) {

+ 1 - 1
js/component/manageCenter/financialManage/distribute/shouKuang.jsx

@@ -885,7 +885,7 @@ const ShouKuang = React.createClass({
     });
   },
   componentWillMount() {
-    // this.loadData();
+    this.loadData();
     this.departmentList();
   },
   tableRowClick(record) {

File diff suppressed because it is too large
+ 3200 - 1728
js/component/manageCenter/order/orderNew/billing.jsx


+ 1 - 1
js/component/manageCenter/order/orderNew/outsourcingList.jsx

@@ -1844,7 +1844,7 @@ const outsourcingList = Form.create()(
                           label={
                             <span>
                               <strong style={{ color: "#f00" }}>*</strong>
-                              数量(万元)
+                              数量()
                             </span>
                           }
                         >

+ 3 - 0
js/component/manageCenter/order/orderNew/reject.jsx

@@ -1288,6 +1288,9 @@ const IntentionCustomer = Form.create()(
           if (data.error.length || data.data.list == "") {
             if (data.error && data.error.length) {
               message.warning(data.error[0].message);
+              this.setState({
+                flag: false
+              });
             }
           } else {
             message.success("该订单已重新提交~");

+ 12 - 1
js/component/manageCenter/order/userMangagement.less

@@ -80,7 +80,6 @@
 .setSave{margin-right: 10px;margin-left: 188px;}
 .toVoid{float: left;margin-right: 10px;}
 .btnSave{text-align: center;margin-top: 10px;overflow: hidden;}
-.ant-calendar-picker{}
 .ant-calendar-picker-input{height: 27px;}
 /*变更说明*/
 .changeBorder .half-item{
@@ -103,4 +102,16 @@
 
 .single:hover{
 	background: skyblue;
+}
+.ant-tabs-bar {
+    margin-bottom: 0;
+}
+.user-content .user-search {
+    margin-top: 0 !important;
+}
+.ant-tabs-tab {
+    font-weight: 900;
+}
+.ant-table-small .ant-table-thead > tr > th {
+    background: #f5f5f5;
 }

+ 200 - 159
js/component/manageCenter/project/task/myTaskCount.jsx

@@ -2,7 +2,16 @@ import React from 'react';
 import { Button, Input, Spin, Table, message,DatePicker, Upload, Form ,Modal} from 'antd';
 import $ from 'jquery/src/ajax';
 import moment from 'moment';
-import { getLiquidationStatus,getProcessStatus,splitUrl,getboutique,getTaskStatus,getApproval,getprovince} from '@/tools.js';
+import {
+  getLiquidationStatus,
+  getProcessStatus,
+  splitUrl,
+  getboutique,
+  getTaskStatus,
+  getApproval,
+  getprovince,
+  getProjectStatus
+} from "@/tools.js";
 
 
 const MyTaskCount = Form.create()(React.createClass({
@@ -50,7 +59,8 @@ const MyTaskCount = Form.create()(React.createClass({
 	                         depName:thisdata.depName,//派单公司
 							 contractNo:thisdata.contractNo,
 							 signTime:thisdata.signTime,
-							 creteTime:thisdata.creteTime
+							 creteTime:thisdata.creteTime,
+							 projectStatus: thisdata.projectStatus
 						});
 					};
 				    this.state.pagination.total = data.data.totalCount;
@@ -74,163 +84,194 @@ const MyTaskCount = Form.create()(React.createClass({
 	
 	getInitialState() {
 		return {
-			page:1,
-			releaseDate: [],
-			selectedRowKeys: [],
-			orgCodeUrl:[],
-			paginations:false,
-			pagination: {
-				defaultCurrent: 1,
-				defaultPageSize: 10,
-				showQuickJumper: true,
-				pageSize: 10,
-				onChange: function(page) {
-					this.loadData(page);
-				}.bind(this),
-				showTotal: function(total) {
-					return '共' + total + '条数据';
-				}
-			},
-			columns: [
-				{
-                    title: '任务编号',
-                    dataIndex: 'id',
-                    key: 'id'
-                },{
-                    title: '任务名称',
-                    dataIndex: 'taskName',
-                    key: 'taskName'
-                },{
-                    title: '订单编号',
-                    dataIndex: 'orderNo',
-                    key: 'orderNo'
-                }, {
-                    title: '业务类别',
-                    dataIndex: 'cname',
-                    key: 'cname'
-                },{
-                    title: '客户名称',
-                    dataIndex: 'userName',
-                    key: 'userName',
-                    render:(text)=>{
-                    	return (text&&text.length>9?text.substr(0,9)+'...':text)
-                    }
-                },{
-                    title: '任务负责人',
-                    dataIndex: 'receiverName',
-                    key: 'receiverName'
-                },{
-                    title: '派单公司',
-                    dataIndex: 'depName',
-                    key: 'depName'
-                },{
-                    title: '任务状态',
-                    dataIndex: 'taskStatus',
-                    key: 'taskStatus',
-                    render:text=>{return getTaskStatus(text)}
-                }, {
-                    title: '工时',
-                    dataIndex: 'hours',
-                    key: 'hours'
-                }, {
-					title: '合同编号',
-					dataIndex: 'contractNo',
-					key: 'contractNo'
-				}, {
-					title: '签单日期',
-					dataIndex: 'signTime',
-					key: 'signTime'
-				}, {
-					title: '派单日期',
-					dataIndex: 'creteTime',
-					key: 'creteTime'
-				},  
-			],
-			data: [],
-			dataSource: [],
-			columnsX: [
-				{
-			        title: '业务项目名称',
-			        dataIndex: 'commodityName',
-			        key: 'commodityName'
-			    }, {
-			        title: '项目类别',
-			        dataIndex: 'cname',
-			        key: 'cname',
-			        
-			    },{
-			        title: '项目数量',
-			        dataIndex: 'commodityQuantity',
-			        key: 'commodityQuantity'
-			    }, {
-			        title: '金额(万元)',
-			        dataIndex: 'commodityPrice',
-			        key: 'commodityPrice'
-			    }, {
-			        title: '负责人',
-			        dataIndex: 'contacts',
-			        key: 'contacts'
-			    }, {
-			        title: '负责人电话',
-			        dataIndex: 'contactsMobile',
-			        key: 'contactsMobile'
-			    }, {
-			        title: '主要项目',
-			        dataIndex: 'main',
-			        key: 'main',
-			        render:(text)=>{
-			        	return (text?'是':'否')
-			        }
-			    }, {
-			        title: '项目说明',
-			        dataIndex: 'taskComment',
-			        key: 'taskComment',
-					render:(text)=>{
-						return (text&&text.length>8?text.substr(0,8)+'…':text)
-					}
-			    }
-			],
-			columnsA: [
-				{
-			        title: '流程',
-			        dataIndex: 'content',
-			        key: 'content',
-					align:'center'
-			    }, {
-			        title: '操作人',
-			        dataIndex: 'aName',
-			        key: 'aName',
-					align:'center'
-			    }, {
-			        title: '时间',
-			        dataIndex: 'createTimes',
-			        key: 'createTimes',
-					align:'center'
-			    }
-			],
-			dataSourceX: [],
-			dataSourceA: [],
-			ContactsLists: [{
-					title: '批次',
-					dataIndex: 'num',
-					key: 'num',
-				},{
-					title: '下证时间',
-					dataIndex: 'licenceTimes',
-					key: 'licenceTimes',
-				}, {
-					title: '下证数量',
-					dataIndex: 'alreadyNumber',
-					key: 'alreadyNumber',
-				},
-				{
-					title: '未下证数量',
-					dataIndex: 'notCount',
-					key: 'notCount',
-				}
-			],
-			
-		}
+      page: 1,
+      releaseDate: [],
+      selectedRowKeys: [],
+      orgCodeUrl: [],
+      paginations: false,
+      pagination: {
+        defaultCurrent: 1,
+        defaultPageSize: 10,
+        showQuickJumper: true,
+        pageSize: 10,
+        onChange: function(page) {
+          this.loadData(page);
+        }.bind(this),
+        showTotal: function(total) {
+          return "共" + total + "条数据";
+        }
+      },
+      columns: [
+        {
+          title: "任务编号",
+          dataIndex: "id",
+          key: "id"
+        },
+        {
+          title: "任务名称",
+          dataIndex: "taskName",
+          key: "taskName"
+        },
+        {
+          title: "订单编号",
+          dataIndex: "orderNo",
+          key: "orderNo"
+        },
+        {
+          title: "业务类别",
+          dataIndex: "cname",
+          key: "cname"
+        },
+        {
+          title: "客户名称",
+          dataIndex: "userName",
+          key: "userName",
+          render: text => {
+            return text && text.length > 9 ? text.substr(0, 9) + "..." : text;
+          }
+        },
+        {
+          title: "任务负责人",
+          dataIndex: "receiverName",
+          key: "receiverName"
+        },
+        {
+          title: "派单公司",
+          dataIndex: "depName",
+          key: "depName"
+        },
+        {
+          title: "任务状态",
+          dataIndex: "taskStatus",
+          key: "taskStatus",
+          render: text => {
+            return getTaskStatus(text);
+          }
+        },
+        {
+          title: "项目状态",
+          dataIndex: "projectStatus",
+          key: "projectStatus",
+          render: text => {
+            return getProjectStatus(text);
+          }
+        },
+        {
+          title: "工时",
+          dataIndex: "hours",
+          key: "hours"
+        },
+        {
+          title: "合同编号",
+          dataIndex: "contractNo",
+          key: "contractNo"
+        },
+        {
+          title: "签单日期",
+          dataIndex: "signTime",
+          key: "signTime"
+        },
+        {
+          title: "派单日期",
+          dataIndex: "creteTime",
+          key: "creteTime"
+        }
+      ],
+      data: [],
+      dataSource: [],
+      columnsX: [
+        {
+          title: "业务项目名称",
+          dataIndex: "commodityName",
+          key: "commodityName"
+        },
+        {
+          title: "项目类别",
+          dataIndex: "cname",
+          key: "cname"
+        },
+        {
+          title: "项目数量",
+          dataIndex: "commodityQuantity",
+          key: "commodityQuantity"
+        },
+        {
+          title: "金额(万元)",
+          dataIndex: "commodityPrice",
+          key: "commodityPrice"
+        },
+        {
+          title: "负责人",
+          dataIndex: "contacts",
+          key: "contacts"
+        },
+        {
+          title: "负责人电话",
+          dataIndex: "contactsMobile",
+          key: "contactsMobile"
+        },
+        {
+          title: "主要项目",
+          dataIndex: "main",
+          key: "main",
+          render: text => {
+            return text ? "是" : "否";
+          }
+        },
+        {
+          title: "项目说明",
+          dataIndex: "taskComment",
+          key: "taskComment",
+          render: text => {
+            return text && text.length > 8 ? text.substr(0, 8) + "…" : text;
+          }
+        }
+      ],
+      columnsA: [
+        {
+          title: "流程",
+          dataIndex: "content",
+          key: "content",
+          align: "center"
+        },
+        {
+          title: "操作人",
+          dataIndex: "aName",
+          key: "aName",
+          align: "center"
+        },
+        {
+          title: "时间",
+          dataIndex: "createTimes",
+          key: "createTimes",
+          align: "center"
+        }
+      ],
+      dataSourceX: [],
+      dataSourceA: [],
+      ContactsLists: [
+        {
+          title: "批次",
+          dataIndex: "num",
+          key: "num"
+        },
+        {
+          title: "下证时间",
+          dataIndex: "licenceTimes",
+          key: "licenceTimes"
+        },
+        {
+          title: "下证数量",
+          dataIndex: "alreadyNumber",
+          key: "alreadyNumber"
+        },
+        {
+          title: "未下证数量",
+          dataIndex: "notCount",
+          key: "notCount"
+        }
+      ]
+    };
 	},
 	
 	//页面加载函数

+ 2 - 2
js/component/project.jsx

@@ -735,14 +735,14 @@ const project = React.createClass({
                   {...formItemLayout}
                   label="用户名"
                 >
-                  <span>{this.state.declareUser ? "*" : ""}</span>
+                  <span>{this.state.declareUser ? "****" : ""}</span>
                 </FormItem>
                 <FormItem
                   className="half-item"
                   {...formItemLayout}
                   label="密码"
                 >
-                  <span>{this.state.declarePwd ? "*" : ""}</span>
+                  <span>{this.state.declarePwd ? "****" : ""}</span>
                 </FormItem>
               </div>
               <div className="clearfix">