From 6cf78e3a9da08ea7c34f9e501ee502de48497ebe Mon Sep 17 00:00:00 2001 From: niexiting <85552560@qq.com> Date: Wed, 31 Jan 2024 14:13:54 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=86=E5=8E=9F=E6=96=99=E4=B8=8A=E6=9E=B6?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E9=87=87=E8=B4=AD=E4=B8=8A=E6=9E=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/request.js | 6 ++-- api/request2.js | 30 +++++++++---------- common/classify.data.js | 6 ++-- pages.json | 12 ++++---- pages/putaway/job/putawayDetail.vue | 2 +- pages/putaway/job/putawayJob.vue | 4 +-- pages/putaway/record/putawayRecord.vue | 2 +- pages/putaway/request/putawayRequest.vue | 4 +-- .../putaway/request/putawayRequestCreate.vue | 2 +- pages/repleinsh/request/repleinshRequest.vue | 4 +-- 10 files changed, 36 insertions(+), 36 deletions(-) diff --git a/api/request.js b/api/request.js index 5a6d9e33..764fce4c 100644 --- a/api/request.js +++ b/api/request.js @@ -481,7 +481,7 @@ export function getPurchaseReturnRequestList(params) { /** - * 原料上架 + * 采购上架 * @param {*} * status 任务状态 * CreationTimeStart 开始日期 @@ -500,7 +500,7 @@ export function getPutawayJobList(params) { /** * * @param {*} id 任务id - * 原料上架获取任务明细 + * 采购上架获取任务明细 */ export function putawayGetJobDetail(id) { return request({ @@ -511,7 +511,7 @@ export function putawayGetJobDetail(id) { } -/**原料上架 +/**采购上架 * * @param {*} number 任务编号 * 按任务编号查询任务 diff --git a/api/request2.js b/api/request2.js index cbe3dcaf..3ca2ba5d 100644 --- a/api/request2.js +++ b/api/request2.js @@ -981,7 +981,7 @@ export function inspectJobSubmit(params) { /** - * 原料上架 任务 + * 采购上架 任务 * status 任务状态 * 开始日期 * 结束日期 @@ -997,7 +997,7 @@ export function getPutawayJobList(params) { } /** - * 原料上架 获取任务明细 + * 采购上架 获取任务明细 * @param {*} id 任务id * */ @@ -1010,7 +1010,7 @@ export function getPutawayJobDetail(id) { } /** - * 原料上架 承接任务 + * 采购上架 承接任务 * @param {*} id * */ @@ -1023,7 +1023,7 @@ export function takePutawayJob(id) { } /** - * 原料上架 放弃承接 + * 采购上架 放弃承接 * @param {*} id * */ @@ -1036,7 +1036,7 @@ export function cancleTakePutawayJob(id) { } /** - * 原料上架 任务提交 + * 采购上架 任务提交 * @param {*} params */ export function putawayJobSubmit(params) { @@ -1048,7 +1048,7 @@ export function putawayJobSubmit(params) { } /** - * 原料上架申请 获取任务列表 + * 采购上架申请 获取任务列表 * 任务状态 * 开始日期 * 结束日期 @@ -1064,7 +1064,7 @@ export function getPutawayRequestList(params) { } /** - * 原料上架申请 获取任务明细 + * 采购上架申请 获取任务明细 * @param {*} id 任务id * */ @@ -1077,7 +1077,7 @@ export function getPutawayRequestDetail(id) { } /** - * 原料上架申请 提交 + * 采购上架申请 提交 * @param {*} params */ export function putawayRequestSubmit(params) { @@ -1089,7 +1089,7 @@ export function putawayRequestSubmit(params) { } /** - * 原料上架申请 关闭任务 + * 采购上架申请 关闭任务 * @param {*} params */ export function putawayRequestClose(id) { @@ -1101,7 +1101,7 @@ export function putawayRequestClose(id) { } /** - * 原料上架申请 提交审批 + * 采购上架申请 提交审批 * @param {*} params */ export function putawayRequestApprove(id) { @@ -1113,7 +1113,7 @@ export function putawayRequestApprove(id) { } /** - * 原料上架申请 提交审批通过 + * 采购上架申请 提交审批通过 * @param {*} params */ export function putawayRequestApproveAgree(id) { @@ -1125,7 +1125,7 @@ export function putawayRequestApproveAgree(id) { } /** - * 原料上架申请 审批驳回 + * 采购上架申请 审批驳回 * @param {*} params */ export function putawayRequestApproveRefused(id) { @@ -1137,7 +1137,7 @@ export function putawayRequestApproveRefused(id) { } /** - * 原料上架申请 处理 + * 采购上架申请 处理 * @param {*} params */ export function putawayRequestHandle(id) { @@ -1149,7 +1149,7 @@ export function putawayRequestHandle(id) { } /** - * 原料上架申请 重新添加 + * 采购上架申请 重新添加 * @param {*} params */ export function putawayRequestAddAgain(id) { @@ -1163,7 +1163,7 @@ export function putawayRequestAddAgain(id) { /** - * 原料上架记录 提交 + * 采购上架记录 提交 * @param {*} params */ export function putawayRecordSubmit(params) { diff --git a/common/classify.data.js b/common/classify.data.js index ea61158a..8979aed8 100644 --- a/common/classify.data.js +++ b/common/classify.data.js @@ -55,13 +55,13 @@ export default [{ }, { - "name": "原料上架任务", + "name": "采购上架任务", "icon": "/static/menus/menu_search_lj.svg", "url": "/pages/putaway/job/putawayJob", "index": 3, }, { - "name": "原料上架记录", + "name": "采购上架记录", "icon": "/static/menus/menu_search_lj.svg", "url": "/pages/putaway/record/putawayRecord", "index": 3, @@ -309,7 +309,7 @@ export default [{ "index": 8, }, { - "name": "原料上架申请", + "name": "采购上架申请", "icon": "/static/menus/menu_search_lj.svg", "url": "/pages/putaway/request/putawayRequest", "index": 8, diff --git a/pages.json b/pages.json index 42f0d94e..1c3e660a 100644 --- a/pages.json +++ b/pages.json @@ -263,7 +263,7 @@ { "path": "pages/putaway/job/putawayJob", "style": { - "navigationBarTitleText": "原料上架", + "navigationBarTitleText": "采购上架", "enablePullDownRefresh": false, "titleNView": { // "autoBackButton": "true", @@ -292,21 +292,21 @@ { "path": "pages/putaway/job/putawayDetail", "style": { - "navigationBarTitleText": "原料上架详情", + "navigationBarTitleText": "采购上架详情", "enablePullDownRefresh": false } }, { "path": "pages/putaway/record/putawayRecord", "style": { - "navigationBarTitleText": "原料上架记录", + "navigationBarTitleText": "采购上架记录", "enablePullDownRefresh": false } }, { "path": "pages/putaway/request/putawayRequest", "style": { - "navigationBarTitleText": "原料上架申请", + "navigationBarTitleText": "采购上架申请", "enablePullDownRefresh": true, "titleNView": { // "autoBackButton": "true", @@ -333,14 +333,14 @@ { "path": "pages/putaway/request/putawayRequestDetail", "style": { - "navigationBarTitleText": "原料上架申请详情", + "navigationBarTitleText": "采购上架申请详情", "enablePullDownRefresh": false } }, { "path": "pages/putaway/request/putawayRequestCreate", "style": { - "navigationBarTitleText": "原料上架申请创建", + "navigationBarTitleText": "采购上架申请创建", "enablePullDownRefresh": false } }, diff --git a/pages/putaway/job/putawayDetail.vue b/pages/putaway/job/putawayDetail.vue index 94086972..f7b593e3 100644 --- a/pages/putaway/job/putawayDetail.vue +++ b/pages/putaway/job/putawayDetail.vue @@ -413,7 +413,7 @@ putawayJobSubmit(params).then(res => { uni.hideLoading() if (res.data) { - this.showCommitSuccessMessage("提交成功
生成原料上架记录
" + res.data) + this.showCommitSuccessMessage("提交成功
生成采购上架记录
" + res.data) } else { this.showErrorMessage("提交失败[" + res.msg + "]") } diff --git a/pages/putaway/job/putawayJob.vue b/pages/putaway/job/putawayJob.vue index d9db6080..d9d24dc0 100644 --- a/pages/putaway/job/putawayJob.vue +++ b/pages/putaway/job/putawayJob.vue @@ -165,13 +165,13 @@ } this.jobList = type === "refresh" ? list : this.jobList.concat(list); this.pageNo++; - updateTitle("原料上架(" + this.totalCount + ")"); + updateTitle("采购上架(" + this.totalCount + ")"); }).catch(error => { if (type === "refresh") { uni.stopPullDownRefresh(); } this.loadingType = ""; - updateTitle("原料上架"); + updateTitle("采购上架"); uni.hideLoading(); that.showMessage(error) }) diff --git a/pages/putaway/record/putawayRecord.vue b/pages/putaway/record/putawayRecord.vue index 3f50079f..a0cf2102 100644 --- a/pages/putaway/record/putawayRecord.vue +++ b/pages/putaway/record/putawayRecord.vue @@ -317,7 +317,7 @@ putawayRecordSubmit(params).then(res => { uni.hideLoading() if (res.data) { - this.showCommitSuccessMessage("提交成功
生成原料上架记录
" + res.data, ) + this.showCommitSuccessMessage("提交成功
生成采购上架记录
" + res.data, ) } else { this.showErrorMessage("提交失败[" + res.msg + "]") } diff --git a/pages/putaway/request/putawayRequest.vue b/pages/putaway/request/putawayRequest.vue index 6a6238d5..28ab9c43 100644 --- a/pages/putaway/request/putawayRequest.vue +++ b/pages/putaway/request/putawayRequest.vue @@ -172,13 +172,13 @@ this.requestList = type === "refresh" ? list : this.requestList.concat(list); this.pageNo++; - updateTitle("原料上架申请(" + this.totalCount + ")"); + updateTitle("采购上架申请(" + this.totalCount + ")"); }).catch(error => { if (type === "refresh") { uni.stopPullDownRefresh(); } - updateTitle("原料上架申请"); + updateTitle("采购上架申请"); this.loadingType = ""; uni.hideLoading(); that.showMessage(error) diff --git a/pages/putaway/request/putawayRequestCreate.vue b/pages/putaway/request/putawayRequestCreate.vue index 97d4f00c..781a7e89 100644 --- a/pages/putaway/request/putawayRequestCreate.vue +++ b/pages/putaway/request/putawayRequestCreate.vue @@ -291,7 +291,7 @@ putawayRequestSubmit(params).then(res => { uni.hideLoading() if (res.data) { - this.showCommitSuccessMessage("提交成功
生成原料上架申请
" + res.data, ) + this.showCommitSuccessMessage("提交成功
生成采购上架申请
" + res.data, ) } else { this.showErrorMessage("提交失败[" + res.msg + "]") } diff --git a/pages/repleinsh/request/repleinshRequest.vue b/pages/repleinsh/request/repleinshRequest.vue index 7ceb8c0c..a2b09a27 100644 --- a/pages/repleinsh/request/repleinshRequest.vue +++ b/pages/repleinsh/request/repleinshRequest.vue @@ -159,13 +159,13 @@ this.jobList = type === "refresh" ? list : this.jobList.concat(list); this.pageNo++; - updateTitle("原料上架申请(" + this.totalCount + ")"); + updateTitle("采购上架申请(" + this.totalCount + ")"); }).catch(error => { if (type === "refresh") { uni.stopPullDownRefresh(); } - updateTitle("原料上架申请"); + updateTitle("采购上架申请"); this.loadingType = ""; uni.hideLoading(); that.showMessage(error)