vue2-client 1.14.76 → 1.14.80

package/package.json

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

package/src/base-client/components/common/XAddReport/XAddReport.vue

@@ -6,6 +6,7 @@
     width="80%"
     height="60%"
     okText="提交"
+    :footer="showButtons ? undefined : null"
     @cancel="close"
     @ok="onSubmit"
     v-bind="attr">
@@ -67,6 +68,8 @@ export default {
       outEnv: {},
       // 外部传递来的 modal 参数
       attr: {},
+      // 是否显示对话框按钮
+      showButtons: true,
     }
   },
   provide () {
@@ -110,13 +113,15 @@ export default {
         selectedId = null,
         outEnv = {},
         mixinData = {},
-        attr = {}
+        attr = {},
+        showButtons = true,
       } = params
       this.configName = configName
       this.serverName = serverName
       this.displayOnly = displayOnly
       this.visible = true
       this.attr = attr
+      this.showButtons = showButtons
       // 有选中项，给选中项赋值
       if (selectedId) {
         this.selectedId = selectedId

package/src/base-client/components/common/XReportGrid/XReport.vue

@@ -85,7 +85,7 @@ export default {
       type: String,
       default: undefined,
     },
-    // 本地配��，调试用
+    // 本地配置，调试用
     localConfig: {
       type: Object,
       default: undefined,
@@ -244,7 +244,8 @@ export default {
       currUser: this.currUser,
       getGlobalData: this.getGlobalData,
       setGlobalData: this.setGlobalData,
-      findComponentByName: this.findComponentByName
+      findComponentByName: this.findComponentByName,
+      closeAddReport: this.closeAddReport,
     }
   },
   methods: {
@@ -284,6 +285,27 @@ export default {
     listClick (data) {
       this.$emit('listClick', data)
     },
+    closeAddReport () {
+      if (this.$refs.xAddReport) {
+        this.$refs.xAddReport.close()
+      }
+      let parent = this.$parent
+      while (parent) {
+        if (parent.$refs && parent.$refs.xAddReport) {
+          const addReportRefs = parent.$refs.xAddReport
+          if (Array.isArray(addReportRefs)) {
+            addReportRefs.forEach(ref => {
+              if (ref && typeof ref.close === 'function') {
+                ref.close()
+              }
+            })
+          } else if (typeof addReportRefs.close === 'function') {
+            addReportRefs.close()
+          }
+        }
+        parent = parent.$parent
+      }
+    },
     slotRendered () {
       if (this.config?.mountedFunction) {
         let func = this.config.mountedFunction
@@ -402,7 +424,7 @@ export default {
      * @param outEnv 其他传递给打开窗口的数据
      * @param attr 传递给Modal弹框用的信息
      */
-    openDialog (configName, selectedId, mixinData, outEnv = {}, attr = {}) {
+    openDialog (configName, selectedId, mixinData, outEnv = {}, attr = {}, showButtons = true) {
       console.log('openDialog', configName, selectedId)
       this.$refs.xAddReport.init({
         configName: configName,
@@ -410,6 +432,7 @@ export default {
         mixinData: mixinData,
         outEnv: outEnv,
         attr,
+        showButtons: showButtons
       })
     },
     openDrawer (configName, selectedId, mixinData, outEnv = {}, attr = {}) {
@@ -455,7 +478,7 @@ export default {
             targetData = targetData[path]
           }
         }
-        // 将修改的数���，添加update = true属性
+        // 将修改的数据，添加update = true属性
         targetData.update = true
       })
       return tempData
@@ -723,7 +746,7 @@ export default {
           titleCellFlag = false
           firstSubLine = false
         }
-        // 保存上一个的colspan���保持生成的格子与原格式一致
+        // 保存上一个的colspan保持生成的格子与原格式一致
         preColSpan = cell.colSpan
       })
 

package/src/base-client/components/common/XReportGrid/XReportTrGroup.vue

@@ -216,7 +216,7 @@ export default {
       }
     }
   },
-  inject: ['openDialog', 'emitEvent', 'registerComponent', 'setColSpanByName', 'setGlobalData', 'getGlobalData', 'getComponentByName', 'runLogic', 'getMixinData', 'getSelectedId', 'isInAModal', 'getConfigByName', 'getSelectedData', 'getOutEnv', 'currUser', 'isWidget', 'findComponentByName'],
+  inject: ['openDialog', 'emitEvent', 'registerComponent', 'setColSpanByName', 'setGlobalData', 'getGlobalData', 'getComponentByName', 'runLogic', 'getMixinData', 'getSelectedId', 'isInAModal', 'getConfigByName', 'getSelectedData', 'getOutEnv', 'currUser', 'isWidget', 'findComponentByName', 'closeAddReport'],
   methods: {
     getWindow,
     isMicroAppEnv,
@@ -659,7 +659,24 @@ export default {
           continue
         }
       }
-    }
+    },
+    closeAddReport () {
+      // 获取所有 xAddReport 组件实例
+      const addReportRefs = this.$parent.$refs.xAddReport
+      if (addReportRefs) {
+        // 如果是数组，遍历关闭所有实例
+        if (Array.isArray(addReportRefs)) {
+          addReportRefs.forEach(ref => {
+            if (ref && typeof ref.close === 'function') {
+              ref.close()
+            }
+          })
+        } else if (typeof addReportRefs.close === 'function') {
+          // 如果是单个实例，直接关闭
+          addReportRefs.close()
+        }
+      }
+    },
   },
   beforeMount () {
     if (this.useOssForImg) {

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

@@ -291,10 +291,10 @@ export default {
             }
           }
           // 拿取多于模板中的数据
-          const diff = Object.fromEntries(
+          const diff = this.bindObject? Object.fromEntries(
             Object.entries(this.bindObject)
               .filter(([key]) => !(key in this.editorRef.getBindObject()))
-          )
+          ) : {}
           this.codeData = {...this.codeData,...diff}
           this.changeMode()
           this.fileUrl = fileUrl

package/src/base-client/components/his/XQuestionnaire/XQuestionnaire.json

@@ -6,7 +6,7 @@
  	"content": [
 		{
       "key":"", //单行记录的标识
-			"justifyContent":"",//居中方式
+			"style":"",//居中方式
 			"item": [
 				{
 					"type":"",
@@ -18,8 +18,8 @@
 		}
 	]
 }
-//常量取值
-type [radio,checkBox,selectionBox,text,input,time,describe]
+//常量取值 checkBox多选
+type [radio,selectionBox,text,input,time,describe]
 justifyContent = ['flex-start', 'flex-end', 'center', 'space-between', 'space-around']
 
 "results": [{

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

@@ -26,13 +26,14 @@
             </template>
             <template v-else-if="column.type === 'radio'">
               <x-radio
+                :class="['column-item']"
                 :key="`row-${index}-item-${idx}`"
                 :queryParamsName="column.configName"
                 @change="handleChange($event,column,index)">
               </x-radio>
             </template>
             <template v-else-if="column.type === 'time'">
-              <x-time-select @change="handleChange($event,column,index)" :key="`row-${index}-item-${idx}`" :queryParamsName="column.configName">
+              <x-time-select :key="`row-${index}-item-${idx}`" :class="['column-item']" @change="handleChange($event,column,index)" :queryParamsName="column.configName">
               </x-time-select>
             </template>
             <template v-else-if="column.type === 'text'">
@@ -88,10 +89,6 @@ export default {
     async getData (queryParamsName) {
       const that = this
       getConfigByName(queryParamsName, 'af-his', res => {
-        if (!res.config.split) {
-          res.config.split = true
-        }
-        that.config = res.config
         that.config = {
           ...that.config,
           ...res.config
@@ -116,11 +113,18 @@ export default {
             this.mapping.push(this.results.length)
             value.row_key = fields.key
             this.results.push(value)
+          } else {
+            this.mapping.push(undefined)
           }
         }
       })
     },
     refreshList (param) {
+      // 清空当前数据和映射关系
+      this.data = []
+      this.results = []
+      this.mapping = []
+      this.results = []
       this.getData(this.queryParamsName, param)
     },
     // 行数据排量方式
@@ -136,15 +140,12 @@ export default {
       const resultIndex = this.mapping[rowIndex]
       if (resultIndex === undefined) return
       if (column.type === 'selectionBox') {
-        this.results[resultIndex] = e.target.checked
+        this.results[resultIndex][column.key] = e.target.checked
       } else if (column.type === 'input') {
-        this.results[resultIndex] = column.value
+        this.results[resultIndex][column.key] = column.value
+      } else if (column.type === 'radio' || column.type === 'time') {
+        this.results[resultIndex][column.key] = e
       }
-      console.log('mapping', this.mapping)
-      console.log('results', this.results)
-      console.log('handleChange', column)
-      console.log('handleChange', e)
-      console.log('handleChange', rowIndex)
     }
   },
   watch: {
@@ -162,42 +163,56 @@ export default {
 </script>
 
 <style scoped>
+
 .list-wrapper {
-  max-height: 240px;
-  overflow-y: auto;
-  padding-right: 2px;
+  border: 1px solid #f0f0f0;
 }
-
 .list-container {
   width: 100%;
 }
 
-/* 自定义滚动条样式 */
-.list-wrapper::-webkit-scrollbar {
-  width: 6px;
-}
-
-.list-wrapper::-webkit-scrollbar-thumb {
-  background-color: #d9d9d9;
-  border-radius: 3px;
-}
+/** 自定义滚动条样式
+    .list-wrapper {
+      max-height: 240px;
+      overflow-y: auto;
+      padding-right: 2px;
+    }
+    .list-wrapper::-webkit-scrollbar {
+      width: 6px;
+    }
 
-.list-wrapper::-webkit-scrollbar-track {
-  background-color: #f0f0f0;
-}
+    .list-wrapper::-webkit-scrollbar-thumb {
+      background-color: #d9d9d9;
+      border-radius: 3px;
+    }
 
+    .list-wrapper::-webkit-scrollbar-track {
+      background-color: #f0f0f0;
+    }
+*/
 /* header样式 */
 .list-wrapper ::v-deep .ant-list-header {
   background-color: #F4F4F4; /* 自定义背景色 */
   display: flex;
   justify-content: center;
 }
-
+.list-wrapper ::v-deep .x-radio-item {
+  margin-bottom: 0;
+}
+.list-wrapper ::v-deep .x-radio-item-container{
+  padding: 0;
+}
+.list-wrapper ::v-deep span.ant-radio + *{
+  padding: 0;
+}
+.list-wrapper ::v-deep .x-time-select {
+  width: auto !important;
+}
 /*每一行的整体样式*/
 .row-item{
   display: flex;
-  flex-wrap: wrap;
   align-items: center;
+  padding: 2px;
 }
 /*行中每一列的数据*/
 .column-item{
@@ -212,4 +227,5 @@ export default {
 .item-input{
   flex: 1;
 }
+
 </style>

package/src/base-client/components/his/XQuestionnaire/XQuestionnaireDemo.vue

@@ -2,22 +2,33 @@
 import XQuestionnaire from './XQuestionnaire.vue'
 import XRadio from '../XRadio/XRadio.vue'
 export default {
-  name: 'XList2Demo',
+  name: 'XQuestionnaireDemo',
   components: {
     XQuestionnaire,
     XRadio
   },
   data () {
     return {
-      queryParamsName: 'surgeryRiskAssessConfig4'
+      queryParamsName2: 'surgeryRiskAssessConfig2',
+      queryParamsName3: 'surgeryRiskAssessConfig3',
+      queryParamsName4: 'surgeryRiskAssessConfig4'
     }
   }
 }
 </script>
 
 <template>
-  <x-questionnaire :queryParamsName="queryParamsName">
-  </x-questionnaire>
+  <div style="display: flex">
+
+    <x-questionnaire :queryParamsName="queryParamsName2">
+    </x-questionnaire>
+
+    <x-questionnaire :queryParamsName="queryParamsName3">
+    </x-questionnaire>
+
+    <x-questionnaire :queryParamsName="queryParamsName4">
+    </x-questionnaire>
+  </div>
 </template>
 
 <style scoped>

package/src/pages/addressSelect/addressDemo.vue

@@ -0,0 +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>

package/src/pages/addressSelect/index.vue

@@ -0,0 +1,259 @@
+<script>
+import XFormTable from '@vue2-client/base-client/components/common/XFormTable'
+import { getConfigByName, runLogic } from '@vue2-client/services/api/common'
+import { mapState } from 'vuex'
+export default {
+  components: {
+    XFormTable
+  },
+  props: {
+    addressShow: {
+      required: true,
+      type: Boolean,
+      default: false
+    }
+  },
+  watch: {
+    addressShow (val) {
+      this.selectAddressVisible = val
+    },
+    'form.f_address_type' (newVal, oldVal) {
+      this.onAddressTypeChange(newVal, oldVal)
+    }
+  },
+  data () {
+    return {
+      selectAddressVisible: false,
+      addAddressFlag: false,
+      form: {
+        f_address_type: '',
+        f_residential_area_id: '',
+        f_residential_area: '',
+        f_iscity: ''
+      },
+      addressModel: [
+        {
+          expression: '{f_building}楼号{f_unit}单元{f_floor}楼层{f_room}门牌号',
+          label: '城市',
+          value: '城市'
+        },
+        {
+          expression: '{f_building}组{f_unit}号',
+          label: '乡镇',
+          value: '乡镇'
+        },
+        {
+          expression: '{f_address}',
+          label: '自定义',
+          value: '自定义'
+        }
+      ],
+      labelCol: { span: 4 },
+      wrapperCol: { span: 20 },
+      formItems: [],
+      areaList: [],
+      signContractVisible: false
+    }
+  },
+  methods: {
+    selAddress (record) {
+      // 给表单赋值
+      const form = {
+        f_address: record.tua_f_address,
+        f_address_id: record.tua_id
+      }
+      console.log('选择了地址是', form)
+      this.$emit('selAddress', form)
+      this.selectAddressVisible = false
+    },
+    addAddress () {
+      // 获取地址模式配置
+      getConfigByName('addressTypeDic', 'af-revenue', (res) => {
+        // 地址模式赋值
+        if (res.value?.length) {
+          this.addressModel = res.value
+        }
+        // 赋值默认地址模式
+        this.form = { f_address_type: this.addressModel[0].value }
+        this.addAddressFlag = true
+        this.addAddressMsg = '添加地址'
+        this.onAddressTypeChange()
+      })
+    },
+    onAddressTypeChange (newVal, oldVal) {
+      const selectedModel = this.addressModel.find(item => item.value === this.form.f_address_type)
+      Object.keys(this.form).forEach(key => {
+        if (key.endsWith('_suffix')) {
+          this.form[key] = ''
+        }
+      })
+      if (selectedModel) {
+        const matches = selectedModel.expression.match(/{(.*?)}([^{}]*)(?={|$)/g)
+        this.formItems = matches.map(item => {
+          const value = item.match(/{(.*?)}/)[1]
+          const label = item.replace(/{.*?}/, '').trim()
+          // 处理后缀
+          this.form[`${value}_suffix`] = label
+          return {
+            label: label || (value === 'f_address' ? '' : value), // 如果存在后面的文字，就使用后面的文字作为 label，否则使用原来的值
+            value: `${value}`
+          }
+        })
+      }
+    },
+    handleSearch (value) {
+      this.getAreaList(value)
+    },
+    getAreaList (value) {
+      console.log('搜索小区', this.currUser.orgid)
+      runLogic('getAreaListByName', {
+        orgId: this.currUser.orgid,
+        name: value
+      }, 'af-revenue').then(res => {
+        console.log(res)
+        this.areaList = res
+      })
+    },
+    handleChange (value) {
+      this.form.f_residential_area = this.areaList.find(item => item.value === value).label
+      console.log(this.form.f_residential_area)
+    },
+    addressSubmit () {
+      if (!this.form.f_residential_area) {
+        this.$message.warning('请选择小区')
+        return
+      }
+      this.deleteAddressData()
+      runLogic('addAddress', Object.assign({}, this.form, {
+        f_address: this.generateAddressString()
+      }, {
+        orgid: this.currUser.orgid,
+        f_orgid: this.currUser.orgid,
+        f_orgname: this.currUser.orgs,
+        f_depid: this.currUser.depids,
+        f_depname: this.currUser.deps,
+        f_operatorid: this.currUser.id,
+        f_operator: this.currUser.name,
+        f_filialeid: this.currUser.orgid
+      }), 'af-revenue').then(res => {
+        if (res) {
+          this.$message.success(`${this.addAddressMsg}成功`)
+          this.addAddressFlag = false
+          this.refresh()
+        }
+      })
+    },
+    // 删除 addressData 中存在 addressModel 不存在的字段
+    deleteAddressData () {
+      // 目前只需要检查这几个key
+      const keys = ['f_building', 'f_unit', 'f_floor', 'f_room']
+      Object.keys(this.form).forEach(key => {
+        if (keys.includes(key) && !this.formItems.some(item => item.value === key)) {
+          this.form[key] = ''
+          this.form[`${key}_suffix`] = ''
+        }
+      })
+    },
+    generateAddressString () {
+      const selectedModel = this.addressModel.find(item => item.value === this.form.f_address_type)
+      if (selectedModel) {
+        let addressString = selectedModel.expression
+        this.formItems.forEach(item => {
+          const value = this.form[item.value]
+          addressString = addressString.replace(`{${item.value}}`, value)
+        })
+        return addressString
+      }
+      return ''
+    },
+  },
+  computed: {
+    inputWidth () {
+      if (this.formItems.length === 1) {
+        return '85%'
+      }
+      return this.formItems.length ? `${65 / this.formItems.length}%` : '85%'
+    },
+    ...mapState('account', { currUser: 'user' }),
+    ...mapState('setting', { isMobile: 'isMobile' })
+  },
+}
+
+</script>
+
+<template>
+  <div>
+    <!-- 地址弹出框 -->
+    <a-modal
+      v-model="selectAddressVisible"
+      :dialog-style="{ top: '30px' }"
+      :bodyStyle="{height:'70vh',overflowY:'scroll'}"
+      :destroy-on-close="true"
+      :z-index="1002"
+      title="选择地址"
+      :footer="null"
+      width="80vw">
+      <x-form-table
+        title="选择地址"
+        queryParamsName="userfiles_sel_address"
+        @action="selAddress"
+        serviceName="af-revenue"
+        :extraHeight="225"
+        ref="selAddressXFormTable">
+        <template #leftButton="{selectedRows}">
+          <a-button
+            type="primary"
+            :disabled="selectedRows?.length !== 1"
+            @click="selAddress(selectedRows[0])"> 选择地址</a-button>
+          <a-button
+            type="primary"
+            @click="addAddress"> 新建地址
+          </a-button>
+        </template>
+      </x-form-table>
+    </a-modal>
+    <!--  添加地址  -->
+    <a-modal
+      v-model="addAddressFlag"
+      :dialog-style="{ top: '30px' }"
+      :z-index="1005"
+      @ok="addressSubmit"
+      @cancel="addAddressFlag = false"
+      title="新增地址信息"
+      :destroyOnClose="true">
+      <a-form-model :model="form" :label-col="labelCol" :wrapper-col="wrapperCol">
+        <a-form-model-item label="小区">
+          <a-select
+            show-search
+            placeholder="请选择小区"
+            option-filter-prop="children"
+            @search="handleSearch"
+            style="width: 200px"
+            @change="handleChange"
+          >
+            <a-select-option v-for="item in areaList" :value="item.value" :key="item">
+              {{ item.label }}
+            </a-select-option>
+          </a-select>
+        </a-form-model-item>
+        <a-form-model-item label="地址类型">
+          <a-radio-group v-model="form.f_address_type">
+            <a-radio :value="item.value" v-for="(item, index) in addressModel" :key="index">
+              {{ item.label }}
+            </a-radio>
+          </a-radio-group>
+        </a-form-model-item>
+        <a-form-model-item label="详细地址">
+          <div v-for="(item, index) in formItems" :key="index" style="display: inline;white-space: nowrap">
+            <a-input v-model="form[item.value]" style="display: inline;" :style="{ width: inputWidth }"/>
+            <span>{{ item.label }}</span>
+          </div>
+        </a-form-model-item>
+      </a-form-model>
+    </a-modal>
+  </div>
+</template>
+
+<style>
+
+</style>

package/src/router/async/router.map.js

@@ -55,6 +55,7 @@ routerResource.newDynamicStatistics = () => import('@vue2-client/pages/NewDynami
 routerResource.example = {
   path: 'example',
   name: '示例主页面',
+  // component: () => import('@vue2-client/pages/addressSelect/addressDemo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XDescriptions/demo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XAddNativeForm/demo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XFormGroup/demo.vue'),