现场问题修改

qushaowei

2023-09-21 6c7ca8b4290cd6afecb680c39be00fc2480a2dca

 src/views/eam/modules/equipmentNew/EquipmentModal.vue

@@ -79,6 +79,8 @@
              ></a-input>
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row>
          <a-col :span="6">
            <a-form-model-item
              label="规格"
@@ -120,28 +122,13 @@
              ></j-image-upload>
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row>
          <a-divider
            orientation="center"
            style="font-size: large;font-style: italic;color: #66aeed;"
          >维护及使用信息</a-divider>
          <a-col :span="6">
            <a-form-model-item
              label="维护部门"
              :labelCol="labelCol"
              :wrapperCol="wrapperCol"
              prop="manageId"
            >
              <a-tree-select
                :disabled="formDisabled"
                style="width: 100%"
                :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
                :tree-data="treeData"
                placeholder="请选择维护部门"
                tree-default-expand-all
                v-model="model.manageId"
              />
            </a-form-model-item>
          </a-col>

          <a-col :span="6">
            <a-form-model-item
              label="使用部门"
@@ -162,6 +149,41 @@
          </a-col>
          <a-col :span="6">
            <a-form-model-item
              label="车间"
              :labelCol="labelCol"
              :wrapperCol="wrapperCol"
              prop="factoryModelId"
            >
              <j-dict-select-tag
                allow-clear
                :disabled="formDisabled"
                placeholder="请选择车间"
                :triggerChange="true"
                dictCode="mom_base_area,name,id,del_flag!='1'"
                v-model="model.factoryModelId"
              />
            </a-form-model-item>
          </a-col>
          <a-col :span="6">
            <a-form-model-item
              label="维修部门"
              :labelCol="labelCol"
              :wrapperCol="wrapperCol"
              prop="manageId"
            >
              <a-tree-select
                :disabled="formDisabled"
                style="width: 100%"
                :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
                :tree-data="treeData"
                placeholder="请选择维修部门"
                tree-default-expand-all
                v-model="model.manageId"
              />
            </a-form-model-item>
          </a-col>
          <a-col :span="6">
            <a-form-model-item
              label="维修班组"
              :labelCol="labelCol"
              :wrapperCol="wrapperCol"
@@ -177,6 +199,26 @@
              />
            </a-form-model-item>
          </a-col>

        </a-row>
        <a-row>
          <!-- <a-col :span="6">
            <a-form-model-item
              label="产线"
              :labelCol="labelCol"
              :wrapperCol="wrapperCol"
              prop="workCenterId"
            >
              <j-dict-select-tag
                allow-clear
                :disabled="formDisabled"
                placeholder="请选择产线"
                :triggerChange="true"
                dictCode="mom_base_work_center,name,id,del_flag!='1'"
                v-model="model.workCenterId"
              />
            </a-form-model-item>
          </a-col> -->
          <a-col :span="6">
            <a-form-model-item
              label="资产制造商"
@@ -194,27 +236,12 @@
              />
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row>
          <a-divider
            orientation="center"
            style="font-size: large;font-style: italic;color: #66aeed;"
          >状态及标识</a-divider>
          <a-col :span="6">
            <a-form-model-item
              label="关键设备标识"
              :labelCol="labelCol"
              :wrapperCol="wrapperCol"
              prop="specificEquipment"
            >
              <j-dict-select-tag
                allow-clear
                placeholder="请选择关键设备标识"
                :disabled="formDisabled"
                :triggerChange="true"
                dictCode="specific_equipment"
                v-model="model.specificEquipment"
              />
            </a-form-model-item>
          </a-col>
          <a-col :span="6">
            <a-form-model-item
              label="设备状态"
