dev01 2 years ago
parent
commit
be6776b968

+ 12 - 9
js/component/manageCenter/order/orderNew/addService.jsx

@@ -5038,7 +5038,12 @@ const NewService = Form.create()(
                                 <FormItem
                                   className="half-item"
                                   {...formItemLayout}
-                                  label="合同签订时间"
+                                  label={
+                                    <span>
+                                      <strong style={{ color: "#f00" }}>*</strong>
+                                      合同签订时间
+                                    </span>
+                                  }
                                 >
                                   <DatePicker
                                     className="signDateRef"
@@ -5059,12 +5064,6 @@ const NewService = Form.create()(
                                       this.setState({ signDate: dataString });
                                     }}
                                   />
-                                  <span
-                                    className="mandatory"
-                                    style={{ marginLeft: 20 }}
-                                  >
-                                    *
-                                  </span>
                                 </FormItem>
                                 <FormItem
                                   className="half-item"
@@ -5671,7 +5670,12 @@ const NewService = Form.create()(
                                 <FormItem
                                   labelCol={{ span: 4 }}
                                   wrapperCol={{ span: 16 }}
-                                  label="订单留言"
+                                  label={
+                                    <span>
+                                      <strong style={{ color: "#f00" }}>*</strong>
+                                      订单留言
+                                    </span>
+                                  }
                                 >
                                   <Input
                                     ref="orderRemarksRef"
@@ -5686,7 +5690,6 @@ const NewService = Form.create()(
                                     }}
                                     style={{ width: "95%" }}
                                   />
-                                  <span className="mandatory">*</span>
                                   <div className="mandatory">
                                     重要提示:请详细填写合同中包含的服务内容、服务年限、时间节点等
                                   </div>

+ 228 - 215
js/component/manageCenter/order/orderNew/reject.jsx

@@ -20,7 +20,7 @@ import {
 } from 'antd';
 import $ from 'jquery/src/ajax';
 import moment from 'moment';
