Merge branch 'dev'

src/components/VxeTable.tsx

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

src/types/api/podUsOrder.ts

@@ -86,8 +86,8 @@ export interface ProductList {
   templatePrice?: number
   templatePrice?: number
   variantImage?: string
   variantImage?: string
   craftPrice?: number
   craftPrice?: number
-  craftCode: string
-  platform: string
+  craftCode?: string
+  platform?: string
   imageAry?: string
   imageAry?: string
   designImages?: string
   designImages?: string
   categoryId?: number
   categoryId?: number

src/views/logistics/logisticsPartition.vue

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

src/views/order/podUs/index.vue

@@ -69,6 +69,14 @@
               style="width: 150px"
               style="width: 150px"
             ></ElInput>
             ></ElInput>
           </ElFormItem>
           </ElFormItem>
+          <ElFormItem label="货号">
+            <ElInput
+              v-model="searchForm.thirdStockSku"
+              placeholder="货号"
+              clearable
+              style="width: 150px"
+            />
+          </ElFormItem>
           <ElFormItem label="款号">
           <ElFormItem label="款号">
             <ElInput
             <ElInput
               v-model="searchForm.supplierProductNo"
               v-model="searchForm.supplierProductNo"
@@ -1170,7 +1178,7 @@
             >
             >
               <template
               <template
                 #top_right
                 #top_right
-                v-if="['ZPZY', 'CXZY', 'THZY'].includes(cardItem.craftCode)"
+               v-if="['ZPZY', 'CXZY', 'THZY'].includes(cardItem?.craftCode || '')"
               >
               >
                 <img
                 <img
                   :src="`/images/pic/${cardItem.craftCode}.png`"
                   :src="`/images/pic/${cardItem.craftCode}.png`"
@@ -1898,7 +1906,7 @@ const [searchForm, resetSearchForm] = useValue<SearchForm>({
   supplierProductNo: '',
   supplierProductNo: '',
   batchArrangeNumber: '',
   batchArrangeNumber: '',
   craftCode: '',
   craftCode: '',
-  thirdStockSku:''
+  thirdStockSku: '',
 })
 })
 const exceptionStatus = ref(1)
 const exceptionStatus = ref(1)
 const userMarkList = ref<string[]>([])
 const userMarkList = ref<string[]>([])