@qqt-product/system 0.0.2 → 0.0.16

package/src/lib/components/QcustomConfigEdit/src/QcustomConfigEdit.vue

@@ -28,8 +28,8 @@
               />
             </a-row>
             <!--表格-->
-            <a-form ref="formRef" :label-col="{ span: 8 }" :wrapper-col="{ span: 16 }" :model="form" class="ant-advanced-rule-form" layout="inline">
-              <a-row :getterr="12">
+            <a-form ref="formRef" :label-col="{ span: 7 }" :wrapper-col="{ span: 16 }" :model="form">
+              <a-row :getterr="15">
                 <a-col :span="20">
                   <a-form-item name="templateNumber" label="模板编号">
                     <a-input disabled v-model:value="form.templateNumber" placeholder="请输入模板编号" />
@@ -48,6 +48,8 @@
                       :disabled="currentEditRow.id ? true : false"
                       dict-code="srmBusinessType"
                       placeholder="请选择业务类型"
+                      show-search
+                      :filter-option="filterOption"
                       @change="changeBusinessTypeEvent"
                     />
                     <!-- <a-select v-model:value="form.businessType"></a-select> -->
@@ -60,17 +62,17 @@
                 </a-col>
                 <a-col :span="20">
                   <a-form-item name=" company" label="公司代码">
-                    <q-select :busAccount="busAccount" v-model:value="form.company" :dict-code="companyCode" placeholder="请选择公司代码" />
+                    <q-select show-search :filter-option="filterOption" :busAccount="busAccount" v-model:value="form.company" :dict-code="companyCode" placeholder="请选择公司代码" />
                   </a-form-item>
                 </a-col>
                 <a-col :span="20">
                   <a-form-item name="purchaseOrg" label="采购组织">
-                    <q-select :busAccount="busAccount" v-model:value="form.purchaseOrg" :dict-code="purchaseOrganization" placeholder="请选择采购组织" />
+                    <q-select show-search :filter-option="filterOption" :busAccount="busAccount" v-model:value="form.purchaseOrg" :dict-code="purchaseOrganization" placeholder="请选择采购组织" />
                   </a-form-item>
                 </a-col>
                 <a-col :span="20">
                   <a-form-item name=" purchaseGroup" label="采购组">
-                    <q-select v-model:value="form.purchaseGroup" :dict-code="purchaseGroup" placeholder="请选择采购组" />
+                    <q-select show-search :filter-option="filterOption" v-model:value="form.purchaseGroup" :dict-code="purchaseGroup" placeholder="请选择采购组" />
                   </a-form-item>
                 </a-col>
                 <a-col :span="20">
@@ -79,7 +81,7 @@
                       编辑布局
                       <a-tooltip title="暂business模板支持"> <exclamation-circle-outlined /> </a-tooltip>
                     </template>
-                    <q-select v-model:value="form.editLayout" dict-code="srmLayout" placeholder="请选择布局样式" />
+                    <q-select show-search :filter-option="filterOption" v-model:value="form.editLayout" dict-code="srmLayout" placeholder="请选择布局样式" />
                   </a-form-item>
                 </a-col>
                 <a-col :span="20">
@@ -90,7 +92,7 @@
                         <exclamation-circle-outlined />
                       </a-tooltip>
                     </template>
-                    <q-select v-model:value="form.examineLayout" dict-code="srmLayout" placeholder="请选择布局样式" />
+                    <q-select show-search :filter-option="filterOption" v-model:value="form.examineLayout" dict-code="srmLayout" placeholder="请选择布局样式" />
                   </a-form-item>
                 </a-col>
                 <a-col :span="20">
@@ -225,11 +227,11 @@
                 <template #toolbar_buttons>
                   <a-button type="primary" @click="() => headGridAddEvent()"> 新增 </a-button>
                   <a-button @click="() => gridDeleteEvent('headGridRef')"> 删除</a-button>
-                  <a-button @click="() => exportHeadEvent('TemplateConfigHeadList', 'head')"> 导出</a-button>
+                  <a-button @click="() => exportHeadEvent()"> 导出</a-button>
                 </template>
                 <template #custom_render="{ row }">
                   <a @click="() => showDictModal(row)">{{ row.dictCode || '请选择' }}</a>
-                  <a-icon v-show="row.dictCode" style="margin-left: 6px" type="close-circle" @click="() => removeDictCode(row)"></a-icon>
+                  <close-circle-outlined v-show="row.dictCode" style="margin-left: 6px" @click="() => removeDictCode(row)" />
                 </template>
 
                 <template #switch_render="{ row, column }">
