vue2-client 1.14.9 → 1.14.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.14.9",
+  "version": "1.14.11",
   "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

@@ -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>