“linengliang”
2023-10-08 56d9c88deb00626a312bc06a7243f9be14eec1df
不同类型设备设备台账
已重命名1个文件
已复制2个文件
已修改3个文件
85 ■■■■■ 文件已修改
src/views/eam/EquipmentListOfFilesCarousel.vue 24 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/eam/EquipmentListOfProduct.vue 22 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/eam/EquipmentListOfWeldingMachine.vue 22 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/eam/modules/equipmentCategory/EquipmentCategoryLeft.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/eam/modules/equipmentCategory/EquipmentCategoryModel.vue 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/eam/modules/equipmentNew/EquipmentModal.vue 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/eam/EquipmentListOfFilesCarousel.vue
copy from src/views/eam/EquipmentList.vue copy to src/views/eam/EquipmentListOfFilesCarousel.vue
Îļþ´Ó src/views/eam/EquipmentList.vue ¸´ÖÆ
@@ -1,5 +1,5 @@
<template>
  <a-card :bordered="false">
  <a-card :bordered="false" title="数控回转库">
    <!-- æŸ¥è¯¢åŒºåŸŸ -->
    <div class="table-page-search-wrapper">
      <a-form layout="inline" @keyup.enter.native="searchQuery">
@@ -10,8 +10,8 @@
            :labelCol="labelCol"
            :wrapperCol="wrapperCol"
            >
              <j-search-select-tag
                dict="mom_eam_equipment_category,name,id"
              <j-dict-select-tag
                dict="mom_eam_equipment_category,name,id,equipment_category_uda1 = 'filesCarousel'"
                placeholder="请输入搜索条件并选择"
                v-model="queryParam.equipmentCategoryId"
              />
@@ -25,10 +25,10 @@
            :wrapperCol="wrapperCol"
            label="统一编码"
            >
              <j-input
              <a-input
                placeholder="请输入设备统一编码查询"
                v-model="queryParam.num"
              ></j-input>
              ></a-input>
            </a-form-item>
          </a-col>
          <a-col
@@ -39,10 +39,10 @@
            :wrapperCol="wrapperCol"
            label="设备名称"
            >
              <j-input
              <a-input
                placeholder="请输入设备名称查询"
                v-model="queryParam.name"
              ></j-input>
              ></a-input>
            </a-form-item>
          </a-col>
          <a-col :span="5">
@@ -51,10 +51,10 @@
              :labelCol="labelCol"
            :wrapperCol="wrapperCol"
            >
            <j-input
            <a-input
                v-model="queryParam.model"
                placeholder="请输入型号"
            ></j-input>
            ></a-input>
            </a-form-item>
          </a-col>
          <a-col :span="4">
@@ -451,7 +451,7 @@
        <equipment-update-warranty-list :mainId="selectedMainId" />
      </a-tab-pane>
    </a-tabs>
    <equipment-modal ref="modalForm" @ok="modalFormOk"></equipment-modal>
    <equipment-modal ref="modalForm" @ok="modalFormOk" :caytegoryParam="caytegoryParam"></equipment-modal>
    <process-edit-model ref ="processEditModel"></process-edit-model>
    <precision-edit-model ref ="precisionEditModel"></precision-edit-model>
    <aBC-update-edit-model @ok="modalFormOk" :updateList="selectionRows" ref="updateABC"></aBC-update-edit-model>
@@ -489,7 +489,7 @@
      EquipmentPrecisionParametersList,
      EquipmentModal,
      EquipmentResumeDrawer,
      JSearchSelectTag,
        JSearchSelectTag,
        ProcessEditModel,
        PrecisionEditModel,
        EquipmentUpdateABCList ,
