vue2-client 1.14.74 → 1.14.78

package/package.json

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

package/src/base-client/components/common/AmapMarker/index.js

@@ -1,3 +1,3 @@
-import AmapPointRendering from './AmapPointRendering'
-
-export default AmapPointRendering
+import AmapPointRendering from './AmapPointRendering'
+
+export default AmapPointRendering

package/src/base-client/components/common/XDetailsView/index.js

@@ -1,3 +1,3 @@
-import XDetailsView from './XDetailsView'
-
-export default XDetailsView
+import XDetailsView from './XDetailsView'
+
+export default XDetailsView

package/src/base-client/components/common/XFormGroupDetails/index.js

@@ -1,3 +1,3 @@
-import XFormGroupDetails from './XFormGroupDetails'
-
-export default XFormGroupDetails
+import XFormGroupDetails from './XFormGroupDetails'
+
+export default XFormGroupDetails

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

@@ -25,7 +25,7 @@
           </template>
           <template v-else-if="cell.type === 'slot'">
             <template
-              v-if="['x-form-table','x-add-native-form','x-tree-pro', 'x-his-editor', 'x-tab', 'x-form-group', 'x-report', 'x-buttons', 'x-label-select', 'x-conversation', 'x-check-list', 'x-cardSet', 'x-collapse','x-h-descriptions', 'x-sidebar', 'x-list','x-input','x-time-line', 'x-radio','x-calendar', 'x-time-select' ,'x-checkbox', 'x-title', 'x-select', 'x-tree-rows', 'x-three-test-orders', 'x-shift-schedule','x-charge'].includes(cell.slotType)">
+              v-if="['x-form-table','x-add-native-form','x-tree-pro', 'x-his-editor', 'x-tab', 'x-form-group', 'x-report', 'x-buttons', 'x-label-select', 'x-conversation', 'x-check-list', 'x-cardSet', 'x-collapse','x-h-descriptions', 'x-sidebar', 'x-list','x-input','x-time-line', 'x-radio','x-calendar', 'x-time-select' ,'x-checkbox', 'x-title', 'x-select', 'x-tree-rows', 'x-three-test-orders', 'x-shift-schedule','x-charge','x-questionnaire'].includes(cell.slotType)">
               <component
                 :is="getComponentName(cell.slotConfig, cell.serviceName, cell.slotType)"
                 :key="cellIndex"
@@ -63,7 +63,7 @@
           </template>
           <template v-else-if="cell.type === 'slot'">
             <template
-              v-if="['x-form-table','x-add-native-form','x-tree-pro', 'x-his-editor', 'x-tab', 'x-form-group', 'x-report', 'x-buttons', 'x-label-select', 'x-conversation', 'x-check-list', 'x-cardSet', 'x-collapse', 'x-h-descriptions', 'x-sidebar', 'x-list','x-input','x-time-line', 'x-radio','x-calendar', 'x-time-select','x-checkbox', 'x-title', 'x-select', 'x-tree-rows', 'x-three-test-orders', 'x-shift-schedule','x-charge'].includes(cell.slotType)">
+              v-if="['x-form-table','x-add-native-form','x-tree-pro', 'x-his-editor', 'x-tab', 'x-form-group', 'x-report', 'x-buttons', 'x-label-select', 'x-conversation', 'x-check-list', 'x-cardSet', 'x-collapse', 'x-h-descriptions', 'x-sidebar', 'x-list','x-input','x-time-line', 'x-radio','x-calendar', 'x-time-select','x-checkbox', 'x-title', 'x-select', 'x-tree-rows', 'x-three-test-orders', 'x-shift-schedule','x-charge','x-questionnaire'].includes(cell.slotType)">
               <component
                 :is="getComponentName(cell.slotConfig, cell.serviceName, cell.slotType)"
                 :key="cellIndex"
