“linengliang”
2023-11-20 ef4e8205a30f83c5478f09182e455528df236e84
生产线
已添加4个文件
已修改11个文件
1423 ■■■■ 文件已修改
src/views/eam/EquipmentListOfAll.vue 31 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/eam/EquipmentListOfCrane.vue 42 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/eam/EquipmentListOfEnvProEquipment.vue 29 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/eam/EquipmentListOfFilesCarousel.vue 27 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/eam/EquipmentListOfPressureVessel.vue 27 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/eam/EquipmentListOfProduct.vue 29 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/eam/EquipmentListOfRide.vue 27 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/eam/EquipmentListOfTester.vue 29 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/eam/EquipmentListOfTruck.vue 27 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/eam/EquipmentListOfWeldingMachine.vue 29 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/eam/EquipmentOfLine.vue 410 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/eam/modules/equipmentScrap/EquipmentSelectModal.vue 78 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/eam/modules/line/EquipmentListOfLine.vue 200 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/eam/modules/line/EquipmentOfLineForm.vue 363 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/eam/modules/line/EquipmentOfLineModal.vue 75 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/eam/EquipmentListOfAll.vue
@@ -4,7 +4,7 @@
    <div class="table-page-search-wrapper">
      <a-form layout="inline" @keyup.enter.native="searchQuery">
        <a-row :gutter="24">
          <a-col :span="5">
          <a-col :span="6">
            <a-form-item
            label="设备所属分类" 
            :labelCol="labelCol"
@@ -18,7 +18,7 @@
            </a-form-item>
          </a-col>
          <a-col
          :span="5"
          :span="6"
          >
            <a-form-item 
            :labelCol="labelCol"
@@ -32,7 +32,7 @@
            </a-form-item>
          </a-col>
          <a-col
          :span="5"
          :span="6"
          >
            <a-form-item 
            :labelCol="labelCol"
@@ -45,7 +45,7 @@
              ></a-input>
            </a-form-item>
          </a-col>
          <a-col :span="5">
          <a-col :span="6">
            <a-form-item
              label="型号"
              :labelCol="labelCol"
@@ -56,24 +56,8 @@
                placeholder="请输入型号"
            ></a-input>
            </a-form-item>
          </a-col>
          <a-col :span="4">
          <span
              style="float: left;overflow: hidden;"
              class="table-page-search-submitButtons"
            >
              <a
                @click="handleToggleSearch"
                style="margin-left: 8px"
              >
                {{ toggleSearchStatus ? '收起' : '展开' }}
                <a-icon :type="toggleSearchStatus ? 'up' : 'down'" />
              </a>
            </span>
          </a-col>
          </a-col>
        </a-row>
        <template v-if="toggleSearchStatus">
        <a-row :gutter="24">
          <a-col :span="6">
            <a-form-item
@@ -220,7 +204,6 @@
            </a-form-model-item>
          </a-col>
        </a-row>
        </template>
      </a-form>
    </div>
    <!-- æŸ¥è¯¢åŒºåŸŸ-END -->
@@ -477,9 +460,9 @@
  import JSearchSelectTag from '../../components/dict/JSearchSelectTag.vue'
  import ProcessEditModel from './modules/equipmentNew/edit/ProcessEditModel.vue'
  import PrecisionEditModel from './modules/equipmentNew/edit/PrecisionEditModel'
  import EquipmentUpdateABCList from './modules/equipmentNew/EquipmentUpdateABCList.vue'
  import EquipmentUpdateABCList from './modules/equipmentNew/EquipmentUpdateABCList'
  import EquipmentUpdateWarrantyList from './modules/equipmentNew/EquipmentUpdateWarrantyList.vue'
  import ABCUpdateEditModel from './modules/equipmentNew/edit/ABCUpdateEditModel.vue'
  import ABCUpdateEditModel from './modules/equipmentNew/edit/ABCUpdateEditModel'
  import WarrantyUpdateModel from './modules/equipmentNew/edit/WarrantyUpdateModel.vue'
  import EquipmentSpareParts from './modules/equipmentNew/EquipmentSpareParts.vue'
  import EquipmentSparePartsModal from './modules/equipmentNew/EquipmentSparePartsModal'
src/views/eam/EquipmentListOfCrane.vue
@@ -4,7 +4,7 @@
    <div class="table-page-search-wrapper">
      <a-form layout="inline" @keyup.enter.native="searchQuery">
        <a-row :gutter="24">
          <a-col :span="5">
          <a-col :span="6">
            <a-form-item
            label="设备所属分类" 
            :labelCol="labelCol"
@@ -18,7 +18,7 @@
            </a-form-item>
          </a-col>
          <a-col
          :span="5"
          :span="6"
          >
            <a-form-item 
            :labelCol="labelCol"
@@ -32,7 +32,7 @@
            </a-form-item>
          </a-col>
          <a-col
          :span="5"
          :span="6"
          >
            <a-form-item 
            :labelCol="labelCol"
@@ -45,7 +45,7 @@
              ></a-input>
            </a-form-item>
          </a-col>
          <a-col :span="5">
          <a-col :span="6">
            <a-form-item
              label="型号"
              :labelCol="labelCol"
@@ -57,23 +57,7 @@
            ></a-input>
            </a-form-item>
          </a-col>
          <a-col :span="4">
          <span
              style="float: left;overflow: hidden;"
              class="table-page-search-submitButtons"
            >
              <a
                @click="handleToggleSearch"
                style="margin-left: 8px"
              >
                {{ toggleSearchStatus ? '收起' : '展开' }}
                <a-icon :type="toggleSearchStatus ? 'up' : 'down'" />
              </a>
            </span>
          </a-col>
        </a-row>
        <template v-if="toggleSearchStatus">
        <a-row :gutter="24">
          <a-col :span="6">
            <a-form-item
@@ -90,21 +74,6 @@
              />
            </a-form-item>
          </a-col>
          <!-- <a-col :span="6">
            <a-form-item
              label="车间"
              :labelCol="labelCol"
            :wrapperCol="wrapperCol"
            >
              <j-dict-select-tag
                allow-clear
                placeholder="请选择资车间"
                :triggerChange="true"
                dictCode="mom_base_factory_model,name,id,del_flag!='1'"
                v-model="queryParam.factoryModelId"
              />
            </a-form-item>
          </a-col> -->
          <a-col :span="6">
            <a-form-item
              label="维护部门"
@@ -220,7 +189,6 @@
            </a-form-model-item>
          </a-col>
        </a-row>
        </template>
      </a-form>
    </div>
    <!-- æŸ¥è¯¢åŒºåŸŸ-END -->
@@ -479,7 +447,7 @@
  import PrecisionEditModel from './modules/equipmentNew/edit/PrecisionEditModel'
  import EquipmentUpdateABCList from './modules/equipmentNew/EquipmentUpdateABCList.vue'
  import EquipmentUpdateWarrantyList from './modules/equipmentNew/EquipmentUpdateWarrantyList.vue'
  import ABCUpdateEditModel from './modules/equipmentNew/edit/ABCUpdateEditModel.vue'
  import ABCUpdateEditModel from './modules/equipmentNew/edit/ABCUpdateEditModel'
  import WarrantyUpdateModel from './modules/equipmentNew/edit/WarrantyUpdateModel.vue'
  import EquipmentSpareParts from './modules/equipmentNew/EquipmentSpareParts.vue'
  import EquipmentSparePartsModal from './modules/equipmentNew/EquipmentSparePartsModal'
src/views/eam/EquipmentListOfEnvProEquipment.vue
@@ -4,7 +4,7 @@
    <div class="table-page-search-wrapper">
      <a-form layout="inline" @keyup.enter.native="searchQuery">
        <a-row :gutter="24">
          <a-col :span="5">
          <a-col :span="6">
            <a-form-item
            label="设备所属分类" 
            :labelCol="labelCol"
@@ -18,7 +18,7 @@
            </a-form-item>
          </a-col>
          <a-col
          :span="5"
          :span="6"
          >
            <a-form-item 
            :labelCol="labelCol"
