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

Merge branch 'master' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-uniapp

wms3.0_pda
niexiting 11 months ago
parent
1fb9d414fc 11c0b7b79f
commit
27d2b42711
40 changed files with 765 additions and 467 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. 83
      api/request2.js
  2. 1
      main.js
  3. 17
      mycomponents/balance/balance.vue
  4. 5
      mycomponents/recommend/recommend.vue
  5. 5
      mycomponents/recommend/recommendCount.vue
  6. 28
      pages.json
  7. 42
      pages/customerReturn/job/returnDetail.vue
  8. 30
      pages/inspect/job/inspectDetail.vue
  9. 92
      pages/inspect/job/inspectFullDetail.vue
  10. 14
      pages/inventoryMove/coms/comInventoryJobCard.vue
  11. 33
      pages/inventoryMove/coms/comMoveJob.vue
  12. 5
      pages/inventoryMove/coms/comMovebalance.vue
  13. 2
      pages/inventoryMove/job/HoldToScrapMoveJob.vue
  14. 2
      pages/inventoryMove/job/OktoScrapMoveJob.vue
  15. 2
      pages/inventoryMove/job/holdToOkMoveJob.vue
  16. 145
      pages/inventoryMove/job/inventoryMoveDetail.vue
  17. 2
      pages/inventoryMove/job/okToHoldMoveJob.vue
  18. 2
      pages/inventoryMove/job/scrapToHoldMoveJob.vue
  19. 10
      pages/issue/request/issueRequest.vue
  20. 30
      pages/productDismantle/job/productDismantleDetail.vue
  21. 8
      pages/productPutaway/coms/comProductJobCard.vue
  22. 89
      pages/productPutaway/job/productPutawayDetail.vue
  23. 56
      pages/productPutaway/record/productPutawayRecord.vue
  24. 132
      pages/productPutaway/request/putawayRequest.vue
  25. 8
      pages/productPutaway/request/putawayRequestCreate.vue
  26. 2
      pages/productReceipt/job/productReceiptDetail.vue
  27. 46
      pages/productionReceipt/job/productionReceiptDetail.vue
  28. 10
      pages/productionReturn/coms/comReturnCommonRequest.vue
  29. 42
      pages/purchaseReturn/job/returnDetail.vue
  30. 10
      pages/purchaseReturn/request/returnRequest.vue
  31. 42
      pages/putaway/job/putawayDetail.vue
  32. 43
      pages/scrap/job/scrapJobDetail.vue
  33. 10
      pages/scrap/request/scrapRrequest.vue
  34. 42
      pages/transfer/job/issueDetail.vue
  35. 43
      pages/transfer/job/receiptDetail.vue
  36. 26
      pages/transfer/job/transferDetail.vue
  37. 42
      pages/unPlanned/job/issueJobDetail.vue
  38. 12
      pages/unPlanned/request/issueRequest.vue
  39. 11
      pages/unPlanned/request/receiptRequest.vue
  40. 8
      static/config.json

83
api/request2.js
View File

