Merge remote-tracking branch 'origin/master'

zhaowei

2025-03-03 133c3ad5450976bb161a9c713f2a6cf075165c55

Merge remote-tracking branch 'origin/master'

 src/views/eam/EquipmentListOfAll.vue

@@ -1,7 +1,7 @@
<template>
  <a-card
    :bordered="false"
    title="所有设备"
    title=""
  >
    <!-- 查询区域 -->
    <div class="table-page-search-wrapper">
@@ -13,35 +13,42 @@
          :gutter="24"
          style="margin-bottom: 1%;"
        >
          <a-col :span="24">
          <a-col :xl='6'
                :lg='7'
                :md='8'
                :sm='24'>
            <a-form-item
              label="统一编号群"
              :labelCol="labelCol"
              :wrapperCol="wrapperCol"
            >
              <a-textarea
                placeholder="请输入所有统一编码,须用空格隔开,否则可能查询出错误信息"
                placeholder="请输入所有统一编码,每个统一编码占用一行,否则查询信息可能会出错"
                v-model="queryParam.nums"
                :auto-size="{ minRows: 2, maxRows:2 }"
              ></a-textarea>
            </a-form-item>
          </a-col>
        </a-row>
        <a-row :gutter="24">
          <a-col :span="6">
          <a-col :xl='6'
                 :lg='7'
                 :md='8'
                 :sm='24'>
            <a-form-item
              label="设备所属分类"
              :labelCol="labelCol"
              :wrapperCol="wrapperCol"
            >
              <j-dict-select-tag
                dictCode="mom_eam_equipment_category,name,id"
                dictCode="mom_eam_equipment_category,name,id,del_flag!='1'"
                placeholder="请输入搜索条件并选择"
                v-model="queryParam.equipmentCategoryId"
              />
            </a-form-item>
          </a-col>
          <a-col :span="6">
          <a-col :xl='6'
                 :lg='7'
                 :md='8'
                 :sm='24'>
            <a-form-item
              :labelCol="labelCol"
              :wrapperCol="wrapperCol"
@@ -53,7 +60,10 @@
              ></a-input>
            </a-form-item>
          </a-col>
          <a-col :span="6">
          <a-col :xl='6'
                 :lg='7'
                 :md='8'
                 :sm='24'>
            <a-form-item
              :labelCol="labelCol"
              :wrapperCol="wrapperCol"
@@ -65,7 +75,10 @@
              ></a-input>
            </a-form-item>
          </a-col>
          <a-col :span="6">
          <a-col :xl='6'
                 :lg='7'
                 :md='8'
                 :sm='24'>
            <a-form-item
              label="型号"
              :labelCol="labelCol"
@@ -77,9 +90,11 @@
              ></a-input>
            </a-form-item>
          </a-col>
        </a-row>
        <a-row :gutter="24">
          <a-col :span="6">

          <a-col :xl='6'
                 :lg='7'
                 :md='8'
                 :sm='24'>
            <a-form-item
              label="工区"
              :labelCol="labelCol"
@@ -109,7 +124,10 @@
              />
            </a-form-item>
          </a-col> -->
          <a-col :span="6">
          <a-col :xl='6'
                 :lg='7'
                 :md='8'
                 :sm='24'>
            <a-form-item
              label="维护部门"
              :labelCol="labelCol"
@@ -130,7 +148,10 @@
              />
            </a-form-item>
          </a-col>
          <a-col :span="6">
          <a-col :xl='6'
                 :lg='7'
                 :md='8'
                 :sm='24'>
            <a-form-item
              label="使用部门"
              :labelCol="labelCol"
@@ -151,7 +172,10 @@
              />
            </a-form-item>
          </a-col>
          <a-col :span="6">
          <a-col :xl='6'
                 :lg='7'
                 :md='8'
                 :sm='24'>
            <a-form-item
              label="是否生产线设备"
              :labelCol="labelCol"
@@ -166,9 +190,10 @@
              />
            </a-form-item>
          </a-col>
        </a-row>
        <a-row :gutter="24">
          <a-col :span="6">
          <a-col :xl='6'
                 :lg='7'
                 :md='8'
                 :sm='24'>
            <a-form-item
              label="ABC标识"
              :labelCol="labelCol"
@@ -183,7 +208,10 @@
              />
            </a-form-item>
          </a-col>
          <a-col :span="6">
          <a-col :xl='6'
                 :lg='7'
                 :md='8'
                 :sm='24'>
            <a-form-item
              label="技术状态"
              :labelCol="labelCol"
@@ -198,7 +226,10 @@
              />
            </a-form-item>
          </a-col>
          <a-col :span="6">
          <a-col :xl='6'
                 :lg='7'
                 :md='8'
                 :sm='24'>
            <a-form-item
              label="设备状态"
              :labelCol="labelCol"
@@ -213,7 +244,10 @@
              />
            </a-form-item>
          </a-col>
          <a-col :span="6">
          <a-col :xl='6'
                 :lg='7'
                 :md='8'
                 :sm='24'>
            <a-form-item
              label="关键设备标识"
              :labelCol="labelCol"
@@ -228,9 +262,10 @@
              />
            </a-form-item>
          </a-col>
        </a-row>
        <a-row :gutter="24">
          <a-col :span="6">
          <a-col :xl='6'
                 :lg='7'
                 :md='8'
                 :sm='24'>
            <a-form-model-item
              label="质保开始日期"
              :labelCol="labelCol"
@@ -244,7 +279,10 @@
              ></j-date>
            </a-form-model-item>
          </a-col>
          <a-col :span="6">
          <a-col :xl='6'
                 :lg='7'
                 :md='8'
                 :sm='24'>
            <a-form-model-item
              label="质保结束日期"
              :labelCol="labelCol"
@@ -259,7 +297,10 @@
            </a-form-model-item>
          </a-col>
          <!-- 按维修班组检索 -->
          <a-col :span="6">
          <a-col :xl='6'
                 :lg='7'
                 :md='8'
                 :sm='24'>
            <a-form-item
              label="维修班组"
              :labelCol="labelCol"

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

@@ -33,7 +33,7 @@
                placeholder='请选择设备所属分类'
                :disabled='formDisabled'
                :triggerChange='true'
                :dictCode="caytegoryParam==='all'?'mom_eam_equipment_category,name,id':'mom_eam_equipment_category,name,id,equipment_category_uda1 = '+'\''+caytegoryParam+'\''"
                :dictCode="caytegoryParam==='all'?'mom_eam_equipment_category,name,id,del_flag!=\'1\'':'mom_eam_equipment_category,name,id,equipment_category_uda1 = '+'\''+caytegoryParam+'\''"
                v-model='model.equipmentCategoryId'
                @change='categoryChange'
              />