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
聂喜婷 1 year ago
parent
60374474d2 7169af26b3
commit
a114eff22c
33 changed files with 462 additions and 413 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. 3
      App.vue
  2. 6
      api/request2.js
  3. 11
      common/basic.js
  4. 2
      mycomponents/job/jobDetailPopup.vue
  5. 2
      mycomponents/recommend/recommend.vue
  6. 412
      pages.json
  7. 42
      pages/config/config.vue
  8. 8
      pages/customerReturn/coms/comReturnJobCard.vue
  9. 34
      pages/customerReturn/job/returnDetail.vue
  10. 12
      pages/deliver/coms/comScanDeliverPack.vue
  11. 35
      pages/inspect/coms/inspectComDetailCard.vue
  12. 3
      pages/inspect/coms/inspectEdit.vue
  13. 23
      pages/inspect/job/inspectDetail.vue
  14. 28
      pages/inspect/job/inspectResult.vue
  15. 6
      pages/inspect/request/inspectRequestDetail.vue
  16. 8
      pages/login/index.vue
  17. 16
      pages/productionReturn/coms/comReturnJobCard.vue
  18. 64
      pages/productionReturn/job/returnDetail.vue
  19. 17
      pages/purchaseReceipt/job/receiptDetail.vue
  20. 12
      pages/purchaseReturn/job/returnDetail.vue
  21. 7
      pages/purchaseReturn/record/returnRecord.vue
  22. 5
      pages/putaway/job/putawayDetail.vue
  23. 3
      router/my_router.js
  24. 10
      static/ali_icon/iconfont.css
  25. BIN
      static/ali_icon/iconfont.ttf
  26. 18
      static/icon/iconfont.css
  27. BIN
      static/icon/iconfont.ttf
  28. BIN
      static/icon/iconfont_filter.ttf
  29. 32
      static/iconfont.css
  30. BIN
      static/iconfont.ttf
  31. BIN
      static/iconfont/iconfont.ttf
  32. 2
      static/scss/index.scss

3
App.vue
View File