-import {boutique ,tepi,jiedian} from '@/dataDic.js';
+import { boutique, tepi, jiedian } from '@/dataDic.js';
 import {
   getLiquidationStatus,
   getProcessStatus,
@@ -35,7 +35,7 @@ import OrderRiZi from "@/orderRiZi.jsx";
 import { cuiJieDian } from "@/dataDic.js";
 import ResolutionDetail from "@/resolutionDetail";
 import ImgList from "../../../common/imgList";
-import {ChooseList} from "./chooseList";
+import { ChooseList } from "./chooseList";
 import OrderItemStatus from "../../../common/orderItemStatus";
 import EnterpriseNameChange from "../../../common/enterpriseNameChange";
 import OrderCoor from './changeComponent/orderCoor';
@@ -43,42 +43,42 @@ import ProjectOperation from "../../../common/projectOperation";
 import ContentUrl from './contentUrl';
 //图片组件
 const PicturesWall = React.createClass({
-	getInitialState() {
-		return {
-			fileList: [],
-		}
-	},
-	handleChange(info) {
-		let fileList = info.fileList;
-		this.setState({
-			fileList
-		});
-		this.props.fileList(fileList);
-	},
-	componentWillReceiveProps(nextProps) {
-		this.state.fileList = nextProps.pictureUrl;
-		this.state.pojectApplicationUrl = undefined;
-	},
-	render() {
-		const {fileList} = this.state;
-		return(
-			<div style={{display:"inline-block"}}>
-              <ImgList
-                  domId={this.props.domId}
-                  uploadConfig={{
-                    action:globalConfig.context + "/api/admin/customer/uploadCustomerImg",
-                    data:{ 'sign': '' },
-                    multiple:true,
-                    listType:"picture-card",
-                  }}
-                  onChange={(infor)=>{
-                    this.handleChange(infor)
-                  }}
-                  fileList={fileList}
-              />
-            </div>
-		);
-	}
+  getInitialState() {
+    return {
+      fileList: [],
+    }
+  },
+  handleChange(info) {
+    let fileList = info.fileList;
+    this.setState({
+      fileList
+    });
+    this.props.fileList(fileList);
+  },
+  componentWillReceiveProps(nextProps) {
+    this.state.fileList = nextProps.pictureUrl;
+    this.state.pojectApplicationUrl = undefined;
+  },
+  render() {
+    const { fileList } = this.state;
+    return (
+      <div style={{ display: "inline-block" }}>
+        <ImgList
+          domId={this.props.domId}
+          uploadConfig={{
+            action: globalConfig.context + "/api/admin/customer/uploadCustomerImg",
+            data: { 'sign': '' },
+            multiple: true,
+            listType: "picture-card",
+          }}
+          onChange={(infor) => {
+            this.handleChange(infor)
+          }}
+          fileList={fileList}
+        />
+      </div>
+    );
+  }
 });
 
 
@@ -143,15 +143,15 @@ const IntentionCustomer = Form.create()(
     getInitialState() {
       return {
         page: 1,
-        orderNos:'',
-        patentTypeList:[],
+        orderNos: '',
+        patentTypeList: [],
         releaseDate: [],
-        orderStatus:0,
-        processStatus:0,
+        orderStatus: 0,
+        processStatus: 0,
         selectedRowKeys: [],
         orgCodeUrl: [],
         replenishUrl: [],
-        contentUrl:[],
+        contentUrl: [],
         customerArr: [],
         resVisible: false,
         pagination: {
@@ -193,14 +193,14 @@ const IntentionCustomer = Form.create()(
             key: "userName",
             render: (text) => {
               return (
-                  <Tooltip title={text}>
-                    <div style={{
-                      maxWidth:'150px',
-                      overflow:'hidden',
-                      textOverflow: "ellipsis",
-                      whiteSpace:'nowrap',
-                    }}>{text}</div>
-                  </Tooltip>
+                <Tooltip title={text}>
+                  <div style={{
+                    maxWidth: '150px',
+                    overflow: 'hidden',
+                    textOverflow: "ellipsis",
+                    whiteSpace: 'nowrap',
+                  }}>{text}</div>
+                </Tooltip>
               )
             },
           },
@@ -470,62 +470,62 @@ const IntentionCustomer = Form.create()(
                 let arr = record.arr || [];
                 return (
                   <div>
-                  <Select
-                    style={{ width: "150px" }}
-                    placeholder="请选择分类"
-                    onChange={(e) => {
-                      record.dunType = e;
-                      if (record.dunType == 0) {
-                        record.customizeTimes = "";
-                        record.customizeName = "";
-                      }
-                      if(e == 0){
-                        record.dunTypeCustom = true;
-                      }else{
-                        record.dunTypeCustom = false;
-                      }
-                      if (e != 1) {
-                        this.setState({
-                          timeFlag: true,
-                        });
-                      } else {
-                        this.setState({
-                          timeFlag: false,
-                        });
-                      }
-                      if (e == 1 && record.sort == 6) {
-                        this.setState({
-                          yearFlag: true,
-                        });
-                      } else if (e != 1 && record.sort == 6) {
-                        this.setState({
-                          yearFlag: false,
-                        });
-                      }
-                      if (record.sort == 3 && e == 3) {
-                        this.setState({
-                          boFlag: true,
-                        });
-                      } else {
-                        this.setState({
-                          boFlag: false,
-                        });
-                      }
-                    }}
-                  >
-                    {arr.map((item) => {
-                      record;
-                      return (
-                        <Select.Option key={item.value} value={item.value}>
-                          {item.key}
-                        </Select.Option>
-                      );
-                    })}
-                    <Select.Option key={0} value={0}>
-                      自定义
-                    </Select.Option>
-                  </Select>
-                  {record.dunType == 0 ? (
+                    <Select
+                      style={{ width: "150px" }}
+                      placeholder="请选择分类"
+                      onChange={(e) => {
+                        record.dunType = e;
+                        if (record.dunType == 0) {
+                          record.customizeTimes = "";
+                          record.customizeName = "";
+                        }
+                        if (e == 0) {
+                          record.dunTypeCustom = true;
+                        } else {
+                          record.dunTypeCustom = false;
+                        }
+                        if (e != 1) {
+                          this.setState({
+                            timeFlag: true,
+                          });
+                        } else {
+                          this.setState({
+                            timeFlag: false,
+                          });
+                        }
+                        if (e == 1 && record.sort == 6) {
+                          this.setState({
+                            yearFlag: true,
+                          });
+                        } else if (e != 1 && record.sort == 6) {
+                          this.setState({
+                            yearFlag: false,
+                          });
+                        }
+                        if (record.sort == 3 && e == 3) {
+                          this.setState({
+                            boFlag: true,
+                          });
+                        } else {
+                          this.setState({
+                            boFlag: false,
+                          });
+                        }
+                      }}
+                    >
+                      {arr.map((item) => {
+                        record;
+                        return (
+                          <Select.Option key={item.value} value={item.value}>
+                            {item.key}
+                          </Select.Option>
+                        );
+                      })}
+                      <Select.Option key={0} value={0}>
+                        自定义
+                      </Select.Option>
+                    </Select>
+                    {record.dunType == 0 ? (
                       <Input
                         value={record.customizeName}
                         placeholder="请输入自定义名称"
@@ -541,7 +541,7 @@ const IntentionCustomer = Form.create()(
                     ) : (
                       ""
                     )}
-                    </div>
+                  </div>
                 );
               } else {
                 return (
@@ -677,26 +677,26 @@ const IntentionCustomer = Form.create()(
                 return <span>{text}</span>;
               }
               return (
-                  <div>
-                    {
-                      record.dunType != 0 ?
-                          <Select
-                              placeholder="请选择年限"
-                              style={{ width: "150px" }}
-                              disabled={this.state.yearFlag ? true : false}
-                              onChange={(e) => {
-                                record.effectiveCount = e;
-                              }}
-                          >
-                            {/* <Select.Option key={null}>无</Select.Option> */}
-                            <Select.Option key={1}>一年</Select.Option>
-                            <Select.Option key={3}>两年</Select.Option>
-                            <Select.Option key={5}>三年</Select.Option>
-                            <Select.Option key={7}>四年</Select.Option>
-                            <Select.Option key={9}>五年</Select.Option>
-                          </Select> : <div/>
-                    }
-                  </div>
+                <div>
+                  {
+                    record.dunType != 0 ?
+                      <Select
+                        placeholder="请选择年限"
+                        style={{ width: "150px" }}
+                        disabled={this.state.yearFlag ? true : false}
+                        onChange={(e) => {
+                          record.effectiveCount = e;
+                        }}
+                      >
+                        {/* <Select.Option key={null}>无</Select.Option> */}
+                        <Select.Option key={1}>一年</Select.Option>
+                        <Select.Option key={3}>两年</Select.Option>
+                        <Select.Option key={5}>三年</Select.Option>
+                        <Select.Option key={7}>四年</Select.Option>
+                        <Select.Option key={9}>五年</Select.Option>
+                      </Select> : <div />
+                  }
+                </div>
               );
             },
           },
@@ -894,9 +894,9 @@ const IntentionCustomer = Form.create()(
 
       this.setState({
         visible: true,
-        orderNos:record.orderNo,
-        orderStatus:record.orderStatus,
-        processStatus:record.orderStatus
+        orderNos: record.orderNo,
+        orderStatus: record.orderStatus,
+        processStatus: record.orderStatus
       });
       this.xiangqing(record.orderNo);
       this.xiangmu(record.orderNo);
@@ -908,8 +908,8 @@ const IntentionCustomer = Form.create()(
     //点击打卡项目详情
     tableRowClickX(record) {
       this.setState({
-        projectOperationVisible:true,
-        dataInfor:record,
+        projectOperationVisible: true,
+        dataInfor: record,
       })
     },
     //项目详情关闭
@@ -917,8 +917,8 @@ const IntentionCustomer = Form.create()(
       this.setState({
         projectOperationVisible: false,
         gid: "",
-        dataInfor:{},
-      },()=>{
+        dataInfor: {},
+      }, () => {
         this.xiangmu(this.state.orderNo);
       });
     },
@@ -964,25 +964,25 @@ const IntentionCustomer = Form.create()(
               orderRemarks: thisdata.orderRemarks, //订单留言
               orgCodeUrl: thisdata.contractPictureUrl
                 ? splitUrl(
-                    thisdata.contractPictureUrl,
-                    ",",
-                    globalConfig.avatarHost + "/upload"
-                  )
+                  thisdata.contractPictureUrl,
+                  ",",
+                  globalConfig.avatarHost + "/upload"
+                )
                 : [], //图片地址
               replenishUrl: thisdata.agreementUrl
                 ? splitUrl(
-                    thisdata.agreementUrl,
-                    ",",
-                    globalConfig.avatarHost + "/upload"
-                  )
+                  thisdata.agreementUrl,
+                  ",",
+                  globalConfig.avatarHost + "/upload"
+                )
+                : [], //图片地址
+              contentUrl: thisdata.serviceContent
+                ? splitUrl(
+                  thisdata.serviceContent,
+                  ",",
+                  globalConfig.avatarHost + "/upload"
+                )
                 : [], //图片地址
-              contentUrl:thisdata.serviceContent
-            ? splitUrl(
-                thisdata.serviceContent,
-                ",",
-                globalConfig.avatarHost + "/upload"
-              )
-            : [], //图片地址
               salesmanName: thisdata.salesmanName, //营销员名称
               salesmanMobile: thisdata.salesmanMobile, //营销员电话
               oldSalesmanName: thisdata.oldSalesmanName, //营销员名称
@@ -998,7 +998,7 @@ const IntentionCustomer = Form.create()(
               organizationSearch: thisdata.orderDep,
               //approval:thisdata.approval==0?thisdata.approval.toString():thisdata.approval,//特批状态
               outsource: thisdata.outsource == 0 ? "否" : "是",
-              deleteSign:thisdata.deleteSign,
+              deleteSign: thisdata.deleteSign,
             });
           }
         }.bind(this),
@@ -1421,9 +1421,9 @@ const IntentionCustomer = Form.create()(
         let picArr = [];
         this.state.replenishUrl.map(function (item) {
           if (
-              item.response &&
-              item.response.data &&
-              item.response.data.length
+            item.response &&
+            item.response.data &&
+            item.response.data.length
           ) {
             picArr.push(item.response.data);
           }
@@ -1444,7 +1444,7 @@ const IntentionCustomer = Form.create()(
           }
         });
         contentUrl = picArr.join(",");
-      }else{
+      } else {
         message.info("请上传服务内容图片")
         return
       }
@@ -1549,7 +1549,7 @@ const IntentionCustomer = Form.create()(
           orderRemarks: this.state.orderRemarks, //订单备注
           contractPictureUrl: theorgCodeUrl.length ? theorgCodeUrl : "",
           agreementUrl: theReplenishUrl.length ? theReplenishUrl : "",
-          serviceContent:contentUrl.length ? contentUrl : "",
+          serviceContent: contentUrl.length ? contentUrl : "",
           orderDep: this.state.organizationSearch,
         },
         success: function (data) {
@@ -1791,9 +1791,9 @@ const IntentionCustomer = Form.create()(
         success: function (data) {
           if (data.error.length === 0) {
             this.setState({
-              patentTypeList:data.data
+              patentTypeList: data.data
             })
-          }else{
+          } else {
             message.warning(data.error[0].message);
           };
         }.bind(this)
@@ -1812,12 +1812,12 @@ const IntentionCustomer = Form.create()(
         url: globalConfig.context + api,
         data: state
           ? {
-              name: e,
-              type: this.state.customType,
-            }
+            name: e,
+            type: this.state.customType,
+          }
           : {
-              businessName: e,
-            },
+            businessName: e,
+          },
         success: function (data) {
           let thedata = data.data;
           if (!thedata) {
@@ -1918,15 +1918,15 @@ const IntentionCustomer = Form.create()(
       let departmentArr = this.state.departmentArr || [];
       const options = this.state.states
         ? dataSources.map((group) => (
-            <Select.Option key={group.id} value={group.name}>
-              {group.name}
-            </Select.Option>
-          ))
+          <Select.Option key={group.id} value={group.name}>
+            {group.name}
+          </Select.Option>
+        ))
         : dataSources.map((group, index) => (
-            <Select.Option key={index} value={group.bname}>
-              {group.bname}
-            </Select.Option>
-          ));
+          <Select.Option key={index} value={group.bname}>
+            {group.bname}
+          </Select.Option>
+        ));
       const { TabPane } = Tabs;
       return (
         <div className="user-content">
@@ -1953,11 +1953,11 @@ const IntentionCustomer = Form.create()(
               <TabPane tab="更改表格显示数据" key="1">
                 <div style={{ marginLeft: 10 }}>
                   <ChooseList
-                      columns={this.state.columns}
-                      changeFn={this.changeList}
-                      changeList={this.state.changeList}
-                      top={55}
-                      margin={11}
+                    columns={this.state.columns}
+                    changeFn={this.changeList}
+                    changeList={this.state.changeList}
+                    top={55}
+                    margin={11}
                   />
                 </div>
               </TabPane>
@@ -2013,8 +2013,8 @@ const IntentionCustomer = Form.create()(
                 <Table
                   columns={
                     this.state.changeList
-                        ? this.state.changeList
-                        : this.state.columns
+                      ? this.state.changeList
+                      : this.state.columns
                   }
                   dataSource={this.state.dataSource}
                   rowSelection={rowSelection}
@@ -2043,8 +2043,8 @@ const IntentionCustomer = Form.create()(
               >
                 <Spin spinning={this.state.loading}>
                   <div className="clearfix">
-                    <div style={{position:"absolute",top:'-52px',left:'81px',zIndex:10000}}>
-                      <OrderItemStatus deleteSign={this.state.deleteSign}/>
+                    <div style={{ position: "absolute", top: '-52px', left: '81px', zIndex: 10000 }}>
+                      <OrderItemStatus deleteSign={this.state.deleteSign} />
                     </div>
                     <FormItem
                       className="half-item"
@@ -2067,9 +2067,9 @@ const IntentionCustomer = Form.create()(
                     >
                       <span>{this.state.userName}</span>
                       <EnterpriseNameChange
-                          type='journal'
-                          style={{ marginLeft: 10 }}
-                          enterpriseId={this.state.orderUid}/>
+                        type='journal'
+                        style={{ marginLeft: 10 }}
+                        enterpriseId={this.state.orderUid} />
                     </FormItem>
 
                     <FormItem
@@ -2158,7 +2158,12 @@ const IntentionCustomer = Form.create()(
                     <FormItem
                       className="half-item"
                       {...formItemLayout}
-                      label="签单金额(万元)"
+                      label={
+                        <span>
+                          <strong style={{ color: "#f00" }}>*</strong>
+                          签单金额(万元)
+                        </span>
+                      }
                     >
                       <Input
                         placeholder="签单金额"
@@ -2169,12 +2174,17 @@ const IntentionCustomer = Form.create()(
                         }}
                         style={{ width: "240px" }}
                       />
-                      <span className="mandatory">*</span>
                     </FormItem>
                     <FormItem
                       className="half-item"
                       {...formItemLayout}
-                      label="首付金额(万元)"
+                      label={
+                        <span>
+                          <strong style={{ color: "#f00" }}>*</strong>
+                          首付金额(万元)
+                        </span>
+                      }
+
                     >
                       <Input
                         placeholder="请输入实签首款金额"
@@ -2185,7 +2195,6 @@ const IntentionCustomer = Form.create()(
                         }}
                         style={{ width: "240px" }}
                       />
-                      <span className="mandatory">*</span>
                     </FormItem>
                     <FormItem
                       className="half-item"
@@ -2224,7 +2233,7 @@ const IntentionCustomer = Form.create()(
                         }}
                         showTime
                         format="YYYY-MM-DD"
-                        onOk={() => {}}
+                        onOk={() => { }}
                         value={
                           this.state.signDate
                             ? moment(this.state.signDate)
@@ -2283,28 +2292,27 @@ const IntentionCustomer = Form.create()(
                         <p>图片建议:要清晰。</p>
                       </FormItem>
                       <FormItem
-                          labelCol={{ span: 4 }}
-                          wrapperCol={{ span: 18 }}
-                          label={
-                            <span>
-                            <strong style={{ color: "#f00" }}>*</strong>
+                        labelCol={{ span: 4 }}
+                        wrapperCol={{ span: 18 }}
+                        label={
+                          <span>
                             补充协议
                           </span>
-                          }
+                        }
                       >
                         <PicturesWall
-                            domId={'reject2'}
-                            fileList={this.getReplenishUrl}
-                            pictureUrl={this.state.replenishUrl}
+                          domId={'reject2'}
+                          fileList={this.getReplenishUrl}
+                          pictureUrl={this.state.replenishUrl}
                         />
                         <p>图片建议:要清晰。</p>
                         <Button
-                            style={{
-                              float: "right",
-                              marginRight: "140px",
-                              marginTop: "20px",
-                            }}
-                            onClick={this.getOrderLog}
+                          style={{
+                            float: "right",
+                            marginRight: "140px",
+                            marginTop: "20px",
+                          }}
+                          onClick={this.getOrderLog}
                         >
                           查看订单 日志
                         </Button>
@@ -2312,16 +2320,21 @@ const IntentionCustomer = Form.create()(
                     </div>
                     <ContentUrl
                       processStatus={this.state.processStatus}
-                      domId = {"rejectContent"}
-                      contentUrl = {this.state.contentUrl}
-                      getContentUrl = {this.getContentUrl}
-                      imgId = {"rejectImg1"}
+                      domId={"rejectContent"}
+                      contentUrl={this.state.contentUrl}
+                      getContentUrl={this.getContentUrl}
+                      imgId={"rejectImg1"}
                     />
                     <div className="clearfix">
                       <FormItem
                         labelCol={{ span: 4 }}
                         wrapperCol={{ span: 16 }}
-                        label="订单留言"
+                        label={
+                          <span>
+                            <strong style={{ color: "#f00" }}>*</strong>
+                            订单留言
+                          </span>
+                        }
                       >
                         <Input
                           type="textarea"
@@ -2428,7 +2441,7 @@ const IntentionCustomer = Form.create()(
                       </FormItem>
                     </div>
                     {/* 协单人员 */}
-                    <OrderCoor orderNo={this.state.orderNos} processStatus={this.state.processStatus} orderStatus={this.state.orderStatus}/>
+                    <OrderCoor orderNo={this.state.orderNos} processStatus={this.state.processStatus} orderStatus={this.state.orderStatus} />
                     <div>
                       <span style={{ marginLeft: "50px", fontSize: "20px" }}>
                         项目业务
@@ -2587,7 +2600,7 @@ const IntentionCustomer = Form.create()(
                   </div>
                 </Spin>
               </Form>
-            </Modal> : <div/>}
+            </Modal> : <div />}
             {/* <Modal
             visible={this.state.rizhivisible}
             className="admin-desc-content"
@@ -2615,11 +2628,11 @@ const IntentionCustomer = Form.create()(
             />
           </div>
           {this.state.projectOperationVisible ? <ProjectOperation
-              readOnly={this.state.dataInfor && Object.keys(this.state.dataInfor).length > 0 && this.state.processStatus !== 0}
-              orderNo={this.state.orderNo}
-              visible={this.state.projectOperationVisible}
-              dataInfor={this.state.dataInfor}
-              onCancel={this.nextCancel}
+            readOnly={this.state.dataInfor && Object.keys(this.state.dataInfor).length > 0 && this.state.processStatus !== 0}
+            orderNo={this.state.orderNo}
+            visible={this.state.projectOperationVisible}
+            dataInfor={this.state.dataInfor}
+            onCancel={this.nextCancel}
           /> : null}
         </div>
       );