@@ -354,13 +356,13 @@
                 </template>
 
                 <template #toolbar_buttons>
-                  <a-button type="primary" @click="() => headGridAddEvent()"> 新增 </a-button>
-                  <a-button @click="() => gridDeleteEvent('headGridRef')"> 删除</a-button>
-                  <a-button @click="() => exportHeadEvent('TemplateConfigHeadList', 'head')"> 导出</a-button>
+                  <a-button type="primary" @click="() => headItemAddEvent()"> 新增 </a-button>
+                  <a-button @click="() => gridDeleteEvent('itemGrid')"> 删除</a-button>
+                  <a-button @click="() => exportItemEvent()"> 导出</a-button>
                 </template>
                 <template #custom_render="{ row }">
                   <a @click="() => showDictModal(row)">{{ row.dictCode || '请选择' }}</a>
-                  <a-icon v-show="row.dictCode" style="margin-left: 6px" type="close-circle" @click="() => removeDictCode(row)"></a-icon>
+                  <close-circle-outlined v-show="row.dictCode" style="margin-left: 6px" @click="() => removeDictCode(row)" />
                 </template>
 
                 <template #switch_render="{ row, column }">
@@ -536,7 +538,7 @@
                   <div>
                     {{ tabItem.title }}
                     <a-tooltip v-if="tabItem.helpText" :title="tabItem.helpText">
-                      <a-icon type="question-circle-o" />
+                      <question-circle-outlined />
                     </a-tooltip>
                   </div>
                   <q-switch :disabled="tabItem.disabled || (tabItem.field === 'sys' && busAccount !== '100000')" :configData="currentDrawer" v-model="currentDrawer[tabItem.field]" />
@@ -545,7 +547,7 @@
                   <div>
                     {{ tabItem.title }}
                     <a-tooltip v-if="tabItem.helpText" :title="tabItem.helpText">
-                      <a-icon type="question-circle-o" />
+                      <question-circle-outlined />
                     </a-tooltip>
                   </div>
                   <q-switch :disabled="tabItem.disabled" :configData="currentDrawer" v-model="currentDrawer[tabItem.field]" />
@@ -585,12 +587,7 @@
                         currentDrawer.alertMsg = msg
                       }
                     "
-                    :value="currentDrawer[tabItem.field]"
-                    @change="
-                      ({ msg }) => {
-                        currentDrawer[tabItem.field] = msg
-                      }
-                    "
+                    v-model="currentDrawer[tabItem.field]"
                   />
                 </a-col>
               </template>
@@ -621,11 +618,11 @@
 
     <!-- <codemirror v-if="editorModalFlag" v-model="sampleCode" :options="editorOption"> </codemirror> -->
     <q-code-editor-model
-      zIndex="1001"
+      :zIndex="1001"
       :isAllowToOpenMode="true"
-      v-if="editorModalFlags"
+      :editorModalFlag="editorModalFlag"
       :value="sampleCode ? sampleCode : ''"
-      @handleSureColse="editorModalFlags = false"
+      @handleSureClose="sampleSureClose"
       @handleSureClick="sampleSureClick"
     ></q-code-editor-model>
     <!-- {{ currentRow }} -->
@@ -636,7 +633,7 @@
 
 <script lang="ts">
 //JS引入
-import { defineComponent, reactive, inject, onMounted, toRefs, nextTick, shallowReactive } from 'vue'
+import { defineComponent, reactive, inject, onMounted, toRefs, nextTick, shallowReactive, ref } from 'vue'
 import Sortable from 'sortablejs'
 //组件
 import { message } from '@qqt-product/ui'
@@ -646,13 +643,14 @@ import regexComponent from '../component/regexComponent'
 import TempalePreviewModal from '../component/TempalePreviewModal.vue'
 //ts
 import * as customConfigEdits from './types'
-import type { VxeTableDefines, VxeGridDefines, VxeGlobalRendererHandles } from 'vxe-table'
+import type { VxeTableDefines, VxeGridDefines } from 'vxe-table'
 import { useConfigData } from './useConfigData'
 import { useConfigComputed } from './useConfigComputed'
 import { useConfigMethods, useConfigElsAccountMethods, useConigApiMethods } from './useConfigMethods'
 import { useColumnSlots } from './QcustomConfigRender'
 import { EditSample, url } from './useConstant'
 import qqtUtils from '@qqt-product/utils'