@ -1095,26 +1095,26 @@ export function getInventoryMoveJobDetail(id) {
} }
/** /**
* 生产收料 任务承接 * 库存转移任务 任务承接
* @param {*} id * @param {*} id
* *
*/ */
export function takeInventoryMoveJob(id) { export function takeInventoryMoveJob(id) {
return request({ return request({
url: baseApi + "/wms/purchasereceipt-job-main/accept?id=" + id, url: baseApi + "/wms/inventorymove-job-main/accept?id=" + id,
method: "put", method: "put",
data: {}, data: {},
}); });
} }
/** /**
* 生产收料 放弃承接 * 库存转移任务 放弃承接
* @param {*} id * @param {*} id
* *
*/ */
export function cancleTakeInventoryMoveJob(id) { export function cancleTakeInventoryMoveJob(id) {
return request({ return request({
url: baseApi + "/wms/purchasereceipt-job-main/abandon?id=" + id, url: baseApi + "/wms/inventorymove-job-main/abandon?id=" + id,
method: "put", method: "put",
data: {}, data: {},
}); });
@ -1128,7 +1128,7 @@ export function cancleTakeInventoryMoveJob(id) {
*/ */
export function inventoryMoveSubmit(params) { export function inventoryMoveSubmit(params) {
return request({ return request({
url: baseApi + "/magic-api/pda/job/purchasereceipt/jobSubmit?id=" + id, url: baseApi + "/wms/inventorymove-job-main/execute",
method: "put", method: "put",
data: params, data: params,
}); });
@ -1619,40 +1619,40 @@ export function getProductPutawayJobDetail(id) {
} }
/** /**
* 制品上架 承接 * 制品上架任务 承接
* @param {*} id * @param {*} id
* *
*/ */
export function takeProductPutawayJob(id) { export function takeProductPutawayJob(id) {
return request({ return request({
url: baseApi + "/wms/purchasereceipt-job-main/abandon?id=" + id, url: baseApi + "/wms/productputaway-job-main/accept?id=" + id,
method: "put", method: "put",
data: {}, data: {},
}); });
} }
/** /**
* 制品上架 放弃承接 * 制品上架任务 放弃承接
* @param {*} id * @param {*} id
* *
*/ */
export function cancleTakeProductPutawayJob(id) { export function cancleTakeProductPutawayJob(id) {
return request({ return request({
url: baseApi + "/wms/purchasereceipt-job-main/abandon?id=" + id, url: baseApi + "/wms/productputaway-job-main/abandon?id=" + id,
method: "get", method: "put",
data: {}, data: {},
}); });
} }
/** /**
* 制品上架 任务提交 * 制品上架任务 提交
* @param {*} 任务id * @param {*} 任务id
* *
*/ */
export function productPutawayJobSubmit(params) { export function productPutawayJobSubmit(params) {
return request({ return request({
url: baseApi + "/magic-api/pda/job/purchasereceipt/jobSubmit", url: baseApi + "/wms/productputaway-job-main/execute",
method: "put", method: "put",
data: params, data: params,
}); });
@ -2209,6 +2209,65 @@ export function productPutawayRequestSubmit(params) {
data: params, data: params,
}); });
} }
/**
* 制品上架申请 处理
* @param {*} params
*/
export function productPutawayRequestHandle(id) {
return request({
url: baseApi + "/wms/productputaway-request-main/handle?id=" + id,
method: "put",
data: {},
});
}
/**
* 制品上架申请 提交审批
* @param {*} params
*/
export function productPutawayRequestApprove(id) {
return request({
url: baseApi + "/wms/productputaway-request-main/submit?id=" + id,
method: "put",
data: {},
});
}
/**
* 制品上架申请 提交审批通过
* @param {*} params
*/
export function productPutawayRequestApproveAgree(id) {
return request({
url: baseApi + "/wms/productputaway-request-main/agree?id=" + id,
method: "put",
data: {},
});
}
/**
* 制品上架申请 审批驳回
* @param {*} params
*/
export function productPutawayRequestApproveRefused(id) {
return request({
url: baseApi + "/wms/productputaway-request-main/refused?id=" + id,
method: "put",
data: {},
});
}
/**
* 制品上架申请 关闭任务
* @param {*} params
*/
export function productPutawayRequestClose(id) {
return request({
url: baseApi + "/wms/productputaway-request-main/close?id=" + id,
method: "put",
data: {},
});
}
/** /**
* 发料申请列表 * 发料申请列表

1
main.js
View File

@ -72,6 +72,7 @@ export function startApp(app) {
app.config.globalProperties.$recepit_configList = res.data.recepit_configList; app.config.globalProperties.$recepit_configList = res.data.recepit_configList;
getApp().globalData.recepit_configList = res.data.recepit_configList; getApp().globalData.recepit_configList = res.data.recepit_configList;
getApp().globalData.feed_configList = res.data.feed_configList; getApp().globalData.feed_configList = res.data.feed_configList;
getApp().globalData.isDevelopment = res.data.baseInfo.isDevelopment.value
} }
}, },
fail: (error) => { fail: (error) => {

17
mycomponents/balance/balance.vue
View File

@ -14,12 +14,16 @@
<compare-qty v-else :dataContent="dataContent" :recommendQty="Number( dataContent.qty)" <compare-qty v-else :dataContent="dataContent" :recommendQty="Number( dataContent.qty)"
:handleQty="Number (dataContent.handleQty)" :isShowStdPack="isShowStdPack"> :handleQty="Number (dataContent.handleQty)" :isShowStdPack="isShowStdPack">
</compare-qty> </compare-qty>
<view class="" style="font-size: 40rpx;"> <view class="" v-if="isDevlement()">
<u-button @click="copy" size="mini" type="primary">复制箱码</u-button> <view class="" style="font-size: 40rpx;">
</view> <u-button @click="copy" size="mini" type="primary">复制箱码</u-button>
<view class="" style="font-size: 40rpx;"> </view>
<u-button @click="copyPro" size="mini" type="primary">复制制品</u-button> <view class="" style="font-size: 40rpx;">
<u-button @click="copyPro" size="mini" type="primary">复制制品</u-button>
</view>
</view> </view>
</view> </view>
</view> </view>
<!-- <u-line></u-line> --> <!-- <u-line></u-line> -->
@ -102,6 +106,9 @@
}) })
} }
) )
},
isDevlement(){
return getApp().globalData.isDevelopment;
} }
} }
} }

5
mycomponents/recommend/recommend.vue
View File

@ -17,7 +17,7 @@
<compare-qty v-else :dataContent="detail" :recommendQty="Number(detail.qty)" <compare-qty v-else :dataContent="detail" :recommendQty="Number(detail.qty)"
:handleQty="Number(detail.handleQty)" :isShowStdPack="false"> :handleQty="Number(detail.handleQty)" :isShowStdPack="false">
</compare-qty> </compare-qty>
<view class="uni-flex uni-row" style="vertical-align:center"> <view class="uni-flex uni-row" style="vertical-align:center" v-if="isDevlement()">
<text style="font-size: 30rpx;color: #2979ff; " <text style="font-size: 30rpx;color: #2979ff; "
@click="copy">复制采购</text> @click="copy">复制采购</text>
<text style="font-size: 30rpx;color: #2979ff;" @click="copyPro">|制品</text> <text style="font-size: 30rpx;color: #2979ff;" @click="copyPro">|制品</text>
@ -105,6 +105,9 @@
}) })
} }
) )
},
isDevlement(){
return getApp().globalData.isDevelopment;
} }
} }
} }

5
mycomponents/recommend/recommendCount.vue
View File

@ -16,7 +16,7 @@
<compare-qty :dataContent="detail" :recommendQty="Number(detail.qty)" :isShowRecommendQty="isShowRecommendQty" <compare-qty :dataContent="detail" :recommendQty="Number(detail.qty)" :isShowRecommendQty="isShowRecommendQty"
:handleQty="Number(detail.handleQty)" :isShowStdPack="false"> :handleQty="Number(detail.handleQty)" :isShowStdPack="false">
</compare-qty> </compare-qty>
<view class="uni-flex uni-row" style="vertical-align:center"> <view class="uni-flex uni-row" style="vertical-align:center" v-if="isDevlement()">
<text style="font-size: 30rpx;color: #2979ff; " <text style="font-size: 30rpx;color: #2979ff; "
@click="copy">复制采购</text> @click="copy">复制采购</text>
<text style="font-size: 30rpx;color: #2979ff;" @click="copyPro">|制品</text> <text style="font-size: 30rpx;color: #2979ff;" @click="copyPro">|制品</text>
@ -108,6 +108,9 @@
}) })
} }
) )
},
isDevlement(){
return getApp().globalData.isDevelopment;
} }
} }
} }

28
pages.json
View File

@ -35,16 +35,16 @@
"navigationBarTitleText": "登录", "navigationBarTitleText": "登录",
"titleNView": { "titleNView": {
// "autoBackButton": "true", // "autoBackButton": "true",
"buttons": [ // "buttons": [
// 右边按钮 // // 右边按钮
{ // {
"float": "right", // "float": "right",
"fontSize": "52rpx", //按钮上文字的大小 // "fontSize": "52rpx", //按钮上文字的大小
"text": "\ue706", // "text": "\ue706",
"fontSrc": "/static/ali_icon/iconfont.ttf" // "fontSrc": "/static/ali_icon/iconfont.ttf"
} // }
] // ]
} }
} }
}, },
@ -1202,6 +1202,14 @@
} }
}, },
{
"path": "pages/productPutaway/request/putawayRequestCreate",
"style": {
"navigationBarTitleText": "制品上架申请创建",
"enablePullDownRefresh": false
}
},
{ {
"path": "pages/productDismantle/job/productDismantleJob", "path": "pages/productDismantle/job/productDismantleJob",

42
pages/customerReturn/job/returnDetail.vue
View File

@ -270,27 +270,39 @@
} else { } else {
let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus); let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus);
let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus); let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus);
if (itemDetail.inventoryStatus != result.balance.inventoryStatus) { if (itemDetail.inventoryStatus != result.balance.inventoryStatus) {
this.showQuestionMessage('实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus + if(this.jobContent.allowModifyInventoryStatus=="TRUE"){
']不一致,是否继续上架?', res => { this.showQuestionMessage('任务中允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
if (res) { ']不一致,是否继续上架?', res => {
itemDetail.scaned = true; if (res) {
itemDetail.handleQty = Number(result.balance.qty) itemDetail.scaned = true;
itemDetail.balance = result.balance; itemDetail.handleQty = Number(result.balance.qty)
itemDetail.balance.balanceQty = result.balance.qty; itemDetail.toInventoryStatus = result.balance.inventoryStatus;
itemDetail.balance.stdPackQty = result.package.stdPackQty itemDetail.balance = result.balance;
itemDetail.balance.stdPackUnit = result.package.stdPackUnit itemDetail.balance.balanceQty = Number(result.balance.qty)
this.calcHandleQty(); itemDetail.balance.stdPackQty = Number(result.package.stdPackQty)
} else { itemDetail.balance.stdPackUnit = result.package.stdPackUnit
this.calcHandleQty();
} else {
this.scanPopupGetFocus();
}
});
}else {
this.showQuestionMessage('任务中不允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
']不一致,不允许转移!', res => {
this.scanPopupGetFocus(); this.scanPopupGetFocus();
} });
}); }
} else { } else {
itemDetail.scaned = true; itemDetail.scaned = true;
itemDetail.handleQty = Number(result.balance.qty) itemDetail.handleQty = Number(result.balance.qty)
itemDetail.toInventoryStatus = result.balance.inventoryStatus;
itemDetail.balance = result.balance; itemDetail.balance = result.balance;
itemDetail.balance.balanceQty = result.balance.qty; itemDetail.balance.balanceQty = Number(result.balance.qty)
itemDetail.balance.stdPackQty = result.package.stdPackQty itemDetail.balance.stdPackQty = Number(result.package.stdPackQty)
itemDetail.balance.stdPackUnit = result.package.stdPackUnit itemDetail.balance.stdPackUnit = result.package.stdPackUnit
this.calcHandleQty(); this.calcHandleQty();
} }

30
pages/inspect/job/inspectDetail.vue
View File

@ -309,17 +309,25 @@
let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus); let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus);
let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus); let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus);
if (itemDetail.inventoryStatus != result.balance.inventoryStatus) { if (itemDetail.inventoryStatus != result.balance.inventoryStatus) {
this.showQuestionMessage('实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus + if(this.jobContent.allowModifyInventoryStatus=="TRUE"){
']不一致,是否继续检验?', res => { this.showQuestionMessage('任务中允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
if (res) { ']不一致,是否继续检验?', res => {
itemDetail.scaned = true; if (res) {
itemDetail.handleQty = Number(result.balance.qty) itemDetail.scaned = true;
itemDetail.balance = result.balance; itemDetail.handleQty = Number(result.balance.qty)
this.calcHandleQty(); itemDetail.balance = result.balance;
} else { this.calcHandleQty();
} else {
this.scanPopupGetFocus();
}
});
}else {
this.showQuestionMessage('任务中不允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
']不一致,不允许转移!', res => {
this.scanPopupGetFocus(); this.scanPopupGetFocus();
} });
}); }
} else { } else {
itemDetail.scaned = true; itemDetail.scaned = true;
itemDetail.balance = result.balance; itemDetail.balance = result.balance;
@ -441,7 +449,7 @@
detail.failedQty = detail.failedQty; detail.failedQty = detail.failedQty;
detail.crackQty = detail.crackQty; detail.crackQty = detail.crackQty;
detail.notPassedQty = detail.failedQty; detail.notPassedQty = detail.failedQty;
// detail.goodQty = detail.handleQty - detail.failedQty - detail.crackQty; detail.goodQty = detail.handleQty - detail.failedQty - detail.crackQty;
detail.inspectUser = this.$store.state.user.id detail.inspectUser = this.$store.state.user.id
//合格数==样品数，全部合格 //合格数==样品数，全部合格

92
pages/inspect/job/inspectFullDetail.vue
View File

@ -148,24 +148,24 @@
}, },
methods: { methods: {
deleteFileById(id){ deleteFileById(id) {
deleteFileById(id).then(res=>{ deleteFileById(id).then(res => {
}) })
}, },
getFileList(id){ getFileList(id) {
getFileList("jobInspectDetail", id).then(res => { getFileList("jobInspectDetail", id).then(res => {
if(res.data){ if (res.data) {
res.data.forEach(res=>{ res.data.forEach(res => {
this.deleteFileById(res.id) this.deleteFileById(res.id)
}) })
} }
}) })
}, },
clearPicList(subList){ clearPicList(subList) {
subList.forEach(item=>{ subList.forEach(item => {
this.getFileList(item.id) this.getFileList(item.id)
}) })
}, },
@ -325,17 +325,25 @@
let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus); let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus);
let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus); let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus);
if (itemDetail.inventoryStatus != result.balance.inventoryStatus) { if (itemDetail.inventoryStatus != result.balance.inventoryStatus) {
this.showQuestionMessage('实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus + if(this.jobContent.allowModifyInventoryStatus=="TRUE"){
']不一致,是否继续检验?', res => { this.showQuestionMessage('任务中允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
if (res) { ']不一致,是否继续检验?', res => {
itemDetail.scaned = true; if (res) {
itemDetail.handleQty = Number(result.balance.qty) itemDetail.scaned = true;
itemDetail.balance = result.balance; itemDetail.handleQty = Number(result.balance.qty)
this.calcHandleQty(); itemDetail.balance = result.balance;
} else { this.calcHandleQty();
} else {
this.scanPopupGetFocus();
}
});
}else {
this.showQuestionMessage('任务中不允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
']不一致,不允许转移!', res => {
this.scanPopupGetFocus(); this.scanPopupGetFocus();
} });
}); }
} else { } else {
itemDetail.scaned = true; itemDetail.scaned = true;
itemDetail.balance = result.balance; itemDetail.balance = result.balance;
@ -353,23 +361,33 @@
commit() { commit() {
this.scanCount = getScanCount(this.subList); this.scanCount = getScanCount(this.subList);
// if (this.scanCount == 0) {
// this.showErrorMessage("扫描数为0,请先扫描") if (this.scanCount == 0) {
// return; this.showErrorMessage("扫描数为0,请先扫描")
// } return;
//如果是全检，必须全部扫描-------改为:任务中的是否允许部分提交：nxt 2023年12月13日
if (this.jobContent.allowPartialComplete == "TRUE") {
this.submitJob();
} else { } else {
//不允许部分提交，提示 if (this.scanCount == this.subList.length) {
this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交<br>' + "已经扫描[" + this.scanCount + this.submitJob();
"]箱总共[" + this } else {
.subList.length + "]箱", res => { //如果是全检，必须全部扫描-------改为:任务中的是否允许部分提交：nxt 2023年12月13日
if (res) { if (this.jobContent.allowPartialComplete == "TRUE") {
this.openScanPopup(); this.submitJob();
} } else {
}); //不允许部分提交，提示
this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交<br>' + "已经扫描[" + this.scanCount +
"]箱总共[" + this
.subList.length + "]箱", res => {
if (res) {
this.openScanPopup();
}
});
}
}
} }
}, },
submitJob() { submitJob() {
@ -449,7 +467,7 @@
detail.failedQty = detail.failedQty; detail.failedQty = detail.failedQty;
detail.crackQty = detail.crackQty; detail.crackQty = detail.crackQty;
detail.notPassedQty = detail.failedQty; detail.notPassedQty = detail.failedQty;
// detail.goodQty = detail.handleQty - detail.failedQty - detail.crackQty; detail.goodQty = detail.handleQty - detail.failedQty - detail.crackQty;
detail.inspectUser = this.$store.state.user.id detail.inspectUser = this.$store.state.user.id
//合格数==样品数，全部合格 //合格数==样品数，全部合格

14
pages/inventoryMove/coms/comInventoryJobCard.vue
View File

@ -3,19 +3,7 @@
<view class="task_item"> <view class="task_item">
<view class="task_text"> <view class="task_text">
<view class=""> <view class="">
物品代码 : {{dataContent.itemCode}} 申请单号 : {{dataContent.requestNumber}}
</view>
</view>
<view class="task_text">
<view class="">
来源库位 : {{dataContent.fromLocationCode}}
</view>
</view>
<view class="task_text">
<view class="">
目标库位 : {{dataContent.toLocationCode}}
</view> </view>
</view> </view>
</view> </view>

33
pages/inventoryMove/coms/comMoveJob.vue
View File

@ -28,12 +28,9 @@
</template> </template>
<script> <script>
import {
getInventoryMoveJobByNumber,
cancelTakeJob
} from '@/api/request.js';
import { import {
getInventoryMoveJobList, getInventoryMoveJobList,
cancleTakeInventoryMoveJob
} from '@/api/request2.js'; } from '@/api/request2.js';
import { import {
@ -226,8 +223,7 @@
this.$refs.comMessage.showQuestionMessage("确定要放弃当前任务?", this.$refs.comMessage.showQuestionMessage("确定要放弃当前任务?",
res => { res => {
if (res) { if (res) {
var id = dataContent.id this.cancleJob(dataContent.id);
this.cancleJob(id);
} }
}); });
} }
@ -238,20 +234,17 @@
}, },
cancleJob(id) { cancleJob(id) {
var data = { cancleTakeInventoryMoveJob(id).then(res => {
jobStatusId: id, if(res.data){
jobStatusTableName: "win_job_inventorymove_main", this.getList("refresh")
jobStatusTableNameDetail: "win_job_inventorymove_detail", uni.showToast({
jobStatusSchemaCode: "inventorymovejob", title:"放弃任务成功"
} })
cancelTakeJob(data).then(res => { }else {
this.getList("refresh") this.showMessage("放弃任务失败")
}).catch(res => { }
this.$refs.comMessage.showErrorMessage(message, res => { }).catch(error => {
if (res) { this.showMessage(error)
}
});
}) })
}, },

5
pages/inventoryMove/coms/comMovebalance.vue
View File

@ -19,7 +19,7 @@
:fromInventoryStatus="fromInventoryStatus" :toInventoryStatus="toInventoryStatus"> :fromInventoryStatus="fromInventoryStatus" :toInventoryStatus="toInventoryStatus">
</moveStatus> </moveStatus>
</view> </view>
<view class=""> <view class="" v-if="isDevlement()">
<view class="" style="font-size: 40rpx;"> <view class="" style="font-size: 40rpx;">
<u-button @click="copy" size="mini" type="primary">复制箱码</u-button> <u-button @click="copy" size="mini" type="primary">复制箱码</u-button>
</view> </view>
@ -127,6 +127,9 @@
}) })
} }
) )
},
isDevlement(){
return getApp().globalData.isDevelopment;
} }
} }
} }

2
pages/inventoryMove/job/HoldToScrapMoveJob.vue
View File

@ -1,6 +1,6 @@
<template> <template>
<view class="page-wraper"> <view class="page-wraper">
<comMoveJob ref="comMoveJob" businessTypeCode='HoldToScrap'> </comMoveJob> <comMoveJob ref="comMoveJob" businessTypeCode='HoldToScrapJob'> </comMoveJob>
</view> </view>
</template> </template>

2
pages/inventoryMove/job/OktoScrapMoveJob.vue
View File

@ -1,6 +1,6 @@
<template> <template>
<view class="page-wraper"> <view class="page-wraper">
<comMoveJob ref="comMoveJob" businessTypeCode='OktoScrap'> </comMoveJob> <comMoveJob ref="comMoveJob" businessTypeCode='OktoScrapJob'> </comMoveJob>
</view> </view>
</template> </template>

2
pages/inventoryMove/job/holdToOkMoveJob.vue
View File

@ -1,6 +1,6 @@
<template> <template>
<view class="page-wraper"> <view class="page-wraper">
<comMoveJob ref="comMoveJob" businessTypeCode='HoldToOk'> </comMoveJob> <comMoveJob ref="comMoveJob" businessTypeCode='HoldToOkJob'> </comMoveJob>
</view> </view>
</template> </template>

145
pages/inventoryMove/job/inventoryMoveDetail.vue
View File

@ -1,5 +1,14 @@
<template> <template>
<view class="page-wraper"> <view class="page-wraper">
<view class="page-header">
<view class="header_job_top">
<job-top :dataContent="jobContent"></job-top>
</view>
<view class="header_item">
申请单号 : {{jobContent.requestNumber}}
</view>
<u-line color="#D8D8D8" style="margin-bottom: 15rpx;margin-top: 10rpx;"></u-line>
</view>
<view class="page-main"> <view class="page-main">
<scroll-view scroll-y="true" class="page-main-scroll"> <scroll-view scroll-y="true" class="page-main-scroll">
<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id"> <view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
@ -63,7 +72,7 @@
import comMessage from '@/mycomponents/common/comMessage.vue' import comMessage from '@/mycomponents/common/comMessage.vue'
import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue" import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue"
import detailInfoPopup from '@/pages/inventoryMove/coms/detailInfoPopup.vue' import detailInfoPopup from '@/pages/inventoryMove/coms/detailInfoPopup.vue'
import jobTop from '@/mycomponents/job/jobTop.vue'
export default { export default {
@ -75,7 +84,8 @@
requiredLocation, requiredLocation,
comMessage, comMessage,
winScanPackAndLocation, winScanPackAndLocation,
detailInfoPopup detailInfoPopup,
jobTop
}, },
data() { data() {
return { return {
@ -95,15 +105,14 @@
this.id = option.id; this.id = option.id;
if (this.id != undefined) { if (this.id != undefined) {
// //新建的任务自动接收 // //新建的任务自动接收
// if (option.status == "JOB_PENDING") { if (option.status == "1") {
// this.receive((callback => { this.receive((callback => {
// this.received = true; this.received = true;
// this.getDetail(); this.getDetail();
// })); }));
// } else { } else {
// this.getDetail(); this.getDetail();
// } }
this.getDetail();
} }
}, },
//返回首页 //返回首页
@ -255,32 +264,60 @@
} else { } else {
let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus); let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus);
let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus); let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus);
if (itemDetail.inventoryStatus != result.balance.inventoryStatus) { if (itemDetail.inventoryStatus != result.balance.inventoryStatus){
this.showQuestionMessage('实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus + if(this.jobContent.allowModifyInventoryStatus=="TRUE"){
']不一致,是否继续上架?', res => { this.showQuestionMessage('任务中允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
if (res) { ']不一致,是否继续转移?', res => {
itemDetail.scaned = true; if (res) {
itemDetail.handleQty = Number(result.label.qty) > Number(result.balance itemDetail.scaned = true;
.qty) ? Number(result.balance.qty) : Number(result.label.qty); itemDetail.handleQty = Number(result.balance.qty) ;
itemDetail.balance = result.balance; itemDetail.toInventoryStatus = result.balance.inventoryStatus;
itemDetail.balance.balanceQty = result.balance.qty; itemDetail.balance = result.balance;
itemDetail.balance.stdPackQty = result.package.stdPackQty itemDetail.balance.balanceQty =Number(result.balance.qty) ;
itemDetail.balance.stdPackUnit = result.package.stdPackUnit itemDetail.balance.stdPackQty = Number(result.package.stdPackQty)
this.calcHandleQty(); itemDetail.balance.stdPackUnit = result.package.stdPackUnit
} else { this.calcHandleQty();
} else {
this.scanPopupGetFocus();
}
});
}else {
this.showQuestionMessage('任务中不允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
']不一致,不允许转移!', res => {
this.scanPopupGetFocus(); this.scanPopupGetFocus();
} });
}); }
} else { }else {
itemDetail.scaned = true; itemDetail.scaned = true;
itemDetail.handleQty = Number(result.label.qty) > Number(result.balance itemDetail.handleQty = Number(result.balance.qty) ;
.qty) ? Number(result.balance.qty) : Number(result.label.qty); itemDetail.toInventoryStatus = result.balance.inventoryStatus;
itemDetail.balance = result.balance; itemDetail.balance = result.balance;
itemDetail.balance.balanceQty = result.balance.qty; itemDetail.balance.balanceQty = Number(result.balance.qty);
itemDetail.balance.stdPackQty = result.package.stdPackQty itemDetail.balance.stdPackQty = Number(result.package.stdPackQty)
itemDetail.balance.stdPackUnit = result.package.stdPackUnit itemDetail.balance.stdPackUnit = result.package.stdPackUnit
this.calcHandleQty(); this.calcHandleQty();
} }
// if (itemDetail.inventoryStatus != result.balance.inventoryStatus) {
// this.showQuestionMessage('实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
// ']不一致,是否继续转移?', res => {
// if (res) {
// itemDetail.scaned = true;
// itemDetail.handleQty = Number(result.balance.qty) ;
// itemDetail.toInventoryStatus = result.balance.inventoryStatus;
// itemDetail.balance = result.balance;
// itemDetail.balance.balanceQty = result.balance.qty;
// itemDetail.balance.stdPackQty = result.package.stdPackQty
// itemDetail.balance.stdPackUnit = result.package.stdPackUnit
// this.calcHandleQty();
// } else {
// this.scanPopupGetFocus();
// }
// });
// } else {
// }
} }
} }
} }
@ -325,21 +362,35 @@
title: "提交中....", title: "提交中....",
mask: true mask: true
}); });
this.managementList = [];
//查询管理模式
// this.detailSource.forEach(item => {
// item.subList.forEach(detail => {
// if (detail.scaned) {
// getManagementPrecisions(item.itemCode,detail.toLocationCode,res=>{
// if (res.success) {
// this.managementList = this.managementList.concat(res.list)
// }
// })
// }
// })
// })
var params = this.setParams(); var params = this.setParams();
console.log("提交" + JSON.stringify(params)) console.log("提交" + JSON.stringify(params))
// inventoryMoveSubmit(params).then(res => { inventoryMoveSubmit(params).then(res => {
// uni.hideLoading() uni.hideLoading()
// if (res.data) { if (res.data) {
// this.showCommitSuccessMessage("提交成功<br>生成库存转移记录" + res.data) this.showCommitSuccessMessage("提交成功<br>生成库存转移记录<br>" + res.data)
// } else { } else {
// this.showErrorMessage("提交失败[" + res.msg + "]") this.showErrorMessage("提交失败[" + res.msg + "]")
// } }
// }).catch(error => { }).catch(error => {
// uni.hideLoading() uni.hideLoading()
// this.showErrorMessage(error) this.showErrorMessage(error)
// }) })
}, },
setParams() { setParams() {
@ -349,6 +400,13 @@
this.detailSource.forEach(item => { this.detailSource.forEach(item => {
item.subList.forEach(detail => { item.subList.forEach(detail => {
if (detail.scaned) { if (detail.scaned) {
// var info = getPackingNumberAndBatch(this.managementList, detail.itemCode,
// detail.packingNumber, detail.batch);
detail.toPackingNumber = detail.packingNumber;
detail.toBatch = detail.batch;
detail.toContainerNumber = '';
detail.toLocationCode = detail.toLocationCode;
subList.push(detail) subList.push(detail)
} }
}) })
@ -420,6 +478,7 @@
navigateBack(1) navigateBack(1)
}) })
}, },
} }
} }

2
pages/inventoryMove/job/okToHoldMoveJob.vue
View File

@ -1,6 +1,6 @@
<template> <template>
<view class="page-wraper"> <view class="page-wraper">
<comMoveJob ref="comMoveJob" businessTypeCode='OkToHold'> </comMoveJob> <comMoveJob ref="comMoveJob" businessTypeCode='OkToHoldJob'> </comMoveJob>
</view> </view>
</template> </template>

2
pages/inventoryMove/job/scrapToHoldMoveJob.vue
View File

@ -1,6 +1,6 @@
<template> <template>
<view class="page-wraper"> <view class="page-wraper">
<comMoveJob ref="comMoveJob" businessTypeCode='ScrapToHold'> </comMoveJob> <comMoveJob ref="comMoveJob" businessTypeCode='ScrapToHoldJob'> </comMoveJob>
</view> </view>
</template> </template>

10
pages/issue/request/issueRequest.vue
View File

@ -293,10 +293,10 @@
issueRequestSubmitApprove(id) { issueRequestSubmitApprove(id) {
issueRequestSubmitApprove(id).then(res => { issueRequestSubmitApprove(id).then(res => {
if (res.data) { if (res.data) {
this.getList("refresh")
uni.showToast({ uni.showToast({
title: "申请提交审批成功" title: "申请提交审批成功"
}) })
this.getList("refresh")
} else { } else {
this.showMessage("申请提交审批失败") this.showMessage("申请提交审批失败")
} }
@ -310,10 +310,10 @@
issueRequestClose(id) { issueRequestClose(id) {
issueRequestClose(id).then(res => { issueRequestClose(id).then(res => {
if (res.data) { if (res.data) {
this.getList("refresh")
uni.showToast({ uni.showToast({
title: "申请关闭成功" title: "申请关闭成功"
}) })
this.getList("refresh")
} else { } else {
this.showMessage("申请关闭失败") this.showMessage("申请关闭失败")
} }
@ -326,10 +326,10 @@
issueRequestSubmitApproveAgree(id) { issueRequestSubmitApproveAgree(id) {
issueRequestSubmitApproveAgree(id).then(res => { issueRequestSubmitApproveAgree(id).then(res => {
if (res.data) { if (res.data) {
this.getList("refresh")
uni.showToast({ uni.showToast({
title: "申请审批通过成功" title: "申请审批通过成功"
}) })
this.getList("refresh")
} else { } else {
this.showMessage("申请审批通过失败") this.showMessage("申请审批通过失败")
} }
@ -342,10 +342,10 @@
issueRequestSubmitApproveRefused(id) { issueRequestSubmitApproveRefused(id) {
issueRequestSubmitApproveRefused(id).then(res => { issueRequestSubmitApproveRefused(id).then(res => {
if (res.data) { if (res.data) {
this.getList("refresh")
uni.showToast({ uni.showToast({
title: "申请审批驳回成功" title: "申请审批驳回成功"
}) })
this.getList("refresh")
} else { } else {
this.showMessage("申请审批驳回失败") this.showMessage("申请审批驳回失败")
} }
@ -358,10 +358,10 @@
issueRequestHandle(id) { issueRequestHandle(id) {
issueRequestHandle(id).then(res => { issueRequestHandle(id).then(res => {
if (res.data) { if (res.data) {
this.getList("refresh")
uni.showToast({ uni.showToast({
title: "申请处理成功" title: "申请处理成功"
}) })
this.getList("refresh")
} else { } else {
this.showMessage("申请处理失败") this.showMessage("申请处理失败")
} }

30
pages/productDismantle/job/productDismantleDetail.vue
View File

@ -286,19 +286,27 @@
this.showErrorMessage("箱码[" + packingNumber + "]" + "批次[" + batch + "]库位[" + locationCode + this.showErrorMessage("箱码[" + packingNumber + "]" + "批次[" + batch + "]库位[" + locationCode +
"]已经扫描") "]已经扫描")
} else { } else {
let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus);
let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus);
if (itemDetail.inventoryStatus != result.balance.inventoryStatus) { if (itemDetail.inventoryStatus != result.balance.inventoryStatus) {
let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus); if(this.jobContent.allowModifyInventoryStatus=="TRUE"){
let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus); this.showQuestionMessage('任务中允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
this.showQuestionMessage('实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus + ']不一致,是否继续拆解?', res => {
']不一致,是否继续上架?', res => { if (res) {
if (res) { itemDetail.scaned = true;
itemDetail.scaned = true; itemDetail.handleQty = Number(result.label.qty);
itemDetail.handleQty = Number(result.label.qty); this.calcHandleQty();
this.calcHandleQty(); } else {
} else { this.scanPopupGetFocus();
}
});
}else {
this.showQuestionMessage('任务中不允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
']不一致,不允许转移!', res => {
this.scanPopupGetFocus(); this.scanPopupGetFocus();
} });
}); }
} else { } else {
itemDetail.scaned = true; itemDetail.scaned = true;
itemDetail.handleQty = Number(result.label.qty); itemDetail.handleQty = Number(result.label.qty);

8
pages/productPutaway/coms/comProductJobCard.vue
View File

@ -9,13 +9,7 @@
<view class="task_text"> <view class="task_text">
<view class=""> <view class="">
零件号 : {{dataContent.itemCode}} 供应商代码 : {{dataContent.supplierCode}}
</view>
</view>
<view class="task_text">
<view class="">
目标库位 : {{dataContent.toLocationCode}}
</view> </view>
</view> </view>
</view> </view>

89
pages/productPutaway/job/productPutawayDetail.vue
View File

@ -120,15 +120,14 @@
this.id = option.id; this.id = option.id;
if (this.id != undefined) { if (this.id != undefined) {
//新建的任务自动接收 //新建的任务自动接收
// if (option.status == "JOB_PENDING") { if (option.status == "1") {
// this.receive((callback => { this.receive((callback => {
// this.received = true; this.received = true;
// this.getDetail(); this.getDetail();
// })); }));
// } else { } else {
// this.getDetail(); this.getDetail();
// } }
this.getDetail();
} }
}, },
//返回首页 //返回首页
@ -287,31 +286,37 @@
this.showErrorMessage("箱码[" + packingNumber + "]" + "批次[" + batch + "]库位[" + locationCode + this.showErrorMessage("箱码[" + packingNumber + "]" + "批次[" + batch + "]库位[" + locationCode +
"]已经扫描") "]已经扫描")
} else { } else {
let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus);
let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus);
if (itemDetail.inventoryStatus != result.balance.inventoryStatus) { if (itemDetail.inventoryStatus != result.balance.inventoryStatus) {
let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus); if(this.jobContent.allowModifyInventoryStatus=="TRUE"){
let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus); this.showQuestionMessage('实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
this.showQuestionMessage('实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus + ']不一致,是否继续上架?', res => {
']不一致,是否继续上架?', res => { if (res) {
if (res) { itemDetail.scaned = true;
itemDetail.scaned = true; itemDetail.handleQty = Number(result.balance.qty)
itemDetail.handleQty = Number(result.label.qty) > Number(result.balance itemDetail.toInventoryStatus = result.balance.inventoryStatus;
.qty) ? Number(result.balance.qty) : Number(result.label.qty); itemDetail.balance = result.balance;
itemDetail.balance = result.balance; itemDetail.balance.balanceQty = Number(result.balance.qty)
itemDetail.balance.balanceQty = result.balance.qty; itemDetail.balance.stdPackQty = Number(result.package.stdPackQty)
itemDetail.balance.stdPackQty = result.package.stdPackQty itemDetail.balance.stdPackUnit = result.package.stdPackUnit
itemDetail.balance.stdPackUnit = result.package.stdPackUnit this.calcHandleQty();
this.calcHandleQty(); } else {
} else { this.scanPopupGetFocus();
this.scanPopupGetFocus(); }
} });
}); }else {
}
} else { } else {
itemDetail.scaned = true; itemDetail.scaned = true;
itemDetail.handleQty = Number(result.label.qty) > Number(result.balance.qty) ? Number( itemDetail.handleQty = Number(result.balance.qty)
result.balance.qty) : Number(result.label.qty);
itemDetail.balance = result.balance; itemDetail.balance = result.balance;
itemDetail.balance.balanceQty = result.balance.qty; itemDetail.toInventoryStatus = result.balance.inventoryStatus;
itemDetail.balance.stdPackQty = result.package.stdPackQty itemDetail.balance.balanceQty = Number(result.balance.qty)
itemDetail.balance.stdPackQty = Number(result.package.stdPackQty)
itemDetail.balance.stdPackUnit = result.package.stdPackUnit itemDetail.balance.stdPackUnit = result.package.stdPackUnit
this.calcHandleQty(); this.calcHandleQty();
} }
@ -401,17 +406,17 @@
this.managementList = res.list; this.managementList = res.list;
var params = this.setParams(); var params = this.setParams();
console.log("提交" + JSON.stringify(params)) console.log("提交" + JSON.stringify(params))
// productPutawayJobSubmit(params).then(res => { productPutawayJobSubmit(params).then(res => {
// uni.hideLoading() uni.hideLoading()
// if (res.data) { if (res.data) {
// this.showCommitSuccessMessage("提交成功<br>生成制品上架记录" + res.data) this.showCommitSuccessMessage("提交成功<br>生成制品上架记录<br>" + res.data)
// } else { } else {
// this.showErrorMessage("提交失败[" + res.msg + "]") this.showErrorMessage("提交失败[" + res.msg + "]")
// } }
// }).catch(error => { }).catch(error => {
// uni.hideLoading() uni.hideLoading()
// this.showErrorMessage(error) this.showErrorMessage(error)
// }) })
} else { } else {
uni.hideLoading(); uni.hideLoading();
@ -431,6 +436,8 @@
detail.packingNumber, detail.batch); detail.packingNumber, detail.batch);
detail.toPackingNumber = info.packingNumber; detail.toPackingNumber = info.packingNumber;
detail.toBatch = info.batch; detail.toBatch = info.batch;
detail.toContainerNumber = '';
detail.toLocationCode = this.toLocationCode;
subList.push(detail) subList.push(detail)
} }
}) })

56
pages/productPutaway/record/productPutawayRecord.vue
View File

@ -49,7 +49,6 @@
} from '@/api/request2.js'; } from '@/api/request2.js';
import { import {
goHome, goHome,
updateTitle,
getPackingNumberAndBatch getPackingNumberAndBatch
} from '@/common/basic.js'; } from '@/common/basic.js';
import { import {
@ -119,8 +118,6 @@
}; };
}, },
onLoad(option) { onLoad(option) {
this.fromType = option.fromType;
this.updateTitle();
var typeCode = "ProductPutaway" var typeCode = "ProductPutaway"
getBusinessType(typeCode, res => { getBusinessType(typeCode, res => {
if (res.success) { if (res.success) {
@ -148,16 +145,6 @@
mounted() { mounted() {
}, },
methods: { methods: {
updateTitle(){
if(this.fromType=="requestType"){
this.showToLoaction=false
updateTitle("制品上架申请")
}else {
updateTitle("制品上架记录")
this.showToLoaction=true
}
},
getScanResult(result) { getScanResult(result) {
let balance = result.balance; let balance = result.balance;
let label = result.label; let label = result.label;
@ -266,22 +253,6 @@
mask: true mask: true
}); });
if(this.fromType=="requestType"){
var params = this.setRequestParams()
console.log("提交" + JSON.stringify(params))
// productPutawayRequestSubmit(params).then(res => {
// uni.hideLoading()
// if (res.data) {
// this.showCommitSuccessMessage("提交成功<br>生成采购收货记录" + res.data, )
// } else {
// this.showErrorMessage("提交失败[" + res.msg + "]")
// }
// }).catch(error => {
// uni.hideLoading()
// this.showErrorMessage(error)
// })
}else {
//记录有目标库位，需要查询管理模式 //记录有目标库位，需要查询管理模式
var itemCodes = [] var itemCodes = []
this.detailSource.forEach(item => { this.detailSource.forEach(item => {
@ -310,36 +281,9 @@
this.showErrorMessage(res.message); this.showErrorMessage(res.message);
} }
}); });
}
}, },
setRequestParams(){
var subList = []
var supplierCode=""
this.detailSource.forEach(item => {
item.subList.forEach(detail => {
if (detail.scaned) {
if(supplierCode==""){
supplierCode = detail.package.supplierCode
}
subList.push(detail)
}
})
})
this.dataContent.subList = subList
this.dataContent.supplierCode = supplierCode
this.dataContent.businessType = "PurchasePutaway"
this.dataContent.departmentCode= "研发部门";
this.dataContent.status= 1 ;
this.dataContent.autoCommit = "FALSE";
this.dataContent.autoAgree = "FALSE";
this.dataContent.autoExecute = "FALSE";
this.dataContent.directCreateRecord = "FALSE";
return this.dataContent;
},
setRecordParams(queryModel) { setRecordParams(queryModel) {
var subList = [] var subList = []
var creator = this.$store.state.user.id var creator = this.$store.state.user.id

132
pages/productPutaway/request/putawayRequest.vue
View File

@ -33,13 +33,19 @@
import { import {
goHome, goHome,
updateTitle updateTitle,
clearTirmAndWrap
} from '@/common/basic.js'; } from '@/common/basic.js';
import { import {
getBusinessType, getBusinessType,
} from '@/common/record.js'; } from '@/common/record.js';
import { import {
getProductPutawayRequestList, getProductPutawayRequestList,
productPutawayRequestClose,
productPutawayRequestApprove,
productPutawayRequestApproveAgree,
productPutawayRequestApproveRefused,
productPutawayRequestHandle
} from '@/api/request2.js'; } from '@/api/request2.js';
import { import {
getDetailOption, getDetailOption,
@ -72,7 +78,6 @@
detailAndHandleOption: [], detailAndHandleOption: [],
detailAndCloseOption: [], detailAndCloseOption: [],
showOptions: [], showOptions: [],
fromType: "requestType",
loadingType: "nomore", loadingType: "nomore",
}; };
@ -81,7 +86,7 @@
this.detailOptions = getDetailOption(); this.detailOptions = getDetailOption();
this.detailAndApproveOptions = getDetailAndApproveOption() this.detailAndApproveOptions = getDetailAndApproveOption()
this.detailAndApprovePassAndApproveNoOption = getDetailAndApprovePassAndApproveNoOption(), this.detailAndApprovePassAndApproveNoOption = getDetailAndApprovePassAndApproveNoOption(),
this.detailAndHandleOption = getDetailAndHandleOption() this.detailAndHandleOption = getDetailAndHandleOption()
this.detailAndCloseOption = getDetailAndCloseOption() this.detailAndCloseOption = getDetailAndCloseOption()
}, },
@ -202,27 +207,45 @@
openScanDetailPopup() { openScanDetailPopup() {
uni.navigateTo({ uni.navigateTo({
url: "../record/productPutawayRecord?fromType=" + this.fromType url: "./putawayRequestCreate"
}) })
}, },
swipeClick(e, dataContent) { swipeClick(e, dataContent) {
if (e.content.text == "详情") { var text = clearTirmAndWrap(e.content.text)
console.log("详情", dataContent.id) if (text == "详情") {
this.openRequestInfoPopup(dataContent); this.openRequestInfoPopup(dataContent);
} else if (e.content.text == "处理") { } else if (text == "处理") {
console.log("处理") this.showQuestionMessage("确定要处理当前申请吗?",res=>{
} else if (e.content.text == "审批") { this.productPutawayRequestHandle(dataContent.id)
console.log("审批") })
} else if (e.content.text == "审批通过") { } else if (text == "提交审批") {
console.log("审批通过") this.showQuestionMessage("确定要审批当前申请吗?",res=>{
} else if (e.content.text == "审批驳回") { this.productPutawayRequestApprove(dataContent.id)
console.log("审批驳回") })
} else if (e.content.text == "关闭") { } else if (text=="审批通过") {
console.log("关闭") this.showQuestionMessage("确定要审批通过当前申请吗?",res=>{
this.productPutawayRequestApproveAgree(dataContent.id)
})
} else if (text == "审批驳回") {
this.showQuestionMessage("确定要审批驳回当前申请吗?",res=>{
this.productPutawayRequestApproveRefused(dataContent.id)
})
} else if (text == "关闭") {
this.showQuestionMessage("确定要关闭当前申请吗?",res=>{
this.productPutawayRequestClose(dataContent.id)
})
} }
}, },
showQuestionMessage(hint,callBack){
this.$refs.comMessage.showQuestionMessage(hint,
res => {
if (res) {
callBack()
}
});
},
switchChangeWait(state, jobStatus) { switchChangeWait(state, jobStatus) {
this.checkedWaitTask = state; this.checkedWaitTask = state;
this.status = jobStatus; this.status = jobStatus;
@ -271,6 +294,83 @@
} }
}); });
}, },
productPutawayRequestApprove(id) {
productPutawayRequestApprove(id).then(res => {
if (res.data) {
uni.showToast({
title: "申请提交审批成功"
})
this.getList("refresh")
} else {
this.showMessage("申请提交审批失败")
}
}).catch(error => {
this.showMessage(error)
})
},
productPutawayRequestClose(id) {
productPutawayRequestClose(id).then(res => {
if (res.data) {
uni.showToast({
title: "申请关闭成功"
})
this.getList("refresh")
} else {
this.showMessage("申请关闭失败")
}
}).catch(error => {
this.showMessage(error)
})
},
productPutawayRequestApproveAgree(id) {
productPutawayRequestApproveAgree(id).then(res => {
if (res.data) {
uni.showToast({
title: "申请审批通过成功"
})
this.getList("refresh")
} else {
this.showMessage("申请审批通过失败")
}
}).catch(error => {
this.showMessage(error)
})
},
productPutawayRequestApproveRefused(id) {
productPutawayRequestApproveRefused(id).then(res => {
if (res.data) {
uni.showToast({
title: "申请审批驳回成功"
})
this.getList("refresh")
} else {
this.showMessage("申请审批驳回失败")
}
}).catch(error => {
this.showMessage(error)
})
},
productPutawayRequestHandle(id) {
productPutawayRequestHandle(id).then(res => {
if (res.data) {
uni.showToast({
title: "申请处理成功"
})
this.getList("refresh")
} else {
this.showMessage("申请处理失败")
}
}).catch(error => {
this.showMessage(error)
})
},
} }
} }

8
pages/productPutaway/request/putawayRequestCreate.vue
View File

@ -0,0 +1,8 @@
<template>
</template>
<script>
</script>
<style>
</style>

2
pages/productReceipt/job/productReceiptDetail.vue
View File

@ -14,7 +14,7 @@
<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id"> <view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
<view class=""> <view class="">
<comProductDetailCard :dataContent="item" :settingParam="jobContent" :isShowLocation="false" <comProductDetailCard :dataContent="item" :settingParam="jobContent" :isShowLocation="false"
@remove="updateData" @updateData="updateData" @openDetail="openDetail" @remove="updateData" @updateData="updateData"
:locationTypeList='tolocationTypeList'> :locationTypeList='tolocationTypeList'>
</comProductDetailCard> </comProductDetailCard>
</view> </view>

46
pages/productionReceipt/job/productionReceiptDetail.vue
View File

@ -275,32 +275,38 @@
let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus); let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus);
let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus); let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus);
if (itemDetail.inventoryStatus != result.balance.inventoryStatus) { if (itemDetail.inventoryStatus != result.balance.inventoryStatus) {
this.showQuestionMessage('实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus + if(this.jobContent.allowModifyInventoryStatus=="TRUE"){
']不一致,是否继续上架?', res => { this.showQuestionMessage('任务中允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
if (res) { ']不一致,是否继续上架?', res => {
itemDetail.scaned = true; if (res) {
itemDetail.supplierCode = supplierCode itemDetail.scaned = true;
itemDetail.handleQty = Number(result.label.qty) > Number(result.balance itemDetail.supplierCode = supplierCode
.qty) ? Number(result.balance.qty) : Number(result.label.qty); itemDetail.handleQty = Number(result.balance.qty)
itemDetail.toInventoryStatus = result.balance.inventoryStatus; itemDetail.toInventoryStatus = result.balance.inventoryStatus;
itemDetail.balance = result.balance; itemDetail.balance = result.balance;
itemDetail.balance.balanceQty = result.balance.qty; itemDetail.balance.balanceQty = Number(result.balance.qty)
itemDetail.balance.stdPackQty = result.package.stdPackQty itemDetail.balance.stdPackQty = Number(result.package.stdPackQty)
itemDetail.balance.stdPackUnit = result.package.stdPackUnit itemDetail.balance.stdPackUnit = result.package.stdPackUnit
this.calcHandleQty(); this.calcHandleQty();
} else { } else {
this.scanPopupGetFocus();
}
});
}else {
this.showQuestionMessage('任务中不允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
']不一致,不允许转移!', res => {
this.scanPopupGetFocus(); this.scanPopupGetFocus();
} });
}); }
} else { } else {
itemDetail.scaned = true; itemDetail.scaned = true;
itemDetail.supplierCode = supplierCode itemDetail.supplierCode = supplierCode
itemDetail.handleQty = Number(result.label.qty) > Number(result.balance itemDetail.handleQty = Number(result.balance.qty)
.qty) ? Number(result.balance.qty) : Number(result.label.qty);
itemDetail.toInventoryStatus = result.balance.inventoryStatus; itemDetail.toInventoryStatus = result.balance.inventoryStatus;
itemDetail.balance = result.balance; itemDetail.balance = result.balance;
itemDetail.balance.balanceQty = result.balance.qty; itemDetail.balance.balanceQty = Number(result.balance.qty)
itemDetail.balance.stdPackQty = result.package.stdPackQty itemDetail.balance.stdPackQty = Number(result.package.stdPackQty)
itemDetail.balance.stdPackUnit = result.package.stdPackUnit itemDetail.balance.stdPackUnit = result.package.stdPackUnit
this.calcHandleQty(); this.calcHandleQty();
} }

10
pages/productionReturn/coms/comReturnCommonRequest.vue
View File

@ -326,10 +326,10 @@
productionReturnRequestSubmitApprove(id) { productionReturnRequestSubmitApprove(id) {
productionReturnRequestSubmitApprove(id).then(res => { productionReturnRequestSubmitApprove(id).then(res => {
if (res.data) { if (res.data) {
this.getList("refresh")
uni.showToast({ uni.showToast({
title: "申请提交审批成功" title: "申请提交审批成功"
}) })
this.getList("refresh")
} else { } else {
this.showMessage("申请提交审批失败") this.showMessage("申请提交审批失败")
} }
@ -342,10 +342,10 @@
productionReturnRequestClose(id) { productionReturnRequestClose(id) {
productionReturnRequestClose(id).then(res => { productionReturnRequestClose(id).then(res => {
if (res.data) { if (res.data) {
this.getList("refresh")
uni.showToast({ uni.showToast({
title: "申请关闭成功" title: "申请关闭成功"
}) })
this.getList("refresh")
} else { } else {
this.showMessage("申请关闭失败") this.showMessage("申请关闭失败")
} }
@ -357,10 +357,10 @@
productionReturnRequestSubmitApproveAgree(id) { productionReturnRequestSubmitApproveAgree(id) {
productionReturnRequestSubmitApproveAgree(id).then(res => { productionReturnRequestSubmitApproveAgree(id).then(res => {
if (res.data) { if (res.data) {
this.getList("refresh")
uni.showToast({ uni.showToast({
title: "申请审批通过成功" title: "申请审批通过成功"
}) })
this.getList("refresh")
} else { } else {
this.showMessage("申请审批通过失败") this.showMessage("申请审批通过失败")
} }
@ -372,10 +372,10 @@
productionReturnRequestSubmitApproveRefused(id) { productionReturnRequestSubmitApproveRefused(id) {
productionReturnRequestSubmitApproveRefused(id).then(res => { productionReturnRequestSubmitApproveRefused(id).then(res => {
if (res.data) { if (res.data) {
this.getList("refresh")
uni.showToast({ uni.showToast({
title: "申请审批驳回成功" title: "申请审批驳回成功"
}) })
this.getList("refresh")
} else { } else {
this.showMessage("申请审批驳回失败") this.showMessage("申请审批驳回失败")
} }
@ -387,10 +387,10 @@
productionReturnRequestHandle(id) { productionReturnRequestHandle(id) {
productionReturnRequestHandle(id).then(res => { productionReturnRequestHandle(id).then(res => {
if (res.data) { if (res.data) {
this.getList("refresh")
uni.showToast({ uni.showToast({
title: "申请处理成功" title: "申请处理成功"
}) })
this.getList("refresh")
} else { } else {
this.showMessage("申请处理失败") this.showMessage("申请处理失败")
} }

42
pages/purchaseReturn/job/returnDetail.vue
View File

@ -247,29 +247,37 @@
let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus); let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus);
let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus); let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus);
if (itemDetail.inventoryStatus != result.balance.inventoryStatus) { if (itemDetail.inventoryStatus != result.balance.inventoryStatus) {
this.showQuestionMessage('实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus + if(this.jobContent.allowModifyInventoryStatus=="TRUE"){
']不一致,是否继续退货?', res => { this.showQuestionMessage('任务中允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
if (res) { ']不一致,是否继续退货?', res => {
itemDetail.scaned = true; if (res) {
itemDetail.handleQty = Number(result.balance.qty) ; itemDetail.scaned = true;
itemDetail.toInventoryStatus = result.balance.inventoryStatus; itemDetail.handleQty = Number(result.balance.qty) ;
itemDetail.balance = result.balance; itemDetail.toInventoryStatus = result.balance.inventoryStatus;
itemDetail.balance.balanceQty = result.balance.qty; itemDetail.balance = result.balance;
itemDetail.balance.stdPackQty =result.package.stdPackQty itemDetail.balance.balanceQty = result.balance.qty;
itemDetail.balance.stdPackUnit =result.package.stdPackUnit itemDetail.balance.stdPackQty =result.package.stdPackQty
itemDetail.balance.stdPackUnit =result.package.stdPackUnit
this.calcHandleQty();
} else { this.calcHandleQty();
} else {
this.scanPopupGetFocus();
}
});
}else {
this.showQuestionMessage('任务中不允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
']不一致,不允许转移!', res => {
this.scanPopupGetFocus(); this.scanPopupGetFocus();
} });
}); }
} else { } else {
itemDetail.scaned = true; itemDetail.scaned = true;
itemDetail.handleQty = Number(result.balance.qty) ; itemDetail.handleQty = Number(result.balance.qty) ;
itemDetail.toInventoryStatus = result.balance.inventoryStatus; itemDetail.toInventoryStatus = result.balance.inventoryStatus;
itemDetail.balance = result.balance; itemDetail.balance = result.balance;
itemDetail.balance.balanceQty = result.balance.qty; itemDetail.balance.balanceQty = Number(result.balance.qty) ;
itemDetail.balance.stdPackQty =result.package.stdPackQty itemDetail.balance.stdPackQty =Number(result.package.stdPackQty)
itemDetail.balance.stdPackUnit =result.package.stdPackUnit itemDetail.balance.stdPackUnit =result.package.stdPackUnit
this.calcHandleQty(); this.calcHandleQty();
} }

10
pages/purchaseReturn/request/returnRequest.vue
View File

@ -293,10 +293,10 @@
purchaseReturnRequestApprove(id) { purchaseReturnRequestApprove(id) {
purchaseReturnRequestApprove(id).then(res => { purchaseReturnRequestApprove(id).then(res => {
if (res.data) { if (res.data) {
this.getList("refresh")
uni.showToast({ uni.showToast({
title: "申请提交审批成功" title: "申请提交审批成功"
}) })
this.getList("refresh")
} else { } else {
this.showMessage("申请提交审批失败") this.showMessage("申请提交审批失败")
} }
@ -310,10 +310,10 @@
purchaseReturnRequestClose(id) { purchaseReturnRequestClose(id) {
purchaseReturnRequestClose(id).then(res => { purchaseReturnRequestClose(id).then(res => {
if (res.data) { if (res.data) {
this.getList("refresh")
uni.showToast({ uni.showToast({
title: "申请关闭成功" title: "申请关闭成功"
}) })
this.getList("refresh")
} else { } else {
this.showMessage("申请关闭失败") this.showMessage("申请关闭失败")
} }
@ -325,10 +325,10 @@
purchaseReturnRequestApproveAgree(id) { purchaseReturnRequestApproveAgree(id) {
purchaseReturnRequestApproveAgree(id).then(res => { purchaseReturnRequestApproveAgree(id).then(res => {
if (res.data) { if (res.data) {
this.getList("refresh")
uni.showToast({ uni.showToast({
title: "申请审批通过成功" title: "申请审批通过成功"
}) })
this.getList("refresh")
} else { } else {
this.showMessage("申请审批通过失败") this.showMessage("申请审批通过失败")
} }
@ -340,10 +340,10 @@
purchaseReturnRequestApproveRefused(id) { purchaseReturnRequestApproveRefused(id) {
purchaseReturnRequestApproveRefused(id).then(res => { purchaseReturnRequestApproveRefused(id).then(res => {
if (res.data) { if (res.data) {
this.getList("refresh")
uni.showToast({ uni.showToast({
title: "申请审批驳回成功" title: "申请审批驳回成功"
}) })
this.getList("refresh")
} else { } else {
this.showMessage("申请审批驳回失败") this.showMessage("申请审批驳回失败")
} }
@ -355,10 +355,10 @@
purchaseReturnRequestHandle(id) { purchaseReturnRequestHandle(id) {
purchaseReturnRequestHandle(id).then(res => { purchaseReturnRequestHandle(id).then(res => {
if (res.data) { if (res.data) {
this.getList("refresh")
uni.showToast({ uni.showToast({
title: "申请处理成功" title: "申请处理成功"
}) })
this.getList("refresh")
} else { } else {
this.showMessage("申请处理失败") this.showMessage("申请处理失败")
} }

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

@ -295,28 +295,36 @@
let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus); let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus);
let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus); let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus);
if (itemDetail.inventoryStatus != result.balance.inventoryStatus) { if (itemDetail.inventoryStatus != result.balance.inventoryStatus) {
this.showQuestionMessage('实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus + if(this.jobContent.allowModifyInventoryStatus=="TRUE"){
']不一致,是否继续上架?', res => { this.showQuestionMessage('任务中允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
if (res) { ']不一致,是否继续上架?', res => {
itemDetail.scaned = true; if (res) {
itemDetail.handleQty = Number(result.balance.qty) ; itemDetail.scaned = true;
itemDetail.toInventoryStatus =result.balance.inventoryStatus itemDetail.handleQty = Number(result.balance.qty) ;
itemDetail.balance = result.balance; itemDetail.toInventoryStatus =result.balance.inventoryStatus
itemDetail.balance.balanceQty = result.balance.qty; itemDetail.balance = result.balance;
itemDetail.balance.stdPackQty = result.package.stdPackQty itemDetail.balance.balanceQty = Number(result.balance.qty) ;
itemDetail.balance.stdPackUnit = result.package.stdPackUnit itemDetail.balance.stdPackQty = Number(result.package.stdPackQty)
this.calcHandleQty(); itemDetail.balance.stdPackUnit = result.package.stdPackUnit
} else { this.calcHandleQty();
} else {
this.scanPopupGetFocus();
}
});
}else {
this.showQuestionMessage('任务中不允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
']不一致,不允许转移!', res => {
this.scanPopupGetFocus(); this.scanPopupGetFocus();
} });
}); }
} else { } else {
itemDetail.scaned = true; itemDetail.scaned = true;
itemDetail.handleQty = Number(result.balance.qty) ; itemDetail.handleQty = Number(result.balance.qty) ;
itemDetail.toInventoryStatus =itemDetail.inventoryStatus itemDetail.toInventoryStatus = itemDetail.inventoryStatus
itemDetail.balance = result.balance; itemDetail.balance = result.balance;
itemDetail.balance.balanceQty = result.balance.qty; itemDetail.balance.balanceQty = Number(result.balance.qty) ;
itemDetail.balance.stdPackQty = result.package.stdPackQty itemDetail.balance.stdPackQty = Number(result.package.stdPackQty)
itemDetail.balance.stdPackUnit = result.package.stdPackUnit itemDetail.balance.stdPackUnit = result.package.stdPackUnit
this.calcHandleQty(); this.calcHandleQty();
} }

43
pages/scrap/job/scrapJobDetail.vue
View File

@ -211,27 +211,36 @@
let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus); let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus);
let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus); let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus);
if (itemDetail.inventoryStatus != result.balance.inventoryStatus) { if (itemDetail.inventoryStatus != result.balance.inventoryStatus) {
this.showQuestionMessage('实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus + if(this.jobContent.allowModifyInventoryStatus=="TRUE"){
']不一致,是否继续出库?', res => { this.showQuestionMessage('任务中允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
if (res) { ']不一致,是否继续出库?', res => {
itemDetail.scaned = true; if (res) {
itemDetail.handleQty = Number(result.label.qty); itemDetail.scaned = true;
itemDetail.inventoryStatus = result.balance.inventoryStatus; itemDetail.handleQty = Number(result.balance.qty);
itemDetail.balance = result.balance; itemDetail.toInventoryStatus = result.balance.inventoryStatus;
itemDetail.balance.balanceQty = result.balance.qty; itemDetail.balance = result.balance;
itemDetail.balance.stdPackQty = result.package.stdPackQty itemDetail.balance.balanceQty = Number(result.balance.qty);
itemDetail.balance.stdPackUnit = result.package.stdPackUnit itemDetail.balance.stdPackQty = Number(result.package.stdPackQty)
this.calcHandleQty(); itemDetail.balance.stdPackUnit = result.package.stdPackUnit
} else { this.calcHandleQty();
} else {
this.scanPopupGetFocus();
}
});
}else {
this.showQuestionMessage('任务中不允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
']不一致,不允许转移!', res => {
this.scanPopupGetFocus(); this.scanPopupGetFocus();
} });
}); }
} else { } else {
itemDetail.scaned = true; itemDetail.scaned = true;
itemDetail.handleQty = Number(result.label.qty); itemDetail.handleQty = Number(result.balance.qty);
itemDetail.toInventoryStatus = result.balance.inventoryStatus;
itemDetail.balance = result.balance; itemDetail.balance = result.balance;
itemDetail.balance.balanceQty = result.balance.qty; itemDetail.balance.balanceQty = Number(result.balance.qty);
itemDetail.balance.stdPackQty = result.package.stdPackQty itemDetail.balance.stdPackQty = Number(result.package.stdPackQty)
itemDetail.balance.stdPackUnit = result.package.stdPackUnit itemDetail.balance.stdPackUnit = result.package.stdPackUnit
this.calcHandleQty(); this.calcHandleQty();
} }

10
pages/scrap/request/scrapRrequest.vue
View File

@ -287,10 +287,10 @@
scrapRequestApprove(id) { scrapRequestApprove(id) {
scrapRequestApprove(id).then(res => { scrapRequestApprove(id).then(res => {
if (res.data) { if (res.data) {
this.getList("refresh")
uni.showToast({ uni.showToast({
title: "申请提交审批成功" title: "申请提交审批成功"
}) })
this.getList("refresh")
} else { } else {
this.showMessage("申请提交审批失败") this.showMessage("申请提交审批失败")
} }
@ -304,10 +304,10 @@
scrapRequestClose(id) { scrapRequestClose(id) {
scrapRequestClose(id).then(res => { scrapRequestClose(id).then(res => {
if (res.data) { if (res.data) {
this.getList("refresh")
uni.showToast({ uni.showToast({
title: "申请关闭成功" title: "申请关闭成功"
}) })
this.getList("refresh")
} else { } else {
this.showMessage("申请关闭失败") this.showMessage("申请关闭失败")
} }
@ -319,10 +319,10 @@
scrapRequestApproveAgree(id) { scrapRequestApproveAgree(id) {
scrapRequestApproveAgree(id).then(res => { scrapRequestApproveAgree(id).then(res => {
if (res.data) { if (res.data) {
this.getList("refresh")
uni.showToast({ uni.showToast({
title: "申请审批通过成功" title: "申请审批通过成功"
}) })
this.getList("refresh")
} else { } else {
this.showMessage("申请审批通过失败") this.showMessage("申请审批通过失败")
} }
@ -334,10 +334,10 @@
scrapRequestApproveRefused(id) { scrapRequestApproveRefused(id) {
scrapRequestApproveRefused(id).then(res => { scrapRequestApproveRefused(id).then(res => {
if (res.data) { if (res.data) {
this.getList("refresh")
uni.showToast({ uni.showToast({
title: "申请审批驳回成功" title: "申请审批驳回成功"
}) })
this.getList("refresh")
} else { } else {
this.showMessage("申请审批驳回失败") this.showMessage("申请审批驳回失败")
} }
@ -349,10 +349,10 @@
scrapRequestHandle(id) { scrapRequestHandle(id) {
scrapRequestHandle(id).then(res => { scrapRequestHandle(id).then(res => {
if (res.data) { if (res.data) {
this.getList("refresh")
uni.showToast({ uni.showToast({
title: "申请处理成功" title: "申请处理成功"
}) })
this.getList("refresh")
} else { } else {
this.showMessage("申请处理失败") this.showMessage("申请处理失败")
} }

42
pages/transfer/job/issueDetail.vue
View File

@ -269,28 +269,36 @@
let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus); let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus);
let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus); let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus);
if (itemDetail.inventoryStatus != result.balance.inventoryStatus) { if (itemDetail.inventoryStatus != result.balance.inventoryStatus) {
this.showQuestionMessage('实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus + if(this.jobContent.allowModifyInventoryStatus=="TRUE"){
']不一致,是否继续出库?', res => { this.showQuestionMessage('任务中允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
if (res) { ']不一致,是否继续出库?', res => {
itemDetail.scaned = true; if (res) {
itemDetail.handleQty = result.label.qty; itemDetail.scaned = true;
itemDetail.toInventoryStatus = result.balance.inventoryStatus itemDetail.handleQty =Number(result.balance.qty) ;
itemDetail.balance = result.balance; itemDetail.toInventoryStatus = result.balance.inventoryStatus
itemDetail.balance.balanceQty = result.balance.qty; itemDetail.balance = result.balance;
itemDetail.balance.stdPackQty = result.package.stdPackQty itemDetail.balance.balanceQty = Number(result.balance.qty) ;
itemDetail.balance.stdPackUnit = result.package.stdPackUnit itemDetail.balance.stdPackQty = Number(result.package.stdPackQty)
this.calcHandleQty(); itemDetail.balance.stdPackUnit = result.package.stdPackUnit
} else { this.calcHandleQty();
} else {
this.scanPopupGetFocus();
}
});
}else {
this.showQuestionMessage('任务中不允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
']不一致,不允许转移!', res => {
this.scanPopupGetFocus(); this.scanPopupGetFocus();
} });
}); }
} else { } else {
itemDetail.scaned = true; itemDetail.scaned = true;
itemDetail.handleQty = result.label.qty; itemDetail.handleQty = Number(result.balance.qty) ;
itemDetail.toInventoryStatus = result.balance.inventoryStatus itemDetail.toInventoryStatus = result.balance.inventoryStatus
itemDetail.balance = result.balance; itemDetail.balance = result.balance;
itemDetail.balance.balanceQty = result.balance.qty; itemDetail.balance.balanceQty = Number(result.balance.qty) ;
itemDetail.balance.stdPackQty = result.package.stdPackQty itemDetail.balance.stdPackQty = Number(result.package.stdPackQty)
itemDetail.balance.stdPackUnit = result.package.stdPackUnit itemDetail.balance.stdPackUnit = result.package.stdPackUnit
this.calcHandleQty(); this.calcHandleQty();
} }

43
pages/transfer/job/receiptDetail.vue
View File

@ -272,28 +272,37 @@
let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus); let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus);
let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus); let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus);
if (itemDetail.inventoryStatus != result.balance.inventoryStatus) { if (itemDetail.inventoryStatus != result.balance.inventoryStatus) {
this.showQuestionMessage('实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus + if(this.jobContent.allowModifyInventoryStatus=="TRUE"){
']不一致,是否继续入库?', res => { this.showQuestionMessage('任务中允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
if (res) { ']不一致,是否继续入库?', res => {
itemDetail.scaned = true; if (res) {
itemDetail.handleQty = result.label.qty; itemDetail.scaned = true;
itemDetail.toInventoryStatus = result.balance.inventoryStatus itemDetail.handleQty = Number(result.balance.qty) ;
itemDetail.balance = result.balance; itemDetail.toInventoryStatus = result.balance.inventoryStatus
itemDetail.balance.balanceQty = result.balance.qty; itemDetail.balance = result.balance;
itemDetail.balance.stdPackQty = result.package.stdPackQty itemDetail.balance.balanceQty = Number(result.balance.qty) ;
itemDetail.balance.stdPackUnit = result.package.stdPackUnit itemDetail.balance.stdPackQty = Number(result.package.stdPackQty)
this.calcHandleQty(); itemDetail.balance.stdPackUnit = result.package.stdPackUnit
} else { this.calcHandleQty();
} else {
this.scanPopupGetFocus();
}
});
}else {
this.showQuestionMessage('任务中不允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
']不一致,不允许转移!', res => {
this.scanPopupGetFocus(); this.scanPopupGetFocus();
} });
}); }
} else { } else {
itemDetail.scaned = true; itemDetail.scaned = true;
itemDetail.handleQty = result.label.qty; itemDetail.handleQty = Number(result.balance.qty) ;
itemDetail.toInventoryStatus = result.balance.inventoryStatus itemDetail.toInventoryStatus = result.balance.inventoryStatus
itemDetail.balance = result.balance; itemDetail.balance = result.balance;
itemDetail.balance.balanceQty = result.balance.qty; itemDetail.balance.balanceQty = Number(result.balance.qty) ;
itemDetail.balance.stdPackQty = result.package.stdPackQty itemDetail.balance.stdPackQty = Number(result.package.stdPackQty)
itemDetail.balance.stdPackUnit = result.package.stdPackUnit itemDetail.balance.stdPackUnit = result.package.stdPackUnit
this.calcHandleQty(); this.calcHandleQty();
} }

26
pages/transfer/job/transferDetail.vue
View File

@ -320,16 +320,24 @@
let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus); let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus);
let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus); let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus);
if (itemDetail.inventoryStatus != result.balance.inventoryStatus) { if (itemDetail.inventoryStatus != result.balance.inventoryStatus) {
this.showQuestionMessage('实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus + if(this.jobContent.allowModifyInventoryStatus=="TRUE"){
']不一致,是否继续上架?', res => { this.showQuestionMessage('实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
if (res) { ']不一致,是否继续上架?', res => {
itemDetail.scaned = true; if (res) {
itemDetail.record = this.createRecordInfo(itemDetail, result.balance); itemDetail.scaned = true;
this.calcHandleQty(); itemDetail.record = this.createRecordInfo(itemDetail, result.balance);
} else { this.calcHandleQty();
} else {
this.scanPopupGetFocus();
}
});
}else {
this.showQuestionMessage('任务中不允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
']不一致,不允许转移!', res => {
this.scanPopupGetFocus(); this.scanPopupGetFocus();
} });
}); }
} else { } else {
itemDetail.scaned = true; itemDetail.scaned = true;
itemDetail.record = this.createRecordInfo(itemDetail, result.balance); itemDetail.record = this.createRecordInfo(itemDetail, result.balance);

42
pages/unPlanned/job/issueJobDetail.vue
View File

@ -229,26 +229,36 @@
let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus); let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus);
let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus); let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus);
if (itemDetail.inventoryStatus != result.balance.inventoryStatus) { if (itemDetail.inventoryStatus != result.balance.inventoryStatus) {
this.showQuestionMessage('实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus + if(this.jobContent.allowModifyInventoryStatus=="TRUE"){
']不一致,是否继续出库?', res => { this.showQuestionMessage('任务中允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
if (res) { ']不一致,是否继续出库?', res => {
itemDetail.scaned = true; if (res) {
itemDetail.handleQty = result.label.qty itemDetail.scaned = true;
itemDetail.balance = result.balance; itemDetail.handleQty = Number(result.balance.qty) ;
itemDetail.balance.balanceQty = result.balance.qty; itemDetail.toInventoryStatus = result.balance.inventoryStatus;
itemDetail.balance.stdPackQty = result.package.stdPackQty itemDetail.balance = result.balance;
itemDetail.balance.stdPackUnit = result.package.stdPackUnit itemDetail.balance.balanceQty = Number(result.balance.qty);
this.calcHandleQty(); itemDetail.balance.stdPackQty = Number(result.package.stdPackQty)
} else { itemDetail.balance.stdPackUnit = result.package.stdPackUnit
this.calcHandleQty();
} else {
this.scanPopupGetFocus();
}
});
}else {
this.showQuestionMessage('任务中不允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
']不一致,不允许转移!', res => {
this.scanPopupGetFocus(); this.scanPopupGetFocus();
} });
}); }
} else { } else {
itemDetail.scaned = true; itemDetail.scaned = true;
itemDetail.handleQty = result.label.qty itemDetail.handleQty = Number(result.balance.qty) ;
itemDetail.toInventoryStatus = result.balance.inventoryStatus;
itemDetail.balance = result.balance; itemDetail.balance = result.balance;
itemDetail.balance.balanceQty = result.balance.qty; itemDetail.balance.balanceQty = Number(result.balance.qty) ;
itemDetail.balance.stdPackQty = result.package.stdPackQty itemDetail.balance.stdPackQty = Number(result.package.stdPackQty)
itemDetail.balance.stdPackUnit = result.package.stdPackUnit itemDetail.balance.stdPackUnit = result.package.stdPackUnit
this.calcHandleQty(); this.calcHandleQty();
} }

12
pages/unPlanned/request/issueRequest.vue
View File

@ -295,10 +295,10 @@
unPlannedIssueRequestApprove(id) { unPlannedIssueRequestApprove(id) {
unPlannedIssueRequestApprove(id).then(res => { unPlannedIssueRequestApprove(id).then(res => {
if (res.data) { if (res.data) {
this.getList("refresh")
uni.showToast({ uni.showToast({
title: "申请提交审批成功" title: "申请提交审批成功"
}) })
this.getList("refresh")
} else { } else {
this.showMessage("申请提交审批失败") this.showMessage("申请提交审批失败")
} }
@ -312,10 +312,11 @@
unPlannedIssueRequestClose(id) { unPlannedIssueRequestClose(id) {
unPlannedIssueRequestClose(id).then(res => { unPlannedIssueRequestClose(id).then(res => {
if (res.data) { if (res.data) {
this.getList("refresh")
uni.showToast({ uni.showToast({
title: "申请关闭成功" title: "申请关闭成功"
}) })
this.getList("refresh")
} else { } else {
this.showMessage("申请关闭失败") this.showMessage("申请关闭失败")
} }
@ -327,10 +328,11 @@
unPlannedIssueRequestApproveAgree(id) { unPlannedIssueRequestApproveAgree(id) {
unPlannedIssueRequestApproveAgree(id).then(res => { unPlannedIssueRequestApproveAgree(id).then(res => {
if (res.data) { if (res.data) {
this.getList("refresh")
uni.showToast({ uni.showToast({
title: "申请审批通过成功" title: "申请审批通过成功"
}) })
this.getList("refresh")
} else { } else {
this.showMessage("申请审批通过失败") this.showMessage("申请审批通过失败")
} }
@ -342,10 +344,10 @@
unPlannedIssueRequestApproveRefused(id) { unPlannedIssueRequestApproveRefused(id) {
unPlannedIssueRequestApproveRefused(id).then(res => { unPlannedIssueRequestApproveRefused(id).then(res => {
if (res.data) { if (res.data) {
this.getList("refresh")
uni.showToast({ uni.showToast({
title: "申请审批驳回成功" title: "申请审批驳回成功"
}) })
this.getList("refresh")
} else { } else {
this.showMessage("申请审批驳回失败") this.showMessage("申请审批驳回失败")
} }
@ -357,10 +359,10 @@
unPlannedIssueRequestHandle(id) { unPlannedIssueRequestHandle(id) {
unPlannedIssueRequestHandle(id).then(res => { unPlannedIssueRequestHandle(id).then(res => {
if (res.data) { if (res.data) {
this.getList("refresh")
uni.showToast({ uni.showToast({
title: "申请处理成功" title: "申请处理成功"
}) })
this.getList("refresh")
} else { } else {
this.showMessage("申请处理失败") this.showMessage("申请处理失败")
} }

11
pages/unPlanned/request/receiptRequest.vue
View File

@ -293,10 +293,10 @@
unPlannedReceiptRequestApprove(id) { unPlannedReceiptRequestApprove(id) {
unPlannedReceiptRequestApprove(id).then(res => { unPlannedReceiptRequestApprove(id).then(res => {
if (res.data) { if (res.data) {
this.getList("refresh")
uni.showToast({ uni.showToast({
title: "申请提交审批成功" title: "申请提交审批成功"
}) })
this.getList("refresh")
} else { } else {
this.showMessage("申请提交审批失败") this.showMessage("申请提交审批失败")
} }
@ -310,10 +310,10 @@
unPlannedReceiptRequestClose(id) { unPlannedReceiptRequestClose(id) {
unPlannedReceiptRequestClose(id).then(res => { unPlannedReceiptRequestClose(id).then(res => {
if (res.data) { if (res.data) {
this.getList("refresh")
uni.showToast({ uni.showToast({
title: "申请关闭成功" title: "申请关闭成功"
}) })
this.getList("refresh")
} else { } else {
this.showMessage("申请关闭失败") this.showMessage("申请关闭失败")
} }
@ -325,10 +325,11 @@
unPlannedReceiptRequestApproveAgree(id) { unPlannedReceiptRequestApproveAgree(id) {
unPlannedReceiptRequestApproveAgree(id).then(res => { unPlannedReceiptRequestApproveAgree(id).then(res => {
if (res.data) { if (res.data) {
this.getList("refresh")
uni.showToast({ uni.showToast({
title: "申请审批通过成功" title: "申请审批通过成功"
}) })
this.getList("refresh")
} else { } else {
this.showMessage("申请审批通过失败") this.showMessage("申请审批通过失败")
} }
@ -340,10 +341,10 @@
unPlannedReceiptRequestApproveRefused(id) { unPlannedReceiptRequestApproveRefused(id) {
unPlannedReceiptRequestApproveRefused(id).then(res => { unPlannedReceiptRequestApproveRefused(id).then(res => {
if (res.data) { if (res.data) {
this.getList("refresh")
uni.showToast({ uni.showToast({
title: "申请审批驳回成功" title: "申请审批驳回成功"
}) })
this.getList("refresh")
} else { } else {
this.showMessage("申请审批驳回失败") this.showMessage("申请审批驳回失败")
} }
@ -355,10 +356,10 @@
unPlannedReceiptRequestHandle(id) { unPlannedReceiptRequestHandle(id) {
unPlannedReceiptRequestHandle(id).then(res => { unPlannedReceiptRequestHandle(id).then(res => {
if (res.data) { if (res.data) {
this.getList("refresh")
uni.showToast({ uni.showToast({
title: "申请处理成功" title: "申请处理成功"
}) })
this.getList("refresh")
} else { } else {
this.showMessage("申请处理失败") this.showMessage("申请处理失败")
} }

8
static/config.json
View File

@ -20,7 +20,7 @@
"name": "request_url", "name": "request_url",
"value": "http://192.168.0.230:12080/admin-api", "value": "http://192.168.0.230:12080/admin-api",
"dev2": "http://192.168.0.157:12080/admin-api", "dev2": "http://192.168.0.157:12080/admin-api",
"chenfang": "http://192.168.0.178:12080/admin-api", "chefang": "http://192.168.0.180:12080/admin-api",
"chenxinming": "http://192.168.0.230:12080/admin-api", "chenxinming": "http://192.168.0.230:12080/admin-api",
"liuchen": "http://192.168.0.159:12080/admin-api", "liuchen": "http://192.168.0.159:12080/admin-api",
"dev": "http://dev.ccwin-in.com:25100/api/admin-api", "dev": "http://dev.ccwin-in.com:25100/api/admin-api",
@ -32,7 +32,13 @@
"name": "tenantId", "name": "tenantId",
"value": "1", "value": "1",
"desc": "租户id" "desc": "租户id"
},
"isDevelopment": {
"name": "isDevelopment",
"value": true,
"desc": "是否是开发模式,true是开发模式,false不是开发模式"
} }
}, },
"recepit_configList": [ "recepit_configList": [

Write Preview
Loading…
Cancel
Save