Sfoglia il codice sorgente

报销费用列表新增字段

dev01 1 anno fa
parent
commit
182bf959cb

+ 2 - 2
js/component/common/flowchart/index.jsx

@@ -160,7 +160,7 @@ class FlowChart extends Component {
               { status: 1, title: "经理审核", name: !info.yxjl ? "-" : info.yxjl, time: "" },
               { status: 2, title: "营销管理员审核", name: info.yxgly, time: "" },
               { status: 3, title: "技术员审核", name: info.zxs, time: "" },
-              { status: 4, title: "技术经理审核", name: info.zxsjl, time: "" },
+              // { status: 4, title: "技术经理审核", name: info.zxsjl, time: "" },
               { status: 5, title: "技术总监审核", name: info.zxsgly, time: "" },
               { status: 6, title: "财务专员审核", name: info.cwzy, time: "" },
               { status: 7, title: "财务总监审核", name: info.cwgly, time: "" },
@@ -182,7 +182,7 @@ class FlowChart extends Component {
               { status: 1, title: "经理审核", name: !info.yxjl ? "-" : info.yxjl, time: "" },
               { status: 2, title: "营销管理员审核", name: info.yxgly, time: "" },
               { status: 3, title: "技术员审核", name: info.zxs, time: "" },
-              { status: 4, title: "技术经理审核", name: info.zxsjl, time: "" },
+              // { status: 4, title: "技术经理审核", name: info.zxsjl, time: "" },
               { status: 6, title: "财务专员审核", name: info.cwzy, time: "" },
               { status: 7, title: "财务总监审核", name: info.cwgly, time: "" },
               { status: 8, title: "公司/部门管理审核", name: info.approvalName, time: "" },

+ 1 - 1
js/component/dataDic.js

@@ -4218,7 +4218,7 @@ module.exports = {
     { label: '交通费', value: 1, },
     { label: '住宿费', value: 2, },
     { label: '市内车费', value: 3, },
-    { label: '餐', value: 4 },
+    { label: '餐', value: 4 },
     { label: '出差补贴', value: 5 },
     { label: '预借支', value: 6 },
     { label: '油费', value: 7 },

+ 26 - 2
js/component/manageCenter/financialManage/account/accountDetaillist.jsx

@@ -70,6 +70,25 @@ const AccountDetaillist = React.createClass({
           },
         },
         {
+          title: "报销时间",
+          dataIndex: "releaseStart",
+          key: "releaseStart",
+          render: (text, record) => {
+            return (
+              <div>
+                <div style={{ textAlign: "center" }}>{text}</div>
+                <div style={{ textAlign: "center" }}>至</div>
+                <div style={{ textAlign: "center" }}>{record.releaseEnd}</div>
+              </div>
+            );
+          },
+        },
+        {
+          title: "工时",
+          dataIndex: "duration",
+          key: "duration",
+        },
+        {
           title: "报销金额(元)",
           dataIndex: "amount",
           key: "amount",
@@ -80,6 +99,11 @@ const AccountDetaillist = React.createClass({
           key: "realAmount",
         },
         {
+          title: "天数",
+          dataIndex: "days",
+          key: "days",
+        },
+        {
           title: "报销编号",
           dataIndex: "checkNo",
           key: "checkNo",
@@ -134,7 +158,7 @@ const AccountDetaillist = React.createClass({
           },
         },
         {
-          title: "报销时间",
+          title: "发起时间",
           dataIndex: "createTimeStr",
           key: "createTimeStr",
         },
@@ -608,7 +632,7 @@ const AccountDetaillist = React.createClass({
                 <Option value="1">交通费</Option>
                 <Option value="2">住宿费</Option>
                 <Option value="3">市内车费</Option>
-                <Option value="4">餐</Option>
+                <Option value="4">餐</Option>
                 <Option value="5">出差补贴</Option>
                 <Option value="6">预借支</Option>
                 <Option value="7">油费</Option>

+ 4 - 0
js/component/manageCenter/financialManage/account/accountDetails.jsx

@@ -516,6 +516,10 @@ class AccountDetails extends Component {
       message.warn("报销事由不能为空!");
       return
     }
+    if (editA == "contractNo" && !this.state.upOrderNo) {
+      message.warn("请选择合同编号!");
+      return
+    }
     let obj1 = {
       id: this.state.upId,
       amount: this.state.upAmount,

+ 2 - 2
js/component/manageCenter/financialManage/account/accountReview.less

@@ -4,7 +4,7 @@
 
 
 .m_body {
-  padding: 0 20px 10px;
+  padding: 20px 30px 40px;
 
   .ant-form-item {
     margin-bottom: 0 !important;
@@ -76,7 +76,7 @@
     font-weight: bold;
     padding: 2px 5px;
     // border-bottom: 1px solid #000;
-    margin-bottom: 15px;
+    margin-bottom: 20px;
   }
 
   .ant-table-wrapper {

+ 46 - 4
js/component/manageCenter/order/orderNew/inquiry.jsx

@@ -39,7 +39,7 @@ import {
   getProjectStatus,
   getboutique,
   getCuikuan,
-  getjiedian, 
+  getjiedian,
   getProjectName,
   getApprovalTag,
 } from "../../../tools.js";
@@ -96,6 +96,7 @@ const PicturesWall = React.createClass({
   componentWillReceiveProps(nextProps) {
     this.state.fileList = nextProps.pictureUrl;
   },
+
   render() {
     const { previewVisible, previewImage, fileList } = this.state;
     const uploadButton = (
@@ -518,7 +519,7 @@ const IntentionCustomer = Form.create()(
             render: text => {
               return (
                 <Tooltip title={text}>
-                  <div 
+                  <div
                   // style={{
                   //   maxWidth: '150px',
                   //   overflow: 'hidden',
@@ -626,7 +627,7 @@ const IntentionCustomer = Form.create()(
             render: text => {
               return (
                 <Tooltip title={text}>
-                  <div 
+                  <div
                   // style={{
                   //   maxWidth: '150px',
                   //   overflow: 'hidden',
@@ -2088,6 +2089,35 @@ const IntentionCustomer = Form.create()(
       this.Cascaders.empty();
       this.loadData();
     },
+    exportExec() {
+
+      let data = {
+        specially: 5,
+        name: this.state.customerName,
+        orderNo: this.state.searchOrderNo,
+        // depId: this.state.departmenttSearch,
+        starTime: this.state.releaseDate[0],
+        endTime: this.state.releaseDate[1],
+        liquidationStatus: this.state.liquidationStatusSearch,
+        contractNo: this.state.contractNoSearch,
+        deps: this.state.departmenttList,
+        amountStatus: this.state.amountStatus,
+        approval: this.state.approvalSearch,
+        projectType: this.state.projectType,
+        processStatus: this.state.processStatusSearch
+      };
+
+      for (let i in data) {
+        if (typeof data[i] === "undefined") {
+          delete data[i]
+        }
+      }
+
+      window.location.href =
+        globalConfig.context +
+        "/api/admin/newOrder/orderNewListDownload?" +
+        $.param(data);
+    },
     //部门
     departmentList() {
       this.setState({
@@ -2761,7 +2791,7 @@ const IntentionCustomer = Form.create()(
                   <Button onClick={this.reset}>
                     重置 <Icon type="reload" />
                   </Button>
-                  <div>
+                  <div style={{ marginTop: 10 }}>
                     <span style={{ marginRight: "10px" }}>下单时间 :</span>
                     <RangePicker
                       value={[
@@ -2819,6 +2849,18 @@ const IntentionCustomer = Form.create()(
                 >
                   查看项目进度
                 </Button>
+                {
+                  adminData.isSuperAdmin &&
+                  <Button
+                    type="primary"
+                    style={{ margin: "11px 0px 10px 10px" }}
+                    onClick={() => {
+                      this.exportExec()
+                    }}
+                  >
+                    导出附件
+                  </Button>
+                }
               </TabPane>
             </Tabs>
             <div className="patent-table">

+ 1 - 1
js/component/manageCenter/project/task/newSupplier.js

@@ -412,7 +412,7 @@ class NewSupplier extends Component {
                                             <Option value="4">加急16-20个工作日</Option>
                                             <Option value="5">加急21-25个工作日</Option>
                                             <Option value="6">加急26-30个工作日</Option>
-                                            <Option value="7">加急31个工作日</Option>
+                                            <Option value="7">加急45个工作日</Option>
                                         </Select>
                                         <span className="mandatory">*</span>
                                     </Form.Item>

+ 39 - 38
js/component/manageCenter/publicMenu.js

@@ -1,45 +1,46 @@
 import ajax from 'jquery/src/ajax/xhr.js'
+import { message, } from "antd";
 import $ from 'jquery/src/ajax';
 
 module.exports = {
-	getMenu: function (index) {
-		var menuArr = [];
-		$.ajax({
-			method: "get",
-			dataType: "json",
-			crossDomain: false,
-			async: false,
-			url: globalConfig.context + "/api/admin/selectMenuList",
-			data: {
-				navId: index[0]
-			},
-			success: function (data) {
-				if (!data.data) {
-					if (data.error && data.error.length) {
-						message.warning(data.error[0].message);
-						return;
-					};
-				};
-				menuArr = data.data;
-				// 如果不是管理员 某某人员变更审核简单写为变更审核
-				// window.setTimeout(() => {
-				// 	console.log($(".account-left"));
-				// })
+  getMenu: function (index) {
+    var menuArr = [];
+    $.ajax({
+      method: "get",
+      dataType: "json",
+      crossDomain: false,
+      async: false,
+      url: globalConfig.context + "/api/admin/selectMenuList",
+      data: {
+        navId: index[0]
+      },
+      success: function (data) {
+        if (!data.data) {
+          if (data.error && data.error.length) {
+            message.warning(data.error[0].message);
+            return;
+          };
+        };
+        menuArr = data.data;
+        // 如果不是管理员 某某人员变更审核简单写为变更审核
+        // window.setTimeout(() => {
+        // 	console.log($(".account-left"));
+        // })
 
-				// if (window.adminData.isSuperAdmin) return
-				// menuArr.forEach(first => {
-				// 	first.subMenus.forEach(second => {
-				// 		let str = second.name.substring(second.name.length - 6, second.name.length)
-				// 		if (str == "变更审核列表") {
-				// 			second.name = "变更审核"
-				// 		} else if (str == "变更查看列表") {
-				// 			second.name = "变更查看"
-				// 		}
-				// 	})
-				// });
-			}
-		})
-		return menuArr;
-	},
+        // if (window.adminData.isSuperAdmin) return
+        // menuArr.forEach(first => {
+        // 	first.subMenus.forEach(second => {
+        // 		let str = second.name.substring(second.name.length - 6, second.name.length)
+        // 		if (str == "变更审核列表") {
+        // 			second.name = "变更审核"
+        // 		} else if (str == "变更查看列表") {
+        // 			second.name = "变更查看"
+        // 		}
+        // 	})
+        // });
+      }
+    })
+    return menuArr;
+  },
 }
 

+ 1 - 1
js/component/manageCenter/set/projectConfigure/addSoftWritingPrice.js

@@ -103,7 +103,7 @@ class AddSoftWritingPrice extends Component{
                                     <Select.Option value={4}>加急16-20个工作日</Select.Option>
                                     <Select.Option value={5}>加急21-25个工作日</Select.Option>
                                     <Select.Option value={6}>加急26-30个工作日</Select.Option>
-                                    <Select.Option value={7}>加急31个工作日</Select.Option>
+                                    <Select.Option value={7}>加急45个工作日</Select.Option>
                                 </Select>
                             )}
                         </Form.Item>

+ 2 - 2
js/component/manageCenter/set/projectConfigure/softwareConfigure.js

@@ -63,7 +63,7 @@ class SoftwareConfigure extends Component {
               case 6:
                 return '加急26-30个工作日';
               case 7:
-                return '加急31个工作日';
+                return '加急45个工作日';
             }
           }
         },
@@ -260,7 +260,7 @@ class SoftwareConfigure extends Component {
                     <Select.Option value={4}>加急16-20个工作日</Select.Option>
                     <Select.Option value={5}>加急21-25个工作日</Select.Option>
                     <Select.Option value={6}>加急26-30个工作日</Select.Option>
-                    <Select.Option value={7}>加急31个工作日</Select.Option>
+                    <Select.Option value={7}>加急45个工作日</Select.Option>
                   </Select>
                 </div>
                 <Button type="primary" onClick={() => {

+ 1 - 1
js/component/tools.js

@@ -1833,7 +1833,7 @@ const obj = {
     } else if (val == 6) {
       return "加急26-30个工作日";
     } else if (val == 7) {
-      return "加急31个工作日";
+      return "加急45个工作日";
     }
   },
   //审核状态

+ 1 - 1
package.json

@@ -1,6 +1,6 @@
 {
   "name": "afanti",
-  "version": "1.3.05",
+  "version": "1.3.06",
   "description": "",
   "main": "index.js",
   "scripts": {