mentoswzq 4 år sedan
förälder
incheckning
2d4aff9eba

+ 29 - 0
js/component/common/imgList/index.js

@@ -0,0 +1,29 @@
+import React,{Component} from 'react';
+import './index.less';
+
+class ImgList extends Component{
+    constructor(props) {
+        super(props);
+        this.state={}
+    }
+
+    render() {
+        return (
+            <div className='ImgList'>
+                {
+                    this.props.fileList.map((value,index)=>(
+                        <div key={index} className='fileItem' style={{
+                            width: this.props.width ? this.props.width : '100px',
+                            height: this.props.height ? this.props.height : '100px',
+                        }}>
+                            <img src={value.url} className='imgFile'/>
+                        </div>
+                    ))
+                }
+                {console.log(this.props.fileList,'图片')}
+            </div>
+        )
+    }
+}
+
+export default ImgList;

+ 13 - 0
js/component/common/imgList/index.less

@@ -0,0 +1,13 @@
+.ImgList{
+  width: 100%;
+  display: flex;
+  flex-flow: row wrap;
+  .fileItem{
+    margin-right: 2%;
+    .imgFile{
+      padding: 10px;
+      width: 100%;
+      height: 100%;
+    }
+  }
+}

+ 5 - 6
js/component/manageCenter/components/checkProject/index.jsx

@@ -14,6 +14,7 @@ import {getProjectStatus,} from '@/tools'
 import { getMaterialStatus, getUrgentStatus } from '@/tools'
 import ApplyPaymentModal from './applyPaymentModal';
 import PayRecord from './payRecord';
+import ImgList from '../../../common/imgList/index';
 import './index.less'
 import $ from "jquery";
 
@@ -929,15 +930,13 @@ class CheckProject extends Component {
         >
           <div>
             <div className="title">备注</div>
-            <Input
-                type="textarea"
-                placeholder="请输入备注"
-                rows={4}
-                value={this.props.outsourceRemarks}
-            />
+            <div style={{fontSize:'15px'}}>
+              {this.props.outsourceRemarks}
+            </div>
           </div>
           <div style={{paddingTop:'20px'}}>
             <div className="title">合同/协议扫描件</div>
+            {/*<ImgList fileList={this.props.fileList}/>*/}
             <Upload
                 className="demandDetailShow-upload"
                 listType="picture-card"

+ 1 - 1
js/component/manageCenter/components/checkProject/index.less

@@ -2,7 +2,7 @@
   padding-top: 10px;
 
   .thirdParty {
-    padding: 20px 20px 0px 20px;
+    padding: 0px 20px 0px 20px;
   }
 
   .projectType {

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 268 - 485
js/component/manageCenter/order/orderNew/costAuditList/detailsModal/projectOverview.js


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

@@ -101,13 +101,14 @@ const PicturesWall = React.createClass({
           action={
             globalConfig.context + '/api/admin/outsourceOrg/uploadOutsourceFile'
           }
+          multiple
           data={{ sign: 'order_outsource' }}
           listType="picture-card"
           fileList={fileList}
           onPreview={this.handlePreview}
           onChange={this.handleChange}
         >
-          {fileList && fileList.length >= 10 ? null : uploadButton}
+          {uploadButton}
         </Upload>
         <Modal
           maskClosable={false}

+ 1 - 0
js/component/manageCenter/project/task/myTaskOutsource.jsx

@@ -756,6 +756,7 @@ const MyTaskOutsource = React.createClass({
     this.payNodeTable(record.id)
     // 获取Csort
     this.getCsortData(localStorage.getItem('cSort'))
+    console.log('项目类型',record.projectType)
   },
   //点击修改项目详情
   tijiaoOk() {

+ 1 - 1
js/component/manageCenter/set/projectConfigure/addSoftWritingPrice.js

@@ -121,7 +121,7 @@ class AddSoftWritingPrice extends Component{
                         <Form.Item  label="备注">
                             {getFieldDecorator('remarks', {
                                 initialValue: this.props.infor.remarks,
-                                rules: [{ required: true, message: '请输入备注!' }],
+                                rules: [{ required: false, message: '请输入备注!' }],
                             })(
                                 <Input placeholder="请输入备注" type={'textarea'} style={{width:'250px'}}/>
                             )}

+ 21 - 21
js/component/project.jsx

@@ -1251,27 +1251,27 @@ const project = React.createClass({
           ) : (
             ''
           )}
-          {this.props.record && this.props.record.outsource == 1 ? (
-            <TabPane tab="外包公司信息" key="3">
-              <div className="patent-table" style={{ marginTop: '10px' }}>
-                <Spin spinning={this.state.loading}>
-                  <Table
-                    columns={this.state.companyColumns}
-                    dataSource={this.state.companys}
-                    scroll={{ x: 300, y: 0 }}
-                    bordered
-                    size="small"
-                    expandedRowRender={(record) => {
-                      return <p>{record.remarks}</p>
-                    }}
-                    pagination={false}
-                  />
-                </Spin>
-              </div>
-            </TabPane>
-          ) : (
-            ''
-          )}
+          {/*{this.props.record && this.props.record.outsource == 1 ? (*/}
+          {/*  <TabPane tab="外包公司信息" key="3">*/}
+          {/*    <div className="patent-table" style={{ marginTop: '10px' }}>*/}
+          {/*      <Spin spinning={this.state.loading}>*/}
+          {/*        <Table*/}
+          {/*          columns={this.state.companyColumns}*/}
+          {/*          dataSource={this.state.companys}*/}
+          {/*          scroll={{ x: 300, y: 0 }}*/}
+          {/*          bordered*/}
+          {/*          size="small"*/}
+          {/*          expandedRowRender={(record) => {*/}
+          {/*            return <p>{record.remarks}</p>*/}
+          {/*          }}*/}
+          {/*          pagination={false}*/}
+          {/*        />*/}
+          {/*      </Spin>*/}
+          {/*    </div>*/}
+          {/*  </TabPane>*/}
+          {/*) : (*/}
+          {/*  ''*/}
+          {/*)}*/}
         </Tabs>
         <Modal
           width="800px"