fix：修改问题

src/api/podCnOrder.ts

@@ -743,3 +743,9 @@ export function orderWeighingApi(params: {
     params,
     params,
   )
   )
 }
 }
+//获取物流公司
+export function allErpCodeListApi() {
+  return axios.get<never, BaseRespData<never>>(
+    '/logisticsCompany/allErpCodeList',
+  )
+}

src/views/order/podCN/PodDistributionOrder.vue

@@ -399,6 +399,11 @@ watch(visible, async (value: boolean) => {
     _warehouseId.value = hit ? localId : props.warehouseList[0].id
     _warehouseId.value = hit ? localId : props.warehouseList[0].id
     initPrintDevice()
     initPrintDevice()
     inputActive()
     inputActive()
+    const locaclPrinter = localStorage.getItem('sheetPrinter')
+    const locaclWarehouseId = localStorage.getItem('locaclWarehouseId')
+    if (locaclPrinter) sheetPrinter.value = JSON.parse(locaclPrinter)
+    if (locaclWarehouseId) warehouseId.value = JSON.parse(locaclWarehouseId)
+    emit('set-printer', sheetPrinter.value)
   }
   }
 })
 })
 watch(
 watch(

src/views/order/podCN/components/WeightDialog.vue

@@ -59,7 +59,6 @@
       <div>
       <div>
         <CustomizeTable
         <CustomizeTable
           ref="tableRef"
           ref="tableRef"
-          v-loading="tableLoading"
           border
           border
           :isShowCheckBox="false"
           :isShowCheckBox="false"
           v-model="tableData"
           v-model="tableData"
@@ -110,8 +109,12 @@ interface ILogisticsList {
 }
 }
 import BigNumber from 'bignumber.js'
 import BigNumber from 'bignumber.js'
 import weight from '../components/weigh.js'
 import weight from '../components/weigh.js'
-import { listByNoApi, orderWeighingApi } from '@/api/podCnOrder'
-import { logisticsCompanyAllCodelist } from '@/api/logistics.ts'
+import {
+  listByNoApi,
+  orderWeighingApi,
+  allErpCodeListApi,
+} from '@/api/podCnOrder'
+// import { logisticsCompanyAllCodelist } from '@/api/logistics.ts'
 import CustomizeTable from '@/components/VxeTable.tsx'
 import CustomizeTable from '@/components/VxeTable.tsx'
 import { TableColumn } from '@/components/VxeTable'
 import { TableColumn } from '@/components/VxeTable'
 const tableData = ref<IpodCnWeighingParams[]>([])
 const tableData = ref<IpodCnWeighingParams[]>([])
@@ -121,7 +124,7 @@ const logisticsCompanyCode = ref('')
 const weighInput = ref()
 const weighInput = ref()
 const weightText = ref('')
 const weightText = ref('')
 const allCodelist = ref<ILogisticsList[]>([])
 const allCodelist = ref<ILogisticsList[]>([])
-const tableLoading = ref(false)
+
 const tableRef = ref()
 const tableRef = ref()
 const tableConfig = ref<TableColumn[]>([
 const tableConfig = ref<TableColumn[]>([
   {
   {
@@ -198,7 +201,7 @@ const emits = defineEmits<{
 }>()
 }>()
 const getlogisticsCompanyAllCodelist = async () => {
 const getlogisticsCompanyAllCodelist = async () => {
   try {
   try {
-    const res = await logisticsCompanyAllCodelist()
+    const res = await allErpCodeListApi()
     if (res.code !== 200) return
     if (res.code !== 200) return
     allCodelist.value = res.data
     allCodelist.value = res.data
   } catch (e) {
   } catch (e) {
@@ -238,8 +241,11 @@ const weightChange = async () => {
 
 
   weightText.value = ''
   weightText.value = ''
   console.log(343, weight.weightInput)
   console.log(343, weight.weightInput)
-
-  tableLoading.value = true
+  const loading = ElLoading.service({
+    fullscreen: true,
+    text: '操作中...',
+    background: 'rgba(0, 0, 0, 0.3)',
+  })
   try {
   try {
     const params: {
     const params: {
       type: string
       type: string
@@ -274,7 +280,7 @@ const weightChange = async () => {
   } catch (error) {
   } catch (error) {
     console.log(error)
     console.log(error)
   } finally {
   } finally {
-    tableLoading.value = false
+    loading.close()
   }
   }
   console.log('weightChange')
   console.log('weightChange')
 }
 }
@@ -290,6 +296,11 @@ const weightGet = async () => {
       return
       return
     }
     }
   }
   }
+  const loading = ElLoading.service({
+    fullscreen: true,
+    text: '操作中...',
+    background: 'rgba(0, 0, 0, 0.3)',
+  })
   try {
   try {
     await orderWeighingApi({ podCnWeighingParams: tableData.value })
     await orderWeighingApi({ podCnWeighingParams: tableData.value })
     ElMessage.success('保存称重分拣成功')
     ElMessage.success('保存称重分拣成功')
@@ -297,6 +308,8 @@ const weightGet = async () => {
     emits('updateList')
     emits('updateList')
   } catch (error) {
   } catch (error) {
     console.log(error)
     console.log(error)
+  } finally {
+    loading.close()
   }
   }
 }
 }
 
 

src/views/order/podCN/index.vue

@@ -2802,9 +2802,10 @@ import {
   printNormalPdf,
   printNormalPdf,
   changeLogisticsApi,
   changeLogisticsApi,
   getEmployeeListApi,
   getEmployeeListApi,
+  allErpCodeListApi,
 } from '@/api/podCnOrder'
 } from '@/api/podCnOrder'
 
 
-import { logisticsCompanyAllCodelist } from '@/api/logistics.ts'
+// import { logisticsCompanyAllCodelist } from '@/api/logistics.ts'
 import { BaseRespData } from '@/types/api'
 import { BaseRespData } from '@/types/api'
 import ChangeWayDialog from './components/ChangeWayDialog.vue'
 import ChangeWayDialog from './components/ChangeWayDialog.vue'
 import UpdateAddress from './components/updateAddress.vue'
 import UpdateAddress from './components/updateAddress.vue'
@@ -5392,7 +5393,7 @@ interface ILogisticsList {
 const allCodelist = ref<ILogisticsList[]>([])
 const allCodelist = ref<ILogisticsList[]>([])
 const getlogisticsCompanyAllCodelist = async () => {
 const getlogisticsCompanyAllCodelist = async () => {
   try {
   try {
-    const res = await logisticsCompanyAllCodelist()
+    const res = await allErpCodeListApi()
     if (res.code !== 200) return
     if (res.code !== 200) return
     allCodelist.value = res.data
     allCodelist.value = res.data
   } catch (e) {
   } catch (e) {

src/views/order/podUs/index.vue

@@ -496,7 +496,10 @@
                   ></ElOption>
                   ></ElOption>
                 </ElSelect>
                 </ElSelect>
               </ElFormItem>
               </ElFormItem>
-              <ElFormItem label="拦截订单">
+              <ElFormItem
+                label="拦截订单"
+                v-if="status !== 'CANCEL' && status !== 'INTERCEPTED'"
+              >
                 <ElSelect
                 <ElSelect
                   v-model="searchForm.blocking"
                   v-model="searchForm.blocking"
                   placeholder="请选择"
                   placeholder="请选择"