From adff8617c92c57e3af24b558aef236f6ef4c0334 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Thu, 5 Sep 2024 11:58:14 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=96=B0=E5=B0=81=E8=A3=85=E4=B8=80?=
 =?UTF-8?q?=E4=B8=AA=E6=89=AB=E6=8F=8F=E7=BB=84=E4=BB=B62024/7/2=2015:59:0?=
 =?UTF-8?q?0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                         |  10 +--
 src/mycomponents/scan/winScanPackage.vue | 105 +++++++++++++++++++++++
 src/pages.json                           |   7 ++
 src/pages/count/job/countJob.vue         |   8 +-
 4 files changed, 123 insertions(+), 7 deletions(-)
 create mode 100644 src/mycomponents/scan/winScanPackage.vue

diff --git a/.env.development b/.env.development
index d4e2314a..531b171f 100644
--- a/.env.development
+++ b/.env.development
@@ -1,11 +1,11 @@
-VITE_BASE_URL=http://localhost:12080/admin-api
-VITE_BASE_URL_IMAGE=http://172.22.32.9: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":"成都1397","value":2},{"text":"长春2379","value":3}]'
+VITE_TENANT='[{"text":"长春","value":1}]'
 
 # 是否是测试环境
-VITE_isDevelopment=true
+VITE_isDevelopment=false
 
 # 积木报表请求路径
-VITE_JMREPORT_BASE_URL='http://172.22.32.9:90'
+VITE_JMREPORT_BASE_URL='http://172.21.32.14:90'
diff --git a/src/mycomponents/scan/winScanPackage.vue b/src/mycomponents/scan/winScanPackage.vue
new file mode 100644
index 00000000..0d8b48af
--- /dev/null
+++ b/src/mycomponents/scan/winScanPackage.vue
@@ -0,0 +1,105 @@
+<template>
+  <view>
+    <u-popup v-model="show" mode="bottom" :mask-close-able="false">
+      <view class="popup_box">
+        <view class="pop_title uni-flex space-between">
+          <view class="" style="font-size: 35rpx"> 扫描{{ title }} </view>
+
+          <view class="">
+            <image class="fr icons_scan_close" src="/static/icons/icons_scan_close.svg" @click="closeScanPopup()"></image>
+          </view>
+        </view>
+        <view class="">
+          <view class="">
+            <win-com-scan ref="comscan" :placeholder="title" @getResult="getScanResult" :headerType="headerType" :isShowHistory="isShowHistory" :clearResult="true"></win-com-scan>
+          </view>
+        </view>
+      </view>
+    </u-popup>
+    <!-- 模拟扫描功能 -->
+    <win-com-scan v-show="false" ref="comscansimulate" @getResult="getScanResult" :headerType="headerType" :isShowHistory="false" :clearResult="true"></win-com-scan>
+    <com-message ref="comMessageRef" />
+  </view>
+</template>
+
+<script setup lang="ts">
+import { ref, getCurrentInstance, onMounted, nextTick, watch } from 'vue'
+import winComScan from '@/mycomponents/scan/winComScan.vue'
+
+const props = defineProps({
+  title: {
+    type: String,
+    default: '箱标签'
+  },
+  isShowHistory: {
+    type: Boolean,
+    default: true
+  },
+  headerType: {
+    type: String,
+    default: 'HPQ'
+  }
+})
+const show = ref(false)
+const comscansimulate = ref()
+const comscan = ref()
+const comMessageRef = ref()
+const simulateScan = (item) => {
+  comscansimulate.value.setItemCodeSimulate(item.copyContent)
+  comscansimulate.value.clickScanMsg()
+}
+const openScanPopup = () => {
+  setTimeout((res) => {
+    show.value = true
+  }, 200)
+}
+
+const closeScanPopup = () => {
+  show.value = false
+  emit('close', '')
+}
+
+const scanClick = () => {
+  if (comscan.value) {
+    comscan.value.clickScanMsg()
+  }
+}
+
+const cancelClick = () => {
+  if (comscan.value) {
+    comscan.value.clearScanValue()
+  }
+}
+
+const getScanResult = (result) => {
+  if (result.success) {
+    emit('getResult', result)
+  } else {
+    showMessage(result.message)
+  }
+}
+
+const getfocus = () => {
+  if (comscan.value != undefined) {
+    comscan.value.getfocus()
+  }
+}
+
+const losefocus = () => {
+  if (comscan.value != undefined) {
+    comscan.value.losefocus()
+  }
+}
+
+const showMessage = (message) => {
+  comMessageRef.value.showMessage(message)
+}
+</script>
+
+<style lang="scss">
+.scroll-view {
+  overflow-y: scroll;
+  height: auto;
+  max-height: 300rpx;
+}
+</style>
diff --git a/src/pages.json b/src/pages.json
index da3c9cbf..9df8ade7 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -1794,6 +1794,13 @@
 				}
 			}
 		},
+		{
+			"path": "pages/count/job/countDetail",
+			"style": {
+				"navigationBarTitleText": "盘点详细",
+				"enablePullDownRefresh": false
+			}
+		},
 		{
 			"path": "pages/count/job/countBlindDetail",
 			"style": {
diff --git a/src/pages/count/job/countJob.vue b/src/pages/count/job/countJob.vue
index a3b7710b..29d8d734 100644
--- a/src/pages/count/job/countJob.vue
+++ b/src/pages/count/job/countJob.vue
@@ -134,7 +134,9 @@ const getList = (type) => {
   const params = {
     filters,
     pageNo: pageNo.value,
-    pageSize: pageSize.value
+    pageSize: pageSize.value,
+    sort: 'number',
+    by: 'DESC'
   }
   getCountJobList(params)
     .then((res) => {
@@ -250,7 +252,9 @@ const getDataListByType = (code) => {
   const params = {
     filters,
     pageNo: 1,
-    pageSize: 100
+    pageSize: 100,
+    sort: 'number',
+    by: 'DESC'
   }
   getCountJobList(params)
     .then((res) => {