@@ -249,6 +276,63 @@
              />
            </a-form-model-item>
          </a-col>
          <a-col :span="6">
            <a-form-model-item
              label="资产状态"
              :labelCol="labelCol"
              :wrapperCol="wrapperCol"
              prop="propertyStatus"
            >
              <j-dict-select-tag
                allow-clear
                :disabled="formDisabled"
                placeholder="请输入资产状态"
                :triggerChange="true"
                dictCode="property_status"
                v-model="model.propertyStatus"
              />
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row v-if="model.propertyStatus=='warranty'">
          <a-divider
            orientation="center"
            style="font-size: large;font-style: italic;color: #66aeed;"
          >质保日期</a-divider>
          <a-col :span="6">
            <a-form-model-item
              label="质保开始日期"
              :labelCol="labelCol"
              :wrapperCol="wrapperCol"
              prop="warrantyStart"
            >
              <j-date
                :disabled="formDisabled"
                style="width: 100%;"
                placeholder="请选择开始日期"
                class="query-group-cust"
                v-model="model.warrantyStart"
              ></j-date>
            </a-form-model-item>
          </a-col>
          <a-col :span="6">
            <a-form-model-item
              label="质保结束日期"
              :labelCol="labelCol"
              :wrapperCol="wrapperCol"
              prop="warrantyEnd"
            >
              <j-date
                :disabled="formDisabled"
                style="width: 100%;"
                placeholder="请选择结束日期"
                class="query-group-cust"
                v-model="model.warrantyEnd"
              ></j-date>
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row>
          <a-divider
            orientation="center"
            style="font-size: large;font-style: italic;color: #66aeed;"
@@ -282,6 +366,7 @@
              />
            </a-form-model-item>
          </a-col>

          <a-col :span="6">
            <a-form-model-item
              label="验收日期"
@@ -311,7 +396,9 @@
              ></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="6">
        </a-row>
        <a-row>
          <!-- <a-col :span="6">
            <a-form-model-item
              label="工区"
              :labelCol="labelCol"
@@ -324,7 +411,7 @@
                :disabled="formDisabled"
              ></a-input>
            </a-form-model-item>
          </a-col>
          </a-col> -->
          <a-col :span="6">
            <a-form-model-item
              label="重量"
@@ -339,6 +426,7 @@
              ></a-input>
            </a-form-model-item>
          </a-col>

          <a-col :span="6">
            <a-form-model-item
              label="重量计量单位"
@@ -367,6 +455,8 @@
              ></a-input>
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row>
          <a-col :span="6">
            <a-form-model-item
              label="功能位置"
@@ -395,6 +485,7 @@
              ></a-input>
            </a-form-model-item>
          </a-col>

          <a-col :span="6">
            <a-form-model-item
              label="资产来源国家"
@@ -479,6 +570,8 @@
              ></a-input>
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row>
          <a-col :span="6">
            <a-form-model-item
              label="系统"
@@ -540,6 +633,8 @@
            orientation="center"
            style="font-size: large;font-style: italic;color: #66aeed;"
          >ABC标识</a-divider>
        </a-row>
        <a-row>
          <a-col :span="6">
            <a-form-model-item
              label="平均使用率"
@@ -612,6 +707,8 @@
              />
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row>
          <a-col :span="6">
            <a-form-model-item
              label="故障频率"
@@ -661,10 +758,33 @@
                placeholder="请选择ABC标识"
                :triggerChange="true"
                dictCode="ABC-standard-result"
                @change="changeNeedSpecific"
                v-model="model.equipmentImportanceId"
              />
            </a-form-model-item>
          </a-col>
          <a-col
            :span="6"
            v-if="needSpecific"
          >
            <a-form-model-item
              label="关键设备标识"
              :labelCol="labelCol"
              :wrapperCol="wrapperCol"
              prop="specificEquipment"
            >
              <j-dict-select-tag
                allow-clear
                placeholder="请选择关键设备标识"
                :disabled="formDisabled"
                :triggerChange="true"
                dictCode="specific_equipment"
                v-model="model.specificEquipment"
              />
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row>
          <a-divider
            orientation="center"
            style="font-size: large;font-style: italic;color: #66aeed;"
@@ -701,7 +821,7 @@
                enter-button
                @search="onSearchPrecisionParametersTemplate()"
                :read-only="true"
                v-model="model.precisionParametersTemplateName"
                v-model="model.precisionParametersTemplateId_dictText"
              />
            </a-form-model-item>
          </a-col>
