qushaowei
2023-08-21 f5e8a1a00baf276c281d4a6335b2d39a8beba91a
点检 保养  调整
已修改11个文件
212 ■■■■ 文件已修改
src/views/base/WarehouseListNew.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/eam/modules/dailyInspectionOrder/DailyInspectionOrderExeDrawer.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/eam/modules/dailyInspectionOrder/DailyInspectionOrderModal.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/eam/modules/dailyInspectionStandard/DailylnspectionStandardModal.vue 34 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/eam/modules/dailyMaintenanceStandard/DailyMaintenanceStandardModal.vue 30 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/eam/modules/equipment/EquipmentModel.vue 61 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/eam/modules/equipmentSeal/EquipmentSealForm.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/eam/modules/inspectionProject/InspectionProjectModel.vue 26 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/eam/modules/inspectionProject/InspectionProjectRight.vue 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/eam/modules/specialtyInspectionPlan/SpecialtyInspectionPlanModal.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/eam/modules/specialtyMaintenancePlan/SpecialtyMaintenancePlanModal.vue 41 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/base/WarehouseListNew.vue
@@ -150,7 +150,7 @@
        </div>
      </a-tab-pane>
      <a-tab-pane
      <!-- <a-tab-pane
        key="2"
        forceRender
      >
@@ -190,7 +190,7 @@
        >
          <service-object-list ref="EquipmentFileList"></service-object-list>
        </div>
      </a-tab-pane>
      </a-tab-pane> -->
    </a-tabs>
    <warehouse-modal
      ref="modalForm"
src/views/eam/modules/dailyInspectionOrder/DailyInspectionOrderExeDrawer.vue
@@ -158,7 +158,7 @@
                        :value="text"
                        v-if="col.dataIndex == 'inspectionProjectResult' && record.analysisMethod == '1'"
                        :min="0"
                        :max="200"
                        :max="20000"
                        @change="(e)=>handleChange(e, record.key, col, index,record)"
                        style="width: 100%"
                        :disabled="record.disabled"
src/views/eam/modules/dailyInspectionOrder/DailyInspectionOrderModal.vue
@@ -180,6 +180,7 @@
          hidden
          :gutter="24"
        >
          <a-col :span="12">
            <a-form-item
              label="有效时长"
src/views/eam/modules/dailyInspectionStandard/DailylnspectionStandardModal.vue
@@ -35,21 +35,21 @@
              :labelCol="labelCol"
              :wrapperCol="wrapperCol"
            >
              <!-- <j-dict-select-tag
                allow-clear
                :disabled="disableSubmit"
                :placeholder="disableSubmit?'':'请选择对象部门'"
                :triggerChange="true"
                dictCode="mom_eam_equipment,use_id,id,status!='0' and del_flag!='1' and use_id!='null'"
                v-decorator="['useId', validatorRules.useId]"
              /> -->
              <a-input-search
              <!-- <a-input-search
                :disabled="disableSubmit"
                placeholder="请选择对象部门"
                enter-button
                @search="onDepartList()"
                :read-only="true"
                v-decorator="['useDepartName', validatorRules.useDepartName]"
              /> -->
              <a-tree-select
                style="width: 100%"
                :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
                :tree-data="treeData"
                placeholder="请选择对象部门"
                tree-default-expand-all
                v-decorator="['useId', validatorRules.useId ]"
              />
            </a-form-item>
          </a-col>
@@ -104,7 +104,7 @@
              />
            </a-form-item>
          </a-col>
          <a-col :span="12">
          <!-- <a-col :span="12">
            <a-form-item
              label="对象部门Id"
              :labelCol="labelCol"
@@ -117,7 +117,7 @@
                v-decorator="['useId', validatorRules.useId ]"
              />
            </a-form-item>
          </a-col>
          </a-col> -->
        </a-row>
        <a-row :gutter="24">
          <a-col :span="12">
