diff --git a/api/device.js b/api/device.js index 30482a4..b593269 100644 --- a/api/device.js +++ b/api/device.js @@ -1,7 +1,7 @@ import request from '@/utils/request' -// 根据设备/模具号查询信息 -export function getDetailsByNumber(params) { +// 根据设备号查询信息 +export function getDeviceDetailsByNumber(params) { return request({ url: '/eam/device-accounts/getDetailsByNumber', 'method': 'GET', @@ -25,7 +25,7 @@ export function deviceRepairPage(params) { }) } -// 报修列表 +// 撤销 export function rejected(id) { return request({ url: '/eam/device-repair/rejected?id='+id, @@ -40,3 +40,11 @@ export function deviceList(params) { params }) } +// 设备分页列表 +export function devicePage(params) { + return request({ + url: '/eam/device-accounts/getAppPage', + 'method': 'GET', + params + }) +} diff --git a/api/mold.js b/api/mold.js new file mode 100644 index 0000000..c6254a3 --- /dev/null +++ b/api/mold.js @@ -0,0 +1,25 @@ +import request from '@/utils/request' +// 根据模具号查询信息 +export function getMoldDetailsByNumber(params) { + return request({ + url: '/eam/mold-accounts/getDetailsByNumber', + 'method': 'GET', + params + }) +} +// 模具分页列表 +export function moldPage(params) { + return request({ + url: '/eam/mold-accounts/getAppPage', + 'method': 'GET', + params + }) +} +// 模具列表 +export function moldList(params) { + return request({ + url: '/eam/mold-accounts/selectData', + 'method': 'GET', + params + }) +} diff --git a/components/search/index.vue b/components/search/index.vue index c06b0ee..0e3156e 100644 --- a/components/search/index.vue +++ b/components/search/index.vue @@ -2,13 +2,16 @@ + :bg-color="searchData.bgBolor ||'white'" + :border-color="searchData.borderColor ||'#E4E4E4'" + :shape="searchData.shape ||'square'" + :height="searchData.height || 80" + :placeholder="searchData.placeholder ||'请输入设备名称'" + :clearabled="true" + @search='search' + > diff --git a/pages.json b/pages.json index ce834c2..2cc6c11 100644 --- a/pages.json +++ b/pages.json @@ -15,7 +15,9 @@ }, { "path": "pages/mold/index", "style": { - "navigationBarTitleText": "模具" + "navigationBarTitleText": "模具", + "navigationBarBackgroundColor": "#409eff", + "navigationBarTextStyle": "white" } }, { "path": "pages/spareParts/index", @@ -81,7 +83,7 @@ "navigationBarTextStyle": "white" } },{ - "path": "pages/repairOrder/myDeviceReport", + "path": "pages/repairOrder/myRepairOrder", "style": { "navigationBarTitleText": "维修工单", "navigationStyle": "custom" diff --git a/pages/device/index.vue b/pages/device/index.vue index 1115000..f327300 100644 --- a/pages/device/index.vue +++ b/pages/device/index.vue @@ -1,10 +1,11 @@