魏超 5 年前
父节点
当前提交
a5bc6aa698

+ 21
- 2
src/pages/eContract/seal/components/SealList.jsx 查看文件

@@ -82,7 +82,7 @@ const header = props => {
82 82
     function updateOnCancel(e) {
83 83
       console.log(e, 'cancel')
84 84
       setUpdateSeal(e);
85
-      getCompanyData({companyId: e.companyId})
85
+      // getCompanyData({companyId: e.companyId
86 86
     }
87 87
 
88 88
     const delSealInfo = (row) => {
@@ -100,7 +100,18 @@ const header = props => {
100 100
               })
101 101
           },
102 102
         });
103
-  }
103
+    }
104
+
105
+    const defaultSeal = (row) => {
106
+      request({ ...apis.seal.setDefaultSealById, urlData:{id: row.sealId} }).then((data) => {
107
+        message.info('操作成功!')
108
+        getCompanyData({ pageNum: 1, pageSize: 10, companyId: companyId })
109
+      }).catch((err) => {
110
+          console.log(err)
111
+          message.info(err.msg || err.message)
112
+      })              
113
+    }
114
+  
104 115
 
105 116
 
106 117
 
@@ -131,6 +142,13 @@ const header = props => {
131 142
         align: 'center',
132 143
         render: (x, row) => <><span>{row.createDate != null ? `${moment(row.createDate).format('YYYY-MM-DD HH:mm:ss')}` : ''}</span></>,
133 144
       },
145
+      {
146
+        title: '默认章',
147
+        dataIndex: 'defaultSeal',
148
+        key: 'defaultSeal',
149
+        align: 'center',
150
+        render: (_, record) => <><span>{record.defaultSeal === 1 ? "是":"否"}</span></>,
151
+      },
134 152
       {
135 153
         title: '操作',
136 154
         dataIndex: '',
@@ -140,6 +158,7 @@ const header = props => {
140 158
             <>
141 159
             <a style={{ color: '#66B3FF' }} onClick={() => updateSealInfo({visable:true, companyId: record.companyId, sealId: record.sealId})} ><span>修改</span></a>
142 160
             <a style={{ color: '#66B3FF', marginLeft:'20px' }} onClick={() => delSealInfo(record)} ><span>删除</span></a>
161
+            <a style={{ color: '#66B3FF', marginLeft:'20px' }} onClick={() => defaultSeal(record)} ><span>默认章</span></a>
143 162
             </>
144 163
         ),
145 164
       },

+ 2
- 2
src/pages/eContract/signedContract/index.jsx 查看文件

@@ -146,7 +146,7 @@ function header(props) {
146 146
             dataIndex: 'signatoryTime',
147 147
             key: 'signatoryTime',
148 148
             align: 'center',
149
-            render: (x, row) => <><span>{row.signatoryStartTime ? `${moment(row.signatoryStartTime).format('YYYY-MM-DD HH:mm:ss')}` : ''}</span></>,
149
+            render: (x, row) => <><span>{row.signatoryTime ? `${moment(row.signatoryTime).format('YYYY-MM-DD HH:mm:ss')}` : ''}</span></>,
150 150
         },
151 151
         {
152 152
             title: '是否结算',
@@ -306,7 +306,7 @@ function header(props) {
306 306
             >
307 307
                 <p>确认结算所选{taContractList.length}份合同手续费?其中{checkData}份已结算过,若不想再结算,请取消勾选。</p>
308 308
                 <div style={{ marginTop: '50px', textAlign: 'center' }}>结算单价:<InputNumber max={99} style={{ marginLeft: '10px', width: '150px' }} formatter={value => `${value}`.replace(/\B(?=(\d{3})+(?!\d))/g, ',')} defaultValue={0} precision={2} onChange={onChange} />元/份</div>
309
-
309
+                <div style={{color:'#999', textAlign: 'center'}}>结算金额为0代表免费,整数位最多2位,小数位最多2位。</div>            
310 310
 
311 311
 
312 312
             </Modal>

+ 5
- 0
src/services/apis.js 查看文件

@@ -327,6 +327,11 @@ const apis = {
327 327
       url: `${prefix}/company/delete`,
328 328
       method: 'DELETE',
329 329
       action: 'channel',
330
+    },
331
+    setDefaultSealById: {
332
+      url: `${prefix}/company/setDefaultSeal/:id`,
333
+      method: 'POST',
334
+      action: 'channel',
330 335
     }
331 336
   }  
332 337
 }