Prechádzať zdrojové kódy

型号规格改成国产型号,第4列改成国产型号的替代型号

allen 1 rok pred
rodič
commit
d59be356d0

+ 1 - 1
cirs-biz/src/main/java/com/cirs/biz/domain/RecommendInfo.java

@@ -25,7 +25,7 @@ public class RecommendInfo {
     @Excel(name= "质量等级")
     private String qualityGrade;
 
-    @Excel(name = "国产替代型号")
+    @Excel(name = "国产型号替代型号")
     private String replaceDomesticModel;
 
 //    @Excel(name="应用")//应用场景

+ 3 - 3
cirs-biz/src/main/java/com/cirs/biz/domain/TElectronComponent.java

@@ -31,11 +31,11 @@ public class TElectronComponent extends BaseEntity
     private String manufacturer;
 
     /** 型号规格 */
-    @Excel(name = "型号规格")
+    @Excel(name = "国产型号")
     private String componentModel;
 
-    /** 国产替代型号 */
-    @Excel(name = "国产替代型号")
+    /** 国产型号替代型号 */
+    @Excel(name = "国产型号替代型号")
     private String replaceDomesticModel;
 
     /** 质量等级(质量由优到劣为JYJCTJTJP) */

+ 1 - 1
cirs-ui/src/api/biz/train.js

@@ -43,7 +43,7 @@ export function delTrain(id) {
   })
 }
 
