1、数据字典配置时删除数据值不能使用下划线限制
2、设备台账列表字段自定义展示以及调整字段
已修改3个文件
396 ■■■■■ 文件已修改
src/views/eam/equipment/EamEquipmentLedger.vue 231 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/eam/equipment/modules/EamEquipmentModal.vue 163 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/system/modules/DictItemModal.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/eam/equipment/EamEquipmentLedger.vue
@@ -29,17 +29,18 @@
            </a-col>
            <a-col :xl="6" :lg="7" :md="8" :sm="24">
              <a-form-item label="使用部门">
                <a-tree-select v-model="queryParam.orgId" style="width: 100%" :tree-data="treeDataAlias" show-search
                <a-tree-select v-model="queryParam.factoryOrgCode" style="width: 100%" :tree-data="productionTreeData"
                               show-search :replaceFields="{key:'orgCode',value:'orgCode'}"
                               treeNodeFilterProp="title" searchPlaceholder="请输入关键字搜索"
                               :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }" placeholder="请选择使用部门"
                               allow-clear tree-default-expand-all
                >
                               allow-clear tree-default-expand-all>
                </a-tree-select>
              </a-form-item>
            </a-col>
            <a-col :xl="6" :lg="7" :md="8" :sm="24">
              <a-form-item label="维修班组">
                <a-tree-select v-model="queryParam.orgId" style="width: 100%" :tree-data="treeDataAlias"
                <a-tree-select v-model="queryParam.repairDepartOrgCode" style="width: 100%"
                               :tree-data="repairDepartTreeData"
                               :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }" placeholder="请选择维修班组"
                               allow-clear tree-default-expand-all>
                </a-tree-select>
@@ -102,10 +103,30 @@
        :scroll="{ x: 'max-content' }"
        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
        @change="handleTableChange"
        :customRow="customTableRow"
      >
        <!--统一编码-->
        <template slot="equipmentCode" slot-scope="text">
          <a href="#" @click="handleDetail(record)" style="display: inline-block;height: 100%">{{text}}</a>
        </template>
        <!--使用部门-->
        <template slot="factoryOrgCode" slot-scope="text,record">
          {{[record.gsfactoryOrgCode_dictText,record.zxfactoryOrgCode_dictText,record.gqfactoryOrgCode_dictText,record.factoryOrgCode_dictText].filter(item=>item).join('/')}}
        </template>
        <!--安装位置-->
        <template slot="installationPosition" slot-scope="text">
          <j-ellipsis :value="text" :length="5"/>
        </template>
        <!--操作系统-->
        <template slot="operationSystem" slot-scope="text">
          <a-switch checked-children="是" un-checked-children="否" :checked="+text" disabled/>
        </template>
        <!--资产制造商-->
        <template slot="manufacturingEnterprise" slot-scope="text">
          <j-ellipsis :value="text" :length="8"/>
        </template>
        <span slot="action" slot-scope="text, record">
@@ -162,7 +183,7 @@
    <!--</a-tabs>-->
    <!-- 表单区域 -->
    <eamEquipment-modal ref="modalForm" @ok="modalFormOk" :treeDataAlias="treeDataAlias"/>
    <eamEquipment-modal ref="modalForm" @ok="modalFormOk" :productionTreeData="productionTreeData"/>
    <!--履历弹窗-->
    <resume-drawer ref="resumeDrawerRef" :currentTableRowRecord="currentTableRowRecord"/>
  </a-card>
@@ -217,7 +238,6 @@
          {
            title: '关键设备标识',
            align: 'center',
            width: 150,
            dataIndex: 'equipmentImportance',
            fixed: 'left'
          },
