Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system-vue into dev

src/views/inspection/screen/inspectionBigScreen.vue

@@ -0,0 +1,13 @@
+<template>
+
+</template>
+
+<script>
+export default {
+  name: 'inspectionBigScreen.vue'
+}
+</script>
+
+<style scoped>
+
+</style>

src/views/repair/screen/repairBigScreen.vue

@@ -0,0 +1,13 @@
+<template>
+
+</template>
+
+<script>
+export default {
+  name: 'repairBigScreen'
+}
+</script>
+
+<style scoped>
+
+</style>

src/views/repair/wares/WaresForm.vue

@@ -107,7 +107,7 @@
               </el-col>
               <el-col :span="12">
                 <el-form-item label="配件属性" prop="attribute">
-                  <el-select v-model="formData.attribute" placeholder="请选择单位">
+                  <el-select v-model="formData.attribute" placeholder="请选择配件属性">
                     <el-option v-for="dict in this.getDictDatas(DICT_TYPE.REPAIR_WARES_ATTRIBUTE)"
                                :key="dict.value" :label="dict.label" :value="dict.value"/>
                   </el-select>

src/views/rescue/screen/rescueBigScreen.vue

@@ -0,0 +1,13 @@
+<template>
+
+</template>
+
+<script>
+export default {
+  name: 'rescueBigScreen'
+}
+</script>
+
+<style scoped>
+
+</style>

src/views/system/notify/template/index.vue

@@ -116,9 +116,10 @@
           <el-input v-model="sendNotifyForm.content" type="textarea" placeholder="请输入模板内容" readonly />
         </el-form-item>
         <el-form-item label="接收人" prop="userId">
-          <el-select v-model="sendNotifyForm.userId" placeholder="请输入接收人" clearable style="width: 100%">
-            <el-option v-for="item in users" :key="parseInt(item.id)" :label="item.nickname" :value="parseInt(item.id)" />
-          </el-select>
+          <el-input v-model="sendNotifyForm.userId" type="text" placeholder="请输入接收人ID" />
+<!--          <el-select v-model="sendNotifyForm.userId" placeholder="请输入接收人" clearable style="width: 100%">-->
+<!--            <el-option v-for="item in users" :key="parseInt(item.id)" :label="item.nickname" :value="parseInt(item.id)" />-->
+<!--          </el-select>-->
         </el-form-item>
         <el-form-item v-for="param in sendNotifyForm.params" :key="param" :label="'参数 {' + param + '}'" :prop="'templateParams.' + param">
           <el-input v-model="sendNotifyForm.templateParams[param]" :placeholder="'请输入 ' + param + ' 参数'" />