浏览代码

adm:feat > 修改添加/修改楼层输入类型

shaun-sheep 4 年之前
父节点
当前提交
90b0259bc0

+ 28 - 26
src/components/ready/buildfloor/formItems.vue

@@ -6,7 +6,7 @@
           :label="item.name"
           :prop="item.code"
           v-if="all||item.visible"
-          :class="{FloorTypeSelect:item.inputMode == 'D1'||item.unit}">
+          :class="{FloorTypeSelect:item.dataType == 'ENUM'||item.unit}">
 
           <el-input
             v-model="form[item.path]"
@@ -41,47 +41,49 @@
           </span>
 
           <!--/二维码相关-->
-          <span v-else-if="item.inputMode == 'B1'">
+          <span v-else-if="item.dataType == 'STRING'">
             <el-input v-model="form[item.path]"
-                      :placeholder="(item.inputMode === 'B1' && item.path==='localId') ? '填写示例:F1、B1?':'' "/>
-              <div v-if="item.inputMode === 'B1' && item.path==='localId' && isShowTitle"
+                      :disabled="!item.editable"
+                      :placeholder="(item.dataType == 'STRING' && item.path==='localId') ? '填写示例:F1、B1?':'' "/>
+              <div v-if="item.dataType == 'STRING' && item.path==='localId' && isShowTitle"
                    style="color: gray;font-size: 12px">
                 用于楼层平面图切换
               </div>
           </span>
 
-          <el-input v-model="form[item.path]" v-else-if="item.inputMode == 'A1'||item.inputMode == 'A2'" type="number">
+          <el-input v-model="form[item.path]" v-else-if="item.dataType == 'INTEGER'||item.dataType == 'DOUBLE'"
+                    type="number">
             <template slot="append" v-if="item.unit">{{ item.unit }}</template>
           </el-input>
 
-          <el-select v-model="form[item.path]" placeholder="请选择" v-else-if="item.inputMode == 'D1'">
+          <el-select v-model="form[item.path]" placeholder="请选择" v-else-if="item.dataType == 'ENUM'">
             <el-option v-for="op in item.options" :key="op.code" :label="op.name" :value="op.code"></el-option>
           </el-select>
 
-          <el-cascader
-            v-else-if="item.inputMode == 'D1L'"
-            placeholder="请选择"
-            :options="item.options"
-            v-model="form[item.path]"
-            :props="item.props"
-            filterable
-            :show-all-levels="false"
-            clearable
-            style="width: 200px"/>
+          <!--          <el-cascader-->
+          <!--            v-else-if="item.inputMode == 'D1L'"-->
+          <!--            placeholder="请选择"-->
+          <!--            :options="item.options"-->
+          <!--            v-model="form[item.path]"-->
+          <!--            :props="item.props"-->
+          <!--            filterable-->
+          <!--            :show-all-levels="false"-->
+          <!--            clearable-->
+          <!--            style="width: 200px"/>-->
 
-          <el-input
-            v-else-if="item.inputMode == 'L'||item.inputMode == 'L1'||item.inputMode == 'L2'||item.inputMode == 'M'"
-            v-model="form[item.path]">
-            <template slot="append" v-if="item.unit">{{ item.unit }}</template>
-          </el-input>
-          <el-input v-model="form[item.path]" v-else disabled title="暂不支持" :placeholder="item.inputMode?'':'字典无输入类型'"></el-input>
+          <!--                    <el-input-->
+          <!--                      v-else-if="item.inputMode == 'L'||item.inputMode == 'L1'||item.inputMode == 'L2'||item.inputMode == 'M'"-->
+          <!--                      v-model="form[item.path]">-->
+          <!--                      <template slot="append" v-if="item.unit">{{ item.unit }}</template>-->
+          <!--                    </el-input>-->
+          <el-input v-model="form[item.path]" v-else :placeholder="item.inputMode?'':'字典无输入类型'"></el-input>
         </el-form-item>
       </div>
     </el-form>
   </div>
 </template>
 <script>
-import {getDataDictionary} from "@/api/dict";
+import { getDataDictionary } from "@/api/dict";
 
 export default {
   props: {
@@ -134,10 +136,10 @@ export default {
       };
       getDataDictionary(params, res => {
         let arr = res.content.map(item => {
-          if ((item.inputMode === 'D1' || item.inputMode === 'D2' || item.inputMode === 'E2' || item.inputMode === 'D1L') && item.dataSource) {
-            // item.options = JSON.parse(item.dataSource)
+          const category = ['ENUM', 'MENUM', 'BOOLEAN']
+          if (item.category == 'STATIC' && item.dataType.includes(category) && item.dataSource) {
             item.options = item.dataSource
-            if (item.options[0] && item.options[0].content) {
+            if (item.options[0]) {
               item.props = {
                 value: 'code',
                 label: 'name',

+ 1 - 1
src/views/ready/buildfloor/addFloor/index.vue

@@ -10,7 +10,7 @@
   </el-dialog>
 </template>
 <script>
-import {manageCreateFloor, manageUpdateFloor} from "@/api/object/floor";
+import { manageCreateFloor, manageUpdateFloor } from "@/api/object/floor";
 import formItems from "@/components/ready/buildfloor/formItems";
 import tools from "@/utils/buildfloor/tools";
 

+ 0 - 2
src/views/ready/buildfloor/index.vue

@@ -230,14 +230,12 @@ export default {
           // item.options = JSON.parse(item.dataSource)
           if (item.category == 'STATIC' && item.dataType.includes(category) && item.dataSource) {
             item.options = item.dataSource
-            // if (item.options[0] && item.options[0].content) {
             item.props = {
               value: 'code',
               label: 'name',
               children: 'content',
               checkStrictly: true
             }
-            // }
           }
           if (first[item.firstName] && first[item.firstName].length) {
           } else {