dev01 преди 1 година
родител
ревизия
3bf109158e
променени са 22 файла, в които са добавени 1329 реда и са изтрити 1216 реда
  1. 1 1
      js/component/common/flowchart/index.jsx
  2. 1 1
      js/component/dataDic.js
  3. 1 1
      js/component/manageCenter/components/checkProject/index.jsx
  4. 3 3
      js/component/manageCenter/customer/NEW/query/queryCutomer.jsx
  5. 19 11
      js/component/manageCenter/financialManage/distribute/invoiceApplyListWai.jsx
  6. 14 4
      js/component/manageCenter/financialManage/distribute/projectvip.jsx
  7. 14 3
      js/component/manageCenter/order/orderNew/myprojectvip.jsx
  8. 2 2
      js/component/manageCenter/project/project/projectAssignment.jsx
  9. 1 1
      js/component/manageCenter/project/summary/highTechConfig.jsx
  10. 2 2
      js/component/manageCenter/project/summary/projectDetails.jsx
  11. 3 3
      js/component/manageCenter/project/task/myTask.jsx
  12. 2 2
      js/component/manageCenter/project/task/myTaskCount.jsx
  13. 2 2
      js/component/manageCenter/project/task/myTaskOutsource.jsx
  14. 4 4
      js/component/manageCenter/project/task/newSupplier.js
  15. 2 2
      js/component/manageCenter/project/task/payApplyReject/detailsModal/projectOverview.js
  16. 2 2
      js/component/manageCenter/project/task/taskCount.jsx
  17. 1 1
      js/component/manageCenter/project/task/taskQuery.jsx
  18. 1239 1156
      js/component/manageCenter/set/organization/organization.jsx
  19. 2 2
      js/component/manageCenter/set/projectConfigure/addSoftWritingPrice.js
  20. 10 9
      js/component/manageCenter/set/projectConfigure/softwareConfigure.js
  21. 3 3
      js/component/tools.js
  22. 1 1
      package.json

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

