Browse Source

新增退单退款变更企业总经理联系信息填写、财务审核新增间接成本填写

dev01 1 year ago
parent
commit
5a86733e53

+ 6 - 6
js/component/common/imgList/index.js

@@ -87,14 +87,14 @@ class ImgList extends Component {
       return isLt2M;
     } else {
       const isJPG = file.type.split('/');
-      if (isJPG[0] !== 'image' && isJPG[0] !== "application") {
-        message.error('只能上传图片或pdf文件!');
-        return false;
-      }
-      // if (isJPG[0] !== 'image') {
-      //   message.error('只能上传图片!');
+      // if (isJPG[0] !== 'image' && isJPG[0] !== "application") {
+      //   message.error('只能上传图片或pdf文件!');
       //   return false;
       // }
+      if (isJPG[0] !== 'image') {
+        message.error('只能上传图片!');
+        return false;
+      }
       if (isJPG && isLt2M) {
         // 用于计算当次选择的图片数量
         this.state.newUploadArr.push(file)

+ 28 - 24
js/component/common/selectreject/index.jsx

@@ -10,7 +10,6 @@ class SelectReject extends Component {
     super(props);
     this.state = {
       selValue: 0,
-      opList: [],
       // 0 退单退款
       theArr0: [
         { value: 0, lable: "营销员", },
@@ -21,7 +20,7 @@ class SelectReject extends Component {
         { value: 5, lable: "技术总监", },
         { value: 6, lable: "财务专员", },
         { value: 7, lable: "财务总监", },
-        { value: 8, lable: "总裁", },
+        { value: 8, lable: "公司/部门管理", },
         { value: 9, lable: "董事长", },
       ],
       // 1 项目&金额
@@ -34,7 +33,7 @@ class SelectReject extends Component {
         { value: 5, lable: "技术总监", },
         { value: 6, lable: "财务专员", },
         { value: 7, lable: "财务总监", },
-        { value: 8, lable: "总裁审核", },
+        { value: 8, lable: "公司/部门管理", },
       ],
       // 2 仅项目
       theArr2: [
@@ -46,7 +45,7 @@ class SelectReject extends Component {
         { value: 5, lable: "技术总监", },
         { value: 6, lable: "财务专员", },
         { value: 7, lable: "财务总监", },
-        { value: 8, lable: "总裁", },
+        { value: 8, lable: "公司/部门管理", },
       ],
       // 3 仅金额
       theArr3: [
@@ -56,7 +55,7 @@ class SelectReject extends Component {
         { value: 5, lable: "技术总监", },
         { value: 6, lable: "财务专员", },
         { value: 7, lable: "财务总监", },
-        { value: 8, lable: "总裁", },
+        { value: 8, lable: "公司/部门管理", },
       ],
       // 4 重报
       theArr4: [
@@ -67,7 +66,7 @@ class SelectReject extends Component {
         { value: 4, lable: "技术经理", },
         { value: 6, lable: "财务专员", },
         { value: 7, lable: "财务总监", },
-        { value: 8, lable: "总裁", },
+        { value: 8, lable: "公司/部门管理", },
       ],
       // 5 赠送
       theArr5: [
@@ -75,7 +74,7 @@ class SelectReject extends Component {
         { value: 1, lable: "营销经理", },
         { value: 2, lable: "营销管理员", },
         { value: 6, lable: "财务专员", },
-        { value: 8, lable: "总裁", },
+        { value: 8, lable: "公司/部门管理", },
       ],
       // 6 退单不退款
       theArr6: [
@@ -87,12 +86,19 @@ class SelectReject extends Component {
         { value: 5, lable: "技术总监", },
         { value: 6, lable: "财务专员", },
         { value: 7, lable: "财务总监", },
-        { value: 8, lable: "总裁", },
+        { value: 8, lable: "公司/部门管理", },
       ],
       // 7 仅变更合同
       theArr7: [
-        { value: 0, lable: "营销员发起", },
-        { value: 2, lable: "营销管理员审核", },
+        { value: 0, lable: "营销员", },
+        { value: 2, lable: "营销管理员", },
+      ],
+      // 8 框架协议
+      theArr8: [
+        { value: 0, lable: "营销员", },
+        { value: 1, lable: "营销经理", },
+        { value: 2, lable: "营销管理员", },
+        { value: 6, lable: "财务专员", },
       ],
     };
     this.onChange = this.onChange.bind(this);
@@ -108,18 +114,7 @@ class SelectReject extends Component {
   }
 
   componentWillReceiveProps(nextProps) {
-    const { theArr0, theArr1, theArr2, theArr3, theArr4, theArr5, theArr6, theArr7 } = this.state
-    const { type } = this.props
-    this.setState({
-      opList: type == 0
-        ? theArr0 : type == 1
-          ? theArr1 : type == 2
-            ? theArr2 : type == 3
-              ? theArr3 : type == 4
-                ? theArr4 : type == 5
-                  ? theArr5 : type == 6
-                    ? theArr6 : type == 7 && theArr7
-    })
+
   }
 
 
@@ -132,8 +127,17 @@ class SelectReject extends Component {
   }
 
   render() {
-    const { selValue, opList } = this.state
-    const { processState } = this.props
+    const { selValue, theArr0, theArr1, theArr2, theArr3, theArr4, theArr5, theArr6, theArr7, theArr8 } = this.state
+    const { processState, type } = this.props
+    const opList = type == 0
+      ? theArr0 : type == 1
+        ? theArr1 : type == 2
+          ? theArr2 : type == 3
+            ? theArr3 : type == 4
+              ? theArr4 : type == 5
+                ? theArr5 : type == 6
+                  ? theArr6 : type == 7
+                    ? theArr7 : type == 8 && theArr8
     return (
       opList.length > 0 &&
       <Select

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

@@ -3070,6 +3070,10 @@ const NewService = Form.create()(
                   isNew: !thisdata.contractPictureUrl ? false : true,
                   processState: thisdata.processState,
                   status: thisdata.status,
+                  contacts: thisdata.contacts, // 企业联系人
+                  contactMobile: thisdata.contactMobile, // 企业联系方式
+                  managerContacts: thisdata.managerContacts, // 企业总经理
+                  managerContactMobile: thisdata.managerContactMobile, // 企业总经理联系方式
                 });
                 this.proList();
                 this.cuiList();
@@ -4494,6 +4498,37 @@ const NewService = Form.create()(
         message.warning("请正确填写备注信息");
         return false;
       }
+
+      if (this.state.typeChange == 0) {
+        let reg1 = /^1[3456789]\d{9}$/
+        let reg2 = /^0\d{2,3}-?\d{7,8}$/
+        let reg3 = /[^\u4E00-\u9FA5]/g
+        if (!this.state.managerContacts || reg3.test(this.state.managerContacts)) {
+          message.warning("请正确填写企业总经理姓名");
+          return false;
+        }
+        if (!this.state.managerContactMobile) {
+          message.warning("请正确填写企业总经理联系电话");
+          return false;
+        }
+        if (!reg1.test(this.state.managerContactMobile) && !reg2.test(this.state.managerContactMobile)) {
+          message.warning("请正确填写企业总经理联系电话");
+          return false;
+        }
+        if (!this.state.contacts || reg3.test(this.state.contacts)) {
+          message.warning("请正确填写企业联系人姓名");
+          return false;
+        }
+        if (!this.state.contactMobile) {
+          message.warning("请正确填写企业联系人联系方式");
+          return false;
+        }
+        if (!reg1.test(this.state.contactMobile) && !reg2.test(this.state.contactMobile)) {
+          message.warning("请正确填写企业联系人联系方式");
+          return false;
+        }
+      }
+
       let theorgCodeUrl = [];
       if (this.state.voucherUrl.length) {
         let picArr = [];
@@ -4549,6 +4584,11 @@ const NewService = Form.create()(
           type: this.state.typeChange,
           contractPictureUrl: this.state.isNew
             ? newContractUrl : undefined,//合同替换件
+
+          contacts: this.state.typeChange == 0 ? this.state.contacts : undefined,
+          contactMobile: this.state.typeChange == 0 ? this.state.contactMobile : undefined,
+          managerContacts: this.state.typeChange == 0 ? this.state.managerContacts : undefined,
+          managerContactMobile: this.state.typeChange == 0 ? this.state.managerContactMobile : undefined,
         },
       }).done(
         function (data) {
@@ -7644,6 +7684,92 @@ const NewService = Form.create()(
                                 />
                               </FormItem>
                             </div>
+                            {/* 退单退款 */}
+                            {this.state.isCaoGao && this.state.typeChange == 0 &&
+                              <div className="clearfix">
+                                <div className="clearfix">
+                                  <FormItem
+                                    className="half-item"
+                                    {...formItemLayout}
+                                    label="企业总经理姓名"
+                                  >
+                                    <Input
+                                      placeholder="请输入企业总经理姓名"
+                                      value={this.state.managerContacts}
+                                      onChange={(e) => {
+                                        this.setState({
+                                          managerContacts: e.target.value,
+                                        });
+                                      }}
+                                      style={{ width: "240px" }}
+                                    />
+                                  </FormItem>
+                                  <FormItem
+                                    className="half-item"
+                                    {...formItemLayout}
+                                    label="企业总经理联系电话"
+                                  >
+                                    <Input
+                                      placeholder="请输入企业总经理联系电话"
+                                      value={this.state.managerContactMobile}
+                                      onChange={(e) => {
+                                        this.setState({
+                                          managerContactMobile: e.target.value,
+                                        });
+                                      }}
+                                      style={{ width: "240px" }}
+                                    />
+                                  </FormItem>
+                                </div>
+
+                                <div className="clearfix">
+                                  <FormItem
+                                    className="half-item"
+                                    {...formItemLayout}
+                                    label="企业联系人姓名"
+                                  >
+                                    <Input
+                                      placeholder="请输入企业联系人姓名"
+                                      value={this.state.contacts}
+                                      onChange={(e) => {
+                                        this.setState({
+                                          contacts: e.target.value,
+                                        });
+                                      }}
+                                      style={{ width: "240px" }}
+                                    />
+                                  </FormItem>
+                                  <FormItem
+                                    className="half-item"
+                                    {...formItemLayout}
+                                    label="企业联系人联系方式"
+                                  >
+                                    <Input
+                                      placeholder="请输入企业联系人联系方式"
+                                      value={this.state.contactMobile}
+                                      onChange={(e) => {
+                                        this.setState({
+                                          contactMobile: e.target.value,
+                                        });
+                                      }}
+                                      style={{ width: "240px" }}
+                                    />
+                                  </FormItem>
+                                </div>
+
+                                <div className="clearfix">
+                                  <FormItem
+                                    className="half-item"
+                                    {...formItemLayout}
+                                    label={<span style={{ color: "red" }}>注</span>}
+                                  >
+                                    <span style={{ color: "red" }}>
+                                      请填写以上信息,公司总经理将与企业联系交流
+                                    </span>
+                                  </FormItem>
+                                </div>
+                              </div>
+                            }
                             <div
                               style={{
                                 display: this.state.isCaoGao ? "block" : "none",
@@ -7996,6 +8122,50 @@ const NewService = Form.create()(
                                 </span>
                               </FormItem>
                             </div> */}
+                              {this.state.detailChange.typeChange == 0 &&
+                                <div className="clearfix">
+                                  <FormItem
+                                    {...formItemLayout}
+                                    className="half-item"
+                                    label="企业总经理姓名"
+                                  >
+                                    <span>
+                                      {this.state.detailChange.managerContacts}
+                                    </span>
+                                  </FormItem>
+                                  <FormItem
+                                    {...formItemLayout}
+                                    className="half-item"
+                                    label="企业总经理联系电话"
+                                  >
+                                    <span>
+                                      {this.state.detailChange.managerContactMobile}
+                                    </span>
+                                  </FormItem>
+                                </div>
+                              }
+                              {this.state.detailChange.typeChange == 0 &&
+                                <div className="clearfix">
+                                  <FormItem
+                                    {...formItemLayout}
+                                    className="half-item"
+                                    label="企业联系人姓名"
+                                  >
+                                    <span>
+                                      {this.state.detailChange.contacts}
+                                    </span>
+                                  </FormItem>
+                                  <FormItem
+                                    {...formItemLayout}
+                                    className="half-item"
+                                    label="企业联系人联系方式"
+                                  >
+                                    <span>
+                                      {this.state.detailChange.contactMobile}
+                                    </span>
+                                  </FormItem>
+                                </div>
+                              }
                               <div className="clearfix">
                                 <FormItem
                                   {...formItemLayout}

+ 1 - 0
js/component/manageCenter/order/orderNew/changeComponent/agreeButton.js

@@ -178,6 +178,7 @@ class ReasonInput extends Component {
     if (this.props.data.status == 2 && this.props.processState == 6) {
       if (
         moneyVerify(this.props.ajaxData.cwCost) ||
+        moneyVerify(this.props.ajaxData.cwIndirectCost) ||
         moneyVerify(this.props.ajaxData.refundableAmount)
       ) {
         return;

+ 128 - 0
js/component/manageCenter/order/orderNew/changeComponent/changeApply.js

@@ -1007,6 +1007,39 @@ class ChangeApply extends Component {
         return;
       }
     }
+
+
+    if (this.state.data.type == 0) {
+      let reg1 = /^1[3456789]\d{9}$/
+      let reg2 = /^0\d{2,3}-?\d{7,8}$/
+      let reg3 = /[^\u4E00-\u9FA5]/g
+      if (!this.state.data.managerContacts || reg3.test(this.state.data.managerContacts)) {
+        message.warning("请正确填写企业总经理姓名");
+        return false;
+      }
+      if (!this.state.data.managerContactMobile) {
+        message.warning("请正确填写企业总经理联系电话");
+        return false;
+      }
+      if (!reg1.test(this.state.data.managerContactMobile) && !reg2.test(this.state.data.managerContactMobile)) {
+        message.warning("请正确填写企业总经理联系电话");
+        return false;
+      }
+      if (!this.state.data.contacts || reg3.test(this.state.data.contacts)) {
+        message.warning("请正确填写企业联系人姓名");
+        return false;
+      }
+      if (!this.state.data.contactMobile) {
+        message.warning("请正确填写企业联系人联系方式");
+        return false;
+      }
+      if (!reg1.test(this.state.data.contactMobile) && !reg2.test(this.state.data.contactMobile)) {
+        message.warning("请正确填写企业联系人联系方式");
+        return false;
+      }
+    }
+
+
     let newContractUrl = [];
     if (this.state.newContractUrl.length) {
       let cArr = [];
@@ -2577,6 +2610,101 @@ class ChangeApply extends Component {
               />
             </FormItem>
           </div>
+          {/* 退单退款 */}
+          {this.state.data.type == 0 &&
+            <div className="clearfix">
+              <div className="clearfix">
+                <FormItem
+                  className="half-item"
+                  {...formItemLayout}
+                  label="企业总经理姓名"
+                >
+                  <Input
+                    placeholder="请输入企业总经理姓名"
+                    value={data.managerContacts}
+                    onChange={(e) => {
+
+                      let data = this.state.data;
+                      data.managerContacts = e.target.value;
+                      this.setState({ data });
+
+                    }}
+                    style={{ width: "240px" }}
+                  />
+                </FormItem>
+                <FormItem
+                  className="half-item"
+                  {...formItemLayout}
+                  label="企业总经理联系电话"
+                >
+                  <Input
+                    placeholder="请输入企业总经理联系电话"
+                    value={data.managerContactMobile}
+                    onChange={(e) => {
+
+                      let data = this.state.data;
+                      data.managerContactMobile = e.target.value;
+                      this.setState({ data });
+
+                    }}
+                    style={{ width: "240px" }}
+                  />
+                </FormItem>
+              </div>
+
+              <div className="clearfix">
+                <FormItem
+                  className="half-item"
+                  {...formItemLayout}
+                  label="企业联系人姓名"
+                >
+                  <Input
+                    placeholder="请输入企业联系人姓名"
+                    value={data.contacts}
+                    onChange={(e) => {
+
+                      let data = this.state.data;
+                      data.contacts = e.target.value;
+                      this.setState({ data });
+
+                    }}
+                    style={{ width: "240px" }}
+                  />
+                </FormItem>
+                <FormItem
+                  className="half-item"
+                  {...formItemLayout}
+                  label="企业联系人联系方式"
+                >
+                  <Input
+                    placeholder="请输入企业联系人联系方式"
+                    value={data.contactMobile}
+                    onChange={(e) => {
+
+                      let data = this.state.data;
+                      data.contactMobile = e.target.value;
+                      this.setState({ data });
+
+                    }}
+                    style={{ width: "240px" }}
+                  />
+                </FormItem>
+              </div>
+
+              <div className="clearfix">
+                <FormItem
+                  className="half-item"
+                  {...formItemLayout}
+                  label={<span style={{ color: "red" }}>注</span>}
+                >
+                  <span style={{ color: "red" }}>
+                    请填写以上信息,公司总经理将与企业联系交流
+                  </span>
+                </FormItem>
+              </div>
+            </div>
+          }
+
           <div>
             <div>
               <span

+ 36 - 7
js/component/manageCenter/order/orderNew/changeComponent/changeDetailCwjl.js

@@ -935,6 +935,25 @@ class ChangeDetail extends Component {
         formItemLayoutB: formItemLayout,
         dataB: getChangeType(this.props.data.type)
       },
+
+      {
+        labelA: this.props.data.type == 0 ? "企业总经理姓名" : "",
+        formItemLayoutA: formItemLayout,
+        dataA: this.props.data.managerContacts,
+        labelB: "企业总经理联系电话",
+        formItemLayoutB: formItemLayout,
+        dataB: this.props.data.managerContactMobile,
+      },
+
+      {
+        labelA: this.props.data.type == 0 ? "企业联系人姓名" : "",
+        formItemLayoutA: formItemLayout,
+        dataA: this.props.data.contacts,
+        labelB: "企业联系人联系方式",
+        formItemLayoutB: formItemLayout,
+        dataB: this.props.data.contactMobile,
+      },
+
       {
         labelA: "合同额(万元)",
         formItemLayoutA: formItemLayout,
@@ -993,8 +1012,9 @@ class ChangeDetail extends Component {
       }
     ];
     const financeData = [
+
       {
-        labelA: "发生成本(万元)",
+        labelA: "发生直接成本(万元)",
         formItemLayoutA: formItemLayout,
         dataA: this.props.data.cwCost ? this.props.data.cwCost : "0",
         onChangeA: value => {
@@ -1002,18 +1022,27 @@ class ChangeDetail extends Component {
             cwCost: value
           });
         },
-        labelB: "应退金额(万元)",
+        labelB: "发生间接成本(万元)",
         formItemLayoutB: formItemLayout,
-        dataB: this.props.data.refundableAmount
-          ? this.props.data.refundableAmount
-          : "0",
+        dataB: this.props.data.cwIndirectCost ? this.props.data.cwIndirectCost : "0",
         onChangeB: value => {
           this.setState({
+            cwIndirectCost: value
+          });
+        },
+        mark: true
+      },
+      {
+        labelA: "应退金额(万元)",
+        formItemLayoutA: formItemLayout,
+        dataA: this.props.data.refundableAmount ? this.props.data.refundableAmount : "0",
+        onChangeA: value => {
+          this.setState({
             refundableAmount: value
           });
         },
         mark: true
-      }
+      },
       // {
       //   labelA: "备注",
       //   formItemLayoutA: formItemLayout,
@@ -1100,7 +1129,7 @@ class ChangeDetail extends Component {
             合同变更记录
           </h2>
           {pageData.map((item, index) => {
-            return <Itemlist key={index} pageData={item} id={this.props.id} />;
+            return !!item.labelA && <Itemlist key={index} pageData={item} id={this.props.id} />;
           })}
           <Form.Item
             label="变更凭证"

+ 28 - 4
js/component/manageCenter/order/orderNew/changeComponent/changeDetailCwzj.js

@@ -367,6 +367,25 @@ class ChangeDetail extends Component {
         formItemLayoutB: formItemLayout,
         dataB: getChangeType(this.props.data.type)
       },
+
+      {
+        labelA: this.props.data.type == 0 ? "企业总经理姓名" : "",
+        formItemLayoutA: formItemLayout,
+        dataA: this.props.data.managerContacts,
+        labelB: "企业总经理联系电话",
+        formItemLayoutB: formItemLayout,
+        dataB: this.props.data.managerContactMobile,
+      },
+
+      {
+        labelA: this.props.data.type == 0 ? "企业联系人姓名" : "",
+        formItemLayoutA: formItemLayout,
+        dataA: this.props.data.contacts,
+        labelB: "企业联系人联系方式",
+        formItemLayoutB: formItemLayout,
+        dataB: this.props.data.contactMobile,
+      },
+
       {
         labelA: "合同额(万元)",
         formItemLayoutA: formItemLayout,
@@ -442,12 +461,17 @@ class ChangeDetail extends Component {
       //   dataB: this.props.data.invoiceAmount
       // },
       {
-        labelA: "发生成本(万元)",
+        labelA: "发生直接成本(万元)",
         formItemLayoutA: formItemLayout,
         dataA: this.props.data.cwCost,
-        labelB: "应退金额(万元)",
+        labelB: "发生间接成本(万元)",
         formItemLayoutB: formItemLayout,
-        dataB: this.props.data.refundableAmount
+        dataB: this.props.data.cwIndirectCost
+      },
+      {
+        labelA: "应退金额(万元)",
+        formItemLayoutA: formItemLayout,
+        dataA: this.props.data.refundableAmount,
       }
       // {
       //   labelA: "补充资料/备注",
@@ -529,7 +553,7 @@ class ChangeDetail extends Component {
             合同变更记录
           </h2>
           {pageData.map((item, index) => {
-            return <Itemlist key={index} pageData={item} orderUid={this.props.orderUid} id={this.props.id} />;
+            return !!item.labelA && <Itemlist key={index} pageData={item} orderUid={this.props.orderUid} id={this.props.id} />;
           })}
           <Form.Item
             label="变更凭证"

+ 60 - 131
js/component/manageCenter/order/orderNew/changeComponent/changeDetailCwzy.js

@@ -990,6 +990,24 @@ class ChangeDetail extends Component {
         formItemLayoutB: formItemLayout,
         dataB: getChangeType(this.props.data.type)
       },
+
+      {
+        labelA: this.props.data.type == 0 ? "企业总经理姓名" : "",
+        formItemLayoutA: formItemLayout,
+        dataA: this.props.data.managerContacts,
+        labelB: "企业总经理联系电话",
+        formItemLayoutB: formItemLayout,
+        dataB: this.props.data.managerContactMobile,
+      },
+
+      {
+        labelA: this.props.data.type == 0 ? "企业联系人姓名" : "",
+        formItemLayoutA: formItemLayout,
+        dataA: this.props.data.contacts,
+        labelB: "企业联系人联系方式",
+        formItemLayoutB: formItemLayout,
+        dataB: this.props.data.contactMobile,
+      },
       {
         labelA: "合同额(万元)",
         formItemLayoutA: formItemLayout,
@@ -1049,7 +1067,7 @@ class ChangeDetail extends Component {
     ];
     const financeData = [
       {
-        labelA: "发生成本(万元)",
+        labelA: "发生直接成本(万元)",
         formItemLayoutA: formItemLayout,
         dataA: this.props.data.cwCost ? this.props.data.cwCost : "0",
         onChangeA: value => {
@@ -1057,29 +1075,25 @@ class ChangeDetail extends Component {
             cwCost: value
           });
         },
-        labelB: "应退金额(万元)",
+        labelB: "发生间接成本(万元)",
         formItemLayoutB: formItemLayout,
-        dataB: this.props.data.refundableAmount
-          ? this.props.data.refundableAmount
-          : "0",
+        dataB: this.props.data.cwIndirectCost ? this.props.data.cwIndirectCost : "0",
         onChangeB: value => {
           this.setState({
+            cwIndirectCost: value
+          });
+        },
+      },
+      {
+        labelA: "应退金额(万元)",
+        formItemLayoutA: formItemLayout,
+        dataA: this.props.data.refundableAmount ? this.props.data.refundableAmount : "0",
+        onChangeA: value => {
+          this.setState({
             refundableAmount: value
           });
         },
-        mark: true
       }
-      // {
-      //   labelA: "备注",
-      //   formItemLayoutA: formItemLayout,
-      //   dataA: this.props.data.cwRemarks,
-      //   onChangeA: value => {
-      //     this.setState({
-      //       reason: value
-      //     });
-      //   },
-      //   mark: false
-      // }
     ];
     const buttonData = [
       {
@@ -1156,7 +1170,7 @@ class ChangeDetail extends Component {
             合同变更记录
           </h2>
           {pageData.map((item, index) => {
-            return <Itemlist key={index} pageData={item} id={this.props.id} />;
+            return !!item.labelA && <Itemlist key={index} pageData={item} id={this.props.id} />;
           })}
           <Form.Item
             label="变更凭证"
@@ -1294,42 +1308,6 @@ class ChangeDetail extends Component {
               <h3 style={{ marginLeft: 20, fontWeight: 800, marginBottom: 10, marginTop: '10px' }}>
                 当前财务状态(财务填写)
               </h3>
-              {/* <div className="clearfix">
-                <Form.Item
-                  className="half-item"
-                  label="收款时间"
-                  labelCol={{ span: 8 }}
-                  wrapperCol={{ span: 14 }}
-                >
-                  <span>{this.props.data.paymentTimes}</span>
-                </Form.Item>
-                <Form.Item
-                  className="half-item"
-                  label="收款金额(万元)"
-                  labelCol={{ span: 8 }}
-                  wrapperCol={{ span: 14 }}
-                >
-                  <span>{this.props.data.paymentAmount}</span>
-                </Form.Item>
-              </div>
-              <div className="clearfix">
-                <Form.Item
-                  className="half-item"
-                  label="开票时间"
-                  labelCol={{ span: 8 }}
-                  wrapperCol={{ span: 14 }}
-                >
-                  <span>{this.props.data.invoiceTimes}</span>
-                </Form.Item>
-                <Form.Item
-                  className="half-item"
-                  label="开票金额(万元)"
-                  labelCol={{ span: 8 }}
-                  wrapperCol={{ span: 14 }}
-                >
-                  <span>{this.props.data.invoiceAmount}</span>
-                </Form.Item>
-              </div> */}
               {financeData.map((item, index) => {
                 return <Itemlist key={index} pageData={item} id={this.props.id} />;
               })}
@@ -1340,104 +1318,45 @@ class ChangeDetail extends Component {
                 当前财务状态(财务填写)
               </h3>
               <div className="clearfix">
-                {/* <Form.Item
-                  className="half-item"
-                  label="收款时间"
-                  labelCol={{ span: 8 }}
-                  wrapperCol={{ span: 14 }}
-                >
-                  <DatePicker
-                    style={{ width: 160 }}
-                    value={
-                      this.state.paymentTimes
-                        ? moment(this.state.paymentTimes)
-                        : null
-                    }
-                    onChange={(_data, dataString) => {
-                      this.setState({
-                        paymentTimes: dataString
-                      });
-                    }}
-                  />
-                </Form.Item>
                 <Form.Item
-                  className="half-item"
-                  label="收款金额(万元)"
-                  labelCol={{ span: 8 }}
-                  wrapperCol={{ span: 14 }}
+                  style={{ width: "33%", display: "inline-block" }}
+                  label="发生直接成本(万元)"
+                  labelCol={{ span: 12 }}
+                  wrapperCol={{ span: 12 }}
                 >
                   <Input
                     style={{ width: 160 }}
-                    value={this.state.paymentAmount}
-                    placeholder="请输入收款金额"
-                    onChange={e => {
-                      this.setState({
-                        paymentAmount: e.target.value
-                      });
-                    }}
-                  />
-                </Form.Item>
-              </div>
-              <div className="clearfix">
-                <Form.Item
-                  className="half-item"
-                  label="开票时间"
-                  labelCol={{ span: 8 }}
-                  wrapperCol={{ span: 14 }}
-                >
-                  <DatePicker
-                    style={{ width: 160 }}
-                    value={
-                      this.state.invoiceTimes
-                        ? moment(this.state.invoiceTimes)
-                        : null
-                    }
-                    onChange={(_data, dataString) => {
+                    value={this.state.cwCost}
+                    placeholder="请输入发生直接成本"
+                    onChange={(e) => {
                       this.setState({
-                        invoiceTimes: dataString
+                        cwCost: e.target.value,
                       });
                     }}
                   />
                 </Form.Item>
                 <Form.Item
-                  className="half-item"
-                  label="开票金额(万元)"
-                  labelCol={{ span: 8 }}
-                  wrapperCol={{ span: 14 }}
+                  style={{ width: "33%", display: "inline-block" }}
+                  label="发生间接成本(万元)"
+                  labelCol={{ span: 12 }}
+                  wrapperCol={{ span: 12 }}
                 >
                   <Input
                     style={{ width: 160 }}
-                    value={this.state.invoiceAmount}
-                    placeholder="请输入开票金额"
-                    onChange={e => {
-                      this.setState({
-                        invoiceAmount: e.target.value
-                      });
-                    }}
-                  />
-                </Form.Item> */}
-                <Form.Item
-                  className="half-item"
-                  label="发生成本(万元)"
-                  labelCol={{ span: 8 }}
-                  wrapperCol={{ span: 14 }}
-                >
-                  <Input
-                    style={{ width: 160 }}
-                    value={this.state.cwCost}
-                    placeholder="请输入发生成本"
+                    value={this.state.cwIndirectCost}
+                    placeholder="请输入发生间接成本"
                     onChange={(e) => {
                       this.setState({
-                        cwCost: e.target.value,
+                        cwIndirectCost: e.target.value,
                       });
                     }}
                   />
                 </Form.Item>
                 <Form.Item
-                  className="half-item"
+                  style={{ width: "33%", display: "inline-block" }}
                   label="应退金额(万元)"
-                  labelCol={{ span: 8 }}
-                  wrapperCol={{ span: 14 }}
+                  labelCol={{ span: 12 }}
+                  wrapperCol={{ span: 12 }}
                 >
                   <Input
                     style={{ width: 160 }}
@@ -1451,6 +1370,16 @@ class ChangeDetail extends Component {
                   />
                 </Form.Item>
               </div>
+              <div className="clearfix">
+                <Form.Item
+                  style={{ width: "70%", }}
+                  label={<span style={{ color: "red" }}>注</span>}
+                  labelCol={{ span: 12 }}
+                  wrapperCol={{ span: 12 }}
+                >
+                  <span style={{ color: "red" }}>除了直接支出的第三方成本及项目奖金提成之外的其他人工成本、系统成本</span>
+                </Form.Item>
+              </div>
               <div
                 style={{
                   marginTop: "10px",

+ 28 - 4
js/component/manageCenter/order/orderNew/changeComponent/changeDetailJsjl.js

@@ -261,6 +261,25 @@ class ChangeDetail extends Component {
         formItemLayoutB: formItemLayout,
         dataB: getChangeType(this.props.data.type),
       },
+
+      {
+        labelA: this.props.data.type == 0 ? "企业总经理姓名" : "",
+        formItemLayoutA: formItemLayout,
+        dataA: this.props.data.managerContacts,
+        labelB: "企业总经理联系电话",
+        formItemLayoutB: formItemLayout,
+        dataB: this.props.data.managerContactMobile,
+      },
+
+      {
+        labelA: this.props.data.type == 0 ? "企业联系人姓名" : "",
+        formItemLayoutA: formItemLayout,
+        dataA: this.props.data.contacts,
+        labelB: "企业联系人联系方式",
+        formItemLayoutB: formItemLayout,
+        dataB: this.props.data.contactMobile,
+      },
+
       {
         labelA: "合同额(万元)",
         formItemLayoutA: formItemLayout,
@@ -320,13 +339,18 @@ class ChangeDetail extends Component {
     ];
     const financeData = [
       {
-        labelA: "发生成本(万元)",
+        labelA: "发生直接成本(万元)",
         formItemLayoutA: formItemLayout,
         dataA: this.props.data.cwCost,
-        labelB: "应退金额(万元)",
+        labelB: "发生间接成本(万元)",
         formItemLayoutB: formItemLayout,
-        dataB: this.props.data.refundableAmount,
+        dataB: this.props.data.cwIndirectCost
       },
+      {
+        labelA: "应退金额(万元)",
+        formItemLayoutA: formItemLayout,
+        dataA: this.props.data.refundableAmount
+      }
     ];
     const buttonData = [
       {
@@ -402,7 +426,7 @@ class ChangeDetail extends Component {
             合同变更记录
           </h2>
           {pageData.map((item, index) => {
-            return <Itemlist key={index} pageData={item} id={this.props.id} />;
+            return !!item.labelA &&  <Itemlist key={index} pageData={item} id={this.props.id} />;
           })}
           <Form.Item
             label="变更凭证"

+ 27 - 3
js/component/manageCenter/order/orderNew/changeComponent/changeDetailJsy.js

@@ -245,6 +245,25 @@ class ChangeDetail extends Component {
         formItemLayoutB: formItemLayout,
         dataB: getChangeType(this.props.data.type),
       },
+
+      {
+        labelA: this.props.data.type == 0 ? "企业总经理姓名" : "",
+        formItemLayoutA: formItemLayout,
+        dataA: this.props.data.managerContacts,
+        labelB: "企业总经理联系电话",
+        formItemLayoutB: formItemLayout,
+        dataB: this.props.data.managerContactMobile,
+      },
+
+      {
+        labelA: this.props.data.type == 0 ? "企业联系人姓名" : "",
+        formItemLayoutA: formItemLayout,
+        dataA: this.props.data.contacts,
+        labelB: "企业联系人联系方式",
+        formItemLayoutB: formItemLayout,
+        dataB: this.props.data.contactMobile,
+      },
+
       {
         labelA: "合同额(万元)",
         formItemLayoutA: formItemLayout,
@@ -305,14 +324,19 @@ class ChangeDetail extends Component {
         dataB: "***",
       },
       {
-        labelA: "发生成本(万元)",
+        labelA: "发生直接成本(万元)",
         formItemLayoutA: formItemLayout,
         dataA: "***",
-        labelB: "应退金额(万元)",
+        labelB: "发生间接成本(万元)",
         formItemLayoutB: formItemLayout,
         dataB: "***",
       },
       {
+        labelA: "应退金额(万元)",
+        formItemLayoutA: formItemLayout,
+        dataA: "***",
+      },
+      {
         labelA: "补充资料/备注",
         formItemLayoutA: formItemLayout,
         dataA: this.props.data.cwRemarks,
@@ -392,7 +416,7 @@ class ChangeDetail extends Component {
             合同变更记录
           </h2>
           {pageData.map((item, index) => {
-            return <Itemlist key={index} pageData={item} orderUid={this.props.orderUid} id={this.props.id} />;
+            return !!item.labelA &&  <Itemlist key={index} pageData={item} orderUid={this.props.orderUid} id={this.props.id} />;
           })}
           <Form.Item
             label="变更凭证"

+ 28 - 4
js/component/manageCenter/order/orderNew/changeComponent/changeDetailJszj.js

@@ -262,6 +262,25 @@ class ChangeDetail extends Component {
         formItemLayoutB: formItemLayout,
         dataB: getChangeType(this.props.data.type),
       },
+
+      {
+        labelA: this.props.data.type == 0 ? "企业总经理姓名" : "",
+        formItemLayoutA: formItemLayout,
+        dataA: this.props.data.managerContacts,
+        labelB: "企业总经理联系电话",
+        formItemLayoutB: formItemLayout,
+        dataB: this.props.data.managerContactMobile,
+      },
+
+      {
+        labelA: this.props.data.type == 0 ? "企业联系人姓名" : "",
+        formItemLayoutA: formItemLayout,
+        dataA: this.props.data.contacts,
+        labelB: "企业联系人联系方式",
+        formItemLayoutB: formItemLayout,
+        dataB: this.props.data.contactMobile,
+      },
+
       {
         labelA: "合同额(万元)",
         formItemLayoutA: formItemLayout,
@@ -321,13 +340,18 @@ class ChangeDetail extends Component {
     ];
     const financeData = [
       {
-        labelA: "发生成本(万元)",
+        labelA: "发生直接成本(万元)",
         formItemLayoutA: formItemLayout,
         dataA: this.props.data.cwCost,
-        labelB: "应退金额(万元)",
+        labelB: "发生间接成本(万元)",
         formItemLayoutB: formItemLayout,
-        dataB: this.props.data.refundableAmount,
+        dataB: this.props.data.cwIndirectCost
       },
+      {
+        labelA: "应退金额(万元)",
+        formItemLayoutA: formItemLayout,
+        dataA: this.props.data.refundableAmount
+      }
     ];
     const buttonData = [
       {
@@ -403,7 +427,7 @@ class ChangeDetail extends Component {
             合同变更记录
           </h2>
           {pageData.map((item, index) => {
-            return <Itemlist key={index} pageData={item} orderUid={this.props.orderUid} id={this.props.id} />;
+            return !!item.labelA &&  <Itemlist key={index} pageData={item} orderUid={this.props.orderUid} id={this.props.id} />;
           })}
           <Form.Item
             label="变更凭证"

+ 28 - 4
js/component/manageCenter/order/orderNew/changeComponent/changeDetailYxgly.js

@@ -314,6 +314,25 @@ class ChangeDetail extends Component {
         formItemLayoutB: formItemLayout,
         dataB: getChangeType(this.props.data.type),
       },
+
+      {
+        labelA: this.props.data.type == 0 ? "企业总经理姓名" : "",
+        formItemLayoutA: formItemLayout,
+        dataA: this.props.data.managerContacts,
+        labelB: "企业总经理联系电话",
+        formItemLayoutB: formItemLayout,
+        dataB: this.props.data.managerContactMobile,
+      },
+
+      {
+        labelA: this.props.data.type == 0 ? "企业联系人姓名" : "",
+        formItemLayoutA: formItemLayout,
+        dataA: this.props.data.contacts,
+        labelB: "企业联系人联系方式",
+        formItemLayoutB: formItemLayout,
+        dataB: this.props.data.contactMobile,
+      },
+
       {
         labelA: "合同额(万元)",
         formItemLayoutA: formItemLayout,
@@ -358,13 +377,18 @@ class ChangeDetail extends Component {
     ];
     const financeData = [
       {
-        labelA: "发生成本(万元)",
+        labelA: "发生直接成本(万元)",
         formItemLayoutA: formItemLayout,
         dataA: this.props.data.cwCost,
-        labelB: "应退金额(万元)",
+        labelB: "发生间接成本(万元)",
         formItemLayoutB: formItemLayout,
-        dataB: this.props.data.refundableAmount,
+        dataB: this.props.data.cwIndirectCost
       },
+      {
+        labelA: "应退金额(万元)",
+        formItemLayoutA: formItemLayout,
+        dataA: this.props.data.refundableAmount
+      }
     ];
     const buttonData = [
       {
@@ -442,7 +466,7 @@ class ChangeDetail extends Component {
             合同变更记录
           </h2>
           {pageData.map((item, index) => {
-            return <Itemlist orderUid={this.props.orderUid} key={index} pageData={item} id={this.props.id} />;
+            return !!item.labelA && <Itemlist orderUid={this.props.orderUid} key={index} pageData={item} id={this.props.id} />;
           })}
           <Form.Item
             label="变更凭证"

+ 29 - 4
js/component/manageCenter/order/orderNew/changeComponent/changeDetailYxjl.js

@@ -314,6 +314,25 @@ class ChangeDetail extends Component {
         formItemLayoutB: formItemLayout,
         dataB: getChangeType(this.props.data.type),
       },
+
+      {
+        labelA: this.props.data.type == 0 ? "企业总经理姓名" : "",
+        formItemLayoutA: formItemLayout,
+        dataA: this.props.data.managerContacts,
+        labelB: "企业总经理联系电话",
+        formItemLayoutB: formItemLayout,
+        dataB: this.props.data.managerContactMobile,
+      },
+
+      {
+        labelA: this.props.data.type == 0 ? "企业联系人姓名" : "",
+        formItemLayoutA: formItemLayout,
+        dataA: this.props.data.contacts,
+        labelB: "企业联系人联系方式",
+        formItemLayoutB: formItemLayout,
+        dataB: this.props.data.contactMobile,
+      },
+
       {
         labelA: "合同额(万元)",
         formItemLayoutA: formItemLayout,
@@ -357,14 +376,20 @@ class ChangeDetail extends Component {
       },
     ];
     const financeData = [
+
       {
-        labelA: "发生成本(万元)",
+        labelA: "发生直接成本(万元)",
         formItemLayoutA: formItemLayout,
         dataA: this.props.data.cwCost,
-        labelB: "应退金额(万元)",
+        labelB: "发生间接成本(万元)",
         formItemLayoutB: formItemLayout,
-        dataB: this.props.data.refundableAmount,
+        dataB: this.props.data.cwIndirectCost
       },
+      {
+        labelA: "应退金额(万元)",
+        formItemLayoutA: formItemLayout,
+        dataA: this.props.data.refundableAmount
+      }
     ];
     const buttonData = [
       {
@@ -442,7 +467,7 @@ class ChangeDetail extends Component {
             合同变更记录
           </h2>
           {pageData.map((item, index) => {
-            return <Itemlist orderUid={this.props.orderUid} key={index} pageData={item} id={this.props.id} />;
+            return !!item.labelA && <Itemlist orderUid={this.props.orderUid} key={index} pageData={item} id={this.props.id} />;
           })}
           <Form.Item
             label="变更凭证"

+ 28 - 4
js/component/manageCenter/order/orderNew/changeComponent/changeDetailYxy.js

@@ -349,6 +349,25 @@ class ChangeDetail extends Component {
         formItemLayoutB: formItemLayout,
         dataB: getChangeType(this.props.data.type)
       },
+
+      {
+        labelA: this.props.data.type == 0 ? "企业总经理姓名" : "",
+        formItemLayoutA: formItemLayout,
+        dataA: this.props.data.managerContacts,
+        labelB: "企业总经理联系电话",
+        formItemLayoutB: formItemLayout,
+        dataB: this.props.data.managerContactMobile,
+      },
+
+      {
+        labelA: this.props.data.type == 0 ? "企业联系人姓名" : "",
+        formItemLayoutA: formItemLayout,
+        dataA: this.props.data.contacts,
+        labelB: "企业联系人联系方式",
+        formItemLayoutB: formItemLayout,
+        dataB: this.props.data.contactMobile,
+      },
+
       {
         labelA: "合同额(万元)",
         formItemLayoutA: formItemLayout,
@@ -393,12 +412,17 @@ class ChangeDetail extends Component {
     ];
     const financeData = [
       {
-        labelA: "发生成本(万元)",
+        labelA: "发生直接成本(万元)",
         formItemLayoutA: formItemLayout,
         dataA: this.props.data.cwCost,
-        labelB: "应退金额(万元)",
+        labelB: "发生间接成本(万元)",
         formItemLayoutB: formItemLayout,
-        dataB: this.props.data.refundableAmount
+        dataB: this.props.data.cwIndirectCost
+      },
+      {
+        labelA: "应退金额(万元)",
+        formItemLayoutA: formItemLayout,
+        dataA: this.props.data.refundableAmount
       }
     ];
     const buttonData = [
@@ -489,7 +513,7 @@ class ChangeDetail extends Component {
             合同变更记录
           </h2>
           {pageData.map((item, index) => {
-            return <Itemlist key={index} pageData={item} orderUid={this.props.orderUid} id={this.props.id} />;
+            return !!item.labelA && <Itemlist key={index} pageData={item} orderUid={this.props.orderUid} id={this.props.id} />;
           })}
           <Form.Item
             label="变更凭证"

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

@@ -1862,7 +1862,8 @@ const PaiDan = React.createClass({
                       <span style={{ marginLeft: "50px", fontSize: "20px" }}>
                         项目业务
                       </span>
-                      {
+                      {/* 隐藏 */}
+                      {/* {
                         <Button
                           type="primary"
                           onClick={this.addDetailed}
@@ -1870,7 +1871,7 @@ const PaiDan = React.createClass({
                         >
                           添加项目明细
                         </Button>
-                      }
+                      } */}
                     </div>
                   }
                   <div className="patent-table">

+ 1 - 1
package.json

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