设备增加序列号字段

src/views/sop/components/dynamic-form-item/device-table/device-in-table.vue

@@ -104,6 +104,11 @@ const columns = [
     colKey: 'deviceNo',
     width: 120,
   },
+  {
+    title: '设备序列号',
+    colKey: 'serialNo',
+    width: 120,
+  },
   {
     title: '型号',
     colKey: 'deviceModel',
@@ -116,7 +121,7 @@ const columns = [
   {
     title: '运行状态',
     colKey: 'deviceStatus',
-    width: 105,
+    width: 85,
   },
   {
     title: '总扫描量',
@@ -126,7 +131,7 @@ const columns = [
   {
     title: '当前所在地',
     colKey: 'location',
-    width: 95,
+    minWidth: 120,
   },
   {
     title: '发往地',
@@ -142,6 +147,7 @@ const columns = [
     colKey: 'operate',
     width: 90,
     align: 'center',
+    fixed: 'right',
   },
 ];
 const resetKeys = () => {

src/views/sop/components/dynamic-form-item/device-table/edit-column-dialog.vue

@@ -97,6 +97,7 @@ const files = ref([]);
 const formData = reactive({
   key: '',
   deviceNo: '',
+  serialNo: '',
   deviceModel: '',
   supplierName: '',
   deviceStatus: '',
@@ -169,7 +170,7 @@ const getDeviceOptions = async () => {
     .map((item) => ({
       ...item,
       value: item.deviceNo,
-      label: item.deviceNo + '_' + item.deviceModel + '_' + item.supplierName,
+      label: item.deviceNo + '_' + item.serialNo + '_' + item.deviceBrand,
     }));
 };
 
@@ -183,6 +184,7 @@ const deviceChange = (val, { option }) => {
   formData.deviceBrand = option.deviceBrand;
   formData.scanCount = option.scanCount;
   formData.location = option.location;
+  formData.serialNo = option.serialNo;
   if (!props.isOutType) {
     formData.address = option.supplierName;
   } else {

src/views/sop/components/dynamic-form-item/device-table/index.vue

@@ -97,6 +97,11 @@ const columns = [
     colKey: 'deviceNo',
     width: 120,
   },
+  {
+    title: '设备序列号',
+    colKey: 'serialNo',
+    width: 120,
+  },
   {
     title: '型号',
     colKey: 'deviceModel',
@@ -109,7 +114,7 @@ const columns = [
   {
     title: '运行状态',
     colKey: 'deviceStatus',
-    width: 105,
+    width: 85,
   },
   {
     title: '总扫描量',
@@ -119,6 +124,7 @@ const columns = [
   {
     title: '当前所在地',
     colKey: 'location',
+    minWidth: 120,
   },
   {
     title: '发往地',
@@ -134,6 +140,7 @@ const columns = [
     colKey: 'operate',
     width: 90,
     align: 'center',
+    fixed: 'right',
   },
 ];
 const resetKeys = () => {

src/views/sop/sop-manage/device-out-in/add-device-dialog.vue

@@ -3,7 +3,7 @@
     :visible="visible"
     @close="emit('update:visible', false)"
     header="新增设备出入库信息"
-    :width="1100"
+    :width="1200"
     :closeOnOverlayClick="false"
   >
     <t-form ref="formRef" :data="formData" :rules="rules" :labelWidth="120">

src/views/sop/sop-manage/device-out-in/device-table/edit-column-dialog.vue

@@ -88,6 +88,7 @@ const files = ref([]);
 const formData = reactive({
   key: '',
   deviceNo: '',
+  serialNo: '',
   supplierName: '',
   deviceStatus: '',
   scanCount: null,
@@ -159,7 +160,7 @@ const getDeviceOptions = async () => {
     .map((item) => ({
       ...item,
       value: item.deviceNo,
-      label: item.deviceNo + '_' + item.deviceModel + '_' + item.supplierName,
+      label: item.deviceNo + '_' + item.serialNo + '_' + item.deviceBrand,
     }));
 };
 
@@ -172,6 +173,7 @@ const deviceChange = (val, { option }) => {
   formData.deviceBrand = option.deviceBrand;
   formData.scanCount = option.scanCount;
   formData.location = option.location;
+  formData.serialNo = option.serialNo;
   if (!props.isOutType) {
     formData.address = option.supplierName;
   }

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

@@ -88,7 +88,12 @@ const columns = [
   {
     title: '设备编号',
     colKey: 'deviceNo',
-    width: 150,
+    width: 120,
+  },
+  {
+    title: '设备序列号',
+    colKey: 'serialNo',
+    width: 120,
   },
   {
     title: '供应商',