增加护理门灯控制，增加事件转发功能开关

languages/en.js

@@ -96,8 +96,5 @@ module.exports = {
     clerkManage: 'clerk manage',
     memberManage: 'member manage',
     mobileDeviceManage: 'mobile device manage'
-  },
-  error: {
-    fromError: '表单填写有误，请检查！'
   }
 }

languages/zh-CN.js

@@ -673,6 +673,8 @@ module.exports = {
     nurseKeyVal: '护士主机转接时长',
     autoAccept: '分机开启自动接听',
     openAutoAccept: '开启自动接听',
+    eventForward: '事件转发功能',
+    openEventForward: '开启事件转发',
     communicationModeBed: '分机通讯方式',
     communicationModeNurse: '护士主机通讯方式',
     communicationModeMobile: '移动设备通讯方式',
@@ -710,7 +712,8 @@ module.exports = {
     vistitation: '探视机',
     transferDevice: '转换盒',
     organizationAdd: '新建组织',
-    boardShowEmptyBed: '看板显示空床'
+    boardShowEmptyBed: '看板显示空床',
+    nursingColorRgb: '护理门灯颜色'
   },
   role: {
     roleName: '角色名称',

src/views/customer/components/patientManager.vue

@@ -507,6 +507,7 @@
     import vueQr from "vue-qr";
     import avator from "@/assets/avatar.jpeg";
     import {FRAME_TYPE} from "@/utils/enum/FrameTypeEnum";
+    import * as API_SystemConfig from "@/api/ncs_systemconfig";
     const serverUrl = domain.serverUrl
     export default {
         name: 'PatientManager',
@@ -537,6 +538,7 @@
                 filterState: null,
                 rowSelection: null,
                 frameworkComponents: null,
+                isCloud: false,
                 /** 列表参数 */
                 params: {
                     page_size: 20,
@@ -597,8 +599,10 @@
                     mobile: [
                         {
                             validator: (rule, value, callback) => {
-                                if (value === null || value === '') { // 手机号可为空
-                                    callback()
+                                if (this.isCloud === false) {
+                                    if (value === null || value === '') { // 手机号可为空
+                                      callback()
+                                    }
                                 }
                                 if (!RegExp.mobile.test(value)) {
                                     callback(new Error(this.$t('member.mobileInputMsg')))
@@ -658,7 +662,7 @@
                 choice: this.$t('action.choice'),
                 colour: this.$t('action.colour'),
                 deleted: this.$t('action.delete'),
-                qrCode: null
+                qrCode: null,
             }
         },
         computed: {
@@ -879,6 +883,8 @@
             })
             this.getEmptyBeds()
 
+            this.getCloud()
+
             // 加载医护人员选择项
             this.getEmployees()
             // 加载护理参数设置项
@@ -1198,6 +1204,7 @@
             },
 
             handleEdit(row) {
+                this.relativeRules.mobile[0].required = this.isCloud
                 this.formmodel = {
                     ...row
                 }
@@ -1509,6 +1516,11 @@
                 this.qrCode = 'http://m.wdklian.com/care/apk/care.user?type=USER_LOGIN&uid=' + r
               })
             }
+        },
+        getCloud() {
+          API_SystemConfig.cloud().then(r => {
+            this.isCloud = r
+          })
         }
     }
 </script>

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

@@ -279,11 +279,31 @@
               </el-form-item>
             </el-col>
 
-            <el-form-item :label="this.$t('partInfo.autoAccept')" prop="auto_accept">
-              <el-checkbox v-model="formmodel.auto_accept" :true-label="1" :false-label="0">{{ this.$t('partInfo.openAutoAccept') }}</el-checkbox>
-            </el-form-item>
+            <el-col :span="8">
+              <el-form-item :label="this.$t('partInfo.autoAccept')" prop="auto_accept">
+                <el-checkbox v-model="formmodel.auto_accept" :true-label="1" :false-label="0">{{ this.$t('partInfo.openAutoAccept') }}</el-checkbox>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="8">
+              <el-form-item :label="this.$t('partInfo.eventForward')" prop="event_forward">
+                <el-checkbox v-model="formmodel.event_forward" :true-label="1" :false-label="0">{{ this.$t('partInfo.openEventForward') }}</el-checkbox>
+              </el-form-item>
+            </el-col>
           </el-row>
 
+
+          <el-row>
+            <el-col :span="8">
+              <el-form-item :label="this.$t('partInfo.nursingColorRgb')">
+<!--                <colorPicker v-model="formmodel.nursing_color_rgb" />-->
+                <el-input v-model="formmodel.nursing_color_rgb" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+
+
           <el-row>
             <el-col :span="8">
               <el-form-item :label="this.$t('partInfo.communicationModeBed')" prop="communication_mode_bed">
@@ -494,7 +514,9 @@ export default {
                 door_nurse_title: '呼叫护士',
                 door_nurse_valid: 1,
                 door_nursing_title: '进入护理',
-                door_nursing_valid: 1
+                door_nursing_valid: 1,
+                event_forward: 0,
+                nursing_color_rgb: '#000000'
               }
             }
           } else {
@@ -545,6 +567,7 @@ export default {
     onSubmit() {
       this.$refs['editform'].validate((valid) => {
         if (valid) {
+          // this.formmodel.nursing_color_rgb = this.formmodel.nursing_color_rgb.replace('#', '')
           if (this.dayStart) {
             this.formmodel.day_start = this.dayStart.toLocaleTimeString('chinese', { hour12: false })
           }
@@ -650,4 +673,8 @@ fieldset {
 .el-input .el-select {
   width: 100px;
 }
+
+/deep/ .m-colorPicker .box.open{
+  z-index: 1000 !important;
+}
 </style>