diff --git a/common/style/layout.css b/common/style/layout.css index e85787c..845b297 100644 --- a/common/style/layout.css +++ b/common/style/layout.css @@ -367,4 +367,53 @@ uni-button:after { .layout-t tr.checked td .sin_input { color: #8a8a8a; border: 1px solid #ffffff; +} + +/** grid分成2个table */ +.grid_new { + width: 100%; + display: flex; + justify-content: space-between; + align-items: flex-start; +} +.grid_l { + -webkit-box-flex: 0; + -ms-flex: 0 0 100rpx; + flex: 0 0 100rpx; +} +.grid_r { + -webkit-box-flex: 1; + -ms-flex: 1; + flex: 1; + overflow-x: scroll; +} +.grid_l table, .grid_r table { + border-collapse: separate; + border-spacing: 0; + border: 0; +} +.grid_l table th, .grid_r table th { + background: #d7d7d7; + font-size: 26rpx; + line-height: 98rpx; + color: #696969; + font-weight: bold; + white-space: nowrap; + text-overflow: ellipsis; + white-space: nowrap; + padding: 0 20rpx; + border-bottom: 10rpx solid #f5f5f5; + text-align: center; +} +.grid_l table td, .grid_r table td { + font-size: 28rpx; + line-height: 76rpx; + color: #323232; + background: #fff; + white-space: nowrap; + text-overflow: ellipsis; + white-space: nowrap; + padding: 11rpx 20rpx; + border-bottom: 10rpx solid #f5f5f5; + text-align: center; } \ No newline at end of file diff --git a/pages.json b/pages.json index d3a9a11..e4805d2 100644 --- a/pages.json +++ b/pages.json @@ -94,6 +94,13 @@ } } + ,{ + "path" : "pages/device/workDetail", + "style": { + "navigationStyle": "custom" + } + + } ], "globalStyle": { // "pageOrientation": "landscape", diff --git a/utils/getData2.js b/utils/getData2.js index b1adb21..a3e5962 100644 --- a/utils/getData2.js +++ b/utils/getData2.js @@ -75,14 +75,20 @@ export const deviceRepairBegin = (row) => request({ } }) // 1.4维修填报页面(二级页面) -export const deviceRepairGetDtl = (code, rcode, id) => request({ - url:'api/pda/device/repair/getDtl', - data: { - device_code: code, - repair_code: rcode, - repair_id: id +// export const deviceRepairGetDtl = (code, rcode, id) => request({ +// url:'api/pda/device/repair/getDtl', +// data: { +// device_code: code, +// repair_code: rcode, +// repair_id: id +// } +// }) +export const deviceRepairGetDtl = (code) => { + let res = { + data: [{isfinish: '1', repair_item_code: '99', repair_item_name: '11', requirement: '检查减速机皮带轮、配重块配合情况,更换减速机齿轮油'}, {isfinish: '0', repair_item_code: '99', repair_item_name: '11', requirement: '111'}] } -}) + return res +} // 1.4.1确认(按钮)-- 是否完成全部为是【确认】按钮可点击,否则为灰色不可点击 export const deviceRepairConfirm = (code, rcode, rows) => request({ url:'api/pda/device/repair/confirm',