解决冲突

src/api/ncs_clerk.js

@@ -52,7 +52,7 @@ export function getRoles(params) {
   return request({
     url: '/ncs/clerk/getRoles',
     method: 'POST',
-    loading: true,
+    loading: false,
     data: params
   })
 }
@@ -69,4 +69,4 @@ export function updateParentById(params) {
     loading: true,
     data: params
   })
-}
+}

src/router/index.js

@@ -162,7 +162,7 @@ export const partRoutes = [
     children: [
       {
         path: 'index',
-        component: () => uiVersion === 1 ? import('@/views/customer/patientManagement') : import('@/views/customer/customerManagement') ,
+        component: () => uiVersion === 1 ? import('@/views/customer/patientManagement') : import('@/views/customer/customerManagement'),
         name: uiVersion === 1 ? 'patientManagement' : 'customerManager',
         meta: { title: uiVersion === 1 ? '病人管理' : '用户管理', icon: 'el-icon-s-custom', noCache: true }
       }
@@ -332,7 +332,7 @@ export const partRoutes = [
         path: 'index',
         component: () => import('@/views/ncs-event/index'),
         name: 'eventList',
-        meta: { title: '按钮事件管理', icon: 'el-icon-notebook-2', noCache: true}
+        meta: { title: '按钮事件管理', icon: 'el-icon-notebook-2', noCache: true }
       }
     ],
     hidden: uiVersion === 1

src/views/hospitalFrame/frameTreeView.vue

@@ -83,7 +83,7 @@
           <el-col :span="24">
             <!--医院结构名称-->
             <el-form-item label="名称" prop="name">
-              <el-input v-model="frameInfo.name" :maxlength="20">
+              <el-input v-model="frameInfo.name" :maxlength="20" @change="frameChange">
                 <template slot="append">{{ frameInfo.type === 4?"房":"床" }}</template>
               </el-input>
             </el-form-item>
@@ -97,6 +97,14 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row>
+          <el-col :span="24">
+            <!--医院结构别名-->
+            <el-form-item label="全称" prop="full_name">
+              <el-input v-model="frameInfo.full_name" :maxlength="20" />
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-row hidden>
           <el-col :span="12">
             <el-form-item label="类型">
@@ -208,6 +216,10 @@ export default {
         ],
         alias: [
           { min: 2, max: 10, message: '长度在 2 到 10 个字符', trigger: 'blur' }
+        ],
+        full_name: [
+          this.MixinRequired('请输入全称！'),
+          { min: 2, max: 10, message: '长度在 2 到 10 个字符', trigger: 'blur' }
         ]
       },
       /** 快速创建空间结构弹窗 **/
@@ -330,11 +342,6 @@ export default {
         if (valid) {
           const params = this.MixinClone(this.frameInfo)
           if (params.id) {
-            if (params.type === 4) {
-              params.full_name = params.name
-            } else {
-              params.full_name = params.parent_name + '-' + params.name + '床'
-            }
             HospitalFrame_API.updateHospitalFrame(params.id, params).then(response => {
               this.$message.success('修改成功！')
               this.frameDialogVisible = false
@@ -347,11 +354,6 @@ export default {
             if (!params.part_id) {
               params.part_id = this.$store.getters.partId
             }
-            if (params.type === 4) {
-              params.full_name = params.name
-            } else {
-              params.full_name = params.parent_name + '-' + params.name + '床'
-            }
 
             HospitalFrame_API.addHospitalFrame(params).then(response => {
               this.$message.success('添加成功！')
@@ -462,6 +464,22 @@ export default {
       if (val > this.createFrameModel.room_end_no) {
         this.createFrameModel.room_end_no = val
       }
+    },
+    /**
+     * 名称输入变化
+     * @param val
+     */
+    frameChange(val) {
+      console.log('s', this.frameInfo)
+      if (!this.frameInfo.full_name) {
+        if (this.frameInfo.type === 4) {
+          this.$set(this.frameInfo, 'full_name', val)
+          // this.frameInfo.full_name = val
+        } else {
+          this.$set(this.frameInfo, 'full_name', this.frameInfo.parent_name + '-' + val + '床')
+          // this.frameInfo.full_name =
+        }
+      }
     }
   }
 }

src/views/ncs-orginazition/components/AppVersionManager.vue

@@ -20,7 +20,8 @@
             </el-upload>
           </el-form-item>
           <el-form-item label="版本数字" prop="version_no">
-            <el-input-number v-model="formmodel.version_no" type="number" clearable :min="1" placeholder="请输入版本信息" />
+            <el-input-number v-model="formmodel.version_no" :min="1" :max="100" placeholder="请输入版本数字" />
+<!--            <el-input v-model="formmodel.version_no" type="number" clearable :maxlength="100" placeholder="请输入版本信息" />-->
           </el-form-item>
           <el-form-item label="版本信息" prop="version_code">
             <el-input v-model="formmodel.version_code" clearable :maxlength="100" placeholder="请输入版本信息" />