vue2-client 1.14.36 → 1.14.38

package/src/pages/XTreeOneProExample/index.vue

@@ -1,67 +1,67 @@
-<template>
-  <x-tree-view ref="xTreeView" @itemChecked="itemChecked">
-    <x-add-native-form ref="nativeForm" />
-  </x-tree-view>
-</template>
-
-<script>
-
-import XTreeView from '@vue2-client/base-client/components/layout/XTreeView'
-import { mapState } from 'vuex'
-import XAddNativeForm from '@vue2-client/base-client/components/common/XAddNativeForm/XAddNativeForm.vue'
-import { getConfigByName } from '@vue2-client/services/api/common'
-
-export default {
-  components: {
-    XAddNativeForm,
-    XTreeView,
-  },
-  data () {
-    return {
-      currentItem: undefined,
-    }
-  },
-  computed: {
-    ...mapState('account', { currUser: 'user' }),
-    ...mapState('setting', ['isMobile'])
-  },
-  mounted () {
-    this.initView()
-  },
-  methods: {
-    // 初始化组件
-    initView () {
-      this.$refs.xTreeView.init({
-        configName: 'templateTreeConfig',
-        serviceName: 'af-his',
-        env: 'dev',
-      })
-    },
-    itemChecked (node) {
-      this.currentItem = node
-      if (node.type === 'all' || node.type === 'folder') {
-        this.$refs.nativeForm.close()
-        return
-      }
-      getConfigByName('编辑模板数据Form', 'af-his', (res) => {
-        this.$refs.nativeForm.init({
-          serviceName: 'af-his',
-          formItems: res.formJson,
-          showSubmitBtn: false,
-          title: '收费',
-          businessType: '新增',
-          getDataParams: {
-            content: {
-              pms_patient_id: 1,
-              template_id: node.id
-            }
-          }
-        })
-      })
-    }
-  }
-}
-</script>
-
-<style>
-</style>
+<template>
+  <x-tree-view ref="xTreeView" @itemChecked="itemChecked">
+    <x-add-native-form ref="nativeForm" />
+  </x-tree-view>
+</template>
+
+<script>
+
+import XTreeView from '@vue2-client/base-client/components/layout/XTreeView'
+import { mapState } from 'vuex'
+import XAddNativeForm from '@vue2-client/base-client/components/common/XAddNativeForm/XAddNativeForm.vue'
+import { getConfigByName } from '@vue2-client/services/api/common'
+
+export default {
+  components: {
+    XAddNativeForm,
+    XTreeView,
+  },
+  data () {
+    return {
+      currentItem: undefined,
+    }
+  },
+  computed: {
+    ...mapState('account', { currUser: 'user' }),
+    ...mapState('setting', ['isMobile'])
+  },
+  mounted () {
+    this.initView()
+  },
+  methods: {
+    // 初始化组件
+    initView () {
+      this.$refs.xTreeView.init({
+        configName: 'templateTreeConfig',
+        serviceName: 'af-his',
+        env: 'dev',
+      })
+    },
+    itemChecked (node) {
+      this.currentItem = node
+      if (node.type === 'all' || node.type === 'folder') {
+        this.$refs.nativeForm.close()
+        return
+      }
+      getConfigByName('编辑模板数据Form', 'af-his', (res) => {
+        this.$refs.nativeForm.init({
+          serviceName: 'af-his',
+          formItems: res.formJson,
+          showSubmitBtn: false,
+          title: '收费',
+          businessType: '新增',
+          getDataParams: {
+            content: {
+              pms_patient_id: 1,
+              template_id: node.id
+            }
+          }
+        })
+      })
+    }
+  }
+}
+</script>
+
+<style>
+</style>

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

