Browse Source

修复Bug

mentoswzq 4 years ago
parent
commit
caa7a4660d

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

@@ -840,7 +840,6 @@ class CheckProject extends Component {
       <div className="App">
         <div className="projectType">
           <div className="typeTitle">
-            <div className="required">*</div>
             <div>类型:</div>
           </div>
           {

+ 2 - 0
js/component/manageCenter/components/checkProject/index.less

@@ -69,6 +69,8 @@
   }
   .payList{
     .payitem{
+      display: flex;
+      flex-flow: row nowrap;
       padding-bottom: 10px;
     }
   }

+ 13 - 6
js/component/manageCenter/components/checkProject/payRecord.js

@@ -529,17 +529,24 @@ class PayRecord extends Component{
                                     {
                                         paymentLogs.map((value,key)=>(
                                             <div key={key} className='payitem'>
-                                                {value.aname+':'}
-                                                <span style={{paddingLeft:'15px',paddingRight:'15px'}}>
+                                                <div style={{width:'83px'}}>{value.aname+':'}</div>
+                                                <div style={{
+                                                    paddingLeft:'15px',
+                                                    paddingRight:'15px',
+                                                    width: '200px',
+                                                    wordBreak: 'break-all'
+                                                }}>
                                                     {
                                                         value.status === 0 ? '(发起)' :
                                                             value.status === 1 ? '(通过)': '(驳回)'
                                                     }
                                                     {value.remarks}
-                                                </span>
-                                                {
-                                                    value.createTimes
-                                                }
+                                                </div>
+                                                <div>
+                                                    {
+                                                        value.createTimes
+                                                    }
+                                                </div>
                                             </div>
                                         ))
                                     }

+ 13 - 2
js/component/manageCenter/financialManage/distribute/shouKuang.jsx

@@ -136,7 +136,7 @@ const ShouKuang = React.createClass({
               companyId: thisdata.companyId,
               companyName: thisdata.companyName,
               buyerId: thisdata.buyerId,
-              buyerName: thisdata.buyerName,
+              costAmount: thisdata.costAmount,
               contractNo: thisdata.contractNo,
               createTime: thisdata.createTime,
               departmentName: thisdata.departmentName,
@@ -704,6 +704,11 @@ const ShouKuang = React.createClass({
           key: "actuallyTotalAmount",
         },
         {
+          title: "已付成本(万元)",
+          dataIndex: "costAmount",
+          key: "costAmount",
+        },
+        {
           title: "最近收款(万元)",
           dataIndex: "finalReceivables",
           key: "finalReceivables",
@@ -834,6 +839,12 @@ const ShouKuang = React.createClass({
           className: "title-table",
         },
         {
+          title: "已付成本(万元)",
+          dataIndex: "costAmount",
+          key: "costAmount",
+          className: "title-table",
+        },
+        {
           title: "最近收款(万元)",
           dataIndex: "finalReceivables",
           key: "finalReceivables",
@@ -1709,7 +1720,7 @@ const ShouKuang = React.createClass({
               startDate: thisdata.startDate,
               taskStatus: thisdata.taskStatus,
               cname: thisdata.cname,
-              id: thisdata.id,
+              costAmount: thisdata.costAmount,
               taskName: thisdata.taskName,
               hours: thisdata.hours,
               taskDistributionTime: thisdata.taskDistributionTime,

+ 9 - 9
js/component/manageCenter/order/orderNew/changeComponent/orderDetail.js

@@ -533,15 +533,15 @@ class OrderDetail extends Component {
             {/*<Upload*/}
             {/*  className="demandDetailShow-upload"*/}
             {/*  listType="picture-card"*/}
-              fileList={
-                data.contractPictureUrl
-                  ? splitUrl(
-                      data.contractPictureUrl,
-                      ",",
-                      globalConfig.avatarHost + "/upload"
-                    )
-                  : []
-              }
+            {/*  fileList={*/}
+            {/*    data.contractPictureUrl*/}
+            {/*      ? splitUrl(*/}
+            {/*          data.contractPictureUrl,*/}
+            {/*          ",",*/}
+            {/*          globalConfig.avatarHost + "/upload"*/}
+            {/*        )*/}
+            {/*      : []*/}
+            {/*  }*/}
             {/*  onPreview={(file) => {*/}
             {/*    this.setState({*/}
             {/*      previewImage: file.url || file.thumbUrl,*/}

+ 3 - 0
js/component/manageCenter/order/orderNew/costAuditList/detailsModal/index.js

@@ -255,6 +255,9 @@ class DetailsModal extends Component{
                             activeKey: e
                         })
                         if(e === '2'){
+                            this.waiDetail();
+                            this.thirdTable(this.props.tid);
+                            this.payNodeTable(this.props.tid);
                             this.getOrderOutsourceDtails({
                                 tid: this.props.tid,
                                 orderNo: this.props.orderNo,

+ 3 - 1
js/component/manageCenter/order/orderNew/costAuditList/filterColumn.js

@@ -119,7 +119,9 @@ class FilterColumn extends Component{
                         })(
                             <Select
                                 placeholder="选择状态"
-                                style={{ width: 150, marginRight: "10px" }}
+                                style={{
+                                    width: '200px',
+                                }}
                             >
                                 <Select.Option value={0}>审核</Select.Option>
                                 <Select.Option value={1}>待支付</Select.Option>

+ 6 - 6
js/component/manageCenter/order/orderNew/costAuditList/index.js

@@ -58,11 +58,11 @@ class CostAuditList extends Component{
                         )
                     },
                 },
-                {
-                    title: "实际总付款",
-                    dataIndex: "costAmount",
-                    key: "costAmount",
-                },
+                // {
+                //     title: "实际总付款",
+                //     dataIndex: "costAmount",
+                //     key: "costAmount",
+                // },
                 {
                     title: "付款类型",
                     dataIndex: "chooseType",
@@ -205,7 +205,7 @@ class CostAuditList extends Component{
         return (
           <div className="user-content">
               <div className="content-title">
-                  <span>派单管理</span>
+                  <span>成本付款申请</span>
               </div>
               <FilterColumn {...this.props} onSearch={(data)=>{
                   this.loadData(1,data)

+ 12 - 31
js/component/manageCenter/project/task/myTaskCount.jsx

@@ -174,31 +174,8 @@ const MyTaskCount = Form.create()(
             } else {
               for (let i = 0; i < data.data.list.length; i++) {
                 let thisdata = data.data.list[i];
-                theArr.push({
-                  key: i,
-                  id: thisdata.id, //ID
-                  orderNo: thisdata.orderNo, //订单编号
-                  taskName: thisdata.taskName, //任务名称
-                  userName: thisdata.userName, //客户名称
-                  cname: thisdata.cname, //项目品类
-                  taskStatus: thisdata.taskStatus, //任务状态
-                  receiverName: thisdata.receiverName, //负责人
-                  hours: thisdata.hours, //任务工时
-                  depName: thisdata.depName, //派单公司
-                  contractNo: thisdata.contractNo,
-                  signTime: thisdata.signTime,
-                  creteTime: thisdata.creteTime,
-                  projectStatus: thisdata.projectStatus,
-                  commodityPrice: thisdata.commodityPrice, //价格
-                  commodityQuantity: thisdata.commodityQuantity, //数量
-                  salesmanName: thisdata.salesmanName, //订单负责人
-                  taskDistributionTime: thisdata.taskDistributionTime,
-                  taskEndTime: thisdata.taskEndTime,
-                  outsource: thisdata.outsource,
-                  splitStatus: thisdata.splitStatus,
-                  splitSuper: thisdata.splitSuper,
-                  splitId: thisdata.splitId
-                });
+                thisdata.key = i;
+                theArr.push(thisdata);
               }
               this.state.pagination.total = data.data.totalCount;
             }
@@ -305,6 +282,16 @@ const MyTaskCount = Form.create()(
             key: "commodityPrice"
           },
           {
+            title: "实付成本(万元)",
+            dataIndex: "costAmount",
+            key: "costAmount"
+          },
+          {
+            title: "已付成本(万元)",
+            dataIndex: "partyAmount",
+            key: "partyAmount"
+          },
+          {
             title: "数量(个)",
             dataIndex: "commodityQuantity",
             key: "commodityQuantity"
@@ -834,12 +821,6 @@ const MyTaskCount = Form.create()(
     getOrgCodeUrl(e) {
       this.setState({ orgCodeUrl: e });
     },
-    //关闭操作工时
-    visitCancelA() {
-      this.setState({
-        visibleA: false
-      });
-    },
     setColor() {
       $(".userName span").after(
         "(<span class='ruanzhu'>软著数</span>/<span class='xiazheng'>下证数</span>)"

+ 26 - 34
js/component/manageCenter/project/task/myTaskOutsource.jsx

@@ -85,39 +85,16 @@ const MyTaskOutsource = React.createClass({
         } else {
           for (let i = 0; i < data.data.list.length; i++) {
             let thisdata = data.data.list[i];
-            theArr.push({
-              key: i,
-              orderNo: thisdata.orderNo, //订单编号
-              id: thisdata.id, //项目ID
-              taskName: thisdata.taskName, //名称
-              cname: thisdata.cname, //项目品类
-              receiverName: thisdata.receiverName, //受理人
-              projectStatus: thisdata.projectStatus, //项目状态
-              taskStatus: thisdata.taskStatus, //项目状态
-              taskDate: thisdata.taskDate, //分配时间
-              userName:
-                thisdata.taskName.substring(0, 5) === "软件著作权"
-                  ? thisdata.userName +
-                    "(" +
-                    thisdata.commodityQuantity.toString() +
-                    "/" +
-                    thisdata.alreadyNumber +
-                    ")"
-                  : thisdata.userName, //用户名
-              depName: thisdata.depName, //部门名称
-              commodityQuantity: thisdata.commodityQuantity, //项目数量
-              outsourceName: thisdata.outsourceName,
-              hours: thisdata.hours,
-              contractNo: thisdata.contractNo,
-              approval: thisdata.approval, //特批状态
-              outsourceStatus: thisdata.outsourceStatus, //外包审核状态
-              splitStatus: thisdata.splitStatus, //是否为子项目 2是 1主项目
-              splitSuper: thisdata.splitSuper,
-              splitId: thisdata.splitId,
-              projectType: thisdata.projectType,//项目类型
-              patentNameType: thisdata.patentNameType,
-              patentName: thisdata.patentName,
-            });
+            thisdata.key = i;
+            thisdata.userName = thisdata.taskName.substring(0, 5) === "软件著作权"
+                ? thisdata.userName +
+                "(" +
+                thisdata.commodityQuantity.toString() +
+                "/" +
+                thisdata.alreadyNumber +
+                ")"
+                : thisdata.userName;
+            theArr.push(thisdata);
           }
         }
         this.state.pagination.current = data.data.pageNo;
@@ -353,6 +330,21 @@ const MyTaskOutsource = React.createClass({
           key: "hours",
         },
         {
+          title: "项目金额(万元)",
+          dataIndex: "commodityPrice",
+          key: "commodityPrice",
+        },
+        {
+          title: "外包成本(万元)",
+          dataIndex: "costAmount",
+          key: "costAmount",
+        },
+        {
+          title: "已付(万元)",
+          dataIndex: "partyAmount",
+          key: "partyAmount",
+        },
+        {
           title: "操作",
           dataIndex: "caozuo",
           key: "caozuo",
@@ -2956,7 +2948,7 @@ const MyTaskOutsource = React.createClass({
                   onRefresh={()=>{
                     this.waiDetail();
                     this.thirdTable(this.state.tid);
-                    this.payNodeTable(this.state.tid)
+                    this.payNodeTable(this.state.tid);
                     this.loadData(this.state.page)
                   }}
               />:<div/>}

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

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