@@ -32,7 +32,7 @@
            </a-form-item>
          </a-col>
          <a-col
          :span="5"
          :span="6"
          >
            <a-form-item 
            :labelCol="labelCol"
@@ -45,7 +45,7 @@
              ></a-input>
            </a-form-item>
          </a-col>
          <a-col :span="5">
          <a-col :span="6">
            <a-form-item
              label="型号"
              :labelCol="labelCol"
@@ -56,24 +56,8 @@
                placeholder="请输入型号"
            ></a-input>
            </a-form-item>
          </a-col>
          <a-col :span="4">
          <span
              style="float: left;overflow: hidden;"
              class="table-page-search-submitButtons"
            >
              <a
                @click="handleToggleSearch"
                style="margin-left: 8px"
              >
                {{ toggleSearchStatus ? '收起' : '展开' }}
                <a-icon :type="toggleSearchStatus ? 'up' : 'down'" />
              </a>
            </span>
          </a-col>
          </a-col>
        </a-row>
        <template v-if="toggleSearchStatus">
        <a-row :gutter="24">
          <a-col :span="6">
            <a-form-item
@@ -220,7 +204,6 @@
            </a-form-model-item>
          </a-col>
        </a-row>
        </template>
      </a-form>
    </div>
    <!-- æŸ¥è¯¢åŒºåŸŸ-END -->
@@ -482,7 +465,7 @@
  import PrecisionEditModel from './modules/equipmentNew/edit/PrecisionEditModel'
  import EquipmentUpdateABCList from './modules/equipmentNew/EquipmentUpdateABCList.vue'
  import EquipmentUpdateWarrantyList from './modules/equipmentNew/EquipmentUpdateWarrantyList.vue'
  import ABCUpdateEditModel from './modules/equipmentNew/edit/ABCUpdateEditModel.vue'
  import ABCUpdateEditModel from './modules/equipmentNew/edit/ABCUpdateEditModel'
  import WarrantyUpdateModel from './modules/equipmentNew/edit/WarrantyUpdateModel.vue'
  import EquipmentSpareParts from './modules/equipmentNew/EquipmentSpareParts.vue'
  import EquipmentSparePartsModal from './modules/equipmentNew/EquipmentSparePartsModal'
src/views/eam/EquipmentListOfFilesCarousel.vue
@@ -4,7 +4,7 @@
    <div class="table-page-search-wrapper">
      <a-form layout="inline" @keyup.enter.native="searchQuery">
        <a-row :gutter="24">
          <a-col :span="5">
          <a-col :span="6">
            <a-form-item
            label="设备所属分类" 
            :labelCol="labelCol"
@@ -18,7 +18,7 @@
            </a-form-item>
          </a-col>
          <a-col
          :span="5"
          :span="6"
          >
            <a-form-item 
            :labelCol="labelCol"
@@ -32,7 +32,7 @@
            </a-form-item>
          </a-col>
          <a-col
          :span="5"
          :span="6"
          >
            <a-form-item 
            :labelCol="labelCol"
@@ -45,7 +45,7 @@
              ></a-input>
            </a-form-item>
          </a-col>
          <a-col :span="5">
          <a-col :span="6">
            <a-form-item
              label="型号"
              :labelCol="labelCol"
@@ -57,23 +57,7 @@
            ></a-input>
            </a-form-item>
          </a-col>
          <a-col :span="4">
          <span
              style="float: left;overflow: hidden;"
              class="table-page-search-submitButtons"
            >
              <a
                @click="handleToggleSearch"
                style="margin-left: 8px"
              >
                {{ toggleSearchStatus ? '收起' : '展开' }}
                <a-icon :type="toggleSearchStatus ? 'up' : 'down'" />
              </a>
            </span>
          </a-col>
        </a-row>
        <template v-if="toggleSearchStatus">
        <a-row :gutter="24">
          <a-col :span="6">
            <a-form-item
@@ -220,7 +204,6 @@
            </a-form-model-item>
          </a-col>
        </a-row>
        </template>
      </a-form>
    </div>
    <!-- æŸ¥è¯¢åŒºåŸŸ-END -->
@@ -479,7 +462,7 @@
  import PrecisionEditModel from './modules/equipmentNew/edit/PrecisionEditModel'
  import EquipmentUpdateABCList from './modules/equipmentNew/EquipmentUpdateABCList.vue'
  import EquipmentUpdateWarrantyList from './modules/equipmentNew/EquipmentUpdateWarrantyList.vue'
  import ABCUpdateEditModel from './modules/equipmentNew/edit/ABCUpdateEditModel.vue'
  import ABCUpdateEditModel from './modules/equipmentNew/edit/ABCUpdateEditModel'
  import WarrantyUpdateModel from './modules/equipmentNew/edit/WarrantyUpdateModel.vue'
  import EquipmentSpareParts from './modules/equipmentNew/EquipmentSpareParts.vue'
  import EquipmentSparePartsModal from './modules/equipmentNew/EquipmentSparePartsModal'
src/views/eam/EquipmentListOfPressureVessel.vue
@@ -4,7 +4,7 @@
    <div class="table-page-search-wrapper">
      <a-form layout="inline" @keyup.enter.native="searchQuery">
        <a-row :gutter="24">
          <a-col :span="5">
          <a-col :span="6">
            <a-form-item
            label="设备所属分类" 
            :labelCol="labelCol"
@@ -18,7 +18,7 @@
            </a-form-item>
          </a-col>
          <a-col
          :span="5"
          :span="6"
          >
            <a-form-item 
            :labelCol="labelCol"
@@ -32,7 +32,7 @@
            </a-form-item>
          </a-col>
          <a-col
          :span="5"
          :span="6"
          >
            <a-form-item 
            :labelCol="labelCol"
@@ -45,7 +45,7 @@
              ></a-input>
            </a-form-item>
          </a-col>
          <a-col :span="5">
          <a-col :span="6">
            <a-form-item
              label="型号"
              :labelCol="labelCol"
@@ -57,23 +57,7 @@
            ></a-input>
            </a-form-item>
          </a-col>
          <a-col :span="4">
          <span
              style="float: left;overflow: hidden;"
              class="table-page-search-submitButtons"
            >
              <a
                @click="handleToggleSearch"
                style="margin-left: 8px"
              >
                {{ toggleSearchStatus ? '收起' : '展开' }}
                <a-icon :type="toggleSearchStatus ? 'up' : 'down'" />
              </a>
            </span>
          </a-col>
        </a-row>
        <template v-if="toggleSearchStatus">
        <a-row :gutter="24">
          <a-col :span="6">
            <a-form-item
@@ -220,7 +204,6 @@
            </a-form-model-item>
          </a-col>
        </a-row>
        </template>
      </a-form>
    </div>
    <!-- æŸ¥è¯¢åŒºåŸŸ-END -->
@@ -479,7 +462,7 @@
  import PrecisionEditModel from './modules/equipmentNew/edit/PrecisionEditModel'
  import EquipmentUpdateABCList from './modules/equipmentNew/EquipmentUpdateABCList.vue'
  import EquipmentUpdateWarrantyList from './modules/equipmentNew/EquipmentUpdateWarrantyList.vue'
  import ABCUpdateEditModel from './modules/equipmentNew/edit/ABCUpdateEditModel.vue'
  import ABCUpdateEditModel from './modules/equipmentNew/edit/ABCUpdateEditModel'
  import WarrantyUpdateModel from './modules/equipmentNew/edit/WarrantyUpdateModel.vue'
  import EquipmentSpareParts from './modules/equipmentNew/EquipmentSpareParts.vue'
  import EquipmentSparePartsModal from './modules/equipmentNew/EquipmentSparePartsModal'
src/views/eam/EquipmentListOfProduct.vue
@@ -4,7 +4,7 @@
    <div class="table-page-search-wrapper">
      <a-form layout="inline" @keyup.enter.native="searchQuery">
        <a-row :gutter="24">
          <a-col :span="5">
          <a-col :span="6">
            <a-form-item
            label="设备所属分类" 
            :labelCol="labelCol"
@@ -18,7 +18,7 @@
            </a-form-item>
          </a-col>
          <a-col
          :span="5"
          :span="6"
          >
            <a-form-item 
            :labelCol="labelCol"
