niexiting 9 months ago
parent
commit
bdea86c3c6
  1. 7
      Dockerfile
  2. 53
      nginx.conf
  3. 4
      package.json
  4. 9
      src/App.vue
  5. 43
      src/api/request2.js
  6. 116
      src/common/appUpdate.js
  7. 11
      src/common/style/new_style.css
  8. 2
      src/common/style/pdabasic.css
  9. 7
      src/mycomponents/balance/balanceDetailPopup.vue
  10. 2
      src/mycomponents/balance/recommendBalance.vue
  11. 4
      src/mycomponents/detail/jobDetailPopup.vue
  12. 4
      src/mycomponents/detail/recordDetailPopup.vue
  13. 4
      src/mycomponents/job/jobDetailPopup.vue
  14. 4
      src/mycomponents/job/jobInfoPopup.vue
  15. 4
      src/mycomponents/package/packageDetailPopup.vue
  16. 8
      src/mycomponents/qty/CountQtyEdit.vue
  17. 4
      src/mycomponents/qty/inspectQtyEdit.vue
  18. 8
      src/mycomponents/qty/recommendQtyEdit.vue
  19. 7
      src/mycomponents/recommend/recommend.vue
  20. 4
      src/mycomponents/scan/winScanAsnNumber.vue
  21. 4
      src/mycomponents/scan/winScanContainer.vue
  22. 4
      src/mycomponents/scan/winScanItem.vue
  23. 4
      src/mycomponents/scan/winScanJobNumber.vue
  24. 4
      src/mycomponents/scan/winScanLocation.vue
  25. 4
      src/mycomponents/scan/winScanPack.vue
  26. 6
      src/mycomponents/scan/winScanPackAndCont.vue
  27. 8
      src/mycomponents/scan/winScanPackAndLocation.vue
  28. 4
      src/mycomponents/scan/winScanPackAndPosition.vue
  29. 4
      src/pages/count/coms/detailInfoPopup.vue
  30. 4
      src/pages/count/coms/jobInfoPopup.vue
  31. 2
      src/pages/count/job/countDetail.vue
  32. 4
      src/pages/customerReturn/coms/detailInfoPopup.vue
  33. 4
      src/pages/customerReturn/coms/jobInfoPopup.vue
  34. 4
      src/pages/customerReturn/coms/requestDetailInfoPopup.vue
  35. 4
      src/pages/customerReturn/coms/requestInfoPopup.vue
  36. 4
      src/pages/deliver/coms/comDeliverRequestPopup.vue
  37. 4
      src/pages/deliver/coms/comScanDeliverPack.vue
  38. 4
      src/pages/deliver/coms/detailInfoPopup.vue
  39. 4
      src/pages/deliver/coms/requestDetailInfoPopup.vue
  40. 4
      src/pages/deliver/coms/requestInfoPopup.vue
  41. 4
      src/pages/inspect/coms/inspectInfoPopup.vue
  42. 4
      src/pages/inspect/coms/requestDetailInfoPopup.vue
  43. 4
      src/pages/inspect/coms/requestInfoPopup.vue
  44. 18
      src/pages/inspect/job/inspectDetail.vue
  45. 34
      src/pages/inspect/job/inspectFullDetail.vue
  46. 6
      src/pages/inspect/job/inspectJob.vue
  47. 18
      src/pages/inspect/job/inspectResult.vue
  48. 4
      src/pages/inventoryMove/coms/detailInfoPopup.vue
  49. 4
      src/pages/inventoryMove/coms/jobInfoPopup.vue
  50. 0
      src/pages/inventoryMove/record/okToScrapRecord.vue
  51. 4
      src/pages/issue-按批次推荐/coms/comScanIssuePack.vue
  52. 4
      src/pages/issue/coms/comIssueRequestPopup.vue
  53. 4
      src/pages/issue/coms/comScanIssuePack.vue
  54. 4
      src/pages/issue/coms/detailInfoPopup.vue
  55. 4
      src/pages/issue/coms/requestDetailInfoPopup.vue
  56. 4
      src/pages/issue/coms/requestInfoPopup.vue
  57. 6
      src/pages/login/index.vue
  58. 5
      src/pages/message/index.vue
  59. 4
      src/pages/productDismantle/coms/detailInfoPopup.vue
  60. 4
      src/pages/productDismantle/coms/jobInfoPopup.vue
  61. 4
      src/pages/productDismantle/coms/requestDetailInfoPopup.vue
  62. 4
      src/pages/productDismantle/coms/requestInfoPopup.vue
  63. 4
      src/pages/productPutaway/coms/detailInfoPopup.vue
  64. 4
      src/pages/productPutaway/coms/jobInfoPopup.vue
  65. 4
      src/pages/productPutaway/coms/requestDetailInfoPopup.vue
  66. 4
      src/pages/productPutaway/coms/requestInfoPopup.vue
  67. 4
      src/pages/productReceipt/coms/detailInfoPopup.vue
  68. 4
      src/pages/productReceipt/coms/jobInfoPopup.vue
  69. 4
      src/pages/productReceipt/coms/productDetailInfoPopup.vue
  70. 4
      src/pages/productionReceipt/coms/detailInfoPopup.vue
  71. 4
      src/pages/productionReceipt/coms/jobInfoPopup.vue
  72. 4
      src/pages/productionReturn/coms/comReturnRequestPopup.vue
  73. 4
      src/pages/productionReturn/coms/comScanReturnPack.vue
  74. 4
      src/pages/productionReturn/coms/detailInfoPopup.vue
  75. 4
      src/pages/productionReturn/coms/jobInfoPopup.vue
  76. 4
      src/pages/productionReturn/coms/requestDetailInfoPopup.vue
  77. 4
      src/pages/productionReturn/coms/requestInfoPopup.vue
  78. 4
      src/pages/productionReturn/coms/returnDetailInfoPopup.vue
  79. 4
      src/pages/purchaseReceipt/coms/receiptDetailInfoPopup.vue
  80. 4
      src/pages/purchaseReceipt/coms/receiptInfoPopup.vue
  81. 1
      src/pages/purchaseReceipt/job/receiptDetail.vue
  82. 4
      src/pages/purchaseReturn/coms/requestDetailInfoPopup.vue
  83. 4
      src/pages/purchaseReturn/coms/requestInfoPopup.vue
  84. 4
      src/pages/purchaseReturn/coms/returnDetailInfoPopup.vue
  85. 5
      src/pages/purchaseReturn/coms/returnInfoPopup.vue
  86. 5
      src/pages/purchaseReturn/coms/returnJobListPopup.vue
  87. 4
      src/pages/putaway/coms/putawayDetailInfoPopup.vue
  88. 4
      src/pages/putaway/coms/putawayInfoPopup.vue
  89. 4
      src/pages/putaway/coms/requestDetailInfoPopup.vue
  90. 4
      src/pages/putaway/coms/requestInfoPopup.vue
  91. 4
      src/pages/repleinsh/coms/comRepleinshRequestPopup.vue
  92. 4
      src/pages/repleinsh/coms/comScanReplishPack.vue
  93. 4
      src/pages/repleinsh/coms/repleinshDetailInfoPopup.vue
  94. 4
      src/pages/repleinsh/coms/repleinshInfoPopup.vue
  95. 4
      src/pages/repleinsh/coms/requestDetailInfoPopup.vue
  96. 4
      src/pages/repleinsh/coms/requestInfoPopup.vue
  97. 4
      src/pages/scrap/coms/requestDetailInfoPopup.vue
  98. 4
      src/pages/scrap/coms/requestInfoPopup.vue
  99. 4
      src/pages/scrap/coms/scrapDetailInfoPopup.vue
  100. 4
      src/pages/scrap/coms/scrapInfoPopup.vue

7
Dockerfile

@ -0,0 +1,7 @@
# 设置基础镜像
FROM nginx:WIN-1.25.3
WORKDIR /opt/sfms3.0-uniapp
COPY nginx.conf /usr/local/nginx/conf/nginx.conf
# 将dist/build/h5/文件中的内容复制到 /opt/sfms3.0-uniapp 这个目录下面
COPY dist/build/h5/ /opt/sfms3.0-uniapp

53
nginx.conf

