vue2-client 1.14.8 → 1.14.10

package/package.json

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

package/src/base-client/components/common/XForm/XTreeSelect.vue

@@ -200,8 +200,14 @@ export default {
             const values = []
             if (extra.allCheckedNodes) {
               for (const item of extra.allCheckedNodes) {
-                if (item.node.key && (item.node?.data?.props?.label !== item.node?.data?.props?.value && item.children && item.children.length)) {
-                  values.push(`${item.node.key}`)
+                if (item.node.key) {
+                  if (item.node?.data?.props?.label === item.node?.data?.props?.value) {
+                    if (!item.children?.length) {
+                      values.push(`${item.node.key}`)
+                    }
+                  } else {
+                    values.push(`${item.node.key}`)
+                  }
                 }
                 if (item.children && item.children.length) {
                   this.getNodeValues(item.children, value, values)

package/src/base-client/components/common/XFormTable/demo.vue

@@ -6,6 +6,7 @@
     <x-form-table
       title="示例表单"
       :queryParamsName="queryParamsName"
+      :x-tree-config-name="xTreeConfigName"
       :fixedAddForm="fixedAddForm"
       @action="action"
       @columnClick="columnClick"
@@ -26,9 +27,9 @@ export default {
   data () {
     return {
       // 查询配置文件名
-      queryParamsName: 'ChargeQueryCRUD',
+      queryParamsName: 'address_management',
       // 查询配置左侧tree
-      // xTreeConfigName: 'addressType',
+      xTreeConfigName: 'addressType',
       // 新增表单固定值
       fixedAddForm: {},
       // 是否显示详情抽屉

package/src/pages/userInfoDetailManage/index.vue

@@ -28,8 +28,8 @@
         </x-descriptions>
         <user-info-detail-query-tabs :userInfo="userInfo"/>
         <template #extra>
-          <a-button type="primary" v-if="userInfo.gb_f_meter_type.includes('物联网表')" @click="openUser">开户</a-button>
-          <a-button type="primary" v-if="userInfo.gb_f_meter_type.includes('物联网表')&&!(userInfo.u_f_user_state === '停用')" @click="valvecontrol">开关阀</a-button>
+          <a-button type="primary" v-if="openUserBtnShow" @click="openUser">开户</a-button>
+          <a-button type="primary" v-if="valveBtnShow" @click="valvecontrol">开关阀</a-button>
           <a-button type="dashed" @click="refresh">刷新</a-button>
         </template>
       </a-page-header>
@@ -121,6 +121,8 @@ export default {
     return {
       userInfo: undefined,
       userInfoDetailVisible: false,
+      openUserBtnShow: false,
+      valveBtnShow: false,
       valve: false,
       networkValveOptions: [
         '手动',
@@ -134,6 +136,18 @@ export default {
       operateReason: '',
     }
   },
+  watch: {
+    userInfo: {
+      handler () {
+        if (this.userInfo) {
+          console.log('userinfo', this.userInfo)
+          this.openUserBtnShow = this.userInfo.f_meter_type.includes('物联网表')
+          this.valveBtnShow = this.userInfo.f_meter_type.includes('物联网表') && this.userInfo.f_user_state !== '停用'
+        }
+      },
+      deep: true
+    }
+  },
   methods: {
     refresh () {
       return runLogic('getUserInfoDetailV4', this.userInfo, 'af-revenue').then(res => {
@@ -144,7 +158,7 @@ export default {
       this.$confirm({
         title: '开户确认',
         content: '是否需要给用户进行开户?',
-        onOk: ()=> {
+        onOk: () => {
           const data = {
             f_userfiles_id: this.userInfo.f_userfiles_id
           }
@@ -167,7 +181,7 @@ export default {
       this.selectedOption = ''
       this.operateReason = ''
     },
-   async init (user) {
+    async init (user) {
       this.userInfo = user
       await this.refresh()
       this.userInfoDetailVisible = true
@@ -237,7 +251,7 @@ export default {
         if (_this.selectedOption !== '手动') {
           const msg = _this.selectedOption !== '自动' ? `阀控状态将在${_this.selectedOption}后自动调整为【自动】` : `阀控状态自动调整为 【自动】`
           this.$message.success(msg)
-          runLogic('iot_processDelayedOperations',datas,'af-revenue').then(res => {
+          runLogic('iot_processDelayedOperations', datas, 'af-revenue').then(res => {
             this.$emit('refresh')
             console.log('延时操作逻辑已执行')
           })