Merge branch 'master' of http://s.dev01.dkiboss.com:9001/lcboss/lcboss-web

src/router/routers.js

@@ -1308,6 +1308,17 @@ let menu = [
         },
         children: [
           {
+            path: '/mst/system-management/early-warning-management/index',
+            name: 'early-warning-management',
+            menuType:1,
+            component: () => import('@/view/mst/system-management/early-warning-management/index.vue'),
+            meta: {
+              title: '风险预警管理',
+              notCache: false,
+              menuType:1
+            },
+          },
+          {
             path: '/mst/system-management/branch-management/index',
             name: 'branch-management',
             menuType:1,

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

@@ -110,7 +110,7 @@
         </div>
 
         <div style="display: flex">
-          <Card class="card card-upcoming" style="margin: 8px;height: 200px;flex: 1" @contextmenu.native.prevent>
+          <Card class="card card-upcoming" style="margin: 8px;height:450px;flex: 1" @contextmenu.native.prevent>
             <div style="padding: 10px">
               <div style="font-size: 16px;color: black">昨日轧花厂入库Top20</div>
               <div style="display: flex;padding: 5px;font-weight: 700;color: gray">
@@ -118,12 +118,13 @@
                 <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%;height: 1px;background: #dedede;margin: 10px 0"></div>
+              <div id="echarts5" style="width: 100%; height: 350px;"></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%;height: 1px;background: #dedede;margin: 10px 0"></div>-->
             </div>
           </Card>
-          <Card class="card card-upcoming" style="margin: 8px;height: 200px;flex: 1" @contextmenu.native.prevent>
+          <Card class="card card-upcoming" style="margin: 8px;height: 450px;flex: 1" @contextmenu.native.prevent>
             <div style="padding: 10px">
               <div style="font-size: 16px;color: black">昨日仓库入库Top20</div>
               <div style="display: flex;padding: 5px;font-weight: 700;color: gray">
@@ -131,12 +132,13 @@
                 <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%;height: 1px;background: #dedede;margin: 10px 0"></div>
+              <div id="echarts6" style="width: 100%; height: 350px;"></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%;height: 1px;background: #dedede;margin: 10px 0"></div>-->
             </div>
           </Card>
-          <Card class="card card-upcoming" style="margin: 8px;height: 200px;flex: 1" @contextmenu.native.prevent>
+          <Card class="card card-upcoming" style="margin: 8px;height: 450px;flex: 1" @contextmenu.native.prevent>
             <div style="padding: 10px">
               <div style="font-size: 16px;color: black">昨日地区入库</div>
               <div style="display: flex;padding: 5px;font-weight: 700;color: gray">
@@ -144,9 +146,10 @@
                 <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%;height: 1px;background: #dedede;margin: 10px 0"></div>
+              <div id="echarts7" style="width: 100%; height: 350px;"></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%;height: 1px;background: #dedede;margin: 10px 0"></div>-->
             </div>
           </Card>
         </div>
@@ -450,6 +453,9 @@ export default {
       this.drawPerformance2()
       this.drawPerformance3()
       this.drawPerformance4()
+      this.drawPerformance5()
+      this.drawPerformance6()
+      this.drawPerformance7()
     });
 
   },
@@ -1117,6 +1123,276 @@ export default {
         }
       )
     },
