Merge branch 'develop' into feature/update-20230720

src/views/ncs-clerk/clerk-admin.vue

@@ -1,17 +1,16 @@
 <template>
   <div>
-    <care-doctor-manager :frame="frame" :part_view="false" />
+    <clerk-list :part_view="false" />
   </div>
 </template>
 
 <script>
-import CareDoctorManager from './components/clerkList'
+import ClerkList from './components/clerkList'
 export default {
   name: 'CareDoctorManagement',
-  components: { CareDoctorManager },
+  components: { ClerkList },
   data() {
     return {
-      frame: {}
     }
   }
 }

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

@@ -18,10 +18,6 @@
         <div class="toolbar-search">
           <en-table-search :placeholder="this.$t('action.keywords')" @search="handlerSearch" />
         </div>
-<!--        <div class="toolbar-btns">-->
-<!--          <el-button type="primary" @click="handleAddMember">新增</el-button>-->
-<!--          &lt;!&ndash; <el-button type="danger" @click="batchDelete">禁用</el-button>&ndash;&gt;-->
-<!--        </div>-->
         <div class="toolbar-btns">
           <el-button v-if="part_view" type="primary" size="mini" @click="handleAddMember">{{ this.$t('action.add') }}</el-button>
           <el-button v-if="!part_view" type="danger" size="mini" @click="batchDelete">{{ this.$t('action.deleteList') }}</el-button>
@@ -104,8 +100,6 @@
                 </template>
 
               </el-autocomplete>
-
-<!--              <el-input v-model="addMemberForm.uname" :maxlength="20" />-->
             </el-form-item>
 
           </el-col>
@@ -220,46 +214,11 @@
                     </el-col>
                   </el-row>
                 </fieldset>
-
-
-<!--                <el-row>-->
-<!--                  <el-checkbox-group v-model="newCheckList">-->
-<!--                    <el-col v-for="(bed,_index) in addMemberForm.subordinate" :key="_index" :xs="8" :sm="8" :md="6" :lg="6" :xl="6">-->
-<!--                      <el-checkbox :label="bed.clerk_id" @change="handleCheckboxChanged(bed)">-->
-<!--                        <span v-if="bed.group_id && !bed.checked" style="color: #13ce66">{{ bed.clerk_name }}  <span style="color: #302db4">{{ bed.group_name }}</span></span>-->
-<!--                        <span v-else>{{ bed.clerk_name }}</span>-->
-<!--                      </el-checkbox>-->
-<!--                    </el-col>-->
-<!--                  </el-checkbox-group>-->
-<!--                  <el-col v-for="(bed,_index) in nurseClerkList" :key="_index" :xs="8" :sm="8" :md="6" :lg="6" :xl="6">-->
-<!--                    &lt;!&ndash;                    <el-checkbox v-model="bed.checked">&ndash;&gt;-->
-<!--                    &lt;!&ndash;                      <span v-if="bed.group_id && !bed.checked" style="color: #13ce66">{{ bed.clerk_name }}  <span style="color: #302db4">{{ bed.group_name }}</span></span>&ndash;&gt;-->
-<!--                    &lt;!&ndash;                      <span v-else>{{ bed.clerk_name }}</span>&ndash;&gt;-->
-<!--                    &lt;!&ndash;                    </el-checkbox>&ndash;&gt;-->
-<!--                  </el-col>-->
-<!--                </el-row>-->
               </div>
             </el-form-item>
 
           </el-col>
         </el-row>
-
-        <!--        <el-row>-->
-        <!--          <el-col :span="12">-->
-        <!--            &lt;!&ndash;地区&ndash;&gt;-->
-        <!--            <el-form-item :label="地区" prop="region" class="form-item-region">-->
-        <!--              <en-region-picker :api="MixinRegionApi" @changed="(object) => { addMemberForm.region = object.last_id }"/>-->
-        <!--            </el-form-item>-->
-        <!--          </el-col>-->
-        <!--          <el-col :span="12">-->
-
-        <!--            &lt;!&ndash;邮箱&ndash;&gt;-->
-        <!--            <el-form-item :label="邮箱" prop="email">-->
-        <!--              <el-input v-model="addMemberForm.email"></el-input>-->
-        <!--            </el-form-item>-->
-        <!--          </el-col>-->
-        <!--        </el-row>-->
-
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="dialogAddMemberVisible = false">{{ this.$t('action.cancel') }}</el-button>
@@ -289,8 +248,9 @@ import ButtonCellRenderList from "@/components/AgGridCellRender/ButtonCellRender
 let prevOverflow = ''
 const serverUrl = domain.serverUrl
 import * as API_Member from '@/api/ncs_member'
