戴艳蓉 %!s(int64=3) %!d(string=hai) anos
pai
achega
aeb4d20b87

+ 4 - 0
src/assets/css/common.scss

@@ -75,6 +75,10 @@ body {
   height: 100%;
   width: 100%;
   background-color: #fff;
+  position: fixed;
+  padding:0;
+  margin: 0;
+  overflow: hidden;
 }
 
 .fillcontain {

+ 4 - 0
src/assets/css/index.scss

@@ -8,6 +8,10 @@
   height: 100%;
   width: 100%;
   background-color: #fff;
+  position: fixed;
+  width: 100%;
+  height: 100%;
+  overflow: hidden;
 }
 .box-home {
   width: 1196px;

+ 1 - 1
src/assets/css/scss/index.scss

@@ -2,7 +2,7 @@
 @import "./mixin.scss";
 html,
 body,
-.app {
+#app {
   width: 100%;
   height: 100%;
 }

+ 9 - 11
src/layout/components/AppMain.vue

@@ -10,30 +10,28 @@
 
 <script>
 export default {
-  name: 'AppMain',
+  name: "AppMain",
   computed: {
     cachedViews() {
-      return this.$store.state.tagsView.cachedViews
+      return this.$store.state.tagsView.cachedViews;
     },
     key() {
-      return this.$route.path
-    }
-  }
-}
+      return this.$route.path;
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
 .app-main {
-  /* 50= navbar  50  */
-  min-height:100%; 
-  //calc(100vh - 50px);
+  min-height: 100%;
   width: 100%;
   height: 100%;
   position: relative;
-  overflow: hidden;
+  overflow-y: scroll;
 }
 
-.fixed-header+.app-main {
+.fixed-header + .app-main {
   padding-top: 50px;
 }
 

+ 59 - 54
src/layout/index.vue

@@ -1,9 +1,13 @@
 <template>
   <div :class="classObj" class="app-wrapper">
-    <div v-if="device==='mobile'&&sidebar.opened" class="drawer-bg" @click="handleClickOutside" />
+    <div
+      v-if="device === 'mobile' && sidebar.opened"
+      class="drawer-bg"
+      @click="handleClickOutside"
+    />
     <sidebar class="sidebar-container" />
-    <div :class="{hasTagsView:needTagsView}" class="main-container">
-      <div :class="{'fixed-header':fixedHeader}">
+    <div :class="{ hasTagsView: needTagsView }" class="main-container">
+      <div :class="{ 'fixed-header': fixedHeader }">
         <navbar />
         <tags-view v-if="needTagsView" />
       </div>
@@ -17,86 +21,87 @@
 
 <script>
 // import RightPanel from '@/components/RightPanel'
-import { AppMain, Navbar, Settings, Sidebar, TagsView } from './components'
-import ResizeMixin from './mixin/ResizeHandler'
-import { mapState } from 'vuex'
+import { AppMain, Navbar, Settings, Sidebar, TagsView } from "./components";
+import ResizeMixin from "./mixin/ResizeHandler";
+import { mapState } from "vuex";
 
 export default {
-  name: 'Layout',
+  name: "Layout",
   components: {
     AppMain,
     Navbar,
     // RightPanel,
     Settings,
     Sidebar,
-    TagsView
+    TagsView,
   },
   mixins: [ResizeMixin],
   computed: {
     ...mapState({
-      sidebar: state => state.app.sidebar,
-      device: state => state.app.device,
-      showSettings: state => state.settings.showSettings,
-      needTagsView: state => state.settings.tagsView,
-      fixedHeader: state => state.settings.fixedHeader
+      sidebar: (state) => state.app.sidebar,
+      device: (state) => state.app.device,
+      showSettings: (state) => state.settings.showSettings,
+      needTagsView: (state) => state.settings.tagsView,
+      fixedHeader: (state) => state.settings.fixedHeader,
     }),
     classObj() {
       return {
         hideSidebar: !this.sidebar.opened,
         openSidebar: this.sidebar.opened,
         withoutAnimation: this.sidebar.withoutAnimation,
-        mobile: this.device === 'mobile'
-      }
-    }
+        mobile: this.device === "mobile",
+      };
+    },
   },
   methods: {
     handleClickOutside() {
-      this.$store.dispatch('app/closeSideBar', { withoutAnimation: false })
-    }
-  }
-}
+      this.$store.dispatch("app/closeSideBar", { withoutAnimation: false });
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
-  @import "~@/styles/mixin.scss";
-  @import "~@/styles/variables.scss";
+@import "~@/styles/mixin.scss";
+@import "~@/styles/variables.scss";
 