-//由 型号规格-质量等级-元器件名称 得到元器件的id
+//由 国产型号-质量等级-元器件名称 得到元器件的id
 export function getComponentIds() {
   return request({
     url: '/biz/train/componentIds',

+ 12 - 12
cirs-ui/src/views/biz/component/index.vue

@@ -34,27 +34,27 @@
 <!--          @keyup.enter.native="handleQuery"-->
 <!--        />-->
 <!--      </el-form-item>-->
-      <el-form-item label="型号规格" prop="componentModel">
+      <el-form-item label="国产型号" prop="componentModel">
         <el-input
           v-model="queryParams.componentModel"
-          placeholder="请输入型号规格"
+          placeholder="请输入国产型号"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
 
-<!--      <el-form-item label="型号规格" prop="componentModel">-->
-<!--        <el-select v-model="queryParams.componentModel" filterable placeholder="请输入型号规格">-->
+<!--      <el-form-item label="国产型号" prop="componentModel">-->
+<!--        <el-select v-model="queryParams.componentModel" filterable placeholder="请输入国产型号">-->
 <!--          <el-option-->
 <!--            v-for="item in componentInfo"-->
 <!--            :value="item.componentModel">-->
 <!--          </el-option>-->
 <!--        </el-select>-->
 <!--      </el-form-item>-->
-<!--      <el-form-item label="国产替代型号" prop="replaceDomesticModel">-->
+<!--      <el-form-item label="国产型号替代型号" prop="replaceDomesticModel">-->
 <!--        <el-input-->
 <!--          v-model="queryParams.replaceDomesticModel"-->
-<!--          placeholder="请输入国产替代型号"-->
+<!--          placeholder="请输入国产型号替代型号"-->
 <!--          clearable-->
 <!--          @keyup.enter.native="handleQuery"-->
 <!--        />-->
@@ -318,8 +318,8 @@
       <el-table-column label="编号" align="center" prop="id" />
       <el-table-column label="元器件名称" align="center" prop="componentName" width="100"  :show-overflow-tooltip="true"/>
       <el-table-column label="生产厂家" align="center" prop="manufacturer"  :show-overflow-tooltip="true"/>
-      <el-table-column label="型号规格" align="center" prop="componentModel"  :show-overflow-tooltip="true"/>
-      <el-table-column label="国产替代型号" align="center" prop="replaceDomesticModel" width="110"  :show-overflow-tooltip="true"/>
+      <el-table-column label="国产型号" align="center" prop="componentModel"  :show-overflow-tooltip="true"/>
+      <el-table-column label="国产型号替代型号" align="center" prop="replaceDomesticModel" width="110"  :show-overflow-tooltip="true"/>
       <el-table-column label="质量等级" align="center" prop="qualityGrade" />
       <el-table-column label="供货周期(周)" align="center" prop="deliveryCycle" width="120"/>
       <el-table-column label="供货量(个/年)" align="center" prop="supplyQuantity" width="140"/>
@@ -417,11 +417,11 @@
         <el-form-item label="生产厂家" prop="manufacturer">
           <el-input v-model="form.manufacturer" placeholder="请输入生产厂家" />
         </el-form-item>
-        <el-form-item label="型号规格" prop="componentModel">
-          <el-input v-model="form.componentModel" placeholder="请输入型号规格" />
+        <el-form-item label="国产型号" prop="componentModel">
+          <el-input v-model="form.componentModel" placeholder="请输入国产型号" />
         </el-form-item>
-        <el-form-item label="国产替代型号" prop="replaceDomesticModel">
-          <el-input v-model="form.replaceDomesticModel" placeholder="请输入国产替代型号" />
+        <el-form-item label="国产型号替代型号" prop="replaceDomesticModel">
+          <el-input v-model="form.replaceDomesticModel" placeholder="请输入国产型号替代型号" />
         </el-form-item>
         <el-form-item label="质量等级" prop="qualityGrade">
           <el-input v-model="form.qualityGrade" placeholder="请输入质量等级" />

+ 1 - 1
cirs-ui/src/views/biz/evaluation/index.vue

@@ -104,7 +104,7 @@
           <span>{{ getComponentName(scope.row.componentId) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="元器件型号规格" align="center" :show-overflow-tooltip="true">
+      <el-table-column label="元器件国产型号" align="center" :show-overflow-tooltip="true">
         <template slot-scope="scope">
           <span>{{ getComponentModel(scope.row.componentId) }}</span>
         </template>

+ 5 - 5
cirs-ui/src/views/biz/recommend/index.vue

@@ -16,9 +16,9 @@
     </div>
     <el-table v-loading="loading" :data="componentList">
       <el-table-column label="元器件名称" align="center" prop="componentName" :show-overflow-tooltip="true" />
-      <el-table-column label="型号规格" align="center" prop="componentModel" :show-overflow-tooltip="true" />
+      <el-table-column label="国产型号" align="center" prop="componentModel" :show-overflow-tooltip="true" />
       <el-table-column label="质量等级" align="center" prop="qualityGrade" :show-overflow-tooltip="true" />
-      <el-table-column label="国产替代型号" align="center" prop="replaceDomesticModel" :show-overflow-tooltip="true" />
+      <el-table-column label="国产型号替代型号" align="center" prop="replaceDomesticModel" :show-overflow-tooltip="true" />
       <!--      <el-table-column label="元器件应用" align="center" prop="applications"/>-->
       <el-table-column label="元器件应用" align="center" :show-overflow-tooltip="true">
         <template slot-scope="scope">
@@ -94,10 +94,10 @@
         <el-form-item label="生产厂家" prop="manufacturer">
           <el-input v-model="form.manufacturer" readonly />
         </el-form-item>
-        <el-form-item label="型号规格" prop="componentModel">
+        <el-form-item label="国产型号" prop="componentModel">
           <el-input v-model="form.componentModel" readonly />
         </el-form-item>
-        <el-form-item label="国产替代型号" prop="replaceDomesticModel">
+        <el-form-item label="国产型号替代型号" prop="replaceDomesticModel">
           <el-input v-model="form.replaceDomesticModel" readonly />
         </el-form-item>
         <el-form-item label="质量等级" prop="qualityGrade">
@@ -276,7 +276,7 @@ export default {
       // 是否显示弹出层
       open: false,
       searchCondition: '',
-      // 查询参数  元器件规格 元器件名称 国产替代型号 元器件应用 操作
+      // 查询参数  元器件规格 元器件名称 国产型号替代型号 元器件应用 操作
       queryParams: {
         pageNum: 1,
         pageSize: 10,

+ 2 - 2
cirs-ui/src/views/index.vue

@@ -57,10 +57,10 @@
         <el-form-item label="生产厂家" prop="manufacturer">
           <el-input v-model="form.manufacturer" readonly="true" />
         </el-form-item>
-        <el-form-item label="型号规格" prop="componentModel">
+        <el-form-item label="国产型号" prop="componentModel">
           <el-input v-model="form.componentModel" readonly="true" />
         </el-form-item>
-        <el-form-item label="国产替代型号" prop="replaceDomesticModel">
+        <el-form-item label="国产型号替代型号" prop="replaceDomesticModel">
           <el-input v-model="form.replaceDomesticModel" readonly="true" />
         </el-form-item>
         <el-form-item label="质量等级" prop="qualityGrade">