Merge remote-tracking branch 'origin/master'

src/view/mst/inventory-management/inbound-management/public-inspection-cotton-warehousing-list/index.vue

@@ -67,9 +67,7 @@
           <!--  合作方  -->
           <DkTableColumn field="cooperationPartner"></DkTableColumn>
           <!--  状态  -->
-          <DkTableColumn field="tagObject" title="状态"
-                         dataType="object"
-                         type="tag"
+          <DkTableColumn field="tagObject" title="状态" :color-cards="['待出库','已出库']"
 
           ></DkTableColumn>
           <!--  备注 -->
@@ -259,7 +257,7 @@ export default {
           outWarehouseStaff: manager,
           cusId: customer,
           seller: '2025-05-28',
-          tagObject: {tag},
+          tagObject: tag,
           contactName: contact,
           objPhone: '13800138000',
           outWarehouseDate: '2025-05-28',

src/view/mst/system-management/role-management/index.vue

@@ -36,7 +36,7 @@
         <DkTable :id="'table-'+$options.name"
                  ref="table-select"
                  :data="tableData"
-                 :height="tableHeight-60"
+                 :height="tableHeight-30"
                  primaryKey="staffId"
                  :multiple="false"
                  :choose-flag="false"