cq

master/src/main/resources/mybatis/ehs/TMsdsMapper.xml

@@ -52,9 +52,9 @@
             <if test="enName != null  and enName != ''"> and en_name like concat(concat('%', #{enName}), '%')</if>
             <if test="cnName != null  and cnName != ''"> and cn_name like concat(concat('%', #{cnName}), '%')</if>
             <if test="casNo != null  and casNo != ''"> and cas_no like concat(concat('%', #{casNo}), '%')</if>
-            <if test="hazardPhrases != null  and hazardPhrases != ''"> and hazard_phrases = #{hazardPhrases}</if>
-            <if test="cmr != null  and cmr != ''"> and cmr = #{cmr}</if>
-            <if test="ghsPictogram != null  and ghsPictogram != ''"> and ghs_pictogram = #{ghsPictogram}</if>
+            <if test="hazardPhrases != null  and hazardPhrases != ''"> and hazard_phrases like concat(concat('%', #{hazardPhrases}), '%')</if>
+            <if test="cmr != null  and cmr != ''"> and cmr like concat(concat('%', #{cmr}), '%')</if>
+            <if test="ghsPictogram != null  and ghsPictogram != ''"> and ghs_pictogram like concat(concat('%', #{ghsPictogram}), '%')</if>
             <if test="holdup != null  and holdup != ''"> and holdup = #{holdup}</if>
             <if test="workArea != null  and workArea != ''"> and work_area = #{workArea}</if>
             <if test="form != null  and form != ''"> and form = #{form}</if>

ui/src/views/ehs/msds/index.vue

@@ -1,15 +1,6 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item :label="$t('英文名称')" prop="enName">
-        <el-input
-          v-model="queryParams.enName"
-          :placeholder="$t('请输入')+$t('英文名称')"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item :label="$t('中文名称')" prop="cnName">
         <el-input
           v-model="queryParams.cnName"
@@ -19,17 +10,8 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item :label="$t('CAS号')" prop="casNo">
-        <el-input
-          v-model="queryParams.casNo"
-          :placeholder="$t('请输入')+$t('CAS号')"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item :label="$t('危险警句')" prop="hazardPhrases">
-        <el-select v-model="queryParams.hazardPhrases" :placeholder="$t('请选择')+$t('危险警句')" clearable size="small">
+        <el-select v-model="queryParams.hazardPhrases" filterable :placeholder="$t('请选择')+$t('危险警句')" clearable size="small">
           <el-option
             v-for="dict in hazardPhrasesOptions"
             :key="dict.dictValue"
@@ -58,143 +40,6 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item :label="$t('保存量')" prop="holdup">
-        <el-input
-          v-model="queryParams.holdup"
-          :placeholder="$t('请输入') + $t('保存量')"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item :label="$t('工作区域')" prop="workArea">
-        <el-select v-model="queryParams.workArea" :placeholder="$t('请选择')+$t('工作区域')" clearable size="small">
-          <el-option
-            v-for="dict in workAreaOptions"
-            :key="dict.dictValue"
-            :label="dict.dictLabel"
-            :value="dict.dictValue"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item :label="$t('形态')" prop="form">
-        <el-input
-          v-model="queryParams.form"
-          :placeholder="$t('请输入') + $t('形态')"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item :label="$t('爆炸极限')" prop="explosionLimit">
-        <el-input
-          v-model="queryParams.explosionLimit"
-          :placeholder="$t('请输入') + $t('爆炸极限')"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item :label="$t('熔点')" prop="meltingPoint">
-        <el-input
-          v-model="queryParams.meltingPoint"
-          :placeholder="$t('请输入') + $t('熔点')"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item :label="$t('沸点')" prop="boilingPoint">
-        <el-input
-          v-model="queryParams.boilingPoint"
-          :placeholder="$t('请输入') + $t('沸点')"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item :label="$t('密度/分子量')" prop="density">
-        <el-input
-          v-model="queryParams.density"
-          :placeholder="$t('请输入') + $t('密度/分子量')"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item :label="$t('组成及纯度')" prop="purity">
-        <el-input
-          v-model="queryParams.purity"
-          :placeholder="$t('请输入') + $t('组成及纯度')"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item :label="$t('归属单位')" prop="responsibleCompany">
-        <el-input
-          v-model="queryParams.responsibleCompany"
-          :placeholder="$t('请输入') + $t('归属单位')"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item :label="$t('出版日期')" prop="issueTime">
-        <el-date-picker clearable size="small" style="width: 200px"
-                        v-model="queryParams.issueTime"
-                        type="date"
-                        value-format="yyyy-MM-dd"
-                        :placeholder="$t('请选择') + $t('出版日期')">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item :label="$t('版次')" prop="version">
-        <el-input
-          v-model="queryParams.version"
-          :placeholder="$t('请输入') + $t('版次')"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item :label="$t('回顾人')" prop="reviewer">
-        <el-select v-model="queryParams.reviewer" filterable  clearable @keyup.enter.native="handleQuery" :placeholder="$t('请选择') + $t('回顾人')">
-        <el-option
-          v-for="dict in stffmgrOptions"
-          :key="dict.staffid"
-          :label="dict.name"
-          :value="dict.staffid">
-          <span style="float: left">{{ dict.name }}</span>
-          <span style="float: right; color: #8492a6; font-size: 13px">{{ dict.staffid }}</span>
-        </el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item :label="$t('回顾日期')" prop="reviewdate">
-        <el-date-picker clearable size="small" style="width: 200px"
-                        v-model="queryParams.reviewdate"
-                        type="date"
-                        value-format="yyyy-MM-dd"
-                        :placeholder="$t('请选择') + $t('回顾日期')">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item :label="$t('回顾状态')" prop="reviewState">
-        <el-select v-model="queryParams.reviewState" :placeholder="$t('请选择') + $t('回顾状态')" clearable size="small">
-          <el-option
-            v-for="dict in reviewStateOptions"
-            :key="dict.dictValue"
-            :label="dict.dictLabel"
-            :value="dict.dictValue"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item :label="$t('下次回顾日期')" prop="nextReviewdate">
-        <el-date-picker clearable size="small" style="width: 200px"
-                        v-model="queryParams.nextReviewdate"
-                        type="date"
-                        value-format="yyyy-MM-dd"
-                        :placeholder="$t('请选择') + $t('下次回顾日期')">
-        </el-date-picker>
-      </el-form-item>
       <el-form-item>
         <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">{{ $t('搜索') }}</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">{{ $t('重置') }}</el-button>