魏超 5 лет назад
Родитель
Сommit
604e0a15e3

+ 3
- 3
src/pages/eContract/businessConfig/add.jsx Просмотреть файл

@@ -133,7 +133,7 @@ const header = props => {
133 133
             rules: [{ required: true, message: ' 请选择关联业务' }],
134 134
           })(<Input  hidden={true}/>)}
135 135
         </Form.Item>
136
-        <Form.Item label="甲方印章" >
136
+        <Form.Item label="甲方印章" style={{marginTop:'20px'}}>
137 137
           {getFieldDecorator('sealId', {
138 138
             rules: [{ required: true, message: ' 请选择企业印章' }],
139 139
           })(<SelectSeal companyId={props.form.getFieldValue('companyId')} onSuccess={e => sealOnSuccess(e)}/>)}
@@ -143,7 +143,7 @@ const header = props => {
143 143
             rules: [{ required: true, message: '请输入甲方签章定位关键字' }],
144 144
           })(<Input maxLength={20} style={{width:'400px'}}/>)}
145 145
         </Form.Item>
146
-        <Form.Item label="甲方关键字签章策略"> 
146
+        <Form.Item label="甲方关键字签章策略" style={{marginTop:'20px'}}> 
147 147
           {getFieldDecorator('signatoryStrategy', {
148 148
               rules: [{ required: true, message: '请选择甲方关键字签章策略' }],
149 149
             })(<Select placeholder="甲方关键字签章策略" style={{ width: '400px' }}>
@@ -157,7 +157,7 @@ const header = props => {
157 157
             rules: [{ required: true, message: '请输入乙方签章定位关键字' }],
158 158
           })(<Input maxLength={20} style={{width:'400px'}}/>)}
159 159
         </Form.Item>
160
-        <Form.Item label="乙方关键字签章策略"> 
160
+        <Form.Item label="乙方关键字签章策略" style={{marginTop:'20px'}}> 
161 161
           {getFieldDecorator('customerStrategy', {
162 162
               rules: [{ required: true, message: '请选择乙方关键字签章策略' }],
163 163
             })(<Select placeholder="乙方关键字签章策略" style={{ width: '400px' }}>

+ 1
- 1
src/pages/eContract/businessConfig/components/SelectCompany.jsx Просмотреть файл

@@ -168,7 +168,7 @@ const SelectContractTemp = props => {
168 168
           )}
169 169
         </Form.Item>
170 170
         <Form.Item>
171
-          <span><a onClick={openIndexImg} style={{ color: 'blue' }}>可选企业必须已认证通过、已上传印章且授权了自动签章。查看电子合同接入手册</a></span>
171
+          <span style={{color:'#999'}}>可选企业必须已认证通过、已上传印章且授权了自动签章。</span><span><a onClick={openIndexImg} style={{ color: 'blue' }}>查看电子合同接入手册</a></span>
172 172
         </Form.Item>
173 173
         <Form.Item>
174 174
           <Button type="primary" htmlType="submit" >

+ 2
- 3
src/pages/eContract/businessConfig/components/SelectSeal.jsx Просмотреть файл

@@ -22,7 +22,6 @@ const SelectContractTemp = props => {
22 22
   }
23 23
   const updateGroup = val => setGroup({ groupId: val, groupName: getGroupTitle(val) })
24 24
 
25
-  const buildingId = props.buildingId
26 25
   const companyId = props.companyId
27 26
 
28 27
   useEffect(() => {
@@ -34,7 +33,7 @@ const SelectContractTemp = props => {
34 33
     request({ ...apis.taEcontract.taCompanySealList, params: { ...params, companyId:companyId } }).then((data) => {
35 34
       setList(data.records || [])
36 35
       setDataInfo(data)
37
-      updateGroup(buildingId ? undefined : value);
36
+      updateGroup(companyId ? undefined : value);
38 37
     })
39 38
   }
40 39
 
@@ -131,7 +130,7 @@ const SelectContractTemp = props => {
131 130
     <div>
132 131
       <div>
133 132
         <Avatar shape="square" style={{color: 'blue',cursor: 'pointer'}} src={group.groupName} size={54} icon="user" />
134
-        <a style={{marginLeft:'30px', color: 'blue' }} onClick={() => setVisible(true)}>选择企业印章</a>
133
+  <a style={{marginLeft:'30px', color: 'blue' }} onClick={() => setVisible(true)}>{companyId != undefined && '选择企业印章'}</a>
135 134
       </div>
136 135
       <Modal
137 136
         title="选择企业印章"

+ 3
- 3
src/pages/eContract/businessConfig/detail.jsx Просмотреть файл

@@ -148,7 +148,7 @@ const header = props => {
148 148
             rules: [{ required: true, message: ' 请选择关联业务' }],
149 149
           })(<Input  hidden={true}/>)}
150 150
         </Form.Item>
151
-        <Form.Item label="甲方印章" >
151
+        <Form.Item label="甲方印章" style={{marginTop:'20px'}}>
152 152
           {getFieldDecorator('sealId', {initialValue:contractBusinessData.sealId,
153 153
             rules: [{ required: true, message: ' 请选择企业印章' }],
154 154
           })(<SelectSeal companyId={props.form.getFieldValue('companyId')} onSuccess={e => sealOnSuccess(e)}/>)}
@@ -158,7 +158,7 @@ const header = props => {
158 158
             rules: [{ required: true, message: '请输入甲方签章定位关键字' }],
159 159
           })(<Input maxLength={20} style={{width:'400px'}}/>)}
160 160
         </Form.Item>
161
-        <Form.Item label="甲方关键字签章策略"> 
161
+        <Form.Item label="甲方关键字签章策略" style={{marginTop:'20px'}}> 
162 162
           {getFieldDecorator('signatoryStrategy', {initialValue:contractBusinessData.signatoryStrategy,
163 163
               rules: [{ required: true, message: '请选择甲方关键字签章策略' }],
164 164
             })(<Select placeholder="甲方关键字签章策略" style={{ width: '400px' }}>
@@ -172,7 +172,7 @@ const header = props => {
172 172
             rules: [{ required: true, message: '请输入乙方签章定位关键字' }],
173 173
           })(<Input maxLength={20} style={{width:'400px'}}/>)}
174 174
         </Form.Item>
175
-        <Form.Item label="乙方关键字签章策略"> 
175
+        <Form.Item label="乙方关键字签章策略" style={{marginTop:'20px'}}> 
176 176
           {getFieldDecorator('customerStrategy', {initialValue:contractBusinessData.customerStrategy,
177 177
               rules: [{ required: true, message: '请选择乙方关键字签章策略' }],
178 178
             })(<Select placeholder="乙方关键字签章策略" style={{ width: '400px' }}>

+ 1
- 4
src/pages/eContract/manage/list.jsx Просмотреть файл

@@ -150,10 +150,7 @@ const header = props => {
150 150
           const [archivesStartDate, archivesEndDate] = archivesDate
151 151
           submitValue.archivesStartDate = moment(archivesStartDate).format('YYYY-MM-DD');
152 152
           submitValue.archivesEndDate = moment(archivesEndDate).format('YYYY-MM-DD');
153
-        }else{
154
-          submitValue.archivesStartDate = null
155
-          submitValue.archivesEndDate = null
156
-        }        
153
+        }   
157 154
         console.log(submitValue)
158 155
         getList({ pageNum: 1, pageSize: 10, ...submitValue })
159 156
       }