@@ -40,11 +40,12 @@ export default {
   },
   created () {
     getConfigByName('revenueConfig', 'af-revenue', (res) => {
-      if (res.queryCondition === 'f_userfiles_id') {
+      const queryCondition = res.fillCardQueryCondition ? res.fillCardQueryCondition : res.queryCondition
+      if (queryCondition === 'f_userfiles_id') {
         this.fixedQueryForm = { f_f_userfiles_id: this.currUserInfo.f_userfiles_id }
-      } else if (res.queryCondition === 'f_userinfo_id') {
+      } else if (queryCondition === 'f_userinfo_id') {
         this.fixedQueryForm = { f_f_userinfo_id: this.currUserInfo.f_userinfo_id }
-      } else if (res.queryCondition === 'f_user_id') {
+      } else if (queryCondition === 'f_user_id') {
         this.fixedQueryForm = { f_f_user_id: this.currUserInfo.f_user_id }
       }
       this.$refs.xFormTable.refresh(true)

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

@@ -40,11 +40,12 @@ export default {
   },
   mounted () {
     getConfigByName('revenueConfig', 'af-revenue', (res) => {
-      if (res.queryCondition === 'f_userfiles_id') {
+      const queryCondition = res.fillGasQueryCondition ? res.fillGasQueryCondition : res.queryCondition
+      if (queryCondition === 'f_userfiles_id') {
         this.fixedQueryForm = { f_f_userfiles_id: this.currUserInfo.f_userfiles_id }
-      } else if (res.queryCondition === 'f_userinfo_id') {
+      } else if (queryCondition === 'f_userinfo_id') {
         this.fixedQueryForm = { f_f_userinfo_id: this.currUserInfo.f_userinfo_id }
-      } else if (res.queryCondition === 'f_user_id') {
+      } else if (queryCondition === 'f_user_id') {
         this.fixedQueryForm = { f_f_user_id: this.currUserInfo.f_user_id }
       }
       this.$refs.xFormTable.refresh(true)

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

@@ -40,11 +40,12 @@ export default {
   },
   mounted () {
     getConfigByName('revenueConfig', 'af-revenue', (res) => {
-      if (res.queryCondition === 'f_userfiles_id') {
+      const queryCondition = res.machineRecordQueryCondition ? res.machineRecordQueryCondition : res.queryCondition
+      if (queryCondition === 'f_userfiles_id') {
         this.fixedQueryForm = { mr_f_userfiles_id: this.currUserInfo.f_userfiles_id }
-      } else if (res.queryCondition === 'f_userinfo_id') {
+      } else if (queryCondition === 'f_userinfo_id') {
         this.fixedQueryForm = { mr_f_userinfo_id: this.currUserInfo.f_userinfo_id }
-      } else if (res.queryCondition === 'f_user_id') {
+      } else if (queryCondition === 'f_user_id') {
         this.fixedQueryForm = { mr_f_user_id: this.currUserInfo.f_user_id }
       }
     })

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

@@ -40,11 +40,12 @@ export default {
   },
   mounted () {
     getConfigByName('revenueConfig', 'af-revenue', (res) => {
-      if (res.queryCondition === 'f_userfiles_id') {
+      const queryCondition = res.otherChargeQueryCondition ? res.otherChargeQueryCondition : res.queryCondition
+      if (queryCondition === 'f_userfiles_id') {
         this.fixedQueryForm = { o_f_userfiles_id: this.currUserInfo.f_userfiles_id }
-      } else if (res.queryCondition === 'f_userinfo_id') {
+      } else if (queryCondition === 'f_userinfo_id') {
         this.fixedQueryForm = { o_f_userinfo_id: this.currUserInfo.f_userinfo_id }
-      } else if (res.queryCondition === 'f_user_id') {
+      } else if (queryCondition === 'f_user_id') {
         this.fixedQueryForm = { o_f_user_id: this.currUserInfo.f_user_id }
       }
       this.$refs.xFormTable.refresh(true)

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

@@ -47,11 +47,12 @@ export default {
       this.queryParamsName = 'UserChargeRecordQueryCRUD'
     }
     getConfigByName('revenueConfig', 'af-revenue', (res) => {
-      if (res.queryCondition === 'f_userfiles_id') {
+      const queryCondition = res.chargeQueryCondition ? res.chargeQueryCondition : res.queryCondition
+      if (queryCondition === 'f_userfiles_id') {
         this.fixedQueryForm = { uc_f_userfiles_id: this.currUserInfo.f_userfiles_id }
-      } else if (res.queryCondition === 'f_userinfo_id') {
+      } else if (queryCondition === 'f_userinfo_id') {
         this.fixedQueryForm = { uc_f_userinfo_id: this.currUserInfo.f_userinfo_id }
-      } else {
+      } else if (queryCondition === 'f_user_id') {
         this.fixedQueryForm = { uc_f_user_id: this.currUserInfo.f_user_id }
       }
       this.$refs.xFormTable.refresh(true)

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

@@ -41,6 +41,7 @@ export default {
   mounted () {
     getConfigByName('revenueConfig', 'af-revenue', (res) => {
       console.log(res)
+      const queryCondition = res.handQueryCondition ? res.handQueryCondition : res.queryCondition
       if (this.currUserInfo.f_meter_type === '物联网表') {
         if (res.newHand) {
           this.queryParamsName = 'WebUserHandRecordQueryCRUD'
@@ -52,11 +53,11 @@ export default {
       } else {
         this.queryParamsName = 'HandRecordQueryCRUD'
       }
-      if (res.queryCondition === 'f_userfiles_id') {
+      if (queryCondition === 'f_userfiles_id') {
         this.fixedQueryForm = { h_f_userfiles_id: this.currUserInfo.f_userfiles_id }
-      } else if (res.queryCondition === 'f_userinfo_id') {
+      } else if (queryCondition === 'f_userinfo_id') {
         this.fixedQueryForm = { h_f_userinfo_id: this.currUserInfo.f_userinfo_id }
-      } else if (res.queryCondition === 'f_user_id') {
+      } else if (queryCondition === 'f_user_id') {
         this.fixedQueryForm = { h_f_user_id: this.currUserInfo.f_user_id }
       }
       this.$refs.xFormTable.refresh(true)

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

@@ -40,11 +40,12 @@ export default {
   },
   async mounted () {
     await getConfigByNameAsync('revenueConfig', 'af-revenue').then((res) => {
-      if (res.queryCondition === 'f_userfiles_id') {
+      const queryCondition = res.recordQueryCondition ? res.recordQueryCondition : res.queryCondition
+      if (queryCondition === 'f_userfiles_id') {
         this.fixedQueryForm = { uc_f_userfiles_id: this.currUserInfo.f_userfiles_id }
-      } else if (res.queryCondition === 'f_userinfo_id') {
+      } else if (queryCondition === 'f_userinfo_id') {
         this.fixedQueryForm = { uc_f_userinfo_id: this.currUserInfo.f_userinfo_id }
-      } else if (res.queryCondition === 'f_user_id') {
+      } else if (queryCondition === 'f_user_id') {
         this.fixedQueryForm = { uc_f_user_id: this.currUserInfo.f_user_id }
       }
     })

package/src/pages/userInfoDetailManage/index.vue

@@ -143,8 +143,8 @@ export default {
       handler () {
         if (this.userInfo) {
           console.log('userinfo', this.userInfo)
-          this.openUserBtnShow = this.userInfo.f_meter_type.includes('物联网表') && this.login?.r.includes('开户权限')
-          this.valveBtnShow = this.userInfo.f_meter_type.includes('物联网表') && this.userInfo.f_user_state !== '停用' && this.login?.r.includes('开关阀权限')
+          this.openUserBtnShow = this.userInfo.f_meter_type.includes('物联网表')
+          this.valveBtnShow = this.userInfo.f_meter_type.includes('物联网表') && this.userInfo.f_user_state !== '停用'
         }
       },
       deep: true
@@ -277,7 +277,7 @@ export default {
   },
   mounted () {},
   computed: {
-    ...mapState('account', { currUser: 'user',login: 'login' }),
+    ...mapState('account', { currUser: 'user' }),
     ...mapState('setting', { isMobile: 'isMobile' })
   }
 }

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

@@ -34,6 +34,7 @@
 
 <script>
 import { post } from '@vue2-client/services/api'
+import { del } from '@vue2-client/services/api/restTools'
 export default {
   props: {
     currUserInfo: {
@@ -53,22 +54,13 @@ export default {
   methods: {
     async getfusetypes () {
       this.fusetypes = [{ label: '全部', value: '' }]
-      const res = await post('/api/af-revenue/sql/singleTable_OrderBy', {
-        data: {
-          items: 'fusetype',
-          tablename: 't_files',
-          condition: `fusetype is not null GROUP BY fusetype`,
-          orderitem: 'fusetype'
-        }
-      })
+      const res = await post('/api/af-revenue/logic/getFileUseType', {})
       this.fusetypes.push(...res.map(item => ({ label: item.fusetype, value: item.fusetype })))
-      console.log('123456', this.fusetypes)
     },
     async getFiles () {
-      console.log('999', this.currUserInfo)
       if (!this.currUserInfo) return
       this.files = []
-      let condition = `CONVERT(varchar(200),f_blobid) = '${this.currUserInfo.f_userinfo_id}'`
+      let condition = `f_blobid = '${this.currUserInfo.f_userinfo_id}'`
       if (this.upload_date) {
         condition += ` and CONVERT(VARCHAR(100), f_uploaddate, 23) = '${this.upload_date}'`
       }
@@ -76,15 +68,13 @@ export default {
         condition += ` and fusetype = '${this.fusetype}'`
       }
       const res = await post('/api/af-revenue/logic/getAllFiles', { data: { condition } })
-      console.log('7777', res)
-      console.log('7777', res.days)
       this.files = res.days.map(day => ({
         days: day.uploadday,
         arrays: res.array.filter(file => file.uploadday === day.uploadday)
       }))
     },
     async delet (fileId) {
-      await this.$resetdelete('rs/entity/t_files', { id: fileId }, { resolveMsg: '删除成功', rejectMsg: '删除失败' })
+      await del('api/af-revenue/entity/save/t_files', { id: fileId }, { resolveMsg: '删除成功', rejectMsg: '删除失败' })
       this.getFiles()
     },
     selfSearch () {