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

src/views/ncs-event/index.vue

@@ -59,6 +59,10 @@
             <el-input-number v-model="formmodel.min_y" :min="0" :max="10000" placeholder="最小y轴" @change="handleChangeMinY" />至
             <el-input-number v-model="formmodel.max_y" :min="0" :max="10000" placeholder="最大y轴" @change="handleChangeMaxY" />
           </el-form-item>
+
+          <el-form-item label="排序" prop="sort">
+            <el-input-number v-model="formmodel.sort" :min="1"  placeholder="排序"  />
+          </el-form-item>
           <el-form-item label="设备类型" prop="type">
             <el-select v-model="formmodel.type" placeholder="请选择类型">
               <el-option label="遥控器" value="遥控器" />
@@ -129,8 +133,8 @@ export default {
       params: {
         page_no: 1,
         page_size: 10,
-        sort: 'create_time',
-        dir: 'desc'
+        sort: 'sort',
+        dir: 'asc'
       },
       editflag: 0,
       srcList: ['1'],
@@ -175,12 +179,13 @@ export default {
           }
         }
       },
-      { headerName: '名称', field: 'name', sortable: true, minWidth: 150 },
-      { headerName: '描述', field: 'desc', sortable: true, minWidth: 220 },
-      { headerName: '唯一标识码', field: 'key_code', sortable: true, minWidth: 160 },
-      { headerName: 'x轴范围', field: 'min_x', sortable: true, filter: false, valueFormatter: this.formatterX, minWidth: 100 },
-      { headerName: 'y轴范围', field: 'min_y', sortable: true, filter: false, valueFormatter: this.formatterY, minWidth: 100 },
-      { headerName: '创建时间', field: 'create_time', sortable: true, valueFormatter: this.formatterDate, minWidth: 170, filter: 'agDateColumnFilter',
+      { headerName: '名称', field: 'name', sortable: true },
+      { headerName: '描述', field: 'desc', sortable: true},
+      { headerName: '唯一标识码', field: 'key_code', sortable: true },
+      { headerName: 'x轴范围', field: 'min_x', sortable: true, filter: false, valueFormatter: this.formatterX },
+      { headerName: 'y轴范围', field: 'min_y', sortable: true, filter: false, valueFormatter: this.formatterY },
+      { headerName: '排序', field: 'sort', sortable: true, filter: true },
+      { headerName: '创建时间', field: 'create_time', sortable: true, valueFormatter: this.formatterDate, filter: 'agDateColumnFilter',
         filterParams: {
           comparator: (filterLocalDateAtMidnight, cellValue) => { // 所有数据都由服务器端过滤，此处只需返回0 即可
             const celldate = unixToDate(cellValue, 'yyyy-MM-dd 00:00:00')
@@ -200,7 +205,7 @@ export default {
         filter: false,
         pinned: 'right',
         lockPinned: true,
-        width: 100,
+        width: 160,
         resizable: false,
         sortable: false
       },
@@ -216,7 +221,7 @@ export default {
         },
         pinned: 'right',
         lockPinned: true,
-        width: 100,
+        width: 160,
         resizable: false,
         filter: false,
         sortable: false

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

@@ -282,6 +282,23 @@
             </el-form-item>
           </el-col>
           </el-row>
+          <el-row>
+            <el-form-item label="自定义呼叫角色1" prop="customize_role_call_first">
+              <el-radio-group v-model="formmodel.customize_role_call_first">
+                <el-radio :label="0">不显示</el-radio>
+                <el-radio :disabled="formmodel.customize_role_call_second===item.role_id" :label="item.role_id" v-for="(item,index) in partRoles" :key="index">{{item.role_name}}</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-row>
+
+          <el-row>
+            <el-form-item label="自定义呼叫角色2" prop="customize_role_call_second">
+              <el-radio-group v-model="formmodel.customize_role_call_second">
+                <el-radio :label="0">不显示</el-radio>
+                 <el-radio :label="item.role_id" :disabled="formmodel.customize_role_call_first===item.role_id" v-for="(item,index) in partRoles" :key="index">{{item.role_name}}</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-row>
 
         </fieldset>
 
@@ -302,7 +319,7 @@ import * as API_Part from '@/api/ncs_partInfo'
 import { saveListByCustomer } from '@/api/ncs_customer'
 import Storage from '@/utils/storage'
 import { init485Device, initData } from "@/api/initialize";
-
+import * as API_Clerk from '@/api/ncs_clerk'
 export default {
   name: 'PartInfoEdit',
   props: {
@@ -320,7 +337,8 @@ export default {
       nurseLevel0Config: [],
       parents: [],
       isShow: false,
-      isDisabled: false
+      isDisabled: false,
+      partRoles: []
     }
   },
   async mounted() {
@@ -328,6 +346,7 @@ export default {
     // this.nurseLevel0Config = await API_Nurse.getNurseConfigs(this.partId, 0)
     this.getPartInfo()
     this.getPartents()
+    this.getRoles({ page_size: 200, page_no: 1, fixedCondition: ' shop_id = -1 and role_name<>"护士"', sort: ' role_id', dir: 'desc' })
   },
   methods: {
     getPartInfo() {
@@ -370,7 +389,9 @@ export default {
                 transfer_duration_leader: 15,
                 communication_mode_bed: 1,
                 communication_mode_nurse: 1,
-                communication_mode_mobile: 1
+                communication_mode_mobile: 1,
+                customize_role_call_first:0,
+                customize_role_call_second:0
               }
             }
           } else {
@@ -400,6 +421,13 @@ export default {
         }
       }
     },
+
+    getRoles(param) {
+      // 获取角色
+      API_Clerk.getRoles(param).then(response => {
+        this.partRoles = response.data
+      })
+    },
     onSubmit() {
       this.$refs['editform'].validate((valid) => {
         if (valid) {