dev01 1 year ago
parent
commit
6589b11969

+ 14 - 14
js/component/manageCenter/financialManage/account/accountDetaillist.jsx

@@ -117,18 +117,18 @@ const AccountDetaillist = React.createClass({
           dataIndex: "financeName",
           key: "financeName",
         },
-        {
-          title: "状态",
-          dataIndex: "status",
-          key: "status",
-          render: (text, record) => {
-            return (
-              <span style={{ color: accountStatus[text]["color"] }}>
-                {accountStatus[text]["label"]}
-              </span>
-            );
-          },
-        },
+        // {
+        //   title: "状态",
+        //   dataIndex: "status",
+        //   key: "status",
+        //   render: (text, record) => {
+        //     return (
+        //       <span style={{ color: accountStatus[text]["color"] }}>
+        //         {accountStatus[text]["label"]}
+        //       </span>
+        //     );
+        //   },
+        // },
         {
           title: "报销公司/支付公司",
           dataIndex: "payDepName",
@@ -650,7 +650,7 @@ const AccountDetaillist = React.createClass({
                   return <Select.Option key={item.id}>{item.name}</Select.Option>;
                 })}
               </Select>
-              <Select
+              {/* <Select
                 style={{ width: 140 }}
                 placeholder="审核状态"
                 value={searchValues["status"]
@@ -668,7 +668,7 @@ const AccountDetaillist = React.createClass({
                 <Option value="2">完成</Option>
                 <Option value="3">驳回</Option>
                 <Option value="4">撤销</Option>
-              </Select>
+              </Select> */}
               <Input
                 placeholder="报销编号"
                 value={searchValues["checkNo"]

+ 17 - 12
js/component/manageCenter/financialManage/account/accountDetails.jsx

@@ -66,7 +66,7 @@ class AccountDetails extends Component {
           title: "序号",
           dataIndex: "a",
           key: "a",
-          width: "2%",
+          width: "3%",
           render: (text, record, index) => {
             return (
               <div>{index + 1}</div>
@@ -77,10 +77,12 @@ class AccountDetails extends Component {
           title: "费用时间",
           dataIndex: "agreeTime",
           key: "agreeTime",
-          width: "6%",
+          width: "10%",
           render: (text, record) => {
             return (
-              <div>{!!text ? text : record.startTime}</div>
+              <div>{record.types == 1
+                ? (moment(record.releaseStart).format("YYYY-MM-DD HH:mm") + " 至 " + moment(record.releaseEnd).format("YYYY-MM-DD HH:mm")) : !!text
+                  ? text : record.startTime}</div>
             )
           }
         },
@@ -99,7 +101,7 @@ class AccountDetails extends Component {
           title: "出差地址",
           dataIndex: "districtName",
           key: "districtName",
-          width: "12%",
+          width: "10%",
           render: (text, record) => {
             return (
               <div>{text}</div>
@@ -110,7 +112,7 @@ class AccountDetails extends Component {
           title: "出差企业",
           dataIndex: "userNames",
           key: "userNames",
-          width: "12%",
+          width: "10%",
           render: (text, record) => {
             return (
               <div>{text}</div>
@@ -132,7 +134,7 @@ class AccountDetails extends Component {
           title: "交通工具",
           dataIndex: "cost",
           key: "cost",
-          width: "10%",
+          width: "8%",
           render: (text, record) => {
             return (
               <div>{!!text ? text : (!!record.vehicle && record.type == 1 ? (
@@ -146,7 +148,7 @@ class AccountDetails extends Component {
           title: "费用",
           dataIndex: "amount",
           key: "amount",
-          width: "4%",
+          width: "5%",
           render: (text, record) => {
             return (
               <div>{text}</div>
@@ -157,6 +159,7 @@ class AccountDetails extends Component {
           title: "实报",
           dataIndex: "realAmount",
           key: "realAmount",
+          width: "5%",
           render: (text, record) => {
             return (
               <div style={{ color: "red", cursor: !record.cost && this.props.isOperate && "pointer" }}
@@ -187,7 +190,7 @@ class AccountDetails extends Component {
           title: "出差事由",
           dataIndex: "plan",
           key: "plan",
-          width: "10%",
+          // width: "10%",
           render: (text, record) => {
             return (
               <div>{text}</div>
@@ -198,7 +201,7 @@ class AccountDetails extends Component {
           title: "报销订单/部门",
           dataIndex: "orderNo",
           key: "orderNo",
-          width: "10%",
+          // width: "10%",
           render: (text, record) => {
             return (
               <div>
@@ -212,7 +215,7 @@ class AccountDetails extends Component {
           title: "报销事由",
           dataIndex: "remarks",
           key: "remarks",
-          width: "10%",
+          // width: "10%",
           render: (text, record) => {
             return (
               <div>{text}</div>
@@ -255,6 +258,8 @@ class AccountDetails extends Component {
               allData.sonList[0].detList[0].orderNo = allData.orderNo; // 订单号
               allData.sonList[0].detList[0].applyDepName = allData.applyDepName; // 部门
               allData.sonList[0].detList[0].remarks = allData.remarks; // 报销事由
+              dlist[0].releaseStart = allData.sonList[i].releaseStart;
+              dlist[0].releaseEnd = allData.sonList[i].releaseEnd; // 公出时间
               dlist[0].duration = allData.sonList[i].duration;  // 费用时间
               dlist[0].districtName = allData.sonList[i].districtName; // 出差地址
               dlist[0].userNames = allData.sonList[i].userNames; // 出差企业
@@ -274,9 +279,9 @@ class AccountDetails extends Component {
 
               allList.push(obj)
             }
-            allList.push({ id: allData.sonList[i].id, cost: "小计", amount: allData.sonList[i].totalAmount, realAmount: allData.sonList[i].realAmount })
+            allList.push({ id: allData.sonList[i].id, cost: "小计", amount: allData.sonList[i].amount, realAmount: allData.sonList[i].realAmount })
           }
-          allList.push({ id: allData.id, cost: "合计", amount: allData.totalAmount, realAmount: allData.realAmount })
+          allList.push({ id: allData.id, cost: "合计", amount: allData.amount, realAmount: allData.realAmount })
           this.setState({
             data: data.data,
             newList: allList,

+ 8 - 5
js/component/manageCenter/financialManage/account/accountReview.jsx

@@ -36,7 +36,9 @@ const AccountReview = React.createClass({
       reason: "",
       checkData: {},
       aname: "",
-      searchValues: {}, // 列表筛选条件
+      searchValues: {
+        examineStatus: this.props.isOperate ? "1" : undefined
+      }, // 列表筛选条件
       loading: false, //加载动画
       changeList: undefined, // 更改后的表格显示数据
       dataSource: [], // 列表数据
@@ -68,8 +70,8 @@ const AccountReview = React.createClass({
         },
         {
           title: "报销金额(元)",
-          dataIndex: "totalAmount",
-          key: "totalAmount",
+          dataIndex: "amount",
+          key: "amount",
         },
         {
           title: "实报金额(元)",
@@ -656,8 +658,9 @@ const AccountReview = React.createClass({
                   });
                 }}
               >
-                <Option value="0">待审核</Option>
-                <Option value="1">已审核</Option>
+                <Option value="0">全部</Option>
+                <Option value="1">待审核</Option>
+                <Option value="2">已审核</Option>
               </Select>
               <Input
                 placeholder="报销编号"

+ 7 - 5
js/component/manageCenter/financialManage/account/accountlist.jsx

@@ -646,18 +646,20 @@ const AccountList = React.createClass({
               <Select
                 style={{ width: 140 }}
                 placeholder="审核状态"
-                value={searchValues["examineStatus"]
-                  ? searchValues["examineStatus"]
+                value={searchValues["status"]
+                  ? searchValues["status"]
                   : undefined}
                 onChange={(e) => {
-                  searchValues["examineStatus"] = e;
+                  searchValues["status"] = e;
                   this.setState({
                     searchValues: searchValues,
                   });
                 }}
               >
-                <Option value="0">待审核</Option>
-                <Option value="1">已审核</Option>
+                <Option value="0">未提交</Option>
+                <Option value="1">待审核</Option>
+                <Option value="2">已审核</Option>
+                <Option value="3">已驳回</Option>
               </Select>
               <Input
                 placeholder="报销编号"