vue2-client 1.14.10 → 1.14.12

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

@@ -1,66 +1,66 @@
-<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: 'TransferRecordQuery',
-  components: {
-    XFormTable: () => import('@vue2-client/base-client/components/common/XFormTable/XFormTable.vue')
-  },
-  data () {
-    return {
-      // 查询配置名称
-      queryParamsName: 'UserTransferRecordQueryCRUD',
-      // 查询表单固定值
-      fixedQueryForm: { t_f_userinfo_id: this.currUserInfo.f_userinfo_id },
-      // 是否显示详情抽屉
-      detailVisible: false,
-      // 当前记录
-      record: {}
-    }
-  },
-  props: {
-    currUserInfo: {
-      type: Object,
-      default: () => undefined
-    }
-  },
-  created () {
-  },
-  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>
+<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: 'TransferRecordQuery',
+  components: {
+    XFormTable: () => import('@vue2-client/base-client/components/common/XFormTable/XFormTable.vue')
+  },
+  data () {
+    return {
+      // 查询配置名称
+      queryParamsName: 'UserTransferRecordQueryCRUD',
+      // 查询表单固定值
+      fixedQueryForm: { t_f_userinfo_id: this.currUserInfo.f_userinfo_id },
+      // 是否显示详情抽屉
+      detailVisible: false,
+      // 当前记录
+      record: {}
+    }
+  },
+  props: {
+    currUserInfo: {
+      type: Object,
+      default: () => undefined
+    }
+  },
+  created () {
+  },
+  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/UserHandRecordQuery/index.vue

