1.增加页面缓存2.工资统计精度问题

小小儁爺

2024-08-12 5504233baae78e2c387ea740adf17c3bce22cd26

1.增加页面缓存2.工资统计精度问题

 src/router/index.js

@@ -97,97 +97,97 @@
    children: [
      {
        path: 'organizationList',
        name: 'organizationListCancel',
        name: 'OrganizationList',
        code: '0101',
        component: () => import('@/views/basicSettings/organizationList'),
        meta: { code: '0101', title: '组织架构', icon: '', keepAlive: true }
      },
      {
        path: 'postList',
        name: 'personListCancel',
        name: 'PersonList',
        code: '0102',
        component: () => import('@/views/basicSettings/postList'),
        meta: { code: '0102', title: '岗位管理', icon: '', keepAlive: true }
      }, {
        path: 'groupList',
        name: 'groupListCancel',
        name: 'GroupList',
        code: '0103',
        component: () => import('@/views/basicSettings/groupList'),
        meta: { code: '0103', title: '班组管理', icon: '', keepAlive: true }
      },
      {
        path: 'personList',
        name: 'personListCancel',
        name: 'PersonList',
        code: '0104',
        component: () => import('@/views/basicSettings/personList'),
        meta: { code: '0104', title: '人员管理', icon: '', keepAlive: true }
      }, {
        path: 'roleList',
        name: 'roleListCancel',
        name: 'RoleList',
        code: '0105',
        component: () => import('@/views/basicSettings/roleList'),
        meta: { code: '0105', title: '角色管理', icon: '', keepAlive: true }
      },
      {
        path: 'powerDivider',
        name: 'powerDividerCancel',
        name: 'PowerDivider',
        code: '0110',
        component: () => import('@/views/basicSettings/powerDivider'),
        meta: { code: '0110', title: '权限分配', icon: '', keepAlive: true }
      },
      {
        path: 'roleDivider',
        name: 'roleDividerCancel',
        name: 'RoleDivider',
        code: '0111',
        hidden: true,
        component: () => import('@/views/basicSettings/roleDivider'),
        meta: { code: '0111', title: '角色分配', icon: '', keepAlive: true }
      }, {
        path: 'contactUnitList',
        name: 'contactUnitListCancel',
        name: 'ContactUnitList',
        code: '0106',
        component: () => import('@/views/basicSettings/contactUnitList'),
        meta: { code: '0106', title: '往来单位', icon: '', keepAlive: true }
      }, {
        path: 'warehouseList',
        name: 'warehouseListCancel',
        name: 'WarehouseList',
        code: '0107',
        component: () => import('@/views/basicSettings/warehouseList'),
        meta: { code: '0107', title: '仓库设置', icon: '', keepAlive: true }
      }, {
        path: 'storageList',
        name: 'storageListCancel',
        name: 'StorageList',
        code: '0108',
        component: () => import('@/views/basicSettings/storageList'),
        meta: { code: '0108', title: '库位设置', icon: '', keepAlive: true }
      }, {
        path: 'installLampList',
        name: 'installLampListCancel',
        name: 'InstallLampList',
        code: '0109',
        component: () => import('@/views/basicSettings/installLampList'),
        meta: { code: '0109', title: '安灯设置', icon: '', keepAlive: true }
      }, {
        path: 'processList',
        name: 'processListCancel',
        name: 'ProcessList',
        code: '0112',
        component: () => import('@/views/basicSettings/processList'),
        meta: { code: '0112', title: '工序设置', icon: '', keepAlive: true }
      }, {
        path: 'cronTime',
        name: 'cronTimeCancel',
        name: 'CronTime',
        code: '0113',
        component: () => import('@/views/basicSettings/cronTime'),
        meta: { code: '0113', title: '定时任务', icon: '', keepAlive: true }
      }, {
        path: 'processRoute',
        name: 'processRouteCancel',
        name: 'ProcessRoute',
        code: '0114',
        component: () => import('@/views/basicSettings/processRoute'),
        meta: { code: '0114', title: '工艺路线', icon: '', keepAlive: true }
      },
      {
        path: 'meterPrice',
        name: 'meterPriceCancel',
        name: 'MeterPrice',
        code: '0115',
        component: () => import('@/views/basicSettings/meterPrice'),
        meta: { code: '0115', title: '工价设置', icon: '', keepAlive: true }
@@ -207,20 +207,20 @@
    children: [
      {
        path: 'unitList',
        name: 'unitListCancel',
        name: 'UnitList',
        code: '0201',
        component: () => import('@/views/materialManager/unitList'),
        meta: { code: '0201', title: '计量单位', icon: '', keepAlive: true }
      },
      {
        path: 'inventoryList',
        name: 'inventoryListCancel',
        name: 'InventoryList',
        code: '0202',
        component: () => import('@/views/materialManager/inventoryList'),
        meta: { code: '0202', title: '存货档案', icon: '', keepAlive: true }
      }, {
        path: 'materialList',
        name: 'materialListCancel',
        name: 'MaterialList',
        code: '0203',
        component: () => import('@/views/materialManager/materialList'),
        meta: { code: '0203', title: '物料清单', icon: '', keepAlive: true }
@@ -240,49 +240,49 @@
    children: [
      {
        path: 'deviceList',
        name: 'deviceListCancel',
        name: 'DeviceList',
        code: '0301',
        component: () => import('@/views/deviceManager/deviceList'),
        meta: { code: '0301', title: '设备清单', icon: '', keepAlive: true }
      },
      {
        path: 'checkStandard',
        name: 'checkStandardCancel',
        name: 'CheckStandard',
        code: '0302',
        component: () => import('@/views/deviceManager/checkStandard'),
        meta: { code: '0302', title: '点检标准', icon: '', keepAlive: true }
      },
      {
        path: 'checkPosition',
        name: 'checkPositionCancel',
        name: 'CheckPosition',
        code: '0303',
        component: () => import('@/views/deviceManager/checkPosition'),
        meta: { code: '0303', title: '点检部位', icon: '', keepAlive: true }
      },
      {
        path: 'maintainStandard',
        name: 'maintainStandardCancel',
        name: 'MaintainStandard',
        code: '0304',
        component: () => import('@/views/deviceManager/maintainStandard'),
        meta: { code: '0304', title: '保养标准', icon: '', keepAlive: true }
      },
      {
        path: 'maintainPosition',
        name: 'maintainPositionCancel',
        name: 'MaintainPosition',
        code: '0305',
        component: () => import('@/views/deviceManager/maintainPosition'),
        meta: { code: '0305', title: '保养部位', icon: '', keepAlive: true }
      },
      {
        path: 'checkRecord',
        name: 'checkRecordCancel',
        name: 'CheckRecord',
        code: '0306',
        component: () => import('@/views/deviceManager/checkRecord'),
        meta: { code: '0306', title: '点检记录', icon: '', keepAlive: true }
      },
      {
        path: 'maintainRecord',
        name: 'maintainRecordCancel',
        name: 'MaintainRecord',
        code: '0307',
        component: () => import('@/views/deviceManager/maintainRecord'),
        meta: { code: '0307', title: '保养记录', icon: '', keepAlive: true }
@@ -290,7 +290,7 @@
      {
        path: 'repairRecord',
        code: '0308',
        name: 'repairRecordCancel',
        name: 'RepairRecord',
        component: () => import('@/views/deviceManager/repairRecord'),
        meta: { code: '0308', title: '维修记录', icon: '', keepAlive: true }
      }
@@ -308,67 +308,67 @@
    children: [
      {
        path: 'mouldList',
        name: 'mouldListCancel',
        name: 'MouldList',
        code: '0901',
        component: () => import('@/views/mouldManager/mouldList'),
        meta: { code: '0901', title: '模具清单', icon: '', keepAlive: true }
      }, {
        path: 'mouldCheckPos',
        name: 'mouldCheckCancel',
        name: 'MouldCheckPos',
        code: '0902',
        component: () => import('@/views/mouldManager/mouldCheck'),
        meta: { code: '0902', title: '模具点检项', icon: '', keepAlive: true }
      }, {
        path: 'mouldCheckStand',
        name: 'mouldCheckStandCancel',
        name: 'MouldCheckStand',
        code: '0903',
        component: () => import('@/views/mouldManager/mouldCheckStand'),
        meta: { code: '0903', title: '模具点检标准', icon: '', keepAlive: true }
      }, {
        path: 'mouldMaintain',
        name: 'mouldMaintainCancel',
        name: 'MouldMaintain',
        code: '0904',
        component: () => import('@/views/mouldManager/mouldMaintain'),
        meta: { code: '0904', title: '模具保养项', icon: '', keepAlive: true }
      }, {
        path: 'mouldMaintainStand',
        name: 'mouldMaintainStandCancel',
        name: 'MouldMaintainStand',
        code: '0905',
        component: () => import('@/views/mouldManager/mouldMaintainStand'),
        meta: { code: '0905', title: '模具保养标准', icon: '', keepAlive: true }
      }, {
        path: 'mouldCheckRecord',
        name: 'mouldCheckRecordCancel',
        name: 'mouldCheckRecord',
        code: '0906',
        component: () => import('@/views/mouldManager/mouldCheckRecord'),
        meta: { code: '0906', title: '模具点检记录', icon: '', keepAlive: true }
      }, {
        path: 'mouldMaintainRecord',
        name: 'mouldMaintainRecordCancel',
        name: 'MouldMaintainRecord',
        code: '0907',
        component: () => import('@/views/mouldManager/mouldMaintainRecord'),
        meta: { code: '0907', title: '模具保养记录', icon: '', keepAlive: true }
      }, {
        path: 'mouldRepairRecord',
        name: 'mouldRepairRecordCancel',
        name: 'MouldRepairRecord',
        code: '0908',
        component: () => import('@/views/mouldManager/mouldRepairRecord'),
        meta: { code: '0908', title: '模具维修记录', icon: '', keepAlive: true }
      }, {
        path: 'mouldUpDownRecord',
        name: 'mouldUpDownRecordCancel',
        name: 'MouldUpDownRecord',
        code: '0909',
        component: () => import('@/views/mouldManager/mouldUpDownRecord'),
        meta: { code: '0909', title: '模具上下机记录', icon: '', keepAlive: true }
      }, {
        path: 'mouldOutInRecord',
        name: 'mouldOutInRecordCancel',
        name: 'MouldOutInRecord',
        code: '0910',
        component: () => import('@/views/mouldManager/mouldOutInRecord'),
        meta: { code: '0910', title: '模具出入库记录', icon: '', keepAlive: true }
      }, {
        path: 'mouldCirculateRecord',
        name: 'mouldCirculateRecordCancel',
        name: 'MouldCirculateRecord',
        code: '0911',
        component: () => import('@/views/mouldManager/mouldCirculateRecord'),
        meta: { code: '0911', title: '模具借还记录', icon: '', keepAlive: true }
@@ -387,32 +387,32 @@
    children: [
      {
        path: 'defectDefine',
        name: 'defectDefineCancel',
        name: 'DefectDefine',
        code: '0401',
        component: () => import('@/views/qualityManager/defectDefine'),
        meta: { code: '0401', title: '缺陷定义', icon: '', keepAlive: true }
      },
      {
        path: 'processCheckItem',
        name: 'processCheckItemCancel',
        name: 'ProcessCheckItem',
        code: '0402',
        component: () => import('@/views/qualityManager/processCheckItem'),
        meta: { code: '0402', title: '检验项设置', icon: '', keepAlive: true }
      }, {
        path: 'qualityPlaning',
        name: 'qualityPlaningCancel',
        name: 'QualityPlaning',
        code: '0403',
        component: () => import('@/views/qualityManager/qualityPlaning'),
        meta: { code: '0403', title: '质检方案', icon: '', keepAlive: true }
      }, {
        path: 'processCheck',
        name: 'processCheckCancel',
        name: 'ProcessCheck',
        code: '0404',
        component: () => import('@/views/qualityManager/processCheck'),
        meta: { code: '0404', title: '工序检验', icon: '', keepAlive: true }
      }, {
        path: 'processCheckRecord',
        name: 'processCheckRecordCancel',
        name: 'ProcessCheckRecord',
        code: '0405',
        component: () => import('@/views/qualityManager/processCheckRecord'),
        meta: { code: '0405', title: '工序检验', icon: '', keepAlive: true }
@@ -431,27 +431,27 @@
    children: [
      {
        path: 'produceOrderList',
        name: 'produceOrderListCancel',
        name: 'ProduceOrderList',
        code: '0501',
        component: () => import('@/views/workOrder/produceOrderList'),
        meta: { code: '0501', title: 'ERP订单', icon: '', keepAlive: true }
      },
      {
        path: 'workOrderList',
        name: 'WorkOrderListCancel',
        name: 'WorkOrderList',
        code: '0502',
        component: () => import('@/views/workOrder/workOrderList'),
        meta: { code: '0502', title: 'MES工单', icon: '', keepAlive: true }
      },
      {
        path: 'workOrderSend',
        name: 'workOrderSendCancel',
        name: 'WorkOrderSend',
        code: '0503',
        component: () => import('@/views/workOrder/workOrderSend'),
        meta: { code: '0503', title: '工单派发', icon: '', keepAlive: true }
      }, {
        path: 'workOrderClose',
        name: 'workOrderCloseCancel',
        name: 'WorkOrderClose',
        code: '0504',
        component: () => import('@/views/workOrder/workOrderClose'),
        meta: { code: '0504', title: '工单关闭', icon: '', keepAlive: true }
@@ -471,20 +471,20 @@
    children: [
      {
        path: 'stepReport',
        name: 'stepReportCancel',
        name: 'StepReport',
        code: '0601',
        component: () => import('@/views/produce/stepReport'),
        meta: { code: '0601', title: '工序报工', icon: '', keepAlive: true }
      },
      {
        path: 'reportCorrect',
        name: 'reportCorrectCancel',
        name: 'ReportCorrect',
        code: '0602',
        component: () => import('@/views/produce/reportCorrect'),
        meta: { code: '0602', title: '报工调整', icon: '', keepAlive: true }
      }, {
        path: 'reportVerify',
        name: 'reportVerifyCancel',
        name: 'ReportVerify',
        code: '0603',
        component: () => import('@/views/produce/reportVerify'),
        meta: { code: '0603', title: '报工审核', icon: '', keepAlive: true }
@@ -504,65 +504,65 @@
    children: [
      {
        path: 'reportList',
        name: 'reportListCancel',
        name: 'ReportList',
        code: '1040',
        component: () => import('@/views/statistic/reportList'),
        meta: { code: '1040', title: '报工记录', icon: '', keepAlive: true }
      },
      {
        path: 'monthReport',
        name: 'monthReportCancel',
        name: 'MonthReport',
        code: '1041',
        component: () => import('@/views/statistic/monthReport'),
        meta: { code: '1041', title: '月度统计', icon: '', keepAlive: true }
      }, {
        path: 'workOrderProcess',
        name: 'workOrderProcessCancel',
        name: 'WorkOrderProcess',
        code: '0701',
        component: () => import('@/views/statistic/workOrderProcess'),
        meta: { code: '0701', title: '生产进度', icon: '', keepAlive: true }
      }, {
        path: 'inProcessList',
        name: 'inProcessListCancel',
        name: 'InProcessList',
        code: '1043',
        component: () => import('@/views/statistic/inProcessList'),
        meta: { code: '1043', title: '在制列表', icon: '', keepAlive: true }
      },
      {
        path: 'groupSalaryList',
        name: 'groupSalaryListCancel',
        name: 'GroupSalaryList',
        code: '0702',
        component: () => import('@/views/statistic/groupSalaryList'),
        meta: { code: '0702', title: '班组工资统计报表', icon: '', keepAlive: true }
      },
      {
        path: 'personSalaryList',
        name: 'personSalaryListCancel',
        name: 'PersonSalaryList',
        code: '0703',
        component: () => import('@/views/statistic/personSalaryList'),
        meta: { code: '0703', title: '人员工资统计报表', icon: '', keepAlive: true }
      }, {
        path: 'subcontractingOperation',
        name: 'subcontractingOperationCancel',
        name: 'SubcontractingOperation',
        code: '0704',
        component: () => import('@/views/statistic/subcontractingOperation'),
        meta: { code: '0704', title: '委外工序明细报表', icon: '', keepAlive: true }
      }, {
        path: 'defectDetailList',
        name: 'defectDetailListCancel',
        name: 'DefectDetailList',
        code: '0705',
        component: () => import('@/views/statistic/defectDetailList'),
        meta: { code: '0705', title: '不良明细报表', icon: '', keepAlive: true }
      }, {
        path: 'repairDetailList',
        name: 'repairDetailListCancel',
        name: 'RepairDetailList',
        code: '0706',
        component: () => import('@/views/statistic/repairDetailList'),
        meta: { code: '0706', title: '维修明细报表', icon: '', keepAlive: true }
      },,
      {
        path: 'installationLampList',
        name: 'installationLampListCancel',
        name: 'InstallationLampList',
        code: '0707',
        component: () => import('@/views/statistic/installationLampList'),
        meta: { code: '0707', title: '安灯报表', icon: '', keepAlive: true }
@@ -582,20 +582,20 @@
    children: [
      {
        path: 'sopDevice',
        name: 'sopDeviceCancel',
        name: 'SopDevice',
        code: '1001',
        component: () => import('@/views/sopManager/sopDevice'),
        meta: { code: '1001', title: '设备SOP', icon: '', keepAlive: true }
      },
      {
        path: 'sopRoute',
        name: 'sopRouteCancel',
        name: 'SopRoute',
        code: '1002',
        component: () => import('@/views/sopManager/sopRoute'),
        meta: { code: '1002', title: '工艺SOP', icon: '', keepAlive: true }
      }, {
        path: 'sopWorkOrder',
        name: 'sopWorkOrderCancel',
        name: 'SopWorkOrder',
        code: '1003',
        component: () => import('@/views/sopManager/sopWorkOrder'),
        meta: { code: '1003', title: '单据SOP', icon: '', keepAlive: true }
@@ -615,14 +615,14 @@
    children: [
      {
        path: 'menuList',
        name: 'menuListCancel',
        name: 'MenuList',
        code: '0801',
        component: () => import('@/views/systemSetting/menuList'),
        meta: { code: '0801', title: '菜单管理', icon: '', keepAlive: true }
      },
      {
        path: 'reportList',
        name: 'reportListCancel',
        name: 'ReportList',
        code: '0802',
        component: () => import('@/views/systemSetting/encodingRules'),
        meta: { code: '0802', title: '编码规则', icon: '', keepAlive: true }
@@ -636,7 +636,7 @@
      },
      {
        path: 'processSetting',
        name: 'processSettingCancel',
        name: 'ProcessSetting',
        code: '0804',
        component: () => import('@/views/systemSetting/processSetting'),
        meta: { code: '0804', title: '流转设置', icon: '', keepAlive: true }

 src/views/basicSettings/contactUnitList.vue

@@ -426,7 +426,7 @@
import { SeaveSearchPartner } from '@/api/ErpSyncMes'

export default {
  name: 'RoleList',
  name: 'ContactUnitList',
  directives: { waves, elDragDialog },
  components: {
    Pagination

 src/views/basicSettings/cronTime.vue

@@ -338,7 +338,7 @@
import vcrontab from '../../components/VcronTab/index'

export default {
  name: 'Zzjg',
  name: 'CronTime',
  components: {
    Pagination, cron, vcrontab
  },

 src/views/basicSettings/groupList.vue

@@ -205,7 +205,7 @@
import waves from '@/directive/waves'

export default {
  name: 'Zzjg',
  name: 'GroupList',
  components: {
    Pagination
  },

 src/views/basicSettings/installLampList.vue

@@ -256,7 +256,7 @@
import { PrentOrganization } from '@/api/GeneralBasicData'

export default {
  name: 'Zzjg',
  name: 'InstallLampList',
  directives: { elDragDialog, waves },
  data() {
    return {

 src/views/basicSettings/meterPrice.vue

@@ -311,7 +311,7 @@
import TableColumnSettings from '@/components/TableColumnSettings'

export default {
  name: 'JPGJ',
  name: 'MeterPrice',
  components: {
    Pagination, TableColumnSettings
  },

 src/views/basicSettings/organizationList.vue

@@ -208,7 +208,7 @@
import { PrentOrganization } from '@/api/GeneralBasicData'

export default {
  name: 'Zzjg',
  name: 'OrganizationList',
  components: {
    Pagination
  },

 src/views/basicSettings/personList.vue

@@ -400,7 +400,7 @@
import { GroupsPermissions, PostPermissions, PrentOrganization, RolePermissions } from '@/api/GeneralBasicData'

export default {
  name: 'Zzjg',
  name: 'PersonList',
  components: {
    Pagination
  },

 src/views/basicSettings/postList.vue

@@ -3,7 +3,13 @@
    <div class="body" :style="{height:mainHeight+'px'}">
      <div class="bodyTopButtonGroup" style="justify-content: space-between">
        <el-button v-waves type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">新增</el-button>
        <el-button v-waves type="success" icon="el-icon-download" @click="$router.push('./../systemSetting/dataImport?fileCode=1')">导入</el-button>
        <el-button
          v-waves
          type="success"
          icon="el-icon-download"
          @click="$router.push('./../systemSetting/dataImport?fileCode=1')"
        >导入
        </el-button>
      </div>

      <div class="bodyTopFormGroup">
@@ -96,7 +102,7 @@
            sortable="custom"
          >
            <template slot-scope="{row}">
              {{ row.description?row.description:'/' }}
              {{ row.description ? row.description : '/' }}
            </template>
          </el-table-column>
          <el-table-column
@@ -200,18 +206,13 @@

<script>
import Pagination from '@/components/Pagination'
import {
  AddUpdateOrganization, AddUpdatePost,
  DeleteOrganization, DeletePost, PostData,
  PrentOrganization,
  STorgData
} from '@/api/basicSettings'
import { AddUpdatePost, DeletePost, PostData } from '@/api/basicSettings'
import { validateCode } from '@/utils/global'
import elDragDialog from '@/directive/el-drag-dialog'
import waves from '@/directive/waves'

export default {
  name: 'Zzjg',
  name: 'PersonList',
  components: {
    Pagination
  },

 src/views/basicSettings/powerDivider.vue

@@ -184,7 +184,7 @@
import arrayToTree from 'array-to-tree'

export default {
  name: 'RoleList',
  name: 'PowerDivider',
  directives: { waves },
  data() {
    return {

 src/views/basicSettings/processList.vue

@@ -260,7 +260,7 @@
import waves from '@/directive/waves'

export default {
  name: 'Zzjg',
  name: 'ProcessList',
  components: {
    Pagination
  },

 src/views/basicSettings/processRoute.vue

@@ -351,7 +351,7 @@
import TableColumnSettings from '@/components/TableColumnSettings'

export default {
  name: 'GYLX',
  name: 'ProcessRoute',
  components: {
    Pagination, TableColumnSettings
  },

 src/views/basicSettings/roleDivider.vue

@@ -326,19 +326,17 @@
<script>
import Pagination from '@/components/Pagination'
import {
  AddUpdatePost, RoleAssignedUserBatchAdd,
  RoleAssignedUserBatchAdd,
  RoleAssignedUserBatchCancel,
  RoleAssignedUserData

} from '@/api/basicSettings'
import { validateCode } from '@/utils/global'
import elDragDialog from '@/directive/el-drag-dialog'
import waves from '@/directive/waves'
import arrayToTree from 'array-to-tree'
import { GroupsPermissions, PostPermissions, PrentOrganization, RolePermissions } from '@/api/GeneralBasicData'

export default {
  name: 'Zzjg',
  name: 'RoleDivider',
  components: {
    Pagination
  },

 src/views/basicSettings/roleList.vue

@@ -16,10 +16,10 @@
        >
          <div class="elForm">
            <el-form-item label="角色编码" style=" display: flex;">
              <el-input v-model="form.storg_code" placeholder="请输入" style="width: 200px" />
              <el-input v-model="form.role_code" placeholder="请输入" style="width: 200px" />
            </el-form-item>
            <el-form-item label="角色名称" style=" display: flex;">
              <el-input v-model="form.storg_name" placeholder="请输入" style="width: 200px" />
              <el-input v-model="form.role_name" placeholder="请输入" style="width: 200px" />
            </el-form-item>
          </div>
          <div
@@ -277,7 +277,7 @@
import arrayToTree from 'array-to-tree'

export default {
  name: 'Zzjg',
  name: 'RoleList',
  components: {
    Pagination
  },
@@ -369,8 +369,8 @@
    },
    // 重置
    reset() {
      this.form.storg_code = ''
      this.form.storg_name = ''
      this.form.role_code = ''
      this.form.role_name = ''
      this.getRoleData()
    },
    // 新增按钮

 src/views/basicSettings/storageList.vue

@@ -414,19 +414,13 @@
import { validateCode } from '@/utils/global'
import elDragDialog from '@/directive/el-drag-dialog'
import arrayToTree from 'array-to-tree'
import {
  TCunstomerAddUpdate,
  TCunstomerClassTree,
  TCunstomerClassTreeAddUpdate,
  TCunstomerClassTreeDelete,
  TCunstomerData, TCunstomerDelete, TSecLocaAddUpdate, TSecLocaData, TSecLocaDelete, TSecLocaTree
} from '@/api/basicSettings'
import { TCunstomerClassTreeAddUpdate, TCunstomerClassTreeDelete, TSecLocaAddUpdate, TSecLocaData, TSecLocaDelete, TSecLocaTree } from '@/api/basicSettings'
import { WareHouseSelectLocation } from '@/api/GeneralBasicData'

const _ = require('lodash')

export default {
  name: 'RoleList',
  name: 'StorageList',
  directives: { waves, elDragDialog },
  components: {
    Pagination

 src/views/basicSettings/warehouseList.vue

@@ -266,7 +266,7 @@
import { SaveSearchWareHouse } from '@/api/ErpSyncMes'

export default {
  name: 'Zzjg',
  name: 'WarehouseList',
  components: {
    Pagination
  },

 src/views/deviceManager/checkPosition.vue

@@ -305,7 +305,7 @@
import TableColumnSettings from '@/components/TableColumnSettings'

export default {
  name: 'Zzjg',
  name: 'CheckPosition',
  components: {
    Pagination, TableColumnSettings
  },

 src/views/deviceManager/checkRecord.vue

@@ -252,7 +252,7 @@
import { PrentOrganizationNoCompany } from '@/api/GeneralBasicData'

export default {
  name: 'Zzjg',
  name: 'CheckRecord',
  components: {
    Pagination, TableColumnSettings
  },

 src/views/deviceManager/checkStandard.vue

@@ -441,7 +441,7 @@
import TableColumnSettings from '@/components/TableColumnSettings'

export default {
  name: 'Zzjg',
  name: 'CheckStandard',
  components: {
    Pagination, TableColumnSettings
  },

 src/views/deviceManager/deviceList.vue

@@ -458,7 +458,7 @@
} from '@/api/DeviceManager'

export default {
  name: 'RoleList',
  name: 'DeviceList',
  directives: { waves, elDragDialog },
  components: {
    Pagination

 src/views/deviceManager/maintainPosition.vue

@@ -254,7 +254,7 @@
import TableColumnSettings from '@/components/TableColumnSettings'

export default {
  name: 'Zzjg',
  name: 'MaintainPosition',
  components: {
    Pagination, TableColumnSettings
  },

 src/views/deviceManager/maintainRecord.vue

@@ -251,7 +251,7 @@
import { PrentOrganizationNoCompany } from '@/api/GeneralBasicData'

export default {
  name: 'Zzjg',
  name: 'MaintainRecord',
  components: {
    Pagination, TableColumnSettings
  },

 src/views/deviceManager/maintainStandard.vue

@@ -400,7 +400,7 @@
import TableColumnSettings from '@/components/TableColumnSettings'

export default {
  name: 'Zzjg',
  name: 'MaintainStandard',
  components: {
    Pagination, TableColumnSettings
  },

 src/views/deviceManager/repairRecord.vue

@@ -333,7 +333,7 @@
import { PrentOrganizationNoCompany } from '@/api/GeneralBasicData'

export default {
  name: 'Zzjg',
  name: 'RepairRecord',
  components: {
    Pagination, TableColumnSettings
  },

 src/views/materialManager/inventoryList.vue

@@ -873,7 +873,7 @@
import ElDragSelect from '@/components/DragSelect'

export default {
  name: 'RoleList',
  name: 'InventoryList',
  directives: { waves, elDragDialog },
  components: {
    Pagination, ElDragSelect

 src/views/materialManager/unitList.vue

@@ -326,7 +326,7 @@
import { AddUpdateTUnit, DeleteTUnit, TUnitData, TUnitGroup, TUnitGroupProject } from '@/api/ProductModel'

export default {
  name: 'Zzjg',
  name: 'UnitList',
  components: {
    Pagination
  },

 src/views/mouldManager/mouldCheck.vue

@@ -180,7 +180,7 @@
import { AddUpdateMouldCheckItem, DeleteMouldCheckItem, MouldCheckItemSearch } from '@/api/MouldManager'

export default {
  name: 'Zzjg',
  name: 'MouldCheckPos',
  components: {
    Pagination, ImportPicker, TableColumnSettings
  },

 src/views/mouldManager/mouldCheckRecord.vue

@@ -291,7 +291,7 @@
import { MouldCheckSubTakeSearch, MouldCheckTakeOutExcel, MouldCheckTakeSearch } from '@/api/MouldManager'

export default {
  name: 'Zzjg',
  name: 'MouldCheckRecord',
  components: {
    Pagination
  },

 src/views/mouldManager/mouldCheckStand.vue

@@ -287,7 +287,7 @@
import arrayToTree from 'array-to-tree'

export default {
  name: 'Zzjg',
  name: 'MouldCheckStand',
  components: {
    Pagination, TableColumnSettings, ElDragSelect
  },

 src/views/mouldManager/mouldCirculateRecord.vue

@@ -282,7 +282,7 @@
} from '@/api/MouldManager'

export default {
  name: 'Zzjg',
  name: 'MouldCirculateRecord',
  components: {
    Pagination
  },

 src/views/mouldManager/mouldList.vue

@@ -548,7 +548,7 @@
import { TCunstomerDelete } from '@/api/basicSettings'

export default {
  name: 'Zzjg',
  name: 'MouldList',
  components: {
    Pagination
  },

 src/views/mouldManager/mouldMaintain.vue

@@ -184,7 +184,7 @@
} from '@/api/MouldManager'

export default {
  name: 'Zzjg',
  name: 'MouldMaintain',
  components: {
    Pagination, ImportPicker, TableColumnSettings
  },

 src/views/mouldManager/mouldMaintainRecord.vue

@@ -295,7 +295,7 @@
} from '@/api/MouldManager'

export default {
  name: 'Zzjg',
  name: 'MouldMaintainRecord',
  components: {
    Pagination
  },

 src/views/mouldManager/mouldMaintainStand.vue

@@ -295,7 +295,7 @@
import arrayToTree from 'array-to-tree'

export default {
  name: 'Zzjg',
  name: 'MouldMaintainStand',
  components: {
    Pagination, TableColumnSettings, ElDragSelect
  },

 src/views/mouldManager/mouldOutInRecord.vue

@@ -300,7 +300,7 @@
} from '@/api/MouldManager'

export default {
  name: 'Zzjg',
  name: 'MouldOutInRecord',
  components: {
    Pagination
  },

 src/views/mouldManager/mouldRepairRecord.vue

@@ -324,7 +324,7 @@
import { MouldUpdateSearch, MouldUpdateSubSearch } from '@/api/MouldManager'

export default {
  name: 'Zzjg',
  name: 'MouldRepairRecord',
  components: {
    Pagination, TableColumnSettings
  },

 src/views/mouldManager/mouldUpDownRecord.vue

@@ -305,7 +305,7 @@
} from '@/api/MouldManager'

export default {
  name: 'Zzjg',
  name: 'MouldUpDownRecord',
  components: {
    Pagination
  },

 src/views/produce/reportCorrect.vue

@@ -469,7 +469,7 @@
import { MesOrderStepModelSearch, MesOrderStepUpdateSeave, MesOrderStepVerifySearch } from '@/api/WorkOrder'

export default {
  name: 'Zzjg',
  name: 'ReportCorrect',
  components: {
    Pagination
  },

 src/views/produce/reportVerify.vue

@@ -343,7 +343,7 @@
import { PrentOrganizationNoCompany } from '@/api/GeneralBasicData'

export default {
  name: 'Zzjg',
  name: 'ReportVerify',
  components: {
    Pagination
  },

 src/views/produce/stepReport.vue

@@ -900,7 +900,7 @@
import { handleDatetime2 } from '@/utils/global'
import QRCode from 'qrcodejs2'
export default {
  name: 'SCKBG',
  name: 'StepReport',
  components: {
    Pagination
  },

 src/views/qualityManager/defectDefine.vue

@@ -202,7 +202,7 @@
import { AddUpdateDedect, DedectSearch, DeleteDedect } from '@/api/QualityManagement'

export default {
  name: 'Zzjg',
  name: 'DefectDefine',
  components: {
    Pagination
  },

 src/views/qualityManager/processCheck.vue

@@ -264,7 +264,7 @@
import { getCookie } from '@/utils/auth'

export default {
  name: 'Zzjg',
  name: 'ProcessCheck',

  directives: { waves },
  data() {

 src/views/qualityManager/processCheckRecord.vue

@@ -365,7 +365,7 @@

const SER_HZ = /^[\u4e00-\u9fa5]+$/
export default {
  name: 'Zzjg',
  name: 'ProcessCheckRecord',
  components: {
    Pagination, ImportPicker, TableColumnSettings
  },

 src/views/qualityManager/qualityPlaning.vue

@@ -715,7 +715,7 @@
import { StepData } from '@/api/GeneralBasicData'

export default {
  name: 'Zzjg',
  name: 'QualityPlaning',
  components: {
    Pagination, TableColumnSettings
  },

 src/views/sopManager/sopDevice.vue

@@ -267,7 +267,7 @@
import elDragDialog from '@/directive/el-drag-dialog'

export default {
  name: 'Zzjg',
  name: 'SopDevice',
  components: {
    Pagination
  },

 src/views/sopManager/sopRoute.vue

@@ -319,7 +319,7 @@
import { PartSelectRpute, RouteSelectStep } from '@/api/basicSettings'

export default {
  name: 'Zzjg',
  name: 'SopRoute',
  directives: { waves, elDragDialog },
  components: {
    Pagination

 src/views/sopManager/sopWorkOrder.vue

@@ -277,7 +277,7 @@
import { PartSelect } from '@/api/ProductModel'

export default {
  name: 'Zzjg',
  name: 'SopWorkOrder',
  components: {
    Pagination
  },

 src/views/statistic/defectDetailList.vue

@@ -14,9 +14,9 @@
          style="display: flex;"
        >
          <div class="elForm">
<!--            <el-form-item label="销售单号" style="display: flex;">-->
<!--              <el-input v-model="form.socode" placeholder="请输入" style="width: 200px" />-->
<!--            </el-form-item>-->
            <!--            <el-form-item label="销售单号" style="display: flex;">-->
            <!--              <el-input v-model="form.socode" placeholder="请输入" style="width: 200px" />-->
            <!--            </el-form-item>-->
            <el-form-item label="车间名称" style=" display: flex;">
              <el-select
                v-model="form.wkshopcode"
@@ -39,10 +39,10 @@
            <el-form-item label="产品编码" style=" display: flex;">
              <el-input v-model="form.partcode" placeholder="请输入" style="width: 200px" />
            </el-form-item>
            <el-form-item label="产品名称" v-show="isExpandForm" style=" display: flex;">
            <el-form-item v-show="isExpandForm" label="产品名称" style=" display: flex;">
              <el-input v-model="form.partname" style="width: 200px" placeholder="请输入" />
            </el-form-item>
            <el-form-item  label="规格型号" style=" display: flex;">
            <el-form-item label="规格型号" style=" display: flex;">
              <el-input v-model="form.partspec" style="width: 200px" placeholder="请输入" />
            </el-form-item>
            <el-form-item v-show="isExpandForm" label="工序名称" style=" display: flex;">
@@ -127,12 +127,12 @@
            width="160"
            sortable="custom"
          />
<!--          <el-table-column-->
<!--            prop="socode"-->
<!--            label="销售单号"-->
<!--            width="160"-->
<!--            sortable="custom"-->
<!--          />-->
          <!--          <el-table-column-->
          <!--            prop="socode"-->
          <!--            label="销售单号"-->
          <!--            width="160"-->
          <!--            sortable="custom"-->
          <!--          />-->
          <el-table-column
            prop="partcode"
            label="产品编码"
@@ -299,7 +299,7 @@
import { PrentOrganizationNoCompany } from '@/api/GeneralBasicData'

export default {
  name: 'Zzjg',
  name: 'DefectDetailList',
  components: {
    Pagination, ImportPicker
  },
@@ -469,7 +469,6 @@
    },
    // 重置
    reset() {

      this.form.wkshopcode = ''
      this.form.wocode = ''
      this.form.partcode = ''

 src/views/statistic/groupSalaryList.vue

@@ -65,7 +65,7 @@
            <el-form-item label="产品编码" style=" display: flex;">
              <el-input v-model="form.partcode" placeholder="请输入" style="width: 200px" />
            </el-form-item>
            <el-form-item label="产品名称"  v-show="isExpandForm" style=" display: flex;">
            <el-form-item v-show="isExpandForm" label="产品名称" style=" display: flex;">
              <el-input v-model="form.partname" style="width: 200px" placeholder="请输入" />
            </el-form-item>
            <!--            <el-form-item label="规格型号" style=" display: flex;">-->
@@ -84,9 +84,9 @@
                />
              </el-select>
            </el-form-item>
<!--            <el-form-item v-show="isExpandForm" label="操作人员" style=" display: flex;">-->
<!--              <el-input v-model="form.username" style="width: 200px" placeholder="请输入" />-->
<!--            </el-form-item>-->
            <!--            <el-form-item v-show="isExpandForm" label="操作人员" style=" display: flex;">-->
            <!--              <el-input v-model="form.username" style="width: 200px" placeholder="请输入" />-->
            <!--            </el-form-item>-->
            <el-form-item v-show="isExpandForm" label="操作时间" style="display: flex;align-items: center">
              <el-date-picker
                v-model="form.operdate"
@@ -549,7 +549,7 @@
import { GroupsPermissions, PrentOrganizationNoCompany } from '@/api/GeneralBasicData'

export default {
  name: 'Zzjg',
  name: 'GroupSalaryList',
  components: {
    Pagination, ImportPicker
  },
@@ -562,7 +562,7 @@
      tableHeight: 0,
      StepSelectArr: [], // 剔除工序数组
      form: {
        socode:'' ,
        socode: '',
        wkshopcode: '',
        wocode: '', // 工单编号
        partcode: '', // 产品编码
@@ -670,7 +670,7 @@
              return Math.round(prev * 100) / 100
            }
          }, 0)
          sums[index] += ' 元'
          sums[index] = sums[index].toFixed(2) + ' 元'
        } else {
          // sums[index] = 'N/A'
          sums[index] = ' '
@@ -689,7 +689,7 @@
        tempDate = handleDatetime(tempDate[0]) + '~' + handleDatetime(tempDate[1])
      }
      const data = {
        socode:this.form.socode,
        socode: this.form.socode,
        wkshopcode: this.form.wkshopcode,
        wocode: this.form.wocode,
        partcode: this.form.partcode,
@@ -779,7 +779,7 @@
    },
    // 重置
    reset() {
      this.form.socode=''
      this.form.socode = ''
      this.form.wkshopcode = ''
      this.form.wocode = ''
      this.form.partcode = ''
@@ -906,7 +906,7 @@
  align-items: center;
}

::v-deep .el-progress-bar__innerText{
::v-deep .el-progress-bar__innerText {
  display: none !important;
}
</style>

 src/views/statistic/installationLampList.vue

@@ -353,7 +353,7 @@
import { PrentOrganization } from '@/api/GeneralBasicData'

export default {
  name: 'Zzjg',
  name: 'InstallationLampList',
  components: {
    Pagination, TableColumnSettings
  },

 src/views/statistic/personSalaryList.vue

@@ -63,15 +63,15 @@
              <el-input v-model="form.wocode" placeholder="请输入" style="width: 200px" />
            </el-form-item>
            <el-form-item label="产品编码" style=" display: flex;">
              <el-input v-model="form.partcode"  placeholder="请输入" style="width: 200px" />
              <el-input v-model="form.partcode" placeholder="请输入" style="width: 200px" />
            </el-form-item>
            <el-form-item label="产品名称" v-show="isExpandForm" style=" display: flex;">
            <el-form-item v-show="isExpandForm" label="产品名称" style=" display: flex;">
              <el-input v-model="form.partname" style="width: 200px" placeholder="请输入" />
            </el-form-item>
            <el-form-item v-show="isExpandForm" label="规格型号" style=" display: flex;">
              <el-input v-model="form.partspec" style="width: 200px" placeholder="请输入" />
            </el-form-item>
            <el-form-item v-show="isExpandForm"  label="工序名称" style=" display: flex;">
            <el-form-item v-show="isExpandForm" label="工序名称" style=" display: flex;">
              <el-input v-model="form.stepname" style="width: 200px" placeholder="请输入" />
            </el-form-item>
            <!--            <el-form-item v-show="isExpandForm" label="生产班组" style=" display: flex;">-->
@@ -84,9 +84,9 @@
            <!--                />-->
            <!--              </el-select>-->
            <!--            </el-form-item>-->
<!--            <el-form-item v-show="isExpandForm" label="报工人员" style=" display: flex;">-->
<!--              <el-input v-model="form.reportname" style="width: 200px" placeholder="请输入" />-->
<!--            </el-form-item>-->
            <!--            <el-form-item v-show="isExpandForm" label="报工人员" style=" display: flex;">-->
            <!--              <el-input v-model="form.reportname" style="width: 200px" placeholder="请输入" />-->
            <!--            </el-form-item>-->
            <el-form-item v-show="isExpandForm" label="报工时间" style="display: flex;align-items: center">
              <el-date-picker
                v-model="form.reportdate"
@@ -525,7 +525,7 @@
import { PrentOrganizationNoCompany } from '@/api/GeneralBasicData'

export default {
  name: 'Zzjg',
  name: 'PersonSalaryList',
  components: {
    Pagination, ImportPicker
  },
@@ -538,7 +538,7 @@
      tableHeight: 0,
      StepSelectArr: [], // 剔除工序数组
      form: {
        socode:'',
        socode: '',
        wkshopcode: '',
        wocode: '', // 工单编号
        partcode: '', // 产品编码
@@ -651,7 +651,7 @@
            }
          }, 0)

          sums[index] += ' 元'
          sums[index] = sums[index].toFixed(2) + ' 元'
        } else {
          // sums[index] = 'N/A'
          sums[index] = ' '
@@ -733,7 +733,7 @@
      }

      const data = {
        socode:this.form.socode,
        socode: this.form.socode,
        wkshopcode: this.form.wkshopcode,
        wocode: this.form.wocode,
        partcode: this.form.partcode,
@@ -763,7 +763,7 @@
    },
    // 重置
    reset() {
      this.form.socode=''
      this.form.socode = ''
      this.form.wkshopcode = ''
      this.form.wocode = ''
      this.form.partcode = ''

 src/views/statistic/repairDetailList.vue

@@ -14,9 +14,9 @@
          style="display: flex;"
        >
          <div class="elForm">
<!--            <el-form-item label="销售单号" style="display: flex;">-->
<!--              <el-input v-model="form.socode" placeholder="请输入" style="width: 200px" />-->
<!--            </el-form-item>-->
            <!--            <el-form-item label="销售单号" style="display: flex;">-->
            <!--              <el-input v-model="form.socode" placeholder="请输入" style="width: 200px" />-->
            <!--            </el-form-item>-->
            <el-form-item label="车间名称" style=" display: flex;">
              <el-select
                v-model="form.wkshopcode"
@@ -39,7 +39,7 @@
            <el-form-item label="产品编码" style=" display: flex;">
              <el-input v-model="form.partcode" placeholder="请输入" style="width: 200px" />
            </el-form-item>
            <el-form-item label="产品名称" v-show="isExpandForm" style=" display: flex;">
            <el-form-item v-show="isExpandForm" label="产品名称" style=" display: flex;">
              <el-input v-model="form.partname" style="width: 200px" placeholder="请输入" />
            </el-form-item>
            <el-form-item v-show="isExpandForm" label="规格型号" style=" display: flex;">
@@ -135,12 +135,12 @@
            width="160"
            sortable="custom"
          />
<!--          <el-table-column-->
<!--            prop="socode"-->
<!--            label="销售单号"-->
<!--            width="160"-->
<!--            sortable="custom"-->
<!--          />-->
          <!--          <el-table-column-->
          <!--            prop="socode"-->
          <!--            label="销售单号"-->
          <!--            width="160"-->
          <!--            sortable="custom"-->
          <!--          />-->
          <el-table-column
            prop="partcode"
            label="产品编码"
@@ -314,7 +314,7 @@
import { PrentOrganizationNoCompany } from '@/api/GeneralBasicData'

export default {
  name: 'Zzjg',
  name: 'RepairDetailList',
  components: {
    Pagination, ImportPicker
  },
@@ -488,7 +488,6 @@
    },
    // 重置
    reset() {

      this.form.wkshopcode = ''
      this.form.wocode = ''
      this.form.partcode = ''

 src/views/statistic/subcontractingOperation.vue

@@ -14,9 +14,9 @@
          style="display: flex;"
        >
          <div class="elForm">
<!--            <el-form-item label="销售单号" style="display: flex;">-->
<!--              <el-input v-model="form.socode" placeholder="请输入" style="width: 200px" />-->
<!--            </el-form-item>-->
            <!--            <el-form-item label="销售单号" style="display: flex;">-->
            <!--              <el-input v-model="form.socode" placeholder="请输入" style="width: 200px" />-->
            <!--            </el-form-item>-->
            <el-form-item label="车间名称" style=" display: flex;">
              <el-select
                v-model="form.wkshopcode"
@@ -39,7 +39,7 @@
            <el-form-item label="产品编码" style=" display: flex;">
              <el-input v-model="form.partcode" placeholder="请输入" style="width: 200px" />
            </el-form-item>
            <el-form-item label="产品名称"  style=" display: flex;">
            <el-form-item label="产品名称" style=" display: flex;">
              <el-input v-model="form.partname" style="width: 200px" placeholder="请输入" />
            </el-form-item>
            <!--            <el-form-item label="规格型号" style=" display: flex;">-->
@@ -51,16 +51,16 @@
            <el-form-item v-show="isExpandForm" label="供方名称" style=" display: flex;">
              <el-input v-model="form.suppername" style="width: 200px" placeholder="请输入" />
            </el-form-item>
<!--            <el-form-item v-show="isExpandForm" label="操作类型" style=" display: flex;">-->
<!--              <el-select v-model="form.type" style="width: 200px" placeholder="请选择">-->
<!--                <el-option-->
<!--                  v-for="item in typeArr"-->
<!--                  :key="item.code"-->
<!--                  :label="item.name"-->
<!--                  :value="item.code"-->
<!--                />-->
<!--              </el-select>-->
<!--            </el-form-item>-->
            <!--            <el-form-item v-show="isExpandForm" label="操作类型" style=" display: flex;">-->
            <!--              <el-select v-model="form.type" style="width: 200px" placeholder="请选择">-->
            <!--                <el-option-->
            <!--                  v-for="item in typeArr"-->
            <!--                  :key="item.code"-->
            <!--                  :label="item.name"-->
            <!--                  :value="item.code"-->
            <!--                />-->
            <!--              </el-select>-->
            <!--            </el-form-item>-->
            <el-form-item
              v-show="isExpandForm"
              style="display: flex;align-items: center"
@@ -136,12 +136,12 @@
            width="160"
            sortable="custom"
          />
<!--          <el-table-column-->
<!--            prop="saleOrderCode"-->
<!--            label="销售单号"-->
<!--            width="160"-->
<!--            sortable="custom"-->
<!--          />-->
          <!--          <el-table-column-->
          <!--            prop="saleOrderCode"-->
          <!--            label="销售单号"-->
          <!--            width="160"-->
          <!--            sortable="custom"-->
          <!--          />-->
          <el-table-column
            prop="partcode"
            label="产品编码"
@@ -364,7 +364,7 @@
import { PrentOrganizationNoCompany } from '@/api/GeneralBasicData'

export default {
  name: 'Zzjg',
  name: 'SubcontractingOperation',
  components: {
    Pagination, ImportPicker
  },
@@ -522,7 +522,6 @@
    },
    // 重置
    reset() {

      this.form.wkshopcode = ''
      this.form.wocode = ''
      this.form.partcode = ''

 src/views/statistic/workOrderProcess.vue

@@ -17,7 +17,7 @@
          <div class="elForm">

            <el-form-item label="销售单号" style=" display: flex;">
              <el-input v-model="form.socode" placeholder="请输入" style="width: 200px"/>
              <el-input v-model="form.socode" placeholder="请输入" style="width: 200px" />
            </el-form-item>

            <el-form-item label="车间名称" style=" display: flex;">
@@ -47,20 +47,20 @@
              </el-select>
            </el-form-item>
            <el-form-item label="工单编号" style=" display: flex;">
              <el-input v-model="form.wocode" placeholder="请输入" style="width: 200px"/>
              <el-input v-model="form.wocode" placeholder="请输入" style="width: 200px" />
            </el-form-item>

            <!--            <el-form-item label="车间名称" style=" display: flex;">-->
            <!--              <el-input v-model="form.wkshopname" placeholder="请输入" style="width: 200px" />-->
            <!--            </el-form-item>-->
            <el-form-item label="产品编码" v-show="isExpandForm" style=" display: flex;">
              <el-input v-model="form.partcode" placeholder="请输入" style="width: 200px"/>
            <el-form-item v-show="isExpandForm" label="产品编码" style=" display: flex;">
              <el-input v-model="form.partcode" placeholder="请输入" style="width: 200px" />
            </el-form-item>
            <el-form-item v-show="isExpandForm" label="产品名称" style=" display: flex;">
              <el-input v-model="form.partname" placeholder="请输入" style="width: 200px"/>
              <el-input v-model="form.partname" placeholder="请输入" style="width: 200px" />
            </el-form-item>
            <el-form-item v-show="isExpandForm" label="规格型号" style=" display: flex;">
              <el-input v-model="form.partspec" placeholder="请输入" style="width: 200px"/>
              <el-input v-model="form.partspec" placeholder="请输入" style="width: 200px" />
            </el-form-item>
            <el-form-item v-show="isExpandForm" label="单据日期" style="display: flex;align-items: center">
              <el-date-picker
@@ -232,8 +232,8 @@
                    />

                    <div style="position: absolute;top:22px;">{{ parseFloat(item.split('/')[1]) }}/{{
                        row.plan_qty
                      }}
                      row.plan_qty
                    }}
                    </div>

                  </div>
@@ -279,21 +279,21 @@

<script>
import Pagination from '@/components/Pagination'
import {handleDatetime} from '@/utils/global'
import { handleDatetime } from '@/utils/global'
import elDragDialog from '@/directive/el-drag-dialog'
import waves from '@/directive/waves'
import {
  ProductionScheduleReportExcelSearch,
  ProductionScheduleReportSearch
} from '@/api/ReportManager'
import {PrentOrganizationNoCompany} from '@/api/GeneralBasicData'
import { PrentOrganizationNoCompany } from '@/api/GeneralBasicData'

export default {
  name: 'Zzjg',
  name: 'WorkOrderProcess',
  components: {
    Pagination
  },
  directives: {elDragDialog, waves},
  directives: { elDragDialog, waves },
  data() {
    return {
      mouseHoverType: 'mouseout',
@@ -301,7 +301,7 @@
      mainHeight: 0,
      tableHeight: 0,
      form: {
        socode: '',//销售单号
        socode: '', // 销售单号
        status: '', // 工单状态
        wocode: '', // 工单编号
        wkshopcode: '', // 工艺路线编码
@@ -316,9 +316,9 @@
        rows: 20 // 每页多少条
      },
      statusArr: [
        {label: '未开始', value: 'NOSTART'},
        {label: '执行中', value: 'START'},
        {label: '已完成', value: 'CLOSED'}
        { label: '未开始', value: 'NOSTART' },
        { label: '执行中', value: 'START' },
        { label: '已完成', value: 'CLOSED' }
      ],
      wkshopcodeArr: [],

@@ -338,7 +338,7 @@
  },
  methods: {
    async getPrentOrganizationNoCompany() {
      const {data: res} = await PrentOrganizationNoCompany()
      const { data: res } = await PrentOrganizationNoCompany()
      this.wkshopcodeArr = res
    },
    async getProductionScheduleReportSearch() {
@@ -390,7 +390,7 @@
      window.location.href = res.data
    },
    // 排序改变时
    sortChange({column, prop, order}) {
    sortChange({ column, prop, order }) {
      if (order === 'descending') {
        order = 'desc'
      } else if (order === 'ascending') {
@@ -408,7 +408,7 @@
    },
    // 重置
    reset() {
      this.form.socode=''
      this.form.socode = ''
      this.form.status = ''
      this.form.wocode = ''
      this.form.wkshopcode = ''
@@ -428,7 +428,7 @@
        this.$refs.tableDataRef.doLayout()
      })
    },
    tableRowClassName({row, rowIndex}) {
    tableRowClassName({ row, rowIndex }) {
      return 'custom-row'
    }
  }

 src/views/systemSetting/encodingRules.vue

@@ -240,7 +240,7 @@
import arrayToTree from 'array-to-tree'

export default {
  name: 'Zzjg',
  name: 'ReportList',
  components: {
    Pagination
  },
@@ -336,7 +336,6 @@
        childrenProperty: 'children'
      })
      // this.menuOptions = this.menuOptionsAll.filter(i => i.Type === this.dialogForm.type)

    },
    radioChange() {
      this.menuOptions = this.menuOptionsAll.filter(i => i.Type === this.dialogForm.type)
@@ -375,7 +374,6 @@
      this.operation = operation
      this.dialogVisible = true


      this.$nextTick(() => {
        this.dialogForm.type = row.Type
        this.radioChange()
@@ -390,7 +388,7 @@
            })
          }
        })
        console.log(parentCode,row.menucode)
        console.log(parentCode, row.menucode)
        this.$refs.cascader.checkedValue = [parentCode, row.menucode]
        this.dialogForm.rightcode = row.menucode
        this.dialogForm.incbit = row.incbit

 src/views/workOrder/produceOrderList.vue

@@ -581,7 +581,7 @@

const SER_HZ = /^[\u4e00-\u9fa5]+$/
export default {
  name: 'SCDD',
  name: 'ProduceOrderList',
  components: {
    Pagination, DateType
  },

 src/views/workOrder/workOrderClose.vue

@@ -1985,7 +1985,7 @@
import { MesOrderPrintSearch } from '@/api/GridReport' // base on element-ui

export default {
  name: 'WorkOrderList',
  name: 'WorkOrderClose',
  components: {
    Pagination, ElDragSelect
  },

 src/views/workOrder/workOrderList.vue

@@ -738,21 +738,37 @@

        <div style="display: flex;align-items: center">
          <div style="font-weight: bolder">工序选择：</div>
          <el-drag-select

          <el-select
            v-model="stepSelectedValue"
            style="width:930px;"
            class="stepSelectedValueClass"
            style="width: 930px;"
            multiple
            placeholder="请选择相对应工序"
            @change="stepSelectedValueChange"
          >
            <!--            :disabled="!(dialogForm.mesorderstus==='NEW'||dialogForm.mesorderstus==='ALLO')"-->
            <el-option
              v-for="item in stepSelectArr"
              :key="item.stepcode"
              :label="item.stepname"
              :value="item.stepcode"
            />
          </el-drag-select>
          </el-select>

          <!--          <el-drag-select-->
          <!--            v-model="stepSelectedValue"-->
          <!--            style="width:930px;"-->
          <!--            multiple-->
          <!--            placeholder="请选择相对应工序"-->
          <!--            @change="stepSelectedValueChange"-->
          <!--          >-->
          <!--            <el-option-->
          <!--              v-for="item in stepSelectArr"-->
          <!--              :key="item.stepcode"-->
          <!--              :label="item.stepname"-->
          <!--              :value="item.stepcode"-->
          <!--            />-->
          <!--          </el-drag-select>-->
        </div>

        <el-table
@@ -1337,7 +1353,7 @@
              >
                <div class="elForm">
                  <el-form-item label="销售单号:" class="formContent">
                    {{ formApprove.saleOrderCode ?formApprove.saleOrderCode :'/' }}
                    {{ formApprove.saleOrderCode ? formApprove.saleOrderCode : '/' }}
                  </el-form-item>
                  <el-form-item label="工单编号:" class="formContent">
                    {{ formApprove.mesordercode }}
@@ -1466,7 +1482,7 @@
              >
                <div class="elForm">
                  <el-form-item label="销售单号:" class="formContent">
                    {{ formApprove.saleOrderCode ?formApprove.saleOrderCode :'/' }}
                    {{ formApprove.saleOrderCode ? formApprove.saleOrderCode : '/' }}
                  </el-form-item>
                  <el-form-item label="工单编号:" class="formContent">
                    {{ formApprove.mesordercode }}
@@ -2223,7 +2239,8 @@
        type="primary"
        style="margin-left: 37px"
        @click="view"
      >预 览/下 载</el-button>
      >预 览/下 载
      </el-button>

      <span slot="footer" class="dialog-footer">
        <div class="footerButton">
@@ -2265,6 +2282,7 @@
import DateType from '@/components/DateType'
import { PartSelectRpute, RouteSelectStep } from '@/api/basicSettings'
import { DeviceSopSearch } from '@/api/DeviceManager'

export default {
  name: 'WorkOrderList',
  components: {
@@ -2939,7 +2957,7 @@
      })
    },
    // 按工序模式走的时候  引用基础资料 工艺
    async  getBasicProcessData() {
    async getBasicProcessData() {
      const { data: res } = await PartSelectRpute({ partcode: this.dialogForm.partcode })
      res.sort((a, b) => a.step_seq - b.step_seq)
      this.stepTableData = []
@@ -2974,7 +2992,7 @@
      }
    },

    async  getPartcodeChangeDialog() {
    async getPartcodeChangeDialog() {
      const { data: res } = await PartSelectRpute({ partcode: this.dialogForm.partcode })
      this.routecodeArr = res

@@ -3015,7 +3033,7 @@
      }
    },

    async  getMesOrderNewStepContent() {
    async getMesOrderNewStepContent() {
      // if (!this.mesSetting.route && this.operation === 'edit') {
      //   return
      // }
@@ -3221,10 +3239,10 @@
              div.scrollTop = div.scrollHeight // 滚动条位于最底部
            })

          // const div = document.getElementById('qrCode')
          // 这么多代码只需要这一句实现我们所需要的功能，定位div滚动条位置在底部，scrollHeight计算出div的高度，再scrollTop 设置滚动条的高度为多少
          // div.scrollTop = div.scrollHeight // 滚动条位于最底部
          // div.scrollTop = 0 // 滚动条位于最顶部
            // const div = document.getElementById('qrCode')
            // 这么多代码只需要这一句实现我们所需要的功能，定位div滚动条位置在底部，scrollHeight计算出div的高度，再scrollTop 设置滚动条的高度为多少
            // div.scrollTop = div.scrollHeight // 滚动条位于最底部
            // div.scrollTop = 0 // 滚动条位于最顶部
          })
        }
      })
@@ -3701,6 +3719,13 @@
<style lang="scss" scoped>
$main_color: #42b983;

.stepSelectedValueClass{
  ::v-deep input{
    //min-height: 34px !important;
    height: 68px !important;
  }
}

.dialogVisibleRoute {
  .myCheckboxGroup {
    display: flex;
@@ -4006,8 +4031,8 @@
}
</style>
<style>
.sortable-ghost{
.sortable-ghost {
  opacity: .8;
  color: #fff!important;
  background: #42b983!important;
  color: #fff !important;
  background: #42b983 !important;
}

 src/views/workOrder/workOrderSend.vue

@@ -1983,7 +1983,7 @@
import { MesOrderPrintSearch } from '@/api/GridReport' // base on element-ui

export default {
  name: 'WorkOrderList',
  name: 'WorkOrderSend',
  components: {
    Pagination, ElDragSelect
  },