新增字段

src/views/resource-guard/device-guard/device-send/index.vue

@@ -95,6 +95,7 @@
         :columns="columns"
         :data="tableData"
         bordered
+        v-loading="loading"
         :pagination="{
           defaultCurrent: 1,
           defaultPageSize: 10,
@@ -209,7 +210,11 @@ import {
   deviceSendExportApi,
   deviceSendReturn,
 } from '@/api/resource-guard';
-import { DEVICE_SEND_STATUS, DEVICE_USAGE_TYPE } from '@/config/constants';
+import {
+  DEVICE_SEND_STATUS,
+  DEVICE_USAGE_TYPE,
+  INOUT_TYPE,
+} from '@/config/constants';
 import usePermission from '@/hooks/usePermission';
 import EditDeviceInfoDialog from './edit-device-info-dialog.vue';
 import { dictToOptionList } from '@/utils/tool';
@@ -225,7 +230,7 @@ const fields = ref([
     prop: 'serviceId',
     label: '服务单元',
     type: 'select',
-    labelWidth: 80,
+    labelWidth: 84,
     colSpan: 6,
     cell: 'service',
   },
@@ -233,7 +238,7 @@ const fields = ref([
     prop: 'usageType',
     label: '用途类型',
     type: 'select',
-    labelWidth: 80,
+    labelWidth: 84,
     colSpan: 6,
     options: dictToOptionList(DEVICE_USAGE_TYPE),
     attrs: {
@@ -243,7 +248,7 @@ const fields = ref([
   {
     prop: 'crmNo',
     label: '项目单号',
-    labelWidth: 80,
+    labelWidth: 84,
     colSpan: 6,
     attrs: {
       clearable: true,
@@ -253,7 +258,7 @@ const fields = ref([
     prop: 'status',
     label: '发货状态',
     type: 'select',
-    labelWidth: 80,
+    labelWidth: 84,
     colSpan: 6,
     options: dictToOptionList(DEVICE_SEND_STATUS),
     attrs: {
@@ -264,14 +269,14 @@ const fields = ref([
     prop: 'deliverUserId',
     label: '发货人',
     type: 'select',
-    labelWidth: 80,
+    labelWidth: 84,
     colSpan: 6,
     cell: 'user',
   },
   {
     prop: 'deliverTime',
     label: '发货时间',
-    labelWidth: 80,
+    labelWidth: 84,
     type: 'daterange',
     colSpan: 12,
     attrs: {
@@ -282,7 +287,7 @@ const fields = ref([
   {
     prop: 'deviceNo',
     label: '设备编号',
-    labelWidth: 80,
+    labelWidth: 84,
     colSpan: 6,
     attrs: {
       clearable: true,
@@ -291,7 +296,7 @@ const fields = ref([
   {
     prop: 'supplierId',
     label: '供应商',
-    labelWidth: 80,
+    labelWidth: 84,
     type: 'select',
     colSpan: 6,
     cell: 'supplier',
@@ -299,7 +304,7 @@ const fields = ref([
   {
     prop: 'receiveTime',
     label: '验收时间',
-    labelWidth: 80,
+    labelWidth: 84,
     type: 'daterange',
     colSpan: 12,
     attrs: {
@@ -310,7 +315,7 @@ const fields = ref([
   {
     prop: 'serialNo',
     label: '设备序列号',
-    labelWidth: 80,
+    labelWidth: 84,
     colSpan: 6,
     attrs: {
       clearable: true,
@@ -319,7 +324,7 @@ const fields = ref([
   {
     prop: 'consignee',
     label: '收件人',
-    labelWidth: 80,
+    labelWidth: 84,
     colSpan: 6,
     attrs: {
       clearable: true,
@@ -328,7 +333,45 @@ const fields = ref([
   {
     prop: 'mailingAddress',
     label: '收件地址',
-    labelWidth: 80,
+    labelWidth: 84,
+    colSpan: 6,
+    attrs: {
+      clearable: true,
+    },
+  },
+  {
+    prop: 'deliveryType',
+    label: '出入库状态',
+    type: 'select',
+    options: dictToOptionList(INOUT_TYPE),
+    labelWidth: 84,
+    colSpan: 6,
+    attrs: {
+      clearable: true,
+    },
+  },
+  {
+    prop: 'brand',
+    label: '品牌',
+    labelWidth: 84,
+    colSpan: 6,
+    attrs: {
+      clearable: true,
+    },
+  },
+  {
+    prop: 'model',
+    label: '型号',
+    labelWidth: 84,
+    colSpan: 6,
+    attrs: {
+      clearable: true,
+    },
+  },
+  {
+    prop: 'expressNo',
+    label: '快递单号',
+    labelWidth: 84,
     colSpan: 6,
     attrs: {
       clearable: true,
@@ -363,6 +406,10 @@ const params = reactive({
   serialNo: '',
   consignee: '',
   mailingAddress: '',
+  deliveryType: '',
+  brand: '',
+  model: '',
+  expressNo: '',
 });
 const computedParams = computed(() => {
   let data = omit(params, ['deliverTime', 'receiveTime']);
@@ -480,16 +527,14 @@ const columns = [
     width: 160,
   },
 ];
-const { pagination, tableData, fetchData, search, onChange } = useFetchTable(
-  deviceSendListApi,
-  {
+const { pagination, tableData, fetchData, search, onChange, loading } =
+  useFetchTable(deviceSendListApi, {
     fetchDataHandle: () => {
       selectedRowKeys.value = [];
       tableKey.value = Date.now() + '';
     },
     params: computedParams,
-  }
-);
+  });
 
 const selectedRowKeys = ref([]);
 const selectChange = (value) => {

src/views/resource-guard/device-guard/registration-query/index.vue

@@ -22,6 +22,7 @@
         :columns="columns"
         :data="tableData"
         bordered
+        v-loading="loading"
         :pagination="{
           defaultCurrent: 1,
           defaultPageSize: 10,
@@ -68,7 +69,11 @@ import { omit } from 'lodash';
 import { registrationQueryListApi } from '@/api/resource-guard';
 import useFetchTable from '@/hooks/useFetchTable';
 import { dictToOptionList } from '@/utils/tool';
-import { DEVICE_USAGE_TYPE, RUNNING_STATUS } from '@/config/constants';
+import {
+  DEVICE_USAGE_TYPE,
+  RUNNING_STATUS,
+  INOUT_TYPE,
+} from '@/config/constants';
 import {
   deviceUsageTypeFilter,
   inoutTypeFilter,
@@ -196,6 +201,17 @@ const fields = ref([
       clearable: true,
     },
   },
+  {
+    prop: 'inOutType',
+    label: '出入库状态',
+    type: 'select',
+    options: dictToOptionList(INOUT_TYPE),
+    labelWidth: 84,
+    colSpan: 6,
+    attrs: {
+      clearable: true,
+    },
+  },
 ]);
 const params = reactive({
   serviceUnitId: '',
@@ -209,6 +225,7 @@ const params = reactive({
   location: '',
   address: '',
   serialNo: '',
+  inOutType: '',
 });
 
 const computedParams = computed(() => {
@@ -237,7 +254,7 @@ const columns = [
   { colKey: 'location', title: '当前地' },
   { colKey: 'address', title: '发往地' },
 ];
-const { pagination, tableData, search, onChange } = useFetchTable(
+const { pagination, tableData, search, onChange, loading } = useFetchTable(
   registrationQueryListApi,
   {
     params: computedParams,

src/views/sop/sop-manage/device-out-in/index.vue

@@ -99,7 +99,11 @@ import RegistrationDetailDialog from '../../../resource-guard/device-guard/regis
 
 import { deviceOutInSearch } from '@/api/sop';
 import { omit } from 'lodash';
-import { DEVICE_USAGE_TYPE, RUNNING_STATUS } from '@/config/constants';
+import {
+  DEVICE_USAGE_TYPE,
+  RUNNING_STATUS,
+  INOUT_TYPE,
+} from '@/config/constants';
 import { dictToOptionList } from '@/utils/tool';
 import {
   timestampFilter,
@@ -230,6 +234,17 @@ const fields = ref([
     colSpan: 6,
     cell: 'address',
   },
+  {
+    prop: 'inOutType',
+    label: '出入库状态',
+    type: 'select',
+    options: dictToOptionList(INOUT_TYPE),
+    labelWidth: 84,
+    colSpan: 6,
+    attrs: {
+      clearable: true,
+    },
+  },
 ]);
 const params = reactive({
   serviceUnitId: '',
@@ -242,6 +257,7 @@ const params = reactive({
   customName: '',
   location: '',
   address: '',
+  inOutType: '',
 });
 const transParams = computed(() => {
   return {