Ver Fonte

Merge remote-tracking branch 'origin/master'

wangyuxuan há 10 meses atrás
pai
commit
57419d6049
37 ficheiros alterados com 7405 adições e 868 exclusões
  1. 1 1
      src/api/pages/mst/sales-management/sales-order-management/basisSalesOrder.js
  2. 1 1
      src/api/pages/mst/sales-management/sales-order-management/ortherSalesOrder.js
  3. 143 19
      src/router/routers.js
  4. 376 510
      src/view/common/home/home-admin.vue
  5. 125 38
      src/view/mst/basic-management/administrative-region-management/index.vue
  6. 184 12
      src/view/mst/basic-management/cotton-ginning-mill-management/index.vue
  7. 99 14
      src/view/mst/basic-management/customer-management/index.vue
  8. 102 17
      src/view/mst/basic-management/supplier-management/index.vue
  9. 163 31
      src/view/mst/basic-management/warehouse-management/index.vue
  10. 0 22
      src/view/mst/basis-management/premium-basis-calculation/index.vue
  11. 394 0
      src/view/mst/basis-management/premium-basis-calculation/procurement-basis/index.vue
  12. 420 0
      src/view/mst/basis-management/premium-basis-calculation/sales-basis/index.vue
  13. 251 0
      src/view/mst/basis-management/premium-basis-calculation/zheng-mian-picked-bags/index.vue
  14. 0 23
      src/view/mst/basis-management/premium-basis-configuration/index.vue
  15. 263 0
      src/view/mst/basis-management/premium-basis-configuration/purchase-premium-basis-configuration/index.vue
  16. 266 0
      src/view/mst/basis-management/premium-basis-configuration/sales-markup-basis-configuration/index.vue
  17. 145 14
      src/view/mst/contract-management/contract-management/contract-management/index.vue
  18. 153 12
      src/view/mst/contract-management/contract-management/contract-statistics/index.vue
  19. 156 27
      src/view/mst/contract-management/invoice-management/invoice-management/index.vue
  20. 153 12
      src/view/mst/contract-management/invoice-management/invoice-statistics/index.vue
  21. 390 0
      src/view/mst/risk-management/risk-warning/early-warning-payables/index.vue
  22. 0 23
      src/view/mst/risk-management/risk-warning/index.vue
  23. 401 0
      src/view/mst/risk-management/risk-warning/inventory-alerts/index.vue
  24. 390 0
      src/view/mst/risk-management/risk-warning/inventory-cycle-overtime-warning/index.vue
  25. 401 0
      src/view/mst/risk-management/risk-warning/outbound-warning/index.vue
  26. 302 0
      src/view/mst/risk-management/risk-warning/receivables-warning/index.vue
  27. 335 0
      src/view/mst/risk-management/risk-warning/settlement-timeout-warning/index.vue
  28. 131 10
      src/view/mst/sales-management/interest-management/lock-bdi-management/index.vue
  29. 151 35
      src/view/mst/sales-management/sales-accounting-books/sales-accounting-books/index.vue
  30. 18 0
      src/view/mst/sales-management/sales-order-management/basis-sales-order/add.vue
  31. 18 0
      src/view/mst/sales-management/sales-order-management/basis-sales-order/edit.vue
  32. 566 0
      src/view/mst/sales-management/sales-order-management/basis-sales-order/form.vue
  33. 147 37
      src/view/mst/sales-management/sales-order-management/basis-sales-order/index.vue
  34. 18 0
      src/view/mst/sales-management/sales-order-management/orther-sales-order/add.vue
  35. 18 0
      src/view/mst/sales-management/sales-order-management/orther-sales-order/edit.vue
  36. 566 0
      src/view/mst/sales-management/sales-order-management/orther-sales-order/form.vue
  37. 158 10
      src/view/mst/sales-management/sales-order-management/orther-sales-order/index.vue

+ 1 - 1
src/api/pages/mst/sales-management/sales-order-management/basisSalesOrder.js

