From 2c58678a89edc8e5242841b8a3c701d39a0a2ec5 Mon Sep 17 00:00:00 2001
From: dytyqx <1342948614@qq.com>
Date: 星期三, 18 三月 2026 12:58:56 +0800
Subject: [PATCH] Merge branch 'Dev' of http://101.37.171.70:10101/r/~jhz/STUWMS into Dev
---
utils/getuiUtils.js | 53
pages/baogong/OA_ErrMsgBackBill.vue | 152 ++
locale/zh-Hans.json | 15
pages/index/tab4.vue | 2
pages/qitaruku_v2/OtherInBill.vue | 5
pages/gongxuOut/Cj_StationOutBill_Standard.vue | 46
.hbuilderx/launch.json | 2
pages/ZLGL/lailiaojianyan_fast/Kf_QCStockInCheckBill_Fast.vue | 37
pages/qitachuku/qitachukudan.vue | 2575 +++++++++++++++++++++++++------------------------
pages/ZLGL/mojianjianyan/ProcessCheckBill.vue | 2
manifest.json | 9
pages/ZLGL/xunjianjianyan/PatrolProcCheckBill.vue | 2
pages/jishikucunchaxun/table.vue | 9
nativeplugins/Mpaas-Scan/ios/meta.config | 24
pages/index/login.vue | 8
pages/ZLGL/lailiaojianyan_fast/Kf_QCStockInCheckBill_Fast2.vue | 54
pages/ZLGL/shoujianjianyan/firstCheckBill.vue | 2
pages/baogong/DayPlanBillList.vue | 2
pages/qitachuku_v2/OtherOutBill.vue | 47
19 files changed, 1,707 insertions(+), 1,339 deletions(-)
diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json
index c9b1af1..49a12f7 100644
--- a/.hbuilderx/launch.json
+++ b/.hbuilderx/launch.json
@@ -26,7 +26,7 @@
"localRepoPath" : "C:/Users/19858/Desktop/鏅轰簯杩堟��/APP/STUWMS/unpackage/debug",
"openVueDevtools" : true,
"packageName" : "com.iflytek.inputmethod",
- "playground" : "standard",
+ "playground" : "custom",
"type" : "uni-app:app-android"
}
]
diff --git a/locale/zh-Hans.json b/locale/zh-Hans.json
index dee8739..56a693c 100644
--- a/locale/zh-Hans.json
+++ b/locale/zh-Hans.json
@@ -7,5 +7,20 @@
"PassWord": "瀵嗙爜",
"Login": "鐧诲綍",
"ServiceSetting": "鏈嶅姟鍣ㄨ缃�"
+ },
+ "POStockInBackBill_PDA": {
+ "title": "閲囪喘閫�鏂欏崟"
+ },
+ "MoveStockBill_PDA": {
+ "title": "鐩存帴璋冩嫧鍗�"
+ },
+ "Kf_OtherOutBill_PDA": {
+ "title": "鍏朵粬鍑哄簱鍗�",
+ "disabledPlaceholder": "",
+ "placeholder_FIFOWarehouse": ""
+ },
+ "SellOutBill_PDA": {
+ "title": "閿�鍞嚭搴撳崟"
}
+
}
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index a1fd119..c9a76dc 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
"name" : "鏅轰簯LMES",
"appid" : "__UNI__B002F49",
"description" : "",
- "versionName" : "2.093",
- "versionCode" : 293,
+ "versionName" : "2.096",
+ "versionCode" : 296,
"transformPx" : false,
/* 5+App鐗规湁鐩稿叧 */
"app-plus" : {
@@ -57,7 +57,8 @@
"NSPhotoLibraryUsageDescription" : "鎴戜滑闇�瑕佽闂偍鐨勭浉鍐屾潵杩涜鍥剧墖閫夋嫨",
"NSPhotoLibraryAddUsageDescription" : "鎴戜滑闇�瑕佽闂偍鐨勭浉鍐屾潵杩涜鍥剧墖瀛樺偍",
"NSCameraUsageDescription" : "鎴戜滑闇�瑕佽闂浉鏈烘潵杩涜鐓х墖鎷嶆憚"
- }
+ },
+ "idfa" : false
},
/* SDK閰嶇疆 */
"sdkConfigs" : {
@@ -108,7 +109,7 @@
"platforms" : "Android,iOS",
"url" : "https://ext.dcloud.net.cn/plugin?id=2636",
"android_package_name" : "com.shebeiguanli.www",
- "ios_bundle_id" : "",
+ "ios_bundle_id" : "com.shebeiguanli.www",
"isCloud" : true,
"bought" : 1,
"pid" : "2636",
diff --git a/nativeplugins/Mpaas-Scan/ios/meta.config b/nativeplugins/Mpaas-Scan/ios/meta.config
new file mode 100644
index 0000000..fd66850
--- /dev/null
+++ b/nativeplugins/Mpaas-Scan/ios/meta.config
@@ -0,0 +1,24 @@
+{
+ "absBase64Code":"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",
+ "appId":"ALIPUB2087527170947",
+ "appKey":"ALIPUB2087527170947_IOS",
+ "base64Code":"/9j/4AAQSkZJRgABAQEAYABgAAD/2wBDAAMCAgMCAgMDAwMEAwMEBQgFBQQEBQoHBwYIDAoMDAsKCwsNDhIQDQ4RDgsLEBYQERMUFRUVDA8XGBYUGBIUFRT/2wBDAQMEBAUEBQkFBQkUDQsNFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBT/wAARCAADAAMDASIAAhEBAxEB/8QAHwAAAQUBAQEBAQEAAAAAAAAAAAECAwQFBgcICQoL/8QAtRAAAgEDAwIEAwUFBAQAAAF9AQIDAAQRBRIhMUEGE1FhByJxFDKBkaEII0KxwRVS0fAkM2JyggkKFhcYGRolJicoKSo0NTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uHi4+Tl5ufo6erx8vP09fb3+Pn6/8QAHwEAAwEBAQEBAQEBAQAAAAAAAAECAwQFBgcICQoL/8QAtREAAgECBAQDBAcFBAQAAQJ3AAECAxEEBSExBhJBUQdhcRMiMoEIFEKRobHBCSMzUvAVYnLRChYkNOEl8RcYGRomJygpKjU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6goOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4uPk5ebn6Onq8vP09fb3+Pn6/9oADAMBAAIRAxFobXF3b8u8j1WDW3p5eCouBatB/mkFAwABAQAAAAQAAB4AAADAAAAAFAAAAIkAAAABAAAAAAAAAAAAAAAAAAAAAAAAABUAAAABAAAAAAAAAAAAAAAIAAAAAAAAAA6zuGl3AAAAAAAAAAAAAABZfkEVPZVekJlDqO7oSKsVgGkl9Vj1cawbp+Fv4/ZlPHSnUbE8r0HV8urE2jJv8LLYFacwChjdJb++laN1cmdjbngBAwF4dWZ3AwECBgEAEQEBCAFxdHNqb3YMQHLraBQcQvL9rWwFAhvOCRenxNm/LoOE0lyygCchyJ4+7+im6afWXMxHXG38JwSaW4bwkc3iO0rmnFMusybCygvbHnjP9Ccz6xHWlYd5ybXJmn9NJflqNqi5udWJH02kr0prjaMnLB8prsh18xJfXGyW0BJgavVI7bOEuvV0S01DIp1C+yW+f+TlBBS7XD+zP3uvS91WPv1Lzu8304PXSDGX8u8CZVONB8T8hdMI7iYbZ7mJjfgPuCX3FLthtFyNlCA8bNzOX5MC1P8AAMKgGAYAAAAA",
+ "bundleId":"com.shebeiguanli.www",
+ "rootPath":"mpaas/ios/ALIPUB2087527170947-default",
+ "shBase64Code":"",
+ "v6Base64Code":"/9j/4AAQSkZJRgABAQEAYABgAAD/2wBDAAMCAgMCAgMDAwMEAwMEBQgFBQQEBQoHBwYIDAoMDAsKCwsNDhIQDQ4RDgsLEBYQERMUFRUVDA8XGBYUGBIUFRT/2wBDAQMEBAUEBQkFBQkUDQsNFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBT/wAARCAADAAMDASIAAhEBAxEB/8QAHwAAAQUBAQEBAQEAAAAAAAAAAAECAwQFBgcICQoL/8QAtRAAAgEDAwIEAwUFBAQAAAF9AQIDAAQRBRIhMUEGE1FhByJxFDKBkaEII0KxwRVS0fAkM2JyggkKFhcYGRolJicoKSo0NTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uHi4+Tl5ufo6erx8vP09fb3+Pn6/8QAHwEAAwEBAQEBAQEBAQAAAAAAAAECAwQFBgcICQoL/8QAtREAAgECBAQDBAcFBAQAAQJ3AAECAxEEBSExBhJBUQdhcRMiMoEIFEKRobHBCSMzUvAVYnLRChYkNOEl8RcYGRomJygpKjU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6goOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4uPk5ebn6Onq8vP09fb3+Pn6/9oADAMBAAIRAxHxmKbQkpyukr5psapkRn0lS8LBc2kGAAABAQAAAAQAAB4AAADAAAAAFAAAAIkAAAABAAAAAAAAAAAAAAAAAAAAAAAAABUAAAABAAAAAAAAAAAAAAAIAAAAAAAAAA6zuGl3AAAAAAAAAAAAAABZfkEVPZVekJlDqO7oSKsVgGkl9Vj1cawbp+Fv4/ZlPHSnUbE8r0HV8urE2jJv8LLYFacwChjdJb++laN1cmdjbngBAwF4dWZ3AwECBgEAEQEBCAFxdHNqb3YMQHLraBQcQvL9rWwFAhvOCRenxNm/LoOE0lyygCchyJ4+7+im6afWXMxHXG38JwSaW4bwkc3iO0rmnFMusybCygvbHnjP9Ccz6xHWlYd5ybXJmn9NJflqNqi5udWJH02kr0prjaMnLB8prsh18xJfXGyW0BJgavVI7bOEuvV0S01DIp1C+yW+f+TlBBS7XD+zP3uvS91WPv1Lzu8304PXSDGX8u8CZVONB8T8hdMI7iYbZ7mJjfgPuCX3FLthtFyNlCA8bNzOX5MC1P8AAMKgGAYAAAAA",
+ "workspaceId":"default",
+ "syncport":"443",
+ "syncserver":"msync.mpaas.cn-hangzhou.aliyuncs.com",
+ "pushPort":"443",
+ "pushGW":"push.mpaas.cn-hangzhou.aliyuncs.com",
+ "rpcGW":"https://mgw.mpaas.cn-hangzhou.aliyuncs.com/mgw.htm",
+ "logGW":"https://mdap.mpaas.cn-hangzhou.aliyuncs.com",
+ "mpaasapi":"https://mpaasapi.mpaas.cn-hangzhou.aliyuncs.com/mgw.htm",
+ "mrtcserver":"wss://mrtc.mpaas.cn-hangzhou.aliyuncs.com/ws",
+ "mdc":"https://mdc.mpaas.cn-hangzhou.aliyuncs.com",
+ "mpaasConfigVersion":"V_1.0",
+ "mpaasConfigEnv":"ONEX_CLOUD",
+ "mpaasConfigPluginExpired":"",
+ "mpaasConfigLicense":"cNxifw5+rftD66JEc/+onoAJeykaFLZkazdm9Wtd6hN0G72vtsLKS8HseJSUCiI3gm+aREjhqy3Na3VHf6uOtzAAe8z/WEP3iS9zuOjxJaouQzyimwTw1nMqVUICQwhL5ZhIDKtmuEX7XRH/n8LIohpL+GKyh/FUfpiP/zpVHHamAgpWZ12foNw2Dj53XdC4eEmAMF2ymwWZrMSSIu9lxY4IekMbjBpvVXQIK8Z6azruyDIKPgolzBbAXbCzAeqKGoVpVeCBoRbGEC+Ec1qKQ09+lg6Go0SgsnU+X9SJIOUiyo76wp24bMom8mbyrbPGs67zc8y3A2alQh0wh6ZpAA=="
+}
\ No newline at end of file
diff --git a/pages/ZLGL/lailiaojianyan_fast/Kf_QCStockInCheckBill_Fast.vue b/pages/ZLGL/lailiaojianyan_fast/Kf_QCStockInCheckBill_Fast.vue
index 2dadc29..02f0833 100644
--- a/pages/ZLGL/lailiaojianyan_fast/Kf_QCStockInCheckBill_Fast.vue
+++ b/pages/ZLGL/lailiaojianyan_fast/Kf_QCStockInCheckBill_Fast.vue
@@ -36,6 +36,9 @@
</view>
<!-- 椤电 鐗╂枡娓呭崟 -->
<view v-if="tabs == 1">
+ <view style="padding: 10rpx;">
+ <button class="btn-a" size="mini" @tap="switchModule">鎵归噺鍚堟牸</button>
+ </view>
<view class="card-item-wrapper">
<view v-for="(item, index) in materialManifest" :key="index">
<uni-card :title="item.HSourceBillNo" @tap="toDetail(item, index)">
@@ -393,6 +396,13 @@
};
},
methods: {
+ switchModule() {
+ uni.redirectTo({
+ url: "/pages/ZLGL/lailiaojianyan_fast/Kf_QCStockInCheckBill_Fast2?" +
+ `HInterID=${this.sourceBillInfo.HInterID}&HBillNo=${this.sourceBillInfo.HBillNo}` +
+ `&HSourceBillNo=${this.sourceBillInfo.HSourceBillNo}&operationType=5`
+ })
+ },
handleUploadCallback(res) { // 鏂囦欢涓婁紶鍥炶皟
console.log('file: ', res);
let fileInfo = res.data[0]
@@ -740,9 +750,26 @@
}
}
},
- onLoad() {
- // 鑾峰彇鏉ユ枡妫�楠屽崟鏈�鏂板崟鎹彿鍜屽崟鎹唴鐮�
- this.GetMaxNumPDA()
+ onLoad(e) {
+ let operationType = e.operationType
+ if (!operationType) {
+ // 鑾峰彇鏉ユ枡妫�楠屽崟鏈�鏂板崟鎹彿鍜屽崟鎹唴鐮�
+ this.GetMaxNumPDA()
+ } else if (operationType == 5) {
+ // 鐢辨壒閲忛〉闈㈣繘鍏�
+ let {
+ HInterID,
+ HBillNo,
+ HSourceBillNo
+ } = e
+ this.sourceBillInfo.HBillNo = HBillNo
+ this.sourceBillInfo.HInterID = HInterID
+ if (HSourceBillNo) {
+ this.tabs = 1
+ this.sourceBillInfo.HSourceBillNo = HSourceBillNo
+ this.getCode(HSourceBillNo)
+ }
+ }
this.getHEmpInfo()
}
}
@@ -947,6 +974,10 @@
flex-direction: row;
justify-content: flex-start;
gap: 6rpx;
+ }
+ .btn-a {
+ background-color: #3A78FF;
+ color: #fff;
}
</style>
\ No newline at end of file
diff --git a/pages/ZLGL/lailiaojianyan_fast/Kf_QCStockInCheckBill_Fast2.vue b/pages/ZLGL/lailiaojianyan_fast/Kf_QCStockInCheckBill_Fast2.vue
index a6b21fb..c9dbf23 100644
--- a/pages/ZLGL/lailiaojianyan_fast/Kf_QCStockInCheckBill_Fast2.vue
+++ b/pages/ZLGL/lailiaojianyan_fast/Kf_QCStockInCheckBill_Fast2.vue
@@ -36,6 +36,9 @@
</view>
<!-- 椤电 鐗╂枡娓呭崟 -->
<view v-if="tabs == 1">
+ <view style="padding: 10rpx;">
+ <button class="btn-a" size="mini" @tap="switchModule">鎵归噺</button>
+ </view>
<view class="form-item-wrapper">
<view class="form-item">
<view class="title">璐ㄦ鍛�:</view>
@@ -310,6 +313,13 @@
};
},
methods: {
+ switchModule() {
+ uni.redirectTo({
+ url: "/pages/ZLGL/lailiaojianyan_fast/Kf_QCStockInCheckBill_Fast?" +
+ `HInterID=${this.sourceBillInfo.HInterID}&HBillNo=${this.sourceBillInfo.HBillNo}` +
+ `&HSourceBillNo=${this.sourceBillInfo.HSourceBillNo}&operationType=5`
+ })
+ },
selectMater(item, index) {
if (typeof this.materialManifest[index].selected == 'undefined') {
this.$set(this.materialManifest[index], 'selected', false)
@@ -535,12 +545,12 @@
},
cmdAdd() {
uni.redirectTo({
- url: "/pages/ZLGL/lailiaojianyan_fast/Kf_QCStockInCheckBill_Fast"
+ url: "./Kf_QCStockInCheckBill_Fast2"
})
},
async cmdSubmit() { // 鍚庣鍦ㄥ崟娆′笂浼犳枃浠舵彁浜ゅ悗浼氬垹闄ゆ湰鍦版枃浠讹紝涓�娆″彧鑳芥彁浜や竴涓暟鎹�
// 妫�鏌ユ槸鍚﹂�変腑鐗╂枡
-
+
if (this.sourceBillInfo.HSourceInterID == 0) {
CommonUtils.showTips({
title: '娓╅Θ鎻愮ず',
@@ -556,7 +566,8 @@
return
}
- let HEntryIDStr = `${this.sourceBillInfo.HSourceEntryIDList.filter(item => item !== undefined && item !== null).join(',')}`
+ let HEntryIDStr =
+ `${this.sourceBillInfo.HSourceEntryIDList.filter(item => item !== undefined && item !== null).join(',')}`
try {
let res = await CommonUtils.doRequest2Sync({
@@ -586,12 +597,12 @@
if (res.confirm) {
console.log('鐢ㄦ埛鐐瑰嚮纭畾');
uni.redirectTo({
- url: './kf_QCStockInCheckBill_Fast2'
+ url: '/pages/ZLGL/lailiaojianyan_fast/Kf_QCStockInCheckBill_Fast2'
})
} else if (res.cancel) {
console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
setTimeout(() => {
- uni.navigateBack();
+ uni.navigateBack();
}, 50)
}
}
@@ -682,9 +693,28 @@
}
}
},
- onLoad() {
- // 鑾峰彇鏉ユ枡妫�楠屽崟鏈�鏂板崟鎹彿鍜屽崟鎹唴鐮�
- this.GetMaxNumPDA()
+ onLoad(e) {
+ let operationType = e.operationType
+ if (!operationType) {
+ // 鑾峰彇鏉ユ枡妫�楠屽崟鏈�鏂板崟鎹彿鍜屽崟鎹唴鐮�
+ this.GetMaxNumPDA()
+ } else if (operationType == 5) {
+ // 鐢辨壒閲忛〉闈㈣繘鍏�
+ let {
+ HInterID,
+ HBillNo,
+ HSourceBillNo
+ } = e
+ this.sourceBillInfo.HBillNo = HBillNo
+ this.sourceBillInfo.HInterID = HInterID
+
+ if (HSourceBillNo) {
+ this.tabs = 1
+ this.sourceBillInfo.HSourceBillNo = HSourceBillNo
+ this.getCode(HSourceBillNo)
+ }
+ }
+
this.getHEmpInfo()
}
}
@@ -896,7 +926,13 @@
}
.card-selected {
- background-color: #a8c7fa;
scale: 1.05;
+ background-color: #6dabfc !important;
+
+ }
+
+ .btn-a {
+ background-color: #3A78FF;
+ color: #fff;
}
</style>
\ No newline at end of file
diff --git a/pages/ZLGL/mojianjianyan/ProcessCheckBill.vue b/pages/ZLGL/mojianjianyan/ProcessCheckBill.vue
index 5ad8fa7..8af49b4 100644
--- a/pages/ZLGL/mojianjianyan/ProcessCheckBill.vue
+++ b/pages/ZLGL/mojianjianyan/ProcessCheckBill.vue
@@ -703,7 +703,7 @@
'&HSourceName=' + this.hform.HSourceName +
'&HSourceBillNo=' + this.hform.HSourceBillNo +
'&HType=' + item +
- '&OperationType=4&linterid=&HSouceBillType=7507'
+ '&OperationType=5&linterid='+ this.hform.HInterID +'&HSouceBillType=7507'
})
},
// 婧愬崟绫诲瀷閫夋嫨
diff --git a/pages/ZLGL/shoujianjianyan/firstCheckBill.vue b/pages/ZLGL/shoujianjianyan/firstCheckBill.vue
index e5a74f4..914d70f 100644
--- a/pages/ZLGL/shoujianjianyan/firstCheckBill.vue
+++ b/pages/ZLGL/shoujianjianyan/firstCheckBill.vue
@@ -2146,7 +2146,7 @@
'&HSourceName=' + this.hform.HSourceName +
'&HSourceBillNo=' + this.hform.HSourceBillNo +
'&HType=' + item +
- '&OperationType=4&linterid=&HSouceBillType=7505'
+ '&OperationType=5&linterid='+ this.hform.HInterID +'&HSouceBillType=7505'
})
},
async auditBill() {
diff --git a/pages/ZLGL/xunjianjianyan/PatrolProcCheckBill.vue b/pages/ZLGL/xunjianjianyan/PatrolProcCheckBill.vue
index 3a0170e..8039c12 100644
--- a/pages/ZLGL/xunjianjianyan/PatrolProcCheckBill.vue
+++ b/pages/ZLGL/xunjianjianyan/PatrolProcCheckBill.vue
@@ -654,7 +654,7 @@
'&HSourceName=' + this.hform.HSourceName +
'&HSourceBillNo=' + this.hform.HSourceBillNo +
'&HType=' + item +
- '&OperationType=4&linterid=&HSouceBillType=7520'
+ '&OperationType=5&linterid='+ this.hform.HInterID +'&HSouceBillType=7520'
})
},
// 婧愬崟绫诲瀷閫夋嫨
diff --git a/pages/baogong/DayPlanBillList.vue b/pages/baogong/DayPlanBillList.vue
index 4e5257d..b49420d 100644
--- a/pages/baogong/DayPlanBillList.vue
+++ b/pages/baogong/DayPlanBillList.vue
@@ -1,6 +1,6 @@
<template>
<view class="content">
- <view class="list">
+ <view class="list" v-if="currentOrder.length > 0">
<uni-card :title="'褰撴湡璁㈠崟锛�'+currentOrder[0].HSourceBillNo"
style="margin: 10px;">
<view class="card-detail">
diff --git a/pages/baogong/OA_ErrMsgBackBill.vue b/pages/baogong/OA_ErrMsgBackBill.vue
index 5f20f76..7095aaa 100644
--- a/pages/baogong/OA_ErrMsgBackBill.vue
+++ b/pages/baogong/OA_ErrMsgBackBill.vue
@@ -383,6 +383,16 @@
HUpDateDate: '',
HChecker: '',
HCheckDate: '',
+
+ HICMOInterID: 0,
+ HICMOEntryID: 0,
+ HICMOBillNo: '',
+
+ HProcExchInterID: 0,
+ HProcExchEntryID: 0,
+ HProcExchBillNo: '',
+
+ HBarCode: '',
}
}
},
@@ -409,7 +419,15 @@
this.getMaxNum()
this.set_Sc_ICMOBillStatus(e.HSourceBillNo, e.HType, e.HSourceName); //鍥炲～淇℃伅
this.hform.HContext = e.HType
- this.hform.HBillTypeName = e.HSouceBillType
+ this.hform.HBillTypeName = e.HSouceBillType
+ this.eData = e
+ } else if (this.OperationType == 5) {
+ // 妫�楠屽崟璺宠浆
+ console.log('e: ', e);
+ this.getMaxNum()
+ this.set_CheckBillStatus(e.linterid, e.HType, e.HSourceName, e.HSouceBillType, e.HBarCode || ''); //鍥炲～淇℃伅
+ this.hform.HContext = e.HType
+ this.hform.HBillTypeName = e.HSouceBillType
this.eData = e
}
},
@@ -421,12 +439,23 @@
},
dynamicDesc: {
get() {
- return '寮傚父鍙嶉鍗曞彿:' + this.hform.HBillNo + ',寮傚父绫诲瀷:' + this.eData.HType + ',璁㈠崟鍙�:' + this
- .eData.HICMOBillNo + ',娴佽浆鍗″彿:' + this.eData.HICMOBillNo +
- ', 浜у搧缂栫爜:' + this.hform.HMaterNumber + ',浜у搧鍚嶇О:' + this.hform.HMaterName + ',瑙勬牸鍨嬪彿:' + this
- .hform.HMaterModel +
- ',鍙戦�佷汉:' + this.hform.HMaker + ',鍙戠敓鏃堕棿:' + this.hform.HDate + ',鐢熶骇璧勬簮:' + this.hform
- .HSourceName + ',璁惧缂栫爜:' + this.hform.EquipNumber + ',瀵瑰簲澶勭悊浜�:' + this.hform.HHandleEmpName
+ if (this.OperationType == 4) {
+ return '寮傚父鍙嶉鍗曞彿:' + this.hform.HBillNo + ',寮傚父绫诲瀷:' + this.eData.HType + ',璁㈠崟鍙�:' + this
+ .eData.HICMOBillNo + ',娴佽浆鍗″彿:' + this.eData.HICMOBillNo +
+ ', 浜у搧缂栫爜:' + this.hform.HMaterNumber + ',浜у搧鍚嶇О:' + this.hform.HMaterName + ',瑙勬牸鍨嬪彿:' + this
+ .hform.HMaterModel +
+ ',鍙戦�佷汉:' + this.hform.HMaker + ',鍙戠敓鏃堕棿:' + this.hform.HDate + ',鐢熶骇璧勬簮:' + this.hform
+ .HSourceName + ',璁惧缂栫爜:' + this.hform.EquipNumber + ',瀵瑰簲澶勭悊浜�:' + this.hform.HHandleEmpName
+ }
+ if (this.OperationType == 5) {
+ return '寮傚父鍙嶉鍗曞彿:' + this.hform.HBillNo + ',寮傚父绫诲瀷:' + this.eData.HType + ',璁㈠崟鍙�:' + this
+ .eData.HICMOBillNo + ',娴佽浆鍗″彿:' + this.eData.HICMOBillNo +
+ ', 浜у搧缂栫爜:' + this.hform.HMaterNumber + ',浜у搧鍚嶇О:' + this.hform.HMaterName + ',瑙勬牸鍨嬪彿:' + this
+ .hform.HMaterModel +
+ ',鍙戦�佷汉:' + this.hform.HMaker + ',鍙戠敓鏃堕棿:' + this.hform.HDate + ',鐢熶骇璧勬簮:' + this.hform
+ .HSourceName + ',璁惧缂栫爜:' + this.hform.EquipNumber + ',瀵瑰簲澶勭悊浜�:' + this.hform.HHandleEmpName
+ + `,妫�楠屽崟鍙�: ${this.hform.HMainSourceBillNo}`
+ }
}
}
},
@@ -845,6 +874,113 @@
},
});
},
+ // 妫�楠屽崟璺宠浆
+ async set_CheckBillStatus(HSourceInterID, HType, HSourceName, HSourceBillType, HBarCode) {
+ try {
+ let res = await CommonUtils.doRequest2Async({
+ url: '/Web/getCheckBillStatus',
+ data: {
+ HInterID: HSourceInterID,
+ HBillType: HSourceBillType
+ }
+ })
+
+ let {
+ data,
+ count,
+ message
+ } = res.data
+ if (count == 1) {
+ this.hform.HMaterNumber = data[0].浜у搧鍐呯爜 //浜у搧鍚嶇О
+ this.hform.HMaterName = data[0].浜у搧鍚嶇О //浜у搧鍚嶇О
+ this.hform.HMaterModel = data[0].浜у搧鍨嬪彿 //浜у搧瑙勬牸
+ this.hform.HMainSourceBillNo = data[0].鍗曟嵁鍙� //婧愬崟鍗曞彿
+ this.hform.HMainSourceInterID = data[0].hmainid //婧愬崟涓诲唴鐮�
+ this.hform.HMainSourceEntryID = data[0].hsubid //婧愬崟瀛愬唴鐮�
+ this.hform.HMainSourceBillType = HSourceBillType //婧愬崟绫诲瀷
+ this.hform.HQty = data[0].妫�楠屾暟閲� //璁″垝鏁伴噺
+ this.hform.HSourceID = data[0].HSourceID //鐢熶骇璧勬簮id
+ this.hform.HSourceName = data[0].鐢熶骇璧勬簮鍚嶇О //鐢熶骇璧勬簮
+ this.hform.HProcExchBillNo = data[0].宸ュ簭娴佽浆鍗″彿 //婧愬崟鍗曞彿
+ this.hform.HProcExchEntryID = data[0].HProcExchInterID //婧愬崟涓诲唴鐮�
+ this.hform.HProcExchInterID = data[0].HProcExchEntryID //婧愬崟瀛愬唴鐮�
+ this.hform.HICMOBillNo = data[0].鐢熶骇璁㈠崟鍙�
+ this.hform.HICMOInterID = data[0].HICMOInterID
+ this.hform.HICMOEntryID = data[0].HICMOEntryID
+
+ this.hform.HBarCode = data[0]["鏉＄爜"] || ''
+ } else {
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: `涓嬫帹寮傚父鍙嶉鍗曞け璐�: ${message}`
+ })
+ }
+
+ uni.request({
+ url: this.serverUrl + '/Sc_MESTransFerWorkBill/Get_ErrMsgBackType',
+ type: "GET",
+ data: {
+ "TypeName": HType
+ },
+ success: (res) => {
+ var data = res.data.data[0]
+ if (res.data.count == 1) {
+ this.hform.HErrMsgBackTypeID = data.HItemID
+ this.hform.HErrMsgBackTypeName = data.HName
+ } else {
+ uni.showToast({
+ title: '鑾峰彇寮傚父绫诲瀷鏁版嵁澶辫触',
+ icon: 'none'
+ })
+ }
+ },
+ fail: (res) => {
+ console.log(res);
+ uni.showToast({
+ title: '鑾峰彇寮傚父绫诲瀷澶辫触',
+ icon: 'none'
+ })
+ },
+ });
+ uni.request({
+ url: this.serverUrl + '/Sc_MESTransFerWorkBill/set_EquipFile',
+ type: "GET",
+ data: {
+ "HSourceName": HSourceName
+ },
+ success: (res) => {
+ var data = res.data.data[0]
+ console.log(res.data)
+ if (res.data.count == 1) {
+ this.hform.EquipNumber = data.璁惧缂栫爜
+
+ this.getEquipBindingEmpInfo()
+ } else {
+ uni.showToast({
+ title: '鑾峰彇璁惧缂栫爜澶辫触',
+ icon: 'none'
+ })
+ }
+ },
+ fail: (res) => {
+ console.log(res);
+ uni.showToast({
+ title: '鑾峰彇璁惧缂栫爜澶辫触',
+ icon: 'none'
+ })
+ },
+ });
+
+ setTimeout(() => {
+ uni.hideLoading()
+ }, 1000)
+ } catch (err) {
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: `涓嬫帹寮傚父鍙嶉鍗曞け璐�: ${err}`
+ })
+ }
+ },
//鎶ュ伐鍙拌烦杞�
set_Sc_ICMOBillStatus(HSourceBill, HType, HSourceName) {
uni.request({
@@ -1099,7 +1235,7 @@
uni.showLoading({
title: '璇风◢鍊�'
})
- if (this.OperationType == 1 || this.OperationType == 2 || this.OperationType == 4) {
+ if (this.OperationType == 1 || this.OperationType == 2 || this.OperationType == 4 || this.OperationType == 5) {
this.refSav = "Add";
}
//鑻ヤ负缂栬緫-淇濆瓨锛屽垯鏇存柊淇敼浜哄拰淇敼鏃堕棿
diff --git a/pages/gongxuOut/Cj_StationOutBill_Standard.vue b/pages/gongxuOut/Cj_StationOutBill_Standard.vue
index 1ce8c9d..f9cf125 100644
--- a/pages/gongxuOut/Cj_StationOutBill_Standard.vue
+++ b/pages/gongxuOut/Cj_StationOutBill_Standard.vue
@@ -121,7 +121,7 @@
</checkbox-group>
</view>
</view>
- <view class="form-item" v-show="false">
+ <view class="form-item" v-show="true">
<view class="title">寮�宸ユ椂闂�:</view>
<view class="right">
<uni-datetime-picker v-model="hform.HRelBeginTime" @change="HRelBeginTimeChange" v-if="hform.HIsTimeFlag==1" :hide-second="true">
@@ -129,7 +129,7 @@
</uni-datetime-picker>
</view>
</view>
- <view class="form-item" v-show="false">
+ <view class="form-item" v-show="true">
<view class="title">瀹屽伐鏃堕棿:</view>
<view class="right">
<uni-datetime-picker v-model="hform.HRelEndTime" @change="HRelEndTimeChange" v-if="hform.HIsTimeFlag==1" :hide-second="true">
@@ -663,11 +663,11 @@
}
}
- this.getHMaterList()
- this.getHProcList()
- this.getHSupList()
- this.getHSourceList()
- this.getHGroupList()
+ //this.getHMaterList()
+ //this.getHProcList()
+ //this.getHSupList()
+ //this.getHSourceList()
+ //this.getHGroupList()
this.getHEmpList()
this.getHCenterList()
@@ -993,7 +993,7 @@
this.$forceUpdate();
} else {
uni.showToast({
- title: res.data.Message,
+ title: res.data.msg,
icon: 'none'
})
}
@@ -1059,7 +1059,7 @@
this.$forceUpdate();
} else {
uni.showToast({
- title: res.data.Message,
+ title: "鐝粍鑾峰彇澶辫触"+res.data.Message,
icon: 'none'
})
}
@@ -1163,13 +1163,13 @@
uni.request({
url: this.serverUrl + '/api/newBill/getWorkCenterList',
data: {
- sWhere: ''
+ sWhere: ' and HUSEORGID = '+uni.getStorageSync('OrganizationID')
},
success: (res) => {
if (res.data.code == 1) {
- this.HCenterNameList = res.data.data.Gy_Source
- for (var i = 0; i < res.data.data.Gy_Source.length; i++) {
- this.arrayHCenterName[i] = res.data.data.Gy_Source[i].宸ヤ綔涓績
+ this.HCenterNameList = res.data.data.Gy_WorkCenter
+ for (var i = 0; i < res.data.data.Gy_WorkCenter.length; i++) {
+ this.arrayHCenterName[i] = res.data.data.Gy_WorkCenter[i].宸ヤ綔涓績
}
this.$forceUpdate();
} else {
@@ -1712,7 +1712,7 @@
},
addNew() {
uni.redirectTo({
- url: '/pages/gongxuOut/Cj_StationOutBill?OperationType=1'
+ url: '/pages/gongxuOut/Cj_StationOutBill_Standard?OperationType=1'
})
},
submit() {
@@ -1788,7 +1788,7 @@
})
setTimeout(() => {
uni.redirectTo({
- url: '/pages/gongxuOut/Cj_StationOutBillList'
+ url: '/pages/gongxuOut/Cj_StationOutBill_StandardList'
})
}, 1000)
} else {
@@ -1800,7 +1800,7 @@
console.log('鐢ㄦ埛鐐瑰嚮纭畾');
this.getNextProc()
// uni.redirectTo({
- // url: '/pages/gongxuOut/Cj_StationOutBill?OperationType=1'
+ // url: '/pages/gongxuOut/Cj_StationOutBill_Standard?OperationType=1'
// })
} else if (res.cancel) {
console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
@@ -1808,17 +1808,17 @@
// uni.navigateBack();
// }, 50)
uni.redirectTo({
- url: '/pages/gongxuOut/Cj_StationOutBill?OperationType=1'
+ url: '/pages/gongxuOut/Cj_StationOutBill_Standard?OperationType=1'
})
}
}
});
}
} else {
- uni.showToast({
- title: res.data.Message,
- icon: 'none'
- })
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: res.data.Message
+ })
}
},
fail: (res) => {
@@ -1974,13 +1974,13 @@
icon: 'none'
})
uni.redirectTo({
- url: '/pages/gongxuOut/Cj_StationOutBill?OperationType=1'
+ url: '/pages/gongxuOut/Cj_StationOutBill_Standard?OperationType=1'
})
}else{
this.hform.HProcNo=nextProcess["宸ュ簭鍙�"];
const HNextBarCode = this.hform.HBarCode+"@"+this.hform.HProcNo+"@"+this.hform.HSEQNumber
uni.redirectTo({
- url: '/pages/gongxuOut/Cj_StationOutBill?OperationType=1&HBarCode='+HNextBarCode
+ url: '/pages/gongxuOut/Cj_StationOutBill_Standard?OperationType=1&HBarCode='+HNextBarCode
})
}
}else{
diff --git a/pages/index/login.vue b/pages/index/login.vue
index b02d389..789859c 100644
--- a/pages/index/login.vue
+++ b/pages/index/login.vue
@@ -114,8 +114,8 @@
"闄堥晲鍝叉湰鍦版祴璇�2": 'http://192.168.88.82:81/API/',
"寮犵憺骞挎湰鍦版祴璇�": 'http://localhost:8082/API/',
"浣欐�濇澃鏈湴娴嬭瘯": 'http://localhost:8082/LuBaoAPI/',
- "鏉ㄦ潈閼湰鍦版祴璇�": 'http://172.20.10.5:8082/API/',
- "鐜嬩华鏈湴娴嬭瘯": 'http://192.168.0.74:8080/API/',
+ "鏉ㄦ潈閼湰鍦版祴璇�": 'http://192.168.0.36:8082/API/',
+ "鐜嬩华鏈湴娴嬭瘯": 'http://192.168.0.74:8080/API/',
// 灏忓崼鍐呭缃�
"鑻忓窞鍗櫤绉戞妧-澶栫綉": 'http://221.224.60.42:8082/API_WW/',
"鑻忓窞鍗櫤绉戞妧-鍐呯綉": 'http://172.16.20.233:8082/API_NW/',
@@ -131,8 +131,8 @@
"瀹佹尝鍗庤垷鍖呰": "http://61.164.64.222:8082/API_WW/",
//浣欏鍗庤繙
"浣欏鍗庤繙": "http://192.168.3.248:82/HuaYuaAPI/",
- //澶╂搸鑸ぉ
- "澶╂搸鑸ぉ": "http://space-engine.com.cn:81/API/",
+ //澶╂搸鑸ぉ
+ "澶╂搸鑸ぉ": "http://space-engine.com.cn:81/API/",
},
serverUrlName: uni.getStorageSync('serverUrlName') || '瀹佹尝鍗庤垷鍖呰',
diff --git a/pages/index/tab4.vue b/pages/index/tab4.vue
index c31f687..87e3b2c 100644
--- a/pages/index/tab4.vue
+++ b/pages/index/tab4.vue
@@ -212,7 +212,7 @@
},
{
"img": "../../static/icon/icon8.png",
- "text": "鏉ユ枡妫�楠�(鎵归噺)",
+ "text": "鏉ユ枡妫�楠�(鎵归噺鍚堟牸)",
"url": "/pages/ZLGL/lailiaojianyan_fast/Kf_QCStockInCheckBill_Fast2",
"id": 21,
"hidden": false
diff --git a/pages/jishikucunchaxun/table.vue b/pages/jishikucunchaxun/table.vue
index 7988855..c3b6361 100644
--- a/pages/jishikucunchaxun/table.vue
+++ b/pages/jishikucunchaxun/table.vue
@@ -51,6 +51,15 @@
<view class="detail" v-if="item['鐗╂枡鍚嶇О']">
<text>鐗╂枡鍚嶇О锛�</text>{{item['鐗╂枡鍚嶇О']}}
</view>
+ <view class="detail" v-if="item['鏁伴噺']">
+ <text>鐗╂枡鏉＄爜鍓╀綑鏁伴噺锛�</text>{{item['鏁伴噺']}}
+ </view>
+ <view class="detail" v-if="item['鏉＄爜搴撳瓨鏁伴噺']">
+ <text>鏉＄爜搴撳瓨鎬绘暟閲忥細</text>{{item['鏉＄爜搴撳瓨鏁伴噺']}}
+ </view>
+ <view class="detail" v-if="item['閲戣澏搴撳瓨鏁伴噺']">
+ <text>閲戣澏搴撳瓨鏁伴噺锛�</text>{{item['閲戣澏搴撳瓨鏁伴噺']}}
+ </view>
<view class="detail" v-if="item['瑙勬牸鍨嬪彿']">
<text>瑙勬牸鍨嬪彿锛�</text>{{item['瑙勬牸鍨嬪彿']}}
</view>
diff --git a/pages/qitachuku/qitachukudan.vue b/pages/qitachuku/qitachukudan.vue
index bae7ba2..e2a55a0 100644
--- a/pages/qitachuku/qitachukudan.vue
+++ b/pages/qitachuku/qitachukudan.vue
@@ -1,1333 +1,1364 @@
<template>
- <view>
- <view class="form">
- <view class="form-item">
- <view class="title">鏉＄爜:</view>
- <view class="right" style="width: 380rpx;">
- <input v-model="hform.HBarCode" placeholder="璇锋壂鎻�(鎴栬緭鍏�)鏉＄爜" @confirm="getCode(hform.HBarCode)" />
- </view>
- <uni-icons type="scan"
- style="margin-left: 10rpx;background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;"
- size="20" @click="toScanCode"></uni-icons>
- </view>
- <view class="form-item">
- <view class="title">鏁伴噺:</view>
- <view class="right">
- <input v-model="hform.HQty" placeholder="璇疯緭鍏ユ暟閲�" />
- </view>
- </view>
- <view class="form-item">
- <view class="title">浠撳簱:</view>
- <view class="right">
- <uni-combox :candidates="arrayHWHName" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撳簱" v-model="hform.HWHName"
- @input="HWHNameChange"></uni-combox>
- </view>
- </view>
- <view class="form-item">
- <view class="title">浠撲綅:</view>
- <view class="right" v-show="showHStockPlaceName">
- <uni-combox :candidates="arrayHStockPlaceName" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撲綅"
- v-model="hform.HStockPlaceName" @input="HStockPlaceNameChange"></uni-combox>
- </view>
- <view class="righton" v-show="!showHStockPlaceName">
- <input v-model="hform.HStockPlaceName" :disabled="!showHStockPlaceName"
- placeholder="涓嶅彲鎿嶄綔" /></view>
- </view>
+ <view>
+ <view class="form">
+ <view class="form-item">
+ <view class="title">鏉＄爜:</view>
+ <view class="right" style="width: 380rpx;">
+ <input v-model="hform.HBarCode" placeholder="璇锋壂鎻�(鎴栬緭鍏�)鏉＄爜" @confirm="getCode(hform.HBarCode)" />
+ </view>
+ <uni-icons type="scan"
+ style="margin-left: 10rpx;background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;"
+ size="20" @click="toScanCode"></uni-icons>
+ </view>
+ <view class="form-item">
+ <view class="title">鏁伴噺:</view>
+ <view class="right">
+ <input v-model="hform.HQty" placeholder="璇疯緭鍏ユ暟閲�" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">浠撳簱:</view>
+ <view class="right">
+ <uni-combox :candidates="arrayHWHName" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撳簱" v-model="hform.HWHName"
+ @input="HWHNameChange"></uni-combox>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">浠撲綅:</view>
+ <view class="right" v-show="showHStockPlaceName">
+ <uni-combox :candidates="arrayHStockPlaceName" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撲綅"
+ v-model="hform.HStockPlaceName" @input="HStockPlaceNameChange"></uni-combox>
+ </view>
+ <view class="righton" v-show="!showHStockPlaceName">
+ <input v-model="hform.HStockPlaceName" :disabled="!showHStockPlaceName" placeholder="涓嶅彲鎿嶄綔" />
+ </view>
+ </view>
- <view class="tabs">
- <view :class="tabs == 0 ? 'on':''" @tap="tabs = 0">閫夋嫨婧愬崟</view>
- <view :class="tabs == 1 ? 'on':''" @tap="tabs = 1">琛ㄥご淇℃伅</view>
- <view :class="tabs == 2 ? 'on':''" @tap="tabs = 2">鐗╂枡淇℃伅</view>
- <view :class="tabs == 3 ? 'on':''" @tap="tabs = 3">鏉＄爜淇℃伅</view>
- <view :class="tabs == 4 ? 'on':''" @tap="tabs = 4">涓嬫灦淇℃伅</view>
- </view>
+ <view class="tabs">
+ <view :class="tabs == 0 ? 'on':''" @tap="tabs = 0">閫夋嫨婧愬崟</view>
+ <view :class="tabs == 1 ? 'on':''" @tap="tabs = 1">琛ㄥご淇℃伅</view>
+ <view :class="tabs == 2 ? 'on':''" @tap="tabs = 2">鐗╂枡淇℃伅</view>
+ <view :class="tabs == 3 ? 'on':''" @tap="tabs = 3">鏉＄爜淇℃伅</view>
+ <view :class="tabs == 4 ? 'on':''" @tap="tabs = 4">涓嬫灦淇℃伅</view>
+ </view>
- <view v-if="tabs == 0">
- <view class="form-item">
- <view class="title">婧愬崟绫诲瀷:</view>
- <view class="right" v-show="showHMainSourceBillType">
- <picker :range="arrayHMainSourceBillType" v-model="HMainSourceBillType"
- @change="HMainSourceBillTypeChange">
- <input name="HMainSourceBillType" disabled v-model="HMainSourceBillType"
- placeholder="璇烽�夋嫨婧愬崟绫诲瀷" />
- </picker>
- </view>
- <view class="righton" v-show="!showHMainSourceBillType">
- <input name="HMainSourceBillType" disabled v-model="HMainSourceBillType"
- placeholder="璇烽�夋嫨婧愬崟绫诲瀷" />
- </view>
- </view>
- <view class="form-item">
- <view class="title">婧愬崟鍗曞彿:</view>
- <view class="right" v-show="showHSourceBillNo">
- <uni-combox v-if="reHSourceBillNo" :candidates="arrayHSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�"
- v-model="hform.HSourceBillNo" @input="HSourceBillNoChange"></uni-combox>
- </view>
- <view class="righton" v-show="!showHSourceBillNo">
- <input name="HSourceBillNo" disabled v-model="hform.HSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�" />
- </view>
- </view>
- <view class="form-item">
- <view class="title">鍗曟嵁瀛愮被鍨�:</view>
- <view class="right">
- <picker :range="arrayHBillSubType" v-model="HBillSubType" @change="HBillSubTypeChange">
- <input name="HBillSubType" disabled v-model="HBillSubType" placeholder="璇烽�夋嫨鍗曟嵁瀛愮被鍨�" />
- </picker>
- </view>
- </view>
- <view class="form-item">
- <view class="title">鍏堣繘鍏堝嚭浠�:</view>
- <view class="right">
- <uni-combox :candidates="arrayHWHName" placeholder="璇烽�夋嫨" v-model="hform.HFIFOWHName"
- @input="HFIFOWHNameChange"></uni-combox>
- </view>
- </view>
- <view class="form-item">
- <view class="title">鏃ユ湡:</view>
- <view class="right">
- <picker mode="date" v-model="hform.HDate" @change="HDateChange">
- <input disabled v-model="hform.HDate" placeholder="璇烽�夋嫨鏃ユ湡" />
- </picker>
- </view>
- </view>
- <view class="form-item">
- <view class="title">鍒跺崟浜�:</view>
- <view class="righton">
- <input name="HMaker" disabled v-model="hform.HMaker" />
- </view>
- </view>
- <view class="form-item">
- <view class="title">鍗曟嵁鍙�:</view>
- <view class="righton">
- <input name="HBillNo" disabled v-model="hform.HBillNo" />
- </view>
- </view>
- <view class="form-item">
- <view class="title">鍗曟嵁ID:</view>
- <view class="righton">
- <input name="HInterID" disabled v-model="hform.HInterID" />
- </view>
- </view>
- </view>
+ <view v-if="tabs == 0">
+ <view class="form-item">
+ <view class="title">婧愬崟绫诲瀷:</view>
+ <view class="right" v-show="showHMainSourceBillType">
+ <picker :range="arrayHMainSourceBillType" v-model="HMainSourceBillType"
+ @change="HMainSourceBillTypeChange">
+ <input name="HMainSourceBillType" disabled v-model="HMainSourceBillType"
+ placeholder="璇烽�夋嫨婧愬崟绫诲瀷" />
+ </picker>
+ </view>
+ <view class="righton" v-show="!showHMainSourceBillType">
+ <input name="HMainSourceBillType" disabled v-model="HMainSourceBillType"
+ placeholder="璇烽�夋嫨婧愬崟绫诲瀷" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">婧愬崟鍗曞彿:</view>
+ <view class="right" v-show="showHSourceBillNo">
+ <uni-combox v-if="reHSourceBillNo" :candidates="arrayHSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�"
+ v-model="hform.HSourceBillNo" @input="HSourceBillNoChange"></uni-combox>
+ </view>
+ <view class="righton" v-show="!showHSourceBillNo">
+ <input name="HSourceBillNo" disabled v-model="hform.HSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">鍗曟嵁瀛愮被鍨�:</view>
+ <view class="right">
+ <picker :range="arrayHBillSubType" v-model="HBillSubType" @change="HBillSubTypeChange">
+ <input name="HBillSubType" disabled v-model="HBillSubType" placeholder="璇烽�夋嫨鍗曟嵁瀛愮被鍨�" />
+ </picker>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">鍏堣繘鍏堝嚭浠�:</view>
+ <view class="right">
+ <uni-combox :candidates="arrayHWHName" placeholder="璇烽�夋嫨" v-model="hform.HFIFOWHName"
+ @input="HFIFOWHNameChange"></uni-combox>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">鏃ユ湡:</view>
+ <view class="right">
+ <picker mode="date" v-model="hform.HDate" @change="HDateChange">
+ <input disabled v-model="hform.HDate" placeholder="璇烽�夋嫨鏃ユ湡" />
+ </picker>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">鍒跺崟浜�:</view>
+ <view class="righton">
+ <input name="HMaker" disabled v-model="hform.HMaker" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">鍗曟嵁鍙�:</view>
+ <view class="righton">
+ <input name="HBillNo" disabled v-model="hform.HBillNo" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">鍗曟嵁ID:</view>
+ <view class="righton">
+ <input name="HInterID" disabled v-model="hform.HInterID" />
+ </view>
+ </view>
+ </view>
- <view v-if="tabs == 1">
- <view class="form-item">
- <view class="title">淇濈:</view>
- <view class="right">
- <uni-combox :candidates="arrayHEmpName" placeholder="璇烽�夋嫨淇濈鍛�" v-model="hform.HKeeperName"
- @input="HKeeperNameChange"></uni-combox>
- </view>
- </view>
- <view class="form-item">
- <view class="title">楠屾敹:</view>
- <view class="right">
- <uni-combox :candidates="arrayHEmpName" placeholder="璇烽�夋嫨楠屾敹鍛�" v-model="hform.HSecManagerName"
- @input="HSecManagerNameChange"></uni-combox>
- </view>
- </view>
- <view class="form-item">
- <view class="title">閮ㄩ棬:</view>
- <view class="right">
- <uni-combox :candidates="arrayHDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" v-model="hform.HDeptName"
- @input="HDeptNameChange"></uni-combox>
- </view>
- </view>
- <view class="form-item">
- <view class="title">瀹㈡埛:</view>
- <view class="right" v-show="showHSupName">
- <uni-combox :candidates="arrayHSupName" placeholder="璇烽�夋嫨瀹㈡埛" v-model="hform.HSupName"
- @input="HSupNameChange"></uni-combox>
- </view>
- <view class="righton" v-show="!showHSupName">
- <input name="HSupName" disabled v-model="hform.HSupName" placeholder="璇烽�夋嫨瀹㈡埛" />
- </view>
- </view>
- <!-- PDA閲屽瓨鍦ㄤ絾鏄病鏈夊��
- <view class="form-item">
- <view class="title">鍑哄簱绫诲瀷:</view>
- <view class="right" >
- <uni-combox :candidates="[]" placeholder="璇烽�夋嫨..." ></uni-combox>
- </view>
- <view class="righton" v-show="!showHSupName">
- <input name="HSupName" disabled v-model="hform.HSupName" placeholder="璇烽�夋嫨渚涘簲鍟�" />
- </view>
- </view>
- -->
- <view class="form-item">
- <view class="title">缁勭粐:</view>
- <view class="righton">
- <input name="HStockOrgName" disabled v-model="hform.HStockOrgName" />
- </view>
- </view>
- </view>
+ <view v-if="tabs == 1">
+ <view class="form-item">
+ <view class="title">淇濈:</view>
+ <view class="right">
+ <uni-combox :candidates="arrayHEmpName" placeholder="璇烽�夋嫨淇濈鍛�" v-model="hform.HKeeperName"
+ @input="HKeeperNameChange"></uni-combox>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">楠屾敹:</view>
+ <view class="right">
+ <uni-combox :candidates="arrayHEmpName" placeholder="璇烽�夋嫨楠屾敹鍛�" v-model="hform.HSecManagerName"
+ @input="HSecManagerNameChange"></uni-combox>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">閮ㄩ棬:</view>
+ <view class="right">
+ <uni-combox :candidates="arrayHDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" v-model="hform.HDeptName"
+ @input="HDeptNameChange"></uni-combox>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">瀹㈡埛:</view>
+ <view class="right" v-show="showHSupName">
+ <uni-combox :candidates="arrayHSupName" placeholder="璇烽�夋嫨瀹㈡埛" v-model="hform.HSupName"
+ @input="HSupNameChange"></uni-combox>
+ </view>
+ <view class="righton" v-show="!showHSupName">
+ <input name="HSupName" disabled v-model="hform.HSupName" placeholder="璇烽�夋嫨瀹㈡埛" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">鍑哄簱绫诲瀷:</view>
+ <zxz-uni-data-select v-if="showHSupName" required class="right" :localdata="stockOutStyleList"
+ dataKey="HName" dataValue="HName" v-model="hform.HStockStyle">
+ </zxz-uni-data-select>
+ <view class="righton" v-if="!showHSupName">
+ <input name="HSupName" disabled v-model="hform.HSupName" placeholder="璇烽�夋嫨渚涘簲鍟�" />
+ </view>
+ </view>
- <view v-if="tabs == 2">
- <view class="list" v-for="(item,index) in Materlist" :key="index">
- <uni-card :title="item.鐗╂枡鍚嶇О" :extra="item.鐗╂枡浠ｇ爜" style="margin: 10px;" @tap="delMater(item)">
- <view class="card-detail">
- <view class="detail">
- <text>婧愬崟鍗曞彿锛�</text>{{item.婧愬崟鍗曞彿}}
- </view>
- <view class="detail">
- <text>婧愬崟鏁伴噺锛�</text>{{item.婧愬崟鏁伴噺}}
- </view>
- <view class="detail">
- <text>鏁伴噺锛�</text>{{item.鏁伴噺}}
- </view>
- <view class="detail">
- <text>鏉＄爜涓暟锛�</text>{{item.鏉＄爜涓暟}}
- </view>
- <view class="detail" v-if="item.瑙勬牸鍨嬪彿">
- <text>瑙勬牸鍨嬪彿锛�</text>{{item.瑙勬牸鍨嬪彿}}
- </view>
- <view class="detail" v-if="item.杈呭姪灞炴��">
- <text>杈呭姪灞炴�э細</text>{{item.杈呭姪灞炴�}
- </view>
- </view>
- </uni-card>
- </view>
- <view class="over" v-if="Materlist.length == 0">鏆傛棤鏁版嵁</view>
- </view>
+ <view class="form-item">
+ <view class="title">缁勭粐:</view>
+ <view class="righton">
+ <input name="HStockOrgName" disabled v-model="hform.HStockOrgName" />
+ </view>
+ </view>
+ </view>
- <view v-if="tabs == 4">
- <view class="list" v-for="(item,index) in FIFOlist" :key="index">
- <uni-card :title="item.HMaterName" :extra="item.HMaterNumber" style="margin: 10px;"
- @tap="delMater(item)">
- <view class="card-detail">
- <view class="detail">
- <text>鏁伴噺锛�</text>{{item.HQty}}
- </view>
- <view class="detail">
- <text>涓嬫灦鏁伴噺锛�</text>{{item.HQtyMust}}
- </view>
- <view class="detail">
- <text>浠撳簱锛�</text>{{item.HWhName}}
- </view>
- <view class="detail">
- <text>浠撲綅锛�</text>{{item.HSPName}}
- </view>
- <view class="detail">
- <text>瑙勬牸鍨嬪彿锛�</text>{{item.HMaterModel}}
- </view>
- <view class="detail" v-if="item.HBatchNo">
- <text>鎵瑰彿锛�</text>{{item.HBatchNo}}
- </view>
- <view class="detail" v-if="item.HAuxPropName">
- <text>杈呭姪灞炴�э細</text>{{item.HAuxPropName}}
- </view>
- </view>
- </uni-card>
- </view>
- <view class="over" v-if="FIFOlist.length == 0">鏆傛棤鏁版嵁</view>
- </view>
+ <view v-if="tabs == 2">
+ <view class="list" v-for="(item,index) in Materlist" :key="index">
+ <uni-card :title="item.鐗╂枡鍚嶇О" :extra="item.鐗╂枡浠ｇ爜" style="margin: 10px;" @tap="delMater(item)">
+ <view class="card-detail">
+ <view class="detail">
+ <text>婧愬崟鍗曞彿锛�</text>{{item.婧愬崟鍗曞彿}}
+ </view>
+ <view class="detail">
+ <text>婧愬崟鏁伴噺锛�</text>{{item.婧愬崟鏁伴噺}}
+ </view>
+ <view class="detail">
+ <text>鏁伴噺锛�</text>{{item.鏁伴噺}}
+ </view>
+ <view class="detail">
+ <text>鏉＄爜涓暟锛�</text>{{item.鏉＄爜涓暟}}
+ </view>
+ <view class="detail" v-if="item.瑙勬牸鍨嬪彿">
+ <text>瑙勬牸鍨嬪彿锛�</text>{{item.瑙勬牸鍨嬪彿}}
+ </view>
+ <view class="detail" v-if="item.杈呭姪灞炴��">
+ <text>杈呭姪灞炴�э細</text>{{item.杈呭姪灞炴�}
+ </view>
+ </view>
+ </uni-card>
+ </view>
+ <view class="over" v-if="Materlist.length == 0">鏆傛棤鏁版嵁</view>
+ </view>
- <view v-if="tabs == 3">
- <view class="form-item">
- <view class="title">鏉＄爜:</view>
- <view class="righton">
- <input name="HBarCode_B" disabled v-model="hform.HBarCode_B" />
- </view>
- </view>
- <view class="form-item">
- <view class="title">鐗╂枡:</view>
- <view class="righton">
- <input disabled v-model="hform.HMaterName_B" />
- </view>
- </view>
- <view class="form-item">
- <view class="title">瑙勬牸:</view>
- <view class="righton">
- <input disabled v-model="hform.HMaterModel_B" />
- </view>
- </view>
- <view class="form-item">
- <view class="title">鎵规:</view>
- <view class="righton">
- <input disabled v-model="hform.HBatchNo_B" />
- </view>
- </view>
- <view class="form-item">
- <view class="title">鍗曚綅:</view>
- <view class="righton">
- <input disabled v-model="hform.HUnitName_B" />
- </view>
- </view>
- <view class="form-item">
- <view class="title">鏁伴噺:</view>
- <view class="righton">
- <input disabled v-model="hform.HQty_B" />
- </view>
- </view>
- <view class="form-item">
- <view class="title">瀹归噺:</view>
- <view class="righton">
- <input disabled v-model="hform.HTMQty_B" />
- </view>
- </view>
- <view class="form-item">
- <view class="title">浠撳簱:</view>
- <view class="righton">
- <input disabled v-model="hform.HWHName_B" />
- </view>
- </view>
- <view class="form-item">
- <view class="title">浠撲綅:</view>
- <view class="righton">
- <input disabled v-model="hform.HSPName_B" />
- </view>
- </view>
- </view>
+ <view v-if="tabs == 4">
+ <view class="list" v-for="(item,index) in FIFOlist" :key="index">
+ <uni-card :title="item.HMaterName" :extra="item.HMaterNumber" style="margin: 10px;"
+ @tap="delMater(item)">
+ <view class="card-detail">
+ <view class="detail">
+ <text>鏁伴噺锛�</text>{{item.HQty}}
+ </view>
+ <view class="detail">
+ <text>涓嬫灦鏁伴噺锛�</text>{{item.HQtyMust}}
+ </view>
+ <view class="detail">
+ <text>浠撳簱锛�</text>{{item.HWhName}}
+ </view>
+ <view class="detail">
+ <text>浠撲綅锛�</text>{{item.HSPName}}
+ </view>
+ <view class="detail">
+ <text>瑙勬牸鍨嬪彿锛�</text>{{item.HMaterModel}}
+ </view>
+ <view class="detail" v-if="item.HBatchNo">
+ <text>鎵瑰彿锛�</text>{{item.HBatchNo}}
+ </view>
+ <view class="detail" v-if="item.HAuxPropName">
+ <text>杈呭姪灞炴�э細</text>{{item.HAuxPropName}}
+ </view>
+ </view>
+ </uni-card>
+ </view>
+ <view class="over" v-if="FIFOlist.length == 0">鏆傛棤鏁版嵁</view>
+ </view>
- <view class="bottom-btn">
- <button class="btn-a" size="mini" @tap="submit">鎻愪氦</button>
- <button class="btn-c" size="mini" @tap="goBack">閫�鍑�</button>
- </view>
- </view>
- </view>
- </view>
+ <view v-if="tabs == 3">
+ <view class="form-item">
+ <view class="title">鏉＄爜:</view>
+ <view class="righton">
+ <input name="HBarCode_B" disabled v-model="hform.HBarCode_B" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">鐗╂枡:</view>
+ <view class="righton">
+ <input disabled v-model="hform.HMaterName_B" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">瑙勬牸:</view>
+ <view class="righton">
+ <input disabled v-model="hform.HMaterModel_B" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">鎵规:</view>
+ <view class="righton">
+ <input disabled v-model="hform.HBatchNo_B" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">鍗曚綅:</view>
+ <view class="righton">
+ <input disabled v-model="hform.HUnitName_B" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">鏁伴噺:</view>
+ <view class="righton">
+ <input disabled v-model="hform.HQty_B" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">瀹归噺:</view>
+ <view class="righton">
+ <input disabled v-model="hform.HTMQty_B" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">浠撳簱:</view>
+ <view class="righton">
+ <input disabled v-model="hform.HWHName_B" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">浠撲綅:</view>
+ <view class="righton">
+ <input disabled v-model="hform.HSPName_B" />
+ </view>
+ </view>
+ </view>
+
+ <view class="bottom-btn">
+ <button class="btn-a" size="mini" @tap="submit">鎻愪氦</button>
+ <button class="btn-c" size="mini" @tap="goBack">閫�鍑�</button>
+ </view>
+ </view>
+ </view>
+ </view>
</template>
<script>
- import getDateTime from '@/utils/getdateTime.js';
- import {
- getUserInfo
- } from "@/utils/auth.js";
- import {
- CommonUtils
- } from '../../utils/common';
- export default {
- data() {
- return {
- CommonUtils,
- userInfo: getUserInfo(),
- tabs: 0,
- arrayHWHName: [], //浠撳簱
- arrayHStockPlaceName: [], //浠撲綅
- OperationType: 1,
+ import getDateTime from '@/utils/getdateTime.js';
+ import {
+ getUserInfo
+ } from "@/utils/auth.js";
+ import {
+ CommonUtils
+ } from '../../utils/common';
+ export default {
+ data() {
+ return {
+ CommonUtils,
+ userInfo: getUserInfo(),
+ tabs: 0,
+ arrayHWHName: [], //浠撳簱
+ arrayHStockPlaceName: [], //浠撲綅
+ OperationType: 1,
- showHStockPlaceName: false,
- showHMainSourceBillType: true,
- showHSourceBillNo: true,
- reHSourceBillNo: true,
- showHSupName: true,
+ showHStockPlaceName: false,
+ showHMainSourceBillType: true,
+ showHSourceBillNo: true,
+ reHSourceBillNo: true,
+ showHSupName: true,
- HMainSourceBillType: '鍑哄簱鐢宠鍗�',
- arrayHMainSourceBillType: ['鍑哄簱鐢宠鍗�', '鎵嬪伐褰曞叆'],
+ HMainSourceBillType: '鍑哄簱鐢宠鍗�',
+ arrayHMainSourceBillType: ['鍑哄簱鐢宠鍗�', '鎵嬪伐褰曞叆'],
- linterid: '',
- HBillNo: '',
- btnType: 0, //0鏂板锛�1淇敼锛�2瀹℃牳锛�3鍙嶅鏍�
- showmore: false,
+ linterid: '',
+ HBillNo: '',
+ btnType: 0, //0鏂板锛�1淇敼锛�2瀹℃牳锛�3鍙嶅鏍�
+ showmore: false,
- arrayHWHName: [], //浠撳簱
- HWHNameList: [],
- arrayHStockPlaceName: [], //浠撲綅
- HStockPlaceNameList: [],
- arrayHSourceBillNo: [], //婧愬崟鍗曞彿
- HSourceBillNoList: [],
- arrayHBillSubType: [], // 鍗曟嵁瀛愮被鍨�
- HBillSubTypeList: [],
- HBillSubType: '鏍囧噯鍏朵粬鍑哄簱鍗�',
+ arrayHWHName: [], //浠撳簱
+ HWHNameList: [],
+ arrayHStockPlaceName: [], //浠撲綅
+ HStockPlaceNameList: [],
+ arrayHSourceBillNo: [], //婧愬崟鍗曞彿
+ HSourceBillNoList: [],
+ arrayHBillSubType: [], // 鍗曟嵁瀛愮被鍨�
+ HBillSubTypeList: [],
+ HBillSubType: '鏍囧噯鍏朵粬鍑哄簱鍗�',
- arrayHEmpName: [], //鎿嶄綔鍛�
- HEmpNameList: [],
- arrayHDeptName: [], //閮ㄩ棬
- HDeptNameList: [],
- arrayHSupName: [], //瀹㈡埛
- HSupNameList: [],
+ arrayHEmpName: [], //鎿嶄綔鍛�
+ HEmpNameList: [],
+ arrayHDeptName: [], //閮ㄩ棬
+ HDeptNameList: [],
+ arrayHSupName: [], //瀹㈡埛
+ HSupNameList: [],
+ HStockOutStyleList: [], // 鍑哄簱绫诲瀷
- Materlist: [],
- FIFOlist: [],
+ Materlist: [],
+ FIFOlist: [],
- hform: {
- HBillType: 1206,
- HBillerID: uni.getStorageSync('HBillerID'),
- HRedBlueFlag: false,
+ hform: {
+ HBillType: 1206,
+ HBillerID: uni.getStorageSync('HBillerID'),
+ HRedBlueFlag: false,
- HBarCode: '',
- HQty: '',
- HWHName: getUserInfo().HWHName,
- HWHID: getUserInfo().HWhID,
- HStockPlaceName: getUserInfo().HSPName,
- HStockPlaceID: getUserInfo().HSPID,
+ HStockStyle: '',
+ HBarCode: '',
+ HQty: '',
+ HWHName: getUserInfo().HWHName,
+ HWHID: getUserInfo().HWhID,
+ HStockPlaceName: getUserInfo().HSPName,
+ HStockPlaceID: getUserInfo().HSPID,
- HMainSourceBillType: 1242,
- HSourceBillNo: '', //CGDD000200
- HFIFOWHName: '',
- HFIFOWHID: '',
- HDate: getDateTime.dateTimeStr('y-m-d'),
- HMaker: uni.getStorageSync('HUserName'),
- HBillNo: '',
- HInterID: '',
- HBillSubType: 'QTCKD01_SYS',
+ HMainSourceBillType: 1242,
+ HSourceBillNo: '', //CGDD000200
+ HFIFOWHName: '',
+ HFIFOWHID: '',
+ HDate: getDateTime.dateTimeStr('y-m-d'),
+ HMaker: uni.getStorageSync('HUserName'),
+ HBillNo: '',
+ HInterID: '',
+ HBillSubType: 'QTCKD01_SYS',
- HKeeperName: getUserInfo().HKeeper,
- HKeeperID: getUserInfo().HKeeperID,
- HSecManagerName: getUserInfo().HSecManager,
- HSecManagerID: getUserInfo().HSecManagerID,
- HDeptName: getUserInfo().HDept,
- HDeptID: getUserInfo().HDeptID,
- HSupName: '',
- HSupID: '',
- HStockOrgName: uni.getStorageSync('Organization'),
- HStockOrgID: uni.getStorageSync('OrganizationID'),
+ HKeeperName: getUserInfo().HKeeper,
+ HKeeperID: getUserInfo().HKeeperID,
+ HSecManagerName: getUserInfo().HSecManager,
+ HSecManagerID: getUserInfo().HSecManagerID,
+ HDeptName: getUserInfo().HDept,
+ HDeptID: getUserInfo().HDeptID,
+ HSupName: '',
+ HSupID: '',
+ HStockOrgName: uni.getStorageSync('Organization'),
+ HStockOrgID: uni.getStorageSync('OrganizationID'),
- HBarCode_B: '',
- HMaterName_B: '',
- HMaterModel_B: '',
- HBatchNo_B: '',
- HUnitName_B: '',
- HQty_B: '',
- HTMQty_B: '',
- HWHName_B: '',
- HSPName_B: '',
- }
- }
- },
- methods: {
- //鎵爜
- toScanCode() {
- var mpaasScanModule = uni.requireNativePlugin("Mpaas-Scan-Module")
- mpaasScanModule.mpaasScan({
- 'hideAlbum': true,
- 'timeoutInterval':'10', //瓒呮椂鏃堕棿
- 'timeoutText':'鏈瘑鍒埌浜岀淮鐮�' //瓒呮椂鎻愰啋
- },(ret) => {
- console.log(ret.resp_result)
- if (this.hform.HBarCode == '*') {
- this.hform.HBarCode = this.hform.HBarCode + ret.resp_result
- } else {
- this.hform.HBarCode = ret.resp_result
- }
-
- this.getCode(this.hform.HBarCode)
- })
- },
- //閫夋嫨浠撳簱
- HWHNameChange(e) {
- // var name = e.split("(")
- for (var i = 0; i < this.HWHNameList.length; i++) {
- if (this.HWHNameList[i]["HName"] == e) {
- this.hform.HWHName = this.HWHNameList[i]["HName"]
- this.hform.HWHID = this.HWHNameList[i].HItemID
-
- this.showHStockPlaceName = this.HWHNameList[i].HIsStockMgr
- }
- }
- },
- // 閫夋嫨鍏堣繘鍏堝嚭浠�
- HFIFOWHNameChange(e) {
- for (var i = 0; i < this.HWHNameList.length; i++) {
- if (this.HWHNameList[i]["HName"] == e) {
- this.hform.HFIFOWHName = this.HWHNameList[i]["HName"]
- this.hform.HFIFOWHID = this.HWHNameList[i].HItemID
- }
- }
- },
- //閫夋嫨浠撲綅
- HStockPlaceNameChange(e) {
- for (var i = 0; i < this.HStockPlaceNameList.length; i++) {
- if (this.HStockPlaceNameList[i]['HWhName'] == e) {
- this.hform.HStockPlaceName = this.HStockPlaceNameList[i]['HWhName']
- this.hform.HStockPlaceID = this.HStockPlaceNameList[i].HItemID
- }
- }
- },
- getHBaseList() {
- CommonUtils.doRequest(
- "/Web/GetWarehouseList_Json_New", {
- Warehouse: "",
- HOrgID: uni.getStorageSync('OrganizationID')
- },
- (res) => {
- let res1 = res.data
- let {
- data,
- count
- } = res1
- if (count == 1) {
- this.HWHNameList = data
- for (var i = 0; i < data.length; i++) {
- this.arrayHWHName[i] = data[i]["HName"]
- }
- } else {
- uni.showToast({
- title: '浠撳簱鏁版嵁璇锋眰澶辫触',
- icon: 'none'
- })
- }
- },
- )
- CommonUtils.doRequest(
- "/WEBSController/GetStockPlaceList_Json", {
- StockPlace: '',
- HWhID: this.hform.HWHID,
- HStockOrgID: uni.getStorageSync('OrganizationID')
- },
- (res) => {
- let res1 = res.data
- console.log(res1)
- let {
- data,
- count
- } = res1
- if (count == 1) {
- this.HStockPlaceNameList = data
- for (var i = 0; i < data.length; i++) {
- this.arrayHStockPlaceName[i] = data[i]["HWhName"]
- }
- } else {
- uni.showToast({
- title: '浠撲綅鏁版嵁璇锋眰澶辫触',
- icon: 'none'
- })
- }
- },
- )
- },
- //閫夋嫨婧愬崟绫诲瀷
- HMainSourceBillTypeChange(e) {
- this.HMainSourceBillType = this.arrayHMainSourceBillType[e.detail.value]
- if (this.HMainSourceBillType == '鍑哄簱鐢宠鍗�') {
- this.hform.HMainSourceBillType = 1242
- this.getHYDList()
- } else {
- this.hform.HMainSourceBillType = -1
- this.getHYDList()
- }
- },
- //婧愬崟璧勬枡
- getHYDList() {
- CommonUtils.doRequest(
- "/WEBSController/GetSourceBillList_Json", {
- HBillType: this.hform.HBillType,
- HSourceBillType: this.hform.HMainSourceBillType,
- HStockOrgID: this.hform.HStockOrgID,
- HSourceBillNo: "",
- HMater: "",
- HCustom: ""
- },
- (res) => {
- let res1 = res.data
- let {
- data,
- count
- } = res1
- if (count == 1) {
- this.HSourceBillNoList = data
- for (var i = 0; i < data.length; i++) {
- this.arrayHSourceBillNo[i] = data[i].鍗曟嵁鍙�
- }
- this.reHSourceBillNo = false
- this.$nextTick(() => {
- this.reHSourceBillNo = true
- })
- } else {
- uni.showToast({
- title: '婧愬崟鏁版嵁璇锋眰澶辫触',
- icon: 'none'
- })
- }
- }
- )
- },
- HSourceBillNoChange(e) {
- this.hform.HSourceBillNo = e
- // this.getHBarCodeData(e)
- // for(var i=0;i<this.HSourceBillNoList.length;i++){
- // if(this.HSourceBillNoList[i].鍗曟嵁鍙� == e){
- // this.hform.HSourceBillNo = this.HSourceBillNoList[i].鍗曟嵁鍙�
- // }
- // }
- },
- // 鑾峰彇鍗曟嵁瀛愮被鍨�
- getHBillSubType() {
- CommonUtils.doRequest(
- "/WEBSController/GetBillSubType_Json", {
- HBillType: this.hform.HBillType,
- HStockOrgID: this.hform.HStockOrgID
- },
- (res) => {
- let {
- count,
- data
- } = res.data
- console.log("HBillSubType", data)
- if (count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- this.HBillSubTypeList = data
- for (let d of data) {
- this.arrayHBillSubType.push(d['HName'])
- }
- }
- }
- )
- },
- // 閫変腑鍗曟嵁瀛愮被鍨�
- HBillSubTypeChange(e) {
- let index = this.arrayHBillSubType.findIndex(
- (subType) => subType.HName == e)
+ HBarCode_B: '',
+ HMaterName_B: '',
+ HMaterModel_B: '',
+ HBatchNo_B: '',
+ HUnitName_B: '',
+ HQty_B: '',
+ HTMQty_B: '',
+ HWHName_B: '',
+ HSPName_B: '',
+ }
+ }
+ },
+ methods: {
+ //鎵爜
+ toScanCode() {
+ var mpaasScanModule = uni.requireNativePlugin("Mpaas-Scan-Module")
+ mpaasScanModule.mpaasScan({
+ 'hideAlbum': true,
+ 'timeoutInterval': '10', //瓒呮椂鏃堕棿
+ 'timeoutText': '鏈瘑鍒埌浜岀淮鐮�' //瓒呮椂鎻愰啋
+ }, (ret) => {
+ console.log(ret.resp_result)
+ if (this.hform.HBarCode == '*') {
+ this.hform.HBarCode = this.hform.HBarCode + ret.resp_result
+ } else {
+ this.hform.HBarCode = ret.resp_result
+ }
- if (index != -1) {
- this.HBillSubType = this.arrayHBillSubType[index]["HName"]
- this.hform.HBillSubType = this.arrayHBillSubType[index]["HNumber"]
- }
- },
- HDateChange(e) {
- console.log(e.detail.value)
- this.hform.HDate = e.detail.value
- },
- RoadBillMain(HInterID) {
- CommonUtils.doRequest(
- "/WEBSController/GetSourceBill_Temp_Json", {
- "HInterID": HInterID,
- "HBillType": this.hform.HBillType
- },
- (res) => {
- console.log('RoadBillMain', res)
- let res1 = res.data
- let {
- data,
- count
- } = res1
- console.log(data)
- if (count == 1) {
- this.hform.HInterID = data[0].HInterID
- this.hform.HBillNo = data[0].HBillNo
- this.hform.HMainSourceBillType = data[0].HSourceBillType
- this.hform.HSourceBillNo = data[0].HSourceBillNo
- if (data[0].HSourceBillType == 1242) {
- this.hform.HMainSourceBillType = 1242
- this.HMainSourceBillType = '鍑哄簱鐢宠鍗�'
- this.showHSupName = false
- } else {
- this.hform.HMainSourceBillType = -1
- this.HMainSourceBillType = '鎵嬪伐褰曞叆'
- }
- this.showHMainSourceBillType = false
+ this.getCode(this.hform.HBarCode)
+ })
+ },
+ //閫夋嫨浠撳簱
+ HWHNameChange(e) {
+ // var name = e.split("(")
+ for (var i = 0; i < this.HWHNameList.length; i++) {
+ if (this.HWHNameList[i]["HName"] == e) {
+ this.hform.HWHName = this.HWHNameList[i]["HName"]
+ this.hform.HWHID = this.HWHNameList[i].HItemID
- //闈炲婧愬崟妯″紡
- if (data[0].HMulSourceBill == 0) {
- this.showHSourceBillNo = false
- }
- this.hform.HDeptID = data[0].HDeptID
- this.hform.HDeptName = data[0].HDeptName
- this.hform.HSupID = data[0].HCusID
- this.hform.HSupName = data[0].HCusName
- this.DisBillEntryList()
- this.tabs = 2
- } else {
- uni.showToast({
- title: '鑾峰彇鏁版嵁鍥炲～澶辫触',
- icon: 'none'
- })
- }
- }
- )
- },
- getNewData() {
- CommonUtils.doRequest("/WEBSController/GetMaxBillNoAndID_Json", {
- HBillType: this.hform.HBillType
- },
- (res) => {
- let res1 = res.data;
- let {
- data,
- count
- } = res1
- if (count == 1) {
- this.hform.HInterID = data[0].HInterID
- this.hform.HBillNo = data[0].HBillNo
- } else {
- uni.showToast({
- title: data.Message,
- icon: 'none'
- })
- }
- })
- },
- getCode(HBarCode) {
- //浠撳簱銆佷粨浣嶆枃鏈涓虹┖鏃讹紝娓呯┖瀵瑰簲ID
- if (!this.hform.HWHName) {
- this.hform.HWHID = 0
- }
- if (!this.hform.HStockPlaceName) {
- this.hform.HStockPlaceID = 0
- }
- var sOldBarCode = HBarCode
- var HDeleteFlag = sOldBarCode.substring(0, 1);
- var sBarCode = sOldBarCode.slice(1);
+ this.showHStockPlaceName = this.HWHNameList[i].HIsStockMgr
+ }
+ }
+ },
+ // 閫夋嫨鍏堣繘鍏堝嚭浠�
+ HFIFOWHNameChange(e) {
+ for (var i = 0; i < this.HWHNameList.length; i++) {
+ if (this.HWHNameList[i]["HName"] == e) {
+ this.hform.HFIFOWHName = this.HWHNameList[i]["HName"]
+ this.hform.HFIFOWHID = this.HWHNameList[i].HItemID
+ }
+ }
+ },
+ //閫夋嫨浠撲綅
+ HStockPlaceNameChange(e) {
+ for (var i = 0; i < this.HStockPlaceNameList.length; i++) {
+ if (this.HStockPlaceNameList[i]['HWhName'] == e) {
+ this.hform.HStockPlaceName = this.HStockPlaceNameList[i]['HWhName']
+ this.hform.HStockPlaceID = this.HStockPlaceNameList[i].HItemID
+ }
+ }
+ },
+ getHBaseList() {
+ CommonUtils.doRequest(
+ "/Web/GetWarehouseList_Json_New", {
+ Warehouse: "",
+ HOrgID: uni.getStorageSync('OrganizationID')
+ },
+ (res) => {
+ let res1 = res.data
+ let {
+ data,
+ count
+ } = res1
+ if (count == 1) {
+ this.HWHNameList = data
+ for (var i = 0; i < data.length; i++) {
+ this.arrayHWHName[i] = data[i]["HName"]
+ }
+ } else {
+ uni.showToast({
+ title: '浠撳簱鏁版嵁璇锋眰澶辫触',
+ icon: 'none'
+ })
+ }
+ },
+ )
+ CommonUtils.doRequest(
+ "/WEBSController/GetStockPlaceList_Json", {
+ StockPlace: '',
+ HWhID: this.hform.HWHID,
+ HStockOrgID: uni.getStorageSync('OrganizationID')
+ },
+ (res) => {
+ let res1 = res.data
+ console.log(res1)
+ let {
+ data,
+ count
+ } = res1
+ if (count == 1) {
+ this.HStockPlaceNameList = data
+ for (var i = 0; i < data.length; i++) {
+ this.arrayHStockPlaceName[i] = data[i]["HWhName"]
+ }
+ } else {
+ uni.showToast({
+ title: '浠撲綅鏁版嵁璇锋眰澶辫触',
+ icon: 'none'
+ })
+ }
+ },
+ )
+ },
+ //閫夋嫨婧愬崟绫诲瀷
+ HMainSourceBillTypeChange(e) {
+ this.HMainSourceBillType = this.arrayHMainSourceBillType[e.detail.value]
+ if (this.HMainSourceBillType == '鍑哄簱鐢宠鍗�') {
+ this.hform.HMainSourceBillType = 1242
+ this.getHYDList()
+ } else {
+ this.hform.HMainSourceBillType = -1
+ this.getHYDList()
+ }
+ },
+ //婧愬崟璧勬枡
+ getHYDList() {
+ CommonUtils.doRequest(
+ "/WEBSController/GetSourceBillList_Json", {
+ HBillType: this.hform.HBillType,
+ HSourceBillType: this.hform.HMainSourceBillType,
+ HStockOrgID: this.hform.HStockOrgID,
+ HSourceBillNo: "",
+ HMater: "",
+ HCustom: ""
+ },
+ (res) => {
+ let res1 = res.data
+ let {
+ data,
+ count
+ } = res1
+ if (count == 1) {
+ this.HSourceBillNoList = data
+ for (var i = 0; i < data.length; i++) {
+ this.arrayHSourceBillNo[i] = data[i].鍗曟嵁鍙�
+ }
+ this.reHSourceBillNo = false
+ this.$nextTick(() => {
+ this.reHSourceBillNo = true
+ })
+ } else {
+ uni.showToast({
+ title: '婧愬崟鏁版嵁璇锋眰澶辫触',
+ icon: 'none'
+ })
+ }
+ }
+ )
+ },
+ HSourceBillNoChange(e) {
+ this.hform.HSourceBillNo = e
+ // this.getHBarCodeData(e)
+ // for(var i=0;i<this.HSourceBillNoList.length;i++){
+ // if(this.HSourceBillNoList[i].鍗曟嵁鍙� == e){
+ // this.hform.HSourceBillNo = this.HSourceBillNoList[i].鍗曟嵁鍙�
+ // }
+ // }
+ },
+ // 鑾峰彇鍗曟嵁瀛愮被鍨�
+ getHBillSubType() {
+ CommonUtils.doRequest(
+ "/WEBSController/GetBillSubType_Json", {
+ HBillType: this.hform.HBillType,
+ HStockOrgID: this.hform.HStockOrgID
+ },
+ (res) => {
+ let {
+ count,
+ data
+ } = res.data
+ console.log("HBillSubType", data)
+ if (count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ this.HBillSubTypeList = data
+ for (let d of data) {
+ this.arrayHBillSubType.push(d['HName'])
+ }
+ }
+ }
+ )
+ },
+ // 閫変腑鍗曟嵁瀛愮被鍨�
+ HBillSubTypeChange(e) {
+ let index = this.arrayHBillSubType.findIndex(
+ (subType) => subType.HName == e)
- var sHWHID = this.hform.HWHID
- var sHSPID = this.hform.HStockPlaceID
- var sHQty = this.hform.HQty
- var sSourceBillNo = this.hform.HSourceBillNo
- var sSourceBillType = this.hform.HMainSourceBillType
- var HSourceFlag = this.hform.HSourceBillNo == '' ? false : true
- console.log(this.hform.HSourceBillNo, HSourceFlag)
- if (HDeleteFlag == "*") {
- if (sBarCode == "") {
- uni.showToast({
- title: '璇疯緭鍏ヨ鍒犻櫎鐨勬潯鐮�',
- icon: 'none'
- })
- } else {
- uni.request({
- url: this.serverUrl + '/WEBSController/set_DelPonderationBillMain_Temp_BarCode_Json',
- data: {
- HInterID: this.hform.HInterID,
- HBillType: this.hform.HBillType,
- HBarCode: sBarCode
- },
- success: (res) => {
- console.log('鍒犻櫎鏉＄爜', res.data);
- this.hform.HBarCode = ''
- if (res.data.count == 1) {
- this.hform.HQty = ''
- this.DisBillEntryList()
- } else {
- uni.showToast({
- title: res.data.Message,
- icon: 'none'
- })
- }
- },
- fail: (res) => {
- console.log(res);
- uni.showToast({
- title: '鎺ュ彛璇锋眰澶辫触',
- icon: 'none'
- })
- },
- });
- }
- } else {
- var sBarCode = this.hform.HBarCode
- if (sHQty == "") {
- sHQty = 0;
- }
- uni.request({
- url: this.serverUrl + '/WEBSController/Get_BarCode_Json',
- data: {
- sBarCode: sBarCode,
- HInterID: this.hform.HInterID,
- HBillType: this.hform.HBillType,
- HBillNo: this.hform.HBillNo,
- HMaker: this.hform.HMaker,
- HWhID: sHWHID,
- HSPID: sHSPID,
- HQty: sHQty,
- HRedBlueFlag: this.hform.HRedBlueFlag,
- SourceFlag: HSourceFlag,
- HSourceBillNo: sSourceBillNo,
- HSourceBillType: sSourceBillType,
- HStockOrgID: this.hform.HStockOrgID,
- HScanStyle: "",
- HCustom1: "",
- HCustom2: ""
- },
- success: (res) => {
- console.log('鎵爜杩斿洖', res.data);
- this.hform.HBarCode = ''
- if (res.data.count == 1) {
- var data = res.data.data
- if (data.hBarTypeField == '浠撳簱鏉＄爜') {
- this.hform.HWHName = data.hWhNameField
- this.hform.HWHID = data.hWhIDField
- this.hform.HStockPlaceName = ''
- this.hform.HStockPlaceID = 0
- if (data.hSPFlagField == 0) {
- this.showHStockPlaceName = false
- } else {
- this.showHStockPlaceName = true
- }
- } else if (data.hBarTypeField == '浠撲綅鏉＄爜') {
- this.hform.HWHName = data.hWhNameField
- this.hform.HWHID = data.hWhIDField
- this.hform.HStockPlaceName = data.hSPNameField
- this.hform.HStockPlaceID = data.hSPIDField
- } else if (data.hBarTypeField == '閮ㄩ棬鏉＄爜') {
- this.hform.HDeptName = data.hDeptNameField
- this.hform.HDeptID = data.hDeptIDField
- this.tabs = 1
- } else if (data.hBarTypeField == '婧愬崟鏉＄爜') {
- this.hform.HSupName = data.hSupNameField
- this.hform.HSupID = data.hSupIDField
- if (data.hDeptIDField != 0) {
- this.hform.HDeptID = data.hDeptIDField
- this.hform.HDeptName = data.hDeptNameField
- }
- this.hform.HSourceBillNo = data.hSourceBillNoField
- //鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
- if (data.hSourceBillTypeField == "1242") {
- this.HMainSourceBillType = '鍑哄簱鐢宠鍗�'
- this.hform.HMainSourceBillType = 1242
- this.showHMainSourceBillType = false
- } else {
- this.HMainSourceBillType = '鎵嬪伐褰曞叆'
- this.hform.HMainSourceBillType = -1
- this.showHMainSourceBillType = false
- }
- if (data.hMulSourceFlagField == 0) {
- this.showHSourceBillNo = false
- }
- //渚涘簲鍟嗕笉鍙紪杈�
- this.showHSupName = false
- this.tabs = 2
- } else { //鐗╂枡鏉＄爜
- this.tabs = 2
- if (!this.hform.HSourceBillNo) {
- this.hform.HSupName = data.hSupNameField
- this.hform.HSupID = data.hSupIDField
- this.hform.HSourceBillNo = data.hSourceBillNoField
- if (data.hDeptIDField != 0) {
- this.hform.HDeptID = data.hDeptIDField
- this.hform.HDeptName = data.hDeptNameField
- }
- console.log(data)
- //鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
- this.hform.HMainSourceBillType = data.hSourceBillTypeField
- if (data.hSourceBillTypeField == "1242") {
- this.HMainSourceBillType = '鍑哄簱鐢宠鍗�'
- this.hform.HMainSourceBillType = 1242
- this.showHMainSourceBillType = false
- } else {
- this.HMainSourceBillType = '鎵嬪伐褰曞叆'
- this.hform.HMainSourceBillType = -1
- this.showHMainSourceBillType = false
- }
- if (data.hMulSourceFlagField == 0) {
- this.showHSourceBillNo = false
- }
- //渚涘簲鍟嗕笉鍙紪杈�
- this.showHSupName = false
- }
- }
- //鏄剧ず琛ㄤ綋鏄庣粏
- this.DisBillEntryList()
- //娓呯┖鏁伴噺
- this.hform.HQty = ''
- } else {
- uni.showToast({
- title: res.data.Message,
- icon: 'none'
- })
- }
- },
- fail: (res) => {
- console.log(res);
- uni.showToast({
- title: '鎺ュ彛璇锋眰澶辫触',
- icon: 'none'
- })
- },
- });
- }
- },
- //鐗╂枡淇℃伅
- DisBillEntryList() {
- CommonUtils.doRequest(
- "/WEBSController/GetBillEntryTmpList_Json", {
- HInterID: this.hform.HInterID,
- HBillNo: this.hform.HBillNo,
- HBillType: this.hform.HBillType,
- HStockOrgID: this.hform.HStockOrgID
- },
- (res) => {
- console.log('鐗╂枡', res.data)
- // if (res.data.count == 1) {
- var data = res.data.data
- this.Materlist = data.Materlist
- if (data.BarCodeDetailslist.length == 0 || !data.BarCodeDetailslist[0].HBarCode) {
- this.hform.HMaterName_B = ''
- this.hform.HMaterModel_B = ''
- this.hform.HBatchNo_B = ''
- this.hform.HUnitName_B = ''
- this.hform.HQty_B = ''
- this.hform.HTMQty_B = ''
- this.hform.HWHName_B = ''
- this.hform.HSPName_B = ''
- } else {
- this.hform.HBarCode_B = data.BarCodeDetailslist[0].HBarCode
- this.hform.HMaterName_B = data.BarCodeDetailslist[0].HMaterName
- this.hform.HMaterModel_B = data.BarCodeDetailslist[0].HMaterModel
- this.hform.HBatchNo_B = data.BarCodeDetailslist[0].HBatchNo
- this.hform.HUnitName_B = data.BarCodeDetailslist[0].HUnitName
- this.hform.HQty_B = data.BarCodeDetailslist[0].HQty
- this.hform.HTMQty_B = data.BarCodeDetailslist[0].HTMQty
- this.hform.HWHName_B = data.BarCodeDetailslist[0].HWHName
- this.hform.HSPName_B = data.BarCodeDetailslist[0].HSPName
- }
- // }
- // else {
- // uni.showToast({
- // title: res.data.Message,
- // icon: 'none'
- // })
- // }
- },
+ if (index != -1) {
+ this.HBillSubType = this.arrayHBillSubType[index]["HName"]
+ this.hform.HBillSubType = this.arrayHBillSubType[index]["HNumber"]
+ }
+ },
+ HDateChange(e) {
+ console.log(e.detail.value)
+ this.hform.HDate = e.detail.value
+ },
+ RoadBillMain(HInterID) {
+ CommonUtils.doRequest(
+ "/WEBSController/GetSourceBill_Temp_Json", {
+ "HInterID": HInterID,
+ "HBillType": this.hform.HBillType
+ },
+ (res) => {
+ console.log('RoadBillMain', res)
+ let res1 = res.data
+ let {
+ data,
+ count
+ } = res1
+ console.log(data)
+ if (count == 1) {
+ this.hform.HInterID = data[0].HInterID
+ this.hform.HBillNo = data[0].HBillNo
+ this.hform.HMainSourceBillType = data[0].HSourceBillType
+ this.hform.HSourceBillNo = data[0].HSourceBillNo
+ if (data[0].HSourceBillType == 1242) {
+ this.hform.HMainSourceBillType = 1242
+ this.HMainSourceBillType = '鍑哄簱鐢宠鍗�'
+ this.showHSupName = false
+ } else {
+ this.hform.HMainSourceBillType = -1
+ this.HMainSourceBillType = '鎵嬪伐褰曞叆'
+ }
+ this.showHMainSourceBillType = false
- )
- },
- // 鍒犻櫎鐗╂枡鐮�
- delMater(item) {
- uni.showModal({
- title: '鎻愮ず',
- content: '纭瑕佸垹闄� " ' + item.鐗╂枡鍚嶇О + ' " 鎵�鏈夋壂鐮佽褰曪紵鍒犻櫎鍚庡皢涓嶅彲鎭㈠锛�',
- success: (res) => {
- if (res.confirm) {
- console.log({
- HInterID: this.hform.HInterID,
- HMaterID: item.HMaterID,
- HAuxPropID: item.HAuxPropID,
- HMTONo: item.HMTONo,
- HSourceInterID: item.HSourceInterID,
- HSourceEntryID: item.HSourceEntryID,
- HBillType: this.hform.HBillType
- })
- CommonUtils.doRequest(
- '/WEBSController/set_DelPonderationBillMain_Temp_InterIDAndSource_Json', {
- HInterID: this.hform.HInterID,
- HMaterID: item.HMaterID,
- HAuxPropID: item.HAuxPropID,
- HMTONo: item.HMTONo,
- HSourceInterID: item.HSourceInterID,
- HSourceEntryID: item.HSourceEntryID,
- HBillType: this.hform.HBillType
- },
- (res) => {
- if (res.data.count == 1) {
- uni.showToast({
- title: res.data.Message,
- icon: 'none'
- })
- this.DisBillEntryList()
- } else {
- uni.showToast({
- title: res.data.Message,
- icon: 'none'
- })
- }
- },
- );
- }
- }
- });
- },
- getHSupList() {
- CommonUtils.doRequest(
- "/Gy_Customer/list", {
- sWhere: "",
- user: uni.getStorageSync('HUserName'),
- Organization: uni.getStorageSync('Organization')
- },
- (res) => {
- let res1 = res.data
- let {
- data,
- count
- } = res1
- if (count == 1) {
- this.HSupNameList = data
- for (var i = 0; i < data.length; i++) {
- this.arrayHSupName[i] = data[i].瀹㈡埛鍚嶇О
- }
- this.$forceUpdate();
- } else {
- uni.showToast({
- title: data.Message,
- icon: 'none'
- })
- }
- }
- )
- },
- //閫夋嫨瀹㈡埛
- HSupNameChange(e) {
- for (var i = 0; i < this.HSupNameList.length; i++) {
- if (this.HSupNameList[i].瀹㈡埛鍚嶇О == e) {
- this.hform.HSupID = this.HSupNameList[i].HItemID
- this.hform.HSupName = this.HSupNameList[i].瀹㈡埛鍚嶇О
- }
- }
- },
- //鑾峰彇浣跨敤閮ㄩ棬鏁版嵁
- getHDeptList() {
- CommonUtils.doRequest(
- "/Gy_Department/list", {
- sWhere: "",
- user: uni.getStorageSync('HUserName'),
- Organization: uni.getStorageSync('Organization')
- },
- (res) => {
- let res1 = res.data
- let {
- data,
- count
- } = res1
- if (count == 1) {
- this.HDeptNameList = data
- for (var i = 0; i < data.length; i++) {
- this.arrayHDeptName[i] = data[i].閮ㄩ棬鍚嶇О
- }
- this.$forceUpdate();
- } else {
- uni.showToast({
- title: '閮ㄩ棬鏁版嵁璇锋眰澶辫触',
- icon: 'none'
- })
- }
- }
- )
- },
- //閫夋嫨浣跨敤閮ㄩ棬
- HDeptNameChange(e) {
- for (var i = 0; i < this.HDeptNameList.length; i++) {
- if (this.HDeptNameList[i].閮ㄩ棬鍚嶇О == e) {
- this.hform.HDeptID = this.HDeptNameList[i].HItemID
- this.hform.HDeptName = this.HDeptNameList[i].閮ㄩ棬鍚嶇О
- }
- }
- },
- //鎿嶄綔鍛�
- getHEmpList() {
- CommonUtils.doRequest("/Web/GetEmployeeList_Json", {
- Employee: '',
- HGroupID: 0,
+ //闈炲婧愬崟妯″紡
+ if (data[0].HMulSourceBill == 0) {
+ this.showHSourceBillNo = false
+ }
+ this.hform.HDeptID = data[0].HDeptID
+ this.hform.HDeptName = data[0].HDeptName
+ this.hform.HSupID = data[0].HCusID
+ this.hform.HSupName = data[0].HCusName
+ this.DisBillEntryList()
+ this.tabs = 2
+ } else {
+ uni.showToast({
+ title: '鑾峰彇鏁版嵁鍥炲～澶辫触',
+ icon: 'none'
+ })
+ }
+ }
+ )
+ },
+ getNewData() {
+ CommonUtils.doRequest("/WEBSController/GetMaxBillNoAndID_Json", {
+ HBillType: this.hform.HBillType
+ },
+ (res) => {
+ let res1 = res.data;
+ let {
+ data,
+ count
+ } = res1
+ if (count == 1) {
+ this.hform.HInterID = data[0].HInterID
+ this.hform.HBillNo = data[0].HBillNo
+ } else {
+ uni.showToast({
+ title: data.Message,
+ icon: 'none'
+ })
+ }
+ })
+ },
+ getCode(HBarCode) {
+ //浠撳簱銆佷粨浣嶆枃鏈涓虹┖鏃讹紝娓呯┖瀵瑰簲ID
+ if (!this.hform.HWHName) {
+ this.hform.HWHID = 0
+ }
+ if (!this.hform.HStockPlaceName) {
+ this.hform.HStockPlaceID = 0
+ }
+ var sOldBarCode = HBarCode
+ var HDeleteFlag = sOldBarCode.substring(0, 1);
+ var sBarCode = sOldBarCode.slice(1);
+
+ var sHWHID = this.hform.HWHID
+ var sHSPID = this.hform.HStockPlaceID
+ var sHQty = this.hform.HQty
+ var sSourceBillNo = this.hform.HSourceBillNo
+ var sSourceBillType = this.hform.HMainSourceBillType
+ var HSourceFlag = this.hform.HSourceBillNo == '' ? false : true
+ console.log(this.hform.HSourceBillNo, HSourceFlag)
+ if (HDeleteFlag == "*") {
+ if (sBarCode == "") {
+ uni.showToast({
+ title: '璇疯緭鍏ヨ鍒犻櫎鐨勬潯鐮�',
+ icon: 'none'
+ })
+ } else {
+ uni.request({
+ url: this.serverUrl +
+ '/WEBSController/set_DelPonderationBillMain_Temp_BarCode_Json',
+ data: {
+ HInterID: this.hform.HInterID,
+ HBillType: this.hform.HBillType,
+ HBarCode: sBarCode
+ },
+ success: (res) => {
+ console.log('鍒犻櫎鏉＄爜', res.data);
+ this.hform.HBarCode = ''
+ if (res.data.count == 1) {
+ this.hform.HQty = ''
+ this.DisBillEntryList()
+ } else {
+ uni.showToast({
+ title: res.data.Message,
+ icon: 'none'
+ })
+ }
+ },
+ fail: (res) => {
+ console.log(res);
+ uni.showToast({
+ title: '鎺ュ彛璇锋眰澶辫触',
+ icon: 'none'
+ })
+ },
+ });
+ }
+ } else {
+ var sBarCode = this.hform.HBarCode
+ if (sHQty == "") {
+ sHQty = 0;
+ }
+ uni.request({
+ url: this.serverUrl + '/WEBSController/Get_BarCode_Json',
+ data: {
+ sBarCode: sBarCode,
+ HInterID: this.hform.HInterID,
+ HBillType: this.hform.HBillType,
+ HBillNo: this.hform.HBillNo,
+ HMaker: this.hform.HMaker,
+ HWhID: sHWHID,
+ HSPID: sHSPID,
+ HQty: sHQty,
+ HRedBlueFlag: this.hform.HRedBlueFlag,
+ SourceFlag: HSourceFlag,
+ HSourceBillNo: sSourceBillNo,
+ HSourceBillType: sSourceBillType,
+ HStockOrgID: this.hform.HStockOrgID,
+ HScanStyle: "",
+ HCustom1: "",
+ HCustom2: ""
+ },
+ success: (res) => {
+ console.log('鎵爜杩斿洖', res.data);
+ this.hform.HBarCode = ''
+ if (res.data.count == 1) {
+ var data = res.data.data
+ if (data.hBarTypeField == '浠撳簱鏉＄爜') {
+ this.hform.HWHName = data.hWhNameField
+ this.hform.HWHID = data.hWhIDField
+ this.hform.HStockPlaceName = ''
+ this.hform.HStockPlaceID = 0
+ if (data.hSPFlagField == 0) {
+ this.showHStockPlaceName = false
+ } else {
+ this.showHStockPlaceName = true
+ }
+ } else if (data.hBarTypeField == '浠撲綅鏉＄爜') {
+ this.hform.HWHName = data.hWhNameField
+ this.hform.HWHID = data.hWhIDField
+ this.hform.HStockPlaceName = data.hSPNameField
+ this.hform.HStockPlaceID = data.hSPIDField
+ } else if (data.hBarTypeField == '閮ㄩ棬鏉＄爜') {
+ this.hform.HDeptName = data.hDeptNameField
+ this.hform.HDeptID = data.hDeptIDField
+ this.tabs = 1
+ } else if (data.hBarTypeField == '婧愬崟鏉＄爜') {
+ this.hform.HSupName = data.hSupNameField
+ this.hform.HSupID = data.hSupIDField
+ if (data.hDeptIDField != 0) {
+ this.hform.HDeptID = data.hDeptIDField
+ this.hform.HDeptName = data.hDeptNameField
+ }
+ this.hform.HSourceBillNo = data.hSourceBillNoField
+ //鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
+ if (data.hSourceBillTypeField == "1242") {
+ this.HMainSourceBillType = '鍑哄簱鐢宠鍗�'
+ this.hform.HMainSourceBillType = 1242
+ this.showHMainSourceBillType = false
+ } else {
+ this.HMainSourceBillType = '鎵嬪伐褰曞叆'
+ this.hform.HMainSourceBillType = -1
+ this.showHMainSourceBillType = false
+ }
+ if (data.hMulSourceFlagField == 0) {
+ this.showHSourceBillNo = false
+ }
+ //渚涘簲鍟嗕笉鍙紪杈�
+ this.showHSupName = false
+ this.tabs = 2
+ } else { //鐗╂枡鏉＄爜
+ this.tabs = 2
+ if (!this.hform.HSourceBillNo) {
+ this.hform.HSupName = data.hSupNameField
+ this.hform.HSupID = data.hSupIDField
+ this.hform.HSourceBillNo = data.hSourceBillNoField
+ if (data.hDeptIDField != 0) {
+ this.hform.HDeptID = data.hDeptIDField
+ this.hform.HDeptName = data.hDeptNameField
+ }
+ console.log(data)
+ //鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
+ this.hform.HMainSourceBillType = data.hSourceBillTypeField
+ if (data.hSourceBillTypeField == "1242") {
+ this.HMainSourceBillType = '鍑哄簱鐢宠鍗�'
+ this.hform.HMainSourceBillType = 1242
+ this.showHMainSourceBillType = false
+ } else {
+ this.HMainSourceBillType = '鎵嬪伐褰曞叆'
+ this.hform.HMainSourceBillType = -1
+ this.showHMainSourceBillType = false
+ }
+ if (data.hMulSourceFlagField == 0) {
+ this.showHSourceBillNo = false
+ }
+ //渚涘簲鍟嗕笉鍙紪杈�
+ this.showHSupName = false
+ }
+ }
+ //鏄剧ず琛ㄤ綋鏄庣粏
+ this.DisBillEntryList()
+ //娓呯┖鏁伴噺
+ this.hform.HQty = ''
+ } else {
+ uni.showToast({
+ title: res.data.Message,
+ icon: 'none'
+ })
+ }
+ },
+ fail: (res) => {
+ console.log(res);
+ uni.showToast({
+ title: '鎺ュ彛璇锋眰澶辫触',
+ icon: 'none'
+ })
+ },
+ });
+ }
+ },
+ //鐗╂枡淇℃伅
+ DisBillEntryList() {
+ CommonUtils.doRequest(
+ "/WEBSController/GetBillEntryTmpList_Json", {
+ HInterID: this.hform.HInterID,
+ HBillNo: this.hform.HBillNo,
+ HBillType: this.hform.HBillType,
+ HStockOrgID: this.hform.HStockOrgID
+ },
+ (res) => {
+ console.log('鐗╂枡', res.data)
+ // if (res.data.count == 1) {
+ var data = res.data.data
+ this.Materlist = data.Materlist
+ if (data.BarCodeDetailslist.length == 0 || !data.BarCodeDetailslist[0].HBarCode) {
+ this.hform.HMaterName_B = ''
+ this.hform.HMaterModel_B = ''
+ this.hform.HBatchNo_B = ''
+ this.hform.HUnitName_B = ''
+ this.hform.HQty_B = ''
+ this.hform.HTMQty_B = ''
+ this.hform.HWHName_B = ''
+ this.hform.HSPName_B = ''
+ } else {
+ this.hform.HBarCode_B = data.BarCodeDetailslist[0].HBarCode
+ this.hform.HMaterName_B = data.BarCodeDetailslist[0].HMaterName
+ this.hform.HMaterModel_B = data.BarCodeDetailslist[0].HMaterModel
+ this.hform.HBatchNo_B = data.BarCodeDetailslist[0].HBatchNo
+ this.hform.HUnitName_B = data.BarCodeDetailslist[0].HUnitName
+ this.hform.HQty_B = data.BarCodeDetailslist[0].HQty
+ this.hform.HTMQty_B = data.BarCodeDetailslist[0].HTMQty
+ this.hform.HWHName_B = data.BarCodeDetailslist[0].HWHName
+ this.hform.HSPName_B = data.BarCodeDetailslist[0].HSPName
+ }
+ // }
+ // else {
+ // uni.showToast({
+ // title: res.data.Message,
+ // icon: 'none'
+ // })
+ // }
+ },
+
+ )
+ },
+ // 鍒犻櫎鐗╂枡鐮�
+ delMater(item) {
+ uni.showModal({
+ title: '鎻愮ず',
+ content: '纭瑕佸垹闄� " ' + item.鐗╂枡鍚嶇О + ' " 鎵�鏈夋壂鐮佽褰曪紵鍒犻櫎鍚庡皢涓嶅彲鎭㈠锛�',
+ success: (res) => {
+ if (res.confirm) {
+ console.log({
+ HInterID: this.hform.HInterID,
+ HMaterID: item.HMaterID,
+ HAuxPropID: item.HAuxPropID,
+ HMTONo: item.HMTONo,
+ HSourceInterID: item.HSourceInterID,
+ HSourceEntryID: item.HSourceEntryID,
+ HBillType: this.hform.HBillType
+ })
+ CommonUtils.doRequest(
+ '/WEBSController/set_DelPonderationBillMain_Temp_InterIDAndSource_Json', {
+ HInterID: this.hform.HInterID,
+ HMaterID: item.HMaterID,
+ HAuxPropID: item.HAuxPropID,
+ HMTONo: item.HMTONo,
+ HSourceInterID: item.HSourceInterID,
+ HSourceEntryID: item.HSourceEntryID,
+ HBillType: this.hform.HBillType
+ },
+ (res) => {
+ if (res.data.count == 1) {
+ uni.showToast({
+ title: res.data.Message,
+ icon: 'none'
+ })
+ this.DisBillEntryList()
+ } else {
+ uni.showToast({
+ title: res.data.Message,
+ icon: 'none'
+ })
+ }
+ },
+ );
+ }
+ }
+ });
+ },
+ getHSupList() {
+ CommonUtils.doRequest(
+ "/Gy_Customer/list", {
+ sWhere: "",
+ user: uni.getStorageSync('HUserName'),
+ Organization: uni.getStorageSync('Organization')
+ },
+ (res) => {
+ let res1 = res.data
+ let {
+ data,
+ count
+ } = res1
+ if (count == 1) {
+ this.HSupNameList = data
+ for (var i = 0; i < data.length; i++) {
+ this.arrayHSupName[i] = data[i].瀹㈡埛鍚嶇О
+ }
+ this.$forceUpdate();
+ } else {
+ uni.showToast({
+ title: data.Message,
+ icon: 'none'
+ })
+ }
+ }
+ )
+ },
+ //閫夋嫨瀹㈡埛
+ HSupNameChange(e) {
+ for (var i = 0; i < this.HSupNameList.length; i++) {
+ if (this.HSupNameList[i].瀹㈡埛鍚嶇О == e) {
+ this.hform.HSupID = this.HSupNameList[i].HItemID
+ this.hform.HSupName = this.HSupNameList[i].瀹㈡埛鍚嶇О
+ }
+ }
+ },
+ //鑾峰彇浣跨敤閮ㄩ棬鏁版嵁
+ getHDeptList() {
+ CommonUtils.doRequest(
+ "/Gy_Department/list", {
+ sWhere: "",
+ user: uni.getStorageSync('HUserName'),
+ Organization: uni.getStorageSync('Organization')
+ },
+ (res) => {
+ let res1 = res.data
+ let {
+ data,
+ count
+ } = res1
+ if (count == 1) {
+ this.HDeptNameList = data
+ for (var i = 0; i < data.length; i++) {
+ this.arrayHDeptName[i] = data[i].閮ㄩ棬鍚嶇О
+ }
+ this.$forceUpdate();
+ } else {
+ uni.showToast({
+ title: '閮ㄩ棬鏁版嵁璇锋眰澶辫触',
+ icon: 'none'
+ })
+ }
+ }
+ )
+ },
+ //閫夋嫨浣跨敤閮ㄩ棬
+ HDeptNameChange(e) {
+ for (var i = 0; i < this.HDeptNameList.length; i++) {
+ if (this.HDeptNameList[i].閮ㄩ棬鍚嶇О == e) {
+ this.hform.HDeptID = this.HDeptNameList[i].HItemID
+ this.hform.HDeptName = this.HDeptNameList[i].閮ㄩ棬鍚嶇О
+ }
+ }
+ },
+ //鎿嶄綔鍛�
+ getHEmpList() {
+ CommonUtils.doRequest("/Web/GetEmployeeList_Json", {
+ Employee: '',
+ HGroupID: 0,
HDeptID: uni.getStorageSync("HDeptID")
- },
- (res) => {
- if (res.data.count == 1) {
- this.HEmpNameList = res.data.data
- for (var i = 0; i < res.data.data.length; i++) {
- this.arrayHEmpName[i] = res.data.data[i].HName
- }
- this.$forceUpdate();
- } else {
- uni.showToast({
- title: '浜哄憳鏁版嵁璇锋眰澶辫触',
- icon: 'none'
- })
- }
- },
- )
- },
- //淇濈
- HKeeperNameChange(e) {
- for (var i = 0; i < this.HEmpNameList.length; i++) {
- if (this.HEmpNameList[i].HName == e) {
- console.log(this.HEmpNameList[i])
- this.hform.HKeeperID = this.HEmpNameList[i].HItemID
- this.hform.HKeeperName = this.HEmpNameList[i].HName
- }
- }
- },
- //楠屾敹
- HSecManagerNameChange(e) {
- for (var i = 0; i < this.HEmpNameList.length; i++) {
- if (this.HEmpNameList[i].HName == e) {
- this.hform.HSecManagerID = this.HEmpNameList[i].HItemID
- this.hform.HSecManagerName = this.HEmpNameList[i].HName
- }
- }
- },
- submit() {
- //浠撳簱銆佷粨浣嶃�佷繚绠°�侀獙鏀躲�侀儴闂ㄣ�佷緵搴斿晢鏂囨湰妗嗕负绌烘椂锛屾竻绌哄搴擨D
- if (!this.hform.HWHName) {
- this.hform.HWHID = 0
- }
- if (!this.hform.HStockPlaceName) {
- this.hform.HStockPlaceID = 0
- }
- if (!this.hform.HKeeperName) {
- this.hform.HKeeperID = 0
- }
- if (!this.hform.HSecManagerName) {
- this.hform.HSecManagerID = 0
- }
- if (!this.hform.HDeptName) {
- this.hform.HDeptID = 0
- }
- if (!this.hform.HSupName) {
- this.hform.HSupID = 0
- }
- if (this.hform.HInterID == 0 || !this.hform.HInterID) {
- uni.showToast({
- title: '鍗曟嵁鍐呯爜鑾峰彇澶辫触锛岄敊璇殑鍗曟嵁鍐呯爜锛�',
- icon: 'none'
- })
- } else if (!this.hform.HBillNo) {
- uni.showToast({
- title: '鍗曟嵁鍙疯幏鍙栧け璐ワ紝閿欒鐨勫崟鎹彿锛�',
- icon: 'none'
- })
- } else if (!this.Materlist || this.Materlist.length == 0) {
- uni.showToast({
- title: '娌℃湁鎵爜淇℃伅锛岃鍏堟壂鎻忔潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�',
- icon: 'none'
- })
- } else {
- var s = 0;
- for (var i = 0; i < this.Materlist.length; i++) {
- if (this.Materlist[i].鏁伴噺 > 0) {
- s = 1;
- }
- }
- if (s == 0) {
- uni.showToast({
- title: '娌℃湁鎵弿鐗╂枡鏉＄爜锛岃鍏堟壂鎻忕墿鏂欐潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�',
- icon: 'none'
- })
- } else {
- uni.showLoading({
- title: '璇风◢鍊�'
- })
+ },
+ (res) => {
+ if (res.data.count == 1) {
+ this.HEmpNameList = res.data.data
+ for (var i = 0; i < res.data.data.length; i++) {
+ this.arrayHEmpName[i] = res.data.data[i].HName
+ }
+ this.$forceUpdate();
+ } else {
+ uni.showToast({
+ title: '浜哄憳鏁版嵁璇锋眰澶辫触',
+ icon: 'none'
+ })
+ }
+ },
+ )
+ },
+ //淇濈
+ HKeeperNameChange(e) {
+ for (var i = 0; i < this.HEmpNameList.length; i++) {
+ if (this.HEmpNameList[i].HName == e) {
+ console.log(this.HEmpNameList[i])
+ this.hform.HKeeperID = this.HEmpNameList[i].HItemID
+ this.hform.HKeeperName = this.HEmpNameList[i].HName
+ }
+ }
+ },
+ //楠屾敹
+ HSecManagerNameChange(e) {
+ for (var i = 0; i < this.HEmpNameList.length; i++) {
+ if (this.HEmpNameList[i].HName == e) {
+ this.hform.HSecManagerID = this.HEmpNameList[i].HItemID
+ this.hform.HSecManagerName = this.HEmpNameList[i].HName
+ }
+ }
+ },
+ // 鑾峰彇鍑哄簱绫诲瀷
+ async getStockOutStyle() {
+ try {
+ let res = await CommonUtils.doRequest2Async({
+ url: 'WEBSController/GetStockOutStyle_Json',
+ })
+
+ let {
+ data,
+ count,
+ Message
+ } = res.data
+
+ if (count == 1) {
+ this.stockOutStyleList = data
+ } else {
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: `鑾峰彇鍑哄簱绫诲瀷澶辫触: ${Message}`
+ })
+ }
+ } catch (err) {
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: `鑾峰彇鍑哄簱绫诲瀷澶辫触: ${err}`
+ })
+ }
+ },
+ submit() {
+ //浠撳簱銆佷粨浣嶃�佷繚绠°�侀獙鏀躲�侀儴闂ㄣ�佷緵搴斿晢鏂囨湰妗嗕负绌烘椂锛屾竻绌哄搴擨D
+ if (!this.hform.HWHName) {
+ this.hform.HWHID = 0
+ }
+ if (!this.hform.HStockPlaceName) {
+ this.hform.HStockPlaceID = 0
+ }
+ if (!this.hform.HKeeperName) {
+ this.hform.HKeeperID = 0
+ }
+ if (!this.hform.HSecManagerName) {
+ this.hform.HSecManagerID = 0
+ }
+ if (!this.hform.HDeptName) {
+ this.hform.HDeptID = 0
+ }
+ if (!this.hform.HSupName) {
+ this.hform.HSupID = 0
+ }
+ if (this.hform.HInterID == 0 || !this.hform.HInterID) {
+ uni.showToast({
+ title: '鍗曟嵁鍐呯爜鑾峰彇澶辫触锛岄敊璇殑鍗曟嵁鍐呯爜锛�',
+ icon: 'none'
+ })
+ } else if (!this.hform.HBillNo) {
+ uni.showToast({
+ title: '鍗曟嵁鍙疯幏鍙栧け璐ワ紝閿欒鐨勫崟鎹彿锛�',
+ icon: 'none'
+ })
+ } else if (!this.Materlist || this.Materlist.length == 0) {
+ uni.showToast({
+ title: '娌℃湁鎵爜淇℃伅锛岃鍏堟壂鎻忔潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�',
+ icon: 'none'
+ })
+ } else {
+ var s = 0;
+ for (var i = 0; i < this.Materlist.length; i++) {
+ if (this.Materlist[i].鏁伴噺 > 0) {
+ s = 1;
+ }
+ }
+ if (s == 0) {
+ uni.showToast({
+ title: '娌℃湁鎵弿鐗╂枡鏉＄爜锛岃鍏堟壂鎻忕墿鏂欐潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�',
+ icon: 'none'
+ })
+ } else {
+ uni.showLoading({
+ title: '璇风◢鍊�'
+ })
- let sMainStr = JSON.stringify(this.hform);
- console.log("涓昏〃锛�" + sMainStr)
+ let sMainStr = JSON.stringify(this.hform);
+ console.log("涓昏〃锛�" + sMainStr)
- CommonUtils.doRequest(
- '/WEBSController/set_SaveOtherOutBill_Json', {
- oMain: sMainStr
- },
- (res) => {
- console.log(1, res);
- uni.hideLoading()
- if (res.data.count == 1) {
- uni.showModal({
- title: '鎻愮ず',
- content: res.data.Message + '銆傛槸鍚︾户缁柊澧烇紵(鐐瑰嚮鍙栨秷杩斿洖涓婄骇椤甸潰)',
- success: (res) => {
- if (res.confirm) {
- console.log('鐢ㄦ埛鐐瑰嚮纭畾');
- uni.redirectTo({
- url: '/pages/caigouruku/POStockInBill?OperationType=1'
- })
- } else if (res.cancel) {
- console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
- setTimeout(() => {
- uni.navigateBack();
- }, 50)
- }
- }
- });
- } else {
- // uni.showToast({
- // title: res.data.Message,
- // icon: 'none'
- // })
- uni.showModal({
- content: res.data.Message,
- showCancel: false,
- complete() {
- uni.hideLoading()
- }
- })
- }
- },
- null,
- "POST"
- )
- }
- }
- },
- goBack() {
- uni.showModal({
- title: '鎻愮ず',
- content: '纭瑕侀��鍑哄綋鍓嶉〉闈㈠悧锛�',
- success: (res) => {
- if (res.confirm) {
- console.log('鐢ㄦ埛鐐瑰嚮纭畾');
- uni.redirectTo({
- url: '/pages/qitachuku/qitachuku'
- })
- } else if (res.cancel) {
- console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
- }
- }
- });
- }
- },
- onLoad(e) {
- console.log(e, this.userInfo)
- this.OperationType = e.OperationType
- if (e.HInterID) {
- this.HInterID_Temp = e.HInterID
- this.btnType = 1
- this.RoadBillMain(e.HInterID)
- } else {
- this.getNewData()
- }
+ CommonUtils.doRequest(
+ '/WEBSController/set_SaveOtherOutBill_Json', {
+ oMain: sMainStr
+ },
+ (res) => {
+ console.log(1, res);
+ uni.hideLoading()
+ if (res.data.count == 1) {
+ uni.showModal({
+ title: '鎻愮ず',
+ content: res.data.Message + '銆傛槸鍚︾户缁柊澧烇紵(鐐瑰嚮鍙栨秷杩斿洖涓婄骇椤甸潰)',
+ success: (res) => {
+ if (res.confirm) {
+ console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+ uni.redirectTo({
+ url: '/pages/caigouruku/POStockInBill?OperationType=1'
+ })
+ } else if (res.cancel) {
+ console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+ setTimeout(() => {
+ uni.navigateBack();
+ }, 50)
+ }
+ }
+ });
+ } else {
+ // uni.showToast({
+ // title: res.data.Message,
+ // icon: 'none'
+ // })
+ uni.showModal({
+ content: res.data.Message,
+ showCancel: false,
+ complete() {
+ uni.hideLoading()
+ }
+ })
+ }
+ },
+ null,
+ "POST"
+ )
+ }
+ }
+ },
+ goBack() {
+ uni.showModal({
+ title: '鎻愮ず',
+ content: '纭瑕侀��鍑哄綋鍓嶉〉闈㈠悧锛�',
+ success: (res) => {
+ if (res.confirm) {
+ console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+ uni.redirectTo({
+ url: '/pages/qitachuku/qitachuku'
+ })
+ } else if (res.cancel) {
+ console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+ }
+ }
+ });
+ }
+ },
+ onLoad(e) {
+ console.log(e, this.userInfo)
+ this.OperationType = e.OperationType
+ if (e.HInterID) {
+ this.HInterID_Temp = e.HInterID
+ this.btnType = 1
+ this.RoadBillMain(e.HInterID)
+ } else {
+ this.getNewData()
+ }
- this.getHBaseList()
- this.getHSupList()
- this.getHEmpList()
- this.getHDeptList()
- this.getHBillSubType()
- }
- }
+ this.getHBaseList()
+ this.getHSupList()
+ this.getHEmpList()
+ this.getHDeptList()
+ this.getHBillSubType()
+ this.getStockOutStyle()
+ }
+ }
</script>
<style lang="scss" scoped>
- .form {
- width: 668rpx;
- margin: 20rpx auto;
- padding-bottom: 240rpx;
- }
+ .form {
+ width: 668rpx;
+ margin: 20rpx auto;
+ padding-bottom: 240rpx;
+ }
- .tab_area {
- width: 100%;
- height: 50rpx;
- }
+ .tab_area {
+ width: 100%;
+ height: 50rpx;
+ }
- .other {
- margin-top: 8rpx;
- text-align: center;
- font-size: 28rpx;
- padding: 4rpx 18rpx;
- color: #1890FF;
- }
+ .other {
+ margin-top: 8rpx;
+ text-align: center;
+ font-size: 28rpx;
+ padding: 4rpx 18rpx;
+ color: #1890FF;
+ }
- .tabs {
- width: 100%;
- display: flex;
- border-bottom: 1px solid #ddd;
- margin: 20rpx 0;
+ .tabs {
+ width: 100%;
+ display: flex;
+ border-bottom: 1px solid #ddd;
+ margin: 20rpx 0;
- view {
- width: 25%;
- font-size: 30rpx;
- color: #555;
- text-align: center;
- padding: 16rpx 0;
- }
+ view {
+ width: 25%;
+ font-size: 30rpx;
+ color: #555;
+ text-align: center;
+ padding: 16rpx 0;
+ }
- .on {
- color: #3a78ff;
- font-weight: bold;
- border-bottom: 3px solid #3a78ff;
- }
- }
+ .on {
+ color: #3a78ff;
+ font-weight: bold;
+ border-bottom: 3px solid #3a78ff;
+ }
+ }
- .form-item {
- display: flex;
- align-items: center;
- font-size: 30rpx;
- padding: 6rpx 0;
+ .form-item {
+ display: flex;
+ align-items: center;
+ font-size: 30rpx;
+ padding: 6rpx 0;
- .title {
- width: 208rpx;
+ .title {
+ width: 208rpx;
- text {
- color: red;
- font-weight: bold;
- }
- }
+ text {
+ color: red;
+ font-weight: bold;
+ }
+ }
- .right {
- width: 450rpx;
- border-radius: 22rpx;
- border: 1px solid #acacac;
- }
+ .right {
+ width: 450rpx;
+ border-radius: 22rpx;
+ border: 1px solid #acacac;
+ }
- .righton {
- width: 450rpx;
- border-radius: 22rpx;
- border: 1px solid #e4e4e4;
- background-color: #e4e4e4;
- }
+ .righton {
+ width: 450rpx;
+ border-radius: 22rpx;
+ border: 1px solid #e4e4e4;
+ background-color: #e4e4e4;
+ }
- input {
- width: 100%;
- padding: 8rpx 20rpx;
- font-size: 30rpx;
- }
+ input {
+ width: 100%;
+ padding: 8rpx 20rpx;
+ font-size: 30rpx;
+ }
- textarea {
- width: 98%;
- padding: 8rpx 20rpx;
- font-size: 30rpx;
- }
+ textarea {
+ width: 98%;
+ padding: 8rpx 20rpx;
+ font-size: 30rpx;
+ }
- }
+ }
- .bottom-btn {
- width: 100%;
- // height: 120rpx;
- position: fixed;
- bottom: 0;
- left: 0;
- background-color: #fff;
- box-shadow: 0 2rpx 10rpx 2rpx rgba(0, 0, 0, 0.4);
- padding: 30rpx 40rpx 40rpx 40rpx;
+ .bottom-btn {
+ width: 100%;
+ // height: 120rpx;
+ position: fixed;
+ bottom: 0;
+ left: 0;
+ background-color: #fff;
+ box-shadow: 0 2rpx 10rpx 2rpx rgba(0, 0, 0, 0.4);
+ padding: 30rpx 40rpx 40rpx 40rpx;
- button {
- border-radius: 50rpx;
- width: 180rpx;
- height: 66rpx;
- line-height: 66rpx;
- font-size: 28rpx;
- }
+ button {
+ border-radius: 50rpx;
+ width: 180rpx;
+ height: 66rpx;
+ line-height: 66rpx;
+ font-size: 28rpx;
+ }
- .btn-a {
- background-color: #3A78FF;
- color: #fff;
- }
+ .btn-a {
+ background-color: #3A78FF;
+ color: #fff;
+ }
- .btn-b {
- background-color: #41a863;
- color: #fff;
- }
+ .btn-b {
+ background-color: #41a863;
+ color: #fff;
+ }
- .btn-c {
- background-color: #acacac;
- color: #fff;
- position: absolute;
- right: 120rpx;
- }
+ .btn-c {
+ background-color: #acacac;
+ color: #fff;
+ position: absolute;
+ right: 120rpx;
+ }
- .btn-d {
- background-color: #ff8901;
- color: #fff;
- }
- }
+ .btn-d {
+ background-color: #ff8901;
+ color: #fff;
+ }
+ }
- .list {
- width: 100%;
+ .list {
+ width: 100%;
- .card-detail {
- width: 100%;
- display: flex;
- flex-wrap: wrap;
- justify-content: space-between;
- line-height: 120%;
+ .card-detail {
+ width: 100%;
+ display: flex;
+ flex-wrap: wrap;
+ justify-content: space-between;
+ line-height: 120%;
- .detail {
- // width: 50%;
- font-size: 26rpx;
- margin-bottom: 12rpx;
- color: #555;
- margin-right: 20rpx;
+ .detail {
+ // width: 50%;
+ font-size: 26rpx;
+ margin-bottom: 12rpx;
+ color: #555;
+ margin-right: 20rpx;
- text {
- color: #999;
- font-size: 26rpx;
- }
- }
- }
+ text {
+ color: #999;
+ font-size: 26rpx;
+ }
+ }
+ }
- .more {
- color: #888;
- font-size: 24rpx;
- display: flex;
- border-top: 1px solid #eee;
- padding-top: 20rpx;
+ .more {
+ color: #888;
+ font-size: 24rpx;
+ display: flex;
+ border-top: 1px solid #eee;
+ padding-top: 20rpx;
- .part {
- width: 50%;
- text-align: center;
- }
- }
- }
+ .part {
+ width: 50%;
+ text-align: center;
+ }
+ }
+ }
</style>
\ No newline at end of file
diff --git a/pages/qitachuku_v2/OtherOutBill.vue b/pages/qitachuku_v2/OtherOutBill.vue
index b2c20ed..5c3579a 100644
--- a/pages/qitachuku_v2/OtherOutBill.vue
+++ b/pages/qitachuku_v2/OtherOutBill.vue
@@ -127,6 +127,15 @@
</view>
</view>
<view class="form-item">
+ <view class="title">鍑哄簱绫诲瀷:</view>
+ <zxz-uni-data-select v-if="showHSupName" required class="right" :localdata="stockOutStyleList"
+ dataKey="HName" dataValue="HName" v-model="hform.HStockStyle">
+ </zxz-uni-data-select>
+ <view class="righton" v-if="!showHSupName">
+ <input name="HSupName" disabled v-model="hform.HSupName" placeholder="璇烽�夋嫨渚涘簲鍟�" />
+ </view>
+ </view>
+ <view class="form-item">
<view class="title">
{{ $t("Kf_OtherOutBill_PDA.Date") == "Kf_OtherOutBill_PDA.Date" ? "鏃ユ湡" : $t("Kf_OtherOutBill_PDA.Date") }}锛�
</view>
@@ -384,7 +393,9 @@
getUserStockRelation
} from '../../utils/userRelationManager';
import BarCodePopupVue from "../../components/BarCodePopup/BarCodePopup.vue";
- import { MpaasScan } from '../../utils/mpaasScan';
+ import {
+ MpaasScan
+ } from '../../utils/mpaasScan';
export default {
data() {
return {
@@ -446,9 +457,11 @@
HDeptNameList: [],
arrayHSupName: [], //瀹㈡埛
HSupNameList: [],
+ HStockOutStyleList: [], // 鍑哄簱绫诲瀷
Materlist: [],
FIFOlist: [],
+
hform: {
HBillType: 1206,
HBillSubType: "",
@@ -457,6 +470,7 @@
SourceFlag: false,
+ HStockStyle: '',
HBarCode: '',
HQty: '',
HWHName: getUserInfo().HWHName,
@@ -512,8 +526,7 @@
},
onLoad(e) {
uni.setNavigationBarTitle({
- title: this.$t("Kf_OtherOutBill_PDA.title") == 'Kf_OtherOutBill_PDA.title' ?
- '鍏朵粬鍑哄簱鍗�' : this.$t("Kf_OtherOutBill_PDA.title")
+ title: this.$t("Kf_OtherOutBill_PDA.title")
});
console.log(e, this.userInfo)
this.OperationType = e.OperationType
@@ -536,6 +549,7 @@
this.GetSourceBillType()
this.getRelationStore()
+ this.getStockOutStyle()
uni.$on('BillSelectComplete', (e) => {
console.log("鎺ユ敹鍒扮殑娑堟伅: ", e.HBillNo)
@@ -547,6 +561,33 @@
uni.$off('BillSelectComplete')
},
methods: {
+ async getStockOutStyle() {
+ try {
+ let res = await CommonUtils.doRequest2Async({
+ url: 'WEBSController/GetStockOutStyle_Json',
+ })
+
+ let {
+ data,
+ count,
+ Message
+ } = res.data
+
+ if (count == 1) {
+ this.stockOutStyleList = data
+ } else {
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: `鑾峰彇鍑哄簱绫诲瀷澶辫触: ${Message}`
+ })
+ }
+ } catch (err) {
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: `鑾峰彇鍑哄簱绫诲瀷澶辫触: ${err}`
+ })
+ }
+ },
toScanBillCode() {
MpaasScan.scanCode((res) => {
this.getHBarCodeData(res)
diff --git a/pages/qitaruku_v2/OtherInBill.vue b/pages/qitaruku_v2/OtherInBill.vue
index d2d0819..2696016 100644
--- a/pages/qitaruku_v2/OtherInBill.vue
+++ b/pages/qitaruku_v2/OtherInBill.vue
@@ -71,9 +71,9 @@
name="HSourceBillNo" v-model="hform.HSourceBillNo" :placeholder="Kf_OtherInBill_PDA" />
</view>
- <view class="icon-wrapper" v-show="showHSourceBillNo" :disabled="hform.HMainSourceBillType == -1">
+<!-- <view class="icon-wrapper" v-show="showHSourceBillNo" :disabled="hform.HMainSourceBillType == -1">
<uni-icons type="search" size="20" @click="showBillList"></uni-icons>
- </view>
+ </view> -->
<view class="icon-wrapper" v-show="showHSourceBillNo" :disabled="hform.HMainSourceBillType === -1">
<uni-icons type="scan" size="20" @click="toScanBillCode"></uni-icons>
</view>
@@ -1560,6 +1560,7 @@
this.hform.HSPName_B = data.BarCodeDetailslist[0].HSPName
}
} else {
+ this.Materlist = []
uni.showToast({
title: res.data.Message,
icon: 'none'
diff --git a/utils/getuiUtils.js b/utils/getuiUtils.js
index c9e8e10..5c8b201 100644
--- a/utils/getuiUtils.js
+++ b/utils/getuiUtils.js
@@ -9,12 +9,55 @@
getClientID(Userbm, UserName) {
// #ifdef APP-PLUS
- const info = plus.push.getClientInfo()
- this.cid = info["clientid"]
- console.log('cid: ', this.cid);
- this.setUserClientIDRelative(Userbm, UserName, this.cid, 1)
+ // 瀹氫箟閲嶈瘯鍙傛暟锛氭渶澶氶噸璇�5娆★紝姣忔闂撮殧1.5绉掞紙鍙牴鎹疄闄呮儏鍐佃皟鏁达級
+ const maxRetry = 5;
+ const retryInterval = 1500;
+ let retryCount = 0;
+
+ // 灏佽鑾峰彇clientid鐨勬牳蹇冮�昏緫
+ const tryGetClientId = () => {
+ try {
+ const info = plus.push.getClientInfo();
+ // 鍏煎iOS涓嶅悓SDK鐗堟湰鐨勫瓧娈靛悕锛坈lientid / clientId锛�
+ const clientid = info?.clientid || info?.clientId;
+
+ // 鎴愬姛鑾峰彇鍒癱lientid
+ if (clientid) {
+ this.cid = clientid;
+ console.log('鎴愬姛鑾峰彇cid: ', this.cid);
+ this.setUserClientIDRelative(Userbm, UserName, this.cid, 1);
+ return;
+ }
+
+ // 鏈幏鍙栧埌锛屼笖杩樻湁閲嶈瘯娆℃暟
+ if (retryCount < maxRetry) {
+ retryCount++;
+ console.log(`绗�${retryCount}娆￠噸璇曡幏鍙朿id锛堟殏鏈幏鍙栧埌锛夛紝鍓╀綑閲嶈瘯娆℃暟锛�${maxRetry - retryCount}`);
+ setTimeout(tryGetClientId, retryInterval);
+ return;
+ }
+
+ // 閲嶈瘯鑰楀敖浠嶆湭鑾峰彇鍒�
+ console.error('閲嶈瘯娆℃暟鑰楀敖锛宨OS鐜涓嬫湭鑾峰彇鍒癱lientid');
+ this.cid = '';
+ // 鍙�夛細姝ゅ鍙坊鍔犺幏鍙栧け璐ョ殑鍏滃簳閫昏緫锛堟瘮濡傝褰曟棩蹇椼�佹彁绀虹敤鎴风瓑锛�
+ this.setUserClientIDRelative(Userbm, UserName, this.cid, 1);
+
+ } catch (error) {
+ console.error('鑾峰彇clientid杩囩▼涓嚭鐜板紓甯革細', error);
+ if (retryCount < maxRetry) {
+ retryCount++;
+ setTimeout(tryGetClientId, retryInterval);
+ }
+ }
+ };
+
+ // 鍚姩绗竴娆¤幏鍙�
+ tryGetClientId();
// #endif
- };
+ }
+
+
async setUserClientIDRelative(Userbm, UserName, ClientID, Online) {
try {
--
Gitblit v1.9.1