设备台账字段增加查询条件增加

“linengliang”

2023-09-06 b2ec7b35247273c77768115635955991a449e942

设备台账字段增加查询条件增加

 src/views/eam/EquipmentList.vue

@@ -4,8 +4,12 @@
    <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="设备所属分类">
          <a-col :span="5">
            <a-form-item
            label="设备所属分类" 
            :labelCol="labelCol"
            :wrapperCol="wrapperCol"
            >
              <j-search-select-tag
                dict="mom_eam_equipment_category,name,id"
                placeholder="请输入搜索条件并选择"
@@ -14,9 +18,13 @@
            </a-form-item>
          </a-col>
          <a-col
          :span="6"
          :span="5"
          >
            <a-form-item label="统一编码">
            <a-form-item 
            :labelCol="labelCol"
            :wrapperCol="wrapperCol"
            label="统一编码"
            >
              <j-input
                placeholder="请输入设备统一编码查询"
                v-model="queryParam.num"
@@ -24,16 +32,195 @@
            </a-form-item>
          </a-col>
          <a-col
          :span="6"
          :span="5"
          >
            <a-form-item label="设备名称">
            <a-form-item 
            :labelCol="labelCol"
            :wrapperCol="wrapperCol"
            label="设备名称"
            >
              <j-input
                placeholder="请输入设备名称查询"
                v-model="queryParam.name"
              ></j-input>
            </a-form-item>
          </a-col>
          <a-col :span="5">
            <a-form-item
              label="型号"
              :labelCol="labelCol"
            :wrapperCol="wrapperCol"
            >
            <j-input
                v-model="queryParam.model"
                placeholder="请输入型号"
            ></j-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
              label="产线"
              :labelCol="labelCol"
            :wrapperCol="wrapperCol"
            >
            <j-dict-select-tag
                allow-clear
                placeholder="请选择产线"
                :triggerChange="true"
                dictCode="mom_base_work_center,name,id,del_flag!='1'"
                v-model="queryParam.workCenterId"
              />
            </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="维护部门"
              :labelCol="labelCol"
            :wrapperCol="wrapperCol"
            >
            <a-tree-select
                style="width: 100%"
                :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
                :tree-data="treeData"
                placeholder="请选择维护部门"
                tree-default-expand-all
                v-model="queryParam.manageId"
              />
            </a-form-item>
          </a-col>
          <a-col :span="6">
            <a-form-item
              label="使用部门"
              :labelCol="labelCol"
            :wrapperCol="wrapperCol"
            >
            <a-tree-select
                style="width: 100%"
                :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
                :tree-data="treeData"
                placeholder="请选择使用部门"
                tree-default-expand-all
                v-model="queryParam.useId"
              />
            </a-form-item>
          </a-col>
        </a-row>
        <a-row :gutter="24">
          <a-col :span="6">
            <a-form-item
              label="ABC标识"
              :labelCol="labelCol"
            :wrapperCol="wrapperCol"
            >
              <j-dict-select-tag
                allow-clear
                placeholder="请选择ABC标识"
                :triggerChange="true"
                dictCode="ABC-standard-result"
                v-model="queryParam.equipmentImportanceId"
              />
            </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="technology_status"
                v-model="queryParam.technologyStatus"
              />
            </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="equipment_status"
                v-model="queryParam.equipmentStatus"
              />
            </a-form-item>
          </a-col>
          <a-col :span="6">
            <a-form-item
              label="关键设备标识"
              :labelCol="labelCol"
              :wrapperCol="wrapperCol"
            >
              <j-dict-select-tag
                allow-clear
                :triggerChange="true"
                placeholder="请选择关键设备标识"
                dictCode="specific_equipment"
                v-model="queryParam.specificEquipment"
              />
            </a-form-item>
          </a-col>
        </a-row>
        <a-row :gutter="24">
          <a-col :span="6">
            <a-form-model-item
              label="质保开始日期"
              :labelCol="labelCol"
              :wrapperCol="wrapperCol"
            >
            <j-date  style="width: 100%;" placeholder="请选择开始日期" class="query-group-cust" v-model="queryParam.warrantyStart"></j-date>
            </a-form-model-item>
          </a-col>
          <a-col :span="6">
            <a-form-model-item
              label="质保结束日期"
              :labelCol="labelCol"
              :wrapperCol="wrapperCol"
            >
            <j-date style="width: 100%;" placeholder="请选择结束日期" class="query-group-cust" v-model="queryParam.warrantyEnd"></j-date>
            </a-form-model-item>
          </a-col>
        </a-row>
        </template>
      </a-form>
    </div>
    <!-- 查询区域-END -->