@@ -502,6 +502,7 @@
    data () {
      return {
        description: '设备台账管理页面',
        caytegoryParam:'filesCarousel',
        // è¡¨å¤´
        columns: [
        {
@@ -807,6 +808,7 @@
          this.ipagination.current = 1;
        }
        this.onClearSelected()
        this.queryParam.equipmentCategoryUda1 = this.caytegoryParam;
        var params = this.getQueryParams();//查询条件
        this.loading = true;
        getAction(this.url.list, params).then((res) => {
src/views/eam/EquipmentListOfProduct.vue
ÎļþÃû´Ó src/views/eam/EquipmentList.vue ÐÞ¸Ä
@@ -1,5 +1,5 @@
<template>
  <a-card :bordered="false">
  <a-card :bordered="false" title="生产设备">
    <!-- æŸ¥è¯¢åŒºåŸŸ -->
    <div class="table-page-search-wrapper">
      <a-form layout="inline" @keyup.enter.native="searchQuery">
@@ -10,8 +10,8 @@
            :labelCol="labelCol"
            :wrapperCol="wrapperCol"
            >
              <j-search-select-tag
                dict="mom_eam_equipment_category,name,id"
              <j-dict-select-tag
                dictCode="mom_eam_equipment_category,name,id,equipment_category_uda1 = 'producter'"
                placeholder="请输入搜索条件并选择"
                v-model="queryParam.equipmentCategoryId"
              />
@@ -25,10 +25,10 @@
            :wrapperCol="wrapperCol"
            label="统一编码"
            >
              <j-input
              <a-input
                placeholder="请输入设备统一编码查询"
                v-model="queryParam.num"
              ></j-input>
              ></a-input>
            </a-form-item>
          </a-col>
          <a-col
@@ -39,10 +39,10 @@
            :wrapperCol="wrapperCol"
            label="设备名称"
            >
              <j-input
              <a-input
                placeholder="请输入设备名称查询"
                v-model="queryParam.name"
              ></j-input>
              ></a-input>
            </a-form-item>
          </a-col>
          <a-col :span="5">
@@ -51,10 +51,10 @@
              :labelCol="labelCol"
            :wrapperCol="wrapperCol"
            >
            <j-input
            <a-input
                v-model="queryParam.model"
                placeholder="请输入型号"
            ></j-input>
            ></a-input>
            </a-form-item>
          </a-col>
          <a-col :span="4">
@@ -451,7 +451,7 @@
        <equipment-update-warranty-list :mainId="selectedMainId" />
      </a-tab-pane>
    </a-tabs>
    <equipment-modal ref="modalForm" @ok="modalFormOk"></equipment-modal>
    <equipment-modal ref="modalForm" @ok="modalFormOk" :caytegoryParam="caytegoryParam"></equipment-modal>
    <process-edit-model ref ="processEditModel"></process-edit-model>
    <precision-edit-model ref ="precisionEditModel"></precision-edit-model>
    <aBC-update-edit-model @ok="modalFormOk" :updateList="selectionRows" ref="updateABC"></aBC-update-edit-model>
@@ -502,6 +502,7 @@
    data () {
      return {
        description: '设备台账管理页面',
        caytegoryParam:'producter',
        // è¡¨å¤´
        columns: [
        {
@@ -807,6 +808,7 @@
          this.ipagination.current = 1;
        }
        this.onClearSelected()
        this.queryParam.equipmentCategoryUda1 = this.caytegoryParam;
        var params = this.getQueryParams();//查询条件
        this.loading = true;
        getAction(this.url.list, params).then((res) => {
src/views/eam/EquipmentListOfWeldingMachine.vue
copy from src/views/eam/EquipmentList.vue copy to src/views/eam/EquipmentListOfWeldingMachine.vue
Îļþ´Ó src/views/eam/EquipmentList.vue ¸´ÖÆ
@@ -1,5 +1,5 @@
<template>
  <a-card :bordered="false">
  <a-card :bordered="false" title="焊机">
    <!-- æŸ¥è¯¢åŒºåŸŸ -->
    <div class="table-page-search-wrapper">
      <a-form layout="inline" @keyup.enter.native="searchQuery">
@@ -10,8 +10,8 @@
            :labelCol="labelCol"
            :wrapperCol="wrapperCol"
            >
              <j-search-select-tag
                dict="mom_eam_equipment_category,name,id"
              <j-dict-select-tag
                dictCode="mom_eam_equipment_category,name,id,equipment_category_uda1 = 'weldingMachine'"
                placeholder="请输入搜索条件并选择"
                v-model="queryParam.equipmentCategoryId"
              />
@@ -25,10 +25,10 @@
            :wrapperCol="wrapperCol"
            label="统一编码"
            >
              <j-input
              <a-input
                placeholder="请输入设备统一编码查询"
                v-model="queryParam.num"
              ></j-input>
              ></a-input>
            </a-form-item>
          </a-col>
          <a-col
@@ -39,10 +39,10 @@
            :wrapperCol="wrapperCol"
            label="设备名称"
            >
              <j-input
              <a-input
                placeholder="请输入设备名称查询"
                v-model="queryParam.name"
              ></j-input>
              ></a-input>
            </a-form-item>
          </a-col>
          <a-col :span="5">
@@ -51,10 +51,10 @@
              :labelCol="labelCol"
            :wrapperCol="wrapperCol"
            >
            <j-input
            <a-input
                v-model="queryParam.model"
                placeholder="请输入型号"
            ></j-input>
            ></a-input>
            </a-form-item>
          </a-col>
          <a-col :span="4">
@@ -451,7 +451,7 @@
        <equipment-update-warranty-list :mainId="selectedMainId" />
      </a-tab-pane>
    </a-tabs>
    <equipment-modal ref="modalForm" @ok="modalFormOk"></equipment-modal>
    <equipment-modal ref="modalForm" @ok="modalFormOk" :caytegoryParam="caytegoryParam"></equipment-modal>
    <process-edit-model ref ="processEditModel"></process-edit-model>
    <precision-edit-model ref ="precisionEditModel"></precision-edit-model>
    <aBC-update-edit-model @ok="modalFormOk" :updateList="selectionRows" ref="updateABC"></aBC-update-edit-model>
@@ -502,6 +502,7 @@
    data () {
      return {
        description: '设备台账管理页面',
        caytegoryParam:'weldingMachine',
        // è¡¨å¤´
        columns: [
        {
@@ -807,6 +808,7 @@
          this.ipagination.current = 1;
        }
        this.onClearSelected()
        this.queryParam.equipmentCategoryUda1 = this.caytegoryParam;
        var params = this.getQueryParams();//查询条件
        this.loading = true;
        getAction(this.url.list, params).then((res) => {
src/views/eam/modules/equipmentCategory/EquipmentCategoryLeft.vue
@@ -169,6 +169,7 @@
      this.$refs.modalForm.title = "新增";
      this.$refs.modalForm.disableSubmit = false;
      this.$refs.modalForm.parentId = record.id;
      this.$refs.modalForm.equipmentCategoryUda1 = record.equipmentCategoryUda1;
    },
    onClearSelected() {
      this.hiding = true;
src/views/eam/modules/equipmentCategory/EquipmentCategoryModel.vue
@@ -261,6 +261,7 @@
      codeDisable: true,
      disableSubmit: false,
      parentId: '',
      equipmentCategoryUda1:'',
      model: {},
      labelCol: {
        span: 7
@@ -470,6 +471,7 @@
          let obj;
          if (!this.model.id) {
            formData.parentId = this.parentId
            formData.equipmentCategoryUda1 = this.equipmentCategoryUda1;
            obj = postAction(this.url.add, formData);
          } else {
            formData.equipmentCategoryDtlList = this.selectionRows;
src/views/eam/modules/equipmentNew/EquipmentModal.vue
@@ -32,7 +32,7 @@
                placeholder="请选择设备所属分类"
                :disabled="formDisabled"
                :triggerChange="true"
                dictCode="mom_eam_equipment_category,name,id"
                :dictCode="'mom_eam_equipment_category,name,id,equipment_category_uda1 = '+'\''+caytegoryParam+'\''"
                v-model="model.equipmentCategoryId"
              />
            </a-form-model-item>
@@ -167,7 +167,7 @@
          >维护及使用信息</a-divider>
          <a-col :span="6">
            <a-form-model-item
              label="维修部门"
              label="维护部门"
              :labelCol="labelCol"
              :wrapperCol="wrapperCol"
              prop="manageId"
@@ -177,7 +177,7 @@
                style="width: 100%"
                :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
                :tree-data="treeData"
                placeholder="请选择维修部门"
                placeholder="请选择维护部门"
                tree-default-expand-all
                v-model="model.manageId"
              />
@@ -878,6 +878,11 @@
      default: false,
      required: false
    },
    caytegoryParam:{
      type:String,
      default: '',
      required: false
    }
  },
  data() {
    return {
@@ -985,6 +990,9 @@
    edit(record) {
      console.log(this.disabled)
      this.model = Object.assign({}, record);
      if(!this.model.id){
          this.model.equipmentStatus = '1'
      }
      this.visible = true;
    },
    close() {