Merge branch 'master' of http://140.143.162.39:3000/shentun/peisweb

src/components/patientRegister/PatientRegisterEdit.vue

@@ -1322,9 +1322,9 @@ export default {
       })
 
       // 业务员 {operatorTypes:["1","3"]}
-      postapi('/api/identity/users/GetListByOperatorType', { operatorTypes: ["0", "1", "2", "3", "4"] })
+      //postapi('/api/identity/users/GetListByOperatorType', { operatorTypes: ["0", "1", "2", "3", "4"] })
       //roleSysParmId:'sale_role_id'
-      //postapi('/api/identity/users/GetUserListBySaleRole',{})
+      postapi('/api/identity/users/GetUserListBySaleRole')
         .then(res => {
           if (res.code > -1) {
             this.dictSalesman = res.data

src/components/patientRegister/PatientRegisterList.vue

@@ -5,8 +5,8 @@
       <div :style="'width:' + (window.pageWidth - 200 - 145) + 'px;'" @contextmenu.prevent="onContextmenu">
         <div>
           <u-table :data="tableData" border :height="window.pageHeight < 600
-              ? 248
-              : Math.floor(((window.pageHeight - 250) * 2) / 3)
+            ? 248
+            : Math.floor(((window.pageHeight - 250) * 2) / 3)
             " highlight-current-row @row-click="rowClick" @row-dblclick="dblClick" size="small" row-key="id"
             @selection-change="handleSelectionChange" @row-contextmenu="onCellRightClick" ref="info" id="info"
             :row-class-name="handleRowClassName" use-virtual :row-height="25" @table-body-scroll="scrollFull"
@@ -15,8 +15,8 @@
             <u-table-column v-for="(item, index) in dragCol" :key="index" :type="dragCol[index].type"
               :min-width="dragCol[index].minWidth" :align="dragCol[index].align" :label="item.label"
               :prop="dragCol[index].prop" :sortable="dragCol[index].type || dragCol[index].prop == 'sn'
-                  ? false
-                  : true
+                ? false
+                : true
                 ">
               <template slot-scope="scope" v-if="!dragCol[index].type">
                 <div v-if="!dragCol[index].type">
@@ -299,8 +299,8 @@
     <div>
       <!-- 体检人员登记 :title="patientRegister.patientRegisterRd.id ? '体检人员--编辑' : '体检人员--新增'" -->
       <el-dialog :title="dataTransOpts.tableS.patient_register.id
-          ? '体检人员--编辑'
-          : '体检人员--新增'
+        ? '体检人员--编辑'
+        : '体检人员--新增'
         " :visible.sync="dialogWin.PatientRegisterEdit" :close-on-click-modal="false" fullscreen
         @close="close_dialogWin_PatientRegisterEdit">
         <!-- :formInitData="patientRegister.patientRegisterRd" -->
@@ -2107,9 +2107,15 @@ export default {
       this.dataTransOpts.tableS.patient_register.patientRegisterNo =
         row.patientRegisterNo;
 
-      this.upBaseInfo = Object.assign(this.upBaseInfo, row);
-      this.upBaseInfo.patientRegisterId = row.id;
-      this.upBaseInfo.visble = true;
+      // 获取资料  
+      postapi('/api/app/patientregister/getinfoorpatient', { patientRegisterId: row.id })
+        .then(res => {
+          if (res.code > -1) {
+            this.upBaseInfo = Object.assign(this.upBaseInfo, row);
+            this.upBaseInfo.patientRegisterId = row.id;
+            this.upBaseInfo.visble = true;
+          }
+        })
     },
 
     editMedicalStartDate() {

src/views/common-settings/ItemType.vue

@@ -50,6 +50,10 @@
               prop="simpleCode"
               label="拼音简码"
             ></el-table-column>
+            <el-table-column
+              prop="displayOrder"
+              label="排序"
+            ></el-table-column>
             <el-table-column label="操作" width="" align="center">
               <template>
                 <el-tag

src/views/user-list/Role.vue

@@ -20,12 +20,13 @@
             highlight-current-row
             ref="tableData"
       >
-        <el-table-column prop="name" label="角色名称" width="180">
+      <el-table-column prop="id" label="编号" width="320" />
+      <el-table-column prop="name" label="角色名称" width="180">
         </el-table-column>
-        <!-- <el-table-column prop="id" label="id" width=""> </el-table-column> -->
+        <!--  
         <el-table-column prop="concurrencyStamp" label="标记">
         </el-table-column>
-        <!-- <el-table-column label="操作">
+        <el-table-column label="操作">
           <template slot-scope="scope">
             <el-button
               type="primary"