+import { CloseCircleOutlined, QuestionCircleOutlined, ExclamationCircleOutlined } from '@ant-design/icons-vue'
 export default defineComponent({
   name: 'QcustomConfigEdit',
   emits: ['handleReturn'],
@@ -661,6 +659,9 @@ export default defineComponent({
     dataFormatComponent,
     regexComponent,
     TempalePreviewModal,
+    CloseCircleOutlined,
+    QuestionCircleOutlined,
+    ExclamationCircleOutlined,
   },
   props: {
     busAccount: {
@@ -682,14 +683,13 @@ export default defineComponent({
     const qHttp = inject(customConfigEdits.INJECT_HTTP) as customConfigEdits.HttpClient
     const { currentEditRow, busAccount } = toRefs(props)
     //常量
-
     /*
     data
      */
     const {
       switchFields,
       nowFieldType,
-      editorModalFlags,
+      editorModalFlag,
       codeEditorFields,
       drawerVisible,
       currentDictRow,
@@ -1106,7 +1106,7 @@ export default defineComponent({
         },
       },
     ])
-
+    const allType = ref('')
     //computed
     const { showBusinessTips, gridHeight, commonDevelopTabs } = useConfigComputed()
     /*
@@ -1197,12 +1197,12 @@ export default defineComponent({
     const codeEditorSureClick = (contents: string) => {
       form.extend = contents
     }
-    const changeBusinessTypeEvent = (type: string) => {
+    const changeBusinessTypeEvent = ({ value }: { value: string }) => {
       qHttp
         .get({
           url: '/template/templateHead/querySysByBusinessType',
           params: {
-            businessType: type,
+            businessType: value,
           },
         })
         .then((res) => {
@@ -1377,7 +1377,25 @@ export default defineComponent({
       }
     }
 
+    const getAllItemsDataPromiss = () => {
+      if (form.businessType === 'costForm') {
+        let url = '/cost/costField/queryAll'
+        return qHttp.get({
+          url,
+        })
+      } else {
+        let url = '/template/templateHead/queryItemFieldsByBusinessType'
+        return qHttp.get({
+          url,
+          params: {
+            businessType: form.businessType,
+          },
+        })
+      }
+    }
+
     const headGridAddEvent = () => {
+      allType.value = 'headGrid'
       let { fullData } = headGrid.value.getTableData()
       if (busAccount.value == '100000') {
         let length = fullData.length
@@ -1406,6 +1424,46 @@ export default defineComponent({
       })
     }
 
+    const headItemAddEvent = () => {
+      allType.value = 'itemGrid'
+      let { fullData } = itemGrid.value.getTableData()
+      if (busAccount.value == '100000') {
+        let length = fullData.length
+        itemGrid.value.insertAt({ sortOrder: length + 1, groupType: 'head' }, -1)
+        return
+      }
+      let fieldNameList = fullData.map((item: customConfigEdits.MapObjectNoneType) => {
+        return item.fieldName + '_' + item.groupCode
+      })
+
+      getAllItemsDataPromiss().then((res) => {
+        if (res.success) {
+          if (form.businessType === 'costForm') {
+            fieldData.value = res.result
+            visible.value = true
+          } else {
+            if (res.result.templateConfigItemList && res.result.templateConfigItemList.length) {
+              if (res.result.businessType === 'supplierMasterData') {
+                fieldData.value = res.result.templateConfigItemList
+                visible.value = true
+              } else {
+                let fieldDatas = res.result.templateConfigItemList.filter((item: customConfigEdits.MapObjectNoneType) => {
+                  return !fieldNameList.includes(item.fieldName + '_' + item.groupCode)
+                })
+                fieldData.value = fieldDatas
+                visible.value = true
+              }
+            } else {
+              const t = '没有配置表行数据'
+              message.warning(t)
+            }
+          }
+        } else {
+          message.warning(res.message)
+        }
+      })
+    }
+
     const gridDeleteEvent = (type: string) => {
       const CurentGridRef = getCurentGridRef(type)
       let checkboxRecords = CurentGridRef.value.getCheckboxRecords()
@@ -1429,17 +1487,26 @@ export default defineComponent({
       confirmLoading.value = !confirmLoading.value
     }
 
-    const exportHeadEvent = (type: string, sets: string) => {
+    const exportHeadEvent = () => {
       if (!currentEditRow.value.id) {
         message.warning('请先保存模板配置')
         return
       }
-      // confirmLoading.value = true
+      const sets = 'head'
+      const type = 'TemplateConfigHeadList'
       handleExportXls('表头配置', currentEditRow.value.id, sets, type, '/template/templateHead/exportTemplateColumnConfig', handleEpritXisCallBack)
     }
-
+    const exportItemEvent = () => {
+      if (!currentEditRow.value.id) {
+        message.warning('请先保存模板配置')
+        return
+      }
+      const sets = 'item'
+      const type = 'TemplateConfigItemList'
+      handleExportXls('表行配置', currentEditRow.value.id, sets, type, '/template/templateHead/exportTemplateColumnConfig', handleEpritXisCallBack)
+    }
     let getCurentGridRef = (type: string) => {
-      const curGridRefObj: customConfigEdits.GridQConfigEditRef = { groupGridRef: groupGrid, headGridRef: headGrid }
+      const curGridRefObj: customConfigEdits.GridQConfigEditRef = { groupGridRef: groupGrid, headGridRef: headGrid, itemGrid: itemGrid }
       return curGridRefObj[type]
     }
     const resetSortOrder = (type: string) => {
@@ -1455,13 +1522,22 @@ export default defineComponent({
         message.warning('请选择数据！')
         return
       }
+      let fullData = []
+      if (allType.value == 'headGrid') {
+        fullData = headGrid.value.getTableData().fullData
+      } else {
+        fullData = itemGrid.value.getTableData().fullData
+      }
 
-      let { fullData } = headGrid.value.getTableData()
       let length = fullData.length
-      checkboxRecords.forEach((item: customConfigEdits.MapObjectNoneType, index: customConfigEdits.MapObjectNoneType) => {
+      checkboxRecords.forEach((item: customConfigEdits.MapObjectNoneType, index: number) => {
         item.sortOrder = length + index + 1
       })
-      headGrid.value?.insertAt(checkboxRecords, -1)
+      if (allType.value == 'headGrid') {
+        headGrid.value?.insertAt(checkboxRecords, -1)
+      } else {
+        itemGrid.value?.insertAt(checkboxRecords, -1)
+      }
 
       visible.value = false
     }
@@ -1559,7 +1635,10 @@ export default defineComponent({
       } else if (field === 'formula') {
         sampleCode.value = currentStep.value === 2 ? EditSample.formulaHead : EditSample.formulaRow
       }
-      editorModalFlags.value = true
+      editorModalFlag.value = true
+    }
+    const sampleSureClose = () => {
+      editorModalFlag.value = false
     }
     const sampleSureClick = (coValue: string) => {
       let warnTips = false
@@ -1584,7 +1663,7 @@ export default defineComponent({
         message.warning('函数已存在，不可导入示例')
         return
       }
-      editorModalFlags.value = false
+      editorModalFlag.value = false
     }
 
     const changeFixSummary = (currentDrawer: customConfigEdits.MapObjectNoneType) => {
@@ -1698,7 +1777,7 @@ export default defineComponent({
       //   message.warning('请添加表行信息！')
       //   return
       // }
-      // console.log('save', 1)
+      console.log('save', 1)
       itemGrid.value.validate(fullData, (valid: customConfigEdits.MapObjectNoneType) => {
         if (!valid) {
           postData(type)
@@ -1712,6 +1791,11 @@ export default defineComponent({
     const handleReturn = () => {
       emit('handleReturn')
     }
+
+    const filterOption = (input: string, option: any) => {
+      return option.title.toLowerCase().indexOf(input.toLowerCase()) >= 0
+    }
+
     //生命周期
 
     onMounted(() => {
@@ -1761,6 +1845,7 @@ export default defineComponent({
       selectGrid,
       selectedHeadOk,
       exportHeadEvent,
+      exportItemEvent,
       rowChangeSummary,
       removeDictCode,
       showDictModal,
@@ -1770,7 +1855,7 @@ export default defineComponent({
       drawerVisible,
       commonDevelopTabs,
       codeEditorFields,
-      editorModalFlags,
+      editorModalFlag,
       sampleCode,
       nowFieldType,
       showSample,
@@ -1779,6 +1864,7 @@ export default defineComponent({
       changeSummary,
       changeFixSummary,
       sampleSureClick,
+      sampleSureClose,
       itemColumns,
       itemRowDrop,
       itemData,
@@ -1790,6 +1876,8 @@ export default defineComponent({
       // currentEditRow,
       currentRow,
       handleReturn,
+      headItemAddEvent,
+      filterOption,
     }
   },
 })

package/src/lib/components/QcustomConfigEdit/src/QcustomConfigRender.tsx

@@ -180,7 +180,7 @@ export function useColumnSlots(elsAccount: Ref) {
     } else if (row.fieldType == 'multiple' && row.dictCode) {
       editor = [<span>{getMultipleCurrentLabel(row.defaultValueOpts, row.defaultValue)}</span>]
     } else if (row.fieldType == 'switch') {
-      editor = [<m-switch v-model={row.defaultValue} />]
+      editor = [<vxe-switch open-value="1" close-value="0" v-model={row.defaultValue}></vxe-switch>]
     } else {
       editor = [<span>{row.defaultValue}</span>]
     }
@@ -197,7 +197,7 @@ export function useColumnSlots(elsAccount: Ref) {
       }
       editor = [<vxe-select v-model={row.defaultValue} options={row.defaultValueOpts} clearable multiple />]
     } else if (row.fieldType == 'switch') {
-      editor = [<m-switch v-model={row.defaultValue} />]
+      editor = [<vxe-switch open-value="1" close-value="0" v-model={row.defaultValue}></vxe-switch>]
     } else {
       editor = [<vxe-input clearable size="small" v-model={row.defaultValue} />]
     }

package/src/lib/components/QcustomConfigEdit/src/useConfigData.ts

@@ -40,7 +40,7 @@ export function useConfigData() {
   const fieldData = ref<customConfigEdits.MapObjectNoneType[]>()
   const visible = ref<boolean>(false)
   const drawerVisible = ref<boolean>(false)
-  const editorModalFlags = ref<boolean>(false)
+  const editorModalFlag = ref<boolean>(false)
   const perviewOpen = shallowRef<boolean>(false)
   const currentDrawer = ref<customConfigEdits.MapObjectNoneType>({})
   const sampleCode = ref<string>()
@@ -110,7 +110,7 @@ export function useConfigData() {
     currentItemGrid,
     drawerVisible,
     codeEditorFields,
-    editorModalFlags,
+    editorModalFlag,
     sampleCode,
     nowFieldType,
     switchFields,

package/src/lib/components/QcustomConfigEdit/src/useConstant.ts

@@ -62,7 +62,7 @@ function callback(parentRef, pageData, groupData, value, opt, oldVal, form) {
 // ##############  M端绑定函数:  ####################
 const initFunctionHead =
   `/**
- * 业务规则 
+ * 业务规则
  * 延期规则, prop: 'delayRule', 0 不允许延期，1 不限制延期次数, 2 有限制次数延期
  * 结束前多少分钟, prop: 'beforeEndMinute'
  * 延期多少分钟, prop: 'delayMinute'
@@ -143,23 +143,23 @@ const extendHead = `/* extend 原设计是对字段自定义配置，也是对
         field: 'toElsAccount',
         fieldLabelI18nKey: 'i18n_title_supplierAccount',
         title: '供应商ELS账号',
-        with: 150,
+        width: 150,
     },
     {
         field: 'supplierCode',
         fieldLabelI18nKey: 'i18n_title_supplierCode',
         title: '供应商编码',
-        with: 150,
+        width: 150,
     },
     {
         field: 'supplierName',
         fieldLabelI18nKey: 'i18n_title_supplierName',
         title: '供应商名称',
-        with: 150,
+        width: 150,
     }
     ],
     modalUrl: '/supplier/supplierMaster/list',
-    modalParams: {},
+    params: {},
     beforeCheckedCallBack: function (parentRef, pageData, groupData, form) {
         return new Promise((resolve, rejec) => {
             let orderStatus = form.orderStatus || '';
@@ -223,25 +223,25 @@ const extendRow = `/* extend 原设计是对字段自定义配置，也是对绑
         field: 'taxCode',
         title: '税码',
         fieldLabelI18nKey: 'i18n_field_taxCode',
-        with: 150,
+        width: 150,
     }, {
         field: 'taxRate',
         title: '税率（%）',
         fieldLabelI18nKey: 'i18n_field_taxRate',
-        with: 150,
+        width: 150,
     }, {
         field: 'taxName',
         title: '税码名称',
         fieldLabelI18nKey: 'i18n_field_taxName',
-        with: 150,
+        width: 150,
     }, {
         field: 'remark',
         title: '备注',
         fieldLabelI18nKey: 'i18n_field_remark',
-        with: 150,
+        width: 150,
     }],
     modalUrl: '/base/tax/list',
-    modalParams: {},
+    params: {},
     // 表行弹窗清除按钮回调
     afterRowClearCallBack:function(Vue,row){
         row.taxCode = ''
@@ -255,12 +255,12 @@ const fieldValidatorRow = `/* 增强表单校验，表单配置的校验除了
 */
 /**
      * @param {*} _this
-     * @param {*} item 
+     * @param {*} item
      * @param {*} rule 规则
      * @param {*} value 当前值
      * @param {*} row 编辑态当前行
      * @param {*} column 编辑列
-     * 
+     *
 **/
  {
     validateMethod: function (that, item, rule, value, row, column) {