@ -21,11 +21,12 @@
@import "./uni_modules/vk-uview-ui/index.scss"; @import "./uni_modules/vk-uview-ui/index.scss";
// @import './common/PDA_style.css'; // @import './common/PDA_style.css';
@import './common/style/new_style.css'; @import './common/style/new_style.css';
@import "./static/icon/iconfont.css";
@import './common/style/uni.css'; @import './common/style/uni.css';
@import './common/style/pdabasic.css'; @import './common/style/pdabasic.css';
@import './uni.scss'; @import './uni.scss';
@import '@/static/scss/index.scss'; @import '@/static/scss/index.scss';
@import './static/ali_icon/iconfont.css';
body{ body{
background-color: #EBEEF0; background-color: #EBEEF0;

6
api/request2.js
View File

@ -2234,7 +2234,7 @@ export function getProductionReturnJobDetail(id) {
*/ */
export function takeProductionReturnJob(id) { export function takeProductionReturnJob(id) {
return request({ return request({
url: baseApi + "/wms/purchasereceipt-job-main/abandon?id=" + id, url: baseApi + "/wms/productionreturn-job-main/accept?id=" + id,
method: "put", method: "put",
data: {}, data: {},
}); });
@ -2247,7 +2247,7 @@ export function takeProductionReturnJob(id) {
*/ */
export function cancleTakeProductionReturnJob(id) { export function cancleTakeProductionReturnJob(id) {
return request({ return request({
url: baseApi + "/wms/purchasereceipt-job-main/abandon?id=" + id, url: baseApi + "/wms/productionreturn-job-main/abandon?id=" + id,
method: "put", method: "put",
data: {}, data: {},
}); });
@ -2260,7 +2260,7 @@ export function cancleTakeProductionReturnJob(id) {
*/ */
export function productionReturnJobSubmit(params) { export function productionReturnJobSubmit(params) {
return request({ return request({
url: baseApi + "/magic-api/pda/job/purchasereceipt/jobSubmit", url: baseApi + "/wms/productionreturn-job-main/execute",
method: "put", method: "put",
data: params, data: params,
}); });

11
common/basic.js
View File

@ -879,3 +879,14 @@ export function updateTitle(title) {
export function clearTirmAndWrap(content) { export function clearTirmAndWrap(content) {
return content.replace(/<\/?.+?\/?>|\r|\n|\s*/g, '') return content.replace(/<\/?.+?\/?>|\r|\n|\s*/g, '')
} }
export function navigateBack(backIndex) {
let canNavBack = getCurrentPages()
if (canNavBack && canNavBack.length - 1 > backIndex) {
uni.navigateBack({
delta: backIndex
})
} else {
history.back();
}
}

2
mycomponents/job/jobDetailPopup.vue
View File

@ -1,7 +1,7 @@
<template> <template>
<view class=""> <view class="">
<uni-popup ref="popup"> <uni-popup ref="popup">
<detail-common-info :dataContent='dataContent'></detail-common-info> <detail-common-info :dataContent='dataContent' @onClose="closeScanPopup()" ></detail-common-info>
</uni-popup> </uni-popup>
</view> </view>
</template> </template>

2
mycomponents/recommend/recommend.vue
View File

@ -11,7 +11,7 @@
</location> </location>
</view> </view>
<view> <view>
<recommend-qty v-if="detail.handleQty==null || detail.handleQty==undefined" :dataContent="detail" <recommend-qty v-if="detail.handleQty==null || detail.handleQty==undefined||detail.handleQty==0" :dataContent="detail"
:isShowStdPack="false"></recommend-qty> :isShowStdPack="false"></recommend-qty>
<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">

412
pages.json
View File

@ -34,8 +34,30 @@
"style": { "style": {
"navigationBarTitleText": "登录", "navigationBarTitleText": "登录",
"titleNView": { "titleNView": {
"autoBackButton": "true", // "autoBackButton": "true",
"buttons": [{}] "buttons": [
// 右边按钮
// {
// "float": "right",
// "fontSize": "52rpx", //按钮上文字的大小
// "text": "\ue706",
// "fontSrc": "/static/ali_icon/iconfont.ttf"
// }
]
}
}
},
{
"path": "pages/config/config",
"style": {
"navigationBarTitleText": "配置",
"titleNView": {
// "autoBackButton": "true",
"buttons": [
]
} }
} }
}, },
@ -66,17 +88,17 @@
// 右边按钮 // 右边按钮
{ {
"float": "right", "float": "right",
"fontSize": "23px", //按钮上文字的大小 "fontSize": "58rpx", //按钮上文字的大小
"text": "\ue7c6", "text": "\ue696",
"fontSrc": "/static/iconfont/iconfont.ttf" "fontSrc": "/static/ali_icon/iconfont.ttf"
}, },
{ {
"float": "right", "float": "right",
"fontSize": "21px", //按钮上文字的大小 "fontSize": "52rpx", //按钮上文字的大小
"text": "\ue6e2", "text": "\ue6e2",
"fontSrc": "/static/iconfont/iconfont.ttf" "fontSrc": "/static/ali_icon/iconfont.ttf"
} }
] ]
} }
@ -101,17 +123,17 @@
// 右边按钮 // 右边按钮
{ {
"float": "right", "float": "right",
"fontSize": "23px", //按钮上文字的大小 "fontSize": "58rpx", //按钮上文字的大小
"text": "\ue7c6", "text": "\ue696",
"fontSrc": "/static/iconfont/iconfont.ttf" "fontSrc": "/static/ali_icon/iconfont.ttf"
}, },
{ {
"float": "right", "float": "right",
"fontSize": "21px", //按钮上文字的大小 "fontSize": "52rpx", //按钮上文字的大小
"text": "\ue6e2", "text": "\ue6e2",
"fontSrc": "/static/iconfont/iconfont.ttf" "fontSrc": "/static/ali_icon/iconfont.ttf"
} }
] ]
} }
@ -139,17 +161,17 @@
{ {
"float": "right", "float": "right",
"fontSize": "23px", //按钮上文字的大小 "fontSize": "58rpx", //按钮上文字的大小
"text": "\ue7c6", "text": "\ue696",
"fontSrc": "/static/iconfont/iconfont.ttf" "fontSrc": "/static/ali_icon/iconfont.ttf"
}, },
{ {
"float": "right", "float": "right",
"fontSize": "21px", //按钮上文字的大小 "fontSize": "52rpx", //按钮上文字的大小
"text": "\ue6e2", "text": "\ue6e2",
"fontSrc": "/static/iconfont/iconfont.ttf" "fontSrc": "/static/ali_icon/iconfont.ttf"
} }
] ]
} }
@ -174,15 +196,15 @@
// 右边按钮 // 右边按钮
{ {
"float": "right", "float": "right",
"fontSize": "23px", //按钮上文字的大小 "fontSize": "58rpx", //按钮上文字的大小
"text": "\ue7c6", "text": "\ue696",
"fontSrc": "/static/iconfont/iconfont.ttf" "fontSrc": "/static/ali_icon/iconfont.ttf"
}, },
{ {
"float": "right", "float": "right",
"fontSize": "21px", //按钮上文字的大小 "fontSize": "52rpx", //按钮上文字的大小
"text": "\ue6e2", "text": "\ue6e2",
"fontSrc": "/static/iconfont/iconfont.ttf" "fontSrc": "/static/ali_icon/iconfont.ttf"
} }
] ]
} }
@ -209,17 +231,17 @@
{ {
"float": "right", "float": "right",
"fontSize": "23px", //按钮上文字的大小 "fontSize": "58rpx", //按钮上文字的大小
"text": "\ue7c6", "text": "\ue696",
"fontSrc": "/static/iconfont/iconfont.ttf" "fontSrc": "/static/ali_icon/iconfont.ttf"
}, },
{ {
"float": "right", "float": "right",
"fontSize": "21px", //按钮上文字的大小 "fontSize": "52rpx", //按钮上文字的大小
"text": "\ue6e2", "text": "\ue6e2",
"fontSrc": "/static/iconfont/iconfont.ttf" "fontSrc": "/static/ali_icon/iconfont.ttf"
} }
] ]
} }
@ -251,17 +273,17 @@
// 右边按钮 // 右边按钮
{ {
"float": "right", "float": "right",
"fontSize": "23px", //按钮上文字的大小 "fontSize": "58rpx", //按钮上文字的大小
"text": "\ue7c6", "text": "\ue696",
"fontSrc": "/static/iconfont/iconfont.ttf" "fontSrc": "/static/ali_icon/iconfont.ttf"
}, },
{ {
"float": "right", "float": "right",
"fontSize": "21px", //按钮上文字的大小 "fontSize": "52rpx", //按钮上文字的大小
"text": "\ue6e2", "text": "\ue6e2",
"fontSrc": "/static/iconfont/iconfont.ttf" "fontSrc": "/static/ali_icon/iconfont.ttf"
} }
] ]
} }
@ -287,17 +309,17 @@
{ {
"float": "right", "float": "right",
"fontSize": "23px", //按钮上文字的大小 "fontSize": "58rpx", //按钮上文字的大小
"text": "\ue7c6", "text": "\ue696",
"fontSrc": "/static/iconfont/iconfont.ttf" "fontSrc": "/static/ali_icon/iconfont.ttf"
}, },
{ {
"float": "right", "float": "right",
"fontSize": "21px", //按钮上文字的大小 "fontSize": "52rpx", //按钮上文字的大小
"text": "\ue6e2", "text": "\ue6e2",
"fontSrc": "/static/iconfont/iconfont.ttf" "fontSrc": "/static/ali_icon/iconfont.ttf"
} }
] ]
} }
@ -330,17 +352,17 @@
{ {
"float": "right", "float": "right",
"fontSize": "23px", //按钮上文字的大小 "fontSize": "58rpx", //按钮上文字的大小
"text": "\ue7c6", "text": "\ue696",
"fontSrc": "/static/iconfont/iconfont.ttf" "fontSrc": "/static/ali_icon/iconfont.ttf"
}, },
{ {
"float": "right", "float": "right",
"fontSize": "21px", //按钮上文字的大小 "fontSize": "52rpx", //按钮上文字的大小
"text": "\ue6e2", "text": "\ue6e2",
"fontSrc": "/static/iconfont/iconfont.ttf" "fontSrc": "/static/ali_icon/iconfont.ttf"
} }
] ]
} }
@ -358,17 +380,17 @@
{ {
"float": "right", "float": "right",
"fontSize": "23px", //按钮上文字的大小 "fontSize": "58rpx", //按钮上文字的大小
"text": "\ue7c6", "text": "\ue696",
"fontSrc": "/static/iconfont/iconfont.ttf" "fontSrc": "/static/ali_icon/iconfont.ttf"
}, },
{ {
"float": "right", "float": "right",
"fontSize": "21px", //按钮上文字的大小 "fontSize": "52rpx", //按钮上文字的大小
"text": "\ue6e2", "text": "\ue6e2",
"fontSrc": "/static/iconfont/iconfont.ttf" "fontSrc": "/static/ali_icon/iconfont.ttf"
} }
] ]
} }
@ -423,17 +445,17 @@
// 右边按钮 // 右边按钮
{ {
"float": "right", "float": "right",
"fontSize": "23px", //按钮上文字的大小 "fontSize": "58rpx", //按钮上文字的大小
"text": "\ue7c6", "text": "\ue696",
"fontSrc": "/static/iconfont/iconfont.ttf" "fontSrc": "/static/ali_icon/iconfont.ttf"
}, },
{ {
"float": "right", "float": "right",
"fontSize": "21px", //按钮上文字的大小 "fontSize": "52rpx", //按钮上文字的大小
"text": "\ue6e2", "text": "\ue6e2",
"fontSrc": "/static/iconfont/iconfont.ttf" "fontSrc": "/static/ali_icon/iconfont.ttf"
} }
] ]
} }
@ -466,17 +488,17 @@
{ {
"float": "right", "float": "right",
"fontSize": "23px", //按钮上文字的大小 "fontSize": "58rpx", //按钮上文字的大小
"text": "\ue7c6", "text": "\ue696",
"fontSrc": "/static/iconfont/iconfont.ttf" "fontSrc": "/static/ali_icon/iconfont.ttf"
}, },
{ {
"float": "right", "float": "right",
"fontSize": "21px", //按钮上文字的大小 "fontSize": "52rpx", //按钮上文字的大小
"text": "\ue6e2", "text": "\ue6e2",
"fontSrc": "/static/iconfont/iconfont.ttf" "fontSrc": "/static/ali_icon/iconfont.ttf"
} }
] ]
} }
@ -515,17 +537,17 @@
// 右边按钮 // 右边按钮
{ {
"float": "right", "float": "right",
"fontSize": "23px", //按钮上文字的大小 "fontSize": "58rpx", //按钮上文字的大小
"text": "\ue7c6", "text": "\ue696",
"fontSrc": "/static/iconfont/iconfont.ttf" "fontSrc": "/static/ali_icon/iconfont.ttf"
}, },
{ {
"float": "right", "float": "right",
"fontSize": "21px", //按钮上文字的大小 "fontSize": "52rpx", //按钮上文字的大小
"text": "\ue6e2", "text": "\ue6e2",
"fontSrc": "/static/iconfont/iconfont.ttf" "fontSrc": "/static/ali_icon/iconfont.ttf"
} }
] ]
} }
@ -542,17 +564,17 @@
// 右边按钮 // 右边按钮
{ {
"float": "right", "float": "right",
"fontSize": "23px", //按钮上文字的大小 "fontSize": "58rpx", //按钮上文字的大小
"text": "\ue7c6", "text": "\ue696",
"fontSrc": "/static/iconfont/iconfont.ttf" "fontSrc": "/static/ali_icon/iconfont.ttf"
}, },
{ {
"float": "right", "float": "right",
"fontSize": "21px", //按钮上文字的大小 "fontSize": "52rpx", //按钮上文字的大小
"text": "\ue6e2", "text": "\ue6e2",
"fontSrc": "/static/iconfont/iconfont.ttf" "fontSrc": "/static/ali_icon/iconfont.ttf"
} }
] ]
} }
@ -615,17 +637,17 @@
{ {
"float": "right", "float": "right",
"fontSize": "23px", //按钮上文字的大小 "fontSize": "58rpx", //按钮上文字的大小
"text": "\ue7c6", "text": "\ue696",
"fontSrc": "/static/iconfont/iconfont.ttf" "fontSrc": "/static/ali_icon/iconfont.ttf"
}, },
{ {
"float": "right", "float": "right",
"fontSize": "21px", //按钮上文字的大小 "fontSize": "52rpx", //按钮上文字的大小
"text": "\ue6e2", "text": "\ue6e2",
"fontSrc": "/static/iconfont/iconfont.ttf" "fontSrc": "/static/ali_icon/iconfont.ttf"
} }
] ]
} }
@ -650,17 +672,17 @@
{ {
"float": "right", "float": "right",
"fontSize": "23px", //按钮上文字的大小 "fontSize": "58rpx", //按钮上文字的大小
"text": "\ue7c6", "text": "\ue696",
"fontSrc": "/static/iconfont/iconfont.ttf" "fontSrc": "/static/ali_icon/iconfont.ttf"
}, },
{ {
"float": "right", "float": "right",
"fontSize": "21px", //按钮上文字的大小 "fontSize": "52rpx", //按钮上文字的大小
"text": "\ue6e2", "text": "\ue6e2",
"fontSrc": "/static/iconfont/iconfont.ttf" "fontSrc": "/static/ali_icon/iconfont.ttf"
} }
] ]
} }
@ -694,16 +716,16 @@
// 右边按钮 // 右边按钮
{ {
"float": "right", "float": "right",
"fontSize": "23px", //按钮上文字的大小 "fontSize": "58rpx", //按钮上文字的大小
"text": "\ue7c6", "text": "\ue696",
"fontSrc": "/static/iconfont/iconfont.ttf" "fontSrc": "/static/ali_icon/iconfont.ttf"
}, },
{ {
"float": "right", "float": "right",
"fontSize": "21px", //按钮上文字的大小 "fontSize": "52rpx", //按钮上文字的大小
"text": "\ue6e2", "text": "\ue6e2",
"fontSrc": "/static/iconfont/iconfont.ttf" "fontSrc": "/static/ali_icon/iconfont.ttf"
} }
] ]
} }
@ -727,16 +749,16 @@
// 右边按钮 // 右边按钮
{ {
"float": "right", "float": "right",
"fontSize": "23px", //按钮上文字的大小 "fontSize": "58rpx", //按钮上文字的大小
"text": "\ue7c6", "text": "\ue696",
"fontSrc": "/static/iconfont/iconfont.ttf" "fontSrc": "/static/ali_icon/iconfont.ttf"
}, },
{ {
"float": "right", "float": "right",
"fontSize": "21px", //按钮上文字的大小 "fontSize": "52rpx", //按钮上文字的大小
"text": "\ue6e2", "text": "\ue6e2",
"fontSrc": "/static/iconfont/iconfont.ttf" "fontSrc": "/static/ali_icon/iconfont.ttf"
} }
] ]
} }
@ -753,16 +775,16 @@
// 右边按钮 // 右边按钮
{ {
"float": "right", "float": "right",
"fontSize": "23px", //按钮上文字的大小 "fontSize": "58rpx", //按钮上文字的大小
"text": "\ue7c6", "text": "\ue696",
"fontSrc": "/static/iconfont/iconfont.ttf" "fontSrc": "/static/ali_icon/iconfont.ttf"
}, },
{ {
"float": "right", "float": "right",
"fontSize": "21px", //按钮上文字的大小 "fontSize": "52rpx", //按钮上文字的大小
"text": "\ue6e2", "text": "\ue6e2",
"fontSrc": "/static/iconfont/iconfont.ttf" "fontSrc": "/static/ali_icon/iconfont.ttf"
} }
] ]
} }
@ -779,16 +801,16 @@
// 右边按钮 // 右边按钮
{ {
"float": "right", "float": "right",
"fontSize": "23px", //按钮上文字的大小 "fontSize": "58rpx", //按钮上文字的大小
"text": "\ue7c6", "text": "\ue696",
"fontSrc": "/static/iconfont/iconfont.ttf" "fontSrc": "/static/ali_icon/iconfont.ttf"
}, },
{ {
"float": "right", "float": "right",
"fontSize": "21px", //按钮上文字的大小 "fontSize": "52rpx", //按钮上文字的大小
"text": "\ue6e2", "text": "\ue6e2",
"fontSrc": "/static/iconfont/iconfont.ttf" "fontSrc": "/static/ali_icon/iconfont.ttf"
} }
] ]
} }
@ -805,16 +827,16 @@
// 右边按钮 // 右边按钮
{ {
"float": "right", "float": "right",
"fontSize": "23px", //按钮上文字的大小 "fontSize": "58rpx", //按钮上文字的大小
"text": "\ue7c6", "text": "\ue696",
"fontSrc": "/static/iconfont/iconfont.ttf" "fontSrc": "/static/ali_icon/iconfont.ttf"
}, },
{ {
"float": "right", "float": "right",
"fontSize": "21px", //按钮上文字的大小 "fontSize": "52rpx", //按钮上文字的大小
"text": "\ue6e2", "text": "\ue6e2",
"fontSrc": "/static/iconfont/iconfont.ttf" "fontSrc": "/static/ali_icon/iconfont.ttf"
} }
] ]
} }
@ -831,16 +853,16 @@
// 右边按钮 // 右边按钮
{ {
"float": "right", "float": "right",
"fontSize": "23px", //按钮上文字的大小 "fontSize": "58rpx", //按钮上文字的大小
"text": "\ue7c6", "text": "\ue696",
"fontSrc": "/static/iconfont/iconfont.ttf" "fontSrc": "/static/ali_icon/iconfont.ttf"
}, },
{ {
"float": "right", "float": "right",
"fontSize": "21px", //按钮上文字的大小 "fontSize": "52rpx", //按钮上文字的大小
"text": "\ue6e2", "text": "\ue6e2",
"fontSrc": "/static/iconfont/iconfont.ttf" "fontSrc": "/static/ali_icon/iconfont.ttf"
} }
] ]
} }
@ -903,16 +925,16 @@
// 右边按钮 // 右边按钮
{ {
"float": "right", "float": "right",
"fontSize": "23px", //按钮上文字的大小 "fontSize": "58rpx", //按钮上文字的大小
"text": "\ue7c6", "text": "\ue696",
"fontSrc": "/static/iconfont/iconfont.ttf" "fontSrc": "/static/ali_icon/iconfont.ttf"
}, },
{ {
"float": "right", "float": "right",
"fontSize": "21px", //按钮上文字的大小 "fontSize": "52rpx", //按钮上文字的大小
"text": "\ue6e2", "text": "\ue6e2",
"fontSrc": "/static/iconfont/iconfont.ttf" "fontSrc": "/static/ali_icon/iconfont.ttf"
} }
] ]
} }
@ -941,16 +963,16 @@
"titleNView": { "titleNView": {
"buttons": [{ "buttons": [{
"float": "right", "float": "right",
"fontSize": "23px", //按钮上文字的大小 "fontSize": "58rpx", //按钮上文字的大小
"text": "\ue7c6", "text": "\ue696",
"fontSrc": "/static/iconfont/iconfont.ttf" "fontSrc": "/static/ali_icon/iconfont.ttf"
}, },
{ {
"float": "right", "float": "right",
"fontSize": "21px", //按钮上文字的大小 "fontSize": "52rpx", //按钮上文字的大小
"text": "\ue6e2", "text": "\ue6e2",
"fontSrc": "/static/iconfont/iconfont.ttf" "fontSrc": "/static/ali_icon/iconfont.ttf"
} }
] ]
} }
@ -983,17 +1005,17 @@
{ {
"float": "right", "float": "right",
"fontSize": "23px", //按钮上文字的大小 "fontSize": "58rpx", //按钮上文字的大小
"text": "\ue7c6", "text": "\ue696",
"fontSrc": "/static/iconfont/iconfont.ttf" "fontSrc": "/static/ali_icon/iconfont.ttf"
}, },
{ {
"float": "right", "float": "right",
"fontSize": "21px", //按钮上文字的大小 "fontSize": "52rpx", //按钮上文字的大小
"text": "\ue6e2", "text": "\ue6e2",
"fontSrc": "/static/iconfont/iconfont.ttf" "fontSrc": "/static/ali_icon/iconfont.ttf"
} }
] ]
} }
@ -1026,17 +1048,17 @@
// 右边按钮 // 右边按钮
{ {
"float": "right", "float": "right",
"fontSize": "23px", //按钮上文字的大小 "fontSize": "58rpx", //按钮上文字的大小
"text": "\ue7c6", "text": "\ue696",
"fontSrc": "/static/iconfont/iconfont.ttf" "fontSrc": "/static/ali_icon/iconfont.ttf"
}, },
{ {
"float": "right", "float": "right",
"fontSize": "21px", //按钮上文字的大小 "fontSize": "52rpx", //按钮上文字的大小
"text": "\ue6e2", "text": "\ue6e2",
"fontSrc": "/static/iconfont/iconfont.ttf" "fontSrc": "/static/ali_icon/iconfont.ttf"
} }
] ]
} }
@ -1068,17 +1090,17 @@
// 右边按钮 // 右边按钮
{ {
"float": "right", "float": "right",
"fontSize": "23px", //按钮上文字的大小 "fontSize": "58rpx", //按钮上文字的大小
"text": "\ue7c6", "text": "\ue696",
"fontSrc": "/static/iconfont/iconfont.ttf" "fontSrc": "/static/ali_icon/iconfont.ttf"
}, },
{ {
"float": "right", "float": "right",
"fontSize": "21px", //按钮上文字的大小 "fontSize": "52rpx", //按钮上文字的大小
"text": "\ue6e2", "text": "\ue6e2",
"fontSrc": "/static/iconfont/iconfont.ttf" "fontSrc": "/static/ali_icon/iconfont.ttf"
} }
] ]
} }
@ -1112,17 +1134,17 @@
// 右边按钮 // 右边按钮
{ {
"float": "right", "float": "right",
"fontSize": "23px", //按钮上文字的大小 "fontSize": "58rpx", //按钮上文字的大小
"text": "\ue7c6", "text": "\ue696",
"fontSrc": "/static/iconfont/iconfont.ttf" "fontSrc": "/static/ali_icon/iconfont.ttf"
}, },
{ {
"float": "right", "float": "right",
"fontSize": "21px", //按钮上文字的大小 "fontSize": "52rpx", //按钮上文字的大小
"text": "\ue6e2", "text": "\ue6e2",
"fontSrc": "/static/iconfont/iconfont.ttf" "fontSrc": "/static/ali_icon/iconfont.ttf"
} }
] ]
} }
@ -1148,17 +1170,17 @@
// 右边按钮 // 右边按钮
{ {
"float": "right", "float": "right",
"fontSize": "23px", //按钮上文字的大小 "fontSize": "58rpx", //按钮上文字的大小
"text": "\ue7c6", "text": "\ue696",
"fontSrc": "/static/iconfont/iconfont.ttf" "fontSrc": "/static/ali_icon/iconfont.ttf"
}, },
{ {
"float": "right", "float": "right",
"fontSize": "21px", //按钮上文字的大小 "fontSize": "52rpx", //按钮上文字的大小
"text": "\ue6e2", "text": "\ue6e2",
"fontSrc": "/static/iconfont/iconfont.ttf" "fontSrc": "/static/ali_icon/iconfont.ttf"
} }
] ]
} }
@ -1208,17 +1230,17 @@
{ {
"float": "right", "float": "right",
"fontSize": "23px", //按钮上文字的大小 "fontSize": "58rpx", //按钮上文字的大小
"text": "\ue7c6", "text": "\ue696",
"fontSrc": "/static/iconfont/iconfont.ttf" "fontSrc": "/static/ali_icon/iconfont.ttf"
}, },
{ {
"float": "right", "float": "right",
"fontSize": "21px", //按钮上文字的大小 "fontSize": "52rpx", //按钮上文字的大小
"text": "\ue6e2", "text": "\ue6e2",
"fontSrc": "/static/iconfont/iconfont.ttf" "fontSrc": "/static/ali_icon/iconfont.ttf"
} }
] ]
} }
@ -1243,16 +1265,16 @@
// 右边按钮 // 右边按钮
{ {
"float": "right", "float": "right",
"fontSize": "23px", //按钮上文字的大小 "fontSize": "58rpx", //按钮上文字的大小
"text": "\ue7c6", "text": "\ue696",
"fontSrc": "/static/iconfont/iconfont.ttf" "fontSrc": "/static/ali_icon/iconfont.ttf"
}, },
{ {
"float": "right", "float": "right",
"fontSize": "21px", //按钮上文字的大小 "fontSize": "52rpx", //按钮上文字的大小
"text": "\ue6e2", "text": "\ue6e2",
"fontSrc": "/static/iconfont/iconfont.ttf" "fontSrc": "/static/ali_icon/iconfont.ttf"
} }
] ]
} }
@ -1278,17 +1300,17 @@
{ {
"float": "right", "float": "right",
"fontSize": "23px", //按钮上文字的大小 "fontSize": "58rpx", //按钮上文字的大小
"text": "\ue7c6", "text": "\ue696",
"fontSrc": "/static/iconfont/iconfont.ttf" "fontSrc": "/static/ali_icon/iconfont.ttf"
}, },
{ {
"float": "right", "float": "right",
"fontSize": "21px", //按钮上文字的大小 "fontSize": "52rpx", //按钮上文字的大小
"text": "\ue6e2", "text": "\ue6e2",
"fontSrc": "/static/iconfont/iconfont.ttf" "fontSrc": "/static/ali_icon/iconfont.ttf"
} }
] ]
} }
@ -1312,16 +1334,16 @@
// 右边按钮 // 右边按钮
{ {
"float": "right", "float": "right",
"fontSize": "23px", //按钮上文字的大小 "fontSize": "58rpx", //按钮上文字的大小
"text": "\ue7c6", "text": "\ue696",
"fontSrc": "/static/iconfont/iconfont.ttf" "fontSrc": "/static/ali_icon/iconfont.ttf"
}, },
{ {
"float": "right", "float": "right",
"fontSize": "21px", //按钮上文字的大小 "fontSize": "52rpx", //按钮上文字的大小
"text": "\ue6e2", "text": "\ue6e2",
"fontSrc": "/static/iconfont/iconfont.ttf" "fontSrc": "/static/ali_icon/iconfont.ttf"
} }
] ]
} }
@ -1360,16 +1382,16 @@
// 右边按钮 // 右边按钮
{ {
"float": "right", "float": "right",
"fontSize": "23px", //按钮上文字的大小 "fontSize": "58rpx", //按钮上文字的大小
"text": "\ue7c6", "text": "\ue696",
"fontSrc": "/static/iconfont/iconfont.ttf" "fontSrc": "/static/ali_icon/iconfont.ttf"
}, },
{ {
"float": "right", "float": "right",
"fontSize": "21px", //按钮上文字的大小 "fontSize": "52rpx", //按钮上文字的大小
"text": "\ue6e2", "text": "\ue6e2",
"fontSrc": "/static/iconfont/iconfont.ttf" "fontSrc": "/static/ali_icon/iconfont.ttf"
} }
] ]
} }
@ -1400,16 +1422,16 @@
// 右边按钮 // 右边按钮
{ {
"float": "right", "float": "right",
"fontSize": "23px", //按钮上文字的大小 "fontSize": "58rpx", //按钮上文字的大小
"text": "\ue7c6", "text": "\ue696",
"fontSrc": "/static/iconfont/iconfont.ttf" "fontSrc": "/static/ali_icon/iconfont.ttf"
}, },
{ {
"float": "right", "float": "right",
"fontSize": "21px", //按钮上文字的大小 "fontSize": "52rpx", //按钮上文字的大小
"text": "\ue6e2", "text": "\ue6e2",
"fontSrc": "/static/iconfont/iconfont.ttf" "fontSrc": "/static/ali_icon/iconfont.ttf"
} }
] ]
} }
@ -1443,16 +1465,16 @@
// 右边按钮 // 右边按钮
{ {
"float": "right", "float": "right",
"fontSize": "23px", //按钮上文字的大小 "fontSize": "58rpx", //按钮上文字的大小
"text": "\ue7c6", "text": "\ue696",
"fontSrc": "/static/iconfont/iconfont.ttf" "fontSrc": "/static/ali_icon/iconfont.ttf"
}, },
{ {
"float": "right", "float": "right",
"fontSize": "21px", //按钮上文字的大小 "fontSize": "52rpx", //按钮上文字的大小
"text": "\ue6e2", "text": "\ue6e2",
"fontSrc": "/static/iconfont/iconfont.ttf" "fontSrc": "/static/ali_icon/iconfont.ttf"
} }
] ]
} }
@ -1484,16 +1506,16 @@
// 右边按钮 // 右边按钮
{ {
"float": "right", "float": "right",
"fontSize": "23px", //按钮上文字的大小 "fontSize": "58rpx", //按钮上文字的大小
"text": "\ue7c6", "text": "\ue696",
"fontSrc": "/static/iconfont/iconfont.ttf" "fontSrc": "/static/ali_icon/iconfont.ttf"
}, },
{ {
"float": "right", "float": "right",
"fontSize": "21px", //按钮上文字的大小 "fontSize": "52rpx", //按钮上文字的大小
"text": "\ue6e2", "text": "\ue6e2",
"fontSrc": "/static/iconfont/iconfont.ttf" "fontSrc": "/static/ali_icon/iconfont.ttf"
} }
] ]
} }
@ -1526,17 +1548,17 @@
// 右边按钮 // 右边按钮
{ {
"float": "right", "float": "right",
"fontSize": "23px", //按钮上文字的大小 "fontSize": "58rpx", //按钮上文字的大小
"text": "\ue7c6", "text": "\ue696",
"fontSrc": "/static/iconfont/iconfont.ttf" "fontSrc": "/static/ali_icon/iconfont.ttf"
}, },
{ {
"float": "right", "float": "right",
"fontSize": "21px", //按钮上文字的大小 "fontSize": "52rpx", //按钮上文字的大小
"text": "\ue6e2", "text": "\ue6e2",
"fontSrc": "/static/iconfont/iconfont.ttf" "fontSrc": "/static/ali_icon/iconfont.ttf"
} }
] ]
} }
@ -1560,16 +1582,16 @@
// 右边按钮 // 右边按钮
{ {
"float": "right", "float": "right",
"fontSize": "23px", //按钮上文字的大小 "fontSize": "52rpx", //按钮上文字的大小
"text": "\ue7c6", "text": "\ue696",
"fontSrc": "/static/iconfont/iconfont.ttf" "fontSrc": "/static/ali_icon/iconfont.ttf"
}, },
{ {
"float": "right", "float": "right",
"fontSize": "21px", //按钮上文字的大小 "fontSize": "52rpx", //按钮上文字的大小
"text": "\ue6e2", "text": "\ue6e2",
"fontSrc": "/static/iconfont/iconfont.ttf" "fontSrc": "/static/ali_icon/iconfont.ttf"
} }
] ]
} }
@ -1648,9 +1670,9 @@
"autoBackButton": "true", "autoBackButton": "true",
"buttons": [{ "buttons": [{
"float": "right", "float": "right",
"text": "\ue7c6", "text": "\ue696",
"fontSrc": "/static/icon/iconfont.ttf", "fontSrc": "/static/ali_icon/iconfont.ttf",
"fontSize": "22px" "fontSize": "58rpx"
}] }]
}, },
"softinputMode": "adjustPan" //adjustResize "softinputMode": "adjustPan" //adjustResize

