From 8ea28a0af6a24894776befa00630b1df6f970e27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E6=AD=A3=E6=98=93?= Date: Tue, 3 Dec 2024 20:19:15 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=81=E8=BD=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/reportFlow/index.js | 27 ++ components/uni-section/uni-section.vue | 275 +++++++++--------- main.js | 4 +- package.json | 4 + pages.json | 21 ++ pages/index.vue | 62 +++- pages/produceManagement/process/process.vue | 196 +++++++++++++ .../requisition/requisition.vue | 207 +++++++++++++ pages/qualityManagement/IPQC/IPQC.vue | 22 ++ uni.scss | 4 +- utils/request.js | 4 - 11 files changed, 668 insertions(+), 158 deletions(-) create mode 100644 api/reportFlow/index.js create mode 100644 pages/produceManagement/process/process.vue create mode 100644 pages/produceManagement/requisition/requisition.vue create mode 100644 pages/qualityManagement/IPQC/IPQC.vue diff --git a/api/reportFlow/index.js b/api/reportFlow/index.js new file mode 100644 index 0000000..7f09395 --- /dev/null +++ b/api/reportFlow/index.js @@ -0,0 +1,27 @@ +import request from '@/utils/request' +// 获取工单信息 +export function GetWorkOrderDetail(params) { + return request({ + url: '/mobile/reportflow/get_workorder_detail', + method: 'get', + params + }) +} + +// 查询工序报工详情 +export function GetProcessReportWorkDetail(params) { + return request({ + url: '/mobile/reportflow/get_process_reportwork_detail', + method: 'get', + params + }) +} + +// 工序报工 +export function ProcessReportWork(params) { + return request({ + url: '/mobile/reportflow/process_reportwork', + method: 'get', + params + }) +} \ No newline at end of file diff --git a/components/uni-section/uni-section.vue b/components/uni-section/uni-section.vue index 9a52e0b..d30be48 100644 --- a/components/uni-section/uni-section.vue +++ b/components/uni-section/uni-section.vue @@ -1,167 +1,166 @@ - diff --git a/main.js b/main.js index c09e81e..8ed1c2e 100644 --- a/main.js +++ b/main.js @@ -4,6 +4,9 @@ import store from './store' // store import plugins from './plugins' // plugins import './permission' // permission + +import uView from '@/uni_modules/uview-ui' +Vue.use(uView) // dayjs // import dayjs from 'dayjs' @@ -11,7 +14,6 @@ import './permission' // permission // 插件安装 import scanInputVue from './components/scan-input/scan-input.vue' Vue.component('ScanInput', scanInputVue) - Vue.use(plugins) Vue.config.productionTip = false diff --git a/package.json b/package.json index 8155ec5..ea4ea2f 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,9 @@ { "dependencies": { "dayjs": "^1.11.13" + }, + "devDependencies": { + "sass": "^1.81.1", + "sass-loader": "^16.0.3" } } diff --git a/pages.json b/pages.json index 0ed45fc..9f2f138 100644 --- a/pages.json +++ b/pages.json @@ -71,6 +71,27 @@ "style": { "navigationBarTitleText": "浏览文本" } + }, + { + "path" : "pages/produceManagement/requisition/requisition", + "style" : + { + "navigationBarTitleText" : "物料领用" + } + }, + { + "path" : "pages/produceManagement/process/process", + "style" : + { + "navigationBarTitleText" : "工序报工" + } + }, + { + "path" : "pages/qualityManagement/IPQC/IPQC", + "style" : + { + "navigationBarTitleText" : "IPQC制程检验" + } } ], "tabBar": { diff --git a/pages/index.vue b/pages/index.vue index b413400..c008b67 100644 --- a/pages/index.vue +++ b/pages/index.vue @@ -39,10 +39,9 @@ + + diff --git a/pages/produceManagement/requisition/requisition.vue b/pages/produceManagement/requisition/requisition.vue new file mode 100644 index 0000000..7214ac4 --- /dev/null +++ b/pages/produceManagement/requisition/requisition.vue @@ -0,0 +1,207 @@ + + + + + diff --git a/pages/qualityManagement/IPQC/IPQC.vue b/pages/qualityManagement/IPQC/IPQC.vue new file mode 100644 index 0000000..8183fd0 --- /dev/null +++ b/pages/qualityManagement/IPQC/IPQC.vue @@ -0,0 +1,22 @@ + + + + + diff --git a/uni.scss b/uni.scss index 5b30ca3..32cf27e 100644 --- a/uni.scss +++ b/uni.scss @@ -61,4 +61,6 @@ $uni-font-size-title:20px; $uni-color-subtitle: #555555; // 二级标题颜色 $uni-font-size-subtitle:26px; $uni-color-paragraph: #3F536E; // 文章段落颜色 -$uni-font-size-paragraph:15px; \ No newline at end of file +$uni-font-size-paragraph:15px; + +@import '@/uni_modules/uview-ui/theme.scss'; \ No newline at end of file diff --git a/utils/request.js b/utils/request.js index 489cb9a..4c0f7f9 100644 --- a/utils/request.js +++ b/utils/request.js @@ -17,7 +17,6 @@ import { let timeout = 60000 const request = config => { - // console.log('config',config); // 是否需要设置 token const storageBaseUrl = 'http://' + getBaseUrl(); const isToken = (config.headers || {}).isToken === false @@ -41,17 +40,14 @@ const request = config => { header: config.header, dataType: 'json' }).then(response => { - // console.log('response',response); let [error, res] = response if (error) { console.log('config', config); console.log('response', response); - console.log('error', error); toast('后端接口连接异常') reject('后端接口连接异常') return } - // console.log('response',response,error,res); const code = res.data.code || 200 const msg = errorCode[code] || res.data.msg || errorCode['default'] if (code === 401) {