暂存

src/apis/service/good-share/index.js

@@ -20,5 +20,7 @@ export default {
   // 毛利率修改
   rateEdit: (data, params) => http(api + "projectrate", data, "post", params),
   // 项目返回商品分页查询
-  back_good_list: (data, params) => http(api + "consultbidlist", data, "post", params),
+  back_good_list: (data, params) => http(api + "projectfeedlist", data, "post", params),
+  // 反馈商品选择
+  back_good_submit: (data, params) => http(api + "projectfeeddheck", data, "post", params),
 };

src/apis/service/purchaseIn/workbench/index.js

@@ -19,7 +19,7 @@ export default {
   // 反馈商品编辑
   good_update: (data, params) => http(api + "consultfeededit", data, "post", params),
   // 反馈商品列表
-  good_list: (data, params) => http(api + "consultfeedlist", data, "post", params),
+  good_list: (data, params) => http(api + "consultbidlist", data, "post", params),
   // 更新
   update: (data, params) => http(api + "customaredit", data, "post", params),
   // 新建

src/layout/components/AppMain.vue

@@ -10,30 +10,39 @@
 
 <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>
+// @import "~@/styles/mixin.scss";
+// @import "~@/styles/sidebar.scss";
+@import "~@/styles/variables.scss";
+@import "~@/styles/mixin.scss";
+@import "~@/styles/transition.scss";
+@import "~@/styles/element-ui.scss";
+@import "~@/styles/sidebar.scss";
+@import "~@/styles/btn.scss";
 .app-main {
   /* 50= navbar  50  */
-  min-height:100%; 
+  min-height: 100%;
   //calc(100vh - 50px);
   width: 100%;
   height: 100%;
   position: relative;
-  overflow: hidden;
+  overflow: scroll;
+  @include scrollBar();
 }
 
-.fixed-header+.app-main {
+.fixed-header + .app-main {
   padding-top: 50px;
 }
 

src/styles/index.scss

@@ -6,6 +6,7 @@
 @import "./btn.scss";
 .pagePadding{
   padding: 8px 20px 20px 20px;
+
 }
 
 body {

src/views/good-share/components/backGoodShow.vue

@@ -88,10 +88,6 @@
         <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"
@@ -170,18 +166,30 @@ export default {
       // console.log(this.allList);
       await this.searchList(this.index);
     },
-    next(){
-      const{selection}=this.allList[this.index]
-      if(selection.length===0){
+    async next() {
+      const { selection } = this.allList[this.index];
+      if (selection.length === 0) {
         this.$message.warning("至少选择一个商品！");
-        return
+        return;
       }
-      if(this.index+1!==this.allList.length){
-        this.index++
-      }else{
-        
+      if (this.index + 1 !== this.allList.length) {
+        this.index++;
+        await this.searchList(this.index);
+      } else {
+        await this.$confirm("确定要提交？", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+          .then(async () => {
+            this.$emit("selectEnd");
+          })
+          .catch(() => {
+            console.log("取消");
+          });
       }
     },
+
     selection_change(e) {
       const { list } = e;
       this.allList[this.index].selection = JSON.parse(JSON.stringify(list));
@@ -257,17 +265,7 @@ export default {
       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].tableData = list;
         this.allList[index].pageInfo.total = Number(count);
       } else if (code >= 100 && code <= 104) {
         await this.logout();

src/views/good-share/components/columnsForm.js

@@ -3,12 +3,7 @@ export default [
     {
         prop: "spuCode",
         label: "商品编号",
-        width: '110px'
-    },
-    {
-        prop: "sale_price",
-        label: "销售单价",
-        width: '110px'
+        width: '170px'
     },
     {
         prop: "good_img",
@@ -25,20 +20,10 @@ export default [
     },
     {
         prop: "model",
-        label: "型号",
-        width: '70px'
-    },
-    {
-        prop: "color",
-        label: "颜色",
-        width: '70px'
-    },
-    {
-        prop: "material",
-        label: "材质",
-        width: '70px'
+        label: "规格",
+        _slot_: "model",
+        'min-width': '110px'
     },
-
     {
         prop: "expiry_day",
         label: "信息有效期",
@@ -54,11 +39,6 @@ export default [
         label: "物流时间",
         width: '70px'
     },
-
-    // {
-    //     prop: "weight",
-    //     label: "商品重量",
-    // },
     {
         prop: "salesman",
         label: "申请人",

src/views/good-share/index.vue

@@ -65,7 +65,7 @@
               label="预算单价"
               show-overflow-tooltip
             />
-             <el-table-column
+            <el-table-column
               prope="address"
               label="预算单价"
               show-overflow-tooltip
@@ -94,7 +94,7 @@ export default {
       status: "",
       radio: "",
       sitem: {},
-      queryId: "PROv1b1220301161345",
+      queryId: "PROa8gi220310202256",
       multipleSelection: [],
       tableData: [],
       newTime: "",
@@ -126,10 +126,38 @@ export default {
       this.newTime = new Date().valueOf();
     },
     tableChange(e) {
-      console.log(e)
+      console.log(e);
       const { list } = e;
       this.tableData = JSON.parse(JSON.stringify(list));
     },
+    async submitForm() {
+      this.loading = true;
+
+      let list = JSON.parse(JSON.stringify(this.tableData));
+      let model = {
+        feedid: [],
+      };
+      list.forEach((a) => {
+        model.feedid.push(a.id);
+      });
+
+      let { code, data, message } = await asyncRequest.back_good_submit(model);
+      console.log(res);
+      this.loading = false;
+      if (code === 0) {
+        this.$notify.success({
+          title: "提交成功！",
+          message: "",
+        });
+        this.showModelThis = false;
+        // 刷新
+        this.$emit("refresh");
+      } else if (code >= 100 && code <= 104) {
+        await this.logout();
+      } else {
+        this.$message.warning(message);
+      }
+    },
   },
 };
 </script>

src/views/purchaseIn/workbench/detail.vue

@@ -42,12 +42,12 @@
               <li>{{ sitem.can_name }}</li>
               <li>商品品牌：</li>
               <li>{{ sitem.brand ? sitem.brand : "无要求" }}</li>
-              <li>型号：</li>
+              <!-- <li>商品规格：</li>
               <li>{{ sitem.model }}</li>
               <li>颜色：</li>
               <li>{{ sitem.color }}</li>
               <li>材质：</li>
-              <li>{{ sitem.material }}</li>
+              <li>{{ sitem.material }}</li> -->
               <li>重量：</li>
               <li>{{ sitem.total_weight }}g</li>
               <li>是否多地：</li>
@@ -68,7 +68,7 @@
               <li v-if="sitem.is_metal">
                 {{ sitem.other_config }}
               </li>
-              <li v-if="sitem.is_metal">贵金属种类：</li>
+              <li v-if="sitem.is_metal">金属种类：</li>
               <li v-if="sitem.is_metal">
                 {{ sitem.metal_id }}
               </li>
@@ -261,6 +261,8 @@ export default {
       editId: "add",
       editType: "wait",
       parmValue: {
+        page:1,
+        size:100,
         zxNo: "",
         infoNo: "",
         bidNo: "",