42
pages/config/config.vue
View File

@ -0,0 +1,42 @@
<template>
<view class="" style="background-color: #fff; height: 100%;">
<view class="" style="font-size: 35rpx;padding: 15rpx;">
请求地址
</view>
<uni-combox :candidates="candidates" placeholder="请选择请求地址" v-model="city"></uni-combox>
</view>
</template>
<script>
export default {
data() {
return {
candidates:["http://192.168.0.178:12080/admin-api(陈放)",
"http://192.168.0.178:12080/admin-api"
],
city:""
};
},
methods: {
}
}
</script>
<style>
</style>

8
pages/customerReturn/coms/comReturnJobCard.vue
View File

@ -9,13 +9,7 @@
<view class="task_text"> <view class="task_text">
<view class=""> <view class="">
客户名称 : {{dataContent.customerName}} 客户代码 : {{dataContent.customerCode}}
</view>
</view>
<view class="task_text">
<view class="">
物品代码 : {{dataContent.itemCode}}
</view> </view>
</view> </view>
</view> </view>

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

@ -95,8 +95,6 @@
}; };
}, },
onLoad(option) { onLoad(option) {
console.log("任务id",option.id)
console.log("任务状态",option.status)
this.id = option.id; this.id = option.id;
if (this.id != undefined) { if (this.id != undefined) {
//新建的任务自动接收 //新建的任务自动接收
@ -277,8 +275,7 @@
']不一致,是否继续上架?', res => { ']不一致,是否继续上架?', res => {
if (res) { if (res) {
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.balance = result.balance; itemDetail.balance = result.balance;
itemDetail.balance.balanceQty = result.balance.qty; itemDetail.balance.balanceQty = result.balance.qty;
itemDetail.balance.stdPackQty = result.package.stdPackQty itemDetail.balance.stdPackQty = result.package.stdPackQty
@ -290,8 +287,7 @@
}); });
} 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.balance = result.balance; itemDetail.balance = result.balance;
itemDetail.balance.balanceQty = result.balance.qty; itemDetail.balance.balanceQty = result.balance.qty;
itemDetail.balance.stdPackQty = result.package.stdPackQty itemDetail.balance.stdPackQty = result.package.stdPackQty
@ -363,19 +359,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));
// customerReturnJobSubmit(this.id, params).then(res => { customerReturnJobSubmit(params).then(res => {
// uni.hideLoading() uni.hideLoading()
// if (res.data) { if (res.data) {
// var hint = res.data.Number; this.showCommitSuccessMessage("提交成功<br>生成客户退货记录:" + res.data)
// this.showCommitSuccessMessage("提交成功" + hint) } else {
this.showErrorMessage("提交失败[" + res.msg + "]")
// } else { }
// this.showErrorMessage("提交失败[" + res.msg + "]") }).catch(error => {
// } uni.hideLoading()
// }).catch(error => { this.showErrorMessage(error)
// uni.hideLoading() })
// this.showErrorMessage(error)
// })
} else { } else {
uni.hideLoading(); uni.hideLoading();
this.showErrorMessage(res.message); this.showErrorMessage(res.message);
@ -394,7 +388,9 @@
var info = getPackingNumberAndBatch(this.managementList, detail.itemCode, var info = getPackingNumberAndBatch(this.managementList, detail.itemCode,
detail.packingNumber, detail.batch); detail.packingNumber, detail.batch);
detail.toPackingNumber = info.packingNumber; detail.toPackingNumber = info.packingNumber;
detail.toContainerNumber = detail.containerNumber;
detail.toBatch = info.batch; detail.toBatch = info.batch;
detail.toLocationCode = detail.toLocationCode;
subList.push(detail) subList.push(detail)
} }
}) })