@@ -32,7 +32,7 @@
            </a-form-item>
          </a-col>
          <a-col
          :span="5"
          :span="6"
          >
            <a-form-item 
            :labelCol="labelCol"
@@ -45,7 +45,7 @@
              ></a-input>
            </a-form-item>
          </a-col>
          <a-col :span="5">
          <a-col :span="6">
            <a-form-item
              label="型号"
              :labelCol="labelCol"
@@ -56,24 +56,8 @@
                placeholder="请输入型号"
            ></a-input>
            </a-form-item>
          </a-col>
          <a-col :span="4">
          <span
              style="float: left;overflow: hidden;"
              class="table-page-search-submitButtons"
            >
              <a
                @click="handleToggleSearch"
                style="margin-left: 8px"
              >
                {{ toggleSearchStatus ? '收起' : '展开' }}
                <a-icon :type="toggleSearchStatus ? 'up' : 'down'" />
              </a>
            </span>
          </a-col>
          </a-col>
        </a-row>
        <template v-if="toggleSearchStatus">
        <a-row :gutter="24">
          <a-col :span="6">
            <a-form-item
@@ -220,7 +204,6 @@
            </a-form-model-item>
          </a-col>
        </a-row>
        </template>
      </a-form>
    </div>
    <!-- æŸ¥è¯¢åŒºåŸŸ-END -->
@@ -479,7 +462,7 @@
  import PrecisionEditModel from './modules/equipmentNew/edit/PrecisionEditModel'
  import EquipmentUpdateABCList from './modules/equipmentNew/EquipmentUpdateABCList.vue'
  import EquipmentUpdateWarrantyList from './modules/equipmentNew/EquipmentUpdateWarrantyList.vue'
  import ABCUpdateEditModel from './modules/equipmentNew/edit/ABCUpdateEditModel.vue'
  import ABCUpdateEditModel from './modules/equipmentNew/edit/ABCUpdateEditModel'
  import WarrantyUpdateModel from './modules/equipmentNew/edit/WarrantyUpdateModel.vue'
  import EquipmentSpareParts from './modules/equipmentNew/EquipmentSpareParts.vue'
  import EquipmentSparePartsModal from './modules/equipmentNew/EquipmentSparePartsModal'
src/views/eam/EquipmentListOfRide.vue
@@ -4,7 +4,7 @@
    <div class="table-page-search-wrapper">
      <a-form layout="inline" @keyup.enter.native="searchQuery">
        <a-row :gutter="24">
          <a-col :span="5">
          <a-col :span="6">
            <a-form-item
            label="设备所属分类" 
            :labelCol="labelCol"
@@ -18,7 +18,7 @@
            </a-form-item>
          </a-col>
          <a-col
          :span="5"
          :span="6"
          >
            <a-form-item 
            :labelCol="labelCol"
@@ -32,7 +32,7 @@
            </a-form-item>
          </a-col>
          <a-col
          :span="5"
          :span="6"
          >
            <a-form-item 
            :labelCol="labelCol"
@@ -45,7 +45,7 @@
              ></a-input>
            </a-form-item>
          </a-col>
          <a-col :span="5">
          <a-col :span="6">
            <a-form-item
              label="型号"
              :labelCol="labelCol"
@@ -57,23 +57,7 @@
            ></a-input>
            </a-form-item>
          </a-col>
          <a-col :span="4">
          <span
              style="float: left;overflow: hidden;"
              class="table-page-search-submitButtons"
            >
              <a
                @click="handleToggleSearch"
                style="margin-left: 8px"
              >
                {{ toggleSearchStatus ? '收起' : '展开' }}
                <a-icon :type="toggleSearchStatus ? 'up' : 'down'" />
              </a>
            </span>
          </a-col>
        </a-row>
        <template v-if="toggleSearchStatus">
        <a-row :gutter="24">
          <a-col :span="6">
            <a-form-item
@@ -220,7 +204,6 @@
            </a-form-model-item>
          </a-col>
        </a-row>
        </template>
      </a-form>
    </div>
    <!-- æŸ¥è¯¢åŒºåŸŸ-END -->
@@ -479,7 +462,7 @@
  import PrecisionEditModel from './modules/equipmentNew/edit/PrecisionEditModel'
  import EquipmentUpdateABCList from './modules/equipmentNew/EquipmentUpdateABCList.vue'
  import EquipmentUpdateWarrantyList from './modules/equipmentNew/EquipmentUpdateWarrantyList.vue'
  import ABCUpdateEditModel from './modules/equipmentNew/edit/ABCUpdateEditModel.vue'
  import ABCUpdateEditModel from './modules/equipmentNew/edit/ABCUpdateEditModel'
  import WarrantyUpdateModel from './modules/equipmentNew/edit/WarrantyUpdateModel.vue'
  import EquipmentSpareParts from './modules/equipmentNew/EquipmentSpareParts.vue'
  import EquipmentSparePartsModal from './modules/equipmentNew/EquipmentSparePartsModal'
src/views/eam/EquipmentListOfTester.vue
@@ -4,7 +4,7 @@
    <div class="table-page-search-wrapper">
      <a-form layout="inline" @keyup.enter.native="searchQuery">
        <a-row :gutter="24">
          <a-col :span="5">
          <a-col :span="6">
            <a-form-item
            label="设备所属分类" 
            :labelCol="labelCol"
@@ -18,7 +18,7 @@
            </a-form-item>
          </a-col>
          <a-col
          :span="5"
          :span="6"
          >
            <a-form-item 
            :labelCol="labelCol"
@@ -32,7 +32,7 @@
            </a-form-item>
          </a-col>
          <a-col
          :span="5"
          :span="6"
          >
            <a-form-item 
            :labelCol="labelCol"
@@ -45,7 +45,7 @@
              ></a-input>
            </a-form-item>
          </a-col>
          <a-col :span="5">
          <a-col :span="6">
            <a-form-item
              label="型号"
              :labelCol="labelCol"
@@ -56,24 +56,8 @@
                placeholder="请输入型号"
            ></a-input>
            </a-form-item>
          </a-col>
          <a-col :span="4">
          <span
              style="float: left;overflow: hidden;"
              class="table-page-search-submitButtons"
            >
              <a
                @click="handleToggleSearch"
                style="margin-left: 8px"
              >
                {{ toggleSearchStatus ? '收起' : '展开' }}
                <a-icon :type="toggleSearchStatus ? 'up' : 'down'" />
              </a>
            </span>
          </a-col>
          </a-col>
        </a-row>
        <template v-if="toggleSearchStatus">
        <a-row :gutter="24">
          <a-col :span="6">
            <a-form-item
@@ -220,7 +204,6 @@
            </a-form-model-item>
          </a-col>
        </a-row>
        </template>
      </a-form>
    </div>
    <!-- æŸ¥è¯¢åŒºåŸŸ-END -->
@@ -479,7 +462,7 @@
  import PrecisionEditModel from './modules/equipmentNew/edit/PrecisionEditModel'
  import EquipmentUpdateABCList from './modules/equipmentNew/EquipmentUpdateABCList.vue'
  import EquipmentUpdateWarrantyList from './modules/equipmentNew/EquipmentUpdateWarrantyList.vue'
  import ABCUpdateEditModel from './modules/equipmentNew/edit/ABCUpdateEditModel.vue'
  import ABCUpdateEditModel from './modules/equipmentNew/edit/ABCUpdateEditModel'
  import WarrantyUpdateModel from './modules/equipmentNew/edit/WarrantyUpdateModel.vue'
  import EquipmentSpareParts from './modules/equipmentNew/EquipmentSpareParts.vue'
  import EquipmentSparePartsModal from './modules/equipmentNew/EquipmentSparePartsModal'
src/views/eam/EquipmentListOfTruck.vue
@@ -4,7 +4,7 @@
    <div class="table-page-search-wrapper">
      <a-form layout="inline" @keyup.enter.native="searchQuery">
        <a-row :gutter="24">
          <a-col :span="5">
          <a-col :span="6">
            <a-form-item
            label="设备所属分类" 
            :labelCol="labelCol"