+
 export default {
-  name: 'CareDoctorManager',
+  name: 'ClerkList',
   components: { ButtonCellRenderList, ButtonCellRender, AgGridImg, ImageViewer, RadioFilter,ListFilter },
 
   props: {
@@ -313,8 +273,8 @@ export default {
       params: {
         page_size: 20,
         page_no: 1,
-        fixedCondition: 'user_state=0',
-        sort: 'member_id',
+        fixedCondition: 'user_state=0 and member_id is not NULL',
+        sort: 'shop_id,member_id',
         dir: 'asc'
       },
 
@@ -323,7 +283,7 @@ export default {
         page_size: 20,
         page_no: 1,
         sort: 'member_id',
-        dir: 'desc'
+        dir: 'asc'
       },
       autoCompleteDisabled:false,
       /** 列表数据 */
@@ -416,7 +376,7 @@ export default {
       } else {
         this.shopId = val
       }
-      this.params.fixedCondition = this.part_view ? 'shop_id=' + this.shopId+' and user_state=0' : 'user_state = 0'
+      this.params.fixedCondition = this.part_view ? 't.shop_id=' + this.shopId+' and t.user_state=0 and t.member_id is not NULL' : 't.user_state = 0 and t.member_id is not NULL'
       this.GET_MemberList()
     }
   },
@@ -434,15 +394,16 @@ export default {
         resizable: false,
         valueGetter: this.hashValueGetter
       },
-      { headerName: this.$t('member.face'), field: 'face', sortable: true, filter: false, width: 180,
-        cellRendererFramework: 'AgGridImg',
-        cellRendererParams: param => {
-          return {
-            onClick: this.lookBigImg,
-            face: 'face'
-          }
-        }
-      },
+      // { headerName: this.$t('member.face'), field: 'face', sortable: true, filter: false, width: 180,
+      //   cellRendererFramework: 'AgGridImg',
+      //   cellRendererParams: param => {
+      //     return {
+      //       onClick: this.lookBigImg,
+      //       face: 'face'
+      //     }
+      //   }
+      // },
+      { headerName: 'id', field: 'member_id', sortable: true, width: 50 },
       { headerName: this.$t('member.uname'), field: 'uname', sortable: true, filter: true, width: 180 },
       { headerName: this.$t('member.nickname'), field: 'clerk_name', sortable: true, filter: true, width: 180 },
       { headerName: this.$t('member.sex'), field: 'sex', sortable: true, valueFormatter: this.formatterSex, width: 180, filterFramework: 'RadioFilter',
@@ -450,8 +411,8 @@ export default {
           listData: this.sexTransfer
         }
       },
-      { headerName: this.$t('member.mobile'), field: 'mobile', sortable: true, filter: true, width: 200 },
-      { headerName: this.$t('clerkManage.role'), field: 'role_name', sortable: true, filter: false, valueFormatter: this.formatterRole,   filterFramework: 'ListFilter', flex:1,
+      { headerName: this.$t('member.mobile'), field: 'mobile', sortable: true, filter: true, width: 150 },
+      { headerName: this.$t('clerkManage.role'), field: 'role_name', sortable: true, filter: false, width: 150, valueFormatter: this.formatterRole,   filterFramework: 'ListFilter', 
         filterParams: {
           listData: this.roleTransfer
         } },
@@ -546,7 +507,7 @@ export default {
     } else {
       this.shopId = this.partId
     }
-    this.params.fixedCondition = this.part_view ? 'shop_id=' + this.shopId +' and user_state=0': 'user_state=0'
+    this.params.fixedCondition = this.part_view ? 'shop_id=' + this.shopId +' and user_state=0': 'user_state=0 and member_id is not null'
     this.GET_MemberList()
     this.getRoles({ page_size: 200, page_no: 1, fixedCondition: ' shop_id = -1', sort: ' role_id', dir: 'desc' })
 
@@ -566,18 +527,11 @@ export default {
       // this.gridApi.sizeColumnsToFit()
       API_Clerk.getList(this.params).then(response => {
         this.loading = false
-        const size = 0
-        // response.data.forEach((item, index) => {
-        //   if (item.founder === 1) {
-        //     delete response.data[index]
-        //     size++
-        //   }
-        // })
         this.tableData = response.data
         this.pageData = {
           page_no: response.page_no,
           page_size: response.page_size,
-          data_total: response.data_total - size
+          data_total: response.data_total
         }
       }).catch(() => {
         this.loading = false
@@ -626,10 +580,10 @@ export default {
         this.rolesOptions = res.data
         this.roleTransfer =[...res.data.map(p=>{return {'key':p.role_name,'value':p.role_name}})]
         this.columnDefs[6].filterParams.listData=this.roleTransfer
-        console.log(this.columnDefs)
+        // console.log(this.columnDefs)
         this.gridApi.setColumnDefs(this.columnDefs);
         this.gridApi.redrawRows()
-        console.log(this.roleTransfer)
+        // console.log(this.roleTransfer)
         const nurseZz = res.data.find(item => item.role_name === '护士组长')
         if (nurseZz) {
           this.roleZzId = nurseZz.role_id