@@ -737,7 +857,7 @@
                enter-button
                @search="onSearchProcessParametersTemplate()"
                :read-only="true"
                v-model="model.processParametersTemplateName"
                v-model="model.processParametersTemplateId_dictText"
              />
            </a-form-model-item>
          </a-col>
@@ -761,8 +881,8 @@
import { postAction, requestPut, getAction } from '@/api/manage'
import { duplicateCheck } from '@/api/api'
import moment from 'moment'
import ProcessParametersTemplateList from '../equipment/ProcessParametersTemplateList'
import PrecisionParametersTemplateList from '../equipment/PrecisionParametersTemplateList'
import ProcessParametersTemplateList from './serach/ProcessParametersTemplateList'
import PrecisionParametersTemplateList from './serach/PrecisionParametersTemplateList'
import { JVxeTableModelMixin } from '@/mixins/JVxeTableModelMixin.js'
import { JVXETypes } from '@/components/jeecg/JVxeTable'
export default {
@@ -822,7 +942,46 @@
        ],
        equipmentCategoryId: [
          { required: true, message: '请选则设备类别!' },
        ]
        ],
        specification: [
          { required: true, message: '请选则设备规格!' },
        ],
        model: [
          { required: true, message: '请选则设备型号!' },
        ],
        equipmentImportanceId: [
          { required: true, message: '请选则设备ABC标识!' },
        ],
        manageId: [
          { required: true, message: '请选择维护部门!' },
        ],
        useId: [
          { required: true, message: '请选择使用部门部门!' },
        ],
        specificEquipment: [
          { required: true, message: '请选择关键设备标识!' },
        ],
        equipmentStatus: [
          { required: true, message: '请选择设备状态!' },
        ],
        technologyStatus: [
          { required: true, message: '请选择设备状态!' },
        ],
        workCenterId: [
          { required: true, message: '请选择设备产线!' },
        ],
        factoryModelId: [
          { required: true, message: '请选择设备车间!' },
        ],
        warrantyStart: [
          { required: true, message: '请选择开始日期!' },
        ],
        warrantyEnd: [
          { required: true, message: '请选择结束日期!' },
        ],
        propertyStatus: [
          { required: true, message: '请选择资产状态!' },
        ],
      },
      url: {
        add: "/eam/equipment/add",
@@ -830,6 +989,7 @@
        loadOptions: '/sys/sysDepart/loadDepartTreeOptions',
      },
      treeData: [],
      needSpecific: false,

    }
  },
@@ -840,6 +1000,7 @@
  },
  methods: {
    add() {
      this
      this.edit(this.modelDefault);
    },
    edit(record) {
@@ -986,7 +1147,7 @@
    sendProcessParametersTemplateRecord(data) {
      let record = data.record;
      this.model.processParametersTemplateId = record.id
      this.model.processParametersTemplateName = record.name
      this.model.processParametersTemplateId_dictText = record.name
      this.model = Object.assign({}, this.model);
    },

@@ -997,7 +1158,7 @@
    sendPrecisionParametersTemplateRecord(data) {
      let record = data.record;
      this.model.precisionParametersTemplateId = record.id
      this.model.precisionParametersTemplateName = record.name
      this.model.precisionParametersTemplateId_dictText = record.name
      this.model = Object.assign({}, this.model);
    },
    standardResultCompute() {
@@ -1020,6 +1181,25 @@
      }
      this.model = Object.assign({}, this.model);

    },
    changeNeedSpecific(val) {
      if (val == 'A') {
        this.needSpecific = true;
      } else {
        let that = this;
        this.$confirm({
          title: '提示',
          content: '非A类设备，是否要添加关键设备标识！',
          okText: '确认',
          cancelText: '取消',
          onOk() {
            that.needSpecific = true;
          },
          onCancel() {
            that.needSpecific = false;
          }
        })
      }
    }
  },
  computed: {