Ver código fonte

获取任务增加货主

zhaohuanhuan 1 ano atrás
pai
commit
ce1ae9ba28

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

@@ -1,6 +1,6 @@
 <template>
 <template>
   <van-dialog v-model:show="orderBigTrueFalseBy"
   <van-dialog v-model:show="orderBigTrueFalseBy"
-              :title="props.ownerMap[props.model.owner]?'大件拣货-'+props.ownerMap[props.model.owner]:'大件拣货-'+props.model.owner"
+              :title="props.ownerMap[props.model.owner]?props.ownerMap[props.model.owner]+'-大件任务列表':props.model.owner+'-大件任务列表'"
               close-on-click-overlay
               close-on-click-overlay
               :show-cancel-button="false"
               :show-cancel-button="false"
               :show-confirm-button="false"
               :show-confirm-button="false"

+ 7 - 5
src/views/outbound/components/ContainerNoInput.vue

@@ -16,7 +16,7 @@
           <div class="container-item-no">{{item}}</div>
           <div class="container-item-no">{{item}}</div>
         </div>
         </div>
       </div>
       </div>
-<!--      <div class="completion" @click="completion(1)">手动补全</div>-->
+      <div class="completion" @click="completion(1)">手动补全</div>
     </van-dialog>
     </van-dialog>
   </div>
   </div>
 </template>
 </template>
@@ -70,12 +70,13 @@ import { showToast } from 'vant'
     const completion=(item)=>{
     const completion=(item)=>{
       if(item==1){
       if(item==1){
         containerCode.value=`JH-${warehouse}-`
         containerCode.value=`JH-${warehouse}-`
+        setTimeout(()=>{
+          containerCodeRef.value?.focus()
+        },200)
       }else {
       }else {
         containerCode.value=item
         containerCode.value=item
       }
       }
-      // setTimeout(()=>{
-      //   containerCodeRef.value?.focus()
-      // },200)
+
 
 
     }
     }
     defineExpose({show})
     defineExpose({show})
@@ -94,7 +95,8 @@ import { showToast } from 'vant'
        text-decoration: underline
        text-decoration: underline
      .container-list
      .container-list
        max-height: 100px
        max-height: 100px
-       font-size: 12px
+       font-size: 13px
+       font-weight: bold
        display: flex
        display: flex
        padding: 5px 20px
        padding: 5px 20px
        justify-content: space-between
        justify-content: space-between

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

@@ -2,7 +2,7 @@
   <div class="container">
   <div class="container">
     <van-popup v-model:show="selectOwnerTrueFalseBy" destroy-on-close round position="bottom">
     <van-popup v-model:show="selectOwnerTrueFalseBy" destroy-on-close round position="bottom">
       <van-picker
       <van-picker
-        title="选择货主"
+        title="选择货主筛选任务"
         :model-value="pickerValue"
         :model-value="pickerValue"
         :columns="columns"
         :columns="columns"
         @cancel="selectOwnerTrueFalseBy = false"
         @cancel="selectOwnerTrueFalseBy = false"

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

@@ -205,7 +205,7 @@ const loadData =  async (pickingCode) => {
   if(selectTask.value.length>0){
   if(selectTask.value.length>0){
     getDefContainer(selectTask.value)
     getDefContainer(selectTask.value)
   }else {
   }else {
-    onContainerNo(2)
+    // onContainerNo(2)
   }
   }
 }
 }
 
 
