vue2-client 1.14.95 → 1.14.99

package/package.json

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

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

@@ -362,6 +362,11 @@ export default {
       type: Number,
       default: 80
     },
+    // 是否禁用右侧操作行为
+    disableAction: {
+      type: Boolean,
+      default: false
+    },
     // 额外参数，用于控制组件行为
     extraParams: {
       type: Object,
@@ -541,6 +546,7 @@ export default {
             env: this.env,
             form: this.$refs.xForm.form,
             summaryUpdate: true,
+            disableAction: this.disableAction,
             ...res
           })
           if (this.realQueryConfig?.funcData?.pageMounted) {
@@ -632,8 +638,8 @@ export default {
      * @param fun 向上级传递的事件
      */
     action (record, id, actionType, fun = 'action', index) {
-      this.$emit('innerXFormTableEmit', fun, record, id, actionType, index)
-      this.$emit(fun, record, id, actionType, index)
+      this.$emit('innerXFormTableEmit', fun, record, id, actionType, index, this)
+      this.$emit(fun, record, id, actionType, index, this)
     },
     treeOnChecked (checkedKeys, deepNodes, deepKeys) {
       this.$emit('treeOnChecked', checkedKeys, deepNodes, deepKeys)

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

@@ -151,6 +151,7 @@
     <template v-if="isTableMode">
       <x-table-wrapper
         ref="table"
+        :disableAction="disableAction"
         @rowClick="handleRowClick"
         @beforeDataChange="beforeDataChange"
         @expand="onExpand">
@@ -458,7 +459,9 @@ export default {
       selectRowMode: 'default',
       tableSize: 'default',
       clearSelectRowAfterQuery: false,
-      selectedRowModalVisible: false
+      selectedRowModalVisible: false,
+      // 是否禁用右侧操作行为
+      disableAction: false
     }
   },
   props: {
@@ -739,7 +742,8 @@ export default {
         printTemplate = 'DEFAULT_CRUD_PRINT_TEMPLATE',
         selectRowMode = 'default',
         tableSize = 'default',
-        clearSelectRowAfterQuery = false
+        clearSelectRowAfterQuery = false,
+        disableAction = false
       } = params
       this.showSummary = Object.keys(tableSummaryMap).length > 0
       if (this.showSummary) {
@@ -792,6 +796,7 @@ export default {
       this.selectRowMode = selectRowMode
       this.tableSize = tableSize
       this.clearSelectRowAfterQuery = clearSelectRowAfterQuery
+      this.disableAction = disableAction
       if (this.chartsConfigArray.length > 0) {
         // 循环chartsConfigArray，将每个配置的数据请求参数赋值给requestParameters
         this.chartsConfigArray.forEach(item => {

package/src/base-client/components/common/XTable/XTableWrapper.vue

@@ -5,7 +5,7 @@
     ref="expandableTable"
     :id="tableContext.uniqueId"
     :alert="true"
-    :columns="tableContext.tableColumns"
+    :columns="realTableColumns"
     :data="loadData()"
     :rowKey="tableContext.rowKey"
     :showSummary="tableContext.showSummary"
@@ -24,7 +24,7 @@
     @rowClick="handleRowClick"
   >
     <template
-      v-for="(item, c_index) in tableContext.tableColumns"
+      v-for="(item, c_index) in realTableColumns"
       :slot="item.dataIndex"
       slot-scope="text, record, index">
       <template v-if="tableContext.isEditMode && getFromItem(item.dataIndex,text, record, index)">
@@ -140,7 +140,7 @@
     ref="simpleTable"
     :id="tableContext.uniqueId"
     :alert="true"
-    :columns="tableContext.tableColumns"
+    :columns="realTableColumns"
     :data="loadData()"
     :rowKey="tableContext.rowKey"
     :showSummary="tableContext.showSummary"
@@ -158,7 +158,7 @@
     @beforeDataChange="beforeDataChange"
   >
     <template
-      v-for="(item, c_index) in tableContext.tableColumns"
+      v-for="(item, c_index) in realTableColumns"
       :slot="item.dataIndex"
       slot-scope="text, record, index">
       <template v-if="tableContext.isEditMode && getFromItem(item.dataIndex,text, record, index)">
@@ -287,6 +287,9 @@ export default {
     // 获取当前活动的表格实例
     activeTable () {
       return this.tableContext.expandedGrid ? this.$refs.expandableTable : this.$refs.simpleTable
+    },
+    realTableColumns () {
+      return this.tableContext.tableColumns.filter(item => item.slotType !== 'action' || !this.disableAction)
     }
   },
   props: {
@@ -294,6 +297,10 @@ export default {
       type: Boolean,
       required: false,
       default: false
+    },
+    disableAction: {
+      type: Boolean,
+      default: false
     }
   },
   inject: ['tableContext'],
@@ -384,11 +391,11 @@ export default {
       if (aa) {
         const tempConfig = JSON.parse(JSON.stringify(aa))
         // 如果找到了字段
-        const ColumnIndex = this.tableContext.tableColumns.findIndex(item => item.dataIndex === model)
+        const ColumnIndex = this.realTableColumns.findIndex(item => item.dataIndex === model)
         // 并且表单项是日期框
         if (ColumnIndex !== -1 && ['yearPicker', 'monthPicker', 'datePicker', 'rangePicker'].includes(tempConfig.type)) {
           // 修改他的列宽
-          this.tableContext.tableColumns[ColumnIndex].width = 220
+          this.realTableColumns[ColumnIndex].width = 220
         }
         // 如果有检验规则检验是数字
         if (ColumnIndex !== -1 && ['number', 'integer', 'float'].includes(tempConfig?.rule?.type)) {

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

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

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

@@ -1,7 +1,7 @@
 <template>
   <div class="list-container" style="display: flex;">
-    <template v-for="(config, index) in configs">
-      <x-questionnaire-item :fixedQueryForm="conditions[index]" :queryParamsName="config" :ref="el => setItemRef(el, index)" :key="`questionnaire-${index}`"></x-questionnaire-item>
+    <template v-for="(config) in configs">
+      <x-questionnaire-item :key="config.tmp_key" :fixedQueryForm="conditionsMap[config.tmp_key]" :queryParamsName="config" :ref="el => setItemRef(el, config)" @customizeEvent="customizeEvent"></x-questionnaire-item>
     </template>
   </div>
 </template>
@@ -26,38 +26,60 @@ export default {
   data () {
     return {
       configs: [],
-      questionnaireItemRefs: [], // 存储子组件实例
-      conditions: []
+      questionnaireItemRefs: new Map(), // 存储子组件实例
+      conditionsMap: {}
     }
   },
   methods: {
     // 获取配置
-    async getData (queryParamsName, conditions) {
-      const that = this
-      getConfigByName(queryParamsName, 'af-his', res => {
-        if (res.configs) {
-          that.configs = []
-        }
-        for (let i = 0; i < res.configs.length; i++) {
-          const condition = i < conditions.length ? conditions[i] : {}
-          that.configs.push(res.configs[i])
-          that.conditions.push(condition)
-        }
+    async getData (conditionData) {
+      getConfigByName(this.queryParamsName, 'af-his', res => {
+        // 清空旧数据
+        this.configs = []
+        this.conditionsMap = { ...this.conditionsMap }
+        console.log(res)
+        res.configs.forEach(config => {
+          this.configs.push(config)
+          // 响应式更新条件映射
+          this.$set(this.conditionsMap, config.tmp_key,
+            conditionData[config.tmp_key] || {}
+          )
+        })
       })
     },
-    setItemRef (el, index) {
-      if (el) {
-        this.questionnaireItemRefs[index] = el // 保存实例
+    customizeEvent (customize, callback) {
+      console.log(this.$listeners)
+      console.log(customize)
+      if (customize.clickEventName && this.$listeners[customize.clickEventName]) {
+        // 交由父级处理
+        this.$emit(customize.clickEventName, customize, callback)
+      } else {
+        this.defaultAction(customize.clickEventName, customize, callback)
       }
     },
-    init (conditions) {
-      this.getData(this.queryParamsName, conditions)
+    defaultAction (clickEventName, item, callback) {
+      setTimeout(() => {
+        this.$message.warn(`已触发按钮 [${item.key}]，注册事件名 [${clickEventName}]，未实现事件函数`)
+        callback()
+      }, 200)
     },
-    refreshList (index, condition) {
-      if (index < this.conditions.length) {
-        this.conditions[index] = condition
+    setItemRef (el, config) {
+      if (el) {
+        this.questionnaireItemRefs.set(config.tmp_key, el)
+      } else {
+        this.questionnaireItemRefs.delete(config.tmp_key) // 组件卸载时清理
       }
-    }
+    },
+    async init () { // 接收完整条件对象
+      this.$emit('init')
+    },
+
+    refreshList (tmpKey, condition) {
+      // 更新条件映射
+      this.$set(this.conditionsMap, tmpKey, condition)
+      // 调用子组件刷新
+      this.questionnaireItemRefs.get(tmpKey)?.refreshList(condition)
+    },
   },
 }
 </script>

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

@@ -13,7 +13,19 @@ export default {
   methods: {
     init () {
       console.log(this)
-      this.$refs.questionnaireRef.init([{ id: 10 }, { id: 20 }, { id: 10 }])
+      const conditionData = {
+        tmp_1: { tmp_id: 1 },
+        tmp_2: { tmp_id: 2 },
+        tmp_3: { tmp_id: 3 }
+      }
+      this.$refs.questionnaireRef.init(conditionData)
+    },
+    save () {
+      console.log(this)
+      console.log(this.$refs.questionnaireRef.questionnaireItemRefs.get('tmp_1').results)
+    },
+    refreshList () {
+      this.$refs.questionnaireRef.refreshList('tmp_2', { tmp_id: 3 })
     }
   }
 }
@@ -26,9 +38,14 @@ export default {
     <a-button type="primary" @click="init">
       初始化
     </a-button>
+    <a-button type="primary" @click="save">
+      保存
+    </a-button>
+    <a-button type="primary" @click="refreshList">
+      刷新
+    </a-button>
   </div>
 </template>
 
 <style scoped>
-
 </style>

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

@@ -19,23 +19,23 @@
           class="row-item"
           :style="{ justifyContent: getFlexJustify(item.style) }"
         >
-          <template v-for="(column, idx) in item.item">
+          <template v-for="(column, idx) in item.columns">
             <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>
+              <a-checkbox @change="handleChange($event,column)" 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" />
+              <a-input @change="handleChange($event,column)" :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)">
+                @change="handleChange($event,column)">
               </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 :key="`row-${index}-item-${idx}`" :class="['column-item']" @change="handleChange($event,column)" :queryParamsName="column.configName">
               </x-time-select>
             </template>
             <template v-else-if="column.type === 'text'">
@@ -51,13 +51,13 @@
               <a-button
                 :class="['column-item']"
                 :key="`row-${index}-item-${idx}`"
-                :disabled="column.disabled"
-                :icon="column.icon"
-                :loading="column.loading"
-                :type="column.buttonType || 'default'"
+                :disabled="column.customize.disabled"
+                :icon="column.customize.icon"
+                :loading="column.customize.loading"
+                :type="column.customize.buttonType || 'default'"
                 @click="handleButtonClick(column)"
               >
-                {{ column.label }}
+                {{ column.value }}
               </a-button>
             </template>
             <template v-else>
@@ -99,8 +99,8 @@ export default {
         split: true,
         header: null
       },
-      results: [],
-      mapping: [] // 行索引  results数据所在的行
+      results: {},
+      oldFixedQueryForm: null
     }
   },
   created () {
@@ -116,38 +116,33 @@ export default {
           ...config
         }
         runLogic(config.data, param, 'af-his').then(res => {
+          console.log('1', res)
           that.data = res || []
           // 将又返回值的数据创建到results
           for (let i = 0; i < res.length; i++) {
             const fields = res[i]
-            if (!fields.item) {
+            if (!fields.columns) {
               continue
             }
-            const value = {}
-            let hasValidData = false // 标识是否有有效数据
-            for (let j = 0; j < fields.item.length; j++) {
-              const field = fields.item[j]
+            console.log('2', fields)
+            for (let j = 0; j < fields.columns.length; j++) {
+              const field = fields.columns[j]
+              console.log('3', field)
+              if (this.results[field.config_id]) {
+                console.error(`Config_id 冲突: ${field.config_id} 重复,同一个模板中不能有形同的配置项`)
+                return
+              }
               if (field.type === 'selectionBox' || field.type === 'input' || field.type === 'radio' || field.type === 'time') {
-                value[field.key] = field.value
-                hasValidData = true
+                this.results[field.config_id] = { value: field.value, data_id: field.data_id }
               }
-            }
-            if (hasValidData) {
-              this.mapping.push(this.results.length)
-              value.row_key = fields.key
-              this.results.push(value)
-            } else {
-              this.mapping.push(undefined)
+              console.log(this.results)
             }
           }
         })
     },
     refreshList (param) {
-      // 清空当前数据和映射关系
       this.data = []
-      this.results = []
-      this.mapping = []
-      this.results = []
+      this.results = {}
       this.getData(this.queryParamsName, param)
     },
     // 行数据排量方式
@@ -159,34 +154,21 @@ export default {
       return validStyles.includes(style) ? style : 'flex-start'
     },
     // 数据发生改变--将修改后的值填充到results
-    handleChange (e, column, rowIndex) {
-      const resultIndex = this.mapping[rowIndex]
-      if (resultIndex === undefined) return
+    handleChange (e, column) {
       if (column.type === 'selectionBox') {
-        this.results[resultIndex][column.key] = e.target.checked
+        this.results[column.config_id].value = e.target.checked
       } else if (column.type === 'input') {
-        this.results[resultIndex][column.key] = column.value
+        this.results[column.config_id].value = column.value
       } else if (column.type === 'radio' || column.type === 'time') {
-        this.results[resultIndex][column.key] = e
+        this.results[column.config_id].value = e
       }
     },
     handleButtonClick (item) {
-      item.loading = true
+      item.customize.loading = true
       const callback = () => {
-        item.loading = false
+        item.customize.loading = false
       }
-      if (item.clickEventName && this.$listeners[item.clickEventName]) {
-        // 交由父级处理
-        this.$emit(item.clickEventName, item, callback)
-      } else {
-        this.defaultAction(item.clickEventName, item, callback)
-      }
-    },
-    defaultAction (clickEventName, item, callback) {
-      setTimeout(() => {
-        this.$message.warn(`已触发按钮 [${item.key}]，注册事件名 [${clickEventName}]，未实现事件函数`)
-        callback()
-      }, 200)
+      this.$emit('customizeEvent', item.customize, callback)
     }
   },
   watch: {

package/src/pages/WorkflowDetail/WorkFlowDemo2.vue

@@ -30,6 +30,23 @@
     >
     </WorkflowDetail>
     <address-select ref="addressSelect" @setAddress="setForm"></address-select>
+    <!--  协议作废功能  -->
+    <a-modal
+      v-model="formState"
+      :dialog-style="{ top: '5rem' }"
+      :z-index="1001"
+      title="作废"
+      :destroyOnClose="true"
+      width="55vw">
+      <x-add-native-form
+        ref="xCancelForm"
+        @onSubmit="submit"
+      />
+      <template #footer>
+        <a-button key="back" @click="formState = false">取消</a-button>
+        <a-button key="submit" type="primary" :loading="submitLoading" @click="formSubmit">确认</a-button>
+      </template>
+    </a-modal>
   </a-card>
 </template>
 
@@ -54,7 +71,10 @@ export default {
       // 查询配置文件名
       queryParamsName: 'applyCRUD',
       // 发起报建弹框控制
-      applyAddFlag: false
+      applyAddFlag: false,
+      formState: false,
+      submitLoading: false,
+      cancelRecord: {}
     }
   },
   computed: {
@@ -101,6 +121,55 @@ export default {
     },
     setForm (record) {
       this.$refs.workFlow.setFormValue({ address: record.f_address })
+    },
+    // 协议作废
+    setCancel (record) {
+      this.cancelRecord = record
+      this.formState = true
+      this.$nextTick(() => {
+        getConfigByName('setCancelForm', 'af-apply', (config) => {
+          if (this.$refs.xCancelForm) {
+            this.$refs.xCancelForm.init({
+              formItems: config.formJson,
+              title: '补充协议作废',
+              businessType: '修改',
+              showSubmitBtn: false,
+              ...config
+            })
+            if (this.$refs.xCancelForm) {
+              console.log(record)
+              // this.$refs.xCancelForm.setForm(recordData)
+            }
+          } else {
+            console.error('xCancelForm组件未加载完成')
+            // 延迟重试
+            setTimeout(() => {
+              this.setCancel(record)
+            }, 100)
+          }
+        })
+      })
+    },
+    async formSubmit () {
+      this.submitLoading = true
+      const formData = await this.$refs.xCancelForm.asyncSubmit()
+      try {
+        await this.submit(formData)
+      } catch (error) {
+        this.$message.error('表单验证失败，请检查填写内容')
+      } finally {
+        this.submitLoading = false
+      }
+    },
+    async submit (formData) {
+      const data = {
+        ...formData,
+      }
+      console.log('==formData', data)
+      await runLogic('666', data, 'af-apply').then(() => {
+        this.$message.success('操作成功')
+        this.formState = false
+      })
     }
   }
 }

package/src/pages/WorkflowDetail/WorkflowPageDetail/WorkFlowHandle.vue

@@ -39,7 +39,7 @@
               <!--   当前步骤历史记录   -->
               <template v-if="showTab">
                 <x-tab
-                  :compProp="{ buttonState: { add: false, edit: false, delete: false, import: false }}"
+                  :compProp="{ buttonState: { add: false, edit: false, delete: false, import: false }, disableAction: true }"
                   :local-config="tabDesigner"
                   :body-style="{ padding: 0 }"
                   :tabBarGutter="24"