vue2-client 1.14.87 → 1.14.88

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.14.87",
+  "version": "1.14.88",
   "private": false,
   "scripts": {
     "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint",

package/src/base-client/components/his/XShiftSchedule/XShiftSchedule.vue

@@ -7,17 +7,19 @@
     <span slot="time" class="time-title">
       <span v-for="(item, index) in configData.timePeriod" :key="index">{{ item }}</span>
     </span>
-    <a-button slot="lastWeek" icon="left" size="large" @click="handleLastWeek" />
-    <div v-for="(item, index) in weekDays" :key="index" :slot="item.key" class="time-title">
-      <span>{{item.title}}</span>
-      <span>{{ currentWeekDates[index].toLocaleDateString() }}</span>
+    <div v-for="(item, index) in weekDays" :key="index" :slot="item.key" class="week_last_next_btn">
+      <a-button slot="lastWeek" icon="left" size="large" @click="handleLastWeek" v-if="item.title == '周一'" />
+      <div class="time-title">
+        <span>{{item.title}}</span>
+        <span>{{ currentWeekDates[index].toLocaleDateString() }}</span>
+      </div>
+      <a-button slot="nextWeek" icon="right" size="large" @click="handleNextWeek" v-if="item.title == '周日'"/>
     </div>
     <template :slot="day.key" slot-scope="text, record" v-for="day in shiftTable">
       <div class="time-title" :key="day.key">
         <a-button v-for="(item, index) in record[day.key]" :key="index" @click="handleShiftChange(day.key, index, record)">{{ item === 1 || item === '1' ? '坐诊' : '休息' }}</a-button>
       </div>
     </template>
-    <a-button slot="nextWeek" icon="right" size="large" @click="handleNextWeek" />
     <template slot="sk_limit" slot-scope="text, record">
       <a-input-number id="inputNumber" v-model="record.sk_limit" :min="configData.sk_limitMin" :max="configData.sk_limitMax" />
     </template>
@@ -49,29 +51,12 @@ export default {
         return { title, key }
       })],
       // 排班时间表