-  .app-wrapper {
-    @include clearfix;
-    position: relative;
-    height: 100%;
-    width: 100%;
-
-    &.mobile.openSidebar {
-      position: fixed;
-      top: 0;
-    }
-  }
+.app-wrapper {
+  @include clearfix;
+  height: 100%;
+  width: 100%;
+  position: fixed;
+  overflow: hidden;
 
-  .drawer-bg {
-    background: #000;
-    opacity: 0.3;
-    width: 100%;
-    top: 0;
-    height: 100%;
-    position: absolute;
-    z-index: 999;
-  }
-
-  .fixed-header {
+  &.mobile.openSidebar {
     position: fixed;
     top: 0;
-    right: 0;
-    z-index: 9;
-    width: calc(100% - #{$sideBarWidth});
-    transition: width 0.28s;
   }
+}
 
-  .hideSidebar .fixed-header {
-    width: calc(100% - 54px)
-  }
+.drawer-bg {
+  background: #000;
+  opacity: 0.3;
+  width: 100%;
+  top: 0;
+  height: 100%;
+  position: absolute;
+  z-index: 999;
+}
 
-  .mobile .fixed-header {
-    width: 100%;
-  }
+.fixed-header {
+  position: fixed;
+  top: 0;
+  right: 0;
+  z-index: 9;
+  width: calc(100% - #{$sideBarWidth});
+  transition: width 0.28s;
+}
+
+.hideSidebar .fixed-header {
+  width: calc(100% - 54px);
+}
+
+.mobile .fixed-header {
+  width: 100%;
+}
 </style>

+ 0 - 304
src/views/good-share/components/backGoodShow.vue

@@ -1,304 +0,0 @@
-<template>
-  <div v-if="allList[index]">
-    <div class="project-backGoodShow" v-loading="allList[index].loading">
-      <div class="project-backGoodShow-main">
-        <div class="project-backGoodShow-title">
-          商品要求{{ index + 1 }}
-          <el-button-group :size="'mini'" class="fr" style="margin: 8px 0 0 0">
-            <el-button
-              class="fr"
-              v-if="index !== 0"
-              type="primary"
-              :size="'mini'"
-              icon="el-icon-arrow-left"
-              @click="index--"
-              >上一个</el-button
-            >
-            <el-button
-              type="primary"
-              class="fr"
-              v-if="index + 1 !== allList.length"
-              @click="next()"
-              :size="'mini'"
-              >下一个<i
-                class="el-icon-arrow-right el-icon--right"
-                :size="'mini'"
-              ></i
-            ></el-button>
-            <el-button
-              type="primary"
-              class="fr"
-              @click="next()"
-              v-if="index + 1 === allList.length"
-              :size="'mini'"
-              >提交<i class="el-icon-upload el-icon--right"></i>
-            </el-button>
-          </el-button-group>
-        </div>
-        <div class="project-backGoodShow-ask-table">
-          <template v-if="allList[index].ladder">
-            <el-table
-              :data="allList[index].ladder"
-              :size="'mini'"
-              border
-              stripe
-              style="width: 100%"
-            >
-              <el-table-column prop="good_type" label="商品类型" width="80px">
-                <template slot-scope="scope">
-                  <el-tag
-                    :size="'mini'"
-                    v-text="
-                      (
-                        statusOptions.find(
-                          (items) => items.value == scope.row.good_type
-                        ) || {}
-                      ).label || '--'
-                    "
-                  ></el-tag
-                ></template>
-              </el-table-column>
-              <el-table-column
-                prop="budget_price"
-                label="预算单价"
-                width="110"
-              />
-              <el-table-column prop="num" label="购买数量" width="110" />
-              <el-table-column prop="cat_name" label="商品分类" />
-              <el-table-column prop="good_img" label="图片" width="50">
-                <template slot-scope="scope">
-                  <div
-                    v-if="scope.row.good_img"
-                    style="width: 20px; height: 20px"
-                    class="hover"
-                    v-viewer
-                  >
-                    <img
-                      :src="scope.row.good_img"
-                      style="display: inline-block; width: 100%; height: 100%"
-                      alt=""
-                    />
-                  </div>
-                </template>
-              </el-table-column>
-              <el-table-column prop="good_name" label="商品名称" />
-            </el-table>
-          </template>
-        </div>
-        <div class="project-backGoodShow-title">商品反馈情况</div>
-        <div class="project-backGoodShow-backGood-table">
-          <template v-if="allList[index].tableData">
-            <!-- allList[index].pageInfo.curr = 1;
-                searchList(index); 
-                
-              -->
-            <ex-table
-              v-loading="allList[index].loading"
-              :table="table"
-              :data="allList[index].tableData"
-              :columns="columns"
-              :page="allList[index].pageInfo"
-              :size="'mini'"
-              @page-curr-change="handlePageChange($event, index)"
-              @page-size-change="handleSizeChange($event, index)"
-              @screen-reset="
-                allList[index].pageInfo.curr = 1;
-                searchList(index);
-              "
-              @screen-submit="
-                allList[index].pageInfo.curr = 1;
-                searchList(index);
-              "
-              @selection="selection_change"
-            >
-            </ex-table>
-          </template>
-        </div>
-      </div>
-    </div>
-  </div>
-</template>
-<script>
-import asyncRequest from "@/apis/service/good-share";
-import resToken from "@/mixins/resToken";
-import columnsForm from "./columnsForm";
-export default {
-  name: "backGoodShow",
-  props: ["showModel", "sitem", "id", "type", "newTime"],
-  mixins: [resToken],
-  watch: {
-    // showModel: function (val) {
-    //   this.showModelThis = val;
-    //   if (val) {
-    //     this.initForm();
-    //   }
-    // },
-    // showModelThis(val) {
-    //   if (!val) {
-    //     this.$emit("cancel");
-    //   }
-    // },
-  },
-  data() {
-    return {
-      loading: false,
-      allList: [],
-      index: 0,
-      projectNo: "",
-      statusOptions: [
-        { value: "1", label: "竞品" },
-        { value: "2", label: "竞聘" },
-      ],
-      table: {
-        stripe: true,
-        border: true,
-        // _defaultHeader_: ["setcol"],
-      },
-      // 表格 - 列参数
-      columns: columnsForm,
-    };
-  },
-  mounted() {
-    this.initForm();
-  },
-  methods: {
-    //初始化整个组件
-    async initForm() {
-      this.loading = true;
-      await this.initListData();
-      this.loading = false;
-      // console.log(this.allList);
-      await this.searchList(this.index);
-    },
-    next(){
-      const{selection}=this.allList[this.index]
-      if(selection.length===0){
-        this.$message.warning("至少选择一个商品!");
-        return
-      }
-      if(this.index+1!==this.allList.length){
-        this.index++
-      }else{
-        
-      }
-    },
-    selection_change(e) {
-      const { list } = e;
-      this.allList[this.index].selection = JSON.parse(JSON.stringify(list));
-      let change_all_list = [];
-      this.allList.forEach((a, ai) => {
-        const { selection } = a;
-        if (selection && selection.length > 0) {
-          selection.forEach((b) => {
-            let item = JSON.parse(JSON.stringify(b));
-            item.noIndex = ai + 1;
-            change_all_list.push(item);
-          });
-        }
-      });
-      this.$emit("tableChange", { list: change_all_list });
-    },
-
-    //初始化整个组件
-    async initListData() {
-      // console.log(this.sitem);
-      this.allList = [];
-      const { projectNo, ladder } = this.sitem;
-      this.projectNo = projectNo;
-      if (ladder && ladder.length > 0) {
-        ladder.forEach((e) => {
-          let item = JSON.parse(JSON.stringify(e));
-          // console.log(item);
-          let model = {
-            ladder: [item],
-            pageInfo: {
-              size: 15,
-              curr: 1,
-              total: 0,
-            },
-            loading: true,
-            selection: [],
-            tableData: [],
-          };
-          this.allList.push(model);
-        });
-      }
-    },
-    async allSearchList() {
-      if (this.allList && this.allList.length > 0) {
-        this.allList.forEach(async (e, i) => {
-          await this.searchList(i);
-        });
-      }
-    },
-    //页数选择
-    async handlePageChange(e, index) {
-      this.allList[index].pageInfo.curr = e;
-      await this.searchList(index);
-    },
-    //页面条数选择
-    async handleSizeChange(e, index) {
-      this.allList[index].pageInfo.curr = 1;
-      this.allList[index].pageInfo.size = e;
-      await this.searchList(index);
-    },
-    async searchList(index) {
-      const { pageInfo } = this.allList[index];
-      const { size, curr } = pageInfo;
-      this.allList[index].loading = true;
-      let model = {
-        page: curr,
-        size: size,
-        zxNo: "",
-        infoNo: "",
-        bidNo: "",
-        projectNo: this.projectNo,
-      };
-      const { code, data } = await asyncRequest.back_good_list(model);
-      if (code === 0) {
-        const { list, count } = data;
-        this.allList[index].tableData = [{ num: 1 }];
-        // list;
-        //  this.allList[index].tableData.map((v) => {
-        //     v.class_cat = "";
-        //     if (v.can && v.can.length > 0) {
-        //       v.can.forEach((x, i) => {
-        //         v.class_cat += i === 0 ? x.name : "/" + x.name;
-        //       });
-        //     }
-        //     return v;
-        //   });
-        this.allList[index].pageInfo.total = Number(count);
-      } else if (code >= 100 && code <= 104) {
-        await this.logout();
-      } else {
-        this.allList[index].tableData = [];
-        this.allList[index].pageInfo.total = 0;
-      }
-      this.allList[index].loading = false;
-    },
-  },
-};
-</script>
-
-   <style lang="scss" scoped>
-.project-backGoodShow {
-  box-sizing: border-box;
-  width: 100%;
-  padding: 2px 16px 16px 16px;
-
-  .project-backGoodShow-main {
-    // padding: 2px 16px 16px 16px;
-    // background: #fefefe;
-    // border-radius: 5px;
-    // overflow: hidden;
-    // border: 1px solid #f0f0f0;
-    // margin: 0 0 16px 0;
-    .project-backGoodShow-title {
-      height: 48px;
-      line-height: 48px;
-      color: #676767;
-    }
-  }
-}
-</style>

+ 357 - 0
src/views/good-share/components/changeBackGood.vue

@@ -0,0 +1,357 @@
+<template>
+  <div class="choice-goods">
+    <div class="top">
+      <div v-if="allList[index]">
+        <div class="project-backGoodShow" v-loading="allList[index].loading">
+          <div class="project-backGoodShow-main">
+            <div class="project-backGoodShow-title">
+              商品要求{{ index + 1 }}
+              <el-button-group
+                :size="'mini'"
+                class="fr"
+                style="margin: 8px 0 0 0"
+              >
+                <el-button
+                  class="fr"
+                  v-if="index !== 0"
+                  type="primary"
+                  :size="'mini'"
+                  icon="el-icon-arrow-left"
+                  @click="index--"
+                  >上一个</el-button
+                >
+                <el-button
+                  type="primary"
+                  class="fr"
+                  v-if="index + 1 !== allList.length"
+                  @click="next()"
+                  :size="'mini'"
+                  >下一个<i
+                    class="el-icon-arrow-right el-icon--right"
+                    :size="'mini'"
+                  ></i
+                ></el-button>
+                <el-button
+                  type="primary"
+                  class="fr"
+                  @click="next()"
+                  v-if="index + 1 === allList.length"
+                  :size="'mini'"
+                  >提交<i class="el-icon-upload el-icon--right"></i>
+                </el-button>
+              </el-button-group>
+            </div>
+            <div class="project-backGoodShow-ask-table">
+              <template v-if="allList[index].ladder">
+                <el-table
+                  :data="allList[index].ladder"
+                  :size="'mini'"
+                  border
+                  stripe
+                  style="width: 100%"
+                >
+                  <el-table-column
+                    prop="good_type"
+                    label="商品类型"
+                    width="80px"
+                  >
+                    <template slot-scope="scope">
+                      <el-tag
+                        :size="'mini'"
+                        v-text="
+                          (
+                            statusOptions.find(
+                              (items) => items.value == scope.row.good_type
+                            ) || {}
+                          ).label || '--'
+                        "
+                      ></el-tag
+                    ></template>
+                  </el-table-column>
+                  <el-table-column
+                    prop="budget_price"
+                    label="预算单价"
+                    width="110"
+                  />
+                  <el-table-column prop="num" label="购买数量" width="110" />
+                  <el-table-column prop="cat_name" label="商品分类" />
+                  <el-table-column prop="good_img" label="图片" width="50">
+                    <template slot-scope="scope">
+                      <div
+                        v-if="scope.row.good_img"
+                        style="width: 20px; height: 20px"
+                        class="hover"
+                        v-viewer
+                      >
+                        <img
+                          :src="scope.row.good_img"
+                          style="
+                            display: inline-block;
+                            width: 100%;
+                            height: 100%;
+                          "
+                          alt=""
+                        />
+                      </div>
+                    </template>
+                  </el-table-column>
+                  <el-table-column prop="good_name" label="商品名称" />
+                </el-table>
+              </template>
+            </div>
+            <div class="project-backGoodShow-title">商品反馈情况</div>
+            <div class="project-backGoodShow-backGood-table">
+              <template v-if="allList[index].tableData">
+                <!-- allList[index].pageInfo.curr = 1;
+                searchList(index); 
+                
+              -->
+                <ex-table
+                  v-loading="allList[index].loading"
+                  :table="table"
+                  :data="allList[index].tableData"
+                  :columns="columns"
+                  :page="allList[index].pageInfo"
+                  :size="'mini'"
+                  @page-curr-change="handlePageChange($event, index)"
+                  @page-size-change="handleSizeChange($event, index)"
+                  @screen-reset="
+                    allList[index].pageInfo.curr = 1;
+                    searchList(index);
+                  "
+                  @screen-submit="
+                    allList[index].pageInfo.curr = 1;
+                    searchList(index);
+                  "
+                  @selection="selection_change"
+                >
+                </ex-table>
+              </template>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="bottom">
+      <div class="table-main clear">
+        <div class="table-main-index" style="padding-top: 40px">
+          已选中的商品
+        </div>
+        <div class="table-main-last">
+          <el-table
+            :data="tableData"
+            border
+            max-height="170px"
+            :size="'mini'"
+            style="width: 100%"
+          >
+            <el-table-column label="商品要求" type="index" width="80">
+            </el-table-column>
+            <el-table-column property="date" label="商品名称" width="145" />
+            <el-table-column property="name" label="图片" width="120">
+            </el-table-column>
+            <el-table-column
+              prope="address"
+              label="分类"
+              show-overflow-tooltip
+            />
+            <el-table-column
+              prope="address"
+              label="购买数量"
+              show-overflow-tooltip
+            />
+            <el-table-column
+              prope="address"
+              label="预算单价"
+              show-overflow-tooltip
+            />
+            <el-table-column
+              prope="address"
+              label="预算单价"
+              show-overflow-tooltip
+            />
+          </el-table>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+import asyncRequest from "@/apis/service/good-share";
+import resToken from "@/mixins/resToken";
+import columnsForm from "./columnsForm";
+export default {
+  name: "changeBackGood",
+  props: ["showModel", "sitem", "id", "type", "newTime"],
+  mixins: [resToken],
+  watch: {
+    // showModel: function (val) {
+    //   this.showModelThis = val;
+    //   if (val) {
+    //     this.initForm();
+    //   }
+    // },
+    // showModelThis(val) {
+    //   if (!val) {
+    //     this.$emit("cancel");
+    //   }
+    // },
+  },
+  data() {
+    return {
+      loading: false,
+      allList: [],
+      index: 0,
+      projectNo: "",
+      statusOptions: [
+        { value: "1", label: "竞品" },
+        { value: "2", label: "竞聘" },
+      ],
+      table: {
+        stripe: true,
+        border: true,
+        // _defaultHeader_: ["setcol"],
+      },
+      // 表格 - 列参数
+      columns: columnsForm,
+      tableData: [],
+    };
+  },
+  mounted() {
+    this.initForm();
+  },
+  methods: {
+    tableChange(e) {
+      console.log(e);
+      const { list } = e;
+      this.tableData = JSON.parse(JSON.stringify(list));
+    },
+    //初始化整个组件
+    async initForm() {
+      this.loading = true;
+      this.tableData = [];
+      await this.initListData();
+      this.loading = false;
+      // console.log(this.allList);
+      await this.searchList(this.index);
+    },
+    next() {
+      const { selection } = this.allList[this.index];
+      if (selection.length === 0) {
+        this.$message.warning("至少选择一个商品!");
+        return;
+      }
+      if (this.index + 1 !== this.allList.length) {
+        this.index++;
+      } else {
+      }
+    },
+    selection_change(e) {
+      const { list } = e;
+      this.allList[this.index].selection = JSON.parse(JSON.stringify(list));
+      let change_all_list = [];
+      this.allList.forEach((a, ai) => {
+        const { selection } = a;
+        if (selection && selection.length > 0) {
+          selection.forEach((b) => {
+            let item = JSON.parse(JSON.stringify(b));
+            item.noIndex = ai + 1;
+            change_all_list.push(item);
+          });
+        }
+      });
+      this.$emit("tableChange", { list: change_all_list });
+    },
+
+    //初始化整个组件
+    async initListData() {
+      // console.log(this.sitem);
+      this.allList = [];
+      const { projectNo, ladder } = this.sitem;
+      this.projectNo = projectNo;
+      if (ladder && ladder.length > 0) {
+        ladder.forEach((e) => {
+          let item = JSON.parse(JSON.stringify(e));
+          // console.log(item);
+          let model = {
+            ladder: [item],
+            pageInfo: {
+              size: 15,
+              curr: 1,
+              total: 0,
+            },
+            loading: true,
+            selection: [],
+            tableData: [],
+          };
+          this.allList.push(model);
+        });
+      }
+    },
+    async allSearchList() {
+      if (this.allList && this.allList.length > 0) {
+        this.allList.forEach(async (e, i) => {
+          await this.searchList(i);
+        });
+      }
+    },
+    //页数选择
+    async handlePageChange(e, index) {
+      this.allList[index].pageInfo.curr = e;
+      await this.searchList(index);
+    },
+    //页面条数选择
+    async handleSizeChange(e, index) {
+      this.allList[index].pageInfo.curr = 1;
+      this.allList[index].pageInfo.size = e;
+      await this.searchList(index);
+    },
+    async searchList(index) {
+      const { pageInfo } = this.allList[index];
+      const { size, curr } = pageInfo;
+      this.allList[index].loading = true;
+      let model = {
+        page: curr,
+        size: size,
+        zxNo: "",
+        infoNo: "",
+        bidNo: "",
+        projectNo: this.projectNo,
+      };
+      const { code, data } = await asyncRequest.back_good_list(model);
+      if (code === 0) {
+        const { list, count } = data;
+        this.allList[index].tableData = [{ num: 1 }];
+        // list;
+        //  this.allList[index].tableData.map((v) => {
+        //     v.class_cat = "";
+        //     if (v.can && v.can.length > 0) {
+        //       v.can.forEach((x, i) => {
+        //         v.class_cat += i === 0 ? x.name : "/" + x.name;
+        //       });
+        //     }
+        //     return v;
+        //   });
+        this.allList[index].pageInfo.total = Number(count);
+      } else if (code >= 100 && code <= 104) {
+        await this.logout();
+      } else {
+        this.allList[index].tableData = [];
+        this.allList[index].pageInfo.total = 0;
+      }
+      this.allList[index].loading = false;
+    },
+  },
+};
+</script>
+
+   <style lang="scss" scoped>
+.choice-goods{
+  position: relative;
+  width: 100%;
+  height: 100%;
+  overflow: hidden;
+  box-sizing: border-box;
+  overflow: hidden;
+}
+</style>

+ 7 - 53
src/views/good-share/index.vue

@@ -25,67 +25,25 @@
       </ul>
     </div>
     <div class="right">
-      <back-good-show
+      <change-back-good
         v-if="newTime !== ''"
         :newTime="newTime"
         :sitem="sitem"
         @tableChange="tableChange"
       />
     </div>
-    <div class="bottom">
-      <div class="table-main clear">
-        <div class="table-main-index" style="padding-top: 40px">
-          已选中的商品
-        </div>
-        <div class="table-main-last">
-          <el-table
-            :data="tableData"
-            border
-            max-height="170px"
-            :size="'mini'"
-            style="width: 100%"
-          >
-            <el-table-column label="商品要求" type="index" width="80">
-            </el-table-column>
-            <el-table-column property="date" label="商品名称" width="145" />
-            <el-table-column property="name" label="图片" width="120">
-            </el-table-column>
-            <el-table-column
-              prope="address"
-              label="分类"
-              show-overflow-tooltip
-            />
-            <el-table-column
-              prope="address"
-              label="购买数量"
-              show-overflow-tooltip
-            />
-            <el-table-column
-              prope="address"
-              label="预算单价"
-              show-overflow-tooltip
-            />
-             <el-table-column
-              prope="address"
-              label="预算单价"
-              show-overflow-tooltip
-            />
-          </el-table>
-        </div>
-      </div>
-    </div>
   </div>
 </template>
 
 <script>
 import asyncRequest from "@/apis/service/good-share";
 import resToken from "@/mixins/resToken";
-import backGoodShow from "./components/backGoodShow";
+import changeBackGood from "./components/changeBackGood";
 export default {
   name: "goodShare",
   mixins: [resToken],
   components: {
-    backGoodShow,
+    changeBackGood,
   },
   data() {
     return {
@@ -125,11 +83,7 @@ export default {
     getNewTime() {
       this.newTime = new Date().valueOf();
     },
-    tableChange(e) {
-      console.log(e)
-      const { list } = e;
-      this.tableData = JSON.parse(JSON.stringify(list));
-    },
+  
   },
 };
 </script>
@@ -187,10 +141,10 @@ export default {
     top: 16px;
     right: 16px;
     z-index: 1;
-    background: #fff;
+    // background: #fff;
     width: calc(100% - 288px);
-    min-height: calc(100% - 288px);
-    height: calc(100% - 248px);
+    min-height: 100%;
+    height: 100%;
     box-sizing: border-box;
     // padding: 16px;