Inicio Explorar Axuda
Iniciar sesión
baoshi-front-end
/
baoshi-swms-app-web
2
0
Fork 0
Ficheiros Incidencias 0 Pull Requests 0 Wiki
Explorar o código

拣货完成优化

zhaohuanhuan hai 1 ano
pai
efe2c0d2a6
achega
72fbd06ed0
Modificáronse 4 ficheiros con 23 adicións e 3 borrados
Unificar vista Mostrar estatísticas de Diff
  1. 16 0
      index.html
  2. 3 1
      src/views/outbound/components/BigPicking.vue
  3. 3 1
      src/views/outbound/picking/list/index.vue
  4. 1 1
      src/views/outbound/picking/task/index.vue

+ 16 - 0
index.html
Ver ficheiro 

@@ -8,11 +8,27 @@
 
       content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, viewport-fit=cover"
 
       content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, viewport-fit=cover"
 
     />
 
     />
 
     <title>h5</title>
 
     <title>h5</title>
 
+    <style>
 
+        #splash {
 
+            position: fixed;
 
+            top: 0;
 
+            left: 0;
 
+            width: 100%;
 
+            height: 100%;
 
+            background: #fff url('src/assets/img.png') no-repeat center center;
 
+            background-size: contain;
 
+            z-index: 9999;
 
+        }
 
+    </style>
 
   </head>
 
   </head>
 
   <body>
 
   <body>
 
     <div id="app"></div>
 
     <div id="app"></div>
 
+    <div id="splash"></div>
 
     <script type="module" src="/src/main.ts"></script>
 
     <script type="module" src="/src/main.ts"></script>
 
     <script>
 
     <script>
 
+      window.onload = function() {
 
+        document.getElementById('splash').style.display = 'none'; // 隐藏启动页
 
+      }
 
       function getBrowserInfo() {
 
       function getBrowserInfo() {
 
         const userAgent = navigator.userAgent;
 
         const userAgent = navigator.userAgent;
 
         let browserName = "Unknown";
 
         let browserName = "Unknown";

+ 3 - 1
src/views/outbound/components/BigPicking.vue
Ver ficheiro 

@@ -30,7 +30,7 @@
 
     <div class="sub-task-list" >
 
     <div class="sub-task-list" >
 
       <van-checkbox  class="sub-task-checkbox" v-model="isCheckAll"  :indeterminate="isIndeterminate"  @change="checkAllChange">全选</van-checkbox>
 
       <van-checkbox  class="sub-task-checkbox" v-model="isCheckAll"  :indeterminate="isIndeterminate"  @change="checkAllChange">全选</van-checkbox>
 
       <van-checkbox-group  v-model="checkedResult" @change="checkedChange">
 
       <van-checkbox-group  v-model="checkedResult" @change="checkedChange">
 
-        <van-checkbox class="sub-task-checkbox" v-for="(item,index) in typeTaskList" :key="index" :name="item" :disabled="item.allowPick===false && taskType==='EQUIPMENT_PICK'" >
 
+        <van-checkbox class="sub-task-checkbox" v-for="(item,index) in typeTaskList" :key="index" :name="item" :disabled="(item.allowPick===false && taskType==='EQUIPMENT_PICK') || item.status!==40" >
 
           <div class="sub-task-item" v-if="taskType==='LOCATION_PICK'">
 
           <div class="sub-task-item" v-if="taskType==='LOCATION_PICK'">
 
             <div  style="font-size: 13px;font-weight: bold" >{{item.location}}</div>
 
             <div  style="font-size: 13px;font-weight: bold" >{{item.location}}</div>
 
             <div class="sub-task-item-content" >
 
             <div class="sub-task-item-content" >
 
@@ -128,6 +128,8 @@ const checkAllChange = (val) => {
 
   let filteredList=typeTaskList.value
 
   let filteredList=typeTaskList.value
 
   if(taskType.value==='EQUIPMENT_PICK'){
 
   if(taskType.value==='EQUIPMENT_PICK'){
 
    filteredList = typeTaskList.value.filter(item => item.allowPick !== false )
 
    filteredList = typeTaskList.value.filter(item => item.allowPick !== false )
 
+  }else{
 
+    typeTaskList.value.filter(item => item.status!==40 )
 
   }
 
   }
 
   checkedResult.value = val ? filteredList : []
 
   checkedResult.value = val ? filteredList : []
 
   isIndeterminate.value = false
 
   isIndeterminate.value = false

+ 3 - 1
src/views/outbound/picking/list/index.vue
Ver ficheiro 

@@ -221,6 +221,8 @@ const loadData =  async (pickingCode) => {
 
   if(selectTask.value.length>0){
 
   if(selectTask.value.length>0){
 
     getDefContainer(selectTask.value)
 
     getDefContainer(selectTask.value)
 
   }else {
 
   }else {
 
+    scanBarcode.value=''
 
+    containerNo.value=''
 
     // onContainerNo(2)
 
     // onContainerNo(2)
 
   }
 
   }
 
 }
 
 }
 
@@ -456,7 +458,7 @@ const onCount=(item,type)=>{
 
         title:'温馨提示',
 
         title:'温馨提示',
 
         message:'任务已经完成,是否回到选择任务界面'
 
         message:'任务已经完成,是否回到选择任务界面'
 
       }).then(() => {
 
       }).then(() => {
 
-        router.push('/picking-task')
 
+        getPickingCode()
 
       }).catch(() => {
 
       }).catch(() => {
 
         loadData(pickingNo.value)
 
         loadData(pickingNo.value)
 
       })
 
       })

+ 1 - 1
src/views/outbound/picking/task/index.vue
Ver ficheiro 

@@ -393,7 +393,7 @@ const createPicking = () => {
 
     loadData()
 
     loadData()
 
   }).catch(err => {
 
   }).catch(err => {
 
     closeLoading()
 
     closeLoading()
 
-    showFailToast({duration:50000,message:err.message})
 
+    showFailToast({duration:5000,message:err.message})
 
 
 
   })
 
   })
 
 };
 
 };