-      shiftTable: [
-        {
-          dataIndex: 'lastWeek',
-          key: 'lastWeek',
-          slots: { title: 'lastWeek' },
-          scopedSlots: { customRender: 'lastWeekTitle' },
-          align: 'center',
-          width: 80
-        },
-        ...['周一', '周二', '周三', '周四', '周五', '周六', '周日'].map((title, index) => {
+      shiftTable: [...['周一', '周二', '周三', '周四', '周五', '周六', '周日'].map((title, index) => {
           const key = ['Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday', 'Sunday'][index]
           return {
-            key, dataIndex: key, scopedSlots: { customRender: key }, slots: { title: key }, align: 'center', width: 120
+            key, dataIndex: key, scopedSlots: { customRender: key }, slots: { title: key }, align: 'center', width: key === 'Monday' || key === 'Sunday' ? 170 : 120
           }
         }),
-        {
-          dataIndex: 'nextWeek',
-          key: 'nextWeek',
-          slots: { title: 'nextWeek' },
-          scopedSlots: { customRender: 'nextWeekTitle' },
-          align: 'center',
-          width: 80
-        },
         {
           title: '排班数',
           key: 'sk_limit',
@@ -234,6 +219,13 @@ export default {
   flex-direction: column !important;
   align-items: center !important;
 }
+.week_last_next_btn {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: center;
+  gap: 16px;
+}
 ::v-deep .ant-table-thead > tr > th,
 ::v-deep .ant-table-tbody > tr > td {
   padding: 8px 16px !important;

package/src/pages/addressSelect/addressDemo.vue

@@ -1,24 +1,24 @@
-<template>
-  <!--  测试界面——测试地址选择新增组件-->
-  <div>
-    <a-button @click="open">打开选择地址弹窗</a-button>
-    <address-select :addressShow="showDialog"/>
-  </div>
-</template>
-
-  <script>
-  import AddressSelect from '@/pages/addressSelect'
-
-  export default {
-    components: { AddressSelect },
-    data: () => ({
-      showDialog: false
-    }),
-    methods: {
-      open () {
-        console.log('打开选择地址弹窗')
-        this.showDialog = true
-      }
-    }
-  }
-  </script>
+<template>
+  <!--  测试界面——测试地址选择新增组件-->
+  <div>
+    <a-button @click="open">打开选择地址弹窗</a-button>
+    <address-select :addressShow="showDialog"/>
+  </div>
+</template>
+
+  <script>
+  import AddressSelect from '@/pages/addressSelect'
+
+  export default {
+    components: { AddressSelect },
+    data: () => ({
+      showDialog: false
+    }),
+    methods: {
+      open () {
+        console.log('打开选择地址弹窗')
+        this.showDialog = true
+      }
+    }
+  }
+  </script>

package/src/pages/userInfoDetailManage/InsuranceDetailQuery/index.vue

@@ -0,0 +1,64 @@
+<template>
+  <a-card :bordered="false" v-if="currUserInfo">
+    <x-form-table
+      title="保险明细查询"
+      :queryParamsName="queryParamsName"
+      :fixedQueryForm="fixedQueryForm"
+      service-name="af-revenue"
+      @action="action"
+      ref="xFormTable">
+    </x-form-table>
+  </a-card>
+</template>
+
+<script>
+import { mapState } from 'vuex'
+
+export default {
+  name: 'InsuranceDetailQuery',
+  components: {
+    XFormTable: () => import('@vue2-client/base-client/components/common/XFormTable/XFormTable.vue')
+  },
+  data () {
+    return {
+      // 查询配置名称
+      queryParamsName: 'InsuranceDetailQueryCRUD',
+      // 查询表单固定值
+      fixedQueryForm: { t_f_userinfo_id: this.currUserInfo.f_userinfo_id },
+      // 是否显示详情抽屉
+      detailVisible: false,
+      // 当前记录
+      record: {}
+    }
+  },
+  props: {
+    currUserInfo: {
+      type: Object,
+      default: () => undefined
+    }
+  },
+  mounted () {
+    this.$refs.xFormTable.refresh(true)
+  },
+  methods: {
+    action (record, id, actionType) {
+      this.detailVisible = true
+      console.log('触发了详情操作', record, id, actionType)
+    },
+    onClose () {
+      this.detailVisible = false
+      // 关闭详情之后重新查询表单
+      this.$refs.xFormTable.refreshTable(true)
+    }
+  },
+
+  computed: {
+    ...mapState('account', { currUser: 'user' }),
+    ...mapState('setting', { isMobile: 'isMobile' })
+  },
+}
+</script>
+
+<style scoped>
+
+</style>

package/src/pages/userInfoDetailManage/userInfoDetailQueryTabs.vue

@@ -35,6 +35,7 @@ import WatchCollectionRecordQuery from '@vue2-client/pages/userInfoDetailManage/
 import UserException from '@vue2-client/pages/userInfoDetailManage/UserException'
 import PriceAdjustments from '@vue2-client/pages/userInfoDetailManage/PriceAdjustments'
 import uploadFilesHistory from '@vue2-client/pages/userInfoDetailManage/uploadFilesHistory'
+import InsuranceDetailQuery from '@vue2-client/pages/userInfoDetailManage/InsuranceDetailQuery'
 
 export default {
   name: 'UserInfoDetailQueryTabs',
@@ -58,6 +59,7 @@ export default {
     UserException,
     PriceAdjustments,
     uploadFilesHistory,
+    InsuranceDetailQuery
   },
   props: {
     userInfo: {
@@ -109,6 +111,7 @@ export default {
         { key: '14', label: '异常报警', permission: '异常报警', component: 'UserException' },
         { key: '15', label: '价格调整', permission: '价格调整', component: 'PriceAdjustments' },
         { key: '16', label: '附件查看', permission: '附件查看', component: 'uploadFilesHistory' },
+        { key: '16', label: '保险明细', permission: '保险明细', component: 'InsuranceDetailQuery' },
       ],
     }
   },