+    drawPerformance5() {
+      let echarts = require('echarts')
+      let echarts1 = echarts.init(document.getElementById('echarts5'))
+      echarts1.setOption(
+        {
+          title: {
+            text: '',
+            left: 'center',
+            textStyle: {
+              fontSize: 18,
+              fontWeight: 'bold'
+            }
+          },
+          tooltip: {
+            trigger: 'axis',
+            axisPointer: {
+              type: 'shadow'
+            },
+            formatter: function (params) {
+              return params[0].name + '<br/>' + params[0].seriesName + ': ' + params[0].value + ' 吨';
+            }
+          },
+          legend: {
+            top: '5%',
+            data: ['入库量']
+          },
+          grid: {
+            left: '10%',
+            right: '5%',
+            bottom: '3%',
+            top: '15%',
+            containLabel: true
+          },
+          xAxis: {
+            type: 'value',
+            name: '吨',
+            nameLocation: 'end',
+            nameGap: 20,
+            boundaryGap: [0, 0.01]
+          },
+          yAxis: {
+            type: 'category',
+            data: [
+              '新疆阿克苏轧花厂', '山东德州棉业', '河南南阳轧花厂', '河北衡水棉业',
+              '湖北荆州轧花厂', '江苏盐城棉业', '安徽宿州轧花厂', '甘肃庆阳棉业',
+              '陕西渭南轧花厂', '江西九江棉业', '四川南充轧花厂', '云南大理棉业',
+              '贵州遵义轧花厂', '辽宁锦州棉业', '吉林四平轧花厂', '黑龙江绥化棉业',
+              '内蒙古赤峰轧花厂', '山西运城棉业', '浙江嘉兴轧花厂', '广东韶关棉业'
+            ],
+            axisLabel: {
+              interval: 0,
+              formatter: function (value) {
+                // 处理较长的轧花厂名称，超出一定长度显示省略号
+                return value.length > 6 ? value.substring(0, 6) + '...' : value;
+              }
+            }
+          },
+          series: [
+            {
+              name: '入库量',
+              type: 'bar',
+              data: [
+                18203, 17542, 16875, 15342, 14789,
+                13456, 12876, 11987, 10876, 9765,
+                8976, 8456, 7890, 7345, 6987,
+                6543, 6123, 5789, 5345, 4987
+              ],
+              label: {
+                show: true,
+                position: 'right',
+                formatter: '{c} 吨'
+              },
+              itemStyle: {
+                color: '#36a2eb'
+              }
+            }
+          ]
+        }
+      )
+    },
+    drawPerformance6() {
+      let echarts = require('echarts')
+      let echarts1 = echarts.init(document.getElementById('echarts6'))
+      echarts1.setOption(
+        {
+          title: {
+            text: '',
+            left: 'center',
+            textStyle: {
+              fontSize: 18,
+              fontWeight: 'bold'
+            }
+          },
+          tooltip: {
+            trigger: 'axis',
+            axisPointer: {
+              type: 'shadow'
+            },
+            formatter: function (params) {
+              return params[0].name + '<br/>' + params[0].seriesName + ': ' + params[0].value + ' 吨';
+            }
+          },
+          legend: {
+            top: '5%',
+            data: ['入库量']
+          },
+          grid: {
+            left: '10%',
+            right: '5%',
+            bottom: '3%',
+            top: '15%',
+            containLabel: true
+          },
+          xAxis: {
+            type: 'value',
+            name: '吨',
+            nameLocation: 'end',
+            nameGap: 20,
+            boundaryGap: [0, 0.01]
+          },
+          yAxis: {
+            type: 'category',
+            data:[
+              "新疆阿克苏棉花仓库",
+              "山东德州棉业仓库",
+              "河南南阳棉花仓库",
+              "河北衡水棉业仓库",
+              "湖北荆州棉花仓库",
+              "江苏盐城棉业仓库",
+              "安徽宿州棉花仓库",
+              "甘肃庆阳棉业仓库",
+              "陕西渭南棉花仓库",
+              "江西九江棉业仓库",
+              "四川南充棉花仓库",
+              "云南大理棉业仓库",
+              "贵州遵义棉花仓库",
+              "辽宁锦州棉业仓库",
+              "吉林四平棉花仓库",
+              "黑龙江绥化棉业仓库",
+              "内蒙古赤峰棉花仓库",
+              "山西运城棉业仓库",
+              "浙江嘉兴棉花仓库",
+              "广东韶关棉业仓库"
+            ],
+            axisLabel: {
+              interval: 0,
+              formatter: function (value) {
+                // 处理较长的轧花厂名称，超出一定长度显示省略号
+                return value.length > 6 ? value.substring(0, 6) + '...' : value;
+              }
+            }
+          },
+          series: [
+            {
+              name: '入库量',
+              type: 'bar',
+              data: [
+                18203, 17542, 16875, 15342, 14789,
+                13456, 12876, 11987, 10876, 9765,
+                8976, 8456, 7890, 7345, 6987,
+                6543, 6123, 5789, 5345, 4987
+              ],
+              label: {
+                show: true,
+                position: 'right',
+                formatter: '{c} 吨'
+              },
+              itemStyle: {
+                color: '#36a2eb'
+              }
+            }
+          ]
+        }
+      )
+    },
+    drawPerformance7() {
+      let echarts = require('echarts')
+      let echarts1 = echarts.init(document.getElementById('echarts7'))
+      echarts1.setOption(
+        {
+          title: {
+            text: '',
+            left: 'center',
+            textStyle: {
+              fontSize: 18,
+              fontWeight: 'bold'
+            }
+          },
+          tooltip: {
+            trigger: 'axis',
+            axisPointer: {
+              type: 'shadow'
+            },
+            formatter: function (params) {
+              return params[0].name + '<br/>' + params[0].seriesName + ': ' + params[0].value + ' 吨';
+            }
+          },
+          legend: {
+            top: '5%',
+            data: ['入库量']
+          },
+          grid: {
+            left: '10%',
+            right: '5%',
+            bottom: '3%',
+            top: '15%',
+            containLabel: true
+          },
+          xAxis: {
+            type: 'value',
+            name: '吨',
+            nameLocation: 'end',
+            nameGap: 20,
+            boundaryGap: [0, 0.01]
+          },
+          yAxis: {
+            type: 'category',
+            data:[
+              "新疆阿克苏地区",
+              "山东德州",
+              "河南南阳",
+              "河北衡水",
+              "湖北荆州",
+              "江苏盐城",
+              "安徽宿州",
+              "甘肃庆阳",
+              "陕西渭南",
+              "江西九江",
+              "四川南充",
+              "云南大理",
+              "贵州遵义",
+              "辽宁锦州",
+              "吉林四平",
+              "黑龙江绥化",
+              "内蒙古赤峰",
+              "山西运城",
+              "浙江嘉兴",
+              "广东韶关"
+            ],
+            axisLabel: {
+              interval: 0,
+              formatter: function (value) {
+                // 处理较长的轧花厂名称，超出一定长度显示省略号
+                return value.length > 6 ? value.substring(0, 6) + '...' : value;
+              }
+            }
+          },
+          series: [
+            {
+              name: '入库量',
+              type: 'bar',
+              data: [
+                18203, 17542, 16875, 15342, 14789,
+                13456, 12876, 11987, 10876, 9765,
+                8976, 8456, 7890, 7345, 6987,
+                6543, 6123, 5789, 5345, 4987
+              ],
+              label: {
+                show: true,
+                position: 'right',
+                formatter: '{c} 吨'
+              },
+              itemStyle: {
+                color: '#36a2eb'
+              }
+            }
+          ]
+        }
+      )
+    },
     /**
      * @desc   : 跳页
      * @author : 洪旭东

src/view/common/staff-test-小窗体-单列表/index.vue

@@ -74,7 +74,7 @@
         </DkFormItem>
         <!--  员工名称  -->
         <DkFormItem prop="staffName" :required="true" v-model="formData.staffName" :type="$config.formItemType.number"
-                    :format-thousandth="false" data-type="number" unit="元">
+                    :format-thousandth="false" :dataType="$config.columnType.number" unit="元">
         </DkFormItem>
         <DkFormItem prop="gender" v-model="formData.gender" :type="$config.formItemType.radio"
                     :optionList="gendersList">

src/view/common/staff-test-小窗体-左右两栏/index.vue

@@ -97,7 +97,7 @@
         </DkFormItem>
         <!--  员工名称  -->
         <DkFormItem prop="staffName" :required="true" v-model="formData.staffName" :type="$config.formItemType.number"
-                    :format-thousandth="false" data-type="number" unit="元">
+                    :format-thousandth="false" :dataType="$config.columnType.number" unit="元">
         </DkFormItem>
         <DkFormItem prop="gender" v-model="formData.gender" :type="$config.formItemType.radio"
                     :optionList="gendersList">

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

@@ -55,9 +55,10 @@
                  :pageSize="pageInfo.pageSize"  >
           <DkTableColumn field="warehouseName" title="仓库名"></DkTableColumn>
           <DkTableColumn field="status" title="状态"></DkTableColumn>
-          <DkTableColumn field="province"   title="省份" ></DkTableColumn>
-          <DkTableColumn field="region"   title="地区"></DkTableColumn>
-          <DkTableColumn field="address"  title="地址"></DkTableColumn>
+          <DkTableColumn field="province" title="省"></DkTableColumn>
+          <DkTableColumn field="city" title="市"></DkTableColumn>
+          <DkTableColumn field="region" title="区"></DkTableColumn>
+          <DkTableColumn field="fullAddress"  title="详细地址" ></DkTableColumn>
           <DkTableColumn field="contactPerson" title="联系人"></DkTableColumn>
           <DkTableColumn field="landlinePhone" title="座机"></DkTableColumn>
           <DkTableColumn field="mobilePhone" title="手机"/>
@@ -143,9 +144,10 @@ export default {
           staffId: 1001,
           warehouseName: '甘肃省敦煌种业集团股份有限公司',
           status: '有效',
-          province: '甘肃省',
-          region: '酒泉市',
-          address: '西城路10号',
+          province: "辽宁",
+          city: "沈阳",
+          region: "和平区",
+          fullAddress: "和平北大街156号",
           contactPerson: '狄军',
           landlinePhone: '010-88888888',
           mobilePhone: '13800138001',
@@ -156,9 +158,10 @@ export default {
           staffId: 1002,
           warehouseName: '新疆金棉仓储物流有限公司',
           status: '有效',
-          province: '新疆维吾尔自治区',
-          region: '阿拉尔',
-          address: '',
+          "province": "辽宁",
+          "city": "沈阳",
+          "region": "沈河区",
+          "fullAddress": "青年大街167号",
           contactPerson: '李海峰',
           landlinePhone: '021-66666666',
           mobilePhone: '13900139002',
@@ -169,9 +172,10 @@ export default {
           staffId: 1003,
           warehouseName: '中棉集团邯郸物流园有限公司',
           status: '有效',
-          province: '西藏自治区',
-          region: '拉萨市',
-          address: '',
+          "province": "辽宁",
+          "city": "沈阳",
+          "region": "皇姑区",
+          "fullAddress": "泰山路2号",
           contactPerson: '王跃武',
           landlinePhone: '020-77777777',
           mobilePhone: '13700137003',
@@ -182,9 +186,10 @@ export default {
           staffId: 1004,
           warehouseName: '湖北景天集团天门仓库',
           status: '有效',
-          province: '湖北省',
-          region: '天门市',
-          address: '待确定',
+          "province": "辽宁",
+          "city": "沈阳",
+          "region": "铁西区",
+          "fullAddress": "建设大路40号",
           contactPerson: '赵小六',
           landlinePhone: '0755-99999999',
           mobilePhone: '13600136004',
@@ -195,9 +200,10 @@ export default {
           staffId: 1005,
           warehouseName: '新疆库尔勒华力运销有限责任公司',
           status: '有效',
-          province: '新疆维吾尔自治区',
-          region: '巴州',
-          address: '尚未收录',
+          "province": "辽宁",
+          "city": "沈阳",
+          "region": "大东区",
+          "fullAddress": "滂江街81号",
           contactPerson: '钱七',
           landlinePhone: '028-55555555',
           mobilePhone: '13500135005',
@@ -208,9 +214,10 @@ export default {
           staffId: 1006,
           warehouseName: '潍坊瑞港国际物流有限公司',
           status: '有效',
-          province: '山东省',
-          region: '青岛市',
-          address: '尚未收录',
+          "province": "辽宁",
+          "city": "沈阳",
+          "region": "于洪区",
+          "fullAddress": "黄海路33号",
           contactPerson: '孙达瓦',
           landlinePhone: '027-44444444',
           mobilePhone: '13400134006',
@@ -221,9 +228,10 @@ export default {
           staffId: 1007,
           warehouseName: '临清华茂纺织原料有限公司',
           status: '有效',
-          province: '山东省',
-          region: '聊城市',
-          address: '尚未收录',
+          "province": "辽宁",
+          "city": "沈阳",
+          "region": "沈北新区",
+          "fullAddress": "蒲河路88号",
           contactPerson: '周阿九',
           landlinePhone: '029-33333333',
           mobilePhone: '13300133007',
@@ -234,9 +242,10 @@ export default {
           staffId: 1008,
           warehouseName: '新疆商物港汇物流有限公司',
           status: '有效',
-          province: '新疆维吾尔自治区',
-          region: '乌鲁木齐',
-          address: '乌鲁木齐高新技术产业开发区（新市区）长春中路818号新世界广场超高层商业、商务办公综合楼B段1601室',
+          "province": "辽宁",
+          "city": "沈阳",
+          "region": "苏家屯区",
+          "fullAddress": "南京南街1028号",
           contactPerson: '吴达',
           landlinePhone: '025-22222222',
           mobilePhone: '13200132008',
@@ -247,9 +256,10 @@ export default {
           staffId: 1009,
           warehouseName: '新乡市富华供应链管理有限公司',
           status: '有效',
-          province: '河南省',
-          region: '新乡市',
-          address: '河南省新乡市辉县市峪河镇蒋庄村1号',
+          "province": "辽宁",
+          "city": "沈阳",
+          "region": "辽中区",
+          "fullAddress": "滨水路38号",
           contactPerson: '郑经',
           landlinePhone: '0571-11111111',
           mobilePhone: '13100131009',
@@ -260,9 +270,10 @@ export default {
           staffId: 1010,
           warehouseName: '辉县市常青贸易有限责任公司',
           status: '有效',
-          province: '河南省',
-          region: '新乡市',
-          address: '辉县市峪河镇肖吕村',
+          "province": "辽宁",
+          "city": "沈阳",
+          "region": "新民市",
+          "fullAddress": "辽河大街123号",
           contactPerson: '王飞',
           landlinePhone: '0991-88888888',
           mobilePhone: '13000130010',

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

@@ -55,18 +55,18 @@
           <DkTableColumn field="batchNumber" type="link"  title="批号"></DkTableColumn>
           <vxe-colgroup title="郑棉">
             <!--  ="郑棉-升贴水  -->
-            <DkTableColumn field="zhengMianBasisPriceAdjustment" title="升贴水"></DkTableColumn>
+            <DkTableColumn  dataType="number"  field="zhengMianBasisPriceAdjustment" title="升贴水"></DkTableColumn>
           </vxe-colgroup>
           <vxe-colgroup title="棉协11月">
             <!--  ="郑棉-升贴水  -->
-            <DkTableColumn  dataType="number"  field="cottonAssociationBasisPriceAdjustment" title="升贴水"></DkTableColumn>
+            <DkTableColumn  dataType="number"field="cottonAssociationBasisPriceAdjustment" title="升贴水"></DkTableColumn>
           </vxe-colgroup>
           <vxe-colgroup title="Idc">
             <!--  ="郑棉-升贴水  -->
             <DkTableColumn  dataType="number"  field="idcBasisPriceAdjustment" title="升贴水"></DkTableColumn>
           </vxe-colgroup>
           <!--  规格型号  -->
-          <DkTableColumn     field="foreignFiber"  dataType="number" title="异纤"   ></DkTableColumn>
+          <DkTableColumn     field="foreignFiber"  digits="0"  dataType="number" title="异纤"   ></DkTableColumn>
           <!--  计量单位  -->
           <DkTableColumn field="warehousingDate"   title="入库日期"></DkTableColumn>
           <!--  仓库名称  -->
@@ -76,7 +76,7 @@
           <!--  供应商  -->
           <DkTableColumn field="inspectionWarehouse" title="公检仓库"></DkTableColumn>
           <!--  采购人  -->
-          <DkTableColumn dataType="number" field="baleCount" title="包数"/>
+          <DkTableColumn dataType="number"  digits="0"  field="baleCount" title="包数"/>
           <!--  备注  -->
           <DkTableColumn dataType="number" field="officialWeight" title="公重（t）"></DkTableColumn>
           <DkTableColumn dataType="number" field="moistureRegain" title="回潮"></DkTableColumn>

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

@@ -58,19 +58,19 @@
             <DkTableColumn field="basisDifference" title="基差"></DkTableColumn>
           </vxe-colgroup>
           <DkTableColumn  width="100"  field="lintType" title="皮棉类型"></DkTableColumn>
-          <DkTableColumn field="foreignFiber"dataType="number" title="异纤"></DkTableColumn>
+          <DkTableColumn field="foreignFiber"dataType="number"  digits="0"  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"dataType="number" title="包数"></DkTableColumn>
+          <DkTableColumn field="baleCount" width="400"dataType="number"  digits="0"  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）">
-            <DkTableColumn field="lengthAverageValue" title="均值"></DkTableColumn>
+            <DkTableColumn  dataType="number" field="lengthAverageValue" title="均值"></DkTableColumn>
           </vxe-colgroup>
           <vxe-colgroup title="马值">
             <DkTableColumn field="mainGrade" title="主体级"></DkTableColumn>

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

@@ -61,7 +61,7 @@
             <!--  ="郑棉-升贴水  -->
             <DkTableColumn dataType="number" field="basisPriceAdjustment" title="升贴水"></DkTableColumn>
           </vxe-colgroup>
-          <DkTableColumn  width="100"  field="baleCount" dataType="number" title="包数"></DkTableColumn>
+          <DkTableColumn  width="100"  field="baleCount" dataType="number" digits="0"  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

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

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

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

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

@@ -56,6 +56,7 @@
                  :pageSize="pageInfo.pageSize"
         >
           <!--  商品编号  -->
+          <DkTableColumn field="invoiceNumber"type="link"  title="发票编号"></DkTableColumn>
           <DkTableColumn field="invoiceType" title="发票类型"></DkTableColumn>
           <!--  规格型号  -->
           <DkTableColumn field="invoiceDate"  title="开票日期" ></DkTableColumn>
@@ -63,15 +64,12 @@
           <DkTableColumn field="invoicingMethod"   title="开票方式"></DkTableColumn>
           <!--  仓库名称  -->
           <DkTableColumn field="invoicingParty"  title="开票方"></DkTableColumn>
-          <!--  存放货位  -->
-          <DkTableColumn field="invoiceNumber" title="发票号码"></DkTableColumn>
-
           <!--  采购人  -->
           <DkTableColumn field="tons" data-type="number" title="吨数"/>
           <!--  备注  -->
           <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="contractNo"  title="合同号"></DkTableColumn>
           <DkTableColumn field="remarks" title="备注"></DkTableColumn>
 
 

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

@@ -59,9 +59,9 @@
            <DkTableColumn field="supplierName" title="供应商名称"></DkTableColumn>
            <DkTableColumn field="supplierCode" title="供应商编号"></DkTableColumn>
            <DkTableColumn field="purchaseOrderNo" 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="totalAmount" :dataType="$config.columnType.number" title="应付金额"></DkTableColumn>
+           <DkTableColumn field="paidAmount":dataType="$config.columnType.number" title="已付金额"></DkTableColumn>
+           <DkTableColumn field="unpaidAmount":dataType="$config.columnType.number" title="未付金额"></DkTableColumn>
            <DkTableColumn field="paymentDeadline" title="付款期限"></DkTableColumn>
            <DkTableColumn field="overdueDays" title="逾期天数"></DkTableColumn>
            <DkTableColumn field="overdueStartDate" title="逾期开始日期"></DkTableColumn>

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

@@ -62,7 +62,7 @@
           <!-- 卖方 -->
           <DkTableColumn field="seller" title="卖方"></DkTableColumn>
           <!-- 件数 -->
-          <DkTableColumn field="itemCount" data-type="number" title="件数"></DkTableColumn>
+          <DkTableColumn field="itemCount" data-type="number"   digits="0"   title="件数"></DkTableColumn>
           <!-- 公重 -->
           <DkTableColumn field="grossWeight" data-type="number" title="公重"></DkTableColumn>
           <!-- 金额 -->
@@ -279,9 +279,9 @@ export default {
         {
           //公司名称
           itemCode: 'cpIds',
-          title: '批号',
-
-          required: true
+          title: '开货日期',
+          valueKind:'DATE',
+          // required: true
         },
         {
           //员工工号

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

@@ -12,7 +12,7 @@
             :height="250"
             :financeFlag="true"
             :operateFlag ="false"
-            :pageFlag="true"
+            :pageFlag="false"
             :pageTotal="pageTotal"
             v-model="formData.skuData"
             :columns="editTableColumns"
@@ -24,7 +24,7 @@
         <div slot="content">
           <EditTable
             ref="contactName1"
-            :height="250"
+            :height="tableHeight-50"
             :financeFlag="true"
             :pageFlag="false"
             :pageTotal="pageTotal"

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

@@ -5,14 +5,14 @@
     <loading :loading="loading" v-if="!modalVisible"></loading>
     <!-- 页面区域-->
     <DkCollapse ref="collapse" @on-change="changeCollapse">
-      <DkPanel title="锁基差利息1：计算规则(️ 超期天数 ✖️ 锁基差成本 )" prop="锁基差利息1：计算规则(️ 超期天数 ✖️ 锁基差成本 )" class="tabs-step-class" >
+      <DkPanel title="超期利息（一）计算规则：(重量 ✖️ 财务成本 ✖️ 超期天数)" prop="超期利息（一）计算规则：(重量 ✖️ 财务成本 ✖️ 超期天数)" class="tabs-step-class" >
         <div slot="content">
           <EditTable
             ref="contactName1"
             :height="300"
             :financeFlag="true"
             :operateFlag ="false"
-            :pageFlag="true"
+            :pageFlag="false"
             :pageTotal="pageTotal"
             v-model="formData.skuData"
             :columns="editTableColumns"
@@ -24,7 +24,7 @@
         <div slot="content">
           <EditTable
             ref="contactName1"
-            :height="300"
+            :height="tableHeight-50"
             :financeFlag="true"
             :pageFlag="false"
             :pageTotal="pageTotal"

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

@@ -44,6 +44,7 @@
           ref="table-select"
           :data="tableData"
           :height="tableHeight - 30"
+          :showFooter="true"
           primaryKey="staffId"
           :multiple="false"
           :choose-flag="false"
@@ -65,8 +66,8 @@
           <DkTableColumn field="customerName" title="客户名称"></DkTableColumn>
           <DkTableColumn field="cottonSpec" 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>
+          <DkTableColumn field="salesPrice"   :dataType="$config.columnType.number" :sum="true" title="销售单价" />
+          <DkTableColumn field="salesAmount" :dataType="$config.columnType.number" :sum="true" title="销售金额"></DkTableColumn>
         </DkTable>
       </div>
 

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

@@ -67,12 +67,12 @@
           <!--  存放货位  -->
           <DkTableColumn field="seller" title="卖方"></DkTableColumn>
           <!--  供应商  -->
-          <DkTableColumn field="totalAmount" data-type="number" title="金额合计"></DkTableColumn>
+          <DkTableColumn field="totalAmount" :dataType="$config.columnType.number" title="金额合计"></DkTableColumn>
           <!--  采购人  -->
-          <DkTableColumn field="totalPieces" data-type="number" title="件数合计"/>
+          <DkTableColumn field="totalPieces" :dataType="$config.columnType.number" title="件数合计"/>
           <!--  备注  -->
-          <DkTableColumn field="duplicateTotal"  data-type="number" title="重复合计"></DkTableColumn>
-          <DkTableColumn field="interest" data-type="number" title="利息"></DkTableColumn>
+          <DkTableColumn field="duplicateTotal"  :dataType="$config.columnType.number" title="重复合计"></DkTableColumn>
+          <DkTableColumn field="interest" :dataType="$config.columnType.number" title="利息"></DkTableColumn>
 
 
         </DkTable>
@@ -239,6 +239,7 @@ export default {
           //员工工号
           itemCode: 'staffCode',
           title: '开货日期',
+          valueKind:'DATE',
         },
         {
           //员工名称

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

@@ -65,7 +65,7 @@
         <div slot="content">
           <EditTable
             ref="contactName1"
-            :height="tableHeight - 50"
+            :height="tableHeight - 90"
             :financeFlag="true"
             :pageFlag="false"
             :pageTotal="pageTotal"

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

@@ -70,7 +70,7 @@
           <!--  存放货位  -->
           <DkTableColumn field="lintGradeAndSpec" title="皮棉等级 / 规格"></DkTableColumn>
           <!--  供应商  -->
-          <DkTableColumn field="salesQuantity"  data-type="number" title="销售数量"></DkTableColumn>
+          <DkTableColumn field="salesQuantity"  data-type="number"   digits="0"   title="销售数量"></DkTableColumn>
           <!--  采购人  -->
           <DkTableColumn field="unitPrice"   data-type="number" title="单价"/>
           <!--  备注  -->

src/view/mst/system-management/early-warning-management/index.vue

@@ -0,0 +1,265 @@
+<!-- @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="non-param-enable" ref="enable" name="enable"></BaseIndexButton>
+        <!--    停用    -->
+        <BaseIndexButton right-button="non-param-disable" ref="disable" name="disable"></BaseIndexButton>
+
+
+
+      </template>
+      <template #right>
+        <!--   新建     -->
+        <BaseIndexButton right-button="staff-add" ref="add" name="add" @click="add1"></BaseIndexButton>
+      </template>
+    </BaseIndexButtonGroup>
+    <!--  表格部分  -->
+    <div :style="'height: ' + tableHeight + 'px'" class="split-div-class">
+      <!--  卡片区  -->
+      <div class="index-card">
+        <!--  查询条件区域  -->
+
+        <!--  表格部分  -->
+
+
+        <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="warningType" title="预警类型" ></DkTableColumn>
+          <!--  预警值上限  -->
+          <DkTableColumn field="warningUpperLimit" title="预警值上限" > </DkTableColumn>
+          <!--  预警值下限  -->
+          <DkTableColumn field="warningLowerLimit" title="预警值下限"  ></DkTableColumn>
+          <!--  是否启用预警  -->
+          <DkTableColumn field="isWarningEnabled" type="switch" title="是否启用预警"></DkTableColumn>
+          <!--  过期时间  -->
+          <DkTableColumn field="dateTime" title="上次操作时间"></DkTableColumn>
+
+
+        </DkTable>
+      </div>
+    </div>
+    <!--新建角色-->
+    <DkModal
+      :loading="loading"
+      v-model="addRoleFlag"
+      ref="add-role-modal"
+      :title="$t('addRole')"
+      @modalOk="save('addRole')"
+      @on-visible-change="handleVisibleModal"
+      :saveFlag="true"
+      width="520px"
+
+    >
+      <DkForm ref="dk-form" v-model="formData" :col-count="1" style="height: 220px;">
+        <DkFormItem prop="warningType" title="预警类型" v-model="formData.warningType" :readonly="readonly"
+                    :type="$config.formItemType.select" :option-list="warningTypeList" :dataType="'boolean'"
+                    :multiple="false" labelKey="dataValue" valueKey="dataId">
+        </DkFormItem>
+        <DkFormItem v-if="formData.warningType ==1"   title="安全库存上限"  prop="password" v-model="formData.password"></DkFormItem>
+        <DkFormItem  v-if="formData.warningType ==1"  title="安全库存下限"  prop="password" v-model="formData.password"></DkFormItem>
+        <DkFormItem  v-if="formData.warningType ==2"  title="客户余额下限"  prop="password" v-model="formData.password"></DkFormItem>
+        <DkFormItem  v-if="formData.warningType ==2"  title="客户余额下限"  prop="password" v-model="formData.password"></DkFormItem>
+      <!--        上限-->
+        <DkFormItem  v-if="formData.warningType ==3"  title="超期天数预警值"  prop="password" v-model="formData.password"></DkFormItem>
+        <DkFormItem   title="是否开启预警"  :type="$config.formItemType.switch" prop="userNameLabel" v-model="formData.userNameLabel"></DkFormItem>
+
+
+
+      </DkForm>
+    </DkModal>
+    <!--角色授权-->
+    <DkModal
+      :loading="loading"
+      v-model="roleAuthorizationFlag"
+      ref="role-authorization-modal"
+      :title="$t('roleAuthorization')"
+      @modalOk="save('roleAuthorization')"
+      @on-visible-change="handleVisibleModal"
+      :saveFlag="true"
+      width="520px"
+
+    >
+
+    </DkModal>
+
+  </div>
+</template>
+
+<script>
+
+import {indexMixin} from '@/mixins'
+
+export default {
+  name: 'personnel-management',
+  mixins: [indexMixin],
+  data() {
+    let self = this
+    return {
+      warningTypeList: [
+        {dataId: 1, dataValue: '库存预警'},
+        {dataId: 2, dataValue: '出库预警'},
+        {dataId: 3, dataValue: '存货周期超时预警'},
+        {dataId: 4, dataValue: '结算超时预警'},
+        {dataId: 5, dataValue: '应收款预警'},
+        {dataId: 6, dataValue: '应付款预警'},
+      ],
+      addRoleFlag: false,
+      roleAuthorizationFlag: false,
+      userRenewalFlag: false,
+      dialogVisible: false,
+      periodType: '年',
+      duration: 3,
+      searchContent: [
+        {
+          //人员名
+          itemCode: 'employeeName',
+          title: this.$t('预警类型'),
+        },
+        //公司
+        {
+          itemCode: 'company',
+          valueFormat: {
+            code: 'company', data: [
+              { valueKey: 1, labelKey: "测试加工企业1" },
+              { valueKey: 2, labelKey:"测试加工企业2" },
+              { valueKey: 3, labelKey:"测试加工企业3" },
+              { valueKey: 4, labelKey:"测试加工企业4" },
+              { valueKey: 5, labelKey:"测试加工企业5" },
+              { valueKey: 6, labelKey:"测试加工企业6" },
+            ],
+            valueKey: 'valueKey',
+            labelKey: 'labelKey',
+          },
+          valueKind: this.$config.docUserInput.sChoice
+        },
+      ],
+      formData: {},
+      tableData:[
+        {
+          staffId: 1,
+          warningType: '库存预警',
+          warningUpperLimit: 30,
+          warningLowerLimit: 10,
+          isWarningEnabled: true,
+          dateTime: '2023-12-31 23:59:59'
+        },
+        {
+          staffId: 2,
+          warningType: '出库预警',
+          warningUpperLimit: "-",
+          warningLowerLimit: 30,
+          isWarningEnabled: true,
+          dateTime: '2023-12-31 23:59:59'
+        },
+        {
+          staffId: 3,
+          warningType: '存货周期超时预警',
+          warningUpperLimit: 100,
+          warningLowerLimit: "-",
+          isWarningEnabled: false,
+          dateTime: '2024-01-31 23:59:59'
+        },
+        {
+          staffId: 4,
+          warningType: '结算超时预警',
+          warningUpperLimit:  "-",
+          warningLowerLimit:  "-",
+          isWarningEnabled: true,
+          dateTime: '2024-01-15 23:59:59'
+        },
+        {
+          staffId: 5,
+          warningType: '应收款预警',
+          warningUpperLimit:  "-",
+          warningLowerLimit:  "-",
+          isWarningEnabled: true,
+          dateTime: '2024-02-28 23:59:59'
+        },
+        {
+          staffId: 6,
+          warningType: '应付款预警',
+          warningUpperLimit:  "-",
+          warningLowerLimit:  "-",
+          isWarningEnabled: false,
+          dateTime: '2024-03-31 23:59:59'
+        },
+
+      ],
+    }
+  },
+  methods: {
+    /**
+     *   @desc   : 新增编辑
+     *   @date   : 2025-5-28 15:00:00
+     *   @author : 王宇轩
+     */
+    add1() {
+      this.addRoleFlag = true;
+    },
+    /**
+     *   @desc   : 用户续费
+     *   @date   : 2025-5-28 15:00:00
+     *   @author : 王宇轩
+     */
+    renewal() {
+      this.userRenewalFlag = true;
+    },
+    /**
+     *   @desc   : 权限分配
+     *   @date   : 2025-5-28 15:00:00
+     *   @author : 王宇轩
+     */
+    roleAuthorization() {
+      this.roleAuthorizationFlag = true;
+    },
+
+    /**
+     *   @desc   : 加载数据
+     *   @date   : 2025-5-28 15:00:00
+     *   @author : 王宇轩
+     */
+    initData() {
+
+    },
+
+
+  },
+  created() {
+
+  },
+
+}
+
+</script>
+<style scoped>
+span{
+  font-size: 16px;
+  front-weight: bold;
+}
+</style>

src/view/personnel-info/personnel-manage/organization/form.vue

@@ -9,7 +9,7 @@
         <DkForm slot="content" ref="formInline" v-model="formData" style="width:100%" :colCount="4">
           <!--  公司名称  -->
           <DkFormItem prop="ownCpId" ref="ownCpId" :title="$t('cpName')" :type="$config.formItemType.search"
-                      required v-model="formData.ownCpId" :mag-text.sync="formData.ownCpName" data-type="number"
+                      required v-model="formData.ownCpId" :mag-text.sync="formData.ownCpName" :dataType="$config.columnType.number"
                       :mag-type="$config.MagnifierType.company" :multiple="false"
                       :initSearchFlag="true"
                       @on-change="chooseCompany"