Forráskód Böngészése

客户最大值提示bug

dev01 2 hónapja%!(EXTRA string=óta)
szülő
commit
6534ec7c18

+ 20 - 22
js/component/manageCenter/customer/NEW/intentionCustomer/intentionCustomer.jsx

@@ -579,30 +579,28 @@ const IntentionCustomer = Form.create()(
         data: {},
         success: function (data) {
           let thedata = data.data;
-          if (!thedata) {
-            if (data.error && data.error.length) {
-              message.warning(data.error[0].message);
-            } else {
-              if (thedata == 1) {
-                Modal.warning({
-                  title: '温馨提示',
-                  content: (
-                    <div>
-                      <p>不可添加!您的客户数已达最大值,可移除部分客户后添加!</p>
-                    </div>
-                  ),
-                  onOk() { },
-                });
-                return
-              }
-              this.state.RowData = {};
-              this.setState({
-                detailApi: this.props.detailApi,
-                showDesc: true,
-                modalVisible: false,
-                visitModul: false,
+          if (data.error && data.error.length) {
+            message.warning(data.error[0].message);
+          } else {
+            if (thedata == 1) {
+              Modal.warning({
+                title: '温馨提示',
+                content: (
+                  <div>
+                    <p>不可添加!您的客户数已达最大值,可移除部分客户后添加!</p>
+                  </div>
+                ),
+                onOk() { },
               });
+              return
             }
+            this.state.RowData = {};
+            this.setState({
+              detailApi: this.props.detailApi,
+              showDesc: true,
+              modalVisible: false,
+              visitModul: false,
+            });
           }
 
         }.bind(this),

+ 1 - 1
js/component/manageCenter/customer/NEW/signCustomer/signCustomer.jsx

@@ -206,7 +206,7 @@ const IntentionCustomer = Form.create()(React.createClass({
           key: "locationProvince",
         },
         {
-          title: "最新签单日期",
+          title: "初始时间",
           dataIndex: "transferTime",
           key: "transferTime",
         },

+ 1 - 1
js/component/manageCenter/financialManage/account/accountDetails.jsx

@@ -259,7 +259,7 @@ class AccountDetails extends Component {
           title: "报销订单/部门",
           dataIndex: "orderNo",
           key: "orderNo",
-          // width: "10%",
+          width: "10%",
           render: (text, record) => {
             return (
               <div>

+ 42 - 13
js/component/manageCenter/order/orderNew/addService.jsx

@@ -5374,13 +5374,8 @@ const NewService = Form.create()(
             });
             message.error(data.error[0].message);
           } else {
-            this.setState({
-              score: "",
-              cSort: "",
-              cname: "",
-              tname: "",
-            })
             message.success("操作成功");
+            this.onCloses()
             this.loadData();
           }
         }.bind(this),
@@ -5393,6 +5388,46 @@ const NewService = Form.create()(
       );
     },
 
+    onCloses() {
+      this.setState({
+        score: "",
+        tid: "",
+        cSort: "",
+        cname: "",
+        tname: "",
+
+        zyd: undefined,
+        zydList: [],
+        professionalism: undefined,
+
+        gtl: undefined,
+        gtlList: [],
+        communicationSkills: undefined,
+
+        xyd: undefined,
+        yxdList: [],
+        responsiveness: undefined,
+
+        gcxx: undefined,
+        gcxxList: [],
+        publicImage: undefined,
+
+        fwtd: undefined,
+        fwtdList: [],
+        serviceAttitude: undefined,
+
+        ydhb: undefined,
+        ydhbList: [],
+        monthlyReport: undefined,
+
+        ndhb: undefined,
+        ndhbList: [],
+        yearReport: undefined,
+
+        remarks: undefined,
+      })
+    },
+
     queryByTid(value) {
       this.setState({
         loading: true,
@@ -9069,13 +9104,7 @@ const NewService = Form.create()(
             title="项目评分"
             width={this.state.score == "selcet" ? 400 : 740}
             onCancel={() => {
-              this.setState({
-                score: "",
-                tid: "",
-                cSort: "",
-                cname: "",
-                tname: "",
-              })
+              this.onCloses()
             }}
           >
             {

+ 381 - 167
js/component/manageCenter/project/task/progress.jsx

@@ -1,18 +1,22 @@
 import React, { Component } from "react";
-import { message, Modal, Spin, Input, Button } from "antd";
-import './progress.less';
+import { message, Modal, Radio, Tag, Spin, Input, Button } from "antd";
 import $ from "jquery/src/ajax";
+import Print from 'react-print-html';
+import ReactToPrint from 'react-to-print';
+import html2canvas from 'html2canvas';
 
-const { TextArea } = Input;
+import './progress.less';
 
+const { TextArea } = Input;
+const RadioGroup = Radio.Group;
 class Progress extends Component {
   constructor(props) {
     super(props);
     this.state = {
       loading: false,
-
+      isPrint: false,
+      data: {},
     }
-
   }
 
 
@@ -20,189 +24,399 @@ class Progress extends Component {
 
   }
 
+  // 下载图片
+  download() {
+    const canvas2 = document.createElement('canvas');
+    let _canvas = document.getElementById('count'); // 指定要截图的DOM元素
+
+    const w = parseInt(window.getComputedStyle(_canvas).width);
+    const h = parseInt(window.getComputedStyle(_canvas).height);
+    // 设置画布大小,可以根据需要调整
+    canvas2.width = w * 3.3;
+    canvas2.height = h * 2.3;
+
+    const context = canvas2.getContext('2d');
+    context.scale(2, 2);
+    window.scrollTo(0, 0); // 确保页面滚动到顶部,避免截图偏移
+
+    html2canvas(_canvas, { canvas: canvas2 }).then(function (canvas) {
+      const imgUri = canvas.toDataURL('image/png').replace('image/png', 'image/octet-stream');
+      // 此处可以添加下载图片的逻辑,如创建一个下载链接并触发点击事件
+      const link = document.createElement("a");
+      link.href = imgUri;
+      link.download = "schedule.png";
+      document.body.appendChild(link);
+      link.click();
+      document.body.removeChild(link);
+    });
+  }
+
+  onChange(e, lable) {
+    const { data } = this.state
+    const { value } = e.target;
+    const reg = /^-?(0|[1-9][0-9]*)(\.[0-9]*)?$/;
+    if ((!isNaN(value) && reg.test(value)) || value === '' || value === '-') {
+      this.setState({
+        data: Object.assign(data, {
+          [lable]: value,
+        }),
+      })
+    }
+  }
+
+  handleChange(lable, width = 40) {
+    const { data } = this.state
+    let newWidth = !!data[lable] ? Math.max(width, data[lable].length * 8) : width
+    return newWidth + "px"
+  }
+
   render() {
+    const { data } = this.state
+    const radioStyle = {
+      // display: 'block',
+      height: '30px',
+      lineHeight: '30px',
+    };
     return (
-      <div className="progress">
-        <div className="pro-content">
-          <div className="pc-title">中联重工科技集团有限公司</div>
-          <div className="pc-row">
-            <div className="pr-item">
-              <div style={{ color: "black" }}>合同编号:HNKD20240563</div>
-              <div>&nbsp;</div>
-              <div style={{ color: "black" }}>会员等级:A&nbsp;&nbsp;&nbsp;&nbsp;会员&nbsp;&nbsp;&nbsp;&nbsp;A/AA/AAA</div>
-            </div>
-            <div className="pr-item">
-              <div className="pi-tit">服务内容</div>
-              <div>高新会员(财税) 2025年</div>
-              <div>高新会员(财税) 2025年</div>
-              <div>国家高新技术企业认定 2025年</div>
-            </div>
-            <div className="pr-item">
-              <div className="pi-tit">服务团队</div>
-              <div>业务负责人:XXXX</div>
-              <div>项目负责人:XXXX</div>
-              <div>技术咨询师:XXXX</div>
-              <div>财税咨询师:XXXX</div>
-            </div>
-          </div>
-          <div className="pc-tit">基础数据</div>
-          <div className="pc-row">
-            <div className="pr-item">
-              <div className="pi-tit">上年度(2024年)</div>
-              <div>销售收入:2000万元</div>
-              <div>高新研发费用:500万元</div>
-            </div>
-            <div className="pr-item">
-              <div className="pi-tit">上上年度(2023年)</div>
-              <div>销售收入:2000万元</div>
-              <div>高新研发费用:500万元</div>
-            </div>
-            <div className="pr-item">
-              <div className="pi-tit">本年度企业人员情况</div>
-              <div>职工总数:10人&nbsp;&nbsp;科技人员:10人</div>
-              <div>占比:100%</div>
-            </div>
-          </div>
-          <div className="pc-tit">科研立项与研发投入</div>
-          <div className="pc-row">
-            <div className="pr-item">
-              <div className="pi-tit">立项和预算</div>
-              <div>研发立项数量:10个</div>
-              <div>年度研发预算总额:10,000万元</div>
-              <div>年度销售收入预计:1,000,000万元</div>
-            </div>
-            <div className="pr-item">
-              <div className="pi-tit">&nbsp;</div>
-              <div>&nbsp;</div>
-              <div>本年度研发费用预算占比:20.30%</div>
-              <div>三年研发费用占比预估:20.30%</div>
-            </div>
-          </div>
-          <div className="p-line"></div>
-          <div className="pc-row">
-            <div className="pr-items">
-              <div className="pi-tit">实际情况</div>
-              <div>数据周期(累计):10个</div>
-              <div>已立项RD数量:10个</div>
-              <div>已归集研发费用总额:10000万元</div>
-              <div>研发预算完成进度:20.30%</div>
-            </div>
-            <div className="pr-items">
-              <div className="pi-tit">&nbsp;</div>
-              <div>年度实际销售收入:1000000万元</div>
-              <div>本年度研发费用占比:20.30%</div>
-              <div>三年研发费用占比:20.30%</div>
+      <div className="progress" >
+        <Spin spinning={this.state.loading}>
+          <div
+            id="count"
+            className="pro-content"
+            ref={ref => {
+              this.printTemp = ref;
+            }}
+          >
+            <div className="pc-title">中联重工科技集团有限公司</div>
+            <div className="pc-row">
+              <div className="pr-item">
+                <div><span>合同编号:</span>HNKD20240563</div>
+                <div>&nbsp;</div>
+                <div><span>会员等级:</span>A&nbsp;&nbsp;&nbsp;&nbsp;<Tag color="#2db7f5"><span style={{ color: "#fff" }}>会员</span></Tag>&nbsp;&nbsp;&nbsp;A/AA/AAA</div>
+              </div>
+              <div className="pr-item">
+                <div className="pi-tit">服务内容</div>
+                <div>高新会员(财税) 2025年</div>
+                <div>高新会员(财税) 2025年</div>
+                <div>国家高新技术企业认定 2025年</div>
+              </div>
+              <div className="pr-item">
+                <div className="pi-tit">服务团队</div>
+                <div><span>业务负责人:</span>XXXX</div>
+                <div><span>项目负责人:</span>XXXX</div>
+                <div><span>技术咨询师:</span>XXXX</div>
+                <div><span>财税咨询师:</span>XXXX</div>
+              </div>
+              {
+                !this.state.isPrint &&
+                <div className="pr-item no-print">
+                  <div>
+                    <ReactToPrint
+                      trigger={() => (
+                        <Button
+                          type="primary"
+                        >
+                          打&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;印
+                        </Button>
+                      )}
+                      content={() => this.printTemp}
+                      onAfterPrint={() => {
+                        console.log("---wanchen---")
+                      }}
+                    />
+                    <Button
+                      type="primary"
+                      onClick={() => {
+                        const _this = this
+                        this.setState({
+                          isPrint: true
+                        }, () => {
+                          this.download()
+                        })
+                        setTimeout(function () {
+                          _this.setState({
+                            isPrint: false
+                          })
+                        }, 2000)
+                      }}
+                    >
+                      下载整图
+                    </Button>
+                  </div>
+                  <div className="pi-record">最近更新时间</div>
+                  <div className="pi-record">2024-12-23 10:00:00</div>
+                  <div className="pi-record">下载/打印时间</div>
+                  <div className="pi-record">2024-12-23 10:00:00</div>
+                </div>
+              }
             </div>
-          </div>
-          <div className="pc-tit">报表报送</div>
-          <div className="pc-row">
-            <div className="pr-items">
-              <div>火炬统计:10个</div>
-              <div>统计年报:10个</div>
+            <div className="pc-tit">基础数据</div>
+            <div className="pc-row">
+              <div className="pr-item">
+                <div className="pi-tit">上年度(2024年)</div>
+                <div>销售收入:<Input style={{ width: this.handleChange('yxsr', 40) }} value={data.yxsr} onChange={e => { this.onChange(e, "yxsr") }} />万元</div>
+                <div>高新研发费用:<Input style={{ width: this.handleChange('gxyf', 40) }} value={data.gxyf} onChange={e => { this.onChange(e, "gxyf") }} />万元</div>
+              </div>
+              <div className="pr-item">
+                <div className="pi-tit">上上年度(2023年)</div>
+                <div>销售收入:<Input style={{ width: this.handleChange('yxsrs', 40) }} value={data.yxsrs} onChange={e => { this.onChange(e, "yxsrs") }} />万元</div>
+                <div>高新研发费用:<Input style={{ width: this.handleChange('gxyfs', 40) }} value={data.gxyfs} onChange={e => { this.onChange(e, "gxyfs") }} />万元</div>
+              </div>
+              <div className="pr-item">
+                <div className="pi-tit">本年度企业人员情况</div>
+                <div>职工总数:<Input style={{ width: this.handleChange('rs', 25) }} value={data.rs} onChange={e => { this.onChange(e, "rs") }} />人
+                  &nbsp;&nbsp;
+                  科技人员:<Input style={{ width: this.handleChange('rs', 25) }} value={data.rs} onChange={e => { this.onChange(e, "rs") }} />人
+                </div>
+                <div>占比:100%</div>
+              </div>
             </div>
-            <div className="pr-items">
-              <div>高企年报:1000000万元</div>
-              <div>汇算清缴:20.30%</div>
-              <div>加扣RD10个,其中有知识产权的加扣费用1000000万元,加扣研发费用金额10000万元</div>
+            <div className="pc-tit">科研立项与研发投入</div>
+            <div className="pc-row">
+              <div className="pr-item">
+                <div className="pi-tit">立项和预算</div>
+                <div>研发立项数量:<Input style={{ width: this.handleChange('rs', 25) }} value={data.rs} onChange={e => { this.onChange(e, "rs") }} />个</div>
+                <div>年度研发预算总额:<Input style={{ width: this.handleChange('yfys', 40) }} value={data.yfys} onChange={e => { this.onChange(e, "yfys") }} />万元</div>
+                <div>年度销售收入预计:<Input style={{ width: this.handleChange('yxssr', 40) }} value={data.yxssr} onChange={e => { this.onChange(e, "yxssr") }} />万元</div>
+              </div>
+              <div className="pr-item">
+                <div className="pi-tit">&nbsp;</div>
+                <div>&nbsp;</div>
+                <div>本年度研发费用预算占比:20.30%</div>
+                <div>三年研发费用占比预估:20.30%</div>
+              </div>
             </div>
-          </div>
-          <div className="pc-tit">研发奖补</div>
-          <div className="pc-row">
-            <div className="pr-items">
-              <div>研发准备金备案:10个</div>
+            <div className="p-line"></div>
+            <div className="pc-row">
+              <div className="pr-items">
+                <div className="pi-tit">实际情况</div>
+                <div>数据周期(累计):
+                  <RadioGroup
+                    onChange={e => {
+                      this.setState({
+                        data: Object.assign(data, {
+                          cycle: e.target.value,
+                        }),
+                      });
+                    }}
+                    value={data.cycle}
+                  >
+                    <Radio style={radioStyle} value={1}>第1季度</Radio>
+                    <Radio style={radioStyle} value={2}>上半年</Radio>
+                    <Radio style={radioStyle} value={3}>前3季度</Radio>
+                    <Radio style={radioStyle} value={4}>全年</Radio>
+                    {/* <Radio style={radioStyle} value={0}>
+                      其他
+                      {data.cycle === 0 ? <Input style={{ width: 100, marginLeft: 10 }} /> : null}
+                    </Radio> */}
+                  </RadioGroup>
+                </div>
+                <div>
+                  已立项RD数量:<Input style={{ width: this.handleChange('rs', 25) }} value={data.rs} onChange={e => { this.onChange(e, "rs") }} />个,
+                  其中委外项目<Input style={{ width: this.handleChange('rs', 25) }} value={data.rs} onChange={e => { this.onChange(e, "rs") }} />个,
+                  合作项目<Input style={{ width: this.handleChange('rs', 25) }} value={data.rs} onChange={e => { this.onChange(e, "rs") }} />个,
+                  完成技术合同登记<Input style={{ width: this.handleChange('rs', 25) }} value={data.rs} onChange={e => { this.onChange(e, "rs") }} />个
+                </div>
+                <div>已归集研发费用总额:<Input style={{ width: this.handleChange('yxssr', 40) }} value={data.yxssr} onChange={e => { this.onChange(e, "yxssr") }} />万元</div>
+                <div>研发预算完成进度:20.30%</div>
+              </div>
+              <div className="pr-items">
+                <div className="pi-tit">&nbsp;</div>
+                <div>年度实际销售收入:<Input style={{ width: this.handleChange('yxssr', 40) }} value={data.yxssr} onChange={e => { this.onChange(e, "yxssr") }} />万元</div>
+                <div>本年度研发费用占比:20.30%</div>
+                <div>三年研发费用占比:20.30%</div>
+              </div>
             </div>
-            <div className="pr-items">
-              <div>研发奖补申请:1000000万元</div>
-              <div>申请金额:100000万元,公示金额:100000万元,其他_______</div>
+            <div className="pc-tit">报表报送</div>
+            <div className="pc-row">
+              <div className="pr-items">
+                <div>
+                  <span>火炬统计:</span>
+                  <RadioGroup
+                    onChange={e => {
+                      this.setState({
+                        data: Object.assign(data, {
+                          hj: e.target.value,
+                        }),
+                      });
+                    }}
+                    value={data.hj}
+                  >
+                    <Radio style={radioStyle} value={1}>待完成</Radio>
+                    <Radio style={radioStyle} value={2}>已完成</Radio>
+                    <Radio style={radioStyle} value={3}>合同无此项</Radio>
+                    <Radio style={radioStyle} value={0}>
+                      其他
+                      {data.hj === 0 ? <Input style={{ width: 100, marginLeft: 10, textAlign: 'left' }} /> : null}
+                    </Radio>
+                  </RadioGroup>
+                </div>
+                <div>
+                  <span>统计年报:</span>
+                  <RadioGroup
+                    onChange={e => {
+                      this.setState({
+                        data: Object.assign(data, {
+                          nb: e.target.value,
+                        }),
+                      });
+                    }}
+                    value={data.nb}
+                  >
+                    <Radio style={radioStyle} value={1}>待完成</Radio>
+                    <Radio style={radioStyle} value={2}>已完成</Radio>
+                    <Radio style={radioStyle} value={3}>合同无此项</Radio>
+                    <Radio style={radioStyle} value={0}>
+                      其他
+                      {data.nb === 0 ? <Input style={{ width: 100, marginLeft: 10, textAlign: 'left' }} /> : null}
+                    </Radio>
+                  </RadioGroup>
+                </div>
+              </div>
+              <div className="pr-items">
+                <div>
+                  <span>高企年报:</span>
+                  <RadioGroup
+                    onChange={e => {
+                      this.setState({
+                        data: Object.assign(data, {
+                          gqnb: e.target.value,
+                        }),
+                      });
+                    }}
+                    value={data.gqnb}
+                  >
+                    <Radio style={radioStyle} value={1}>待完成</Radio>
+                    <Radio style={radioStyle} value={2}>已完成</Radio>
+                    <Radio style={radioStyle} value={3}>合同无此项</Radio>
+                    <Radio style={radioStyle} value={0}>
+                      其他
+                      {data.gqnb === 0 ? <Input style={{ width: 100, marginLeft: 10, textAlign: 'left' }} /> : null}
+                    </Radio>
+                  </RadioGroup>
+                </div>
+                <div>
+                  <span>汇算清缴:</span>
+                  <RadioGroup
+                    onChange={e => {
+                      this.setState({
+                        data: Object.assign(data, {
+                          hsqj: e.target.value,
+                        }),
+                      });
+                    }}
+                    value={data.hsqj}
+                  >
+                    <Radio style={radioStyle} value={1}>待完成</Radio>
+                    <Radio style={radioStyle} value={2}>已完成</Radio>
+                    <Radio style={radioStyle} value={3}>合同无此项</Radio>
+                    <Radio style={radioStyle} value={0}>
+                      其他
+                      {data.hsqj === 0 ? <Input style={{ width: 100, marginLeft: 10, textAlign: 'left' }} /> : null}
+                    </Radio>
+                  </RadioGroup>
+                </div>
+                <div>加扣RD10个,其中有知识产权的加扣费用1000000万元,加扣研发费用金额10000万元</div>
+              </div>
             </div>
-          </div>
-          <div className="pc-tit">备查交付与归档</div>
-          <div className="pc-row">
-            <div className="pr-items">
-              <div>加扣备查交付:10个</div>
-              <div>是否归档:10个</div>
+            <div className="pc-tit">研发奖补</div>
+            <div className="pc-row">
+              <div className="pr-items">
+                <div><span>研发准备金备案:</span>10个</div>
+              </div>
+              <div className="pr-items">
+                <div><span>研发奖补申请:</span>1000000万元</div>
+                <div><span>申请金额:</span>100000万元,<span>公示金额:</span>100000万元,其他_______</div>
+              </div>
             </div>
-            <div className="pr-items">
-              <div>高新备查交付:10个</div>
-              <div>是否归档:10个</div>
+            <div className="pc-tit">备查交付与归档</div>
+            <div className="pc-row">
+              <div className="pr-items">
+                <div><span>加扣备查交付:</span>10个</div>
+                <div><span>是否归档:</span>10个</div>
+              </div>
+              <div className="pr-items">
+                <div><span>高新备查交付:</span>10个</div>
+                <div><span>是否归档:</span>10个</div>
+              </div>
             </div>
-          </div>
-          <div className="pc-tit">日常工作</div>
-          <div className="pc-row">
-            <div className="pr-itemss">
-              <div><span>召开上年度总结及本年工作计划:</span></div>
+            <div className="pc-tit">日常工作</div>
+            <div className="pc-row">
+              <div className="pr-itemss">
+                <div><span>召开上年度总结及本年工作计划:</span></div>
+              </div>
             </div>
-          </div>
-          <div className="p-line"></div>
-          <div className="pc-row">
-            <div className="pr-itemss">
-              <div><span>阶段性汇报:</span></div>
+            <div className="p-line"></div>
+            <div className="pc-row">
+              <div className="pr-itemss">
+                <div><span>阶段性汇报:</span></div>
+              </div>
             </div>
-          </div>
-          <div className="p-line"></div>
-          <div className="pc-row">
-            <div className="pr-itemss">
-              <div><span>立项资料编写:</span>完成数 10 个&nbsp;&nbsp;&nbsp;完成率(系统自动计算)50%</div>
+            <div className="p-line"></div>
+            <div className="pc-row">
+              <div className="pr-itemss">
+                <div><span>立项资料编写:</span>完成数 10 个&nbsp;&nbsp;&nbsp;完成率(系统自动计算)50%</div>
+              </div>
             </div>
-          </div>
-          <div className="p-line"></div>
-          <div className="pc-row">
-            <div className="pr-itemss">
-              <div><span>加计预申报:</span></div>
+            <div className="p-line"></div>
+            <div className="pc-row">
+              <div className="pr-itemss">
+                <div><span>加计预申报:</span></div>
+              </div>
             </div>
-          </div>
-          <div className="p-line"></div>
-          <div className="pc-row">
-            <div className="pr-itemss">
-              <div><span>知识产权情况:</span>当年申报数量100个&nbsp;&nbsp;&nbsp;当年授权数量100个&nbsp;&nbsp;&nbsp;截止本年末可用于下次高新认定数量100个,其中I类100ge,II类100个。</div>
+            <div className="p-line"></div>
+            <div className="pc-row">
+              <div className="pr-itemss">
+                <div><span>知识产权情况:</span>当年申报数量100个&nbsp;&nbsp;&nbsp;当年授权数量100个&nbsp;&nbsp;&nbsp;截止本年末可用于下次高新认定数量100个,其中I类100ge,II类100个。</div>
+              </div>
             </div>
-          </div>
-          <div className="p-line"></div>
-          <div className="pc-row">
-            <div className="pr-itemss">
-              <div><span>技术合同登记:</span>委外开发项目数量:100个&nbsp;&nbsp;&nbsp;技术开发合同完成登记数量:100个</div>
+            <div className="p-line"></div>
+            <div className="pc-row">
+              <div className="pr-itemss">
+                <div><span>技术合同登记:</span>委外开发项目数量:100个&nbsp;&nbsp;&nbsp;技术开发合同完成登记数量:100个</div>
+              </div>
             </div>
-          </div>
-          <div className="p-line"></div>
-          <div className="pc-row">
-            <div className="pr-itemss">
-              <div><span>公出指标(本年度):</span>合同约定次数:100次&nbsp;&nbsp;&nbsp;实际次数:100次&nbsp;&nbsp;&nbsp;</div>
+            <div className="p-line"></div>
+            <div className="pc-row">
+              <div className="pr-itemss">
+                <div><span>公出指标(本年度):</span>合同约定次数:100次&nbsp;&nbsp;&nbsp;实际次数:100次&nbsp;&nbsp;&nbsp;</div>
+              </div>
             </div>
-          </div>
-          <div className="p-line"></div>
-          <div className="pc-row">
-            <div className="pr-itemss">
-              <div><span>培训指标(本年度):</span>合同约定次数:100次&nbsp;&nbsp;&nbsp;实际次数:100次&nbsp;&nbsp;&nbsp;其他:</div>
+            <div className="p-line"></div>
+            <div className="pc-row">
+              <div className="pr-itemss">
+                <div><span>培训指标(本年度):</span>合同约定次数:100次&nbsp;&nbsp;&nbsp;实际次数:100次&nbsp;&nbsp;&nbsp;其他:</div>
+              </div>
             </div>
-          </div>
-          <div className="pc-tit">特色工作</div>
-          <div className="pc-row">
-            <div className="pr-item">
-              <div><span>专项检查:</span>1次</div>
+            <div className="pc-tit">特色工作</div>
+            <div className="pc-row">
+              <div className="pr-item">
+                <div><span>专项检查:</span>1次</div>
+              </div>
+              <div className="pr-item">
+                <div><span>模拟稽查:</span>1次</div>
+              </div>
             </div>
-            <div className="pr-item">
-              <div><span>模拟稽查:</span>1次</div>
+            <div className="pc-tit">高新认定</div>
+            <div className="pc-row">
+              <div className="pr-itemss">
+                <div><span>1.基础情况:</span>创新能力评价估分___分,实际申报批次:,是否重点关注:</div>
+                <div><span>2.申报提交:</span>网上系统提交:&nbsp;纸质材料提交:</div>
+                <div><span>3.评审情况:</span>省级 国家级</div>
+              </div>
             </div>
-          </div>
-          <div className="pc-tit">高新认定</div>
-          <div className="pc-row">
-            <div className="pr-itemss">
-              <div><span>1.基础情况:</span>创新能力评价估分___分,实际申报批次:,是否重点关注:</div>
-              <div><span>2.申报提交:</span>网上系统提交:&nbsp;纸质材料提交:</div>
-              <div><span>3.评审情况:</span>省级 国家级</div>
+            <div className="pc-tit">其他事项说明</div>
+            <div className="pc-row">
+              <TextArea rows={2} />
             </div>
-          </div>
-          <div className="pc-tit">其他事项说明</div>
-          <div className="pc-row">
-            <TextArea rows={2} />
-          </div>
-          <div className="pc-tit">客户签字</div>
-          <div className="pc-row">
-            <div className="pr-itemss">
-              <div style={{ paddingBottom: 80 }}><span>授权代表(签字或盖章):</span></div>
+            <div className="pc-tit">客户签字</div>
+            <div className="pc-row">
+              <div className="pr-itemss">
+                <div style={{ paddingBottom: 80 }}><span>授权代表(签字或盖章):</span></div>
+              </div>
             </div>
           </div>
-        </div>
+        </Spin>
         <div className="pro-bottom">
           <Button
             type="primary"
@@ -216,7 +430,7 @@ class Progress extends Component {
           <Button
             type="ghost"
             onClick={() => {
-
+              console.log("--------", data)
             }}
             style={{ margin: 25 }}
           >

+ 184 - 4
js/component/manageCenter/project/task/progress.less

@@ -1,19 +1,112 @@
+@media print {
+  .no-print {
+    display: none;
+  }
+
+  .pro-content {
+    display: flex;
+    flex-direction: column;
+
+    .pc-title {
+      text-align: center;
+      font-size: 16px;
+      font-weight: bold;
+      margin-bottom: 10px;
+      color: black;
+
+    }
+
+    .pc-row {
+      display: flex;
+      flex-direction: row;
+      font-size: 12px;
+      padding: 0 30px;
+
+      .pr-item {
+        width: 25%;
+
+      }
+
+      .pr-items {
+        width: 50%;
+
+      }
+
+      .pr-itemss {
+        width: 100%;
+
+      }
+
+      .pr-item,
+      .pr-items,
+      .pr-itemss {
+        .pi-tit {
+          font-weight: bold;
+          color: black;
+        }
+
+        span {
+          color: black;
+          font-weight: bold;
+
+        }
+
+        button {
+          background: "green";
+          margin: 0 28px;
+
+          span {
+            color: #fff;
+          }
+        }
+
+        .pi-record {
+          text-align: center;
+          color: #999999;
+        }
+
+      }
+
+    }
+
+    .p-line {
+      border-top: 1px dashed #000000A6;
+      margin: 6px 30px;
+
+    }
+
+    .pc-tit {
+      font-size: 14px;
+      padding: 4px 20px;
+      margin: 4px 0;
+      color: #fff;
+      background: #02a7f0;
+
+    }
+  }
+
+}
+
 .progress {
   padding: 30px 0;
 
   .pro-content {
+    display: flex;
+    flex-direction: column;
+
     .pc-title {
       text-align: center;
-      font-size: 20px;
+      font-size: 16px;
       font-weight: bold;
-      margin-bottom: 15px;
+      margin-bottom: 10px;
+      color: black;
 
     }
 
     .pc-row {
       display: flex;
       flex-direction: row;
-      font-size: 16px;
+      font-size: 12px;
       padding: 0 30px;
 
       .pr-item {
@@ -45,6 +138,93 @@
 
         }
 
+        .ant-radio-wrapper {
+          span {
+            color: #000000A6;
+            font-weight: 400;
+          }
+
+          .ant-input {
+            border: 0px;
+            border-bottom: 1px solid #d9d9d9;
+            border-radius: 0;
+          }
+
+        }
+
+        .ant-input {
+          border: 0px;
+          border-bottom: 1px solid #d9d9d9;
+          border-radius: 0;
+          padding: 0 2px;
+          height: 100%;
+          text-align: center;
+
+        }
+
+        button {
+          background: green;
+          margin: 0 28px;
+
+          span {
+            color: #fff;
+          }
+        }
+
+        .pi-record {
+          text-align: center;
+          color: #999999;
+        }
+
+        .ant-radio-inner {
+          border-radius: 2px;
+          /* 修改圆角 */
+          width: 14px;
+          /* 修改宽度 */
+          height: 14px;
+          /* 修改高度 */
+        }
+
+
+        .ant-radio-checked .ant-radio-inner {
+          border-color: #1890ff;
+          /* 修改选中时的边框颜色 */
+          background: #1890ff;
+          /* 修改选中时的背景颜色 */
+        }
+
+        .ant-radio-inner::after {
+          content: "\E632";
+          /* 使用base64的勾选图标 */
+          // display: block;
+          // font-weight: 700;
+          // font-size: 8px;
+          // border: 0;
+          // color: #fff;
+          // left: 2px;
+          // top: 3px;
+          // position: absolute;
+
+
+          -webkit-transform: rotate(45deg) scale(0);
+          -ms-transform: rotate(45deg) scale(0);
+          transform: rotate(45deg) scale(0);
+          position: absolute;
+          left: 4px;
+          top: 1px;
+          display: table;
+          width: 5px;
+          height: 8px;
+          border: 2px solid #fff;
+          background: #fff;
+          border-top: 0;
+          border-left: 0;
+          content: " ";
+          -webkit-transition: all .1s cubic-bezier(0.71, -0.46, 0.34, -0.91);
+          transition: all .1s cubic-bezier(.71,-.46,.88,.6)
+
+        }
+
       }
 
     }
@@ -56,7 +236,7 @@
     }
 
     .pc-tit {
-      font-size: 16px;
+      font-size: 14px;
       padding: 5px 20px;
       margin: 5px 0;
       color: #fff;

+ 1 - 1
package.json

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