Merge branch 'release3.0' into dev

RMS-FrontEnd/src/config/index.js

@@ -1,7 +1,7 @@
 export default {
     baseURL: "/api",
     host: window.location.host,
-    staticURL: process.env.NODE_ENV === 'production' ? 'http://139.224.24.90:8084' : (process.env.NODE_ENV === 'test'?'http://192.168.1.24:8084':'http://192.168.1.24:8084'),
-    staticURL2: process.env.NODE_ENV === 'production' ? 'http://139.224.24.90:8081' : 'http://139.224.24.90:8081',
-    pasURL:process.env.NODE_ENV === 'production' ? window.location.protocol+'//'+window.location.hostname+':80' : window.location.protocol+'//'+window.location.hostname+':8085',
+    staticURL: process.env.NODE_ENV === 'production' ? 'http://139.224.24.90:8084' : (process.env.NODE_ENV === 'test'?'http://139.224.24.90:8083':'http://192.168.1.24:8084'),
+    staticURL2: process.env.NODE_ENV === 'production' ? 'http://139.224.24.90:8081' : (process.env.NODE_ENV === 'test'?'http://139.224.24.90:8083':'http://192.168.1.24:8081'),
+    pasURL:process.env.NODE_ENV === 'production' ? window.location.protocol+'//'+window.location.hostname+':80' :(process.env.NODE_ENV === 'test'?window.location.protocol+'//'+window.location.hostname+':8080':window.location.protocol+'//'+window.location.hostname+':8085') ,
 }

RMS-FrontEnd/src/views/components/articles/components/history/other.vue

@@ -283,6 +283,6 @@ export default {
 
 <style lang="scss" scoped>
 .items{
-  cursor: pointer;
+   cursor: pointer;
 }
 </style>

RMS-FrontEnd/src/views/product/components/product.vue

@@ -106,7 +106,7 @@
       :before-close="close">
 
       <el-form :rules="rules" ref="productForm" :model="productForm" label-width="110px">
-        <el-form-item label="所属产品类别 " prop="productCategoryName" >
+        <el-form-item label="所属产品类别 " prop="productCategoryId" >
           <div class="selectButton">
             <el-select v-model="productForm.productCategoryId" @change="productFormSelect" filterable placeholder="请选择所属产品类别" clearable >
               <el-option
@@ -174,7 +174,7 @@
       append-to-body
       :close-on-click-modal="false"
       :before-close="categoryClose">
-      <el-form :rules="rules" ref="categoryForm" :model="categoryForm" label-width="80px">
+      <el-form :rules="categoryRules" ref="categoryForm" :model="categoryForm" label-width="80px">
         <el-form-item label="名称 " prop="productCategoryName">
           <el-input v-model="categoryForm.productCategoryName" placeholder="请输入名称"></el-input>
         </el-form-item>
@@ -265,7 +265,10 @@ export default {
       rules: {
         productName:[{ required: true, message: '请输入产品名称', trigger: 'blur' },],
         licenseRate:[{ required: false, validator:licenseRateRule, trigger: 'blur' },],
-        productCategoryName:[{ required: true, message: '请选择产品类别名称', trigger: 'blur' },],
+        productCategoryId:[{ required: true, message: '请选择产品类别名称', trigger: 'change' },],
+      },
+      categoryRules:{
+        productCategoryName:[{ required: true, message: '请输入产品类别名称', trigger: 'blur' },],
       },
       isCollapse:false,
     }

RMS-FrontEnd/src/views/report/components/Card.vue

@@ -22,6 +22,7 @@
                         <el-dropdown-item command="10" v-if="[0,1,2,3].includes(item.type)&&[2].includes(item.status)"> 添加对比文件</el-dropdown-item>
                         <el-dropdown-item command="11" v-if="item.status!=3"> 完成报告</el-dropdown-item>
                         <el-dropdown-item command="12"> 追踪报告</el-dropdown-item>
+
                         <!-- <el-dropdown-item command="6" v-if="[2,3].includes(item.status)&& item.type != 4">导入 </el-dropdown-item> -->
                         <el-dropdown-item command="7" divided style="color: red;">删除 </el-dropdown-item>
                         <!-- <el-dropdown-item command="0">分享</el-dropdown-item> -->