Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/views/device_management/index.vue

src/views/certificate/index.vue

@@ -34,7 +34,7 @@
         </el-form-item>
         <el-form-item label="学历：" prop="education">
           <el-select v-model="form.education" placeholder="填写学历">
-            <el-option v-for="item in educationDicList" :key="item.id" :label="item.name" :value="item.value" />
+            <el-option v-for="item in educationDicList" :key="item.id" :label="item.name" :value="item.code" />
           </el-select>
         </el-form-item>
         <el-form-item label="专业：" prop="major">
@@ -42,7 +42,7 @@
         </el-form-item>
         <el-form-item label="职称：" prop="certificateName">
           <el-select v-model="form.certificateName" placeholder="填写职称">
-            <el-option v-for="item in certificateNameDicList" :key="item.id" :label="item.name" :value="item.value" />
+            <el-option v-for="item in certificateNameDicList" :key="item.id" :label="item.name" :value="item.code" />
           </el-select>
         </el-form-item>
         <el-form-item label="级别/项目/代号：" prop="levelList">
@@ -59,7 +59,7 @@
         </el-form-item>
         <el-form-item label="备注：" prop="remarks">
           <el-select v-model="form.remarks" placeholder="填写备注">
-            <el-option v-for="item in remarksDicList" :key="item.id" :label="item.name" :value="item.value" />
+            <el-option v-for="item in remarksDicList" :key="item.id" :label="item.name" :value="item.code" />
           </el-select>
         </el-form-item>
       </el-form>
@@ -139,9 +139,9 @@ export default {
       colConfigs: [
         { prop: 'username', label: '姓名', align: 'center', width: 50 },
         { prop: 'identificationNum', label: '身份证号码', align: 'center' },
-        { prop: 'education', label: '学历', align: 'center', width: 50 },
-        { prop: 'major', label: '专业', align: 'center' },
-        { prop: 'certificateName', label: '职称', align: 'center', width: 60 },
+        { prop: 'education', label: '学历', align: 'center', width: 50, formatter: this.formatterDicData },
+        { prop: 'major', label: '专业', align: 'center', formatter: this.formatterDicDataMajor },
+        { prop: 'certificateName', label: '职称', align: 'center', width: 60, formatter: this.formatterDicDataJob },
         { prop: 'level', label: '级别', align: 'center', width: 50 },
         { prop: 'project', label: '项目', align: 'center' },
         { prop: 'code', label: '代号', align: 'center', width: 50 },
@@ -152,7 +152,7 @@ export default {
           }
         },
         { prop: 'renewalDate', label: '发换证日期', align: 'center', width: 50 },
-        { prop: 'remarks', label: '备注', align: 'center', width: 60 },
+        { prop: 'remarks', label: '备注', align: 'center', width: 60,formatter: this.formatterDicDataRemark },
         { slot: 'operation' }
       ],
       permission: {
@@ -312,6 +312,36 @@ export default {
         this.dialogVisible = false
         downloadFile(data, parseTime(new Date()) + '-' + this.crud.title + '数据', 'xlsx')
       })
+    },
+    formatterDicData(cellValue) {
+      if (cellValue != null) {
+        let label = ''
+        this.educationDicList.filter(dicData => dicData.code === cellValue.education).forEach(dicData => {
+          label = dicData.name
+        })
+        return label
+      }
+      return null
+    },
+    formatterDicDataJob(cellValue) {
+      if (cellValue != null) {
+        let label = ''
+        this.certificateNameDicList.filter(dicData => dicData.code === cellValue.certificateName).forEach(dicData => {
+          label = dicData.name
+        })
+        return label
+      }
+      return null
+    },
+    formatterDicDataRemark(cellValue){
+            if (cellValue != null) {
+        let label = ''
+        this.remarksDicList.filter(dicData => dicData.code === cellValue.remarks).forEach(dicData => {
+          label = dicData.name
+        })
+        return label
+      }
+      return null
     }
   }
 }

src/views/device_management/index.vue

@@ -299,6 +299,17 @@ const defaultForm = form({
   checkDate: ''
 })
 
+// 自定义模板内容
+const PrefixPlusText = {
+  props: ['value', 'functions'],
+  template: `
+    <el-tag v-if="functions(value) === '在用'" effect="dark"><span v-html="functions(value)"></span></el-tag>
+    <el-tag v-else-if="functions(value) === '停用'" type="danger" effect="dark"><span v-html="functions(value)"></span></el-tag>
+    <el-tag v-else-if="functions(value) === '待报废'" type="warning" effect="dark"><span v-html="functions(value)"></span></el-tag>
+    <el-tag v-else type="info" effect="dark"><span v-html="functions(value)"></span></el-tag>
+  `
+}
+
 export default {
   name: 'InstrumentList',
   components: { Pagination, Query, Crud, CustomTable, Edit, TreeSelect, Move },

src/views/ysjl/addJyfa.vue

@@ -84,7 +84,9 @@ export default {
         type: '',
         jianyanxiangmu: '',
         userId: '',
-        templateId: ''
+        templateId: '',
+        defaultStatus: false,
+        jybgTemplateId: ''
       }
     }
   },
@@ -133,6 +135,7 @@ export default {
           this.dialogVisible = false
         }
       }
+
       this.api({
         url: '/ysjl/addJyfa',
         method: 'get',
@@ -251,7 +254,7 @@ export default {
      */
     editChild(id, jianyanxiangmu, departmentId, modelId) {
       this.api({
-        url: '/template/getById',
+        url: '/template',
         method: 'get',
         params: {
           id: modelId