@@ -1,86 +1,86 @@
-<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'
-import { getConfigByName } from '@vue2-client/services/api/common'
-
-export default {
-  name: 'UserHandRecordQuery',
-  components: {
-    XFormTable: () => import('@vue2-client/base-client/components/common/XFormTable/XFormTable.vue')
-  },
-  data () {
-    return {
-      // 查询配置名称
-      queryParamsName: '',
-      // 查询表单固定值
-      fixedQueryForm: {},
-      // 是否显示详情抽屉
-      detailVisible: false,
-      // 当前记录
-      record: {}
-    }
-  },
-  props: {
-    currUserInfo: {
-      type: Object,
-      default: () => undefined
-    }
-  },
-  mounted () {
-    getConfigByName('revenueConfig', 'af-revenue', (res) => {
-      console.log(res)
-      if (this.currUserInfo.f_meter_type === '物联网表') {
-        if (res.newHand) {
-          this.queryParamsName = 'WebUserHandRecordQueryCRUD'
-        } else {
-          this.queryParamsName = 'HandRecordQueryCRUD'
-        }
-      } else if (this.currUserInfo.f_meter_type.includes('卡表')) {
-        this.queryParamsName = 'CardHandRecordQueryCRUD'
-      } else {
-        this.queryParamsName = 'HandRecordQueryCRUD'
-      }
-      if (res.queryCondition === 'f_userfiles_id') {
-        this.fixedQueryForm = { h_f_userfiles_id: this.currUserInfo.f_userfiles_id }
-      } else if (res.queryCondition === 'f_userinfo_id') {
-        this.fixedQueryForm = { h_f_userinfo_id: this.currUserInfo.f_userinfo_id }
-      } else if (res.queryCondition === 'f_user_id') {
-        this.fixedQueryForm = { h_f_user_id: this.currUserInfo.f_user_id }
-      }
-      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>
+<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'
+import { getConfigByName } from '@vue2-client/services/api/common'
+
+export default {
+  name: 'UserHandRecordQuery',
+  components: {
+    XFormTable: () => import('@vue2-client/base-client/components/common/XFormTable/XFormTable.vue')
+  },
+  data () {
+    return {
+      // 查询配置名称
+      queryParamsName: '',
+      // 查询表单固定值
+      fixedQueryForm: {},
+      // 是否显示详情抽屉
+      detailVisible: false,
+      // 当前记录
+      record: {}
+    }
+  },
+  props: {
+    currUserInfo: {
+      type: Object,
+      default: () => undefined
+    }
+  },
+  mounted () {
+    getConfigByName('revenueConfig', 'af-revenue', (res) => {
+      console.log(res)
+      if (this.currUserInfo.f_meter_type === '物联网表') {
+        if (res.newHand) {
+          this.queryParamsName = 'WebUserHandRecordQueryCRUD'
+        } else {
+          this.queryParamsName = 'HandRecordQueryCRUD'
+        }
+      } else if (this.currUserInfo.f_meter_type.includes('卡表')) {
+        this.queryParamsName = 'CardHandRecordQueryCRUD'
+      } else {
+        this.queryParamsName = 'HandRecordQueryCRUD'
+      }
+      if (res.queryCondition === 'f_userfiles_id') {
+        this.fixedQueryForm = { h_f_userfiles_id: this.currUserInfo.f_userfiles_id }
+      } else if (res.queryCondition === 'f_userinfo_id') {
+        this.fixedQueryForm = { h_f_userinfo_id: this.currUserInfo.f_userinfo_id }
+      } else if (res.queryCondition === 'f_user_id') {
+        this.fixedQueryForm = { h_f_user_id: this.currUserInfo.f_user_id }
+      }
+      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/UserRecordQuery/index.vue

@@ -1,73 +1,73 @@
-<template>
-  <a-card :bordered="false" v-if="currUserInfo">
-    <x-form-table
-      title="用户流水查询"
-      :queryParamsName="queryParamsName"
-      :fixedQueryForm="fixedQueryForm"
-      @action="action"
-      serviceName="af-revenue"
-      ref="xFormTable">
-    </x-form-table>
-  </a-card>
-</template>
-
-<script>
-import { mapState } from 'vuex'
-import { getConfigByNameAsync } from '@vue2-client/services/api/common'
-
-export default {
-  name: 'UserRecordQuery',
-  components: {
-    XFormTable: () => import('@vue2-client/base-client/components/common/XFormTable/XFormTable.vue')
-  },
-  data () {
-    return {
-      // 查询配置名称
-      queryParamsName: 'UserRecordQueryCRUD',
-      // 查询表单固定值
-      fixedQueryForm: {},
-      // 是否显示详情抽屉
-      detailVisible: false,
-      // 当前记录
-      record: {}
-    }
-  },
-  props: {
-    currUserInfo: {
-      type: Object,
-      default: () => undefined
-    }
-  },
-  async mounted () {
-    await getConfigByNameAsync('revenueConfig', 'af-revenue').then((res) => {
-      if (res.queryCondition === 'f_userfiles_id') {
-        this.fixedQueryForm = { uc_f_userfiles_id: this.currUserInfo.f_userfiles_id }
-      } else if (res.queryCondition === 'f_userinfo_id') {
-        this.fixedQueryForm = { uc_f_userinfo_id: this.currUserInfo.f_userinfo_id }
-      } else if (res.queryCondition === 'f_user_id') {
-        this.fixedQueryForm = { uc_f_user_id: this.currUserInfo.f_user_id }
-      }
-    })
-    this.$refs.xFormTable.refresh(true)
-  },
-  methods: {
-    action (record, id, actionType) {
-      this.detailVisible = true
-    },
-    onClose () {
-      this.detailVisible = false
-      // 关闭详情之后重新查询表单
-      this.$refs.xFormTable.refreshTable(true)
-    }
-  },
-  computed: {
-    ...mapState('account', { currUser: 'user' }),
-    ...mapState('setting', { isMobile: 'isMobile' })
-  }
-  ,
-}
-</script>
-
-<style scoped>
-
-</style>
+<template>
+  <a-card :bordered="false" v-if="currUserInfo">
+    <x-form-table
+      title="用户流水查询"
+      :queryParamsName="queryParamsName"
+      :fixedQueryForm="fixedQueryForm"
+      @action="action"
+      serviceName="af-revenue"
+      ref="xFormTable">
+    </x-form-table>
+  </a-card>
+</template>
+
+<script>
+import { mapState } from 'vuex'
+import { getConfigByNameAsync } from '@vue2-client/services/api/common'
+
+export default {
+  name: 'UserRecordQuery',
+  components: {
+    XFormTable: () => import('@vue2-client/base-client/components/common/XFormTable/XFormTable.vue')
+  },
+  data () {
+    return {
+      // 查询配置名称
+      queryParamsName: 'UserRecordQueryCRUD',
+      // 查询表单固定值
+      fixedQueryForm: {},
+      // 是否显示详情抽屉
+      detailVisible: false,
+      // 当前记录
+      record: {}
+    }
+  },
+  props: {
+    currUserInfo: {
+      type: Object,
+      default: () => undefined
+    }
+  },
+  async mounted () {
+    await getConfigByNameAsync('revenueConfig', 'af-revenue').then((res) => {
+      if (res.queryCondition === 'f_userfiles_id') {
+        this.fixedQueryForm = { uc_f_userfiles_id: this.currUserInfo.f_userfiles_id }
+      } else if (res.queryCondition === 'f_userinfo_id') {
+        this.fixedQueryForm = { uc_f_userinfo_id: this.currUserInfo.f_userinfo_id }
+      } else if (res.queryCondition === 'f_user_id') {
+        this.fixedQueryForm = { uc_f_user_id: this.currUserInfo.f_user_id }
+      }
+    })
+    this.$refs.xFormTable.refresh(true)
+  },
+  methods: {
+    action (record, id, actionType) {
+      this.detailVisible = true
+    },
+    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/WatchCollectionRecordQuery/index.vue

@@ -1,64 +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: 'WatchCollectionRecordQuery',
-  components: {
-    XFormTable: () => import('@vue2-client/base-client/components/common/XFormTable/XFormTable.vue')
-  },
-  data () {
-    return {
-      // 查询配置名称
-      queryParamsName: 'UserWatchCollectionRecordQueryCRUD',
-      // 查询表单固定值
-      fixedQueryForm: { wc_f_userfiles_id: this.currUserInfo.f_userfiles_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>
+<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: 'WatchCollectionRecordQuery',
+  components: {
+    XFormTable: () => import('@vue2-client/base-client/components/common/XFormTable/XFormTable.vue')
+  },
+  data () {
+    return {
+      // 查询配置名称
+      queryParamsName: 'UserWatchCollectionRecordQueryCRUD',
+      // 查询表单固定值
+      fixedQueryForm: { wc_f_userfiles_id: this.currUserInfo.f_userfiles_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/index.vue

@@ -38,8 +38,8 @@
     <a-modal
       title="阀控管理"
       :visible="valve"
-      :closable="false"
       :width="600"
+      @cancel="closeValveModal"
       :body-style="{ padding: '24px' }"
     >
       <!-- 阀控状态选择 -->
@@ -60,7 +60,7 @@
       <div style="margin-bottom: 16px;">
         <label
           style="display: block; font-size: 14px; color: #555; margin-bottom: 8px;"
-          :style="operateReason ? '' : 'color: #ff4d4f;'"
+          class="ant-form-item-required"
         >
           操作原因
         </label>
@@ -69,16 +69,17 @@
           placeholder="请填写操作原因"
           :rows="2"
           style="width: 100%;"
+          :class="{ 'error-border': operateReasonError }"
+          @blur="checkOperateReason"
         />
+        <div v-if="operateReasonError" style="color: red; margin-top: 8px;">
+          请填写操作原因
+        </div>
       </div>
 
       <!-- 底部按钮 -->
       <template #footer>
-        <div style="display: flex; justify-content: space-between; align-items: center;">
-          <!-- 左侧关闭按钮 -->
-          <a-button type="danger" @click="closeValveModal" style="border-radius: 4px;">
-            关闭
-          </a-button>
+        <div style="display: flex; justify-content: flex-end; align-items: center;">
           <!-- 右侧开阀和关阀按钮 -->
           <div>
             <a-button
@@ -132,8 +133,9 @@ export default {
         '6小时后自动',
         '12小时后自动'
       ],
-      selectedOption: '',
+      selectedOption: '手动',
       operateReason: '',
+      operateReasonError: false,
     }
   },
   watch: {
@@ -149,6 +151,13 @@ export default {
     }
   },
   methods: {
+    checkOperateReason () {
+      if (this.operateReason.trim() === '') {
+        this.operateReasonError = true
+      } else {
+        this.operateReasonError = false
+      }
+    },
     refresh () {
       return runLogic('getUserInfoDetailV4', this.userInfo, 'af-revenue').then(res => {
         this.userInfo = res
@@ -178,13 +187,15 @@ export default {
     },
     closeValveModal () {
       this.valve = false
-      this.selectedOption = ''
+      this.selectedOption = '手动'
       this.operateReason = ''
+      this.operateReasonError = false
     },
     async init (user) {
       this.userInfo = user
       await this.refresh()
       this.userInfoDetailVisible = true
+      this.operateReasonError = false
     },
     onClose () {
       this.userInfoDetailVisible = false
@@ -266,12 +277,14 @@ export default {
   },
   mounted () {},
   computed: {
-    ...mapState('account', { currUser: 'user' }),
-    ...mapState('setting', { isMobile: 'isMobile' })
+    ...mapState('account', {currUser: 'user'}),
+    ...mapState('setting', {isMobile: 'isMobile'})
   }
 }
 </script>
 
 <style scoped>
-
+.error-border {
+  border-color: red;
+}
 </style>