Merge branch 'master' of http://git.wdklian.com/allen/ncs_ui

# Conflicts:
#	languages/zh-CN.js

languages/zh-CN.js

@@ -619,7 +619,9 @@ module.exports = {
     authRegular: '菜单权限',
     inputAuthRegular: '请输入菜单权限！',
     authRegularMsg: '长度在 1 到 50 个字符',
-    MenuDeleteMsg: '确定要删除这个菜单吗？如果有子菜单，子菜单也会被一并删除！'
+    MenuDeleteMsg: '确定要删除这个菜单吗？如果有子菜单，子菜单也会被一并删除！',
+    colorRgb: '颜色标识',
+    basic: '基本护理信息'
   },
   partInfo: {
     partInfo: '系统设置',
@@ -719,6 +721,7 @@ module.exports = {
     roleDelete: '删除角色',
     roleEdit: '编辑角色事件',
     onChoiceRole: '没有选中任何角色!',
+    boardShowEmptyBed: '看板显示空床'
   },
   tab: {
     home: '首页',

src/views/ncs-clerk/components/clerkList.vue

@@ -518,7 +518,7 @@ export default {
     },
     /** 性别格式化 */
     formatterSex(row) {
-      return row.data.sex === 1 ? this.$t('action.man') : row.data.sex === 0 ? this.$t('action.woman') : this.$t('action.unknown')
+      return row.data.sex === 1 ? this.$t('member.man') : row.data.sex === 0 ? this.$t('member.woman') : this.$t('member.unknown')
     },
     formatterRole(row) {
       if (row.data.founder === 1) {

src/views/ncs-nurse-config/index.vue

@@ -174,6 +174,9 @@
         <el-form-item :label="this.$t('action.sort')" prop="index_no">
           <el-input-number v-model="addForm.index_no" :min="1" :max="100" />
         </el-form-item>
+        <el-form-item  prop="basic">
+          <el-checkbox v-model="addForm.basic">{{this.$t('nurseConfig.basic')}}</el-checkbox>
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click.native="addFormVisible = false">{{ this.$t('action.cancel') }}</el-button>

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

@@ -154,6 +154,9 @@
                   :label="this.$t('partInfo.dayOrNightTransferBoxSystemVol')"
                 />
               </el-form-item>
+
+
+
             </el-col>
           </el-row>
 
@@ -343,6 +346,12 @@
               <el-form-item :label="this.$t('partInfo.upSeconds')">
                 <el-input-number v-model="formmodel.up_seconds" :min="1" :max="300" :label="this.$t('partInfo.upSeconds')" />
               </el-form-item>
+
+            </el-col>
+            <el-col :span="8">
+              <el-form-item  prop="board_show_empty_bed">
+                <el-checkbox v-model="formmodel.board_show_empty_bed">{{this.$t('partInfo.boardShowEmptyBed')}}</el-checkbox>
+              </el-form-item>
             </el-col>
           </el-row>