@@ -70,7 +70,7 @@ class FlowChart extends Component {
               { status: 0, title: "营销员发起", name: info.yxy, time: "" },
               { status: 1, title: "经理审核", name: !info.yxjl ? "-" : info.yxjl, time: "" },
               { status: 2, title: "营销管理员审核", name: info.yxgly, time: "" },
-              { status: 3, title: "财务专员/技术总监审核", name: info.cwzy, time: "" },
+              { status: 3, title: "财务/复审/技术总监审核", name: info.cwzy, time: "" },
               { status: 4, title: "特批审核", name: tpname, time: "" },
               { status: 5, title: "技术总监派单", name: info.zxsgly, time: "" },
               { status: 6, title: "技术接单", name: "", time: "" },

+ 1 - 1
js/component/dataDic.js

@@ -3054,7 +3054,7 @@ module.exports = {
     },
     {
       value: "3",
-      key: "已派财务专员/技术总监",
+      key: "已派财务/复审/技术总监",
     },
     {
       value: "4",

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

@@ -369,7 +369,7 @@ class CheckProject extends Component {
             },
           },
           {
-            title: '材料',
+            title: '方案',
             dataIndex: 'material',
             key: 'material',
             render: (text, record) => {

+ 3 - 3
js/component/manageCenter/customer/NEW/query/queryCutomer.jsx

@@ -228,10 +228,10 @@ const QueryCustomer = React.createClass({
                   onClick={(e) => {
                     e.stopPropagation(), this.seeDetail(record);
                   }}
-                  type="primary"
-                  style={{ marginRight: 10 }}
+                  // type="primary"
+                  style={{ marginRight: 10, color: "#fff", background: record.signBills === 0 ? "#58A3FF" : "green" }}
                 >
-                  {record.signBills === 0 ? '暂未签单' : '查看签单详情'}
+                  {record.signBills === 0 ? '暂未签单' : '已签,查看详细'}
                 </Button>
                 <Button
                   onClick={(e) => {

+ 19 - 11
js/component/manageCenter/financialManage/distribute/invoiceApplyListWai.jsx

@@ -472,22 +472,30 @@ const invoiceApplyListWai = React.createClass({
         examine: this.state.examine,
         reason: this.state.reason,
       },
-      success: function () { }.bind(this),
-    }).done(
-      function () {
+      success: function (data) {
         this.setState({
           loading: false,
         });
-        if (this.state.examine === 2) {
-          message.success("通过成功!");
-          // this.state.pagination.current
-          this.loadData();
+        if (data.error && data.error.length) {
+          message.warning(data.error[0].message);
         } else {
-          message.success("拒绝成功!");
-          this.resetReason();
-          this.rejectCancels();
-          this.loadData();
+          if (this.state.examine === 2) {
+            message.success("通过成功!");
+            // this.state.pagination.current
+            this.loadData();
+          } else {
+            message.success("拒绝成功!");
+            this.resetReason();
+            this.rejectCancels();
+            this.loadData();
+          }
         }
+      }.bind(this),
+    }).always(
+      function () {
+        this.setState({
+          loading: false,
+        });
       }.bind(this)
     );
   },

+ 14 - 4
js/component/manageCenter/financialManage/distribute/projectvip.jsx

@@ -228,10 +228,20 @@ const ProjectVip = React.createClass({
           title: "状态",
           dataIndex: "status",
           key: "status",
-          render: (text) => {
+          width: 80,
+          render: (text, record) => {
             return (
               <div>
-                {["", "财务审核", "特批审核", "通过", "驳回"][text]}
+                {text != 1 && <div>{["", "财务审核", "特批审核", "通过", "驳回"][text]}</div>}
+                {text == 1 &&
+                  <div>
+                    {record.examineType == 1
+                      ? "财务审核" : record.examineType == 2
+                        ? "财务复审" : record.examineType == 3 && "财务审核"
+                    }
+                    {record.examineType == 3 && <div>财务复审</div>}
+                  </div>
+                }
               </div>
             );
           }
@@ -936,7 +946,7 @@ const ProjectVip = React.createClass({
               }}
             >
               {
-                this.state.recard.status == 1 &&
+                this.state.recard.status == 1 && this.state.recard.myExamine == 0 &&
                 <Button
                   type="primary"
                   style={{ margin: '20px 10px 5px' }}
@@ -949,7 +959,7 @@ const ProjectVip = React.createClass({
                 </Button>
               }
               {
-                this.state.recard.status == 1 &&
+                this.state.recard.status == 1 && this.state.recard.myExamine == 0 &&
                 <Button
                   type="danger"
                   style={{ margin: '20px 10px 5px' }}

+ 14 - 3
js/component/manageCenter/order/orderNew/myprojectvip.jsx

@@ -225,10 +225,21 @@ const MyProjectVip = React.createClass({
         {
           title: "状态",
           dataIndex: "status",
-          key: "status", render: (text) => {
+          key: "status",
+          width: 80,
+          render: (text, record) => {
             return (
-              <div style={{ maxWidth: 115, color: text == 4 && "red" }}>
-                {["", "财务审核", "特批审核", "通过", "驳回"][text]}
+              <div>
+                {text != 1 && <div style={{ color: text == 4 && "red" }}>{["", "财务审核", "特批审核", "通过", "驳回"][text]}</div>}
+                {text == 1 &&
+                  <div>
+                    {record.examineType == 1
+                      ? "财务审核" : record.examineType == 2
+                        ? "财务复审" : record.examineType == 3 && "财务审核"
+                    }
+                    {record.examineType == 3 && <div>财务复审</div>}
+                  </div>
+                }
               </div>
             );
           }

+ 2 - 2
js/component/manageCenter/project/project/projectAssignment.jsx

@@ -1222,7 +1222,7 @@ const PaiDan = React.createClass({
               render: (text, record) => {
                 return (
                   <div>
-                    {(this.state.processStatus == 5 || record.taskStatus == 0) &&
+                    {(this.state.processStatus == 5 || this.state.processStatus == 6) && record.taskStatus == 0 &&
                       <Button
                         type="primary"
                         onClick={e => {
@@ -1428,7 +1428,7 @@ const PaiDan = React.createClass({
           </TabPane>
           <TabPane tab="操作" key="2">
             <div style={{ padding: "10px 0 0 10px" }}>
-            <Tag color="black" onClick={() => this.setTag(0)}>默认</Tag>
+              <Tag color="black" onClick={() => this.setTag(0)}>默认</Tag>
               <Tag color="#666666" onClick={() => this.setTag(4)}>已过期</Tag>
               <Tag color="#996600" onClick={() => this.setTag(5)}>已作废</Tag>
               <Tag color="#169BD5" onClick={() => this.setTag(1)}>待处理</Tag>

+ 1 - 1
js/component/manageCenter/project/summary/highTechConfig.jsx

@@ -613,7 +613,7 @@ const softWriting = [
     )
   },
   {
-    title: "有无材料",
+    title: "有无方案",
     dataIndex: "ifMaterial",
     key: "ifMaterial",
     render: (value) => (

+ 2 - 2
js/component/manageCenter/project/summary/projectDetails.jsx

@@ -564,7 +564,7 @@ class ProjectDetails extends Component {
             bpType: thisdata.bpType,//0 正常 1专利 2软著 3审计 4双软 5高新 6商标
             cSort: thisdata.sort,
             specialComment: thisdata.specialComment,
-            urgentDay: thisdata.urgentDay, //有无材料
+            urgentDay: thisdata.urgentDay, //有无方案
             ifMaterial: thisdata.ifMaterial, //加急情况
             spotCheckStatus: thisdata.spotCheckStatus,
             setUpStatus: thisdata.setUpStatus,
@@ -1259,7 +1259,7 @@ class ProjectDetails extends Component {
                     <FormItem
                       className="half-item"
                       {...formItemLayout}
-                      label="有无材料"
+                      label="有无方案"
                     >
                       {
                         this.state.ifMaterial === 1 ? '是' :

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

@@ -945,7 +945,7 @@ const Task = React.createClass({
             },
           },
           {
-            title: '材料',
+            title: '方案',
             dataIndex: 'material',
             key: 'material',
             render: (text, record) => {
@@ -3183,7 +3183,7 @@ const Task = React.createClass({
     this.setState({
       loading: true,
     })
-    // material: this.state.thirdMaterial, //材料
+    // material: this.state.thirdMaterial, //方案
     // urgent: this.state.thirdUrgent, //加急
     // unitPrice: this.state.thirdUnitPrice, //单价
     let data = {
@@ -5829,7 +5829,7 @@ const Task = React.createClass({
                   <FormItem
                     className="half-item"
                     {...formItemLayout}
-                    label="有无材料"
+                    label="有无方案"
                   >
                     <Radio.Group
                       value={this.state.ifMaterial}

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

@@ -885,7 +885,7 @@ const MyTaskCount = Form.create()(
       this.state.contractNoSearch = "";
       this.state.outsourceSearch = [];
       this.setState({
-        urgentDay: '', //有无材料
+        urgentDay: '', //有无方案
         ifMaterial: '', //加急情况
         specialComment: '', //特别说明
         spotCheckStatus: '',
@@ -1883,7 +1883,7 @@ const MyTaskCount = Form.create()(
               <FormItem
                 className="half-item"
                 {...formItemLayout}
-                label="有无材料"
+                label="有无方案"
               >
                 {
                   this.state.ifMaterial === 1 ? '是' :

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

@@ -2375,7 +2375,7 @@ const MyTaskOutsource = React.createClass({
             },
           },
           {
-            title: '材料',
+            title: '方案',
             dataIndex: 'material',
             key: 'material',
             render: (text, record) => {
@@ -5081,7 +5081,7 @@ const MyTaskOutsource = React.createClass({
                   <FormItem
                     className="half-item"
                     {...formItemLayout}
-                    label="有无材料"
+                    label="有无方案"
                   >
                     <Radio.Group
                       value={this.state.ifMaterial}

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

@@ -166,7 +166,7 @@ class NewSupplier extends Component {
             data.cid = customerId     //公司id            只有软著类要传cid,其他类型都是非必填的
         }
         if (this.props.projectType === 2) {
-            data.material = this.state.thirdMaterial;   //材料
+            data.material = this.state.thirdMaterial;   //方案
             data.urgent = this.state.thirdUrgent;       //加急
             data.calculation = 1;                       //0 其他 1软著 2专利
         } else {                                          //非软著类需要传总金额
@@ -364,7 +364,7 @@ class NewSupplier extends Component {
                             </div> : <div />}
                             {this.props.projectType === 2 ? <div>
                                 <div className="clearfix">
-                                    <Form.Item {...formItemLayout} label="材料">
+                                    <Form.Item {...formItemLayout} label="方案">
                                         <Select
                                             value={this.state.thirdMaterial}
                                             onChange={(val) => {
@@ -381,8 +381,8 @@ class NewSupplier extends Component {
                                             style={{ width: '220px' }}
                                             defaultValue="0"
                                         >
-                                            <Option value={0}>无材料</Option>
-                                            <Option value={1}>有材料</Option>
+                                            <Option value={0}>无方案</Option>
+                                            <Option value={1}>有方案</Option>
                                         </Select>
                                         <span className="mandatory">*</span>
                                     </Form.Item>

+ 2 - 2
js/component/manageCenter/project/task/payApplyReject/detailsModal/projectOverview.js

@@ -359,7 +359,7 @@ class projectOverview extends Component {
                         declarationBatch: thisdata.declarationBatch,
                         bpType: thisdata.bpType,//0 正常 1专利 2软著 3审计 4双软 5高新 6商标
                         specialComment: thisdata.specialComment,
-                        urgentDay: thisdata.urgentDay, //有无材料
+                        urgentDay: thisdata.urgentDay, //有无方案
                         ifMaterial: thisdata.ifMaterial, //加急情况
                         spotCheckStatus: thisdata.spotCheckStatus,
                         setUpStatus: thisdata.setUpStatus,
@@ -687,7 +687,7 @@ class projectOverview extends Component {
                             <FormItem
                                 className="half-item"
                                 {...formItemLayout}
-                                label="有无材料"
+                                label="有无方案"
                             >
                                 {
                                     this.state.ifMaterial === 1 ? '是' :

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

@@ -636,7 +636,7 @@ const IntentionCustomer = Form.create()(
               bpType: thisdata.bpType,//0 正常 1专利 2软著 3审计 4双软 5高新 6商标
               cSort: thisdata.sort,
               specialComment: thisdata.specialComment,
-              urgentDay: thisdata.urgentDay, //有无材
+              urgentDay: thisdata.urgentDay, //有无材方案
               ifMaterial: thisdata.ifMaterial, //加急情况
               spotCheckStatus: thisdata.spotCheckStatus,
               setUpStatus: thisdata.setUpStatus,
@@ -2141,7 +2141,7 @@ const IntentionCustomer = Form.create()(
               <FormItem
                 className="half-item"
                 {...formItemLayout}
-                label="有无材料"
+                label="有无方案"
               >
                 {
                   this.state.ifMaterial === 1 ? '是' :

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

@@ -2168,7 +2168,7 @@ const Task = React.createClass({
                     <FormItem
                       className="half-item"
                       {...formItemLayout}
-                      label="有无材料"
+                      label="有无方案"
                     >
                       {
                         this.state.ifMaterial === 1 ? '是' :

Файловите разлики са ограничени, защото са твърде много
+ 1239 - 1156
js/component/manageCenter/set/organization/organization.jsx


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

@@ -79,10 +79,10 @@ class AddSoftWritingPrice extends Component{
                                 <Input placeholder="请输入单价" type={'number'} style={{width:'250px'}}/>
                             )}
                         </Form.Item>
-                        <Form.Item  label="材料">
+                        <Form.Item  label="方案">
                             {getFieldDecorator('material', {
                                 initialValue: this.props.infor.material,
-                                rules: [{ required: true, message: '请选择是否有材料!' }],
+                                rules: [{ required: true, message: '请选择是否有方案!' }],
                             })(
                                 <Select style={{ width:'200px'}}>
                                     <Select.Option value={0}>无</Select.Option>

+ 10 - 9
js/component/manageCenter/set/projectConfigure/softwareConfigure.js

@@ -3,6 +3,7 @@ import { Button, Input, message, Select, Spin, Table, Tag, Popconfirm, Tabs } fr
 import AddSoftWritingPrice from './addSoftWritingPrice'
 import $ from "jquery/src/ajax";
 import '../content.less';
+import { getMaterialStatus } from "@/tools";
 import { ChooseList } from "../../order/orderNew/chooseList";
 
 const TabPane = Tabs.TabPane;
@@ -13,7 +14,7 @@ class SoftwareConfigure extends Component {
     this.state = {
       companyName: '',        //公司名称
       urgent: undefined,            //加急
-      material: undefined,          //材料
+      material: undefined,          //方案
       pagination: {
         defaultCurrent: 1,
         defaultPageSize: 10,
@@ -34,12 +35,12 @@ class SoftwareConfigure extends Component {
           key: 'companyName',
         },
         {
-          title: '材料',
+          title: '方案',
           dataIndex: 'material',
           key: 'material',
-          render: (text) => {
-            return text === 0 ? '无材料' : '有材料'
-          }
+          render: (text, record) => {
+            return getMaterialStatus(text)
+          },
         },
         {
           title: '加急天数',
@@ -138,7 +139,7 @@ class SoftwareConfigure extends Component {
         pageSize: this.state.pagination.pageSize,
         companyName: this.state.companyName || undefined,       //公司名称
         urgent: this.state.urgent,    //加急
-        material: this.state.material,  //材料
+        material: this.state.material,  //方案
       },
       success: function (data) {
         if (!data.data || !data.data.list) {
@@ -179,7 +180,7 @@ class SoftwareConfigure extends Component {
     this.setState({
       companyName: '',       //公司名称
       urgent: undefined,    //加急
-      material: undefined,  //材料
+      material: undefined,  //方案
     }, () => {
       this.loadData();
     })
@@ -236,9 +237,9 @@ class SoftwareConfigure extends Component {
                   value={this.state.companyName}
                   onChange={(e) => { this.setState({ companyName: e.target.value }); }} />
                 <div style={{ display: 'flex', flexFlow: 'row nowrap' }}>
-                  <div style={{ marginLeft: 10, marginRight: 10 }}>材料:</div>
+                  <div style={{ marginLeft: 10, marginRight: 10 }}>方案:</div>
                   <Select
-                    placeholder="材料"
+                    placeholder="方案"
                     style={{ width: '200px', marginRight: '10px' }}
                     value={this.state.material}
                     onChange={(e) => { this.setState({ material: e }) }}>

+ 3 - 3
js/component/tools.js

@@ -1785,12 +1785,12 @@ const obj = {
       return "已派财务总监";
     }
   },
-  //第三方信息状态----是否有材料
+  //第三方信息状态----是否有方案
   getMaterialStatus: function (val) {
     if (val == 0) {
-      return "无材料";
+      return "无方案";
     } else if (val == 1) {
-      return "有材料";
+      return "有方案";
     }
   },
   //第三方信息状态----加急

+ 1 - 1
package.json

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