暂存

src/layout/components/AppMain.vue

@@ -25,8 +25,10 @@ export default {
 <style lang="scss" scoped>
 .app-main {
   /* 50= navbar  50  */
-  min-height: calc(100vh - 50px);
+  min-height:100%; 
+  //calc(100vh - 50px);
   width: 100%;
+  height: 100%;
   position: relative;
   overflow: hidden;
 }

src/styles/sidebar.scss

@@ -1,6 +1,7 @@
 #app {
   .main-container {
-    min-height: 100%;
+    // min-height: 100%;
+    height: 100%;
     transition: margin-left 0.28s;
     margin-left: $sideBarWidth;
     position: relative;

src/views/biddingWorkbench/workbench/components/taskItem.vue

@@ -0,0 +1,288 @@
+<template>
+ <div class="task-item">
+
+ </div>
+</template>
+   <script>
+export default {
+  name: "taskItem",
+  data() {
+    return {
+      
+    };
+  },
+  mounted() {
+    this.initForm();
+  },
+  methods: {
+    async initForm() {
+      this.loading = true;
+      this.resetFormData();
+      this.rulesThis = this.rules;
+      await this.resetForm();
+      this.loading = false;
+    },
+    handleClick(row) {
+      console.log(row);
+    },
+    openEdit(type, sitem) {
+      this.sitem = sitem;
+      this.modelId = type;
+      this.showModel = true;
+    },
+    async initData() {
+      this.loading = true;
+      const { code, data, message } = await asyncRequest.detail({
+        id: this.id,
+      });
+      this.loading = false;
+      if (code === 0) {
+        await this.resetForm(data);
+      } else if (code >= 100 && code <= 104) {
+        await this.logout();
+      } else {
+        this.$message.warning(message);
+      }
+    },
+    async resetForm() {
+      // 重置
+      await this.$nextTick(async () => {
+        if (this.$refs.ruleForm) {
+          this.$refs.ruleForm.resetFields();
+          this.$refs.ruleForm.clearValidate();
+          this.resetFormData();
+        }
+      });
+    },
+    resetFormData() {
+      this.ruleForm = {
+        a1: "",
+        a2: [],
+        a3: "",
+        a4: "",
+        a5: "",
+        a6: [],
+        a7: "",
+        a8: "",
+        b1: "2018春秋新款V领修身丝绒西装女 双排扣复古极简中长款工装外套",
+        b2: "",
+        b3: "",
+        b4: "",
+        b5: "",
+        b6: "",
+        b7: "",
+        b8: "",
+        b9: "",
+        bb1: "",
+      };
+    },
+    refreshEdit(e) {
+      console.log(e);
+    },
+    //商品分类选择
+    goods_class_change(e) {
+      this.ruleForm.a1 = e;
+      this.$refs.ruleForm.validateField("a1");
+    },
+    //商品品牌选择
+    a2searchChange(e) {
+      const { id, code, label } = e;
+      if (id) {
+        this.ruleForm.a2 = [id];
+      } else {
+        this.ruleForm.a2 = [];
+      }
+      this.$refs.ruleForm.validateField("a2");
+    },
+    //供应商选择
+    a6searchChange(e) {
+      const { id, code, label } = e;
+      if (id) {
+        this.ruleForm.a6 = [code];
+      } else {
+        this.ruleForm.a6 = [];
+      }
+      this.$refs.ruleForm.validateField("a6");
+    },
+    //税点选择
+    a8searchChange(e) {
+      // console.log(e);
+      const { id, code, label } = e;
+      if (id) {
+        this.ruleForm.a8 = label;
+      } else {
+        this.ruleForm.a8 = "";
+      }
+      this.$refs.ruleForm.validateField("a8");
+    },
+    //单位选择
+    b2searchChange(e) {
+      const { id, code, label } = e;
+      if (id) {
+        this.ruleForm.b2 = [code];
+      } else {
+        this.ruleForm.b2 = [];
+      }
+      this.$refs.ruleForm.validateField("b2");
+    },
+    //贵金属种类选择
+    b4searchChange(e) {
+      const { id, code, label } = e;
+      if (id) {
+        this.ruleForm.b4 = code;
+      } else {
+        this.ruleForm.b4 = "";
+      }
+      this.$refs.ruleForm.validateField("b4");
+    },
+    //税点选择
+    b4searchChange(e) {
+      const { id, code, label } = e;
+      if (id) {
+        this.ruleForm.b4 = code;
+      } else {
+        this.ruleForm.b4 = "";
+      }
+      this.$refs.ruleForm.validateField("b4");
+    },
+    async submitForm() {
+      await this.$refs.ruleForm.validate(async (valid) => {
+        if (valid) {
+          let change = false;
+          this.mock.forEach((v1) => {
+            if (v1.change && v1.change.length > 0) {
+              change = true;
+            }
+          });
+          if (!change) {
+            this.ruleForm.spec = "规格！";
+            return;
+          } else {
+            this.ruleForm.spec = "";
+            let table = false;
+            let hasnot = false;
+            let stock = [];
+            this.right.specList.forEach((v1) => {
+              if (v1) {
+                v1.forEach((v2) => {
+                  if (v2 && v2.limit && v2.limit.length > 0) {
+                    let list = [];
+                    v2.limit.forEach((v3) => {
+                      if (v3.num != 0 && v3.price != 0) {
+                        table = true;
+                        list.push(v3);
+                      }
+                      if (
+                        (v3.num != 0 && v3.price == 0) ||
+                        (v3.num == 0 && v3.price !== 0)
+                      ) {
+                        hasnot = true;
+                      }
+                    });
+                    if (list.length > 0) {
+                      let model = Object.assign({}, v2);
+                      model.limit = list;
+                      stock.push(model);
+                    }
+                  }
+                });
+              }
+            });
+
+            if (hasnot) {
+              this.ruleForm.table =
+                "起订量与成本价需成对填写，未成对请设为零！";
+            } else {
+              if (!table) {
+                this.ruleForm.table = "至少填写一堆起订量与成本价！";
+              } else {
+                this.ruleForm.table = "";
+                this.loading = true;
+                let obj = JSON.parse(JSON.stringify(this.ruleForm));
+                obj.stock = stock;
+                obj.a1 = obj.a1[obj.a1.length - 1];
+                obj.image = obj.image.join();
+                //split(",");
+                console.log(obj);
+                let res = {};
+                if (this.id === "add") {
+                  delete obj["id"];
+                  res = await asyncRequest.add(obj);
+                } else {
+                  res = await asyncRequest.update(obj);
+                }
+                this.loading = false;
+                if (res.code === 0) {
+                  let title = this.id === "add" ? "添加成功" : "修改成功";
+                  this.$notify.success({
+                    title,
+                    message: "",
+                  });
+                  // 刷新
+                  this.$emit("refresh");
+                }
+              }
+            }
+          }
+        } else {
+          console.log("error submit!!");
+          return false;
+        }
+      });
+    },
+
+    doExchange(arr) {
+      let len = arr.length;
+      // 当数组大于等于2个的时候
+      if (len >= 2) {
+        // 第一个数组的长度
+        let len1 = arr[0].length;
+        // 第二个数组的长度
+        let len2 = arr[1].length;
+        // 2个数组产生的组合数
+        let lenBoth = len1 * len2;
+        //  申明一个新数组
+        let items = new Array(lenBoth);
+        // 申明新数组的索引
+        let index = 0;
+        for (let i = 0; i < len1; i++) {
+          for (let j = 0; j < len2; j++) {
+            if (arr[0][i] instanceof Array) {
+              items[index] = arr[0][i].concat(arr[1][j]);
+            } else {
+              items[index] = [arr[0][i]].concat(arr[1][j]);
+            }
+            index++;
+          }
+        }
+        let newArr = new Array(len - 1);
+        for (let i = 2; i < arr.length; i++) {
+          newArr[i - 1] = arr[i];
+        }
+        newArr[0] = items;
+        return this.doExchange(newArr);
+      } else {
+        return arr[0];
+      }
+    },
+  },
+  watch: {},
+};
+</script>
+   <style lang="scss" scoped>
+.activeAdd {
+  .activeAdd-title {
+    border-top: 1px solid #ebeef5;
+    span {
+      height: 50px;
+      line-height: 50px;
+      font-family: "微软雅黑", sans-serif;
+      font-weight: 400;
+      font-style: normal;
+      font-size: 16fpx;
+      text-align: left;
+    }
+  }
+}
+</style>
+   

src/views/biddingWorkbench/workbench/detail.vue

@@ -323,7 +323,7 @@
 </template>
    <script>
 import mixinPage from "@/mixins/elPaginationHandle";
-import asyncRequest from "@/apis/service/BiddingWorkbench/workbench";
+import asyncRequest from "@/apis/service/biddingWorkbench/workbench";
 import ladderPrice from "./ladderPrice";
 // import PeriodDatePicker from "@/components/PeriodDatePicker";
 import statusList from "@/assets/js/statusList";

src/views/biddingWorkbench/workbench/index.vue

@@ -1,213 +1,33 @@
 <template>
   <div class="workbench pagePadding">
-    <ex-table
+    <div
+      class="workbench-main"
       v-loading="loading"
       v-if="powers && powers.length > 0 && powers.some((item) => item == '001')"
-      :table="table"
-      :data="tableData"
-      :columns="columns"
-      :page="pageInfo"
-      :size="size"
-      @page-curr-change="handlePageChange"
-      @page-size-change="handleSizeChange"
-      @screen-reset="
-        pageInfo.curr = 1;
-        parmValue.page = 1;
-        searchList();
-      "
-      @screen-submit="
-        pageInfo.curr = 1;
-        parmValue.page = 1;
-        searchList();
-      "
     >
-      <template #table-header="{}">
-        <div style="width: 100%">
-          <el-row style="padding: 0 0 10px 80px">
-            <el-col :span="6" style="width: 303px">
-              <period-date-picker
-                :type="1"
-                :width="'135px'"
-                :size="searchSize"
-                :start="parmValue.starttime"
-                :end="parmValue.endtime"
-                @timeReturned="handleTime"
-              />
-            </el-col>
-            <el-col :span="6" style="width: 250px; padding: 0 0 0 10px"> 所属平台 platform_code</el-col>
-            <el-col :span="4" style="width: 160px">
-              <el-select
-                v-model="parmValue.status"
-                filterable
-                clearable
-                :size="searchSize"
-                placeholder="活动状态"
-                style="width: 100%"
-                @change="
-                  pageInfo.curr = 1;
-                  parmValue.page = 1;
-                  searchList();
-                "
-              >
-                <el-option
-                  v-for="item in statusList"
-                  :key="'status' + item.code"
-                  :label="item.name"
-                  :value="item.code"
-                />
-              </el-select>
-            </el-col>
-
-            <el-col
-              :span="3"
-              class="fr"
-              style="width: 66px; padding: 0 0 0 10px"
-            >
-              <el-button type="primary" :size="searchSize" @click="searchList">
-                刷新
-              </el-button>
-            </el-col>
-            <el-col
-              :span="3"
-              class="fr"
-              style="width: 66px; padding: 0 0 0 10px"
-            >
-              <el-button type="warning" :size="searchSize" @click="restSearch">
-                重置
-              </el-button>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="4" style="width: 373px">
-              <el-input
-                :size="searchSize"
-                v-model="parmValue.BiddingWorkbench_name"
-                :maxlength="40"
-                @blur="
-                  pageInfo.curr = 1;
-                  parmValue.page = 1;
-                  searchList();
-                "
-                placeholder="活动名称"
-              ></el-input>
-            </el-col>
-            <el-col :span="6" style="width: 250px; padding: 0 0 0 10px">
-              <el-input
-                :size="searchSize"
-                v-model="parmValue.BiddingWorkbench_code"
-                :maxlength="40"
-                @blur="
-                  pageInfo.curr = 1;
-                  parmValue.page = 1;
-                  searchList();
-                "
-                placeholder="活动编号"
-              ></el-input>
-            </el-col>
-            <el-col :span="4" style="width: 170px; padding: 0 0 0 10px">
-              <el-input
-                :size="searchSize"
-                v-model="parmValue.creater"
-                :maxlength="40"
-                @change="
-                  pageInfo.curr = 1;
-                  parmValue.page = 1;
-                  searchList();
-                "
-                placeholder="创建人"
-              ></el-input>
-            </el-col>
-            <el-col
-              :span="3"
-              class="fr"
-              style="width: 66px; padding: 0 0 0 10px"
-              v-if="powers.some((item) => item == '003')"
-            >
-              <el-button
-                :size="searchSize"
-                type="success"
-                style="float: right"
-                @click="routeGoto('workbenchAdd', {})"
-              >
-                添加
-              </el-button>
-            </el-col>
-          </el-row>
-        </div></template
-      >
-      <template #status="{ scope }">
-        <el-tag
-          :size="tablebtnSize"
-          :type="scope.row.status == '1' ? 'warning' : ''"
-          v-text="
-            (statusOptions.find((item) => item.id == scope.row.status) || {})
-              .label || '--'
-          "
-        ></el-tag>
-      </template>
-
-      <template #operation="{ scope }">
-        <el-tooltip
-          v-if="powers.some((item) => item == '007')"
-          effect="dark"
-          content="详情"
-          placement="top"
-        >
-          <i
-            class="el-icon-view tb-icon"
-            @click="openModal(scope.row, '007')"
-          ></i>
-        </el-tooltip>
-        <el-tooltip
-          v-if="powers.some((item) => item == '005')"
-          effect="dark"
-          content="修改"
-          placement="top"
-        >
-          <i
-            class="el-icon-edit tb-icon"
-            @click="openModal(scope.row, '005')"
-          ></i>
-        </el-tooltip>
-        <el-tooltip
-          v-if="
-            powers.some((item) => item == '004') && scope.row.status === '0'
-          "
-          effect="dark"
-          content="禁用"
-          placement="top"
-        >
-          <i
-            class="el-icon-video-pause tb-icon"
-            @click="changeStatus(scope.row.id, scope.row.status)"
-          ></i>
-        </el-tooltip>
-        <el-tooltip
-          v-if="
-            powers.some((item) => item == '004') && scope.row.status === '1'
-          "
-          effect="dark"
-          content="启用"
-          placement="top"
-        >
-          <i
-            class="el-icon-video-play tb-icon"
-            @click="changeStatus(scope.row.id, scope.row.status)"
-          ></i>
-        </el-tooltip>
-        <el-tooltip
-          v-if="powers.some((item) => item == '006')"
-          effect="dark"
-          content="删除"
-          placement="top"
-        >
-          <i
-            class="el-icon-delete tb-icon"
-            @click="deleteItem(scope.row.id)"
-          ></i>
-        </el-tooltip>
-      </template>
-    </ex-table>
+      <ul class="clear">
+        <li>
+          <div class="taskTitle color1">项目单任务</div>
+          <div class="taskList">111</div>
+        </li>
+        <li>
+          <div class="taskTitle color2">咨询单任务</div>
+          <div class="taskList">111</div>
+        </li>
+        <li>
+          <div class="taskTitle color3">客户指定商品任务</div>
+          <div class="taskList">
+            <div class="no-data">暂无数据！</div>
+          </div>
+        </li>
+        <li>
+          <div class="taskTitle color4">服务</div>
+          <div class="taskList">
+            <div class="no-data">暂无数据！</div>
+          </div>
+        </li>
+      </ul>
+    </div>
     <no-auth v-else></no-auth>
     <!-- 弹窗 新增/修改 -->
     <add-edit
@@ -220,7 +40,7 @@
   </div>
 </template>
 <script>
-import asyncRequest from "@/apis/service/BiddingWorkbench/workbench";
+import asyncRequest from "@/apis/service/biddingWorkbench/workbench";
 import statusList from "@/assets/js/statusList";
 import roleLevel from "@/assets/js/roleLevel";
 import mixinPage from "@/mixins/elPaginationHandle";
@@ -420,7 +240,7 @@ export default {
     // 刷新表格
     async searchList() {
       this.loading = true;
-      const res = await asyncRequest.list(this.parmValue);
+      const res = await asyncRequest.list1(this.parmValue);
       if (res && res.code === 0 && res.data) {
         this.tableData = res.data.list;
         this.pageInfo.total = Number(res.data.count);
@@ -437,4 +257,43 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.workbench {
+  position: relative;
+  width: 100%;
+  height: 100%;
+  .workbench-main {
+    position: relative;
+    width: 100%;
+    height: 100%;
+    ul {
+      width: 100%;
+      height: 100%;
+      li {
+        float: left;
+        width: 24%;
+        margin: 0 1% 0 0;
+        border: 1px solid rgba(121, 121, 121, 1);
+        .taskTitle {
+          width: 100%;
+          height: 55px;
+          line-height: 55px;
+          text-align: center;
+          border-bottom: 1px solid rgba(121, 121, 121, 1);
+          &.color1 {
+            background: rgba(250, 205, 145, 1);
+          }
+          &.color2 {
+            background: rgba(202, 249, 130, 1);
+          }
+          &.color3 {
+            background: rgba(129, 211, 248, 1);
+          }
+          &.color4 {
+            background: rgba(255, 255, 128, 1);
+          }
+        }
+      }
+    }
+  }
+}
 </style>

src/views/interest/action/index.vue

@@ -574,14 +574,16 @@ export default {
 </script>
 <style lang="scss" scoped>
 .action {
-  height: calc(100vh - 80px);
+  // height: calc(100vh - 80px);
+  height: 100%;
   position: relative;
   width: 100%;
   text-align: center;
   .action_show {
     position: relative;
     width: 100%;
-    height: calc(100vh - 122px);
+    height: 100%;
+    // height: calc(100vh - 122px);
     .rule-bottom {
       padding: 18px 16px 0 18%;
       background: #fff;