@@ -18,6 +18,6 @@ export default {
     */
 export const routeUrl = {
   basisSalesOrder:{
-    add: {key: 'add', method:'add',isMustChooseFlag:true},
+    add: {key: 'add',routeName:'basis-sales-order-add'},
   }
 }

+ 1 - 1
src/api/pages/mst/sales-management/sales-order-management/ortherSalesOrder.js

@@ -18,6 +18,6 @@ export default {
     */
 export const routeUrl = {
   ortherSalesOrder:{
-    add: {key: 'add', method:'add',isMustChooseFlag:true},
+    add: {key: 'add',routeName:'orther-sales-order-add'},
   }
 }

+ 143 - 19
src/router/routers.js

@@ -275,32 +275,43 @@ let menu = [
     children: [
       {
         path: '',
-        name: '基差管理',
+        name: '升贴水/基差计算',
         menuType:0,
         component: parentView,
         meta: {
-          title: '基差管理',
+          title: '升贴水/基差计算',
           notCache: true,
           menuType:0
         },
         children: [
           {
-            path: '/mst/basis-management/premium-basis-calculation/index',
-            name: 'premium-basis-calculation',
+            path: '/mst/basis-management/premium-basis-calculation/procurement-basis/index',
+            name: 'procurement-basis',
             menuType:1,
-            component: () => import('@/view/mst/basis-management/premium-basis-calculation/index.vue'),
+            component: () => import('@/view/mst/basis-management/premium-basis-calculation/procurement-basis/index.vue'),
             meta: {
-              title: '升贴水/基差计算',
+              title: '采购基差',
               notCache: false,
               menuType:1
             },
           },
           {
-            path: '/mst/basis-management/premium-basis-configuration/index',
-            name: 'premium-basis-configuration',
-            component: () => import('@/view/mst/basis-management/premium-basis-configuration/index.vue'),
+            path: '/mst/basis-management/premium-basis-configuration/zheng-mian-picked-bags/index',
+            name: 'zheng-mian-picked-bags',
+            component: () => import('@/view/mst/basis-management/premium-basis-calculation/zheng-mian-picked-bags/index.vue'),
             meta: {
-              title: '升贴水/基差配置',
+              title: '郑棉挑包',
+              notCache: false,
+              flgRight: true,
+              menuType:1
+            },
+          },
+          {
+            path: '/mst/basis-management/premium-basis-configuration/sales-basis/index',
+            name: 'sales-basis',
+            component: () => import('@/view/mst/basis-management/premium-basis-calculation/sales-basis/index.vue'),
+            meta: {
+              title: '销售基差',
               notCache: false,
               flgRight: true,
               menuType:1
@@ -309,6 +320,42 @@ let menu = [
 
         ]
       },
+      {
+        path: '',
+        name: '升贴水/基差配置',
+        menuType:0,
+        component: parentView,
+        meta: {
+          title: '升贴水/基差配置',
+          notCache: true,
+          menuType:0
+        },
+        children: [
+          {
+            path: '/mst/basis-management/premium-basis-configuration/purchase-premium-basis-configuration/index',
+            name: 'purchase-premium-basis-configuration',
+            menuType:1,
+            component: () => import('@/view/mst/basis-management/premium-basis-configuration/purchase-premium-basis-configuration/index.vue'),
+            meta: {
+              title: '采购升贴水/基差配置',
+              notCache: false,
+              menuType:1
+            },
+          },
+          {
+            path: '/mst/basis-management/premium-basis-configuration/sales-markup-basis-configuration/index',
+            name: 'sales-markup-basis-configuration',
+            menuType:1,
+            component: () => import('@/view/mst/basis-management/premium-basis-configuration/sales-markup-basis-configuration/index.vue'),
+            meta: {
+              title: '销售升贴水/基差配置',
+              notCache: false,
+              menuType:1
+            },
+          },
+
+        ]
+      },
     ]
   },
   {
@@ -359,6 +406,7 @@ let menu = [
           {
             path: '/mst/basic-management/cotton-ginning-mill-management/index',
             name: 'cotton-ginning-mill-management',
+            menuType:1,
             component: () => import('@/view/mst/basic-management/cotton-ginning-mill-management/index.vue'),
             meta: {
               title: '轧花厂管理',
@@ -868,6 +916,17 @@ let menu = [
             },
           },
           {
+            path: '/mst/sales-management/sales-order-management/basis-sales-order/add',
+            name: 'basis-sales-order-add',
+            component: () => import('@/view/mst/sales-management/sales-order-management/basis-sales-order/add.vue'),
+            meta: {
+              title: '新建基差销售单',
+              notCache: false,
+              flgRight: true,
+              menuType:2
+            },
+          },
+          {
             path: '/mst/sales-management/sales-order-management/orther-sales-order/index',
             name: 'orther-sales-order',
             component: () => import('@/view/mst/sales-management/sales-order-management/orther-sales-order/index.vue'),
@@ -879,6 +938,17 @@ let menu = [
               menuType:1
             },
           },
+          {
+            path: '/mst/sales-management/sales-order-management/orther-sales-order/add',
+            name: 'orther-sales-order-add',
+            component: () => import('@/view/mst/sales-management/sales-order-management/orther-sales-order/add.vue'),
+            meta: {
+              title: '新建其它销售单',
+              notCache: false,
+              flgRight: true,
+              menuType:2
+            },
+          },
 
         ]
       },
@@ -907,8 +977,8 @@ let menu = [
             },
           },
           {
-            path: '/mst/sales-management/sales-accounting-books/sales-accounting-books/index',
-            name: 'sales-accounting-books',
+            path: '/mst/sales-management/interest-management/overdue-interest-management/index',
+            name: 'overdue-interest-management',
             component: () => import('@/view/mst/sales-management/interest-management/overdue-interest-management/index.vue'),
             menuType:1,
             meta: {
@@ -1135,27 +1205,81 @@ let menu = [
     children: [
       {
         path: '',
-        name: '风险管理',
+        name: '风险预警',
         menuType:0,
         component: parentView,
         meta: {
-          title: '风险管理',
+          title: '风险预警',
           notCache: true,
           menuType:0
         },
         children: [
           {
-            path: '/mst/risk-management/risk-warning/index',
-            name: 'risk-warning',
+            path: '/mst/risk-management/risk-warning/inventory-alerts/index',
+            name: 'inventory-alerts',
             menuType:1,
-            component: () => import('@/view/mst/risk-management/risk-warning/index.vue'),
+            component: () => import('@/view/mst/risk-management/risk-warning/inventory-alerts/index.vue'),
             meta: {
-              title: '风险预警',
+              title: '库存预警',
+              notCache: false,
+              menuType:1
+            },
+          },
+          {
+            path: '/mst/risk-management/risk-warning/outbound-warning/index',
+            name: 'outbound-warning',
+            menuType:1,
+            component: () => import('@/view/mst/risk-management/risk-warning/outbound-warning/index.vue'),
+            meta: {
+              title: '出库预警',
+              notCache: false,
+              menuType:1
+            },
+          },
+          {
+            path: '/mst/risk-management/risk-warning/inventory-cycle-overtime-warning/index',
+            name: 'inventory-cycle-overtime-warning',
+            menuType:1,
+            component: () => import('@/view/mst/risk-management/risk-warning/inventory-cycle-overtime-warning/index.vue'),
+            meta: {
+              title: '存货周期超时预警',
+              notCache: false,
+              menuType:1
+            },
+          },
+          {
+            path: '/mst/risk-management/risk-warning/settlement-timeout-warning/index',
+            name: 'settlement-timeout-warning',
+            menuType:1,
+            component: () => import('@/view/mst/risk-management/risk-warning/settlement-timeout-warning/index.vue'),
+            meta: {
+              title: '结算超时预警',
+              notCache: false,
+              menuType:1
+            },
+          },
+          {
+            path: '/mst/risk-management/risk-warning/receivables-warning/index',
+            name: 'receivables-warning',
+            menuType:1,
+            component: () => import('@/view/mst/risk-management/risk-warning/receivables-warning/index.vue'),
+            meta: {
+              title: '应收款预警',
+              notCache: false,
+              menuType:1
+            },
+          },
+          {
+            path: '/mst/risk-management/risk-warning/early-warning-payables/index',
+            name: 'early-warning-payables',
+            menuType:1,
+            component: () => import('@/view/mst/risk-management/risk-warning/early-warning-payables/index.vue'),
+            meta: {
+              title: '应付款预警',
               notCache: false,
               menuType:1
             },
           },
-
         ]
       },
     ]

Diff do ficheiro suprimidas por serem muito extensas
+ 376 - 510
src/view/common/home/home-admin.vue


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

@@ -55,28 +55,15 @@
                  :pageSize="pageInfo.pageSize"
         >
           <!--  商品编号  -->
-          <DkTableColumn field="ownCpName" title="行政区域层级"></DkTableColumn>
+          <DkTableColumn field="country" title="国家"></DkTableColumn>
           <!--  商品名称  -->
-          <DkTableColumn field="staffCode" title="行政区域名称"></DkTableColumn>
+          <DkTableColumn field="province" title="省"></DkTableColumn>
+          <DkTableColumn field="city" title="市"></DkTableColumn>
+          <DkTableColumn field="region" title="区"></DkTableColumn>
           <!--  规格型号  -->
-          <DkTableColumn field="staffName" type="link" title="区域代码"
-                         @on-link="handleLink(Object.assign($event,{button:'edit'}))"></DkTableColumn>
-          <!--  计量单位  -->
-          <DkTableColumn field="staffPhone"   title="棉花种植面积"></DkTableColumn>
-          <!--  仓库名称  -->
-          <DkTableColumn field="orgName"  title="籽棉产量"></DkTableColumn>
-          <!--  存放货位  -->
-          <DkTableColumn field="postName" title="轧花厂数量"></DkTableColumn>
-          <!--  供应商  -->
-          <DkTableColumn field="jobName" title="皮棉仓储点数量"></DkTableColumn>
-          <!--  采购人  -->
-          <DkTableColumn field="openStatusName" title="主要客户 / 供应商"/>
-          <!--  备注  -->
-          <DkTableColumn field="roleName" title="运输路线"></DkTableColumn>
-          <DkTableColumn field="roleName" title="政策补贴信息"></DkTableColumn>
-          <DkTableColumn field="roleName" title="皮棉流通量"></DkTableColumn>
-          <DkTableColumn field="roleName" title="价格指数"></DkTableColumn>
-          <DkTableColumn field="roleName" title="库存占比"></DkTableColumn>
+          <DkTableColumn field="fullAddress"  title="详细地址" ></DkTableColumn>
+
+          <DkTableColumn field="zip" title="邮编"></DkTableColumn>
 
 
         </DkTable>
@@ -92,20 +79,26 @@
         @on-visible-change="handleVisibleModal"
       >
         <DkForm ref="dk-form" v-model="formData" :col-count="1">
+          <DkFormItem prop="country" 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="province" title="省" v-model="formData.province" :readonly="readonly"
+                      :type="$config.formItemType.select" :option-list="countryList" :dataType="'boolean'"
+                      :multiple="false" labelKey="dataValue" valueKey="dataId">
+          </DkFormItem>
+          <DkFormItem prop="city" title="市" v-model="formData.city" :readonly="readonly"
+                      :type="$config.formItemType.select" :option-list="countryList" :dataType="'boolean'"
+                      :multiple="false" labelKey="dataValue" valueKey="dataId">
+          </DkFormItem>
+          <DkFormItem prop="region" title="区" v-model="formData.region" :readonly="readonly"
+                      :type="$config.formItemType.select" :option-list="countryList" :dataType="'boolean'"
+                      :multiple="false" labelKey="dataValue" valueKey="dataId">
+          </DkFormItem>
+
+          <DkFormItem prop="remarks"  title="详细地址"  v-model="formData.fullAddress" :readonly="readonly">  </DkFormItem>
+          <DkFormItem prop="remarks"  title="邮编"  v-model="formData.zip" :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>
-          <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>
         </DkForm>
       </DkModal>
     </div>
@@ -125,27 +118,121 @@ export default {
   mixins: [indexMixin],
   data() {
     return  {
+      countryList: [
+        // {dataId: true, dataValue: '广州雨田'},
+        // {dataId: false, dataValue: '郑州嘉丰'}
+      ],//卖方
+      tableData:[
+        {
+          "country": "中国",
+          "province": "辽宁",
+          "city": "沈阳",
+          "region": "和平区",
+          "fullAddress": "和平北大街156号",
+          "zip": "110003"
+        },
+        {
+          "country": "中国",
+          "province": "辽宁",
+          "city": "沈阳",
+          "region": "沈河区",
+          "fullAddress": "青年大街167号",
+          "zip": "110011"
+        },
+        {
+          "country": "中国",
+          "province": "辽宁",
+          "city": "沈阳",
+          "region": "皇姑区",
+          "fullAddress": "泰山路2号",
+          "zip": "110032"
+        },
+        {
+          "country": "中国",
+          "province": "辽宁",
+          "city": "沈阳",
+          "region": "铁西区",
+          "fullAddress": "建设大路40号",
+          "zip": "110020"
+        },
+        {
+          "country": "中国",
+          "province": "辽宁",
+          "city": "沈阳",
+          "region": "大东区",
+          "fullAddress": "滂江街81号",
+          "zip": "110041"
+        },
+        {
+          "country": "中国",
+          "province": "辽宁",
+          "city": "沈阳",
+          "region": "于洪区",
+          "fullAddress": "黄海路33号",
+          "zip": "110141"
+        },
+        {
+          "country": "中国",
+          "province": "辽宁",
+          "city": "沈阳",
+          "region": "沈北新区",
+          "fullAddress": "蒲河路88号",
+          "zip": "110136"
+        },
+        {
+          "country": "中国",
+          "province": "辽宁",
+          "city": "沈阳",
+          "region": "苏家屯区",
+          "fullAddress": "南京南街1028号",
+          "zip": "110101"
+        },
+        {
+          "country": "中国",
+          "province": "辽宁",
+          "city": "沈阳",
+          "region": "辽中区",
+          "fullAddress": "滨水路38号",
+          "zip": "110200"
+        },
+        {
+          "country": "中国",
+          "province": "辽宁",
+          "city": "沈阳",
+          "region": "新民市",
+          "fullAddress": "辽河大街123号",
+          "zip": "110300"
+        }
+      ],
       //查询条件
       searchContent: [
         {
           //公司名称
           itemCode: 'cpIds',
-          title: '行政区域名称',
+          title: '国家',
 
           required: true
         },
         {
           //员工工号
           itemCode: 'staffCode',
-          title: '区域代码',
+          title: '',
         },
         {
           //员工名称
           itemCode: 'staffName',
-          title: '棉花种植面积',
+          title: '市',
+        },
+        {
+          //员工名称
+          itemCode: 'staffName',
+          title: '区',
+        },
+        {
+          //员工名称
+          itemCode: 'staffName',
+          title: '邮编',
         },
-
-
       ],
       formData: {
         staffCode: null,//员工工号

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

@@ -55,28 +55,28 @@
                  :pageSize="pageInfo.pageSize"
         >
           <!--  商品编号  -->
-          <DkTableColumn field="ownCpName" title="轧花厂管理"></DkTableColumn>
+          <DkTableColumn field="ginMillManagement" title="轧花厂管理"></DkTableColumn>
           <!--  商品名称  -->
-          <DkTableColumn field="staffCode" title="所属地区"></DkTableColumn>
+          <DkTableColumn field="region" title="所属地区"></DkTableColumn>
           <!--  规格型号  -->
           <DkTableColumn field="staffName" type="link" title="负责人 / 联系方式"
                          @on-link="handleLink(Object.assign($event,{button:'edit'}))"></DkTableColumn>
           <!--  计量单位  -->
-          <DkTableColumn field="staffPhone"   title="当日加工量"></DkTableColumn>
+          <DkTableColumn field="amountProcessingOnDay"   title="当日加工量"></DkTableColumn>
           <!--  仓库名称  -->
-          <DkTableColumn field="orgName"  title="累计加工量"></DkTableColumn>
+          <DkTableColumn field="cumulativeProcessingVolume"  title="累计加工量"></DkTableColumn>
           <!--  存放货位  -->
-          <DkTableColumn field="postName" title="皮棉产出量"></DkTableColumn>
+          <DkTableColumn field="lintOutput" title="皮棉产出量"></DkTableColumn>
           <!--  供应商  -->
-          <DkTableColumn field="jobName" title="棉籽产出量"></DkTableColumn>
+          <DkTableColumn field="cottonseedProduction" title="棉籽产出量"></DkTableColumn>
           <!--  采购人  -->
-          <DkTableColumn field="openStatusName" title="设备运行状态"/>
+          <DkTableColumn field="operatingStatusDevice" title="设备运行状态"/>
           <!--  备注  -->
-          <DkTableColumn field="roleName" title="籽棉库存"></DkTableColumn>
-          <DkTableColumn field="roleName" title="包装材料库存"></DkTableColumn>
-          <DkTableColumn field="roleName" title="皮棉等级占比"></DkTableColumn>
-          <DkTableColumn field="roleName" title="含杂率 / 回潮率"></DkTableColumn>
-          <DkTableColumn field="roleName" title="加工损耗率"></DkTableColumn>
+          <DkTableColumn field="seedCottonStocks" title="籽棉库存"></DkTableColumn>
+          <DkTableColumn field="inventoryPackagingMaterials" title="包装材料库存"></DkTableColumn>
+          <DkTableColumn field="proportionLintGrade" title="皮棉等级占比"></DkTableColumn>
+          <DkTableColumn field="impurityMoistureRegain" title="含杂率 / 回潮率"></DkTableColumn>
+          <DkTableColumn field="machiningLossRate" title="加工损耗率"></DkTableColumn>
 
 
         </DkTable>
@@ -151,6 +151,178 @@ export default {
         staffCode: null,//员工工号
         staffName: null,//员工编码
       },
+      tableData:[
+        {
+          staffId: 'STAFF001',
+          ginMillManagement: '阿克苏轧花厂',
+          region: '新疆阿克苏地区',
+          staffName: '陈建军',
+          phoneNumber: '138****2345',
+          amountProcessingOnDay: 22.3,
+          cumulativeProcessingVolume: 1850,
+          lintOutput: 12.1,
+          cottonseedProduction: 7.9,
+          operatingStatusDevice: '运行中',
+          seedCottonStocks: 520,
+          inventoryPackagingMaterials: 2100,
+          proportionLintGrade: '一级棉65%,二级棉35%',
+          impurityMoistureRegain: '含杂率1.1%,回潮率8.3%',
+          machiningLossRate: 3.4
+        },
+        {
+          staffId: 'STAFF002',
+          ginMillManagement: '喀什轧花厂',
+          region: '新疆喀什地区',
+          staffName: '马丽',
+          phoneNumber: '135****6789',
+          amountProcessingOnDay: 19.8,
+          cumulativeProcessingVolume: 1600,
+          lintOutput: 10.7,
+          cottonseedProduction: 6.8,
+          operatingStatusDevice: '停机维护',
+          seedCottonStocks: 400,
+          inventoryPackagingMaterials: 1700,
+          proportionLintGrade: '一级棉50%,二级棉50%',
+          impurityMoistureRegain: '含杂率1.2%,回潮率8.5%',
+          machiningLossRate: 3.3
+        },
+        {
+          staffId: 'STAFF003',
+          ginMillManagement: '巴彦淖尔轧花厂',
+          region: '内蒙古巴彦淖尔',
+          staffName: '王海涛',
+          phoneNumber: '139****0123',
+          amountProcessingOnDay: 25.1,
+          cumulativeProcessingVolume: 2080,
+          lintOutput: 13.8,
+          cottonseedProduction: 9.2,
+          operatingStatusDevice: '待机',
+          seedCottonStocks: 590,
+          inventoryPackagingMaterials: 2300,
+          proportionLintGrade: '一级棉70%,二级棉30%',
+          impurityMoistureRegain: '含杂率1.0%,回潮率8.0%',
+          machiningLossRate: 3.6
+        },
+        {
+          staffId: 'STAFF004',
+          ginMillManagement: '酒泉轧花厂',
+          region: '甘肃酒泉',
+          staffName: '李娜',
+          phoneNumber: '136****4567',
+          amountProcessingOnDay: 18.5,
+          cumulativeProcessingVolume: 1520,
+          lintOutput: 10.0,
+          cottonseedProduction: 6.3,
+          operatingStatusDevice: '运行中',
+          seedCottonStocks: 350,
+          inventoryPackagingMaterials: 1600,
+          proportionLintGrade: '一级棉55%,二级棉45%',
+          impurityMoistureRegain: '含杂率1.3%,回潮率8.8%',
+          machiningLossRate: 3.1
+        },
+        {
+          staffId: 'STAFF005',
+          ginMillManagement: '库尔勒轧花厂',
+          region: '新疆巴音郭楞',
+          staffName: '张伟',
+          phoneNumber: '137****8901',
+          amountProcessingOnDay: 24.0,
+          cumulativeProcessingVolume: 1950,
+          lintOutput: 13.2,
+          cottonseedProduction: 8.7,
+          operatingStatusDevice: '运行中',
+          seedCottonStocks: 550,
+          inventoryPackagingMaterials: 2000,
+          proportionLintGrade: '一级棉60%,二级棉40%',
+          impurityMoistureRegain: '含杂率1.1%,回潮率8.2%',
+          machiningLossRate: 3.5
+        },
+        {
+          staffId: 'STAFF006',
+          ginMillManagement: '阿拉尔轧花厂',
+          region: '新疆阿拉尔',
+          staffName: '杨丽',
+          phoneNumber: '134****2340',
+          amountProcessingOnDay: 20.2,
+          cumulativeProcessingVolume: 1700,
+          lintOutput: 11.0,
+          cottonseedProduction: 7.2,
+          operatingStatusDevice: '待机',
+          seedCottonStocks: 480,
+          inventoryPackagingMaterials: 1850,
+          proportionLintGrade: '一级棉45%,二级棉55%',
+          impurityMoistureRegain: '含杂率1.4%,回潮率9.0%',
+          machiningLossRate: 3.8
+        },
+        {
+          staffId: 'STAFF007',
+          ginMillManagement: '五原轧花厂',
+          region: '内蒙古巴彦淖尔',
+          staffName: '赵刚',
+          phoneNumber: '133****5670',
+          amountProcessingOnDay: 23.7,
+          cumulativeProcessingVolume: 1980,
+          lintOutput: 12.9,
+          cottonseedProduction: 8.5,
+          operatingStatusDevice: '运行中',
+          seedCottonStocks: 530,
+          inventoryPackagingMaterials: 2150,
+          proportionLintGrade: '一级棉68%,二级棉32%',
+          impurityMoistureRegain: '含杂率1.0%,回潮率8.1%',
+          machiningLossRate: 3.3
+        },
+        {
+          staffId: 'STAFF008',
+          ginMillManagement: '敦煌轧花厂',
+          region: '甘肃敦煌',
+          staffName: '周敏',
+          phoneNumber: '132****7890',
+          amountProcessingOnDay: 17.9,
+          cumulativeProcessingVolume: 1480,
+          lintOutput: 9.8,
+          cottonseedProduction: 6.1,
+          operatingStatusDevice: '停机维护',
+          seedCottonStocks: 330,
+          inventoryPackagingMaterials: 1550,
+          proportionLintGrade: '一级棉52%,二级棉48%',
+          impurityMoistureRegain: '含杂率1.2%,回潮率8.6%',
+          machiningLossRate: 3.0
+        },
+        {
+          staffId: 'STAFF009',
+          ginMillManagement: '和田轧花厂',
+          region: '新疆和田地区',
+          staffName: '孙浩',
+          phoneNumber: '131****0123',
+          amountProcessingOnDay: 21.6,
+          cumulativeProcessingVolume: 1800,
+          lintOutput: 11.7,
+          cottonseedProduction: 7.6,
+          operatingStatusDevice: '待机',
+          seedCottonStocks: 420,
+          inventoryPackagingMaterials: 1900,
+          proportionLintGrade: '一级棉58%,二级棉42%',
+          impurityMoistureRegain: '含杂率1.3%,回潮率8.7%',
+          machiningLossRate: 3.7
+        },
+        {
+          staffId: 'STAFF010',
+          ginMillManagement: '张掖轧花厂',
+          region: '甘肃张掖',
+          staffName: '吴芳',
+          phoneNumber: '130****3456',
+          amountProcessingOnDay: 20.9,
+          cumulativeProcessingVolume: 1780,
+          lintOutput: 11.3,
+          cottonseedProduction: 7.4,
+          operatingStatusDevice: '运行中',
+          seedCottonStocks: 470,
+          inventoryPackagingMaterials: 1880,
+          proportionLintGrade: '一级棉62%,二级棉38%',
+          impurityMoistureRegain: '含杂率1.1%,回潮率8.4%',
+          machiningLossRate: 3.2
+        }
+      ],
     }
   },
   methods: {

+ 99 - 14
src/view/mst/basic-management/customer-management/index.vue

@@ -55,25 +55,18 @@
                  :pageSize="pageInfo.pageSize"
         >
           <!--  商品编号  -->
-          <DkTableColumn field="ownCpName" title="客户名称"></DkTableColumn>
+          <DkTableColumn field="name" title="名称"></DkTableColumn>
           <!--  商品名称  -->
-          <DkTableColumn field="staffCode" title="客户类型"></DkTableColumn>
-          <!--  规格型号  -->
-          <DkTableColumn field="staffName" type="link" title="注册地址"
-                         @on-link="handleLink(Object.assign($event,{button:'edit'}))"></DkTableColumn>
+          <DkTableColumn field="contactPerson" title="联系人"></DkTableColumn>
+
           <!--  计量单位  -->
-          <DkTableColumn field="staffPhone"   title="统一社会信用代码"></DkTableColumn>
+          <DkTableColumn field="phoneNumber"   title="电话"></DkTableColumn>
           <!--  仓库名称  -->
-          <DkTableColumn field="orgName"  title="联系人 / 电话"></DkTableColumn>
+          <DkTableColumn field="address"  title="地址"></DkTableColumn>
           <!--  存放货位  -->
-          <DkTableColumn field="postName" title="合作起始时间"></DkTableColumn>
+          <DkTableColumn field="remarks" title="备注"></DkTableColumn>
           <!--  供应商  -->
-          <DkTableColumn field="jobName" title="主营产品"></DkTableColumn>
-          <!--  采购人  -->
-          <DkTableColumn field="openStatusName" title="年度采购量"/>
-          <!--  备注  -->
-          <DkTableColumn field="roleName" title="回款及时率"></DkTableColumn>
-          <DkTableColumn field="roleName" title="信用评级"></DkTableColumn>
+          <DkTableColumn field="status" title="状态"></DkTableColumn>
 
         </DkTable>
       </div>
@@ -144,6 +137,98 @@ export default {
         staffCode: null,//员工工号
         staffName: null,//员工编码
       },
+      tableData : [
+        {
+          staffId: 1001,
+          name: '客户张经理',
+          contactPerson: '销售客户联系人',
+          phoneNumber: '010-88888888',
+          address: '北京市朝阳区建国路88号',
+          remarks: '集团总部',
+          status: '已启用'
+        },
+        {
+          staffId: 1002,
+          name: '客户李经理',
+          contactPerson: '要货',
+          phoneNumber: '021-66666666',
+          address: '上海市浦东新区世纪大道100号',
+          remarks: '华东区域中心',
+          status: '已启用'
+        },
+        {
+          staffId: 1003,
+          name: '客户王经理',
+          contactPerson: '王经理',
+          phoneNumber: '020-77777777',
+          address: '广州市天河区天河路50号',
+          remarks: '华南销售部',
+          status: '已启用'
+        },
+        {
+          staffId: 1004,
+          name: '客户赵经理',
+          contactPerson: '赵经理',
+          phoneNumber: '0755-99999999',
+          address: '深圳市南山区科技园20号',
+          remarks: '技术研发',
+          status: '已启用'
+        },
+        {
+          staffId: 1005,
+          name: '客户钱经理',
+          contactPerson: '钱经理',
+          phoneNumber: '028-55555555',
+          address: '成都市高新区天府大道150号',
+          remarks: '西南区域中心',
+          status: '已启用'
+        },
+        {
+          staffId: 1006,
+          name: '客户孙经理',
+          contactPerson: '孙经理',
+          phoneNumber: '027-44444444',
+          address: '武汉市武昌区中南路30号',
+          remarks: '华中销售部',
+          status: '已启用'
+        },
+        {
+          staffId: 1007,
+          name: '客户周经理',
+          contactPerson: '周经理',
+          phoneNumber: '029-33333333',
+          address: '西安市雁塔区科技路25号',
+          remarks: '西北销售部',
+          status: '已启用'
+        },
+        {
+          staffId: 1008,
+          name: '客户吴经理',
+          contactPerson: '吴经理',
+          phoneNumber: '025-22222222',
+          address: '南京市玄武区中山路50号',
+          remarks: '江苏区域中心',
+          status: '已启用'
+        },
+        {
+          staffId: 1009,
+          name: '客户郑经理',
+          contactPerson: '郑经理',
+          phoneNumber: '0571-11111111',
+          address: '杭州市西湖区文三路80号',
+          remarks: '浙江销售部',
+          status: '已启用'
+        },
+        {
+          staffId: 1010,
+          name: '客户钱经理',
+          contactPerson: '王经理',
+          phoneNumber: '022-00000000',
+          address: '天津市和平区南京路60号',
+          remarks: '华北销售部',
+          status: '已启用'
+        }
+      ],
     }
   },
   methods: {

+ 102 - 17
src/view/mst/basic-management/supplier-management/index.vue

@@ -55,25 +55,18 @@
                  :pageSize="pageInfo.pageSize"
         >
           <!--  商品编号  -->
-          <DkTableColumn field="ownCpName" title="供应商名称"></DkTableColumn>
+          <DkTableColumn field="name" title="名称"></DkTableColumn>
           <!--  商品名称  -->
-          <DkTableColumn field="staffCode" title="供应商类型"></DkTableColumn>
-          <!--  规格型号  -->
-          <DkTableColumn field="staffName" type="link" title="注册地址"
-                         @on-link="handleLink(Object.assign($event,{button:'edit'}))"></DkTableColumn>
+          <DkTableColumn field="contactPerson" title="联系人"></DkTableColumn>
+
           <!--  计量单位  -->
-          <DkTableColumn field="staffPhone"   title="统一社会信用代码"></DkTableColumn>
+          <DkTableColumn field="phoneNumber"   title="电话"></DkTableColumn>
           <!--  仓库名称  -->
-          <DkTableColumn field="orgName"  title="联系人 / 电话"></DkTableColumn>
+          <DkTableColumn field="address"  title="地址"></DkTableColumn>
           <!--  存放货位  -->
-          <DkTableColumn field="postName" title="合作起始时间"></DkTableColumn>
+          <DkTableColumn field="remarks" title="备注"></DkTableColumn>
           <!--  供应商  -->
-          <DkTableColumn field="jobName" title="供应产品 / 服务"></DkTableColumn>
-          <!--  采购人  -->
-          <DkTableColumn field="openStatusName" title="年度采购量"/>
-          <!--  备注  -->
-          <DkTableColumn field="roleName" title="采购金额"></DkTableColumn>
-          <DkTableColumn field="roleName" title="结算方式"></DkTableColumn>
+          <DkTableColumn field="status" title="状态"></DkTableColumn>
 
         </DkTable>
       </div>
@@ -118,24 +111,116 @@ export default {
   mixins: [indexMixin],
   data() {
     return  {
+       tableData : [
+        {
+          staffId: 1001,
+          name: '北京供应商',
+          contactPerson: '张经理',
+          phoneNumber: '010-88888888',
+          address: '北京市朝阳区建国路88号',
+          remarks: '集团总部',
+          status: '已启用'
+        },
+        {
+          staffId: 1002,
+          name: '上海供应商',
+          contactPerson: '李经理',
+          phoneNumber: '021-66666666',
+          address: '上海市浦东新区世纪大道100号',
+          remarks: '华东区域中心',
+          status: '已启用'
+        },
+        {
+          staffId: 1003,
+          name: '广州供应商',
+          contactPerson: '王经理',
+          phoneNumber: '020-77777777',
+          address: '广州市天河区天河路50号',
+          remarks: '华南销售部',
+          status: '已启用'
+        },
+        {
+          staffId: 1004,
+          name: '深圳供应商',
+          contactPerson: '赵经理',
+          phoneNumber: '0755-99999999',
+          address: '深圳市南山区科技园20号',
+          remarks: '技术研发',
+          status: '已启用'
+        },
+        {
+          staffId: 1005,
+          name: '成都供应商',
+          contactPerson: '钱经理',
+          phoneNumber: '028-55555555',
+          address: '成都市高新区天府大道150号',
+          remarks: '西南区域中心',
+          status: '已启用'
+        },
+        {
+          staffId: 1006,
+          name: '武汉供应商',
+          contactPerson: '孙经理',
+          phoneNumber: '027-44444444',
+          address: '武汉市武昌区中南路30号',
+          remarks: '华中销售部',
+          status: '已启用'
+        },
+        {
+          staffId: 1007,
+          name: '西安供应商',
+          contactPerson: '周经理',
+          phoneNumber: '029-33333333',
+          address: '西安市雁塔区科技路25号',
+          remarks: '西北销售部',
+          status: '已启用'
+        },
+        {
+          staffId: 1008,
+          name: '南京供应商',
+          contactPerson: '吴经理',
+          phoneNumber: '025-22222222',
+          address: '南京市玄武区中山路50号',
+          remarks: '江苏区域中心',
+          status: '已启用'
+        },
+        {
+          staffId: 1009,
+          name: '杭州供应商',
+          contactPerson: '郑经理',
+          phoneNumber: '0571-11111111',
+          address: '杭州市西湖区文三路80号',
+          remarks: '浙江销售部',
+          status: '已启用'
+        },
+        {
+          staffId: 1010,
+          name: '天津供应商',
+          contactPerson: '王经理',
+          phoneNumber: '022-00000000',
+          address: '天津市和平区南京路60号',
+          remarks: '华北销售部',
+          status: '已启用'
+        }
+      ],
       //查询条件
       searchContent: [
         {
           //公司名称
           itemCode: 'cpIds',
-          title: '商品编号',
+          title: '名称',
 
           required: true
         },
         {
           //员工工号
           itemCode: 'staffCode',
-          title: '商品名称',
+          title: '联系人',
         },
         {
           //员工名称
           itemCode: 'staffName',
-          title: '规格型号',
+          title: '电话',
         },
 
 

+ 163 - 31
src/view/mst/basic-management/warehouse-management/index.vue

@@ -52,28 +52,17 @@
                  @pageChange="pageSizeChange"
                  :pageSizeOpts="pageSizeOpts"
                  :current-page="pageInfo.currentPage"
-                 :pageSize="pageInfo.pageSize"
-        >
-          <!--  商品编号  -->
-          <DkTableColumn field="ownCpName" title="商品编号"></DkTableColumn>
-          <!--  商品名称  -->
-          <DkTableColumn field="staffCode" title="商品名称"></DkTableColumn>
-          <!--  规格型号  -->
-          <DkTableColumn field="staffName" type="link" title="规格型号"
-                         @on-link="handleLink(Object.assign($event,{button:'edit'}))"></DkTableColumn>
-          <!--  计量单位  -->
-          <DkTableColumn field="staffPhone"   title="计量单位"></DkTableColumn>
-          <!--  仓库名称  -->
-          <DkTableColumn field="orgName"  title="仓库名称"></DkTableColumn>
-          <!--  存放货位  -->
-          <DkTableColumn field="postName" title="存放货位"></DkTableColumn>
-          <!--  供应商  -->
-          <DkTableColumn field="jobName" title="供应商"></DkTableColumn>
-          <!--  采购人  -->
-          <DkTableColumn field="openStatusName" title="采购人"/>
-          <!--  备注  -->
-          <DkTableColumn field="roleName" title="备注"></DkTableColumn>
-
+                 :pageSize="pageInfo.pageSize"  >
+          <DkTableColumn field="warehouseName" title="仓库名"></DkTableColumn>
+          <DkTableColumn field="status" title="状态"></DkTableColumn>
+          <DkTableColumn field="province"   title="省份" ></DkTableColumn>
+          <DkTableColumn field="region"   title="地区"></DkTableColumn>
+          <DkTableColumn field="address"  title="地址"></DkTableColumn>
+          <DkTableColumn field="contactPerson" title="联系人"></DkTableColumn>
+          <DkTableColumn field="landlinePhone" title="座机"></DkTableColumn>
+          <DkTableColumn field="mobilePhone" title="手机"/>
+          <DkTableColumn field="faxNumber" title="传真"></DkTableColumn>
+          <DkTableColumn field="xinjiangSupervision" title="新疆监管库"></DkTableColumn>
 
         </DkTable>
       </div>
@@ -88,16 +77,26 @@
         @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="flgDisabilityName" title="状态" v-model="formData.flgDisability" :readonly="readonly"
+                      :type="$config.formItemType.select" :option-list="buyerList" :dataType="'boolean'"
+                      :multiple="false" labelKey="dataValue" valueKey="dataId">
+          </DkFormItem>
+          <DkFormItem prop="flgDisabilityName" title="省份" v-model="formData.flgDisability" :readonly="readonly"
+                      :type="$config.formItemType.select" :option-list="buyerList" :dataType="'boolean'"
+                      :multiple="false" labelKey="dataValue" valueKey="dataId">
+          </DkFormItem>
+          <DkFormItem prop="flgDisabilityName" title="地区" v-model="formData.flgDisability" :readonly="readonly"
+                      :type="$config.formItemType.select" :option-list="buyerList" :dataType="'boolean'"
+                      :multiple="false" labelKey="dataValue" valueKey="dataId">
+          </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>
-          <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>
+          <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>
@@ -117,6 +116,7 @@ export default {
   mixins: [indexMixin],
   data() {
     return  {
+      buyerList:[],
       //查询条件
       searchContent: [
         {
@@ -143,6 +143,138 @@ export default {
         staffCode: null,//员工工号
         staffName: null,//员工编码
        },
+       tableData : [
+        {
+          staffId: 1001,
+          warehouseName: '甘肃省敦煌种业集团股份有限公司',
+          status: '有效',
+          province: '甘肃省',
+          region: '酒泉市',
+          address: '西城路10号',
+          contactPerson: '狄军',
+          landlinePhone: '010-88888888',
+          mobilePhone: '13800138001',
+          faxNumber: '010-88888889',
+          xinjiangSupervision: '否'
+        },
+        {
+          staffId: 1002,
+          warehouseName: '新疆金棉仓储物流有限公司',
+          status: '有效',
+          province: '新疆维吾尔自治区',
+          region: '阿拉尔',
+          address: '',
+          contactPerson: '李海峰',
+          landlinePhone: '021-66666666',
+          mobilePhone: '13900139002',
+          faxNumber: '021-66666667',
+          xinjiangSupervision: '否'
+        },
+        {
+          staffId: 1003,
+          warehouseName: '中棉集团邯郸物流园有限公司',
+          status: '有效',
+          province: '西藏自治区',
+          region: '拉萨市',
+          address: '',
+          contactPerson: '王跃武',
+          landlinePhone: '020-77777777',
+          mobilePhone: '13700137003',
+          faxNumber: '020-77777778',
+          xinjiangSupervision: '否'
+        },
+        {
+          staffId: 1004,
+          warehouseName: '湖北景天集团天门仓库',
+          status: '有效',
+          province: '湖北省',
+          region: '天门市',
+          address: '待确定',
+          contactPerson: '赵小六',
+          landlinePhone: '0755-99999999',
+          mobilePhone: '13600136004',
+          faxNumber: '0755-99999998',
+          xinjiangSupervision: '否'
+        },
+        {
+          staffId: 1005,
+          warehouseName: '新疆库尔勒华力运销有限责任公司',
+          status: '有效',
+          province: '新疆维吾尔自治区',
+          region: '巴州',
+          address: '尚未收录',
+          contactPerson: '钱七',
+          landlinePhone: '028-55555555',
+          mobilePhone: '13500135005',
+          faxNumber: '028-55555556',
+          xinjiangSupervision: '否'
+        },
+        {
+          staffId: 1006,
+          warehouseName: '潍坊瑞港国际物流有限公司',
+          status: '有效',
+          province: '山东省',
+          region: '青岛市',
+          address: '尚未收录',
+          contactPerson: '孙达瓦',
+          landlinePhone: '027-44444444',
+          mobilePhone: '13400134006',
+          faxNumber: '027-44444445',
+          xinjiangSupervision: '否'
+        },
+        {
+          staffId: 1007,
+          warehouseName: '临清华茂纺织原料有限公司',
+          status: '有效',
+          province: '山东省',
+          region: '聊城市',
+          address: '尚未收录',
+          contactPerson: '周阿九',
+          landlinePhone: '029-33333333',
+          mobilePhone: '13300133007',
+          faxNumber: '029-33333334',
+          xinjiangSupervision: '否'
+        },
+        {
+          staffId: 1008,
+          warehouseName: '新疆商物港汇物流有限公司',
+          status: '有效',
+          province: '新疆维吾尔自治区',
+          region: '乌鲁木齐',
+          address: '乌鲁木齐高新技术产业开发区(新市区)长春中路818号新世界广场超高层商业、商务办公综合楼B段1601室',
+          contactPerson: '吴达',
+          landlinePhone: '025-22222222',
+          mobilePhone: '13200132008',
+          faxNumber: '025-22222223',
+          xinjiangSupervision: '否'
+        },
+        {
+          staffId: 1009,
+          warehouseName: '新乡市富华供应链管理有限公司',
+          status: '有效',
+          province: '河南省',
+          region: '新乡市',
+          address: '河南省新乡市辉县市峪河镇蒋庄村1号',
+          contactPerson: '郑经',
+          landlinePhone: '0571-11111111',
+          mobilePhone: '13100131009',
+          faxNumber: '0571-11111112',
+          xinjiangSupervision: '否'
+        },
+        {
+          staffId: 1010,
+          warehouseName: '辉县市常青贸易有限责任公司',
+          status: '有效',
+          province: '河南省',
+          region: '新乡市',
+          address: '辉县市峪河镇肖吕村',
+          contactPerson: '王飞',
+          landlinePhone: '0991-88888888',
+          mobilePhone: '13000130010',
+          faxNumber: '0991-88888889',
+          xinjiangSupervision: '是'
+        }
+      ],
     }
   },
   methods: {

+ 0 - 22
src/view/mst/basis-management/premium-basis-calculation/index.vue

@@ -1,22 +0,0 @@
-<!-- @desc:升贴水/基差计算  @auth:???  @time:----- -->
-<template>
-  <div class="main-div" ref="mainDiv">
-  </div>
-</template>
-
-<script>
-
-import {indexMixin} from '@/mixins'
-
-export default {
-  name: 'premium-basis-calculation',
-  data() {
-    return  {}
-  },
-  methods: {},
-
-
-
-}
-
-</script>

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

@@ -0,0 +1,394 @@
+<!-- @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 right-button="warehouse-management-enable" ref="enable" name="enable"></BaseIndexButton>-->
+        <!--    停用    -->
+<!--        <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>
+
+        <!--  表格部分  -->
+        <DkTable :id="'table-'+$options.name"
+                 ref="table-select"
+                 :data="tableData"
+                 :height="tableHeight-60"
+                 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"  >
+          <DkTableColumn field="batchNumber" title="批号"></DkTableColumn>
+          <vxe-colgroup title="郑棉">
+            <!--  ="郑棉-升贴水  -->
+            <DkTableColumn field="zhengMianBasisPriceAdjustment" title="升贴水"></DkTableColumn>
+          </vxe-colgroup>
+          <vxe-colgroup title="棉协11月">
+            <!--  ="郑棉-升贴水  -->
+            <DkTableColumn field="cottonAssociationBasisPriceAdjustment" title="升贴水"></DkTableColumn>
+          </vxe-colgroup>
+          <vxe-colgroup title="Idc">
+            <!--  ="郑棉-升贴水  -->
+            <DkTableColumn field="idcBasisPriceAdjustment" title="升贴水"></DkTableColumn>
+          </vxe-colgroup>
+          <!--  规格型号  -->
+          <DkTableColumn field="foreignFiber" type="link" title="异纤"
+                         @on-link="handleLink(Object.assign($event,{button:'edit'}))"></DkTableColumn>
+          <!--  计量单位  -->
+          <DkTableColumn field="warehousingDate"   title="入库日期"></DkTableColumn>
+          <!--  仓库名称  -->
+          <DkTableColumn field="certificateDate"  title="证书日期"></DkTableColumn>
+          <!--  存放货位  -->
+          <DkTableColumn field="manufacturingEnterprise" title="生产企业"></DkTableColumn>
+          <!--  供应商  -->
+          <DkTableColumn field="inspectionWarehouse" title="公检仓库"></DkTableColumn>
+          <!--  采购人  -->
+          <DkTableColumn field="baleCount" title="包数"/>
+          <!--  备注  -->
+          <DkTableColumn field="officialWeight" title="公重(t)"></DkTableColumn>
+          <DkTableColumn field="moistureRegain" title="回潮"></DkTableColumn>
+          <DkTableColumn field="impurityContent" title="含杂"></DkTableColumn>
+          <DkTableColumn field="colorGradeRatio" title="颜色级比例"></DkTableColumn>
+          <vxe-colgroup title="长度(mm)">
+            <!--  ="郑棉-升贴水  -->
+            <DkTableColumn field="lengthAverageValue" title="均值"></DkTableColumn>
+          </vxe-colgroup>
+          <vxe-colgroup title="马值">
+            <!--  ="郑棉-升贴水  -->
+            <DkTableColumn field="micronaireAverageValue" title="均值"></DkTableColumn>
+          </vxe-colgroup>
+          <vxe-colgroup title="长度整齐度">
+            <!--  ="郑棉-升贴水  -->
+            <DkTableColumn field="lengthUniformityAverageValue" title="均值"></DkTableColumn>
+          </vxe-colgroup>
+          <vxe-colgroup title="断裂比强度">
+            <!--  ="郑棉-升贴水  -->
+            <DkTableColumn field="breakingTenacityAverageValue" title="均值"></DkTableColumn>
+          </vxe-colgroup>
+          <DkTableColumn field="ginningQuality" title="轧工质量(%)"></DkTableColumn>
+        </DkTable>
+      </div>
+
+    </div>
+
+
+
+
+  </div>
+</template>
+
+<script>
+
+import {indexMixin} from '@/mixins'
+
+export default {
+  name: 'procurement-basis',
+  mixins: [indexMixin],
+  data() {
+    return  {
+      //查询条件
+      searchContent: [
+        {
+          //公司名称
+          itemCode: 'cpIds',
+          title: '批号',
+
+          required: true
+        },
+        {
+          //员工工号
+          itemCode: 'staffCode',
+          title: '生产企业',
+        },
+        {
+          //员工名称
+          itemCode: 'staffName',
+          title: '公检仓库',
+        },
+
+
+      ],
+      formData: {
+        staffCode: null,//员工工号
+        staffName: null,//员工编码
+      },
+        tableData : [
+        {
+          staffId: 1001,
+          batchNumber: '2023A001',
+          zhengMianBasisPriceAdjustment: 120,
+          cottonAssociationBasisPriceAdjustment: 150,
+          idcBasisPriceAdjustment: 130,
+          foreignFiber: '0',
+          warehousingDate: '2023-11-05',
+          certificateDate: '2023-11-01',
+          manufacturingEnterprise: '阿克苏润通仓储服务有限责任公司',
+          inspectionWarehouse: '阿克苏华疆物流股份有限公司',
+          baleCount: 120,
+          officialWeight: 29.8,
+          moistureRegain: 7.8,
+          impurityContent: 1.2,
+          colorGradeRatio: '白棉2级:0.50%,白棉3级:99.50%',
+          lengthAverageValue: 28.5,
+          micronaireAverageValue: 4.2,
+          lengthUniformityAverageValue: 85.3,
+          breakingTenacityAverageValue: 29.7,
+          ginningQuality: 92.5
+        },
+        {
+          staffId: 1002,
+          batchNumber: '2023A002',
+          zhengMianBasisPriceAdjustment: 110,
+          cottonAssociationBasisPriceAdjustment: 140,
+          idcBasisPriceAdjustment: 125,
+          foreignFiber: '0',
+          warehousingDate: '2023-11-06',
+          certificateDate: '2023-11-02',
+          manufacturingEnterprise: '阿克苏润通仓储服务有限责任公司',
+          inspectionWarehouse: '阿克苏华疆物流股份有限公司',
+          baleCount: 150,
+          officialWeight: 37.2,
+          moistureRegain: 7.5,
+          impurityContent: 1.3,
+          colorGradeRatio: '白棉3级:97.30%,白棉4级:2.70%',
+          lengthAverageValue: 29.1,
+          micronaireAverageValue: 4.1,
+          lengthUniformityAverageValue: 84.9,
+          breakingTenacityAverageValue: 30.1,
+          ginningQuality: 91.8
+        },
+        {
+          staffId: 1003,
+          batchNumber: '2023A003',
+          zhengMianBasisPriceAdjustment: 130,
+          cottonAssociationBasisPriceAdjustment: 160,
+          idcBasisPriceAdjustment: 140,
+          foreignFiber: '0',
+          warehousingDate: '2023-11-07',
+          certificateDate: '2023-11-03',
+          manufacturingEnterprise: '阿克苏润通仓储服务有限责任公司',
+          inspectionWarehouse: '阿克苏华疆物流股份有限公司',
+          baleCount: 100,
+          officialWeight: 24.7,
+          moistureRegain: 7.6,
+          impurityContent: 1.1,
+          colorGradeRatio: '白棉2级:2.20%,白棉3级:97.80%',
+          lengthAverageValue: 28.9,
+          micronaireAverageValue: 4.3,
+          lengthUniformityAverageValue: 85.7,
+          breakingTenacityAverageValue: 29.9,
+          ginningQuality: 93.2
+        },
+        {
+          staffId: 1004,
+          batchNumber: '2023A004',
+          zhengMianBasisPriceAdjustment: 125,
+          cottonAssociationBasisPriceAdjustment: 155,
+          idcBasisPriceAdjustment: 135,
+          foreignFiber: '0',
+          warehousingDate: '2023-11-08',
+          certificateDate: '2023-11-04',
+          manufacturingEnterprise: '阿克苏润通仓储服务有限责任公司',
+          inspectionWarehouse: '阿克苏华疆物流股份有限公司',
+          baleCount: 200,
+          officialWeight: 49.6,
+          moistureRegain: 7.9,
+          impurityContent: 1.0,
+          colorGradeRatio: '白棉2级:20.40%,白棉3级:79.60%',
+          lengthAverageValue: 29.3,
+          micronaireAverageValue: 4.0,
+          lengthUniformityAverageValue: 85.5,
+          breakingTenacityAverageValue: 30.2,
+          ginningQuality: 92.7
+        },
+        {
+          staffId: 1005,
+          batchNumber: '2023A005',
+          zhengMianBasisPriceAdjustment: 115,
+          cottonAssociationBasisPriceAdjustment: 145,
+          idcBasisPriceAdjustment: 130,
+          foreignFiber: '0',
+          warehousingDate: '2023-11-09',
+          certificateDate: '2023-11-05',
+          manufacturingEnterprise: '阿克苏润通仓储服务有限责任公司',
+          inspectionWarehouse: '阿克苏华疆物流股份有限公司',
+          baleCount: 180,
+          officialWeight: 44.6,
+          moistureRegain: 7.7,
+          impurityContent: 1.2,
+          colorGradeRatio: '白棉2级:6.50%,白棉3级:93.50%',
+          lengthAverageValue: 28.7,
+          micronaireAverageValue: 4.2,
+          lengthUniformityAverageValue: 84.8,
+          breakingTenacityAverageValue: 29.5,
+          ginningQuality: 91.5
+        },
+        {
+          staffId: 1006,
+          batchNumber: '2023A006',
+          zhengMianBasisPriceAdjustment: 135,
+          cottonAssociationBasisPriceAdjustment: 165,
+          idcBasisPriceAdjustment: 145,
+          foreignFiber: '0',
+          warehousingDate: '2023-11-10',
+          certificateDate: '2023-11-06',
+          manufacturingEnterprise: '阿克苏润通仓储服务有限责任公司',
+          inspectionWarehouse: '阿克苏华疆物流股份有限公司',
+          baleCount: 130,
+          officialWeight: 32.2,
+          moistureRegain: 7.4,
+          impurityContent: 1.0,
+          colorGradeRatio: '白棉2级:34.40%,白棉3级:65.60%',
+          lengthAverageValue: 29.0,
+          micronaireAverageValue: 4.1,
+          lengthUniformityAverageValue: 85.4,
+          breakingTenacityAverageValue: 30.0,
+          ginningQuality: 93.0
+        },
+        {
+          staffId: 1007,
+          batchNumber: '2023A007',
+          zhengMianBasisPriceAdjustment: 120,
+          cottonAssociationBasisPriceAdjustment: 150,
+          idcBasisPriceAdjustment: 135,
+          foreignFiber: '0',
+          warehousingDate: '2023-11-11',
+          certificateDate: '2023-11-07',
+          manufacturingEnterprise: '阿克苏润通仓储服务有限责任公司',
+          inspectionWarehouse: '阿克苏华疆物流股份有限公司',
+          baleCount: 160,
+          officialWeight: 39.8,
+          moistureRegain: 7.6,
+          impurityContent: 1.1,
+          colorGradeRatio: '白棉2级:21.00%,白棉3级:79.00%',
+          lengthAverageValue: 28.6,
+          micronaireAverageValue: 4.3,
+          lengthUniformityAverageValue: 85.2,
+          breakingTenacityAverageValue: 29.6,
+          ginningQuality: 92.3
+        },
+        {
+          staffId: 1008,
+          batchNumber: '2023A008',
+          zhengMianBasisPriceAdjustment: 110,
+          cottonAssociationBasisPriceAdjustment: 140,
+          idcBasisPriceAdjustment: 125,
+          foreignFiber: '0',
+          warehousingDate: '2023-11-12',
+          certificateDate: '2023-11-08',
+          manufacturingEnterprise: '阿克苏润通仓储服务有限责任公司',
+          inspectionWarehouse: '阿克苏华疆物流股份有限公司',
+          baleCount: 140,
+          officialWeight: 34.7,
+          moistureRegain: 7.8,
+          impurityContent: 1.3,
+          colorGradeRatio: '白棉2级:10.20%,白棉3级:89.80%',
+          lengthAverageValue: 28.4,
+          micronaireAverageValue: 4.0,
+          lengthUniformityAverageValue: 84.7,
+          breakingTenacityAverageValue: 29.3,
+          ginningQuality: 91.2
+        },
+        {
+          staffId: 1009,
+          batchNumber: '2023A009',
+          zhengMianBasisPriceAdjustment: 130,
+          cottonAssociationBasisPriceAdjustment: 160,
+          idcBasisPriceAdjustment: 140,
+          foreignFiber: '0',
+          warehousingDate: '2023-11-13',
+          certificateDate: '2023-11-09',
+          manufacturingEnterprise: '阿克苏润通仓储服务有限责任公司',
+          inspectionWarehouse: '阿克苏华疆物流股份有限公司',
+          baleCount: 190,
+          officialWeight: 47.2,
+          moistureRegain: 7.5,
+          impurityContent: 1.0,
+          colorGradeRatio: '白棉2级:30.60%,白棉3级:69.40%',
+          lengthAverageValue: 29.2,
+          micronaireAverageValue: 4.2,
+          lengthUniformityAverageValue: 85.6,
+          breakingTenacityAverageValue: 30.1,
+          ginningQuality: 92.8
+        },
+        {
+          staffId: 1010,
+          batchNumber: '2023A010',
+          zhengMianBasisPriceAdjustment: 125,
+          cottonAssociationBasisPriceAdjustment: 155,
+          idcBasisPriceAdjustment: 135,
+          foreignFiber: '0',
+          warehousingDate: '2023-11-14',
+          certificateDate: '2023-11-10',
+          manufacturingEnterprise: '阿克苏润通仓储服务有限责任公司',
+          inspectionWarehouse: '阿克苏华疆物流股份有限公司',
+          baleCount: 210,
+          officialWeight: 52.2,
+          moistureRegain: 7.7,
+          impurityContent: 1.1,
+          colorGradeRatio: '白棉3级:100.00%',
+          lengthAverageValue: 29.4,
+          micronaireAverageValue: 4.1,
+          lengthUniformityAverageValue: 85.8,
+          breakingTenacityAverageValue: 30.3,
+          ginningQuality: 93.5
+        }
+      ],
+    }
+  },
+  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 = 'lockBdiManagement'  // 设置路由名称
+  },
+
+
+}
+
+</script>
+

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

@@ -0,0 +1,420 @@
+<!-- @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 right-button="warehouse-management-enable" ref="enable" name="enable"></BaseIndexButton>-->
+        <!--    停用    -->
+        <!--        <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>
+
+        <!--  表格部分  -->
+        <DkTable :id="'table-'+$options.name"
+                 ref="table-select"
+                 :data="tableData"
+                 :height="tableHeight-60"
+                 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  width="100" field="batchNumber" title="批号"></DkTableColumn>
+          <vxe-colgroup title="协棉06_pc">
+            <DkTableColumn field="basisDifference" title="基差"></DkTableColumn>
+          </vxe-colgroup>
+          <DkTableColumn  width="100"  field="lintType" title="皮棉类型"></DkTableColumn>
+          <DkTableColumn field="foreignFiber" title="异纤"></DkTableColumn>
+          <DkTableColumn field="warehousingDate" title="入库日期"></DkTableColumn>
+          <DkTableColumn field="certificateDate" width="400" title="证书日期"></DkTableColumn>
+          <DkTableColumn field="manufacturingEnterprise" width="400" title="生产企业"></DkTableColumn>
+          <DkTableColumn field="currentWarehouse" width="400" title="当前库"></DkTableColumn>
+          <DkTableColumn field="baleCount" width="400" title="包数"></DkTableColumn>
+          <DkTableColumn field="officialWeight" width="400" title="公重(t)"></DkTableColumn>
+          <DkTableColumn field="moistureRegain" width="400" title="回潮"></DkTableColumn>
+          <DkTableColumn field="impurityContent" width="400" title="含杂"></DkTableColumn>
+          <DkTableColumn field="colorMain" width="400" title="颜色主体"></DkTableColumn>
+          <DkTableColumn field="colorGradeRatio" width="400" title="颜色级比例"></DkTableColumn>
+          <vxe-colgroup title="长度(mm)">
+            <DkTableColumn field="lengthAverageValue" title="均值"></DkTableColumn>
+          </vxe-colgroup>
+          <vxe-colgroup title="马值">
+            <DkTableColumn field="mainGrade" title="主体级"></DkTableColumn>
+            <DkTableColumn field="micronaireAverageValue" title="均值"></DkTableColumn>
+          </vxe-colgroup>
+          <vxe-colgroup title="长度整齐度">
+            <DkTableColumn field="lengthUniformityAverageValue" title="均值"></DkTableColumn>
+          </vxe-colgroup>
+          <vxe-colgroup title="断裂比强度">
+            <DkTableColumn field="breakingTenacityAverageValue" title="均值"></DkTableColumn>
+          </vxe-colgroup>
+          <DkTableColumn field="ginningQuality" title="轧工质量(%)"></DkTableColumn>
+          <DkTableColumn field="roundModule" title="圆模"></DkTableColumn>
+          <DkTableColumn field="zhengMianWarehouseBill" title="郑棉仓单"></DkTableColumn>
+          <DkTableColumn field="secondaryWarehousing" title="二次入库"></DkTableColumn>
+        </DkTable>
+      </div>
+
+    </div>
+
+
+
+
+  </div>
+</template>
+
+<script>
+
+import {indexMixin} from '@/mixins'
+
+export default {
+  name: 'procurement-basis',
+  mixins: [indexMixin],
+  data() {
+    return  {
+       tableData : [
+        {
+          staffId: 1001,
+          batchNumber: 'CM2406-001',
+          xieMian06PcBasisDifference: 180,
+          lintType: '细绒棉',
+          foreignFiber: '无',
+          warehousingDate: '2024-06-01',
+          certificateDate: '2024-05-28',
+          manufacturingEnterprise: '新疆阿克苏棉业',
+          currentWarehouse: '郑州001库',
+          baleCount: 150,
+          officialWeight: 37.5,
+          moistureRegain: 7.2,
+          impurityContent: 1.1,
+          colorMain: '白棉',
+          colorGradeRatio: '白棉一级95%',
+          lengthAverageValue: 28.8,
+          micronaireMainGrade: 'A级',
+          micronaireAverageValue: 4.3,
+          lengthUniformityAverageValue: 85.6,
+          breakingTenacityAverageValue: 30.2,
+          ginningQuality: 93.0,
+          roundModule: '500型',
+          zhengMianWarehouseBill: '有效',
+          secondaryWarehousing: '否'
+        },
+        {
+          staffId: 1002,
+          batchNumber: 'CM2406-002',
+          xieMian06PcBasisDifference: 175,
+          lintType: '长绒棉',
+          foreignFiber: '少量',
+          warehousingDate: '2024-06-02',
+          certificateDate: '2024-05-29',
+          manufacturingEnterprise: '山东德州棉麻',
+          currentWarehouse: '郑州002库',
+          baleCount: 120,
+          officialWeight: 29.8,
+          moistureRegain: 7.5,
+          impurityContent: 1.3,
+          colorMain: '淡点污棉',
+          colorGradeRatio: '淡点污棉二级80%',
+          lengthAverageValue: 29.5,
+          micronaireMainGrade: 'B级',
+          micronaireAverageValue: 4.1,
+          lengthUniformityAverageValue: 84.8,
+          breakingTenacityAverageValue: 29.7,
+          ginningQuality: 91.5,
+          roundModule: '400型',
+          zhengMianWarehouseBill: '有效',
+          secondaryWarehousing: '是'
+        },
+        {
+          staffId: 1003,
+          batchNumber: 'CM2406-003',
+          xieMian06PcBasisDifference: 185,
+          lintType: '细绒棉',
+          foreignFiber: '无',
+          warehousingDate: '2024-06-03',
+          certificateDate: '2024-05-30',
+          manufacturingEnterprise: '江苏南通纺织集团',
+          currentWarehouse: '上海001库',
+          baleCount: 200,
+          officialWeight: 49.2,
+          moistureRegain: 7.0,
+          impurityContent: 1.0,
+          colorMain: '白棉',
+          colorGradeRatio: '白棉一级98%',
+          lengthAverageValue: 28.2,
+          micronaireMainGrade: 'A级',
+          micronaireAverageValue: 4.4,
+          lengthUniformityAverageValue: 85.2,
+          breakingTenacityAverageValue: 30.5,
+          ginningQuality: 94.0,
+          roundModule: '500型',
+          zhengMianWarehouseBill: '有效',
+          secondaryWarehousing: '否'
+        },
+        {
+          staffId: 1004,
+          batchNumber: 'CM2406-004',
+          xieMian06PcBasisDifference: 170,
+          lintType: '细绒棉',
+          foreignFiber: '无',
+          warehousingDate: '2024-06-04',
+          certificateDate: '2024-05-31',
+          manufacturingEnterprise: '湖北黄冈棉花公司',
+          currentWarehouse: '郑州003库',
+          baleCount: 180,
+          officialWeight: 44.6,
+          moistureRegain: 7.8,
+          impurityContent: 1.2,
+          colorMain: '白棉',
+          colorGradeRatio: '白棉一级92%',
+          lengthAverageValue: 29.0,
+          micronaireMainGrade: 'B级',
+          micronaireAverageValue: 4.0,
+          lengthUniformityAverageValue: 85.0,
+          breakingTenacityAverageValue: 29.9,
+          ginningQuality: 92.5,
+          roundModule: '400型',
+          zhengMianWarehouseBill: '有效',
+          secondaryWarehousing: '否'
+        },
+        {
+          staffId: 1005,
+          batchNumber: 'CM2406-005',
+          xieMian06PcBasisDifference: 190,
+          lintType: '长绒棉',
+          foreignFiber: '少量',
+          warehousingDate: '2024-06-05',
+          certificateDate: '2024-06-01',
+          manufacturingEnterprise: '新疆喀什棉业',
+          currentWarehouse: '天津001库',
+          baleCount: 90,
+          officialWeight: 22.3,
+          moistureRegain: 7.3,
+          impurityContent: 1.4,
+          colorMain: '淡点污棉',
+          colorGradeRatio: '淡点污棉一级85%',
+          lengthAverageValue: 30.1,
+          micronaireMainGrade: 'A级',
+          micronaireAverageValue: 4.2,
+          lengthUniformityAverageValue: 86.1,
+          breakingTenacityAverageValue: 30.8,
+          ginningQuality: 93.5,
+          roundModule: '500型',
+          zhengMianWarehouseBill: '有效',
+          secondaryWarehousing: '是'
+        },
+        {
+          staffId: 1006,
+          batchNumber: 'CM2406-006',
+          xieMian06PcBasisDifference: 165,
+          lintType: '细绒棉',
+          foreignFiber: '无',
+          warehousingDate: '2024-06-06',
+          certificateDate: '2024-06-02',
+          manufacturingEnterprise: '河北石家庄棉麻',
+          currentWarehouse: '郑州004库',
+          baleCount: 130,
+          officialWeight: 32.1,
+          moistureRegain: 7.6,
+          impurityContent: 1.1,
+          colorMain: '白棉',
+          colorGradeRatio: '白棉一级96%',
+          lengthAverageValue: 28.7,
+          micronaireMainGrade: 'B级',
+          micronaireAverageValue: 4.1,
+          lengthUniformityAverageValue: 84.5,
+          breakingTenacityAverageValue: 29.4,
+          ginningQuality: 91.8,
+          roundModule: '400型',
+          zhengMianWarehouseBill: '有效',
+          secondaryWarehousing: '否'
+        },
+        {
+          staffId: 1007,
+          batchNumber: 'CM2406-007',
+          xieMian06PcBasisDifference: 188,
+          lintType: '细绒棉',
+          foreignFiber: '无',
+          warehousingDate: '2024-06-07',
+          certificateDate: '2024-06-03',
+          manufacturingEnterprise: '安徽安庆棉花公司',
+          currentWarehouse: '青岛001库',
+          baleCount: 170,
+          officialWeight: 42.3,
+          moistureRegain: 7.1,
+          impurityContent: 1.0,
+          colorMain: '白棉',
+          colorGradeRatio: '白棉一级99%',
+          lengthAverageValue: 28.9,
+          micronaireMainGrade: 'A级',
+          micronaireAverageValue: 4.5,
+          lengthUniformityAverageValue: 85.9,
+          breakingTenacityAverageValue: 30.3,
+          ginningQuality: 94.5,
+          roundModule: '500型',
+          zhengMianWarehouseBill: '有效',
+          secondaryWarehousing: '否'
+        },
+        {
+          staffId: 1008,
+          batchNumber: 'CM2406-008',
+          xieMian06PcBasisDifference: 172,
+          lintType: '长绒棉',
+          foreignFiber: '少量',
+          warehousingDate: '2024-06-08',
+          certificateDate: '2024-06-04',
+          manufacturingEnterprise: '河南周口棉麻',
+          currentWarehouse: '郑州005库',
+          baleCount: 220,
+          officialWeight: 54.6,
+          moistureRegain: 7.7,
+          impurityContent: 1.3,
+          colorMain: '淡点污棉',
+          colorGradeRatio: '淡点污棉二级75%',
+          lengthAverageValue: 29.8,
+          micronaireMainGrade: 'B级',
+          micronaireAverageValue: 3.9,
+          lengthUniformityAverageValue: 84.2,
+          breakingTenacityAverageValue: 29.1,
+          ginningQuality: 90.5,
+          roundModule: '400型',
+          zhengMianWarehouseBill: '有效',
+          secondaryWarehousing: '是'
+        },
+        {
+          staffId: 1009,
+          batchNumber: 'CM2406-009',
+          xieMian06PcBasisDifference: 195,
+          lintType: '细绒棉',
+          foreignFiber: '无',
+          warehousingDate: '2024-06-09',
+          certificateDate: '2024-06-05',
+          manufacturingEnterprise: '湖南常德棉业',
+          currentWarehouse: '张家港001库',
+          baleCount: 110,
+          officialWeight: 27.4,
+          moistureRegain: 7.4,
+          impurityContent: 1.2,
+          colorMain: '白棉',
+          colorGradeRatio: '白棉一级93%',
+          lengthAverageValue: 28.4,
+          micronaireMainGrade: 'A级',
+          micronaireAverageValue: 4.3,
+          lengthUniformityAverageValue: 85.3,
+          breakingTenacityAverageValue: 29.6,
+          ginningQuality: 92.0,
+          roundModule: '500型',
+          zhengMianWarehouseBill: '有效',
+          secondaryWarehousing: '否'
+        },
+        {
+          staffId: 1010,
+          batchNumber: 'CM2406-010',
+          xieMian06PcBasisDifference: 168,
+          lintType: '细绒棉',
+          foreignFiber: '无',
+          warehousingDate: '2024-06-10',
+          certificateDate: '2024-06-06',
+          manufacturingEnterprise: '江西九江棉花公司',
+          currentWarehouse: '郑州006库',
+          baleCount: 190,
+          officialWeight: 47.1,
+          moistureRegain: 7.9,
+          impurityContent: 1.0,
+          colorMain: '白棉',
+          colorGradeRatio: '白棉一级97%',
+          lengthAverageValue: 29.3,
+          micronaireMainGrade: 'B级',
+          micronaireAverageValue: 4.0,
+          lengthUniformityAverageValue: 85.7,
+          breakingTenacityAverageValue: 30.0,
+          ginningQuality: 93.2,
+          roundModule: '400型',
+          zhengMianWarehouseBill: '有效',
+          secondaryWarehousing: '否'
+        }
+      ],
+      //查询条件
+      searchContent: [
+        {
+          //公司名称
+          itemCode: 'cpIds',
+          title: '批号',
+
+          required: true
+        },
+        {
+          //员工工号
+          itemCode: 'staffCode',
+          title: '生产企业',
+        },
+        {
+          //员工名称
+          itemCode: 'staffName',
+          title: '公检仓库',
+        },
+
+
+      ],
+      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 = 'lockBdiManagement'  // 设置路由名称
+  },
+
+
+}
+
+</script>
+

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

@@ -0,0 +1,251 @@
+<!-- @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 right-button="warehouse-management-enable" ref="enable" name="enable"></BaseIndexButton>-->
+        <!--    停用    -->
+        <!--        <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>
+
+        <!--  表格部分  -->
+        <DkTable :id="'table-'+$options.name"
+                 ref="table-select"
+                 :data="tableData"
+                 :height="tableHeight-60"
+                 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  width="100" field="batchNumber" title="批号"></DkTableColumn>
+          <DkTableColumn field="pickPackage" title="挑包"></DkTableColumn>
+          <vxe-colgroup title="郑棉">
+            <!--  ="郑棉-升贴水  -->
+            <DkTableColumn field="basisPriceAdjustment" title="升贴水"></DkTableColumn>
+          </vxe-colgroup>
+          <DkTableColumn  width="100"  field="baleCount" title="包数"></DkTableColumn>
+          <DkTableColumn field="warehousingDate" title="入库日期"></DkTableColumn>
+          <DkTableColumn field="certificateDate" title="证书日期"></DkTableColumn>
+          <DkTableColumn field="manufacturingEnterprise" width="400" title="生产企业"></DkTableColumn>
+          <DkTableColumn field="inspectionWarehouse" width="400" title="公检仓库"></DkTableColumn>
+
+        </DkTable>
+      </div>
+
+    </div>
+
+
+
+
+  </div>
+</template>
+
+<script>
+
+import {indexMixin} from '@/mixins'
+
+export default {
+  name: 'procurement-basis',
+  mixins: [indexMixin],
+  data() {
+    return  {
+       tableData : [
+        {
+          staffId: 1001,
+          batchNumber: '20240601-001',
+          pickPackage: '无',
+          zhengMianBasisPriceAdjustment: 150,
+          baleCount: 120,
+          warehousingDate: '2024-06-01',
+          certificateDate: '2024-05-30',
+          manufacturingEnterprise: '新疆棉花产业集团',
+          inspectionWarehouse: '郑州商品交易所指定公检仓库'
+        },
+        {
+          staffId: 1002,
+          batchNumber: '20240601-002',
+          pickPackage: '1包',
+          zhengMianBasisPriceAdjustment: 145,
+          baleCount: 180,
+          warehousingDate: '2024-06-02',
+          certificateDate: '2024-05-31',
+          manufacturingEnterprise: '山东鲁棉集团有限公司',
+          inspectionWarehouse: '郑州商品交易所指定公检仓库'
+        },
+        {
+          staffId: 1003,
+          batchNumber: '20240601-003',
+          pickPackage: '无',
+          zhengMianBasisPriceAdjustment: 160,
+          baleCount: 150,
+          warehousingDate: '2024-06-03',
+          certificateDate: '2024-06-01',
+          manufacturingEnterprise: '江苏华棉纺织有限公司',
+          inspectionWarehouse: '上海国际棉花交易中心公检仓库'
+        },
+        {
+          staffId: 1004,
+          batchNumber: '20240601-004',
+          pickPackage: '2包',
+          zhengMianBasisPriceAdjustment: 155,
+          baleCount: 200,
+          warehousingDate: '2024-06-04',
+          certificateDate: '2024-06-02',
+          manufacturingEnterprise: '湖北银丰棉花集团',
+          inspectionWarehouse: '郑州商品交易所指定公检仓库'
+        },
+        {
+          staffId: 1005,
+          batchNumber: '20240601-005',
+          pickPackage: '无',
+          zhengMianBasisPriceAdjustment: 140,
+          baleCount: 90,
+          warehousingDate: '2024-06-05',
+          certificateDate: '2024-06-03',
+          manufacturingEnterprise: '河北新乐市棉花公司',
+          inspectionWarehouse: '天津商品交易所公检仓库'
+        },
+        {
+          staffId: 1006,
+          batchNumber: '20240601-006',
+          pickPackage: '1包',
+          zhengMianBasisPriceAdjustment: 158,
+          baleCount: 130,
+          warehousingDate: '2024-06-06',
+          certificateDate: '2024-06-04',
+          manufacturingEnterprise: '安徽辉隆农业发展有限公司',
+          inspectionWarehouse: '郑州商品交易所指定公检仓库'
+        },
+        {
+          staffId: 1007,
+          batchNumber: '20240601-007',
+          pickPackage: '无',
+          zhengMianBasisPriceAdjustment: 142,
+          baleCount: 170,
+          warehousingDate: '2024-06-07',
+          certificateDate: '2024-06-05',
+          manufacturingEnterprise: '新疆生产建设兵团棉麻公司',
+          inspectionWarehouse: '青岛国际棉花交易市场公检仓库'
+        },
+        {
+          staffId: 1008,
+          batchNumber: '20240601-008',
+          pickPackage: '3包',
+          zhengMianBasisPriceAdjustment: 153,
+          baleCount: 220,
+          warehousingDate: '2024-06-08',
+          certificateDate: '2024-06-06',
+          manufacturingEnterprise: '河南豫棉集团有限公司',
+          inspectionWarehouse: '郑州商品交易所指定公检仓库'
+        },
+        {
+          staffId: 1009,
+          batchNumber: '20240601-009',
+          pickPackage: '无',
+          zhengMianBasisPriceAdjustment: 165,
+          baleCount: 110,
+          warehousingDate: '2024-06-09',
+          certificateDate: '2024-06-07',
+          manufacturingEnterprise: '湖南云锦集团股份有限公司',
+          inspectionWarehouse: '张家港保税区棉花公检仓库'
+        },
+        {
+          staffId: 1010,
+          batchNumber: '20240601-010',
+          pickPackage: '1包',
+          zhengMianBasisPriceAdjustment: 148,
+          baleCount: 190,
+          warehousingDate: '2024-06-10',
+          certificateDate: '2024-06-08',
+          manufacturingEnterprise: '江西赣棉集团有限公司',
+          inspectionWarehouse: '郑州商品交易所指定公检仓库'
+        }
+      ],
+      //查询条件
+      searchContent: [
+        {
+          //公司名称
+          itemCode: 'cpIds',
+          title: '批号',
+
+          required: true
+        },
+        {
+          //员工工号
+          itemCode: 'staffCode',
+          title: '生产企业',
+        },
+        {
+          //员工名称
+          itemCode: 'staffName',
+          title: '公检仓库',
+        },
+
+
+      ],
+      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 = 'lockBdiManagement'  // 设置路由名称
+  },
+
+
+}
+
+</script>
+

+ 0 - 23
src/view/mst/basis-management/premium-basis-configuration/index.vue

@@ -1,23 +0,0 @@
-<!-- @desc:升贴水/基差配置  @auth:???  @time:----- -->
-<template>
-  <div class="main-div" ref="mainDiv">
-
-  </div>
-</template>
-
-<script>
-
-import {indexMixin} from '@/mixins'
-
-export default {
-  name: 'premium-basis-configuration',
-  data() {
-    return  {}
-  },
-  methods: {},
-
-
-
-}
-
-</script>

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

@@ -0,0 +1,263 @@
+<!-- @desc:升贴水/基差配置  - 采购升贴水/基差配置 @auth:???  @time:----- -->
+<template>
+  <div class="main-div" ref="mainDiv">
+    <!-- 页面区域-->
+    <DkCollapse ref="collapse" @on-change="changeCollapse">
+    <!--基本信息-->
+    <DkPanel title="基差设置" prop="essentialInformation" id="essentialInformation" class="tabs-step-class" >
+      <!--  基本信息  -->
+      <DkForm slot="content" ref="formInline" v-model="formData"  style="width:100%"  :col-count="4">
+
+        <!-- 类型 -->
+        <DkFormItem prop="配置项" title="配置项" v-model="formData.flgDisability"
+                    :type="$config.formItemType.select" :option-list="flgDisabilityList" :dataType="'boolean'"
+                    :multiple="false" labelKey="dataValue" valueKey="dataId">
+        </DkFormItem>
+        <DkFormItem  title="合约" prop="合约" v-model="formData.remarks"   >
+        </DkFormItem>
+        <DkFormItem  title="挂盘价" prop="挂盘价" v-model="formData.remarks"   >
+        </DkFormItem>
+        <DkFormItem  title="基差" prop="基差" v-model="formData.remarks"   >
+        </DkFormItem>
+      </DkForm>
+    </DkPanel>
+      <!--颜色级-->
+      <DkPanel title="颜色级" prop="颜色级" class="tabs-step-class" >
+        <div slot="content">
+          <EditTable
+            ref="contactName1"
+            :height="300"
+            :financeFlag="true"
+            :addFlag ="false"
+            :deleteFlag ="false"
+            :pageFlag="true"
+            :pageTotal="pageTotal"
+            v-model="formData.skuData1"
+            :columns="editTableColumns1"
+            @pageChange="pageSizeChange"
+          ></EditTable>
+        </div>
+      </DkPanel>
+      <DkPanel title="长度" prop="长度" class="tabs-step-class" >
+        <div slot="content">
+          <EditTable
+            ref="contactName1"
+            :height="300"
+            :financeFlag="true"
+            :addFlag ="false"
+            :deleteFlag ="false"
+            :pageFlag="true"
+            :pageTotal="pageTotal"
+            v-model="formData.skuData2"
+            :columns="editTableColumns2"
+            @pageChange="pageSizeChange"
+          ></EditTable>
+        </div>
+      </DkPanel>
+      <DkPanel title="马克隆值级" prop="马克隆值级" class="tabs-step-class" >
+        <div slot="content">
+          <EditTable
+            ref="contactName1"
+            :height="300"
+            :financeFlag="true"
+            :addFlag ="false"
+            :deleteFlag ="false"
+            :pageFlag="true"
+            :pageTotal="pageTotal"
+            v-model="formData.skuData3"
+            :columns="editTableColumns3"
+            @pageChange="pageSizeChange"
+          ></EditTable>
+        </div>
+      </DkPanel>
+      <DkPanel title="轧工质量" prop="轧工质量" class="tabs-step-class" >
+        <div slot="content">
+          <EditTable
+            ref="contactName1"
+            :height="300"
+            :financeFlag="true"
+            :addFlag ="false"
+            :deleteFlag ="false"
+            :pageFlag="true"
+            :pageTotal="pageTotal"
+            v-model="formData.skuData4"
+            :columns="editTableColumns4"
+            @pageChange="pageSizeChange"
+          ></EditTable>
+        </div>
+      </DkPanel>
+      <DkPanel title="长度整齐度" prop="长度整齐度" class="tabs-step-class" >
+        <div slot="content">
+          <EditTable
+            ref="contactName1"
+            :height="300"
+            :financeFlag="true"
+            :addFlag ="false"
+            :deleteFlag ="false"
+            :pageFlag="true"
+            :pageTotal="pageTotal"
+            v-model="formData.skuData5"
+            :columns="editTableColumns5"
+            @pageChange="pageSizeChange"
+          ></EditTable>
+        </div>
+      </DkPanel>
+      <DkPanel title="断裂比强度" prop="断裂比强度" class="tabs-step-class" >
+        <div slot="content">
+          <EditTable
+            ref="contactName1"
+            :height="300"
+            :financeFlag="true"
+            :addFlag ="false"
+            :deleteFlag ="false"
+            :pageFlag="true"
+            :pageTotal="pageTotal"
+            v-model="formData.skuData6"
+            :columns="editTableColumns6"
+            @pageChange="pageSizeChange"
+          ></EditTable>
+        </div>
+      </DkPanel>
+      <DkPanel title="异性纤维" prop="异性纤维" class="tabs-step-class" >
+        <div slot="content">
+          <EditTable
+            ref="contactName1"
+            :height="300"
+            :financeFlag="true"
+            :addFlag ="false"
+            :deleteFlag ="false"
+            :pageFlag="true"
+            :pageTotal="pageTotal"
+            v-model="formData.skuData7"
+            :columns="editTableColumns7"
+            @pageChange="pageSizeChange"
+          ></EditTable>
+        </div>
+      </DkPanel>
+    </DkCollapse>
+  </div>
+</template>
+
+<script>
+
+import {formMixin} from '@/mixins/form'
+
+export default {
+  name: 'purchase-premium-basis-configuration',
+  mixins: [formMixin],
+  data() {
+    return  {
+      pageTotal: null,
+      editTableColumns1: [
+        {  title:'名称', field: 'name', type: 'disabled'},// 商品型号
+        {  title:'编码', field: 'code', type: 'disabled'},// 商品型号
+        {  title:'类型',field: 'type', type: 'disabled', width: 'auto'},// 商品名称
+        {  title:'升贴水', field: 'whater', type: 'number'},// 商品型号
+        {  title:'备注',field: 'remakes', type: 'disabled', width: 'auto'},// 商品名称
+      ],
+      editTableColumns2: [
+        {  title:'名称', field: 'name', type: 'disabled'},// 商品型号
+        {  title:'编码', field: 'code', type: 'disabled'},// 商品型号
+        {  title:'值区间',field: 'interval', type: 'disabled', width: 'auto'},// 商品名称
+        {  title:'类型', field: 'type', type: 'disabled'},// 商品型号
+        {  title:'升贴水',field: 'whater', type: 'number', width: 'auto'},// 商品名称
+        {  title:'备注',field: 'remarks', type: 'disabled', width: 'auto'},// 商品名称
+      ],
+      editTableColumns3: [
+        {  title:'名称', field: 'name', type: 'disabled'},// 商品型号
+        {  title:'编码', field: 'code', type: 'disabled'},// 商品型号
+        {  title:'值区间',field: 'interval', type: 'disabled', width: 'auto'},// 商品名称
+        {  title:'类型', field: 'type', type: 'disabled'},// 商品型号
+        {  title:'升贴水',field: 'whater', type: 'number', width: 'auto'},// 商品名称
+        {  title:'备注',field: 'remarks', type: 'disabled', width: 'auto'},// 商品名称
+      ],
+      editTableColumns4: [
+        {  title:'名称', field: 'name', type: 'disabled'},// 商品型号
+        {  title:'编码', field: 'code', type: 'disabled'},// 商品型号
+        {  title:'类型',field: 'type', type: 'disabled', width: 'auto'},// 商品名称
+        {  title:'升贴水', field: 'whater', type: 'number'},// 商品型号
+        {  title:'备注',field: 'remakes', type: 'disabled', width: 'auto'},// 商品名称
+      ],
+      editTableColumns5: [
+        {  title:'名称', field: 'name', type: 'disabled'},// 商品型号
+        {  title:'编码', field: 'code', type: 'disabled'},// 商品型号
+        {  title:'值区间',field: 'interval', type: 'disabled', width: 'auto'},// 商品名称
+        {  title:'类型', field: 'type', type: 'disabled'},// 商品型号
+        {  title:'升贴水',field: 'whater', type: 'number', width: 'auto'},// 商品名称
+        {  title:'备注',field: 'remarks', type: 'disabled', width: 'auto'},// 商品名称
+      ],
+      editTableColumns6: [
+        {  title:'名称', field: 'name', type: 'disabled'},// 商品型号
+        {  title:'编码', field: 'code', type: 'disabled'},// 商品型号
+        {  title:'值区间',field: 'interval', type: 'disabled', width: 'auto'},// 商品名称
+        {  title:'类型', field: 'type', type: 'disabled'},// 商品型号
+        {  title:'升贴水',field: 'whater', type: 'number', width: 'auto'},// 商品名称
+        {  title:'备注',field: 'remarks', type: 'disabled', width: 'auto'},// 商品名称
+      ],
+      editTableColumns7: [
+        {  title:'名称', field: 'name', type: 'disabled'},// 商品型号
+        {  title:'编码', field: 'code', type: 'disabled'},// 商品型号
+        {  title:'值区间',field: 'interval', type: 'disabled', width: 'auto'},// 商品名称
+        {  title:'类型', field: 'type', type: 'disabled'},// 商品型号
+        {  title:'升贴水',field: 'whater', type: 'number', width: 'auto'},// 商品名称
+        {  title:'备注',field: 'remarks', type: 'disabled', width: 'auto'},// 商品名称
+      ],
+      flgDisabilityList: [
+        {dataId: true, dataValue: '郑棉23/24'},
+        {dataId: false, dataValue: '协棉11月'}
+      ],//类型
+      formData: {
+
+        skuData1: [
+          {   name: '白棉一级',   code: '11',  type: '28',  whater: 500,    remakes: '备注信息...',   },
+          {   name: '白棉二级',   code: '12',  type: '28',  whater: 500,    remakes: '备注信息...',   },
+          {   name: '白棉三级',   code: '13',  type: '28',  whater: 500,    remakes: '备注信息...',   },
+          {   name: '白棉四级',   code: '14',  type: '28',  whater: 500,    remakes: '备注信息...',   },
+        ],
+        skuData2: [
+          {   name: '32毫米',   code: '11',  interval: '32 ≤ 值',  type: "替代交割品",    whater: 900,remarks: '备注信息...',   },
+          {   name: '31毫米',   code: '12',  interval: '31 ≤ 值 < 32',  type: "替代交割品",    whater: 900,remarks: '备注信息...',   },
+          {   name: '30毫米',   code: '13',  interval: '30 ≤ 值 < 31',  type: "基准交割品",    whater: 900, remarks: '备注信息...',  },
+          {   name: '29毫米',   code: '14',  interval: '29 ≤ 值 < 30',  type: "替代交割品",    whater: 900, remarks: '备注信息...',  },
+        ],
+        skuData3: [
+          {   name: 'A档',   code: 'A',  interval: '3.7 ≤ 值 < 4.3',  type: "替代交割品",    whater: 100,remarks: '备注信息...',   },
+          {   name: 'B1档',   code: 'B1',  interval: '3.5 ≤ 值 < 3.7',  type: "基准交割品",    whater: 0,remarks: '备注信息...',   },
+          {   name: 'B2档',   code: 'B2',  interval: '4.3 ≤ 值 < 5',  type: "基准交割品",    whater: 0, remarks: '备注信息...',  },
+          {   name: 'C1档',   code: 'C1',  interval: '值 < 3.5',  type: "替代交割品",    whater: -600, remarks: '备注信息...',  },
+          {   name: 'C2档',   code: 'C2',  interval: '5 ≤ 值',  type: "替代交割品",    whater: -600, remarks: '备注信息...',  },
+        ],
+        skuData4: [
+          {   name: '好',   code: 'P1',  type: '替代交割品',  whater: 100,    remakes: '备注信息...',   },
+          {   name: '中',   code: 'P2',  type: '替代交割品',  whater: 0,    remakes: '备注信息...',   },
+          {   name: '差',   code: 'P2',  type: '替代交割品',  whater: 500,    remakes: '备注信息...',   },
+
+        ],
+        skuData5: [
+          {   name: '很高',   code: 'U1',  interval: '86 ≤ 值 ≤ 100',  type: "替代交割品",    whater: 250,remarks: '备注信息...',   },
+          {   name: '高',   code: 'U2',  interval: '83 ≤ 值 < 86',  type: "基准交割品",    whater: 0,remarks: '备注信息...',   },
+          {   name: '中等',   code: 'U3',  interval: '80 ≤ 值 < 83',  type: "基准交割品",    whater: 0, remarks: '备注信息...',  },
+          {   name: '低',   code: 'U4',  interval: '77 ≤ 值 < 80',  type: "替代交割品",    whater: -600, remarks: '备注信息...',  },
+          {   name: '很低',   code: 'U5',  interval: '值 < 77',  type: "替代交割品",    whater: -600, remarks: '备注信息...',  },
+        ],
+        skuData6: [
+          {   name: '很强',   code: 'S1',  interval: '31 ≤ 值',  type: "替代交割品",    whater: 250,remarks: '断裂比强度...',   },
+          {   name: '强',   code: 'S2',  interval: '29 ≤ 值 < 31',  type: "基准交割品",    whater: 0,remarks: '断裂比强度...',   },
+          {   name: '中等',   code: 'S3',  interval: '26 ≤ 值 < 29',  type: "基准交割品",    whater: 0, remarks: '断裂比强度...',  },
+          {   name: '差',   code: 'S4',  interval: '24 ≤ 值 < 26',  type: "替代交割品",    whater: -600, remarks: '断裂比强度...',  },
+          {   name: '很差',   code: 'S5',  interval: '值 < 24',  type: "替代交割品",    whater: -600, remarks: '断裂比强度...',  },
+        ],
+        skuData7: [
+          {   name: '低',   code: 'L',  interval: '值 ≤ 1',  type: "替代交割品",    whater: 0,remarks: '异性纤维包数...',   },
+          {   name: '高',   code: 'H',  interval: '1 < 值',  type: "基准交割品",    whater: -200,remarks: '异性纤维包数...',   },
+
+        ],
+      },
+    }
+  },
+  methods: {},
+
+
+}
+
+</script>

+ 266 - 0
src/view/mst/basis-management/premium-basis-configuration/sales-markup-basis-configuration/index.vue

@@ -0,0 +1,266 @@
+<!-- @desc:升贴水/基差配置 -销售升贴水/基差配置  @auth:???  @time:----- -->
+<template>
+  <div class="main-div" ref="mainDiv">
+    <!-- 页面区域-->
+    <DkCollapse ref="collapse" @on-change="changeCollapse">
+      <!--基本信息-->
+      <DkPanel title="基差设置" prop="essentialInformation" id="essentialInformation" class="tabs-step-class" >
+        <!--  基本信息  -->
+        <DkForm slot="content" ref="formInline" v-model="formData"  style="width:100%"  :col-count="4">
+
+          <!-- 类型 -->
+          <DkFormItem prop="配置项" title="配置项" v-model="formData.flgDisability"
+                      :type="$config.formItemType.select" :option-list="flgDisabilityList" :dataType="'boolean'"
+                      :multiple="false" labelKey="dataValue" valueKey="dataId">
+          </DkFormItem>
+        </DkForm>
+      </DkPanel>
+      <DkTabs v-model="currentType" :options="tabsOptions"></DkTabs>
+      <div  v-if="currentType =='whater'">
+        <!--颜色级-->
+        <DkPanel title="颜色级" prop="颜色级" class="tabs-step-class" >
+          <div slot="content">
+            <EditTable
+              ref="contactName1"
+              :height="300"
+              :financeFlag="true"
+              :addFlag ="false"
+              :deleteFlag ="false"
+              :pageFlag="true"
+              :pageTotal="pageTotal"
+              v-model="formData.skuData1"
+              :columns="editTableColumns1"
+              @pageChange="pageSizeChange"
+            ></EditTable>
+          </div>
+        </DkPanel>
+        <DkPanel title="长度" prop="长度" class="tabs-step-class" >
+          <div slot="content">
+            <EditTable
+              ref="contactName1"
+              :height="300"
+              :financeFlag="true"
+              :addFlag ="false"
+              :deleteFlag ="false"
+              :pageFlag="true"
+              :pageTotal="pageTotal"
+              v-model="formData.skuData2"
+              :columns="editTableColumns2"
+              @pageChange="pageSizeChange"
+            ></EditTable>
+          </div>
+        </DkPanel>
+        <DkPanel title="马克隆值级" prop="马克隆值级" class="tabs-step-class" >
+          <div slot="content">
+            <EditTable
+              ref="contactName1"
+              :height="300"
+              :financeFlag="true"
+              :addFlag ="false"
+              :deleteFlag ="false"
+              :pageFlag="true"
+              :pageTotal="pageTotal"
+              v-model="formData.skuData3"
+              :columns="editTableColumns3"
+              @pageChange="pageSizeChange"
+            ></EditTable>
+          </div>
+        </DkPanel>
+        <DkPanel title="轧工质量" prop="轧工质量" class="tabs-step-class" >
+          <div slot="content">
+            <EditTable
+              ref="contactName1"
+              :height="300"
+              :financeFlag="true"
+              :addFlag ="false"
+              :deleteFlag ="false"
+              :pageFlag="true"
+              :pageTotal="pageTotal"
+              v-model="formData.skuData4"
+              :columns="editTableColumns4"
+              @pageChange="pageSizeChange"
+            ></EditTable>
+          </div>
+        </DkPanel>
+        <DkPanel title="长度整齐度" prop="长度整齐度" class="tabs-step-class" >
+          <div slot="content">
+            <EditTable
+              ref="contactName1"
+              :height="300"
+              :financeFlag="true"
+              :addFlag ="false"
+              :deleteFlag ="false"
+              :pageFlag="true"
+              :pageTotal="pageTotal"
+              v-model="formData.skuData5"
+              :columns="editTableColumns5"
+              @pageChange="pageSizeChange"
+            ></EditTable>
+          </div>
+        </DkPanel>
+        <DkPanel title="断裂比强度" prop="断裂比强度" class="tabs-step-class" >
+          <div slot="content">
+            <EditTable
+              ref="contactName1"
+              :height="300"
+              :financeFlag="true"
+              :addFlag ="false"
+              :deleteFlag ="false"
+              :pageFlag="true"
+              :pageTotal="pageTotal"
+              v-model="formData.skuData6"
+              :columns="editTableColumns6"
+              @pageChange="pageSizeChange"
+            ></EditTable>
+          </div>
+        </DkPanel>
+        <DkPanel title="异性纤维" prop="异性纤维" class="tabs-step-class" >
+          <div slot="content">
+            <EditTable
+              ref="contactName1"
+              :height="300"
+              :financeFlag="true"
+              :addFlag ="false"
+              :deleteFlag ="false"
+              :pageFlag="true"
+              :pageTotal="pageTotal"
+              v-model="formData.skuData7"
+              :columns="editTableColumns7"
+              @pageChange="pageSizeChange"
+            ></EditTable>
+          </div>
+        </DkPanel>
+      </div>
+
+    </DkCollapse>
+  </div>
+</template>
+
+<script>
+
+import {formMixin} from '@/mixins/form'
+
+export default {
+  name: 'purchase-premium-basis-configuration',
+  mixins: [formMixin],
+  data() {
+    return  {
+      currentType: 'whater',
+      tabsOptions: [
+        {title: '升贴水', name: 'whater'},
+        {title: '基差', name: 'jicha'},
+      ],
+      pageTotal: null,
+      editTableColumns1: [
+        {  title:'名称', field: 'name', type: 'disabled'},// 商品型号
+        {  title:'编码', field: 'code', type: 'disabled'},// 商品型号
+        {  title:'类型',field: 'type', type: 'disabled', width: 'auto'},// 商品名称
+        {  title:'升贴水', field: 'whater', type: 'number'},// 商品型号
+        {  title:'备注',field: 'remakes', type: 'disabled', width: 'auto'},// 商品名称
+      ],
+      editTableColumns2: [
+        {  title:'名称', field: 'name', type: 'disabled'},// 商品型号
+        {  title:'编码', field: 'code', type: 'disabled'},// 商品型号
+        {  title:'值区间',field: 'interval', type: 'disabled', width: 'auto'},// 商品名称
+        {  title:'类型', field: 'type', type: 'disabled'},// 商品型号
+        {  title:'升贴水',field: 'whater', type: 'number', width: 'auto'},// 商品名称
+        {  title:'备注',field: 'remarks', type: 'disabled', width: 'auto'},// 商品名称
+      ],
+      editTableColumns3: [
+        {  title:'名称', field: 'name', type: 'disabled'},// 商品型号
+        {  title:'编码', field: 'code', type: 'disabled'},// 商品型号
+        {  title:'值区间',field: 'interval', type: 'disabled', width: 'auto'},// 商品名称
+        {  title:'类型', field: 'type', type: 'disabled'},// 商品型号
+        {  title:'升贴水',field: 'whater', type: 'number', width: 'auto'},// 商品名称
+        {  title:'备注',field: 'remarks', type: 'disabled', width: 'auto'},// 商品名称
+      ],
+      editTableColumns4: [
+        {  title:'名称', field: 'name', type: 'disabled'},// 商品型号
+        {  title:'编码', field: 'code', type: 'disabled'},// 商品型号
+        {  title:'类型',field: 'type', type: 'disabled', width: 'auto'},// 商品名称
+        {  title:'升贴水', field: 'whater', type: 'number'},// 商品型号
+        {  title:'备注',field: 'remakes', type: 'disabled', width: 'auto'},// 商品名称
+      ],
+      editTableColumns5: [
+        {  title:'名称', field: 'name', type: 'disabled'},// 商品型号
+        {  title:'编码', field: 'code', type: 'disabled'},// 商品型号
+        {  title:'值区间',field: 'interval', type: 'disabled', width: 'auto'},// 商品名称
+        {  title:'类型', field: 'type', type: 'disabled'},// 商品型号
+        {  title:'升贴水',field: 'whater', type: 'number', width: 'auto'},// 商品名称
+        {  title:'备注',field: 'remarks', type: 'disabled', width: 'auto'},// 商品名称
+      ],
+      editTableColumns6: [
+        {  title:'名称', field: 'name', type: 'disabled'},// 商品型号
+        {  title:'编码', field: 'code', type: 'disabled'},// 商品型号
+        {  title:'值区间',field: 'interval', type: 'disabled', width: 'auto'},// 商品名称
+        {  title:'类型', field: 'type', type: 'disabled'},// 商品型号
+        {  title:'升贴水',field: 'whater', type: 'number', width: 'auto'},// 商品名称
+        {  title:'备注',field: 'remarks', type: 'disabled', width: 'auto'},// 商品名称
+      ],
+      editTableColumns7: [
+        {  title:'名称', field: 'name', type: 'disabled'},// 商品型号
+        {  title:'编码', field: 'code', type: 'disabled'},// 商品型号
+        {  title:'值区间',field: 'interval', type: 'disabled', width: 'auto'},// 商品名称
+        {  title:'类型', field: 'type', type: 'disabled'},// 商品型号
+        {  title:'升贴水',field: 'whater', type: 'number', width: 'auto'},// 商品名称
+        {  title:'备注',field: 'remarks', type: 'disabled', width: 'auto'},// 商品名称
+      ],
+      flgDisabilityList: [
+        {dataId: true, dataValue: '轮出(出)_21/6'},
+      ],//类型
+      formData: {
+
+        skuData1: [
+          {   name: '白棉一级',   code: '11',  type: '28',  whater: 500,    remakes: '备注信息...',   },
+          {   name: '白棉二级',   code: '12',  type: '28',  whater: 500,    remakes: '备注信息...',   },
+          {   name: '白棉三级',   code: '13',  type: '28',  whater: 500,    remakes: '备注信息...',   },
+          {   name: '白棉四级',   code: '14',  type: '28',  whater: 500,    remakes: '备注信息...',   },
+        ],
+        skuData2: [
+          {   name: '32毫米',   code: '11',  interval: '32 ≤ 值',  type: "替代交割品",    whater: 900,remarks: '备注信息...',   },
+          {   name: '31毫米',   code: '12',  interval: '31 ≤ 值 < 32',  type: "替代交割品",    whater: 900,remarks: '备注信息...',   },
+          {   name: '30毫米',   code: '13',  interval: '30 ≤ 值 < 31',  type: "基准交割品",    whater: 900, remarks: '备注信息...',  },
+          {   name: '29毫米',   code: '14',  interval: '29 ≤ 值 < 30',  type: "替代交割品",    whater: 900, remarks: '备注信息...',  },
+        ],
+        skuData3: [
+          {   name: 'A档',   code: 'A',  interval: '3.7 ≤ 值 < 4.3',  type: "替代交割品",    whater: 100,remarks: '备注信息...',   },
+          {   name: 'B1档',   code: 'B1',  interval: '3.5 ≤ 值 < 3.7',  type: "基准交割品",    whater: 0,remarks: '备注信息...',   },
+          {   name: 'B2档',   code: 'B2',  interval: '4.3 ≤ 值 < 5',  type: "基准交割品",    whater: 0, remarks: '备注信息...',  },
+          {   name: 'C1档',   code: 'C1',  interval: '值 < 3.5',  type: "替代交割品",    whater: -600, remarks: '备注信息...',  },
+          {   name: 'C2档',   code: 'C2',  interval: '5 ≤ 值',  type: "替代交割品",    whater: -600, remarks: '备注信息...',  },
+        ],
+        skuData4: [
+          {   name: '好',   code: 'P1',  type: '替代交割品',  whater: 100,    remakes: '备注信息...',   },
+          {   name: '中',   code: 'P2',  type: '替代交割品',  whater: 0,    remakes: '备注信息...',   },
+          {   name: '差',   code: 'P2',  type: '替代交割品',  whater: 500,    remakes: '备注信息...',   },
+
+        ],
+        skuData5: [
+          {   name: '很高',   code: 'U1',  interval: '86 ≤ 值 ≤ 100',  type: "替代交割品",    whater: 250,remarks: '备注信息...',   },
+          {   name: '高',   code: 'U2',  interval: '83 ≤ 值 < 86',  type: "基准交割品",    whater: 0,remarks: '备注信息...',   },
+          {   name: '中等',   code: 'U3',  interval: '80 ≤ 值 < 83',  type: "基准交割品",    whater: 0, remarks: '备注信息...',  },
+          {   name: '低',   code: 'U4',  interval: '77 ≤ 值 < 80',  type: "替代交割品",    whater: -600, remarks: '备注信息...',  },
+          {   name: '很低',   code: 'U5',  interval: '值 < 77',  type: "替代交割品",    whater: -600, remarks: '备注信息...',  },
+        ],
+        skuData6: [
+          {   name: '很强',   code: 'S1',  interval: '31 ≤ 值',  type: "替代交割品",    whater: 250,remarks: '断裂比强度...',   },
+          {   name: '强',   code: 'S2',  interval: '29 ≤ 值 < 31',  type: "基准交割品",    whater: 0,remarks: '断裂比强度...',   },
+          {   name: '中等',   code: 'S3',  interval: '26 ≤ 值 < 29',  type: "基准交割品",    whater: 0, remarks: '断裂比强度...',  },
+          {   name: '差',   code: 'S4',  interval: '24 ≤ 值 < 26',  type: "替代交割品",    whater: -600, remarks: '断裂比强度...',  },
+          {   name: '很差',   code: 'S5',  interval: '值 < 24',  type: "替代交割品",    whater: -600, remarks: '断裂比强度...',  },
+        ],
+        skuData7: [
+          {   name: '低',   code: 'L',  interval: '值 ≤ 1',  type: "替代交割品",    whater: 0,remarks: '异性纤维包数...',   },
+          {   name: '高',   code: 'H',  interval: '1 < 值',  type: "基准交割品",    whater: -200,remarks: '异性纤维包数...',   },
+
+        ],
+      },
+    }
+  },
+  methods: {},
+
+
+}
+
+</script>
+

+ 145 - 14
src/view/mst/contract-management/contract-management/contract-management/index.vue

@@ -55,25 +55,24 @@
                  :pageSize="pageInfo.pageSize"
         >
           <!--  商品编号  -->
-          <DkTableColumn field="ownCpName" title="合同编号"></DkTableColumn>
+          <DkTableColumn field="contractNumber" title="合同编号"></DkTableColumn>
           <!--  商品名称  -->
-          <DkTableColumn field="staffCode" title="合同类型"></DkTableColumn>
+          <DkTableColumn field="contractType" title="合同类型"></DkTableColumn>
           <!--  规格型号  -->
-          <DkTableColumn field="staffName" type="link" title="合同状态"
-                         @on-link="handleLink(Object.assign($event,{button:'edit'}))"></DkTableColumn>
+          <DkTableColumn field="contractStatus"   title="合同状态" ></DkTableColumn>
           <!--  计量单位  -->
-          <DkTableColumn field="staffPhone"   title="签订日期"></DkTableColumn>
+          <DkTableColumn field="signingDate"   title="签订日期"></DkTableColumn>
           <!--  仓库名称  -->
-          <DkTableColumn field="orgName"  title="甲方 / 乙方名称"></DkTableColumn>
+          <DkTableColumn field="partyABName"  title="甲方 / 乙方名称"></DkTableColumn>
           <!--  存放货位  -->
-          <DkTableColumn field="postName" title="付款方式"></DkTableColumn>
+          <DkTableColumn field="paymentMethod" title="付款方式"></DkTableColumn>
           <!--  供应商  -->
-          <DkTableColumn field="jobName" title="保证金 / 押金"></DkTableColumn>
+          <DkTableColumn field="marginDeposit" title="保证金 / 押金"></DkTableColumn>
           <!--  采购人  -->
-          <DkTableColumn field="openStatusName" title="履约期限"/>
+          <DkTableColumn field="performancePeriod" title="履约期限"/>
           <!--  备注  -->
-          <DkTableColumn field="roleName" title="违约责任"></DkTableColumn>
-          <DkTableColumn field="roleName" title="风控等级"></DkTableColumn>
+          <DkTableColumn field="liabilityForBreach" title="违约责任"></DkTableColumn>
+          <DkTableColumn field="riskControlLevel" title="风控等级"></DkTableColumn>
 
 
         </DkTable>
@@ -119,24 +118,156 @@ export default {
   mixins: [indexMixin],
   data() {
     return  {
+       tableData : [
+        {
+          staffId: 2001,
+          contractNumber: 'HT-20240601-001',
+          contractType: '采购合同',
+          contractStatus: '已生效',
+          signingDate: '2024-06-01',
+          partyABName: '甲方:新疆棉业集团<br>乙方:郑州纺织有限公司',
+          paymentMethod: '银行转账(30%预付款)',
+          marginDeposit: '50万元',
+          performancePeriod: '2024-06-01至2024-12-31',
+          liabilityForBreach: '按合同金额的5%支付违约金',
+          riskControlLevel: '低风险'
+        },
+        {
+          staffId: 2002,
+          contractNumber: 'HT-20240601-002',
+          contractType: '销售合同',
+          contractStatus: '待审核',
+          signingDate: '2024-06-02',
+          partyABName: '甲方:山东鲁棉集团<br>乙方:上海贸易有限公司',
+          paymentMethod: '信用证(即期)',
+          marginDeposit: '30万元',
+          performancePeriod: '2024-06-15至2025-03-31',
+          liabilityForBreach: '按未履行部分金额的8%支付违约金',
+          riskControlLevel: '中风险'
+        },
+        {
+          staffId: 2003,
+          contractNumber: 'HT-20240601-003',
+          contractType: '加工合同',
+          contractStatus: '履行中',
+          signingDate: '2024-06-03',
+          partyABName: '甲方:江苏华棉纺织<br>乙方:浙江印染厂',
+          paymentMethod: '托收承付',
+          marginDeposit: '20万元',
+          performancePeriod: '2024-06-10至2024-09-30',
+          liabilityForBreach: '按实际损失赔偿',
+          riskControlLevel: '低风险'
+        },
+        {
+          staffId: 2004,
+          contractNumber: 'HT-20240601-004',
+          contractType: '采购合同',
+          contractStatus: '已终止',
+          signingDate: '2024-06-04',
+          partyABName: '甲方:湖北银丰棉花<br>乙方:广东服装公司',
+          paymentMethod: '现金支票',
+          marginDeposit: '40万元',
+          performancePeriod: '2024-06-20至2024-11-30',
+          liabilityForBreach: '违约金10万元',
+          riskControlLevel: '高风险'
+        },
+        {
+          staffId: 2005,
+          contractNumber: 'HT-20240601-005',
+          contractType: '销售合同',
+          contractStatus: '已生效',
+          signingDate: '2024-06-05',
+          partyABName: '甲方:河北新乐棉花<br>乙方:天津纺织集团',
+          paymentMethod: '电汇(全额预付)',
+          marginDeposit: '60万元',
+          performancePeriod: '2024-07-01至2025-01-31',
+          liabilityForBreach: '按合同金额的3%支付违约金',
+          riskControlLevel: '低风险'
+        },
+        {
+          staffId: 2006,
+          contractNumber: 'HT-20240601-006',
+          contractType: '服务合同',
+          contractStatus: '待签署',
+          signingDate: '2024-06-06',
+          partyABName: '甲方:安徽辉隆农业<br>乙方:郑州仓储公司',
+          paymentMethod: '分期付款(分3期)',
+          marginDeposit: '10万元',
+          performancePeriod: '2024-06-25至2024-10-31',
+          liabilityForBreach: '按未支付金额的每日0.1%计罚',
+          riskControlLevel: '中风险'
+        },
+        {
+          staffId: 2007,
+          contractNumber: 'HT-20240601-007',
+          contractType: '采购合同',
+          contractStatus: '履行中',
+          signingDate: '2024-06-07',
+          partyABName: '甲方:新疆生产建设兵团棉麻<br>乙方:青岛纺织有限公司',
+          paymentMethod: '银行承兑汇票',
+          marginDeposit: '70万元',
+          performancePeriod: '2024-06-12至2024-12-31',
+          liabilityForBreach: '赔偿直接经济损失',
+          riskControlLevel: '低风险'
+        },
+        {
+          staffId: 2008,
+          contractNumber: 'HT-20240601-008',
+          contractType: '销售合同',
+          contractStatus: '已生效',
+          signingDate: '2024-06-08',
+          partyABName: '甲方:河南豫棉集团<br>乙方:张家港贸易公司',
+          paymentMethod: '货到付款',
+          marginDeposit: '25万元',
+          performancePeriod: '2024-06-30至2025-04-30',
+          liabilityForBreach: '按延迟天数每日0.05%支付滞纳金',
+          riskControlLevel: '中风险'
+        },
+        {
+          staffId: 2009,
+          contractNumber: 'HT-20240601-009',
+          contractType: '租赁合同',
+          contractStatus: '待审核',
+          signingDate: '2024-06-09',
+          partyABName: '甲方:湖南云锦集团<br>乙方:武汉仓储公司',
+          paymentMethod: '按月支付租金',
+          marginDeposit: '15万元',
+          performancePeriod: '2024-07-15至2025-07-14',
+          liabilityForBreach: '押金不予退还',
+          riskControlLevel: '中风险'
+        },
+        {
+          staffId: 2010,
+          contractNumber: 'HT-20240601-010',
+          contractType: '采购合同',
+          contractStatus: '已生效',
+          signingDate: '2024-06-10',
+          partyABName: '甲方:江西赣棉集团<br>乙方:南京纺织有限公司',
+          paymentMethod: '支付宝/微信支付',
+          marginDeposit: '35万元',
+          performancePeriod: '2024-07-05至2025-02-28',
+          liabilityForBreach: '按合同金额的10%支付违约金',
+          riskControlLevel: '低风险'
+        }
+      ],
       //查询条件
       searchContent: [
         {
           //公司名称
           itemCode: 'cpIds',
-          title: '锁基差单号',
+          title: '合同编号',
 
           required: true
         },
         {
           //员工工号
           itemCode: 'staffCode',
-          title: '关联销售单号',
+          title: '合同类型',
         },
         {
           //员工名称
           itemCode: 'staffName',
-          title: '客户名称',
+          title: '合同状态',
         },
 
 

+ 153 - 12
src/view/mst/contract-management/contract-management/contract-statistics/index.vue

@@ -52,26 +52,25 @@
                  :pageSize="pageInfo.pageSize"
         >
           <!--  商品编号  -->
-          <DkTableColumn field="ownCpName" title="合同编号"></DkTableColumn>
+          <DkTableColumn field="contractNumber" title="合同编号"></DkTableColumn>
           <!--  商品名称  -->
-          <DkTableColumn field="staffCode" title="合同类型"></DkTableColumn>
+          <DkTableColumn field="contractType" title="合同类型"></DkTableColumn>
           <!--  规格型号  -->
-          <DkTableColumn field="staffName" type="link" title="合同名称"
-                         @on-link="handleLink(Object.assign($event,{button:'edit'}))"></DkTableColumn>
+          <DkTableColumn field="contractName"  title="合同名称" ></DkTableColumn>
           <!--  计量单位  -->
-          <DkTableColumn field="staffPhone"   title="签约方"></DkTableColumn>
+          <DkTableColumn field="contractingParty"   title="签约方"></DkTableColumn>
           <!--  仓库名称  -->
-          <DkTableColumn field="orgName"  title="签约日期"></DkTableColumn>
+          <DkTableColumn field="signingDate"  title="签约日期"></DkTableColumn>
           <!--  存放货位  -->
-          <DkTableColumn field="postName" title="合同状态"></DkTableColumn>
+          <DkTableColumn field="contractStatus" title="合同状态"></DkTableColumn>
           <!--  供应商  -->
-          <DkTableColumn field="jobName" title="皮棉品种 / 规格"></DkTableColumn>
+          <DkTableColumn field="lintVarietyAndSpec" title="皮棉品种 / 规格"></DkTableColumn>
           <!--  采购人  -->
-          <DkTableColumn field="openStatusName" title="合同数量"/>
+          <DkTableColumn field="contractQuantity" title="合同数量"/>
           <!--  备注  -->
-          <DkTableColumn field="roleName" title="已履约数量"></DkTableColumn>
-          <DkTableColumn field="roleName" title="履约进度"></DkTableColumn>
-          <DkTableColumn field="roleName" title="交货日期"></DkTableColumn>
+          <DkTableColumn field="performedQuantity" title="已履约数量"></DkTableColumn>
+          <DkTableColumn field="performanceProgress" title="履约进度"></DkTableColumn>
+          <DkTableColumn field="deliveryDate" title="交货日期"></DkTableColumn>
 
 
         </DkTable>
@@ -120,6 +119,148 @@ export default {
         staffCode: null,//员工工号
         staffName: null,//员工编码
       },
+       tableData : [
+        {
+          staffId: 4001,
+          contractNumber: 'HT-20240701-001',
+          contractType: '采购合同',
+          contractName: '新疆细绒棉采购合同',
+          contractingParty: '甲方:郑州纺织有限公司<br>乙方:新疆棉业集团',
+          signingDate: '2024-07-01',
+          contractStatus: '已生效',
+          lintVarietyAndSpec: '细绒棉/Grade 328',
+          contractQuantity: 200, // 单位:吨
+          performedQuantity: 50,
+          performanceProgress: '25%',
+          deliveryDate: '2024-07-15至2024-12-31'
+        },
+        {
+          staffId: 4002,
+          contractNumber: 'HT-20240701-002',
+          contractType: '销售合同',
+          contractName: '山东长绒棉销售合同',
+          contractingParty: '甲方:山东鲁棉集团<br>乙方:上海贸易公司',
+          signingDate: '2024-07-02',
+          contractStatus: '待审核',
+          lintVarietyAndSpec: '长绒棉/Grade 137',
+          contractQuantity: 150,
+          performedQuantity: 0,
+          performanceProgress: '0%',
+          deliveryDate: '2024-08-01至2025-03-31'
+        },
+        {
+          staffId: 4003,
+          contractNumber: 'HT-20240701-003',
+          contractType: '加工合同',
+          contractName: '江苏棉纺织加工合同',
+          contractingParty: '甲方:江苏华棉纺织<br>乙方:浙江印染厂',
+          signingDate: '2024-07-03',
+          contractStatus: '履行中',
+          lintVarietyAndSpec: '细绒棉/Grade 229',
+          contractQuantity: 80,
+          performedQuantity: 30,
+          performanceProgress: '37.5%',
+          deliveryDate: '2024-07-10至2024-09-30'
+        },
+        {
+          staffId: 4004,
+          contractNumber: 'HT-20240701-004',
+          contractType: '采购合同',
+          contractName: '湖北细绒棉采购合同',
+          contractingParty: '甲方:湖北银丰棉花<br>乙方:广东服装公司',
+          signingDate: '2024-07-04',
+          contractStatus: '已终止',
+          lintVarietyAndSpec: '细绒棉/Grade 428',
+          contractQuantity: 120,
+          performedQuantity: 120,
+          performanceProgress: '100%',
+          deliveryDate: '2024-07-20至2024-11-30'
+        },
+        {
+          staffId: 4005,
+          contractNumber: 'HT-20240701-005',
+          contractType: '销售合同',
+          contractName: '河北细绒棉销售合同',
+          contractingParty: '甲方:河北新乐棉花<br>乙方:天津纺织集团',
+          signingDate: '2024-07-05',
+          contractStatus: '已生效',
+          lintVarietyAndSpec: '细绒棉/Grade 527',
+          contractQuantity: 250,
+          performedQuantity: 100,
+          performanceProgress: '40%',
+          deliveryDate: '2024-08-15至2025-01-31'
+        },
+        {
+          staffId: 4006,
+          contractNumber: 'HT-20240701-006',
+          contractType: '服务合同',
+          contractName: '安徽棉花仓储服务合同',
+          contractingParty: '甲方:安徽辉隆农业<br>乙方:郑州仓储公司',
+          signingDate: '2024-07-06',
+          contractStatus: '待签署',
+          lintVarietyAndSpec: '-', // 服务合同无具体品种规格
+          contractQuantity: '-',
+          performedQuantity: 0,
+          performanceProgress: '0%',
+          deliveryDate: '2024-07-25至2024-10-31'
+        },
+        {
+          staffId: 4007,
+          contractNumber: 'HT-20240701-007',
+          contractType: '采购合同',
+          contractName: '新疆长绒棉采购合同',
+          contractingParty: '甲方:新疆生产建设兵团棉麻<br>乙方:青岛纺织有限公司',
+          signingDate: '2024-07-07',
+          contractStatus: '履行中',
+          lintVarietyAndSpec: '长绒棉/Grade 136',
+          contractQuantity: 180,
+          performedQuantity: 90,
+          performanceProgress: '50%',
+          deliveryDate: '2024-07-12至2024-12-31'
+        },
+        {
+          staffId: 4008,
+          contractNumber: 'HT-20240701-008',
+          contractType: '销售合同',
+          contractName: '河南细绒棉销售合同',
+          contractingParty: '甲方:河南豫棉集团<br>乙方:张家港贸易公司',
+          signingDate: '2024-07-08',
+          contractStatus: '已生效',
+          lintVarietyAndSpec: '细绒棉/Grade 327',
+          contractQuantity: 300,
+          performedQuantity: 180,
+          performanceProgress: '60%',
+          deliveryDate: '2024-08-30至2025-04-30'
+        },
+        {
+          staffId: 4009,
+          contractNumber: 'HT-20240701-009',
+          contractType: '租赁合同',
+          contractName: '湖南棉花仓库租赁合同',
+          contractingParty: '甲方:湖南云锦集团<br>乙方:武汉仓储公司',
+          signingDate: '2024-07-09',
+          contractStatus: '待审核',
+          lintVarietyAndSpec: '-', // 租赁合同无具体品种规格
+          contractQuantity: '-',
+          performedQuantity: 0,
+          performanceProgress: '0%',
+          deliveryDate: '2024-09-01至2025-08-31'
+        },
+        {
+          staffId: 4010,
+          contractNumber: 'HT-20240701-010',
+          contractType: '采购合同',
+          contractName: '江西细绒棉采购合同',
+          contractingParty: '甲方:江西赣棉集团<br>乙方:南京纺织有限公司',
+          signingDate: '2024-07-10',
+          contractStatus: '已生效',
+          lintVarietyAndSpec: '细绒棉/Grade 328',
+          contractQuantity: 220,
+          performedQuantity: 66,
+          performanceProgress: '30%',
+          deliveryDate: '2024-08-05至2025-02-28'
+        }
+      ],
     }
   },
   methods: {

+ 156 - 27
src/view/mst/contract-management/invoice-management/invoice-management/index.vue

@@ -55,26 +55,23 @@
                  :pageSize="pageInfo.pageSize"
         >
           <!--  商品编号  -->
-          <DkTableColumn field="ownCpName" title="发票类型"></DkTableColumn>
-          <!--  商品名称  -->
-          <DkTableColumn field="staffCode" title="发票代码 / 号码"></DkTableColumn>
+          <DkTableColumn field="invoiceType" title="发票类型"></DkTableColumn>
           <!--  规格型号  -->
-          <DkTableColumn field="staffName" type="link" title="开票日期"
-                         @on-link="handleLink(Object.assign($event,{button:'edit'}))"></DkTableColumn>
+          <DkTableColumn field="invoiceDate"  title="开票日期" ></DkTableColumn>
           <!--  计量单位  -->
-          <DkTableColumn field="staffPhone"   title="开票方 / 受票方信息"></DkTableColumn>
+          <DkTableColumn field="invoicingMethod"   title="开票方式"></DkTableColumn>
           <!--  仓库名称  -->
-          <DkTableColumn field="orgName"  title="发票状态"></DkTableColumn>
+          <DkTableColumn field="invoicingParty"  title="开票方"></DkTableColumn>
           <!--  存放货位  -->
-          <DkTableColumn field="postName" title="关联合同编号"></DkTableColumn>
-          <!--  供应商  -->
-          <DkTableColumn field="jobName" title="关联销售单 / 采购单"></DkTableColumn>
+          <DkTableColumn field="invoiceNumber" title="发票号码"></DkTableColumn>
+
           <!--  采购人  -->
-          <DkTableColumn field="openStatusName" title="皮棉品种 / 规格"/>
+          <DkTableColumn field="tons" title="吨数"/>
           <!--  备注  -->
-          <DkTableColumn field="roleName" title="数量 / 单位"></DkTableColumn>
-          <DkTableColumn field="roleName" title="单价 / 金额"></DkTableColumn>
-          <DkTableColumn field="roleName" title="税率"></DkTableColumn>
+          <DkTableColumn field="unitPrice" title="单价"></DkTableColumn>
+          <DkTableColumn field="invoiceAmount" title="发票金额"></DkTableColumn>
+          <DkTableColumn field="contractNo" title="合同号"></DkTableColumn>
+          <DkTableColumn field="remarks" title="备注"></DkTableColumn>
 
 
         </DkTable>
@@ -89,19 +86,17 @@
         :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"  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>
-          <DkFormItem prop="remarks"  title="税率"  v-model="formData.remarks" :readonly="readonly">  </DkFormItem>
+        <DkForm ref="dk-form" v-model="formData" :col-count="2">
+          <DkFormItem prop="remarks"  title="开票日期"      :type="$config.formItemType.date" 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>
+          <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>
@@ -120,7 +115,141 @@ export default {
   name: 'sales-order-management',
   mixins: [indexMixin],
   data() {
+    const vm = window.vm;
     return  {
+      vm: vm,
+       tableData : [
+        {
+          staffId: 3001,
+          invoiceType: '采购',
+          invoiceDate: '2024-06-01',
+          invoicingMethod: '电子发票',
+          invoicingParty: '新疆棉业集团有限公司',
+          invoiceNumber: '00123456',
+          tons: 50,
+          unitPrice: 18500,
+          invoiceAmount: 925000,
+          contractNo: 'HT-20240601-001',
+          remarks: '含13%增值税'
+        },
+        {
+          staffId: 3002,
+          invoiceType: '采购',
+          invoiceDate: '2024-06-02',
+          invoicingMethod: '纸质发票',
+          invoicingParty: '山东鲁棉集团有限公司',
+          invoiceNumber: '00123457',
+          tons: 30,
+          unitPrice: 19000,
+          invoiceAmount: 570000,
+          contractNo: 'HT-20240601-002',
+          remarks: '分两批发货'
+        },
+        {
+          staffId: 3003,
+          invoiceType: '采购',
+          invoiceDate: '2024-06-03',
+          invoicingMethod: '电子发票',
+          invoicingParty: '江苏华棉纺织有限公司',
+          invoiceNumber: '00123458',
+          tons: 20,
+          unitPrice: 18800,
+          invoiceAmount: 376000,
+          contractNo: 'HT-20240601-003',
+          remarks: '需提前3天确认收货'
+        },
+        {
+          staffId: 3004,
+          invoiceType: '采购',
+          invoiceDate: '2024-06-04',
+          invoicingMethod: '电子发票',
+          invoicingParty: '湖北银丰棉花集团',
+          invoiceNumber: '00123459',
+          tons: 40,
+          unitPrice: 18200,
+          invoiceAmount: 728000,
+          contractNo: 'HT-20240601-004',
+          remarks: '折扣率5%'
+        },
+        {
+          staffId: 3005,
+          invoiceType: '采购',
+          invoiceDate: '2024-06-05',
+          invoicingMethod: '纸质发票',
+          invoicingParty: '河北新乐市棉花公司',
+          invoiceNumber: '00123460',
+          tons: 15,
+          unitPrice: 19500,
+          invoiceAmount: 292500,
+          contractNo: 'HT-20240601-005',
+          remarks: '运费另计'
+        },
+        {
+          staffId: 3006,
+          invoiceType: '采购',
+          invoiceDate: '2024-06-06',
+          invoicingMethod: '电子发票',
+          invoicingParty: '安徽辉隆农业发展有限公司',
+          invoiceNumber: '00123461',
+          tons: 25,
+          unitPrice: 18600,
+          invoiceAmount: 465000,
+          contractNo: 'HT-20240601-006',
+          remarks: '开户行:中国工商银行'
+        },
+        {
+          staffId: 3007,
+          invoiceType: '采购',
+          invoiceDate: '2024-06-07',
+          invoicingMethod: '电子发票',
+          invoicingParty: '新疆生产建设兵团棉麻公司',
+          invoiceNumber: '00123462',
+          tons: 35,
+          unitPrice: 18900,
+          invoiceAmount: 661500,
+          contractNo: 'HT-20240601-007',
+          remarks: '地址:乌鲁木齐市XX路'
+        },
+        {
+          staffId: 3008,
+          invoiceType: '采购',
+          invoiceDate: '2024-06-08',
+          invoicingMethod: '纸质发票',
+          invoicingParty: '河南豫棉集团有限公司',
+          invoiceNumber: '00123463',
+          tons: 60,
+          unitPrice: 18100,
+          invoiceAmount: 1086000,
+          contractNo: 'HT-20240601-008',
+          remarks: '联系方式:0371-88888888'
+        },
+        {
+          staffId: 3009,
+          invoiceType: '采购',
+          invoiceDate: '2024-06-09',
+          invoicingMethod: '电子发票',
+          invoicingParty: '湖南云锦集团股份有限公司',
+          invoiceNumber: '00123464',
+          tons: 10,
+          unitPrice: 19800,
+          invoiceAmount: 198000,
+          contractNo: 'HT-20240601-009',
+          remarks: '有效期至2024年12月'
+        },
+        {
+          staffId: 3010,
+          invoiceType: '采购',
+          invoiceDate: '2024-06-10',
+          invoicingMethod: '电子发票',
+          invoicingParty: '江西赣棉集团有限公司',
+          invoiceNumber: '00123465',
+          tons: 45,
+          unitPrice: 18300,
+          invoiceAmount: 823500,
+          contractNo: 'HT-20240601-010',
+          remarks: '附销售清单3页'
+        }
+      ],
       //查询条件
       searchContent: [
         {

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

@@ -52,26 +52,25 @@
                  :pageSize="pageInfo.pageSize"
         >
           <!--  商品编号  -->
-          <DkTableColumn field="ownCpName" title="发票编号"></DkTableColumn>
+          <DkTableColumn field="invoiceNumber" title="发票编号"></DkTableColumn>
           <!--  商品名称  -->
-          <DkTableColumn field="staffCode" title="发票类型"></DkTableColumn>
+          <DkTableColumn field="invoiceType" title="发票类型"></DkTableColumn>
           <!--  规格型号  -->
-          <DkTableColumn field="staffName" type="link" title="发票状态"
-                         @on-link="handleLink(Object.assign($event,{button:'edit'}))"></DkTableColumn>
+          <DkTableColumn field="invoiceStatus"  title="发票状态" ></DkTableColumn>
           <!--  计量单位  -->
-          <DkTableColumn field="staffPhone"   title="开票日期"></DkTableColumn>
+          <DkTableColumn field="issueDate"   title="开票日期"></DkTableColumn>
           <!--  仓库名称  -->
-          <DkTableColumn field="orgName"  title="开票方 / 受票方"></DkTableColumn>
+          <DkTableColumn field="issuerAndRecipient"  title="开票方 / 受票方"></DkTableColumn>
           <!--  存放货位  -->
-          <DkTableColumn field="postName" title="发票金额(价税合计)"></DkTableColumn>
+          <DkTableColumn field="totalAmountIncludingTax" title="发票金额(价税合计)"></DkTableColumn>
           <!--  供应商  -->
-          <DkTableColumn field="jobName" title="不含税金额"></DkTableColumn>
+          <DkTableColumn field="taxExcludedAmount" title="不含税金额"></DkTableColumn>
           <!--  采购人  -->
-          <DkTableColumn field="openStatusName" title="税额"/>
+          <DkTableColumn field="taxAmount" title="税额"/>
           <!--  备注  -->
-          <DkTableColumn field="roleName" title="可抵扣税额"></DkTableColumn>
-          <DkTableColumn field="roleName" title="已收 / 付款关联"></DkTableColumn>
-          <DkTableColumn field="roleName" title="关联合同编号"></DkTableColumn>
+          <DkTableColumn field="deductibleTaxAmount" title="可抵扣税额"></DkTableColumn>
+          <DkTableColumn field="paymentAssociation" title="已收 / 付款关联"></DkTableColumn>
+          <DkTableColumn field="relatedContractNumber" title="关联合同编号"></DkTableColumn>
 
 
         </DkTable>
@@ -94,6 +93,148 @@ export default {
   mixins: [indexMixin],
   data() {
     return  {
+        tableData : [
+        {
+          staffId: 5001,
+          invoiceNumber: 'FP-20240701-001',
+          invoiceType: '增值税专用发票',
+          invoiceStatus: '已认证',
+          issueDate: '2024-07-01',
+          issuerAndRecipient: '开票方:新疆棉业集团<br>受票方:郑州纺织有限公司',
+          totalAmountIncludingTax: 925000,
+          taxExcludedAmount: 818584.07,
+          taxAmount: 106415.93,
+          deductibleTaxAmount: 106415.93,
+          paymentAssociation: '已收款',
+          relatedContractNumber: 'HT-20240701-001'
+        },
+        {
+          staffId: 5002,
+          invoiceNumber: 'FP-20240701-002',
+          invoiceType: '增值税普通发票',
+          invoiceStatus: '未认证',
+          issueDate: '2024-07-02',
+          issuerAndRecipient: '开票方:山东鲁棉集团<br>受票方:上海贸易公司',
+          totalAmountIncludingTax: 570000,
+          taxExcludedAmount: 532075.47,
+          taxAmount: 37924.53,
+          deductibleTaxAmount: 0, // 普票不可抵扣
+          paymentAssociation: '未收款',
+          relatedContractNumber: 'HT-20240701-002'
+        },
+        {
+          staffId: 5003,
+          invoiceNumber: 'FP-20240701-003',
+          invoiceType: '增值税专用发票',
+          invoiceStatus: '已抵扣',
+          issueDate: '2024-07-03',
+          issuerAndRecipient: '开票方:江苏华棉纺织<br>受票方:浙江印染厂',
+          totalAmountIncludingTax: 376000,
+          taxExcludedAmount: 332743.36,
+          taxAmount: 43256.64,
+          deductibleTaxAmount: 43256.64,
+          paymentAssociation: '已付款',
+          relatedContractNumber: 'HT-20240701-003'
+        },
+        {
+          staffId: 5004,
+          invoiceNumber: 'FP-20240701-004',
+          invoiceType: '增值税专用发票',
+          invoiceStatus: '红冲',
+          issueDate: '2024-07-04',
+          issuerAndRecipient: '开票方:湖北银丰棉花<br>受票方:广东服装公司',
+          totalAmountIncludingTax: 728000,
+          taxExcludedAmount: 644247.79,
+          taxAmount: 83752.21,
+          deductibleTaxAmount: 0, // 红冲发票不可抵扣
+          paymentAssociation: '退款中',
+          relatedContractNumber: 'HT-20240701-004'
+        },
+        {
+          staffId: 5005,
+          invoiceNumber: 'FP-20240701-005',
+          invoiceType: '增值税普通发票',
+          invoiceStatus: '已开具',
+          issueDate: '2024-07-05',
+          issuerAndRecipient: '开票方:河北新乐棉花<br>受票方:天津纺织集团',
+          totalAmountIncludingTax: 292500,
+          taxExcludedAmount: 270555.56,
+          taxAmount: 21944.44,
+          deductibleTaxAmount: 0,
+          paymentAssociation: '部分收款(50%)',
+          relatedContractNumber: 'HT-20240701-005'
+        },
+        {
+          staffId: 5006,
+          invoiceNumber: 'FP-20240701-006',
+          invoiceType: '增值税专用发票',
+          invoiceStatus: '未认证',
+          issueDate: '2024-07-06',
+          issuerAndRecipient: '开票方:安徽辉隆农业<br>受票方:郑州仓储公司',
+          totalAmountIncludingTax: 465000,
+          taxExcludedAmount: 411504.42,
+          taxAmount: 53495.58,
+          deductibleTaxAmount: 53495.58,
+          paymentAssociation: '未付款',
+          relatedContractNumber: 'HT-20240701-006'
+        },
+        {
+          staffId: 5007,
+          invoiceNumber: 'FP-20240701-007',
+          invoiceType: '增值税专用发票',
+          invoiceStatus: '已认证',
+          issueDate: '2024-07-07',
+          issuerAndRecipient: '开票方:新疆生产建设兵团棉麻<br>受票方:青岛纺织有限公司',
+          totalAmountIncludingTax: 661500,
+          taxExcludedAmount: 585398.23,
+          taxAmount: 76101.77,
+          deductibleTaxAmount: 76101.77,
+          paymentAssociation: '已收款',
+          relatedContractNumber: 'HT-20240701-007'
+        },
+        {
+          staffId: 5008,
+          invoiceNumber: 'FP-20240701-008',
+          invoiceType: '增值税普通发票',
+          invoiceStatus: '已作废',
+          issueDate: '2024-07-08',
+          issuerAndRecipient: '开票方:河南豫棉集团<br>受票方:张家港贸易公司',
+          totalAmountIncludingTax: 1086000,
+          taxExcludedAmount: 961061.95,
+          taxAmount: 124938.05,
+          deductibleTaxAmount: 0,
+          paymentAssociation: '作废重开',
+          relatedContractNumber: 'HT-20240701-008'
+        },
+        {
+          staffId: 5009,
+          invoiceNumber: 'FP-20240701-009',
+          invoiceType: '增值税专用发票',
+          invoiceStatus: '已抵扣',
+          issueDate: '2024-07-09',
+          issuerAndRecipient: '开票方:湖南云锦集团<br>受票方:武汉仓储公司',
+          totalAmountIncludingTax: 198000,
+          taxExcludedAmount: 175221.24,
+          taxAmount: 22778.76,
+          deductibleTaxAmount: 22778.76,
+          paymentAssociation: '已付款',
+          relatedContractNumber: 'HT-20240701-009'
+        },
+        {
+          staffId: 5010,
+          invoiceNumber: 'FP-20240701-010',
+          invoiceType: '增值税专用发票',
+          invoiceStatus: '未认证',
+          issueDate: '2024-07-10',
+          issuerAndRecipient: '开票方:江西赣棉集团<br>受票方:南京纺织有限公司',
+          totalAmountIncludingTax: 823500,
+          taxExcludedAmount: 728761.06,
+          taxAmount: 94738.94,
+          deductibleTaxAmount: 94738.94,
+          paymentAssociation: '未收款',
+          relatedContractNumber: 'HT-20240701-010'
+        }
+      ],
       //查询条件
       searchContent: [
         {

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

@@ -0,0 +1,390 @@
+ <!-- @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 right-button="warehouse-management-enable" ref="enable" name="enable"></BaseIndexButton>
+         <!--    停用    -->
+         <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>
+
+         <!--  表格部分  -->
+         <DkTable
+           :id="'table-' + $options.name"
+           ref="table-select"
+           :data="tableData"
+           :height="tableHeight - 60"
+           primaryKey="paymentWarningId"
+           :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="paymentOrderNo" title="应付单号"></DkTableColumn>
+           <DkTableColumn field="supplierName" title="供应商名称"></DkTableColumn>
+           <DkTableColumn field="supplierCode" title="供应商编号"></DkTableColumn>
+           <DkTableColumn field="purchaseOrderNo" title="采购订单号"></DkTableColumn>
+           <DkTableColumn field="totalAmount" title="应付金额"></DkTableColumn>
+           <DkTableColumn field="paidAmount" title="已付金额"></DkTableColumn>
+           <DkTableColumn field="unpaidAmount" title="未付金额"></DkTableColumn>
+           <DkTableColumn field="paymentDeadline" title="付款期限"></DkTableColumn>
+           <DkTableColumn field="overdueDays" title="逾期天数"></DkTableColumn>
+           <DkTableColumn field="overdueStartDate" title="逾期开始日期"></DkTableColumn>
+           <DkTableColumn field="warningLevel" title="预警等级"></DkTableColumn>
+           <DkTableColumn field="supplierCreditRating" title="供应商信用评级"></DkTableColumn>
+           <DkTableColumn field="penaltyAmount" title="违约金计算"></DkTableColumn>
+           <DkTableColumn field="contractClause" title="关联合同条款"></DkTableColumn>
+           <DkTableColumn field="responsibleDepartment" title="责任部门"></DkTableColumn>
+           <DkTableColumn field="suggestedAction" title="建议操作"></DkTableColumn>
+           <DkTableColumn field="processingStatus" title="处理状态"></DkTableColumn>
+           <DkTableColumn field="latestCommunication" title="最近沟通记录"></DkTableColumn>
+           <DkTableColumn field="warningTriggerTime" title="预警触发时间"></DkTableColumn>
+           <DkTableColumn field="dataUpdateTime" title="数据更新时间"></DkTableColumn>
+           <DkTableColumn field="approvalStatus" title="审批流程状态"></DkTableColumn>
+         </DkTable>
+       </div>
+
+     </div>
+
+
+
+
+   </div>
+ </template>
+
+ <script>
+
+ import {indexMixin} from '@/mixins'
+
+ export default {
+   name: 'early-warning-payables',
+   mixins: [indexMixin],
+   data() {
+     return  {
+       buyerList:[],
+       //查询条件
+       searchContent: [
+         {
+           //公司名称
+           itemCode: 'cpIds',
+           title: '编码',
+
+           required: true
+         },
+         {
+           //员工工号
+           itemCode: 'staffCode',
+           title: '名称',
+         },
+         {
+           //员工名称
+           itemCode: 'staffName',
+           title: '预警等级',
+         },
+
+
+       ],
+       formData: {
+         staffCode: null,//员工工号
+         staffName: null,//员工编码
+       },
+       tableData: [
+         {
+           paymentWarningId: 1,
+           paymentOrderNo: 'AP-2025-001',
+           supplierName: '新疆XX棉业有限公司',
+           supplierCode: 'SUPP-2023-005',
+           purchaseOrderNo: 'PO-2025-088',
+           totalAmount: '500,000.00元',
+           paidAmount: '300,000.00元',
+           unpaidAmount: '200,000.00元',
+           paymentDeadline: '2025-06-05',
+           overdueDays: '+1天',
+           overdueStartDate: '2025-06-06',
+           warningLevel: '黄色预警',
+           supplierCreditRating: 'AA',
+           penaltyAmount: '200,000×0.1%×1=200.00元',
+           contractClause: '逾期利率0.1%/日',
+           responsibleDepartment: '采购部',
+           suggestedAction: '尽快安排付款',
+           processingStatus: '未处理',
+           latestCommunication: '2025-06-06 14:30 电话沟通,供应商同意宽限3天',
+           warningTriggerTime: '2025-06-06 09:00:00',
+           dataUpdateTime: '2025-06-06 11:00:00',
+           approvalStatus: '财务主管审批中'
+         },
+         {
+           paymentWarningId: 2,
+           paymentOrderNo: 'AP-2025-002',
+           supplierName: '美国XX棉商',
+           supplierCode: 'SUPP-2023-012',
+           purchaseOrderNo: 'PO-2025-092',
+           totalAmount: '800,000.00元',
+           paidAmount: '0.00元',
+           unpaidAmount: '800,000.00元',
+           paymentDeadline: '2025-05-25',
+           overdueDays: '+12天',
+           overdueStartDate: '2025-05-26',
+           warningLevel: '红色预警',
+           supplierCreditRating: 'B',
+           penaltyAmount: '800,000×0.15%×12=14,400.00元',
+           contractClause: '逾期利率0.15%/日',
+           responsibleDepartment: '财务部',
+           suggestedAction: '联系供应商协商展期,启动风险预案',
+           processingStatus: '处理中',
+           latestCommunication: '2025-06-05 10:00 邮件申请延期至6月15日',
+           warningTriggerTime: '2025-05-26 09:00:00',
+           dataUpdateTime: '2025-06-06 11:00:00',
+           approvalStatus: '总经理已批准'
+         },
+         {
+           paymentWarningId: 3,
+           paymentOrderNo: 'AP-2025-003',
+           supplierName: '山东XX棉业',
+           supplierCode: 'SUPP-2023-020',
+           purchaseOrderNo: 'PO-2025-076',
+           totalAmount: '350,000.00元',
+           paidAmount: '350,000.00元',
+           unpaidAmount: '0.00元',
+           paymentDeadline: '2025-06-01',
+           overdueDays: '0天',
+           overdueStartDate: '-',
+           warningLevel: '无预警',
+           supplierCreditRating: 'AAA',
+           penaltyAmount: '0.00元',
+           contractClause: '逾期利率0.1%/日',
+           responsibleDepartment: '采购部',
+           suggestedAction: '-',
+           processingStatus: '已结案',
+           latestCommunication: '2025-05-31 16:00 全额付款,供应商确认',
+           warningTriggerTime: '-',
+           dataUpdateTime: '2025-06-06 11:00:00',
+           approvalStatus: '已完成'
+         },
+         {
+           paymentWarningId: 4,
+           paymentOrderNo: 'AP-2025-004',
+           supplierName: '江苏XX有机农业',
+           supplierCode: 'SUPP-2023-035',
+           purchaseOrderNo: 'PO-2025-101',
+           totalAmount: '220,000.00元',
+           paidAmount: '100,000.00元',
+           unpaidAmount: '120,000.00元',
+           paymentDeadline: '2025-06-03',
+           overdueDays: '+3天',
+           overdueStartDate: '2025-06-04',
+           warningLevel: '黄色预警',
+           supplierCreditRating: 'AA',
+           penaltyAmount: '120,000×0.1%×3=360.00元',
+           contractClause: '逾期利率0.1%/日',
+           responsibleDepartment: '财务部',
+           suggestedAction: '尽快安排付款',
+           processingStatus: '未处理',
+           latestCommunication: '2025-06-04 15:00 供应商邮件催款',
+           warningTriggerTime: '2025-06-04 09:00:00',
+           dataUpdateTime: '2025-06-06 11:00:00',
+           approvalStatus: '财务经理审批中'
+         },
+         {
+           paymentWarningId: 5,
+           paymentOrderNo: 'AP-2025-005',
+           supplierName: '澳大利亚XX棉商',
+           supplierCode: 'SUPP-2023-040',
+           purchaseOrderNo: 'PO-2025-112',
+           totalAmount: '650,000.00元',
+           paidAmount: '0.00元',
+           unpaidAmount: '650,000.00元',
+           paymentDeadline: '2025-05-20',
+           overdueDays: '+17天',
+           overdueStartDate: '2025-05-21',
+           warningLevel: '红色预警',
+           supplierCreditRating: 'BB',
+           penaltyAmount: '650,000×0.2%×17=22,100.00元',
+           contractClause: '逾期利率0.2%/日',
+           responsibleDepartment: '采购部',
+           suggestedAction: '联系供应商协商展期,启动风险预案',
+           processingStatus: '处理中',
+           latestCommunication: '2025-06-03 14:00 电话协商,供应商要求6月10日前付款',
+           warningTriggerTime: '2025-05-21 09:00:00',
+           dataUpdateTime: '2025-06-06 11:00:00',
+           approvalStatus: '总经理审批中'
+         },
+         {
+           paymentWarningId: 6,
+           paymentOrderNo: 'AP-2025-006',
+           supplierName: '哈萨克斯坦XX公司',
+           supplierCode: 'SUPP-2023-050',
+           purchaseOrderNo: 'PO-2025-107',
+           totalAmount: '480,000.00元',
+           paidAmount: '200,000.00元',
+           unpaidAmount: '280,000.00元',
+           paymentDeadline: '2025-05-30',
+           overdueDays: '+7天',
+           overdueStartDate: '2025-05-31',
+           warningLevel: '红色预警',
+           supplierCreditRating: 'BBB',
+           penaltyAmount: '280,000×0.12%×7=2,352.00元',
+           contractClause: '逾期利率0.12%/日',
+           responsibleDepartment: '财务部',
+           suggestedAction: '联系供应商协商展期,启动风险预案',
+           processingStatus: '未处理',
+           latestCommunication: '2025-05-31 16:30 邮件提醒逾期风险',
+           warningTriggerTime: '2025-05-31 09:00:00',
+           dataUpdateTime: '2025-06-06 11:00:00',
+           approvalStatus: '财务总监审批中'
+         },
+         {
+           paymentWarningId: 7,
+           paymentOrderNo: 'AP-2025-007',
+           supplierName: '河北XX棉业',
+           supplierCode: 'SUPP-2023-060',
+           purchaseOrderNo: 'PO-2025-083',
+           totalAmount: '320,000.00元',
+           paidAmount: '320,000.00元',
+           unpaidAmount: '0.00元',
+           paymentDeadline: '2025-06-02',
+           overdueDays: '0天',
+           overdueStartDate: '-',
+           warningLevel: '无预警',
+           supplierCreditRating: 'AAA',
+           penaltyAmount: '0.00元',
+           contractClause: '逾期利率0.1%/日',
+           responsibleDepartment: '采购部',
+           suggestedAction: '-',
+           processingStatus: '已结案',
+           latestCommunication: '2025-06-01 15:00 全额付款,供应商确认',
+           warningTriggerTime: '-',
+           dataUpdateTime: '2025-06-06 11:00:00',
+           approvalStatus: '已完成'
+         },
+         {
+           paymentWarningId: 8,
+           paymentOrderNo: 'AP-2025-008',
+           supplierName: '非洲XX农业',
+           supplierCode: 'SUPP-2023-070',
+           purchaseOrderNo: 'PO-2025-123',
+           totalAmount: '180,000.00元',
+           paidAmount: '50,000.00元',
+           unpaidAmount: '130,000.00元',
+           paymentDeadline: '2025-06-04',
+           overdueDays: '+2天',
+           overdueStartDate: '2025-06-05',
+           warningLevel: '黄色预警',
+           supplierCreditRating: 'BB',
+           penaltyAmount: '130,000×0.15%×2=390.00元',
+           contractClause: '逾期利率0.15%/日',
+           responsibleDepartment: '财务部',
+           suggestedAction: '尽快安排付款',
+           processingStatus: '处理中',
+           latestCommunication: '2025-06-05 11:00 电话协商,供应商要求本周内付款',
+           warningTriggerTime: '2025-06-05 09:00:00',
+           dataUpdateTime: '2025-06-06 11:00:00',
+           approvalStatus: '财务主管审批中'
+         },
+         {
+           paymentWarningId: 9,
+           paymentOrderNo: 'AP-2025-009',
+           supplierName: '河南XX纺织',
+           supplierCode: 'SUPP-2023-080',
+           purchaseOrderNo: 'PO-2025-098',
+           totalAmount: '450,000.00元',
+           paidAmount: '200,000.00元',
+           unpaidAmount: '250,000.00元',
+           paymentDeadline: '2025-05-28',
+           overdueDays: '+9天',
+           overdueStartDate: '2025-05-29',
+           warningLevel: '红色预警',
+           supplierCreditRating: 'A',
+           penaltyAmount: '250,000×0.12%×9=2,700.00元',
+           contractClause: '逾期利率0.12%/日',
+           responsibleDepartment: '采购部',
+           suggestedAction: '联系供应商协商展期,启动风险预案',
+           processingStatus: '未处理',
+           latestCommunication: '2025-06-02 14:30 邮件告知资金紧张,争取宽限5天',
+           warningTriggerTime: '2025-05-29 09:00:00',
+           dataUpdateTime: '2025-06-06 11:00:00',
+           approvalStatus: '财务总监审批中'
+         },
+         {
+           paymentWarningId: 10,
+           paymentOrderNo: 'AP-2025-010',
+           supplierName: '陕西XX棉业',
+           supplierCode: 'SUPP-2023-090',
+           purchaseOrderNo: 'PO-2025-104',
+           totalAmount: '380,000.00元',
+           paidAmount: '380,000.00元',
+           unpaidAmount: '0.00元',
+           paymentDeadline: '2025-06-07',
+           overdueDays: '0天',
+           overdueStartDate: '-',
+           warningLevel: '无预警',
+           supplierCreditRating: 'AAA',
+           penaltyAmount: '0.00元',
+           contractClause: '逾期利率0.1%/日',
+           responsibleDepartment: '财务部',
+           suggestedAction: '-',
+           processingStatus: '已结案',
+           latestCommunication: '2025-06-06 10:00 全额付款,供应商确认',
+           warningTriggerTime: '-',
+           dataUpdateTime: '2025-06-06 11:00:00',
+           approvalStatus: '已完成'
+         }
+       ],
+     }
+   },
+   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>

+ 0 - 23
src/view/mst/risk-management/risk-warning/index.vue

@@ -1,23 +0,0 @@
-<!-- @desc:风险预警  @auth:???  @time:----- -->
-<template>
-  <div class="main-div" ref="mainDiv">
-
-  </div>
-</template>
-
-<script>
-
-import {indexMixin} from '@/mixins'
-
-export default {
-  name: 'futures-warrant-batch-management',
-  data() {
-    return  {}
-  },
-  methods: {},
-
-
-
-}
-
-</script>

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

@@ -0,0 +1,401 @@
+ <!-- @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 right-button="warehouse-management-enable" ref="enable" name="enable"></BaseIndexButton>
+         <!--    停用    -->
+         <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>
+
+         <!--  表格部分  -->
+         <DkTable
+           :id="'table-' + $options.name"
+           ref="table-select"
+           :data="tableData"
+           :height="tableHeight - 60"
+           primaryKey="inventoryWarningId"
+           :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="inventoryCode" title="存货编码"></DkTableColumn>
+           <DkTableColumn field="inventoryName" title="存货名称"></DkTableColumn>
+           <DkTableColumn field="warehouseLocation" title="所属仓库 / 库区"></DkTableColumn>
+           <DkTableColumn field="warningType" title="预警类型"></DkTableColumn>
+           <DkTableColumn field="currentStock" title="当前库存量"></DkTableColumn>
+           <DkTableColumn field="safetyStockUpperLimit" title="安全库存上限(预警值)"></DkTableColumn>
+           <DkTableColumn field="safetyStockLowerLimit" title="安全库存下限(预警值)"></DkTableColumn>
+           <DkTableColumn field="deviationValue" title="超量 / 缺量值"></DkTableColumn>
+           <DkTableColumn field="deviationRatio" title="超量 / 缺量比例"></DkTableColumn>
+           <DkTableColumn field="warningLevel" title="预警等级"></DkTableColumn>
+           <DkTableColumn field="accumulationDuration" title="积压时长/预计断货天数"></DkTableColumn>
+           <DkTableColumn field="lastInboundTime" title="最近入库时间"></DkTableColumn>
+           <DkTableColumn field="lastOutboundTime" title="最近出库时间"></DkTableColumn>
+           <DkTableColumn field="relatedPurchaseOrders" title="关联采购订单"></DkTableColumn>
+           <DkTableColumn field="relatedSalesOrders" title="关联销售订单"></DkTableColumn>
+           <DkTableColumn field="supplierInfo" title="供应商信息"></DkTableColumn>
+           <DkTableColumn field="suggestedAction" title="建议操作"></DkTableColumn>
+           <DkTableColumn field="warningResponsiblePerson" title="预警责任人"></DkTableColumn>
+           <DkTableColumn field="processingStatus" title="处理状态"></DkTableColumn>
+           <DkTableColumn field="triggerTime" title="触发时间"></DkTableColumn>
+           <DkTableColumn field="thresholdSetter" title="预警阈值设置人"></DkTableColumn>
+           <DkTableColumn field="dataUpdateTime" title="数据更新时间"></DkTableColumn>
+         </DkTable>
+       </div>
+
+     </div>
+
+
+
+
+   </div>
+ </template>
+
+ <script>
+
+ import {indexMixin} from '@/mixins'
+
+ export default {
+   name: 'early-warning-payables',
+   mixins: [indexMixin],
+   data() {
+     return  {
+       buyerList:[],
+       //查询条件
+       searchContent: [
+         {
+           //公司名称
+           itemCode: 'cpIds',
+           title: '存货编码',
+
+           required: true
+         },
+         {
+           //员工工号
+           itemCode: 'staffCode',
+           title: '存货名称',
+         },
+         {
+           //员工名称
+           itemCode: 'staffName',
+           title: '预警类型',
+         },
+
+
+       ],
+       formData: {
+         staffCode: null,//员工工号
+         staffName: null,//员工编码
+       },
+       tableData: [
+         {
+           inventoryWarningId: 1,
+           inventoryCode: 'PM-2025-001',
+           inventoryName: '新疆长绒棉',
+           warehouseLocation: '原料仓A库区',
+           warningType: '库存过高预警',
+           currentStock: '500吨',
+           safetyStockUpperLimit: '300吨',
+           safetyStockLowerLimit: '100吨',
+           deviationValue: '+200吨',
+           deviationRatio: '+66.7%',
+           warningLevel: '红色预警',
+           accumulationDuration: '52天',
+           lastInboundTime: '2025-05-20',
+           lastOutboundTime: '2025-04-15',
+           relatedPurchaseOrders: 'PO-2025-088/200吨',
+           relatedSalesOrders: '-',
+           supplierInfo: '新疆XX棉业有限公司/13899998888',
+           suggestedAction: '启动促销清仓,联系供应商退换货',
+           warningResponsiblePerson: '采购经理-张XX',
+           processingStatus: '未处理',
+           triggerTime: '2025-06-06 14:30:00',
+           thresholdSetter: '王XX',
+           dataUpdateTime: '2025-06-06 15:00:00'
+         },
+         {
+           inventoryWarningId: 2,
+           inventoryCode: 'PM-2025-002',
+           inventoryName: '进口美棉',
+           warehouseLocation: '保税仓B库区',
+           warningType: '库存过低预警',
+           currentStock: '50吨',
+           safetyStockUpperLimit: '350吨',
+           safetyStockLowerLimit: '100吨',
+           deviationValue: '-50吨',
+           deviationRatio: '-50%',
+           warningLevel: '红色预警',
+           accumulationDuration: '2天',
+           lastInboundTime: '2025-03-01',
+           lastOutboundTime: '2025-06-01',
+           relatedPurchaseOrders: '-',
+           relatedSalesOrders: 'SO-2025-123/80吨',
+           supplierInfo: '美国XX棉商/13900001111',
+           suggestedAction: '触发紧急采购,协调供应商加急供货',
+           warningResponsiblePerson: '仓库主管-李XX',
+           processingStatus: '处理中',
+           triggerTime: '2025-06-06 15:10:00',
+           thresholdSetter: '王XX',
+           dataUpdateTime: '2025-06-06 15:00:00'
+         },
+         {
+           inventoryWarningId: 3,
+           inventoryCode: 'PM-2025-003',
+           inventoryName: '细绒棉',
+           warehouseLocation: '原料仓C库区',
+           warningType: '库存过高预警',
+           currentStock: '350吨',
+           safetyStockUpperLimit: '300吨',
+           safetyStockLowerLimit: '80吨',
+           deviationValue: '+50吨',
+           deviationRatio: '+16.7%',
+           warningLevel: '黄色预警',
+           accumulationDuration: '38天',
+           lastInboundTime: '2025-05-10',
+           lastOutboundTime: '2025-04-28',
+           relatedPurchaseOrders: 'PO-2025-076/150吨',
+           relatedSalesOrders: '-',
+           supplierInfo: '山东XX棉业/13766665555',
+           suggestedAction: '优化采购计划,控制进货量',
+           warningResponsiblePerson: '采购专员-赵XX',
+           processingStatus: '已结案',
+           triggerTime: '2025-06-05 09:45:00',
+           thresholdSetter: '刘XX',
+           dataUpdateTime: '2025-06-06 15:00:00'
+         },
+         {
+           inventoryWarningId: 4,
+           inventoryCode: 'PM-2025-004',
+           inventoryName: '有机棉',
+           warehouseLocation: '保税仓D库区',
+           warningType: '库存过低预警',
+           currentStock: '80吨',
+           safetyStockUpperLimit: '200吨',
+           safetyStockLowerLimit: '120吨',
+           deviationValue: '-40吨',
+           deviationRatio: '-33.3%',
+           warningLevel: '黄色预警',
+           accumulationDuration: '5天',
+           lastInboundTime: '2025-04-18',
+           lastOutboundTime: '2025-06-02',
+           relatedPurchaseOrders: '-',
+           relatedSalesOrders: 'SO-2025-119/60吨',
+           supplierInfo: '江苏XX有机农业/13644443333',
+           suggestedAction: '启动常规采购流程',
+           warningResponsiblePerson: '计划主管-孙XX',
+           processingStatus: '未处理',
+           triggerTime: '2025-06-04 16:20:00',
+           thresholdSetter: '刘XX',
+           dataUpdateTime: '2025-06-06 15:00:00'
+         },
+         {
+           inventoryWarningId: 5,
+           inventoryCode: 'PM-2025-005',
+           inventoryName: '澳棉',
+           warehouseLocation: '临港仓E库区',
+           warningType: '库存过高预警',
+           currentStock: '420吨',
+           safetyStockUpperLimit: '350吨',
+           safetyStockLowerLimit: '100吨',
+           deviationValue: '+70吨',
+           deviationRatio: '+20%',
+           warningLevel: '红色预警',
+           accumulationDuration: '45天',
+           lastInboundTime: '2025-05-15',
+           lastOutboundTime: '2025-04-20',
+           relatedPurchaseOrders: 'PO-2025-092/220吨',
+           relatedSalesOrders: '-',
+           supplierInfo: '澳大利亚XX棉商/13522221111',
+           suggestedAction: '启动促销清仓,联系供应商退换货',
+           warningResponsiblePerson: '销售经理-周XX',
+           processingStatus: '处理中',
+           triggerTime: '2025-06-03 11:10:00',
+           thresholdSetter: '陈XX',
+           dataUpdateTime: '2025-06-06 15:00:00'
+         },
+         {
+           inventoryWarningId: 6,
+           inventoryCode: 'PM-2025-006',
+           inventoryName: '中亚棉',
+           warehouseLocation: '内陆仓F库区',
+           warningType: '库存过低预警',
+           currentStock: '65吨',
+           safetyStockUpperLimit: '250吨',
+           safetyStockLowerLimit: '100吨',
+           deviationValue: '-35吨',
+           deviationRatio: '-35%',
+           warningLevel: '红色预警',
+           accumulationDuration: '3天',
+           lastInboundTime: '2025-04-05',
+           lastOutboundTime: '2025-06-03',
+           relatedPurchaseOrders: '-',
+           relatedSalesOrders: 'SO-2025-107/50吨',
+           supplierInfo: '哈萨克斯坦XX公司/13477776666',
+           suggestedAction: '触发紧急采购,协调供应商加急供货',
+           warningResponsiblePerson: '采购经理-张XX',
+           processingStatus: '未处理',
+           triggerTime: '2025-06-02 14:55:00',
+           thresholdSetter: '陈XX',
+           dataUpdateTime: '2025-06-06 15:00:00'
+         },
+         {
+           inventoryWarningId: 7,
+           inventoryCode: 'PM-2025-007',
+           inventoryName: '地产棉',
+           warehouseLocation: '原料仓G库区',
+           warningType: '库存过高预警',
+           currentStock: '380吨',
+           safetyStockUpperLimit: '320吨',
+           safetyStockLowerLimit: '90吨',
+           deviationValue: '+60吨',
+           deviationRatio: '+18.75%',
+           warningLevel: '黄色预警',
+           accumulationDuration: '40天',
+           lastInboundTime: '2025-05-08',
+           lastOutboundTime: '2025-04-25',
+           relatedPurchaseOrders: 'PO-2025-083/180吨',
+           relatedSalesOrders: '-',
+           supplierInfo: '河北XX棉业/13388887777',
+           suggestedAction: '优化采购计划,控制进货量',
+           warningResponsiblePerson: '采购专员-赵XX',
+           processingStatus: '已结案',
+           triggerTime: '2025-06-01 10:20:00',
+           thresholdSetter: '吴XX',
+           dataUpdateTime: '2025-06-06 15:00:00'
+         },
+         {
+           inventoryWarningId: 8,
+           inventoryCode: 'PM-2025-008',
+           inventoryName: '非洲棉',
+           warehouseLocation: '保税仓H库区',
+           warningType: '库存过低预警',
+           currentStock: '90吨',
+           safetyStockUpperLimit: '220吨',
+           safetyStockLowerLimit: '150吨',
+           deviationValue: '-60吨',
+           deviationRatio: '-40%',
+           warningLevel: '红色预警',
+           accumulationDuration: '4天',
+           lastInboundTime: '2025-03-20',
+           lastOutboundTime: '2025-06-04',
+           relatedPurchaseOrders: '-',
+           relatedSalesOrders: 'SO-2025-104/70吨',
+           supplierInfo: '非洲XX农业/13255554444',
+           suggestedAction: '触发紧急采购,协调供应商加急供货',
+           warningResponsiblePerson: '计划主管-孙XX',
+           processingStatus: '处理中',
+           triggerTime: '2025-05-31 17:30:00',
+           thresholdSetter: '吴XX',
+           dataUpdateTime: '2025-06-06 15:00:00'
+         },
+         {
+           inventoryWarningId: 9,
+           inventoryCode: 'PM-2025-009',
+           inventoryName: '高强棉',
+           warehouseLocation: '成品仓I库区',
+           warningType: '库存过高预警',
+           currentStock: '450吨',
+           safetyStockUpperLimit: '380吨',
+           safetyStockLowerLimit: '120吨',
+           deviationValue: '+70吨',
+           deviationRatio: '+18.4%',
+           warningLevel: '黄色预警',
+           accumulationDuration: '42天',
+           lastInboundTime: '2025-05-12',
+           lastOutboundTime: '2025-04-18',
+           relatedPurchaseOrders: 'PO-2025-098/200吨',
+           relatedSalesOrders: '-',
+           supplierInfo: '河南XX纺织/13166665555',
+           suggestedAction: '优化采购计划,控制进货量',
+           warningResponsiblePerson: '销售经理-周XX',
+           processingStatus: '未处理',
+           triggerTime: '2025-05-30 09:15:00',
+           thresholdSetter: '郑XX',
+           dataUpdateTime: '2025-06-06 15:00:00'
+         },
+         {
+           inventoryWarningId: 10,
+           inventoryCode: 'PM-2025-010',
+           inventoryName: '低绒棉',
+           warehouseLocation: '内陆仓J库区',
+           warningType: '库存过低预警',
+           currentStock: '70吨',
+           safetyStockUpperLimit: '200吨',
+           safetyStockLowerLimit: '120吨',
+           deviationValue: '-50吨',
+           deviationRatio: '-41.7%',
+           warningLevel: '红色预警',
+           accumulationDuration: '3天',
+           lastInboundTime: '2025-03-15',
+           lastOutboundTime: '2025-06-05',
+           relatedPurchaseOrders: '-',
+           relatedSalesOrders: 'SO-2025-101/65吨',
+           supplierInfo: '陕西XX棉业/13099998888',
+           suggestedAction: '触发紧急采购,协调供应商加急供货',
+           warningResponsiblePerson: '仓库主管-李XX',
+           processingStatus: '处理中',
+           triggerTime: '2025-05-29 15:40:00',
+           thresholdSetter: '郑XX',
+           dataUpdateTime: '2025-06-06 15:00:00'
+         }
+       ],
+     }
+   },
+   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>

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

@@ -0,0 +1,390 @@
+ <!-- @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 right-button="warehouse-management-enable" ref="enable" name="enable"></BaseIndexButton>
+         <!--    停用    -->
+         <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>
+
+         <!--  表格部分  -->
+         <DkTable
+           :id="'table-' + $options.name"
+           ref="table-select"
+           :data="tableData"
+           :height="tableHeight - 60"
+           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="inventoryCode" title="存货编码"></DkTableColumn>
+           <DkTableColumn field="inventoryName" title="存货名称"></DkTableColumn>
+           <DkTableColumn field="warehouseLocation" title="所属仓库 / 库区"></DkTableColumn>
+           <DkTableColumn field="supplierName" title="供应商名称"></DkTableColumn>
+           <DkTableColumn field="warehousingDate" title="入库日期"></DkTableColumn>
+           <DkTableColumn field="setCycleDays" title="设定周期天数"></DkTableColumn>
+           <DkTableColumn field="currentCycleDays" title="当前周期天数"></DkTableColumn>
+           <DkTableColumn field="overdueDays" title="超期天数"></DkTableColumn>
+           <DkTableColumn field="warningTriggerTime" title="预警触发时间"></DkTableColumn>
+           <DkTableColumn field="warningLevel" title="预警等级"></DkTableColumn>
+           <DkTableColumn field="lastOutboundTime" title="最近出库时间"></DkTableColumn>
+           <DkTableColumn field="estimatedStagnantLoss" title="预计呆滞损失"></DkTableColumn>
+           <DkTableColumn field="inventoryTurnoverRate" title="存货周转率"></DkTableColumn>
+           <DkTableColumn field="responsibleDepartment" title="责任部门"></DkTableColumn>
+           <DkTableColumn field="responsiblePerson" title="责任人"></DkTableColumn>
+           <DkTableColumn field="suggestedAction" title="建议操作"></DkTableColumn>
+           <DkTableColumn field="processingStatus" title="处理状态"></DkTableColumn>
+           <DkTableColumn field="historicalProcessingRecord" title="历史处理记录"></DkTableColumn>
+           <DkTableColumn field="dataUpdateTime" title="数据更新时间"></DkTableColumn>
+           <DkTableColumn field="cycleRuleSetter" title="周期规则设置人"></DkTableColumn>
+           <DkTableColumn field="relatedPurchaseOrder" title="关联采购订单"></DkTableColumn>
+         </DkTable>
+       </div>
+
+     </div>
+
+
+
+
+   </div>
+ </template>
+
+ <script>
+
+ import {indexMixin} from '@/mixins'
+
+ export default {
+   name: 'early-warning-payables',
+   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,
+           inventoryCode: 'PM-2025-001',
+           inventoryName: '新疆长绒棉',
+           warehouseLocation: '原料仓A库区',
+           supplierName: '新疆XX棉业有限公司',
+           warehousingDate: '2025-03-15',
+           setCycleDays: '60天',
+           currentCycleDays: '92天',
+           overdueDays: '+32天',
+           warningTriggerTime: '2025-05-16 09:00:00',
+           warningLevel: '红色预警',
+           lastOutboundTime: '2025-04-20',
+           estimatedStagnantLoss: '25,600元(超期每天减值0.1%)',
+           inventoryTurnoverRate: '0.3次/月',
+           responsibleDepartment: '销售部',
+           responsiblePerson: '张三(销售专员)',
+           suggestedAction: '启动报废/退换货流程',
+           processingStatus: '处理中',
+           historicalProcessingRecord: '2025-05-16 首次预警,已通知销售部',
+           dataUpdateTime: '2025-06-15 11:00:00',
+           cycleRuleSetter: '王XX',
+           relatedPurchaseOrder: 'PO-2025-088'
+         },
+         {
+           inventoryCycleWarningId: 2,
+           inventoryCode: 'PM-2025-002',
+           inventoryName: '进口美棉',
+           warehouseLocation: '保税仓B库区',
+           supplierName: '美国XX棉商',
+           warehousingDate: '2025-04-01',
+           setCycleDays: '90天',
+           currentCycleDays: '75天',
+           overdueDays: '0天',
+           warningTriggerTime: '-',
+           warningLevel: '无预警',
+           lastOutboundTime: '2025-05-10',
+           estimatedStagnantLoss: '0元',
+           inventoryTurnoverRate: '0.5次/月',
+           responsibleDepartment: '-',
+           responsiblePerson: '-',
+           suggestedAction: '-',
+           processingStatus: '-',
+           historicalProcessingRecord: '-',
+           dataUpdateTime: '2025-06-15 11:00:00',
+           cycleRuleSetter: '王XX',
+           relatedPurchaseOrder: 'PO-2025-092'
+         },
+         {
+           inventoryCycleWarningId: 3,
+           inventoryCode: 'PM-2025-003',
+           inventoryName: '细绒棉',
+           warehouseLocation: '原料仓C库区',
+           supplierName: '山东XX棉业',
+           warehousingDate: '2025-03-25',
+           setCycleDays: '50天',
+           currentCycleDays: '82天',
+           overdueDays: '+32天',
+           warningTriggerTime: '2025-05-16 09:00:00',
+           warningLevel: '红色预警',
+           lastOutboundTime: '2025-04-15',
+           estimatedStagnantLoss: '16,400元(超期每天减值0.1%)',
+           inventoryTurnoverRate: '0.2次/月',
+           responsibleDepartment: '销售部',
+           responsiblePerson: '李四(销售主管)',
+           suggestedAction: '启动报废/退换货流程',
+           processingStatus: '未处理',
+           historicalProcessingRecord: '2025-05-16 首次预警,已通知销售部',
+           dataUpdateTime: '2025-06-15 11:00:00',
+           cycleRuleSetter: '刘XX',
+           relatedPurchaseOrder: 'PO-2025-076'
+         },
+         {
+           inventoryCycleWarningId: 4,
+           inventoryCode: 'PM-2025-004',
+           inventoryName: '有机棉',
+           warehouseLocation: '保税仓D库区',
+           supplierName: '江苏XX有机农业',
+           warehousingDate: '2025-04-10',
+           setCycleDays: '75天',
+           currentCycleDays: '66天',
+           overdueDays: '0天',
+           warningTriggerTime: '-',
+           warningLevel: '无预警',
+           lastOutboundTime: '2025-05-25',
+           estimatedStagnantLoss: '0元',
+           inventoryTurnoverRate: '0.6次/月',
+           responsibleDepartment: '-',
+           responsiblePerson: '-',
+           suggestedAction: '-',
+           processingStatus: '-',
+           historicalProcessingRecord: '-',
+           dataUpdateTime: '2025-06-15 11:00:00',
+           cycleRuleSetter: '刘XX',
+           relatedPurchaseOrder: 'PO-2025-101'
+         },
+         {
+           inventoryCycleWarningId: 5,
+           inventoryCode: 'PM-2025-005',
+           inventoryName: '澳棉',
+           warehouseLocation: '临港仓E库区',
+           supplierName: '澳大利亚XX棉商',
+           warehousingDate: '2025-03-30',
+           setCycleDays: '80天',
+           currentCycleDays: '77天',
+           overdueDays: '0天',
+           warningTriggerTime: '-',
+           warningLevel: '无预警',
+           lastOutboundTime: '2025-05-20',
+           estimatedStagnantLoss: '0元',
+           inventoryTurnoverRate: '0.4次/月',
+           responsibleDepartment: '-',
+           responsiblePerson: '-',
+           suggestedAction: '-',
+           processingStatus: '-',
+           historicalProcessingRecord: '-',
+           dataUpdateTime: '2025-06-15 11:00:00',
+           cycleRuleSetter: '陈XX',
+           relatedPurchaseOrder: 'PO-2025-112'
+         },
+         {
+           inventoryCycleWarningId: 6,
+           inventoryCode: 'PM-2025-006',
+           inventoryName: '中亚棉',
+           warehouseLocation: '内陆仓F库区',
+           supplierName: '哈萨克斯坦XX公司',
+           warehousingDate: '2025-03-10',
+           setCycleDays: '65天',
+           currentCycleDays: '97天',
+           overdueDays: '+32天',
+           warningTriggerTime: '2025-05-16 09:00:00',
+           warningLevel: '红色预警',
+           lastOutboundTime: '2025-04-05',
+           estimatedStagnantLoss: '29,100元(超期每天减值0.1%)',
+           inventoryTurnoverRate: '0.15次/月',
+           responsibleDepartment: '销售部',
+           responsiblePerson: '张三(销售专员)',
+           suggestedAction: '启动报废/退换货流程',
+           processingStatus: '处理中',
+           historicalProcessingRecord: '2025-05-16 首次预警,已通知销售部',
+           dataUpdateTime: '2025-06-15 11:00:00',
+           cycleRuleSetter: '陈XX',
+           relatedPurchaseOrder: 'PO-2025-107'
+         },
+         {
+           inventoryCycleWarningId: 7,
+           inventoryCode: 'PM-2025-007',
+           inventoryName: '地产棉',
+           warehouseLocation: '原料仓G库区',
+           supplierName: '河北XX棉业',
+           warehousingDate: '2025-04-05',
+           setCycleDays: '55天',
+           currentCycleDays: '72天',
+           overdueDays: '+17天',
+           warningTriggerTime: '2025-05-31 09:00:00',
+           warningLevel: '黄色预警',
+           lastOutboundTime: '2025-05-10',
+           estimatedStagnantLoss: '8,640元(超期每天减值0.1%)',
+           inventoryTurnoverRate: '0.35次/月',
+           responsibleDepartment: '销售部',
+           responsiblePerson: '李四(销售主管)',
+           suggestedAction: '加大促销力度',
+           processingStatus: '未处理',
+           historicalProcessingRecord: '2025-05-31 首次预警,已通知销售部',
+           dataUpdateTime: '2025-06-15 11:00:00',
+           cycleRuleSetter: '吴XX',
+           relatedPurchaseOrder: 'PO-2025-083'
+         },
+         {
+           inventoryCycleWarningId: 8,
+           inventoryCode: 'PM-2025-008',
+           inventoryName: '非洲棉',
+           warehouseLocation: '保税仓H库区',
+           supplierName: '非洲XX农业',
+           warehousingDate: '2025-03-20',
+           setCycleDays: '70天',
+           currentCycleDays: '87天',
+           overdueDays: '+17天',
+           warningTriggerTime: '2025-05-31 09:00:00',
+           warningLevel: '黄色预警',
+           lastOutboundTime: '2025-04-30',
+           estimatedStagnantLoss: '13,050元(超期每天减值0.1%)',
+           inventoryTurnoverRate: '0.3次/月',
+           responsibleDepartment: '销售部',
+           responsiblePerson: '王五(销售经理)',
+           suggestedAction: '加大促销力度',
+           processingStatus: '处理中',
+           historicalProcessingRecord: '2025-05-31 首次预警,已通知销售部',
+           dataUpdateTime: '2025-06-15 11:00:00',
+           cycleRuleSetter: '吴XX',
+           relatedPurchaseOrder: 'PO-2025-123'
+         },
+         {
+           inventoryCycleWarningId: 9,
+           inventoryCode: 'PM-2025-009',
+           inventoryName: '高强棉',
+           warehouseLocation: '成品仓I库区',
+           supplierName: '河南XX纺织',
+           warehousingDate: '2025-04-01',
+           setCycleDays: '60天',
+           currentCycleDays: '75天',
+           overdueDays: '+15天',
+           warningTriggerTime: '2025-06-01 09:00:00',
+           warningLevel: '黄色预警',
+           lastOutboundTime: '2025-05-15',
+           estimatedStagnantLoss: '11,250元(超期每天减值0.1%)',
+           inventoryTurnoverRate: '0.4次/月',
+           responsibleDepartment: '销售部',
+           responsiblePerson: '王五(销售经理)',
+           suggestedAction: '加大促销力度',
+           processingStatus: '处理中',
+           historicalProcessingRecord: '2025-06-01 首次预警,已通知销售部',
+           dataUpdateTime: '2025-06-15 11:00:00',
+           cycleRuleSetter: '郑XX',
+           relatedPurchaseOrder: 'PO-2025-098'
+         },
+         {
+           inventoryCycleWarningId: 10,
+           inventoryCode: 'PM-2025-010',
+           inventoryName: '低绒棉',
+           warehouseLocation: '内陆仓J库区',
+           supplierName: '陕西XX棉业',
+           warehousingDate: '2025-04-15',
+           setCycleDays: '50天',
+           currentCycleDays: '61天',
+           overdueDays: '+11天',
+           warningTriggerTime: '2025-06-06 09:00:00',
+           warningLevel: '黄色预警',
+           lastOutboundTime: '2025-05-20',
+           estimatedStagnantLoss: '6,720元(超期每天减值0.1%)',
+           inventoryTurnoverRate: '0.45次/月',
+           responsibleDepartment: '销售部',
+           responsiblePerson: '张三(销售专员)',
+           suggestedAction: '加大促销力度',
+           processingStatus: '未处理',
+           historicalProcessingRecord: '2025-06-06 首次预警,已通知销售部',
+           dataUpdateTime: '2025-06-15 11:00:00',
+           cycleRuleSetter: '郑XX',
+           relatedPurchaseOrder: 'PO-2025-104'
+         }
+       ],
+     }
+   },
+   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>

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

@@ -0,0 +1,401 @@
+ <!-- @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 right-button="warehouse-management-enable" ref="enable" name="enable"></BaseIndexButton>
+         <!--    停用    -->
+         <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>
+
+         <!--  表格部分  -->
+         <DkTable
+           :id="'table-' + $options.name"
+           ref="table-select"
+           :data="tableData"
+           :height="tableHeight - 60"
+           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" 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" title="客户信用额度"></DkTableColumn>
+           <DkTableColumn field="usedCredit" title="已使用额度"></DkTableColumn>
+           <DkTableColumn field="availableCredit" title="剩余可用额度"></DkTableColumn>
+           <DkTableColumn field="currentOutboundAmount" title="本次出库金额"></DkTableColumn>
+           <DkTableColumn field="exceededAmount" 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>
+
+     </div>
+
+
+
+
+   </div>
+ </template>
+
+ <script>
+
+ import {indexMixin} from '@/mixins'
+
+ 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>

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

@@ -0,0 +1,302 @@
+ <!-- @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 right-button="warehouse-management-enable" ref="enable" name="enable"></BaseIndexButton>
+         <!--    停用    -->
+         <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>
+
+         <!--  表格部分  -->
+         <DkTable
+           :id="'table-' + $options.name"
+           ref="table-select"
+           :data="tableData"
+           :height="tableHeight - 60"
+           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="documentNumber" title="单据编号"></DkTableColumn>
+           <DkTableColumn field="customerName" title="客户名称"></DkTableColumn>
+           <DkTableColumn field="customerType" title="客户类型"></DkTableColumn>
+           <DkTableColumn field="receivableAmount" title="应收金额"></DkTableColumn>
+           <DkTableColumn field="collectedAmount" title="已收金额"></DkTableColumn>
+           <DkTableColumn field="uncollectedAmount" title="未收金额"></DkTableColumn>
+           <DkTableColumn field="contractPaymentDate" title="合同约定收款日期"></DkTableColumn>
+           <DkTableColumn field="overdueDays" title="超时天数"></DkTableColumn>
+           <DkTableColumn field="warningLevel" title="预警等级"></DkTableColumn>
+           <DkTableColumn field="collectionResponsible" title="收款责任人"></DkTableColumn>
+           <DkTableColumn field="lastFollowUpTime" title="上次跟进时间"></DkTableColumn>
+           <DkTableColumn field="followUpNotes" title="跟进备注"></DkTableColumn>
+           <DkTableColumn field="operations" title="操作"></DkTableColumn>
+         </DkTable>
+       </div>
+
+     </div>
+
+
+
+
+   </div>
+ </template>
+
+ <script>
+
+ import {indexMixin} from '@/mixins'
+
+ 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,
+           documentNumber: "HT-2025-001",
+           customerName: "XX纺织有限公司",
+           customerType: "长期客户",
+           receivableAmount: 50000,
+           collectedAmount: 30000,
+           uncollectedAmount: 20000,
+           contractPaymentDate: "2025-05-31",
+           overdueDays: 6,
+           warningLevel: "黄色预警",
+           collectionResponsible: "张建国",
+           lastFollowUpTime: "2025-06-05 14:30",
+           followUpNotes: "客户承诺下周一付款",
+           operations: "发送催款函"
+         },
+         {
+           inventoryCycleWarningId: 2,
+           documentNumber: "HT-2025-002",
+           customerName: "YY贸易集团",
+           customerType: "新客户",
+           receivableAmount: 80000,
+           collectedAmount: 0,
+           uncollectedAmount: 80000,
+           contractPaymentDate: "2025-05-15",
+           overdueDays: 21,
+           warningLevel: "红色预警",
+           collectionResponsible: "李丽",
+           lastFollowUpTime: "-",
+           followUpNotes: "多次联系未接通",
+           operations: "生成对账单"
+         },
+         {
+           inventoryCycleWarningId: 3,
+           documentNumber: "DD-2025-003",
+           customerName: "ZZ科技公司",
+           customerType: "战略客户",
+           receivableAmount: 120000,
+           collectedAmount: 90000,
+           uncollectedAmount: 30000,
+           contractPaymentDate: "2025-06-10",
+           overdueDays: 0,
+           warningLevel: "正常",
+           collectionResponsible: "王强",
+           lastFollowUpTime: "2025-06-08 10:00",
+           followUpNotes: "确认本周内安排付款",
+           operations: "标记跟进"
+         },
+         {
+           inventoryCycleWarningId: 4,
+           documentNumber: "HT-2025-004",
+           customerName: "WW纺织厂",
+           customerType: "长期客户",
+           receivableAmount: 35000,
+           collectedAmount: 20000,
+           uncollectedAmount: 15000,
+           contractPaymentDate: "2025-05-20",
+           overdueDays: 17,
+           warningLevel: "红色预警",
+           collectionResponsible: "陈娟",
+           lastFollowUpTime: "2025-06-03 15:45",
+           followUpNotes: "客户资金链紧张,申请延期",
+           operations: "启动法律程序"
+         },
+         {
+           inventoryCycleWarningId: 5,
+           documentNumber: "DD-2025-005",
+           customerName: "RR贸易公司",
+           customerType: "普通客户",
+           receivableAmount: 60000,
+           collectedAmount: 45000,
+           uncollectedAmount: 15000,
+           contractPaymentDate: "2025-06-05",
+           overdueDays: 1,
+           warningLevel: "黄色预警",
+           collectionResponsible: "赵亮",
+           lastFollowUpTime: "2025-06-06 09:30",
+           followUpNotes: "财务审核中",
+           operations: "发送短信提醒"
+         },
+         {
+           inventoryCycleWarningId: 6,
+           documentNumber: "HT-2025-006",
+           customerName: "TT制造企业",
+           customerType: "战略客户",
+           receivableAmount: 90000,
+           collectedAmount: 90000,
+           uncollectedAmount: 0,
+           contractPaymentDate: "2025-06-01",
+           overdueDays: 0,
+           warningLevel: "正常",
+           collectionResponsible: "吴敏",
+           lastFollowUpTime: "-",
+           followUpNotes: "款项已结清",
+           operations: "归档"
+         },
+         {
+           inventoryCycleWarningId: 7,
+           documentNumber: "DD-2025-007",
+           customerName: "YY纺织集团",
+           customerType: "长期客户",
+           receivableAmount: 40000,
+           collectedAmount: 10000,
+           uncollectedAmount: 30000,
+           contractPaymentDate: "2025-04-30",
+           overdueDays: 37,
+           warningLevel: "红色预警",
+           collectionResponsible: "周伟",
+           lastFollowUpTime: "2025-05-20 11:15",
+           followUpNotes: "客户破产清算中",
+           operations: "坏账登记"
+         },
+         {
+           inventoryCycleWarningId: 8,
+           documentNumber: "HT-2025-008",
+           customerName: "XX贸易有限公司",
+           customerType: "新客户",
+           receivableAmount: 25000,
+           collectedAmount: 15000,
+           uncollectedAmount: 10000,
+           contractPaymentDate: "2025-06-05",
+           overdueDays: 1,
+           warningLevel: "黄色预警",
+           collectionResponsible: "郑洁",
+           lastFollowUpTime: "2025-06-06 14:00",
+           followUpNotes: "需核对对账单",
+           operations: "重新发送对账单"
+         },
+         {
+           inventoryCycleWarningId: 9,
+           documentNumber: "DD-2025-009",
+           customerName: "ZZ制造公司",
+           customerType: "普通客户",
+           receivableAmount: 70000,
+           collectedAmount: 30000,
+           uncollectedAmount: 40000,
+           contractPaymentDate: "2025-05-25",
+           overdueDays: 12,
+           warningLevel: "黄色预警",
+           collectionResponsible: "孙磊",
+           lastFollowUpTime: "2025-06-02 16:30",
+           followUpNotes: "申请分期支付",
+           operations: "审核分期申请"
+         },
+         {
+           inventoryCycleWarningId: 10,
+           documentNumber: "HT-2025-010",
+           customerName: "WW科技集团",
+           customerType: "战略客户",
+           receivableAmount: 150000,
+           collectedAmount: 120000,
+           uncollectedAmount: 30000,
+           contractPaymentDate: "2025-06-15",
+           overdueDays: 0,
+           warningLevel: "正常",
+           collectionResponsible: "胡芳",
+           lastFollowUpTime: "2025-06-10 09:00",
+           followUpNotes: "预计下周付款",
+           operations: "跟进确认"
+         }
+       ],
+     }
+   },
+   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>

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

@@ -0,0 +1,335 @@
+ <!-- @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 right-button="warehouse-management-enable" ref="enable" name="enable"></BaseIndexButton>
+         <!--    停用    -->
+         <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>
+
+         <!--  表格部分  -->
+         <DkTable
+           :id="'table-' + $options.name"
+           ref="table-select"
+           :data="tableData"
+           :height="tableHeight - 60"
+           primaryKey="contractWarningId"
+           :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="contractNumber" title="合同编号"></DkTableColumn>
+           <DkTableColumn field="contractName" title="合同名称"></DkTableColumn>
+           <DkTableColumn field="supplierName" title="供应商名称"></DkTableColumn>
+           <DkTableColumn field="totalContractAmount" title="合同总金额"></DkTableColumn>
+           <DkTableColumn field="settledAmount" title="已结算金额"></DkTableColumn>
+           <DkTableColumn field="unsettledAmount" title="未结算金额"></DkTableColumn>
+           <DkTableColumn field="contractSignDate" title="合同签订日期"></DkTableColumn>
+           <DkTableColumn field="agreedSettlementDays" title="约定结算周期(天)"></DkTableColumn>
+           <DkTableColumn field="remainingDays" title="剩余结算天数"></DkTableColumn>
+           <DkTableColumn field="overdueDays" title="超时天数"></DkTableColumn>
+           <DkTableColumn field="settlementStatus" title="结算状态"></DkTableColumn>
+           <DkTableColumn field="responsibleDepartment" title="责任部门"></DkTableColumn>
+           <DkTableColumn field="responsiblePerson" title="责任人"></DkTableColumn>
+           <DkTableColumn field="lastFollowUpDate" title="上次跟进时间"></DkTableColumn>
+           <DkTableColumn field="followUpNotes" title="跟进备注"></DkTableColumn>
+           <DkTableColumn field="warningLevel" title="预警等级"></DkTableColumn>
+         </DkTable>
+       </div>
+
+     </div>
+
+
+
+
+   </div>
+ </template>
+
+ <script>
+
+ import {indexMixin} from '@/mixins'
+
+ 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: [
+         {
+           contractWarningId: 1,
+           contractNumber: "HT-2025-001",
+           contractName: "新疆棉业年度采购合同",
+           supplierName: "西域棉纺有限公司",
+           totalContractAmount: 800000,
+           settledAmount: 500000,
+           unsettledAmount: 300000,
+           contractSignDate: "2025-01-15",
+           agreedSettlementDays: 120,
+           remainingDays: -30, // 超时30天
+           overdueDays: 30,
+           settlementStatus: "超时预警",
+           responsibleDepartment: "采购一部",
+           responsiblePerson: "李明",
+           lastFollowUpDate: "2025-05-10",
+           followUpNotes: "供应商因物流延误申请延期",
+           warningLevel: "高"
+         },
+         {
+           contractWarningId: 2,
+           contractNumber: "HT-2025-002",
+           contractName: "华东纺织厂皮棉供应合同",
+           supplierName: "江南棉业集团",
+           totalContractAmount: 1200000,
+           settledAmount: 900000,
+           unsettledAmount: 300000,
+           contractSignDate: "2025-02-28",
+           agreedSettlementDays: 90,
+           remainingDays: -5, // 超时5天
+           overdueDays: 5,
+           settlementStatus: "超时预警",
+           responsibleDepartment: "采购二部",
+           responsiblePerson: "王芳",
+           lastFollowUpDate: "2025-05-25",
+           followUpNotes: "等待财务审核结算单据",
+           warningLevel: "低"
+         },
+         {
+           contractWarningId: 3,
+           contractNumber: "HT-2025-003",
+           contractName: "华北印染厂皮棉采购协议",
+           supplierName: "黄河棉业有限公司",
+           totalContractAmount: 450000,
+           settledAmount: 450000,
+           unsettledAmount: 0,
+           contractSignDate: "2025-03-20",
+           agreedSettlementDays: 60,
+           remainingDays: 10, // 未超时,剩余10天
+           overdueDays: 0,
+           settlementStatus: "结算完成",
+           responsibleDepartment: "采购三部",
+           responsiblePerson: "张伟",
+           lastFollowUpDate: "-",
+           followUpNotes: "款项已全部结清",
+           warningLevel: "无"
+         },
+         {
+           contractWarningId: 4,
+           contractNumber: "HT-2025-004",
+           contractName: "华南服装公司皮棉长期供应合同",
+           supplierName: "珠江棉纺厂",
+           totalContractAmount: 600000,
+           settledAmount: 200000,
+           unsettledAmount: 400000,
+           contractSignDate: "2025-01-01",
+           agreedSettlementDays: 180,
+           remainingDays: 30, // 未超时,剩余30天
+           overdueDays: 0,
+           settlementStatus: "进行中",
+           responsibleDepartment: "采购一部",
+           responsiblePerson: "刘敏",
+           lastFollowUpDate: "2025-05-30",
+           followUpNotes: "按季度分期结算,本季度待确认",
+           warningLevel: "无"
+         },
+         {
+           contractWarningId: 5,
+           contractNumber: "HT-2025-005",
+           contractName: "西南纺织集团皮棉采购合同",
+           supplierName: "川渝棉业有限公司",
+           totalContractAmount: 300000,
+           settledAmount: 150000,
+           unsettledAmount: 150000,
+           contractSignDate: "2025-04-05",
+           agreedSettlementDays: 60,
+           remainingDays: -10, // 超时10天
+           overdueDays: 10,
+           settlementStatus: "超时预警",
+           responsibleDepartment: "采购二部",
+           responsiblePerson: "陈杰",
+           lastFollowUpDate: "2025-06-02",
+           followUpNotes: "供应商负责人变更,需重新对接",
+           warningLevel: "中"
+         },
+         {
+           contractWarningId: 6,
+           contractNumber: "HT-2025-006",
+           contractName: "东北棉业合作协议",
+           supplierName: "黑土地棉纺厂",
+           totalContractAmount: 550000,
+           settledAmount: 400000,
+           unsettledAmount: 150000,
+           contractSignDate: "2025-02-10",
+           agreedSettlementDays: 150,
+           remainingDays: 20, // 未超时,剩余20天
+           overdueDays: 0,
+           settlementStatus: "进行中",
+           responsibleDepartment: "采购三部",
+           responsiblePerson: "杨璐",
+           lastFollowUpDate: "2025-06-05",
+           followUpNotes: "等待第三方质检报告",
+           warningLevel: "无"
+         },
+         {
+           contractWarningId: 7,
+           contractNumber: "HT-2025-007",
+           contractName: "华中纺织厂皮棉采购合同",
+           supplierName: "长江棉业有限公司",
+           totalContractAmount: 900000,
+           settledAmount: 300000,
+           unsettledAmount: 600000,
+           contractSignDate: "2025-03-01",
+           agreedSettlementDays: 90,
+           remainingDays: -45, // 超时45天
+           overdueDays: 45,
+           settlementStatus: "超时预警",
+           responsibleDepartment: "采购一部",
+           responsiblePerson: "周强",
+           lastFollowUpDate: "2025-05-01",
+           followUpNotes: "供应商濒临破产,启动法律程序",
+           warningLevel: "高"
+         },
+         {
+           contractWarningId: 8,
+           contractNumber: "HT-2025-008",
+           contractName: "西北印染厂皮棉供应协议",
+           supplierName: "丝路棉纺有限公司",
+           totalContractAmount: 200000,
+           settledAmount: 180000,
+           unsettledAmount: 20000,
+           contractSignDate: "2025-05-01",
+           agreedSettlementDays: 30,
+           remainingDays: -1, // 超时1天
+           overdueDays: 1,
+           settlementStatus: "超时预警",
+           responsibleDepartment: "采购二部",
+           responsiblePerson: "吴娜",
+           lastFollowUpDate: "2025-06-06",
+           followUpNotes: "小额尾款待确认支付",
+           warningLevel: "低"
+         },
+         {
+           contractWarningId: 9,
+           contractNumber: "HT-2025-009",
+           contractName: "海外贸易公司皮棉采购合同",
+           supplierName: "国际棉业集团",
+           totalContractAmount: 1500000,
+           settledAmount: 1200000,
+           unsettledAmount: 300000,
+           contractSignDate: "2025-04-15",
+           agreedSettlementDays: 90,
+           remainingDays: 15, // 未超时,剩余15天
+           overdueDays: 0,
+           settlementStatus: "进行中",
+           responsibleDepartment: "采购三部",
+           responsiblePerson: "郑凯",
+           lastFollowUpDate: "2025-06-08",
+           followUpNotes: "等待海关清关完成",
+           warningLevel: "无"
+         },
+         {
+           contractWarningId: 10,
+           contractNumber: "HT-2025-010",
+           contractName: "中部纺织联盟皮棉长期合同",
+           supplierName: "中原棉业有限公司",
+           totalContractAmount: 700000,
+           settledAmount: 700000,
+           unsettledAmount: 0,
+           contractSignDate: "2025-05-20",
+           agreedSettlementDays: 60,
+           remainingDays: 25, // 未超时,提前完成结算
+           overdueDays: 0,
+           settlementStatus: "结算完成",
+           responsibleDepartment: "采购一部",
+           responsiblePerson: "徐丽",
+           lastFollowUpDate: "-",
+           followUpNotes: "提前完成全部款项结算",
+           warningLevel: "无"
+         }
+       ],
+     }
+   },
+   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>

+ 131 - 10
src/view/mst/sales-management/interest-management/lock-bdi-management/index.vue

@@ -55,24 +55,23 @@
                  :pageSize="pageInfo.pageSize"
         >
           <!--  商品编号  -->
-          <DkTableColumn field="ownCpName" title="锁基差单号"></DkTableColumn>
+          <DkTableColumn field="lockBasisOrderNo" title="锁基差单号"></DkTableColumn>
           <!--  商品名称  -->
-          <DkTableColumn field="staffCode" title="关联销售单号"></DkTableColumn>
+          <DkTableColumn field="relatedSalesOrderNo" title="关联销售单号"></DkTableColumn>
           <!--  规格型号  -->
-          <DkTableColumn field="staffName" type="link" title="客户名称"
-                         @on-link="handleLink(Object.assign($event,{button:'edit'}))"></DkTableColumn>
+          <DkTableColumn field="customerName"   title="客户名称" ></DkTableColumn>
           <!--  计量单位  -->
-          <DkTableColumn field="staffPhone"   title="锁基差类型"></DkTableColumn>
+          <DkTableColumn field="lockBasisType"   title="锁基差类型"></DkTableColumn>
           <!--  仓库名称  -->
-          <DkTableColumn field="orgName"  title="期货合约代码"></DkTableColumn>
+          <DkTableColumn field="futuresContractCode"  title="期货合约代码"></DkTableColumn>
           <!--  存放货位  -->
-          <DkTableColumn field="postName" title="锁定基差"></DkTableColumn>
+          <DkTableColumn field="lockedBasis" title="锁定基差"></DkTableColumn>
           <!--  供应商  -->
-          <DkTableColumn field="jobName" title="锁定价格"></DkTableColumn>
+          <DkTableColumn field="lockedPrice" title="锁定价格"></DkTableColumn>
           <!--  采购人  -->
-          <DkTableColumn field="openStatusName" title="当前期货价"/>
+          <DkTableColumn field="currentFuturesPrice" title="当前期货价"/>
           <!--  备注  -->
-          <DkTableColumn field="roleName" title="锁定数量"></DkTableColumn>
+          <DkTableColumn field="lockedQuantity" title="锁定数量"></DkTableColumn>
 
 
         </DkTable>
@@ -117,6 +116,128 @@ export default {
   mixins: [indexMixin],
   data() {
     return  {
+       tableData : [
+        {
+          staffId: 1001,
+          lockBasisOrderNo: `LBO-20250601-${Math.random().toString(36).substr(2, 6)}`,
+          relatedSalesOrderNo: `SO-20250601-${Math.floor(Math.random() * 10000)}`,
+          customerName: `客户${Math.floor(Math.random() * 100 + 1)}`,
+          lockBasisType: ['买入保值', '卖出保值'][Math.floor(Math.random() * 2)],
+          futuresContractCode: `CU2512`, // 假设铜期货合约
+          lockedBasis: `${(Math.random() * 50 - 25).toFixed(2)}`, // -25 至 +25 区间
+          lockedPrice: `${(48000 + Math.random() * 2000).toFixed(2)}`, // 48000-50000 区间
+          currentFuturesPrice: `${(48500 + Math.random() * 1500).toFixed(2)}`, // 48500-50000 区间
+          lockedQuantity: `${Math.floor(Math.random() * 10 + 1)}手`
+        },
+        {
+          staffId: 1002,
+          lockBasisOrderNo: `LBO-20250602-${Math.random().toString(36).substr(2, 6)}`,
+          relatedSalesOrderNo: `SO-20250602-${Math.floor(Math.random() * 10000)}`,
+          customerName: `客户${Math.floor(Math.random() * 100 + 1)}`,
+          lockBasisType: ['买入保值', '卖出保值'][Math.floor(Math.random() * 2)],
+          futuresContractCode: `AL2510`, // 铝期货合约
+          lockedBasis: `${(Math.random() * 30 - 15).toFixed(2)}`, // -15 至 +15 区间
+          lockedPrice: `${(18000 + Math.random() * 1000).toFixed(2)}`, // 18000-19000 区间
+          currentFuturesPrice: `${(18200 + Math.random() * 800).toFixed(2)}`, // 18200-19000 区间
+          lockedQuantity: `${Math.floor(Math.random() * 10 + 1)}手`
+        },
+        {
+          staffId: 1003,
+          lockBasisOrderNo: `LBO-20250603-${Math.random().toString(36).substr(2, 6)}`,
+          relatedSalesOrderNo: `SO-20250603-${Math.floor(Math.random() * 10000)}`,
+          customerName: `客户${Math.floor(Math.random() * 100 + 1)}`,
+          lockBasisType: ['买入保值', '卖出保值'][Math.floor(Math.random() * 2)],
+          futuresContractCode: `RB2511`, // 螺纹钢期货合约
+          lockedBasis: `${(Math.random() * 40 - 20).toFixed(2)}`, // -20 至 +20 区间
+          lockedPrice: `${(3800 + Math.random() * 200).toFixed(2)}`, // 3800-4000 区间
+          currentFuturesPrice: `${(3850 + Math.random() * 150).toFixed(2)}`, // 3850-4000 区间
+          lockedQuantity: `${Math.floor(Math.random() * 10 + 1)}手`
+        },
+        {
+          staffId: 1004,
+          lockBasisOrderNo: `LBO-20250604-${Math.random().toString(36).substr(2, 6)}`,
+          relatedSalesOrderNo: `SO-20250604-${Math.floor(Math.random() * 10000)}`,
+          customerName: `客户${Math.floor(Math.random() * 100 + 1)}`,
+          lockBasisType: ['买入保值', '卖出保值'][Math.floor(Math.random() * 2)],
+          futuresContractCode: `AG2512`, // 白银期货合约
+          lockedBasis: `${(Math.random() * 60 - 30).toFixed(2)}`, // -30 至 +30 区间
+          lockedPrice: `${(5000 + Math.random() * 300).toFixed(2)}`, // 5000-5300 区间
+          currentFuturesPrice: `${(5100 + Math.random() * 200).toFixed(2)}`, // 5100-5300 区间
+          lockedQuantity: `${Math.floor(Math.random() * 10 + 1)}手`
+        },
+        {
+          staffId: 1005,
+          lockBasisOrderNo: `LBO-20250605-${Math.random().toString(36).substr(2, 6)}`,
+          relatedSalesOrderNo: `SO-20250605-${Math.floor(Math.random() * 10000)}`,
+          customerName: `客户${Math.floor(Math.random() * 100 + 1)}`,
+          lockBasisType: ['买入保值', '卖出保值'][Math.floor(Math.random() * 2)],
+          futuresContractCode: `RU2511`, // 橡胶期货合约
+          lockedBasis: `${(Math.random() * 50 - 25).toFixed(2)}`, // -25 至 +25 区间
+          lockedPrice: `${(12000 + Math.random() * 800).toFixed(2)}`, // 12000-12800 区间
+          currentFuturesPrice: `${(12200 + Math.random() * 600).toFixed(2)}`, // 12200-12800 区间
+          lockedQuantity: `${Math.floor(Math.random() * 10 + 1)}手`
+        },
+        {
+          staffId: 1006,
+          lockBasisOrderNo: `LBO-20250606-${Math.random().toString(36).substr(2, 6)}`,
+          relatedSalesOrderNo: `SO-20250606-${Math.floor(Math.random() * 10000)}`,
+          customerName: `客户${Math.floor(Math.random() * 100 + 1)}`,
+          lockBasisType: ['买入保值', '卖出保值'][Math.floor(Math.random() * 2)],
+          futuresContractCode: `ZN2510`, // 锌期货合约
+          lockedBasis: `${(Math.random() * 30 - 15).toFixed(2)}`, // -15 至 +15 区间
+          lockedPrice: `${(22000 + Math.random() * 1000).toFixed(2)}`, // 22000-23000 区间
+          currentFuturesPrice: `${(22300 + Math.random() * 700).toFixed(2)}`, // 22300-23000 区间
+          lockedQuantity: `${Math.floor(Math.random() * 10 + 1)}手`
+        },
+        {
+          staffId: 1007,
+          lockBasisOrderNo: `LBO-20250607-${Math.random().toString(36).substr(2, 6)}`,
+          relatedSalesOrderNo: `SO-20250607-${Math.floor(Math.random() * 10000)}`,
+          customerName: `客户${Math.floor(Math.random() * 100 + 1)}`,
+          lockBasisType: ['买入保值', '卖出保值'][Math.floor(Math.random() * 2)],
+          futuresContractCode: `HC2512`, // 热轧卷板期货合约
+          lockedBasis: `${(Math.random() * 40 - 20).toFixed(2)}`, // -20 至 +20 区间
+          lockedPrice: `${(3900 + Math.random() * 150).toFixed(2)}`, // 3900-4050 区间
+          currentFuturesPrice: `${(3950 + Math.random() * 100).toFixed(2)}`, // 3950-4050 区间
+          lockedQuantity: `${Math.floor(Math.random() * 10 + 1)}手`
+        },
+        {
+          staffId: 1008,
+          lockBasisOrderNo: `LBO-20250608-${Math.random().toString(36).substr(2, 6)}`,
+          relatedSalesOrderNo: `SO-20250608-${Math.floor(Math.random() * 10000)}`,
+          customerName: `客户${Math.floor(Math.random() * 100 + 1)}`,
+          lockBasisType: ['买入保值', '卖出保值'][Math.floor(Math.random() * 2)],
+          futuresContractCode: `NI2511`, // 镍期货合约
+          lockedBasis: `${(Math.random() * 60 - 30).toFixed(2)}`, // -30 至 +30 区间
+          lockedPrice: `${(180000 + Math.random() * 5000).toFixed(2)}`, // 180000-185000 区间
+          currentFuturesPrice: `${(182000 + Math.random() * 3000).toFixed(2)}`, // 182000-185000 区间
+          lockedQuantity: `${Math.floor(Math.random() * 10 + 1)}手`
+        },
+        {
+          staffId: 1009,
+          lockBasisOrderNo: `LBO-20250609-${Math.random().toString(36).substr(2, 6)}`,
+          relatedSalesOrderNo: `SO-20250609-${Math.floor(Math.random() * 10000)}`,
+          customerName: `客户${Math.floor(Math.random() * 100 + 1)}`,
+          lockBasisType: ['买入保值', '卖出保值'][Math.floor(Math.random() * 2)],
+          futuresContractCode: `PB2510`, // 铅期货合约
+          lockedBasis: `${(Math.random() * 50 - 25).toFixed(2)}`, // -25 至 +25 区间
+          lockedPrice: `${(15000 + Math.random() * 600).toFixed(2)}`, // 15000-15600 区间
+          currentFuturesPrice: `${(15200 + Math.random() * 400).toFixed(2)}`, // 15200-15600 区间
+          lockedQuantity: `${Math.floor(Math.random() * 10 + 1)}手`
+        },
+        {
+          staffId: 1010,
+          lockBasisOrderNo: `LBO-20250610-${Math.random().toString(36).substr(2, 6)}`,
+          relatedSalesOrderNo: `SO-20250610-${Math.floor(Math.random() * 10000)}`,
+          customerName: `客户${Math.floor(Math.random() * 100 + 1)}`,
+          lockBasisType: ['买入保值', '卖出保值'][Math.floor(Math.random() * 2)],
+          futuresContractCode: `AU2512`, // 黄金期货合约
+          lockedBasis: `${(Math.random() * 80 - 40).toFixed(2)}`, // -40 至 +40 区间
+          lockedPrice: `${(450 * 1000 + Math.random() * 20 * 1000).toFixed(2)}`, // 450000-470000 区间(元/千克)
+          currentFuturesPrice: `${(460 * 1000 + Math.random() * 10 * 1000).toFixed(2)}`, // 460000-470000 区间
+          lockedQuantity: `${Math.floor(Math.random() * 10 + 1)}手`
+        }
+      ],
       //查询条件
       searchContent: [
         {

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

@@ -39,42 +39,36 @@
         </div>
 
         <!--  表格部分  -->
-        <DkTable :id="'table-'+$options.name"
-                 ref="table-select"
-                 :data="tableData"
-                 :height="tableHeight-60"
-                 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"
+        <DkTable
+          :id="'table-' + $options.name"
+          ref="table-select"
+          :data="tableData"
+          :height="tableHeight - 60"
+          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="ownCpName" title="台账编号"></DkTableColumn>
-          <!--  商品名称  -->
-          <DkTableColumn field="staffCode" title="销售单号"></DkTableColumn>
-          <!--  规格型号  -->
-          <DkTableColumn field="staffName" type="link" title="业务类型"
-                         @on-link="handleLink(Object.assign($event,{button:'edit'}))"></DkTableColumn>
-          <!--  计量单位  -->
-          <DkTableColumn field="staffPhone"   title="交易日期"></DkTableColumn>
-          <!--  仓库名称  -->
-          <DkTableColumn field="orgName"  title="客户名称"></DkTableColumn>
-          <!--  存放货位  -->
-          <DkTableColumn field="postName" title="皮棉规格"></DkTableColumn>
-          <!--  供应商  -->
-          <DkTableColumn field="jobName" title="销售数量"></DkTableColumn>
-          <!--  采购人  -->
-          <DkTableColumn field="openStatusName" title="销售单价"/>
-          <!--  备注  -->
-          <DkTableColumn field="roleName" title="销售金额"></DkTableColumn>
-
-
+          <DkTableColumn field="ledgerNumber" title="台账编号"></DkTableColumn>
+          <DkTableColumn field="salesOrderNumber" title="销售单号"></DkTableColumn>
+          <DkTableColumn
+            field="businessType"
+            type="link"
+            title="业务类型"
+            @on-link="handleLink(Object.assign($event, {button: 'edit'}))"
+          ></DkTableColumn>
+          <DkTableColumn field="transactionDate" title="交易日期"></DkTableColumn>
+          <DkTableColumn field="customerName" title="客户名称"></DkTableColumn>
+          <DkTableColumn field="cottonSpec" title="皮棉规格"></DkTableColumn>
+          <DkTableColumn field="salesQuantity" title="销售数量"></DkTableColumn>
+          <DkTableColumn field="salesPrice" title="销售单价" />
+          <DkTableColumn field="salesAmount" title="销售金额"></DkTableColumn>
         </DkTable>
       </div>
 
@@ -95,6 +89,128 @@ export default {
   mixins: [indexMixin],
   data() {
     return  {
+      tableData: [
+        {
+          staffId: 1,
+          ledgerNumber: 'LD202506001',
+          salesOrderNumber: 'XS202506001',
+          businessType: '现货销售',
+          transactionDate: '2025-06-01',
+          customerName: '东方纺织有限公司',
+          cottonSpec: '3128B',
+          salesQuantity: 25,
+          salesPrice: 17800,
+          salesAmount: 445000
+        },
+        {
+          staffId: 2,
+          ledgerNumber: 'LD202506002',
+          salesOrderNumber: 'XS202506002',
+          businessType: '期货预售',
+          transactionDate: '2025-06-01',
+          customerName: '南方纺织集团',
+          cottonSpec: '2129A',
+          salesQuantity: 40,
+          salesPrice: 18500,
+          salesAmount: 740000
+        },
+        {
+          staffId: 3,
+          ledgerNumber: 'LD202506003',
+          salesOrderNumber: 'XS202506003',
+          businessType: '代理采购',
+          transactionDate: '2025-06-02',
+          customerName: '西部纺织有限公司',
+          cottonSpec: '3128C',
+          salesQuantity: 18,
+          salesPrice: 17500,
+          salesAmount: 315000
+        },
+        {
+          staffId: 4,
+          ledgerNumber: 'LD202506004',
+          salesOrderNumber: 'XS202506004',
+          businessType: '现货销售',
+          transactionDate: '2025-06-02',
+          customerName: '北方纺织集团',
+          cottonSpec: '4128B',
+          salesQuantity: 30,
+          salesPrice: 17200,
+          salesAmount: 516000
+        },
+        {
+          staffId: 5,
+          ledgerNumber: 'LD202506005',
+          salesOrderNumber: 'XS202506005',
+          businessType: '期货预售',
+          transactionDate: '2025-06-03',
+          customerName: '中部纺织有限公司',
+          cottonSpec: '2129B',
+          salesQuantity: 22,
+          salesPrice: 18300,
+          salesAmount: 402600
+        },
+        {
+          staffId: 6,
+          ledgerNumber: 'LD202506006',
+          salesOrderNumber: 'XS202506006',
+          businessType: '现货销售',
+          transactionDate: '2025-06-03',
+          customerName: '华东纺织集团',
+          cottonSpec: '3128A',
+          salesQuantity: 28,
+          salesPrice: 18000,
+          salesAmount: 504000
+        },
+        {
+          staffId: 7,
+          ledgerNumber: 'LD202506007',
+          salesOrderNumber: 'XS202506007',
+          businessType: '代理采购',
+          transactionDate: '2025-06-04',
+          customerName: '华南纺织有限公司',
+          cottonSpec: '4128C',
+          salesQuantity: 15,
+          salesPrice: 17000,
+          salesAmount: 255000
+        },
+        {
+          staffId: 8,
+          ledgerNumber: 'LD202506008',
+          salesOrderNumber: 'XS202506008',
+          businessType: '现货销售',
+          transactionDate: '2025-06-04',
+          customerName: '西南纺织集团',
+          cottonSpec: '3128B',
+          salesQuantity: 35,
+          salesPrice: 17700,
+          salesAmount: 619500
+        },
+        {
+          staffId: 9,
+          ledgerNumber: 'LD202506009',
+          salesOrderNumber: 'XS202506009',
+          businessType: '期货预售',
+          transactionDate: '2025-06-05',
+          customerName: '东北纺织有限公司',
+          cottonSpec: '2129C',
+          salesQuantity: 19,
+          salesPrice: 18100,
+          salesAmount: 343900
+        },
+        {
+          staffId: 10,
+          ledgerNumber: 'LD202506010',
+          salesOrderNumber: 'XS202506010',
+          businessType: '现货销售',
+          transactionDate: '2025-06-05',
+          customerName: '新疆纺织集团',
+          cottonSpec: '1229B',
+          salesQuantity: 23,
+          salesPrice: 18800,
+          salesAmount: 432400
+        }
+      ],
       //查询条件
       searchContent: [
         {

+ 18 - 0
src/view/mst/sales-management/sales-order-management/basis-sales-order/add.vue

@@ -0,0 +1,18 @@
+<template>
+  <CommonForm type="add"></CommonForm>
+</template>
+
+<script>
+import CommonForm from "./form";
+
+export default {
+  name: "basis-sales-order-add",
+  components: {
+    CommonForm
+  },
+}
+</script>
+
+<style scoped>
+
+</style>

+ 18 - 0
src/view/mst/sales-management/sales-order-management/basis-sales-order/edit.vue

@@ -0,0 +1,18 @@
+<template>
+  <CommonForm type="edit"></CommonForm>
+</template>
+
+<script>
+import CommonForm from "./form";
+
+export default {
+  name: "basis-sales-order-edit",
+  components: {
+    CommonForm
+  },
+}
+</script>
+
+<style scoped>
+
+</style>

+ 566 - 0
src/view/mst/sales-management/sales-order-management/basis-sales-order/form.vue

@@ -0,0 +1,566 @@
+<!-- @desc:其他销售单 @auth:王英杰 @time :2025年6月3日 -->
+<template>
+  <div class="main-div">
+    <!--加载中-->
+    <loading :loading="loading" v-if="!modalVisible"></loading>
+    <!-- 页面区域-->
+    <DkCollapse ref="collapse" @on-change="changeCollapse">
+      <!--基本信息-->
+      <DkPanel prop="essentialInformation" id="essentialInformation">
+        <DkForm slot="content" ref="essentialInformation" v-model="formData" style="width:100%" :colCount="4">
+
+          <!--合同编号-->
+          <DkFormItem title="合同编号" prop="staffName" :required="true" v-model="formData.staffName"
+                      :readonly="readonly"></DkFormItem>
+
+          <!--开货日期-->
+          <DkFormItem title="开货日期" prop="staffBirthday" v-model="formData.staffBirthday" :readonly="readonly"
+                      :type="$config.formItemType.date" :dataType="$config.formItemType.date">
+          </DkFormItem>
+
+          <!-- 类型 -->
+          <DkFormItem prop="flgDisabilityName" title="类型" v-model="formData.flgDisability" :readonly="readonly"
+                      :type="$config.formItemType.select" :option-list="flgDisabilityList" :dataType="'boolean'"
+                      :multiple="false" labelKey="dataValue" valueKey="dataId">
+          </DkFormItem>
+
+          <!-- 销售员 -->
+          <DkFormItem prop="flgDisabilityName" title="销售员" v-model="formData.flgDisability" :readonly="readonly"
+                      :type="$config.formItemType.select" :option-list="sellStaffList" :dataType="'boolean'"
+                      :multiple="false" labelKey="dataValue" valueKey="dataId">
+          </DkFormItem>
+
+          <!-- 买方 -->
+          <DkFormItem prop="flgDisabilityName" title="买方" v-model="formData.flgDisability" :readonly="readonly"
+                      :type="$config.formItemType.select" :option-list="buyerList" :dataType="'boolean'"
+                      :multiple="false" labelKey="dataValue" valueKey="dataId">
+          </DkFormItem>
+
+          <!-- 卖方 -->
+          <DkFormItem prop="flgDisabilityName" title="卖方" v-model="formData.flgDisability" :readonly="readonly"
+                      :type="$config.formItemType.select" :option-list="sellerList" :dataType="'boolean'"
+                      :multiple="false" labelKey="dataValue" valueKey="dataId">
+          </DkFormItem>
+          <!-- 金额合计 -->
+          <DkFormItem title="金额合计" prop="金额合计"  :dataType="$config.dataType.number"  v-model="formData.staffAddress" :readonly="readonly"></DkFormItem>
+
+          <!-- 件数合计 -->
+          <DkFormItem title="件数合计" prop="件数合计"  :dataType="$config.dataType.number"  v-model="formData.staffAddress" :readonly="readonly"></DkFormItem>
+          <!-- 重量合计 -->
+          <DkFormItem title="重量合计" prop="重量合计"  :dataType="$config.dataType.number"  v-model="formData.staffAddress" :readonly="readonly"></DkFormItem>
+
+          <!-- 利息 -->
+          <DkFormItem title="利息" prop="利息"  :dataType="$config.dataType.number"  v-model="formData.staffAddress" :readonly="readonly"></DkFormItem>
+        </DkForm>
+      </DkPanel>
+      <!--销售资源-->
+      <DkPanel prop="销售资源" id="workInformation">
+        <div slot="content">
+          <EditTable
+            ref="contactName1"
+            :height="300"
+            :financeFlag="true"
+            :pageFlag="true"
+            :pageTotal="pageTotal"
+            v-model="formData.skuData"
+            :columns="editTableColumns"
+            :childCols="childCols"
+            @pageChange="pageSizeChange"
+            @operate-click="handleOperateClick"
+          ></EditTable>
+
+        </div>
+      </DkPanel>
+
+
+      <!--附件-->
+      <DkPanel prop="files" :right-btns="fileRightBtns" @on-click="handleClickBtn" :readonly="readonly">
+        <div id="search-cond-div-files-info" ref="search-cond-div-files-info"
+             slot="content">
+          <DkPicWall v-model="formData.annexPaths"
+                     :table="$config.tables.staff" :accept="$config.uploadFileConfig.acceptPicType"
+                     :format="['jpg','jpeg','png']"></DkPicWall>
+        </div>
+      </DkPanel>
+    </DkCollapse>
+    <!--      下部分按钮区域-->
+    <DkSaveButton ref="saveButton" :loading="loading" :validFormRefs="validFormRefs" @save="saveValidData"
+                  @close="close"></DkSaveButton>
+  </div>
+</template>
+
+<script>
+import {formMixin} from '@/mixins/form'
+
+export default {
+  mixins: [formMixin],
+  data() {
+    let self = this
+    return {
+      validFormRefs: ['essentialInformation', 'workInformation', 'openAccount'],
+      roleRequiredFlag: true,//角色必填标识
+      hrStatusList: [],
+      // 画面表单数据
+      roleIds: null,//编辑用
+      saveRoleIds: null,//编辑用
+      formData: {
+        staffId: null,//员工id
+        staffCode: null,//员工工号
+        staffName: null,//员工编码
+        staffPhone: null,//联系电话
+        staffCardid: null,//身份证号
+        staffSex: null,//员工性别
+        staffBirthday: null,//出生日期
+        maritalStatus: null,//婚姻状态
+        staffQualification: null,//员工学历
+        emergencyContacts: null,//紧急联系人
+        emergencyContactPhone: null,//紧急联系人电话
+        flgDisability: false,//是否残疾职工
+        staffAddress: null,//员工地址
+        // 附件
+        annexPaths: null,
+        limitEdit: true,//小编辑标识 true不是 false是
+        ctrCpId: self.$store.state.user.ctrCpId,//公司Id
+        ownCpId: self.type === self.$config.formMode.add ? self.$store.state.user.cpId : null,//公司Id
+        ownCpName: self.type === self.$config.formMode.add ? self.$store.state.user.cpName : null,//公司名称
+        orgId: null,//部门Id
+        orgName: null,//部门名称
+        jobId: null,//职位Id
+        postId: null,//岗位Id
+        hrStatus: this.$config.hrStatusSql.onTheJob,//在职状态
+        hrEntryDate: null,//入职日期
+        hrOfficeDate: null,//转正日期
+        hrDepartDate: null,//离职日期
+        bankName: null,//银行名称
+        bankBranch: null,//开户银行
+        bankCardno: null,//银行账号
+        flgApplyOpen: true,//开通账号标识
+        remarks: null,//备注
+
+        openStatus: self.$config.openStatusSql.open,//账号开通状态
+        roleIds: null,//角色Id
+        userPhone: null,//登录账号
+        roleNames: null,//角色名称
+      },
+      flgDisabilityList: [
+        {dataId: true, dataValue: '点价销售'},
+        {dataId: false, dataValue: '点价销售'}
+      ],//类型
+      sellStaffList: [
+        {dataId: true, dataValue: '销售员小张'},
+        {dataId: false, dataValue: '销售员小李'}
+      ],//销售员
+      buyerList: [
+        {dataId: true, dataValue: '客户张经理'},
+        {dataId: false, dataValue: '客户李经理'}
+      ],//买方
+      sellerList: [
+        {dataId: true, dataValue: '广州雨田'},
+        {dataId: false, dataValue: '郑州嘉丰'}
+      ],//卖方
+      //岗位List
+      jobList: [],
+      //职位List
+      postList: [],
+      rightBtns: [{code: 'auth'}], //开通账号右侧按钮列表
+      //可以编辑标识
+      fileRightBtns: [{code: 'scanCodeUpload'},],//附件右侧按钮
+      //上一次选择的公司
+      lastCp: {
+        cpId: self.type === self.$config.formMode.add ? self.$store.state.user.cpId : null,
+        cpName: self.type === self.$config.formMode.add ? self.$store.state.user.cpName : null
+      },
+      openAuthFlag: false,//跳转授权页面标识
+      //--------
+      pageTotal: null,
+      editTableColumns: [
+        // { field: 'expand', type: 'table', childTableWidth: 1000 },
+        {  title:'品类', field: 'skuModel', type: 'disabled'},// 商品型号
+        {field: 'nonstdParamsShow', title:'当前仓库',  type: 'select', width: '300px', required: true},
+        {
+          title:'编码',
+          field: 'skuCode',
+          controlId: 'invId',
+          type: 'tableSelect',
+          treeNode: true,
+          width: 200,
+          dataType: self.$config.tableSelectType.invGoods,
+          fieldUpdate: self.$updateColumns.outGoodsColumns,
+          searchDetailFlag: true
+        },// 商品编码
+        {  title:'年份', field: 'skuName', type: 'disabled'},// 商品型号
+        {  title:'件数',field: 'whpId', type: 'disabled', width: 'auto'},// 商品名称
+        {  title:'重量', field: 'skuModel3', type: 'disabled'},// 商品型号
+        {  title:'单位',field: 'skuNam1e', type: 'disabled', width: 'auto'},// 商品名称
+        {  title:'点单价',field: 'skuNa1me', type: 'disabled', width: 'auto'},// 商品名称
+        {  title:'基差',field: 'sk1uName1', type: 'disabled', width: 'auto'},// 商品名称
+        {  title:'运费',field: 'skuN11ame', type: 'disabled', width: 'auto'},// 商品名称
+        {  title:'结算单价',field: 'sk22uName', type: 'disabled', width: 'auto'},// 商品名称
+        {  title:'结算金额',field: '33', type: 'disabled', width: 'auto'},// 商品名称
+        {  title:'利息',field: '44', type: 'disabled', width: 'auto'},// 商品名称
+        {  title:'备注',field: '44', type: 'disabled', width: 'auto'},// 商品名称
+      ],
+
+      childCols: [
+        {field: 'skuCode'},
+        {field: 'skuModel', type: 'disabled'},
+        {field: 'skuName', type: 'disabled'},
+        {field: 'amount', title: '变更加价金额', type: 'number'}],
+    }
+  },
+  methods: {
+
+    /**
+     * @desc   : desc
+     * @author : 王英杰
+     * @date   : 2025/6/3 9:55
+     */
+    handleOperateClick(item, row) {
+      let childData = row.childData || []
+      let cRow = {...this.newRow}
+      let num = Math.random()
+      cRow.skuCode = cRow.skuCode + num
+      cRow.skuModel = cRow.skuModel + num
+      cRow.skuName = cRow.skuName + num
+      childData.push(cRow)
+      this.$set(row, 'childData', childData)
+    },
+    /**
+     *   @desc   : EditTable 点击事件
+     *   @date   : 2025/3/5 14:46
+     *   @author : 寇珊珊
+     */
+    chooseCompany(e) {
+      if (typeof e != 'object') {
+        return
+      }
+      if (e && this.lastCp) {
+        if (this.formData.orgId || this.formData.roleIds) {
+          this.$IBMessage({
+              content: this.$t('Q_016'),
+              title: this.$t('systemQuestion')
+            },
+            {
+              ok: () => {
+                this.formData.orgId = null
+                this.formData.orgName = null
+                this.formData.roleIds = null
+                this.formData.roleName = null
+                this.lastCp = e
+              },
+              cancel: () => {
+                this.formData.ownCpId = this.lastCp.cpId
+                this.formData.ownCpName = this.lastCp.cpName
+                this.$refs.ownCpId.$refs.prepend.$refs.content.selectedValue = this.lastCp.cpName
+              }
+            })
+        } else {
+          this.lastCp = e
+        }
+      } else if (!e && this.lastCp) {
+        this.formData.ownCpId = this.lastCp.cpId
+        this.formData.ownCpName = this.lastCp.cpName
+        this.$refs.ownCpId.$refs.prepend.$refs.content.selectedValue = this.lastCp.cpName
+      } else if (e && !this.lastCp) {
+        this.lastCp = e
+      }
+    },
+    /**
+     *   @desc   : DkPanel组件右侧按钮点击回调
+     *   @date   : 2024/11/14 15:22
+     *   @author : 寇珊珊
+     */
+    handleClickBtn(e) {
+      switch (e.code) {
+        // 扫码上传
+        case 'scanCodeUpload':
+          let data = [{
+            title: this.$t('files'),
+            code: 'annexPaths'
+          }]
+          // 开启扫码上传
+          this.openWxUpload('staff', data)
+          break
+      }
+    },
+    /**
+     *   @desc   : 加载数据
+     *   @date   : 2024/3/14 8:47
+     *   @author : 寇珊珊
+     */
+    initData() {
+      //获取岗位
+      this.getJob()
+      //获取职位
+      this.getPost()
+    },
+    //获取岗位
+    getJob() {
+      let params = {
+        cpId: this.formData.ownCpdId ? this.formData.ownCpdId : this.$store.state.user.cpId
+      }
+      return this.excute(this.$service.commonService, this.$service.commonService.getJob, params).then(res => {
+        this.jobList = res.data
+      })
+    },
+    //获取职位
+    getPost() {
+      let params = {
+        cpId: this.formData.ownCpdId ? this.formData.ownCpdId : this.$store.state.user.cpId
+      }
+      return this.excute(this.$service.commonService, this.$service.commonService.getPost, params).then(res => {
+        this.postList = res.data
+      })
+    },
+    /**
+     *   @desc   : 基础信息员工电话失焦事件
+     *   @date   : 2024/10/17 9:46
+     *   @author : 寇珊珊
+     */
+    onBlurStaffPhone(e) {
+      if (e && e.target.value) {
+        this.formData.userPhone = this.formData.staffPhone
+      }
+    },
+    /**
+     * @desc   : 身份证变化事件
+     * @author : 洪旭东
+     * @date   : 2025-03-07 16:39
+     */
+    changeStaffCardid(e) {
+      // 身份证校验, 替换e中非数字和字母
+      this.formData.staffCardid = e.target.value.replace(/[^0-9a-zA-Z]/g, '')
+    },
+    /**
+     *   @desc   : 申请账号标识改变事件
+     *   @date   : 2025/2/17 9:07
+     *   @author : 寇珊珊
+     */
+    changeFlgApplyOpen(value) {
+      //账号开通状态-已开通
+      if (this.formData.openStatus && value) {
+        this.formData.openStatus = this.$config.openStatusSql.open
+        this.roleRequiredFlag = true
+      }
+      //账号开通状态-未开通
+      else if (this.formData.openStatus && !value) {
+        this.formData.openStatus = this.$config.openStatusSql.notActivated
+        this.formData.roleIds = []
+        this.formData.roleName = null
+        this.roleRequiredFlag = false
+      }
+    },
+    /**
+     *   @desc   : 账号开通状态 选择事件
+     *   @date   : 2024/10/17 10:32
+     *   @author : 寇珊珊
+     */
+    changeOpenStatus(value) {
+      this.formData.openStatus = value.kindCode
+      if (this.formData.openStatus === this.$config.openStatusSql.notActivated) {
+        this.roleRequiredFlag = false
+        this.formData.roleIds = null
+        this.formData.roleName = null
+      }
+    },
+    /**
+     *   @desc   : 选择角色事件
+     *   @date   : 2024/10/29 9:50
+     *   @author : 寇珊珊
+     */
+    chooseRoles(e) {
+      if (e && e.length > 0) {
+        this.formData.roleNames = e.map(map => map.roleName).toString()
+      }
+    },
+    /**
+     *   @desc   : 保存校验
+     *   @date   : 2025/4/24 15:41
+     *   @author : 寇珊珊
+     */
+    saveValidData() {
+      if (this.type === this.$config.formMode.edit) {
+        this.saveRoleIds = this.formData.roleIds
+        let isEqual = this.areArraysEqual(this.saveRoleIds, this.roleIds)
+        if (!isEqual) {
+          this.$IBMessage({
+              content: this.$t('Q_002', {'param': this.$v('changeRole')})
+                + '\n ' + this.$t('W_209'),
+              title: this.$t('systemQuestion')
+            },
+            {
+              ok: () => {
+                this.save()
+              },
+            })
+        } else {
+          this.save()
+        }
+      } else {
+        this.save()
+      }
+    },
+    validData() {
+      //入职日期不能大于转正日期
+      if (this.formData.hrEntryDate && this.formData.hrOfficeDate) {
+        let entryDate = this.formData.hrEntryDate.getTime()
+        let officeDate = this.formData.hrOfficeDate.getTime()
+        if (entryDate > officeDate) {
+          this.$Message.warning(this.$t('W_112'))
+          return false
+        }
+      }
+      return true
+    },
+    /**
+     *   @desc   : 参数赋值
+     *   @date   : 2024/3/14 10:36
+     *   @author : 寇珊珊
+     */
+    setParams() {
+      let params = JSON.parse(JSON.stringify(this.formData))
+      // params = Object.assign(this.formData,this.formData, this.formData)
+      //开通标识为true  开通状态为空
+      if (params.flgApplyOpen && params.openStatus == null) {
+        //未开通
+        params.openStatus = this.$config.openStatus.noOpenAccount
+      }
+      //开通状态
+      if (!params.flgApplyOpen && params.openStatus == null) {
+        //未开通
+        params.openStatus = this.$config.openStatus.noOpenAccount
+      }
+      //员工生日
+      if (params.staffBirthday) {
+        params.staffBirthday = new Date(params.staffBirthday).format('yyyy-MM-dd')
+      }
+      //入职日期
+      if (params.hrEntryDate) {
+        params.hrEntryDate = new Date(params.hrEntryDate).format('yyyy-MM-dd')
+      }
+      //转正日期
+      if (params.hrOfficeDate) {
+        params.hrOfficeDate = new Date(params.hrOfficeDate).format('yyyy-MM-dd')
+      }
+      //离职日期
+      if (params.hrDepartDate) {
+        params.hrDepartDate = new Date(params.hrDepartDate).format('yyyy-MM-dd')
+      }
+      this.params = params;
+    },
+    /**
+     *   @desc   : 保存数据
+     *   @date   : 2024/3/14 10:32
+     *   @author : 寇珊珊
+     */
+    saveData() {
+      //测试留档,等待测试通过后删除
+      console.log("保存数据", this.params)
+      //新建
+      if (this.type === this.$config.formMode.add || this.type === this.$config.formMode.copy) {
+        return this.excute(this.$service.staffService, this.$service.staffService.insert, this.params)
+      }
+      //编辑
+      else if (this.type === this.$config.formMode.edit) {
+        return this.excute(this.$service.staffService, this.$service.staffService.update, this.params)
+      }
+    },
+    /**
+     *   @desc   : 保存完毕后清空窗体
+     *   @date   : 2024/3/14 13:53
+     *   @author : 寇珊珊
+     */
+    clear() {
+      this.$refs['essentialInformation'].resetFields()
+      this.$refs['workInformation'].resetFields()
+      this.$refs['openAccount'].resetFields()
+    },
+    /**
+     *   @desc   : 通过id查询
+     *   @date   : 2024/3/14 16:29
+     *   @author : 寇珊珊
+     */
+    detail(id) {
+      return this.excuteNoParam(this.$service.staffService, this.$service.staffService.selectById, [id], false);
+    },
+    /**
+     *   @desc   : 编辑页面赋值
+     *   @date   : 2024/3/14 16:42
+     *   @author : 寇珊珊
+     */
+    setValuesByEdit(data) {
+      if (data) {
+        this.formData = data
+        this.roleIds = data.roleIds
+      }
+      if (this.type === this.$config.formMode.copy) {
+        this.formData.staffCode = this.$t('codeRemark')
+        this.formData.staffId = null
+        this.formData.userId = null
+      }
+    },
+    /**
+     *   @desc   : 账号授权
+     *   @date   : 2024/10/17 11:42
+     *   @author : 寇珊珊
+     */
+    rightBtnsClick() {
+      //开通账号未开通
+      if (this.formData.openStatus === this.$config.openStatusSql.notActivated) {
+        this.$Message.error(this.$t('W_155'))
+        return
+      }
+      //调用保存
+      if (this.$refs.saveButton && this.$refs.saveButton.$refs.save) {
+        this.openAuthFlag = true
+        this.$refs.saveButton.$refs.save[0].$el.click();
+      }
+    },
+    /**
+     *   @desc   : 保存后后续操作方法
+     *   @date   : 2024/10/29 11:36
+     *   @author : 寇珊珊
+     */
+    areArraysEqual(arr1, arr2) {
+      if (arr1.length !== arr2.length) return false;
+      return JSON.stringify([...arr1].sort()) === JSON.stringify([...arr2].sort());
+    },
+    handleSaveData(data) {
+      //false  不一致
+      let isEqual = this.areArraysEqual(this.saveRoleIds, this.roleIds)
+      if (this.openAuthFlag || !isEqual) {
+        if (data) {
+          this.openAuthFlag = false
+          let params = {
+            id: data.staffId,
+            roleIds: data.roleIds
+          }
+          //打开员工授权页面
+          this.open(this.$config.routeUrl[this.routeObjName]['auth'], params)
+        }
+      }
+    }
+  },
+  created() {
+    this.focusItem = 'staffId';    // 给第一个组件赋值,可以在混入中自动去聚焦
+    this.primaryKey = 'staffId'  // 设置主键Id
+    //设置默认值
+    this.routeObjName = 'staff'  // 设置路由名称
+    this.formData.staffCode = this.$t('codeRemark')
+  },
+  mounted() {
+    //添加身份证校验
+    const validateIdno = (rule, value, callback) => {
+      if (value && value.length != 18) {
+        callback(new Error(this.$t('W_072', {'param1': this.$t('staffCardid'), "param2": "18"})));
+      }
+      callback()
+    }
+    this.$refs.essentialInformation.setItemRule({prop: 'staffCardid', rule: {validator: validateIdno, trigger: 'blur'}})
+  }
+}
+</script>
+
+<style>
+
+</style>

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

@@ -22,7 +22,7 @@
       </template>
       <template #right>
         <!--   新建     -->
-        <BaseIndexButton right-button="warehouse-management-add" ref="add" name="add"></BaseIndexButton>
+        <BaseIndexButton right-button="basis-sales-order-add" ref="add" name="add"></BaseIndexButton>
       </template>
     </BaseIndexButtonGroup>
 
@@ -55,51 +55,28 @@
                  :pageSize="pageInfo.pageSize"
         >
           <!--  商品编号  -->
-          <DkTableColumn field="ownCpName" title="基差单号"></DkTableColumn>
+          <DkTableColumn field="contractNumber" title="合同编号"></DkTableColumn>
           <!--  商品名称  -->
-          <DkTableColumn field="staffCode" title="交易类型"></DkTableColumn>
+          <DkTableColumn field="goodsIssueDate" title="开货日期"></DkTableColumn>
           <!--  规格型号  -->
-          <DkTableColumn field="staffName" type="link" title="点价类型"
-                         @on-link="handleLink(Object.assign($event,{button:'edit'}))"></DkTableColumn>
+          <DkTableColumn field="type"  title="类型" ></DkTableColumn>
           <!--  计量单位  -->
-          <DkTableColumn field="staffPhone"   title="期货合约关联"></DkTableColumn>
+          <DkTableColumn field="salesperson"   title="销售员"></DkTableColumn>
           <!--  仓库名称  -->
-          <DkTableColumn field="orgName"  title="基差价格"></DkTableColumn>
+          <DkTableColumn field="buyer"  title="买方"></DkTableColumn>
           <!--  存放货位  -->
-          <DkTableColumn field="postName" title="点价有效期"></DkTableColumn>
+          <DkTableColumn field="seller" title="卖方"></DkTableColumn>
           <!--  供应商  -->
-          <DkTableColumn field="jobName" title="点价状态"></DkTableColumn>
+          <DkTableColumn field="totalAmount" title="金额合计"></DkTableColumn>
           <!--  采购人  -->
-          <DkTableColumn field="openStatusName" title="现货价格计算"/>
+          <DkTableColumn field="totalPieces" title="件数合计"/>
           <!--  备注  -->
-          <DkTableColumn field="roleName" title="履约保证金"></DkTableColumn>
+          <DkTableColumn field="duplicateTotal" title="重复合计"></DkTableColumn>
+          <DkTableColumn field="interest" 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"  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>
-        </DkForm>
-      </DkModal>
     </div>
 
 
@@ -117,24 +94,156 @@ export default {
   mixins: [indexMixin],
   data() {
     return  {
+       tableData : [
+        {
+          staffId: 6001,
+          contractNumber: 'HT-20240801-001',
+          goodsIssueDate: '2024-08-05',
+          type: '销售合同',
+          salesperson: '张压',
+          buyer: '郑州纺织有限公司',
+          seller: '新疆棉业集团',
+          totalAmount: 925000,
+          totalPieces: 50,
+          duplicateTotal: 0,
+          interest: 0
+        },
+        {
+          staffId: 6002,
+          contractNumber: 'HT-20240801-002',
+          goodsIssueDate: '2024-08-06',
+          type: '采购合同',
+          salesperson: '李安德',
+          buyer: '上海贸易公司',
+          seller: '山东鲁棉集团',
+          totalAmount: 570000,
+          totalPieces: 30,
+          duplicateTotal: 0,
+          interest: 0
+        },
+        {
+          staffId: 6003,
+          contractNumber: 'HT-20240801-003',
+          goodsIssueDate: '2024-08-07',
+          type: '加工合同',
+          salesperson: '王周星',
+          buyer: '浙江印染厂',
+          seller: '江苏华棉纺织',
+          totalAmount: 376000,
+          totalPieces: 20,
+          duplicateTotal: 0,
+          interest: 0
+        },
+        {
+          staffId: 6004,
+          contractNumber: 'HT-20240801-004',
+          goodsIssueDate: '2024-08-08',
+          type: '销售合同',
+          salesperson: '赵传',
+          buyer: '广东服装公司',
+          seller: '湖北银丰棉花',
+          totalAmount: 728000,
+          totalPieces: 40,
+          duplicateTotal: 0,
+          interest: 0
+        },
+        {
+          staffId: 6005,
+          contractNumber: 'HT-20240801-005',
+          goodsIssueDate: '2024-08-09',
+          type: '采购合同',
+          salesperson: '钱展',
+          buyer: '天津纺织集团',
+          seller: '河北新乐市棉花公司',
+          totalAmount: 292500,
+          totalPieces: 15,
+          duplicateTotal: 0,
+          interest: 0
+        },
+        {
+          staffId: 6006,
+          contractNumber: 'HT-20240801-006',
+          goodsIssueDate: '2024-08-10',
+          type: '服务合同',
+          salesperson: '孙权',
+          buyer: '郑州仓储公司',
+          seller: '安徽辉隆农业',
+          totalAmount: 465000,
+          totalPieces: 25,
+          duplicateTotal: 0,
+          interest: 0
+        },
+        {
+          staffId: 6007,
+          contractNumber: 'HT-20240801-007',
+          goodsIssueDate: '2024-08-11',
+          type: '销售合同',
+          salesperson: '周详',
+          buyer: '青岛纺织有限公司',
+          seller: '新疆生产建设兵团棉麻公司',
+          totalAmount: 661500,
+          totalPieces: 35,
+          duplicateTotal: 0,
+          interest: 0
+        },
+        {
+          staffId: 6008,
+          contractNumber: 'HT-20240801-008',
+          goodsIssueDate: '2024-08-12',
+          type: '采购合同',
+          salesperson: '吴雷',
+          buyer: '张家港贸易公司',
+          seller: '河南豫棉集团有限公司',
+          totalAmount: 1086000,
+          totalPieces: 60,
+          duplicateTotal: 0,
+          interest: 0
+        },
+        {
+          staffId: 6009,
+          contractNumber: 'HT-20240801-009',
+          goodsIssueDate: '2024-08-13',
+          type: '租赁合同',
+          salesperson: '郑制',
+          buyer: '武汉仓储公司',
+          seller: '湖南云锦集团股份有限公司',
+          totalAmount: 198000,
+          totalPieces: 10,
+          duplicateTotal: 0,
+          interest: 0
+        },
+        {
+          staffId: 6010,
+          contractNumber: 'HT-20240801-010',
+          goodsIssueDate: '2024-08-14',
+          type: '销售合同',
+          salesperson: '王赞',
+          buyer: '南京纺织有限公司',
+          seller: '江西赣棉集团有限公司',
+          totalAmount: 823500,
+          totalPieces: 45,
+          duplicateTotal: 0,
+          interest: 0
+        }
+      ],
       //查询条件
       searchContent: [
         {
           //公司名称
           itemCode: 'cpIds',
-          title: '商品编号',
+          title: '合同编号',
 
           required: true
         },
         {
           //员工工号
           itemCode: 'staffCode',
-          title: '商品名称',
+          title: '开货日期',
         },
         {
           //员工名称
           itemCode: 'staffName',
-          title: '规格型号',
+          title: '类型',
         },
 
 
@@ -143,6 +252,7 @@ export default {
         staffCode: null,//员工工号
         staffName: null,//员工编码
       },
+
     }
   },
   methods: {

+ 18 - 0
src/view/mst/sales-management/sales-order-management/orther-sales-order/add.vue

@@ -0,0 +1,18 @@
+<template>
+  <CommonForm type="add"></CommonForm>
+</template>
+
+<script>
+import CommonForm from "./form";
+
+export default {
+  name: "staff-add",
+  components: {
+    CommonForm
+  },
+}
+</script>
+
+<style scoped>
+
+</style>

+ 18 - 0
src/view/mst/sales-management/sales-order-management/orther-sales-order/edit.vue

@@ -0,0 +1,18 @@
+<template>
+  <CommonForm type="edit"></CommonForm>
+</template>
+
+<script>
+import CommonForm from "./form";
+
+export default {
+  name: "staff-edit",
+  components: {
+    CommonForm
+  },
+}
+</script>
+
+<style scoped>
+
+</style>

+ 566 - 0
src/view/mst/sales-management/sales-order-management/orther-sales-order/form.vue

@@ -0,0 +1,566 @@
+<!-- @desc:基差销售单 @auth:王英杰 @time :2025年6月3日 -->
+<template>
+  <div class="main-div">
+    <!--加载中-->
+    <loading :loading="loading" v-if="!modalVisible"></loading>
+    <!-- 页面区域-->
+    <DkCollapse ref="collapse" @on-change="changeCollapse">
+      <!--基本信息-->
+      <DkPanel prop="essentialInformation" id="essentialInformation">
+        <DkForm slot="content" ref="essentialInformation" v-model="formData" style="width:100%" :colCount="4">
+
+          <!--合同编号-->
+          <DkFormItem title="合同编号" prop="staffName" :required="true" v-model="formData.staffName"
+                      :readonly="readonly"></DkFormItem>
+
+          <!--开货日期-->
+          <DkFormItem title="开货日期" prop="staffBirthday" v-model="formData.staffBirthday" :readonly="readonly"
+                      :type="$config.formItemType.date" :dataType="$config.formItemType.date">
+          </DkFormItem>
+
+          <!-- 类型 -->
+          <DkFormItem prop="flgDisabilityName" title="类型" v-model="formData.flgDisability" :readonly="readonly"
+                      :type="$config.formItemType.select" :option-list="flgDisabilityList" :dataType="'boolean'"
+                      :multiple="false" labelKey="dataValue" valueKey="dataId">
+          </DkFormItem>
+
+          <!-- 销售员 -->
+          <DkFormItem prop="flgDisabilityName" title="销售员" v-model="formData.flgDisability" :readonly="readonly"
+                      :type="$config.formItemType.select" :option-list="sellStaffList" :dataType="'boolean'"
+                      :multiple="false" labelKey="dataValue" valueKey="dataId">
+          </DkFormItem>
+
+          <!-- 买方 -->
+          <DkFormItem prop="flgDisabilityName" title="买方" v-model="formData.flgDisability" :readonly="readonly"
+                      :type="$config.formItemType.select" :option-list="buyerList" :dataType="'boolean'"
+                      :multiple="false" labelKey="dataValue" valueKey="dataId">
+          </DkFormItem>
+
+          <!-- 卖方 -->
+          <DkFormItem prop="flgDisabilityName" title="卖方" v-model="formData.flgDisability" :readonly="readonly"
+                      :type="$config.formItemType.select" :option-list="sellerList" :dataType="'boolean'"
+                      :multiple="false" labelKey="dataValue" valueKey="dataId">
+          </DkFormItem>
+          <!-- 金额合计 -->
+          <DkFormItem title="金额合计" prop="金额合计"  :dataType="$config.dataType.number"  v-model="formData.staffAddress" :readonly="readonly"></DkFormItem>
+
+          <!-- 件数合计 -->
+          <DkFormItem title="件数合计" prop="件数合计"  :dataType="$config.dataType.number"  v-model="formData.staffAddress" :readonly="readonly"></DkFormItem>
+          <!-- 重量合计 -->
+          <DkFormItem title="重量合计" prop="重量合计"  :dataType="$config.dataType.number"  v-model="formData.staffAddress" :readonly="readonly"></DkFormItem>
+
+          <!-- 利息 -->
+          <DkFormItem title="利息" prop="利息"  :dataType="$config.dataType.number"  v-model="formData.staffAddress" :readonly="readonly"></DkFormItem>
+        </DkForm>
+      </DkPanel>
+      <!--销售资源-->
+      <DkPanel prop="销售资源" id="workInformation">
+        <div slot="content">
+          <EditTable
+            ref="contactName1"
+            :height="300"
+            :financeFlag="true"
+            :pageFlag="true"
+            :pageTotal="pageTotal"
+            v-model="formData.skuData"
+            :columns="editTableColumns"
+            :childCols="childCols"
+            @pageChange="pageSizeChange"
+            @operate-click="handleOperateClick"
+          ></EditTable>
+
+        </div>
+      </DkPanel>
+
+
+      <!--附件-->
+      <DkPanel prop="files" :right-btns="fileRightBtns" @on-click="handleClickBtn" :readonly="readonly">
+        <div id="search-cond-div-files-info" ref="search-cond-div-files-info"
+             slot="content">
+          <DkPicWall v-model="formData.annexPaths"
+                     :table="$config.tables.staff" :accept="$config.uploadFileConfig.acceptPicType"
+                     :format="['jpg','jpeg','png']"></DkPicWall>
+        </div>
+      </DkPanel>
+    </DkCollapse>
+    <!--      下部分按钮区域-->
+    <DkSaveButton ref="saveButton" :loading="loading" :validFormRefs="validFormRefs" @save="saveValidData"
+                  @close="close"></DkSaveButton>
+  </div>
+</template>
+
+<script>
+import {formMixin} from '@/mixins/form'
+
+export default {
+  mixins: [formMixin],
+  data() {
+    let self = this
+    return {
+      validFormRefs: ['essentialInformation', 'workInformation', 'openAccount'],
+      roleRequiredFlag: true,//角色必填标识
+      hrStatusList: [],
+      // 画面表单数据
+      roleIds: null,//编辑用
+      saveRoleIds: null,//编辑用
+      formData: {
+        staffId: null,//员工id
+        staffCode: null,//员工工号
+        staffName: null,//员工编码
+        staffPhone: null,//联系电话
+        staffCardid: null,//身份证号
+        staffSex: null,//员工性别
+        staffBirthday: null,//出生日期
+        maritalStatus: null,//婚姻状态
+        staffQualification: null,//员工学历
+        emergencyContacts: null,//紧急联系人
+        emergencyContactPhone: null,//紧急联系人电话
+        flgDisability: false,//是否残疾职工
+        staffAddress: null,//员工地址
+        // 附件
+        annexPaths: null,
+        limitEdit: true,//小编辑标识 true不是 false是
+        ctrCpId: self.$store.state.user.ctrCpId,//公司Id
+        ownCpId: self.type === self.$config.formMode.add ? self.$store.state.user.cpId : null,//公司Id
+        ownCpName: self.type === self.$config.formMode.add ? self.$store.state.user.cpName : null,//公司名称
+        orgId: null,//部门Id
+        orgName: null,//部门名称
+        jobId: null,//职位Id
+        postId: null,//岗位Id
+        hrStatus: this.$config.hrStatusSql.onTheJob,//在职状态
+        hrEntryDate: null,//入职日期
+        hrOfficeDate: null,//转正日期
+        hrDepartDate: null,//离职日期
+        bankName: null,//银行名称
+        bankBranch: null,//开户银行
+        bankCardno: null,//银行账号
+        flgApplyOpen: true,//开通账号标识
+        remarks: null,//备注
+
+        openStatus: self.$config.openStatusSql.open,//账号开通状态
+        roleIds: null,//角色Id
+        userPhone: null,//登录账号
+        roleNames: null,//角色名称
+      },
+      flgDisabilityList: [
+        {dataId: true, dataValue: '点价销售'},
+        {dataId: false, dataValue: '点价销售'}
+      ],//类型
+      sellStaffList: [
+        {dataId: true, dataValue: '销售员小张'},
+        {dataId: false, dataValue: '销售员小李'}
+      ],//销售员
+      buyerList: [
+        {dataId: true, dataValue: '客户张经理'},
+        {dataId: false, dataValue: '客户李经理'}
+      ],//买方
+      sellerList: [
+        {dataId: true, dataValue: '广州雨田'},
+        {dataId: false, dataValue: '郑州嘉丰'}
+      ],//卖方
+      //岗位List
+      jobList: [],
+      //职位List
+      postList: [],
+      rightBtns: [{code: 'auth'}], //开通账号右侧按钮列表
+      //可以编辑标识
+      fileRightBtns: [{code: 'scanCodeUpload'},],//附件右侧按钮
+      //上一次选择的公司
+      lastCp: {
+        cpId: self.type === self.$config.formMode.add ? self.$store.state.user.cpId : null,
+        cpName: self.type === self.$config.formMode.add ? self.$store.state.user.cpName : null
+      },
+      openAuthFlag: false,//跳转授权页面标识
+      //--------
+      pageTotal: null,
+      editTableColumns: [
+        // { field: 'expand', type: 'table', childTableWidth: 1000 },
+        {  title:'品类', field: 'skuModel', type: 'disabled'},// 商品型号
+        {field: 'nonstdParamsShow', title:'当前仓库',  type: 'select', width: '300px', required: true},
+        {
+          title:'编码',
+          field: 'skuCode',
+          controlId: 'invId',
+          type: 'tableSelect',
+          treeNode: true,
+          width: 200,
+          dataType: self.$config.tableSelectType.invGoods,
+          fieldUpdate: self.$updateColumns.outGoodsColumns,
+          searchDetailFlag: true
+        },// 商品编码
+        {  title:'年份', field: 'skuName', type: 'disabled'},// 商品型号
+        {  title:'件数',field: 'whpId', type: 'disabled', width: 'auto'},// 商品名称
+        {  title:'重量', field: 'skuModel3', type: 'disabled'},// 商品型号
+        {  title:'单位',field: 'skuNam1e', type: 'disabled', width: 'auto'},// 商品名称
+        {  title:'点单价',field: 'skuNa1me', type: 'disabled', width: 'auto'},// 商品名称
+        {  title:'基差',field: 'sk1uName1', type: 'disabled', width: 'auto'},// 商品名称
+        {  title:'运费',field: 'skuN11ame', type: 'disabled', width: 'auto'},// 商品名称
+        {  title:'结算单价',field: 'sk22uName', type: 'disabled', width: 'auto'},// 商品名称
+        {  title:'结算金额',field: '33', type: 'disabled', width: 'auto'},// 商品名称
+        {  title:'利息',field: '44', type: 'disabled', width: 'auto'},// 商品名称
+        {  title:'备注',field: '44', type: 'disabled', width: 'auto'},// 商品名称
+      ],
+
+      childCols: [
+        {field: 'skuCode'},
+        {field: 'skuModel', type: 'disabled'},
+        {field: 'skuName', type: 'disabled'},
+        {field: 'amount', title: '变更加价金额', type: 'number'}],
+    }
+  },
+  methods: {
+
+    /**
+     * @desc   : desc
+     * @author : 王英杰
+     * @date   : 2025/6/3 9:55
+     */
+    handleOperateClick(item, row) {
+      let childData = row.childData || []
+      let cRow = {...this.newRow}
+      let num = Math.random()
+      cRow.skuCode = cRow.skuCode + num
+      cRow.skuModel = cRow.skuModel + num
+      cRow.skuName = cRow.skuName + num
+      childData.push(cRow)
+      this.$set(row, 'childData', childData)
+    },
+    /**
+     *   @desc   : EditTable 点击事件
+     *   @date   : 2025/3/5 14:46
+     *   @author : 寇珊珊
+     */
+    chooseCompany(e) {
+      if (typeof e != 'object') {
+        return
+      }
+      if (e && this.lastCp) {
+        if (this.formData.orgId || this.formData.roleIds) {
+          this.$IBMessage({
+              content: this.$t('Q_016'),
+              title: this.$t('systemQuestion')
+            },
+            {
+              ok: () => {
+                this.formData.orgId = null
+                this.formData.orgName = null
+                this.formData.roleIds = null
+                this.formData.roleName = null
+                this.lastCp = e
+              },
+              cancel: () => {
+                this.formData.ownCpId = this.lastCp.cpId
+                this.formData.ownCpName = this.lastCp.cpName
+                this.$refs.ownCpId.$refs.prepend.$refs.content.selectedValue = this.lastCp.cpName
+              }
+            })
+        } else {
+          this.lastCp = e
+        }
+      } else if (!e && this.lastCp) {
+        this.formData.ownCpId = this.lastCp.cpId
+        this.formData.ownCpName = this.lastCp.cpName
+        this.$refs.ownCpId.$refs.prepend.$refs.content.selectedValue = this.lastCp.cpName
+      } else if (e && !this.lastCp) {
+        this.lastCp = e
+      }
+    },
+    /**
+     *   @desc   : DkPanel组件右侧按钮点击回调
+     *   @date   : 2024/11/14 15:22
+     *   @author : 寇珊珊
+     */
+    handleClickBtn(e) {
+      switch (e.code) {
+        // 扫码上传
+        case 'scanCodeUpload':
+          let data = [{
+            title: this.$t('files'),
+            code: 'annexPaths'
+          }]
+          // 开启扫码上传
+          this.openWxUpload('staff', data)
+          break
+      }
+    },
+    /**
+     *   @desc   : 加载数据
+     *   @date   : 2024/3/14 8:47
+     *   @author : 寇珊珊
+     */
+    initData() {
+      //获取岗位
+      this.getJob()
+      //获取职位
+      this.getPost()
+    },
+    //获取岗位
+    getJob() {
+      let params = {
+        cpId: this.formData.ownCpdId ? this.formData.ownCpdId : this.$store.state.user.cpId
+      }
+      return this.excute(this.$service.commonService, this.$service.commonService.getJob, params).then(res => {
+        this.jobList = res.data
+      })
+    },
+    //获取职位
+    getPost() {
+      let params = {
+        cpId: this.formData.ownCpdId ? this.formData.ownCpdId : this.$store.state.user.cpId
+      }
+      return this.excute(this.$service.commonService, this.$service.commonService.getPost, params).then(res => {
+        this.postList = res.data
+      })
+    },
+    /**
+     *   @desc   : 基础信息员工电话失焦事件
+     *   @date   : 2024/10/17 9:46
+     *   @author : 寇珊珊
+     */
+    onBlurStaffPhone(e) {
+      if (e && e.target.value) {
+        this.formData.userPhone = this.formData.staffPhone
+      }
+    },
+    /**
+     * @desc   : 身份证变化事件
+     * @author : 洪旭东
+     * @date   : 2025-03-07 16:39
+     */
+    changeStaffCardid(e) {
+      // 身份证校验, 替换e中非数字和字母
+      this.formData.staffCardid = e.target.value.replace(/[^0-9a-zA-Z]/g, '')
+    },
+    /**
+     *   @desc   : 申请账号标识改变事件
+     *   @date   : 2025/2/17 9:07
+     *   @author : 寇珊珊
+     */
+    changeFlgApplyOpen(value) {
+      //账号开通状态-已开通
+      if (this.formData.openStatus && value) {
+        this.formData.openStatus = this.$config.openStatusSql.open
+        this.roleRequiredFlag = true
+      }
+      //账号开通状态-未开通
+      else if (this.formData.openStatus && !value) {
+        this.formData.openStatus = this.$config.openStatusSql.notActivated
+        this.formData.roleIds = []
+        this.formData.roleName = null
+        this.roleRequiredFlag = false
+      }
+    },
+    /**
+     *   @desc   : 账号开通状态 选择事件
+     *   @date   : 2024/10/17 10:32
+     *   @author : 寇珊珊
+     */
+    changeOpenStatus(value) {
+      this.formData.openStatus = value.kindCode
+      if (this.formData.openStatus === this.$config.openStatusSql.notActivated) {
+        this.roleRequiredFlag = false
+        this.formData.roleIds = null
+        this.formData.roleName = null
+      }
+    },
+    /**
+     *   @desc   : 选择角色事件
+     *   @date   : 2024/10/29 9:50
+     *   @author : 寇珊珊
+     */
+    chooseRoles(e) {
+      if (e && e.length > 0) {
+        this.formData.roleNames = e.map(map => map.roleName).toString()
+      }
+    },
+    /**
+     *   @desc   : 保存校验
+     *   @date   : 2025/4/24 15:41
+     *   @author : 寇珊珊
+     */
+    saveValidData() {
+      if (this.type === this.$config.formMode.edit) {
+        this.saveRoleIds = this.formData.roleIds
+        let isEqual = this.areArraysEqual(this.saveRoleIds, this.roleIds)
+        if (!isEqual) {
+          this.$IBMessage({
+              content: this.$t('Q_002', {'param': this.$v('changeRole')})
+                + '\n ' + this.$t('W_209'),
+              title: this.$t('systemQuestion')
+            },
+            {
+              ok: () => {
+                this.save()
+              },
+            })
+        } else {
+          this.save()
+        }
+      } else {
+        this.save()
+      }
+    },
+    validData() {
+      //入职日期不能大于转正日期
+      if (this.formData.hrEntryDate && this.formData.hrOfficeDate) {
+        let entryDate = this.formData.hrEntryDate.getTime()
+        let officeDate = this.formData.hrOfficeDate.getTime()
+        if (entryDate > officeDate) {
+          this.$Message.warning(this.$t('W_112'))
+          return false
+        }
+      }
+      return true
+    },
+    /**
+     *   @desc   : 参数赋值
+     *   @date   : 2024/3/14 10:36
+     *   @author : 寇珊珊
+     */
+    setParams() {
+      let params = JSON.parse(JSON.stringify(this.formData))
+      // params = Object.assign(this.formData,this.formData, this.formData)
+      //开通标识为true  开通状态为空
+      if (params.flgApplyOpen && params.openStatus == null) {
+        //未开通
+        params.openStatus = this.$config.openStatus.noOpenAccount
+      }
+      //开通状态
+      if (!params.flgApplyOpen && params.openStatus == null) {
+        //未开通
+        params.openStatus = this.$config.openStatus.noOpenAccount
+      }
+      //员工生日
+      if (params.staffBirthday) {
+        params.staffBirthday = new Date(params.staffBirthday).format('yyyy-MM-dd')
+      }
+      //入职日期
+      if (params.hrEntryDate) {
+        params.hrEntryDate = new Date(params.hrEntryDate).format('yyyy-MM-dd')
+      }
+      //转正日期
+      if (params.hrOfficeDate) {
+        params.hrOfficeDate = new Date(params.hrOfficeDate).format('yyyy-MM-dd')
+      }
+      //离职日期
+      if (params.hrDepartDate) {
+        params.hrDepartDate = new Date(params.hrDepartDate).format('yyyy-MM-dd')
+      }
+      this.params = params;
+    },
+    /**
+     *   @desc   : 保存数据
+     *   @date   : 2024/3/14 10:32
+     *   @author : 寇珊珊
+     */
+    saveData() {
+      //测试留档,等待测试通过后删除
+      console.log("保存数据", this.params)
+      //新建
+      if (this.type === this.$config.formMode.add || this.type === this.$config.formMode.copy) {
+        return this.excute(this.$service.staffService, this.$service.staffService.insert, this.params)
+      }
+      //编辑
+      else if (this.type === this.$config.formMode.edit) {
+        return this.excute(this.$service.staffService, this.$service.staffService.update, this.params)
+      }
+    },
+    /**
+     *   @desc   : 保存完毕后清空窗体
+     *   @date   : 2024/3/14 13:53
+     *   @author : 寇珊珊
+     */
+    clear() {
+      this.$refs['essentialInformation'].resetFields()
+      this.$refs['workInformation'].resetFields()
+      this.$refs['openAccount'].resetFields()
+    },
+    /**
+     *   @desc   : 通过id查询
+     *   @date   : 2024/3/14 16:29
+     *   @author : 寇珊珊
+     */
+    detail(id) {
+      return this.excuteNoParam(this.$service.staffService, this.$service.staffService.selectById, [id], false);
+    },
+    /**
+     *   @desc   : 编辑页面赋值
+     *   @date   : 2024/3/14 16:42
+     *   @author : 寇珊珊
+     */
+    setValuesByEdit(data) {
+      if (data) {
+        this.formData = data
+        this.roleIds = data.roleIds
+      }
+      if (this.type === this.$config.formMode.copy) {
+        this.formData.staffCode = this.$t('codeRemark')
+        this.formData.staffId = null
+        this.formData.userId = null
+      }
+    },
+    /**
+     *   @desc   : 账号授权
+     *   @date   : 2024/10/17 11:42
+     *   @author : 寇珊珊
+     */
+    rightBtnsClick() {
+      //开通账号未开通
+      if (this.formData.openStatus === this.$config.openStatusSql.notActivated) {
+        this.$Message.error(this.$t('W_155'))
+        return
+      }
+      //调用保存
+      if (this.$refs.saveButton && this.$refs.saveButton.$refs.save) {
+        this.openAuthFlag = true
+        this.$refs.saveButton.$refs.save[0].$el.click();
+      }
+    },
+    /**
+     *   @desc   : 保存后后续操作方法
+     *   @date   : 2024/10/29 11:36
+     *   @author : 寇珊珊
+     */
+    areArraysEqual(arr1, arr2) {
+      if (arr1.length !== arr2.length) return false;
+      return JSON.stringify([...arr1].sort()) === JSON.stringify([...arr2].sort());
+    },
+    handleSaveData(data) {
+      //false  不一致
+      let isEqual = this.areArraysEqual(this.saveRoleIds, this.roleIds)
+      if (this.openAuthFlag || !isEqual) {
+        if (data) {
+          this.openAuthFlag = false
+          let params = {
+            id: data.staffId,
+            roleIds: data.roleIds
+          }
+          //打开员工授权页面
+          this.open(this.$config.routeUrl[this.routeObjName]['auth'], params)
+        }
+      }
+    }
+  },
+  created() {
+    this.focusItem = 'staffId';    // 给第一个组件赋值,可以在混入中自动去聚焦
+    this.primaryKey = 'staffId'  // 设置主键Id
+    //设置默认值
+    this.routeObjName = 'staff'  // 设置路由名称
+    this.formData.staffCode = this.$t('codeRemark')
+  },
+  mounted() {
+    //添加身份证校验
+    const validateIdno = (rule, value, callback) => {
+      if (value && value.length != 18) {
+        callback(new Error(this.$t('W_072', {'param1': this.$t('staffCardid'), "param2": "18"})));
+      }
+      callback()
+    }
+    this.$refs.essentialInformation.setItemRule({prop: 'staffCardid', rule: {validator: validateIdno, trigger: 'blur'}})
+  }
+}
+</script>
+
+<style>
+
+</style>

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

@@ -55,24 +55,26 @@
                  :pageSize="pageInfo.pageSize"
         >
           <!--  商品编号  -->
-          <DkTableColumn field="ownCpName" title="销售单号"></DkTableColumn>
+          <DkTableColumn field="salesOrderNumber" title="销售单号"></DkTableColumn>
           <!--  商品名称  -->
-          <DkTableColumn field="staffCode" title="销售类型"></DkTableColumn>
+          <DkTableColumn field="salesType" title="销售类型"></DkTableColumn>
           <!--  规格型号  -->
-          <DkTableColumn field="staffName" type="link" title="订单日期"
-                         @on-link="handleLink(Object.assign($event,{button:'edit'}))"></DkTableColumn>
+          <DkTableColumn field="orderDate"  title="订单日期" ></DkTableColumn>
           <!--  计量单位  -->
-          <DkTableColumn field="staffPhone"   title="客户名称"></DkTableColumn>
+          <DkTableColumn field="customerName"   title="客户名称"></DkTableColumn>
           <!--  仓库名称  -->
-          <DkTableColumn field="orgName"  title="业务员"></DkTableColumn>
+          <DkTableColumn field="salesAgent"  title="业务员"></DkTableColumn>
+          <DkTableColumn field="buyer"  title="买方"></DkTableColumn>
           <!--  存放货位  -->
-          <DkTableColumn field="postName" title="皮棉等级 / 规格"></DkTableColumn>
+          <DkTableColumn field="seller" title="卖方"></DkTableColumn>
+          <!--  存放货位  -->
+          <DkTableColumn field="lintGradeAndSpec" title="皮棉等级 / 规格"></DkTableColumn>
           <!--  供应商  -->
-          <DkTableColumn field="jobName" title="销售数量"></DkTableColumn>
+          <DkTableColumn field="salesQuantity" title="销售数量"></DkTableColumn>
           <!--  采购人  -->
-          <DkTableColumn field="openStatusName" title="单价"/>
+          <DkTableColumn field="unitPrice" title="单价"/>
           <!--  备注  -->
-          <DkTableColumn field="roleName" title="总金额"></DkTableColumn>
+          <DkTableColumn field="totalAmount" title="总金额"></DkTableColumn>
 
 
         </DkTable>
@@ -94,6 +96,10 @@
           <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>
+          <!--  仓库名称  -->
+          <DkTableColumn field="buyer"  title="买方"></DkTableColumn>
+          <!--  存放货位  -->
+          <DkTableColumn field="seller" title="卖方"></DkTableColumn>
           <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>
@@ -117,6 +123,148 @@ export default {
   mixins: [indexMixin],
   data() {
     return  {
+       tableData : [
+        {
+          staffId: 7001,
+          salesOrderNumber: 'SO-20240901-001',
+          salesType: '现货销售',
+          orderDate: '2024-09-01',
+          customerName: '郑州纺织有限公司',
+          salesAgent: '张区时',
+          lintGradeAndSpec: '细绒棉/328级',
+          buyer: '郑州纺织有限公司',
+          seller: '新疆棉业集团',
+          salesQuantity: 50, // 单位:吨
+          unitPrice: 18500,
+          totalAmount: 925000
+        },
+        {
+          staffId: 7002,
+          salesOrderNumber: 'SO-20240901-002',
+          salesType: '期货销售',
+          orderDate: '2024-09-02',
+          customerName: '上海贸易公司',
+          salesAgent: '李斯达',
+          buyer: '上海贸易公司',
+          seller: '山东鲁棉集团',
+          lintGradeAndSpec: '长绒棉/137级',
+          salesQuantity: 30,
+          unitPrice: 19000,
+          totalAmount: 570000
+        },
+        {
+          staffId: 7003,
+          salesOrderNumber: 'SO-20240901-003',
+          salesType: '加工销售',
+          orderDate: '2024-09-03',
+          customerName: '浙江印染厂',
+          salesAgent: '王信',
+          buyer: '浙江印染厂',
+          seller: '江苏华棉纺织',
+          lintGradeAndSpec: '细绒棉/229级',
+          salesQuantity: 20,
+          unitPrice: 18800,
+          totalAmount: 376000
+        },
+        {
+          staffId: 7004,
+          salesOrderNumber: 'SO-20240901-004',
+          salesType: '现货销售',
+          orderDate: '2024-09-04',
+          customerName: '广东服装公司',
+          salesAgent: '赵斯',
+          buyer: '广东服装公司',
+          seller: '湖北银丰棉花',
+          lintGradeAndSpec: '细绒棉/428级',
+          salesQuantity: 40,
+          unitPrice: 18200,
+          totalAmount: 728000
+        },
+        {
+          staffId: 7005,
+          salesOrderNumber: 'SO-20240901-005',
+          salesType: '出口销售',
+          orderDate: '2024-09-05',
+          customerName: '天津纺织集团',
+          salesAgent: '钱行政',
+          buyer: '天津纺织集团',
+          seller: '河北新乐市棉花公司',
+          lintGradeAndSpec: '细绒棉/527级',
+          salesQuantity: 15,
+          unitPrice: 19500,
+          totalAmount: 292500
+        },
+        {
+          staffId: 7006,
+          salesOrderNumber: 'SO-20240901-006',
+          salesType: '内贸销售',
+          orderDate: '2024-09-06',
+          customerName: '郑州仓储公司',
+          salesAgent: '孙程',
+          buyer: '郑州仓储公司',
+          seller: '安徽辉隆农业',
+          lintGradeAndSpec: '-', // 服务类无具体规格
+          salesQuantity: 25, // 单位:批次
+          unitPrice: 18600,
+          totalAmount: 465000
+        },
+        {
+          staffId: 7007,
+          salesOrderNumber: 'SO-20240901-007',
+          salesType: '现货销售',
+          orderDate: '2024-09-07',
+          customerName: '青岛纺织有限公司',
+          salesAgent: '周欧',
+          buyer: '青岛纺织有限公司',
+          seller: '新疆生产建设兵团棉麻公司',
+          lintGradeAndSpec: '长绒棉/136级',
+          salesQuantity: 35,
+          unitPrice: 18900,
+          totalAmount: 661500
+        },
+        {
+          staffId: 7008,
+          salesOrderNumber: 'SO-20240901-008',
+          salesType: '期货销售',
+          orderDate: '2024-09-08',
+          customerName: '张家港贸易公司',
+          salesAgent: '吴群',
+          buyer: '张家港贸易公司',
+          seller: '河南豫棉集团有限公司',
+          lintGradeAndSpec: '细绒棉/327级',
+          salesQuantity: 60,
+          unitPrice: 18100,
+          totalAmount: 1086000
+        },
+        {
+          staffId: 7009,
+          salesOrderNumber: 'SO-20240901-009',
+          salesType: '租赁销售',
+          orderDate: '2024-09-09',
+          customerName: '武汉仓储公司',
+          buyer: '张家港贸易公司',
+          seller: '河南豫棉集团有限公司',
+          salesAgent: '郑周星',
+          lintGradeAndSpec: '-', // 租赁类无具体规格
+          salesQuantity: 10, // 单位:月
+          unitPrice: 19800,
+          totalAmount: 198000
+        },
+        {
+          staffId: 7010,
+          salesOrderNumber: 'SO-20240901-010',
+          salesType: '现货销售',
+          orderDate: '2024-09-10',
+          customerName: '南京纺织有限公司',
+          buyer: '张家港贸易公司',
+          seller: '河南豫棉集团有限公司',
+          salesAgent: '王尺',
+          lintGradeAndSpec: '细绒棉/328级',
+          salesQuantity: 45,
+          unitPrice: 18300,
+          totalAmount: 823500
+        }
+      ],
       //查询条件
       searchContent: [
         {

Alguns ficheiros não foram mostrados porque muitos ficheiros mudaram neste diff