风险管理路由 其他填充数据

src/router/routers.js

@@ -390,19 +390,6 @@ let menu = [
               menuType:1
             },
           },
-        ]
-      },
-      {
-        path: '',
-        name: '轧花厂管理',
-        menuType:0,
-        component: parentView,
-        meta: {
-          title: '轧花厂管理',
-          notCache: true,
-          menuType:0
-        },
-        children: [
           {
             path: '/mst/basic-management/cotton-ginning-mill-management/index',
             name: 'cotton-ginning-mill-management',
@@ -415,19 +402,6 @@ let menu = [
               menuType:1
             },
           },
-        ]
-      },
-      {
-        path: '',
-        name: '行政区域管理',
-        menuType:0,
-        component: parentView,
-        meta: {
-          title: '行政区域管理',
-          notCache: true,
-          menuType:0
-        },
-        children: [
           {
             path: '/mst/basic-management/administrative-region-management/index',
             name: 'administrative-region-management',
@@ -440,19 +414,6 @@ let menu = [
               menuType:1,
             },
           },
-        ]
-      },
-      {
-        path: '',
-        name: '供应商管理',
-        menuType:0,
-        component: parentView,
-        meta: {
-          title: '供应商管理',
-          notCache: true,
-          menuType:0
-        },
-        children: [
           {
             path: '/mst/basic-management/supplier-management/index',
             name: 'supplier-management',
@@ -465,19 +426,6 @@ let menu = [
               menuType:1,
             },
           },
-        ]
-      },
-      {
-        path: '',
-        name: '客户管理',
-        menuType:0,
-        component: parentView,
-        meta: {
-          title: '客户管理',
-          notCache: true,
-          menuType:0
-        },
-        children: [
           {
             path: '/mst/basic-management/customer-management/index',
             name: 'customer-management',
@@ -492,6 +440,7 @@ let menu = [
           },
         ]
       },
+
     ]
   },
   {
@@ -724,25 +673,37 @@ let menu = [
           {
             path: '/mst/sales-management/interest-management/index',
             name: 'interest-management',
-            component: () => import('@/view/mst/sales-management/interest-management/lock-bdi-management/index.vue'),
+            component: () => import('@/view/mst/sales-management/interest-management/index.vue'),
             menuType:1,
             meta: {
-              title: '锁基差利息管理',
+              title: '销售单利息管理',
               notCache: false,
               flgRight: true,
               menuType:1
             },
           },
           {
+            path: '/mst/sales-management/interest-management/lock-bdi-management/index',
+            name: 'lock-bdi-management/',
+            component: () => import('@/view/mst/sales-management/interest-management/lock-bdi-management/index.vue'),
+
+            meta: {
+              title: '锁基差利息管理',
+              notCache: false,
+              flgRight: true,
+              menuType:2
+            },
+          },
+          {
             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: {
               title: '超期利息管理',
               notCache: false,
               flgRight: true,
-              menuType:1
+              menuType:2
             },
           },
 

src/view/common/home/home-admin.vue

@@ -17,10 +17,10 @@
               <div class="upcoming-card" @click="openDrawer($config.homeDrawType.waitAudit)">
                 <div class="upcoming-card-icon">
                   <img :src="require('@/assets/images/menu-image/' + 'web-order-pending.png')"
-                       style="width: 40px;height: 40px;"/>
+                       style="width: 60px;height: 60px;"/>
                 </div>
                 <div class="upcoming-card-text">
-                  <div>
+                  <div  class="upcoming-card-text-one">
                     加工概况
                   </div>
                   <div>
@@ -34,10 +34,10 @@
               <div class="upcoming-card" @click="openDrawer($config.homeDrawType.waitAudit)">
                 <div class="upcoming-card-icon">
                   <img :src="require('@/assets/images/menu-image/' + 'web-order-pending.png')"
-                       style="width: 40px;height: 40px;"/>
+                       style="width: 60px;height: 60px;"/>
                 </div>
                 <div class="upcoming-card-text">
-                  <div>
+                  <div class="upcoming-card-text-one">
                     入库总量
                   </div>
                   <div>
@@ -53,10 +53,10 @@
               <div class="upcoming-card" @click="openDrawer($config.homeDrawType.waitAudit)">
                 <div class="upcoming-card-icon">
                   <img :src="require('@/assets/images/menu-image/' + 'web-order-pending.png')"
-                       style="width: 40px;height: 40px;"/>
+                       style="width: 60px;height: 60px;"/>
                 </div>
                 <div class="upcoming-card-text">
-                  <div>
+                  <div  class="upcoming-card-text-one">
                     公检总量
                   </div>
                   <div>
@@ -72,10 +72,10 @@
               <div class="upcoming-card" @click="openDrawer($config.homeDrawType.waitAudit)">
                 <div class="upcoming-card-icon">
                   <img :src="require('@/assets/images/menu-image/' + 'web-order-pending.png')"
-                       style="width: 40px;height: 40px;"/>
+                       style="width: 60px;height: 60px;"/>
                 </div>
                 <div class="upcoming-card-text">
-                  <div>
+                  <div  class="upcoming-card-text-one">
                     地区入库
                   </div>
                   <div>
@@ -115,11 +115,11 @@
               <div style="font-size: 16px;color: black">昨日轧花厂入库Top20</div>
               <div style="display: flex;padding: 5px;font-weight: 700;color: gray">
                 <div style="flex: 2">厂名</div>
-                <div  style="flex: 1">批数</div>
-                <div  style="flex: 1"> 毛重（吨）</div>
+                <div style="flex: 1">批数</div>
+                <div style="flex: 1"> 毛重（吨）</div>
               </div>
               <div style="width: 100%;height: 1px;background: #dedede;margin: 10px 0"></div>
-              <div  style="width: 100%;text-align: center;margin: 30px 0">暂无数据</div>
+              <div style="width: 100%;text-align: center;margin: 30px 0">暂无数据</div>
               <div style="width: 100%;height: 1px;background: #dedede;margin: 10px 0"></div>
             </div>
           </Card>
@@ -128,11 +128,11 @@
               <div style="font-size: 16px;color: black">昨日仓库入库Top20</div>
               <div style="display: flex;padding: 5px;font-weight: 700;color: gray">
                 <div style="flex: 2">仓库名</div>
-                <div  style="flex: 1">批数</div>
-                <div  style="flex: 1"> 毛重（吨）</div>
+                <div style="flex: 1">批数</div>
+                <div style="flex: 1"> 毛重（吨）</div>
               </div>
               <div style="width: 100%;height: 1px;background: #dedede;margin: 10px 0"></div>
-              <div  style="width: 100%;text-align: center;margin: 30px 0">暂无数据</div>
+              <div style="width: 100%;text-align: center;margin: 30px 0">暂无数据</div>
               <div style="width: 100%;height: 1px;background: #dedede;margin: 10px 0"></div>
             </div>
           </Card>
@@ -141,11 +141,11 @@
               <div style="font-size: 16px;color: black">昨日地区入库</div>
               <div style="display: flex;padding: 5px;font-weight: 700;color: gray">
                 <div style="flex: 2">地区</div>
-                <div  style="flex: 1">批数</div>
-                <div  style="flex: 1"> 毛重（吨）</div>
+                <div style="flex: 1">批数</div>
+                <div style="flex: 1"> 毛重（吨）</div>
               </div>
               <div style="width: 100%;height: 1px;background: #dedede;margin: 10px 0"></div>
-              <div  style="width: 100%;text-align: center;margin: 30px 0">暂无数据</div>
+              <div style="width: 100%;text-align: center;margin: 30px 0">暂无数据</div>
               <div style="width: 100%;height: 1px;background: #dedede;margin: 10px 0"></div>
             </div>
           </Card>
@@ -1492,6 +1492,8 @@ export default {
   overflow-x: auto;
   transition: scrollLeft 2s;
   padding-bottom: 10px;
+  scrollbar-width: none;
+  -ms-overflow-style: none;
 
   .upcoming-card {
     display: flex;
@@ -1516,16 +1518,20 @@ export default {
     }
 
     .upcoming-card-text {
-      flex: 2
+      flex: 3
+    }
+
+    .upcoming-card-text-one {
+      font-size: 18px;
     }
 
     .upcoming-card-text-span-large {
-      font-size: 14px;
+      font-size: 22px;
       font-weight: 700
     }
 
     .upcoming-card-text-span-small {
-      font-size: 8px;
+      font-size: 14px;
       font-weight: 700
     }
   }

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

@@ -42,7 +42,7 @@
         <DkTable :id="'table-'+$options.name"
                  ref="table-select"
                  :data="tableData"
-                 :height="tableHeight-60"
+                 :height="tableHeight-30"
                  primaryKey="staffId"
                  :multiple="false"
                  :choose-flag="false"
@@ -83,20 +83,12 @@
                       :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 prop="region" :readonly="readonly" :title="$t('地址')"  :defaultValue="formData.addressFull" v-model="formData.region" :required="true"
+                      @on-change="chooseAddress" :type="$config.formItemType.region" :data-type="$config.dataType.object">
           </DkFormItem>
 
-          <DkFormItem prop="remarks"  title="详细地址"  v-model="formData.fullAddress" :readonly="readonly">  </DkFormItem>
+
           <DkFormItem prop="remarks"  title="邮编"  v-model="formData.zip" :readonly="readonly">  </DkFormItem>
 
         </DkForm>
@@ -242,6 +234,28 @@ export default {
   },
   methods: {
     /**
+     * @desc   : 地址改变事件
+     * @author : 王英杰
+     * @date   : 2025/6/9 13:39
+     */
+    chooseAddress(value) {
+      // 说明是清空
+      if (!value) {
+        this.formData.addressName = null;
+        this.formData.addressFull = null;
+        this.formData.addressGcj02 = {};
+        this.formData.addressArea = {};
+        this.formData.addressNo = null;
+      } else {
+        //按照title进行
+        this.formData.addressName = value.addressName;
+        this.formData.addressGcj02 = value.addressGcj02;
+        this.formData.addressArea = value.addressArea;
+        this.formData.addressNo = value.addressNo;
+        this.formData.addressFull = value.addressFull ;
+      }
+    },
+    /**
      * @desc   : 点击预览页当前行
      * @author : 王英杰
      * @date   : 2025/5/28 14:41

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

@@ -42,7 +42,7 @@
         <DkTable :id="'table-'+$options.name"
                  ref="table-select"
                  :data="tableData"
-                 :height="tableHeight-60"
+                 :height="tableHeight-30"
                  primaryKey="staffId"
                  :multiple="false"
                  :choose-flag="false"
@@ -59,24 +59,23 @@
           <!--  商品名称  -->
           <DkTableColumn field="region" title="所属地区"></DkTableColumn>
           <!--  规格型号  -->
-          <DkTableColumn field="staffName" type="link" title="负责人 / 联系方式"
-                         @on-link="handleLink(Object.assign($event,{button:'edit'}))"></DkTableColumn>
+          <DkTableColumn field="staffName"  title="负责人 / 联系方式"   ></DkTableColumn>
           <!--  计量单位  -->
-          <DkTableColumn field="amountProcessingOnDay"   title="当日加工量"></DkTableColumn>
+          <DkTableColumn field="amountProcessingOnDay" data-type="number"  title="当日加工量"></DkTableColumn>
           <!--  仓库名称  -->
-          <DkTableColumn field="cumulativeProcessingVolume"  title="累计加工量"></DkTableColumn>
+          <DkTableColumn field="cumulativeProcessingVolume" data-type="number" title="累计加工量"></DkTableColumn>
           <!--  存放货位  -->
-          <DkTableColumn field="lintOutput" title="皮棉产出量"></DkTableColumn>
+          <DkTableColumn field="lintOutput" data-type="number" title="皮棉产出量"></DkTableColumn>
           <!--  供应商  -->
-          <DkTableColumn field="cottonseedProduction" title="棉籽产出量"></DkTableColumn>
+          <DkTableColumn field="cottonseedProduction" data-type="number" title="棉籽产出量"></DkTableColumn>
           <!--  采购人  -->
           <DkTableColumn field="operatingStatusDevice" title="设备运行状态"/>
           <!--  备注  -->
-          <DkTableColumn field="seedCottonStocks" title="籽棉库存"></DkTableColumn>
-          <DkTableColumn field="inventoryPackagingMaterials" title="包装材料库存"></DkTableColumn>
+          <DkTableColumn field="seedCottonStocks" data-type="number" title="籽棉库存"></DkTableColumn>
+          <DkTableColumn field="inventoryPackagingMaterials" data-type="number" title="包装材料库存"></DkTableColumn>
           <DkTableColumn field="proportionLintGrade" title="皮棉等级占比"></DkTableColumn>
           <DkTableColumn field="impurityMoistureRegain" title="含杂率 / 回潮率"></DkTableColumn>
-          <DkTableColumn field="machiningLossRate" title="加工损耗率"></DkTableColumn>
+          <DkTableColumn field="machiningLossRate" data-type="number" title="加工损耗率"></DkTableColumn>
 
 
         </DkTable>
@@ -94,7 +93,10 @@
         <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="region" :readonly="readonly" :title="$t('所属地区')"  :defaultValue="formData.addressFull" v-model="formData.region" :required="true"
+                      @on-change="chooseAddress" :type="$config.formItemType.region" :data-type="$config.dataType.object">
+          </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>
@@ -327,6 +329,28 @@ export default {
   },
   methods: {
     /**
+     * @desc   : 地址改变事件
+     * @author : 王英杰
+     * @date   : 2025/6/9 13:39
+     */
+    chooseAddress(value) {
+      // 说明是清空
+      if (!value) {
+        this.formData.addressName = null;
+        this.formData.addressFull = null;
+        this.formData.addressGcj02 = {};
+        this.formData.addressArea = {};
+        this.formData.addressNo = null;
+      } else {
+        //按照title进行
+        this.formData.addressName = value.addressName;
+        this.formData.addressGcj02 = value.addressGcj02;
+        this.formData.addressArea = value.addressArea;
+        this.formData.addressNo = value.addressNo;
+        this.formData.addressFull = value.addressFull ;
+      }
+    },
+    /**
      * @desc   : 点击预览页当前行
      * @author : 王英杰
      * @date   : 2025/5/28 14:41

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

@@ -42,7 +42,7 @@
         <DkTable :id="'table-'+$options.name"
                  ref="table-select"
                  :data="tableData"
-                 :height="tableHeight-60"
+                 :height="tableHeight-30"
                  primaryKey="staffId"
                  :multiple="false"
                  :choose-flag="false"
@@ -82,16 +82,12 @@
       >
         <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>
+          <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>
@@ -116,19 +112,18 @@ export default {
         {
           //公司名称
           itemCode: 'cpIds',
-          title: '商品编号',
-
+          title: '名称',
           required: true
         },
         {
           //员工工号
           itemCode: 'staffCode',
-          title: '商品名称',
+          title: '联系人',
         },
         {
           //员工名称
           itemCode: 'staffName',
-          title: '规格型号',
+          title: '电话',
         },
 
 

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

@@ -42,7 +42,7 @@
         <DkTable :id="'table-'+$options.name"
                  ref="table-select"
                  :data="tableData"
-                 :height="tableHeight-60"
+                 :height="tableHeight-30"
                  primaryKey="staffId"
                  :multiple="false"
                  :choose-flag="false"
@@ -83,15 +83,12 @@
         <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>
+          <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>

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

@@ -42,7 +42,7 @@
         <DkTable :id="'table-'+$options.name"
                  ref="table-select"
                  :data="tableData"
-                 :height="tableHeight-60"
+                 :height="tableHeight-30"
                  primaryKey="staffId"
                  :multiple="false"
                  :choose-flag="false"
@@ -82,16 +82,11 @@
                       :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 prop="region" :readonly="readonly" :title="$t('whpAddress')"  :defaultValue="formData.addressFull" v-model="formData.region" :required="true"
+                      @on-change="chooseAddress" :type="$config.formItemType.region" :data-type="$config.dataType.object">
           </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>
@@ -122,19 +117,19 @@ export default {
         {
           //公司名称
           itemCode: 'cpIds',
-          title: '商品编号',
+          title: '仓库名',
 
           required: true
         },
         {
           //员工工号
           itemCode: 'staffCode',
-          title: '商品名称',
+          title: '联系人',
         },
         {
           //员工名称
           itemCode: 'staffName',
-          title: '规格型号',
+          title: '手机号',
         },
 
 
@@ -278,6 +273,28 @@ export default {
     }
   },
   methods: {
+  /**
+      * @desc   : 地址改变事件
+      * @author : 王英杰
+      * @date   : 2025/6/9 13:39
+      */
+    chooseAddress(value) {
+      // 说明是清空
+      if (!value) {
+        this.formData.addressName = null;
+        this.formData.addressFull = null;
+        this.formData.addressGcj02 = {};
+        this.formData.addressArea = {};
+        this.formData.addressNo = null;
+      } else {
+        //按照title进行
+        this.formData.addressName = value.addressName;
+        this.formData.addressGcj02 = value.addressGcj02;
+        this.formData.addressArea = value.addressArea;
+        this.formData.addressNo = value.addressNo;
+        this.formData.addressFull = value.addressFull ;
+      }
+    },
     /**
       * @desc   : 点击预览页当前行
       * @author : 王英杰

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

@@ -42,7 +42,7 @@
         <DkTable :id="'table-'+$options.name"
                  ref="table-select"
                  :data="tableData"
-                 :height="tableHeight-60"
+                 :height="tableHeight-30"
                  primaryKey="staffId"
                  :multiple="false"
                  :choose-flag="false"
@@ -52,22 +52,21 @@
                  @pageChange="pageSizeChange"
                  :pageSizeOpts="pageSizeOpts"
                  :current-page="pageInfo.currentPage"  >
-          <DkTableColumn field="batchNumber" title="批号"></DkTableColumn>
+          <DkTableColumn field="batchNumber" type="link"  title="批号"></DkTableColumn>
           <vxe-colgroup title="郑棉">
             <!--  ="郑棉-升贴水  -->
             <DkTableColumn field="zhengMianBasisPriceAdjustment" title="升贴水"></DkTableColumn>
           </vxe-colgroup>
           <vxe-colgroup title="棉协11月">
             <!--  ="郑棉-升贴水  -->
-            <DkTableColumn field="cottonAssociationBasisPriceAdjustment" title="升贴水"></DkTableColumn>
+            <DkTableColumn  dataType="number"  field="cottonAssociationBasisPriceAdjustment" title="升贴水"></DkTableColumn>
           </vxe-colgroup>
           <vxe-colgroup title="Idc">
             <!--  ="郑棉-升贴水  -->
-            <DkTableColumn field="idcBasisPriceAdjustment" title="升贴水"></DkTableColumn>
+            <DkTableColumn  dataType="number"  field="idcBasisPriceAdjustment" title="升贴水"></DkTableColumn>
           </vxe-colgroup>
           <!--  规格型号  -->
-          <DkTableColumn field="foreignFiber" type="link" title="异纤"
-                         @on-link="handleLink(Object.assign($event,{button:'edit'}))"></DkTableColumn>
+          <DkTableColumn     field="foreignFiber"  dataType="number" title="异纤"   ></DkTableColumn>
           <!--  计量单位  -->
           <DkTableColumn field="warehousingDate"   title="入库日期"></DkTableColumn>
           <!--  仓库名称  -->
@@ -77,29 +76,29 @@
           <!--  供应商  -->
           <DkTableColumn field="inspectionWarehouse" title="公检仓库"></DkTableColumn>
           <!--  采购人  -->
-          <DkTableColumn field="baleCount" title="包数"/>
+          <DkTableColumn dataType="number" field="baleCount" title="包数"/>
           <!--  备注  -->
-          <DkTableColumn field="officialWeight" title="公重（t）"></DkTableColumn>
-          <DkTableColumn field="moistureRegain" title="回潮"></DkTableColumn>
-          <DkTableColumn field="impurityContent" title="含杂"></DkTableColumn>
+          <DkTableColumn dataType="number" field="officialWeight" title="公重（t）"></DkTableColumn>
+          <DkTableColumn dataType="number" field="moistureRegain" title="回潮"></DkTableColumn>
+          <DkTableColumn dataType="number" field="impurityContent" title="含杂"></DkTableColumn>
           <DkTableColumn field="colorGradeRatio" title="颜色级比例"></DkTableColumn>
           <vxe-colgroup title="长度（mm）">
             <!--  ="郑棉-升贴水  -->
-            <DkTableColumn field="lengthAverageValue" title="均值"></DkTableColumn>
+            <DkTableColumn  dataType="number" field="lengthAverageValue" title="均值"></DkTableColumn>
           </vxe-colgroup>
           <vxe-colgroup title="马值">
             <!--  ="郑棉-升贴水  -->
-            <DkTableColumn field="micronaireAverageValue" title="均值"></DkTableColumn>
+            <DkTableColumn dataType="number" field="micronaireAverageValue" title="均值"></DkTableColumn>
           </vxe-colgroup>
           <vxe-colgroup title="长度整齐度">
             <!--  ="郑棉-升贴水  -->
-            <DkTableColumn field="lengthUniformityAverageValue" title="均值"></DkTableColumn>
+            <DkTableColumn dataType="number" field="lengthUniformityAverageValue" title="均值"></DkTableColumn>
           </vxe-colgroup>
           <vxe-colgroup title="断裂比强度">
             <!--  ="郑棉-升贴水  -->
-            <DkTableColumn field="breakingTenacityAverageValue" title="均值"></DkTableColumn>
+            <DkTableColumn dataType="number" field="breakingTenacityAverageValue" title="均值"></DkTableColumn>
           </vxe-colgroup>
-          <DkTableColumn field="ginningQuality" title="轧工质量（%）"></DkTableColumn>
+          <DkTableColumn dataType="number" field="ginningQuality" title="轧工质量（%）"></DkTableColumn>
         </DkTable>
       </div>
 

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

@@ -42,7 +42,7 @@
         <DkTable :id="'table-'+$options.name"
                  ref="table-select"
                  :data="tableData"
-                 :height="tableHeight-60"
+                 :height="tableHeight-30"
                  primaryKey="staffId"
                  :multiple="false"
                  :choose-flag="false"
@@ -53,20 +53,20 @@
                  :pageSizeOpts="pageSizeOpts"
                  :current-page="pageInfo.currentPage"
                  :pageSize="pageInfo.pageSize"   >
-          <DkTableColumn  width="100" field="batchNumber" title="批号"></DkTableColumn>
+          <DkTableColumn  width="100" field="batchNumber"  type="link"  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="foreignFiber"dataType="number" 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="baleCount" width="400"dataType="number" title="包数"></DkTableColumn>
+          <DkTableColumn field="officialWeight" width="400"dataType="number"  title="公重（t）"></DkTableColumn>
+          <DkTableColumn field="moistureRegain" width="400" dataType="number" title="回潮"></DkTableColumn>
+          <DkTableColumn field="impurityContent" width="400" dataType="number" title="含杂"></DkTableColumn>
           <DkTableColumn field="colorMain" width="400" title="颜色主体"></DkTableColumn>
           <DkTableColumn field="colorGradeRatio" width="400" title="颜色级比例"></DkTableColumn>
           <vxe-colgroup title="长度（mm）">
@@ -74,15 +74,15 @@
           </vxe-colgroup>
           <vxe-colgroup title="马值">
             <DkTableColumn field="mainGrade" title="主体级"></DkTableColumn>
-            <DkTableColumn field="micronaireAverageValue" title="均值"></DkTableColumn>
+            <DkTableColumn dataType="number" field="micronaireAverageValue" title="均值"></DkTableColumn>
           </vxe-colgroup>
           <vxe-colgroup title="长度整齐度">
-            <DkTableColumn field="lengthUniformityAverageValue" title="均值"></DkTableColumn>
+            <DkTableColumn dataType="number" field="lengthUniformityAverageValue" title="均值"></DkTableColumn>
           </vxe-colgroup>
           <vxe-colgroup title="断裂比强度">
-            <DkTableColumn field="breakingTenacityAverageValue" title="均值"></DkTableColumn>
+            <DkTableColumn  dataType="number"field="breakingTenacityAverageValue" title="均值"></DkTableColumn>
           </vxe-colgroup>
-          <DkTableColumn field="ginningQuality" title="轧工质量（%）"></DkTableColumn>
+          <DkTableColumn dataType="number"field="ginningQuality" title="轧工质量（%）"></DkTableColumn>
           <DkTableColumn field="roundModule" title="圆模"></DkTableColumn>
           <DkTableColumn field="zhengMianWarehouseBill" title="郑棉仓单"></DkTableColumn>
           <DkTableColumn field="secondaryWarehousing" title="二次入库"></DkTableColumn>

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

@@ -42,7 +42,7 @@
         <DkTable :id="'table-'+$options.name"
                  ref="table-select"
                  :data="tableData"
-                 :height="tableHeight-60"
+                 :height="tableHeight-30"
                  primaryKey="staffId"
                  :multiple="false"
                  :choose-flag="false"
@@ -55,13 +55,13 @@
                  :pageSize="pageInfo.pageSize"
         >
           <!--  商品编号  -->
-          <DkTableColumn  width="100" field="batchNumber" title="批号"></DkTableColumn>
+          <DkTableColumn  width="100" field="batchNumber" type="link" title="批号"></DkTableColumn>
           <DkTableColumn field="pickPackage" title="挑包"></DkTableColumn>
           <vxe-colgroup title="郑棉">
             <!--  ="郑棉-升贴水  -->
-            <DkTableColumn field="basisPriceAdjustment" title="升贴水"></DkTableColumn>
+            <DkTableColumn dataType="number" field="basisPriceAdjustment" title="升贴水"></DkTableColumn>
           </vxe-colgroup>
-          <DkTableColumn  width="100"  field="baleCount" title="包数"></DkTableColumn>
+          <DkTableColumn  width="100"  field="baleCount" dataType="number" title="包数"></DkTableColumn>
           <DkTableColumn field="warehousingDate" title="入库日期"></DkTableColumn>
           <DkTableColumn field="certificateDate" title="证书日期"></DkTableColumn>
           <DkTableColumn field="manufacturingEnterprise" width="400" title="生产企业"></DkTableColumn>

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

@@ -28,9 +28,8 @@
             ref="contactName1"
             :height="300"
             :financeFlag="true"
-            :addFlag ="false"
-            :deleteFlag ="false"
-            :pageFlag="true"
+            :operateFlag ="false"
+            :pageFlag="false"
             :pageTotal="pageTotal"
             v-model="formData.skuData1"
             :columns="editTableColumns1"
@@ -44,9 +43,8 @@
             ref="contactName1"
             :height="300"
             :financeFlag="true"
-            :addFlag ="false"
-            :deleteFlag ="false"
-            :pageFlag="true"
+            :operateFlag ="false"
+            :pageFlag="false"
             :pageTotal="pageTotal"
             v-model="formData.skuData2"
             :columns="editTableColumns2"
@@ -60,9 +58,8 @@
             ref="contactName1"
             :height="300"
             :financeFlag="true"
-            :addFlag ="false"
-            :deleteFlag ="false"
-            :pageFlag="true"
+            :operateFlag ="false"
+            :pageFlag="false"
             :pageTotal="pageTotal"
             v-model="formData.skuData3"
             :columns="editTableColumns3"
@@ -76,9 +73,8 @@
             ref="contactName1"
             :height="300"
             :financeFlag="true"
-            :addFlag ="false"
-            :deleteFlag ="false"
-            :pageFlag="true"
+            :operateFlag ="false"
+            :pageFlag="false"
             :pageTotal="pageTotal"
             v-model="formData.skuData4"
             :columns="editTableColumns4"
@@ -92,9 +88,8 @@
             ref="contactName1"
             :height="300"
             :financeFlag="true"
-            :addFlag ="false"
-            :deleteFlag ="false"
-            :pageFlag="true"
+            :operateFlag ="false"
+            :pageFlag="false"
             :pageTotal="pageTotal"
             v-model="formData.skuData5"
             :columns="editTableColumns5"
@@ -108,9 +103,8 @@
             ref="contactName1"
             :height="300"
             :financeFlag="true"
-            :addFlag ="false"
-            :deleteFlag ="false"
-            :pageFlag="true"
+            :operateFlag ="false"
+            :pageFlag="false"
             :pageTotal="pageTotal"
             v-model="formData.skuData6"
             :columns="editTableColumns6"
@@ -124,9 +118,8 @@
             ref="contactName1"
             :height="300"
             :financeFlag="true"
-            :addFlag ="false"
-            :deleteFlag ="false"
-            :pageFlag="true"
+            :operateFlag ="false"
+            :pageFlag="false"
             :pageTotal="pageTotal"
             v-model="formData.skuData7"
             :columns="editTableColumns7"

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

@@ -15,7 +15,10 @@
           </DkFormItem>
         </DkForm>
       </DkPanel>
-      <DkTabs v-model="currentType" :options="tabsOptions"></DkTabs>
+
+      <div style="background: white;width: 100%">
+        <DkTabs v-model="currentType" :options="tabsOptions"></DkTabs>
+      </div>
       <div  v-if="currentType =='whater'">
         <!--颜色级-->
         <DkPanel title="颜色级" prop="颜色级" class="tabs-step-class" >
@@ -24,9 +27,8 @@
               ref="contactName1"
               :height="300"
               :financeFlag="true"
-              :addFlag ="false"
-              :deleteFlag ="false"
-              :pageFlag="true"
+              :operateFlag ="false"
+              :pageFlag="false"
               :pageTotal="pageTotal"
               v-model="formData.skuData1"
               :columns="editTableColumns1"
@@ -40,9 +42,8 @@
               ref="contactName1"
               :height="300"
               :financeFlag="true"
-              :addFlag ="false"
-              :deleteFlag ="false"
-              :pageFlag="true"
+              :operateFlag ="false"
+              :pageFlag="false"
               :pageTotal="pageTotal"
               v-model="formData.skuData2"
               :columns="editTableColumns2"
@@ -56,9 +57,8 @@
               ref="contactName1"
               :height="300"
               :financeFlag="true"
-              :addFlag ="false"
-              :deleteFlag ="false"
-              :pageFlag="true"
+              :operateFlag ="false"
+              :pageFlag="false"
               :pageTotal="pageTotal"
               v-model="formData.skuData3"
               :columns="editTableColumns3"
@@ -72,9 +72,8 @@
               ref="contactName1"
               :height="300"
               :financeFlag="true"
-              :addFlag ="false"
-              :deleteFlag ="false"
-              :pageFlag="true"
+              :operateFlag ="false"
+              :pageFlag="false"
               :pageTotal="pageTotal"
               v-model="formData.skuData4"
               :columns="editTableColumns4"
@@ -88,9 +87,8 @@
               ref="contactName1"
               :height="300"
               :financeFlag="true"
-              :addFlag ="false"
-              :deleteFlag ="false"
-              :pageFlag="true"
+              :operateFlag ="false"
+              :pageFlag="false"
               :pageTotal="pageTotal"
               v-model="formData.skuData5"
               :columns="editTableColumns5"
@@ -104,9 +102,8 @@
               ref="contactName1"
               :height="300"
               :financeFlag="true"
-              :addFlag ="false"
-              :deleteFlag ="false"
-              :pageFlag="true"
+              :operateFlag ="false"
+              :pageFlag="false"
               :pageTotal="pageTotal"
               v-model="formData.skuData6"
               :columns="editTableColumns6"
@@ -120,9 +117,8 @@
               ref="contactName1"
               :height="300"
               :financeFlag="true"
-              :addFlag ="false"
-              :deleteFlag ="false"
-              :pageFlag="true"
+              :operateFlag ="false"
+              :pageFlag="false"
               :pageTotal="pageTotal"
               v-model="formData.skuData7"
               :columns="editTableColumns7"

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

@@ -42,7 +42,7 @@
         <DkTable :id="'table-'+$options.name"
                  ref="table-select"
                  :data="tableData"
-                 :height="tableHeight-60"
+                 :height="tableHeight-30"
                  primaryKey="staffId"
                  :multiple="false"
                  :choose-flag="false"
@@ -55,7 +55,7 @@
                  :pageSize="pageInfo.pageSize"
         >
           <!--  商品编号  -->
-          <DkTableColumn field="contractNumber" title="合同编号"></DkTableColumn>
+          <DkTableColumn field="contractNumber" type="link" title="合同编号"></DkTableColumn>
           <!--  商品名称  -->
           <DkTableColumn field="contractType" title="合同类型"></DkTableColumn>
           <!--  规格型号  -->
@@ -63,7 +63,8 @@
           <!--  计量单位  -->
           <DkTableColumn field="signingDate"   title="签订日期"></DkTableColumn>
           <!--  仓库名称  -->
-          <DkTableColumn field="partyABName"  title="甲方 / 乙方名称"></DkTableColumn>
+          <DkTableColumn field="partyAName"  title="甲方名称"></DkTableColumn>
+          <DkTableColumn field="partyBName"  title="乙方名称"></DkTableColumn>
           <!--  存放货位  -->
           <DkTableColumn field="paymentMethod" title="付款方式"></DkTableColumn>
           <!--  供应商  -->
@@ -93,7 +94,8 @@
           <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>
@@ -125,7 +127,8 @@ export default {
           contractType: '采购合同',
           contractStatus: '已生效',
           signingDate: '2024-06-01',
-          partyABName: '甲方：新疆棉业集团<br>乙方：郑州纺织有限公司',
+          partyAName: '新疆棉业集团',
+          partyBName: '郑州纺织有限公司',
           paymentMethod: '银行转账（30%预付款）',
           marginDeposit: '50万元',
           performancePeriod: '2024-06-01至2024-12-31',
@@ -138,7 +141,8 @@ export default {
           contractType: '销售合同',
           contractStatus: '待审核',
           signingDate: '2024-06-02',
-          partyABName: '甲方：山东鲁棉集团<br>乙方：上海贸易有限公司',
+          partyAName: '山东鲁棉集团',
+          partyBName: '上海贸易有限公司',
           paymentMethod: '信用证（即期）',
           marginDeposit: '30万元',
           performancePeriod: '2024-06-15至2025-03-31',
@@ -151,7 +155,8 @@ export default {
           contractType: '加工合同',
           contractStatus: '履行中',
           signingDate: '2024-06-03',
-          partyABName: '甲方：江苏华棉纺织<br>乙方：浙江印染厂',
+          partyAName: '江苏华棉纺织',
+          partyBName: '浙江印染厂',
           paymentMethod: '托收承付',
           marginDeposit: '20万元',
           performancePeriod: '2024-06-10至2024-09-30',
@@ -164,7 +169,8 @@ export default {
           contractType: '采购合同',
           contractStatus: '已终止',
           signingDate: '2024-06-04',
-          partyABName: '甲方：湖北银丰棉花<br>乙方：广东服装公司',
+          partyAName: '湖北银丰棉花',
+          partyBName: '广东服装公司',
           paymentMethod: '现金支票',
           marginDeposit: '40万元',
           performancePeriod: '2024-06-20至2024-11-30',
@@ -177,7 +183,8 @@ export default {
           contractType: '销售合同',
           contractStatus: '已生效',
           signingDate: '2024-06-05',
-          partyABName: '甲方：河北新乐棉花<br>乙方：天津纺织集团',
+          partyAName: '河北新乐棉花',
+          partyBName: '天津纺织集团',
           paymentMethod: '电汇（全额预付）',
           marginDeposit: '60万元',
           performancePeriod: '2024-07-01至2025-01-31',
@@ -190,7 +197,8 @@ export default {
           contractType: '服务合同',
           contractStatus: '待签署',
           signingDate: '2024-06-06',
-          partyABName: '甲方：安徽辉隆农业<br>乙方：郑州仓储公司',
+          partyAName: '安徽辉隆农业',
+          partyBName: '郑州仓储公司',
           paymentMethod: '分期付款（分3期）',
           marginDeposit: '10万元',
           performancePeriod: '2024-06-25至2024-10-31',
@@ -203,7 +211,8 @@ export default {
           contractType: '采购合同',
           contractStatus: '履行中',
           signingDate: '2024-06-07',
-          partyABName: '甲方：新疆生产建设兵团棉麻<br>乙方：青岛纺织有限公司',
+          partyAName: '新疆生产建设兵团棉麻',
+          partyBName: '青岛纺织有限公司',
           paymentMethod: '银行承兑汇票',
           marginDeposit: '70万元',
           performancePeriod: '2024-06-12至2024-12-31',
@@ -216,7 +225,8 @@ export default {
           contractType: '销售合同',
           contractStatus: '已生效',
           signingDate: '2024-06-08',
-          partyABName: '甲方：河南豫棉集团<br>乙方：张家港贸易公司',
+          partyAName: '河南豫棉集团',
+          partyBName: '张家港贸易公司',
           paymentMethod: '货到付款',
           marginDeposit: '25万元',
           performancePeriod: '2024-06-30至2025-04-30',
@@ -229,7 +239,8 @@ export default {
           contractType: '租赁合同',
           contractStatus: '待审核',
           signingDate: '2024-06-09',
-          partyABName: '甲方：湖南云锦集团<br>乙方：武汉仓储公司',
+          partyAName: '湖南云锦集团',
+          partyBName: '武汉仓储公司',
           paymentMethod: '按月支付租金',
           marginDeposit: '15万元',
           performancePeriod: '2024-07-15至2025-07-14',
@@ -242,7 +253,8 @@ export default {
           contractType: '采购合同',
           contractStatus: '已生效',
           signingDate: '2024-06-10',
-          partyABName: '甲方：江西赣棉集团<br>乙方：南京纺织有限公司',
+          partyAName: '江西赣棉集团',
+          partyBName: '南京纺织有限公司',
           paymentMethod: '支付宝/微信支付',
           marginDeposit: '35万元',
           performancePeriod: '2024-07-05至2025-02-28',

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

@@ -10,17 +10,20 @@
         <!--    清空条件    -->
         <BaseIndexButton ref="clear" name="clear"></BaseIndexButton>
         <!--    编辑    -->
-        <BaseIndexButton right-button="warehouse-management-edit" ref="edit" name="edit"></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-enable" ref="enable" name="enable"></BaseIndexButton>-->
+<!--        &lt;!&ndash;    停用    &ndash;&gt;-->
+<!--        <BaseIndexButton right-button="warehouse-management-disable" ref="disable" name="disable"></BaseIndexButton>-->
         <!--    导入    -->
         <BaseIndexButton right-button="warehouse-management-import" ref="import" name="import"></BaseIndexButton>
         <!--    导出    -->
         <BaseIndexButton right-button="warehouse-management-export" ref="export" name="export"></BaseIndexButton>
       </template>
-
+      <template #right>
+        <!--   新建     -->
+<!--        <BaseIndexButton right-button="warehouse-management-add" ref="add" name="add"></BaseIndexButton>-->
+      </template>
     </BaseIndexButtonGroup>
 
 
@@ -39,7 +42,7 @@
         <DkTable :id="'table-'+$options.name"
                  ref="table-select"
                  :data="tableData"
-                 :height="tableHeight-60"
+                 :height="tableHeight-30"
                  primaryKey="staffId"
                  :multiple="false"
                  :choose-flag="false"
@@ -52,30 +55,54 @@
                  :pageSize="pageInfo.pageSize"
         >
           <!--  商品编号  -->
-          <DkTableColumn field="contractNumber" title="合同编号"></DkTableColumn>
+          <DkTableColumn field="contractNumber" type="link" title="合同编号"></DkTableColumn>
           <!--  商品名称  -->
           <DkTableColumn field="contractType" title="合同类型"></DkTableColumn>
           <!--  规格型号  -->
-          <DkTableColumn field="contractName"  title="合同名称" ></DkTableColumn>
+          <DkTableColumn field="contractStatus"   title="合同状态" ></DkTableColumn>
           <!--  计量单位  -->
-          <DkTableColumn field="contractingParty"   title="签约方"></DkTableColumn>
+          <DkTableColumn field="signingDate"   title="签订日期"></DkTableColumn>
           <!--  仓库名称  -->
-          <DkTableColumn field="signingDate"  title="签约日期"></DkTableColumn>
+          <DkTableColumn field="partyAName"  title="甲方名称"></DkTableColumn>
+          <DkTableColumn field="partyBName"  title="乙方名称"></DkTableColumn>
           <!--  存放货位  -->
-          <DkTableColumn field="contractStatus" title="合同状态"></DkTableColumn>
+          <DkTableColumn field="paymentMethod" title="付款方式"></DkTableColumn>
           <!--  供应商  -->
-          <DkTableColumn field="lintVarietyAndSpec" title="皮棉品种 / 规格"></DkTableColumn>
+          <DkTableColumn field="marginDeposit" title="保证金 / 押金"></DkTableColumn>
           <!--  采购人  -->
-          <DkTableColumn field="contractQuantity" title="合同数量"/>
+          <DkTableColumn field="performancePeriod" title="履约期限"/>
           <!--  备注  -->
-          <DkTableColumn field="performedQuantity" title="已履约数量"></DkTableColumn>
-          <DkTableColumn field="performanceProgress" title="履约进度"></DkTableColumn>
-          <DkTableColumn field="deliveryDate" title="交货日期"></DkTableColumn>
+          <DkTableColumn field="liabilityForBreach" title="违约责任"></DkTableColumn>
+          <DkTableColumn field="riskControlLevel" 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>
+          <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>
 
 
@@ -93,174 +120,174 @@ export default {
   mixins: [indexMixin],
   data() {
     return  {
-      //查询条件
-      searchContent: [
-        {
-          //公司名称
-          itemCode: 'cpIds',
-          title: '锁基差单号',
-
-          required: true
-        },
-        {
-          //员工工号
-          itemCode: 'staffCode',
-          title: '关联销售单号',
-        },
-        {
-          //员工名称
-          itemCode: 'staffName',
-          title: '客户名称',
-        },
-
-
-      ],
-      formData: {
-        staffCode: null,//员工工号
-        staffName: null,//员工编码
-      },
-       tableData : [
+      tableData : [
         {
-          staffId: 4001,
-          contractNumber: 'HT-20240701-001',
+          staffId: 2001,
+          contractNumber: 'HT-20240601-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'
+          signingDate: '2024-06-01',
+          partyAName: '新疆棉业集团',
+          partyBName: '郑州纺织有限公司',
+          paymentMethod: '银行转账（30%预付款）',
+          marginDeposit: '50万元',
+          performancePeriod: '2024-06-01至2024-12-31',
+          liabilityForBreach: '按合同金额的5%支付违约金',
+          riskControlLevel: '低风险'
         },
         {
-          staffId: 4002,
-          contractNumber: 'HT-20240701-002',
+          staffId: 2002,
+          contractNumber: 'HT-20240601-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'
+          signingDate: '2024-06-02',
+          partyAName: '山东鲁棉集团',
+          partyBName: '上海贸易有限公司',
+          paymentMethod: '信用证（即期）',
+          marginDeposit: '30万元',
+          performancePeriod: '2024-06-15至2025-03-31',
+          liabilityForBreach: '按未履行部分金额的8%支付违约金',
+          riskControlLevel: '中风险'
         },
         {
-          staffId: 4003,
-          contractNumber: 'HT-20240701-003',
+          staffId: 2003,
+          contractNumber: 'HT-20240601-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'
+          signingDate: '2024-06-03',
+          partyAName: '江苏华棉纺织',
+          partyBName: '浙江印染厂',
+          paymentMethod: '托收承付',
+          marginDeposit: '20万元',
+          performancePeriod: '2024-06-10至2024-09-30',
+          liabilityForBreach: '按实际损失赔偿',
+          riskControlLevel: '低风险'
         },
         {
-          staffId: 4004,
-          contractNumber: 'HT-20240701-004',
+          staffId: 2004,
+          contractNumber: 'HT-20240601-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'
+          signingDate: '2024-06-04',
+          partyAName: '湖北银丰棉花',
+          partyBName: '广东服装公司',
+          paymentMethod: '现金支票',
+          marginDeposit: '40万元',
+          performancePeriod: '2024-06-20至2024-11-30',
+          liabilityForBreach: '违约金10万元',
+          riskControlLevel: '高风险'
         },
         {
-          staffId: 4005,
-          contractNumber: 'HT-20240701-005',
+          staffId: 2005,
+          contractNumber: 'HT-20240601-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'
+          signingDate: '2024-06-05',
+          partyAName: '河北新乐棉花',
+          partyBName: '天津纺织集团',
+          paymentMethod: '电汇（全额预付）',
+          marginDeposit: '60万元',
+          performancePeriod: '2024-07-01至2025-01-31',
+          liabilityForBreach: '按合同金额的3%支付违约金',
+          riskControlLevel: '低风险'
         },
         {
-          staffId: 4006,
-          contractNumber: 'HT-20240701-006',
+          staffId: 2006,
+          contractNumber: 'HT-20240601-006',
           contractType: '服务合同',
-          contractName: '安徽棉花仓储服务合同',
-          contractingParty: '甲方：安徽辉隆农业<br>乙方：郑州仓储公司',
-          signingDate: '2024-07-06',
           contractStatus: '待签署',
-          lintVarietyAndSpec: '-', // 服务合同无具体品种规格
-          contractQuantity: '-',
-          performedQuantity: 0,
-          performanceProgress: '0%',
-          deliveryDate: '2024-07-25至2024-10-31'
+          signingDate: '2024-06-06',
+          partyAName: '安徽辉隆农业',
+          partyBName: '郑州仓储公司',
+          paymentMethod: '分期付款（分3期）',
+          marginDeposit: '10万元',
+          performancePeriod: '2024-06-25至2024-10-31',
+          liabilityForBreach: '按未支付金额的每日0.1%计罚',
+          riskControlLevel: '中风险'
         },
         {
-          staffId: 4007,
-          contractNumber: 'HT-20240701-007',
+          staffId: 2007,
+          contractNumber: 'HT-20240601-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'
+          signingDate: '2024-06-07',
+          partyAName: '新疆生产建设兵团棉麻',
+          partyBName: '青岛纺织有限公司',
+          paymentMethod: '银行承兑汇票',
+          marginDeposit: '70万元',
+          performancePeriod: '2024-06-12至2024-12-31',
+          liabilityForBreach: '赔偿直接经济损失',
+          riskControlLevel: '低风险'
         },
         {
-          staffId: 4008,
-          contractNumber: 'HT-20240701-008',
+          staffId: 2008,
+          contractNumber: 'HT-20240601-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'
+          signingDate: '2024-06-08',
+          partyAName: '河南豫棉集团',
+          partyBName: '张家港贸易公司',
+          paymentMethod: '货到付款',
+          marginDeposit: '25万元',
+          performancePeriod: '2024-06-30至2025-04-30',
+          liabilityForBreach: '按延迟天数每日0.05%支付滞纳金',
+          riskControlLevel: '中风险'
         },
         {
-          staffId: 4009,
-          contractNumber: 'HT-20240701-009',
+          staffId: 2009,
+          contractNumber: 'HT-20240601-009',
           contractType: '租赁合同',
-          contractName: '湖南棉花仓库租赁合同',
-          contractingParty: '甲方：湖南云锦集团<br>乙方：武汉仓储公司',
-          signingDate: '2024-07-09',
           contractStatus: '待审核',
-          lintVarietyAndSpec: '-', // 租赁合同无具体品种规格
-          contractQuantity: '-',
-          performedQuantity: 0,
-          performanceProgress: '0%',
-          deliveryDate: '2024-09-01至2025-08-31'
+          signingDate: '2024-06-09',
+          partyAName: '湖南云锦集团',
+          partyBName: '武汉仓储公司',
+          paymentMethod: '按月支付租金',
+          marginDeposit: '15万元',
+          performancePeriod: '2024-07-15至2025-07-14',
+          liabilityForBreach: '押金不予退还',
+          riskControlLevel: '中风险'
         },
         {
-          staffId: 4010,
-          contractNumber: 'HT-20240701-010',
+          staffId: 2010,
+          contractNumber: 'HT-20240601-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'
+          signingDate: '2024-06-10',
+          partyAName: '江西赣棉集团',
+          partyBName: '南京纺织有限公司',
+          paymentMethod: '支付宝/微信支付',
+          marginDeposit: '35万元',
+          performancePeriod: '2024-07-05至2025-02-28',
+          liabilityForBreach: '按合同金额的10%支付违约金',
+          riskControlLevel: '低风险'
         }
       ],
+      //查询条件
+      searchContent: [
+        {
+          //公司名称
+          itemCode: 'cpIds',
+          title: '合同编号',
+
+          required: true
+        },
+        {
+          //员工工号
+          itemCode: 'staffCode',
+          title: '合同类型',
+        },
+        {
+          //员工名称
+          itemCode: 'staffName',
+          title: '合同状态',
+        },
+
+
+      ],
+      formData: {
+        staffCode: null,//员工工号
+        staffName: null,//员工编码
+      },
     }
   },
   methods: {
@@ -277,7 +304,7 @@ export default {
   },
   created() {
     this.primaryKey = 'staffId'  // 设置主键Id
-    this.routeObjName = 'contractStatistics'  // 设置路由名称
+    this.routeObjName = 'contractManagement'  // 设置路由名称
   },
 
 
@@ -285,3 +312,4 @@ export default {
 
 </script>
 
+

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

@@ -12,9 +12,9 @@
         <!--    编辑    -->
         <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-enable" ref="enable" name="enable"></BaseIndexButton>-->
+<!--        &lt;!&ndash;    停用    &ndash;&gt;-->
+<!--        <BaseIndexButton right-button="warehouse-management-disable" ref="disable" name="disable"></BaseIndexButton>-->
         <!--    导入    -->
         <BaseIndexButton right-button="warehouse-management-import" ref="import" name="import"></BaseIndexButton>
         <!--    导出    -->
@@ -22,7 +22,8 @@
       </template>
       <template #right>
         <!--   新建     -->
-        <BaseIndexButton right-button="warehouse-management-add" ref="add" name="add"></BaseIndexButton>
+        <BaseIndexButton right-button="warehouse-management-add"  buttonType="primary" @click="openAddByClick" title="新建采购发票"></BaseIndexButton>
+        <BaseIndexButton right-button="warehouse-management-add"   buttonType="primary"   @click="openAddByClick" title="新建销售发票"></BaseIndexButton>
       </template>
     </BaseIndexButtonGroup>
 
@@ -42,7 +43,7 @@
         <DkTable :id="'table-'+$options.name"
                  ref="table-select"
                  :data="tableData"
-                 :height="tableHeight-60"
+                 :height="tableHeight-30"
                  primaryKey="staffId"
                  :multiple="false"
                  :choose-flag="false"
@@ -66,11 +67,11 @@
           <DkTableColumn field="invoiceNumber" title="发票号码"></DkTableColumn>
 
           <!--  采购人  -->
-          <DkTableColumn field="tons" title="吨数"/>
+          <DkTableColumn field="tons" data-type="number" title="吨数"/>
           <!--  备注  -->
-          <DkTableColumn field="unitPrice" title="单价"></DkTableColumn>
-          <DkTableColumn field="invoiceAmount" title="发票金额"></DkTableColumn>
-          <DkTableColumn field="contractNo" title="合同号"></DkTableColumn>
+          <DkTableColumn field="unitPrice" data-type="number" title="单价"></DkTableColumn>
+          <DkTableColumn field="invoiceAmount" data-type="number" title="发票金额"></DkTableColumn>
+          <DkTableColumn field="contractNo" type="link" title="合同号"></DkTableColumn>
           <DkTableColumn field="remarks" title="备注"></DkTableColumn>
 
 

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

@@ -10,17 +10,21 @@
         <!--    清空条件    -->
         <BaseIndexButton ref="clear" name="clear"></BaseIndexButton>
         <!--    编辑    -->
-        <BaseIndexButton right-button="warehouse-management-edit" ref="edit" name="edit"></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-enable" ref="enable" name="enable"></BaseIndexButton>-->
+        <!--        &lt;!&ndash;    停用    &ndash;&gt;-->
+        <!--        <BaseIndexButton right-button="warehouse-management-disable" ref="disable" name="disable"></BaseIndexButton>-->
         <!--    导入    -->
         <BaseIndexButton right-button="warehouse-management-import" ref="import" name="import"></BaseIndexButton>
         <!--    导出    -->
         <BaseIndexButton right-button="warehouse-management-export" ref="export" name="export"></BaseIndexButton>
       </template>
-
+      <template #right>
+        <!--   新建     -->
+<!--        <BaseIndexButton right-button="warehouse-management-add" ref="add" name="add" title="新建采购发票"></BaseIndexButton>-->
+<!--        <BaseIndexButton right-button="warehouse-management-add" ref="add"  name="add" title="新建销售发票"></BaseIndexButton>-->
+      </template>
     </BaseIndexButtonGroup>
 
 
@@ -39,7 +43,7 @@
         <DkTable :id="'table-'+$options.name"
                  ref="table-select"
                  :data="tableData"
-                 :height="tableHeight-60"
+                 :height="tableHeight-30"
                  primaryKey="staffId"
                  :multiple="false"
                  :choose-flag="false"
@@ -52,30 +56,50 @@
                  :pageSize="pageInfo.pageSize"
         >
           <!--  商品编号  -->
-          <DkTableColumn field="invoiceNumber" title="发票编号"></DkTableColumn>
-          <!--  商品名称  -->
           <DkTableColumn field="invoiceType" title="发票类型"></DkTableColumn>
           <!--  规格型号  -->
-          <DkTableColumn field="invoiceStatus"  title="发票状态" ></DkTableColumn>
+          <DkTableColumn field="invoiceDate"  title="开票日期" ></DkTableColumn>
           <!--  计量单位  -->
-          <DkTableColumn field="issueDate"   title="开票日期"></DkTableColumn>
+          <DkTableColumn field="invoicingMethod"   title="开票方式"></DkTableColumn>
           <!--  仓库名称  -->
-          <DkTableColumn field="issuerAndRecipient"  title="开票方 / 受票方"></DkTableColumn>
+          <DkTableColumn field="invoicingParty"  title="开票方"></DkTableColumn>
           <!--  存放货位  -->
-          <DkTableColumn field="totalAmountIncludingTax" title="发票金额（价税合计）"></DkTableColumn>
-          <!--  供应商  -->
-          <DkTableColumn field="taxExcludedAmount" title="不含税金额"></DkTableColumn>
+          <DkTableColumn field="invoiceNumber" title="发票号码"></DkTableColumn>
+
           <!--  采购人  -->
-          <DkTableColumn field="taxAmount" title="税额"/>
+          <DkTableColumn field="tons" data-type="number" title="吨数"/>
           <!--  备注  -->
-          <DkTableColumn field="deductibleTaxAmount" title="可抵扣税额"></DkTableColumn>
-          <DkTableColumn field="paymentAssociation" title="已收 / 付款关联"></DkTableColumn>
-          <DkTableColumn field="relatedContractNumber" title="关联合同编号"></DkTableColumn>
+          <DkTableColumn field="unitPrice" data-type="number" title="单价"></DkTableColumn>
+          <DkTableColumn field="invoiceAmount" data-type="number" title="发票金额"></DkTableColumn>
+          <DkTableColumn field="contractNo" type="link" title="合同号"></DkTableColumn>
+          <DkTableColumn field="remarks" title="备注"></DkTableColumn>
 
 
         </DkTable>
       </div>
-
+      <!--新建编辑-->
+      <DkModal
+        :loading="loading"
+        v-model="editAddModal"
+        ref="modal_editAdd"
+        @modalOk="save"
+        :saveFlag="true"
+        :title="modalTitle"
+        @on-visible-change="handleVisibleModal"
+      >
+        <DkForm ref="dk-form" v-model="formData" :col-count="2">
+          <DkFormItem prop="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>
 
 
@@ -92,147 +116,139 @@ export default {
   name: 'sales-order-management',
   mixins: [indexMixin],
   data() {
+    const vm = window.vm;
     return  {
-        tableData : [
+      vm: vm,
+      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: 3001,
+          invoiceType: '采购',
+          invoiceDate: '2024-06-01',
+          invoicingMethod: '电子发票',
+          invoicingParty: '新疆棉业集团有限公司',
+          invoiceNumber: '00123456',
+          tons: 50,
+          unitPrice: 18500,
+          invoiceAmount: 925000,
+          contractNo: 'HT-20240601-001',
+          remarks: '含13%增值税'
         },
         {
-          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: 3002,
+          invoiceType: '采购',
+          invoiceDate: '2024-06-02',
+          invoicingMethod: '纸质发票',
+          invoicingParty: '山东鲁棉集团有限公司',
+          invoiceNumber: '00123457',
+          tons: 30,
+          unitPrice: 19000,
+          invoiceAmount: 570000,
+          contractNo: 'HT-20240601-002',
+          remarks: '分两批发货'
         },
         {
-          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: 3003,
+          invoiceType: '采购',
+          invoiceDate: '2024-06-03',
+          invoicingMethod: '电子发票',
+          invoicingParty: '江苏华棉纺织有限公司',
+          invoiceNumber: '00123458',
+          tons: 20,
+          unitPrice: 18800,
+          invoiceAmount: 376000,
+          contractNo: 'HT-20240601-003',
+          remarks: '需提前3天确认收货'
         },
         {
-          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: 3004,
+          invoiceType: '采购',
+          invoiceDate: '2024-06-04',
+          invoicingMethod: '电子发票',
+          invoicingParty: '湖北银丰棉花集团',
+          invoiceNumber: '00123459',
+          tons: 40,
+          unitPrice: 18200,
+          invoiceAmount: 728000,
+          contractNo: 'HT-20240601-004',
+          remarks: '折扣率5%'
         },
         {
-          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: 3005,
+          invoiceType: '采购',
+          invoiceDate: '2024-06-05',
+          invoicingMethod: '纸质发票',
+          invoicingParty: '河北新乐市棉花公司',
+          invoiceNumber: '00123460',
+          tons: 15,
+          unitPrice: 19500,
+          invoiceAmount: 292500,
+          contractNo: 'HT-20240601-005',
+          remarks: '运费另计'
         },
         {
-          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: 3006,
+          invoiceType: '采购',
+          invoiceDate: '2024-06-06',
+          invoicingMethod: '电子发票',
+          invoicingParty: '安徽辉隆农业发展有限公司',
+          invoiceNumber: '00123461',
+          tons: 25,
+          unitPrice: 18600,
+          invoiceAmount: 465000,
+          contractNo: 'HT-20240601-006',
+          remarks: '开户行：中国工商银行'
         },
         {
-          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: 3007,
+          invoiceType: '采购',
+          invoiceDate: '2024-06-07',
+          invoicingMethod: '电子发票',
+          invoicingParty: '新疆生产建设兵团棉麻公司',
+          invoiceNumber: '00123462',
+          tons: 35,
+          unitPrice: 18900,
+          invoiceAmount: 661500,
+          contractNo: 'HT-20240601-007',
+          remarks: '地址：乌鲁木齐市XX路'
         },
         {
-          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: 3008,
+          invoiceType: '采购',
+          invoiceDate: '2024-06-08',
+          invoicingMethod: '纸质发票',
+          invoicingParty: '河南豫棉集团有限公司',
+          invoiceNumber: '00123463',
+          tons: 60,
+          unitPrice: 18100,
+          invoiceAmount: 1086000,
+          contractNo: 'HT-20240601-008',
+          remarks: '联系方式：0371-88888888'
         },
         {
-          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: 3009,
+          invoiceType: '采购',
+          invoiceDate: '2024-06-09',
+          invoicingMethod: '电子发票',
+          invoicingParty: '湖南云锦集团股份有限公司',
+          invoiceNumber: '00123464',
+          tons: 10,
+          unitPrice: 19800,
+          invoiceAmount: 198000,
+          contractNo: 'HT-20240601-009',
+          remarks: '有效期至2024年12月'
         },
         {
-          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'
+          staffId: 3010,
+          invoiceType: '采购',
+          invoiceDate: '2024-06-10',
+          invoicingMethod: '电子发票',
+          invoicingParty: '江西赣棉集团有限公司',
+          invoiceNumber: '00123465',
+          tons: 45,
+          unitPrice: 18300,
+          invoiceAmount: 823500,
+          contractNo: 'HT-20240601-010',
+          remarks: '附销售清单3页'
         }
       ],
       //查询条件
@@ -240,14 +256,14 @@ export default {
         {
           //公司名称
           itemCode: 'cpIds',
-          title: '发票编号',
+          title: '发票类型',
 
           required: true
         },
         {
           //员工工号
           itemCode: 'staffCode',
-          title: '发票类型',
+          title: '开票日期',
         },
         {
           //员工名称
@@ -277,7 +293,7 @@ export default {
   },
   created() {
     this.primaryKey = 'staffId'  // 设置主键Id
-    this.routeObjName = 'invoiceStatistics'  // 设置路由名称
+    this.routeObjName = 'invoiceManagement'  // 设置路由名称
   },
 
 
@@ -285,3 +301,5 @@ export default {
 
 </script>
 
+
+

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

@@ -10,11 +10,11 @@
          <!--    清空条件    -->
          <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-edit" ref="edit" name="edit"></BaseIndexButton>-->
+<!--         &lt;!&ndash;    启用    &ndash;&gt;-->
+<!--         <BaseIndexButton right-button="warehouse-management-enable" ref="enable" name="enable"></BaseIndexButton>-->
+<!--         &lt;!&ndash;    停用    &ndash;&gt;-->
+<!--         <BaseIndexButton right-button="warehouse-management-disable" ref="disable" name="disable"></BaseIndexButton>-->
          <!--    导入    -->
          <BaseIndexButton right-button="warehouse-management-import" ref="import" name="import"></BaseIndexButton>
          <!--    导出    -->
@@ -22,7 +22,7 @@
        </template>
        <template #right>
          <!--   新建     -->
-         <BaseIndexButton right-button="warehouse-management-add" ref="add" name="add"></BaseIndexButton>
+<!--         <BaseIndexButton right-button="warehouse-management-add" ref="add" name="add"></BaseIndexButton>-->
        </template>
      </BaseIndexButtonGroup>
 
@@ -43,7 +43,7 @@
            :id="'table-' + $options.name"
            ref="table-select"
            :data="tableData"
-           :height="tableHeight - 60"
+           :height="tableHeight - 30"
            primaryKey="paymentWarningId"
            :multiple="false"
            :choose-flag="false"
@@ -55,13 +55,13 @@
            :current-page="pageInfo.currentPage"
            :pageSize="pageInfo.pageSize"
          >
-           <DkTableColumn field="paymentOrderNo" title="应付单号"></DkTableColumn>
+           <DkTableColumn field="paymentOrderNo" type="link" 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="totalAmount" data-type="number" title="应付金额"></DkTableColumn>
+           <DkTableColumn field="paidAmount"data-type="number" title="已付金额"></DkTableColumn>
+           <DkTableColumn field="unpaidAmount"data-type="number" title="未付金额"></DkTableColumn>
            <DkTableColumn field="paymentDeadline" title="付款期限"></DkTableColumn>
            <DkTableColumn field="overdueDays" title="逾期天数"></DkTableColumn>
            <DkTableColumn field="overdueStartDate" title="逾期开始日期"></DkTableColumn>

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

@@ -10,11 +10,11 @@
          <!--    清空条件    -->
          <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-edit" ref="edit" name="edit"></BaseIndexButton>-->
+<!--         &lt;!&ndash;    启用    &ndash;&gt;-->
+<!--         <BaseIndexButton right-button="warehouse-management-enable" ref="enable" name="enable"></BaseIndexButton>-->
+<!--         &lt;!&ndash;    停用    &ndash;&gt;-->
+<!--         <BaseIndexButton right-button="warehouse-management-disable" ref="disable" name="disable"></BaseIndexButton>-->
          <!--    导入    -->
          <BaseIndexButton right-button="warehouse-management-import" ref="import" name="import"></BaseIndexButton>
          <!--    导出    -->
@@ -22,7 +22,7 @@
        </template>
        <template #right>
          <!--   新建     -->
-         <BaseIndexButton right-button="warehouse-management-add" ref="add" name="add"></BaseIndexButton>
+<!--         <BaseIndexButton right-button="warehouse-management-add" ref="add" name="add"></BaseIndexButton>-->
        </template>
      </BaseIndexButtonGroup>
 
@@ -43,7 +43,7 @@
            :id="'table-' + $options.name"
            ref="table-select"
            :data="tableData"
-           :height="tableHeight - 60"
+           :height="tableHeight - 30"
            primaryKey="inventoryWarningId"
            :multiple="false"
            :choose-flag="false"
@@ -55,7 +55,7 @@
            :current-page="pageInfo.currentPage"
            :pageSize="pageInfo.pageSize"
          >
-           <DkTableColumn field="inventoryCode" title="存货编码"></DkTableColumn>
+           <DkTableColumn field="inventoryCode" type="link" title="存货编码"></DkTableColumn>
            <DkTableColumn field="inventoryName" title="存货名称"></DkTableColumn>
            <DkTableColumn field="warehouseLocation" title="所属仓库 / 库区"></DkTableColumn>
            <DkTableColumn field="warningType" title="预警类型"></DkTableColumn>

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

@@ -9,12 +9,12 @@
          <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>
+<!--         &lt;!&ndash;    编辑    &ndash;&gt;-->
+<!--         <BaseIndexButton right-button="warehouse-management-edit" ref="edit" name="edit"></BaseIndexButton>-->
+<!--         &lt;!&ndash;    启用    &ndash;&gt;-->
+<!--         <BaseIndexButton right-button="warehouse-management-enable" ref="enable" name="enable"></BaseIndexButton>-->
+<!--         &lt;!&ndash;    停用    &ndash;&gt;-->
+<!--         <BaseIndexButton right-button="warehouse-management-disable" ref="disable" name="disable"></BaseIndexButton>-->
          <!--    导入    -->
          <BaseIndexButton right-button="warehouse-management-import" ref="import" name="import"></BaseIndexButton>
          <!--    导出    -->
@@ -22,7 +22,7 @@
        </template>
        <template #right>
          <!--   新建     -->
-         <BaseIndexButton right-button="warehouse-management-add" ref="add" name="add"></BaseIndexButton>
+<!--         <BaseIndexButton right-button="warehouse-management-add" ref="add" name="add"></BaseIndexButton>-->
        </template>
      </BaseIndexButtonGroup>
 
@@ -43,7 +43,7 @@
            :id="'table-' + $options.name"
            ref="table-select"
            :data="tableData"
-           :height="tableHeight - 60"
+           :height="tableHeight - 30"
            primaryKey="inventoryCycleWarningId"
            :multiple="false"
            :choose-flag="false"
@@ -55,7 +55,7 @@
            :current-page="pageInfo.currentPage"
            :pageSize="pageInfo.pageSize"
          >
-           <DkTableColumn field="inventoryCode" title="存货编码"></DkTableColumn>
+           <DkTableColumn field="inventoryCode"type="link" title="存货编码"></DkTableColumn>
            <DkTableColumn field="inventoryName" title="存货名称"></DkTableColumn>
            <DkTableColumn field="warehouseLocation" title="所属仓库 / 库区"></DkTableColumn>
            <DkTableColumn field="supplierName" title="供应商名称"></DkTableColumn>

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

@@ -9,12 +9,12 @@
          <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>
+<!--         &lt;!&ndash;    编辑    &ndash;&gt;-->
+<!--         <BaseIndexButton right-button="warehouse-management-edit" ref="edit" name="edit"></BaseIndexButton>-->
+<!--         &lt;!&ndash;    启用    &ndash;&gt;-->
+<!--         <BaseIndexButton right-button="warehouse-management-enable" ref="enable" name="enable"></BaseIndexButton>-->
+<!--         &lt;!&ndash;    停用    &ndash;&gt;-->
+<!--         <BaseIndexButton right-button="warehouse-management-disable" ref="disable" name="disable"></BaseIndexButton>-->
          <!--    导入    -->
          <BaseIndexButton right-button="warehouse-management-import" ref="import" name="import"></BaseIndexButton>
          <!--    导出    -->
@@ -22,7 +22,7 @@
        </template>
        <template #right>
          <!--   新建     -->
-         <BaseIndexButton right-button="warehouse-management-add" ref="add" name="add"></BaseIndexButton>
+<!--         <BaseIndexButton right-button="warehouse-management-add" ref="add" name="add"></BaseIndexButton>-->
        </template>
      </BaseIndexButtonGroup>
 
@@ -43,7 +43,7 @@
            :id="'table-' + $options.name"
            ref="table-select"
            :data="tableData"
-           :height="tableHeight - 60"
+           :height="tableHeight - 30"
            primaryKey="inventoryCycleWarningId"
            :multiple="false"
            :choose-flag="false"
@@ -55,16 +55,16 @@
            :current-page="pageInfo.currentPage"
            :pageSize="pageInfo.pageSize"
          >
-           <DkTableColumn field="customerCode" title="客户编号"></DkTableColumn>
+           <DkTableColumn field="customerCode" type="link" title="客户编号"></DkTableColumn>
            <DkTableColumn field="customerName" title="客户名称"></DkTableColumn>
            <DkTableColumn field="contactPerson" title="联系人"></DkTableColumn>
            <DkTableColumn field="outboundOrderNumber" title="出库单号"></DkTableColumn>
            <DkTableColumn field="outboundDate" title="出库日期"></DkTableColumn>
-           <DkTableColumn field="customerCreditLimit" title="客户信用额度"></DkTableColumn>
-           <DkTableColumn field="usedCredit" title="已使用额度"></DkTableColumn>
-           <DkTableColumn field="availableCredit" title="剩余可用额度"></DkTableColumn>
-           <DkTableColumn field="currentOutboundAmount" title="本次出库金额"></DkTableColumn>
-           <DkTableColumn field="exceededAmount" title="超额度金额"></DkTableColumn>
+           <DkTableColumn field="customerCreditLimit" data-type="number" title="客户信用额度"></DkTableColumn>
+           <DkTableColumn field="usedCredit"   data-type="number"  title="已使用额度"></DkTableColumn>
+           <DkTableColumn field="availableCredit"  data-type="number"  title="剩余可用额度"></DkTableColumn>
+           <DkTableColumn field="currentOutboundAmount"  data-type="number"  title="本次出库金额"></DkTableColumn>
+           <DkTableColumn field="exceededAmount"  data-type="number"  title="超额度金额"></DkTableColumn>
            <DkTableColumn field="warningType" title="预警类型"></DkTableColumn>
            <DkTableColumn field="warningLevel" title="预警等级"></DkTableColumn>
            <DkTableColumn field="historicalOverdueRecords" title="历史逾期记录"></DkTableColumn>

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

@@ -10,11 +10,11 @@
          <!--    清空条件    -->
          <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-edit" ref="edit" name="edit"></BaseIndexButton>-->
+<!--         &lt;!&ndash;    启用    &ndash;&gt;-->
+<!--         <BaseIndexButton right-button="warehouse-management-enable" ref="enable" name="enable"></BaseIndexButton>-->
+<!--         &lt;!&ndash;    停用    &ndash;&gt;-->
+<!--         <BaseIndexButton right-button="warehouse-management-disable" ref="disable" name="disable"></BaseIndexButton>-->
          <!--    导入    -->
          <BaseIndexButton right-button="warehouse-management-import" ref="import" name="import"></BaseIndexButton>
          <!--    导出    -->
@@ -22,7 +22,7 @@
        </template>
        <template #right>
          <!--   新建     -->
-         <BaseIndexButton right-button="warehouse-management-add" ref="add" name="add"></BaseIndexButton>
+<!--         <BaseIndexButton right-button="warehouse-management-add" ref="add" name="add"></BaseIndexButton>-->
        </template>
      </BaseIndexButtonGroup>
 
@@ -43,7 +43,7 @@
            :id="'table-' + $options.name"
            ref="table-select"
            :data="tableData"
-           :height="tableHeight - 60"
+           :height="tableHeight - 30"
            primaryKey="inventoryCycleWarningId"
            :multiple="false"
            :choose-flag="false"
@@ -55,12 +55,12 @@
            :current-page="pageInfo.currentPage"
            :pageSize="pageInfo.pageSize"
          >
-           <DkTableColumn field="documentNumber" title="单据编号"></DkTableColumn>
+           <DkTableColumn field="documentNumber" type="link" 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="receivableAmount" data-type="number" title="应收金额"></DkTableColumn>
+           <DkTableColumn field="collectedAmount" data-type="number" title="已收金额"></DkTableColumn>
+           <DkTableColumn field="uncollectedAmount" data-type="number" title="未收金额"></DkTableColumn>
            <DkTableColumn field="contractPaymentDate" title="合同约定收款日期"></DkTableColumn>
            <DkTableColumn field="overdueDays" title="超时天数"></DkTableColumn>
            <DkTableColumn field="warningLevel" title="预警等级"></DkTableColumn>

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

@@ -10,11 +10,11 @@
          <!--    清空条件    -->
          <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-edit" ref="edit" name="edit"></BaseIndexButton>-->
+<!--         &lt;!&ndash;    启用    &ndash;&gt;-->
+<!--         <BaseIndexButton right-button="warehouse-management-enable" ref="enable" name="enable"></BaseIndexButton>-->
+<!--         &lt;!&ndash;    停用    &ndash;&gt;-->
+<!--         <BaseIndexButton right-button="warehouse-management-disable" ref="disable" name="disable"></BaseIndexButton>-->
          <!--    导入    -->
          <BaseIndexButton right-button="warehouse-management-import" ref="import" name="import"></BaseIndexButton>
          <!--    导出    -->
@@ -22,7 +22,7 @@
        </template>
        <template #right>
          <!--   新建     -->
-         <BaseIndexButton right-button="warehouse-management-add" ref="add" name="add"></BaseIndexButton>
+<!--         <BaseIndexButton right-button="warehouse-management-add" ref="add" name="add"></BaseIndexButton>-->
        </template>
      </BaseIndexButtonGroup>
 
@@ -43,7 +43,7 @@
            :id="'table-' + $options.name"
            ref="table-select"
            :data="tableData"
-           :height="tableHeight - 60"
+           :height="tableHeight - 30"
            primaryKey="contractWarningId"
            :multiple="false"
            :choose-flag="false"
@@ -55,15 +55,14 @@
            :current-page="pageInfo.currentPage"
            :pageSize="pageInfo.pageSize"
          >
-           <DkTableColumn field="contractNumber" title="合同编号"></DkTableColumn>
+           <DkTableColumn field="contractNumber" type="link" 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="totalContractAmount" data-type="number" title="合同总金额"></DkTableColumn>
+           <DkTableColumn field="settledAmount" data-type="number"  title="已结算金额"></DkTableColumn>
+           <DkTableColumn field="unsettledAmount" data-type="number"  title="未结算金额"></DkTableColumn>
            <DkTableColumn field="contractSignDate" title="合同签订日期"></DkTableColumn>
            <DkTableColumn field="agreedSettlementDays" title="约定结算周期（天）"></DkTableColumn>
-           <DkTableColumn field="remainingDays" title="剩余结算天数"></DkTableColumn>
            <DkTableColumn field="overdueDays" title="超时天数"></DkTableColumn>
            <DkTableColumn field="settlementStatus" title="结算状态"></DkTableColumn>
            <DkTableColumn field="responsibleDepartment" title="责任部门"></DkTableColumn>

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

@@ -0,0 +1,348 @@
+<!-- @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 - 30"
+                 primaryKey="staffId"
+                 :multiple="false"
+                 :choose-flag="false"
+                 @current-change="currentChangeTable"
+                 :page-flag="true"
+                 :page-total="pageInfo.total"
+                 @pageChange="pageSizeChange"
+                 :pageSizeOpts="pageSizeOpts"
+                 :current-page="pageInfo.currentPage"
+                 :pageSize="pageInfo.pageSize">
+          <!-- 开货日期 -->
+          <DkTableColumn field="deliveryDate" title="开货日期"></DkTableColumn>
+          <!-- 销售员 -->
+          <DkTableColumn field="salesman" title="销售员"></DkTableColumn>
+          <!-- 买方 -->
+          <DkTableColumn field="buyer" title="买方"></DkTableColumn>
+          <!-- 卖方 -->
+          <DkTableColumn field="seller" title="卖方"></DkTableColumn>
+          <!-- 件数 -->
+          <DkTableColumn field="itemCount" data-type="number" title="件数"></DkTableColumn>
+          <!-- 公重 -->
+          <DkTableColumn field="grossWeight" data-type="number" title="公重"></DkTableColumn>
+          <!-- 金额 -->
+          <DkTableColumn field="amount" data-type="number" title="金额"></DkTableColumn>
+          <!-- 总利息 -->
+          <DkTableColumn field="totalInterest"data-type="number" title="总利息"></DkTableColumn>
+          <!-- 基差利息 -->
+          <DkTableColumn field="basisInterest"data-type="number" title="基差利息"></DkTableColumn>
+          <!-- 超期利息 -->
+          <DkTableColumn field="overdueInterest"data-type="number" title="超期利息"></DkTableColumn>
+          <!-- 合同号 -->
+          <DkTableColumn field="contractNumber" title="合同号"></DkTableColumn>
+          <!-- 状态 -->
+          <DkTableColumn field="status" title="状态"></DkTableColumn>
+          <!-- 备注 -->
+          <DkTableColumn field="remarks" title="备注"></DkTableColumn>
+          <DkTableColumn field="remarks" type="operate" title="操作" width="220">
+            <!-- 自定义操作按钮，通过 flex 布局横向排列 -->
+            <template #default="{ row, rowIndex }">
+              <div style="display: flex;align-items: center; gap: 8px; text-align: center">
+                <Button type="primary" size="small" @click="handleLockBdiManagement(row, rowIndex)">
+                  锁基差利息管理
+                </Button>
+                <Button type="primary" size="small" @click="handleOverdueInterestManagement(row, rowIndex)" style="">
+                  超期利息管理
+                </Button>
+              </div>
+            </template>
+          </DkTableColumn>
+        </DkTable>
+      </div>
+
+    </div>
+
+
+
+
+  </div>
+</template>
+
+<script>
+
+import {indexMixin} from '@/mixins'
+
+export default {
+  name: 'sales-order-management',
+  mixins: [indexMixin],
+  data() {
+    return  {
+      tableData: [
+        {
+          staffId: 1001,
+          deliveryDate: '2025-06-01',
+          salesman: '张建军',
+          buyer: '北京XX贸易有限公司',
+          seller: '上海XX实业集团',
+          itemCount: 200,
+          grossWeight: 5000,
+          amount: 85000,
+          totalInterest: 1200,
+          basisInterest: 800,
+          overdueInterest: 400,
+          contractNumber: 'HT-20250601-001',
+          status: '已确认',
+          remarks: '正常履约'
+        },
+        {
+          staffId: 1002,
+          deliveryDate: '2025-06-02',
+          salesman: '李芳',
+          buyer: '广州XX科技公司',
+          seller: '深圳XX供应链',
+          itemCount: 150,
+          grossWeight: 3750,
+          amount: 63000,
+          totalInterest: 945,
+          basisInterest: 630,
+          overdueInterest: 315,
+          contractNumber: 'HT-20250602-002',
+          status: '待审核',
+          remarks: '需补充资质文件'
+        },
+        {
+          staffId: 1003,
+          deliveryDate: '2025-06-03',
+          salesman: '王强',
+          buyer: '成都XX商贸中心',
+          seller: '重庆XX制造有限公司',
+          itemCount: 300,
+          grossWeight: 7500,
+          amount: 127500,
+          totalInterest: 1912.5,
+          basisInterest: 1275,
+          overdueInterest: 637.5,
+          contractNumber: 'HT-20250603-003',
+          status: '执行中',
+          remarks: '部分货物待发货'
+        },
+        {
+          staffId: 1004,
+          deliveryDate: '2025-06-04',
+          salesman: '陈雨',
+          buyer: '武汉XX有限公司',
+          seller: '杭州XX集团',
+          itemCount: 80,
+          grossWeight: 2000,
+          amount: 34000,
+          totalInterest: 510,
+          basisInterest: 340,
+          overdueInterest: 170,
+          contractNumber: 'HT-20250604-004',
+          status: '已取消',
+          remarks: '买方单方面终止合同'
+        },
+        {
+          staffId: 1005,
+          deliveryDate: '2025-06-05',
+          salesman: '周伟',
+          buyer: '西安XX贸易行',
+          seller: '南京XX实业公司',
+          itemCount: 250,
+          grossWeight: 6250,
+          amount: 106250,
+          totalInterest: 1593.75,
+          basisInterest: 1062.5,
+          overdueInterest: 531.25,
+          contractNumber: 'HT-20250605-005',
+          status: '待确认',
+          remarks: '等待卖方签章'
+        },
+        {
+          staffId: 1006,
+          deliveryDate: '2025-06-06',
+          salesman: '吴敏',
+          buyer: '天津XX科技集团',
+          seller: '苏州XX供应链管理',
+          itemCount: 120,
+          grossWeight: 3000,
+          amount: 51000,
+          totalInterest: 765,
+          basisInterest: 510,
+          overdueInterest: 255,
+          contractNumber: 'HT-20250606-006',
+          status: '已完成',
+          remarks: '履约完成，货款结清'
+        },
+        {
+          staffId: 1007,
+          deliveryDate: '2025-06-07',
+          salesman: '郑凯',
+          buyer: '长沙XX商贸有限公司',
+          seller: '青岛XX制造集团',
+          itemCount: 350,
+          grossWeight: 8750,
+          amount: 148750,
+          totalInterest: 2231.25,
+          basisInterest: 1487.5,
+          overdueInterest: 743.75,
+          contractNumber: 'HT-20250607-007',
+          status: '执行中',
+          remarks: '运输途中，预计明日到达'
+        },
+        {
+          staffId: 1008,
+          deliveryDate: '2025-06-08',
+          salesman: '吕娜',
+          buyer: '合肥XX贸易公司',
+          seller: '宁波XX实业有限公司',
+          itemCount: 60,
+          grossWeight: 1500,
+          amount: 25500,
+          totalInterest: 382.5,
+          basisInterest: 255,
+          overdueInterest: 127.5,
+          contractNumber: 'HT-20250608-008',
+          status: '待发货',
+          remarks: '等待仓库排期'
+        },
+        {
+          staffId: 1009,
+          deliveryDate: '2025-06-09',
+          salesman: '孙阳',
+          buyer: '沈阳XX科技有限公司',
+          seller: '大连XX供应链有限公司',
+          itemCount: 180,
+          grossWeight: 4500,
+          amount: 76500,
+          totalInterest: 1147.5,
+          basisInterest: 765,
+          overdueInterest: 382.5,
+          contractNumber: 'HT-20250609-009',
+          status: '审核中',
+          remarks: '财务审核中'
+        },
+        {
+          staffId: 1010,
+          deliveryDate: '2025-06-10',
+          salesman: '郭华',
+          buyer: '哈尔滨XX商贸中心',
+          seller: '长春XX制造有限公司',
+          itemCount: 220,
+          grossWeight: 5500,
+          amount: 93500,
+          totalInterest: 1402.5,
+          basisInterest: 935,
+          overdueInterest: 467.5,
+          contractNumber: 'HT-20250610-0010',
+          status: '已过期',
+          remarks: '超过履约期限未执行'
+        }
+      ],
+      //查询条件
+      searchContent: [
+        {
+          //公司名称
+          itemCode: 'cpIds',
+          title: '批号',
+
+          required: true
+        },
+        {
+          //员工工号
+          itemCode: 'staffCode',
+          title: '合同号',
+        },
+        {
+          //员工名称
+          itemCode: 'staffName',
+          title: '备注',
+        },
+
+
+      ],
+      formData: {
+        staffCode: null,//员工工号
+        staffName: null,//员工编码
+      },
+    }
+  },
+  methods: {
+   /**
+       * @desc   : 跳转锁基差利息管理
+       * @author : 王英杰
+       * @date   : 2025/6/9 16:35
+       */
+    handleLockBdiManagement(row, rowIndex) {
+      console.log('编辑行数据：', row, '索引：', rowIndex);
+     this.$router.push({
+       path: '/mst/sales-management/interest-management/lock-bdi-management/index'
+     });
+    },
+    /**
+     * @desc   : 跳转锁基差利息管理
+     * @author : 王英杰
+     * @date   : 2025/6/9 16:35
+     */
+    handleOverdueInterestManagement(row, rowIndex) {
+      console.log('删除行数据：', row, '索引：', rowIndex);
+      this.$router.push({
+        path: '/mst/sales-management/interest-management/overdue-interest-management/index',
+      });
+    },
+    /**
+     * @desc   : 点击超期利息管理
+     * @author : 王英杰
+     * @date   : 2025/5/28 14:41
+     */
+    currentChangeTable(e) {
+      if (e && e.row) {
+        this.row = e
+      }
+    },
+  },
+  created() {
+    this.primaryKey = 'staffId'  // 设置主键Id
+    this.routeObjName = 'lockBdiManagement'  // 设置路由名称
+  },
+
+
+}
+
+</script>
+

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

@@ -1,290 +1,550 @@
 <!-- @desc:利息管理-锁基差利息管理  @auth:？？？  @time:----- -->
 <template>
-  <div class="main-div" ref="mainDiv">
+  <div class="main-div">
+    <!--加载中-->
     <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>
+    <!-- 页面区域-->
+    <DkCollapse ref="collapse" @on-change="changeCollapse">
+      <DkPanel title="锁基差利息1：计算规则(️ 超期天数 ✖️ 锁基差成本 )" prop="锁基差利息1：计算规则(️ 超期天数 ✖️ 锁基差成本 )" class="tabs-step-class" >
+        <div slot="content">
+          <EditTable
+            ref="contactName1"
+            :height="250"
+            :financeFlag="true"
+            :operateFlag ="false"
+            :pageFlag="true"
+            :pageTotal="pageTotal"
+            v-model="formData.skuData"
+            :columns="editTableColumns"
+            @pageChange="pageSizeChange"
+          ></EditTable>
         </div>
+      </DkPanel>
+      <DkPanel prop="批号资源" id="workInformation">
+        <div slot="content">
+          <EditTable
+            ref="contactName1"
+            :height="250"
+            :financeFlag="true"
+            :pageFlag="false"
+            :pageTotal="pageTotal"
+            v-model="formData.skuData1"
+            :columns="editTableColumns1"
+            :childCols="childCols"
+            @pageChange="pageSizeChange"
+            @operate-click="handleOperateClick"
+          ></EditTable>
 
-        <!--  表格部分  -->
-        <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="lockBasisOrderNo" title="锁基差单号"></DkTableColumn>
-          <!--  商品名称  -->
-          <DkTableColumn field="relatedSalesOrderNo" title="关联销售单号"></DkTableColumn>
-          <!--  规格型号  -->
-          <DkTableColumn field="customerName"   title="客户名称" ></DkTableColumn>
-          <!--  计量单位  -->
-          <DkTableColumn field="lockBasisType"   title="锁基差类型"></DkTableColumn>
-          <!--  仓库名称  -->
-          <DkTableColumn field="futuresContractCode"  title="期货合约代码"></DkTableColumn>
-          <!--  存放货位  -->
-          <DkTableColumn field="lockedBasis" title="锁定基差"></DkTableColumn>
-          <!--  供应商  -->
-          <DkTableColumn field="lockedPrice" title="锁定价格"></DkTableColumn>
-          <!--  采购人  -->
-          <DkTableColumn field="currentFuturesPrice" title="当前期货价"/>
-          <!--  备注  -->
-          <DkTableColumn field="lockedQuantity" 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>
-
-
+        </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 {indexMixin} from '@/mixins'
+import {formMixin} from '@/mixins/form'
 
 export default {
-  name: 'sales-order-management',
-  mixins: [indexMixin],
+  mixins: [formMixin],
   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: [
-        {
-          //公司名称
-          itemCode: 'cpIds',
-          title: '锁基差单号',
-
-          required: true
-        },
-        {
-          //员工工号
-          itemCode: 'staffCode',
-          title: '关联销售单号',
-        },
-        {
-          //员工名称
-          itemCode: 'staffName',
-          title: '客户名称',
-        },
+    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,//角色名称
+
+        skuData: [
+          {   shipmentDate: '2023-12-03',   buyer: '销售员小张',  seller: '客户张经理',  number: 2362,
+            metricWeight: '554.297',  amount: '477053.1',contractNumber: '',status: '完成',remarks: '', },
+          {   shipmentDate: '2023-12-03',   buyer: '销售员小张',  seller: '客户张经理',   number: 2362,
+            metricWeight: '554.297',  amount: '477053.1',contractNumber: '',status: '完成',remarks: '', },
+
+        ],
+      },
+      editTableColumns: [
+        {  title:'开货日期', field: 'shipmentDate', type: 'checkbox'},// 商品型号
+        {  title:'开货日期', field: 'shipmentDate', type: 'disabled'},// 商品型号
+        {  title:'买方',field: 'buyer', type: 'disabled', width: 'auto'},// 商品名称
+        {  title:'卖方', field: 'seller', type: 'disabled'},// 商品型号
+        {  title:'件数',field: 'number', type: 'number', width: 'auto'},// 商品名称
+        {  title:'公重',field: 'metricWeight', type: 'disabled', width: 'auto'},// 商品名称
+        {  title:'金额',field: 'amount', type: 'disabled', width: 'auto'},// 商品名称
+        {  title:'合同号',field: 'contractNumber', type: 'disabled', width: 'auto'},// 商品名称
+        {  title:'状态',field: 'status', type: 'disabled', width: 'auto'},// 商品名称
+        {  title:'备注',field: 'remarks', type: 'disabled', width: 'auto'},// 商品名称
+      ],
+      editTableColumns1: [
+        // { field: 'expand', type: 'table', childTableWidth: 1000 },
+        {  title:'批号', field: 'skuModel', type: 'disabled'},// 商品型号
+        {
+          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: 'skuModel3', type: 'disabled'},// 商品型号
+        {  title:'锁基差利息',field: 'skuNa1me', type: 'disabled', width: 'auto'},// 商品名称
+
+      ],
+      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,
+
+      childCols: [
+        {field: 'skuCode'},
+        {field: 'skuModel', type: 'disabled'},
+        {field: 'skuName', type: 'disabled'},
+        {field: 'amount', title: '变更加价金额', type: 'number'}],
     }
   },
   methods: {
+
     /**
-     * @desc   : 点击预览页当前行
+     * @desc   : desc
      * @author : 王英杰
-     * @date   : 2025/5/28 14:41
+     * @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 : 寇珊珊
      */
-    currentChangeTable(e) {
-      if (e && e.row) {
-        this.row = e
+    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 = 'lockBdiManagement'  // 设置路由名称
+    //设置默认值
+    this.routeObjName = 'staff'  // 设置路由名称
+    this.formData.staffCode = this.$t('codeRemark')
+    this.resizeTableFlag = true // 开启计算高度
   },
-
-
+  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>
+

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

@@ -1,170 +1,552 @@
 <!-- @desc:利息管理-超期利息管理  @auth:？？？  @time:----- -->
 <template>
-  <div class="main-div" ref="mainDiv">
+  <div class="main-div">
+    <!--加载中-->
     <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>
+    <!-- 页面区域-->
+    <DkCollapse ref="collapse" @on-change="changeCollapse">
+      <DkPanel title="锁基差利息1：计算规则(️ 超期天数 ✖️ 锁基差成本 )" prop="锁基差利息1：计算规则(️ 超期天数 ✖️ 锁基差成本 )" class="tabs-step-class" >
+        <div slot="content">
+          <EditTable
+            ref="contactName1"
+            :height="300"
+            :financeFlag="true"
+            :operateFlag ="false"
+            :pageFlag="true"
+            :pageTotal="pageTotal"
+            v-model="formData.skuData"
+            :columns="editTableColumns"
+            @pageChange="pageSizeChange"
+          ></EditTable>
         </div>
+      </DkPanel>
+      <DkPanel prop="批号资源" id="workInformation">
+        <div slot="content">
+          <EditTable
+            ref="contactName1"
+            :height="300"
+            :financeFlag="true"
+            :pageFlag="false"
+            :pageTotal="pageTotal"
+            v-model="formData.skuData1"
+            :columns="editTableColumns1"
+            :childCols="childCols"
+            @pageChange="pageSizeChange"
+            @operate-click="handleOperateClick"
+          ></EditTable>
 
-        <!--  表格部分  -->
-        <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>
-
-
-        </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>
-
-
+        </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 {indexMixin} from '@/mixins'
+import {formMixin} from '@/mixins/form'
 
 export default {
-  name: 'sales-order-management',
-  mixins: [indexMixin],
+  mixins: [formMixin],
   data() {
-    return  {
-      //查询条件
-      searchContent: [
-        {
-          //公司名称
-          itemCode: 'cpIds',
-          title: '锁基差单号',
-
-          required: true
-        },
-        {
-          //员工工号
-          itemCode: 'staffCode',
-          title: '关联销售单号',
-        },
-        {
-          //员工名称
-          itemCode: 'staffName',
-          title: '客户名称',
-        },
+    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,//角色名称
+
+        skuData: [
+          {   shipmentDate: '2023-12-03',   buyer: '销售员小张',  seller: '客户张经理',  number: 2362,
+            metricWeight: '554.297',  amount: '477053.1',contractNumber: '',status: '完成',remarks: '', },
+          {   shipmentDate: '2023-12-03',   buyer: '销售员小张',  seller: '客户张经理',   number: 2362,
+            metricWeight: '554.297',  amount: '477053.1',contractNumber: '',status: '完成',remarks: '', },
+
+        ],
       },
+      editTableColumns: [
+        {  title:'开货日期', field: 'shipmentDate', type: 'checkbox'},// 商品型号
+        {  title:'开货日期', field: 'shipmentDate', type: 'disabled'},// 商品型号
+        {  title:'买方',field: 'buyer', type: 'disabled', width: 'auto'},// 商品名称
+        {  title:'卖方', field: 'seller', type: 'disabled'},// 商品型号
+        {  title:'件数',field: 'number', type: 'number', width: 'auto'},// 商品名称
+        {  title:'公重',field: 'metricWeight', type: 'disabled', width: 'auto'},// 商品名称
+        {  title:'金额',field: 'amount', type: 'disabled', width: 'auto'},// 商品名称
+        {  title:'合同号',field: 'contractNumber', type: 'disabled', width: 'auto'},// 商品名称
+        {  title:'状态',field: 'status', type: 'disabled', width: 'auto'},// 商品名称
+        {  title:'备注',field: 'remarks', type: 'disabled', width: 'auto'},// 商品名称
+      ],
+      editTableColumns1: [
+        // { field: 'expand', type: 'table', childTableWidth: 1000 },
+        {  title:'批号', field: 'skuModel', type: 'disabled'},// 商品型号
+        {
+          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: 'skuModel3', type: 'disabled'},// 商品型号
+        {  title:'锁基差利息',field: 'skuNa1me', type: 'disabled', width: 'auto'},// 商品名称
+
+      ],
+      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,
+
+      childCols: [
+        {field: 'skuCode'},
+        {field: 'skuModel', type: 'disabled'},
+        {field: 'skuName', type: 'disabled'},
+        {field: 'amount', title: '变更加价金额', type: 'number'}],
     }
   },
   methods: {
+
     /**
-     * @desc   : 点击预览页当前行
+     * @desc   : desc
      * @author : 王英杰
-     * @date   : 2025/5/28 14:41
+     * @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 : 寇珊珊
      */
-    currentChangeTable(e) {
-      if (e && e.row) {
-        this.row = e
+    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 = 'overdueInterestManagement'  // 设置路由名称
+    //设置默认值
+    this.routeObjName = 'staff'  // 设置路由名称
+    this.formData.staffCode = this.$t('codeRemark')
+    this.resizeTableFlag = true // 开启计算高度
   },
+  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>
 
-</script>
 
 

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

@@ -10,15 +10,15 @@
         <!--    清空条件    -->
         <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>
+<!--        <BaseIndexButton right-button="warehouse-management-edit" ref="edit" name="edit"></BaseIndexButton>-->
+<!--        &lt;!&ndash;    启用    &ndash;&gt;-->
+<!--        <BaseIndexButton right-button="warehouse-management-enable" ref="enable" name="enable"></BaseIndexButton>-->
+<!--        &lt;!&ndash;    停用    &ndash;&gt;-->
+<!--        <BaseIndexButton right-button="warehouse-management-disable" ref="disable" name="disable"></BaseIndexButton>-->
+<!--        &lt;!&ndash;    导入    &ndash;&gt;-->
+<!--        <BaseIndexButton right-button="warehouse-management-import" ref="import" name="import"></BaseIndexButton>-->
+<!--        &lt;!&ndash;    导出    &ndash;&gt;-->
+<!--        <BaseIndexButton right-button="warehouse-management-export" ref="export" name="export"></BaseIndexButton>-->
       </template>
       <template #right>
         <!--   新建     -->
@@ -43,7 +43,7 @@
           :id="'table-' + $options.name"
           ref="table-select"
           :data="tableData"
-          :height="tableHeight - 60"
+          :height="tableHeight - 30"
           primaryKey="staffId"
           :multiple="false"
           :choose-flag="false"
@@ -55,20 +55,18 @@
           :current-page="pageInfo.currentPage"
           :pageSize="pageInfo.pageSize"
         >
-          <DkTableColumn field="ledgerNumber" title="台账编号"></DkTableColumn>
+          <DkTableColumn field="ledgerNumber"  type="link" 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>
+          <DkTableColumn field="salesQuantity" data-type="number" title="销售数量"></DkTableColumn>
+          <DkTableColumn field="salesPrice"  data-type="number" title="销售单价" />
+          <DkTableColumn field="salesAmount" data-type="number" title="销售金额"></DkTableColumn>
         </DkTable>
       </div>
 

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

@@ -3,6 +3,13 @@
   <div class="main-div">
     <!--加载中-->
     <loading :loading="loading" v-if="!modalVisible"></loading>
+    <div style="display: flex" >
+      <BaseIndexButton    title="拉去库存资源"></BaseIndexButton>
+      <BaseIndexButton    title="添加公检批号"></BaseIndexButton>
+      <BaseIndexButton    title="添加资源"></BaseIndexButton>
+      <BaseIndexButton    title="修改仓库"></BaseIndexButton>
+      <BaseIndexButton    title="移除资源"></BaseIndexButton>
+    </div>
     <!-- 页面区域-->
     <DkCollapse ref="collapse" @on-change="changeCollapse">
       <!--基本信息-->
@@ -54,13 +61,13 @@
         </DkForm>
       </DkPanel>
       <!--销售资源-->
-      <DkPanel prop="销售资源" id="workInformation">
+      <DkPanel prop="销售资源" id="workInformation" :table-panel="true">
         <div slot="content">
           <EditTable
             ref="contactName1"
-            :height="300"
+            :height="tableHeight - 40"
             :financeFlag="true"
-            :pageFlag="true"
+            :pageFlag="false"
             :pageTotal="pageTotal"
             v-model="formData.skuData"
             :columns="editTableColumns"
@@ -547,6 +554,8 @@ export default {
     //设置默认值
     this.routeObjName = 'staff'  // 设置路由名称
     this.formData.staffCode = this.$t('codeRemark')
+    this.averageHeightFlag = true // 根据页面元素高度平分table高度
+    this.resizeTableFlag = true // 开启计算高度
   },
   mounted() {
     //添加身份证校验

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

@@ -42,7 +42,7 @@
         <DkTable :id="'table-'+$options.name"
                  ref="table-select"
                  :data="tableData"
-                 :height="tableHeight-60"
+                 :height="tableHeight-30"
                  primaryKey="staffId"
                  :multiple="false"
                  :choose-flag="false"
@@ -55,7 +55,7 @@
                  :pageSize="pageInfo.pageSize"
         >
           <!--  商品编号  -->
-          <DkTableColumn field="contractNumber" title="合同编号"></DkTableColumn>
+          <DkTableColumn field="contractNumber" type ="link" title="合同编号"></DkTableColumn>
           <!--  商品名称  -->
           <DkTableColumn field="goodsIssueDate" title="开货日期"></DkTableColumn>
           <!--  规格型号  -->
@@ -67,12 +67,12 @@
           <!--  存放货位  -->
           <DkTableColumn field="seller" title="卖方"></DkTableColumn>
           <!--  供应商  -->
-          <DkTableColumn field="totalAmount" title="金额合计"></DkTableColumn>
+          <DkTableColumn field="totalAmount" data-type="number" title="金额合计"></DkTableColumn>
           <!--  采购人  -->
-          <DkTableColumn field="totalPieces" title="件数合计"/>
+          <DkTableColumn field="totalPieces" data-type="number" title="件数合计"/>
           <!--  备注  -->
-          <DkTableColumn field="duplicateTotal" title="重复合计"></DkTableColumn>
-          <DkTableColumn field="interest" title="利息"></DkTableColumn>
+          <DkTableColumn field="duplicateTotal"  data-type="number" title="重复合计"></DkTableColumn>
+          <DkTableColumn field="interest" data-type="number" title="利息"></DkTableColumn>
 
 
         </DkTable>

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

@@ -3,6 +3,13 @@
   <div class="main-div">
     <!--加载中-->
     <loading :loading="loading" v-if="!modalVisible"></loading>
+    <div style="display: flex" >
+      <BaseIndexButton    title="拉去库存资源"></BaseIndexButton>
+      <BaseIndexButton    title="添加公检批号"></BaseIndexButton>
+      <BaseIndexButton    title="添加资源"></BaseIndexButton>
+      <BaseIndexButton    title="修改仓库"></BaseIndexButton>
+      <BaseIndexButton    title="移除资源"></BaseIndexButton>
+    </div>
     <!-- 页面区域-->
     <DkCollapse ref="collapse" @on-change="changeCollapse">
       <!--基本信息-->
@@ -58,9 +65,9 @@
         <div slot="content">
           <EditTable
             ref="contactName1"
-            :height="300"
+            :height="tableHeight - 50"
             :financeFlag="true"
-            :pageFlag="true"
+            :pageFlag="false"
             :pageTotal="pageTotal"
             v-model="formData.skuData"
             :columns="editTableColumns"
@@ -547,6 +554,7 @@ export default {
     //设置默认值
     this.routeObjName = 'staff'  // 设置路由名称
     this.formData.staffCode = this.$t('codeRemark')
+    this.resizeTableFlag = true // 开启计算高度
   },
   mounted() {
     //添加身份证校验

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

@@ -42,7 +42,7 @@
         <DkTable :id="'table-'+$options.name"
                  ref="table-select"
                  :data="tableData"
-                 :height="tableHeight-60"
+                 :height="tableHeight-30"
                  primaryKey="staffId"
                  :multiple="false"
                  :choose-flag="false"
@@ -55,7 +55,7 @@
                  :pageSize="pageInfo.pageSize"
         >
           <!--  商品编号  -->
-          <DkTableColumn field="salesOrderNumber" title="销售单号"></DkTableColumn>
+          <DkTableColumn field="salesOrderNumber"  type ="link" title="销售单号"></DkTableColumn>
           <!--  商品名称  -->
           <DkTableColumn field="salesType" title="销售类型"></DkTableColumn>
           <!--  规格型号  -->
@@ -70,42 +70,16 @@
           <!--  存放货位  -->
           <DkTableColumn field="lintGradeAndSpec" title="皮棉等级 / 规格"></DkTableColumn>
           <!--  供应商  -->
-          <DkTableColumn field="salesQuantity" title="销售数量"></DkTableColumn>
+          <DkTableColumn field="salesQuantity"  data-type="number" title="销售数量"></DkTableColumn>
           <!--  采购人  -->
-          <DkTableColumn field="unitPrice" title="单价"/>
+          <DkTableColumn field="unitPrice"   data-type="number" title="单价"/>
           <!--  备注  -->
-          <DkTableColumn field="totalAmount" title="总金额"></DkTableColumn>
+          <DkTableColumn field="totalAmount"  data-type="number" 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>
-          <!--  仓库名称  -->
-          <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>
-          <DkFormItem prop="remarks"  title="总金额"  v-model="formData.remarks" :readonly="readonly">  </DkFormItem>
-        </DkForm>
-      </DkModal>
     </div>