@@ -126,7 +126,8 @@ export default {
     XTreeRows: () => import('@vue2-client/base-client/components/his/XTreeRows/XTreeRows.vue'),
     XThreeTestOrders: () => import('@vue2-client/base-client/components/his/threeTestOrders/threeTestOrders.vue'),
     XShiftSchedule: () => import('@vue2-client/base-client/components/his/XShiftSchedule/XShiftSchedule.vue'),
-    XCharge: () => import('@vue2-client/base-client/components/his/XCharge/XCharge.vue')
+    XCharge: () => import('@vue2-client/base-client/components/his/XCharge/XCharge.vue'),
+    XQuestionnaire: () => import('@vue2-client/base-client/components/his/XQuestionnaire/XQuestionnaire.vue')
   },
   props: {
     // 每一行的配置

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

@@ -0,0 +1,32 @@
+{
+	"config":{
+	  "title":"",
+	  "split":""
+	},
+ 	"content": [
+		{
+      "key":"", //单行记录的标识
+			"style":"",//居中方式
+			"item": [
+				{
+					"type":"",
+					"key": "",
+					"value": {},
+					"configName":"" // 通过后端获配置单选多选
+				}
+			]
+		}
+	]
+}
+//常量取值 checkBox多选
+type [radio,selectionBox,text,input,time,describe]
+justifyContent = ['flex-start', 'flex-end', 'center', 'space-between', 'space-around']
+
+"results": [{
+   "row_key": "",
+   "key": "value"
+  }
+]
+
+
+

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

@@ -0,0 +1,226 @@
+<template>
+  <div class="list-wrapper">
+    <a-list size="large"
+            :data-source="data"
+            itemLayout="horizontal"
+            class="list-container"
+            ref="listRef"
+            split="config.split"
+    >
+      <template v-if="config.header" #header>
+        <div >{{ config.header }}</div>
+      </template>
+      <a-list-item
+        slot="renderItem"
+        slot-scope="item, index">
+        <div
+          class="row-item"
+          :style="{ justifyContent: getFlexJustify(item.style) }"
+        >
+          <template v-for="(column, idx) in item.item">
+            <template v-if="column.type === 'selectionBox'">
+              <a-checkbox @change="handleChange($event,column,index)" v-model="column.value" :key="`row-${index}-item-${idx}`" :class="['column-item']"></a-checkbox>
+            </template>
+            <template v-else-if="column.type === 'input'">
+              <a-input @change="handleChange($event,column,index)" :key="`row-${index}-item-${idx}`" :class="['column-item','item-input']" v-model="column.value" />
+            </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 :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'">
+              <span :key="`row-${index}-item-${idx}`" :class="['column-item','item-text']"> {{ column.value }} </span>
+            </template>
+            <template v-else-if="column.type === 'describe'">
+              <span :key="`row-${index}-item-${idx}`" :class="['column-item','item-describe']"> {{ column.value }} </span>
+            </template>
+            <template v-else>
+              <span :key="`row-${index}-item-${idx}`" :class="['column-item','item-text']"> {{ column.value }} </span>
+            </template>
+          </template>
+        </div>
+      </a-list-item>
+    </a-list>
+  </div>
+</template>
+
+<script>
+
+import { getConfigByName } from '@vue2-client/services/api/common'
+import XRadio from '@vue2-client/base-client/components/his/XRadio/XRadio'
+import XTimeSelect from '@vue2-client/base-client/components/his/XTimeSelect/XTimeSelect'
+export default {
+  name: 'XQuestionnaire',
+  props: {
+    queryParamsName: {
+      type: Object,
+      default: null
+    }
+  },
+  inject: ['getComponentByName'],
+  components: {
+    XTimeSelect,
+    XRadio
+  },
+  data () {
+    return {
+      data: [],
+      config: {
+        split: true,
+        header: null
+      },
+      results: [],
+      mapping: [] // 行索引  results数据所在的行
+    }
+  },
+  created () {
+    this.getData(this.queryParamsName)
+  },
+  methods: {
+    // 获取配置
+    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
+        }
+        that.data = res.content || []
+        // 将又返回值的数据创建到results
+        for (let i = 0; i < res.content.length; i++) {
+          const fields = res.content[i]
+          if (!fields.item) {
+            continue
+          }
+          const value = {}
+          let hasValidData = false // 标识是否有有效数据
+          for (let j = 0; j < fields.item.length; j++) {
+            const field = fields.item[j]
+            if (field.type === 'selectionBox' || field.type === 'input' || field.type === 'radio' || field.type === 'time') {
+              value[field.key] = field.value
+              hasValidData = true
+            }
+          }
+          if (hasValidData) {
+            this.mapping.push(this.results.length)
+            value.row_key = fields.key
+            this.results.push(value)
+          } else {
+            this.mapping.push(undefined)
+          }
+        }
+      })
+    },
+    refreshList (param) {
+      this.getData(this.queryParamsName, param)
+    },
+    // 行数据排量方式
+    getFlexJustify (style) {
+      const validStyles = [
+        'flex-start', 'flex-end', 'center',
+        'space-between', 'space-around'
+      ]
+      return validStyles.includes(style) ? style : 'flex-start'
+    },
+    // 数据发生改变--将修改后的值填充到results
+    handleChange (e, column, rowIndex) {
+      const resultIndex = this.mapping[rowIndex]
+      if (resultIndex === undefined) return
+      if (column.type === 'selectionBox') {
+        this.results[resultIndex][column.key] = e.target.checked
+      } else if (column.type === 'input') {
+        this.results[resultIndex][column.key] = column.value
+      } else if (column.type === 'radio' || column.type === 'time') {
+        this.results[resultIndex][column.key] = e
+      }
+    }
+  },
+  watch: {
+    fixedQueryForm: {
+      deep: true,
+      handler (val) {
+        this.refreshList(val)
+      }
+    }
+  },
+  beforeDestroy () {
+    this.clearAllTimers()
+  }
+}
+</script>
+
+<style scoped>
+.list-wrapper {
+  max-height: 240px;
+  overflow-y: auto;
+  padding-right: 2px;
+}
+
+.list-container {
+  width: 100%;
+}
+
+/* 自定义滚动条样式 */
+.list-wrapper::-webkit-scrollbar {
+  width: 6px;
+}
+
+.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;
+  align-items: center;
+}
+/*行中每一列的数据*/
+.column-item{
+  margin-left: 10px;
+}
+.item-text {
+  color: black;
+}
+.item-describe {
+  color: #808080 ;
+}
+.item-input{
+  flex: 1;
+}
+
+</style>

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