12
pages/deliver/coms/comScanDeliverPack.vue
View File

@ -138,7 +138,7 @@
fromLocationList: [], fromLocationList: [],
fromLocationCode: '', fromLocationCode: '',
fromLocation: null, fromLocation: null,
issueRecord: [], //补料历史 issueRecord: [], //发货历史
expand: true, expand: true,
scanOptions: {}, scanOptions: {},
editItem: {}, editItem: {},
@ -212,7 +212,7 @@
let location = this.fromLocationList.find(r => r == fromlocation) let location = this.fromLocationList.find(r => r == fromlocation)
if (location == undefined) { if (location == undefined) {
this.fromLocationCode = '' this.fromLocationCode = ''
this.showErrorMessage('补料库位【' + fromlocation + '】不存在') this.showErrorMessage('发货库位【' + fromlocation + '】不存在')
} }
}, },
onScan(result) { onScan(result) {
@ -231,7 +231,7 @@
let lot = result.label.batch; let lot = result.label.batch;
let item = that.toLocation.Items.find(r => r.itemCode == itemCode); let item = that.toLocation.Items.find(r => r.itemCode == itemCode);
if (item == undefined) { if (item == undefined) {
that.showErrorMessage('未查找到零件【' + itemCode + '】的补料明细', that.showErrorMessage('未查找到零件【' + itemCode + '】的发货明细',
res => { res => {
that.getfocus(); that.getfocus();
} }
@ -321,21 +321,21 @@
} else { } else {
if (this.jobContent.AllowModifyBatch == null) { if (this.jobContent.AllowModifyBatch == null) {
this.showQuestionMessage('在【' + that.fromLocationCode + '】库位下,未查找到批次【' + lot + this.showQuestionMessage('在【' + that.fromLocationCode + '】库位下,未查找到批次【' + lot +
'】的补料明细,是否要继续补料?', res => { '】的发货明细,是否要继续发货?', res => {
if (res) { if (res) {
let batch = that.createBatchInfo(label, balance); let batch = that.createBatchInfo(label, balance);
fromLocation.Batchs.unshift(batch); fromLocation.Batchs.unshift(batch);
} }
}) })
} else { } else {
that.showErrorMessage('未查找到批次【' + lot + '】的补料明细', that.showErrorMessage('未查找到批次【' + lot + '】的发货明细',
res => { res => {
that.getfocus(); that.getfocus();
}); });
} }
} }
} else { } else {
that.showErrorMessage('未查找到推荐库位【' + that.fromLocationCode + '】的补料明细', that.showErrorMessage('未查找到推荐库位【' + that.fromLocationCode + '】的发货明细',
res => { res => {
that.getfocus(); that.getfocus();
} }

35
pages/inspect/coms/inspectComDetailCard.vue
View File

@ -1,23 +1,33 @@
<template> <template>
<view class="" style="background-color: #fff;"> <view class="" style="background-color: #fff;">
<view class=""> <view class="">
<view class="" style="font-size: 32rpx;margin-left: 20rpx;">
<view class=""> <view class="cen_card" style="padding: 20rpx;">
检验类型 : {{getInspectType(jobContent.inspectType)}} <view class="cell_box uni-flex uni-row">
<view class="cell_info">
<view class="text_lightblue">类型</view>
<view>{{getInspectType(jobContent.inspectType)}}</view>
</view> </view>
<view class=""> <view class="cell_info">
收货数量 : {{jobContent.receiveQty}}{{getUnitInfo(jobContent.uom)}} <view class="text_lightblue">收货数</view>
<view>{{jobContent.receiveQty}}{{getUnitInfo(jobContent.uom)}}</view>
</view> </view>
<view class=""> <view class="cell_info">
检验数量 : {{jobContent.sampleQty}}{{getUnitInfo(jobContent.uom)}} <view class="text_lightblue">检验数</view>
<view>{{jobContent.sampleQty}}{{getUnitInfo(jobContent.uom)}}</view>
</view> </view>
<view class=""> <view class="cell_info">
不合格数量 : {{jobContent.failedQty}}{{getUnitInfo(jobContent.uom)}} <view class="text_lightblue">不合格数</view>
<view>{{jobContent.failedQty}}{{getUnitInfo(jobContent.uom)}}</view>
</view>
<view class="cell_info">
<view class="text_lightblue">报废数</view>
<view>{{jobContent.crackQty}}{{getUnitInfo(jobContent.uom)}}</view>
</view> </view>
<view class="">
报废数量 : {{jobContent.crackQty}}{{getUnitInfo(jobContent.uom)}}
</view> </view>
<u-line />
</view> </view>
</view> </view>
<u-line /> <u-line />
<uni-collapse ref="collapse1" @change=""> <uni-collapse ref="collapse1" @change="">
@ -168,7 +178,7 @@
detail(item) { detail(item) {
this.showItem = item; this.showItem = item;
this.$refs.receiptHint.openScanPopup() this.$refs.receiptHint.openScanPopup(item)
}, },
remove(item) { remove(item) {
this.$refs.message.showQuestionMessage("确定移除扫描信息?", this.$refs.message.showQuestionMessage("确定移除扫描信息?",
@ -181,6 +191,7 @@
item.notPassedQty = 0; item.notPassedQty = 0;
item.inspectResult ="" item.inspectResult =""
item.failedReason ="" item.failedReason =""
item.handleQty =0;
item.photos ="" item.photos =""
this.$forceUpdate() this.$forceUpdate()
this.$emit('remove', item) this.$emit('remove', item)

3
pages/inspect/coms/inspectEdit.vue
View File

@ -100,7 +100,7 @@
openEditPopup(item) { openEditPopup(item) {
this.failedReasonArray = getInspectFailedReasonList(); this.failedReasonArray = getInspectFailedReasonList();
//拷贝数据到页面显示，防止修改数据原数据修改 //拷贝数据到页面显示，防止修改数据原数据修改
Object.assign(this.dataContent, item) this.dataContent = Object.assign({}, item)
this.$refs['editPopup'].open("bottom"); this.$refs['editPopup'].open("bottom");
}, },
@ -138,6 +138,7 @@
this.dataContent.failedQty = failedQty; this.dataContent.failedQty = failedQty;
this.dataContent.crackQty = crackQty this.dataContent.crackQty = crackQty
this.dataContent.goodQty = this.dataContent.handleQty -failedQty-crackQty this.dataContent.goodQty = this.dataContent.handleQty -failedQty-crackQty
debugger
this.afterSave() this.afterSave()

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

@ -42,6 +42,7 @@
goHome, goHome,
getCurrDateTime, getCurrDateTime,
getPackingNumberAndBatch, getPackingNumberAndBatch,
navigateBack
} from '@/common/basic.js'; } from '@/common/basic.js';
import { import {
getInventoryStatusName, getInventoryStatusName,
@ -194,8 +195,6 @@
res.photos = "" res.photos = ""
res.inspectResult = "" res.inspectResult = ""
}) })
// that.jobContent.outInventoryStatuses='INSP,OK'
that.jobContent.outInventoryStatuses='HOLD'
that.fromInventoryStatuses = that.jobContent.outInventoryStatuses that.fromInventoryStatuses = that.jobContent.outInventoryStatuses
that.detailSource = getDataSource(that.subList); that.detailSource = getDataSource(that.subList);
} else { } else {
@ -293,8 +292,7 @@
']不一致,是否继续上架?', res => { ']不一致,是否继续上架?', res => {
if (res) { if (res) {
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.balance = result.balance; itemDetail.balance = result.balance;
this.calcHandleQty(); this.calcHandleQty();
} else { } else {
@ -304,8 +302,7 @@
} else { } else {
itemDetail.scaned = true; itemDetail.scaned = true;
itemDetail.balance = result.balance; itemDetail.balance = result.balance;
itemDetail.handleQty = Number(result.label.qty) > Number(result.balance.qty) ? Number( itemDetail.handleQty = Number(result.balance.qty)
result.balance.qty) : Number(result.label.qty);
this.calcHandleQty(); this.calcHandleQty();
} }
} }
@ -372,7 +369,7 @@
inspectJobSubmit(params).then(res => { inspectJobSubmit(params).then(res => {
uni.hideLoading() uni.hideLoading()
if (res.data) { if (res.data) {
this.showCommitSuccessMessage("提交成功<br>生成到货检验记录" + res.data, ) this.showCommitSuccessMessage("提交成功<br>生成到货检验记录" + res.data)
} else { } else {
this.showErrorMessage("提交失败[" + res.msg + "]") this.showErrorMessage("提交失败[" + res.msg + "]")
} }
@ -480,9 +477,15 @@
showCommitSuccessMessage(hint) { showCommitSuccessMessage(hint) {
this.$refs.comMessage.showSuccessMessage(hint, res => { this.$refs.comMessage.showSuccessMessage(hint, res => {
uni.navigateTo({ // let canNavBack = getCurrentPages()
url: './inspectJob' // if( canNavBack && canNavBack.length>1) {
}) // uni.navigateBack({
// delta:2
// })
// } else {
// history.back();
// }
navigateBack(2);
}) })
}, },

28
pages/inspect/job/inspectResult.vue
View File

@ -51,7 +51,7 @@
<view class="uni-label">不合格数量</view> <view class="uni-label">不合格数量</view>
</view> </view>
<view class="pda-list-cell-db"> <view class="pda-list-cell-db">
<uni-easyinput :inputBorder="true" type="number" placeholder="请输入数字" v-model="jobContent.failedQty" <uni-easyinput :inputBorder="true" type="number" placeholder="请输入数字" v-model="jobContent.failedQty" @clear="clearFailedQty"
@blur="failedQtyConfirm" class="count-input"> @blur="failedQtyConfirm" class="count-input">
</uni-easyinput> </uni-easyinput>
</view> </view>
@ -63,7 +63,7 @@
<view class="uni-label">报废数量</view> <view class="uni-label">报废数量</view>
</view> </view>
<view class="pda-list-cell-db"> <view class="pda-list-cell-db">
<uni-easyinput placeholder="请输入数字" type="number" v-model="jobContent.crackQty" @blur="" <uni-easyinput placeholder="请输入数字" type="number" v-model="jobContent.crackQty" @blur="" @clear="clearCrackQty"
class="count-input"> class="count-input">
</uni-easyinput> </uni-easyinput>
</view> </view>
@ -156,6 +156,11 @@
getUnitInfo getUnitInfo
} from '@/common/directory.js'; } from '@/common/directory.js';
import {
goHome,
navigateBack
} from '@/common/basic.js';
export default { export default {
components: { components: {
comMessage comMessage
@ -181,6 +186,12 @@
} }
}, },
//返回首页
onNavigationBarButtonTap(e) {
if (e.index === 0) {
goHome();
}
},
onLoad(option) { onLoad(option) {
this.id = option.id; this.id = option.id;
this.status = option.status; this.status = option.status;
@ -318,6 +329,13 @@
} }
}, },
clearFailedQty(){
this.jobContent.failedQty = null;
},
clearCrackQty(){
this.jobContent.crackQty = null
},
commit() { commit() {
@ -394,7 +412,7 @@
res.photos = "" res.photos = ""
res.inspectResult = "" res.inspectResult = ""
res.toInventoryStatus = "NOK" res.toInventoryStatus = "NOK"
re.inspectUser = this.$store.state.user.id res.inspectUser = this.$store.state.user.id
}) })
this.jobContent.nextAction = this.nextAction; this.jobContent.nextAction = this.nextAction;
this.jobContent.goodQty = 0 this.jobContent.goodQty = 0
@ -458,9 +476,7 @@
}, },
showCommitSuccessMessage(hint) { showCommitSuccessMessage(hint) {
this.$refs.comMessage.showSuccessMessage(hint, res => { this.$refs.comMessage.showSuccessMessage(hint, res => {
uni.navigateTo({ navigateBack(1)
url: './inspectJob'
})
}) })
}, },
showErrorMessage(message) { showErrorMessage(message) {

6
pages/inspect/request/inspectRequestDetail.vue
View File

@ -5,10 +5,10 @@
<scroll-view scroll-y="true" class="page-main-scroll"> <scroll-view scroll-y="true" class="page-main-scroll">
<view class="" style="background-color: #fff; padding-left: 20rpx;padding-right: 20rpx; padding-top: 10rpx;padding-bottom: 10rpx;"> <view class="" style="background-color: #fff; padding-left: 20rpx;padding-right: 20rpx; padding-top: 10rpx;padding-bottom: 10rpx;">
<view class="" style="font-size: 35rpx;"> <view class="" style="font-size: 35rpx;">
发货单号 : 单据号 : {{requestContent.number}}
</view> </view>
<view class="" style="font-size: 35rpx;"> <view class="" style="font-size: 35rpx;">
<text>供应商 : </text> <text>供应商代码 : {{requestContent.supplierCode}} </text>
</view> </view>
</view> </view>
<u-line /> <u-line />
@ -93,7 +93,7 @@
that.showMessage('未获取到详情'); that.showMessage('未获取到详情');
} else { } else {
if (res.data.subList.length > 0) { if (res.data.subList.length > 0) {
that.jobContent = res.data; that.requestContent = res.data;
that.subList = res.data.subList; that.subList = res.data.subList;
that.detailSource = getDataSource(that.subList) that.detailSource = getDataSource(that.subList)
// that.subList = res.data[0]; // that.subList = res.data[0];

8
pages/login/index.vue
View File

@ -136,6 +136,14 @@
backgroundColor: "#476DF5 !important" backgroundColor: "#476DF5 !important"
}) })
}, },
//返回首页
onNavigationBarButtonTap(e) {
if (e.index === 0) {
uni.navigateTo({
url:"/pages/config/config"
})
}
},
onLoad() { onLoad() {
getCaptchaImage().then(res => { getCaptchaImage().then(res => {
if (res) { if (res) {

16
pages/productionReturn/coms/comReturnJobCard.vue
View File

@ -9,15 +9,10 @@
<view class="task_text"> <view class="task_text">
<view class=""> <view class="">
物品代码 : {{dataContent.itemCode}} 业务类型 : {{getBusinessTypeName(dataContent.businessType)}}
</view> </view>
</view> </view>
<view class="task_text">
<view class="">
目标库位 : {{dataContent.toLocationCode}}
</view>
</view>
</view> </view>
</job-com-main-card> </job-com-main-card>
</template> </template>
@ -40,9 +35,18 @@
}, },
methods: { methods: {
getBusinessTypeName(value) {
var name = "";
if (value == 'ReturnToStore') {
name = "合格退料"
} else if (value == 'ReturnToHold') {
name = "隔离退料"
}
return name;
} }
} }
}
</script> </script>
<style lang="scss"> <style lang="scss">

64
pages/productionReturn/job/returnDetail.vue
View File

@ -15,13 +15,13 @@
</view> </view>
<view class="page-footer"> <view class="page-footer">
<view class="uni-flex u-col-center space-between padding_10" <view class="uni-flex u-col-center space-between padding_10"
style="background-color:ghostwhite; width: 100%; "> style="background-color:ghostwhite; width: 100%; ">
<view class=""> <view class="">
<requiredLocation title="目标库位" :locationCode="toLocationCode" :isShowEdit="jobContent.allowModifyLocation==1" <requiredLocation title="目标库位" :locationCode="toLocationCode"
@getLocation='scanLocationCode' :locationTypeList="tolocationTypeList"></requiredLocation> :isShowEdit="jobContent.allowModifyLocation==1" @getLocation='scanLocationCode'
:locationTypeList="tolocationTypeList"></requiredLocation>
</view> </view>
<view class=" uni-flex uni-row"> <view class=" uni-flex uni-row">
<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button> <button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
@ -37,7 +37,6 @@
</template> </template>
<script> <script>
import { import {
getProductionReturnJobDetail, getProductionReturnJobDetail,
productionReturnJobSubmit, productionReturnJobSubmit,
@ -105,16 +104,15 @@
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();
} }
}
}, },
//返回首页 //返回首页
onNavigationBarButtonTap(e) { onNavigationBarButtonTap(e) {
@ -268,7 +266,7 @@
']不一致,是否继续上架?', res => { ']不一致,是否继续上架?', res => {
if (res) { if (res) {
itemDetail.scaned = true; itemDetail.scaned = true;
itemDetail.handleQty = Number(result.label.qty)>Number(result.balance.qty)?Number(result.balance.qty):Number(result.label.qty); itemDetail.handleQty = Number(result.balance.qty)
itemDetail.balance = result.balance; itemDetail.balance = result.balance;
itemDetail.balance.balanceQty = result.balance.qty; itemDetail.balance.balanceQty = result.balance.qty;
itemDetail.balance.stdPackQty = result.package.stdPackQty itemDetail.balance.stdPackQty = result.package.stdPackQty
@ -280,7 +278,7 @@
}); });
} else { } else {
itemDetail.scaned = true; itemDetail.scaned = true;
itemDetail.handleQty = Number(result.label.qty)>Number(result.balance.qty)?Number(result.balance.qty):Number(result.label.qty); itemDetail.handleQty = Number(result.balance.qty)
itemDetail.balance = result.balance; itemDetail.balance = result.balance;
itemDetail.balance.balanceQty = result.balance.qty; itemDetail.balance.balanceQty = result.balance.qty;
itemDetail.balance.stdPackQty = result.package.stdPackQty itemDetail.balance.stdPackQty = result.package.stdPackQty
@ -337,7 +335,7 @@
} }
}, },
async submitJob() { submitJob() {
uni.showLoading({ uni.showLoading({
title: "提交中....", title: "提交中....",
mask: true mask: true
@ -358,19 +356,17 @@
var params = this.setParams() var params = this.setParams()
console.log("提交参数", JSON.stringify(params)); console.log("提交参数", JSON.stringify(params));
// productionReturnJobSubmit(this.id, params).then(res => { productionReturnJobSubmit(params).then(res => {
// uni.hideLoading() uni.hideLoading()
// if (res.data) { if (res.data) {
// var hint = res.data.Number; this.showCommitSuccessMessage("提交成功<br>生成生产退料记录:" + res.data)
// this.showCommitSuccessMessage("提交成功" + hint) } else {
this.showErrorMessage("提交失败[" + res.msg + "]")
// } else { }
// this.showErrorMessage("提交失败[" + res.msg + "]") }).catch(error => {
// } uni.hideLoading()
// }).catch(error => { this.showErrorMessage(error)
// uni.hideLoading() })
// this.showErrorMessage(error)
// })
} else { } else {
uni.hideLoading(); uni.hideLoading();
this.showErrorMessage(res.message); this.showErrorMessage(res.message);
@ -387,8 +383,11 @@
if (detail.scaned) { if (detail.scaned) {
var info = getPackingNumberAndBatch(this.managementList, detail.itemCode, var info = getPackingNumberAndBatch(this.managementList, detail.itemCode,
detail.packingNumber, detail.batch); detail.packingNumber, detail.batch);
detail.toPackingNumber =info.packingNumber; detail.toPackingNumber = detail.packingNumber;
detail.toBatch =info.batch; detail.toContainerNumber = detail.containerNumber;
detail.toBatch = detail.batch;
detail.toLocationCode = detail.toLocationCode;
subList.push(detail) subList.push(detail)
} }
}) })
@ -463,13 +462,10 @@
showCommitSuccessMessage(hint) { showCommitSuccessMessage(hint) {
this.$refs.comMessage.showSuccessMessage(hint, res => { this.$refs.comMessage.showSuccessMessage(hint, res => {
})
setTimeout(() => {
uni.navigateTo({ uni.navigateTo({
url: './returnJob' url: './returnJob'
}) })
}, 3000) })
}, },
} }
} }

