sfms3.0
/
sfms3.0-uniapp
3
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

将原料上架改为采购上架

wms3.0_pda
niexiting 10 months ago
parent
c5c7a98b20
commit
6cf78e3a9d
10 changed files with 36 additions and 36 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      api/request.js
  2. 30
      api/request2.js
  3. 6
      common/classify.data.js
  4. 12
      pages.json
  5. 2
      pages/putaway/job/putawayDetail.vue
  6. 4
      pages/putaway/job/putawayJob.vue
  7. 2
      pages/putaway/record/putawayRecord.vue
  8. 4
      pages/putaway/request/putawayRequest.vue
  9. 2
      pages/putaway/request/putawayRequestCreate.vue
  10. 4
      pages/repleinsh/request/repleinshRequest.vue

6
api/request.js
View File

@ -481,7 +481,7 @@ export function getPurchaseReturnRequestList(params) {
/** /**
* 原料上架 * 采购上架
* @param {*} * @param {*}
* status 任务状态 * status 任务状态
* CreationTimeStart 开始日期 * CreationTimeStart 开始日期
@ -500,7 +500,7 @@ export function getPutawayJobList(params) {
/** /**
* *
* @param {*} id 任务id * @param {*} id 任务id
* 原料上架获取任务明细 * 采购上架获取任务明细
*/ */
export function putawayGetJobDetail(id) { export function putawayGetJobDetail(id) {
return request({ return request({
@ -511,7 +511,7 @@ export function putawayGetJobDetail(id) {
} }
/**原料上架 /**采购上架
* *
* @param {*} number 任务编号 * @param {*} number 任务编号
* 按任务编号查询任务 * 按任务编号查询任务

30
api/request2.js
View File

@ -981,7 +981,7 @@ export function inspectJobSubmit(params) {
/** /**
* 原料上架 任务 * 采购上架 任务
* status 任务状态 * status 任务状态
* 开始日期 * 开始日期
* 结束日期 * 结束日期
@ -997,7 +997,7 @@ export function getPutawayJobList(params) {
} }
/** /**
* 原料上架 获取任务明细 * 采购上架 获取任务明细
* @param {*} id 任务id * @param {*} id 任务id
* *
*/ */
@ -1010,7 +1010,7 @@ export function getPutawayJobDetail(id) {
} }
/** /**
* 原料上架 承接任务 * 采购上架 承接任务
* @param {*} id * @param {*} id
* *
*/ */
@ -1023,7 +1023,7 @@ export function takePutawayJob(id) {
} }
/** /**
* 原料上架 放弃承接 * 采购上架 放弃承接
* @param {*} id * @param {*} id
* *
*/ */
@ -1036,7 +1036,7 @@ export function cancleTakePutawayJob(id) {
} }
/** /**
* 原料上架 任务提交 * 采购上架 任务提交
* @param {*} params * @param {*} params
*/ */
export function putawayJobSubmit(params) { export function putawayJobSubmit(params) {
@ -1048,7 +1048,7 @@ export function putawayJobSubmit(params) {
} }
/** /**
* 原料上架申请 获取任务列表 * 采购上架申请 获取任务列表
* 任务状态 * 任务状态
* 开始日期 * 开始日期
* 结束日期 * 结束日期
@ -1064,7 +1064,7 @@ export function getPutawayRequestList(params) {
} }
/** /**
* 原料上架申请 获取任务明细 * 采购上架申请 获取任务明细
* @param {*} id 任务id * @param {*} id 任务id
* *
*/ */
@ -1077,7 +1077,7 @@ export function getPutawayRequestDetail(id) {
} }
/** /**
* 原料上架申请 提交 * 采购上架申请 提交
* @param {*} params * @param {*} params
*/ */
export function putawayRequestSubmit(params) { export function putawayRequestSubmit(params) {
@ -1089,7 +1089,7 @@ export function putawayRequestSubmit(params) {
} }
/** /**
* 原料上架申请 关闭任务 * 采购上架申请 关闭任务
* @param {*} params * @param {*} params
*/ */
export function putawayRequestClose(id) { export function putawayRequestClose(id) {
@ -1101,7 +1101,7 @@ export function putawayRequestClose(id) {
} }
/** /**
* 原料上架申请 提交审批 * 采购上架申请 提交审批
* @param {*} params * @param {*} params
*/ */
export function putawayRequestApprove(id) { export function putawayRequestApprove(id) {
@ -1113,7 +1113,7 @@ export function putawayRequestApprove(id) {
} }
/** /**
* 原料上架申请 提交审批通过 * 采购上架申请 提交审批通过
* @param {*} params * @param {*} params
*/ */
export function putawayRequestApproveAgree(id) { export function putawayRequestApproveAgree(id) {
@ -1125,7 +1125,7 @@ export function putawayRequestApproveAgree(id) {
} }
/** /**
* 原料上架申请 审批驳回 * 采购上架申请 审批驳回
* @param {*} params * @param {*} params
*/ */
export function putawayRequestApproveRefused(id) { export function putawayRequestApproveRefused(id) {
@ -1137,7 +1137,7 @@ export function putawayRequestApproveRefused(id) {
} }
/** /**
* 原料上架申请 处理 * 采购上架申请 处理
* @param {*} params * @param {*} params
*/ */
export function putawayRequestHandle(id) { export function putawayRequestHandle(id) {
@ -1149,7 +1149,7 @@ export function putawayRequestHandle(id) {
} }
/** /**
* 原料上架申请 重新添加 * 采购上架申请 重新添加
* @param {*} params * @param {*} params
*/ */
export function putawayRequestAddAgain(id) { export function putawayRequestAddAgain(id) {
@ -1163,7 +1163,7 @@ export function putawayRequestAddAgain(id) {
/** /**
* 原料上架记录 提交 * 采购上架记录 提交
* @param {*} params * @param {*} params
*/ */
export function putawayRecordSubmit(params) { export function putawayRecordSubmit(params) {

6
common/classify.data.js
View File

@ -55,13 +55,13 @@ export default [{
}, },
{ {
"name": "原料上架任务", "name": "采购上架任务",
"icon": "/static/menus/menu_search_lj.svg", "icon": "/static/menus/menu_search_lj.svg",
"url": "/pages/putaway/job/putawayJob", "url": "/pages/putaway/job/putawayJob",
"index": 3, "index": 3,
}, },
{ {
"name": "原料上架记录", "name": "采购上架记录",
"icon": "/static/menus/menu_search_lj.svg", "icon": "/static/menus/menu_search_lj.svg",
"url": "/pages/putaway/record/putawayRecord", "url": "/pages/putaway/record/putawayRecord",
"index": 3, "index": 3,
@ -309,7 +309,7 @@ export default [{
"index": 8, "index": 8,
}, },
{ {
"name": "原料上架申请", "name": "采购上架申请",
"icon": "/static/menus/menu_search_lj.svg", "icon": "/static/menus/menu_search_lj.svg",
"url": "/pages/putaway/request/putawayRequest", "url": "/pages/putaway/request/putawayRequest",
"index": 8, "index": 8,

12
pages.json
View File

@ -263,7 +263,7 @@
{ {
"path": "pages/putaway/job/putawayJob", "path": "pages/putaway/job/putawayJob",
"style": { "style": {
"navigationBarTitleText": "原料上架", "navigationBarTitleText": "采购上架",
"enablePullDownRefresh": false, "enablePullDownRefresh": false,
"titleNView": { "titleNView": {
// "autoBackButton": "true", // "autoBackButton": "true",
@ -292,21 +292,21 @@
{ {
"path": "pages/putaway/job/putawayDetail", "path": "pages/putaway/job/putawayDetail",
"style": { "style": {
"navigationBarTitleText": "原料上架详情", "navigationBarTitleText": "采购上架详情",
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
}, },
{ {
"path": "pages/putaway/record/putawayRecord", "path": "pages/putaway/record/putawayRecord",
"style": { "style": {
"navigationBarTitleText": "原料上架记录", "navigationBarTitleText": "采购上架记录",
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
}, },
{ {
"path": "pages/putaway/request/putawayRequest", "path": "pages/putaway/request/putawayRequest",
"style": { "style": {
"navigationBarTitleText": "原料上架申请", "navigationBarTitleText": "采购上架申请",
"enablePullDownRefresh": true, "enablePullDownRefresh": true,
"titleNView": { "titleNView": {
// "autoBackButton": "true", // "autoBackButton": "true",
@ -333,14 +333,14 @@
{ {
"path": "pages/putaway/request/putawayRequestDetail", "path": "pages/putaway/request/putawayRequestDetail",
"style": { "style": {
"navigationBarTitleText": "原料上架申请详情", "navigationBarTitleText": "采购上架申请详情",
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
}, },
{ {
"path": "pages/putaway/request/putawayRequestCreate", "path": "pages/putaway/request/putawayRequestCreate",
"style": { "style": {
"navigationBarTitleText": "原料上架申请创建", "navigationBarTitleText": "采购上架申请创建",
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
}, },

2
pages/putaway/job/putawayDetail.vue
View File

@ -413,7 +413,7 @@
putawayJobSubmit(params).then(res => { putawayJobSubmit(params).then(res => {
uni.hideLoading() uni.hideLoading()
if (res.data) { if (res.data) {
this.showCommitSuccessMessage("提交成功<br>生成原料上架记录<br>" + res.data) this.showCommitSuccessMessage("提交成功<br>生成采购上架记录<br>" + res.data)
} else { } else {
this.showErrorMessage("提交失败[" + res.msg + "]") this.showErrorMessage("提交失败[" + res.msg + "]")
} }

4
pages/putaway/job/putawayJob.vue
View File

@ -165,13 +165,13 @@
} }
this.jobList = type === "refresh" ? list : this.jobList.concat(list); this.jobList = type === "refresh" ? list : this.jobList.concat(list);
this.pageNo++; this.pageNo++;
updateTitle("原料上架(" + this.totalCount + ")"); updateTitle("采购上架(" + this.totalCount + ")");
}).catch(error => { }).catch(error => {
if (type === "refresh") { if (type === "refresh") {
uni.stopPullDownRefresh(); uni.stopPullDownRefresh();
} }
this.loadingType = ""; this.loadingType = "";
updateTitle("原料上架"); updateTitle("采购上架");
uni.hideLoading(); uni.hideLoading();
that.showMessage(error) that.showMessage(error)
}) })

2
pages/putaway/record/putawayRecord.vue
View File

@ -317,7 +317,7 @@
putawayRecordSubmit(params).then(res => { putawayRecordSubmit(params).then(res => {
uni.hideLoading() uni.hideLoading()
if (res.data) { if (res.data) {
this.showCommitSuccessMessage("提交成功<br>生成原料上架记录<br>" + res.data, ) this.showCommitSuccessMessage("提交成功<br>生成采购上架记录<br>" + res.data, )
} else { } else {
this.showErrorMessage("提交失败[" + res.msg + "]") this.showErrorMessage("提交失败[" + res.msg + "]")
} }

4
pages/putaway/request/putawayRequest.vue
View File

@ -172,13 +172,13 @@
this.requestList = type === "refresh" ? list : this.requestList.concat(list); this.requestList = type === "refresh" ? list : this.requestList.concat(list);
this.pageNo++; this.pageNo++;
updateTitle("原料上架申请(" + this.totalCount + ")"); updateTitle("采购上架申请(" + this.totalCount + ")");
}).catch(error => { }).catch(error => {
if (type === "refresh") { if (type === "refresh") {
uni.stopPullDownRefresh(); uni.stopPullDownRefresh();
} }
updateTitle("原料上架申请"); updateTitle("采购上架申请");
this.loadingType = ""; this.loadingType = "";
uni.hideLoading(); uni.hideLoading();
that.showMessage(error) that.showMessage(error)

2
pages/putaway/request/putawayRequestCreate.vue
View File

@ -291,7 +291,7 @@
putawayRequestSubmit(params).then(res => { putawayRequestSubmit(params).then(res => {
uni.hideLoading() uni.hideLoading()
if (res.data) { if (res.data) {
this.showCommitSuccessMessage("提交成功<br>生成原料上架申请<br>" + res.data, ) this.showCommitSuccessMessage("提交成功<br>生成采购上架申请<br>" + res.data, )
} else { } else {
this.showErrorMessage("提交失败[" + res.msg + "]") this.showErrorMessage("提交失败[" + res.msg + "]")
} }

4
pages/repleinsh/request/repleinshRequest.vue
View File

@ -159,13 +159,13 @@
this.jobList = type === "refresh" ? list : this.jobList.concat(list); this.jobList = type === "refresh" ? list : this.jobList.concat(list);
this.pageNo++; this.pageNo++;
updateTitle("原料上架申请(" + this.totalCount + ")"); updateTitle("采购上架申请(" + this.totalCount + ")");
}).catch(error => { }).catch(error => {
if (type === "refresh") { if (type === "refresh") {
uni.stopPullDownRefresh(); uni.stopPullDownRefresh();
} }
updateTitle("原料上架申请"); updateTitle("采购上架申请");
this.loadingType = ""; this.loadingType = "";
uni.hideLoading(); uni.hideLoading();
that.showMessage(error) that.showMessage(error)

Write Preview
Loading…
Cancel
Save