@@ -507,6 +694,7 @@
          active: "/eam/equipment/active",
          exportXlsUrl: '/eam/equipment/exportXls',
          importExcelUrl: "/eam/equipment/importExcel",
          loadOptions: '/sys/sysDepart/loadDepartTreeOptions',
        },
        dictOptions:{
        },
@@ -529,10 +717,20 @@
        equipmentPrecisionParametersMainId: '',
        isOpenPrecision:true,
        isOpenProcess:true,
        treeData: [],
        labelCol: {
        xs: { span: 24 },
        sm: { span: 5 },
        },
        wrapperCol: {
          xs: { span: 24 },
          sm: { span: 16 },
        },
      }
    },
    created() {
      this.getSuperFieldList();
      this.initOptions();
    },
    computed: {
      importExcelUrl: function(){
@@ -666,7 +864,17 @@
      },
      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)
        }
      })
    },

    }
  }
</script>

 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,6 +122,8 @@
              ></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;"
@@ -179,6 +183,42 @@
          </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_factory_model,name,id,del_flag!='1'"
                v-model="model.factoryModelId"
              />
            </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="资产制造商"
              :labelCol="labelCol"
              :wrapperCol="wrapperCol"
@@ -194,6 +234,8 @@
              />
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row>
          <a-divider
            orientation="center"
            style="font-size: large;font-style: italic;color: #66aeed;"
@@ -249,6 +291,8 @@
              />
            </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 +326,7 @@
              />
            </a-form-model-item>
          </a-col>
       
          <a-col :span="6">
            <a-form-model-item
              label="验收日期"
@@ -311,6 +356,8 @@
              ></a-input>
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row>
          <a-col :span="6">
            <a-form-model-item
              label="工区"
@@ -339,6 +386,7 @@
              ></a-input>
            </a-form-model-item>
          </a-col>
      
          <a-col :span="6">
            <a-form-model-item
              label="重量计量单位"
@@ -367,6 +415,8 @@
              ></a-input>
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row>
          <a-col :span="6">
            <a-form-model-item
              label="功能位置"
@@ -395,6 +445,7 @@
              ></a-input>
            </a-form-model-item>
          </a-col>
      
          <a-col :span="6">
            <a-form-model-item
              label="资产来源国家"
@@ -479,6 +530,8 @@
              ></a-input>
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row>
          <a-col :span="6">
            <a-form-model-item
              label="系统"
@@ -540,6 +593,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 +667,8 @@
              />
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row>
          <a-col :span="6">
            <a-form-model-item
              label="故障频率"
@@ -665,6 +722,8 @@
              />
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row>
          <a-divider
            orientation="center"
            style="font-size: large;font-style: italic;color: #66aeed;"
@@ -739,6 +798,32 @@
                :read-only="true"
                v-model="model.processParametersTemplateId_dictText"
              />
            </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="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>
@@ -847,6 +932,18 @@
        technologyStatus:[
        { required: true, message: '请选择设备状态!' },
        ],
        workCenterId:[
        { required: true, message: '请选择设备产线!' },
        ],
        factoryModelId:[
        { required: true, message: '请选择设备车间!' },
        ],
        warrantyStart:[
        { required: true, message: '请选择开始日期!' },
        ],
        warrantyEnd:[
        { required: true, message: '请选择结束日期!' },
        ]
      },
      url: {
        add: "/eam/equipment/add",