17
pages/purchaseReceipt/job/receiptDetail.vue
View File

@ -46,7 +46,8 @@
getCurrDateTime, getCurrDateTime,
getPackingNumberAndBatch, getPackingNumberAndBatch,
updateTitle, updateTitle,
compareAsc compareAsc,
navigateBack
} from '@/common/basic.js'; } from '@/common/basic.js';
import { import {
@ -417,21 +418,9 @@
}, },
closeCommitMessage() {
setTimeout(() => {
uni.navigateTo({
url: './receipt'
})
})
//点关闭直接返回列表
uni.hideLoading();
},
showCommitSuccessMessage(hint) { showCommitSuccessMessage(hint) {
this.$refs.comMessage.showSuccessMessage(hint, res => { this.$refs.comMessage.showSuccessMessage(hint, res => {
uni.navigateTo({ navigateBack(1)
url: './receiptJob'
})
}) })
}, },
} }

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

@ -53,6 +53,7 @@
goHome, goHome,
getCurrDateTime, getCurrDateTime,
getPackingNumberAndBatch, getPackingNumberAndBatch,
navigateBack
} from '@/common/basic.js'; } from '@/common/basic.js';
import { import {
getInventoryStatusName getInventoryStatusName
@ -248,7 +249,8 @@
']不一致,是否继续上架?', res => { ']不一致,是否继续上架?', res => {
if (res) { if (res) {
itemDetail.scaned = true; itemDetail.scaned = true;
itemDetail.handleQty = Number(qty); itemDetail.handleQty = Number(result.label.qty) > Number(result.balance
.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 = result.balance.qty;
@ -262,13 +264,13 @@
}); });
} else { } else {
itemDetail.scaned = true; itemDetail.scaned = true;
itemDetail.handleQty = Number(qty); itemDetail.handleQty = Number(result.label.qty) > Number(result.balance
.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 = result.balance.qty;
itemDetail.balance.stdPackQty =result.package.stdPackQty itemDetail.balance.stdPackQty =result.package.stdPackQty
itemDetail.balance.stdPackUnit =result.package.stdPackUnit itemDetail.balance.stdPackUnit =result.package.stdPackUnit
itemDetail.handleQty = Number(qty);
this.calcHandleQty(); this.calcHandleQty();
} }
} }
@ -418,9 +420,7 @@
showCommitSuccessMessage(number) { showCommitSuccessMessage(number) {
this.$refs.comMessage.showSuccessMessage('提交成功<br>生成退货记录:' + number, res => { this.$refs.comMessage.showSuccessMessage('提交成功<br>生成退货记录:' + number, res => {
uni.navigateTo({ navigateBack()
url: './returnJob'
})
}) })
} }
} }