@ -0,0 +1,53 @@
user root;
worker_processes 2;
events {
worker_connections 1024;
}
http {
include mime.types;
charset utf-8,gbk;
default_type application/octet-stream;
log_format main '$remote_addr - $remote_user [$time_local] "$request" '
'$status $body_bytes_sent "$http_referer" '
'"$http_user_agent" "$http_x_forwarded_for" "$request_time $upstream_response_time"';
proxy_cache_path /opt/nginx_cache/ levels=1:2 keys_zone=my_zone:10m inactive=300s max_size=5g;
access_log logs/access.log main;
sendfile on;
#tcp_nopush on;
keepalive_timeout 600s;
client_max_body_size 200m;
gzip on;
gzip_min_length 10k;
gzip_comp_level 9;
gzip_buffers 4 16k;
gzip_types text/plain application/javascript text/css application/xml text/javascript image/jpeg image/gif image/png;
gzip_vary on;
gzip_disable "MSIE [1-6]\.";
upstream sfms3.0 {
server localhost:25110 weight=10 max_fails=3 fail_timeout=10s;
}
server {
listen 25102;
server_name_in_redirect off;
server_name dev.ccwin-in.com;
location /api/ {
proxy_pass http://sfms3.0/;
proxy_next_upstream http_500 http_502 http_503 http_504 error timeout invalid_header;
proxy_set_header X-Forwared-For $proxy_add_x_forwarded_for;
proxy_set_header Host $http_host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $http_x_forwarded_for;
}
location / {
proxy_cache my_zone;
proxy_cache_valid 200 304 12h;
proxy_cache_key $host$uri$is_args$args;
try_files $uri $uri/ /index.html;
root /opt/sfms3.0-uniapp;
index index.html index.htm;
}
}
}

4
package.json

@ -6,14 +6,14 @@
"dev:app-android": "uni -p app-android", "dev:app-android": "uni -p app-android",
"dev:app-ios": "uni -p app-ios", "dev:app-ios": "uni -p app-ios",
"dev:custom": "uni -p", "dev:custom": "uni -p",
"dev:h5": "uni", "dev": "uni",
"dev:h5:ssr": "uni --ssr", "dev:h5:ssr": "uni --ssr",
"dev:mp-weixin": "uni -p mp-weixin", "dev:mp-weixin": "uni -p mp-weixin",
"build:app": "uni build -p app", "build:app": "uni build -p app",
"build:app-android": "uni build -p app-android", "build:app-android": "uni build -p app-android",
"build:app-ios": "uni build -p app-ios", "build:app-ios": "uni build -p app-ios",
"build:custom": "uni build -p", "build:custom": "uni build -p",
"build:h5": "uni build", "test": "uni build",
"build:h5:ssr": "uni build --ssr", "build:h5:ssr": "uni build --ssr",
"build:mp-weixin": "uni build -p mp-weixin" "build:mp-weixin": "uni build -p mp-weixin"
}, },

9
src/App.vue

