Merge branch 'dev' of http://47.122.114.111:9999/qinjianhui/factory_front into dev

src/components/VxeTable.tsx

@@ -51,12 +51,17 @@ export default defineComponent({
       type: Boolean,
       default: true,
     },
+    otherAttrs: {
+      type: Object,
+      default: () => ({}),
+    },
   },
   emits: ['update:modelValue', 'checkbox-change', 'getCheckboxRecords'],
   setup(props, { emit, attrs }) {
     const tableRef = ref<VxeTableInstance | null>(null)
     const tableData = ref<Record<string, unknown>[]>([])
     const tableColumns = ref<TableColumn[]>([])
+
     const editConfig = computed(() => {
       return {
         trigger: 'dblclick',
@@ -139,10 +144,21 @@ export default defineComponent({
         {...this.attrs}
       >
         {this.isShowCheckBox && (
-          <vxe-column type="checkbox" width="50" align="center"></vxe-column>
+          <vxe-column
+            type="checkbox"
+            width="50"
+            align="center"
+            {...this.otherAttrs}
+          ></vxe-column>
         )}
 
-        <vxe-column align="center" type="seq" width="50" title="序号" />
+        <vxe-column
+          align="center"
+          type="seq"
+          width="50"
+          title="序号"
+          {...this.otherAttrs}
+        />
         {this.tableColumns.map((item: TableColumn, index: number) => (
           <vxe-column
             key={index}

src/views/logistics/logisticsPartition.vue

@@ -43,6 +43,9 @@
           align="center"
           border="full"
           @getCheckboxRecords="handleCheckboxRecords"
+          :otherAttrs="{
+            fixed: 'left',
+          }"
         ></CustomizeTable>
       </div>
     </div>
@@ -232,6 +235,7 @@ async function getList(data?: {
       {
         prop: 'zoneName',
         label: '分区',
+        attrs: { 'min-width': '100px', fixed: 'left' },
       },
     ]
     const newConfig = []
@@ -243,6 +247,7 @@ async function getList(data?: {
             label: key,
             attrs: {
               'edit-render': {},
+              'min-width': '300px',
             },
             render: {
               edit: ({