Browse Source

订单详情增加特批类型明细

dev01 1 day ago
parent
commit
30582ff5ad

+ 7 - 5
js/component/common/projectOperation/newAddProject.jsx

@@ -714,9 +714,12 @@ class NewAddProject extends Component {
   }
   }
   // 图片添加
   // 图片添加
   getOrgCodeUrl(e, idx) {
   getOrgCodeUrl(e, idx) {
-    // this.setState({ orgCodeUrl: e });
-    this.state.subProList[idx].orgCodeUrl = e;
-    this.setState({ subProList: this.state.subProList });
+    if (!!idx) {
+      this.state.subProList[idx].orgCodeUrl = e;
+      this.setState({ subProList: this.state.subProList });
+      return;
+    }
+    this.setState({ orgCodeUrl: e });
   }
   }
 
 
   getNewCheckType(item, list = []) {
   getNewCheckType(item, list = []) {
@@ -1590,7 +1593,6 @@ class NewAddProject extends Component {
                           <PicturesWall
                           <PicturesWall
                             domId={'vip'}
                             domId={'vip'}
                             fileList={e => this.getOrgCodeUrl(e, idx)}
                             fileList={e => this.getOrgCodeUrl(e, idx)}
-                            // pictureUrl={this.state.orgCodeUrl}
                             pictureUrl={item.orgCodeUrl}
                             pictureUrl={item.orgCodeUrl}
                           />
                           />
                           {<span className="mandatory">*</span>}
                           {<span className="mandatory">*</span>}
@@ -1885,7 +1887,7 @@ class NewAddProject extends Component {
                           >
                           >
                             <PicturesWall
                             <PicturesWall
                               domId={'vip'}
                               domId={'vip'}
-                              fileList={this.getOrgCodeUrl}
+                              fileList={e => this.getOrgCodeUrl(e)}
                               pictureUrl={this.state.orgCodeUrl}
                               pictureUrl={this.state.orgCodeUrl}
                             />
                             />
                             {<span className="mandatory">*</span>}
                             {<span className="mandatory">*</span>}

+ 1 - 0
js/component/dataDic.js

@@ -4349,6 +4349,7 @@ module.exports = {
     { label: '合同已收到,前期款延期支付,预估前期款收款时间', value: 8 },
     { label: '合同已收到,前期款延期支付,预估前期款收款时间', value: 8 },
     { label: '合同与前期款均未收到,且在派单前仍不能收到的,预估收回时间', value: 9 },
     { label: '合同与前期款均未收到,且在派单前仍不能收到的,预估收回时间', value: 9 },
     { label: '非常规合同', value: 10 },
     { label: '非常规合同', value: 10 },
+    { label: '收款与满意度关联', value: 11 },
     { label: '其他', value: 0 },
     { label: '其他', value: 0 },
   ],
   ],
 
 

+ 3 - 2
js/component/manageCenter/customer/NEW/publicCustomer/publicCustomer.jsx

@@ -1,4 +1,4 @@
-import React, { Fragment } from 'react';
+import React from 'react';
 import {
 import {
   Button, Cascader, Input, Select, Tag,
   Button, Cascader, Input, Select, Tag,
   Spin, Table, message, Form, Col, Tabs, Modal, Icon, AutoComplete, Upload
   Spin, Table, message, Form, Col, Tabs, Modal, Icon, AutoComplete, Upload
@@ -19,7 +19,7 @@ import ImgList from '../../../../common/imgList/index.js';
 const QueryCustomer = React.createClass({
 const QueryCustomer = React.createClass({
   loadData(pageNo, apiUrl) {
   loadData(pageNo, apiUrl) {
     // 新需求 除湖南和内蒙古外 不让其他省操作
     // 新需求 除湖南和内蒙古外 不让其他省操作
-    if (adminData.province != "21" && adminData.province != "11" || adminData.province != "2") {
+    if (adminData.province != "21" && adminData.province != "11" && adminData.province != "2") {
       return
       return
     }
     }
     this.setState({
     this.setState({
@@ -1063,6 +1063,7 @@ const QueryCustomer = React.createClass({
                   </div>
                   </div>
                   <FormItem wrapperCol={{ span: 12, offset: 6 }}>
                   <FormItem wrapperCol={{ span: 12, offset: 6 }}>
                     <Button type="primary" htmlType="submit" style={{}}>领取客户</Button>
                     <Button type="primary" htmlType="submit" style={{}}>领取客户</Button>
+
                   </FormItem>
                   </FormItem>
                 </Spin>
                 </Spin>
               </Form >
               </Form >

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

@@ -23,6 +23,7 @@ const QueryCustomer = React.createClass({
     if (!this.state.nameSearch) {
     if (!this.state.nameSearch) {
       return
       return
     }
     }
+    
     // 新需求 除湖南和内蒙古外 不让其他省操作
     // 新需求 除湖南和内蒙古外 不让其他省操作
     if (adminData.province != "21" && adminData.province != "11" && adminData.province != "2") {
     if (adminData.province != "21" && adminData.province != "11" && adminData.province != "2") {
       return
       return

+ 4 - 3
js/component/manageCenter/leftTab.jsx

@@ -27,7 +27,8 @@ const LeftTab = React.createClass({
     let cur, sub, sut;
     let cur, sub, sut;
     if (rid.length > 1) {
     if (rid.length > 1) {
       for (var h = 0; h < menu.length; h++) {
       for (var h = 0; h < menu.length; h++) {
-        if (menu[h].subMenus.length) {
+        console.log(menu[h].subMenus)
+        if (menu[h].subMenus && menu[h].subMenus.length) {
           menu[h].subMenus.map(function (atem) {
           menu[h].subMenus.map(function (atem) {
             let urls = atem.url.split('#')
             let urls = atem.url.split('#')
             if (rid[1] == urls[1]) {
             if (rid[1] == urls[1]) {
@@ -51,7 +52,7 @@ const LeftTab = React.createClass({
     });
     });
     var htmlMenu = [];
     var htmlMenu = [];
     for (var j = 0; j < menu.length; j++) {
     for (var j = 0; j < menu.length; j++) {
-      if (menu[j].subMenus.length) {
+      if (menu[j].subMenus && menu[j].subMenus.length) {
         htmlMenu.push(
         htmlMenu.push(
           <SubMenu key={menu[j].url} title={<span>{menu[j].name}</span>}>
           <SubMenu key={menu[j].url} title={<span>{menu[j].name}</span>}>
             {
             {
@@ -76,7 +77,7 @@ const LeftTab = React.createClass({
     if (window.location.hash && menu[0].subMenus.length) {
     if (window.location.hash && menu[0].subMenus.length) {
       let theKey = window.location.hash.substr(1);
       let theKey = window.location.hash.substr(1);
       menu.map(function (item1) {
       menu.map(function (item1) {
-        item1.subMenus.map(function (item2) {
+        item1.subMenus && item1.subMenus.map(function (item2) {
           let urls = item2.url.split('#')
           let urls = item2.url.split('#')
           if (theKey == urls[1]) {
           if (theKey == urls[1]) {
             _me.state.subKey = item1.url
             _me.state.subKey = item1.url

+ 1 - 0
js/component/manageCenter/order/orderNew/addService.jsx

@@ -6364,6 +6364,7 @@ const NewService = Form.create()(
         { label: '认证类项目的前期款低于5000元', value: 7 },
         { label: '认证类项目的前期款低于5000元', value: 7 },
         { label: '合同已收到,前期款延期支付,预估前期款收款时间', value: 8 },
         { label: '合同已收到,前期款延期支付,预估前期款收款时间', value: 8 },
         { label: '合同与前期款均未收到,且在派单前仍不能收到的,预估收回时间', value: 9 },
         { label: '合同与前期款均未收到,且在派单前仍不能收到的,预估收回时间', value: 9 },
+        { label: '收款与满意度关联', value: 11 },
         { label: '非常规合同', value: 10 },
         { label: '非常规合同', value: 10 },
         {
         {
           label: <span>
           label: <span>

+ 7 - 2
js/component/manageCenter/order/orderNew/changeComponent/orderDetail.js

@@ -8,7 +8,8 @@ import {
   getboutique,
   getboutique,
   getCuikuan,
   getCuikuan,
   getApprovedState,
   getApprovedState,
-  getProjectStatus
+  getProjectStatus,
+  getApprovedType
 } from "@/tools.js";
 } from "@/tools.js";
 import img from "./img.png"
 import img from "./img.png"
 import ResolutionDetail from "@/resolutionDetail";
 import ResolutionDetail from "@/resolutionDetail";
@@ -498,6 +499,7 @@ class OrderDetail extends Component {
       wrapperCol: { span: 14 }
       wrapperCol: { span: 14 }
     };
     };
     const data = this.props.orderData || {};
     const data = this.props.orderData || {};
+    console.log(data)
     const propsList = this.props.contactList || [];
     const propsList = this.props.contactList || [];
     const expandedRowRenderVip = (e) => {
     const expandedRowRenderVip = (e) => {
       const data = e.splitList;
       const data = e.splitList;
@@ -713,7 +715,10 @@ class OrderDetail extends Component {
           </span>
           </span>
         </FormItem>
         </FormItem>
         <FormItem className="half-item" {...formItemLayout} label="特批立项">
         <FormItem className="half-item" {...formItemLayout} label="特批立项">
-          <span>{getApprovedState(data.approval)}</span>
+          <span>
+            {getApprovedState(data.approval)}
+            {getApprovedType(data.type ? data.type.split(",").map(Number) : [], data.typeExplain, 1)}
+          </span>
         </FormItem>
         </FormItem>
         { data.approval > 0 && <div className="clearfix">
         { data.approval > 0 && <div className="clearfix">
           <FormItem
           <FormItem

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

@@ -4654,7 +4654,10 @@ const IntentionCustomer = Form.create()(
                         {...formItemLayout}
                         {...formItemLayout}
                         label="特批立项"
                         label="特批立项"
                       >
                       >
-                        <span>{getApprovedState(this.state.approval)}</span>
+                        <span>
+                          {getApprovedState(this.state.approval)}
+                          {getApprovedType(this.state.type ? this.state.type.split(",").map(Number) : [], this.state.typeExplain, 1)}
+                        </span>
                       </FormItem>
                       </FormItem>
                        { this.state.approval > 0 && <div className="clearfix">
                        { this.state.approval > 0 && <div className="clearfix">
                         <FormItem
                         <FormItem

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

@@ -2216,6 +2216,7 @@ const IntentionCustomer = Form.create()(
         { label: '认证类项目的前期款低于5000元', value: 7 },
         { label: '认证类项目的前期款低于5000元', value: 7 },
         { label: '合同已收到,前期款延期支付,预估前期款收款时间', value: 8 },
         { label: '合同已收到,前期款延期支付,预估前期款收款时间', value: 8 },
         { label: '合同与前期款均未收到,且在派单前仍不能收到的,预估收回时间', value: 9 },
         { label: '合同与前期款均未收到,且在派单前仍不能收到的,预估收回时间', value: 9 },
+        { label: '收款与满意度关联', value: 11 },
         { label: '非常规合同', value: 10 },
         { label: '非常规合同', value: 10 },
         {
         {
           label: <span>
           label: <span>

+ 4 - 1
js/component/manageCenter/project/task/myTask.jsx

@@ -4443,7 +4443,10 @@ const Task = React.createClass({
                           {...formItemLayout}
                           {...formItemLayout}
                           label="是否特批"
                           label="是否特批"
                         >
                         >
-                          <span>{getApproval(this.state.approval)}</span>
+                          <span>
+                            {getApproval(this.state.approval)}
+                            {getApprovedType(this.state.type ? this.state.type.split(",").map(Number) : [], this.state.typeExplain, 1)}
+                          </span>
                         </FormItem>
                         </FormItem>
                         <FormItem
                         <FormItem
                           className="half-item"
                           className="half-item"