@@ -18,7 +18,7 @@
            </a-form-item>
          </a-col>
          <a-col
          :span="5"
          :span="6"
          >
            <a-form-item 
            :labelCol="labelCol"
@@ -32,7 +32,7 @@
            </a-form-item>
          </a-col>
          <a-col
          :span="5"
          :span="6"
          >
            <a-form-item 
            :labelCol="labelCol"
@@ -45,7 +45,7 @@
              ></a-input>
            </a-form-item>
          </a-col>
          <a-col :span="5">
          <a-col :span="6">
            <a-form-item
              label="型号"
              :labelCol="labelCol"
@@ -57,23 +57,7 @@
            ></a-input>
            </a-form-item>
          </a-col>
          <a-col :span="4">
          <span
              style="float: left;overflow: hidden;"
              class="table-page-search-submitButtons"
            >
              <a
                @click="handleToggleSearch"
                style="margin-left: 8px"
              >
                {{ toggleSearchStatus ? '收起' : '展开' }}
                <a-icon :type="toggleSearchStatus ? 'up' : 'down'" />
              </a>
            </span>
          </a-col>
        </a-row>
        <template v-if="toggleSearchStatus">
        <a-row :gutter="24">
          <a-col :span="6">
            <a-form-item
@@ -220,7 +204,6 @@
            </a-form-model-item>
          </a-col>
        </a-row>
        </template>
      </a-form>
    </div>
    <!-- æŸ¥è¯¢åŒºåŸŸ-END -->
@@ -479,7 +462,7 @@
  import PrecisionEditModel from './modules/equipmentNew/edit/PrecisionEditModel'
  import EquipmentUpdateABCList from './modules/equipmentNew/EquipmentUpdateABCList.vue'
  import EquipmentUpdateWarrantyList from './modules/equipmentNew/EquipmentUpdateWarrantyList.vue'
  import ABCUpdateEditModel from './modules/equipmentNew/edit/ABCUpdateEditModel.vue'
  import ABCUpdateEditModel from './modules/equipmentNew/edit/ABCUpdateEditModel'
  import WarrantyUpdateModel from './modules/equipmentNew/edit/WarrantyUpdateModel.vue'
  import EquipmentSpareParts from './modules/equipmentNew/EquipmentSpareParts.vue'
  import EquipmentSparePartsModal from './modules/equipmentNew/EquipmentSparePartsModal'
src/views/eam/EquipmentListOfWeldingMachine.vue
@@ -4,7 +4,7 @@
    <div class="table-page-search-wrapper">
      <a-form layout="inline" @keyup.enter.native="searchQuery">
        <a-row :gutter="24">
          <a-col :span="5">
          <a-col :span="6">
            <a-form-item
            label="设备所属分类" 
            :labelCol="labelCol"
@@ -18,7 +18,7 @@
            </a-form-item>
          </a-col>
          <a-col
          :span="5"
          :span="6"
          >
            <a-form-item 
            :labelCol="labelCol"
@@ -32,7 +32,7 @@
            </a-form-item>
          </a-col>
          <a-col
          :span="5"
          :span="6"
          >
            <a-form-item 
            :labelCol="labelCol"
@@ -45,7 +45,7 @@
              ></a-input>
            </a-form-item>
          </a-col>
          <a-col :span="5">
          <a-col :span="6">
            <a-form-item
              label="型号"
              :labelCol="labelCol"
@@ -56,24 +56,8 @@
                placeholder="请输入型号"
            ></a-input>
            </a-form-item>
          </a-col>
          <a-col :span="4">
          <span
              style="float: left;overflow: hidden;"
              class="table-page-search-submitButtons"
            >
              <a
                @click="handleToggleSearch"
                style="margin-left: 8px"
              >
                {{ toggleSearchStatus ? '收起' : '展开' }}
                <a-icon :type="toggleSearchStatus ? 'up' : 'down'" />
              </a>
            </span>
          </a-col>
          </a-col>
        </a-row>
        <template v-if="toggleSearchStatus">
        <a-row :gutter="24">
          <a-col :span="6">
            <a-form-item
@@ -220,7 +204,6 @@
            </a-form-model-item>
          </a-col>
        </a-row>
        </template>
      </a-form>
    </div>
    <!-- æŸ¥è¯¢åŒºåŸŸ-END -->
@@ -479,7 +462,7 @@
  import PrecisionEditModel from './modules/equipmentNew/edit/PrecisionEditModel'
  import EquipmentUpdateABCList from './modules/equipmentNew/EquipmentUpdateABCList.vue'
  import EquipmentUpdateWarrantyList from './modules/equipmentNew/EquipmentUpdateWarrantyList.vue'
  import ABCUpdateEditModel from './modules/equipmentNew/edit/ABCUpdateEditModel.vue'
  import ABCUpdateEditModel from './modules/equipmentNew/edit/ABCUpdateEditModel'
  import WarrantyUpdateModel from './modules/equipmentNew/edit/WarrantyUpdateModel.vue'
  import EquipmentSpareParts from './modules/equipmentNew/EquipmentSpareParts.vue'
  import EquipmentSparePartsModal from './modules/equipmentNew/EquipmentSparePartsModal'
src/views/eam/EquipmentOfLine.vue
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,410 @@
<template>
  <a-card :bordered="false" title="运输车">
    <!-- æŸ¥è¯¢åŒºåŸŸ -->
    <div class="table-page-search-wrapper">
      <a-form layout="inline" @keyup.enter.native="searchQuery">
        <a-row :gutter="24">
          <a-col :span="6">
            <a-form-item
            label="分类"
            :labelCol="labelCol"
            :wrapperCol="wrapperCol"
            >
              <j-dict-select-tag
                :dictCode="'mom_eam_equipment_category,name,id,equipment_category_uda1='+'\''+caytegoryParam+'\''"
                placeholder="请输入搜索条件并选择"
                v-model="queryParam.equipmentCategoryId"
              />
            </a-form-item>
          </a-col>
          <a-col
          :span="6"
          >
            <a-form-item
            :labelCol="labelCol"
            :wrapperCol="wrapperCol"
            label="生产线编号"
            >
              <a-input
                placeholder="请输入生产线编码查询"
                v-model="queryParam.num"
              ></a-input>
            </a-form-item>
          </a-col>
          <a-col
          :span="6"
          >
            <a-form-item
            :labelCol="labelCol"
            :wrapperCol="wrapperCol"
            label="生产线名称"
            >
              <a-input
                placeholder="请输入生产线名称查询"
                v-model="queryParam.name"
              ></a-input>
            </a-form-item>
          </a-col>
        </a-row>
      </a-form>
    </div>
    <!-- æŸ¥è¯¢åŒºåŸŸ-END -->
    <!-- æ“ä½œæŒ‰é’®åŒºåŸŸ -->
    <div class="table-operator">
      <a-button
        type="primary"
        @click="searchQuery"
        icon="search"
      >查询</a-button>
      <a-button
        @click="searchReset"
        icon="reload"
      >重置</a-button>
      <a-button @click="handleAdd" type="primary" icon="plus" v-has="'equipmentAccount:add&delete&import&Edit'">新增</a-button>
      <!-- <a-button type="primary" icon="download" @click="handleExportXls('设备台账')" v-has="'equipmentAccount:outport'">导出</a-button>
      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
        <a-button type="primary" icon="import"  v-has="'equipmentAccount:add&delete&import&Edit'">导入</a-button>
      </a-upload>
      <a-button :disabled="selectedRowKeys.length==0" @click="handleUpdateABC" type="primary" icon="font-colors" v-has="'equipmentAccount:add&delete&import&Edit'">ABC标识变更</a-button>
      <a-button :disabled="selectedRowKeys.length==0" @click="handleUpdateWarranty" type="primary" icon="calendar" v-has="'equipmentAccount:add&delete&import&Edit'">质保期变更</a-button> -->
    </div>
    <!-- table区域-begin -->
    <div>
      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
        <i class="anticon anticon-info-circle ant-alert-icon"></i> å·²é€‰æ‹© <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
      </div>
      <a-table
        ref="table"
        size="middle"
        bordered
        rowKey="id"
        :scroll="{x:true}"
        :columns="columns"
        :dataSource="dataSource"
        :pagination="ipagination"
        :loading="loading"
        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange, type:'checkbox'}"
        :customRow="clickThenSelect"
        @change="handleTableChange">
        <template slot="htmlSlot" slot-scope="text">
          <div v-html="text"></div>
        </template>
        <template slot="imgSlot" slot-scope="text,record">
          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
          <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
        </template>
        <template slot="fileSlot" slot-scope="text">
          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
          <a-button
            v-else
            :ghost="true"
            type="primary"
            icon="download"
            size="small"
            @click="downloadFile(text)">
            ä¸‹è½½
          </a-button>
        </template>
      <span
        slot="action"
        slot-scope="text, record"
      >
        <a
          href="javascript:;"
          @click='handleDetail(record)'
        >详情</a>
        <a-divider type="vertical" />
        <a @click="handleEdit(record)" >编辑</a>
        <a-dropdown>
          <a class="ant-dropdown-link">
            æ›´å¤š
            <a-icon type="down" />
          </a>
          <a-menu slot="overlay">
            <a-menu-item  v-has="'equipmentAccount:add&delete&import&Edit'">
            </a-menu-item>
            <a-menu-item>
              <a-popconfirm
                title="确定删除吗?"
                @confirm="() => handleDelete(record.id)"
                v-has="'equipmentAccount:add&delete&import&Edit'"
              >
                <a>删除</a>
              </a-popconfirm>
            </a-menu-item>
          </a-menu>
        </a-dropdown>
      </span>
      </a-table>
    </div>
    <a-tabs defaultActiveKey="1">
      <a-tab-pane tab="设备" key="1" forceRender>
        <equipment-list-of-line :mainId="selectedMainId"></equipment-list-of-line>
      </a-tab-pane>
    </a-tabs>
    <equipment-of-line-modal ref="modalForm" @ok="modalFormOk" :caytegoryParam="caytegoryParam"></equipment-of-line-modal>
  </a-card>