@@ -372,6 +372,7 @@
      isRevise: false,
      model: {},
      inspectionCycles: {},
      treeData: [],
      labelCol: {
        xs: { span: 24 },
        sm: { span: 6 },
@@ -416,6 +417,7 @@
        getInspectionCycle: "/eam/inspectionStandardDetail/getInspectionCycle",
        revise: '/eam/inspectionStandard/revise',
        getReviseVersion: "/eam/inspectionStandard/getReviseVersion",
        loadOptions: '/sys/sysDepart/loadDepartTreeOptions',
      },
      dataSource: [],
@@ -461,6 +463,7 @@
    edit(record) {
      let that = this;
      that.getInspectionCycle()
      that.initOptions();
      that.dataSource = [];
      that.form.resetFields();
      that.model = Object.assign({}, record);
@@ -491,6 +494,15 @@
      }
    },
    initOptions() {
      getAction(this.url.loadOptions).then(res => {
        if (res.success) {
          this.treeData = res.result
        } else {
          this.$message.warning(res.message)
        }
      })
    },
    onEquipmentList() {
      let data = this.form.getFieldsValue(['useId']);
      this.$refs.EquipmentList.list(data.useId);
src/views/eam/modules/dailyMaintenanceStandard/DailyMaintenanceStandardModal.vue
@@ -33,13 +33,21 @@
              :labelCol="labelCol"
              :wrapperCol="wrapperCol"
            >
              <a-input-search
              <!-- <a-input-search
                :disabled="disableSubmit"
                placeholder="请选择对象部门"
                enter-button
                @search="onDepartList()"
                :read-only="true"
                v-decorator="['useDepartName', validatorRules.useDepartName]"
              /> -->
              <a-tree-select
                style="width: 100%"
                :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
                :tree-data="treeData"
                placeholder="请选择部门"
                tree-default-expand-all
                v-decorator="['departId', validatorRules.useId ]"
              />
            </a-form-item>
          </a-col>
@@ -88,7 +96,7 @@
                allow-clear
                :disabled="true"
                :placeholder="disableSubmit?'':'请输入责任班组'"
                v-decorator="['teamName', validatorRules.teamName ]"
                v-decorator="['teamName', {} ]"
              />
            </a-form-item>
          </a-col>
@@ -111,7 +119,7 @@
              />
            </a-form-item>
          </a-col>
          <a-col :span="12">
          <!-- <a-col :span="12">
            <a-form-item
              label="对象部门Id"
              :labelCol="labelCol"
@@ -124,7 +132,7 @@
                v-decorator="['departId', validatorRules.useId ]"
              />
            </a-form-item>
          </a-col>
          </a-col> -->
          <a-col :span="12">
            <a-form-item
              label="班组Id"
@@ -508,6 +516,7 @@
      model: {},
      upload: {},
      maintenanceCycles: {},
      treeData: [],
      labelCol: {
        xs: { span: 24 },
        sm: { span: 6 },
@@ -564,6 +573,7 @@
        realDelete: "/eam/maintenanceStandardDetail/realDelete",
        revise: '/eam/maintenanceStandard/revise',
        getReviseVersion: "/eam/maintenanceStandard/getReviseVersion",
        loadOptions: '/sys/sysDepart/loadDepartTreeOptions',
      },
      dataSource: [],
@@ -635,6 +645,7 @@
    edit(record) {
      let that = this;
      this.initOptions();
      this.getMaintenanceCycle()
      this.dataSource = [];
      this.form.resetFields();
@@ -670,6 +681,17 @@
      }
    },
    initOptions() {
      getAction(this.url.loadOptions).then(res => {
        if (res.success) {
          this.treeData = res.result
        } else {
          this.$message.warning(res.message)
        }
      })
    },
    onEquipmentList() {
      let data = this.form.getFieldsValue(['departId']);
      if (data.departId == null || data.departId == "") {
src/views/eam/modules/equipment/EquipmentModel.vue
@@ -215,14 +215,22 @@
                placeholder="请输入所有组织"
                v-decorator="['affiliationId', validatorRules.affiliationId]"
              /> -->
              <a-select
              <!-- <a-select
                :placeholder="disableSubmit?'':'请选择所有组织'"
                :options="this.departs"
                style="width: 100%"
                :disabled="disableSubmit"
                v-decorator="['affiliationId', validatorRules.affiliationId]"
              />
              /> -->
              <!-- @change="(e)=>handle1Change(e)" -->
              <a-tree-select
                style="width: 100%"
                :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
                :tree-data="treeData"
                placeholder="请选择管理组织"
                tree-default-expand-all
                v-decorator="['affiliationId', validatorRules.affiliationId]"
              />
            </a-form-item>
          </a-col>
          <a-col :span="24 / 3">
@@ -249,14 +257,22 @@
                placeholder="请输入管理组织"
                v-decorator="['manageId', validatorRules.manageId]"
              /> -->
              <a-select
              <!-- <a-select
                :placeholder="disableSubmit?'':'请选择管理组织'"
                :options="this.departs"
                style="width: 100%"
                :disabled="disableSubmit"
                v-decorator="['manageId', validatorRules.manageId]"
              />
              /> -->
              <!-- @change="(e)=>handle3Change(e)" -->
              <a-tree-select
                style="width: 100%"
                :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
                :tree-data="treeData"
                placeholder="请选择管理组织"
                tree-default-expand-all
                v-decorator="['manageId', validatorRules.manageId]"
              />
            </a-form-item>
          </a-col>
          <a-col :span="24 / 3">
@@ -299,23 +315,23 @@
              :wrapperCol="wrapperCol"
              label="使用部门"
            >
              <!-- <j-dict-select-tag
                allow-clear
                :disabled="disableSubmit"
                :placeholder="disableSubmit?'':'请选择使用组织'"
                :triggerChange="true"
                dictCode="sys_depart,depart_name,id,version = '7' and del_flag!='1'"
              <a-tree-select
                style="width: 100%"
                :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
                :tree-data="treeData"
                placeholder="请选择部门"
                tree-default-expand-all
                v-decorator="['useId', validatorRules.useId]"
              /> -->
              <a-select
              />
              <!-- <a-select
                :placeholder="disableSubmit?'':'请选择使用部门'"
                :options="this.departs"
                style="width: 100%"
                :disabled="disableSubmit"
                v-decorator="['useId', validatorRules.useId]"
              />
              <!-- @change="(e)=>handle2Change(e)" -->
              /> -->
            </a-form-item>
          </a-col>
          <a-col :span="24 / 3">
@@ -330,7 +346,7 @@
                :placeholder="disableSubmit?'':'请选择责任班组'"
                :triggerChange="true"
                dictCode="mom_base_team,name,id,status='1' and del_flag='0'"
                v-decorator="['teamId', validatorRules.teamId]"
                v-decorator="['teamId', {}]"
              />
            </a-form-item>
          </a-col>
@@ -553,7 +569,6 @@
        关闭
      </a-button>
      <a-button
        hidden
        v-if="!this.model.id"
        :disabled="disableSubmit || confirmLoading"
        :loading="confirmLoading"
@@ -610,6 +625,7 @@
      precisionParametersTemplateId: '',
      equipmentPhoto: '',
      departs: [],
      treeData: [],
      model: {},
      headers: {},
      labelCol: {
@@ -662,6 +678,7 @@
        add: "/eam/equipment/add",
        edit: "/eam/equipment/edit",
        getSysDeparts: "/eam/equipment/getSysDeparts",
        loadOptions: '/sys/sysDepart/loadDepartTreeOptions',
      },
      //新增、编辑、删除、批量删除操作改变数据后刷新关联的组件的监听属性
      alterFlag: "",
@@ -669,6 +686,7 @@
  },
  created() {
    this.getSysDeparts()
  },
  methods: {
    moment,
@@ -683,6 +701,7 @@
      this.visible = true;
      this.disableSubmit = false;
      this.fileList = [];
      this.initOptions();
      this.precisionParametersTemplateId = record.precisionParametersTemplateId
      this.processParametersTemplateId = record.processParametersTemplateId
      this.$nextTick(() => {
@@ -937,6 +956,16 @@
      }
    },
    initOptions() {
      getAction(this.url.loadOptions).then(res => {
        if (res.success) {
          this.treeData = res.result
        } else {
          this.$message.warning(res.message)
        }
      })
    },
    onSearchProcessParametersTemplate() {
      this.$refs.ProcessParametersTemplateList.list();
src/views/eam/modules/equipmentSeal/EquipmentSealForm.vue
@@ -81,6 +81,7 @@
          :toolbar="true"
          :toolbarConfig="toolbarConfig"
          :linkage-config="linkageConfig"
          :addDefaultRowNum="0"
        >
          <template slot="toolbarPrefix">
            <a-button
src/views/eam/modules/inspectionProject/InspectionProjectModel.vue
@@ -114,7 +114,7 @@
            </a-form-item>
          </a-col> -->
          <a-col
            v-if="analysisMethod == '2'"
            v-if="testValueType == '2'"
            :span="12"
          >
            <a-form-item
@@ -131,7 +131,7 @@
            </a-form-item>
          </a-col>
          <a-col
            v-if="analysisMethod == '1'"
            v-if="testValueType == '1'"
            :span="12"
          >
            <a-form-item
@@ -150,7 +150,7 @@
          </a-col>
        </a-row>
        <a-row
          v-if="analysisMethod == '1'"
          v-if="testValueType == '1'"
          :gutter="24"
        >
          <a-col :span="12">
@@ -277,7 +277,7 @@
      codeDisable: true,
      disableSubmit: false,
      inspectionProjectCategoryId: '',
      analysisMethod: null,
      testValueType: null,
      model: {},
      labelCol: {
        xs: { span: 24 },
@@ -304,11 +304,11 @@
            { validator: this.validateName },
          ]
        },
        analysisMethod: {
          rules: [
            { required: true, message: '请选择分析方法!' },
          ]
        },
        // analysisMethod: {
        //   rules: [
        //     { required: true, message: '请选择分析方法!' },
        //   ]
        // },
        surfaceValue: {
          rules: [
            { required: true, message: '请输入名义值!' },
@@ -353,12 +353,12 @@
      this.model = Object.assign({}, record);
      this.visible = true;
      this.disableSubmit = false;
      this.analysisMethod = record.analysisMethod
      this.testValueType = record.testValueType
      this.$nextTick(() => {
        this.form.setFieldsValue(pick(this.model, 'inspectionProjectCategoryNumName',
          'num', 'name', 'unitId', 'testValueType', 'analysisMethod', 'inspectionMethod', 'inspectionTool', 'remark'))
          'num', 'name', 'unitId', 'testValueType', 'inspectionMethod', 'inspectionTool', 'remark'))
      });
      if (record.analysisMethod == '1') {
      if (record.testValueType == '1') {
        this.$nextTick(() => {
          this.form.setFieldsValue(pick(this.model, 'surfaceValue', 'upValue', 'downValue'))
        });
@@ -440,7 +440,7 @@
    },
    handleChange(val) {
      this.analysisMethod = val
      this.testValueType = val
    },
    validateDownValue(rule, value, callback) {
src/views/eam/modules/inspectionProject/InspectionProjectRight.vue
@@ -265,11 +265,11 @@
          align: 'center',
          dataIndex: 'unitId_dictText',
        },
        {
          title: '分析方法',
          align: 'center',
          dataIndex: 'analysisMethod_dictText',
        },
        // {
        //   title: '分析方法',
        //   align: 'center',
        //   dataIndex: 'analysisMethod_dictText',
        // },
        {
          title: '检验值类型',
          align: "center",
src/views/eam/modules/specialtyInspectionPlan/SpecialtyInspectionPlanModal.vue
@@ -148,7 +148,7 @@
              <a-input
                :disabled=true
                placeholder="请输入图片名称"
                v-decorator="['name', validatorRules.name ]"
                v-decorator="['name', {} ]"
              />
            </a-form-item>
          </a-col>
src/views/eam/modules/specialtyMaintenancePlan/SpecialtyMaintenancePlanModal.vue
@@ -33,11 +33,20 @@
              :labelCol="labelCol"
              :wrapperCol="wrapperCol"
            >
              <a-select
              <!-- <a-select
                :placeholder="disableSubmit?'':'请选择对象部门'"
                :options="this.departs"
                style="width: 100%"
                :disabled="disableSubmit"
                v-decorator="['departId', validatorRules.departId]"
                @change="(e)=>handle2Change(e)"
              /> -->
              <a-tree-select
                style="width: 100%"
                :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
                :tree-data="treeData"
                placeholder="请选择对象部门"
                tree-default-expand-all
                v-decorator="['departId', validatorRules.departId]"
                @change="(e)=>handle2Change(e)"
              />
@@ -67,7 +76,7 @@
              :labelCol="labelCol"
              :wrapperCol="wrapperCol"
            >
            <j-dict-select-tag
              <j-dict-select-tag
                allow-clear
                :disabled="disableSubmit"
                :placeholder="disableSubmit?'':'请选择责任班组'"
@@ -184,7 +193,7 @@
              />
            </a-form-item>
          </a-col>
        </a-row>
      </a-form>
    </a-spin>
@@ -311,6 +320,7 @@
      codeDisable: true,
      model: {},
      maintenanceCycles: [],
      treeData: [],
      departs: [],
      labelCol: {
        xs: { span: 24 },
@@ -339,7 +349,7 @@
            { required: true, message: '请选择对象部门!' },
          ]
        },
       teamId: {
        teamId: {
          rules: [
            { required: true, message: '请选择责任班组!' },
          ]
@@ -377,6 +387,7 @@
        listByBusIdAndBusType: "/system/sysUploadRela/listByBusIdAndBusType",
        getMaintenanceCycles: "/eam/maintenanceStandardDetail/getMaintenanceCycle",
        getSysDeparts: "/eam/equipment/getSysDeparts",
        loadOptions: '/sys/sysDepart/loadDepartTreeOptions',
      },
      dataSource: [],
      //用于展示文件
@@ -396,9 +407,9 @@
          maintenanceStandardId: data[i].id,
          num: data[i].num,
          equipmentId: data[i].equipmentId,
          version:data[i].version,
          versionStatus:data[i].versionStatus,
          versionStatusName:data[i].versionStatusName,
          version: data[i].version,
          versionStatus: data[i].versionStatus,
          versionStatusName: data[i].versionStatusName,
          equipmentNum: data[i].equipmentNum,
          equipmentName: data[i].equipmentName,
          equipmentModel: data[i].equipmentModel,
@@ -409,7 +420,7 @@
  created() {
    this.getMaintenanceCycles()
    this.getSysDeparts()
    // this.getSysDeparts()
    const token = Vue.ls.get(ACCESS_TOKEN);
    const tenantid = Vue.ls.get(TENANT_ID)
    this.headers = {
@@ -486,12 +497,14 @@
      let that = this;
      that.visible = true;
      that.isFileChange = false;
      that.initOptions();
      that.model = Object.assign({}, record);
      that.$nextTick(() => {
        that.form.setFieldsValue(pick(that.model, 'num', 'departId','teamId','teamName' ,'assignMode','maintenanceCycleId', 'dutyDepartId', 'maintenanceTypeId', 'maintenanceMode', 'remark'))
        that.form.setFieldsValue(pick(that.model, 'num', 'departId', 'teamId', 'teamName', 'assignMode', 'maintenanceCycleId', 'dutyDepartId', 'maintenanceTypeId', 'maintenanceMode', 'remark'))
      });
      that.fileList = [];
      that.form.resetFields();
      that.uploadId = ''
      if (record.specialtyMaintenancePlanDetailList != undefined) {
        const temp = [...record.specialtyMaintenancePlanDetailList];
@@ -526,6 +539,16 @@
      this.visible = false;
    },
    initOptions() {
      getAction(this.url.loadOptions).then(res => {
        if (res.success) {
          this.treeData = res.result
        } else {
          this.$message.warning(res.message)
        }
      })
    },
    handleOk() {
      const that = this;
      // 触发表单验证