修改 数据 上传第二版

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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