</template>
<script>
  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
  import { mixinDevice } from '@/utils/mixin'
  import { getAction } from '@/api/manage'
  import '@/assets/less/TableExpand.less'
  import JSearchSelectTag from '../../components/dict/JSearchSelectTag.vue'
  import EquipmentOfLineModal from './modules/line/EquipmentOfLineModal.vue'
  import EquipmentListOfLine from './modules/line/EquipmentListOfLine.vue'
  export default {
    name: "EquipmentOfLine",
    mixins:[JeecgListMixin,mixinDevice],
    components: {
      JSearchSelectTag,
      EquipmentOfLineModal,
      EquipmentListOfLine,
    },
    data () {
      return {
        description: '设备台账管理页面',
        caytegoryParam:'line',
        // è¡¨å¤´
        columns: [
        {
          title: '#',
          dataIndex: '',
          key: 'rowIndex',
          align: 'center',
          customRender: function (t, r, index) {
            return parseInt(index) + 1
          },
          width: 50,
        },
        {
          title: '生产线编码',
          align: "center",
          dataIndex: 'num',
        },
        {
          title: '生产线名称',
          align: "center",
          dataIndex: 'name',
        },
        {
          title: '设备总数',
          align: "center",
          dataIndex: 'sumOfEquipment',
        },
        {
          title: '操作',
          align: "center",
          dataIndex: 'action',
          scopedSlots: {
            customRender: 'action',
          },
          width: 147,
          fixed: 'right',
        },
        ],
        url: {
          list: "/eam/equipment/getEquipmentList",
          delete: "/eam/equipment/delete",
          deleteBatch: "/eam/equipment/deleteBatch",
          active: "/eam/equipment/active",
          exportXlsUrl: '/eam/equipment/exportXls',
          importExcelUrl: "/eam/equipment/importExcel",
          loadOptions: '/sys/sysDepart/loadDepartTreeOptions',
        },
        dictOptions:{
        },
        /* åˆ†é¡µå‚æ•° */
        ipagination:{
          current: 1,
          pageSize: 5,
          pageSizeOptions: ['5', '10', '50'],
          showTotal: (total, range) => {
            return range[0] + "-" + range[1] + " å…±" + total + "条"
          },
          showQuickJumper: true,
          showSizeChanger: true,
          total: 0
        },
        selectedMainId:'',
        superFieldList:[],
        equipmentProcessParametersMainId: '',
        equipmentDocumentMainId: '',
        equipmentPrecisionParametersMainId: '',
        precisionParametersTemplateId:'',
        isOpenPrecision:true,
        isOpenProcess:true,
        treeData: [],
        labelCol: {
        xs: { span: 24 },
        sm: { span: 5 },
        },
        wrapperCol: {
          xs: { span: 24 },
          sm: { span: 16 },
        },
        mainId:'',
      }
    },
    created() {
      this.getSuperFieldList();
      this.initOptions();
    },
    computed: {
      importExcelUrl: function(){
        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
      }
    },
    methods: {
      initDictConfig(){
      },
      equipmentResumeShow(record) {
      this.$refs.EquipmentResumeDrawer.visible = true
      this.$refs.EquipmentResumeDrawer.title = '设备履历'
      this.$refs.EquipmentResumeDrawer.handleShow(record)
       },
      clickThenSelect(record) {
        return {
          on: {
            click: () => {
              this.onSelectChange(record.id.split(","), [record]);
            }
          }
        }
      },
      onClearSelected() {
        this.selectedRowKeys = [];
        this.selectionRows = [];
        this.selectedMainId=''
      },
      onSelectChange(selectedRowKeys, selectionRows) {
        if(selectedRowKeys.length==1){
          this.selectedMainId=selectedRowKeys[0]
        }else{
          this.selectedMainId=''
        }
        this.selectedRowKeys = selectedRowKeys;
        this.selectionRows = selectionRows;
      },
      loadData(arg) {
        if(!this.url.list){
          this.$message.error("请设置url.list属性!")
          return
        }
        //加载数据 è‹¥ä¼ å…¥å‚æ•°1则加载第一页的内容
        if (arg === 1) {
          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) => {
          if (res.success) {
            this.dataSource = res.result.records;
            this.ipagination.total = res.result.total;
          }
          if(res.code===510){
            this.$message.warning(res.message)
          }
          this.loading = false;
        })
      },
      getSuperFieldList(){
        let fieldList=[];
        fieldList.push({type:'string',value:'num',text:'统一编码',dictCode:''})
        fieldList.push({type:'string',value:'name',text:'设备名称',dictCode:''})
        fieldList.push({type:'string',value:'model',text:'型号',dictCode:''})
        fieldList.push({type:'string',value:'specification',text:'规格',dictCode:''})
        fieldList.push({type:'string',value:'equipmentStatus',text:'设备状态',dictCode:''})
        fieldList.push({type:'string',value:'technologyStatus',text:'technologyStatus',dictCode:''})
        fieldList.push({type:'string',value:'assetNumber',text:'assetNumber',dictCode:''})
        fieldList.push({type:'string',value:'equipmentCategoryId',text:'equipmentCategoryId',dictCode:''})
        fieldList.push({type:'string',value:'specificEquipment',text:'specificEquipment',dictCode:''})
        fieldList.push({type:'string',value:'equipmentPhoto',text:'equipmentPhoto',dictCode:''})
        fieldList.push({type:'string',value:'constructorId',text:'资产制造商',dictCode:''})
        fieldList.push({type:'string',value:'supplierId',text:'supplierId',dictCode:''})
        fieldList.push({type:'string',value:'factoryNumber',text:'factoryNumber',dictCode:''})
        fieldList.push({type:'string',value:'leaveFactoryDate',text:'出厂日期',dictCode:''})
        fieldList.push({type:'string',value:'acceptanceCheckDate',text:'验收日期',dictCode:''})
        fieldList.push({type:'string',value:'affiliationId',text:'affiliationId',dictCode:''})
        fieldList.push({type:'string',value:'manageId',text:'维护部门ID',dictCode:''})
        fieldList.push({type:'string',value:'manager',text:'manager',dictCode:''})
        fieldList.push({type:'string',value:'useId',text:'使用部门ID',dictCode:''})
        fieldList.push({type:'string',value:'functionary',text:'functionary',dictCode:''})
        fieldList.push({type:'string',value:'location',text:'location',dictCode:''})
        fieldList.push({type:'string',value:'equipmentImportanceId',text:'ABC标识ID',dictCode:''})
        fieldList.push({type:'string',value:'processParameters',text:'processParameters',dictCode:''})
        fieldList.push({type:'string',value:'processParametersTemplateId',text:'processParametersTemplateId',dictCode:''})
        fieldList.push({type:'string',value:'precisionParameters',text:'precisionParameters',dictCode:''})
        fieldList.push({type:'string',value:'precisionParametersTemplateId',text:'precisionParametersTemplateId',dictCode:''})
        fieldList.push({type:'string',value:'verification',text:'verification',dictCode:''})
        fieldList.push({type:'string',value:'verificationPeriod',text:'verificationPeriod',dictCode:''})
        fieldList.push({type:'string',value:'lastVerificationDate',text:'lastVerificationDate',dictCode:''})
        fieldList.push({type:'string',value:'nextVerificationDate',text:'nextVerificationDate',dictCode:''})
        fieldList.push({type:'string',value:'status',text:'status',dictCode:''})
        fieldList.push({type:'string',value:'remark',text:'remark',dictCode:''})
        fieldList.push({type:'string',value:'equipmentUda1',text:'工区',dictCode:''})
        fieldList.push({type:'string',value:'equipmentUda2',text:'安装位置',dictCode:''})
        fieldList.push({type:'string',value:'equipmentUda3',text:'重量',dictCode:''})
        fieldList.push({type:'string',value:'equipmentUda4',text:'重量计量单位ID',dictCode:''})
        fieldList.push({type:'string',value:'equipmentUda5',text:'功能位置',dictCode:''})
        fieldList.push({type:'string',value:'tenantId',text:'tenantId',dictCode:''})
        fieldList.push({type:'int',value:'delFlag',text:'delFlag',dictCode:''})
        fieldList.push({type:'string',value:'teamId',text:'维修班组ID',dictCode:''})
        fieldList.push({type:'string',value:'sourceId',text:'sourceId',dictCode:''})
        fieldList.push({type:'string',value:'fundSource',text:'资金来源',dictCode:''})
        fieldList.push({type:'string',value:'factoryNo',text:'出厂编号',dictCode:''})
        fieldList.push({type:'string',value:'mfr',text:'制造商',dictCode:''})
        fieldList.push({type:'string',value:'sourceCountry',text:'资产来源国家',dictCode:''})
        fieldList.push({type:'string',value:'gpo',text:'总功率',dictCode:''})
        fieldList.push({type:'string',value:'keyEquipmentIdentification',text:'关键设备标识',dictCode:''})
        fieldList.push({type:'string',value:'securityConfiguration',text:'安全配置',dictCode:''})
        fieldList.push({type:'string',value:'coolingSystem',text:'冷却系统',dictCode:''})
        fieldList.push({type:'string',value:'fireExtinguisher',text:'灭火器',dictCode:''})
        fieldList.push({type:'string',value:'fireExtinguisherValidityPeriod',text:'灭火器有效期',dictCode:''})
        fieldList.push({type:'string',value:'operatingSystem',text:'操作系统',dictCode:''})
        fieldList.push({type:'string',value:'system',text:'系统',dictCode:''})
        fieldList.push({type:'string',value:'port',text:'端口',dictCode:''})
        fieldList.push({type:'BigDecimal',value:'coordinateNum',text:'坐标数量',dictCode:''})
        fieldList.push({type:'string',value:'projectApprovalNo',text:'立项卡号',dictCode:''})
        this.superFieldList = fieldList
      },
      editProcess(record){
        this.$refs.processEditModel.edit(record);
      },
      editPrecision(record){
        this.$refs.precisionEditModel.edit(record);
      },
      initOptions() {
      getAction(this.url.loadOptions).then(res => {
        if (res.success) {
          this.treeData = res.result
        } else {
          this.$message.warning(res.message)
        }
      })
    },
    handleUpdateABC(){
      this.$refs.updateABC.add();
    },
    handleUpdateWarranty(){
      this.$refs.updateWarranty.add();
    },
    handleEditSpareParts(record){
      this.$refs.modalFormSpareParts.edit(record);
    }
    }
  }