@ -1,6 +1,13 @@
<script> <script>
// #ifdef APP-PLUS
import {
appUpdate
} from "@/common/appUpdate.js"
// #endif
export default { export default {
onLaunch: function() { onLaunch: function() {
console.log('App Launch') console.log('App Launch')
// , // ,
// #ifdef APP-PLUS // #ifdef APP-PLUS
@ -11,7 +18,9 @@
// plus.screen.lockOrientation('landscape-primary'); // plus.screen.lockOrientation('landscape-primary');
// // app // // app
// plus.screen.lockOrientation('portrait-primary'); // plus.screen.lockOrientation('portrait-primary');
appUpdate();
// #endif // #endif
}, },
onShow: function() { onShow: function() {
console.log('App Show') console.log('App Show')

43
src/api/request2.js

@ -102,9 +102,19 @@ export function updateUserPwd(oldPassword, newPassword) {
* @param {*} * @param {*}
* *
*/ */
export function getWarehouseCodeList(pageNo,pageSize) { export function getWarehouseCodeList(pageNo, pageSize) {
return request({ return request({
url: baseApi + "/wms/warehouse/page?pageNo="+pageNo+"&pageSize="+pageSize, url: baseApi + "/wms/warehouse/page?pageNo=" + pageNo + "&pageSize=" + pageSize,
method: "get",
data: {},
});
}
//获取产品标签信息inventorylabel
export function getInventoryLabel(code) {
return request({
url: baseApi + "/api/pda/label/inventorylabel/by-code?code=" + code,
method: "get", method: "get",
data: {}, data: {},
}); });
@ -115,9 +125,9 @@ export function getWarehouseCodeList(pageNo,pageSize) {
* @param {*} * @param {*}
* *
*/ */
export function getMessageList(pageNo,pageSize) { export function getMessageList(pageNo, pageSize) {
return request({ return request({
url: baseApi + "/system/notify-message/my-page?pageNo="+pageNo+"&pageSize="+pageSize, url: baseApi + "/system/notify-message/my-page?pageNo=" + pageNo + "&pageSize=" + pageSize,
method: "get", method: "get",
data: {}, data: {},
}); });
@ -130,7 +140,7 @@ export function getMessageList(pageNo,pageSize) {
*/ */
export function setMessageUpdateRead(ids) { export function setMessageUpdateRead(ids) {
return request({ return request({
url: baseApi + "/system/notify-message/update-read?ids="+ids, url: baseApi + "/system/notify-message/update-read?ids=" + ids,
method: "put", method: "put",
data: {}, data: {},
}); });
@ -980,7 +990,16 @@ export function inspectJobSubmit(params) {
}); });
} }
//根据检验记录单号创建上架申请
export function createPutAwayRequest(number) {
return request({
url: baseApi + "/wms/inspect-record-main/createPutAwayRequest?number=" + number,
method: "post",
data: {},
});
}
/** /**
* 采购上架 任务 * 采购上架 任务
* status 任务状态 * status 任务状态
@ -1974,7 +1993,7 @@ export function productPutawayJobSubmit(params) {
}); });
} }
@ -3617,3 +3636,15 @@ export function getMainMessage() {
}); });
} }
/**
* app检查更新
* @param {*}
*
*/
export function appCheckUpdate() {
return uni.request({
url:"http://192.168.0.119:9527/appUpdate.json",
method:"GET",
data:{}
})
}

116
src/common/appUpdate.js

@ -0,0 +1,116 @@
import {
appCheckUpdate
} from '../api/request2.js';
export function appUpdate() {
let curversion = 0;
plus.runtime.getProperty(plus.runtime.appid, function(widgetInfo) {
const data = {
action: 'checkVersion',
appid: plus.runtime.appid,
appVersion: plus.runtime.version,
wgtVersion: widgetInfo.version,
versionCode: widgetInfo.versionCode
}
curversion=data.versionCode
appCheckUpdate().then(res => {
console.log("当前版本提示",curversion)
if (res.data) {
if (res.data.versionCode > Number(curversion)) {
var downUrl = res.data.downUrl;
var content = res.data.content;
var version =res.data.version
console.log("新版本提示")
uni.showModal({
title: "发现新版本:("+version+")",
content: content,
confirmText: "更新",
cancelText: "取消",
success: (res) => {
if (res.confirm) {
confirm(downUrl);
console.log('comfirm') //点击确定之后执行的代码
} else {
console.log('cancel') //点击取消之后执行的代码
}
}
})
} else {
uni.showToast({
title:"当前是最新版本"
})
console.log("没有新版本")
}
}
}).catch(error => {
console.log("版本错误", error)
})
})
}
export function confirm(downUrl) {
var downloadApkUrl = downUrl
var dtask = plus.downloader.createDownload(downloadApkUrl, {},
function(d, status) {
// 下载完成
if (status == 200) {
plus.runtime.install(plus.io.convertLocalFileSystemURL(
d.filename), {}, {}, function(error) {
uni.showToast({
title: '安装失败',
duration: 1500
});
})
} else {
uni.showToast({
title: '更新失败',
duration: 1500
});
}
});
try {
dtask.start(); // 开启下载的任务
var prg = 0;
var showLoading = plus.nativeUI.showWaiting(
"正在下载"); //创建一个showWaiting对象
dtask.addEventListener('statechanged', function(
task,
status
) {
// 给下载任务设置一个监听 并根据状态 做操作
switch (task.state) {
case 1:
showLoading.setTitle("正在下载");
break;
case 2:
showLoading.setTitle("已连接到服务器");
break;
case 3:
prg = parseInt(
(parseFloat(task.downloadedSize) /
parseFloat(task.totalSize)) *
100
);
showLoading.setTitle(" 正在下载" + prg + "% ");
break;
case 4:
plus.nativeUI.closeWaiting();
//下载完成
break;
}
});
} catch (err) {
plus.nativeUI.closeWaiting();
uni.showToast({
title: '更新失败-03',
mask: false,
duration: 1500
});
}
}

11
src/common/style/new_style.css

@ -2089,6 +2089,17 @@ button::after {
padding: 5px; padding: 5px;
} }
.card_container {
color: #0076F6;
padding: 5px;
}
.card_container_content {
font-size: 32rpx;
padding: 5px;
}
.card_business { .card_business {
color: #F1A532; color: #F1A532;
padding: 5px; padding: 5px;

2
src/common/style/pdabasic.css

@ -733,7 +733,7 @@ page {
.page-header .header_item { .page-header .header_item {
/* padding-left: 10rpx; */ /* padding-left: 10rpx; */
padding: 5rpx 10rpx; padding: 5rpx 10rpx;
font-size:15px ; font-size:32rpx ;
} }
.page-header .header_job_top { .page-header .header_job_top {

7
src/mycomponents/balance/balanceDetailPopup.vue

@ -60,8 +60,9 @@
methods: { methods: {
openPopup(val) { openPopup(val) {
this.dataContent = val; this.dataContent = val;
this.$refs.popup.open('bottom') setTimeout(res => {
this.$refs.popup.open('bottom')
}, 500)
}, },
// avaliable(value) { // avaliable(value) {
// return value == "TRUE" ? "" : "" // return value == "TRUE" ? "" : ""
@ -84,4 +85,4 @@
<style> <style>
</style> </style>

2
src/mycomponents/balance/recommendBalance.vue

@ -26,7 +26,7 @@
import pack from '@/mycomponents/balance/pack.vue' import pack from '@/mycomponents/balance/pack.vue'
import location from '@/mycomponents/balance/location.vue' import location from '@/mycomponents/balance/location.vue'
import batch from '@/mycomponents/balance/batch.vue' import batch from '@/mycomponents/balance/batch.vue'
import recommendQty from '@/mycomponents/qty/recommendQty.vue' import recommendQty from '@/mycomponents/qty/RecommendQty.vue'
import compareQty from '@/mycomponents/qty/compareQty.vue' import compareQty from '@/mycomponents/qty/compareQty.vue'
export default { export default {

4
src/mycomponents/detail/jobDetailPopup.vue

@ -32,7 +32,9 @@
methods: { methods: {
openScanPopup(val) { openScanPopup(val) {
this.dataContent = val; this.dataContent = val;
this.$refs.popup.open('bottom') setTimeout(res => {
this.$refs.popup.open('bottom')
}, 500)
}, },
closeScanPopup() { closeScanPopup() {
this.$refs.popup.close() this.$refs.popup.close()

4
src/mycomponents/detail/recordDetailPopup.vue

@ -54,7 +54,9 @@
methods: { methods: {
openPopup(val) { openPopup(val) {
this.dataContent = val; this.dataContent = val;
this.$refs.popup.open('bottom') setTimeout(res => {
this.$refs.popup.open('bottom')
}, 500)
}, },
closePopup() { closePopup() {
this.$refs.popup.close() this.$refs.popup.close()

4
src/mycomponents/job/jobDetailPopup.vue

@ -32,7 +32,9 @@
methods: { methods: {
openScanPopup(val) { openScanPopup(val) {
this.dataContent = val; this.dataContent = val;
this.$refs.popup.open('bottom') setTimeout(res => {
this.$refs.popup.open('bottom')
}, 500)
}, },
closeScanPopup() { closeScanPopup() {
this.$refs.popup.close() this.$refs.popup.close()

4
src/mycomponents/job/jobInfoPopup.vue

@ -58,7 +58,9 @@
openPopup(dataContent, dataList) { openPopup(dataContent, dataList) {
this.dataContent = dataContent; this.dataContent = dataContent;
// this.dataList = dataList; // this.dataList = dataList;
this.$refs.popup.open('bottom') setTimeout(res => {
this.$refs.popup.open('bottom')
}, 500)
}, },
closePopup() { closePopup() {
this.$refs.popup.close() this.$refs.popup.close()

4
src/mycomponents/package/packageDetailPopup.vue

@ -49,7 +49,9 @@
openPopup(val) { openPopup(val) {
this.dataContent = val; this.dataContent = val;
this.getDataList(); this.getDataList();
this.$refs.popup.open('bottom'); setTimeout(res => {
this.$refs.popup.open('bottom')
}, 500)
}, },
closePopup(val) { closePopup(val) {

8
src/mycomponents/qty/CountQtyEdit.vue

@ -166,7 +166,9 @@
// this.detailList = detailList // this.detailList = detailList
this.showConfirmCountdown = false; this.showConfirmCountdown = false;
this.mode = 'edit'; this.mode = 'edit';
this.$refs.popup.open('bottom') setTimeout(res => {
this.$refs.popup.open('bottom')
}, 500)
clearInterval(this.timer) clearInterval(this.timer)
}, },
@ -175,7 +177,9 @@
this.initData(item, detailList); this.initData(item, detailList);
this.showConfirmCountdown = true; this.showConfirmCountdown = true;
this.mode = 'add'; this.mode = 'add';
this.$refs.popup.open('bottom') setTimeout(res => {
this.$refs.popup.open('bottom')
}, 500)
this.startTimer() this.startTimer()
}, },

4
src/mycomponents/qty/inspectQtyEdit.vue

@ -118,7 +118,9 @@
this.toInventoryStatus = this.dataContent.toInventoryStatus this.toInventoryStatus = this.dataContent.toInventoryStatus
this.allQty = Number(handleQty) this.allQty = Number(handleQty)
this.FailedQty = Number(item.FailedQty) this.FailedQty = Number(item.FailedQty)
this.$refs.popup.open('bottom') setTimeout(res => {
this.$refs.popup.open('bottom')
}, 100)
}, },
closeEditPopup() { closeEditPopup() {
this.$refs.popup.close() this.$refs.popup.close()

8
src/mycomponents/qty/recommendQtyEdit.vue

@ -119,7 +119,9 @@
} }
}, },
openEditPopup() { openEditPopup() {
this.$refs.popup.open('bottom') setTimeout(res => {
this.$refs.popup.open('bottom')
}, 500)
}, },
openTaskEditPopup(recommendQty, handleQty, labelQty) { openTaskEditPopup(recommendQty, handleQty, labelQty) {
this.recommendQty = Number(recommendQty); this.recommendQty = Number(recommendQty);
@ -133,7 +135,9 @@
this.recommendQty = 0; this.recommendQty = 0;
this.labelQty = Number(labelQty); this.labelQty = Number(labelQty);
this.allQty = Number(labelQty) this.allQty = Number(labelQty)
this.$refs.popup.open('bottom') setTimeout(res => {
this.$refs.popup.open('bottom')
}, 500)
}, },
closeEditPopup() { closeEditPopup() {
this.$refs.popup.close() this.$refs.popup.close()

7
src/mycomponents/recommend/recommend.vue

@ -3,10 +3,10 @@
<view class="uni-flex uni-row space-between" style="align-items: center"> <view class="uni-flex uni-row space-between" style="align-items: center">
<!-- uni-inline-item 暂时拿掉--> <!-- uni-inline-item 暂时拿掉-->
<view style="word-break: break-all;"> <view style="word-break: break-all;">
<container v-if="isShowContainer&&detail.containerNumber!=''" :container="detail.containerNumber"> <container v-if="isShowContainer&&detail.containerNumber!=null" :container="detail.containerNumber">
</container> </container>
<pack v-if="isShowPack" :packingCode="detail.packingNumber"></pack> <pack v-if="isShowPack && detail.packingNumber!=null" :packingCode="detail.packingNumber"></pack>
<batch v-if="isShowBatch" :batch="detail.batch"></batch> <batch v-if="isShowBatch && detail.batch!=null" :batch="detail.batch"></batch>
<location v-if="isShowFromLocation" title="来源库位" :locationCode="detail.fromLocationCode"> <location v-if="isShowFromLocation" title="来源库位" :locationCode="detail.fromLocationCode">
</location> </location>
<!-- <to-location></to-location> --> <!-- <to-location></to-location> -->
@ -15,7 +15,6 @@
</view> </view>
<view style="word-break: break-all;"> <view style="word-break: break-all;">
<!-- ||detail.handleQty==0 可能会有扫描到0的情况--> <!-- ||detail.handleQty==0 可能会有扫描到0的情况-->
<recommend-qty v-if="detail.handleQty==null || detail.handleQty==undefined" :dataContent="detail" <recommend-qty v-if="detail.handleQty==null || detail.handleQty==undefined" :dataContent="detail"
:isShowStdPack="false" :isShowStatus="isShowStatus"></recommend-qty> :isShowStdPack="false" :isShowStatus="isShowStatus"></recommend-qty>
<compare-qty v-else :dataContent="detail" :recommendQty="Number(detail.qty)" <compare-qty v-else :dataContent="detail" :recommendQty="Number(detail.qty)"

4
src/mycomponents/scan/winScanAsnNumber.vue

@ -55,7 +55,9 @@
}, },
methods: { methods: {
openScanPopup() { openScanPopup() {
this.$refs.popup.open('bottom') setTimeout(res => {
this.$refs.popup.open('bottom')
}, 500)
}, },
closeScanPopup() { closeScanPopup() {
this.$refs.popup.close() this.$refs.popup.close()

4
src/mycomponents/scan/winScanContainer.vue

@ -54,7 +54,9 @@
}, },
methods: { methods: {
openScanPopup() { openScanPopup() {
this.$refs.popup.open('bottom') setTimeout(res => {
this.$refs.popup.open('bottom')
}, 500)
}, },
closeScanPopup() { closeScanPopup() {
this.$refs.popup.close() this.$refs.popup.close()

4
src/mycomponents/scan/winScanItem.vue

@ -76,7 +76,9 @@
}, },
methods: { methods: {
openScanPopup() { openScanPopup() {
this.$refs.popup.open('bottom') setTimeout(res => {
this.$refs.popup.open('bottom')
}, 500)
}, },
closeScanPopup() { closeScanPopup() {
this.$refs.popup.close() this.$refs.popup.close()

4
src/mycomponents/scan/winScanJobNumber.vue

@ -55,7 +55,9 @@
}, },
methods: { methods: {
openScanPopup() { openScanPopup() {
this.$refs.popup.open('bottom') setTimeout(res => {
this.$refs.popup.open('bottom')
}, 500)
}, },
closeScanPopup() { closeScanPopup() {
this.$refs.popup.close() this.$refs.popup.close()

4
src/mycomponents/scan/winScanLocation.vue

@ -63,7 +63,9 @@
}, },
methods: { methods: {
openScanPopup() { openScanPopup() {
this.$refs.popup.open('bottom') setTimeout(res => {
this.$refs.popup.open('bottom')
}, 500)
}, },
closeScanPopup() { closeScanPopup() {
this.$refs.popup.close() this.$refs.popup.close()

4
src/mycomponents/scan/winScanPack.vue

@ -56,7 +56,9 @@
}, },
methods: { methods: {
openScanPopup() { openScanPopup() {
this.$refs.popup.open('bottom'); setTimeout(res => {
this.$refs.popup.open('bottom')
}, 500)
}, },
closeScanPopup() { closeScanPopup() {

6
src/mycomponents/scan/winScanPackAndCont.vue

@ -20,7 +20,9 @@
</view> </view>
</view> </view>
</uni-popup> </uni-popup>
<comMessage ref="comMessage" @afterClose="getfocus"></comMessage> <comMessage ref="comMessage" @afterClose="getfocus"></comMessage>
</view> </view>
</template> </template>
@ -59,7 +61,9 @@
}, },
methods: { methods: {
openScanPopup() { openScanPopup() {
this.$refs.popup.open('bottom'); setTimeout(res => {
this.$refs.popup.open('bottom')
}, 500)
}, },
closeScanPopup() { closeScanPopup() {

8
src/mycomponents/scan/winScanPackAndLocation.vue

@ -139,7 +139,9 @@
this.fromInventoryStatuses = this.businessType.outInventoryStatuses this.fromInventoryStatuses = this.businessType.outInventoryStatuses
this.inventoryStatus = getDirectoryItemArray(this.businessType.outInventoryStatuses); // this.inventoryStatus = getDirectoryItemArray(this.businessType.outInventoryStatuses); //
this.fromLocationTypeArray = getDirectoryItemArray(this.businessType.outLocationTypes); // this.fromLocationTypeArray = getDirectoryItemArray(this.businessType.outLocationTypes); //
this.$refs.popup.open('bottom'); setTimeout(res => {
this.$refs.popup.open('bottom')
}, 500)
}, },
// //
@ -155,7 +157,9 @@
this.fromLocationCode = this.fromLocationList[0]; this.fromLocationCode = this.fromLocationList[0];
} }
} }
this.$refs.popup.open('bottom'); setTimeout(res => {
this.$refs.popup.open('bottom')
}, 500)
this.fromInventoryStatuses = jobContent.outInventoryStatuses this.fromInventoryStatuses = jobContent.outInventoryStatuses
this.inventoryStatus = getDirectoryItemArray(jobContent.outInventoryStatuses); //; // this.inventoryStatus = getDirectoryItemArray(jobContent.outInventoryStatuses); //; //
this.fromLocationTypeArray = getDirectoryItemArray(jobContent.fromLocationTypes); // this.fromLocationTypeArray = getDirectoryItemArray(jobContent.fromLocationTypes); //

4
src/mycomponents/scan/winScanPackAndPosition.vue

@ -106,7 +106,9 @@
}) })
} }
this.$refs.popup.open('bottom'); setTimeout(res => {
this.$refs.popup.open('bottom')
}, 500)
}, },
initData(){ initData(){

4
src/pages/count/coms/detailInfoPopup.vue

@ -36,7 +36,9 @@
methods: { methods: {
openPopup(val) { openPopup(val) {
this.dataContent = val; this.dataContent = val;
this.$refs.popup.open('bottom') setTimeout(res => {
this.$refs.popup.open('bottom')
}, 500)
}, },
closePopup() { closePopup() {
this.$refs.popup.close() this.$refs.popup.close()

4
src/pages/count/coms/jobInfoPopup.vue

@ -53,7 +53,9 @@
methods: { methods: {
openPopup(val) { openPopup(val) {
this.dataContent = val; this.dataContent = val;
this.$refs.popup.open('bottom') setTimeout(res => {
this.$refs.popup.open('bottom')
}, 500)
}, },
closePopup() { closePopup() {
this.$refs.popup.close() this.$refs.popup.close()

2
src/pages/count/job/countDetail.vue

@ -84,7 +84,7 @@
import requiredLocation from '@/mycomponents/location/requiredLocation.vue' import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
import comCountDetailCard from '@/pages/count/coms/comCountDetailCard.vue' import comCountDetailCard from '@/pages/count/coms/comCountDetailCard.vue'
import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue" import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue"
import countQtyEdit from '@/mycomponents/qty/countQtyEdit.vue' import countQtyEdit from '@/mycomponents/qty/CountQtyEdit.vue'
import jobTop from '@/mycomponents/job/jobTop.vue' import jobTop from '@/mycomponents/job/jobTop.vue'
import balanceSelect from '@/mycomponents/balance/balanceSelect.vue' import balanceSelect from '@/mycomponents/balance/balanceSelect.vue'

4
src/pages/customerReturn/coms/detailInfoPopup.vue

@ -40,7 +40,9 @@
methods: { methods: {
openPopup(val) { openPopup(val) {
this.dataContent = val; this.dataContent = val;
this.$refs.popup.open('bottom') setTimeout(res => {
this.$refs.popup.open('bottom')
}, 500)
}, },
closePopup() { closePopup() {
this.$refs.popup.close() this.$refs.popup.close()

4
src/pages/customerReturn/coms/jobInfoPopup.vue

@ -61,7 +61,9 @@
methods: { methods: {
openPopup(val) { openPopup(val) {
this.dataContent = val; this.dataContent = val;
this.$refs.popup.open('bottom') setTimeout(res => {
this.$refs.popup.open('bottom')
}, 500)
}, },
closePopup() { closePopup() {
this.$refs.popup.close() this.$refs.popup.close()

4
src/pages/customerReturn/coms/requestDetailInfoPopup.vue

@ -70,7 +70,9 @@
methods: { methods: {
openPopup(val) { openPopup(val) {
this.dataContent = val; this.dataContent = val;
this.$refs.popup.open('bottom') setTimeout(res => {
this.$refs.popup.open('bottom')
}, 500)
}, },
closePopup() { closePopup() {
this.$refs.popup.close() this.$refs.popup.close()

4
src/pages/customerReturn/coms/requestInfoPopup.vue

@ -88,7 +88,9 @@
title: '到月台代码', title: '到月台代码',
content: this.dataContent.toDockCode, content: this.dataContent.toDockCode,
}]; }];
this.$refs.popup.open('bottom') setTimeout(res => {
this.$refs.popup.open('bottom')
}, 500)
}, },
closePopup() { closePopup() {
this.$refs.popup.close() this.$refs.popup.close()

4
src/pages/deliver/coms/comDeliverRequestPopup.vue

@ -164,7 +164,9 @@
this.itemCodeGetFocus(); this.itemCodeGetFocus();
} }
this.$refs.popup.open('bottom') setTimeout(res => {
this.$refs.popup.open('bottom')
}, 500)
}, },
closeRequestPopup() { closeRequestPopup() {
this.$refs.popup.close() this.$refs.popup.close()

4
src/pages/deliver/coms/comScanDeliverPack.vue

@ -181,7 +181,9 @@
this.initData(); this.initData();
this.positionInfo = this.jobContent.workShopCode + "-" + this.jobContent.subList[0].productionLineCode + this.positionInfo = this.jobContent.workShopCode + "-" + this.jobContent.subList[0].productionLineCode +
"-" + this.jobContent.subList[0].workStationCode "-" + this.jobContent.subList[0].workStationCode
this.$refs.popup.open('bottom'); setTimeout(res => {
this.$refs.popup.open('bottom')
}, 500)
}, },
closeScanPopup() { closeScanPopup() {

4
src/pages/deliver/coms/detailInfoPopup.vue

@ -40,7 +40,9 @@
methods: { methods: {
openPopup(val) { openPopup(val) {
this.dataContent = val; this.dataContent = val;
this.$refs.popup.open('bottom') setTimeout(res => {
this.$refs.popup.open('bottom')
}, 500)
}, },
closePopup() { closePopup() {
this.$refs.popup.close() this.$refs.popup.close()

4
src/pages/deliver/coms/requestDetailInfoPopup.vue

@ -70,7 +70,9 @@
methods: { methods: {
openPopup(val) { openPopup(val) {
this.dataContent = val; this.dataContent = val;
this.$refs.popup.open('bottom') setTimeout(res => {
this.$refs.popup.open('bottom')
}, 500)
}, },
closePopup() { closePopup() {
this.$refs.popup.close() this.$refs.popup.close()

4
src/pages/deliver/coms/requestInfoPopup.vue

@ -82,7 +82,9 @@
title: '到库区代码范围', title: '到库区代码范围',
content: this.dataContent.toAreaCodes content: this.dataContent.toAreaCodes
}]; }];
this.$refs.popup.open('bottom') setTimeout(res => {
this.$refs.popup.open('bottom')
}, 500)
}, },
closePopup() { closePopup() {
this.$refs.popup.close() this.$refs.popup.close()

4
src/pages/inspect/coms/inspectInfoPopup.vue

@ -93,7 +93,9 @@
methods: { methods: {
openPopup(val) { openPopup(val) {
this.dataContent = val; this.dataContent = val;
this.$refs.popup.open('bottom') setTimeout(res => {
this.$refs.popup.open('bottom')
}, 500)
}, },
closePopup() { closePopup() {
this.$refs.popup.close() this.$refs.popup.close()

4
src/pages/inspect/coms/requestDetailInfoPopup.vue

@ -68,7 +68,9 @@
methods: { methods: {
openPopup(val) { openPopup(val) {
this.dataContent = val; this.dataContent = val;
this.$refs.popup.open('bottom') setTimeout(res => {
this.$refs.popup.open('bottom')
}, 500)
}, },
closePopup() { closePopup() {
this.$refs.popup.close() this.$refs.popup.close()

4
src/pages/inspect/coms/requestInfoPopup.vue

@ -99,7 +99,9 @@
methods: { methods: {
openPopup(val) { openPopup(val) {
this.dataContent = val; this.dataContent = val;
this.$refs.popup.open('bottom') setTimeout(res => {
this.$refs.popup.open('bottom')
}, 500)
}, },
closePopup() { closePopup() {
this.$refs.popup.close() this.$refs.popup.close()

18
src/pages/inspect/job/inspectDetail.vue

@ -41,7 +41,8 @@
getInspectJobDetail, getInspectJobDetail,
inspectJobSubmit, inspectJobSubmit,
getFileList, getFileList,
deleteFileByTable deleteFileByTable,
createPutAwayRequest
} from '@/api/request2.js'; } from '@/api/request2.js';
import { import {
goHome, goHome,
@ -147,8 +148,7 @@
methods: { methods: {
deleteFileByTable(id) { deleteFileByTable(id) {
debugger debugger
deleteFileByTable("jobInspectDetail", id).then(res=>{ deleteFileByTable("jobInspectDetail", id).then(res => {})
})
}, },
clearPicList(subList) { clearPicList(subList) {
@ -374,6 +374,12 @@
uni.hideLoading() uni.hideLoading()
if (res.data) { if (res.data) {
this.showCommitSuccessMessage("提交成功<br>生成到货检验记录<br>" + res.data) this.showCommitSuccessMessage("提交成功<br>生成到货检验记录<br>" + res.data)
createPutAwayRequest(res.data).then(putawayres => {
this.showCommitSuccessMessage("生成上架申请单号<br>" + putawayres.data)
}).catch(error => {
uni.hideLoading();
this.showErrorMessage(error);
})
} else { } else {
this.showErrorMessage("提交失败[" + res.msg + "]") this.showErrorMessage("提交失败[" + res.msg + "]")
} }
@ -454,8 +460,8 @@
detail.toInventoryStatus = "NOK" detail.toInventoryStatus = "NOK"
} }
} }
} }
// else { // else {
// detail.sampleQty = detail.qty; // detail.sampleQty = detail.qty;
// detail.failedQty = 0; // detail.failedQty = 0;
@ -524,4 +530,4 @@
background: #e0e0e0; background: #e0e0e0;
} }
</style> </style>

34
src/pages/inspect/job/inspectFullDetail.vue

@ -42,7 +42,8 @@
inspectJobSubmit, inspectJobSubmit,
deleteFileById, deleteFileById,
getFileList, getFileList,
deleteFileByTable deleteFileByTable,
createPutAwayRequest
} from '@/api/request2.js'; } from '@/api/request2.js';
import { import {
goHome, goHome,
@ -98,7 +99,7 @@
fromInventoryStatuses: "", fromInventoryStatuses: "",
managementList: [], managementList: [],
selectedItem: {}, selectedItem: {},
jobStatus:"" jobStatus: ""
}; };
}, },
onLoad(option) { onLoad(option) {
@ -125,7 +126,7 @@
onBackPress(e) { onBackPress(e) {
// //
if (e.from == 'backbutton') { if (e.from == 'backbutton') {
if (this.jobStatus=="2") { if (this.jobStatus == "2") {
// //
cancleTakeInspectJob(this.id).then(res => { cancleTakeInspectJob(this.id).then(res => {
uni.navigateBack(); uni.navigateBack();
@ -151,10 +152,9 @@
}, },
methods: { methods: {
deleteFileByTable(id) { deleteFileByTable(id) {
deleteFileByTable("jobInspectDetail", id).then(res=>{ deleteFileByTable("jobInspectDetail", id).then(res => {})
})
}, },
clearPicList(subList) { clearPicList(subList) {
subList.forEach(item => { subList.forEach(item => {
this.deleteFileByTable(item.id) this.deleteFileByTable(item.id)
@ -247,8 +247,8 @@
for (let item of this.detailSource) { for (let item of this.detailSource) {
for (let detail of item.subList) { for (let detail of item.subList) {
if (detail != undefined && detail.scaned) { if (detail != undefined && detail.scaned) {
failedQty= calc.add(failedQty,detail.failedQty) failedQty = calc.add(failedQty, detail.failedQty)
crackQty= calc.add(crackQty,detail.crackQty) crackQty = calc.add(crackQty, detail.crackQty)
} }
} }
} }
@ -379,10 +379,6 @@
} }
} }
} }
}, },
submitJob() { submitJob() {
@ -397,6 +393,13 @@
uni.hideLoading() uni.hideLoading()
if (res.data) { if (res.data) {
this.showCommitSuccessMessage("提交成功<br>生成到货检验记录" + res.data) this.showCommitSuccessMessage("提交成功<br>生成到货检验记录" + res.data)
//
createPutAwayRequest(res.data).then(putawayres => {
this.showCommitSuccessMessage("生成上架申请单号<br>" + putawayres.data)
}).catch(error => {
uni.hideLoading();
this.showErrorMessage(error);
})
} else { } else {
this.showErrorMessage("提交失败[" + res.msg + "]") this.showErrorMessage("提交失败[" + res.msg + "]")
} }
@ -462,8 +465,8 @@
detail.failedQty = detail.failedQty; detail.failedQty = detail.failedQty;
detail.crackQty = detail.crackQty; detail.crackQty = detail.crackQty;
detail.notPassedQty = detail.failedQty; detail.notPassedQty = detail.failedQty;
var tempQty = calc.sub(detail.handleQt,detail.failedQty) var tempQty = calc.sub(detail.handleQty, detail.failedQty)
detail.goodQty = calc.sub(tempQty,detail.crackQty) ; detail.goodQty = calc.sub(tempQty, detail.crackQty);
detail.inspectUser = this.$store.state.user.id detail.inspectUser = this.$store.state.user.id
//== //==
@ -518,6 +521,7 @@
height: 100%; height: 100%;
background-color: #fff; background-color: #fff;
} }
.page-wraper { .page-wraper {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
@ -546,4 +550,4 @@
background: #e0e0e0; background: #e0e0e0;
} }
</style> </style>

6
src/pages/inspect/job/inspectJob.vue

@ -41,9 +41,9 @@
import comEmptyView from '@/mycomponents/common/comEmptyView.vue' import comEmptyView from '@/mycomponents/common/comEmptyView.vue'
import jobFilter from '@/mycomponents/job/jobFilter.vue' import jobFilter from '@/mycomponents/job/jobFilter.vue'
import inspectInfoPopup from '@/pages/Inspect/coms/inspectInfoPopup.vue' import inspectInfoPopup from '@/pages/inspect/coms/inspectInfoPopup.vue'
import comInspectJobCard from '@/pages/Inspect/coms/comInspectJobCard.vue' import comInspectJobCard from '@/pages/inspect/coms/comInspectJobCard.vue'
import comInspectJobList from '@/pages/Inspect/coms/comInspectJobList.vue' import comInspectJobList from '@/pages/inspect/coms/comInspectJobList.vue'
export default { export default {
name: 'receipt', name: 'receipt',

18
src/pages/inspect/job/inspectResult.vue

@ -143,7 +143,8 @@
getInspectJobDetail, getInspectJobDetail,
takeInspectJob, takeInspectJob,
cancleTakeInspectJob, cancleTakeInspectJob,
inspectJobSubmit inspectJobSubmit,
createPutAwayRequest
} from '@/api/request2.js'; } from '@/api/request2.js';
import { import {
@ -159,8 +160,7 @@
} from '@/common/basic.js'; } from '@/common/basic.js';
export default { export default {
components: { components: {},
},
data() { data() {
return { return {
id: '', id: '',
@ -178,7 +178,7 @@
detailSource: [], // detailSource: [], //
nextActionList: [], nextActionList: [],
nextAction: null, nextAction: null,
jobStatus:"" jobStatus: ""
} }
}, },
@ -207,7 +207,7 @@
onBackPress(e) { onBackPress(e) {
// //
if (e.from == 'backbutton') { if (e.from == 'backbutton') {
if (this.jobStatus=="2") { if (this.jobStatus == "2") {
// //
cancleTakeInspectJob(this.id).then(res => { cancleTakeInspectJob(this.id).then(res => {
uni.navigateBack(); uni.navigateBack();
@ -546,6 +546,12 @@
hint = "提交成功<br>生成到货检验任务<br>" + res.data hint = "提交成功<br>生成到货检验任务<br>" + res.data
} else { } else {
hint = "提交成功<br>生成到货检验记录<br>" + res.data hint = "提交成功<br>生成到货检验记录<br>" + res.data
createPutAwayRequest(res.data).then(putawayres => {
this.showCommitSuccessMessage("生成上架申请单号<br>" + putawayres.data)
}).catch(error => {
uni.hideLoading();
this.showErrorMessage(error);
})
} }
this.showCommitSuccessMessage(hint) this.showCommitSuccessMessage(hint)
} else { } else {
@ -573,4 +579,4 @@
</script> </script>
<style> <style>
</style> </style>

4
src/pages/inventoryMove/coms/detailInfoPopup.vue

@ -40,7 +40,9 @@
methods: { methods: {
openPopup(val) { openPopup(val) {
this.dataContent = val; this.dataContent = val;
this.$refs.popup.open('bottom') setTimeout(res => {
this.$refs.popup.open('bottom')
}, 500)
}, },
closePopup() { closePopup() {
this.$refs.popup.close() this.$refs.popup.close()

4
src/pages/inventoryMove/coms/jobInfoPopup.vue

@ -36,7 +36,9 @@
methods: { methods: {
openPopup(val) { openPopup(val) {
this.dataContent = val; this.dataContent = val;
this.$refs.popup.open('bottom') setTimeout(res => {
this.$refs.popup.open('bottom')
}, 500)
}, },
closePopup() { closePopup() {
this.$refs.popup.close() this.$refs.popup.close()

0
src/pages/inventoryMove/record/oktoScrapRecord.vue → src/pages/inventoryMove/record/okToScrapRecord.vue

4
src/pages/issue-按批次推荐/coms/comScanIssuePack.vue

@ -100,7 +100,9 @@
this.dataContent = content; this.dataContent = content;
this.jobContent = jobcontent; this.jobContent = jobcontent;
this.initData(); this.initData();
this.$refs.popup.open('bottom'); setTimeout(res => {
this.$refs.popup.open('bottom')
}, 500)
}, },
closeScanPopup() { closeScanPopup() {

4
src/pages/issue/coms/comIssueRequestPopup.vue

@ -196,7 +196,9 @@
this.itemCodeGetFocus(); this.itemCodeGetFocus();
} }
this.$refs.popup.open('bottom') setTimeout(res => {
this.$refs.popup.open('bottom')
}, 500)
}, },
initData() { initData() {
this.positionList = []; this.positionList = [];

4
src/pages/issue/coms/comScanIssuePack.vue

@ -174,7 +174,9 @@
this.initData(); this.initData();
// this.positionInfo = this.jobContent.workShopCode + "-" + this.jobContent.subList[0].productionLineCode + // this.positionInfo = this.jobContent.workShopCode + "-" + this.jobContent.subList[0].productionLineCode +
// "-" + this.jobContent.subList[0].workStationCode // "-" + this.jobContent.subList[0].workStationCode
this.$refs.popup.open('bottom'); setTimeout(res => {
this.$refs.popup.open('bottom')
}, 500)
}, },
closeScanPopup() { closeScanPopup() {

4
src/pages/issue/coms/detailInfoPopup.vue

@ -40,7 +40,9 @@
methods: { methods: {
openPopup(val) { openPopup(val) {
this.dataContent = val; this.dataContent = val;
this.$refs.popup.open('bottom') setTimeout(res => {
this.$refs.popup.open('bottom')
}, 500)
}, },
closePopup() { closePopup() {
this.$refs.popup.close() this.$refs.popup.close()

4
src/pages/issue/coms/requestDetailInfoPopup.vue

@ -68,7 +68,9 @@
methods: { methods: {
openPopup(val) { openPopup(val) {
this.dataContent = val; this.dataContent = val;
this.$refs.popup.open('bottom') setTimeout(res => {
this.$refs.popup.open('bottom')
}, 500)
}, },
closePopup() { closePopup() {
this.$refs.popup.close() this.$refs.popup.close()

4
src/pages/issue/coms/requestInfoPopup.vue

@ -60,7 +60,9 @@
title: '到库区代码范围', title: '到库区代码范围',
content: this.dataContent.toAreaCodes, content: this.dataContent.toAreaCodes,
}]; }];
this.$refs.popup.open('bottom') setTimeout(res => {
this.$refs.popup.open('bottom')
}, 500)
}, },
closePopup() { closePopup() {
this.$refs.popup.close() this.$refs.popup.close()

6
src/pages/login/index.vue

@ -36,7 +36,7 @@
用户名 用户名
</view> </view>
<view> <view>
<input class="uni-input" placeholder="请输入用户名" v-model="username" /> <input class="uni-input" style="padding:25rpx" placeholder="请输入用户名" v-model="username" />
</view> </view>
</view> </view>
<view class="conone"> <view class="conone">
@ -44,8 +44,8 @@
<image class="icon_normal" src="../../static/icons_ui/icon_login_password.svg"></image> <image class="icon_normal" src="../../static/icons_ui/icon_login_password.svg"></image>
密码 密码
</view> </view>
<view class="uni-input-wrapper"> <view class="uni-input-wrapper" >
<input class="uni-input" placeholder="请输入密码" :password="showPassword" <input class="uni-input" style="padding:25rpx" placeholder="请输入密码" :password="showPassword"
v-model="password" /> v-model="password" />
<text class="uni-icon" :class="[!showPassword ? 'uni-eye-active' : '']" <text class="uni-icon" :class="[!showPassword ? 'uni-eye-active' : '']"
@click="changePassword">&#xe568;</text> @click="changePassword">&#xe568;</text>

5
src/pages/message/index.vue

@ -1,7 +1,8 @@
<template> <template>
<view class="body-view msg_body"> <view class="">
<!-- 头部 --> <!-- 头部 -->
<scroll-view class="top-menu-view" scroll-x="true" :scroll-left="scrollLeft"> <scroll-view class="top-menu-view" scroll-x="true" :scroll-left="scrollLeft">
<block v-for="(menuTab,index) in menuTabs" :key="index"> <block v-for="(menuTab,index) in menuTabs" :key="index">
<view class="menu-topic-view" v-bind:id="'tabNum'+index" @click="swichMenu(index)" clickable> <view class="menu-topic-view" v-bind:id="'tabNum'+index" @click="swichMenu(index)" clickable>
@ -39,7 +40,6 @@
</template> </template>
<script> <script>
import comMessage from '@/mycomponents/common/comMessage.vue'
import { import {
getMessageList, getMessageList,
getMessageUnreadCount, getMessageUnreadCount,
@ -52,7 +52,6 @@
export default { export default {
name: '', name: '',
components: { components: {
comMessage
}, },

4
src/pages/productDismantle/coms/detailInfoPopup.vue

@ -40,7 +40,9 @@
methods: { methods: {
openPopup(val) { openPopup(val) {
this.dataContent = val; this.dataContent = val;
this.$refs.popup.open('bottom') setTimeout(res => {
this.$refs.popup.open('bottom')
}, 500)
}, },
closePopup() { closePopup() {
this.$refs.popup.close() this.$refs.popup.close()

4
src/pages/productDismantle/coms/jobInfoPopup.vue

@ -36,7 +36,9 @@
methods: { methods: {
openPopup(val) { openPopup(val) {
this.dataContent = val; this.dataContent = val;
this.$refs.popup.open('bottom') setTimeout(res => {
this.$refs.popup.open('bottom')
}, 500)
}, },
closePopup() { closePopup() {
this.$refs.popup.close() this.$refs.popup.close()

4
src/pages/productDismantle/coms/requestDetailInfoPopup.vue

@ -68,7 +68,9 @@
methods: { methods: {
openPopup(val) { openPopup(val) {
this.dataContent = val; this.dataContent = val;
this.$refs.popup.open('bottom') setTimeout(res => {
this.$refs.popup.open('bottom')
}, 500)
}, },
closePopup() { closePopup() {
this.$refs.popup.close() this.$refs.popup.close()

4
src/pages/productDismantle/coms/requestInfoPopup.vue

@ -73,7 +73,9 @@
methods: { methods: {
openPopup(val) { openPopup(val) {
this.dataContent = val; this.dataContent = val;
this.$refs.popup.open('bottom') setTimeout(res => {
this.$refs.popup.open('bottom')
}, 500)
}, },
closePopup() { closePopup() {
this.$refs.popup.close() this.$refs.popup.close()

4
src/pages/productPutaway/coms/detailInfoPopup.vue

@ -40,7 +40,9 @@
methods: { methods: {
openPopup(val) { openPopup(val) {
this.dataContent = val; this.dataContent = val;
this.$refs.popup.open('bottom') setTimeout(res => {
this.$refs.popup.open('bottom')
}, 500)
}, },
closePopup() { closePopup() {
this.$refs.popup.close() this.$refs.popup.close()

4
src/pages/productPutaway/coms/jobInfoPopup.vue

@ -36,7 +36,9 @@
methods: { methods: {
openPopup(val) { openPopup(val) {
this.dataContent = val; this.dataContent = val;
this.$refs.popup.open('bottom') setTimeout(res => {
this.$refs.popup.open('bottom')
}, 500)
}, },
closePopup() { closePopup() {
this.$refs.popup.close() this.$refs.popup.close()

4
src/pages/productPutaway/coms/requestDetailInfoPopup.vue

@ -56,7 +56,9 @@
methods: { methods: {
openPopup(val) { openPopup(val) {
this.dataContent = val; this.dataContent = val;
this.$refs.popup.open('bottom') setTimeout(res => {
this.$refs.popup.open('bottom')
}, 500)
}, },
closePopup() { closePopup() {
this.$refs.popup.close() this.$refs.popup.close()

4
src/pages/productPutaway/coms/requestInfoPopup.vue

@ -56,7 +56,9 @@
title: '到库区代码范围', title: '到库区代码范围',
content: this.dataContent.toAreaCodes, content: this.dataContent.toAreaCodes,
}]; }];
this.$refs.popup.open('bottom') setTimeout(res => {
this.$refs.popup.open('bottom')
}, 500)
}, },
closePopup() { closePopup() {
this.$refs.popup.close() this.$refs.popup.close()

4
src/pages/productReceipt/coms/detailInfoPopup.vue

@ -72,7 +72,9 @@
methods: { methods: {
openPopup(val) { openPopup(val) {
this.dataContent = val; this.dataContent = val;
this.$refs.popup.open('bottom') setTimeout(res => {
this.$refs.popup.open('bottom')
}, 500)
}, },
closePopup() { closePopup() {
this.$refs.popup.close() this.$refs.popup.close()

4
src/pages/productReceipt/coms/jobInfoPopup.vue

@ -49,7 +49,9 @@
methods: { methods: {
openPopup(val) { openPopup(val) {
this.dataContent = val; this.dataContent = val;
this.$refs.popup.open('bottom') setTimeout(res => {
this.$refs.popup.open('bottom')
}, 500)
}, },
closePopup() { closePopup() {
this.$refs.popup.close() this.$refs.popup.close()

4
src/pages/productReceipt/coms/productDetailInfoPopup.vue

@ -74,7 +74,9 @@
methods: { methods: {
openPopup(val) { openPopup(val) {
this.dataContent = val; this.dataContent = val;
this.$refs.popup.open('bottom') setTimeout(res => {
this.$refs.popup.open('bottom')
}, 500)
}, },
closePopup() { closePopup() {
this.$refs.popup.close() this.$refs.popup.close()

4
src/pages/productionReceipt/coms/detailInfoPopup.vue

@ -44,7 +44,9 @@
methods: { methods: {
openPopup(val) { openPopup(val) {
this.dataContent = val; this.dataContent = val;
this.$refs.popup.open('bottom') setTimeout(res => {
this.$refs.popup.open('bottom')
}, 500)
}, },
closePopup() { closePopup() {
this.$refs.popup.close() this.$refs.popup.close()

4
src/pages/productionReceipt/coms/jobInfoPopup.vue

@ -45,7 +45,9 @@
methods: { methods: {
openPopup(val) { openPopup(val) {
this.dataContent = val; this.dataContent = val;
this.$refs.popup.open('bottom') setTimeout(res => {
this.$refs.popup.open('bottom')
}, 500)
}, },
closePopup() { closePopup() {
this.$refs.popup.close() this.$refs.popup.close()

4
src/pages/productionReturn/coms/comReturnRequestPopup.vue

@ -237,7 +237,9 @@
this.itemCodeGetFocus(); this.itemCodeGetFocus();
} }
this.$refs.popup.open('bottom') setTimeout(res => {
this.$refs.popup.open('bottom')
}, 500)
}, },
closeRequestPopup() { closeRequestPopup() {
this.$refs.popup.close() this.$refs.popup.close()

4
src/pages/productionReturn/coms/comScanReturnPack.vue

@ -168,7 +168,9 @@
this.initData(); this.initData();
// this.positionInfo = this.jobContent.workShopCode + "-" + this.jobContent.subList[0].productionLineCode + // this.positionInfo = this.jobContent.workShopCode + "-" + this.jobContent.subList[0].productionLineCode +
// "-" + this.jobContent.subList[0].workStationCode // "-" + this.jobContent.subList[0].workStationCode
this.$refs.popup.open('bottom'); setTimeout(res => {
this.$refs.popup.open('bottom')
}, 500)
}, },
closeScanPopup() { closeScanPopup() {

4
src/pages/productionReturn/coms/detailInfoPopup.vue

@ -40,7 +40,9 @@
methods: { methods: {
openPopup(val) { openPopup(val) {
this.dataContent = val; this.dataContent = val;
this.$refs.popup.open('bottom') setTimeout(res => {
this.$refs.popup.open('bottom')
}, 500)
}, },
closePopup() { closePopup() {
this.$refs.popup.close() this.$refs.popup.close()

4
src/pages/productionReturn/coms/jobInfoPopup.vue

@ -36,7 +36,9 @@
methods: { methods: {
openPopup(val) { openPopup(val) {
this.dataContent = val; this.dataContent = val;
this.$refs.popup.open('bottom') setTimeout(res => {
this.$refs.popup.open('bottom')
}, 500)
}, },
closePopup() { closePopup() {
this.$refs.popup.close() this.$refs.popup.close()

4
src/pages/productionReturn/coms/requestDetailInfoPopup.vue

@ -69,7 +69,9 @@
methods: { methods: {
openPopup(val) { openPopup(val) {
this.dataContent = val; this.dataContent = val;
this.$refs.popup.open('bottom') setTimeout(res => {
this.$refs.popup.open('bottom')
}, 500)
}, },
closePopup() { closePopup() {
this.$refs.popup.close() this.$refs.popup.close()

4
src/pages/productionReturn/coms/requestInfoPopup.vue

@ -56,7 +56,9 @@
title: '到库区代码范围', title: '到库区代码范围',
content: this.dataContent.toAreaCodes, content: this.dataContent.toAreaCodes,
}]; }];
this.$refs.popup.open('bottom') setTimeout(res => {
this.$refs.popup.open('bottom')
}, 500)
}, },
closePopup() { closePopup() {
this.$refs.popup.close() this.$refs.popup.close()

4
src/pages/productionReturn/coms/returnDetailInfoPopup.vue

@ -46,7 +46,9 @@
methods: { methods: {
openPopup(val) { openPopup(val) {
this.dataContent = val; this.dataContent = val;
this.$refs.popup.open('bottom') setTimeout(res => {
this.$refs.popup.open('bottom')
}, 500)
}, },
closePopup() { closePopup() {
this.$refs.popup.close() this.$refs.popup.close()

4
src/pages/purchaseReceipt/coms/receiptDetailInfoPopup.vue

@ -86,7 +86,9 @@
methods: { methods: {
openPopup(val) { openPopup(val) {
this.dataContent = val; this.dataContent = val;
this.$refs.popup.open('bottom') setTimeout(res => {
this.$refs.popup.open('bottom')
}, 500)
}, },
closePopup() { closePopup() {
this.$refs.popup.close() this.$refs.popup.close()

4
src/pages/purchaseReceipt/coms/receiptInfoPopup.vue

@ -60,7 +60,9 @@
methods: { methods: {
openPopup(val) { openPopup(val) {
this.dataContent = val; this.dataContent = val;
this.$refs.popup.open('bottom') setTimeout(res => {
this.$refs.popup.open('bottom')
}, 500)
}, },
closePopup() { closePopup() {
this.$refs.popup.close() this.$refs.popup.close()

1
src/pages/purchaseReceipt/job/receiptDetail.vue

@ -40,6 +40,7 @@
<win-scan-button @goScan='openScanPopup'></win-scan-button> <win-scan-button @goScan='openScanPopup'></win-scan-button>
<winScanPackAndCont ref="scanPopup" @getResult='getScanResult'></winScanPackAndCont> <winScanPackAndCont ref="scanPopup" @getResult='getScanResult'></winScanPackAndCont>
<comMessage ref="comMessage"></comMessage> <comMessage ref="comMessage"></comMessage>
</view> </view>
</template> </template>

4
src/pages/purchaseReturn/coms/requestDetailInfoPopup.vue

@ -88,7 +88,9 @@
methods: { methods: {
openPopup(val) { openPopup(val) {
this.dataContent = val; this.dataContent = val;
this.$refs.popup.open('bottom') setTimeout(res => {
this.$refs.popup.open('bottom')
}, 500)
}, },
closePopup() { closePopup() {
this.$refs.popup.close() this.$refs.popup.close()

4
src/pages/purchaseReturn/coms/requestInfoPopup.vue

@ -85,7 +85,9 @@
title: '从月台代码', title: '从月台代码',
content: this.dataContent.fromDockCode content: this.dataContent.fromDockCode
}]; }];
this.$refs.popup.open('bottom') setTimeout(res => {
this.$refs.popup.open('bottom')
}, 500)
}, },
closePopup() { closePopup() {
this.$refs.popup.close() this.$refs.popup.close()

4
src/pages/purchaseReturn/coms/returnDetailInfoPopup.vue

@ -40,7 +40,9 @@
methods: { methods: {
openPopup(val) { openPopup(val) {
this.dataContent = val; this.dataContent = val;
this.$refs.popup.open('bottom') setTimeout(res=>{
this.$refs.popup.open('bottom')
},500)
}, },
closePopup() { closePopup() {
this.$refs.popup.close() this.$refs.popup.close()

5
src/pages/purchaseReturn/coms/returnInfoPopup.vue

@ -58,7 +58,10 @@
methods: { methods: {
openPopup(val) { openPopup(val) {
this.dataContent = val; this.dataContent = val;
this.$refs.popup.open('bottom') setTimeout(res=>{
this.$refs.popup.open('bottom')
},500)
}, },
closePopup() { closePopup() {
this.$refs.popup.close() this.$refs.popup.close()

5
src/pages/purchaseReturn/coms/returnJobListPopup.vue

@ -31,6 +31,11 @@
openPopup(items) { openPopup(items) {
this.receiptList = items; this.receiptList = items;
this.$refs['popupItems'].open("center"); this.$refs['popupItems'].open("center");
// setTimeout(res=>{
// this.receiptList = items;
// this.$refs['popupItems'].open("center");
// },100)
}, },
closePopup() { closePopup() {
this.$refs.popupItems.close() this.$refs.popupItems.close()

4
src/pages/putaway/coms/putawayDetailInfoPopup.vue

@ -40,7 +40,9 @@
methods: { methods: {
openPopup(val) { openPopup(val) {
this.dataContent = val; this.dataContent = val;
this.$refs.popup.open('bottom') setTimeout(res => {
this.$refs.popup.open('bottom')
}, 500)
}, },
closePopup() { closePopup() {
this.$refs.popup.close() this.$refs.popup.close()

4
src/pages/putaway/coms/putawayInfoPopup.vue

@ -36,7 +36,9 @@
methods: { methods: {
openPopup(val) { openPopup(val) {
this.dataContent = val; this.dataContent = val;
this.$refs.popup.open('bottom') setTimeout(res => {
this.$refs.popup.open('bottom')
}, 500)
}, },
closePopup() { closePopup() {
this.$refs.popup.close() this.$refs.popup.close()

4
src/pages/putaway/coms/requestDetailInfoPopup.vue

@ -69,7 +69,9 @@
methods: { methods: {
openPopup(val) { openPopup(val) {
this.dataContent = val; this.dataContent = val;
this.$refs.popup.open('bottom') setTimeout(res => {
this.$refs.popup.open('bottom')
}, 500)
}, },
closePopup() { closePopup() {
this.$refs.popup.close() this.$refs.popup.close()

4
src/pages/putaway/coms/requestInfoPopup.vue

@ -56,7 +56,9 @@
title: '供应商代码', title: '供应商代码',
content: this.dataContent.supplierCode, content: this.dataContent.supplierCode,
}]; }];
this.$refs.popup.open('bottom') setTimeout(res => {
this.$refs.popup.open('bottom')
}, 500)
}, },
closePopup() { closePopup() {
this.$refs.popup.close() this.$refs.popup.close()

4
src/pages/repleinsh/coms/comRepleinshRequestPopup.vue

@ -173,7 +173,9 @@
this.toLocationCode = '请扫目标库位' this.toLocationCode = '请扫目标库位'
this.counQty =undefined; this.counQty =undefined;
this.numberFocus = false this.numberFocus = false
this.$refs.popup.open('bottom'); setTimeout(res => {
this.$refs.popup.open('bottom')
}, 500)
// this.showScanLocation(); // this.showScanLocation();
}, },
closeRequestPopup() { closeRequestPopup() {

4
src/pages/repleinsh/coms/comScanReplishPack.vue

@ -167,7 +167,9 @@
this.initData(); this.initData();
this.positionInfo = this.jobContent.workShopCode + "-" + this.jobContent.subList[0].productionLineCode + this.positionInfo = this.jobContent.workShopCode + "-" + this.jobContent.subList[0].productionLineCode +
"-" + this.jobContent.subList[0].workStationCode "-" + this.jobContent.subList[0].workStationCode
this.$refs.popup.open('bottom'); setTimeout(res => {
this.$refs.popup.open('bottom')
}, 500)
}, },
closeScanPopup() { closeScanPopup() {

4
src/pages/repleinsh/coms/repleinshDetailInfoPopup.vue

@ -40,7 +40,9 @@
methods: { methods: {
openPopup(val) { openPopup(val) {
this.dataContent = val; this.dataContent = val;
this.$refs.popup.open('bottom') setTimeout(res => {
this.$refs.popup.open('bottom')
}, 500)
}, },
closePopup() { closePopup() {
this.$refs.popup.close() this.$refs.popup.close()

4
src/pages/repleinsh/coms/repleinshInfoPopup.vue

@ -56,7 +56,9 @@
methods: { methods: {
openPopup(val) { openPopup(val) {
this.dataContent = val; this.dataContent = val;
this.$refs.popup.open('bottom') setTimeout(res => {
this.$refs.popup.open('bottom')
}, 500)
}, },
closePopup() { closePopup() {
this.$refs.popup.close() this.$refs.popup.close()

4
src/pages/repleinsh/coms/requestDetailInfoPopup.vue

@ -69,7 +69,9 @@
methods: { methods: {
openPopup(val) { openPopup(val) {
this.dataContent = val; this.dataContent = val;
this.$refs.popup.open('bottom') setTimeout(res => {
this.$refs.popup.open('bottom')
}, 500)
}, },
closePopup() { closePopup() {
this.$refs.popup.close() this.$refs.popup.close()

4
src/pages/repleinsh/coms/requestInfoPopup.vue

@ -73,7 +73,9 @@
methods: { methods: {
openPopup(val) { openPopup(val) {
this.dataContent = val; this.dataContent = val;
this.$refs.popup.open('bottom') setTimeout(res => {
this.$refs.popup.open('bottom')
}, 500)
}, },
closePopup() { closePopup() {
this.$refs.popup.close() this.$refs.popup.close()

4
src/pages/scrap/coms/requestDetailInfoPopup.vue

@ -61,7 +61,9 @@
methods: { methods: {
openPopup(val) { openPopup(val) {
this.dataContent = val; this.dataContent = val;
this.$refs.popup.open('bottom') setTimeout(res => {
this.$refs.popup.open('bottom')
}, 500)
}, },
closePopup() { closePopup() {
this.$refs.popup.close() this.$refs.popup.close()

4
src/pages/scrap/coms/requestInfoPopup.vue

@ -43,7 +43,9 @@
title: '从库区代码范围', title: '从库区代码范围',
content: this.dataContent.fromAreaCodes, content: this.dataContent.fromAreaCodes,
}]; }];
this.$refs.popup.open('bottom') setTimeout(res => {
this.$refs.popup.open('bottom')
}, 500)
}, },
closePopup() { closePopup() {
this.$refs.popup.close() this.$refs.popup.close()

4
src/pages/scrap/coms/scrapDetailInfoPopup.vue

@ -82,7 +82,9 @@
methods: { methods: {
openPopup(val) { openPopup(val) {
this.dataContent = val; this.dataContent = val;
this.$refs.popup.open('bottom') setTimeout(res => {
this.$refs.popup.open('bottom')
}, 500)
}, },
closePopup() { closePopup() {
this.$refs.popup.close() this.$refs.popup.close()

4
src/pages/scrap/coms/scrapInfoPopup.vue

@ -57,7 +57,9 @@
methods: { methods: {
openPopup(val) { openPopup(val) {
this.dataContent = val; this.dataContent = val;
this.$refs.popup.open('bottom') setTimeout(res => {
this.$refs.popup.open('bottom')
}, 500)
}, },
closePopup() { closePopup() {
this.$refs.popup.close() this.$refs.popup.close()

Some files were not shown because too many files changed in this diff

Loading…
Cancel
Save