@@ -0,0 +1,25 @@
+<script>
+import XQuestionnaire from './XQuestionnaire.vue'
+import XRadio from '../XRadio/XRadio.vue'
+export default {
+  name: 'XList2Demo',
+  components: {
+    XQuestionnaire,
+    XRadio
+  },
+  data () {
+    return {
+      queryParamsName: 'surgeryRiskAssessConfig4'
+    }
+  }
+}
+</script>
+
+<template>
+  <x-questionnaire :queryParamsName="queryParamsName">
+  </x-questionnaire>
+</template>
+
+<style scoped>
+
+</style>

package/src/pages/WorkflowDetail/WorkFlowDemo.vue

@@ -1,90 +1,47 @@
-<template>
-  <a-card :bordered="false">
-    <x-form-table
-      title="示例页面"
-      :queryParamsName="queryParamsName"
-      :fixed-query-form="{
-        users_f_handler_id: currUser.id,
-      }"
-      @action="toDetail">
-      <template slot="button">
-        <a-button @click="add">
-          <a-icon type="plus"/>
-          发起报建
-        </a-button>
-      </template>
-    </x-form-table>
-    <a-modal
-      v-model="applyAddFlag"
-      :footer="null"
-      :dialog-style="{ top: '5rem' }"
-      :z-index="1001"
-      title="发起报建"
-      :destroyOnClose="true">
-      <x-add-native-form ref="xForm" @onSubmit="applySubmit"/>
-    </a-modal>
-    <WorkflowDetail ref="workFlow" @success="success"></WorkflowDetail>
-  </a-card>
-</template>
-
 <script>
 import WorkflowDetail from '@vue2-client/pages/WorkflowDetail/WorkflowDetail.vue'
