2025/6/11 王宇轩第一次提交

src/components/table/dk-table/dk-table-column.vue

@@ -389,12 +389,15 @@
           {{ row[field] }}
         </div>
         <div v-if="row[field] && typeof row[field] == 'object'" class="tag-view">
-          <Tag color="primary" size="medium" class="tag-class" v-if="!columnTopRightTipFlag"
+          <Tag color="primary" size="medium" class="tag-class" v-if="tagType=='aCMTag'"
                v-for="item in row[field]">{{ item }}
           </Tag>
-          <div v-if="columnTopRightTipFlag" v-for="item in row[field]"> {{ item }}
-            <span :style="{ fontSize: '80%', color: columnTopRightTipColor,
-            position: 'relative', top: '-7px', left: '5px' }">{{columnTopRightTipContent}}</span>
+          <Tag :color="row[field].color ? row[field].color : 'red'" size="medium" class="tag-class" v-if="tagType=='mCSTag'"
+               >{{ row[field].tag }}
+          </Tag>
+          <div v-if="tagType=='rightTipTag'" > {{ row[field].tag }}
+            <span :style="{ fontSize: '80%', color: row[field].color? row[field].color:'#2d8cf0',
+            position: 'relative', top: '-7px', left: '5px' }">{{row[field].rText?row[field].rText:'一检'}}</span>
           </div>
         </div>
       </div>
@@ -803,20 +806,15 @@ export default {
       type: Boolean,
       default: false,
     },
