Merge branch 'dev' into 'master'

Dev

See merge request !242

src/api/logistics.ts

@@ -168,7 +168,7 @@ export function getLogisticsWayListByCompanyId(companyId: number) {
 }
 // 获取tictok物流承运商
 export function getTiktokCarrier() {
-  return axios.get<never, BaseRespData<{ name: string; id: string,typeCode:string,label:string }[]>>(
+  return axios.get<never, BaseRespData<{ name: string; id: string, typeCode: string, label: string }[]>>(
     'logisticsWay/getTiktokShippingProvider',
   )
 }
@@ -461,6 +461,9 @@ export function logisticsCompanyAllCodelist() {
     '/logisticsCompany/allCodelist',
   )
 }
+/**
+  分拣配置
+ */
 export function getsortingConfigListApi(
   data: IsortingInfo,
   currentPage: number,
@@ -475,6 +478,13 @@ export function getsortingConfigListApi(
     },
   )
 }
+// 详情
+export function getSortingConfig(params: { id: number | string }) {
+  return axios.get<never, BaseRespData<IsortingInfo>>(
+    'logistics/sortingConfig/get',
+    { params },
+  )
+}
 export function createSortingApi(data: IsortingInfo) {
   return axios.post<never, BaseRespData<never>>(
     'logistics/sortingConfig/add',

src/views/logistics/sortingConfiguration.vue

@@ -3,7 +3,7 @@ import { Ilogistics, IsortingInfo } from '@/types/api/logistics'
 import {
   Edit,
   Delete,
-  CirclePlus,
+  // CirclePlus,
   QuestionFilled,
 } from '@element-plus/icons-vue'
 import platformJson from '@/json/platform.json'
@@ -16,6 +16,7 @@ import {
   createSortingApi,
   updateSortingApi,
   deleteSortingApi,
+  getSortingConfig,
 } from '@/api/logistics'
 import { allErpCodeListApi } from '@/api/podCnOrder'
 import { nextTick, ref } from 'vue'
@@ -211,25 +212,25 @@ const handleBatchDelete = async (row: IsortingInfo | null) => {
   ElMessage.success('删除成功')
   search()
 }
-const addLogistics = () => {
-  ElMessageBox.prompt('', '物流方式', {
-    confirmButtonText: '确定',
-    cancelButtonText: '取消',
-    inputErrorMessage: '请输入物流方式',
-    inputPlaceholder: '请输入物流方式',
-  }).then(({ value }: { value: string }) => {
-    if (!value.trim()) {
-      ElMessage.error('物流方式不能为空')
-      return
-    }
-    if (form.value.serviceCode.includes(value)) {
-      ElMessage.warning('物流方式已存在')
-      return
-    }
-    form.value.serviceCode.push(value)
-    ElMessage.success('添加成功')
-  })
-}
+// const addLogistics = () => {
+//   ElMessageBox.prompt('', '物流方式', {
+//     confirmButtonText: '确定',
+//     cancelButtonText: '取消',
+//     inputErrorMessage: '请输入物流方式',
+//     inputPlaceholder: '请输入物流方式',
+//   }).then(({ value }: { value: string }) => {
+//     if (!value.trim()) {
+//       ElMessage.error('物流方式不能为空')
+//       return
+//     }
+//     if (form.value.serviceCode.includes(value)) {
+//       ElMessage.warning('物流方式已存在')
+//       return
+//     }
+//     form.value.serviceCode.push(value)
+//     ElMessage.success('添加成功')
+//   })
+// }
 const createWarehouse = () => {
   createData.value.show = true
   createData.value.isEdit = false
@@ -244,16 +245,17 @@ const createWarehouse = () => {
     formRef.value?.clearValidate()
   })
 }
-const updateSorting = (item: IsortingInfo) => {
+const updateSorting = async (item: IsortingInfo) => {
+  if (!item) return
   createData.value.show = true
   createData.value.isEdit = true
   createData.value.title = '修改'
+  const res = await getSortingConfig({ id: item.id as number | string })
+  if (res.code !== 200) return
+  const { serviceCode, ...rest } = res.data
   form.value = {
-    id: item.id,
-    sortingFacility: item.sortingFacility,
-    sortingArea: item.sortingArea,
-    sortingAreaName: item.sortingAreaName,
-    serviceCode: item.serviceCode ? item.serviceCode.split(',') : [],
+    ...rest,
+    serviceCode: serviceCode ? serviceCode.split(',') : [],
   }
   nextTick(() => {
     formRef.value?.clearValidate()
@@ -640,7 +642,7 @@ useEnterKeyTrigger({
                 :value="item.code"
               ></el-option>
             </el-select>
-            &ensp;
+            <!-- &ensp;
             <el-icon
               color="#409eff"
               size="30"
@@ -648,7 +650,7 @@ useEnterKeyTrigger({
               class="add-btn"
               @click="addLogistics"
               ><CirclePlus
-            /></el-icon>
+            /></el-icon> -->
           </div>
         </el-form-item>
         <el-form-item label="平台" v-else prop="serviceCode">