加工-调整为旧版本

(cherry picked from commit 91c512a8c268a150feee3b920123aae65d7e2306)

src/router/index.ts

@@ -127,18 +127,18 @@ const routes: RouteRecordRaw[] = [
     meta:{title:'退货登记'},
     component: () => import('@/views/returned/register/index.vue')
   },
-  {
-    path: '/processing-detail',
-    name: 'ProcessingDetail',
-    meta:{title:'加工登记'},
-    component: () => import('@/views/processing/register/index.vue')
-  },
   {
     path: '/processing',
     name: 'Processing',
-    meta:{title:'加工任务'},
-    component: () => import('@/views/processing/task/index.vue')
+    meta:{title:'加工登记'},
+    component: () => import('@/views/processing/register/index.vue')
   },
+  // {
+  //   path: '/processing',
+  //   name: 'Processing',
+  //   meta:{title:'加工任务'},
+  //   component: () => import('@/views/processing/task/index.vue')
+  // },
   {
     path: '/putaway',
     name: 'Putaway',

src/views/processing/register/components/addRegisterType.vue

@@ -46,17 +46,11 @@ const props = defineProps({
   processingTypeList: Array
 })
 const typeList=ref([])
-const show = async (list,item) => {
+const show = async (list) => {
   typeTrueFalseBy.value = true
   type.value = []
   count.value = ''
   checkType.value = ''
-  if(item.expectAmount){
-    count.value=item.expectAmount
-    type.value=item.operate
-    const match=['PROFESSIONAL','DEEP','FINE'].find(items => item.operate.includes(items)) || ''
-    checkType.value=match
-  }
   typeList.value=list
 }
 //输入拣货容器号
@@ -105,7 +99,6 @@ const beforeClose = (action) => new Promise(async (resolve) => {
       data.operate.every(op => item.operate.includes(op))
     );
     if(isExist){
-      // data.expectAmount = isExist.expectAmount;
       showToast('选择的加工类型已存在，请检查')
       scanError()
       return resolve(false)

src/views/processing/register/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="register">
     <van-nav-bar
-      title="加工建单" left-arrow fixed placeholder @click-left="historyBack" @click-right="onConfirm()">
+      title="加工建单" left-arrow fixed placeholder @click-left="goBack" @click-right="onConfirm()">
       <template #left>
         <van-icon name="arrow-left" size="25" />
         <div style="color: #fff">返回</div>
@@ -10,26 +10,21 @@
         <div style="color: #fff">提交</div>
       </template>
     </van-nav-bar>
-
-    <van-field v-model="taskDetail.code" type="text" label="任务号" placeholder="任务号"
-               readonly input-align="right" required
+    <van-field v-model="date" type="text" label="登记日期" placeholder="请选择日期"
+               readonly is-link input-align="right" @click="dateTrueFalseBy=true" required
+    />
+    <van-field v-model="ownerCode" type="text" label="登记货主" placeholder="请选择货主" readonly
+               is-link @click="ownerRef.show(1)" input-align="right" required
     />
-<!--    <van-field v-model="date" type="text" label="登记日期" placeholder="请选择日期"-->
-<!--               readonly is-link input-align="right" @click="dateTrueFalseBy=true" required-->
-<!--    />-->
-    <van-field v-model="taskDetail.owner" type="text" label="登记货主" placeholder="请选择货主" readonly
-               input-align="right" required
+    <van-field v-model="code" type="textarea" label="单据信息" placeholder="请填写快递单号/收货任务号，多个用逗号/空格/换行符进行分割"
+               show-word-limit maxlength="500" rows="2" autosize required
     />
-<!--  is-link @click="ownerRef.show(1)"   -->
-<!--    <van-field v-model="code" type="textarea" label="单据信息" placeholder="请填写快递单号/收货任务号，多个用逗号/空格/换行符进行分割"-->
-<!--               show-word-limit maxlength="500" rows="2" autosize required-->
-<!--    />-->
     <van-field v-model="note" type="textarea" label="&nbsp;&nbsp;备注信息" placeholder="请输入备注信息"
-               show-word-limit  maxlength="500" rows="2" autosize
+               show-word-limit  maxlength="500" rows="1" autosize
     />
     <div class="register-content">
       <div class="add-type">
-        <van-button type="primary" round size="small" @click="addType({})">添加类型</van-button>
+        <van-button type="primary" round size="small" @click="addType">添加类型</van-button>
       </div>
       <div class="type-box">
         <div class="type-title">类型表一览</div>
@@ -37,19 +32,16 @@
           <div class="type-item">
             <div class="type-item-item">类型</div>
             <div class="type-item-operate">数量</div>
-            <div class="type-item-operate" >操作</div>
+            <div class="type-item-operate">操作</div>
           </div>
           <div  class="type-item" v-for="(item,index) in typeList" v-if="typeList.length>0">
             <div  class="type-item-item">{{getOperate(item.operate)}}</div>
             <div class="type-item-operate">{{item.expectAmount}}</div>
-            <div style="display: flex" >
-<!--              <span class="type-item-update" @click="addType(item)" >修改</span>-->
-              <span class="type-item-delete" @click="del(item,index)" >删除</span>
-            </div>
+            <div class="type-item-delete" @click="del(item,index)" >删除</div>
           </div>
           <div v-else>
             <van-empty :image="<string>nodataUrl" image-size="140" >
-              <van-button round type="primary" class="bottom-button" size="small" @click="addType({})">添加</van-button>
+              <van-button round type="primary" class="bottom-button" size="small" @click="addType">添加</van-button>
             </van-empty>
           </div>
         </div>
@@ -70,12 +62,11 @@ import { useStore } from '@/store/modules/user'
 import { closeLoading, showLoading } from '@/utils/loading'
 import Owner from '@/components/Owner.vue'
 import { formatDate } from '@/utils/date'
-import { useRoute, useRouter } from 'vue-router'
+import { useRouter } from 'vue-router'
 import nodataUrl from '@/assets/nodata.png'
 import AddRegisterType from '@/views/processing/register/components/addRegisterType.vue'
-import { createProcessing, getProcessingDetail, getProcessingTypeList } from '@/api/processing'
+import { createProcessing, getProcessingTypeList } from '@/api/processing'
 import { toArray, toMap } from '@/utils/dataType'
-const route = useRoute()
 const router = useRouter()
 try {
   getHeader()
@@ -90,7 +81,6 @@ const ownerCode = ref('')
 const date = ref(formatDate(new Date()))
 const note = ref('')
 const code=ref('')
-const taskDetail=ref({}) //任务详情
 const processingTypeList=ref([])
 const processingTypeMap=ref({})
 //添加类型
@@ -107,68 +97,46 @@ const dateConfirm = (e) => {
   date.value = formatDate(e)
   dateTrueFalseBy.value = false
 }
-
-// 获取详情
-const getDetail=()=>{
-  showLoading()
-  getProcessingDetail({code:route.query.code}).then(res => {
-    taskDetail.value=res.data
-    ownerCode.value = res.data.ownerId
-    typeList.value=res.data.typeList
-    note.value=res.data.processNote
-  }).catch(err=>{
-    taskDetail.value={}
-    scanError()
-    showNotify({ type: 'warning', duration: 3000, message: '详情获取失败正在返回上一页' })
-    router.push({name:'Processing'})
-  })
-    .finally(() => {
-    closeLoading()
-  })
-}
-getDetail()
 //提交登记
 const onConfirm = () => {
-  // if(!ownerCode.value){
-  //   showNotify({ type: 'warning', duration: 3000, message: '请选择货主' })
-  //   scanError()
-  //   return
-  // }
+  if(!ownerCode.value){
+    showNotify({ type: 'warning', duration: 3000, message: '请选择货主' })
+    scanError()
+    return
+  }
   if(typeList.value.length==0){
     showNotify({ type: 'warning', duration: 3000, message: '请先添加单据类型' })
     scanError()
     return
   }
-  // if(!code.value){
-  //   showNotify({ type: 'warning', duration: 3000, message: '请先添加单据信息' })
-  //   scanError()
-  //   return
-  // }
+  if(!code.value){
+    showNotify({ type: 'warning', duration: 3000, message: '请先添加单据信息' })
+    scanError()
+    return
+  }
 
   showConfirmDialog({
     title: '温馨提示', message:'是否确认建单' })
     .then(() => {
-    _createProcessing()
+      _createProcessing()
     }).catch(() => {})
 }
 
 const _createProcessing=()=>{
-  const data={id:taskDetail.value.id,note:note.value,warehouse,typeList:typeList.value}
+  const data={owner:ownerItem.value.id,ownerCode:ownerItem.value.code,note:note.value,warehouse,typeList:typeList.value,noList:toArray(code.value)}
   showLoading()
   createProcessing(data).then(res=>{
     closeLoading()
     scanSuccess()
     showConfirmDialog({
-      title: '提示',
+      title: '建单成功',
       message:`加工单号为：${res.data}`,
       confirmButtonText:'复制'
     })
       .then(() => {
         copyText(res.data)
       })
-      .catch(() => {
-        router.push({name:'Processing'})
-      });
+      .catch(() => {});
     reset()
   }).catch(err=>{
     scanError()
@@ -184,7 +152,6 @@ const copyText=(txt) =>{
     const successful = document.execCommand('copy');
     if (successful) {
       showNotify({ type: 'success', duration: 3000, message: '已复制' })
-      router.push({name:'Processing'})
     } else {
       console.error('复制失败');
     }
@@ -194,9 +161,6 @@ const copyText=(txt) =>{
     document.body.removeChild(textarea);
   }
 }
-const historyBack=()=>{
-  history.back();
-}
 const reset=()=>{
   code.value=""
   typeList.value=[]
@@ -204,12 +168,11 @@ const reset=()=>{
   ownerCode.value=''
 }
 //添加类型
-const addType=(item)=>{
-  console.log(item,"item")
-  addRegisterTypeRef.value?.show(typeList.value,item)
+const addType=()=>{
+  addRegisterTypeRef.value?.show(typeList.value)
 }
 const setProcessingType=(data)=>{
-    typeList.value.push(data);
+  typeList.value.push(data)
 }
 //转换类型名称
 const getOperate=(operate)=>{
@@ -265,11 +228,6 @@ window.onRefresh = loadData
             text-align: center
             color: #ff4141
             text-decoration: underline
-          .type-item-update
-            width: 50px
-            text-align: center
-            color: #1861e0
-            text-decoration: underline
         .type-item:last-child
           border-bottom: none