From 3ed8961d9cb29e1e95439e768b905c1b0c9e5b73 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Mon, 29 Jul 2024 08:58:38 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=8F=91=E6=96=99=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E4=BC=98=E5=85=88=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/common/directory.js | 22 ++++++++++- src/common/style/new_style.css | 6 +++ src/mycomponents/balance/level.vue | 37 +++++++++++++++++++ src/mycomponents/job/jobComMainDetailCard.vue | 13 +++++-- src/pages/index/index.vue | 2 +- 5 files changed, 73 insertions(+), 7 deletions(-) create mode 100644 src/mycomponents/balance/level.vue diff --git a/src/common/directory.js b/src/common/directory.js index e922c360..2ad8acfb 100644 --- a/src/common/directory.js +++ b/src/common/directory.js @@ -22,6 +22,7 @@ let countStageList = []; let locationAreaTypeList = []; let businessList = []; let countScopeTypeList = []; +let priorityList = [] @@ -64,6 +65,7 @@ export function clearCacheData() { locationAreaTypeList = [] businessList = [] countScopeTypeList = [] + priorityList = [] } //获取字典信息 @@ -79,7 +81,6 @@ export function getDirectoryInfo(type) { } } } - return result } @@ -614,5 +615,22 @@ export function getPackUnitName(value) { return resultInfo } - +//获取优先级 +export function getPriorityName(value) { + console.log(344,value) + var resultInfo = ""; + if (priorityList.length == 0) { + priorityList = getDirectoryInfo("priority") + } + console.log(455,priorityList) + if (priorityList.length > 0) { + for (let item of priorityList) { + if (item.value == value) { + resultInfo = item.label + break; + } + } + } + return resultInfo +} locationAreaTypeList \ No newline at end of file diff --git a/src/common/style/new_style.css b/src/common/style/new_style.css index dacc8147..d04e9a6b 100644 --- a/src/common/style/new_style.css +++ b/src/common/style/new_style.css @@ -2138,6 +2138,12 @@ button::after { padding: 5px; } +.card_level { + color: #0689da; + padding: 5px; + font-size: 30rpx; +} + .card_supportCode { color: #DA8910; padding: 5px; diff --git a/src/mycomponents/balance/level.vue b/src/mycomponents/balance/level.vue new file mode 100644 index 00000000..57c2a22e --- /dev/null +++ b/src/mycomponents/balance/level.vue @@ -0,0 +1,37 @@ + + + + + diff --git a/src/mycomponents/job/jobComMainDetailCard.vue b/src/mycomponents/job/jobComMainDetailCard.vue index b37077f0..3fe53d6a 100644 --- a/src/mycomponents/job/jobComMainDetailCard.vue +++ b/src/mycomponents/job/jobComMainDetailCard.vue @@ -9,8 +9,13 @@ - - + + + + + + + @@ -27,8 +32,8 @@ import location from '@/mycomponents/balance/location.vue' import toLocation from '@/mycomponents/balance/toLocation.vue' import batch from '@/mycomponents/balance/batch.vue' - import jobComMainCard from '@/mycomponents/job/jobComMainCard.vue' import itemCompareQty from '@/mycomponents/item/itemCompareQty.vue' + import level from '@/mycomponents/balance/level.vue' export default { components: { @@ -36,8 +41,8 @@ location, toLocation, batch, - jobComMainCard, itemCompareQty, + level }, data() { return {}; diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue index dba09b64..ce10f123 100644 --- a/src/pages/index/index.vue +++ b/src/pages/index/index.vue @@ -359,7 +359,7 @@ "inventory_status", "container_type", "pack_unit", "unplanned_receipt_reason", "unplanned_issue_reason", "scrap_reason", "inspect_failed_reason", "request_status", "inspect_type", "next_action", "sample_method", "transfer_mode", - "count_stage", "inspect_result", "area_type","count_scope_type" + "count_stage", "inspect_result", "area_type","count_scope_type","priority" ] } getDictionaryItem(params).then(res => { From ec4b1771a896858d8b7b383f0b1aba7dfd19251d Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Mon, 29 Jul 2024 10:37:01 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=8F=91=E6=96=99=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BC=98=E5=85=88=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/issue/coms/comIssueRequestPopup.vue | 38 ++++++++++++++++++- .../issue/request/issueRequestCreate.vue | 4 +- 2 files changed, 38 insertions(+), 4 deletions(-) diff --git a/src/pages/issue/coms/comIssueRequestPopup.vue b/src/pages/issue/coms/comIssueRequestPopup.vue index 41628e0b..6c5bacd4 100644 --- a/src/pages/issue/coms/comIssueRequestPopup.vue +++ b/src/pages/issue/coms/comIssueRequestPopup.vue @@ -23,7 +23,20 @@ @confirm="confirmWareHouse"> - + + + + 优先级 + + + + + 位置： @@ -67,6 +80,7 @@ + @@ -136,7 +150,21 @@ maxlength: 10, stdPackInfo: undefined, wareHouseList: [], - showWareHouse: false + showWareHouse: false, + priorityList: [{ + value: 0, + text: "低" + }, + { + value: 1, + text: "中" + }, + { + value: 2, + text: "高" + }, + ], + priority:1,//优先级 } }, props: { @@ -207,6 +235,7 @@ this.itemCode = "请扫描物料信息"; this.rawLocationCode = "" this.positionInfo = "请选择位置" + this.priority = '' this.fromWarehouseCode = "请选择仓库代码" this.workshopCode = "" //车间 this.workShopName = "" @@ -241,6 +270,10 @@ }, confirm() { + if (this.priority === '') { + this.showErrorMessage("请输入优先级", "priority") + return + } if (this.positionInfo == "请选择位置") { this.showErrorMessage("请选择位置") return @@ -286,6 +319,7 @@ fgLocationCode: this.fgLocationCode, fromWarehouseCode: this.fromWarehouseCode, toWarehouseCode: this.fromWarehouseCode, + priority : this.priority, itemCode: this.itemCode, itemName: this.itemName, uom: this.uom, diff --git a/src/pages/issue/request/issueRequestCreate.vue b/src/pages/issue/request/issueRequestCreate.vue index fe896681..63a82335 100644 --- a/src/pages/issue/request/issueRequestCreate.vue +++ b/src/pages/issue/request/issueRequestCreate.vue @@ -107,7 +107,6 @@ //确定需求信息 requestConfirm(action, item) { - if (this.detailSource.subList.length == 0) { this.detailSource = { workshopCode: item.workshopCode, @@ -119,6 +118,7 @@ toLocationCode: item.rawLocationCode, fromWarehouseCode:item.fromWarehouseCode, useOnTheWay:this.useOnTheWay, + priority : item.priority, totalQty: 0, subList: [] } @@ -153,7 +153,7 @@ qty: item.qty, uom: item.uom } - + this.detailSource.priority =item.priority this.detailSource.subList.push(subItem) } else { From 2e8244cde7478ca60fa301c54d93077329291bc7 Mon Sep 17 00:00:00 2001 From: niexiting <85552560@qq.com> Date: Mon, 29 Jul 2024 11:41:24 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=85=88=E8=BF=9B?= =?UTF-8?q?=E5=85=88=E5=87=BA=E7=9B=B4=E6=8E=A5=E8=A1=A5=E6=96=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 2 +- src/common/style/new_style.css | 10 +- src/mycomponents/balance/balance.vue | 11 +- src/mycomponents/balance/balanceSelect.vue | 22 +- .../record/recordComDetailCard.vue | 2 +- src/mycomponents/scan/winComScanBalance.vue | 38 +- .../repleinsh/record/repleinshRecord.vue | 682 +++++++++--------- .../repleinsh/record/repleinshRecordV1.vue | 558 ++++++++++++++ 8 files changed, 950 insertions(+), 375 deletions(-) create mode 100644 src/pages/repleinsh/record/repleinshRecordV1.vue diff --git a/.env.development b/.env.development index 96e32fde..a4608106 100644 --- a/.env.development +++ b/.env.development @@ -1,7 +1,7 @@ #VITE_BASE_URL=http://dev.ccwin-in.com:25300/api/admin-api #VITE_BASE_URL_IMAGE=http://dev.ccwin-in.com:25300/api/admin-api -VITE_BASE_URL=http://172.21.32.13:81/api/admin-api VITE_BASE_URL_IMAGE=http://172.21.32.13:81/admin-api +VITE_BASE_URL=http://172.21.32.14:81/api/admin-api VITE_BASE_URL_IMAGE=http://172.21.32.14:81/admin-api # 租户配置 VITE_TENANT='[{"text":"长春1379","value":1},{"text":"成都1397","value":2},{"text":"长春2379","value":3}]' # 是否是测试环境 diff --git a/src/common/style/new_style.css b/src/common/style/new_style.css index dacc8147..92388b7c 100644 --- a/src/common/style/new_style.css +++ b/src/common/style/new_style.css @@ -2085,6 +2085,12 @@ button::after { vertical-align: middle } +.card_item_code { + color: #329362; + padding: 5px; + font-size: 30rpx; +} + .card_packing_code { color: #3315EB; padding: 5px; @@ -2147,10 +2153,10 @@ button::after { font-size: 32rpx; } -.card_item_code { +/* .card_item_code { color: #F1A532; padding: 5px; -} +} */ .card_product_date { color: #329362; diff --git a/src/mycomponents/balance/balance.vue b/src/mycomponents/balance/balance.vue index a1e31de1..e3a345e2 100644 --- a/src/mycomponents/balance/balance.vue +++ b/src/mycomponents/balance/balance.vue @@ -11,8 +11,6 @@ - - - 复制 - + - - - diff --git a/src/mycomponents/balance/balanceSelect.vue b/src/mycomponents/balance/balanceSelect.vue index 931f3adc..2000cec1 100644 --- a/src/mycomponents/balance/balanceSelect.vue +++ b/src/mycomponents/balance/balanceSelect.vue @@ -6,7 +6,14 @@ - + + + + + + + + @@ -37,13 +44,13 @@ }, methods: { openPopup(items) { - if(Array.isArray(items)){ + if (Array.isArray(items)) { this.balanceItems = items; - }else{ + } else { this.balanceItems = [items]; } - - + + this.$refs['popupItems'].open("center"); }, @@ -52,9 +59,12 @@ this.$refs['popupItems'].close(); }, + close() { + this.$refs['popupItems'].close(); + } } } + \ No newline at end of file diff --git a/src/mycomponents/record/recordComDetailCard.vue b/src/mycomponents/record/recordComDetailCard.vue index f5fd805e..9ae2850e 100644 --- a/src/mycomponents/record/recordComDetailCard.vue +++ b/src/mycomponents/record/recordComDetailCard.vue @@ -72,7 +72,7 @@ isShowStatus: { type: Boolean, - default: false + default: true }, isShowFromLocation: { diff --git a/src/mycomponents/scan/winComScanBalance.vue b/src/mycomponents/scan/winComScanBalance.vue index 9023f7f6..39b00527 100644 --- a/src/mycomponents/scan/winComScanBalance.vue +++ b/src/mycomponents/scan/winComScanBalance.vue @@ -72,12 +72,12 @@ type: Boolean, default: true }, - bussinessCode:{ + bussinessCode: { type: String, default: '' } - - + + }, data() { return { @@ -114,13 +114,13 @@ }, - getScanResult(result) { + getScanResult(result) { this.resultData = result; - if(!result.package){ - this.showErrorMessage(result.label.code+"包装信息为空") + if (!result.package) { + this.showErrorMessage(result.label.code + "包装信息为空") return; } - this.getItemCodeType(result.package.itemCode,callBack=>{ + this.getItemCodeType(result.package.itemCode, callBack => { this.queryBalance(this.resultData) }) }, @@ -130,11 +130,15 @@ itemCode: result.package.itemCode, batch: result.label.batch, packingNumber: result.label.packingNumber, - parentPackingNumber:result.package.parentNumber, + parentPackingNumber: result.package.parentNumber, inventoryStatus: this.fromInventoryStatuses, areaType: this.fromLocationAreaTypeList, - bussinessCode:this.bussinessCode + bussinessCode: this.bussinessCode } + uni.showLoading({ + title: '查询中', + mask: true + }) getBalanceByParams(params).then(res => { uni.hideLoading() if (res.data.length == 0) { @@ -149,10 +153,10 @@ "未查找到库存余额" this.showErrorMessage(hint) } else if (res.data.length == 1) { - + result.balance = res.data[0] - if(result.label.packingNumber!=result.balance.packingNumber){ - result.balance.lableQty=result.label.qty + if (result.label.packingNumber != result.balance.packingNumber) { + result.balance.lableQty = result.label.qty } this.$emit("getBalance", result) // this.closeScanPopup() @@ -166,7 +170,7 @@ this.showErrorMessage(error) }) }, - getItemCodeType(itemCode,callBack) { + getItemCodeType(itemCode, callBack) { uni.showLoading({ title: "加载中", mask: true @@ -201,7 +205,7 @@ showErrorMessage(message) { this.$refs.comMessage.showErrorMessage(message, res => { if (res) { - if(this.$refs.comscan){ + if (this.$refs.comscan) { this.$refs.comscan.getfocus() } } @@ -215,12 +219,12 @@ closeScanPopup() { this.$refs.popup.close() }, - getfocus(){ - if(this.$refs.comscan){ + getfocus() { + if (this.$refs.comscan) { this.$refs.comscan.getfocus() } } - + diff --git a/src/pages/repleinsh/record/repleinshRecord.vue b/src/pages/repleinsh/record/repleinshRecord.vue index 8a1fab48..ddd06aeb 100644 --- a/src/pages/repleinsh/record/repleinshRecord.vue +++ b/src/pages/repleinsh/record/repleinshRecord.vue @@ -1,44 +1,58 @@ @@ -46,93 +60,91 @@ + \ No newline at end of file diff --git a/src/pages/repleinsh/record/repleinshRecordV1.vue b/src/pages/repleinsh/record/repleinshRecordV1.vue new file mode 100644 index 00000000..8a1fab48 --- /dev/null +++ b/src/pages/repleinsh/record/repleinshRecordV1.vue @@ -0,0 +1,558 @@ + + + + + From d65b7cfdc47b99251b006965b2f49a2e2b85bd1e Mon Sep 17 00:00:00 2001 From: niexiting <85552560@qq.com> Date: Mon, 29 Jul 2024 13:55:39 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=85=88=E8=BF=9B?= =?UTF-8?q?=E5=85=88=E5=87=BA=E5=8F=91=E6=96=99=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/request2.js | 83 +- src/pages.json | 2 +- src/pages/issue/coms/comIssueRequestPopup.vue | 4 +- src/pages/issue/record/issueRecord.vue | 964 ++++++++++++------ src/pages/issue/record/issueRecordV1.vue | 432 ++++++++ .../repleinsh/record/repleinshRecord.vue | 2 +- 6 files changed, 1145 insertions(+), 342 deletions(-) create mode 100644 src/pages/issue/record/issueRecordV1.vue diff --git a/src/api/request2.js b/src/api/request2.js index b49c8a03..163e023e 100644 --- a/src/api/request2.js +++ b/src/api/request2.js @@ -2,7 +2,7 @@ import request from './httpRequest3.js' import storage from '../common/utils/storage.js' //公司地址 // 本地地址 -const baseApi = '' +const baseApi = '' /** * 获取验证码 * @param {*} @@ -17,7 +17,7 @@ export function getCaptchaImage(params) { /** * 登录方法 */ -export function login(username, password, code, uuid,tenantName) { +export function login(username, password, code, uuid, tenantName) { return request({ url: baseApi + '/system/auth/login', headers: { @@ -178,7 +178,7 @@ export function getMessageUnreadCount() { * 获取单据开关配置 */ export function getSwitchByCode(params) { - + return request({ url: baseApi + "/wms/switch/getSwitchList", method: "post", @@ -443,9 +443,9 @@ export function getPackageListByNumber(number) { export function getMesPackInfo(code) { var params = { filters: [{ - column:"lowerLim", - action:"==", - value:code + column: "lowerLim", + action: "==", + value: code }], pageNo: 1, pageSize: 10 @@ -1363,7 +1363,7 @@ export function getProductionReceiptJobByProductionline() { data: {}, }); } - + /** * 发料任务明细 * @param {*} 任务id @@ -1383,10 +1383,10 @@ export function getIssueJobDetail(id) { * @param {*} 任务id * /wms/issue-request-main */ -export function getBalanceByBatchOffShelf(itemCode, qty) { +export function getBalanceByBatchOffShelf(itemCode, qty, businesstype) { return request({ url: baseApi + "/wms/issue-request-main/getBalanceByBatchOffShelf?itemCode=" + itemCode + "&&qty=" + - qty, + qty + "&&businesstype=" + businesstype, method: "get", data: {}, }); @@ -4116,7 +4116,7 @@ export function getMainMessage() { */ export function appCheckUpdate() { return request({ - url: baseApi+"/wms/system-install-package/returnNewFile", + url: baseApi + "/wms/system-install-package/returnNewFile", method: "get", data: {} }) @@ -4209,10 +4209,10 @@ export function getPackageLabel(packageCode) { name: name, pageNo: 1, pageSize: 10, - sort:"", - filters:[{ + sort: "", + filters: [{ action: "==", - column:"relateNumber", + column: "relateNumber", value: packageCode }] } @@ -4229,7 +4229,7 @@ export function getPackageLabel(packageCode) { */ export function isCheckMesCode(code) { return request({ - url: baseApi + "/wms/productreceipt-detailb/getCheckWhetherItExists?remark="+code, + url: baseApi + "/wms/productreceipt-detailb/getCheckWhetherItExists?remark=" + code, method: "get", data: {}, }); @@ -4239,11 +4239,11 @@ export function isCheckMesCode(code) { * 获取上架任务打印明细 * @param {*} */ -export function getJimuPutawayJobDetail(data) { - return request({ +export function getJimuPutawayJobDetail(data) { + return request({ url: baseApi + "/wms/jimu-report/getPutawayJobDetailForPDA", method: "post", - data:data + data: data }); } @@ -4251,11 +4251,11 @@ export function getJimuPutawayJobDetail(data) { * 查询库位，后台自己查询管理模式 * @param {*} */ -export function getBalanceByParams(data) { - return request({ +export function getBalanceByParams(data) { + return request({ url: baseApi + "/wms/balance/getBalanceListByPackage", method: "post", - data:data + data: data }); } @@ -4264,11 +4264,11 @@ export function getBalanceByParams(data) { * @param {*} */ -export function getBusinessType() { - return request({ +export function getBusinessType() { + return request({ url: baseApi + "/wms/businesstype/page?pageSize=1000&pageNo=1", method: "get", - data:{} + data: {} }); } @@ -4277,11 +4277,12 @@ export function getBusinessType() { * @param {*} */ -export function getPlaneInfoByproductLine(productionLine,planDate) { - return request({ - url: baseApi + "/wms/production-main/getPlanProductionByProductionLineAndPlanDate?productionLine="+productionLine+"&planDate="+planDate, +export function getPlaneInfoByproductLine(productionLine, planDate) { + return request({ + url: baseApi + "/wms/production-main/getPlanProductionByProductionLineAndPlanDate?productionLine=" + + productionLine + "&planDate=" + planDate, method: "get", - data:{} + data: {} }); } @@ -4290,33 +4291,33 @@ export function getPlaneInfoByproductLine(productionLine,planDate) { * @param {*} */ -export function planReceiptSubmit(params) { - return request({ +export function planReceiptSubmit(params) { + return request({ url: baseApi + "/wms/productreceipt-record-main/createByPlan", method: "post", - data:params + data: params }); } /** * @param {Object} params 创建计划完工后调用上架申请 number */ -export function createPutawayRequestByPlan(number) { - return request({ - url: baseApi + "/wms/productreceipt-record-main/createPutawayRequest?number="+number, +export function createPutawayRequestByPlan(number) { + return request({ + url: baseApi + "/wms/productreceipt-record-main/createPutawayRequest?number=" + number, method: "post", - data:{} + data: {} }); } /** * @param {Object} params 创建检验申请 number */ -export function createInspectRequestByPlan(number) { - return request({ - url: baseApi + "/wms/productreceipt-record-main/createInspectRequest?number="+number, +export function createInspectRequestByPlan(number) { + return request({ + url: baseApi + "/wms/productreceipt-record-main/createInspectRequest?number=" + number, method: "post", - data:{} + data: {} }); } @@ -4324,11 +4325,11 @@ export function createInspectRequestByPlan(number) { /** * @param {Object} params 查询计划报工单号 number */ -export function getPlanByNumber(params) { - return request({ +export function getPlanByNumber(params) { + return request({ url: baseApi + "/wms/production-detail/senior", method: "post", - data:params + data: params }); } diff --git a/src/pages.json b/src/pages.json index 4f875fc9..57d38d42 100644 --- a/src/pages.json +++ b/src/pages.json @@ -593,7 +593,7 @@ { "path": "pages/issue/record/issueRecord", "style": { - "navigationBarTitleText": "直接发料记录", + "navigationBarTitleText": "先进先出发料", "enablePullDownRefresh": false, "titleNView": { "autoBackButton": "true" diff --git a/src/pages/issue/coms/comIssueRequestPopup.vue b/src/pages/issue/coms/comIssueRequestPopup.vue index 6c5bacd4..3b20dfe4 100644 --- a/src/pages/issue/coms/comIssueRequestPopup.vue +++ b/src/pages/issue/coms/comIssueRequestPopup.vue @@ -39,7 +39,7 @@ - 位置： + 目标位置： {{positionInfo}} @@ -51,7 +51,7 @@ - 物料： + 需求物料： {{itemCode}} diff --git a/src/pages/issue/record/issueRecord.vue b/src/pages/issue/record/issueRecord.vue index 478b634c..f40a8116 100644 --- a/src/pages/issue/record/issueRecord.vue +++ b/src/pages/issue/record/issueRecord.vue @@ -1,218 +1,379 @@ - + \ No newline at end of file diff --git a/src/pages/issue/record/issueRecordV1.vue b/src/pages/issue/record/issueRecordV1.vue new file mode 100644 index 00000000..478b634c --- /dev/null +++ b/src/pages/issue/record/issueRecordV1.vue @@ -0,0 +1,432 @@ + + + + + diff --git a/src/pages/repleinsh/record/repleinshRecord.vue b/src/pages/repleinsh/record/repleinshRecord.vue index ddd06aeb..6e6c1ef4 100644 --- a/src/pages/repleinsh/record/repleinshRecord.vue +++ b/src/pages/repleinsh/record/repleinshRecord.vue @@ -251,7 +251,7 @@ itemCode: result.package.itemCode, qty: result.package.qty, } - getBalanceByBatchOffShelf(item.itemCode, item.qty).then(res => { + getBalanceByBatchOffShelf(item.itemCode, item.qty, "Repleinment").then(res => { if (res.data == null) { that.showErrorMessage('未获取到推荐信息'); } else { From d577fd446937cb125e4826d63ffc946c9d340eec Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Mon, 29 Jul 2024 14:03:06 +0800 Subject: [PATCH 5/5] =?UTF-8?q?PDA=E7=AB=AF=E5=A4=84=E7=90=86=E5=A4=9A?= =?UTF-8?q?=E6=AC=A1=E8=A7=A6=E5=8F=91=E4=BA=8B=E4=BB=B6=EF=BC=8C=E9=98=B2?= =?UTF-8?q?=E6=AD=A2=E9=87=8D=E5=A4=8D=E7=82=B9=E5=87=BB=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E5=B7=B2=E6=B7=BB=E5=8A=A0=EF=BC=8C=E7=9B=B4=E6=8E=A5=E8=B0=83?= =?UTF-8?q?=E7=94=A8=E5=B0=B1=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/common/directory.js | 2 -- src/common/noclick.js | 25 +++++++++++++++++++++++++ src/main.js | 7 ++++--- 3 files changed, 29 insertions(+), 5 deletions(-) create mode 100644 src/common/noclick.js diff --git a/src/common/directory.js b/src/common/directory.js index 2ad8acfb..3c2a8980 100644 --- a/src/common/directory.js +++ b/src/common/directory.js @@ -617,12 +617,10 @@ export function getPackUnitName(value) { //获取优先级 export function getPriorityName(value) { - console.log(344,value) var resultInfo = ""; if (priorityList.length == 0) { priorityList = getDirectoryInfo("priority") } - console.log(455,priorityList) if (priorityList.length > 0) { for (let item of priorityList) { if (item.value == value) { diff --git a/src/common/noclick.js b/src/common/noclick.js new file mode 100644 index 00000000..2c4191ee --- /dev/null +++ b/src/common/noclick.js @@ -0,0 +1,25 @@ +// 防止处理多次点击 +function noMultipleClicks(methods, info) { + // methods是需要点击后需要执行的函数， info是点击需要传的参数 + let that = this; + if (that.noClick) { + // 第一次点击 + that.noClick= false; + if(info && info !== '') { + // info是执行函数需要传的参数 + methods(info); + } else { + methods(); + } + setTimeout(()=> { + that.noClick= true; + }, 2000) + } else { + // 这里是重复点击的判断 + } +} + +//导出 +export default { + noMultipleClicks,//禁止多次点击 +} diff --git a/src/main.js b/src/main.js index 5bd28748..6344a1ab 100644 --- a/src/main.js +++ b/src/main.js @@ -4,10 +4,12 @@ import './router/my_router.js'; //引入拦截 import VueClipboard from 'vue-clipboard2' //复制粘贴 import uView from './uni_modules/vk-uview-ui';// 引入 uView UI import comMessage from './mycomponents/common/comMessage.vue' +import noclick from './common/noclick.js' // #ifndef VUE3 import Vue from 'vue' -console.log("Vuew2222"); +console.log("Vuew2222");//配置公共方法 防治多次点击 + Vue.config.productionTip = false Vue.prototype.$store = store Vue.prototype.$adpid = "1111111111" @@ -33,8 +35,7 @@ export function createApp() { app.use(VueClipboard) app.use(uView) app.component('comMessage', comMessage) - - console.log("网络22请求") + app.config.globalProperties.$noMultipleClicks = noclick.noMultipleClicks; // startApp(app); return { app,