</script>
<style scoped>
  @import '~@assets/less/common.less'
</style>
src/views/eam/modules/equipmentScrap/EquipmentSelectModal.vue
@@ -8,7 +8,7 @@
    @cancel="close"
    style="top:50px"
    cancelText="关闭"
    :width="1200"
    :width="1400"
  >
    <a-card :bordered="false">
      <div class="table-page-search-wrapper">
@@ -32,10 +32,10 @@
              :md="8"
              :sm="6"
            >
              <a-form-item label="统一编码">
              <a-form-item label="设备名称">
                <a-input
                  placeholder="请输入统一编码"
                  v-model="queryParam.num"
                  placeholder="设备名称"
                  v-model="queryParam.name"
                />
              </a-form-item>
            </a-col>
@@ -108,69 +108,51 @@
        {
          title: '统一编码',
          align: 'center',
          dataIndex: 'num'
        },
        {
          title: '资产编码',
          align: 'center',
          dataIndex: 'assetNumber'
        },
        {
          title: '特种设备',
          align: 'center',
          dataIndex: 'specificEquipment_dictText'
          dataIndex: 'num',
          width:200
        },
        {
          title: '设备名称',
          align: 'center',
          dataIndex: 'name'
          dataIndex: 'name',
          width:200
        },
        {
          title: '设备型号',
          align: 'center',
          dataIndex: 'model'
          dataIndex: 'model',
          width:200
        },
        {
          title: '设备规格',
          align: 'center',
          dataIndex: 'specification'
          dataIndex: 'specification',
          width:200
        },
        {
          title: 'ABC标识',
          align: "center",
          dataIndex: 'equipmentImportanceId',
          width:100
        },
        {
          title: '关键设备标识',
          align: "center",
          dataIndex: 'specificEquipment_dictText',
          width:100
        },
        {
          title: '设备状态',
          align: 'center',
          dataIndex: 'equipmentStatus_dictText'
          dataIndex: 'equipmentStatus_dictText',
          width:100
        },
        {
          title: '技术状态',
          align: 'center',
          dataIndex: 'technologyStatus_dictText'
          dataIndex: 'technologyStatus_dictText',
          width:100
        },
        {
          title: '设备图片',
          align: 'center',
          dataIndex: 'equipmentPhoto',
          scopedSlots: { customRender: 'equipmentPhoto' }
        },
        // {
        //   title:'设备图片',
        //   align:"center",
        //   dataIndex: 'equipmentPhoto',
        //   scopedSlots: {customRender: 'imgSlot'}
        // },
        {
          title: '位置',
          align: 'center',
          dataIndex: 'location'
        },
        {
          title: '重要度',
          align: 'center',
          dataIndex: 'equipmentImportanceId_dictText'
        }
      ],
      selectedRowKeys: [],
      oldSelectRows: [],