@@ -575,11 +575,10 @@ const onRefresh = () => {
               color: #D3D3D3
               color: #D3D3D3
               z-index: -10
               z-index: -10
               opacity: .7
               opacity: .7
-              font-size: 20px
-
+              font-size: 24px
             .c-left-count
             .c-left-count
               font-weight: bold
               font-weight: bold
-              font-size: 20px
+              font-size: 24px
           .c-right
           .c-right
             flex: 0 0 75%
             flex: 0 0 75%
             max-width: 75%
             max-width: 75%

+ 19 - 4
src/views/outbound/picking/task/index.vue

@@ -45,7 +45,7 @@
       <van-back-top right="80vw" bottom="10vh" />
       <van-back-top right="80vw" bottom="10vh" />
     </van-pull-refresh>
     </van-pull-refresh>
     <van-dialog v-model:show="orderTrueFalseBy"
     <van-dialog v-model:show="orderTrueFalseBy"
-                :title="model.type=='*'?'攒单任务':'订单列表'"
+                :title="ownerTaskTitle"
                 show-cancel-button
                 show-cancel-button
                 confirm-button-text="生成任务"
                 confirm-button-text="生成任务"
                 :beforeClose="onBuildTask"
                 :beforeClose="onBuildTask"
@@ -58,7 +58,7 @@
           <van-checkbox-group  v-model="checkedResult" @change="checkedResultChange" >
           <van-checkbox-group  v-model="checkedResult" @change="checkedResultChange" >
             <van-checkbox class="order-item" v-for="(item,index) in taskDetailList" :key="index" :name="item">
             <van-checkbox class="order-item" v-for="(item,index) in taskDetailList" :key="index" :name="item">
               <div v-if="model.type=='*'" class="order-item-detail">
               <div v-if="model.type=='*'" class="order-item-detail">
-                <div class="">{{item.carrierName}}</div>
+                <div class="" style="width: 80px" ><van-notice-bar :background="'none'" :speed="50" color="#000" :text="item.carrierName" /></div>
                 <div class="">{{item.residualOrderQty}}<span style="font-size: 12px">单</span></div>
                 <div class="">{{item.residualOrderQty}}<span style="font-size: 12px">单</span></div>
                 <div @click.stop class="">
                 <div @click.stop class="">
                   <van-stepper v-model="item.taskCount" :min="1" :max="item.residualOrderQty" input-width="50px"	theme="round"  button-size="30" />
                   <van-stepper v-model="item.taskCount" :min="1" :max="item.residualOrderQty" input-width="50px"	theme="round"  button-size="30" />
@@ -78,7 +78,7 @@
     </van-dialog>
     </van-dialog>
     <van-dialog v-model:show="createTaskTrueFalseBy"
     <van-dialog v-model:show="createTaskTrueFalseBy"
                 :beforeClose="beforeClose"
                 :beforeClose="beforeClose"
-                title="生成任务" show-cancel-button  >
+                :title="ownerTaskTitle" show-cancel-button  >
       <van-form>
       <van-form>
         <van-field
         <van-field
           v-model="count"
           v-model="count"
@@ -115,7 +115,7 @@
 <script lang="ts" setup>
 <script lang="ts" setup>
 import { useRouter } from 'vue-router'
 import { useRouter } from 'vue-router'
 import { getTaskList } from '@/views/outbound/picking/task/hooks/task'
 import { getTaskList } from '@/views/outbound/picking/task/hooks/task'
-import { computed, nextTick, ref } from 'vue'
+import { computed, ref } from 'vue'
 import { showToast } from 'vant'
 import { showToast } from 'vant'
 import { basicStore } from '@/store/modules/basic'
 import { basicStore } from '@/store/modules/basic'
 import { createPickingTask, getPickingTaskDetail } from '@/api/picking'
 import { createPickingTask, getPickingTaskDetail } from '@/api/picking'
@@ -146,6 +146,21 @@ const loadData = async () => {
   allTaskList.value=taskList.value
   allTaskList.value=taskList.value
 }
 }
 loadData()
 loadData()
+const ownerTaskTitle = computed(() => {
+  const owner = ownerMap.value[model.value.owner];
+  const type = model.value.type;
+  const typeMap = {
+    '*': '攒单任务',
+    'S': '特殊订单列表',
+    'U': '加急订单列表',
+    'N': '普通/截单生成任务',
+    'Y': '单品生成任务',
+  };
+  const typeTitle = typeMap[type] || '订单列表';
+
+  return owner ? `${owner}-${typeTitle}` : typeTitle;
+});
+
 /**
 /**
  * 获取任务列表
  * 获取任务列表
  */
  */