-import XFormTable from '@vue2-client/base-client/components/common/XFormTable/XFormTable'
-import XAddNativeForm from '@vue2-client/base-client/components/common/XAddNativeForm/XAddNativeForm.vue'
-import { getConfigByName, runLogic } from '@vue2-client/services/api/common'
-import { mapState } from 'vuex'
 
 export default {
-  name: 'Apply',
-  components: {
-    XFormTable,
-    XAddNativeForm,
-    WorkflowDetail
-  },
-  data () {
-    return {
-      // 查询配置文件名
-      queryParamsName: 'applyCRUD',
-      // 发起报建弹框控制
-      applyAddFlag: false
-    }
-  },
-  computed: {
-    ...mapState('account', { currUser: 'user' }),
+  name: 'WorkFlowDemo',
+  components: { WorkflowDetail },
+  mounted () {
+    this.$refs.workFlow.init({
+      workflowId: '11'
+    })
   },
   methods: {
-    add () {
-      this.applyAddFlag = true
-      this.$nextTick(
-        () => {
-          getConfigByName('addApplyForm', 'af-apply', (res) => {
-            this.$refs.xForm.init({
-              businessType: '新增',
-              title: '发起报建',
-              ...res
-            })
-          })
-        }
-      )
-    },
-    applySubmit (formData) {
-      runLogic('addApply', formData).then(
-        res => {
-          this.$message.success('发起报建成功')
-          this.applyAddFlag = false
-        }
-      ).catch(() => {
-        this.applyAddFlag = false
-      })
+    /**
+     * 流程详情页成功
+     * @param note 备注信息
+     * @param form 表单信息
+     * @param workflowId
+     */
+    success ({ note, form, workflowId }) {
+      console.log('success', note, form, workflowId)
     },
-    success () {
-      console.log('完工')
-    },
-    toDetail (record, id) {
-      this.$refs.workFlow.init({
-        workflowId: record.twf_id
-      })
+    /**
+     * 流程详情页成功
+     * @param note 备注信息
+     * @param form 表单信息
+     * @param workflowId 工作流id
+     * @param fromStepId 起ID
+     * @param toStepId 往ID
+     * @param successStepId 完成步骤id
+     * @param successStep 完成步骤名称
+     * @param fromStep 起步骤名称
+     * @param toStep 往步骤名称
+     */
+    nextClick ({ note, form, workflowId, fromStepId, toStepId, fromStep, toStep, successStepId, successStep }) {
+      console.log('success', note, form, workflowId, fromStepId, toStepId, fromStep, toStep, successStepId, successStep)
     }
   }
 }
 </script>
+
+<template>
+  <WorkflowDetail ref="workFlow" @success="success" @nextClick="nextClick"></WorkflowDetail>
+</template>
+
+<style scoped lang="less">
+
+</style>

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,16 +55,18 @@ 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'),
-  component: () => import('@vue2-client/base-client/components/common/XReport/XReportDemo.vue'),
+  // component: () => import('@vue2-client/base-client/components/common/XReport/XReportDemo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XFormTable/demo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XDatePicker/demo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XTab/XTabDemo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XRate/demo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XForm/demo.vue'),
   // component: () => import('@vue2-client/base-client/components/his/XTimeSelect/XTimeSelectDemo.vue'),
+  component: () => import('@vue2-client/base-client/components/his/XQuestionnaire/XQuestionnaireDemo.vue'),
   // component: () => import('@vue2-client/pages/WorkflowDetail/WorkFlowDemo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XConversation/XConversationDemo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XButtons/XButtonDemo.vue'),

package/vue.config.js

@@ -11,12 +11,12 @@ const productionGzipExtensions = ['js', 'css']
 const isProd = process.env.NODE_ENV === 'production'
 
 // v4 产品演示
-const v3Server = 'http://192.168.50.67:31567'
+const v3Server = 'http://aote-office.8866.org:31567'
 // const gateway = 'http://192.168.50.67:31467'
 // const testUpload = 'http://123.60.214.109:8406'
 const OSSServerDev = 'http://192.168.50.67:30351'
 // const revenue = 'http://aote-office.8866.org:31567'
-const revenue = 'http://192.168.50.67:31567'
+const revenue = 'http://aote-office.8866.org:31567'
 // const OSSServerProd = 'http://192.168.50.67:31351'
 // const testUploadLocal = 'http://127.0.0.1:9001'
 // v3 铜川