duy 5 miesięcy temu
rodzic
commit
ac833558e7

+ 2 - 1
package.json

@@ -40,7 +40,8 @@
         "vue-router": "^4.4.5",
         "vue-virtual-scroll-list": "^2.3.5",
         "vue-virtual-scroller": "^2.0.0-beta.8",
-        "vuedraggable": "^4.1.0"
+        "vuedraggable": "^4.1.0",
+        "z-element-plus": "^0.0.0-dev.1"
     },
     "devDependencies": {
         "@unocss/eslint-config": "0.58.9",

+ 25 - 0
src/api/modules/other.js

@@ -153,3 +153,28 @@ export const getLocalArchivesApp = () => HcApi({
     url: 'local-app.json?time=' + new Date().getTime(),
     method: 'get',
 })
+//获取表单下的设计强度列表
+export const getDesignStrengthList = (form) =>
+    HcApi({
+        url: '/api/blade-manager/mixProportion/designStrengthList',
+        method: 'get',
+        params: form,
+    })
+//获取表单的下拉框测站点数据
+export const getDapSiteData = (form) =>
+    HcApi({
+        url: '/api/blade-business/dap/site',
+        method: 'get',
+        params: form,
+    })
+
+    //获取表单
+
+
+    export const getExcelHtml = (form) =>
+        HcApi({
+            url: '/api/blade-manager/exceltab/get-excel-html_buss',
+            method: 'get',
+            params: form,
+        })
+    

+ 1 - 1
src/components/plugins/table-form/hc-form-select-search2.vue

@@ -9,7 +9,7 @@
 
 <script setup>
 import { nextTick, ref } from 'vue'
-import { getDapSiteData, getDesignStrengthList } from '~api/other'
+import { getDesignStrengthList } from '~api/other'
 import { ElOption, ElSelect } from 'z-element-plus'
 import { arrIndex, getObjVal, getObjValue } from 'js-fast-way'
 import { setStoreValue } from '~src/utils/storage'

+ 2 - 2
src/global/components/index.js

@@ -5,7 +5,7 @@ import HcReportExperts from './hc-report-experts/index.vue'
 import HcTasksUser from './hc-tasks-user/index.vue'
 import HcBorderNeon from './hc-border-neon/index.vue'
 import HcPdfs from './hc-pdfs/pdfs.vue'
-// import HcTableForm from './table-form/index.vue'
+import HcTableForm from './table-form/index.vue'
 
 //注册全局组件
 export const setupComponents = (App) => {
@@ -16,5 +16,5 @@ export const setupComponents = (App) => {
     App.component('HcTasksUser', HcTasksUser)
     App.component('HcBorderNeon', HcBorderNeon)
     App.component('HcPdfs', HcPdfs)
-    // App.component('HcTableForm', HcTableForm)
+    App.component('HcTableForm', HcTableForm)
 }

+ 2 - 0
src/styles/app/_var.scss

@@ -71,3 +71,5 @@ $darks: (
     'dark-8':  	$dark-8,
     'dark-9':  	$dark-9
 );
+
+$initials: initial !important;

+ 48 - 1
src/views/transfer/move-submit.vue

@@ -13,7 +13,18 @@
                     </template>
 
 
-                    表单填报页内容
+                    <div class="hc-content-box h-full">
+                        <div class="hc-table-form-box h-full">
+                            <HcTableForm
+                                ref="tableFormRef"
+                                :form="tableFormData"
+                                :html="excelHtmlData"
+                                :loading="loading"
+                                :pkey="excelIdVal"
+                                @render="tableFormRender"
+                            />
+                        </div>
+                    </div>
                 </hc-card>
             </template>
             <template #tab-two>
@@ -25,6 +36,8 @@
 
 <script setup>
 import { ref } from 'vue'
+import { getExcelHtml } from '~api/other'
+import { isString } from 'js-fast-way'
 //类型处理
 const tabsKey = ref('one')
 const tabsData = ref([
@@ -36,6 +49,10 @@ const tabsData = ref([
 
 const tabsChange = (item) => {
     console.log(item)
+    if (tabsKey.value === 'one') {
+        getExcelHtmlData()
+    }
+   
 }
 const pdfUrl = ref('')
 const saveClick = () => {
@@ -45,6 +62,36 @@ const saveClick = () => {
 const reportClick = () => {
  console.log('上报')   
 }
+//表单填报
+const tableFormRef = ref(null)
+const tableFormData = ref({})
+
+const excelIdVal = ref('')
+const loading = ref(false)
+const isTableForm = ref(false)
+
+const excelHtmlData = ref('')
+const getExcelHtmlData = async (excelId) => {
+
+        //获取数据
+        const { error, code, data } = await getExcelHtml({
+            
+            pkeyId: '1905193952357646337',
+        }, false)
+        //处理数据
+        const resData = isString(data) ? data || '' : ''
+        if (!error && code === 200 && resData) {
+            excelHtmlData.value = resData
+        } else {
+            excelHtmlData.value = ''
+            isTableForm.value = false
+            window?.$message?.warning('暂无表单')
+        }
+    }
+//渲染表单完成
+const tableFormRender = (form) => {
+    isTableForm.value = form.isRenderForm
+}
 </script>
 
 <style>

+ 22 - 1
yarn.lock

@@ -340,7 +340,7 @@
   resolved "http://39.108.216.210:9000/@ctrl/tinycolor/-/tinycolor-3.6.1.tgz#b6c75a56a1947cc916ea058772d666a2c8932f31"
   integrity sha512-SITSV6aIXsuVNV3f3O0f2n/cgyEDWoSqtZMYiAmcsYHydcKrOz3gUxB/iXd/Qf08+IZX4KpgNbvUdMBmWz+kcA==
 
-"@element-plus/icons-vue@^2.3.1":
+"@element-plus/icons-vue@^2.0.6", "@element-plus/icons-vue@^2.3.1":
   version "2.3.1"
   resolved "http://39.108.216.210:9000/@element-plus/icons-vue/-/icons-vue-2.3.1.tgz#1f635ad5fdd5c85ed936481525570e82b5a8307a"
   integrity sha512-XxVUZv48RZAd87ucGS48jPf6pKu0yV5UCg9f4FFwtrYxXOwWuVJo6wOvSLKEoMQKjv8GsX/mhP6UsC1lRwbUWg==
@@ -3432,6 +3432,27 @@ yocto-queue@^0.1.0:
   resolved "http://39.108.216.210:9000/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b"
   integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==
 
+z-element-plus@^0.0.0-dev.1:
+  version "0.0.0-dev.1"
+  resolved "http://219.151.181.73:9000/z-element-plus/-/z-element-plus-0.0.0-dev.1.tgz#7f420b5dc83bdc60d5035cef489b8ec42e89c146"
+  integrity sha512-0h6KRE+yLlkh1ZTKrJL6iM1JWiGvfd5qhkApp9laT4Xmf3s5D+x3LG/wbYJTUCRImsx0TnKB35Qjsu0pYI5htQ==
+  dependencies:
+    "@ctrl/tinycolor" "^3.4.1"
+    "@element-plus/icons-vue" "^2.0.6"
+    "@floating-ui/dom" "^1.0.1"
+    "@popperjs/core" "npm:@sxzz/popperjs-es@^2.11.7"
+    "@types/lodash" "^4.14.182"
+    "@types/lodash-es" "^4.17.6"
+    "@vueuse/core" "^9.1.0"
+    async-validator "^4.2.5"
+    dayjs "^1.11.3"
+    escape-html "^1.0.3"
+    lodash "^4.17.21"
+    lodash-es "^4.17.21"
+    lodash-unified "^1.0.2"
+    memoize-one "^6.0.0"
+    normalize-wheel-es "^1.2.0"
+
 zip-stream@^6.0.1:
   version "6.0.1"
   resolved "http://39.108.216.210:9000/zip-stream/-/zip-stream-6.0.1.tgz#e141b930ed60ccaf5d7fa9c8260e0d1748a2bbfb"