diff --git a/components/SearchBox.vue b/components/SearchBox.vue index 3d5f176..2a39660 100644 --- a/components/SearchBox.vue +++ b/components/SearchBox.vue @@ -48,6 +48,7 @@ if (e.target.value.length) { this.$emit('handleChange', e.target.value) } + uni.hideKeyboard() } } } diff --git a/pages.json b/pages.json index e42af7f..762a9d5 100644 --- a/pages.json +++ b/pages.json @@ -631,6 +631,14 @@ } } + ,{ + "path" : "pages/SecondPhase/slitting/SlittingCutting2", + "style" : + { + "navigationStyle": "custom" + } + + } ], "globalStyle": { // "pageOrientation": "landscape", diff --git a/pages/SecondPhase/slitting/CallShaft.vue b/pages/SecondPhase/slitting/CallShaft.vue index 8d30bd9..5617db3 100644 --- a/pages/SecondPhase/slitting/CallShaft.vue +++ b/pages/SecondPhase/slitting/CallShaft.vue @@ -43,27 +43,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + +
序号设备位置尺寸状态代数呼叫时间
{{Number(i) + 1}}{{e.resource_name}}{{['上轴', '下轴'][Number(e.up_or_down) - 1]}}{{e.qzz_size}}{{getStatusText(e.status)}}{{e.qzz_generation}}{{e.start_time}}
+
+
- - + + + + + + \ No newline at end of file diff --git a/utils/getData3.js b/utils/getData3.js index b6ae662..7ebb1e7 100644 --- a/utils/getData3.js +++ b/utils/getData3.js @@ -462,3 +462,13 @@ export const remainShaftBack = (code, size, ge, flag) => request({ flag: flag } }) +/** + * 分切下料2(二期分切管理) + */ +export const downRolls2 = (device, code) => request({ + url:'api/pda/slitter/downRolls2', + data: { + device_code: device, + container: code + } +}) diff --git a/utils/mork2.js b/utils/mork2.js index e55f916..670e406 100644 --- a/utils/mork2.js +++ b/utils/mork2.js @@ -85,6 +85,7 @@ export const allAuthority = () => { {menu_id: '5', path: 'RF03', title: '分切管理', sonTree: [ {menu_id: '1', title: '分切上料', path: '/pages/SecondPhase/slitting/SlittingFeeding'}, {menu_id: '6', title: '分切下料', path: '/pages/SecondPhase/slitting/SlittingCutting'}, + {menu_id: '6', title: '分切下料2', path: '/pages/SecondPhase/slitting/SlittingCutting2'}, {menu_id: '2', title: '空轴套管', path: '/pages/SecondPhase/slitting/ZjCasing'}, {menu_id: '3', title: '空轴配送', path: '/pages/SecondPhase/slitting/ZjDelivery'}, {menu_id: '4', title: '空轴进站', path: '/pages/SecondPhase/slitting/ZjInStore'},