-    //是否显示右上角的重要信息
-    columnTopRightTipFlag: {
-      type: Boolean,
-      default: false
-    },
-    //右上角信息的内容
-    columnTopRightTipContent: {
-      type: String,
-      default: ''
-    },
-    //右上角信息的颜色
-    columnTopRightTipColor: {
+
+   //标签的类型
+    tagType: {
       type: String,
-      default: 'red'}
+      default: 'aCMTag'//aCMTag单一颜色的多标签  mCSTag多颜色的单标签 rightTipTag右上角有提示信息的标签
+        //类型为mCSTag时,需要传入tag和color{tag:'标签',color:'red'}否则颜色为默认值red
+        //类型为rightTipTag时,需要传入tag和color和rText{tag:'标签',color:'red',rText:'提示信息'}
+        // 否则颜色默认为#2d8cf0,内容默认为一检
+    }
   },
   data() {
     const vm = window.vm
@@ -1055,6 +1053,9 @@ export default {
         // 如果是对象，需要处理下
         if (typeof row[field] === 'object') {
           value = JSON.stringify(row[field])
+          if (this.tagType=='mCSTag'||this.tagType=='rightTipTag'){
+              value = row[field].tag
+          }
         }
         this.$Message.success(vm.$t('copySuccess') + '：' + value)
         //创建一个input框

src/view/mst/financial-management/balance-inquiry/enterprise-balance-inquiry/index.vue

@@ -49,30 +49,10 @@
           <!--  资金类别  -->
           <DkTableColumn field="fundCategory"></DkTableColumn>
           <!--  当前余额  -->
-          <DkTableColumn field="currentBalance" type="number" sum="true" ></DkTableColumn>
-          <!--  可用余额  -->
-          <DkTableColumn field="availableBalance"  type="number" sum="true"></DkTableColumn>
-
-          <!--  冻结余额  -->
-          <DkTableColumn field="frozenBalance"  type="number" sum="true"></DkTableColumn>
+          <DkTableColumn field="currentBalance" title="余额" type="number" sum="true" ></DkTableColumn>
           <!--  交易日期  -->
           <DkTableColumn field="transactionDate"></DkTableColumn>
-          <!--  交易金额  -->
-          <DkTableColumn field="transactionAmount"  type="number" sum="true"></DkTableColumn>
-          <!--  交易类型  -->
-          <DkTableColumn field="transactionType"></DkTableColumn>
-          <!--  棉花品种  -->
-          <DkTableColumn field="cottonVariety"></DkTableColumn>
-          <!--  等级  -->
-          <DkTableColumn field="level"></DkTableColumn>
-          <!--  批次  -->
-          <DkTableColumn field="batch" type="link"></DkTableColumn>
-          <!--  数量  -->
-          <DkTableColumn field="num"  type="number" sum="true" digits="0"></DkTableColumn>
-          <!--  供应商名称  -->
-          <DkTableColumn field="supName"></DkTableColumn>
-          <!--  客户名称  -->
-          <DkTableColumn field="cusName"></DkTableColumn>
+
         </DkTable>
       </div>
     </div>

src/view/mst/inventory-management/historical-inventory/historical-inventory-inquiry/index.vue

@@ -54,7 +54,7 @@
           <!--  库存数量  -->
           <DkTableColumn field="inventoryQuantity" data-type="number" sum="true" digits="0"></DkTableColumn>
           <!--  在库状态  -->
-          <DkTableColumn field="tagObject" title="在库状态" type="tag"></DkTableColumn>
+          <DkTableColumn field="tagObject" title="在库状态" type="tag" tag-type="mCSTag"></DkTableColumn>
           <!--  采购单号  -->
           <DkTableColumn field="purNo" type="link"></DkTableColumn>
           <!--  销售单号  -->
@@ -82,6 +82,16 @@ export default {
     return {
       editFlag: false,
       searchContent: [
+        //入库时间
+        {
+          itemCode: 'inWarehouseDate',
+          valueKind: this.$config.docUserInput.dateTimeRange,
+        },
+        //出库时间
+        {
+          itemCode: 'outWarehouseDate',
+          valueKind: this.$config.docUserInput.dateTimeRange,
+        },
         //皮棉编号
         {
           itemCode: 'leatherSurfaceNumber',
@@ -151,7 +161,8 @@ export default {
         inWarehouseDate: '2025-05-28',
         outWarehouseDate: '2025-05-28',
         inventoryQuantity: `${Math.floor(Math.random() * 100) + 1}`,
-        tagObject: {tag: ['已锁定', '已销售', '暂停销售', '可销售'][index % 4]},
+        tagObject: {tag: ['已锁定', '已销售', '暂停销售', '可销售'][index % 4],
+          color: ['#FF0000', '#00FF00', '#0000FF', '#FFFF00'][index % 4]},
         purNo: 'PUR' + `${String(index + 1).padStart(5, '0')}`,
         salesOrderNo: 'SAL' + `${String(index + 1).padStart(5, '0')}`,
         transWarehOrderNo: 'TRANS' + `${String(index + 1).padStart(5, '0')}`,

src/view/mst/inventory-management/inbound-management/cancel-the-inbound-order/form.vue

@@ -55,41 +55,44 @@
           </DkFormItem>
         </DkForm>
       </DkPanel>
-      <div>
-      </div>
+      <!--表格-->
+      <DkPanel prop="table" id="table" >
+        <div slot="content">
+          <DkTable
+            :id="'table-'+$options.name"
+            ref="table-select"
+            :height="tableHeight-325"
+            primaryKey="staffId"
+            :multiple="false"
+            :choose-flag="false"
+            :page-flag="true"
+            :page-total="pageInfo.total"
+            @pageChange="pageSizeChange"
+            :pageSizeOpts="pageSizeOpts"
+            :current-page="pageInfo.currentPage"
+            :pageSize="pageInfo.pageSize"
+          >
+            <!--  品类  -->
+            <DkTableColumn field="category"></DkTableColumn>
+            <!--  当前仓库  -->
+            <DkTableColumn field="currentWarehouse"></DkTableColumn>
+            <!--  编码  -->
+            <DkTableColumn field="code"></DkTableColumn>
+            <!--  圆模  -->
+            <DkTableColumn field="circularDie"></DkTableColumn>
+            <!--  郑交所仓单  -->
+            <DkTableColumn field="zceWarehouseReceipt"></DkTableColumn>
+            <!--  数量  -->
+            <DkTableColumn field="num"></DkTableColumn>
+            <!--  单位  -->
+            <DkTableColumn field="unit"></DkTableColumn>
+            <!--  备注  -->
+            <DkTableColumn field="remark"></DkTableColumn>
+          </DkTable>
+        </div>
+      </DkPanel>
     </DkCollapse>
 
-    <DkTable
-      :id="'table-'+$options.name"
-      ref="table-select"
-      :height="tableHeight-266"
-      primaryKey="staffId"
-      :multiple="false"
-      :choose-flag="false"
-      :page-flag="true"
-      :page-total="pageInfo.total"
-      @pageChange="pageSizeChange"
-      :pageSizeOpts="pageSizeOpts"
-      :current-page="pageInfo.currentPage"
-      :pageSize="pageInfo.pageSize"
-    >
-      <!--  品类  -->
-      <DkTableColumn field="category"></DkTableColumn>
-      <!--  当前仓库  -->
-      <DkTableColumn field="currentWarehouse"></DkTableColumn>
-      <!--  编码  -->
-      <DkTableColumn field="code"></DkTableColumn>
-      <!--  圆模  -->
-      <DkTableColumn field="circularDie"></DkTableColumn>
-      <!--  郑交所仓单  -->
-      <DkTableColumn field="zceWarehouseReceipt"></DkTableColumn>
-      <!--  数量  -->
-      <DkTableColumn field="num"></DkTableColumn>
-      <!--  单位  -->
-      <DkTableColumn field="unit"></DkTableColumn>
-      <!--  备注  -->
-      <DkTableColumn field="remark"></DkTableColumn>
-    </DkTable>
     <!--添加公检批号-->
     <DkModal
       :loading="loading"

src/view/mst/inventory-management/inbound-management/cancel-the-inbound-order/index.vue

@@ -27,89 +27,76 @@
                       :searchContent="searchContent"
           ></SearchCond>
         </div>
-        <DkTable
-          slot="top"
-          :id="'table-'+$options.name"
-          ref="table-select"
-          :data="tableData"
-          :height="tableHeight-320"
-          primaryKey="staffId"
-          :multiple="false"
-          :showFooter="true"
-          :choose-flag="false"
-          :page-flag="true"
-          :page-total="pageInfo.total"
-          @pageChange="pageSizeChange"
-          :pageSizeOpts="pageSizeOpts"
-          :current-page="pageInfo.currentPage"
-          :pageSize="pageInfo.pageSize"
-        >
-          <!--  单号  -->
-          <DkTableColumn field="dataNo" type="link"></DkTableColumn>
-          <!--  入库类型  -->
-          <DkTableColumn field="inWarehouseType"></DkTableColumn>
-          <!--  入库员  -->
-          <DkTableColumn field="inWarehouseStaff"></DkTableColumn>
-          <!--  供应商  -->
-          <DkTableColumn field="supplier"></DkTableColumn>
-          <!--  买家  -->
-          <DkTableColumn field="buyer"></DkTableColumn>
-          <!--  联系人  -->
-          <DkTableColumn field="contactName"></DkTableColumn>
-          <!--  电话  -->
-          <DkTableColumn field="objPhone"></DkTableColumn>
-          <!--  入库日期  -->
-          <DkTableColumn field="inWarehouseDate"></DkTableColumn>
-          <!--  重量 /吨  -->
-          <DkTableColumn field="weight" :dataType="$config.columnType.number" :sum="true"></DkTableColumn>
-          <!--  货权人  -->
-          <DkTableColumn field="goodsOwner"></DkTableColumn>
-          <!--  合作方  -->
-          <DkTableColumn field="cooperationPartner"></DkTableColumn>
-          <!--  状态  -->
-          <DkTableColumn field="tagObject" title="状态"
-                         dataType="object"
-                         type="tag"></DkTableColumn>
-          <!--  备注 -->
-          <DkTableColumn field="remarks"></DkTableColumn>
+        <!--  表格部分  -->
+        <div :style="'height: ' + tableHeight + 'px'" class="split-div-class">
+          <DkSplit mode="vertical" v-model="split" ref="split">
+            <div slot="top">
+              <DkTable :id="'table-' + $options.name" ref="table-select" :data="tableData"
+                       :height="tableHeight * split -40" :page-flag="true" primaryKey="docId" :multiple="false"
+                       :choose-flag="false" :page-total="pageInfo.total" :current-page="pageInfo.currentPage"
+                       :page-size="pageInfo.pageSize" :page-size-opts="pageSizeOpts" @pageChange="pageSizeChange"
+                       :showFooter="true"
+                       reverseColorFlag tree-flag>
+                <!--  单号  -->
+                <DkTableColumn field="dataNo" type="link"></DkTableColumn>
+                <!--  入库类型  -->
+                <DkTableColumn field="inWarehouseType"></DkTableColumn>
+                <!--  入库员  -->
+                <DkTableColumn field="inWarehouseStaff"></DkTableColumn>
+                <!--  供应商  -->
+                <DkTableColumn field="supplier"></DkTableColumn>
+                <!--  买家  -->
+                <DkTableColumn field="buyer"></DkTableColumn>
+                <!--  联系人  -->
+                <DkTableColumn field="contactName"></DkTableColumn>
+                <!--  电话  -->
+                <DkTableColumn field="objPhone"></DkTableColumn>
+                <!--  入库日期  -->
+                <DkTableColumn field="inWarehouseDate"></DkTableColumn>
+                <!--  重量 /吨  -->
+                <DkTableColumn field="weight" :dataType="$config.columnType.number" :sum="true"></DkTableColumn>
+                <!--  货权人  -->
+                <DkTableColumn field="goodsOwner"></DkTableColumn>
+                <!--  合作方  -->
+                <DkTableColumn field="cooperationPartner"></DkTableColumn>
+                <!--  状态  -->
+                <DkTableColumn field="tagObject" title="状态"
+                               type="tag" tag-type="mCSTag"></DkTableColumn>
+                <!--  备注 -->
+                <DkTableColumn field="remarks"></DkTableColumn>
+              </DkTable>
+            </div>
+            <div slot="bottom">
+              <!-- 商品明细 -->
+              <DkTable :id="'table-' + $options.name + '-file'" ref="table-select-down-file" :data="formData"
+                       :height="tableHeight * (1 - split) - 40" :page-flag="false" primaryKey="itemId" :multiple="false"
+                       :choose-flag="false" @pageChange="pageSizeChange"
+                       :showFooter="true"
+                       :tree-flag="true"
+                       parentField="parentId"
+              >
+                <DkTabs v-model="currentType" :options="tabsOptions"></DkTabs>
+                <!--  品类  -->
+                <DkTableColumn field="category"></DkTableColumn>
+                <!--  当前仓库  -->
+                <DkTableColumn field="currentWarehouse"></DkTableColumn>
+                <!--  编码  -->
+                <DkTableColumn field="code" type="link"></DkTableColumn>
+                <!--  圆模  -->
+                <DkTableColumn field="circularDie"></DkTableColumn>
+                <!--  郑交所仓单  -->
+                <DkTableColumn field="zceWarehouseReceipt"></DkTableColumn>
+                <!--  数量  -->
+                <DkTableColumn field="num" :dataType="$config.columnType.number" :sum="true" :digits="0"></DkTableColumn>
+                <!--  单位  -->
+                <DkTableColumn field="unit"></DkTableColumn>
+                <!--  备注  -->
+                <DkTableColumn field="remarks"></DkTableColumn>
+              </DkTable>
+            </div>
+          </DkSplit>
+        </div>
 
-        </DkTable>
-        <DkTabs v-model="currentType" :options="tabsOptions"></DkTabs>
-        <!--  转货权采购单表格部分   -->
-        <DkTable
-          slot="buttom"
-          :id="'table-'+$options.name"
-          ref="table-select"
-          :data="formData"
-          :height="tableHeight-320"
-          primaryKey="staffId"
-          :multiple="false"
-          :choose-flag="false"
-          :showFooter="true"
-          :page-flag="true"
-          :page-total="pageInfo.total"
-          @pageChange="pageSizeChange"
-          :pageSizeOpts="pageSizeOpts"
-          :current-page="pageInfo.currentPage"
-          :pageSize="pageInfo.pageSize"
-        >
-          <!--  品类  -->
-          <DkTableColumn field="category"></DkTableColumn>
-          <!--  当前仓库  -->
-          <DkTableColumn field="currentWarehouse"></DkTableColumn>
-          <!--  编码  -->
-          <DkTableColumn field="code" type="link"></DkTableColumn>
-          <!--  圆模  -->
-          <DkTableColumn field="circularDie"></DkTableColumn>
-          <!--  郑交所仓单  -->
-          <DkTableColumn field="zceWarehouseReceipt"></DkTableColumn>
-          <!--  数量  -->
-          <DkTableColumn field="num" :dataType="$config.columnType.number" :sum="true" :digits="0"></DkTableColumn>
-          <!--  单位  -->
-          <DkTableColumn field="unit"></DkTableColumn>
-          <!--  备注  -->
-          <DkTableColumn field="remarks"></DkTableColumn>
-        </DkTable>
       </div>
     </div>
 
@@ -231,7 +218,7 @@ export default {
      */
     add1() {
       //跳转
-      this.$router.push({name: 'residual-batch-inbound-order-add'})
+      this.$router.push({name: 'cancel-the-inbound-order-add'})
     },
     /**
      *   @desc   : 加载数据
@@ -239,39 +226,23 @@ export default {
      *   @author : 王宇轩
      */
     initData() {
-      const managers = ['张经理', '李经理', '赵经理', '胡经理'];
-      const customers = ['曹魏', '江东', '蜀汉'];
-      const contacts = ['曹操', '曹仁', '曹嵩', '曹英', '曹爽', '曹昂', '曹真', '曹丕', '曹植', '曹彰', '曹冲', '曹髦', '曹睿', '曹芳'];
-      const inboundTypes = ['采购入库', '退货入库', '其他入库'];
-      const tags = ['待出库', '已出库'];
+    this.tableData = Array.from({length: 20}, (_, index) => ({
+      dataNo: `AB${String(index + 1).padStart(5, '0')}`,
+      inWarehouseType: ['采购入库', '退货入库', '其他入库'][index % 3],
+      inWarehouseStaff: `员工${index + 1}`,
+      supplier: `供应商${index + 1}`,
+      buyer: `买家${index + 1}`,
+      contactName: `联系人${index + 1}`,
+      objPhone: `1234567890${String(index + 1).padStart(2, '0')}`,
+      inWarehouseDate: `2025-05-${String(index + 1).padStart(2, '0')}`,
+      weight: `${Math.floor(Math.random() * 1000) + 1}`,
+      goodsOwner: `货权人${index + 1}`,
+      cooperationPartner: `合作方${index + 1}`,
+      tagObject: {tag:['待出库','已出库'][index%2],color:['blue','green'][index%2]},
+      remarks: `备注${index + 1}`
+    })),
+
 
-      this.tableData = [];
-      for (let i = 0; i < 20; i++) {
-        const manager = managers[i % managers.length];
-        const customer = customers[i % customers.length];
-        const contact = contacts[i % contacts.length];
-        const inboundType = inboundTypes[i % inboundTypes.length];
-        const tag= tags[i % tags.length];
-        this.tableData.push({
-          dataNo: `KH${String(i + 1).padStart(5, '0')}`,
-          outWarehouseType: inboundType,
-          outWarehouseStaff: manager,
-          cusId: customer,
-          seller: '2025-05-28',
-          tagObject: {tag},
-          contactName: contact,
-          objPhone: '13800138000',
-          outWarehouseDate: '2025-05-28',
-          weight: '2000',
-          remarks: `备注${i + 1}`,
-          inWarehouseType: inboundType,
-          inWarehouseStaff: manager,
-          supplier: customer,
-          buyer: customer,
-          inWarehouseDate: '2025-05-28',
-          goodsOwner: contact,
-          cooperationPartner: '江东',
-        });
         this.formData = Array.from({length: 20}, (_, index) => ({
           dataNo: `AB${String(index + 1).padStart(5, '0')}`,
           category: `品类${index + 1}`,
@@ -283,7 +254,7 @@ export default {
           unit: ['吨', '件', '箱'][index % 3],
           remarks: `备注${index + 1}`
         }));
-      }
+
     },
 
 

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

@@ -8,7 +8,7 @@
         <!--    添加公检批号    -->
         <BaseIndexButton ref="addOffInspecBatNo" name="addOffInspecBatNo" @click="addOffInspecBatNo"></BaseIndexButton>
         <!--    添加仓单批号    -->
-        <BaseIndexButton ref="addWareReceBatNo" name="addWareReceBatNo" @click="addWareReceBatNo"> </BaseIndexButton>
+        <BaseIndexButton ref="addWareReceBatNo" name="addWareReceBatNo" @click="addWareReceBatNo"></BaseIndexButton>
         <!--    添加国储批号    -->
         <BaseIndexButton ref="addNaReserveBatNo" name="addNaReserveBatNo" @click="addNaReserveBatNo"></BaseIndexButton>
         <!--    添加资源    -->
@@ -26,7 +26,8 @@
       <DkPanel prop="essentialInformation" id="essentialInformation">
         <DkForm slot="content" ref="essentialInformation" v-model="formData" style="width:100%" :colCount="4">
           <!--类型-->
-          <DkFormItem prop="type" :required="true" v-model="formData.type" :type="$config.formItemType.select" :span="6"></DkFormItem>
+          <DkFormItem prop="type" :required="true" v-model="formData.type" :type="$config.formItemType.select"
+                      :span="6"></DkFormItem>
           <!--入库员-->
           <DkFormItem prop="inWarehouseStaff" v-model="formData.inWarehouseStaff" :type="$config.formItemType.select"
                       :span="6"
@@ -40,12 +41,13 @@
                       popType="dictionaryData" :required="true"></DkFormItem>
           <!--货权人-->
           <DkFormItem prop="goodsOwner" v-model="formData.goodsOwner" :type="$config.formItemType.text"
-                      :span="6" ></DkFormItem>
+                      :span="6"></DkFormItem>
           <!--合作方-->
           <DkFormItem prop="cooperationPartner" v-model="formData.cooperationPartner" :type="$config.formItemType.text"
-                      :span="6" ></DkFormItem>
+                      :span="6"></DkFormItem>
           <!--数量合计-->
-          <DkFormItem prop="quantityTotal" v-model="formData.quantityTotal" :type="$config.formItemType.number" :required="true" :span="6"></DkFormItem>
+          <DkFormItem prop="quantityTotal" v-model="formData.quantityTotal" :type="$config.formItemType.number"
+                      :required="true" :span="6"></DkFormItem>
           <!--入库日期-->
           <DkFormItem prop="inWarehouseDate" v-model="formData.V" :type="$config.formItemType.date"
                       :span="6" :required="true"></DkFormItem>
@@ -55,41 +57,44 @@
           </DkFormItem>
         </DkForm>
       </DkPanel>
-      <div>
-      </div>
-    </DkCollapse>
 
-    <DkTable
-      :id="'table-'+$options.name"
-      ref="table-select"
-      :height="tableHeight-266"
-      primaryKey="staffId"
-      :multiple="false"
-      :choose-flag="false"
-      :page-flag="true"
-      :page-total="pageInfo.total"
-      @pageChange="pageSizeChange"
-      :pageSizeOpts="pageSizeOpts"
-      :current-page="pageInfo.currentPage"
-      :pageSize="pageInfo.pageSize"
-    >
-      <!--  品类  -->
-      <DkTableColumn field="category"></DkTableColumn>
-      <!--  当前仓库  -->
-      <DkTableColumn field="currentWarehouse"></DkTableColumn>
-      <!--  编码  -->
-      <DkTableColumn field="code"></DkTableColumn>
-      <!--  圆模  -->
-      <DkTableColumn field="circularDie"></DkTableColumn>
-      <!--  郑交所仓单  -->
-      <DkTableColumn field="zceWarehouseReceipt"></DkTableColumn>
-      <!--  数量  -->
-      <DkTableColumn field="num"></DkTableColumn>
-      <!--  单位  -->
-      <DkTableColumn field="unit"></DkTableColumn>
-      <!--  备注  -->
-      <DkTableColumn field="remark"></DkTableColumn>
-    </DkTable>
+      <!--表格-->
+      <DkPanel prop="table" id="table">
+        <div slot="content">
+          <DkTable
+            :id="'table-'+$options.name"
+            ref="table-select"
+            :height="tableHeight-324"
+            primaryKey="staffId"
+            :multiple="false"
+            :choose-flag="false"
+            :page-flag="true"
+            :page-total="pageInfo.total"
+            @pageChange="pageSizeChange"
+            :pageSizeOpts="pageSizeOpts"
+            :current-page="pageInfo.currentPage"
+            :pageSize="pageInfo.pageSize"
+          >
+            <!--  品类  -->
+            <DkTableColumn field="category"></DkTableColumn>
+            <!--  当前仓库  -->
+            <DkTableColumn field="currentWarehouse"></DkTableColumn>
+            <!--  编码  -->
+            <DkTableColumn field="code"></DkTableColumn>
+            <!--  圆模  -->
+            <DkTableColumn field="circularDie"></DkTableColumn>
+            <!--  郑交所仓单  -->
+            <DkTableColumn field="zceWarehouseReceipt"></DkTableColumn>
+            <!--  数量  -->
+            <DkTableColumn field="num"></DkTableColumn>
+            <!--  单位  -->
+            <DkTableColumn field="unit"></DkTableColumn>
+            <!--  备注  -->
+            <DkTableColumn field="remark"></DkTableColumn>
+          </DkTable>
+        </div>
+      </DkPanel>
+    </DkCollapse>
     <!--添加公检批号-->
     <DkModal
       :loading="loading"
@@ -104,13 +109,13 @@
     >
       <DkForm ref="dk-form" v-model="formData" :col-count="1" style="height: 80px; width: 780px;">
         <!--批号-->
-        <DkFormItem prop="batchNumber"  :required="true" v-model="formData.type" :span="24"></DkFormItem>
+        <DkFormItem prop="batchNumber" :required="true" v-model="formData.type" :span="24"></DkFormItem>
         <div style="position: relative;left: 5px;">
-          <span class="title" >圆模</span>&nbsp;&nbsp;&nbsp;
-          <DkSwitch class="DKs" v-model="switch1" @on-change="change" />
+          <span class="title">圆模</span>&nbsp;&nbsp;&nbsp;
+          <DkSwitch class="DKs" v-model="switch1" @on-change="change"/>
           &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
           <span class="title">郑交所仓单</span>&nbsp;&nbsp;&nbsp;
-          <DkSwitch v-model="switch2" @on-change="change" />
+          <DkSwitch v-model="switch2" @on-change="change"/>
         </div>
       </DkForm>
     </DkModal>
@@ -128,7 +133,7 @@
     >
       <DkForm ref="dk-form" v-model="formData" :col-count="1" style="height: 20px; width: 780px;">
         <!--批号-->
-        <DkFormItem prop="batchNumber"  :required="true" v-model="formData.type" :span="24"></DkFormItem>
+        <DkFormItem prop="batchNumber" :required="true" v-model="formData.type" :span="24"></DkFormItem>
 
       </DkForm>
     </DkModal>
@@ -146,7 +151,7 @@
     >
       <DkForm ref="dk-form" v-model="formData" :col-count="1" style="height: 20px; width: 780px;">
         <!--批号-->
-        <DkFormItem prop="batchNumber"  :required="true" v-model="formData.type" :span="24"></DkFormItem>
+        <DkFormItem prop="batchNumber" :required="true" v-model="formData.type" :span="24"></DkFormItem>
       </DkForm>
     </DkModal>
     <!--修改仓库-->
@@ -163,7 +168,8 @@
     >
       <DkForm ref="dk-form" v-model="formData" :col-count="1" style="height: 20px; width: 780px;">
         <!--类型-->
-        <DkFormItem prop="warehouse"  :type="$config.formItemType.select" v-model="formData.type" :span="24"></DkFormItem>
+        <DkFormItem prop="warehouse" :type="$config.formItemType.select" v-model="formData.type"
+                    :span="24"></DkFormItem>
 
       </DkForm>
     </DkModal>
@@ -195,16 +201,16 @@ export default {
     }
   },
   methods: {
-    addOffInspecBatNo(){
+    addOffInspecBatNo() {
       this.addOffInspecBatNoFlag = true
     },
-    addWareReceBatNo(){
+    addWareReceBatNo() {
       this.addWareReceBatNoFlag = true
     },
-    addNaReserveBatNo(){
+    addNaReserveBatNo() {
       this.addNaReserveBatNoFlag = true
     },
-    modifyWarehouse(){
+    modifyWarehouse() {
       this.modifyWarehouseFlag = true
     },
     initData() {
@@ -213,7 +219,7 @@ export default {
       //获取职位
       this.getPost()
     },
-    change (status) {
+    change(status) {
       this.$Message.info('开关状态：' + status);
     },
   },
@@ -226,11 +232,11 @@ export default {
 
 <style>
 
-  .title{
-    font-size: 17px;
-    font-weight: bold;
-    position: relative;
-    top: 2.5px;
-  }
+.title {
+  font-size: 17px;
+  font-weight: bold;
+  position: relative;
+  top: 2.5px;
+}
 
 </style>

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

@@ -27,88 +27,80 @@
                       :searchContent="searchContent"
           ></SearchCond>
         </div>
-        <DkTable
-          slot="top"
-          :id="'table-'+$options.name"
-          ref="table-select"
-          :data="tableData"
-          :height="tableHeight-320"
-          primaryKey="staffId"
-          :multiple="false"
-          :showFooter="true"
-          :choose-flag="false"
-          :page-flag="true"
-          :page-total="pageInfo.total"
-          @pageChange="pageSizeChange"
-          :pageSizeOpts="pageSizeOpts"
-          :current-page="pageInfo.currentPage"
-          :pageSize="pageInfo.pageSize"
-        >
-          <!--  单号  -->
-          <DkTableColumn field="dataNo" type="link"></DkTableColumn>
-          <!--  入库类型  -->
-          <DkTableColumn field="inWarehouseType"></DkTableColumn>
-          <!--  入库员  -->
-          <DkTableColumn field="inWarehouseStaff"></DkTableColumn>
-          <!--  供应商  -->
-          <DkTableColumn field="supplier"></DkTableColumn>
-          <!--  买家  -->
-          <DkTableColumn field="buyer"></DkTableColumn>
-          <!--  联系人  -->
-          <DkTableColumn field="contactName"></DkTableColumn>
-          <!--  电话  -->
-          <DkTableColumn field="objPhone"></DkTableColumn>
-          <!--  入库日期  -->
-          <DkTableColumn field="inWarehouseDate"></DkTableColumn>
-          <!--  重量 /吨  -->
-          <DkTableColumn field="weight" data-type="number" sum="true"></DkTableColumn>
-          <!--  货权人  -->
-          <DkTableColumn field="goodsOwner"></DkTableColumn>
-          <!--  合作方  -->
-          <DkTableColumn field="cooperationPartner"></DkTableColumn>
-          <!--  状态  -->
-          <DkTableColumn field="tagObject" title="状态" :color-cards="['待出库','已出库']"
 
-          ></DkTableColumn>
-          <!--  备注 -->
-          <DkTableColumn field="remarks"></DkTableColumn>
-        </DkTable>
-        <DkTabs v-model="currentType" :options="tabsOptions"></DkTabs>
-        <!--  转货权采购单表格部分   -->
-        <DkTable
-          slot="buttom"
-          :id="'table-'+$options.name"
-          ref="table-select"
-          :data="formData"
-          :height="tableHeight-320"
-          primaryKey="staffId"
-          :multiple="false"
-          :choose-flag="false"
-          :showFooter="true"
-          :page-flag="true"
-          :page-total="pageInfo.total"
-          @pageChange="pageSizeChange"
-          :pageSizeOpts="pageSizeOpts"
-          :current-page="pageInfo.currentPage"
-          :pageSize="pageInfo.pageSize"
-        >
-          <!--  品类  -->
-          <DkTableColumn field="category"></DkTableColumn>
-          <!--  当前仓库  -->
-          <DkTableColumn field="currentWarehouse"></DkTableColumn>
-          <!--  编码  -->
-          <DkTableColumn field="code" type="link"></DkTableColumn>
-          <!--  圆模  -->
-          <DkTableColumn field="circularDie"></DkTableColumn>
-          <!--  郑交所仓单  -->
-          <DkTableColumn field="zceWarehouseReceipt"></DkTableColumn>
-          <!--  数量  -->
-          <DkTableColumn field="num" data-type="number" sum="true" digits="0"></DkTableColumn>
-          <!--  单位  -->
-          <DkTableColumn field="unit"></DkTableColumn>
-          <!--  备注  -->
-          <DkTableColumn field="remarks"></DkTableColumn>
-        </DkTable>
+        <!--  表格部分  -->
+        <div :style="'height: ' + tableHeight + 'px'" class="split-div-class">
+          <DkSplit mode="vertical" v-model="split" ref="split">
+            <div slot="top">
+              <DkTable :id="'table-' + $options.name" ref="table-select" :data="tableData"
+                       :height="tableHeight * split -40" :page-flag="true" primaryKey="docId" :multiple="false"
+                       :choose-flag="false" :page-total="pageInfo.total" :current-page="pageInfo.currentPage"
+                       :page-size="pageInfo.pageSize" :page-size-opts="pageSizeOpts" @pageChange="pageSizeChange"
+                       :showFooter="true"
+                     reverseColorFlag tree-flag>
+                <!--  单号  -->
+                <DkTableColumn field="dataNo" type="link"></DkTableColumn>
+                <!--  入库类型  -->
+                <DkTableColumn field="inWarehouseType"></DkTableColumn>
+                <!--  入库员  -->
+                <DkTableColumn field="inWarehouseStaff"></DkTableColumn>
+                <!--  供应商  -->
+                <DkTableColumn field="supplier"></DkTableColumn>
+                <!--  买家  -->
+                <DkTableColumn field="buyer"></DkTableColumn>
+                <!--  联系人  -->
+                <DkTableColumn field="contactName"></DkTableColumn>
+                <!--  电话  -->
+                <DkTableColumn field="objPhone"></DkTableColumn>
+                <!--  入库日期  -->
+                <DkTableColumn field="inWarehouseDate"></DkTableColumn>
+                <!--  重量 /吨  -->
+                <DkTableColumn field="weight" data-type="number" sum="true"></DkTableColumn>
+                <!--  货权人  -->
+                <DkTableColumn field="goodsOwner"></DkTableColumn>
+                <!--  合作方  -->
+                <DkTableColumn field="cooperationPartner"></DkTableColumn>
+                <!--  状态  -->
+                <DkTableColumn field="tagObject" title="状态" type="tag"
+                               tag-type="mCSTag"
+
+                ></DkTableColumn>
+                <!--  备注 -->
+                <DkTableColumn field="remarks"></DkTableColumn>
+              </DkTable>
+            </div>
+            <div slot="bottom">
+                           <!-- 商品明细 -->
+              <DkTable :id="'table-' + $options.name + '-file'" ref="table-select-down-file" :data="formData"
+                       :height="tableHeight * (1 - split) - 40" :page-flag="false" primaryKey="itemId" :multiple="false"
+                       :choose-flag="false" @pageChange="pageSizeChange"
+                       :showFooter="true"
+                       :tree-flag="true"
+                       parentField="parentId"
+              >
+                <DkTabs v-model="currentType" :options="tabsOptions"></DkTabs>
+                <!--  品类  -->
+                <DkTableColumn field="category"></DkTableColumn>
+                <!--  当前仓库  -->
+                <DkTableColumn field="currentWarehouse"></DkTableColumn>
+                <!--  编码  -->
+                <DkTableColumn field="code" type="link"></DkTableColumn>
+                <!--  圆模  -->
+                <DkTableColumn field="circularDie"></DkTableColumn>
+                <!--  郑交所仓单  -->
+                <DkTableColumn field="zceWarehouseReceipt"></DkTableColumn>
+                <!--  数量  -->
+                <DkTableColumn field="num" data-type="number" sum="true" digits="0"></DkTableColumn>
+                <!--  单位  -->
+                <DkTableColumn field="unit"></DkTableColumn>
+                <!--  备注  -->
+                <DkTableColumn field="remarks"></DkTableColumn>
+              </DkTable>
+                  </div>
+          </DkSplit>
+        </div>
+
+
       </div>
     </div>
 
@@ -238,59 +230,67 @@ export default {
      *   @author : 王宇轩
      */
     initData() {
-      const managers = ['张经理', '李经理', '赵经理', '胡经理'];
-      const customers = ['曹魏', '江东', '蜀汉'];
-      const contacts = ['曹操', '曹仁', '曹嵩', '曹英', '曹爽', '曹昂', '曹真', '曹丕', '曹植', '曹彰', '曹冲', '曹髦', '曹睿', '曹芳'];
-      const inboundTypes = ['采购入库', '退货入库', '其他入库'];
-      const tags = ['待出库', '已出库'];
-
-      this.tableData = [];
-      for (let i = 0; i < 20; i++) {
-        const manager = managers[i % managers.length];
-        const customer = customers[i % customers.length];
-        const contact = contacts[i % contacts.length];
-        const inboundType = inboundTypes[i % inboundTypes.length];
-        const tag= tags[i % tags.length];
-        this.tableData.push({
-          dataNo: `KH${String(i + 1).padStart(5, '0')}`,
-          outWarehouseType: inboundType,
-          outWarehouseStaff: manager,
-          cusId: customer,
-          seller: '2025-05-28',
-          tagObject: tag,
-          contactName: contact,
-          objPhone: '13800138000',
-          outWarehouseDate: '2025-05-28',
-          weight: '2000',
-          remarks: `备注${i + 1}`,
-          inWarehouseType: inboundType,
-          inWarehouseStaff: manager,
-          supplier: customer,
-          buyer: customer,
-          inWarehouseDate: '2025-05-28',
-          goodsOwner: contact,
-          cooperationPartner: '江东',
-        });
-        this.formData = Array.from({length: 20}, (_, index) => ({
-          dataNo: `AB${String(index + 1).padStart(5, '0')}`,
-          category: `品类${index + 1}`,
-          currentWarehouse: `仓库${index % 5 + 1}`, // 假设只有 5 个仓库
-          code: `CODE-${String(index + 1).padStart(3, '0')}`,
-          circularDie: `圆模${String.fromCharCode(65 + index % 26)}`, // 使用 A - Z 命名
-          zceWarehouseReceipt: `ZCE-${String(index + 1).padStart(4, '0')}`,
-          num: `${Math.floor(Math.random() * 100) + 1}`, // 1 - 100 随机数
-          unit: ['吨', '件', '箱'][index % 3],
-          remarks: `备注${index + 1}`
-        }));
+      this.tableData = Array.from({length: 1000}, (_, index) => ({
+        dataNo: ['DJ', 'VO'][index % 2] + `-${String(index + 1).padStart(4, '0')}`,
+        inWarehouseType: ['采购入库', '退货入库', '其他入库'][index % 3],
+        inWarehouseStaff: ['张师傅', '李师傅', '赵师傅'][index % 3],
+        supplier: ['A供应商', 'B供应商', 'C供应商'][index % 3],
+        buyer: ['A买家', 'B买家', 'C买家'][index % 3],
+        contactName: ['A联系人', 'B联系人', 'C联系人'][index % 3],
+        objPhone: '13800138000',
+        inWarehouseDate: '2025-05-25',
+        weight: Math.floor(Math.random() * 1000) + 1, // 1 - 1000 随机数
+        goodsOwner: ['A货权人', 'B货权人', 'C货权人'][index % 3],
+        cooperationPartner: ['A合作方', 'B合作方', 'C合作方'][index % 3],
+        tagObject: {tag: ['待出库', '已出库'][index % 2], color: ['blue', 'green'][index % 2]},
+        remarks: '备注信息',
+      }));
+      this.formData = Array.from({length: 20}, (_, index) => ({
+        dataNo: `AB${String(index + 1).padStart(5, '0')}`,
+        category: `品类${index + 1}`,
+        currentWarehouse: `仓库${index % 5 + 1}`, // 假设只有 5 个仓库
+        code: `CODE-${String(index + 1).padStart(3, '0')}`,
+        circularDie: `圆模${String.fromCharCode(65 + index % 26)}`, // 使用 A - Z 命名
+        zceWarehouseReceipt: `ZCE-${String(index + 1).padStart(4, '0')}`,
+        num: `${Math.floor(Math.random() * 100) + 1}`, // 1 - 100 随机数
+        unit: ['吨', '件', '箱'][index % 3],
+        remarks: `备注${index + 1}`
+      }));
+    },
+    /**
+     * @desc 计算表格高度
+     * @date 2025-5-29 15:00:00
+     * @author 王宇轩
+     */
+    calculateTableHeight(){
+      const windowHeight = window.innerHeight;
+      const element = document.getElementById('BaseIndexButtonGroup');
+      const element1 = document.getElementById('search-cond-div');
+      const element2 = document.getElementById('taps');
+      if (element && element1) {
+        const elementHeight = element.offsetHeight;
+        const element1Height = element1.offsetHeight;
+        const element2Height = element2.offsetHeight;
+        const tableHeight = windowHeight - elementHeight - element1Height - element2Height;
+        this.tableHeight = tableHeight / 2;
+        console.log('BaseIndexButtonGroup', elementHeight)
+        console.log('search-cond-div', element1Height)
+        console.log('tableHeight', this.tableHeight)
       }
     },
-
-
-  },
-  created() {
-
+    /**
+     * @desc 窗口大小变化时重新计算表格高度
+     */
+    handleResize() {
+      this.calculateTableHeight();
+    },
   },
-
+    created() {
+      this.initData();
+    },
+    updated() {
+      this.handleResize();
+    }
 }
 
 </script>

src/view/mst/inventory-management/inbound-management/reserve-cotton-warehousing-list/form.vue

@@ -55,41 +55,43 @@
           </DkFormItem>
         </DkForm>
       </DkPanel>
-      <div>
-      </div>
+      <!--表格-->
+      <DkPanel prop="table" id="table" >
+        <div slot="content">
+          <DkTable
+            :id="'table-'+$options.name"
+            ref="table-select"
+            :height="tableHeight-325"
+            primaryKey="staffId"
+            :multiple="false"
+            :choose-flag="false"
+            :page-flag="true"
+            :page-total="pageInfo.total"
+            @pageChange="pageSizeChange"
+            :pageSizeOpts="pageSizeOpts"
+            :current-page="pageInfo.currentPage"
+            :pageSize="pageInfo.pageSize"
+          >
+            <!--  品类  -->
+            <DkTableColumn field="category"></DkTableColumn>
+            <!--  当前仓库  -->
+            <DkTableColumn field="currentWarehouse"></DkTableColumn>
+            <!--  编码  -->
+            <DkTableColumn field="code"></DkTableColumn>
+            <!--  圆模  -->
+            <DkTableColumn field="circularDie"></DkTableColumn>
+            <!--  郑交所仓单  -->
+            <DkTableColumn field="zceWarehouseReceipt"></DkTableColumn>
+            <!--  数量  -->
+            <DkTableColumn field="num"></DkTableColumn>
+            <!--  单位  -->
+            <DkTableColumn field="unit"></DkTableColumn>
+            <!--  备注  -->
+            <DkTableColumn field="remark"></DkTableColumn>
+          </DkTable>
+        </div>
+      </DkPanel>
     </DkCollapse>
-
-    <DkTable
-      :id="'table-'+$options.name"
-      ref="table-select"
-      :height="tableHeight-266"
-      primaryKey="staffId"
-      :multiple="false"
-      :choose-flag="false"
-      :page-flag="true"
-      :page-total="pageInfo.total"
-      @pageChange="pageSizeChange"
-      :pageSizeOpts="pageSizeOpts"
-      :current-page="pageInfo.currentPage"
-      :pageSize="pageInfo.pageSize"
-    >
-      <!--  品类  -->
-      <DkTableColumn field="category"></DkTableColumn>
-      <!--  当前仓库  -->
-      <DkTableColumn field="currentWarehouse"></DkTableColumn>
-      <!--  编码  -->
-      <DkTableColumn field="code"></DkTableColumn>
-      <!--  圆模  -->
-      <DkTableColumn field="circularDie"></DkTableColumn>
-      <!--  郑交所仓单  -->
-      <DkTableColumn field="zceWarehouseReceipt"></DkTableColumn>
-      <!--  数量  -->
-      <DkTableColumn field="num"></DkTableColumn>
-      <!--  单位  -->
-      <DkTableColumn field="unit"></DkTableColumn>
-      <!--  备注  -->
-      <DkTableColumn field="remark"></DkTableColumn>
-    </DkTable>
     <!--添加公检批号-->
     <DkModal
       :loading="loading"

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

@@ -27,88 +27,75 @@
                       :searchContent="searchContent"
           ></SearchCond>
         </div>
-        <DkTable
-          slot="top"
-          :id="'table-'+$options.name"
-          ref="table-select"
-          :data="tableData"
-          :height="tableHeight-320"
-          primaryKey="staffId"
-          :multiple="false"
-          :choose-flag="false"
-          :showFooter="true"
-          :page-flag="true"
-          :page-total="pageInfo.total"
-          @pageChange="pageSizeChange"
-          :pageSizeOpts="pageSizeOpts"
-          :current-page="pageInfo.currentPage"
-          :pageSize="pageInfo.pageSize"
-        >
-          <!--  单号  -->
-          <DkTableColumn field="dataNo" type="link"></DkTableColumn>
-          <!--  入库类型  -->
-          <DkTableColumn field="inWarehouseType"></DkTableColumn>
-          <!--  入库员  -->
-          <DkTableColumn field="inWarehouseStaff"></DkTableColumn>
-          <!--  供应商  -->
-          <DkTableColumn field="supplier"></DkTableColumn>
-          <!--  买家  -->
-          <DkTableColumn field="buyer"></DkTableColumn>
-          <!--  联系人  -->
-          <DkTableColumn field="contactName"></DkTableColumn>
-          <!--  电话  -->
-          <DkTableColumn field="objPhone"></DkTableColumn>
-          <!--  入库日期  -->
-          <DkTableColumn field="inWarehouseDate"></DkTableColumn>
-          <!--  重量 /吨  -->
-          <DkTableColumn field="weight" data-type="number" sum="true"></DkTableColumn>
-          <!--  货权人  -->
-          <DkTableColumn field="goodsOwner"></DkTableColumn>
-          <!--  合作方  -->
-          <DkTableColumn field="cooperationPartner"></DkTableColumn>
-          <!--  状态  -->
-          <DkTableColumn field="tagObject" title="状态"
-                         dataType="object"
-                         type="tag"></DkTableColumn>
-          <!--  备注 -->
-          <DkTableColumn field="remarks"></DkTableColumn>
-        </DkTable>
-        <DkTabs v-model="currentType" :options="tabsOptions"></DkTabs>
-        <!--  转货权采购单表格部分   -->
-        <DkTable
-          slot="buttom"
-          :id="'table-'+$options.name"
-          ref="table-select"
-          :data="formData"
-          :height="tableHeight-320"
-          primaryKey="staffId"
-          :multiple="false"
-          :showFooter="true"
-          :choose-flag="false"
-          :page-flag="true"
-          :page-total="pageInfo.total"
-          @pageChange="pageSizeChange"
-          :pageSizeOpts="pageSizeOpts"
-          :current-page="pageInfo.currentPage"
-          :pageSize="pageInfo.pageSize"
-        >
-          <!--  品类  -->
-          <DkTableColumn field="category"></DkTableColumn>
-          <!--  当前仓库  -->
-          <DkTableColumn field="currentWarehouse"></DkTableColumn>
-          <!--  编码  -->
-          <DkTableColumn field="code" type="link"></DkTableColumn>
-          <!--  圆模  -->
-          <DkTableColumn field="circularDie"></DkTableColumn>
-          <!--  郑交所仓单  -->
-          <DkTableColumn field="zceWarehouseReceipt"></DkTableColumn>
-          <!--  数量  -->
-          <DkTableColumn field="num" data-type="int" sum="true" digits="0"></DkTableColumn>
-          <!--  单位  -->
-          <DkTableColumn field="unit"></DkTableColumn>
-          <!--  备注  -->
-          <DkTableColumn field="remarks"></DkTableColumn>
-        </DkTable>
+        <!--  表格部分  -->
+        <div :style="'height: ' + tableHeight + 'px'" class="split-div-class">
+          <DkSplit mode="vertical" v-model="split" ref="split">
+            <div slot="top">
+              <DkTable :id="'table-' + $options.name" ref="table-select" :data="tableData"
+                       :height="tableHeight * split -40" :page-flag="true" primaryKey="docId" :multiple="false"
+                       :choose-flag="false" :page-total="pageInfo.total" :current-page="pageInfo.currentPage"
+                       :page-size="pageInfo.pageSize" :page-size-opts="pageSizeOpts" @pageChange="pageSizeChange"
+                       :showFooter="true"
+                       reverseColorFlag tree-flag>
+                <!--  单号  -->
+                <DkTableColumn field="dataNo" type="link"></DkTableColumn>
+                <!--  入库类型  -->
+                <DkTableColumn field="inWarehouseType"></DkTableColumn>
+                <!--  入库员  -->
+                <DkTableColumn field="inWarehouseStaff"></DkTableColumn>
+                <!--  供应商  -->
+                <DkTableColumn field="supplier"></DkTableColumn>
+                <!--  买家  -->
+                <DkTableColumn field="buyer"></DkTableColumn>
+                <!--  联系人  -->
+                <DkTableColumn field="contactName"></DkTableColumn>
+                <!--  电话  -->
+                <DkTableColumn field="objPhone"></DkTableColumn>
+                <!--  入库日期  -->
+                <DkTableColumn field="inWarehouseDate"></DkTableColumn>
+                <!--  重量 /吨  -->
+                <DkTableColumn field="weight" data-type="number" sum="true"></DkTableColumn>
+                <!--  货权人  -->
+                <DkTableColumn field="goodsOwner"></DkTableColumn>
+                <!--  合作方  -->
+                <DkTableColumn field="cooperationPartner"></DkTableColumn>
+                <!--  状态  -->
+                <DkTableColumn field="tagObject" title="状态"
+                               type="tag" tag-type="mCSTag"></DkTableColumn>
+                <!--  备注 -->
+                <DkTableColumn field="remarks"></DkTableColumn>
+              </DkTable>
+            </div>
+            <div slot="bottom">
+              <!-- 商品明细 -->
+              <DkTable :id="'table-' + $options.name + '-file'" ref="table-select-down-file" :data="formData"
+                       :height="tableHeight * (1 - split) - 40" :page-flag="false" primaryKey="itemId" :multiple="false"
+                       :choose-flag="false" @pageChange="pageSizeChange"
+                       :showFooter="true"
+                       :tree-flag="true"
+                       parentField="parentId"
+              >
+                <DkTabs v-model="currentType" :options="tabsOptions"></DkTabs>
+                <!--  品类  -->
+                <DkTableColumn field="category"></DkTableColumn>
+                <!--  当前仓库  -->
+                <DkTableColumn field="currentWarehouse"></DkTableColumn>
+                <!--  编码  -->
+                <DkTableColumn field="code" type="link"></DkTableColumn>
+                <!--  圆模  -->
+                <DkTableColumn field="circularDie"></DkTableColumn>
+                <!--  郑交所仓单  -->
+                <DkTableColumn field="zceWarehouseReceipt"></DkTableColumn>
+                <!--  数量  -->
+                <DkTableColumn field="num" data-type="int" sum="true" digits="0"></DkTableColumn>
+                <!--  单位  -->
+                <DkTableColumn field="unit"></DkTableColumn>
+                <!--  备注  -->
+                <DkTableColumn field="remarks"></DkTableColumn>
+              </DkTable>
+            </div>
+          </DkSplit>
+        </div>
       </div>
     </div>
 
@@ -238,39 +225,35 @@ export default {
      *   @author : 王宇轩
      */
     initData() {
-      const managers = ['张经理', '李经理', '赵经理', '胡经理'];
-      const customers = ['曹魏', '江东', '蜀汉'];
-      const contacts = ['曹操', '曹仁', '曹嵩', '曹英', '曹爽', '曹昂', '曹真', '曹丕', '曹植', '曹彰', '曹冲', '曹髦', '曹睿', '曹芳'];
-      const inboundTypes = ['采购入库', '退货入库', '其他入库'];
-      const tags = ['待出库', '已出库'];
-
-      this.tableData = [];
-      for (let i = 0; i < 20; i++) {
-        const manager = managers[i % managers.length];
-        const customer = customers[i % customers.length];
-        const contact = contacts[i % contacts.length];
-        const inboundType = inboundTypes[i % inboundTypes.length];
-        const tag= tags[i % tags.length];
-        this.tableData.push({
-          dataNo: `KH${String(i + 1).padStart(5, '0')}`,
-          outWarehouseType: inboundType,
-          outWarehouseStaff: manager,
-          cusId: customer,
-          seller: '2025-05-28',
-          tagObject: {tag},
-          contactName: contact,
-          objPhone: '13800138000',
-          outWarehouseDate: '2025-05-28',
-          weight: '2000',
-          remarks: `备注${i + 1}`,
-          inWarehouseType: inboundType,
-          inWarehouseStaff: manager,
-          supplier: customer,
-          buyer: customer,
-          inWarehouseDate: '2025-05-28',
-          goodsOwner: contact,
-          cooperationPartner: '江东',
-        });
+      this.tableData=Array.from({ length: 1000 }, (_, index) => ({
+        rotaReservePlan: ['DJ', 'VO'][index % 2] + `-${String(index + 1).padStart(4, '0')}`,
+        // 单号
+        dataNo: ['DJ', 'VO'][index % 2] + `-${String(index + 1).padStart(4, '0')}`,
+        // 入库类型
+        inWarehouseType: ['采购入库', '退货入库', '其他入库'][index % 3],
+        // 入库员
+        inWarehouseStaff: ['张师傅', '李师傅', '赵师傅'][index % 3],
+        // 供应商
+        supplier: ['A供应商', 'B供应商', 'C供应商'][index % 3],
+        // 买家
+        buyer: ['A买家', 'B买家', 'C买家'][index % 3],
+        // 联系人
+        contactName: ['A联系人', 'B联系人', 'C联系人'][index % 3],
+        // 电话
+        objPhone: ['12345678901', '12345678902', '12345678903'][index % 3],
+        // 入库日期
+        inWarehouseDate: '2025-05-28',
+        // 重量 /吨
+        weight: Math.floor(Math.random() * 1000) + 1,
+        // 货权人
+        goodsOwner: ['A货权人', 'B货权人', 'C货权人'][index % 3],
+        // 合作方
+        cooperationPartner: ['A合作方', 'B合作方', 'C合作方'][index % 3],
+        // 状态
+        tagObject:{tag:['待出库','已出库'][index%2],color:['blue','green'][index%2]},
+        // 备注
+        remarks: ['A备注', 'B备注', 'C备注'][index % 3],
+      })),
         this.formData = Array.from({length: 20}, (_, index) => ({
           dataNo: `AB${String(index + 1).padStart(5, '0')}`,
           category: `品类${index + 1}`,
@@ -282,7 +265,7 @@ export default {
           unit: ['吨', '件', '箱'][index % 3],
           remarks: `备注${index + 1}`
         }));
-      }
+
     },
 
 

src/view/mst/inventory-management/inbound-management/residual-batch-inbound-order/form.vue

@@ -55,41 +55,44 @@
           </DkFormItem>
         </DkForm>
       </DkPanel>
-      <div>
-      </div>
+      <!--表格-->
+      <DkPanel prop="table" id="table" >
+        <div slot="content">
+          <DkTable
+            :id="'table-'+$options.name"
+            ref="table-select"
+            :height="tableHeight-325"
+            primaryKey="staffId"
+            :multiple="false"
+            :choose-flag="false"
+            :page-flag="true"
+            :page-total="pageInfo.total"
+            @pageChange="pageSizeChange"
+            :pageSizeOpts="pageSizeOpts"
+            :current-page="pageInfo.currentPage"
+            :pageSize="pageInfo.pageSize"
+          >
+            <!--  品类  -->
+            <DkTableColumn field="category"></DkTableColumn>
+            <!--  当前仓库  -->
+            <DkTableColumn field="currentWarehouse"></DkTableColumn>
+            <!--  编码  -->
+            <DkTableColumn field="code"></DkTableColumn>
+            <!--  圆模  -->
+            <DkTableColumn field="circularDie"></DkTableColumn>
+            <!--  郑交所仓单  -->
+            <DkTableColumn field="zceWarehouseReceipt"></DkTableColumn>
+            <!--  数量  -->
+            <DkTableColumn field="num"></DkTableColumn>
+            <!--  单位  -->
+            <DkTableColumn field="unit"></DkTableColumn>
+            <!--  备注  -->
+            <DkTableColumn field="remark"></DkTableColumn>
+          </DkTable>
+        </div>
+      </DkPanel>
     </DkCollapse>
 
-    <DkTable
-      :id="'table-'+$options.name"
-      ref="table-select"
-      :height="tableHeight-266"
-      primaryKey="staffId"
-      :multiple="false"
-      :choose-flag="false"
-      :page-flag="true"
-      :page-total="pageInfo.total"
-      @pageChange="pageSizeChange"
-      :pageSizeOpts="pageSizeOpts"
-      :current-page="pageInfo.currentPage"
-      :pageSize="pageInfo.pageSize"
-    >
-      <!--  品类  -->
-      <DkTableColumn field="category"></DkTableColumn>
-      <!--  当前仓库  -->
-      <DkTableColumn field="currentWarehouse"></DkTableColumn>
-      <!--  编码  -->
-      <DkTableColumn field="code"></DkTableColumn>
-      <!--  圆模  -->
-      <DkTableColumn field="circularDie"></DkTableColumn>
-      <!--  郑交所仓单  -->
-      <DkTableColumn field="zceWarehouseReceipt"></DkTableColumn>
-      <!--  数量  -->
-      <DkTableColumn field="num"></DkTableColumn>
-      <!--  单位  -->
-      <DkTableColumn field="unit"></DkTableColumn>
-      <!--  备注  -->
-      <DkTableColumn field="remark"></DkTableColumn>
-    </DkTable>
     <!--添加公检批号-->
     <DkModal
       :loading="loading"

src/view/mst/inventory-management/inbound-management/residual-batch-inbound-order/index.vue

@@ -27,88 +27,76 @@
                       :searchContent="searchContent"
           ></SearchCond>
         </div>
-        <DkTable
-          slot="top"
-          :id="'table-'+$options.name"
-          ref="table-select"
-          :data="tableData"
-          :height="tableHeight-320"
-          primaryKey="staffId"
-          :multiple="false"
-          :showFooter="true"
-          :choose-flag="false"
-          :page-flag="true"
-          :page-total="pageInfo.total"
-          @pageChange="pageSizeChange"
-          :pageSizeOpts="pageSizeOpts"
-          :current-page="pageInfo.currentPage"
-          :pageSize="pageInfo.pageSize"
-        >
-          <!--  单号  -->
-          <DkTableColumn field="dataNo" type="link"></DkTableColumn>
-          <!--  入库类型  -->
-          <DkTableColumn field="inWarehouseType"></DkTableColumn>
-          <!--  入库员  -->
-          <DkTableColumn field="inWarehouseStaff"></DkTableColumn>
-          <!--  供应商  -->
-          <DkTableColumn field="supplier"></DkTableColumn>
-          <!--  买家  -->
-          <DkTableColumn field="buyer"></DkTableColumn>
-          <!--  联系人  -->
-          <DkTableColumn field="contactName"></DkTableColumn>
-          <!--  电话  -->
-          <DkTableColumn field="objPhone"></DkTableColumn>
-          <!--  入库日期  -->
-          <DkTableColumn field="inWarehouseDate"></DkTableColumn>
-          <!--  重量 /吨  -->
-          <DkTableColumn field="weight" data-type="number" sum="true"></DkTableColumn>
-          <!--  货权人  -->
-          <DkTableColumn field="goodsOwner"></DkTableColumn>
-          <!--  合作方  -->
-          <DkTableColumn field="cooperationPartner"></DkTableColumn>
-          <!--  状态  -->
-          <DkTableColumn field="tagObject" title="状态"
-                         dataType="object"
-                         type="tag"></DkTableColumn>
-          <!--  备注 -->
-          <DkTableColumn field="remarks"></DkTableColumn>
-        </DkTable>
-        <DkTabs v-model="currentType" :options="tabsOptions"></DkTabs>
-        <!--  转货权采购单表格部分   -->
-        <DkTable
-          slot="buttom"
-          :id="'table-'+$options.name"
-          ref="table-select"
-          :data="formData"
-          :height="tableHeight-320"
-          primaryKey="staffId"
-          :multiple="false"
-          :showFooter="true"
-          :choose-flag="false"
-          :page-flag="true"
-          :page-total="pageInfo.total"
-          @pageChange="pageSizeChange"
-          :pageSizeOpts="pageSizeOpts"
-          :current-page="pageInfo.currentPage"
-          :pageSize="pageInfo.pageSize"
-        >
-          <!--  品类  -->
-          <DkTableColumn field="category"></DkTableColumn>
-          <!--  当前仓库  -->
-          <DkTableColumn field="currentWarehouse"></DkTableColumn>
-          <!--  编码  -->
-          <DkTableColumn field="code" type="link"></DkTableColumn>
-          <!--  圆模  -->
-          <DkTableColumn field="circularDie"></DkTableColumn>
-          <!--  郑交所仓单  -->
-          <DkTableColumn field="zceWarehouseReceipt"></DkTableColumn>
-          <!--  数量  -->
-          <DkTableColumn field="num" data-type="int" sum="true" digits="0"></DkTableColumn>
-          <!--  单位  -->
-          <DkTableColumn field="unit"></DkTableColumn>
-          <!--  备注  -->
-          <DkTableColumn field="remarks"></DkTableColumn>
-        </DkTable>
+        <!--  表格部分  -->
+        <div :style="'height: ' + tableHeight + 'px'" class="split-div-class">
+          <DkSplit mode="vertical" v-model="split" ref="split">
+            <div slot="top">
+              <DkTable :id="'table-' + $options.name" ref="table-select" :data="tableData"
+                       :height="tableHeight * split -40" :page-flag="true" primaryKey="docId" :multiple="false"
+                       :choose-flag="false" :page-total="pageInfo.total" :current-page="pageInfo.currentPage"
+                       :page-size="pageInfo.pageSize" :page-size-opts="pageSizeOpts" @pageChange="pageSizeChange"
+                       :showFooter="true"
+                       reverseColorFlag tree-flag>
+                <!--  单号  -->
+                <DkTableColumn field="dataNo" type="link"></DkTableColumn>
+                <!--  入库类型  -->
+                <DkTableColumn field="inWarehouseType"></DkTableColumn>
+                <!--  入库员  -->
+                <DkTableColumn field="inWarehouseStaff"></DkTableColumn>
+                <!--  供应商  -->
+                <DkTableColumn field="supplier"></DkTableColumn>
+                <!--  买家  -->
+                <DkTableColumn field="buyer"></DkTableColumn>
+                <!--  联系人  -->
+                <DkTableColumn field="contactName"></DkTableColumn>
+                <!--  电话  -->
+                <DkTableColumn field="objPhone"></DkTableColumn>
+                <!--  入库日期  -->
+                <DkTableColumn field="inWarehouseDate"></DkTableColumn>
+                <!--  重量 /吨  -->
+                <DkTableColumn field="weight" data-type="number" sum="true"></DkTableColumn>
+                <!--  货权人  -->
+                <DkTableColumn field="goodsOwner"></DkTableColumn>
+                <!--  合作方  -->
+                <DkTableColumn field="cooperationPartner"></DkTableColumn>
+                <!--  状态  -->
+                <DkTableColumn field="tagObject" title="状态"
+                               type="tag" tag-type="mCSTag"></DkTableColumn>
+                <!--  备注 -->
+                <DkTableColumn field="remarks"></DkTableColumn>
+              </DkTable>
+            </div>
+            <div slot="bottom">
+              <!-- 商品明细 -->
+              <DkTable :id="'table-' + $options.name + '-file'" ref="table-select-down-file" :data="formData"
+                       :height="tableHeight * (1 - split) - 40" :page-flag="false" primaryKey="itemId" :multiple="false"
+                       :choose-flag="false" @pageChange="pageSizeChange"
+                       :showFooter="true"
+                       :tree-flag="true"
+                       parentField="parentId"
+              >
+                <DkTabs v-model="currentType" :options="tabsOptions"></DkTabs>
+                <!--  品类  -->
+                <DkTableColumn field="category"></DkTableColumn>
+                <!--  当前仓库  -->
+                <DkTableColumn field="currentWarehouse"></DkTableColumn>
+                <!--  编码  -->
+                <DkTableColumn field="code" type="link"></DkTableColumn>
+                <!--  圆模  -->
+                <DkTableColumn field="circularDie"></DkTableColumn>
+                <!--  郑交所仓单  -->
+                <DkTableColumn field="zceWarehouseReceipt"></DkTableColumn>
+                <!--  数量  -->
+                <DkTableColumn field="num" data-type="int" sum="true" digits="0"></DkTableColumn>
+                <!--  单位  -->
+                <DkTableColumn field="unit"></DkTableColumn>
+                <!--  备注  -->
+                <DkTableColumn field="remarks"></DkTableColumn>
+              </DkTable>
+            </div>
+          </DkSplit>
+        </div>
+
       </div>
     </div>
 
@@ -238,39 +226,21 @@ export default {
      *   @author : 王宇轩
      */
     initData() {
-      const managers = ['张经理', '李经理', '赵经理', '胡经理'];
-      const customers = ['曹魏', '江东', '蜀汉'];
-      const contacts = ['曹操', '曹仁', '曹嵩', '曹英', '曹爽', '曹昂', '曹真', '曹丕', '曹植', '曹彰', '曹冲', '曹髦', '曹睿', '曹芳'];
-      const inboundTypes = ['采购入库', '退货入库', '其他入库'];
-      const tags = ['待出库', '已出库'];
-
-      this.tableData = [];
-      for (let i = 0; i < 20; i++) {
-        const manager = managers[i % managers.length];
-        const customer = customers[i % customers.length];
-        const contact = contacts[i % contacts.length];
-        const inboundType = inboundTypes[i % inboundTypes.length];
-        const tag= tags[i % tags.length];
-        this.tableData.push({
-          dataNo: `KH${String(i + 1).padStart(5, '0')}`,
-          outWarehouseType: inboundType,
-          outWarehouseStaff: manager,
-          cusId: customer,
-          seller: '2025-05-28',
-          tagObject: {tag},
-          contactName: contact,
-          objPhone: '13800138000',
-          outWarehouseDate: '2025-05-28',
-          weight: '2000',
-          remarks: `备注${i + 1}`,
-          inWarehouseType: inboundType,
-          inWarehouseStaff: manager,
-          supplier: customer,
-          buyer: customer,
-          inWarehouseDate: '2025-05-28',
-          goodsOwner: contact,
-          cooperationPartner: '江东',
-        });
+      this.tableData = Array.from({length: 20}, (_, index) => ({
+        dataNo: `AB${String(index + 1).padStart(5, '0')}`,
+        inWarehouseType: ['采购入库', '退货入库', '其他入库'][index % 3],
+        inWarehouseStaff: `员工${index + 1}`,
+        supplier: `供应商${index + 1}`,
+        buyer: `买家${index + 1}`,
+        contactName: `联系人${index + 1}`,
+        objPhone: `1380013800${String(index + 1).padStart(2, '0')}`,
+        inWarehouseDate: `2024-05-${String(index + 1).padStart(2, '0')}`,
+        weight: Math.floor(Math.random() * 1000) + 1, // 1 - 1000 随机数
+        goodsOwner: `货权人${index + 1}`,
+        cooperationPartner: `合作方${index + 1}`,
+        tagObject: {tag:['待出库', '已出库'][index % 2],color:['blue', 'green'][index % 2]},
+        remarks: `备注${index + 1}`
+      })),
         this.formData = Array.from({length: 20}, (_, index) => ({
           dataNo: `AB${String(index + 1).padStart(5, '0')}`,
           category: `品类${index + 1}`,
@@ -282,7 +252,6 @@ export default {
           unit: ['吨', '件', '箱'][index % 3],
           remarks: `备注${index + 1}`
         }));
-      }
     },
 
 

src/view/mst/inventory-management/inbound-management/warehouse-receipt-cotton-warehousing-list/form.vue

@@ -55,41 +55,43 @@
           </DkFormItem>
         </DkForm>
       </DkPanel>
-      <div>
-      </div>
+      <!--表格-->
+      <DkPanel prop="table" id="table" >
+        <div slot="content">
+          <DkTable
+            :id="'table-'+$options.name"
+            ref="table-select"
+            :height="tableHeight-325"
+            primaryKey="staffId"
+            :multiple="false"
+            :choose-flag="false"
+            :page-flag="true"
+            :page-total="pageInfo.total"
+            @pageChange="pageSizeChange"
+            :pageSizeOpts="pageSizeOpts"
+            :current-page="pageInfo.currentPage"
+            :pageSize="pageInfo.pageSize"
+          >
+            <!--  品类  -->
+            <DkTableColumn field="category"></DkTableColumn>
+            <!--  当前仓库  -->
+            <DkTableColumn field="currentWarehouse"></DkTableColumn>
+            <!--  编码  -->
+            <DkTableColumn field="code"></DkTableColumn>
+            <!--  圆模  -->
+            <DkTableColumn field="circularDie"></DkTableColumn>
+            <!--  郑交所仓单  -->
+            <DkTableColumn field="zceWarehouseReceipt"></DkTableColumn>
+            <!--  数量  -->
+            <DkTableColumn field="num"></DkTableColumn>
+            <!--  单位  -->
+            <DkTableColumn field="unit"></DkTableColumn>
+            <!--  备注  -->
+            <DkTableColumn field="remark"></DkTableColumn>
+          </DkTable>
+        </div>
+      </DkPanel>
     </DkCollapse>
-
-    <DkTable
-      :id="'table-'+$options.name"
-      ref="table-select"
-      :height="tableHeight-266"
-      primaryKey="staffId"
-      :multiple="false"
-      :choose-flag="false"
-      :page-flag="true"
-      :page-total="pageInfo.total"
-      @pageChange="pageSizeChange"
-      :pageSizeOpts="pageSizeOpts"
-      :current-page="pageInfo.currentPage"
-      :pageSize="pageInfo.pageSize"
-    >
-      <!--  品类  -->
-      <DkTableColumn field="category"></DkTableColumn>
-      <!--  当前仓库  -->
-      <DkTableColumn field="currentWarehouse"></DkTableColumn>
-      <!--  编码  -->
-      <DkTableColumn field="code"></DkTableColumn>
-      <!--  圆模  -->
-      <DkTableColumn field="circularDie"></DkTableColumn>
-      <!--  郑交所仓单  -->
-      <DkTableColumn field="zceWarehouseReceipt"></DkTableColumn>
-      <!--  数量  -->
-      <DkTableColumn field="num"></DkTableColumn>
-      <!--  单位  -->
-      <DkTableColumn field="unit"></DkTableColumn>
-      <!--  备注  -->
-      <DkTableColumn field="remark"></DkTableColumn>
-    </DkTable>
     <!--添加公检批号-->
     <DkModal
       :loading="loading"

src/view/mst/inventory-management/inbound-management/warehouse-receipt-cotton-warehousing-list/index.vue

@@ -27,87 +27,75 @@
                       :searchContent="searchContent"
           ></SearchCond>
         </div>
-        <DkTable
-          slot="top"
-          :id="'table-'+$options.name"
-          ref="table-select"
-          :data="tableData"
-          :height="tableHeight-320"
-          primaryKey="staffId"
-          :multiple="false"
-          :choose-flag="false"
-          :showFooter="true"
-          :page-flag="true"
-          :page-total="pageInfo.total"
-          @pageChange="pageSizeChange"
-          :pageSizeOpts="pageSizeOpts"
-          :current-page="pageInfo.currentPage"
-          :pageSize="pageInfo.pageSize"
-        >
-          <!--  单号  -->
-          <DkTableColumn field="dataNo" type="link"></DkTableColumn>
-          <!--  入库类型  -->
-          <DkTableColumn field="inWarehouseType"></DkTableColumn>
-          <!--  入库员  -->
-          <DkTableColumn field="inWarehouseStaff"></DkTableColumn>
-          <!--  供应商  -->
-          <DkTableColumn field="supplier"></DkTableColumn>
-          <!--  买家  -->
-          <DkTableColumn field="buyer"></DkTableColumn>
-          <!--  联系人  -->
-          <DkTableColumn field="contactName"></DkTableColumn>
-          <!--  电话  -->
-          <DkTableColumn field="objPhone"></DkTableColumn>
-          <!--  入库日期  -->
-          <DkTableColumn field="inWarehouseDate"></DkTableColumn>
-          <!--  重量 /吨  -->
-          <DkTableColumn field="weight" data-type="number" sum="true"></DkTableColumn>
-          <!--  货权人  -->
-          <DkTableColumn field="goodsOwner"></DkTableColumn>
-          <!--  合作方  -->
-          <DkTableColumn field="cooperationPartner"></DkTableColumn>
-          <!--  状态  -->
-          <DkTableColumn field="tagObject" title="状态"
-                         type="tag"></DkTableColumn>
-          <!--  备注 -->
-          <DkTableColumn field="remarks"></DkTableColumn>
-        </DkTable>
-        <DkTabs v-model="currentType" :options="tabsOptions"></DkTabs>
-        <!--  转货权采购单表格部分   -->
-        <DkTable
-          slot="buttom"
-          :id="'table-'+$options.name"
-          ref="table-select"
-          :data="formData"
-          :height="tableHeight-320"
-          primaryKey="staffId"
-          :multiple="false"
-          :choose-flag="false"
-          :showFooter="true"
-          :page-flag="true"
-          :page-total="pageInfo.total"
-          @pageChange="pageSizeChange"
-          :pageSizeOpts="pageSizeOpts"
-          :current-page="pageInfo.currentPage"
-          :pageSize="pageInfo.pageSize"
-        >
-          <!--  品类  -->
-          <DkTableColumn field="category"></DkTableColumn>
-          <!--  当前仓库  -->
-          <DkTableColumn field="currentWarehouse"></DkTableColumn>
-          <!--  编码  -->
-          <DkTableColumn field="code" type="link"></DkTableColumn>
-          <!--  圆模  -->
-          <DkTableColumn field="circularDie"></DkTableColumn>
-          <!--  郑交所仓单  -->
-          <DkTableColumn field="zceWarehouseReceipt"></DkTableColumn>
-          <!--  数量  -->
-          <DkTableColumn field="num" data-type="int" sum=true digits="0"></DkTableColumn>
-          <!--  单位  -->
-          <DkTableColumn field="unit"></DkTableColumn>
-          <!--  备注  -->
-          <DkTableColumn field="remarks"></DkTableColumn>
-        </DkTable>
+        <!--  表格部分  -->
+        <div :style="'height: ' + tableHeight + 'px'" class="split-div-class">
+          <DkSplit mode="vertical" v-model="split" ref="split">
+            <div slot="top">
+              <DkTable :id="'table-' + $options.name" ref="table-select" :data="tableData"
+                       :height="tableHeight * split -40" :page-flag="true" primaryKey="docId" :multiple="false"
+                       :choose-flag="false" :page-total="pageInfo.total" :current-page="pageInfo.currentPage"
+                       :page-size="pageInfo.pageSize" :page-size-opts="pageSizeOpts" @pageChange="pageSizeChange"
+                       :showFooter="true"
+                       reverseColorFlag tree-flag>
+                <!--  单号  -->
+                <DkTableColumn field="dataNo" type="link"></DkTableColumn>
+                <!--  入库类型  -->
+                <DkTableColumn field="inWarehouseType"></DkTableColumn>
+                <!--  入库员  -->
+                <DkTableColumn field="inWarehouseStaff"></DkTableColumn>
+                <!--  供应商  -->
+                <DkTableColumn field="supplier"></DkTableColumn>
+                <!--  买家  -->
+                <DkTableColumn field="buyer"></DkTableColumn>
+                <!--  联系人  -->
+                <DkTableColumn field="contactName"></DkTableColumn>
+                <!--  电话  -->
+                <DkTableColumn field="objPhone"></DkTableColumn>
+                <!--  入库日期  -->
+                <DkTableColumn field="inWarehouseDate"></DkTableColumn>
+                <!--  重量 /吨  -->
+                <DkTableColumn field="weight" data-type="number" sum="true"></DkTableColumn>
+                <!--  货权人  -->
+                <DkTableColumn field="goodsOwner"></DkTableColumn>
+                <!--  合作方  -->
+                <DkTableColumn field="cooperationPartner"></DkTableColumn>
+                <!--  状态  -->
+                <DkTableColumn field="tagObject" title="状态"
+                               type="tag" tag-type="mCSTag"></DkTableColumn>
+                <!--  备注 -->
+                <DkTableColumn field="remarks"></DkTableColumn>
+              </DkTable>
+            </div>
+            <div slot="bottom">
+              <!-- 商品明细 -->
+              <DkTable :id="'table-' + $options.name + '-file'" ref="table-select-down-file" :data="formData"
+                       :height="tableHeight * (1 - split) - 40" :page-flag="false" primaryKey="itemId" :multiple="false"
+                       :choose-flag="false" @pageChange="pageSizeChange"
+                       :showFooter="true"
+                       :tree-flag="true"
+                       parentField="parentId"
+              >
+                <DkTabs v-model="currentType" :options="tabsOptions"></DkTabs>
+                <!--  品类  -->
+                <DkTableColumn field="category"></DkTableColumn>
+                <!--  当前仓库  -->
+                <DkTableColumn field="currentWarehouse"></DkTableColumn>
+                <!--  编码  -->
+                <DkTableColumn field="code" type="link"></DkTableColumn>
+                <!--  圆模  -->
+                <DkTableColumn field="circularDie"></DkTableColumn>
+                <!--  郑交所仓单  -->
+                <DkTableColumn field="zceWarehouseReceipt"></DkTableColumn>
+                <!--  数量  -->
+                <DkTableColumn field="num" data-type="int" sum="true" digits="0"></DkTableColumn>
+                <!--  单位  -->
+                <DkTableColumn field="unit"></DkTableColumn>
+                <!--  备注  -->
+                <DkTableColumn field="remarks"></DkTableColumn>
+              </DkTable>
+            </div>
+          </DkSplit>
+        </div>
       </div>
     </div>
 
@@ -237,51 +225,33 @@ export default {
      *   @author : 王宇轩
      */
     initData() {
-      const managers = ['张经理', '李经理', '赵经理', '胡经理'];
-      const customers = ['曹魏', '江东', '蜀汉'];
-      const contacts = ['曹操', '曹仁', '曹嵩', '曹英', '曹爽', '曹昂', '曹真', '曹丕', '曹植', '曹彰', '曹冲', '曹髦', '曹睿', '曹芳'];
-      const inboundTypes = ['采购入库', '退货入库', '其他入库'];
-      const tags = ['待出库', '已出库'];
+      this.tableData = Array.from({length: 20}, (_, index) => ({
+        dataNo: `AB${String(index + 1).padStart(5, '0')}`,
+        inWarehouseType: ['采购入库', '退货入库', '其他入库'][index % 3],
+        inWarehouseStaff: `员工${index + 1}`,
+        supplier: `供应商${index + 1}`,
+        buyer: `买家${index + 1}`,
+        contactName: `联系人${index + 1}`,
+        objPhone: `1234567890${index + 1}`,
+        inWarehouseDate: `2025-05-${String(index + 1).padStart(2, '0')}`,
+        weight: `${Math.floor(Math.random() * 1000) + 1}`, // 1 - 1000 随机数
+        goodsOwner: `货权人${index + 1}`,
+        cooperationPartner: `合作方${index + 1}`,
+        tagObject: {tag: ['待出库', '已出库'][index % 2], color: ['blue', 'green'][index % 2]},
+        remarks: `备注${index + 1}`,
+      }));
+      this.formData = Array.from({length: 20}, (_, index) => ({
+        dataNo: `AB${String(index + 1).padStart(5, '0')}`,
+        category: `品类${index + 1}`,
+        currentWarehouse: `仓库${index % 5 + 1}`, // 假设只有 5 个仓库
+        code: `CODE-${String(index + 1).padStart(3, '0')}`,
+        circularDie: `圆模${String.fromCharCode(65 + index % 26)}`, // 使用 A - Z 命名
+        zceWarehouseReceipt: `ZCE-${String(index + 1).padStart(4, '0')}`,
+        num: `${Math.floor(Math.random() * 100) + 1}`, // 1 - 100 随机数
+        unit: ['吨', '件', '箱'][index % 3],
+        remarks: `备注${index + 1}`
+      }));
 
-      this.tableData = [];
-      for (let i = 0; i < 20; i++) {
-        const manager = managers[i % managers.length];
-        const customer = customers[i % customers.length];
-        const contact = contacts[i % contacts.length];
-        const inboundType = inboundTypes[i % inboundTypes.length];
-        const tag= tags[i % tags.length];
-        this.tableData.push({
-          dataNo: `KH${String(i + 1).padStart(5, '0')}`,
-          outWarehouseType: inboundType,
-          outWarehouseStaff: manager,
-          cusId: customer,
-          seller: '2025-05-28',
-          tagObject: {tag},
-          contactName: contact,
-          objPhone: '13800138000',
-          outWarehouseDate: '2025-05-28',
-          weight: '2000',
-          remarks: `备注${i + 1}`,
-          inWarehouseType: inboundType,
-          inWarehouseStaff: manager,
-          supplier: customer,
-          buyer: customer,
-          inWarehouseDate: '2025-05-28',
-          goodsOwner: contact,
-          cooperationPartner: '江东',
-        });
-        this.formData = Array.from({length: 20}, (_, index) => ({
-          dataNo: `AB${String(index + 1).padStart(5, '0')}`,
-          category: `品类${index + 1}`,
-          currentWarehouse: `仓库${index % 5 + 1}`, // 假设只有 5 个仓库
-          code: `CODE-${String(index + 1).padStart(3, '0')}`,
-          circularDie: `圆模${String.fromCharCode(65 + index % 26)}`, // 使用 A - Z 命名
-          zceWarehouseReceipt: `ZCE-${String(index + 1).padStart(4, '0')}`,
-          num: `${Math.floor(Math.random() * 100) + 1}`, // 1 - 100 随机数
-          unit: ['吨', '件', '箱'][index % 3],
-          remarks: `备注${index + 1}`
-        }));
-      }
     },
 
 

src/view/mst/inventory-management/on-hand-inventory/inventory-adjustments/index.vue

@@ -46,7 +46,7 @@
           <!--  调整单号  -->
           <DkTableColumn field="adjustmentOrderNo" type="link"></DkTableColumn>
           <!--  调整类型  -->
-          <DkTableColumn field="adjustmentType" type="tag" ></DkTableColumn>
+          <DkTableColumn field="adjustmentType" type="tag" tag-type="mCSTag"></DkTableColumn>
           <!--  调整数量  -->
           <DkTableColumn field="adjustmentQuantity" data-type="number" sum="true" digits="0"></DkTableColumn>
           <!--  调整原因  -->
@@ -66,7 +66,7 @@
           <!--  责任人  -->
           <DkTableColumn field="responsPerson"></DkTableColumn>
           <!--  审批状态  -->
-          <DkTableColumn field="flgAudit" type="tag"></DkTableColumn>
+          <DkTableColumn field="flgAudit" type="tag" tag-type="mCSTag"></DkTableColumn>
           <!--  审批人  -->
           <DkTableColumn field="auditUser"></DkTableColumn>
           <!--  审批意见  -->
@@ -205,7 +205,7 @@ export default {
     initData() {
       this.tableData=Array.from({length:20},(_,index)=> ({
         adjustmentOrderNo:['KH','HI','LK','HL'][index%4]+ `-${String(index + 1).padStart(3, '0')}`,
-        adjustmentType:{tag:['报损','报溢'][index%2]},
+        adjustmentType:{tag:['报损','报溢'][index%2],color:['blue','red'][index%2]},
         adjustmentQuantity:Math.floor(Math.random() * 100) + 1,
         adjustmentReason:['原因1','原因2','原因3','原因4'][index%4],
         adjustmentDate:new Date().toISOString().split('T')[0],
@@ -215,7 +215,7 @@ export default {
         cottonVariety:['细绒棉','长绒棉'][index%2],
         lintCottonGrade:['品种A','品种B','品种C'][index%3],
         responsPerson:['关羽','诸葛诞','诸葛瑾','诸葛恪','诸葛亮'][index%5],
-        flgAudit:{tag:['待审批','已审批','驳回'][index%3]},
+        flgAudit:{tag:['待审批','已审批','驳回'][index%3],color:['blue','green','red'][index%3]},
         auditUser:['关羽','诸葛诞','诸葛瑾','诸葛恪','诸葛亮'][(index+1)%5],
         auditContent:['审批通过','审批不通过'][index%2],
       }))

src/view/mst/inventory-management/on-hand-inventory/inventory-details/index.vue

@@ -64,7 +64,7 @@
           <!--  二次入库日期  -->
           <DkTableColumn field="secondWarehouseData"></DkTableColumn>
           <!--  在库状态  -->
-          <DkTableColumn field="inventoryStatus" type="tag" ></DkTableColumn>
+          <DkTableColumn field="inventoryStatus" type="tag" tag-type="mCSTag"></DkTableColumn>
         </DkTable>
       </div>
     </div>
@@ -154,14 +154,6 @@ export default {
             labelKey: 'labelKey',},
           valueKind: 'M-CHOICE',
         },
-        //数量最小值
-        {
-          itemCode: 'numMin',
-        },
-        //数量最大值
-        {
-          itemCode: 'numMax',
-        },
         //圆模
         {
           itemCode: 'circularDie',
@@ -231,7 +223,7 @@ export default {
         circularDie: `圆模${String.fromCharCode(65 + index % 26)}`, // 使用 A - Z 命名
         zceWarehouseReceipt: `ZCE-${String(index + 1).padStart(4, '0')}`,
         secondWarehouseData: `2025-05-${String(index + 1).padStart(2, '0')}`,
-        inventoryStatus:{tag:['已锁定','已销售','暂停销售','可销售'][index % 4]}
+        inventoryStatus:{tag:['已锁定','已销售','暂停销售','可销售'][index % 4],color:['#FF0000','#00FF00','#0000FF','#FFFF00'][index % 4]}
       }));
 
 

src/view/mst/inventory-management/outbound-management/outbound-list-management/form.vue

@@ -52,41 +52,43 @@
           </DkFormItem>
         </DkForm>
       </DkPanel>
-      <div>
-      </div>
+      <!--表格-->
+      <DkPanel prop="table" id="table" >
+        <div slot="content">
+          <DkTable
+            :id="'table-'+$options.name"
+            ref="table-select"
+            :height="tableHeight-325"
+            primaryKey="staffId"
+            :multiple="false"
+            :choose-flag="false"
+            :page-flag="true"
+            :page-total="pageInfo.total"
+            @pageChange="pageSizeChange"
+            :pageSizeOpts="pageSizeOpts"
+            :current-page="pageInfo.currentPage"
+            :pageSize="pageInfo.pageSize"
+          >
+            <!--  品类  -->
+            <DkTableColumn field="category"></DkTableColumn>
+            <!--  当前仓库  -->
+            <DkTableColumn field="currentWarehouse"></DkTableColumn>
+            <!--  编码  -->
+            <DkTableColumn field="code"></DkTableColumn>
+            <!--  圆模  -->
+            <DkTableColumn field="circularDie"></DkTableColumn>
+            <!--  郑交所仓单  -->
+            <DkTableColumn field="zceWarehouseReceipt"></DkTableColumn>
+            <!--  数量  -->
+            <DkTableColumn field="num"></DkTableColumn>
+            <!--  单位  -->
+            <DkTableColumn field="unit"></DkTableColumn>
+            <!--  备注  -->
+            <DkTableColumn field="remark"></DkTableColumn>
+          </DkTable>
+        </div>
+      </DkPanel>
     </DkCollapse>
-
-    <DkTable
-      :id="'table-'+$options.name"
-      ref="table-select"
-      :height="tableHeight-266"
-      primaryKey="staffId"
-      :multiple="false"
-      :choose-flag="false"
-      :page-flag="true"
-      :page-total="pageInfo.total"
-      @pageChange="pageSizeChange"
-      :pageSizeOpts="pageSizeOpts"
-      :current-page="pageInfo.currentPage"
-      :pageSize="pageInfo.pageSize"
-    >
-      <!--  品类  -->
-      <DkTableColumn field="category"></DkTableColumn>
-      <!--  当前仓库  -->
-      <DkTableColumn field="currentWarehouse"></DkTableColumn>
-      <!--  编码  -->
-      <DkTableColumn field="code"></DkTableColumn>
-      <!--  圆模  -->
-      <DkTableColumn field="circularDie"></DkTableColumn>
-      <!--  郑交所仓单  -->
-      <DkTableColumn field="zceWarehouseReceipt"></DkTableColumn>
-      <!--  数量  -->
-      <DkTableColumn field="num"></DkTableColumn>
-      <!--  单位  -->
-      <DkTableColumn field="unit"></DkTableColumn>
-      <!--  备注  -->
-      <DkTableColumn field="remark"></DkTableColumn>
-    </DkTable>
     <!--添加公检批号-->
     <DkModal
       :loading="loading"

src/view/mst/inventory-management/outbound-management/outbound-list-management/index.vue

@@ -27,83 +27,71 @@
                       :searchContent="searchContent"
           ></SearchCond>
         </div>
-        <DkTable
-          slot="top"
-          :id="'table-'+$options.name"
-          ref="table-select"
-          :data="tableData"
-          :height="tableHeight-320"
-          primaryKey="staffId"
-          :multiple="false"
-          :showFooter="true"
-          :choose-flag="false"
-          :page-flag="true"
-          :page-total="pageInfo.total"
-          @pageChange="pageSizeChange"
-          :pageSizeOpts="pageSizeOpts"
-          :current-page="pageInfo.currentPage"
-          :pageSize="pageInfo.pageSize"
-        >
-          <!--  单号  -->
-          <DkTableColumn field="dataNo" type="link"></DkTableColumn>
-          <!--  出库类型  -->
-          <DkTableColumn field="outWarehouseType"></DkTableColumn>
-          <!--  出库员  -->
-          <DkTableColumn field="outWarehouseStaff"></DkTableColumn>
-          <!--  客户  -->
-          <DkTableColumn field="cusId"></DkTableColumn>
-          <!--  卖家  -->
-          <DkTableColumn field="seller"></DkTableColumn>
-          <!--  联系人  -->
-          <DkTableColumn field="contactName"></DkTableColumn>
-          <!--  电话  -->
-          <DkTableColumn field="objPhone"></DkTableColumn>
-          <!--  出库日期  -->
-          <DkTableColumn field="outWarehouseDate"></DkTableColumn>
-          <!--  重量 /吨  -->
-          <DkTableColumn field="weight" data-type="number" sum="true" ></DkTableColumn>
-          <!--  状态  -->
-          <DkTableColumn  field="tagObject" title="状态"
-                         type="tag" ></DkTableColumn>
-          <!--  备注 -->
-          <DkTableColumn field="remarks"></DkTableColumn>
-        </DkTable>
-        <DkTabs v-model="currentType" :options="tabsOptions"></DkTabs>
-        <!--  转货权采购单表格部分   -->
-        <DkTable
-          slot="buttom"
-          :id="'table-'+$options.name"
-          ref="table-select"
-          :data="formData"
-          :height="tableHeight-320"
-          primaryKey="staffId"
-          :multiple="false"
-          :choose-flag="false"
-          :showFooter="true"
-          :page-flag="true"
-          :page-total="pageInfo.total"
-          @pageChange="pageSizeChange"
-          :pageSizeOpts="pageSizeOpts"
-          :current-page="pageInfo.currentPage"
-          :pageSize="pageInfo.pageSize"
-        >
-          <!--  品类  -->
-          <DkTableColumn field="category"></DkTableColumn>
-          <!--  当前仓库  -->
-          <DkTableColumn field="currentWarehouse"></DkTableColumn>
-          <!--  编码  -->
-          <DkTableColumn field="code" type="link"></DkTableColumn>
-          <!--  数量  -->
-          <DkTableColumn field="num" data-type="number" sum="true" digits="0"></DkTableColumn>
-          <!--  单位  -->
-          <DkTableColumn field="unit" ></DkTableColumn>
-          <!--  圆模  -->
-          <DkTableColumn field="circularDie"></DkTableColumn>
-          <!--  郑交所仓单  -->
-          <DkTableColumn field="zceWarehouseReceipt" type="link"></DkTableColumn>
-          <!--  备注  -->
-          <DkTableColumn field="remarks"></DkTableColumn>
-        </DkTable>
+        <!--  表格部分  -->
+        <div :style="'height: ' + tableHeight + 'px'" class="split-div-class">
+          <DkSplit mode="vertical" v-model="split" ref="split">
+            <div slot="top">
+              <DkTable :id="'table-' + $options.name" ref="table-select" :data="tableData"
+                       :height="tableHeight * split -40" :page-flag="true" primaryKey="docId" :multiple="false"
+                       :choose-flag="false" :page-total="pageInfo.total" :current-page="pageInfo.currentPage"
+                       :page-size="pageInfo.pageSize" :page-size-opts="pageSizeOpts" @pageChange="pageSizeChange"
+                       :showFooter="true"
+                       reverseColorFlag tree-flag>
+                <!--  单号  -->
+                <DkTableColumn field="dataNo" type="link"></DkTableColumn>
+                <!--  出库类型  -->
+                <DkTableColumn field="outWarehouseType"></DkTableColumn>
+                <!--  出库员  -->
+                <DkTableColumn field="outWarehouseStaff"></DkTableColumn>
+                <!--  客户  -->
+                <DkTableColumn field="cusId"></DkTableColumn>
+                <!--  卖家  -->
+                <DkTableColumn field="seller"></DkTableColumn>
+                <!--  联系人  -->
+                <DkTableColumn field="contactName"></DkTableColumn>
+                <!--  电话  -->
+                <DkTableColumn field="objPhone"></DkTableColumn>
+                <!--  出库日期  -->
+                <DkTableColumn field="outWarehouseDate"></DkTableColumn>
+                <!--  重量 /吨  -->
+                <DkTableColumn field="weight" data-type="number" sum="true" ></DkTableColumn>
+                <!--  状态  -->
+                <DkTableColumn  field="tagObject" title="状态"
+                                type="tag" tag-type="mCSTag"></DkTableColumn>
+                <!--  备注 -->
+                <DkTableColumn field="remarks"></DkTableColumn>
+              </DkTable>
+            </div>
+            <div slot="bottom">
+              <!-- 商品明细 -->
+              <DkTable :id="'table-' + $options.name + '-file'" ref="table-select-down-file" :data="formData"
+                       :height="tableHeight * (1 - split) - 40" :page-flag="false" primaryKey="itemId" :multiple="false"
+                       :choose-flag="false" @pageChange="pageSizeChange"
+                       :showFooter="true"
+                       :tree-flag="true"
+                       parentField="parentId"
+              >
+                <DkTabs v-model="currentType" :options="tabsOptions"></DkTabs>
+                <!--  品类  -->
+                <DkTableColumn field="category"></DkTableColumn>
+                <!--  当前仓库  -->
+                <DkTableColumn field="currentWarehouse"></DkTableColumn>
+                <!--  编码  -->
+                <DkTableColumn field="code" type="link"></DkTableColumn>
+                <!--  数量  -->
+                <DkTableColumn field="num" data-type="number" sum="true" digits="0"></DkTableColumn>
+                <!--  单位  -->
+                <DkTableColumn field="unit" ></DkTableColumn>
+                <!--  圆模  -->
+                <DkTableColumn field="circularDie"></DkTableColumn>
+                <!--  郑交所仓单  -->
+                <DkTableColumn field="zceWarehouseReceipt" type="link"></DkTableColumn>
+                <!--  备注  -->
+                <DkTableColumn field="remarks"></DkTableColumn>
+              </DkTable>
+            </div>
+          </DkSplit>
+        </div>
       </div>
     </div>
 
@@ -223,39 +211,19 @@ export default {
      *   @author : 王宇轩
      */
     initData() {
-      const managers = ['张经理', '李经理', '赵经理', '胡经理'];
-      const customers = ['曹魏', '江东', '蜀汉'];
-      const contacts = ['曹操', '曹仁', '曹嵩', '曹英', '曹爽', '曹昂', '曹真', '曹丕', '曹植', '曹彰', '曹冲', '曹髦', '曹睿', '曹芳'];
-      const inboundTypes = ['采购入库', '退货入库', '其他入库'];
-      const tags = ['待入库', '已入库'];
-
-      this.tableData = [];
-      for (let i = 0; i < 20; i++) {
-        const manager = managers[i % managers.length];
-        const customer = customers[i % customers.length];
-        const contact = contacts[i % contacts.length];
-        const inboundType = inboundTypes[i % inboundTypes.length];
-        const tag= tags[i % tags.length];
-        this.tableData.push({
-          dataNo: `KH${String(i + 1).padStart(5, '0')}`,
-          outWarehouseType: inboundType,
-          outWarehouseStaff: manager,
-          cusId: customer,
-          seller: customer,
-          tagObject: {tag},
-          contactName: contact,
-          objPhone: '13800138000',
-          outWarehouseDate: '2025-05-28',
-          weight: '2000',
-          remarks: `备注${i + 1}`,
-          inWarehouseType: inboundType,
-          inWarehouseStaff: manager,
-          supplier: customer,
-          buyer: customer,
-          inWarehouseDate: '2025-05-28',
-          goodsOwner: contact,
-          cooperationPartner: '江东',
-        });
+      this.tableData = Array.from({length: 20}, (_, index) => ({
+        dataNo: `AB${String(index + 1).padStart(5, '0')}`,
+        outWarehouseType: ['采购入库', '退货入库', '其他入库'][index % 3],
+        outWarehouseStaff: `员工${index + 1}`,// Path: react-ts-playground/src/components/atoms/Button/Button.stories.tsx
+        cusId: `客户${index + 1}`,
+        seller: `卖方${index + 1}`,
+        contactName: `联系人${index + 1}`,
+        objPhone: `电话${index + 1}`,
+        outWarehouseDate: `2025-05-${String(index + 1).padStart(2, '0')}`,
+        weight: `${Math.floor(Math.random() * 100) + 1}`, // 1 - 100 随机数
+        tagObject:{tag:['待出库', '已出库'][index % 2],color:['blue', 'green'][index % 2]},
+        remarks: `备注${index + 1}`,
+      }))
         this.formData = Array.from({length: 20}, (_, index) => ({
           dataNo: `AB${String(index + 1).padStart(5, '0')}`,
           category: `品类${index + 1}`,
@@ -267,396 +235,8 @@ export default {
           unit: ['吨', '件', '箱'][index % 3],
           remarks: `备注${index + 1}`
         }));
-      }
+
     },
-    // initData() {
-    //   this.tableData = [
-    //
-    //
-    //
-    //     {
-    //       dataNo: '00001',
-    //       outWarehouseType: '采购入库',
-    //       outWarehouseStaff: '张经理',
-    //       cusId: '曹魏',
-    //       seller: '2025-05-28',
-    //       contactName: '曹操',
-    //       objPhone: '13800138000',
-    //       outWarehouseDate: '2025-05-28',
-    //       weight: '2000',
-    //       flgValid: true,
-    //       remarks: '备注',
-    //       inWarehouseType: '采购入库',
-    //       inWarehouseStaff: '张经理',
-    //       supplier: '曹魏',
-    //       buyer: '曹魏',
-    //       inWarehouseDate: '2025-05-28',
-    //       goodsOwner: '曹操',
-    //       cooperationPartner: '江东',
-    //     },
-    //     {
-    //       dataNo: '00002',
-    //       outWarehouseType: '采购入库',
-    //       outWarehouseStaff: '李经理',
-    //       cusId: '曹魏',
-    //       seller: '2025-05-28',
-    //       contactName: '曹仁',
-    //       objPhone: '13800138000',
-    //       outWarehouseDate: '2025-05-28',
-    //       weight: '2000',
-    //       flgValid: false,
-    //       remarks: '备注',
-    //       inWarehouseType: '采购入库',
-    //       inWarehouseStaff: '张经理',
-    //       supplier: '曹魏',
-    //       buyer: '曹魏',
-    //       inWarehouseDate: '2025-05-28',
-    //       goodsOwner: '曹仁',
-    //       cooperationPartner: '江东',
-    //     },
-    //     {
-    //       dataNo: '00003',
-    //       outWarehouseType: '采购入库',
-    //       outWarehouseStaff: '赵经理',
-    //       cusId: '曹魏',
-    //       seller: '2025-05-28',
-    //       contactName: '曹嵩',
-    //       objPhone: '13800138000',
-    //       outWarehouseDate: '2025-05-28',
-    //       weight: '2000',
-    //       flgValid: false,
-    //       remarks: '备注',
-    //       inWarehouseType: '采购入库',
-    //       inWarehouseStaff: '张经理',
-    //       supplier: '曹魏',
-    //       buyer: '曹魏',
-    //       inWarehouseDate: '2025-05-28',
-    //       goodsOwner: '曹嵩',
-    //       cooperationPartner: '江东',
-    //     },
-    //     {
-    //       dataNo: '00004',
-    //       outWarehouseType: '采购入库',
-    //       outWarehouseStaff: '胡经理',
-    //       cusId: '曹魏',
-    //       seller: '2025-05-28',
-    //       contactName: '曹英',
-    //       objPhone: '13800138000',
-    //       outWarehouseDate: '2025-05-28',
-    //       weight: '2000',
-    //       flgValid: false,
-    //       remarks: '备注',
-    //       inWarehouseType: '采购入库',
-    //       inWarehouseStaff: '张经理',
-    //       supplier: '曹魏',
-    //       buyer: '曹魏',
-    //       inWarehouseDate: '2025-05-28',
-    //       goodsOwner: '曹英',
-    //       cooperationPartner: '江东',
-    //     },
-    //     {
-    //       dataNo: '00005',
-    //       outWarehouseType: '采购入库',
-    //       outWarehouseStaff: '张经理',
-    //       cusId: '曹魏',
-    //       seller: '2025-05-28',
-    //       contactName: '曹爽',
-    //       objPhone: '13800138000',
-    //       outWarehouseDate: '2025-05-28',
-    //       weight: '2000',
-    //       flgValid: false,
-    //       remarks: '备注',
-    //       inWarehouseType: '采购入库',
-    //       inWarehouseStaff: '张经理',
-    //       supplier: '曹魏',
-    //       buyer: '曹魏',
-    //       inWarehouseDate: '2025-05-28',
-    //       goodsOwner: '曹爽',
-    //       cooperationPartner: '江东',
-    //     },
-    //     {
-    //       dataNo: '00006',
-    //       outWarehouseType: '采购入库',
-    //       outWarehouseStaff: '李经理',
-    //       cusId: '曹魏',
-    //       seller: '2025-05-28',
-    //       contactName: '曹昂',
-    //       objPhone: '13800138000',
-    //       outWarehouseDate: '2025-05-28',
-    //       weight: '2000',
-    //       flgValid: false,
-    //       remarks: '备注',
-    //       inWarehouseType: '采购入库',
-    //       inWarehouseStaff: '张经理',
-    //       supplier: '曹魏',
-    //       buyer: '曹魏',
-    //       inWarehouseDate: '2025-05-28',
-    //       goodsOwner: '曹昂',
-    //       cooperationPartner: '江东',
-    //     },
-    //     {
-    //       dataNo: '00007',
-    //       outWarehouseType: '采购入库',
-    //       outWarehouseStaff: '赵经理',
-    //       cusId: '曹魏',
-    //       seller: '2025-05-28',
-    //       contactName: '曹真',
-    //       objPhone: '13800138000',
-    //       outWarehouseDate: '2025-05-28',
-    //       weight: '2000',
-    //       flgValid: false,
-    //       remarks: '备注',
-    //       inWarehouseType: '采购入库',
-    //       inWarehouseStaff: '张经理',
-    //       supplier: '曹魏',
-    //       buyer: '曹魏',
-    //       inWarehouseDate: '2025-05-28',
-    //       goodsOwner: '曹真',
-    //       cooperationPartner: '江东',
-    //     },
-    //     {
-    //       dataNo: '00008',
-    //       outWarehouseType: '采购入库',
-    //       outWarehouseStaff: '胡经理',
-    //       cusId: '曹魏',
-    //       seller: '2025-05-28',
-    //       contactName: '曹丕',
-    //       objPhone: '13800138000',
-    //       outWarehouseDate: '2025-05-28',
-    //       weight: '2000',
-    //       flgValid: false,
-    //       remarks: '备注',
-    //       inWarehouseType: '采购入库',
-    //       inWarehouseStaff: '张经理',
-    //       supplier: '曹魏',
-    //       buyer: '曹魏',
-    //       inWarehouseDate: '2025-05-28',
-    //       goodsOwner: '曹丕',
-    //       cooperationPartner: '江东',
-    //     },
-    //     {
-    //       dataNo: '00009',
-    //       outWarehouseType: '采购入库',
-    //       outWarehouseStaff: '张经理',
-    //       cusId: '曹魏',
-    //       seller: '2025-05-28',
-    //       contactName: '曹植',
-    //       objPhone: '13800138000',
-    //       outWarehouseDate: '2025-05-28',
-    //       weight: '2000',
-    //       flgValid: false,
-    //       remarks: '备注',
-    //       inWarehouseType: '采购入库',
-    //       inWarehouseStaff: '张经理',
-    //       supplier: '曹魏',
-    //       buyer: '曹魏',
-    //       inWarehouseDate: '2025-05-28',
-    //       goodsOwner: '曹植',
-    //       cooperationPartner: '江东',
-    //     },
-    //     {
-    //       dataNo: '00010',
-    //       outWarehouseType: '采购入库',
-    //       outWarehouseStaff: '李经理',
-    //       cusId: '曹魏',
-    //       seller: '2025-05-28',
-    //       contactName: '曹彰',
-    //       objPhone: '13800138000',
-    //       outWarehouseDate: '2025-05-28',
-    //       weight: '2000',
-    //       flgValid: false,
-    //       remarks: '备注',
-    //       inWarehouseType: '采购入库',
-    //       inWarehouseStaff: '张经理',
-    //       supplier: '曹魏',
-    //       buyer: '曹魏',
-    //       inWarehouseDate: '2025-05-28',
-    //       goodsOwner: '曹彰',
-    //       cooperationPartner: '江东',
-    //     },
-    //     {
-    //       dataNo: '00011',
-    //       outWarehouseType: '采购入库',
-    //       outWarehouseStaff: '赵经理',
-    //       cusId: '曹魏',
-    //       seller: '2025-05-28',
-    //       contactName: '曹冲',
-    //       objPhone: '13800138000',
-    //       outWarehouseDate: '2025-05-28',
-    //       weight: '2000',
-    //       flgValid: false,
-    //       remarks: '备注',
-    //       inWarehouseType: '采购入库',
-    //       inWarehouseStaff: '张经理',
-    //       supplier: '曹魏',
-    //       buyer: '曹魏',
-    //       inWarehouseDate: '2025-05-28',
-    //       goodsOwner: '曹冲',
-    //       cooperationPartner: '江东',
-    //     },
-    //     {
-    //       dataNo: '00012',
-    //       outWarehouseType: '采购入库',
-    //       outWarehouseStaff: '胡经理',
-    //       cusId: '曹魏',
-    //       seller: '2025-05-28',
-    //       contactName: '曹髦',
-    //       objPhone: '13800138000',
-    //       outWarehouseDate: '2025-05-28',
-    //       weight: '2000',
-    //       flgValid: false,
-    //       remarks: '备注',
-    //       inWarehouseType: '采购入库',
-    //       inWarehouseStaff: '张经理',
-    //       supplier: '曹魏',
-    //       buyer: '曹魏',
-    //       inWarehouseDate: '2025-05-28',
-    //       goodsOwner: '曹髦',
-    //       cooperationPartner: '江东',
-    //     },
-    //     {
-    //       dataNo: '00013',
-    //       outWarehouseType: '采购入库',
-    //       outWarehouseStaff: '张经理',
-    //       cusId: '曹魏',
-    //       seller: '2025-05-28',
-    //       contactName: '曹睿',
-    //       objPhone: '13800138000',
-    //       outWarehouseDate: '2025-05-28',
-    //       weight: '2000',
-    //       flgValid: false,
-    //       remarks: '备注',
-    //       inWarehouseType: '采购入库',
-    //       inWarehouseStaff: '张经理',
-    //       supplier: '曹魏',
-    //       buyer: '曹魏',
-    //       inWarehouseDate: '2025-05-28',
-    //       goodsOwner: '曹睿',
-    //       cooperationPartner: '江东',
-    //     },
-    //     {
-    //       dataNo: '00014',
-    //       outWarehouseType: '采购入库',
-    //       outWarehouseStaff: '李经理',
-    //       cusId: '曹魏',
-    //       seller: '2025-05-28',
-    //       contactName: '曹芳',
-    //       objPhone: '13800138000',
-    //       outWarehouseDate: '2025-05-28',
-    //       weight: '2000',
-    //       flgValid: false,
-    //       remarks: '备注',
-    //       inWarehouseType: '采购入库',
-    //       inWarehouseStaff: '张经理',
-    //       supplier: '曹魏',
-    //       buyer: '曹魏',
-    //       inWarehouseDate: '2025-05-28',
-    //       goodsOwner: '曹芳',
-    //       cooperationPartner: '江东',
-    //     }
-    //   ]
-    //   this.formData = [
-    //     {
-    //       category: '品类1',
-    //       currentWarehouse: '仓库1',
-    //       code: '00001',
-    //       num: '100',
-    //       unit: '吨',
-    //       circularDie: '圆模1',
-    //       zceWarehouseReceipt: '郑交所仓单1',
-    //       remarks: '备注1',
-    //     },
-    //     {
-    //       category: '品类2',
-    //       currentWarehouse: '仓库2',
-    //       code: '00002',
-    //       num: '200',
-    //       unit: '吨',
-    //       circularDie: '圆模2',
-    //       zceWarehouseReceipt: '郑交所仓单2',
-    //       remarks: '备注2',
-    //     },
-    //     {
-    //       category: '品类3',
-    //       currentWarehouse: '仓库3',
-    //       code: '00003',
-    //       num: '300',
-    //       unit: '吨',
-    //       circularDie: '圆模3',
-    //       zceWarehouseReceipt: '郑交所仓单3',
-    //       remarks: '备注3',
-    //     },
-    //     {
-    //       category: '品类4',
-    //       currentWarehouse: '仓库4',
-    //       code: '00004',
-    //       num: '400',
-    //       unit: '吨',
-    //       circularDie: '圆模4',
-    //       zceWarehouseReceipt: '郑交所仓单4',
-    //       remarks: '备注4',
-    //     },
-    //     {
-    //       category: '品类5',
-    //       currentWarehouse: '仓库5',
-    //       code: '00005',
-    //       num: '500',
-    //       unit: '吨',
-    //       circularDie: '圆模5',
-    //       zceWarehouseReceipt: '郑交所仓单5',
-    //       remarks: '备注5',
-    //     },
-    //     {
-    //       category: '品类6',
-    //       currentWarehouse: '仓库6',
-    //       code: '00006',
-    //       num: '600',
-    //       unit: '吨',
-    //       circularDie: '圆模6',
-    //       zceWarehouseReceipt: '郑交所仓单6',
-    //       remarks: '备注6',
-    //     },
-    //     {
-    //       category: '品类7',
-    //       currentWarehouse: '仓库7',
-    //       code: '00007',
-    //       num: '700',
-    //       unit: '吨',
-    //       circularDie: '圆模7',
-    //       zceWarehouseReceipt: '郑交所仓单7',
-    //       remarks: '备注7',
-    //     },
-    //     {
-    //       category: '品类8',
-    //       currentWarehouse: '仓库8',
-    //       code: '00008',
-    //       num: '800',
-    //       unit: '吨',
-    //       circularDie: '圆模8',
-    //       zceWarehouseReceipt: '郑交所仓单8',
-    //       remarks: '备注8',
-    //     },
-    //     {
-    //       category: '品类9',
-    //       currentWarehouse: '仓库9',
-    //       code: '00009',
-    //       num: '900',
-    //       unit: '吨',
-    //       circularDie: '圆模9',
-    //       zceWarehouseReceipt: '郑交所仓单9',
-    //     },
-    //     {
-    //       category: '品类10',
-    //       currentWarehouse: '仓库10',
-    //       code: '00010',
-    //       num: '1000',
-    //       unit: '吨',
-    //       circularDie: '圆模10',
-    //       zceWarehouseReceipt: '郑交所仓单10',
-    //       remarks: '备注10',
-    //     }
-    //   ]
-    // },
 
 
   },

src/view/mst/inventory-management/stock-transfer-management/stock-transfer-list-management/index.vue

@@ -51,7 +51,7 @@
           <DkTableColumn field="businessDate"></DkTableColumn>
           <!--  状态  -->
           <DkTableColumn field="tagObject" title="状态"
-                         type="tag" ></DkTableColumn>
+                         type="tag"  tag-type="mCSTag"></DkTableColumn>
           <!--  移出仓库  -->
           <DkTableColumn field="transOutWarehouse"></DkTableColumn>
           <!--  移入仓库  -->
@@ -240,7 +240,7 @@ export default {
         //
         transWarehOrderNo: ['HF', 'KJ', 'DK'][index % 3]+`${String(index + 1).padStart(5, '0')}`,
         businessDate:['2025', '2023', '2024'][index % 3]+'-01-01',
-        tagObject:{tag:tags[index % tags.length],},
+        tagObject:{tag:tags[index % tags.length],color:['#2d8cf0','red','blue','green','gray'][index % 5]},
         transOutWarehouse:['仓库1','仓库2','仓库3','仓库4','仓库5'][index % 5],
         transInWarehouse:['仓库10','仓库6','仓库7','仓库8','仓库9'][index % 5],
         goodsCode: ['HF', 'KJ', 'DK'][index % 3]+`-${String(index + 1).padStart(5, '0')}`,

src/view/mst/procurement-management/purchase-order-management/purchase-order-for-transfer-right/index.vue

@@ -75,7 +75,7 @@
           <!--  合同号  -->
           <DkTableColumn field="contractNumber" type="link"></DkTableColumn>
           <!--  状态  -->
-          <DkTableColumn field="flgValid" type="tag"></DkTableColumn>
+          <DkTableColumn field="flgValid" type="tag" tagType="mCSTag"></DkTableColumn>
           <!--备注-->
           <DkTableColumn field="remarks"></DkTableColumn>
         </DkTable>
@@ -105,7 +105,7 @@
           <DkTableColumn field="currentWarehouse"></DkTableColumn>
           <!--  编码  -->
           <DkTableColumn field="code" type="tag" columnTopRightTipFlag="true"
-                         columnTopRightTipContent="一检" columnTopRightTipColor="#2d8cf0"
+                         columnTopRightTipContent="一检" tag-type="rightTipTag"
           ></DkTableColumn>
           <!--  年份  -->
           <DkTableColumn field="yearValue"></DkTableColumn>
@@ -223,7 +223,7 @@ export default {
         conditionedWeight: (Math.random() * 100).toFixed(2),
         orderGoodsQty: (Math.random() * 100000).toFixed(2),
         contractNumber: `CN-${String(index + 1).padStart(4, '0')}`,
-        flgValid: {tag: ['有效', '无效'][Math.floor(Math.random() * 2)]},
+        flgValid: {tag: ['有效', '无效'][Math.floor(Math.random() * 2)], color: ['green', 'red'][index % 2]},
         remarks: ['这是一条备注信息', '这是另一条备注信息'][index % 2],
       })),
         this.formData = Array.from({length: 100}, (_, index) => ({

src/view/mst/quality-data-query/futures-warrant-batch-management/index.vue

@@ -87,7 +87,7 @@
           <!--  可用数量  -->
           <DkTableColumn field="availableQuantity" type="number" sum="true" digits="0"></DkTableColumn>
           <!--  仓单状态  -->
-          <DkTableColumn field="wareReceStatus" type="tag"></DkTableColumn>
+          <DkTableColumn field="wareReceStatus" type="tag" tag-type="mCSTag"></DkTableColumn>
         </DkTable>
       </div>
     </div>
@@ -233,7 +233,7 @@ export default {
         conditionedWeight:index%100,
         standWareReceQuant:index%100,
         availableQuantity:index%100,
-        wareReceStatus:{tag:['已冻结','已抵押','已交割'][index%3]},
+        wareReceStatus:{tag:['已冻结','已抵押','已交割'][index%3],color:['blue','green','blue'][index%3]},
      }))
     },
 

src/view/mst/quality-data-query/rotation-storage-batch-management/index.vue

@@ -79,7 +79,7 @@
           <!--  检验时间  -->
           <DkTableColumn field="inspectionDateTime"></DkTableColumn>
           <!--  检验结果  -->
-          <DkTableColumn field="inspectionResult" type="tag"></DkTableColumn>
+          <DkTableColumn field="inspectionResult" type="tag" tag-type="mCSTag"></DkTableColumn>
         </DkTable>
       </div>
     </div>
@@ -186,7 +186,7 @@ export default {
         feeDetails:['费用1','费用2','费用3','费用4','费用5'][index%5],
         insReportNumber:['报告1','报告2','报告3','报告4','报告5'][index%5],
         inspectionDateTime:'2025-05-28',
-        inspectionResult:{tag:['合格','不合格'][index%2]},
+        inspectionResult:{tag:['合格','不合格'][index%2],color:['green','red'][index%2]},
       }))
     },