zhoulisen 5 lat temu
rodzic
commit
9176dde770
2 zmienionych plików z 5 dodań i 7 usunięć
  1. 1
    1
      config/config.js
  2. 4
    6
      src/pages/resource/openScreen/edit.jsx

+ 1
- 1
config/config.js Wyświetl plik

@@ -133,7 +133,7 @@ export default {
133 133
 
134 134
   proxy: {
135 135
     '/api': {
136
-      target: 'http://192.168.2.49:8080/',
136
+      target: 'http://192.168.2.51:8080/',
137 137
       changeOrigin: true,
138 138
       // pathRewrite: { '^/server': '' },
139 139
     },

+ 4
- 6
src/pages/resource/openScreen/edit.jsx Wyświetl plik

@@ -245,9 +245,7 @@ const header = props => {
245 245
     }
246 246
 
247 247
     function disabledDate(current) {
248
-        // Can not select days before today and today
249
-        // console.log(current && current < moment().endOf('day'))
250
-        // console.log(current)
248
+        
251 249
         return current && current < moment().startOf('day');
252 250
     }
253 251
 
@@ -295,7 +293,7 @@ const header = props => {
295 293
         },
296 294
         {
297 295
             label: '关联业务',
298
-            name: 'targetName',
296
+            name: 'sampleName',
299 297
             // value: data.targetId,
300 298
             //   type: FieldTypes.Text,
301 299
             render: <div style={{ color: 'blue' }} onClick={e => handleShowModel(data.targetId)}>{sample.sampleName || '选择关联业务'}{console.log(sample, '13')}</div>,
@@ -345,10 +343,10 @@ const header = props => {
345 343
                 // </div>, 
346 344
                 // <DatePicker disabledDate={disabledDate} onChange={ontime}></DatePicker>,
347 345
                 <DatePicker
348
-                    showToday = {false}
346
+                    // showToday = {false}showTime={{ format: 'HH:mm' }}
349 347
                     disabledDate={disabledDate}
350 348
                     disabledTime={disabledDateTime}
351
-                    showTime={{ defaultValue: moment(data.invalidTime, 'YYYY-MM-DD HH:mm:ss') }}
349
+                    showTime={{ format: 'YYYY-MM-DD HH:mm:ss' }}
352 350
 
353 351
                 />,
354 352
             //         < DatePicker