Merge branch 'master' of http://182.151.8.209:9010/eln_TD/eln_web

src/views/business/study/comp/edit.vue

@@ -26,7 +26,7 @@
           </el-col>
           <el-col :span="24">
             <el-form-item :label="$t('page.business.study.study.leader')+'：'" prop="leader">
-              <SelectDeptUser @change="changeLeader" v-model="infoDialog.formData.leader" :name="infoDialog.formData.leaderName" :nameEn="infoDialog.formData.leaderNameEn"  />
+              <SelectDeptUser :readOnly="!checkRole(['TFM'])" @change="changeLeader" v-model="infoDialog.formData.leader" :name="infoDialog.formData.leaderName" :nameEn="infoDialog.formData.leaderNameEn"  />
             </el-form-item>
           </el-col>
           <el-col :span="24">
@@ -42,6 +42,7 @@
 </template>
 
 <script>
+import { checkRole } from "@/utils/permission";
 import { study_info,study_save} from "@/api/business/study/study";
 import SelectDeptUser from '@/views/business/comps/select/SelectDeptUser.vue';
 import Sign from './sign.vue'
@@ -89,6 +90,7 @@ export default {
   created() {
   },
   methods: {
+    checkRole,
     changeLeader(val){
       this.infoDialog.formData.leader = val.id
       this.infoDialog.formData.leaderName = val.name

src/views/business/template/list.vue

@@ -49,7 +49,10 @@
           <span v-if="scope.row.product == 1">试剂</span>
           <span v-if="scope.row.product == 3">给药制剂</span>
           <span v-if="scope.row.product == 5">麻精药</span>
-          <span v-if="scope.row.product == 7">无</span>
+          <span v-if="scope.row.product == 7">供试品</span>
+          <span v-if="scope.row.product == 9">细胞</span>
+          <span v-if="scope.row.product == 11">细菌</span>
+          <span v-if="scope.row.product == 20">无</span>
         </template>
       </el-table-column>
       <!-- <el-table-column label="模板类型" prop="type" align="center" width="100">
@@ -110,7 +113,10 @@
                 <el-option label="试剂" :value="1" />
                 <el-option label="给药制剂" :value="3" />
                 <el-option label="麻精药" :value="5" />
-                <el-option label="无" :value="7" />
+                <!-- <el-option label="供试品" :value="7" /> -->
+                <el-option label="细胞" :value="9" />
+                <el-option label="细菌" :value="11" />
+                <el-option label="无" :value="20" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -261,9 +267,9 @@ export default {
           name: [
             { required: true, message: '请输入', trigger: "blur" }
           ],
-          nameEn: [
-            { required: true, message: '请输入', trigger: "blur" }
-          ],
+          // nameEn: [
+          //   { required: true, message: '请输入', trigger: "blur" }
+          // ],
           deptId: [
             { required: true, message: '请选择', trigger: "change" }
           ],