zhaohuanhuan 1 rok temu
rodzic
commit
efe2c0d2a6

+ 1 - 1
src/views/outbound/components/BigPicking.vue

@@ -235,7 +235,7 @@ defineExpose({show})
     .sub-task-item
       display: flex
       flex: 1
-      //width: 260px
+      align-items: center
       justify-content: space-between
       .sub-task-item-content
         font-size: 13px

+ 3 - 2
src/views/outbound/picking/list/index.vue

@@ -108,7 +108,7 @@
 </template>
 <script lang="ts" setup>
 import { computed, nextTick, onMounted, onUnmounted, ref, watch } from 'vue'
-import { showDialog, showFailToast, showToast } from 'vant'
+import { showConfirmDialog, showDialog, showFailToast, showToast } from 'vant'
 import { fetchPickingData, getPickingTask } from '@/views/outbound/picking/list/hooks/list'
 import { getOwnerList } from '@/hooks/basic'
 import { useRouter,useRoute } from 'vue-router'
@@ -452,7 +452,7 @@ const onCount=(item,type)=>{
     }
     scanSuccess()
     if(selectTask.value.length===taskItem.value.length){
-      showDialog({
+      showConfirmDialog({
         title:'温馨提示',
         message:'任务已经完成,是否回到选择任务界面'
       }).then(() => {
@@ -466,6 +466,7 @@ const onCount=(item,type)=>{
     onScan(4)
     messageTips.value=err.message
     scanError()
+    showFailToast({duration:5000,message:err.message})
     jumpLoading.value=false
   })
 }

+ 13 - 6
src/views/outbound/picking/task/index.vue

@@ -71,7 +71,7 @@
                     is-link value="获取" @click="onSubCreateTask(item)" >
             <template #title>
               <div style="display: flex;justify-content:space-evenly;">
-                <div style="flex: 1">{{item.carrierName}}</div>
+                <div style="width: 65%">{{item.carrierName}}</div>
                 <div style="flex: 1">{{item.residualOrderQty}}单</div>
               </div>
             </template>
@@ -119,14 +119,19 @@
             <div style="flex: 1"><van-notice-bar :background="'none'" :speed="20" color="#000" :text="model.carrier" /></div>
           </div>
           <div class="tips-item" @click="count=modelCount">数量:<span class="all-count">{{modelCount}}</span></div>
-<!--          <div class="tips-item">类型:{{model.typeDescribe}}</div>-->
           <div class="tips-item" v-if="model.warehouseAttribute">属性仓:{{model.warehouseAttribute}}</div>
           <div class="tips-item" v-if="model.issuePartyName" style="display: flex;align-items: center;">
             <div>店铺:</div>
             <div style="flex: 1"><van-notice-bar :background="'none'" :speed="20" color="#000" :text="model.issuePartyName" /></div>
           </div>
-          <div class="tips-item" v-if="model.ruleName">规则:{{model.ruleName}}</div>
-          <div class="tips-item" v-if="model.remark" style="color: orangered">备注:{{model.remark}}</div>
+          <div class="tips-item" v-if="model.ruleName" style="display: flex;align-items: center;">
+            <div>规则:</div>
+            <div style="flex: 1"><van-notice-bar :background="'none'" :speed="20" color="#000" :text="model.ruleName" /></div>
+          </div>
+          <div class="tips-item" v-if="model.remark" style="display: flex;align-items: center;">
+            <div>规则:</div>
+            <div style="flex: 1"><van-notice-bar :background="'none'" :speed="20"  :text="model.remark" /></div>
+          </div>
         </div>
       </van-form>
     </van-dialog>
@@ -141,7 +146,7 @@
 import { useRoute, useRouter } from 'vue-router'
 import { getTaskList } from '@/views/outbound/picking/task/hooks/task'
 import { computed, nextTick, ref } from 'vue'
-import { showDialog, showToast } from 'vant'
+import { showDialog, showFailToast, showToast } from 'vant'
 import { basicStore } from '@/store/modules/basic'
 import { createPickingTask, getPickingTaskDetail } from '@/api/picking'
 import { useStore } from '@/store/modules/user'
@@ -386,8 +391,10 @@ const createPicking = () => {
     closeLoading()
     router.push('/picking')
     loadData()
-  }).catch(error => {
+  }).catch(err => {
     closeLoading()
+    showFailToast({duration:50000,message:err.message})
+
   })
 };
 const pickingNoInputRef=ref(null)