Merge remote-tracking branch 'origin/master'

src/router/routers.js

@@ -317,7 +317,28 @@ let menu = [
               menuType:1
             },
           },
-
+          {
+            path: '/mst/basis-management/liter-premium-configuration/index',
+            name: 'liter-premium-configuration',
+            component: () => import('@/view/mst/basis-management/liter-premium-configuration/index.vue'),
+            meta: {
+              title: '升贴水配置',
+              notCache: false,
+              flgRight: true,
+              menuType:1
+            },
+          },
+          {
+            path: '/mst/basis-management/liter-premium-configuration/liter-premium-configuration-detail/index',
+            name: 'liter-premium-configuration-detail',
+            component: () => import('@/view/mst/basis-management/liter-premium-configuration/liter-premium-configuration-detail/index.vue'),
+            meta: {
+              title: '升贴水详细配置',
+              notCache: false,
+              flgRight: true,
+              menuType:2
+            },
+          },
         ]
       },
       {

src/view/mst/basic-management/administrative-region-management/index.vue

@@ -1,4 +1,4 @@
-<!-- @desc:行政区域管理  @auth:？？？  @time:----- -->
+<!-- @desc:行政区域管理  @auth: ？  @time:----- -->
 <template>
   <div class="main-div" ref="mainDiv">
     <loading :loading="loading" v-if="!modalVisible"></loading>

src/view/mst/basic-management/cotton-ginning-mill-management/index.vue

@@ -69,7 +69,7 @@
           <!--  供应商  -->
           <DkTableColumn field="cottonseedProduction" data-type="number" title="棉籽产出量"></DkTableColumn>
           <!--  采购人  -->
-          <DkTableColumn field="operatingStatusDevice" title="设备运行状态"/>
+          <DkTableColumn field="operatingStatusDevice" type="tag" title="设备运行状态"/>
           <!--  备注  -->
           <DkTableColumn field="seedCottonStocks" data-type="number" title="籽棉库存"></DkTableColumn>
           <DkTableColumn field="inventoryPackagingMaterials" data-type="number" title="包装材料库存"></DkTableColumn>
@@ -164,7 +164,7 @@ export default {
           cumulativeProcessingVolume: 1850,
           lintOutput: 12.1,
           cottonseedProduction: 7.9,
-          operatingStatusDevice: '运行中',
+          operatingStatusDevice: {tag:'有效' },
           seedCottonStocks: 520,
           inventoryPackagingMaterials: 2100,
           proportionLintGrade: '一级棉65%，二级棉35%',
@@ -181,7 +181,7 @@ export default {
           cumulativeProcessingVolume: 1600,
           lintOutput: 10.7,
           cottonseedProduction: 6.8,
-          operatingStatusDevice: '停机维护',
+          operatingStatusDevice: {tag:'停机维护' },
           seedCottonStocks: 400,
           inventoryPackagingMaterials: 1700,
           proportionLintGrade: '一级棉50%，二级棉50%',
@@ -198,7 +198,7 @@ export default {
           cumulativeProcessingVolume: 2080,
           lintOutput: 13.8,
           cottonseedProduction: 9.2,
-          operatingStatusDevice: '待机',
+          operatingStatusDevice: {tag:'待机' },
           seedCottonStocks: 590,
           inventoryPackagingMaterials: 2300,
           proportionLintGrade: '一级棉70%，二级棉30%',
@@ -215,7 +215,7 @@ export default {
           cumulativeProcessingVolume: 1520,
           lintOutput: 10.0,
           cottonseedProduction: 6.3,
-          operatingStatusDevice: '运行中',
+           operatingStatusDevice: {tag:'有效' },
           seedCottonStocks: 350,
           inventoryPackagingMaterials: 1600,
           proportionLintGrade: '一级棉55%，二级棉45%',
@@ -232,7 +232,7 @@ export default {
           cumulativeProcessingVolume: 1950,
           lintOutput: 13.2,
           cottonseedProduction: 8.7,
-          operatingStatusDevice: '运行中',
+           operatingStatusDevice: {tag:'有效' },
           seedCottonStocks: 550,
           inventoryPackagingMaterials: 2000,
           proportionLintGrade: '一级棉60%，二级棉40%',
@@ -249,7 +249,7 @@ export default {
           cumulativeProcessingVolume: 1700,
           lintOutput: 11.0,
           cottonseedProduction: 7.2,
-          operatingStatusDevice: '待机',
+          operatingStatusDevice: {tag:'待机' },
           seedCottonStocks: 480,
           inventoryPackagingMaterials: 1850,
           proportionLintGrade: '一级棉45%，二级棉55%',
@@ -266,7 +266,7 @@ export default {
           cumulativeProcessingVolume: 1980,
           lintOutput: 12.9,
           cottonseedProduction: 8.5,
-          operatingStatusDevice: '运行中',
+           operatingStatusDevice: {tag:'有效' },
           seedCottonStocks: 530,
           inventoryPackagingMaterials: 2150,
           proportionLintGrade: '一级棉68%，二级棉32%',
@@ -283,7 +283,7 @@ export default {
           cumulativeProcessingVolume: 1480,
           lintOutput: 9.8,
           cottonseedProduction: 6.1,
-          operatingStatusDevice: '停机维护',
+          operatingStatusDevice: {tag:'停机维护' },
           seedCottonStocks: 330,
           inventoryPackagingMaterials: 1550,
           proportionLintGrade: '一级棉52%，二级棉48%',
@@ -300,7 +300,7 @@ export default {
           cumulativeProcessingVolume: 1800,
           lintOutput: 11.7,
           cottonseedProduction: 7.6,
-          operatingStatusDevice: '待机',
+          operatingStatusDevice: {tag:'待机' },
           seedCottonStocks: 420,
           inventoryPackagingMaterials: 1900,
           proportionLintGrade: '一级棉58%，二级棉42%',
@@ -317,7 +317,7 @@ export default {
           cumulativeProcessingVolume: 1780,
           lintOutput: 11.3,
           cottonseedProduction: 7.4,
-          operatingStatusDevice: '运行中',
+           operatingStatusDevice: {tag:'有效' },
           seedCottonStocks: 470,
           inventoryPackagingMaterials: 1880,
           proportionLintGrade: '一级棉62%，二级棉38%',

src/view/mst/basic-management/customer-management/index.vue

@@ -66,7 +66,7 @@
           <!--  存放货位  -->
           <DkTableColumn field="remarks" title="备注"></DkTableColumn>
           <!--  供应商  -->
-          <DkTableColumn field="status" title="状态"></DkTableColumn>
+          <DkTableColumn field="status"  type="tag" title="状态"></DkTableColumn>
 
         </DkTable>
       </div>
@@ -140,7 +140,7 @@ export default {
           phoneNumber: '010-88888888',
           address: '北京市朝阳区建国路88号',
           remarks: '集团总部',
-          status: '已启用'
+         status: {tag:'已启用' },
         },
         {
           staffId: 1002,
@@ -149,7 +149,7 @@ export default {
           phoneNumber: '021-66666666',
           address: '上海市浦东新区世纪大道100号',
           remarks: '华东区域中心',
-          status: '已启用'
+         status: {tag:'已启用' },
         },
         {
           staffId: 1003,
@@ -158,7 +158,7 @@ export default {
           phoneNumber: '020-77777777',
           address: '广州市天河区天河路50号',
           remarks: '华南销售部',
-          status: '已启用'
+         status: {tag:'已启用' },
         },
         {
           staffId: 1004,
@@ -167,7 +167,7 @@ export default {
           phoneNumber: '0755-99999999',
           address: '深圳市南山区科技园20号',
           remarks: '技术研发',
-          status: '已启用'
+         status: {tag:'已启用' },
         },
         {
           staffId: 1005,
@@ -176,7 +176,7 @@ export default {
           phoneNumber: '028-55555555',
           address: '成都市高新区天府大道150号',
           remarks: '西南区域中心',
-          status: '已启用'
+         status: {tag:'已启用' },
         },
         {
           staffId: 1006,
@@ -185,7 +185,7 @@ export default {
           phoneNumber: '027-44444444',
           address: '武汉市武昌区中南路30号',
           remarks: '华中销售部',
-          status: '已启用'
+         status: {tag:'已启用' },
         },
         {
           staffId: 1007,
@@ -194,7 +194,7 @@ export default {
           phoneNumber: '029-33333333',
           address: '西安市雁塔区科技路25号',
           remarks: '西北销售部',
-          status: '已启用'
+         status: {tag:'已启用' },
         },
         {
           staffId: 1008,
@@ -203,7 +203,7 @@ export default {
           phoneNumber: '025-22222222',
           address: '南京市玄武区中山路50号',
           remarks: '江苏区域中心',
-          status: '已启用'
+         status: {tag:'已启用' },
         },
         {
           staffId: 1009,
@@ -212,7 +212,7 @@ export default {
           phoneNumber: '0571-11111111',
           address: '杭州市西湖区文三路80号',
           remarks: '浙江销售部',
-          status: '已启用'
+         status: {tag:'已启用' },
         },
         {
           staffId: 1010,
@@ -221,7 +221,7 @@ export default {
           phoneNumber: '022-00000000',
           address: '天津市和平区南京路60号',
           remarks: '华北销售部',
-          status: '已启用'
+         status: {tag:'已启用' },
         }
       ],
     }

src/view/mst/basic-management/supplier-management/index.vue

@@ -66,7 +66,7 @@
           <!--  存放货位  -->
           <DkTableColumn field="remarks" title="备注"></DkTableColumn>
           <!--  供应商  -->
-          <DkTableColumn field="status" title="状态"></DkTableColumn>
+          <DkTableColumn field="status"  type="tag" title="状态"></DkTableColumn>
 
         </DkTable>
       </div>
@@ -116,7 +116,7 @@ export default {
           phoneNumber: '010-88888888',
           address: '北京市朝阳区建国路88号',
           remarks: '集团总部',
-          status: '已启用'
+          status: {tag:'已启用' },
         },
         {
           staffId: 1002,
@@ -125,7 +125,8 @@ export default {
           phoneNumber: '021-66666666',
           address: '上海市浦东新区世纪大道100号',
           remarks: '华东区域中心',
-          status: '已启用'
+         status: {tag:'已启用' },
+
         },
         {
           staffId: 1003,
@@ -134,7 +135,7 @@ export default {
           phoneNumber: '020-77777777',
           address: '广州市天河区天河路50号',
           remarks: '华南销售部',
-          status: '已启用'
+         status: {tag:'已启用' },
         },
         {
           staffId: 1004,
@@ -143,7 +144,7 @@ export default {
           phoneNumber: '0755-99999999',
           address: '深圳市南山区科技园20号',
           remarks: '技术研发',
-          status: '已启用'
+         status: {tag:'已启用' },
         },
         {
           staffId: 1005,
@@ -152,7 +153,7 @@ export default {
           phoneNumber: '028-55555555',
           address: '成都市高新区天府大道150号',
           remarks: '西南区域中心',
-          status: '已启用'
+         status: {tag:'已启用' },
         },
         {
           staffId: 1006,
@@ -161,7 +162,7 @@ export default {
           phoneNumber: '027-44444444',
           address: '武汉市武昌区中南路30号',
           remarks: '华中销售部',
-          status: '已启用'
+         status: {tag:'已启用' },
         },
         {
           staffId: 1007,
@@ -170,7 +171,7 @@ export default {
           phoneNumber: '029-33333333',
           address: '西安市雁塔区科技路25号',
           remarks: '西北销售部',
-          status: '已启用'
+         status: {tag:'已启用' },
         },
         {
           staffId: 1008,
@@ -179,7 +180,7 @@ export default {
           phoneNumber: '025-22222222',
           address: '南京市玄武区中山路50号',
           remarks: '江苏区域中心',
-          status: '已启用'
+         status: {tag:'已启用' },
         },
         {
           staffId: 1009,
@@ -188,7 +189,7 @@ export default {
           phoneNumber: '0571-11111111',
           address: '杭州市西湖区文三路80号',
           remarks: '浙江销售部',
-          status: '已启用'
+         status: {tag:'已启用' },
         },
         {
           staffId: 1010,
@@ -197,7 +198,7 @@ export default {
           phoneNumber: '022-00000000',
           address: '天津市和平区南京路60号',
           remarks: '华北销售部',
-          status: '已启用'
+         status: {tag:'已启用' },
         }
       ],
       //查询条件

src/view/mst/basic-management/warehouse-management/index.vue

@@ -48,13 +48,14 @@
                  :choose-flag="false"
                  @current-change="currentChangeTable"
                  :page-flag="true"
+                 :showFooter="true"
                  :page-total="pageInfo.total"
                  @pageChange="pageSizeChange"
                  :pageSizeOpts="pageSizeOpts"
                  :current-page="pageInfo.currentPage"
                  :pageSize="pageInfo.pageSize"  >
           <DkTableColumn field="warehouseName" title="仓库名"></DkTableColumn>
-          <DkTableColumn field="status" title="状态"></DkTableColumn>
+          <DkTableColumn field="status" type="tag"title="状态"></DkTableColumn>
           <DkTableColumn field="province" title="省"></DkTableColumn>
           <DkTableColumn field="city" title="市"></DkTableColumn>
           <DkTableColumn field="region" title="区"></DkTableColumn>
@@ -132,7 +133,11 @@ export default {
           itemCode: 'staffName',
           title: '手机号',
         },
-
+        {
+          //员工名称
+          itemCode: 'staffName',
+          title: '地址',
+        },
 
       ],
       formData: {
@@ -143,7 +148,7 @@ export default {
         {
           staffId: 1001,
           warehouseName: '甘肃省敦煌种业集团股份有限公司',
-          status: '有效',
+          status: {tag:'有效' },
           province: "辽宁",
           city: "沈阳",
           region: "和平区",
@@ -157,7 +162,7 @@ export default {
         {
           staffId: 1002,
           warehouseName: '新疆金棉仓储物流有限公司',
-          status: '有效',
+            status: {tag:'有效' },
           "province": "辽宁",
           "city": "沈阳",
           "region": "沈河区",
@@ -171,7 +176,7 @@ export default {
         {
           staffId: 1003,
           warehouseName: '中棉集团邯郸物流园有限公司',
-          status: '有效',
+            status: {tag:'有效' },
           "province": "辽宁",
           "city": "沈阳",
           "region": "皇姑区",
@@ -185,7 +190,7 @@ export default {
         {
           staffId: 1004,
           warehouseName: '湖北景天集团天门仓库',
-          status: '有效',
+            status: {tag:'有效' },
           "province": "辽宁",
           "city": "沈阳",
           "region": "铁西区",
@@ -199,7 +204,7 @@ export default {
         {
           staffId: 1005,
           warehouseName: '新疆库尔勒华力运销有限责任公司',
-          status: '有效',
+            status: {tag:'有效' },
           "province": "辽宁",
           "city": "沈阳",
           "region": "大东区",
@@ -213,7 +218,7 @@ export default {
         {
           staffId: 1006,
           warehouseName: '潍坊瑞港国际物流有限公司',
-          status: '有效',
+            status: {tag:'有效' },
           "province": "辽宁",
           "city": "沈阳",
           "region": "于洪区",
@@ -227,7 +232,7 @@ export default {
         {
           staffId: 1007,
           warehouseName: '临清华茂纺织原料有限公司',
-          status: '有效',
+            status: {tag:'有效' },
           "province": "辽宁",
           "city": "沈阳",
           "region": "沈北新区",
@@ -241,7 +246,7 @@ export default {
         {
           staffId: 1008,
           warehouseName: '新疆商物港汇物流有限公司',
-          status: '有效',
+            status: {tag:'有效' },
           "province": "辽宁",
           "city": "沈阳",
           "region": "苏家屯区",
@@ -255,7 +260,7 @@ export default {
         {
           staffId: 1009,
           warehouseName: '新乡市富华供应链管理有限公司',
-          status: '有效',
+            status: {tag:'有效' },
           "province": "辽宁",
           "city": "沈阳",
           "region": "辽中区",
@@ -269,7 +274,7 @@ export default {
         {
           staffId: 1010,
           warehouseName: '辉县市常青贸易有限责任公司',
-          status: '有效',
+            status: {tag:'有效' },
           "province": "辽宁",
           "city": "沈阳",
           "region": "新民市",

src/view/mst/basis-management/liter-premium-configuration/index.vue

@@ -0,0 +1,252 @@
+<!-- @desc:升贴水/基差配置 -升贴水配置  @auth:？？？  @time:----- -->
+<template>
+  <div class="main-div" ref="mainDiv">
+    <loading :loading="loading" v-if="!modalVisible"></loading>
+    <!--按钮区-->
+    <BaseIndexButtonGroup id="BaseIndexButtonGroup">
+      <template #left>
+        <!--    查询    -->
+        <BaseIndexButton  ref="search" name="search"></BaseIndexButton>
+        <!--    清空条件    -->
+        <BaseIndexButton ref="clear" name="clear"></BaseIndexButton>
+        <!--    编辑    -->
+        <BaseIndexButton right-button="warehouse-management-edit" ref="edit" name="edit"></BaseIndexButton>
+
+        <!--    导出    -->
+        <BaseIndexButton   ref="export" title="明细" @click="JumpDetail"></BaseIndexButton>
+      </template>
+      <template #right>
+        <!--   新建     -->
+        <BaseIndexButton right-button="warehouse-management-add" ref="add" name="add"></BaseIndexButton>
+      </template>
+    </BaseIndexButtonGroup>
+
+
+    <!--  表格部分  -->
+    <div :style="'height: ' + tableHeight + 'px'" class="split-div-class">
+      <!--  卡片区  -->
+      <div class="index-card">
+        <!--  查询条件区域  -->
+        <div id="search-cond-div" ref="search-cond-div" class="search-cond-class">
+          <SearchCond ref="searchCond" v-model="searchCond"
+                      @collapse-change="collapseChange" :setFlag="false"
+                      :searchContent="searchContent"  ></SearchCond>
+        </div>
+
+        <!--  表格部分  -->
+        <DkTable :id="'table-'+$options.name"
+                 ref="table-select"
+                 :data="tableData"
+                 :height="tableHeight-30"
+                 primaryKey="staffId"
+                 :multiple="false"
+                 :choose-flag="false"
+                 @current-change="currentChangeTable"
+                 :page-flag="true"
+                 :page-total="pageInfo.total"
+                 @pageChange="pageSizeChange"
+                 :pageSizeOpts="pageSizeOpts"
+                 :current-page="pageInfo.currentPage"
+                 :pageSize="pageInfo.pageSize"
+        >
+          <DkTableColumn field="contractName" type="checkbox"  title=" "></DkTableColumn>
+          <DkTableColumn field="contractName" title="名称"></DkTableColumn>
+          <DkTableColumn field="contractCalculator" title="计算器"></DkTableColumn>
+          <DkTableColumn field="contractStandard" title="标准"></DkTableColumn>
+          <DkTableColumn field="signingGb1103" title="gb1103"></DkTableColumn>
+          <DkTableColumn field="maxPickPackages" data-type="number" digits="0" title="最大挑包数"></DkTableColumn>
+          <DkTableColumn field="contractRemark" title="备注"></DkTableColumn>
+
+        </DkTable>
+      </div>
+      <!--新建编辑-->
+      <DkModal
+        :loading="loading"
+        v-model="editAddModal"
+        ref="modal_editAdd"
+        @modalOk="save"
+        :saveFlag="true"
+        :title="modalTitle"
+        @on-visible-change="handleVisibleModal"
+      >
+        <DkForm ref="dk-form" v-model="formData" :col-count="1">
+
+          <DkFormItem prop="remarks"  title="名称"  v-model="formData.remarks" :readonly="readonly">  </DkFormItem>
+          <DkFormItem prop="remarks"  title="标准"  v-model="formData.remarks" :readonly="readonly">  </DkFormItem>
+          <DkFormItem prop="remarks"    title="计算器"  v-model="formData.remarks" :readonly="readonly">  </DkFormItem>
+          <DkFormItem prop="remarks" type="switch" title="国标"  v-model="formData.remarkss" :readonly="readonly">  </DkFormItem>
+          <DkFormItem prop="remarks"  title="最大挑包数"  v-model="formData.remarks" :readonly="readonly">  </DkFormItem>
+          <DkFormItem prop="remarks"  title="升贴水计算类别"  v-model="formData.remarks" :readonly="readonly">  </DkFormItem>
+          <DkFormItem prop="remarks"  title="备注"  v-model="formData.remarks" :readonly="readonly">  </DkFormItem>
+        </DkForm>
+      </DkModal>
+    </div>
+
+
+
+
+  </div>
+</template>
+
+<script>
+
+import {indexMixin} from '@/mixins'
+
+export default {
+  name: 'sales-order-management',
+  mixins: [indexMixin],
+  data() {
+    return  {
+      tableData: [
+        {
+          staffId: "STAFF001",
+          contractName: "nobody(轧花厂排名)",
+          contractCalculator: "大渊博计算公式",
+          contractStandard: "国标1103",
+          signingGb1103: "是",
+          maxPickPackages: 0,
+          contractRemark: "棉协21/11"
+        },
+        {
+          staffId: "STAFF002",
+          contractName: "nobody(轧花厂排名)19/20",
+          contractCalculator: "大渊博计算公式",
+          contractStandard: "国标1103",
+          signingGb1103: "是",
+          maxPickPackages: 0,
+          contractRemark: "棉协21/11"
+        },
+        {
+          staffId: "STAFF003",
+          contractName: "nobody(轧花厂排名)20/21",
+          contractCalculator: "大渊博计算公式",
+          contractStandard: "国标1103",
+          signingGb1103: "是",
+          maxPickPackages: 0,
+          contractRemark: "棉协21/11"
+        },
+        {
+          staffId: "STAFF004",
+          contractName: "中纺采购升贴水2021",
+          contractCalculator: "大渊博计算公式",
+          contractStandard: "国标1103",
+          signingGb1103: "是",
+          maxPickPackages: 0,
+          contractRemark: "棉协21/11"
+        },
+        {
+          staffId: "STAFF005",
+          contractName: "嘉丰18/19升贴水",
+          contractCalculator: "大渊博计算公式",
+          contractStandard: "国标1103",
+          signingGb1103: "是",
+          maxPickPackages: 0,
+          contractRemark: "棉协21/11"
+        },
+        {
+          staffId: "STAFF006",
+          contractName: "嘉丰18/19升贴水2",
+          contractCalculator: "大渊博计算公式",
+          contractStandard: "国标1103",
+          signingGb1103: "是",
+          maxPickPackages: 0,
+          contractRemark: "棉协21/11"
+        },
+        {
+          staffId: "STAFF007",
+          contractName: "嘉丰19/20升贴水",
+          contractCalculator: "大渊博计算公式",
+          contractStandard: "国标1103",
+          signingGb1103: "是",
+          maxPickPackages: 0,
+          contractRemark: "棉协21/11"
+        },
+        {
+          staffId: "STAFF008",
+          contractName: "nobody(轧花厂排名)",
+          contractCalculator: "大渊博计算公式",
+          contractStandard: "国标1103",
+          signingGb1103: "是",
+          maxPickPackages: 0,
+          contractRemark: "棉协21/11"
+        },
+        {
+          staffId: "STAFF009",
+          contractName: "嘉丰19/20升贴水2",
+          contractCalculator: "嘉丰升贴水计算公式",
+          contractStandard: "国标1103",
+          signingGb1103: "是",
+          maxPickPackages: 0,
+          contractRemark: "棉协21/11"
+        },
+        {
+          staffId: "STAFF010",
+          contractName: "嘉丰20/21升贴水-ldc",
+          contractCalculator: "嘉丰升贴水计算公式",
+          contractStandard: "国标1103",
+          signingGb1103: "是",
+          maxPickPackages: 0,
+          contractRemark: "棉协21/11"
+        }
+      ],
+      //查询条件
+      searchContent: [
+
+        {
+          //公司名称
+          itemCode: 'cpIds',
+          title: '名称',
+
+          required: true
+        },
+        {
+          //公司名称
+          itemCode: 'cpIds',
+          title: '计算器',
+
+          required: true
+        },
+        {
+          //公司名称
+          itemCode: 'cpIds',
+          title: '标准',
+
+          required: true
+        },
+
+
+      ],
+      formData: {
+        staffCode: null,//员工工号
+        staffName: null,//员工编码
+      },
+    }
+  },
+  methods: {
+    JumpDetail(){
+      this.$router.push({
+        path: '/mst/basis-management/liter-premium-configuration/liter-premium-configuration-detail/index',
+      });
+    },
+    /**
+     * @desc   : 点击预览页当前行
+     * @author : 王英杰
+     * @date   : 2025/5/28 14:41
+     */
+    currentChangeTable(e) {
+      if (e && e.row) {
+        this.row = e
+      }
+    },
+  },
+  created() {
+    this.primaryKey = 'staffId'  // 设置主键Id
+    this.routeObjName = 'contractManagement'  // 设置路由名称
+  },
+
+
+}
+
+</script>
+
+

src/view/mst/basis-management/liter-premium-configuration/liter-premium-configuration-detail/index.vue

@@ -0,0 +1,388 @@
+<!-- @desc:升贴水/基差配置 - 升贴水明细配置  @auth:？？？  @time:----- -->
+<template>
+  <div class="main-div" ref="mainDiv">
+    <loading :loading="loading" v-if="!modalVisible"></loading>
+    <!--按钮区-->
+    <BaseIndexButtonGroup id="BaseIndexButtonGroup">
+      <template #left>
+        <!--    查询    -->
+        <BaseIndexButton  ref="search" name="search"></BaseIndexButton>
+        <!--    清空条件    -->
+        <BaseIndexButton ref="clear" name="clear"></BaseIndexButton>
+        <!--    编辑    -->
+        <BaseIndexButton right-button="warehouse-management-edit" ref="edit" name="edit"></BaseIndexButton>
+
+
+      </template>
+      <template #right>
+        <!--   新建     -->
+        <BaseIndexButton right-button="warehouse-management-add" ref="add" name="add"></BaseIndexButton>
+      </template>
+    </BaseIndexButtonGroup>
+
+
+    <!--  表格部分  -->
+    <div :style="'height: ' + tableHeight + 'px'" class="split-div-class">
+      <!--  卡片区  -->
+      <div class="index-card">
+        <!--  查询条件区域  -->
+        <div id="search-cond-div" ref="search-cond-div" class="search-cond-class">
+          <SearchCond ref="searchCond" v-model="searchCond"
+                      @collapse-change="collapseChange" :setFlag="false"
+                      :searchContent="searchContent"  ></SearchCond>
+        </div>
+
+        <!--  表格部分  -->
+        <DkTable :id="'table-'+$options.name"
+                 ref="table-select"
+                 :data="tableData"
+                 :height="tableHeight-30"
+                 primaryKey="staffId"
+                 :multiple="false"
+                 :choose-flag="false"
+                 @current-change="currentChangeTable"
+                 :page-flag="true"
+                 :page-total="pageInfo.total"
+                 @pageChange="pageSizeChange"
+                 :pageSizeOpts="pageSizeOpts"
+                 :current-page="pageInfo.currentPage"
+                 :pageSize="pageInfo.pageSize"
+        >
+          <DkTableColumn field="contractName" type="checkbox" title=" "></DkTableColumn>
+          <DkTableColumn field="contractCategory" title="类别"></DkTableColumn>
+          <DkTableColumn field="contractName" title="名称"></DkTableColumn>
+          <DkTableColumn field="contractCode" title="编码"></DkTableColumn>
+          <DkTableColumn field="reservedCode" title="预留编码"></DkTableColumn>
+          <DkTableColumn field="level" title="级别"></DkTableColumn>
+          <DkTableColumn field="gear" title="档位"></DkTableColumn>
+          <vxe-colgroup title="最小值">
+            <DkTableColumn   field="minComparator" title="比较符"></DkTableColumn>
+            <DkTableColumn dataType="number" field="minValue" title="值"></DkTableColumn>
+          </vxe-colgroup>
+          <vxe-colgroup title="最大值">
+            <DkTableColumn  field="maxComparator" title="比较符"></DkTableColumn>
+            <DkTableColumn dataType="number" field="maxValue" title="值"></DkTableColumn>
+          </vxe-colgroup>
+          <DkTableColumn dataType="number" field="reservedValue" title="预留值"></DkTableColumn>
+          <DkTableColumn  field="deliveryType" title="交割类型"></DkTableColumn>
+          <DkTableColumn dataType="number" field="premiumDiscount" title="升贴水"></DkTableColumn>
+          <DkTableColumn dataType="number" digits="0" field="sortOrder" title="排序"></DkTableColumn>
+          <DkTableColumn   field="createTime" title="创建时间"></DkTableColumn>
+          <DkTableColumn  field="remark" title="备注"></DkTableColumn>
+        </DkTable>
+      </div>
+      <!--新建编辑-->
+      <DkModal
+        :loading="loading"
+        v-model="editAddModal"
+        ref="modal_editAdd"
+        @modalOk="save"
+        :saveFlag="true"
+        :title="modalTitle"
+        @on-visible-change="handleVisibleModal"
+      >
+        <DkForm ref="dk-form" v-model="formData" :col-count="2">
+          <DkFormItem prop="country"   span="12" title="类别" v-model="formData.country" :readonly="readonly"
+                      :type="$config.formItemType.select" :option-list="countryList" :dataType="'boolean'"
+                      :multiple="false" labelKey="dataValue" valueKey="dataId">
+          </DkFormItem>
+
+
+          <DkFormItem prop="remarks"  title="名称" span="12"  v-model="formData.remarks" :readonly="readonly">  </DkFormItem>
+          <DkFormItem prop="remarks"    title="编码"  span="12" v-model="formData.remarks" :readonly="readonly">  </DkFormItem>
+          <DkFormItem prop="remarks"  title="预留编码"  span="12" v-model="formData.remarks" :readonly="readonly">  </DkFormItem>
+          <DkFormItem prop="country" title="最小值比较符"  span="12" v-model="formData.country" :readonly="readonly"
+                      :type="$config.formItemType.select" :option-list="countryList" :dataType="'boolean'"
+                      :multiple="false" labelKey="dataValue" valueKey="dataId">
+          </DkFormItem>
+          <DkFormItem prop="remarks"  title="最小值" span="12"  v-model="formData.remarks" :readonly="readonly">  </DkFormItem>
+          <DkFormItem prop="remarks"  title="级别"  span="12" v-model="formData.remarks" :readonly="readonly">  </DkFormItem>
+          <DkFormItem prop="remarks"  title="档位"  span="12" v-model="formData.remarks" :readonly="readonly">  </DkFormItem>
+          <DkFormItem prop="country" title="最大值比较符" span="12" v-model="formData.country" :readonly="readonly"
+                      :type="$config.formItemType.select" :option-list="countryList" :dataType="'boolean'"
+                      :multiple="false" labelKey="dataValue" valueKey="dataId">
+          </DkFormItem>
+          <DkFormItem prop="remarks"  title="最大值"   span="12"v-model="formData.remarks" :readonly="readonly">  </DkFormItem>
+          <DkFormItem prop="remarks"  title="预留值"  span="12" v-model="formData.remarks" :readonly="readonly">  </DkFormItem>
+          <DkFormItem prop="country" title="交割类型" span="12" v-model="formData.country" :readonly="readonly"
+                      :type="$config.formItemType.select" :option-list="countryList" :dataType="'boolean'"
+                      :multiple="false" labelKey="dataValue" valueKey="dataId">
+          </DkFormItem>
+          <DkFormItem prop="remarks" span="12" title="升贴水"  v-model="formData.remarks" :readonly="readonly">  </DkFormItem>
+          <DkFormItem prop="remarks"span="12"  title="序号"  v-model="formData.remarks" :readonly="readonly">  </DkFormItem>
+          <DkFormItem prop="remarks" span="24" title="备注"  v-model="formData.remarks" :readonly="readonly">  </DkFormItem>
+        </DkForm>
+      </DkModal>
+    </div>
+
+
+
+
+  </div>
+</template>
+
+<script>
+
+import {indexMixin} from '@/mixins'
+
+export default {
+  name: 'sales-order-management',
+  mixins: [indexMixin],
+  data() {
+    return  {
+      tableData: [
+        {
+          staffId: "COT-001",
+          contractName: "whiteCottonGrade1",
+          contractCategory: "白棉1级",
+          contractCode: "11-2025",
+          reservedCode: "WH-11-2025",
+          level: "1",
+          gear: "特优档",
+          minComparator: ">=",
+          minValue: 850,
+          maxComparator: "<=",
+          maxValue: 950,
+          reservedValue: 900,
+          deliveryType: "标准交割品",
+          premiumDiscount: 500,
+          sortOrder: 1,
+          createTime: "2025-01-01",  // 高级别合约采用较新日期
+          remark: "色泽洁白、纤维整齐度优"
+        },
+        {
+          staffId: "COT-002",
+          contractName: "whiteCottonGrade2",
+          contractCategory: "白棉2级",
+          contractCode: "12-2024",
+          reservedCode: "WH-12-2024",
+          level: "2",
+          gear: "优质档",
+          minComparator: ">=",
+          minValue: 800,
+          maxComparator: "<=",
+          maxValue: 900,
+          reservedValue: 850,
+          deliveryType: "标准交割品",
+          premiumDiscount: 350,
+          sortOrder: 2,
+          createTime: "2024-02-01",
+          remark: "色泽乳白、纤维强度良好"
+        },
+        {
+          staffId: "COT-003",
+          contractName: "whiteCottonGrade3",
+          contractCategory: "白棉3级",
+          contractCode: "13-2023",
+          reservedCode: "WH-13-2023",
+          level: "3",
+          gear: "普通档",
+          minComparator: ">=",
+          minValue: 750,
+          maxComparator: "<=",
+          maxValue: 850,
+          reservedValue: 800,
+          deliveryType: "替代交割品",
+          premiumDiscount: 150,
+          sortOrder: 3,
+          createTime: "2023-03-01",
+          remark: "色泽淡白、纤维均匀度一般"
+        },
+        {
+          staffId: "COT-004",
+          contractName: "lightSpottedCotton",
+          contractCategory: "淡点污棉",
+          contractCode: "21-2023",
+          reservedCode: "LS-21-2023",
+          level: "4",
+          gear: "合格档",
+          minComparator: ">=",
+          minValue: 700,
+          maxComparator: "<=",
+          maxValue: 800,
+          reservedValue: 750,
+          deliveryType: "替代交割品",
+          premiumDiscount: -50,
+          sortOrder: 4,
+          createTime: "2023-04-01",
+          remark: "带少量污点、纤维强度达标"
+        },
+        {
+          staffId: "COT-005",
+          contractName: "yellowStainedCotton1",
+          contractCategory: "淡黄染棉1级",
+          contractCode: "31-2022",
+          reservedCode: "YS-31-2022",
+          level: "5",
+          gear: "降级档",
+          minComparator: ">=",
+          minValue: 650,
+          maxComparator: "<=",
+          maxValue: 750,
+          reservedValue: 700,
+          deliveryType: "替代交割品",
+          premiumDiscount: -150,
+          sortOrder: 5,
+          createTime: "2022-05-01",
+          remark: "轻微黄染、纤维整齐度一般"
+        },
+        {
+          staffId: "COT-006",
+          contractName: "yellowStainedCotton2",
+          contractCategory: "淡黄染棉2级",
+          contractCode: "32-2021",
+          reservedCode: "YS-32-2021",
+          level: "6",
+          gear: "降级档",
+          minComparator: ">=",
+          minValue: 600,
+          maxComparator: "<=",
+          maxValue: 700,
+          reservedValue: 650,
+          deliveryType: "非标准交割品",
+          premiumDiscount: -300,
+          sortOrder: 6,
+          createTime: "2021-06-01",  // 低级别合约采用较老日期
+          remark: "黄染明显、纤维强度偏低"
+        },
+        {
+          staffId: "COT-007",
+          contractName: "grayCotton",
+          contractCategory: "灰棉",
+          contractCode: "41-2020",
+          reservedCode: "GR-41-2020",
+          level: "7",
+          gear: "等外品",
+          minComparator: ">=",
+          minValue: 550,
+          maxComparator: "<=",
+          maxValue: 650,
+          reservedValue: 600,
+          deliveryType: "非标准交割品",
+          premiumDiscount: -500,
+          sortOrder: 7,
+          createTime: "2020-07-01",
+          remark: "色泽灰暗、纤维短绒率高"
+        },
+        {
+          staffId: "COT-008",
+          contractName: "whiteCottonGrade4",
+          contractCategory: "白棉4级",
+          contractCode: "14-2025",
+          reservedCode: "WH-14-2025",
+          level: "8",
+          gear: "合格档",
+          minComparator: ">=",
+          minValue: 780,
+          maxComparator: "<=",
+          maxValue: 880,
+          reservedValue: 830,
+          deliveryType: "标准交割品",
+          premiumDiscount: 200,
+          sortOrder: 8,
+          createTime: "2025-08-01",
+          remark: "色泽白、纤维长度适中"
+        },
+        {
+          staffId: "COT-009",
+          contractName: "whiteCottonGrade5",
+          contractCategory: "白棉5级",
+          contractCode: "15-2024",
+          reservedCode: "WH-15-2024",
+          level: "9",
+          gear: "普通档",
+          minComparator: ">=",
+          minValue: 720,
+          maxComparator: "<=",
+          maxValue: 820,
+          reservedValue: 770,
+          deliveryType: "替代交割品",
+          premiumDiscount: 50,
+          sortOrder: 9,
+          createTime: "2024-09-01",
+          remark: "色泽稍白、纤维整齐度一般"
+        },
+        {
+          staffId: "COT-010",
+          contractName: "lightYellowStainedCotton",
+          contractCategory: "淡点黄染棉",
+          contractCode: "33-2023",
+          reservedCode: "LYS-33-2023",
+          level: "10",
+          gear: "合格档",
+          minComparator: ">=",
+          minValue: 680,
+          maxComparator: "<=",
+          maxValue: 780,
+          reservedValue: 730,
+          deliveryType: "替代交割品",
+          premiumDiscount: -100,
+          sortOrder: 10,
+          createTime: "2023-10-01",
+          remark: "轻微黄染、纤维强度达标"
+        }
+      ],
+      //查询条件
+      searchContent: [
+
+
+        {
+          //公司名称
+          itemCode: 'cpIds',
+          title: '名称',
+
+          required: true
+        },
+        {
+          //公司名称
+          itemCode: 'cpIds',
+          title: '编码',
+
+          required: true
+        },
+        {
+          //公司名称
+          itemCode: 'cpIds',
+          title: '预留编码',
+
+          required: true
+        },
+        {
+          //公司名称
+          itemCode: 'cpIds',
+          title: '档位',
+          required: true
+        },
+
+      ],
+      countryList:[],
+      formData: {
+        staffCode: null,//员工工号
+        staffName: null,//员工编码
+      },
+    }
+  },
+  methods: {
+
+    /**
+     * @desc   : 点击预览页当前行
+     * @author : 王英杰
+     * @date   : 2025/5/28 14:41
+     */
+    currentChangeTable(e) {
+      if (e && e.row) {
+        this.row = e
+      }
+    },
+  },
+  created() {
+    this.primaryKey = 'staffId'  // 设置主键Id
+    this.routeObjName = 'contractManagement'  // 设置路由名称
+  },
+
+
+}
+
+</script>
+
+

src/view/mst/basis-management/premium-basis-calculation/procurement-basis/index.vue

@@ -129,7 +129,11 @@ export default {
           required: true
         },
         {
-          //员工工号
+          itemCode: 'staffCode',
+          title: '入库日期',
+          valueKind:'DATE_RANGE',
+        },
+        {
           itemCode: 'staffCode',
           title: '生产企业',
         },

src/view/mst/basis-management/premium-basis-calculation/sales-basis/index.vue

@@ -371,19 +371,20 @@ export default {
       //查询条件
       searchContent: [
         {
-          //公司名称
           itemCode: 'cpIds',
           title: '批号',
-
           required: true
         },
         {
-          //员工工号
+          itemCode: 'staffCode',
+          title: '入库日期',
+          valueKind:'DATE_RANGE',
+        },
+        {
           itemCode: 'staffCode',
           title: '生产企业',
         },
         {
-          //员工名称
           itemCode: 'staffName',
           title: '公检仓库',
         },

src/view/mst/basis-management/premium-basis-calculation/zheng-mian-picked-bags/index.vue

@@ -202,19 +202,20 @@ export default {
       //查询条件
       searchContent: [
         {
-          //公司名称
           itemCode: 'cpIds',
           title: '批号',
-
           required: true
         },
         {
-          //员工工号
+          itemCode: 'staffCode',
+          title: '入库日期',
+          valueKind:'DATE_RANGE',
+        },
+        {
           itemCode: 'staffCode',
           title: '生产企业',
         },
         {
-          //员工名称
           itemCode: 'staffName',
           title: '公检仓库',
         },

src/view/mst/basis-management/premium-basis-configuration/purchase-premium-basis-configuration/index.vue

@@ -205,7 +205,7 @@ export default {
           {   name: '白棉一级',   code: '11',  type: '替代交割品',  whater: 500,    remakes: '备注信息...',   },
           {   name: '白棉二级',   code: '12',  type: '替代交割品',  whater: 500,    remakes: '备注信息...',   },
           {   name: '白棉三级',   code: '13',  type: '替代交割品',  whater: 500,    remakes: '备注信息...',   },
-          {   name: '白棉四级',   code: '14',  type: '替代交割品',  whater: 500,    remakes: '备注信息...',   },
+          {   name: '白棉四级',   code: '14',  type: '替代交割品   ',  whater: 500,    remakes: '备注信息...',   },
         ],
         skuData2: [
           {   name: '32毫米',   code: '11',  interval: '32 ≤ 值',  type: "替代交割品",    whater: 900,remarks: '备注信息...',   },

src/view/mst/contract-management/contract-management/contract-management/index.vue

@@ -59,7 +59,7 @@
           <!--  商品名称  -->
           <DkTableColumn field="contractType" title="合同类型"></DkTableColumn>
           <!--  规格型号  -->
-          <DkTableColumn field="contractStatus"   title="合同状态" ></DkTableColumn>
+          <DkTableColumn field="contractStatus" type="tag"   title="合同状态" ></DkTableColumn>
           <!--  计量单位  -->
           <DkTableColumn field="signingDate"   title="签订日期"></DkTableColumn>
           <!--  仓库名称  -->
@@ -92,7 +92,7 @@
 
           <DkFormItem prop="remarks"  title="合同编号"  v-model="formData.remarks" :readonly="readonly">  </DkFormItem>
           <DkFormItem prop="remarks"  title="合同类型"  v-model="formData.remarks" :readonly="readonly">  </DkFormItem>
-          <DkFormItem prop="remarks"  title="合同状态"  v-model="formData.remarks" :readonly="readonly">  </DkFormItem>
+          <DkFormItem prop="remarks"    title="合同状态"  v-model="formData.remarks" :readonly="readonly">  </DkFormItem>
           <DkFormItem prop="remarks"  title="签订日期"  v-model="formData.remarks" :readonly="readonly">  </DkFormItem>
           <DkFormItem prop="remarks"  title="甲方名称"  v-model="formData.remarks" :readonly="readonly">  </DkFormItem>
           <DkFormItem prop="remarks"  title="乙方名称"  v-model="formData.remarks" :readonly="readonly">  </DkFormItem>
@@ -125,7 +125,8 @@ export default {
           staffId: 2001,
           contractNumber: 'HT-20240601-001',
           contractType: '采购合同',
-          contractStatus: '已生效',
+           contractStatus: {tag:'已生效' },
+
           signingDate: '2024-06-01',
           partyAName: '新疆棉业集团',
           partyBName: '郑州纺织有限公司',
@@ -139,7 +140,8 @@ export default {
           staffId: 2002,
           contractNumber: 'HT-20240601-002',
           contractType: '销售合同',
-          contractStatus: '待审核',
+          contractStatus: {tag:'待审核' },
+
           signingDate: '2024-06-02',
           partyAName: '山东鲁棉集团',
           partyBName: '上海贸易有限公司',
@@ -153,7 +155,7 @@ export default {
           staffId: 2003,
           contractNumber: 'HT-20240601-003',
           contractType: '加工合同',
-          contractStatus: '履行中',
+          contractStatus: {tag:'履行中' },
           signingDate: '2024-06-03',
           partyAName: '江苏华棉纺织',
           partyBName: '浙江印染厂',
@@ -167,7 +169,7 @@ export default {
           staffId: 2004,
           contractNumber: 'HT-20240601-004',
           contractType: '采购合同',
-          contractStatus: '已终止',
+          contractStatus: {tag:'履行中' },
           signingDate: '2024-06-04',
           partyAName: '湖北银丰棉花',
           partyBName: '广东服装公司',
@@ -181,7 +183,7 @@ export default {
           staffId: 2005,
           contractNumber: 'HT-20240601-005',
           contractType: '销售合同',
-          contractStatus: '已生效',
+           contractStatus: {tag:'已生效' },
           signingDate: '2024-06-05',
           partyAName: '河北新乐棉花',
           partyBName: '天津纺织集团',
@@ -195,7 +197,7 @@ export default {
           staffId: 2006,
           contractNumber: 'HT-20240601-006',
           contractType: '服务合同',
-          contractStatus: '待签署',
+          contractStatus: {tag:'履行中' },
           signingDate: '2024-06-06',
           partyAName: '安徽辉隆农业',
           partyBName: '郑州仓储公司',
@@ -209,7 +211,7 @@ export default {
           staffId: 2007,
           contractNumber: 'HT-20240601-007',
           contractType: '采购合同',
-          contractStatus: '履行中',
+          contractStatus: {tag:'履行中' },
           signingDate: '2024-06-07',
           partyAName: '新疆生产建设兵团棉麻',
           partyBName: '青岛纺织有限公司',
@@ -223,7 +225,7 @@ export default {
           staffId: 2008,
           contractNumber: 'HT-20240601-008',
           contractType: '销售合同',
-          contractStatus: '已生效',
+           contractStatus: {tag:'已生效' },
           signingDate: '2024-06-08',
           partyAName: '河南豫棉集团',
           partyBName: '张家港贸易公司',
@@ -237,7 +239,7 @@ export default {
           staffId: 2009,
           contractNumber: 'HT-20240601-009',
           contractType: '租赁合同',
-          contractStatus: '待审核',
+          contractStatus: {tag:'待审核' },
           signingDate: '2024-06-09',
           partyAName: '湖南云锦集团',
           partyBName: '武汉仓储公司',
@@ -251,7 +253,7 @@ export default {
           staffId: 2010,
           contractNumber: 'HT-20240601-010',
           contractType: '采购合同',
-          contractStatus: '已生效',
+           contractStatus: {tag:'已生效' },
           signingDate: '2024-06-10',
           partyAName: '江西赣棉集团',
           partyBName: '南京纺织有限公司',
@@ -265,6 +267,12 @@ export default {
       //查询条件
       searchContent: [
         {
+          itemCode: 'cpIds',
+          title: '签订日期',
+          valueKind:'DATE_RANGE',
+          // required: true
+        },
+        {
           //公司名称
           itemCode: 'cpIds',
           title: '合同编号',

src/view/mst/contract-management/contract-management/contract-statistics/index.vue

@@ -59,7 +59,7 @@
           <!--  商品名称  -->
           <DkTableColumn field="contractType" title="合同类型"></DkTableColumn>
           <!--  规格型号  -->
-          <DkTableColumn field="contractStatus"   title="合同状态" ></DkTableColumn>
+          <DkTableColumn field="contractStatus"  type="tag"  title="合同状态" ></DkTableColumn>
           <!--  计量单位  -->
           <DkTableColumn field="signingDate"   title="签订日期"></DkTableColumn>
           <!--  仓库名称  -->
@@ -125,7 +125,8 @@ export default {
           staffId: 2001,
           contractNumber: 'HT-20240601-001',
           contractType: '采购合同',
-          contractStatus: '已生效',
+          contractStatus: {tag:'已生效' },
+
           signingDate: '2024-06-01',
           partyAName: '新疆棉业集团',
           partyBName: '郑州纺织有限公司',
@@ -139,7 +140,8 @@ export default {
           staffId: 2002,
           contractNumber: 'HT-20240601-002',
           contractType: '销售合同',
-          contractStatus: '待审核',
+          contractStatus: {tag:'待审核' },
+
           signingDate: '2024-06-02',
           partyAName: '山东鲁棉集团',
           partyBName: '上海贸易有限公司',
@@ -153,7 +155,7 @@ export default {
           staffId: 2003,
           contractNumber: 'HT-20240601-003',
           contractType: '加工合同',
-          contractStatus: '履行中',
+          contractStatus: {tag:'履行中' },
           signingDate: '2024-06-03',
           partyAName: '江苏华棉纺织',
           partyBName: '浙江印染厂',
@@ -167,7 +169,7 @@ export default {
           staffId: 2004,
           contractNumber: 'HT-20240601-004',
           contractType: '采购合同',
-          contractStatus: '已终止',
+          contractStatus: {tag:'履行中' },
           signingDate: '2024-06-04',
           partyAName: '湖北银丰棉花',
           partyBName: '广东服装公司',
@@ -181,7 +183,7 @@ export default {
           staffId: 2005,
           contractNumber: 'HT-20240601-005',
           contractType: '销售合同',
-          contractStatus: '已生效',
+          contractStatus: {tag:'已生效' },
           signingDate: '2024-06-05',
           partyAName: '河北新乐棉花',
           partyBName: '天津纺织集团',
@@ -195,7 +197,7 @@ export default {
           staffId: 2006,
           contractNumber: 'HT-20240601-006',
           contractType: '服务合同',
-          contractStatus: '待签署',
+          contractStatus: {tag:'履行中' },
           signingDate: '2024-06-06',
           partyAName: '安徽辉隆农业',
           partyBName: '郑州仓储公司',
@@ -209,7 +211,7 @@ export default {
           staffId: 2007,
           contractNumber: 'HT-20240601-007',
           contractType: '采购合同',
-          contractStatus: '履行中',
+          contractStatus: {tag:'履行中' },
           signingDate: '2024-06-07',
           partyAName: '新疆生产建设兵团棉麻',
           partyBName: '青岛纺织有限公司',
@@ -223,7 +225,7 @@ export default {
           staffId: 2008,
           contractNumber: 'HT-20240601-008',
           contractType: '销售合同',
-          contractStatus: '已生效',
+          contractStatus: {tag:'已生效' },
           signingDate: '2024-06-08',
           partyAName: '河南豫棉集团',
           partyBName: '张家港贸易公司',
@@ -237,7 +239,7 @@ export default {
           staffId: 2009,
           contractNumber: 'HT-20240601-009',
           contractType: '租赁合同',
-          contractStatus: '待审核',
+          contractStatus: {tag:'待审核' },
           signingDate: '2024-06-09',
           partyAName: '湖南云锦集团',
           partyBName: '武汉仓储公司',
@@ -251,7 +253,7 @@ export default {
           staffId: 2010,
           contractNumber: 'HT-20240601-010',
           contractType: '采购合同',
-          contractStatus: '已生效',
+          contractStatus: {tag:'已生效' },
           signingDate: '2024-06-10',
           partyAName: '江西赣棉集团',
           partyBName: '南京纺织有限公司',
@@ -265,6 +267,12 @@ export default {
       //查询条件
       searchContent: [
         {
+          itemCode: 'cpIds',
+          title: '签订日期',
+          valueKind:'DATE_RANGE',
+          // required: true
+        },
+        {
           //公司名称
           itemCode: 'cpIds',
           title: '合同编号',

src/view/mst/contract-management/invoice-management/invoice-management/index.vue

@@ -262,13 +262,18 @@ export default {
           //员工工号
           itemCode: 'staffCode',
           title: '开票日期',
+          valueKind:'DATE_RANGE',
         },
         {
           //员工名称
           itemCode: 'staffName',
-          title: '发票状态',
+          title: '发票方式',
+        },
+        {
+          //员工名称
+          itemCode: 'staffName',
+          title: '开票方',
         },
-
 
       ],
       formData: {

src/view/mst/contract-management/invoice-management/invoice-statistics/index.vue

@@ -264,13 +264,18 @@ export default {
           //员工工号
           itemCode: 'staffCode',
           title: '开票日期',
+          valueKind:'DATE_RANGE',
         },
         {
           //员工名称
           itemCode: 'staffName',
-          title: '发票状态',
+          title: '发票方式',
+        },
+        {
+          //员工名称
+          itemCode: 'staffName',
+          title: '开票方',
         },
-
 
       ],
       formData: {

src/view/mst/risk-management/risk-warning/early-warning-payables/index.vue

@@ -102,14 +102,24 @@
          {
            //公司名称
            itemCode: 'cpIds',
-           title: '编码',
+           title: '应付单号',
 
            required: true
          },
          {
            //员工工号
            itemCode: 'staffCode',
-           title: '名称',
+           title: '供应商名称',
+         },
+         {
+           //员工工号
+           itemCode: 'staffCode',
+           title: '供应商编号',
+         },
+         {
+           //员工工号
+           itemCode: 'staffCode',
+           title: '采购单号',
          },
          {
            //员工名称

src/view/mst/risk-management/risk-warning/inventory-alerts/index.vue

@@ -73,7 +73,7 @@
            <DkTableColumn field="supplierInfo" title="供应商信息"></DkTableColumn>
            <DkTableColumn field="suggestedAction" title="建议操作"></DkTableColumn>
            <DkTableColumn field="warningResponsiblePerson" title="预警责任人"></DkTableColumn>
-           <DkTableColumn field="processingStatus" title="处理状态"></DkTableColumn>
+           <DkTableColumn field="processingStatus"  type="tag" title="处理状态"></DkTableColumn>
            <DkTableColumn field="triggerTime" title="触发时间"></DkTableColumn>
            <DkTableColumn field="thresholdSetter" title="预警阈值设置人"></DkTableColumn>
            <DkTableColumn field="dataUpdateTime" title="数据更新时间"></DkTableColumn>
@@ -117,8 +117,27 @@
            itemCode: 'staffName',
            title: '预警类型',
          },
+         {
+           //员工名称
+           itemCode: 'staffName',
+           title: '预警等级',
+         },
+         {
+           //员工名称
+           itemCode: 'staffName',
+           title: '所属库区',
+         },
 
-
+         {
+           //员工名称
+           itemCode: 'staffName',
+           title: '关联采购订单号',
+         },
+         {
+           //员工名称
+           itemCode: 'staffName',
+           title: '关联销售订单号',
+         },
        ],
        formData: {
          staffCode: null,//员工工号
@@ -145,7 +164,7 @@
            supplierInfo: '新疆XX棉业有限公司/13899998888',
            suggestedAction: '启动促销清仓，联系供应商退换货',
            warningResponsiblePerson: '采购经理-张XX',
-           processingStatus: '未处理',
+           processingStatus: {tag:'未处理'},
            triggerTime: '2025-06-06 14:30:00',
            thresholdSetter: '王XX',
            dataUpdateTime: '2025-06-06 15:00:00'
@@ -170,7 +189,7 @@
            supplierInfo: '美国XX棉商/13900001111',
            suggestedAction: '触发紧急采购，协调供应商加急供货',
            warningResponsiblePerson: '仓库主管-李XX',
-           processingStatus: '处理中',
+           processingStatus: {tag:'未处理'},
            triggerTime: '2025-06-06 15:10:00',
            thresholdSetter: '王XX',
            dataUpdateTime: '2025-06-06 15:00:00'
@@ -195,7 +214,7 @@
            supplierInfo: '山东XX棉业/13766665555',
            suggestedAction: '优化采购计划，控制进货量',
            warningResponsiblePerson: '采购专员-赵XX',
-           processingStatus: '已结案',
+           processingStatus: {tag:'未处理'},
            triggerTime: '2025-06-05 09:45:00',
            thresholdSetter: '刘XX',
            dataUpdateTime: '2025-06-06 15:00:00'
@@ -220,7 +239,7 @@
            supplierInfo: '江苏XX有机农业/13644443333',
            suggestedAction: '启动常规采购流程',
            warningResponsiblePerson: '计划主管-孙XX',
-           processingStatus: '未处理',
+           processingStatus: {tag:'未处理'},
            triggerTime: '2025-06-04 16:20:00',
            thresholdSetter: '刘XX',
            dataUpdateTime: '2025-06-06 15:00:00'
@@ -245,7 +264,7 @@
            supplierInfo: '澳大利亚XX棉商/13522221111',
            suggestedAction: '启动促销清仓，联系供应商退换货',
            warningResponsiblePerson: '销售经理-周XX',
-           processingStatus: '处理中',
+           processingStatus: {tag:'未处理'},
            triggerTime: '2025-06-03 11:10:00',
            thresholdSetter: '陈XX',
            dataUpdateTime: '2025-06-06 15:00:00'
@@ -270,7 +289,7 @@
            supplierInfo: '哈萨克斯坦XX公司/13477776666',
            suggestedAction: '触发紧急采购，协调供应商加急供货',
            warningResponsiblePerson: '采购经理-张XX',
-           processingStatus: '未处理',
+           processingStatus: {tag:'未处理'},
            triggerTime: '2025-06-02 14:55:00',
            thresholdSetter: '陈XX',
            dataUpdateTime: '2025-06-06 15:00:00'
@@ -295,7 +314,7 @@
            supplierInfo: '河北XX棉业/13388887777',
            suggestedAction: '优化采购计划，控制进货量',
            warningResponsiblePerson: '采购专员-赵XX',
-           processingStatus: '已结案',
+           processingStatus: {tag:'未处理'},
            triggerTime: '2025-06-01 10:20:00',
            thresholdSetter: '吴XX',
            dataUpdateTime: '2025-06-06 15:00:00'
@@ -320,7 +339,7 @@
            supplierInfo: '非洲XX农业/13255554444',
            suggestedAction: '触发紧急采购，协调供应商加急供货',
            warningResponsiblePerson: '计划主管-孙XX',
-           processingStatus: '处理中',
+           processingStatus: {tag:'未处理'},
            triggerTime: '2025-05-31 17:30:00',
            thresholdSetter: '吴XX',
            dataUpdateTime: '2025-06-06 15:00:00'
@@ -345,7 +364,7 @@
            supplierInfo: '河南XX纺织/13166665555',
            suggestedAction: '优化采购计划，控制进货量',
            warningResponsiblePerson: '销售经理-周XX',
-           processingStatus: '未处理',
+           processingStatus: {tag:'未处理'},
            triggerTime: '2025-05-30 09:15:00',
            thresholdSetter: '郑XX',
            dataUpdateTime: '2025-06-06 15:00:00'
@@ -370,7 +389,7 @@
            supplierInfo: '陕西XX棉业/13099998888',
            suggestedAction: '触发紧急采购，协调供应商加急供货',
            warningResponsiblePerson: '仓库主管-李XX',
-           processingStatus: '处理中',
+           processingStatus: {tag:'未处理'},
            triggerTime: '2025-05-29 15:40:00',
            thresholdSetter: '郑XX',
            dataUpdateTime: '2025-06-06 15:00:00'

src/view/mst/risk-management/risk-warning/inventory-cycle-overtime-warning/index.vue

@@ -103,7 +103,6 @@
            //公司名称
            itemCode: 'cpIds',
            title: '存货编码',
-
            required: true
          },
          {
@@ -116,7 +115,22 @@
            itemCode: 'staffName',
            title: '预警类型',
          },
-
+         {
+           //员工名称
+           itemCode: 'staffName',
+           title: '所属库区',
+         },
+         {
+           //员工名称
+           itemCode: 'staffName',
+           title: '供应商名称',
+         },
+         {
+           itemCode: 'cpIds',
+           title: '入库日期',
+           valueKind:'DATE_RANGE',
+           // required: true
+         },
 
        ],
        formData: {

src/view/mst/risk-management/risk-warning/outbound-warning/index.vue

@@ -1,401 +1,408 @@
- <!-- @desc:风险预警-出库预警  @auth:？？？  @time:----- -->
- <template>
-   <div class="main-div" ref="mainDiv">
-     <loading :loading="loading" v-if="!modalVisible"></loading>
-     <!--按钮区-->
-     <BaseIndexButtonGroup id="BaseIndexButtonGroup">
-       <template #left>
-         <!--    查询    -->
-         <BaseIndexButton  ref="search" name="search"></BaseIndexButton>
-         <!--    清空条件    -->
-         <BaseIndexButton ref="clear" name="clear"></BaseIndexButton>
-<!--         &lt;!&ndash;    编辑    &ndash;&gt;-->
-<!--         <BaseIndexButton right-button="warehouse-management-edit" ref="edit" name="edit"></BaseIndexButton>-->
-<!--         &lt;!&ndash;    启用    &ndash;&gt;-->
-<!--         <BaseIndexButton right-button="warehouse-management-enable" ref="enable" name="enable"></BaseIndexButton>-->
-<!--         &lt;!&ndash;    停用    &ndash;&gt;-->
-<!--         <BaseIndexButton right-button="warehouse-management-disable" ref="disable" name="disable"></BaseIndexButton>-->
-         <!--    导入    -->
-         <BaseIndexButton right-button="warehouse-management-import" ref="import" name="import"></BaseIndexButton>
-         <!--    导出    -->
-         <BaseIndexButton right-button="warehouse-management-export" ref="export" name="export"></BaseIndexButton>
-       </template>
-       <template #right>
-         <!--   新建     -->
-<!--         <BaseIndexButton right-button="warehouse-management-add" ref="add" name="add"></BaseIndexButton>-->
-       </template>
-     </BaseIndexButtonGroup>
+<!-- @desc:风险预警-出库预警  @auth:？？？  @time:----- -->
+<template>
+  <div class="main-div" ref="mainDiv">
+    <loading :loading="loading" v-if="!modalVisible"></loading>
+    <!--按钮区-->
+    <BaseIndexButtonGroup id="BaseIndexButtonGroup">
+      <template #left>
+        <!--    查询    -->
+        <BaseIndexButton ref="search" name="search"></BaseIndexButton>
+        <!--    清空条件    -->
+        <BaseIndexButton ref="clear" name="clear"></BaseIndexButton>
+        <!--         &lt;!&ndash;    编辑    &ndash;&gt;-->
+        <!--         <BaseIndexButton right-button="warehouse-management-edit" ref="edit" name="edit"></BaseIndexButton>-->
+        <!--         &lt;!&ndash;    启用    &ndash;&gt;-->
+        <!--         <BaseIndexButton right-button="warehouse-management-enable" ref="enable" name="enable"></BaseIndexButton>-->
+        <!--         &lt;!&ndash;    停用    &ndash;&gt;-->
+        <!--         <BaseIndexButton right-button="warehouse-management-disable" ref="disable" name="disable"></BaseIndexButton>-->
+        <!--    导入    -->
+        <BaseIndexButton right-button="warehouse-management-import" ref="import" name="import"></BaseIndexButton>
+        <!--    导出    -->
+        <BaseIndexButton right-button="warehouse-management-export" ref="export" name="export"></BaseIndexButton>
+      </template>
+      <template #right>
+        <!--   新建     -->
+        <!--         <BaseIndexButton right-button="warehouse-management-add" ref="add" name="add"></BaseIndexButton>-->
+      </template>
+    </BaseIndexButtonGroup>
 
 
-     <!--  表格部分  -->
-     <div :style="'height: ' + tableHeight + 'px'" class="split-div-class">
-       <!--  卡片区  -->
-       <div class="index-card">
-         <!--  查询条件区域  -->
-         <div id="search-cond-div" ref="search-cond-div" class="search-cond-class">
-           <SearchCond ref="searchCond" v-model="searchCond"
-                       @collapse-change="collapseChange" :setFlag="false"
-                       :searchContent="searchContent"  ></SearchCond>
-         </div>
+    <!--  表格部分  -->
+    <div :style="'height: ' + tableHeight + 'px'" class="split-div-class">
+      <!--  卡片区  -->
+      <div class="index-card">
+        <!--  查询条件区域  -->
+        <div id="search-cond-div" ref="search-cond-div" class="search-cond-class">
+          <SearchCond ref="searchCond" v-model="searchCond"
+                      @collapse-change="collapseChange" :setFlag="false"
+                      :searchContent="searchContent"></SearchCond>
+        </div>
 
-         <!--  表格部分  -->
-         <DkTable
-           :id="'table-' + $options.name"
-           ref="table-select"
-           :data="tableData"
-           :height="tableHeight - 30"
-           primaryKey="inventoryCycleWarningId"
-           :multiple="false"
-           :choose-flag="false"
-           @current-change="currentChangeTable"
-           :page-flag="true"
-           :page-total="pageInfo.total"
-           @pageChange="pageSizeChange"
-           :pageSizeOpts="pageSizeOpts"
-           :current-page="pageInfo.currentPage"
-           :pageSize="pageInfo.pageSize"
-         >
-           <DkTableColumn field="customerCode" type="link" title="客户编号"></DkTableColumn>
-           <DkTableColumn field="customerName" title="客户名称"></DkTableColumn>
-           <DkTableColumn field="contactPerson" title="联系人"></DkTableColumn>
-           <DkTableColumn field="outboundOrderNumber" title="出库单号"></DkTableColumn>
-           <DkTableColumn field="outboundDate" title="出库日期"></DkTableColumn>
-           <DkTableColumn field="customerCreditLimit" data-type="number" title="客户信用额度"></DkTableColumn>
-           <DkTableColumn field="usedCredit"   data-type="number"  title="已使用额度"></DkTableColumn>
-           <DkTableColumn field="availableCredit"  data-type="number"  title="剩余可用额度"></DkTableColumn>
-           <DkTableColumn field="currentOutboundAmount"  data-type="number"  title="本次出库金额"></DkTableColumn>
-           <DkTableColumn field="exceededAmount"  data-type="number"  title="超额度金额"></DkTableColumn>
-           <DkTableColumn field="warningType" title="预警类型"></DkTableColumn>
-           <DkTableColumn field="warningLevel" title="预警等级"></DkTableColumn>
-           <DkTableColumn field="historicalOverdueRecords" title="历史逾期记录"></DkTableColumn>
-           <DkTableColumn field="lastPaymentDate" title="最近付款日期"></DkTableColumn>
-           <DkTableColumn field="responsibleDepartment" title="责任部门"></DkTableColumn>
-           <DkTableColumn field="responsiblePerson" title="责任人"></DkTableColumn>
-           <DkTableColumn field="suggestedAction" title="建议操作"></DkTableColumn>
-           <DkTableColumn field="processingStatus" title="处理状态"></DkTableColumn>
-           <DkTableColumn field="approvalProcessStatus" title="审批流程状态"></DkTableColumn>
-           <DkTableColumn field="warningTriggerTime" title="预警触发时间"></DkTableColumn>
-           <DkTableColumn field="dataUpdateTime" title="数据更新时间"></DkTableColumn>
-           <DkTableColumn field="creditLimitSetter" title="信用额度设置人"></DkTableColumn>
-         </DkTable>
-       </div>
+        <!--  表格部分  -->
+        <DkTable
+          :id="'table-' + $options.name"
+          ref="table-select"
+          :data="tableData"
+          :height="tableHeight - 30"
+          primaryKey="inventoryCycleWarningId"
+          :multiple="false"
+          :choose-flag="false"
+          @current-change="currentChangeTable"
+          :page-flag="true"
+          :page-total="pageInfo.total"
+          @pageChange="pageSizeChange"
+          :pageSizeOpts="pageSizeOpts"
+          :current-page="pageInfo.currentPage"
+          :pageSize="pageInfo.pageSize"
+        >
+          <DkTableColumn field="customerCode" type="link" title="客户编号"></DkTableColumn>
+          <DkTableColumn field="customerName" title="客户名称"></DkTableColumn>
+          <DkTableColumn field="contactPerson" title="联系人"></DkTableColumn>
+          <DkTableColumn field="outboundOrderNumber" title="出库单号"></DkTableColumn>
+          <DkTableColumn field="outboundDate" title="出库日期"></DkTableColumn>
+          <DkTableColumn field="customerCreditLimit" data-type="number" title="客户信用额度"></DkTableColumn>
+          <DkTableColumn field="usedCredit" data-type="number" title="已使用额度"></DkTableColumn>
+          <DkTableColumn field="availableCredit" data-type="number" title="剩余可用额度"></DkTableColumn>
+          <DkTableColumn field="currentOutboundAmount" data-type="number" title="本次出库金额"></DkTableColumn>
+          <DkTableColumn field="exceededAmount" data-type="number" title="超额度金额"></DkTableColumn>
+          <DkTableColumn field="warningType" title="预警类型"></DkTableColumn>
+          <DkTableColumn field="warningLevel" title="预警等级"></DkTableColumn>
+          <DkTableColumn field="historicalOverdueRecords" data-type="number" digits="0" title="历史逾期记录"></DkTableColumn>
+          <DkTableColumn field="lastPaymentDate" title="最近付款日期"></DkTableColumn>
+          <DkTableColumn field="responsibleDepartment" title="责任部门"></DkTableColumn>
+          <DkTableColumn field="responsiblePerson" title="责任人"></DkTableColumn>
+          <DkTableColumn field="suggestedAction" title="建议操作"></DkTableColumn>
+          <DkTableColumn field="processingStatus" type="tag" title="处理状态"></DkTableColumn>
+          <!--           <DkTableColumn field="approvalProcessStatus" title="审批流程状态"></DkTableColumn>-->
+          <DkTableColumn field="warningTriggerTime" title="预警触发时间"></DkTableColumn>
+          <DkTableColumn field="dataUpdateTime" title="数据更新时间"></DkTableColumn>
+          <DkTableColumn field="creditLimitSetter" title="信用额度设置人"></DkTableColumn>
+        </DkTable>
+      </div>
 
-     </div>
+    </div>
 
 
+  </div>
+</template>
 
+<script>
 
-   </div>
- </template>
+import {indexMixin} from '@/mixins'
 
- <script>
+export default {
+  name: 'outbound-warning',
+  mixins: [indexMixin],
+  data() {
+    return {
+      buyerList: [],
+      //查询条件
+      searchContent: [
+        {
+          //公司名称
+          itemCode: 'cpIds',
+          title: '客户编码',
 
- import {indexMixin} from '@/mixins'
+          required: true
+        },
+        {
+          //员工工号
+          itemCode: 'staffCode',
+          title: '客户名称',
+        },
+        {
+          //员工名称
+          itemCode: 'staffName',
+          title: '联系人',
+        },
+        {
+          //员工名称
+          itemCode: 'staffName',
+          title: '出库单号',
+        },
+        {
+          itemCode: 'cpIds',
+          title: '出库日期',
+          valueKind: 'DATE_RANGE',
+          // required: true
+        },
+      ],
+      formData: {
+        staffCode: null,//员工工号
+        staffName: null,//员工编码
+      },
+      tableData: [
+        {
+          inventoryCycleWarningId: 1,
+          customerCode: "CUST001",
+          customerName: "深圳科技有限公司",
+          contactPerson: "张三",
+          outboundOrderNumber: "OUT20250601001",
+          outboundDate: "2025-06-01",
+          customerCreditLimit: 50000,
+          usedCredit: 35000,
+          availableCredit: 15000,
+          currentOutboundAmount: 8000,
+          exceededAmount: 0,
+          warningType: "额度预警",
+          warningLevel: "黄色预警",
+          historicalOverdueRecords: 1,
+          lastPaymentDate: "2025-05-25",
+          responsibleDepartment: "销售一部",
+          responsiblePerson: "李四",
+          suggestedAction: "加强监控",
+          processingStatus: {tag: '未处理'},
+          approvalProcessStatus: "审批中",
+          warningTriggerTime: "2025-06-01 14:30:00",
+          dataUpdateTime: "2025-06-01 15:00:00",
+          creditLimitSetter: "系统自动设置"
+        },
+        {
+          inventoryCycleWarningId: 2,
+          customerCode: "CUST002",
+          customerName: "上海贸易集团",
+          contactPerson: "王芳",
+          outboundOrderNumber: "OUT20250601002",
+          outboundDate: "2025-06-01",
+          customerCreditLimit: 80000,
+          usedCredit: 75000,
+          availableCredit: 5000,
+          currentOutboundAmount: 6000,
+          exceededAmount: 1000,
+          warningType: "超支预警",
+          warningLevel: "红色预警",
+          historicalOverdueRecords: 3,
+          lastPaymentDate: "2025-05-18",
+          responsibleDepartment: "销售二部",
+          responsiblePerson: "赵六",
+          suggestedAction: "暂停合作",
+          processingStatus: {tag: '未处理'},
+          approvalProcessStatus: "待审批",
+          warningTriggerTime: "2025-06-01 14:45:00",
+          dataUpdateTime: "2025-06-01 15:15:00",
+          creditLimitSetter: "张经理"
+        },
+        {
+          inventoryCycleWarningId: 3,
+          customerCode: "CUST003",
+          customerName: "广州电子有限公司",
+          contactPerson: "陈丽",
+          outboundOrderNumber: "OUT20250601003",
+          outboundDate: "2025-06-01",
+          customerCreditLimit: 100000,
+          usedCredit: 40000,
+          availableCredit: 60000,
+          currentOutboundAmount: 12000,
+          exceededAmount: 0,
+          warningType: "正常",
+          warningLevel: "绿色预警",
+          historicalOverdueRecords: 0,
+          lastPaymentDate: "2025-06-01",
+          responsibleDepartment: "财务部",
+          responsiblePerson: "周七",
+          suggestedAction: "维持现状",
+          processingStatus: {tag: '未处理'},
+          approvalProcessStatus: "已通过",
+          warningTriggerTime: "-",
+          dataUpdateTime: "2025-06-01 16:00:00",
+          creditLimitSetter: "李总监"
+        },
+        {
+          inventoryCycleWarningId: 4,
+          customerCode: "CUST004",
+          customerName: "杭州制造企业",
+          contactPerson: "吴明",
+          outboundOrderNumber: "OUT20250601004",
+          outboundDate: "2025-06-01",
+          customerCreditLimit: 60000,
+          usedCredit: 58000,
+          availableCredit: 2000,
+          currentOutboundAmount: 2500,
+          exceededAmount: 500,
+          warningType: "额度预警",
+          warningLevel: "黄色预警",
+          historicalOverdueRecords: 2,
+          lastPaymentDate: "2025-05-30",
+          responsibleDepartment: "风控部",
+          responsiblePerson: "郑八",
+          suggestedAction: "降低额度",
+          processingStatus: {tag: '未处理'},
+          approvalProcessStatus: "审批中",
+          warningTriggerTime: "2025-06-01 15:10:00",
+          dataUpdateTime: "2025-06-01 15:30:00",
+          creditLimitSetter: "系统自动设置"
+        },
+        {
+          inventoryCycleWarningId: 5,
+          customerCode: "CUST005",
+          customerName: "南京供应链公司",
+          contactPerson: "徐丽",
+          outboundOrderNumber: "OUT20250601005",
+          outboundDate: "2025-06-01",
+          customerCreditLimit: 30000,
+          usedCredit: 28000,
+          availableCredit: 2000,
+          currentOutboundAmount: 1800,
+          exceededAmount: 0,
+          warningType: "接近预警",
+          warningLevel: "黄色预警",
+          historicalOverdueRecords: 1,
+          lastPaymentDate: "2025-05-20",
+          responsibleDepartment: "销售一部",
+          responsiblePerson: "孙九",
+          suggestedAction: "提醒付款",
+          processingStatus: {tag: '未处理'},
+          approvalProcessStatus: "待审批",
+          warningTriggerTime: "2025-06-01 15:45:00",
+          dataUpdateTime: "2025-06-01 16:15:00",
+          creditLimitSetter: "张经理"
+        },
+        {
+          inventoryCycleWarningId: 6,
+          customerCode: "CUST006",
+          customerName: "成都贸易公司",
+          contactPerson: "胡军",
+          outboundOrderNumber: "OUT20250601006",
+          outboundDate: "2025-06-01",
+          customerCreditLimit: 70000,
+          usedCredit: 65000,
+          availableCredit: 5000,
+          currentOutboundAmount: 5500,
+          exceededAmount: 500,
+          warningType: "超支预警",
+          warningLevel: "红色预警",
+          historicalOverdueRecords: 4,
+          lastPaymentDate: "2025-05-10",
+          responsibleDepartment: "销售二部",
+          responsiblePerson: "林十",
+          suggestedAction: "暂停合作",
+          processingStatus: {tag: '未处理'},
+          approvalProcessStatus: "待审批",
+          warningTriggerTime: "2025-06-01 16:00:00",
+          dataUpdateTime: "2025-06-01 16:30:00",
+          creditLimitSetter: "李总监"
+        },
+        {
+          inventoryCycleWarningId: 7,
+          customerCode: "CUST007",
+          customerName: "武汉科技企业",
+          contactPerson: "郭伟",
+          outboundOrderNumber: "OUT20250601007",
+          outboundDate: "2025-06-01",
+          customerCreditLimit: 90000,
+          usedCredit: 30000,
+          availableCredit: 60000,
+          currentOutboundAmount: 9000,
+          exceededAmount: 0,
+          warningType: "正常",
+          warningLevel: "绿色预警",
+          historicalOverdueRecords: 0,
+          lastPaymentDate: "2025-06-01",
+          responsibleDepartment: "财务部",
+          responsiblePerson: "马十一",
+          suggestedAction: "维持现状",
+          processingStatus: {tag: '未处理'},
+          approvalProcessStatus: "已通过",
+          warningTriggerTime: "-",
+          dataUpdateTime: "2025-06-01 17:00:00",
+          creditLimitSetter: "系统自动设置"
+        },
+        {
+          inventoryCycleWarningId: 8,
+          customerCode: "CUST008",
+          customerName: "西安制造集团",
+          contactPerson: "罗芳",
+          outboundOrderNumber: "OUT20250601008",
+          outboundDate: "2025-06-01",
+          customerCreditLimit: 40000,
+          usedCredit: 38000,
+          availableCredit: 2000,
+          currentOutboundAmount: 2200,
+          exceededAmount: 200,
+          warningType: "额度预警",
+          warningLevel: "黄色预警",
+          historicalOverdueRecords: 1,
+          lastPaymentDate: "2025-05-28",
+          responsibleDepartment: "风控部",
+          responsiblePerson: "郑十二",
+          suggestedAction: "降低额度",
+          processingStatus: {tag: '未处理'},
+          approvalProcessStatus: "审批中",
+          warningTriggerTime: "2025-06-01 17:15:00",
+          dataUpdateTime: "2025-06-01 17:30:00",
+          creditLimitSetter: "张经理"
+        },
+        {
+          inventoryCycleWarningId: 9,
+          customerCode: "CUST009",
+          customerName: "重庆贸易有限公司",
+          contactPerson: "苏明",
+          outboundOrderNumber: "OUT20250601009",
+          outboundDate: "2025-06-01",
+          customerCreditLimit: 20000,
+          usedCredit: 19000,
+          availableCredit: 1000,
+          currentOutboundAmount: 1200,
+          exceededAmount: 200,
+          warningType: "接近预警",
+          warningLevel: "黄色预警",
+          historicalOverdueRecords: 2,
+          lastPaymentDate: "2025-05-15",
+          responsibleDepartment: "销售一部",
+          responsiblePerson: "黄十三",
+          suggestedAction: "提醒付款",
+          processingStatus: {tag: '未处理'},
+          approvalProcessStatus: "待审批",
+          warningTriggerTime: "2025-06-01 18:00:00",
+          dataUpdateTime: "2025-06-01 18:15:00",
+          creditLimitSetter: "李总监"
+        },
+        {
+          inventoryCycleWarningId: 10,
+          customerCode: "CUST010",
+          customerName: "长沙科技集团",
+          contactPerson: "邓丽",
+          outboundOrderNumber: "OUT20250601010",
+          outboundDate: "2025-06-01",
+          customerCreditLimit: 100000,
+          usedCredit: 50000,
+          availableCredit: 50000,
+          currentOutboundAmount: 15000,
+          exceededAmount: 0,
+          warningType: "正常",
+          warningLevel: "绿色预警",
+          historicalOverdueRecords: 0,
+          lastPaymentDate: "2025-06-01",
+          responsibleDepartment: "财务部",
+          responsiblePerson: "陈十四",
+          suggestedAction: "维持现状",
+          processingStatus: {tag: '未处理'},
+          approvalProcessStatus: "已通过",
+          warningTriggerTime: "-",
+          dataUpdateTime: "2025-06-01 19:00:00",
+          creditLimitSetter: "系统自动设置"
+        }
+      ],
+    }
+  },
+  methods: {
+    /**
+     * @desc   : 点击预览页当前行
+     * @author : 王英杰
+     * @date   : 2025/5/28 14:41
+     */
+    currentChangeTable(e) {
+      if (e && e.row) {
+        this.row = e
+      }
+    },
+  },
+  created() {
+    this.primaryKey = 'staffId'  // 设置主键Id
+    this.routeObjName = 'warehouseManagement'  // 设置路由名称
+  },
 
- export default {
-   name: 'outbound-warning',
-   mixins: [indexMixin],
-   data() {
-     return  {
-       buyerList:[],
-       //查询条件
-       searchContent: [
-         {
-           //公司名称
-           itemCode: 'cpIds',
-           title: '存货编码',
 
-           required: true
-         },
-         {
-           //员工工号
-           itemCode: 'staffCode',
-           title: '存货名称',
-         },
-         {
-           //员工名称
-           itemCode: 'staffName',
-           title: '预警类型',
-         },
+}
 
-
-       ],
-       formData: {
-         staffCode: null,//员工工号
-         staffName: null,//员工编码
-       },
-       tableData: [
-         {
-           inventoryCycleWarningId: 1,
-           customerCode: "CUST001",
-           customerName: "深圳科技有限公司",
-           contactPerson: "张三",
-           outboundOrderNumber: "OUT20250601001",
-           outboundDate: "2025-06-01",
-           customerCreditLimit: 50000,
-           usedCredit: 35000,
-           availableCredit: 15000,
-           currentOutboundAmount: 8000,
-           exceededAmount: 0,
-           warningType: "额度预警",
-           warningLevel: "黄色预警",
-           historicalOverdueRecords: 1,
-           lastPaymentDate: "2025-05-25",
-           responsibleDepartment: "销售一部",
-           responsiblePerson: "李四",
-           suggestedAction: "加强监控",
-           processingStatus: "处理中",
-           approvalProcessStatus: "审批中",
-           warningTriggerTime: "2025-06-01 14:30:00",
-           dataUpdateTime: "2025-06-01 15:00:00",
-           creditLimitSetter: "系统自动设置"
-         },
-         {
-           inventoryCycleWarningId: 2,
-           customerCode: "CUST002",
-           customerName: "上海贸易集团",
-           contactPerson: "王芳",
-           outboundOrderNumber: "OUT20250601002",
-           outboundDate: "2025-06-01",
-           customerCreditLimit: 80000,
-           usedCredit: 75000,
-           availableCredit: 5000,
-           currentOutboundAmount: 6000,
-           exceededAmount: 1000,
-           warningType: "超支预警",
-           warningLevel: "红色预警",
-           historicalOverdueRecords: 3,
-           lastPaymentDate: "2025-05-18",
-           responsibleDepartment: "销售二部",
-           responsiblePerson: "赵六",
-           suggestedAction: "暂停合作",
-           processingStatus: "待处理",
-           approvalProcessStatus: "待审批",
-           warningTriggerTime: "2025-06-01 14:45:00",
-           dataUpdateTime: "2025-06-01 15:15:00",
-           creditLimitSetter: "张经理"
-         },
-         {
-           inventoryCycleWarningId: 3,
-           customerCode: "CUST003",
-           customerName: "广州电子有限公司",
-           contactPerson: "陈丽",
-           outboundOrderNumber: "OUT20250601003",
-           outboundDate: "2025-06-01",
-           customerCreditLimit: 100000,
-           usedCredit: 40000,
-           availableCredit: 60000,
-           currentOutboundAmount: 12000,
-           exceededAmount: 0,
-           warningType: "正常",
-           warningLevel: "绿色预警",
-           historicalOverdueRecords: 0,
-           lastPaymentDate: "2025-06-01",
-           responsibleDepartment: "财务部",
-           responsiblePerson: "周七",
-           suggestedAction: "维持现状",
-           processingStatus: "已处理",
-           approvalProcessStatus: "已通过",
-           warningTriggerTime: "-",
-           dataUpdateTime: "2025-06-01 16:00:00",
-           creditLimitSetter: "李总监"
-         },
-         {
-           inventoryCycleWarningId: 4,
-           customerCode: "CUST004",
-           customerName: "杭州制造企业",
-           contactPerson: "吴明",
-           outboundOrderNumber: "OUT20250601004",
-           outboundDate: "2025-06-01",
-           customerCreditLimit: 60000,
-           usedCredit: 58000,
-           availableCredit: 2000,
-           currentOutboundAmount: 2500,
-           exceededAmount: 500,
-           warningType: "额度预警",
-           warningLevel: "黄色预警",
-           historicalOverdueRecords: 2,
-           lastPaymentDate: "2025-05-30",
-           responsibleDepartment: "风控部",
-           responsiblePerson: "郑八",
-           suggestedAction: "降低额度",
-           processingStatus: "处理中",
-           approvalProcessStatus: "审批中",
-           warningTriggerTime: "2025-06-01 15:10:00",
-           dataUpdateTime: "2025-06-01 15:30:00",
-           creditLimitSetter: "系统自动设置"
-         },
-         {
-           inventoryCycleWarningId: 5,
-           customerCode: "CUST005",
-           customerName: "南京供应链公司",
-           contactPerson: "徐丽",
-           outboundOrderNumber: "OUT20250601005",
-           outboundDate: "2025-06-01",
-           customerCreditLimit: 30000,
-           usedCredit: 28000,
-           availableCredit: 2000,
-           currentOutboundAmount: 1800,
-           exceededAmount: 0,
-           warningType: "接近预警",
-           warningLevel: "黄色预警",
-           historicalOverdueRecords: 1,
-           lastPaymentDate: "2025-05-20",
-           responsibleDepartment: "销售一部",
-           responsiblePerson: "孙九",
-           suggestedAction: "提醒付款",
-           processingStatus: "待处理",
-           approvalProcessStatus: "待审批",
-           warningTriggerTime: "2025-06-01 15:45:00",
-           dataUpdateTime: "2025-06-01 16:15:00",
-           creditLimitSetter: "张经理"
-         },
-         {
-           inventoryCycleWarningId: 6,
-           customerCode: "CUST006",
-           customerName: "成都贸易公司",
-           contactPerson: "胡军",
-           outboundOrderNumber: "OUT20250601006",
-           outboundDate: "2025-06-01",
-           customerCreditLimit: 70000,
-           usedCredit: 65000,
-           availableCredit: 5000,
-           currentOutboundAmount: 5500,
-           exceededAmount: 500,
-           warningType: "超支预警",
-           warningLevel: "红色预警",
-           historicalOverdueRecords: 4,
-           lastPaymentDate: "2025-05-10",
-           responsibleDepartment: "销售二部",
-           responsiblePerson: "林十",
-           suggestedAction: "暂停合作",
-           processingStatus: "待处理",
-           approvalProcessStatus: "待审批",
-           warningTriggerTime: "2025-06-01 16:00:00",
-           dataUpdateTime: "2025-06-01 16:30:00",
-           creditLimitSetter: "李总监"
-         },
-         {
-           inventoryCycleWarningId: 7,
-           customerCode: "CUST007",
-           customerName: "武汉科技企业",
-           contactPerson: "郭伟",
-           outboundOrderNumber: "OUT20250601007",
-           outboundDate: "2025-06-01",
-           customerCreditLimit: 90000,
-           usedCredit: 30000,
-           availableCredit: 60000,
-           currentOutboundAmount: 9000,
-           exceededAmount: 0,
-           warningType: "正常",
-           warningLevel: "绿色预警",
-           historicalOverdueRecords: 0,
-           lastPaymentDate: "2025-06-01",
-           responsibleDepartment: "财务部",
-           responsiblePerson: "马十一",
-           suggestedAction: "维持现状",
-           processingStatus: "已处理",
-           approvalProcessStatus: "已通过",
-           warningTriggerTime: "-",
-           dataUpdateTime: "2025-06-01 17:00:00",
-           creditLimitSetter: "系统自动设置"
-         },
-         {
-           inventoryCycleWarningId: 8,
-           customerCode: "CUST008",
-           customerName: "西安制造集团",
-           contactPerson: "罗芳",
-           outboundOrderNumber: "OUT20250601008",
-           outboundDate: "2025-06-01",
-           customerCreditLimit: 40000,
-           usedCredit: 38000,
-           availableCredit: 2000,
-           currentOutboundAmount: 2200,
-           exceededAmount: 200,
-           warningType: "额度预警",
-           warningLevel: "黄色预警",
-           historicalOverdueRecords: 1,
-           lastPaymentDate: "2025-05-28",
-           responsibleDepartment: "风控部",
-           responsiblePerson: "郑十二",
-           suggestedAction: "降低额度",
-           processingStatus: "处理中",
-           approvalProcessStatus: "审批中",
-           warningTriggerTime: "2025-06-01 17:15:00",
-           dataUpdateTime: "2025-06-01 17:30:00",
-           creditLimitSetter: "张经理"
-         },
-         {
-           inventoryCycleWarningId: 9,
-           customerCode: "CUST009",
-           customerName: "重庆贸易有限公司",
-           contactPerson: "苏明",
-           outboundOrderNumber: "OUT20250601009",
-           outboundDate: "2025-06-01",
-           customerCreditLimit: 20000,
-           usedCredit: 19000,
-           availableCredit: 1000,
-           currentOutboundAmount: 1200,
-           exceededAmount: 200,
-           warningType: "接近预警",
-           warningLevel: "黄色预警",
-           historicalOverdueRecords: 2,
-           lastPaymentDate: "2025-05-15",
-           responsibleDepartment: "销售一部",
-           responsiblePerson: "黄十三",
-           suggestedAction: "提醒付款",
-           processingStatus: "待处理",
-           approvalProcessStatus: "待审批",
-           warningTriggerTime: "2025-06-01 18:00:00",
-           dataUpdateTime: "2025-06-01 18:15:00",
-           creditLimitSetter: "李总监"
-         },
-         {
-           inventoryCycleWarningId: 10,
-           customerCode: "CUST010",
-           customerName: "长沙科技集团",
-           contactPerson: "邓丽",
-           outboundOrderNumber: "OUT20250601010",
-           outboundDate: "2025-06-01",
-           customerCreditLimit: 100000,
-           usedCredit: 50000,
-           availableCredit: 50000,
-           currentOutboundAmount: 15000,
-           exceededAmount: 0,
-           warningType: "正常",
-           warningLevel: "绿色预警",
-           historicalOverdueRecords: 0,
-           lastPaymentDate: "2025-06-01",
-           responsibleDepartment: "财务部",
-           responsiblePerson: "陈十四",
-           suggestedAction: "维持现状",
-           processingStatus: "已处理",
-           approvalProcessStatus: "已通过",
-           warningTriggerTime: "-",
-           dataUpdateTime: "2025-06-01 19:00:00",
-           creditLimitSetter: "系统自动设置"
-         }
-       ],
-     }
-   },
-   methods: {
-     /**
-      * @desc   : 点击预览页当前行
-      * @author : 王英杰
-      * @date   : 2025/5/28 14:41
-      */
-     currentChangeTable(e) {
-       if (e && e.row) {
-         this.row = e
-       }
-     },
-   },
-   created() {
-     this.primaryKey = 'staffId'  // 设置主键Id
-     this.routeObjName = 'warehouseManagement'  // 设置路由名称
-   },
-
-
- }
-
- </script>
+</script>

src/view/mst/risk-management/risk-warning/receivables-warning/index.vue

@@ -62,7 +62,7 @@
            <DkTableColumn field="collectedAmount" data-type="number" title="已收金额"></DkTableColumn>
            <DkTableColumn field="uncollectedAmount" data-type="number" title="未收金额"></DkTableColumn>
            <DkTableColumn field="contractPaymentDate" title="合同约定收款日期"></DkTableColumn>
-           <DkTableColumn field="overdueDays" title="超时天数"></DkTableColumn>
+           <DkTableColumn field="overdueDays" data-type="number" digits="0" title="超时天数"></DkTableColumn>
            <DkTableColumn field="warningLevel" title="预警等级"></DkTableColumn>
            <DkTableColumn field="collectionResponsible" title="收款责任人"></DkTableColumn>
            <DkTableColumn field="lastFollowUpTime" title="上次跟进时间"></DkTableColumn>
@@ -94,21 +94,27 @@
          {
            //公司名称
            itemCode: 'cpIds',
-           title: '存货编码',
+           title: '单据编码',
 
            required: true
          },
          {
            //员工工号
            itemCode: 'staffCode',
-           title: '存货名称',
+           title: '客户名称',
          },
          {
-           //员工名称
-           itemCode: 'staffName',
-           title: '预警类型',
+           itemCode: 'cpIds',
+           title: '跟进日期',
+           valueKind: 'DATE_RANGE',
+           // required: true
+         },
+         {
+           itemCode: 'cpIds',
+           title: '约定收款日期',
+           valueKind: 'DATE_RANGE',
+           // required: true
          },
-
 
        ],
        formData: {

src/view/mst/risk-management/risk-warning/settlement-timeout-warning/index.vue

@@ -62,9 +62,9 @@
            <DkTableColumn field="settledAmount" data-type="number"  title="已结算金额"></DkTableColumn>
            <DkTableColumn field="unsettledAmount" data-type="number"  title="未结算金额"></DkTableColumn>
            <DkTableColumn field="contractSignDate" title="合同签订日期"></DkTableColumn>
-           <DkTableColumn field="agreedSettlementDays" title="约定结算周期（天）"></DkTableColumn>
-           <DkTableColumn field="overdueDays" title="超时天数"></DkTableColumn>
-           <DkTableColumn field="settlementStatus" title="结算状态"></DkTableColumn>
+           <DkTableColumn field="agreedSettlementDays" data-type="number" digits="0" title="约定结算周期（天）"></DkTableColumn>
+           <DkTableColumn field="overdueDays" data-type="number" digits="0" title="超时天数"></DkTableColumn>
+           <DkTableColumn field="settlementStatus" type="tag" title="结算状态"></DkTableColumn>
            <DkTableColumn field="responsibleDepartment" title="责任部门"></DkTableColumn>
            <DkTableColumn field="responsiblePerson" title="责任人"></DkTableColumn>
            <DkTableColumn field="lastFollowUpDate" title="上次跟进时间"></DkTableColumn>
@@ -96,22 +96,32 @@
          {
            //公司名称
            itemCode: 'cpIds',
-           title: '存货编码',
+           title: '合同编号',
 
            required: true
          },
          {
            //员工工号
            itemCode: 'staffCode',
-           title: '存货名称',
+           title: '合同名称',
          },
          {
            //员工名称
            itemCode: 'staffName',
-           title: '预警类型',
+           title: '供应商名称',
+         },
+         {
+           itemCode: 'cpIds',
+           title: '合同签订日期',
+           valueKind: 'DATE_RANGE',
+           // required: true
+         },
+         {
+           itemCode: 'cpIds',
+           title: '跟进日期',
+           valueKind: 'DATE_RANGE',
+           // required: true
          },
-
-
        ],
        formData: {
          staffCode: null,//员工工号
@@ -130,7 +140,7 @@
            agreedSettlementDays: 120,
            remainingDays: -30, // 超时30天
            overdueDays: 30,
-           settlementStatus: "超时预警",
+           settlementStatus:{tag: "超时预警"},
            responsibleDepartment: "采购一部",
            responsiblePerson: "李明",
            lastFollowUpDate: "2025-05-10",
@@ -149,7 +159,7 @@
            agreedSettlementDays: 90,
            remainingDays: -5, // 超时5天
            overdueDays: 5,
-           settlementStatus: "超时预警",
+           settlementStatus:{tag: "超时预警"},
            responsibleDepartment: "采购二部",
            responsiblePerson: "王芳",
            lastFollowUpDate: "2025-05-25",
@@ -168,7 +178,7 @@
            agreedSettlementDays: 60,
            remainingDays: 10, // 未超时，剩余10天
            overdueDays: 0,
-           settlementStatus: "结算完成",
+           settlementStatus:{tag: "结算完成"},
            responsibleDepartment: "采购三部",
            responsiblePerson: "张伟",
            lastFollowUpDate: "-",
@@ -187,7 +197,7 @@
            agreedSettlementDays: 180,
            remainingDays: 30, // 未超时，剩余30天
            overdueDays: 0,
-           settlementStatus: "进行中",
+           settlementStatus:{tag: "进行中"},
            responsibleDepartment: "采购一部",
            responsiblePerson: "刘敏",
            lastFollowUpDate: "2025-05-30",
@@ -206,7 +216,7 @@
            agreedSettlementDays: 60,
            remainingDays: -10, // 超时10天
            overdueDays: 10,
-           settlementStatus: "超时预警",
+           settlementStatus:{tag: "超时预警"},
            responsibleDepartment: "采购二部",
            responsiblePerson: "陈杰",
            lastFollowUpDate: "2025-06-02",
@@ -225,7 +235,7 @@
            agreedSettlementDays: 150,
            remainingDays: 20, // 未超时，剩余20天
            overdueDays: 0,
-           settlementStatus: "进行中",
+           settlementStatus:{tag: "进行中"},
            responsibleDepartment: "采购三部",
            responsiblePerson: "杨璐",
            lastFollowUpDate: "2025-06-05",
@@ -244,7 +254,7 @@
            agreedSettlementDays: 90,
            remainingDays: -45, // 超时45天
            overdueDays: 45,
-           settlementStatus: "超时预警",
+           settlementStatus:{tag: "超时预警"},
            responsibleDepartment: "采购一部",
            responsiblePerson: "周强",
            lastFollowUpDate: "2025-05-01",
@@ -263,7 +273,7 @@
            agreedSettlementDays: 30,
            remainingDays: -1, // 超时1天
            overdueDays: 1,
-           settlementStatus: "超时预警",
+           settlementStatus:{tag: "超时预警"},
            responsibleDepartment: "采购二部",
            responsiblePerson: "吴娜",
            lastFollowUpDate: "2025-06-06",
@@ -282,7 +292,7 @@
            agreedSettlementDays: 90,
            remainingDays: 15, // 未超时，剩余15天
            overdueDays: 0,
-           settlementStatus: "进行中",
+           settlementStatus:{tag: "进行中"},
            responsibleDepartment: "采购三部",
            responsiblePerson: "郑凯",
            lastFollowUpDate: "2025-06-08",
@@ -301,7 +311,7 @@
            agreedSettlementDays: 60,
            remainingDays: 25, // 未超时，提前完成结算
            overdueDays: 0,
-           settlementStatus: "结算完成",
+           settlementStatus:{tag: "结算完成"},
            responsibleDepartment: "采购一部",
            responsiblePerson: "徐丽",
            lastFollowUpDate: "-",

src/view/mst/sales-management/interest-management/index.vue

@@ -76,7 +76,7 @@
           <!-- 合同号 -->
           <DkTableColumn field="contractNumber" title="合同号"></DkTableColumn>
           <!-- 状态 -->
-          <DkTableColumn field="status" title="状态"></DkTableColumn>
+          <DkTableColumn field="status" type="tag" title="状态"></DkTableColumn>
           <!-- 备注 -->
           <DkTableColumn field="remarks" title="备注"></DkTableColumn>
           <DkTableColumn field="remarks" type="operate" title="操作" width="220">
@@ -126,7 +126,7 @@ export default {
           basisInterest: 800,
           overdueInterest: 400,
           contractNumber: 'HT-20250601-001',
-          status: '已确认',
+         status: {tag:'已确认' },
           remarks: '正常履约'
         },
         {
@@ -142,7 +142,7 @@ export default {
           basisInterest: 630,
           overdueInterest: 315,
           contractNumber: 'HT-20250602-002',
-          status: '待审核',
+          status: {tag:'待审核' },
           remarks: '需补充资质文件'
         },
         {
@@ -158,7 +158,7 @@ export default {
           basisInterest: 1275,
           overdueInterest: 637.5,
           contractNumber: 'HT-20250603-003',
-          status: '执行中',
+          status: {tag:'执行中' },
           remarks: '部分货物待发货'
         },
         {
@@ -174,7 +174,7 @@ export default {
           basisInterest: 340,
           overdueInterest: 170,
           contractNumber: 'HT-20250604-004',
-          status: '已取消',
+          status: {tag:'已取消' },
           remarks: '买方单方面终止合同'
         },
         {
@@ -190,7 +190,7 @@ export default {
           basisInterest: 1062.5,
           overdueInterest: 531.25,
           contractNumber: 'HT-20250605-005',
-          status: '待确认',
+          status: {tag:'待确认' },
           remarks: '等待卖方签章'
         },
         {
@@ -206,7 +206,8 @@ export default {
           basisInterest: 510,
           overdueInterest: 255,
           contractNumber: 'HT-20250606-006',
-          status: '已完成',
+          status: {tag:'已完成' },
+
           remarks: '履约完成，货款结清'
         },
         {
@@ -222,7 +223,7 @@ export default {
           basisInterest: 1487.5,
           overdueInterest: 743.75,
           contractNumber: 'HT-20250607-007',
-          status: '执行中',
+           status: {tag:'执行中' },
           remarks: '运输途中，预计明日到达'
         },
         {
@@ -238,7 +239,7 @@ export default {
           basisInterest: 255,
           overdueInterest: 127.5,
           contractNumber: 'HT-20250608-008',
-          status: '待发货',
+          status: {tag:'执行中' },
           remarks: '等待仓库排期'
         },
         {
@@ -254,7 +255,7 @@ export default {
           basisInterest: 765,
           overdueInterest: 382.5,
           contractNumber: 'HT-20250609-009',
-          status: '审核中',
+          status: {tag:'执行中' },
           remarks: '财务审核中'
         },
         {
@@ -270,17 +271,16 @@ export default {
           basisInterest: 935,
           overdueInterest: 467.5,
           contractNumber: 'HT-20250610-0010',
-          status: '已过期',
+          status: {tag:'执行中' },
           remarks: '超过履约期限未执行'
         }
       ],
       //查询条件
       searchContent: [
         {
-          //公司名称
           itemCode: 'cpIds',
           title: '开货日期',
-          valueKind:'DATE',
+          valueKind:'DATE_RANGE',
           // required: true
         },
         {
@@ -289,6 +289,21 @@ export default {
           title: '合同号',
         },
         {
+          //员工工号
+          itemCode: 'staffCode',
+          title: '销售员',
+        },
+        {
+          //员工工号
+          itemCode: 'staffCode',
+          title: '买方',
+        },
+        {
+          //员工工号
+          itemCode: 'staffCode',
+          title: '卖方',
+        },
+        {
           //员工名称
           itemCode: 'staffName',
           title: '备注',

src/view/mst/sales-management/sales-accounting-books/sales-accounting-books/index.vue

@@ -213,6 +213,12 @@ export default {
       //查询条件
       searchContent: [
         {
+          itemCode: 'cpIds',
+          title: '交易、日期',
+          valueKind:'DATE_RANGE',
+          // required: true
+        },
+        {
           //公司名称
           itemCode: 'cpIds',
           title: '台账编号',

src/view/mst/sales-management/sales-order-management/basis-sales-order/index.vue

@@ -239,14 +239,18 @@ export default {
           //员工工号
           itemCode: 'staffCode',
           title: '开货日期',
-          valueKind:'DATE',
+          valueKind:'DATE_RANGE',
         },
         {
           //员工名称
           itemCode: 'staffName',
           title: '类型',
         },
-
+        {
+          //员工工号
+          itemCode: 'staffCode',
+          title: '销售员',
+        },
 
       ],
       formData: {

src/view/mst/sales-management/sales-order-management/orther-sales-order/index.vue

@@ -257,8 +257,18 @@ export default {
           //员工名称
           itemCode: 'staffName',
           title: '订单日期',
+          valueKind:'DATE_RANGE',
+        },
+        {
+          //员工工号
+          itemCode: 'staffCode',
+          title: '客户名称',
+        },
+        {
+          //员工工号
+          itemCode: 'staffCode',
+          title: '业务员',
         },
-
 
       ],
       formData: {