@@ -241,31 +261,32 @@
          {
            title: '使用部门',
            align: 'center',
            dataIndex: 'factoryOrgCode'
            dataIndex: 'factoryOrgCode',
            scopedSlots: { customRender: 'factoryOrgCode' }
          },
          {
            title: '所属分类',
            align: 'center',
            width: 100,
            dataIndex: 'equipmentCategory'
            dataIndex: 'equipmentCategory_dictText'
          },
          {
            title: '保养状态',
            align: 'center',
            width: 100,
            dataIndex: 'maintenanceStatus_dicText'
            dataIndex: 'maintenanceStatus_dictText'
          },
          {
            title: '维修状态',
            align: 'center',
            width: 100,
            dataIndex: 'repairStatus_dicText'
            dataIndex: 'repairStatus_dictText'
          },
          {
            title: '技术状态',
            align: 'center',
            width: 100,
            dataIndex: 'technologyStatus_dicText'
            dataIndex: 'technologyStatus_dictText'
          },
          {
            title: 'ABC标识',
@@ -300,14 +321,13 @@
          {
            title: '灭火器有效期',
            align: 'center',
            width: 150,
            dataIndex: 'fireExtinguisherExpirationDate'
          },
          {
            title: '操作系统',
            align: 'center',
            width: 100,
            dataIndex: 'operationSystem'
            dataIndex: 'operationSystem',
            scopedSlots: { customRender: 'operationSystem' }
          },
          {
            title: '系统',
@@ -348,8 +368,8 @@
          {
            title: '安装位置',
            align: 'center',
            width: 100,
            dataIndex: 'installationPosition'
            dataIndex: 'installationPosition',
            scopedSlots: { customRender: 'installationPosition' }
          },
          {
            title: '出厂日期',
@@ -366,7 +386,6 @@
          {
            title: '资金来源',
            align: 'center',
            width: 100,
            dataIndex: 'fundingSource'
          },
          {
@@ -378,19 +397,18 @@
          {
            title: '出厂编号',
            align: 'center',
            width: 100,
            dataIndex: 'factoryNumber'
          },
          {
            title: '资产制造商',
            align: 'center',
            width: 100,
            dataIndex: 'manufacturingEnterprise'
            dataIndex: 'manufacturingEnterprise',
            scopedSlots: { customRender: 'manufacturingEnterprise' },
            ellipsis: true
          },
          {
            title: '资产来源国家',
            align: 'center',
            width: 150,
            dataIndex: 'originCountry'
          },
          {
@@ -408,7 +426,6 @@
          {
            title: '总功率',
            align: 'center',
            width: 100,
            dataIndex: 'equipmentPower'
          },
          {
@@ -424,7 +441,7 @@
          {
            title: '资产状态',
            align: 'center',
            dataIndex: 'assetStatus'
            dataIndex: 'assetStatus_dictText'
          },
          {
            title: '本次三保日期',
@@ -474,14 +491,9 @@
          getProductionTreeList: '/eam/BaseFactory/queryTreeList',
          templateXlsDownloadUrl: '导入模板/设备台账导入模板_v1.1.xlsx'
        },
        treeData: [],
        printedRows: [],
        activeTabKey: 1,
        appHomeUrl: '',
        currentTableRowRecord: {},
        isOpenProcess: false,
        isOpenPrecision: false,
        treeDataAlias: []
        productionTreeData: [],
        repairDepartTreeData: []
      }
    },
    computed: {
@@ -490,30 +502,37 @@
      }
    },
    created() {
      this.loadAllProductionTree()
      this.loadAppHomeUrlConfigValue()
      this.getProductionTreeDataByApi()
    },
    methods: {
      loadAllProductionTree() {
        //加载车间选择树
        getAction(this.url.getProductionTreeList).then(res => {
          if (res.success) {
            this.treeData = [...res.result]
            this.treeDataAlias = this.deepCopyAndModify(res.result)
          } else {
            this.$message.warning(res.message)
          }
        })
      // 获取使用部门树
      getProductionTreeDataByApi() {
        getAction(this.url.getProductionTreeList)
          .then(res => {
            if (res.success) {
              this.productionTreeData = res.result
            } else {
              this.$notification.warning({
                message: '消息',
                description: res.message
              })
            }
          })
      },
      /**
       * 开启铭牌弹窗
       * @param recordArray 表格行信息集合
       */
      handleOpenNameplateModal(recordArray) {
        this.printedRows = recordArray
        this.$refs.nameplateModalRef.httpUrl = this.appHomeUrl
        this.$refs.nameplateModalRef.visible = true
      // 获取使用部门树
      getProductionTreeDataByApi() {
        getAction(this.url.getProductionTreeList)
          .then(res => {
            if (res.success) {
              this.productionTreeData = res.result
            } else {
              this.$notification.warning({
                message: '消息',
                description: res.message
              })
            }
          })
      },
      /**
@@ -528,118 +547,8 @@
        this.$nextTick(() => this.$refs.resumeDrawerRef.getEquipmentResumeByApi())
      },
      /**
       * 自定义设备台账表格行
       * @param record 表格行信息
       * @returns {{style: {cursor: string}, on: {click: *}}} 样式对象与事件方法
       */
      customTableRow(record) {
        return {
          style: {
            cursor: 'pointer'
          },
          on: {
            click: () => {
              this.onSelectChange([record.id])
            }
          }
        }
      },
      /**
       * 页签改变时触发
       * @param activeTabKey 当前激活的页签key
       */
      handleTabChange(activeTabKey) {
        if (this.selectedRowKeys.length !== 1) return
        this.$nextTick(() => this.loadTabPaneTableData(this.selectedRowKeys[0]))
      },
      /**
       * 加载页签表格数据
       * @param id 设备台账行记录Id
       */
      loadTabPaneTableData(id) {
        this.$refs['tabPaneTableListRef' + this.activeTabKey].queryParam.equipmentId = id
        this.$refs['tabPaneTableListRef' + this.activeTabKey].loadData(1)
      },
      /**
       * 设备台账表格多选框状态改变时触发
       * @param selectedRowKeys 已选择的rowKey集合
       * @param selectionRows 当前分页下已选择的行信息集合
       */
      onSelectChange(selectedRowKeys, selectionRows) {
        this.selectedRowKeys = selectedRowKeys
        this.selectionRows = selectionRows
        this.$refs['tabPaneTableListRef' + this.activeTabKey].queryParam.equipmentId = null
        this.$refs['tabPaneTableListRef' + this.activeTabKey].dataSource = []
        this.$refs['tabPaneTableListRef' + this.activeTabKey].onClearSelected()
        if (selectedRowKeys.length === 1) {
          let row = this.dataSource.find(row => row.id === selectedRowKeys[0])
          if (row) {
            this.isOpenProcess = (row.processParametersFlag === '1')
            this.isOpenPrecision = (row.precisionParametersFlag === '1')
          } else {
            this.isOpenProcess = false
            this.isOpenPrecision = false
          }
          this.loadTabPaneTableData(selectedRowKeys[0])
        } else {
          this.isOpenProcess = false
          this.isOpenPrecision = false
        }
        //tab标签被销毁了,返回第一个tab
        if (!this.isOpenProcess && this.activeTabKey === 6) {
          this.activeTabKey = 1
        }
        if (!this.isOpenPrecision && this.activeTabKey === 7) {
          this.activeTabKey = 1
        }
      },
      handleTemplateXlsDownload() {
        templateXlsDownload(this.url.templateXlsDownloadUrl)
      },
      loadAppHomeUrlConfigValue() {
        let params = { settingKey: 'app_home_url' }
        getSystemConfigValue(params).then(res => {
          if (res.success) {
            this.appHomeUrl = res.result.settingValue
          }
        })
      },
      deepCopyAndModify(arr) {
        // 如果当前元素不是数组或对象,直接返回
        if (!Array.isArray(arr) && typeof arr !== 'object' || arr === null || arr.length === 0) {
          return arr
        }
        // 如果是数组,创建一个新数组并递归处理每个元素
        if (Array.isArray(arr)) {
          const newArray = []
          for (let i = 0; i < arr.length; i++) {
            newArray.push(this.deepCopyAndModify(arr[i]))
          }
          return newArray
        }
        // 如果是对象,创建一个新对象并递归处理每个属性
        const newObj = {}
        for (const key in arr) {
          if (arr.hasOwnProperty(key)) {
            if (key === 'selectable') {
              newObj[key] = true
            } else if (key === 'children') {
              newObj[key] = this.deepCopyAndModify(arr[key])
            } else {
              newObj[key] = arr[key]
            }
          }
        }
        return newObj
      }
    }
  }
src/views/eam/equipment/modules/EamEquipmentModal.vue
@@ -6,52 +6,46 @@
    centered
    :confirmLoading="confirmLoading"
    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
    switchFullscreen
    @ok="handleOk"
    @cancel="handleCancel"
    cancelText="关闭">
    <a-tabs tab-position="left">
      <a-tab-pane tab="基础信息" :key="1">
        <a-form-model ref="form" :model="model" :rules="validatorRules" :labelCol="labelCol" :wrapperCol="wrapperCol">
          <a-row :gutter="24">
    <a-spin :spinning="confirmLoading">
      <j-form-container :disabled="disableSubmit">
        <a-form-model ref="form" :model="model" :rules="validatorRules" :labelCol="labelCol"
                      :wrapperCol="wrapperCol" slot="detail">
          <a-row>
            <a-col :span="customSpan">
              <a-form-model-item label="关键设备标识">
                <j-dict-select-tag dict-code="equipment_importance" placeholder="请输入关键设备标识"
                                   v-model="model.equipmentImportance" :disabled="editable || disableSubmit"/>
                                   v-model="model.equipmentImportance"/>
              </a-form-model-item>
            </a-col>
            <a-col :span="customSpan">
              <a-form-model-item prop="equipmentCode" label="统一编码">
                <a-input placeholder="请输入统一编码" v-model="model.equipmentCode" :disabled="editable || disableSubmit"/>
                <a-input placeholder="请输入统一编码" v-model="model.equipmentCode"/>
              </a-form-model-item>
            </a-col>
            <a-col :span="customSpan">
              <a-form-model-item prop="equipmentName" label="设备名称">
                <a-input placeholder="请输入设备名称" v-model="model.equipmentName" :disabled="editable || disableSubmit"/>
                <a-input placeholder="请输入设备名称" v-model="model.equipmentName"/>
              </a-form-model-item>
            </a-col>
            <a-col :span="customSpan">
              <a-form-model-item prop="factoryOrgCode" label="使用部门">
                <a-tree-select v-model="model.factoryOrgCode"
                               style="width: 100%"
                               show-search
                               :tree-data="treeDataAlias"
                               :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
                               placeholder="请选择使用部门"
                               allow-clear
                               treeNodeFilterProp="title"
                               searchPlaceholder="请输入关键字搜索"
                               tree-default-expand-all/>
                <a-tree-select v-model="model.factoryOrgCode" style="width: 100%" show-search
                               :tree-data="productionTreeData" :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
                               placeholder="请选择使用部门" allow-clear treeNodeFilterProp="title"
                               :replaceFields="{key:'orgCode',value:'orgCode'}"
                               searchPlaceholder="请输入关键字搜索" tree-default-expand-all/>
              </a-form-model-item>
            </a-col>
          </a-row>
          <a-row :gutter="24">
          <a-row>
            <a-col :span="customSpan">
              <a-form-model-item prop="equipmentCategory" label="所属分类">
                <j-dict-select-tag dict-code="equipment_category" placeholder="请选择所属分类"
                                   v-model="model.equipmentCategory"
                                   :disabled="editable || disableSubmit"/>
                                   v-model="model.equipmentCategory"/>
              </a-form-model-item>
            </a-col>
            <a-col :span="customSpan">
@@ -66,37 +60,33 @@
            </a-col>
            <a-col :span="customSpan">
              <a-form-model-item label="ABC标识">
                <j-dict-select-tag dict-code="abc_flag" placeholder="请选择ABC标识" v-model="model.abcFlag"
                                   :disabled="editable || disableSubmit"/>
                <j-dict-select-tag dict-code="abc_flag" placeholder="请选择ABC标识" v-model="model.abcFlag"/>
              </a-form-model-item>
            </a-col>
          </a-row>
          <a-row :gutter="24">
          <a-row>
            <a-col :span="customSpan">
              <a-form-model-item prop="repairDepartOrgCode" label="维修班组">
                <a-input placeholder="请选择维修班组" v-model="model.repairDepartOrgCode"
                         :disabled="editable || disableSubmit"/>
                <a-input placeholder="请选择维修班组" v-model="model.repairDepartOrgCode"/>
              </a-form-model-item>
            </a-col>
            <a-col :span="customSpan">
              <a-form-model-item label="安全配置">
                <a-input placeholder="请输入安全配置" v-model="model.securityConfiguration"
                         :disabled="editable || disableSubmit"/>
                <a-input placeholder="请输入安全配置" v-model="model.securityConfiguration"/>
              </a-form-model-item>
            </a-col>
          </a-row>
          <a-row :gutter="24">
          <a-row>
            <a-col :span="customSpan">
              <a-form-model-item label="冷却系统">
                <j-dict-select-tag dict-code="cooling_system" placeholder="请输入统一编码" v-model="model.coolSystem"
                                   :disabled="editable || disableSubmit"/>
                <j-dict-select-tag dict-code="cooling_system" placeholder="请选择冷却系统" v-model="model.coolSystem"/>
              </a-form-model-item>
            </a-col>
            <a-col :span="customSpan">
              <a-form-model-item label="灭火器">
                <a-input placeholder="请输入灭火器" v-model="model.fireExtinguisher" :disabled="editable || disableSubmit"/>
                <a-input placeholder="请输入灭火器" v-model="model.fireExtinguisher"/>
              </a-form-model-item>
            </a-col>
            <a-col :span="customSpan">
@@ -112,47 +102,43 @@
            </a-col>
          </a-row>
          <a-row :gutter="24">
          <a-row>
            <a-col :span="customSpan">
              <a-form-model-item label="系统">
                <a-input placeholder="请输入系统" v-model="model.system" :disabled="editable || disableSubmit"/>
                <a-input placeholder="请输入系统" v-model="model.system"/>
              </a-form-model-item>
            </a-col>
            <a-col :span="customSpan">
              <a-form-model-item label="设备端口">
                <a-input placeholder="请输入设备端口" v-model="model.equipmentPort" :disabled="editable || disableSubmit"/>
                <a-input placeholder="请输入设备端口" v-model="model.equipmentPort"/>
              </a-form-model-item>
            </a-col>
            <a-col :span="customSpan">
              <a-form-model-item label="坐标数量">
                <a-input-number placeholder="请输入坐标数量" v-model="model.coordinateNum" :min="0" style="width: 100%"
                                :disabled="editable || disableSubmit"/>
                <a-input-number placeholder="请输入坐标数量" v-model="model.coordinateNum" :min="0" style="width: 100%"/>
              </a-form-model-item>
            </a-col>
            <a-col :span="customSpan">
              <a-form-model-item label="重量">
                <a-input-number placeholder="请输入重量" v-model="model.equipmentWeight" :min="0" style="width: 100%"
                                :disabled="editable || disableSubmit"/>
                <a-input-number placeholder="请输入重量" v-model="model.equipmentWeight" :min="0" style="width: 100%"/>
              </a-form-model-item>
            </a-col>
          </a-row>
          <a-row :gutter="24">
          <a-row>
            <a-col :span="customSpan">
              <a-form-model-item label="重量计量单位">
                <a-input placeholder="请输入重量计量单位" v-model="model.weightUnit" :disabled="editable || disableSubmit"/>
                <a-input placeholder="请输入重量计量单位" v-model="model.weightUnit"/>
              </a-form-model-item>
            </a-col>
            <a-col :span="customSpan">
              <a-form-model-item label="功能位置">
                <a-input placeholder="请输入功能位置" v-model="model.functionalLocation"
                         :disabled="editable || disableSubmit"/>
                <a-input placeholder="请输入功能位置" v-model="model.functionalLocation"/>
              </a-form-model-item>
            </a-col>
            <a-col :span="customSpan">
              <a-form-model-item label="安装位置">
                <a-input placeholder="请输入安装位置" v-model="model.installationPosition"
                         :disabled="editable || disableSubmit"/>
                <a-input placeholder="请输入安装位置" v-model="model.installationPosition"/>
              </a-form-model-item>
            </a-col>
            <a-col :span="customSpan">
@@ -162,15 +148,15 @@
            </a-col>
          </a-row>
          <a-row :gutter="24">
          <a-row>
            <a-col :span="customSpan">
              <a-form-model-item label="立项卡号">
                <a-input placeholder="请输入立项卡号" v-model="model.cardNumber" :disabled="editable || disableSubmit"/>
                <a-input placeholder="请输入立项卡号" v-model="model.cardNumber"/>
              </a-form-model-item>
            </a-col>
            <a-col :span="customSpan">
              <a-form-model-item label="资金来源">
                <a-input placeholder="请输入资金来源" v-model="model.fundingSource" :disabled="editable || disableSubmit"/>
                <a-input placeholder="请输入资金来源" v-model="model.fundingSource"/>
              </a-form-model-item>
            </a-col>
            <a-col :span="customSpan">
@@ -180,40 +166,38 @@
            </a-col>
            <a-col :span="customSpan">
              <a-form-model-item label="出厂编号">
                <a-input placeholder="请输入出厂编号" v-model="model.factoryNumber" :disabled="editable || disableSubmit"/>
                <a-input placeholder="请输入出厂编号" v-model="model.factoryNumber"/>
              </a-form-model-item>
            </a-col>
          </a-row>
          <a-row :gutter="24">
          <a-row>
            <a-col :span="customSpan">
              <a-form-model-item label="资产制造商">
                <a-input placeholder="请输入资产制造商" v-model="model.manufacturingEnterprise"
                         :disabled="editable || disableSubmit"/>
                <a-input placeholder="请输入资产制造商" v-model="model.manufacturingEnterprise"/>
              </a-form-model-item>
            </a-col>
            <a-col :span="customSpan">
              <a-form-model-item label="资产来源国家">
                <a-input placeholder="请输入资产来源国家" v-model="model.originCountry" :disabled="editable || disableSubmit"/>
                <a-input placeholder="请输入资产来源国家" v-model="model.originCountry"/>
              </a-form-model-item>
            </a-col>
            <a-col :span="customSpan">
              <a-form-model-item label="型号">
                <a-input placeholder="请输入型号" v-model="model.equipmentModel" :disabled="editable || disableSubmit"/>
                <a-input placeholder="请输入型号" v-model="model.equipmentModel"/>
              </a-form-model-item>
            </a-col>
            <a-col :span="customSpan">
              <a-form-model-item label="设备规格">
                <a-input placeholder="请输入设备规格" v-model="model.equipmentSpecification"
                         :disabled="editable || disableSubmit"/>
                <a-input placeholder="请输入设备规格" v-model="model.equipmentSpecification"/>
              </a-form-model-item>
            </a-col>
          </a-row>
          <a-row :gutter="24">
          <a-row>
            <a-col :span="customSpan">
              <a-form-model-item label="总功率">
                <a-input placeholder="请输入总功率" v-model="model.equipmentPower" :disabled="editable || disableSubmit"/>
                <a-input placeholder="请输入总功率" v-model="model.equipmentPower"/>
              </a-form-model-item>
            </a-col>
            <a-col :span="customSpan">
@@ -228,13 +212,12 @@
            </a-col>
            <a-col :span="customSpan">
              <a-form-model-item label="资产状态">
                <j-dict-select-tag dict-code="asset_status" placeholder="请选择资产状态" v-model="model.assetStatus"
                                   :disabled="editable || disableSubmit"/>
                <j-dict-select-tag dict-code="asset_status" placeholder="请选择资产状态" v-model="model.assetStatus"/>
              </a-form-model-item>
            </a-col>
          </a-row>
          <a-row :gutter="24">
          <a-row>
            <a-col :span="customSpan">
              <a-form-model-item label="本次三保日期">
                <a-date-picker v-model="model.latestThirdMaintenance" value-format="YYYY-MM-DD" style="width:100%"/>
@@ -247,7 +230,8 @@
            </a-col>
            <a-col :span="customSpan">
              <a-form-model-item label="三保周期">
                <a-date-picker v-model="model.thirdMaintenancePeriod" value-format="YYYY-MM-DD" style="width:100%"/>
                <a-input-number placeholder="请输入三保周期" v-model="model.thirdMaintenancePeriod" :min="0"
                                style="width: 100%"/>
              </a-form-model-item>
            </a-col>
            <a-col :span="customSpan">
@@ -257,7 +241,7 @@
            </a-col>
          </a-row>
          <a-row :gutter="24">
          <a-row>
            <a-col :span="customSpan">
              <a-form-model-item label="下次技术鉴定日期">
                <a-date-picker v-model="model.nextTechnologyCheck" value-format="YYYY-MM-DD" style="width:100%"/>
@@ -265,40 +249,14 @@
            </a-col>
            <a-col :span="customSpan">
              <a-form-model-item label="技术鉴定周期">
                <a-date-picker v-model="model.technologyCheckPeriod" value-format="YYYY-MM-DD" style="width:100%"/>
                <a-input-number placeholder="请输入技术鉴定周期" v-model="model.technologyCheckPeriod" :min="0"
                                style="width: 100%"/>
              </a-form-model-item>
            </a-col>
          </a-row>
        </a-form-model>
      </a-tab-pane>
      <template v-if="disableSubmit">
        <a-tab-pane tab="设备文档" :key="2">
        </a-tab-pane>
        <a-tab-pane tab="点检工单" :key="3">
        </a-tab-pane>
        <a-tab-pane tab="二保工单" :key="4">
        </a-tab-pane>
        <a-tab-pane tab="三保工单" :key="5">
        </a-tab-pane>
        <a-tab-pane tab="维修工单" :key="6">
        </a-tab-pane>
        <a-tab-pane tab="保养标准" :key="7">
        </a-tab-pane>
        <a-tab-pane tab="工艺参数" :key="8">
        </a-tab-pane>
        <a-tab-pane tab="设备精度" :key="9">
        </a-tab-pane>
      </template>
    </a-tabs>
      </j-form-container>
    </a-spin>
  </j-modal>
</template>
@@ -309,7 +267,7 @@
  export default {
    name: 'EamEquipmentModal',
    props: {
      treeDataAlias: {
      productionTreeData: {
        type: Array
      }
    },
@@ -360,8 +318,7 @@
        },
        url: {
          add: '/eam/equipment/add',
          edit: '/eam/equipment/edit',
          getProductionTreeList: '/eam/BaseFactory/queryTreeList'
          edit: '/eam/equipment/edit'
        }
      }
    },
@@ -380,20 +337,6 @@
        this.editable = true
        this.model = Object.assign({}, record)
        this.visible = true
      },
      loadAllProductionTree() {
        //加载车间选择树
        getAction(this.url.getProductionTreeList)
          .then(res => {
            if (res.success) {
              this.productionTreeData = res.result
            } else {
              this.$notification.warning({
                message: '消息',
                description: res.message
              })
            }
          })
      },
      handleOk() {
src/views/system/modules/DictItemModal.vue
@@ -164,7 +164,7 @@
          param.id = this.model.id
        }
        if(value){
          let reg=new RegExp("[`_~!@#$^&*()=|{}'.<>《》/?!¥()—【】‘;:”“。,、?]")
          let reg=new RegExp("[`~!@#$^&*()=|{}'.<>《》/?!¥()—【】‘;:”“。,、?]")
          if(reg.test(value)){
            callback("数据值不能包含特殊字符!")
          }else{