7
pages/purchaseReturn/record/returnRecord.vue
View File

@ -44,7 +44,8 @@
} from '@/api/request2.js'; } from '@/api/request2.js';
import { import {
goHome, goHome,
updateTitle updateTitle,
navigateBack
} from '@/common/basic.js'; } from '@/common/basic.js';
import { import {
@ -381,9 +382,7 @@
showCommitSuccessMessage(hint) { showCommitSuccessMessage(hint) {
this.$refs.comMessage.showSuccessMessage(hint, res => { this.$refs.comMessage.showSuccessMessage(hint, res => {
if (this.fromType == "requestType") { if (this.fromType == "requestType") {
uni.navigateTo({ navigateBack(1)
url: '../request/issueRequest'
})
}else { }else {
//清空 //清空
this.subList = []; this.subList = [];

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

@ -54,6 +54,7 @@
goHome, goHome,
getCurrDateTime, getCurrDateTime,
getPackingNumberAndBatch, getPackingNumberAndBatch,
navigateBack
} from '@/common/basic.js'; } from '@/common/basic.js';
import { import {
@ -499,9 +500,7 @@
showCommitSuccessMessage(hint) { showCommitSuccessMessage(hint) {
this.$refs.comMessage.showSuccessMessage(hint, res => { this.$refs.comMessage.showSuccessMessage(hint, res => {
uni.navigateTo({ navigateBack(1)
url: './putawayJob'
})
}) })
}, },
} }

3
router/my_router.js
View File

@ -1,7 +1,8 @@
//只要是未登录状态，想要跳转到名单内的路径时，直接跳到登录页 //只要是未登录状态，想要跳转到名单内的路径时，直接跳到登录页
// 页面白名单，不受拦截 // 页面白名单，不受拦截
const whiteList = [ const whiteList = [
'/pages/login/index' '/pages/login/index',
'/pages/config/config'
] ]
function hasPermission(url) { function hasPermission(url) {

10
static/icon/iconfont_filter.css → static/ali_icon/iconfont.css
View File

@ -1,6 +1,6 @@
@font-face { @font-face {
font-family: "iconfont"; /* Project id 4087030 */ font-family: "iconfont"; /* Project id 4087030 */
src: url('@/static/icon/iconfont_filter.ttf') format('truetype'); src: url('/static/ali_icon/iconfont.ttf') format('truetype');
} }
.iconfont { .iconfont {
@ -11,6 +11,14 @@
-moz-osx-font-smoothing: grayscale; -moz-osx-font-smoothing: grayscale;
} }
.icon-shezhi:before {
content: "\e706";
}
.icon-icon_home:before {
content: "\e696";
}
.icon-guolv:before { .icon-guolv:before {
content: "\e6e2"; content: "\e6e2";
} }

BIN
static/ali_icon/iconfont.ttf
View File

Binary file not shown.

18
static/icon/iconfont.css
View File

@ -1,18 +0,0 @@
@font-face {
font-family: "iconfont";
/* Project id */
/* src: url('iconfont.ttf?t=1653546564489') format('truetype'); */
src: url('@/static/icon/iconfont.ttf') format('truetype');
}
/* .iconfont {
font-family: "iconfont" !important;
font-size: 16px;
font-style: normal;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
}
.icon-home:before {
content: "\e7c6";
} */

BIN
static/icon/iconfont.ttf
View File

Binary file not shown.

BIN
static/icon/iconfont_filter.ttf
View File

Binary file not shown.

32
static/iconfont.css
View File

@ -1,32 +0,0 @@
@font-face {
font-family: "iconfont"; /* Project id */
src: url('@/static/iconfont.ttf') format('truetype');
}
.iconfont {
font-family: "iconfont" !important;
font-size: 16px;
font-style: normal;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
}
.icon-link:before {
content: "\e772";
}
.icon-poweroff:before {
content: "\e774";
}
.icon-safety-certificate:before {
content: "\e776";
}
.icon-chart-pie-alt:before {
content: "\e78c";
}
.icon-kongxincai:before {
content: "\e642";
}

BIN
static/iconfont.ttf
View File

Binary file not shown.

BIN
static/iconfont/iconfont.ttf
View File

Binary file not shown.

2
static/scss/index.scss
View File

@ -2,5 +2,3 @@
@import "./global.scss"; @import "./global.scss";
// color-ui // color-ui
@import "@/static/scss/colorui.css"; @import "@/static/scss/colorui.css";
// iconfont
@import "@/static/font/iconfont.css";
Write Preview
Loading…
Cancel
Save