@@ -227,7 +209,7 @@
      let that = this
      this.loading = true
      let params = this.getQueryParams()//查询条件
      params.equipmentStatus = '1'
      // params.equipmentStatus = '1'
      await getAction(this.url.list, params).then((res) => {
        if (res.success) {
          for (let i = 0; i < res.result.records.length; i++) {
@@ -291,7 +273,7 @@
      this.loadData()
    },
    handleSubmit() {
      this.$bus.$emit('selectionRows', this.selectionRows)
      this.$emit('selectionRows', this.selectionRows)
      this.searchReset(0)
      this.close()
    },
src/views/eam/modules/line/EquipmentListOfLine.vue
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,200 @@
<template>
  <a-card :bordered="false" :class="'cust-erp-sub-tab'">
    <!-- æŸ¥è¯¢åŒºåŸŸ -->
    <div class="table-page-search-wrapper">
      <a-form layout="inline" @keyup.enter.native="searchQuery">
        <a-row :gutter="24">
        </a-row>
      </a-form>
    </div>
    <div>
      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
        <i class="anticon anticon-info-circle ant-alert-icon"></i> å·²é€‰æ‹© <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
      </div>
      <a-table
        ref="table"
        size="middle"
        bordered
        class="j-table-force-nowrap"
        rowKey="id"
        :scroll="{x:true}"
        :columns="columns"
        :dataSource="dataSource"
        :pagination="ipagination"
        :loading="loading"
        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
        :rowClassName="tableRowClass"
        @change="handleTableChange">
        <span
          slot="specificEquipment"
          slot-scope="text"
        >
        <a-icon type="check" style="color: rgb(0, 21, 255);" v-if="text==='是'" />
        <a-icon type="close" v-else style="color:red;"/>
      </span>
        <template slot="htmlSlot" slot-scope="text">
          <div v-html="text"></div>
        </template>
        <template slot="imgSlot" slot-scope="text,record">
          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
          <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
        </template>
        <template slot="fileSlot" slot-scope="text">
          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
          <a-button
            v-else
            :ghost="true"
            type="primary"
            icon="download"
            size="small"
            @click="downloadFile(text)">
            ä¸‹è½½
          </a-button>
        </template>
        <span slot="action" slot-scope="text, record">
          <a @click="handleEdit(record)">编辑</a>
          <a-divider type="vertical" />
          <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
            <a>删除</a>
          </a-popconfirm>
        </span>
      </a-table>
    </div>
  </a-card>
</template>
<script>
  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
  export default {
    name: "EquipmentListOfLine",
    disableMixinCreated:true,
    mixins:[JeecgListMixin],
    components: { },
    props:{
      mainId:{
        type:String,
        default:'',
        required:false
      }
    },
    watch:{
      mainId:{
        immediate: true,
        handler(val) {
          if(!this.mainId){
            this.clearList()
          }else{
            this.queryParam['lineId'] = val
            this.loadData(1);
          }
        }
      }
    },
    data () {
      return {
        description: '设备',
        disableMixinCreated:true,
        // è¡¨å¤´
        columns: [
        {
          title: '主设备?',
          align: "center",
          dataIndex: 'isMeta_dictText',
          width:50,
          scopedSlots: { customRender: 'specificEquipment' }
        },
        {
          title: '设备类型',
          align: "center",
          dataIndex: 'equipmentCategoryId_dictText',
          width:200
        },
        {
          title: '统一编号',
          align: "center",
          dataIndex: 'num',
          width:200
        },
        {
          title: '设备名称',
          align: "center",
          dataIndex: 'name',
          width:200
        },
        {
          title: '型号',
          align: "center",
          dataIndex: 'model',
          width:200
        },
        {
          title: '使用部门',
          align: "center",
          dataIndex: 'useId_dictText',
          width:200
        },
        {
          title: 'ABC标识',
          align: "center",
          dataIndex: 'equipmentImportanceId',
          width:100
        },
        {
          title: '关键设备',
          align: "center",
          dataIndex: 'specificEquipment_dictText',
          width:100
        },
        {
          title: '技术状态',
          align: "center",
          dataIndex: 'technologyStatus_dictText',
          width:100
        },
        ],
        url: {
          list: "/eam/equipment/getEquipmentList",
        },
        dictOptions:{
        }
      }
    },
    created() {
    },
    computed: {
      importExcelUrl(){
        return `${window._CONFIG['domianURL']}/${this.url.importUrl}/${this.mainId}`;
      }
    },
    methods: {
      clearList(){
        this.dataSource=[]
        this.selectedRowKeys=[]
        this.ipagination.current = 1
      },
      tableRowClass(record, index) {
        if (record.isMeta==='yes') {
          return 'primary'
        }
      },
    },
    mounted(){
      this.$bus.$on('loadData', (data) => {
            this.loadData();
      });
    }
  }
</script>
<style scoped>
  @import '~@assets/less/common.less';
  .primary {
  color: red;
  font-weight: bold;
}
</style>
src/views/eam/modules/line/EquipmentOfLineForm.vue
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,363 @@
<template>
  <a-spin :spinning="confirmLoading">
    <j-form-container :disabled="formDisabled">
      <!-- ä¸»è¡¨å•区域 -->
      <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
        <a-row>
          <a-col :span="6">
            <a-form-model-item
              label="生产线所属分类"
              :labelCol="labelCol"
              :wrapperCol="wrapperCol"
              prop="equipmentCategoryId"
            >
              <j-dict-select-tag
                allow-clear
                placeholder="生产线所属分类"
                :disabled="formDisabled"
                :triggerChange="true"
                :dictCode="caytegoryParam==='all'?'mom_eam_equipment_category,name,id':'mom_eam_equipment_category,name,id,equipment_category_uda1 = '+'\''+caytegoryParam+'\''"
                v-model="model.equipmentCategoryId"
              />
            </a-form-model-item>
          </a-col>
          <a-col :span="6">
            <a-form-model-item
              label="生产线编码"
              :labelCol="labelCol"
              :wrapperCol="wrapperCol"
              prop="num"
            >
              <a-input
                v-model="model.num"
                placeholder="请输入生产线编号"
                :disabled="formDisabled"
              ></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="6">
            <a-form-model-item
              label="生产线名称"
              :labelCol="labelCol"
              :wrapperCol="wrapperCol"
              prop="name"
            >
              <a-input
                v-model="model.name"
                placeholder="请输入生产线名称"
                :disabled="formDisabled"
              ></a-input>
            </a-form-model-item>
          </a-col>
        </a-row>
      </a-form-model>
    </j-form-container>
      <!-- å­è¡¨å•区域 -->
    <a-tabs v-model="activeKey" @change="handleChangeTabs">
      <a-tab-pane tab="设备" :key="refKeys[0]" :forceRender="true">
        <j-vxe-table
          keep-source
          :ref="refKeys[0]"
          :loading="equipmentOfLineList.loading"
          :columns="equipmentOfLineList.columns"
          :dataSource="equipmentOfLineList.dataSource"
          :maxHeight="600"
          :disabled="formDisabled"
          :rowNumber="true"
          :rowSelection="true"
          :bordered="true"
          :alwaysEdit="true"
          :toolbar="true"
          @valueChange="changeDate"
          :toolbarConfig="toolbarConfig"
          >
              <template slot="toolbarPrefix">
                <a-button type="primary" @click="selectEquipmentList" :disabled="formDisabled">选择设备
                </a-button>
              </template>
        </j-vxe-table>
      </a-tab-pane>
    </a-tabs>
    <equipment-select-modal ref="EquipmentSelectModal" @selectionRows="addSelectedEquipments"></equipment-select-modal>
  </a-spin>
</template>
<script>
  import { getAction } from '@/api/manage'
  import { JVxeTableModelMixin } from '@/mixins/JVxeTableModelMixin.js'
  import { duplicateCheck } from '@/api/api'
  import { JVXETypes } from '@/components/jeecg/JVxeTable'
  import { validateDuplicateValue } from '@/utils/util'
  import { getRefPromise,VALIDATE_FAILED} from '@/components/jeecg/JVxeTable/utils/vxeUtils.js'
  import JFormContainer from '@/components/jeecg/JFormContainer'
  import EquipmentSelectModal from '../equipmentScrap/EquipmentSelectModal.vue'
  import dayjs from 'dayjs'
  export default {
    name: 'EquipmentOfLineForm',
    mixins: [JVxeTableModelMixin],
    components: {
      JFormContainer,
      dayjs,
      EquipmentSelectModal
    },
    props: {
      //表单禁用
      disabled: {
        type: Boolean,
        default: false,
        required: false
      },
      caytegoryParam: {
        type: String,
        default: '',
        required: false
      }
    },
    data() {
      return {
        toolbarConfig: {
        // prefix å‰ç¼€ï¼›suffix åŽç¼€
        slot: ['prefix', 'suffix'],
        // add æ–°å¢žæŒ‰é’®ï¼›remove åˆ é™¤æŒ‰é’®ï¼›clearSelection æ¸…空选择按钮
        btn: ['remove', 'clearSelection']
        },
        labelCol: {
          xs: { span: 24 },
          sm: { span: 5 },
        },
        wrapperCol: {
          xs: { span: 24 },
          sm: { span: 16 },
        },
        model:{
         },
        // æ–°å¢žæ—¶å­è¡¨é»˜è®¤æ·»åŠ å‡ è¡Œç©ºæ•°æ®
        addDefaultRowNum: 0,
        validatorRules: {
        num: [
          { required: true, message: '请输入编码!' },
          { validator: (rule, value, callback) => validateDuplicateValue('mom_eam_equipment', 'num', value, this.model.id, callback) }
        ],
        name: [
          { required: true, message: '请输入名称!' }
        ],
        equipmentCategoryId:[
          { required: true, message: '请输入分类!' }
        ]
        },
        refKeys: ['equipmentOfLineTable', ],
        tableKeys:['equipmentOfLineTable', ],
        activeKey: 'equipmentOfLineTable',
        equipmentOfLineList: {
          loading: false,
          dataSource: [],
          columns: [
            {
              title: 'id',
              key: 'id',
               type: JVXETypes.hidden,
              disabled:true,
              align:'center',
            },
            {
              title: 'showId',
              key: 'showId',
               type: JVXETypes.hidden,
              disabled:true,
              align:'center',
            },
            {
              title: '统一编码',
              key: 'num',
               type: JVXETypes.normal,
              width:"300px",
              placeholder: '请输入${title}',
              disabled:true,
              align:'center',
              defaultValue:'',
            },
            {
              title: '设备名称',
              key: 'name',
               type: JVXETypes.normal,
              width:"300px",
              placeholder: '请输入${title}',
              disabled:true,
              align:'center',
              defaultValue:'',
            },
            {
              title: '设备型号',
              key: 'model',
               type: JVXETypes.normal,
              width:"202px",
              placeholder: '请输入${title}',
              disabled:true,
              align:'center',
              defaultValue:'',
            },
            {
              title: '关键设备标识',
              key: 'specificEquipment_dictText',
              type: JVXETypes.normal,
              width:"202px",
              placeholder: '请输入${title}',
              disabled:true,
              align:'center',
              defaultValue:'',
            },
            {
              title: 'ABC标识',
              key: 'equipmentImportanceId',
              type: JVXETypes.normal,
              width:"202px",
              placeholder: '请输入${title}',
              disabled:true,
              align:'center',
              defaultValue:'',
            },
            {
              title: '技术状态',
              key: 'technologyStatus_dictText',
              type: JVXETypes.normal,
              width:"202px",
              placeholder: '请输入${title}',
              disabled:true,
              align:'center',
              defaultValue:'',
            },
            {
              title: '是否主设备',
              key: 'isMeta',
              type: JVXETypes.select,
              width:"202px",
              placeholder: '请选择${title}',
              dictCode:'is_product',
              align:'center',
              options:[],
              validateRules: [
                  {
                    required: true, // å¿…å¡«
                    message: '请输入${title}' // æ˜¾ç¤ºçš„æ–‡æœ¬
                  },
              ]
             },
          ]
        },
        url: {
          add: "/eam/equipment/addLine",
          edit:"/eam/equipment/editLine",
          equipmentOfLineTable: {
            list: "/eam/equipment/getEquipmentList",
          },
        }
      }
    },
    computed: {
      formDisabled(){
        return this.disabled
      },
    },
    created () {
    },
    methods: {
      addBefore(){
       this.equipmentOfLineList.dataSource=[];
      },
      getAllTable() {
        let values = this.tableKeys.map(key => getRefPromise(this, key))
        return Promise.all(values)
      },
      /** è°ƒç”¨å®Œedit()方法之后会自动调用此方法 */
      editAfter() {
        this.$nextTick(() => {
        })
        // åŠ è½½å­è¡¨æ•°æ®
        if (this.model.id) {
          let params = {lineId: this.model.id }
          this.requestSubTableData(this.url.equipmentOfLineTable.list, params, this.equipmentOfLineList)
        }
      },
      //校验所有一对一子表表单
        validateSubForm(allValues){
            return new Promise((resolve,reject)=>{
              Promise.all([
              ]).then(() => {
                resolve(allValues)
              }).catch(e => {
                if (e.error === VALIDATE_FAILED) {
                  // å¦‚果有未通过表单验证的子表,就自动跳转到它所在的tab
                  this.activeKey = e.index == null ? this.activeKey : this.refKeys[e.index]
                } else {
                  console.error(e)
                }
              })
            })
        },
      /** æ•´ç†æˆformData */
      classifyIntoFormData(allValues) {
        let main = Object.assign(this.model, allValues.formValue)
        return {
          ...main, // å±•å¼€
          equipmentOfLineTable: allValues.tablesValue[0].tableData,
        }
      },
      validateError(msg){
        this.$message.error(msg)
      },
      changeDate(target){
        let tableData =this.$refs.equipmentOfLineTable.getTableData();
        let id = target.row.id
        if(target.column.key==='isMeta'){
           for(var i = 0;i<tableData.length;i++){
              if(id!==tableData[i].showId){
                this.$refs.equipmentOfLineTable.getRowById(tableData[i].showId).isMeta='no'
              }
           }
        }
      },
       //选择设备
      selectEquipmentList() {
        let ids = []
        let tableData = this.$refs.equipmentOfLineTable.getTableData()
        let deleteData = this.$refs.equipmentOfLineTable.getDeleteData()
        for (let i = 0; i < tableData.length; i++) {
          ids.push(tableData[i].showId)
        }
        this.$refs.EquipmentSelectModal.showModals(ids)
        this.$refs.EquipmentSelectModal.title = '选择设备'
        this.$refs.EquipmentSelectModal.disableSubmit = false
      },
      addSelectedEquipments(data) {
        let tableData = this.$refs.equipmentOfLineTable.getTableData()
        // const seletedEquipmentIds = tableData.
        var tableStr = JSON.stringify(tableData)
        const addRows = []
        for (let i = 0; i < data.length; i++) {
          var equipment = {}
          if (tableStr.indexOf(data[i].id)==-1) {
            equipment = {
              id: data[i].id,
              num: data[i].num,
              name: data[i].name,
              model:data[i].model,
              showId:data[i].id,
              specificEquipment_dictText:data[i].specificEquipment_dictText,
              technologyStatus_dictText:data[i].technologyStatus_dictText,
              equipmentImportanceId:data[i].equipmentImportanceId,
              isMeta:'no'
            }
          }
          addRows.push(equipment)
        }
        this.$refs.equipmentOfLineTable.pushRows(addRows)
      },
    }
  }
</script>
<style scoped>
</style>
src/views/eam/modules/line/EquipmentOfLineModal.vue
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,75 @@
<template>
  <j-modal
    :title="title"
    :width="1520"
    :height="600"
    :visible="visible"
    :maskClosable="true"
    :fullscreen="true"
    switchFullscreen
    @ok="handleOk"
    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
    @cancel="handleCancel">
    <equipment-of-line-form
    :caytegoryParam="caytegoryParam"
    ref="realForm"
    @ok="submitCallback"
    :disabled="disableSubmit"/>
  </j-modal>
</template>
<script>
import EquipmentOfLineForm from './EquipmentOfLineForm'
  export default {
    name: 'EquipmentOfLineModal',
    components: {
      EquipmentOfLineForm
    },
    props:{
      caytegoryParam: {
        type: String,
        default: '',
        required: false
      }
    },
    data() {
      return {
        title:'',
        width:1500,
        visible: false,
        disableSubmit: false
      }
    },
    methods:{
      add () {
        this.visible=true
        this.$nextTick(()=>{
          this.$refs.realForm.addBefore();
        })
      },
      edit (record) {
        this.visible=true
        this.$nextTick(()=>{
          this.$refs.realForm.edit(record);
        })
      },
      close () {
        this.$emit('close');
        this.visible = false;
      },
      handleOk () {
        this.$refs.realForm.handleOk();
      },
      submitCallback(){
        this.$emit('ok');
        this.$bus.$emit('loadData')
        this.visible = false;
      },
      handleCancel () {
        this.close()
      }
    }
  }
</script>
<style scoped>
</style>