Bläddra i källkod

维多利亚excel导入问题解决,组件样式修改

cz 2 år sedan
förälder
incheckning
20eb369a8c

+ 6 - 0
src/assets/styles/index.scss

@@ -215,4 +215,10 @@ aside {
 
 .cp{
   cursor: pointer;
+}
+
+// 20223/05/04增加
+.public_height_dialog {
+  height: calc(100vh - 260px);
+  overflow: auto;
 }

+ 2 - 2
src/components/byTable/index.vue

@@ -476,7 +476,7 @@ export default defineComponent({
   position: relative;
   text-align: left;
   height: 32px;
-  z-index: 100;
+  z-index: 1010;
   padding: 0 10px;
   transition: all 0.5s ease;
   cursor: pointer;
@@ -517,7 +517,7 @@ export default defineComponent({
   top: 8px;
   background-color: #ddd;
   right: 0;
-  z-index: 101;
+  z-index: 1011;
 }
 
 .by-dropdown:hover {

+ 1 - 2
src/components/headerBar/header.scss

@@ -28,14 +28,13 @@
 	}
 	.header-bar-hover {
 		position: fixed;
-		z-index: 205;
+		z-index: 1050;
 		top: 50px;
 		left: 0px;
 		right: 0;
 		background: #fff;
 		box-shadow: 0px 3px 10px 1px rgba(0, 0, 0, 0.1);
 		height: 500px;
-
 		.header-bar-hover-content {
 			display: flex;
 			text-align: left;

+ 172 - 164
src/views/WDLY/basic/product/index.vue

@@ -54,159 +54,183 @@
       v-model="dialogVisible"
       width="500"
       v-loading="loadingOne"
+      destroy-on-close
     >
-      <byForm
-        :formConfig="formConfig"
-        :formOption="formOption"
-        v-model="formData.data"
-        :rules="rules"
-        ref="byform"
-      >
-        <template #productPic>
-          <div>
-            <el-upload
-              v-model:fileList="fileList"
-              action="https://winfaster.obs.cn-south-1.myhuaweicloud.com"
-              :data="uploadData"
-              list-type="picture-card"
-              :on-remove="handleRemove"
-              :on-success="handleSuccess"
-              :before-upload="handleBeforeUpload"
-              accept=".gif, .jpeg, .jpg, .png"
-            >
-              <el-icon><Plus /></el-icon>
-            </el-upload>
-          </div>
-        </template>
-
-        <template #combination>
-          <div>
-            <div
-              style="
-                font-size: 14px;
-                font-weight: bold;
-                margin-bottom: 10px;
-                color: #333333;
-              "
-              v-show="formData.data.combination == 1"
-            >
-              组合明细
+      <div class="public_height_dialog">
+        <byForm
+          :formConfig="formConfig"
+          :formOption="formOption"
+          v-model="formData.data"
+          :rules="rules"
+          ref="byform"
+        >
+          <template #productPic>
+            <div>
+              <el-upload
+                v-model:fileList="fileList"
+                action="https://winfaster.obs.cn-south-1.myhuaweicloud.com"
+                :data="uploadData"
+                list-type="picture-card"
+                :on-remove="handleRemove"
+                :on-success="handleSuccess"
+                :before-upload="handleBeforeUpload"
+                accept=".gif, .jpeg, .jpg, .png"
+              >
+                <el-icon><Plus /></el-icon>
+              </el-upload>
             </div>
-            <el-button
-              type="primary"
-              @click="openProduct = true"
-              style="margin-bottom: 10px"
-              v-show="formData.data.combination == 1"
-            >
-              添加
-            </el-button>
-            <el-table
-              :data="formData.data.productCombinationList"
-              v-show="formData.data.combination == 1"
-            >
-              <el-table-column prop="code" label="产品编码" />
-              <el-table-column prop="name" label="产品名称" />
-              <el-table-column
-                prop="linkQuantity"
-                label="组合数量"
-                min-width="150"
+          </template>
+
+          <template #combination>
+            <div>
+              <div
+                style="
+                  font-size: 14px;
+                  font-weight: bold;
+                  margin-bottom: 10px;
+                  color: #333333;
+                "
+                v-show="formData.data.combination == 1"
               >
-                <template #default="{ row, $index }">
-                  <el-form-item
-                    :prop="'productCombinationList.' + $index + '.linkQuantity'"
-                    :rules="rules.linkQuantity"
-                    :inline-message="true"
+                组合明细
+              </div>
+              <el-button
+                type="primary"
+                @click="openProduct = true"
+                style="margin-bottom: 10px"
+                v-show="formData.data.combination == 1"
+              >
+                添加
+              </el-button>
+              <el-table
+                :data="formData.data.productCombinationList"
+                v-show="formData.data.combination == 1"
+              >
+                <el-table-column prop="code" label="产品编码" />
+                <el-table-column prop="name" label="产品名称" />
+                <el-table-column
+                  prop="linkQuantity"
+                  label="组合数量"
+                  min-width="150"
+                >
+                  <template #default="{ row, $index }">
+                    <el-form-item
+                      :prop="
+                        'productCombinationList.' + $index + '.linkQuantity'
+                      "
+                      :rules="rules.linkQuantity"
+                      :inline-message="true"
+                    >
+                      <el-input-number
+                        v-model="row.linkQuantity"
+                        placeholder="请输入"
+                        :min="1"
+                        :controls="false"
+                        :precision="0"
+                      />
+                    </el-form-item>
+                  </template>
+                </el-table-column>
+                <el-table-column prop="zip" label="操作" width="100">
+                  <template #default="{ $index }">
+                    <el-button
+                      type="primary"
+                      link
+                      @click="handleRemoveProduct($index)"
+                      >删除</el-button
+                    >
+                  </template>
+                </el-table-column>
+              </el-table>
+            </div>
+          </template>
+          <template #one>
+            <div style="width: 100%">
+              <el-row>
+                <el-col :span="4">
+                  <el-input
+                    v-model="formData.data.victoriatouristJson.newProductsDay1"
+                    placeholder="请输入"
+                    disabled
+                  />
+                </el-col>
+                <el-col :span="1" style="text-align: center"> ~ </el-col>
+                <el-col :span="4">
+                  <el-input-number
+                    v-model="formData.data.victoriatouristJson.newProductsDay"
+                    placeholder="请输入"
+                    :min="0"
+                    :controls="false"
+                    :precision="0"
+                    style="width: 100%"
+                    @change="changeDay(10)"
                   >
-                    <el-input-number
-                      v-model="row.linkQuantity"
-                      placeholder="请输入"
-                      :min="1"
-                      :controls="false"
-                      :precision="0"
-                    />
-                  </el-form-item>
-                </template>
-              </el-table-column>
-              <el-table-column prop="zip" label="操作" width="100">
-                <template #default="{ $index }">
-                  <el-button
-                    type="primary"
-                    link
-                    @click="handleRemoveProduct($index)"
-                    >删除</el-button
+                  </el-input-number>
+                </el-col>
+                <el-col :span="1" style="text-align: center"> : </el-col>
+                <el-col :span="6">
+                  <el-input-number
+                    v-model="
+                      formData.data.victoriatouristJson.newProductsExpectedSales
+                    "
+                    placeholder="预期销量"
+                    :min="0"
+                    :controls="false"
+                    :precision="0"
+                    style="width: 100%"
+                  />
+                </el-col>
+              </el-row>
+            </div>
+          </template>
+          <template #two>
+            <div style="width: 100%">
+              <el-row>
+                <el-col :span="4">
+                  <el-input
+                    v-model="formData.data.victoriatouristJson.growUpDay1"
+                    placeholder="请输入"
+                    disabled
+                  />
+                </el-col>
+                <el-col :span="1" style="text-align: center"> ~ </el-col>
+                <el-col :span="4">
+                  <el-input-number
+                    v-model="formData.data.victoriatouristJson.growUpDay"
+                    placeholder="请输入"
+                    :min="0"
+                    :controls="false"
+                    :precision="0"
+                    style="width: 100%"
+                    @change="changeDay(20)"
                   >
-                </template>
-              </el-table-column>
-            </el-table>
-          </div>
-        </template>
-        <template #one>
-          <div style="width: 100%">
-            <el-row>
-              <el-col :span="4">
-                <el-input
-                  v-model="formData.data.victoriatouristJson.newProductsDay1"
-                  placeholder="请输入"
-                  disabled
-                />
-              </el-col>
-              <el-col :span="1" style="text-align: center"> ~ </el-col>
-              <el-col :span="4">
-                <el-input-number
-                  v-model="formData.data.victoriatouristJson.newProductsDay"
-                  placeholder="请输入"
-                  :min="0"
-                  :controls="false"
-                  :precision="0"
-                  style="width: 100%"
-                  @change="changeDay(10)"
-                >
-                </el-input-number>
-              </el-col>
-              <el-col :span="1" style="text-align: center"> : </el-col>
-              <el-col :span="6">
-                <el-input-number
-                  v-model="
-                    formData.data.victoriatouristJson.newProductsExpectedSales
-                  "
-                  placeholder="预期销量"
-                  :min="0"
-                  :controls="false"
-                  :precision="0"
-                  style="width: 100%"
-                />
-              </el-col>
-            </el-row>
-          </div>
-        </template>
-        <template #two>
-          <div style="width: 100%">
-            <el-row>
-              <el-col :span="4">
-                <el-input
-                  v-model="formData.data.victoriatouristJson.growUpDay1"
-                  placeholder="请输入"
-                  disabled
-                />
-              </el-col>
-              <el-col :span="1" style="text-align: center"> ~ </el-col>
-              <el-col :span="4">
-                <el-input-number
-                  v-model="formData.data.victoriatouristJson.growUpDay"
-                  placeholder="请输入"
-                  :min="0"
-                  :controls="false"
-                  :precision="0"
-                  style="width: 100%"
-                  @change="changeDay(20)"
-                >
-                </el-input-number>
+                  </el-input-number>
+                </el-col>
+                <el-col :span="1" style="text-align: center"> : </el-col>
+                <el-col :span="6">
+                  <el-input-number
+                    v-model="
+                      formData.data.victoriatouristJson.growUpExpectedSales
+                    "
+                    placeholder="预期销量"
+                    :min="0"
+                    :controls="false"
+                    :precision="0"
+                    style="width: 100%"
+                  />
+                </el-col>
+              </el-row>
+            </div>
+          </template>
+          <template #three>
+            <el-row style="width: 100%">
+              <el-col :span="5">
+                大于{{ formData.data.victoriatouristJson.attDay }}天:
               </el-col>
-              <el-col :span="1" style="text-align: center"> : </el-col>
               <el-col :span="6">
                 <el-input-number
                   v-model="
-                    formData.data.victoriatouristJson.growUpExpectedSales
+                    formData.data.victoriatouristJson.matureExpectedSales
                   "
                   placeholder="预期销量"
                   :min="0"
@@ -216,26 +240,9 @@
                 />
               </el-col>
             </el-row>
-          </div>
-        </template>
-        <template #three>
-          <el-row style="width: 100%">
-            <el-col :span="5">
-              大于{{ formData.data.victoriatouristJson.attDay }}天:
-            </el-col>
-            <el-col :span="6">
-              <el-input-number
-                v-model="formData.data.victoriatouristJson.matureExpectedSales"
-                placeholder="预期销量"
-                :min="0"
-                :controls="false"
-                :precision="0"
-                style="width: 100%"
-              />
-            </el-col>
-          </el-row>
-        </template>
-      </byForm>
+          </template>
+        </byForm>
+      </div>
       <template #footer>
         <el-button @click="dialogVisible = false" size="large">取 消</el-button>
         <el-button
@@ -1064,4 +1071,5 @@ getDict();
 :deep(.el-date-picker__header .el-date-picker__header-label) {
   display: none;
 }
+
 </style>

+ 7 - 4
src/views/WDLY/purchaseManage/subscribe/index.vue

@@ -394,9 +394,8 @@ const formConfig = computed(() => {
 const getList = async (req) => {
   sourceList.value.pagination = { ...sourceList.value.pagination, ...req };
   loading.value = true;
-  proxy
-    .post("/subscribeDetail/pageByWdly  ", sourceList.value.pagination)
-    .then((message) => {
+  proxy.post("/subscribeDetail/pageByWdly  ", sourceList.value.pagination).then(
+    (message) => {
       console.log(message);
       sourceList.value.data = message.rows.map((x) => ({
         ...x,
@@ -406,7 +405,11 @@ const getList = async (req) => {
       setTimeout(() => {
         loading.value = false;
       }, 200);
-    });
+    },
+    (err) => {
+      loading.value = false;
+    }
+  );
 };
 
 const openModal = () => {

+ 2 - 2
src/views/WDLY/salesMange/jdOrder/index.vue

@@ -262,7 +262,7 @@
       <div style="margin-top: 20px" v-show="importData.customerId">
         <div style="margin-bottom: 10px">上传附件</div>
         <el-upload
-          action="/dev-api/jdOrder/excelImport"
+          :action="actionUrl + '/jdOrder/excelImport'"
           :data="importData"
           :headers="headers"
           :on-success="handleSuccess"
@@ -300,7 +300,7 @@ import SelectProduct from "@/components/WDLY/product/SelectProduct";
 import OrderDetails from "@/components/WDLY/order/details";
 import { getToken } from "@/utils/auth";
 const headers = ref({ Authorization: "Bearer " + getToken() });
-
+const actionUrl = import.meta.env.VITE_APP_BASE_API;
 const loading = ref(false);
 const submitLoading = ref(false);
 const sourceList = ref({

+ 3 - 1
src/views/WDLY/salesMange/jdReGoods/index.vue

@@ -143,7 +143,7 @@
       </el-select>
       <div style="margin-top: 20px" v-show="importData.warehouseId">
         <el-upload
-          action="/dev-api/jdBack/excelImport"
+          :action="actionUrl+'/jdBack/excelImport'"
           :data="importData"
           :headers="headers"
           :on-success="handleSuccess"
@@ -183,6 +183,8 @@ import { getToken } from "@/utils/auth";
 
 const uploadData = ref({});
 const headers = ref({ Authorization: "Bearer " + getToken() });
+const actionUrl = import.meta.env.VITE_APP_BASE_API;
+
 const loading = ref(false);
 const submitLoading = ref(false);
 const sourceList = ref({

+ 4 - 2
src/views/WDLY/salesMange/jdReGoodsInspection/index.vue

@@ -184,7 +184,7 @@
     >
       <div>
         <el-upload
-          action="/dev-api/jdBackQualityWait/importExcel"
+          :action="actionUrl + '/jdBackQualityWait/importExcel'"
           :headers="headers"
           :on-success="handleSuccess"
           :on-progress="handleProgress"
@@ -216,6 +216,8 @@ import SelectProduct from "@/components/WDLY/product/SelectProduct";
 import OrderDetails from "@/components/WDLY/order/details";
 import { getToken } from "@/utils/auth";
 const headers = ref({ Authorization: "Bearer " + getToken() });
+const actionUrl = import.meta.env.VITE_APP_BASE_API;
+
 let openExcelDialog = ref(false);
 let excelLoading = ref(false);
 const loading = ref(false);
@@ -592,7 +594,7 @@ const handleExcel = () => {
   });
   let xhr = new XMLHttpRequest();
   //域名是华为云的
-  xhr.open("GET", `/dev-api/jdBackQualityWait/exportExcel`, true);
+  xhr.open("GET", `${actionUrl}/jdBackQualityWait/exportExcel`, true);
   xhr.responseType = "blob";
   xhr.setRequestHeader("Authorization", `Bearer ${getToken()}`);
   xhr.send();

+ 3 - 1
src/views/WDLY/salesMange/jdSalesData/index.vue

@@ -132,7 +132,7 @@
       </el-select>
       <div style="margin-top: 20px" v-show="importData.warehouseId">
         <el-upload
-          action="/dev-api/salesRecord/excelImport"
+          :action="actionUrl + '/salesRecord/excelImport'"
           :data="importData"
           :headers="headers"
           :on-success="handleSuccess"
@@ -172,6 +172,8 @@ import { getToken } from "@/utils/auth";
 
 const uploadData = ref({});
 const headers = ref({ Authorization: "Bearer " + getToken() });
+const actionUrl = import.meta.env.VITE_APP_BASE_API;
+
 const loading = ref(false);
 const submitLoading = ref(false);
 const sourceList = ref({

+ 4 - 0
src/views/WDLY/salesMange/order/index.vue

@@ -134,6 +134,7 @@
                       :controls="false"
                       :min="0"
                       @change="totalAmount"
+                      placeholder="请输入"
                     />
                   </el-form-item>
                 </template>
@@ -151,6 +152,7 @@
                       :controls="false"
                       :min="0"
                       @change="totalAmount"
+                      placeholder="请输入"
                     />
                   </el-form-item>
                 </template>
@@ -506,12 +508,14 @@ const formConfig = reactive([
     prop: "contacts",
     label: "收件人",
     itemWidth: 20,
+    placeholder: "姓名",
   },
   {
     type: "input",
     prop: "phone",
     label: " ",
     itemWidth: 30,
+    placeholder: "联系电话",
   },
   {
     type: "slot",

+ 5 - 1
src/views/connect/E-mail/mail/com/right.vue

@@ -15,7 +15,9 @@
     <div v-show="headRadio === '3'">
       <Purchase></Purchase>
     </div>
-    <div v-show="headRadio === '4'">d</div>
+    <div v-show="headRadio === '4'">
+      <Netdisk></Netdisk>
+    </div>
   </div>
 </template>
 
@@ -23,6 +25,8 @@
 import Contract from "./right/contract/index.vue";
 import Documents from "./right/documents/index.vue";
 import Purchase from "./right/purchase/index.vue";
+import Netdisk from "./right/netdisk/index.vue";
+
 
 const headRadio = ref("");
 onMounted(() => {

+ 2 - 1
src/views/connect/E-mail/mail/com/right/contract/pi.vue

@@ -34,7 +34,7 @@
       :data="sourceList.data"
       style="width: 100%; margin-top: 10px"
       v-loading="loading"
-      height="390"
+      :height="tableHeight"
     >
       <el-table-column prop="code" label="单号" width="115" fixed="left" />
       <el-table-column prop="createTime" label="日期" width="140" />
@@ -72,6 +72,7 @@
 </template>
   
 <script setup>
+const tableHeight = window.innerHeight - 330;
 const loading = ref(false);
 const sourceList = ref({
   data: [],

+ 2 - 1
src/views/connect/E-mail/mail/com/right/contract/quotation.vue

@@ -34,7 +34,7 @@
       :data="sourceList.data"
       style="width: 100%; margin-top: 10px"
       v-loading="loading"
-      height="390"
+      :height="tableHeight"
     >
       <el-table-column prop="code" label="单号" width="115" fixed="left" />
       <el-table-column prop="createTime" label="日期" width="140" />
@@ -72,6 +72,7 @@
 </template>
   
 <script setup>
+const tableHeight = window.innerHeight - 330;
 const loading = ref(false);
 const sourceList = ref({
   data: [],

+ 2 - 1
src/views/connect/E-mail/mail/com/right/documents/index.vue

@@ -17,7 +17,7 @@
       :data="sourceList.data"
       style="width: 100%; margin-top: 10px"
       v-loading="loading"
-      height="463"
+      :height="tableHeight"
     >
       <el-table-column
         prop="buyCorporationName"
@@ -55,6 +55,7 @@
 </template>
   
 <script setup>
+const tableHeight = window.innerHeight - 257;
 const loading = ref(false);
 const sourceList = ref({
   data: [],

+ 194 - 0
src/views/connect/E-mail/mail/com/right/netdisk/enterprise.vue

@@ -0,0 +1,194 @@
+<template>
+  <div>
+    <div style="margin-bottom: 10px; display: flex; align-items: center">
+      <el-input
+        class="input_content"
+        placeholder="请输入内容"
+        v-model="sourceList.pagination.keyword"
+        style="width: 90%"
+        clearable
+        size="small"
+      ></el-input>
+      <div style="text-align: center; width: 10%">
+        <el-icon style="cursor: pointer" @click="getList"><Search /></el-icon>
+      </div>
+    </div>
+    <el-row>
+      <el-col :span="6" style="border-right: 1px solid #d7d7d7">
+        <div class="mulu">
+          <el-tree
+            :data="treeListData"
+            :props="{ label: 'name', children: 'netdiskList' }"
+            ref="tree"
+            node-key="id"
+            @node-click="treeChange"
+            default-expand-all
+            :expand-on-click-node="false"
+          ></el-tree>
+        </div>
+      </el-col>
+      <el-col :span="18" style="padding: 0 5px">
+        <el-table
+          :data="sourceList.data"
+          style="width: 100%"
+          v-loading="loading"
+          :height="tableHeight"
+        >
+          <el-table-column prop="name" label="文件名" width="115" />
+          <el-table-column prop="createTime" label="上传时间" width="140" />
+          <el-table-column
+            label="操作"
+            width="60"
+            fixed="right"
+            align="center"
+            v-if="isShowBtn"
+          >
+            <template #default="{ row }">
+              <el-button type="primary" text @click="handleClickRow(row)"
+                ><i class="iconfont icon-iconm_wofqd"></i
+              ></el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+
+        <el-pagination
+          style="margin-top: 10px"
+          v-model:current-page="sourceList.pagination.pageNum"
+          :page-size="10"
+          layout="total, prev, pager, next"
+          :total="sourceList.pagination.total"
+          prev-text="上一页"
+          next-text="下一页"
+          @current-change="handleCurrentChange"
+        />
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script setup>
+import useMailStore from "@/store/modules/mail";
+const mailStore = useMailStore();
+const isShowBtn = ref(false);
+mailStore.$subscribe((mutations, state) => {
+  if (state.currentId.includes("write")) {
+    isShowBtn.value = true;
+  } else {
+    isShowBtn.value = false;
+  }
+});
+const loading = ref(false);
+const sourceList = ref({
+  data: [],
+  pagination: {
+    total: 300,
+    pageNum: 1,
+    pageSize: 10,
+    keyword: "",
+  },
+});
+const treeListData = ref([]);
+const tableHeight = window.innerHeight - 295;
+const statusData = ref([
+  {
+    label: "草稿",
+    value: 0,
+  },
+  {
+    label: "审批中",
+    value: 10,
+  },
+  {
+    label: "驳回",
+    value: 20,
+  },
+  {
+    label: "通过",
+    value: 30,
+  },
+  {
+    label: "终止",
+    value: 99,
+  },
+]);
+const { proxy } = getCurrentInstance();
+const getList = (req) => {
+  loading.value = true;
+  proxy.post("/netdisk/page", sourceList.value.pagination).then((res) => {
+    sourceList.value.data = res.rows;
+    sourceList.value.pagination.total = res.total;
+    setTimeout(() => {
+      loading.value = false;
+    }, 200);
+  });
+};
+
+const handleCurrentChange = (val) => {
+  sourceList.value.pagination.pageNum = val;
+  getList();
+};
+
+const treeChange = (e) => {
+  sourceList.value.pagination.parentFolderId = e.id;
+  sourceList.value.pagination.pageNum = 1;
+  getList();
+};
+
+const getTreeList = () => {
+  proxy.get("/netdisk/tree", {}).then((res) => {
+    treeListData.value = res.data;
+    console.log(treeListData.value, "ada");
+  });
+};
+getTreeList();
+getList();
+
+const handleClickRow = (row) => {
+  console.log(row, "ada");
+};
+</script>
+
+<style lang="scss" scoped>
+* {
+  font-size: 12px;
+}
+.el-button {
+  padding: 0px;
+}
+.btn {
+  width: 100%;
+  border-radius: 10px;
+  padding: 6px 10px;
+  height: 24px;
+}
+.el-pagination {
+  padding-left: 30px;
+}
+:deep(.el-pagination button, .el-pager li) {
+  font-size: 12px;
+}
+:deep(.el-table .el-table__cell) {
+  padding: 2px 0px;
+}
+</style>
+<style lang="scss">
+.mulu {
+  width: 100%;
+  padding: 0 5px;
+  height: calc(100vh - 50px - 50px - 10px - 30px - 28px - 46px - 35px - 24px);
+  overflow-y: auto;
+  overflow-x: auto;
+  .el-tree {
+    .el-tree-node.is-expanded > .el-tree-node__children {
+      overflow: visible;
+    }
+    .el-tree-node > .el-tree-node__children {
+      overflow: visible;
+    }
+
+    .el-tree-node__content {
+      height: 26px !important;
+    }
+  }
+}
+</style>

+ 22 - 0
src/views/connect/E-mail/mail/com/right/netdisk/index.vue

@@ -0,0 +1,22 @@
+<template>
+  <div>
+    <el-tabs v-model="activeName" style="font-size: 12px">
+      <el-tab-pane label="企业网盘" name="1">
+        <Enterprise> </Enterprise>
+      </el-tab-pane>
+      <el-tab-pane label="个人网盘" name="2">
+        <!-- <Pi></Pi> 1 -->暂未开放
+      </el-tab-pane>
+    </el-tabs>
+  </div>
+</template>
+
+<script setup>
+import Enterprise from "./enterprise";
+// import Pi from "./pi";
+const activeName = ref("");
+activeName.value = "1";
+</script>
+
+<style lang="scss" scoped>
+</style>

+ 2 - 1
src/views/connect/E-mail/mail/com/right/purchase/index.vue

@@ -31,7 +31,7 @@
       :data="sourceList.data"
       style="width: 100%; margin-top: 10px"
       v-loading="loading"
-      height="463"
+      :height="tableHeight"
     >
       <el-table-column prop="code" label="单号" width="100" fixed="left" />
       <el-table-column prop="createTime" label="日期" width="150" />
@@ -70,6 +70,7 @@
 </template>
   
 <script setup>
+const tableHeight = window.innerHeight - 257;
 const loading = ref(false);
 const sourceList = ref({
   data: [],

+ 1 - 0
src/views/connect/E-mail/mail/index.vue

@@ -113,6 +113,7 @@ const handleClose = (icon) => {
   }
 }
 .icon-closed {
+  // display: block;
   transform: rotate(-180deg);
   &:hover {
     transform: rotate(180deg) !important;

+ 26 - 23
src/views/product/material/index.vue

@@ -56,29 +56,32 @@
       v-loading="loading"
       destroy-on-close
     >
-      <byForm
-        :formConfig="formConfig"
-        :formOption="formOption"
-        v-model="formData.data"
-        :rules="rules"
-        ref="byform"
-      >
-        <template #productPic>
-          <div>
-            <el-upload
-              v-model:fileList="fileList"
-              action="https://winfaster.obs.cn-south-1.myhuaweicloud.com"
-              :data="uploadData"
-              list-type="picture-card"
-              :on-remove="handleRemove"
-              :on-success="handleSuccess"
-              :before-upload="handleBeforeUpload"
-            >
-              <el-icon><Plus /></el-icon>
-            </el-upload>
-          </div>
-        </template>
-      </byForm>
+      <div class="public_height_dialog">
+        <byForm
+          :formConfig="formConfig"
+          :formOption="formOption"
+          v-model="formData.data"
+          :rules="rules"
+          ref="byform"
+        >
+          <template #productPic>
+            <div>
+              <el-upload
+                v-model:fileList="fileList"
+                action="https://winfaster.obs.cn-south-1.myhuaweicloud.com"
+                :data="uploadData"
+                list-type="picture-card"
+                :on-remove="handleRemove"
+                :on-success="handleSuccess"
+                :before-upload="handleBeforeUpload"
+              >
+                <el-icon><Plus /></el-icon>
+              </el-upload>
+            </div>
+          </template>
+        </byForm>
+      </div>
+
       <template #footer>
         <el-button @click="dialogVisible = false" size="large">取 消</el-button>
         <el-button

+ 28 - 24
src/views/product/product/index.vue

@@ -54,31 +54,35 @@
       v-model="dialogVisible"
       width="500"
       v-loading="loading"
+      destroy-on-close
     >
-      <byForm
-        :formConfig="formConfig"
-        :formOption="formOption"
-        v-model="formData.data"
-        :rules="rules"
-        ref="byform"
-      >
-        <template #productPic>
-          <div>
-            <el-upload
-              v-model:fileList="fileList"
-              action="https://winfaster.obs.cn-south-1.myhuaweicloud.com"
-              :data="uploadData"
-              list-type="picture-card"
-              :on-remove="handleRemove"
-              :on-success="handleSuccess"
-              :before-upload="handleBeforeUpload"
-              accept=".gif, .jpeg, .jpg, .png"
-            >
-              <el-icon><Plus /></el-icon>
-            </el-upload>
-          </div>
-        </template>
-      </byForm>
+      <div class="public_height_dialog">
+        <byForm
+          :formConfig="formConfig"
+          :formOption="formOption"
+          v-model="formData.data"
+          :rules="rules"
+          ref="byform"
+        >
+          <template #productPic>
+            <div>
+              <el-upload
+                v-model:fileList="fileList"
+                action="https://winfaster.obs.cn-south-1.myhuaweicloud.com"
+                :data="uploadData"
+                list-type="picture-card"
+                :on-remove="handleRemove"
+                :on-success="handleSuccess"
+                :before-upload="handleBeforeUpload"
+                accept=".gif, .jpeg, .jpg, .png"
+              >
+                <el-icon><Plus /></el-icon>
+              </el-upload>
+            </div>
+          </template>
+        </byForm>
+      </div>
+
       <template #footer>
         <el-button @click="dialogVisible = false" size="large">取 消</el-button>
         <el-button

+ 28 - 24
src/views/product/product/index2.vue

@@ -54,31 +54,35 @@
       v-model="dialogVisible"
       width="500"
       v-loading="loading"
+      destroy-on-close
     >
-      <byForm
-        :formConfig="formConfig"
-        :formOption="formOption"
-        v-model="formData.data"
-        :rules="rules"
-        ref="byform"
-      >
-        <template #productPic>
-          <div>
-            <el-upload
-              v-model:fileList="fileList"
-              action="https://winfaster.obs.cn-south-1.myhuaweicloud.com"
-              :data="uploadData"
-              list-type="picture-card"
-              :on-remove="handleRemove"
-              :on-success="handleSuccess"
-              :before-upload="handleBeforeUpload"
-              accept=".gif, .jpeg, .jpg, .png"
-            >
-              <el-icon><Plus /></el-icon>
-            </el-upload>
-          </div>
-        </template>
-      </byForm>
+      <div class="public_height_dialog">
+        <byForm
+          :formConfig="formConfig"
+          :formOption="formOption"
+          v-model="formData.data"
+          :rules="rules"
+          ref="byform"
+        >
+          <template #productPic>
+            <div>
+              <el-upload
+                v-model:fileList="fileList"
+                action="https://winfaster.obs.cn-south-1.myhuaweicloud.com"
+                :data="uploadData"
+                list-type="picture-card"
+                :on-remove="handleRemove"
+                :on-success="handleSuccess"
+                :before-upload="handleBeforeUpload"
+                accept=".gif, .jpeg, .jpg, .png"
+              >
+                <el-icon><Plus /></el-icon>
+              </el-upload>
+            </div>
+          </template>
+        </byForm>
+      </div>
+
       <template #footer>
         <el-button @click="dialogVisible = false" size="large">取 消</el-button>
         <el-button