瀏覽代碼

bug修复

iZaiZaiA 2 年之前
父節點
當前提交
95631693dc

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

@@ -77,7 +77,7 @@ const formUploadExceed = () => {
 
 //删除上传的文件
 const delTableFormFile = () => {
-    emit('del', keyname.value)
+    emit('del', isKeyName.value)
 }
 </script>
 

+ 1 - 1
src/config/index.js

@@ -17,7 +17,7 @@ export default {
     statusWhiteList: [],    //http的status默认放行列表
     ossUrl: 'https://bladex-test-info.oss-cn-chengdu.aliyuncs.com', //oss地址
     smsPhone: '',  //测试接受短信验证码的手机号
-    dev_version: '202209291142',    //开发版本号
+    dev_version: '202209291410',    //开发版本号
     prod_host: 'http://47.110.251.215:8090',  //线上
     //dev_host: 'http://192.168.4.6', //黄键楠
     //dev_host: 'http://192.168.3.13', //祝炜

+ 98 - 4
src/test/http/index.vue

@@ -17,8 +17,51 @@
                     </el-button>
                 </div>
             </template>
-            <div>
-                123456
+            <div class="hc-http-form-box">
+                <div class="http-form-config">
+                    <div class="title">快速配置</div>
+                    <div class="config-item">
+                        <div class="name-box">
+                            <div class="name">携带 项目ID</div>
+                            <div class="val">{{projectId}}</div>
+                        </div>
+                        <span class="switch">
+                            <el-switch v-model="httpForm.data.projectId" inline-prompt :active-value="projectId" active-text="是" inactive-value="" inactive-text="否" />
+                        </span>
+                    </div>
+                    <div class="config-item">
+                        <div class="name-box">
+                            <div class="name">携带 合同段ID</div>
+                            <div class="val">{{contractId}}</div>
+                        </div>
+                        <span class="switch">
+                            <el-switch v-model="httpForm.data.contractId" inline-prompt :active-value="contractId" active-text="是" inactive-value="" inactive-text="否"/>
+                        </span>
+                    </div>
+                </div>
+                <div class="http-form-data">
+                    <div class="title">提交表单</div>
+                    <el-form ref="formDataRef" :model="formDataModel" label-width="auto" size="large">
+                        <div class="hc-form-item">
+                            <el-form-item label="字段">
+                                <el-input v-model="formDataModel.key"/>
+                            </el-form-item>
+                            <el-form-item label="内容">
+                                <el-input v-model="formDataModel.val"/>
+                            </el-form-item>
+                            <el-form-item label="操作">
+                                <el-button>
+                                    <HcIcon name="edit"/>
+                                    <span>删除</span>
+                                </el-button>
+                            </el-form-item>
+                        </div>
+                    </el-form>
+                </div>
+                <div class="http-form-res">
+                    <div class="title">返回数据</div>
+                    res
+                </div>
             </div>
             <template #action>
                 <el-button type="primary" hc-btn>
@@ -53,7 +96,7 @@ const typeData = ref([ 'GET', 'POST'])
 
 //搜索表单
 const httpForm = ref({
-    type: 'GET', url: ''
+    type: 'GET', url: '', data: { projectId: '', contractId: '' }
 })
 
 //回车搜索
@@ -67,8 +110,59 @@ const keyUpEvent = (e) => {
 const searchClick = () => {
 
 }
+
+const formDataRef = ref(null)
+const formDataModel = ref({
+    key: '', val: ''
+})
+
 </script>
 
 <style lang="scss" scoped>
-
+.hc-http-form-box {
+    position: relative;
+    display: flex;
+    height: 100%;
+    .http-form-config {
+        position: relative;
+        padding-right: 24px;
+        border-right: 1px solid #e4e7ed;
+        .config-item {
+            position: relative;
+            display: flex;
+            align-items: center;
+            padding: 14px 0;
+            .name-box {
+                position: relative;
+                margin-right: 40px;
+                .val {
+                    font-size: 14px;
+                    color: #aaa;
+                }
+            }
+        }
+        .config-item + .config-item {
+            border-top: 1px solid #e4e7ed;
+        }
+    }
+    .http-form-data {
+        position: relative;
+        padding: 0 24px;
+        flex: 1;
+    }
+    .http-form-res {
+        flex: 1;
+        position: relative;
+        padding-left: 24px;
+        border-left: 1px solid #e4e7ed;
+    }
+    .http-form-config, .http-form-data, .http-form-res {
+        .title {
+            position: relative;
+            margin-bottom: 20px;
+            font-size: 18px;
+            font-weight: 400;
+        }
+    }
+}
 </style>

+ 1 - 1
src/views/data-fill/components/HcTreeData.vue

@@ -1,6 +1,6 @@
 <template>
     <ElTree class="hc-tree-node tree-line" ref="ElTreeRef" :props="ElTreeProps" :data="datas" highlight-current accordion node-key="primaryKeyId"
-            :default-expanded-keys="TreeExpandKey" @node-click="ElTreeClick" @node-contextmenu="ElTreeLabelContextMenu">
+            :default-expanded-keys="TreeExpandKey" @node-click="ElTreeClick" @node-contextmenu="ElTreeLabelContextMenu" :indent="0">
         <template #default="{ node, data }">
             <div class="data-custom-tree-node" :id="`${idPrefix}${data['primaryKeyId']}`">
                 <!--树组件,节点名称-->

+ 2 - 1
src/views/data-fill/components/HcTreeNode.vue

@@ -1,5 +1,6 @@
 <template>
-    <ElTree class="hc-tree-node-box hc-tree-node tree-line" ref="ElTreeRef" :props="ElTreeProps" :data="ElTreeData" :node-key="nodeKey" highlight-current accordion show-checkbox :check-strictly="isStrictly" :expand-on-click-node="false" @check="ElTreeCheckChange">
+    <ElTree class="hc-tree-node-box hc-tree-node tree-line" ref="ElTreeRef" :props="ElTreeProps" :data="ElTreeData" :node-key="nodeKey" highlight-current accordion show-checkbox
+            :check-strictly="isStrictly" :expand-on-click-node="false" @check="ElTreeCheckChange" :indent="0">
         <template #default="{ node, data }">
             <div class="custom-tree-node">
                 <div class="label" @dblclick="ElTreeDblClick(data)">

+ 1 - 1
src/views/ledger/components/WbsTree.vue

@@ -1,6 +1,6 @@
 <template>
     <ElTree class="hc-tree-node tree-line" ref="ElTreeRef" :props="ElTreeProps" :load="ElTreeLoadNode" lazy highlight-current accordion node-key="primaryKeyId"
-            :default-expanded-keys="defaultExpandedCids" @node-click="ElTreeClick" @node-contextmenu="ElTreeLabelContextMenu">
+            :default-expanded-keys="defaultExpandedCids" @node-click="ElTreeClick" @node-contextmenu="ElTreeLabelContextMenu" :indent="0">
         <template #default="{ node, data }">
             <div class="data-custom-tree-node" :id="`${idPrefix}${data['primaryKeyId']}`">
                 <!--树组件,节点名称-->

+ 1 - 1
src/views/other-file/components/ProjectTree.vue

@@ -1,5 +1,5 @@
 <template>
-    <ElTree class="hc-tree-node tree-line" :props="ElTreeProps" :data="datas" highlight-current accordion node-key="id" :default-expanded-keys="TreeExpandKey" @node-click="ElTreeClick">
+    <ElTree class="hc-tree-node tree-line" :props="ElTreeProps" :data="datas" highlight-current accordion node-key="id" :default-expanded-keys="TreeExpandKey" @node-click="ElTreeClick" :indent="0">
         <template #default="{ node, data }">
             <div class="data-custom-tree-node" :id="`${idPrefix}${data['id']}`">{{ node.label }}</div>
         </template>

+ 1 - 1
src/views/other-file/components/WbsTree.vue

@@ -1,6 +1,6 @@
 <template>
     <ElTree class="hc-tree-node tree-line" :props="ElTreeProps" :load="ElTreeLoadNode" lazy highlight-current accordion node-key="primaryKeyId"
-            :default-expanded-keys="defaultExpandedCids" @node-click="ElTreeClick">
+            :default-expanded-keys="defaultExpandedCids" @node-click="ElTreeClick" :indent="0">
         <template #default="{ node, data }">
             <div class="data-custom-tree-node" :id="`${idPrefix}${data['primaryKeyId']}`">
                 <div class="label" :class="node.level === 1?'level-name':''">{{ node.label }}</div>