Merge branch 'sit'

src/apis/components/goods-class.js

@@ -2,6 +2,6 @@ import http from "@/apis/axios";
 const api = "admin/";
 export default {
   // 列表
-  list: (data, params) => http(api + "catlist", data, "post", params),
+  list: (data, params) => http(api + "cattitle", data, "post", params),
 };
    

src/apis/components/search-good-modal.js

@@ -2,7 +2,7 @@ import http from "@/apis/axios";
 const api = "admin/";
 export default {
   // 列表
-  list: (data, params) => http(api + "goodlist", data, "post", params),
+  list: (data, params) => http(api + "gooduplist", data, "post", params),
   // 供应商列表
   supplierList: (data, params) => http(api + "supplierlist", data, "post", params),
 

src/apis/components/search-good-online-modal.js

@@ -0,0 +1,9 @@
+import http from "@/apis/axios";
+const api = "admin/";
+export default {
+  // 列表
+  list: (data, params) => http(api + "gooduplist", data, "post", params),
+  // 供应商列表
+  supplierList: (data, params) => http(api + "supplierlist", data, "post", params),
+
+};

src/apis/components/search-terrace.js

@@ -2,6 +2,6 @@ import http from "@/apis/axios";
 const api = "admin/";
 export default {
   // 列表
-  list: (data, params) => http(api + "unitlist", data, "post", params),
+  list: (data, params) => http(api + "platformlist", data, "post", params),
 };
    

src/apis/service/goodStore/goodsCost/index.js

@@ -7,7 +7,7 @@ export default {
   // 删除
   delete: (data, params) => http(api + "gooddel", data, "post", params),
   // 分页查询
-  list: (data, params) => http(api + "goodlist", data, "post", params),
+  list: (data, params) => http(api + "gooduplist", data, "post", params),
   // 详情
   detail: (data, params) => http(api + "goodinfo", data, "post", params),
   // 更改

src/components/globalComponents/goodClass/main.vue

@@ -1,14 +1,15 @@
 <template>
   <div class="select-goodsClass">
     <el-cascader
-     v-loading="loading"
+      v-if="!loading"
+      :size="size || 'medium'"
       style="width: 100%"
-      :disabled="disabled"
+      filterable
+      clearable
       v-model="value"
-      :options="options"
       :placeholder="placeholder || ''"
-      :size="size || 'medium'"
       :props="props"
+      :disabled="disabled"
       @change="handleChange"
     ></el-cascader>
   </div>
@@ -37,13 +38,38 @@ export default {
   data() {
     return {
       loading: false,
-      options: [],
-      selectLoading: false,
       props: {
-        label: "cat_name",
-        value: "id",
-        children: "child",
-        checkStrictly: true
+        lazy: true, //开启远程加载
+        async lazyLoad(node, resolve) {
+          // console.log(node);
+          const { level, value, root, loading } = node;
+          let model = {
+            cat_name: "",
+            pid: "",
+            status: "",
+          };
+          let list = [];
+          if (level === 0) {
+            model.pid = "0";
+          } else {
+            model.pid = value;
+          }
+          const res = await asyncRequest.list(model);
+          const { code, data } = res;
+          if (code === 0) {
+            data.forEach((v1) => {
+              let province = {
+                value: v1.id,
+                label: v1.cat_name,
+                leaf: level >= 2,
+              };
+              list.push(province);
+            });
+            resolve(list);
+          } else {
+            resolve([]);
+          }
+        },
       },
     };
   },
@@ -59,7 +85,7 @@ export default {
   // },
   mounted() {
     this.options = [];
-    this.getInfo();
+    // this.getInfo();
     this.selectLoading = false;
   },
   methods: {
@@ -70,12 +96,7 @@ export default {
       if (e && e.length > 0) {
         let index = this.options.findIndex((v) => v.code === e[0]);
         if (index !== -1) {
-          let model = {
-            id: this.options[index].id,
-            code: this.options[index].code,
-            label: this.options[index].name,
-          };
-          this.$emit("searchChange", model);
+          this.$emit("searchChange", this.options[index]);
         } else {
           this.$emit("searchChange", {});
         }

src/components/globalComponents/search-metal-kind/main.vue

@@ -1,25 +1,24 @@
 <template>
+  <!-- multiple
+    filterable
+    remote
+    :multiple-limit="1" :remote-method="remoteMethod" -->
   <el-select
     v-model="value"
-    multiple
     filterable
-    remote
-    :multiple-limit="1"
     reserve-keyword
     :size="size || 'medium'"
     style="width: 100%"
     :placeholder="placeholder || ''"
     :disabled="disabled"
-    :remote-method="remoteMethod"
     :loading="selectLoading"
     @change="selectChange"
   >
     <el-option
       v-for="(item, index) in options"
-      :key="item.id + index"
-      :label="item.name"
-      :value="item.wsm_code"
-      :disabled="item.status === '0'"
+      :key="item.type + index + 'spec'"
+      :label="item.type_cn"
+      :value="item.type"
     >
     </el-option>
   </el-select>
@@ -58,11 +57,16 @@ export default {
       options: [],
       selectLoading: false,
       searchName: "",
-      formValue: {},
+      formValue: {
+        start: "",
+        end: "",
+        creater: "",
+        status: "",
+        type_cn: "",
+      },
     };
   },
-  // watch: {
-   
+  watch: {
     //  names: function (val, old) {
     //   // console.log(val, old);
     //   this.searchName = val;
@@ -70,48 +74,41 @@ export default {
     //     this.remoteMethod(this.searchName);
     //   }
     // },
-  // },
+  },
   mounted() {
     this.options = [];
     this.selectLoading = false;
+    this.remoteMethod();
   },
   methods: {
     async selectChange(e) {
-      if (e && e.length > 0) {
-        let index = this.options.findIndex((v) => v.wsm_code === e[0]);
-        if (index !== -1) {
-          let model = {
-            id: this.options[index].id,
-            code: this.options[index].type,
-            label: this.options[index].type_cn,
-          };
-          this.$emit("searchChange", model);
-        } else {
-          this.$emit("searchChange", {});
-        }
+      let index = this.options.findIndex((v) => v.type === e);
+      if (index !== -1) {
+        let model = {
+          id: this.options[index].type,
+          code: this.options[index].type,
+          label: this.options[index].type_cn,
+        };
+        this.$emit("searchChange", model);
       } else {
         this.$emit("searchChange", {});
       }
     },
-    async remoteMethod(query) {
+    //query
+    async remoteMethod() {
       this.selectLoading = true;
-      if (query !== "") {
-        this.options = [];
-        let res = {};
-      this.formValue.supplierNo = query;
-          res = await asyncRequest.list(this.formValue);
-
-        if (res && res.code === 0 && res.data) {
-            const { list } = res.data;
-            this.options = list;
-        } else if (res && res.code >= 100 && res.code <= 104) {
-          await this.logout();
-        } else {
-          this.$message.warning(res.message);
-        }
+      this.options = [];
+      const { code, data, message } = await asyncRequest.list(this.formValue);
+      if (code === 0) {
+        this.options = data;
+      } else if (code >= 100 && code <= 104) {
+        await this.logout();
       } else {
-        this.options = [];
+        this.$message.warning(message);
       }
+      // } else {
+      //   this.options = [];
+      // }
       this.selectLoading = false;
     },
   },

src/components/globalComponents/search-terrace/main.vue

@@ -19,7 +19,7 @@
       :key="item.id + index"
       :label="item.platform_name"
       :value="item.platform_code"
-      :disabled="item.status === '0'"
+      :disabled="item.status === '1'"
     >
     </el-option>
   </el-select>

src/components/globalComponents/search-unit/main.vue

@@ -17,8 +17,8 @@
     <el-option
       v-for="(item, index) in options"
       :key="item.id + index"
-      :label="item.name"
-      :value="item.wsm_code"
+      :label="item.unit"
+      :value="item.id"
       :disabled="item.status === '0'"
     >
     </el-option>

src/components/globalComponents/search-work-company/main.vue

@@ -11,10 +11,10 @@
   >
     <el-option
       v-for="(item, index) in options"
-      :key="item.rate + index + ''"
+      :key="item.companyNo + index + ''"
       :label="item.company"
-      :value="item.rate + '%'"
-      :disabled="item.status === '0'"
+      :value="item.companyNo"
+      :disabled="item.status === '1'"
     />
   </el-select>
 </template>
@@ -67,7 +67,7 @@ export default {
         let model = {
           id: this.options[index].rate,
           code: this.options[index].rate,
-          label: this.options[index].rate+"%",
+          label: this.options[index].rate + "%",
         };
         this.$emit("searchChange", model);
       } else {
@@ -78,7 +78,8 @@ export default {
       this.selectLoading = true;
       const { code, data, message } = await asyncRequest.list({});
       if (code === 0) {
-        this.options = data;
+        const { list } = data;
+        this.options = list || [];
       } else if (code >= 100 && code <= 104) {
         await this.logout();
       } else {

src/components/search-good-online-modal/columns.js

@@ -0,0 +1,84 @@
+export default [
+  { type: "selection", fixed: "left", _noset_: true },
+  {
+    prop: "good_code",
+    label: "商品编码",
+    width: "150",
+  },
+  {
+    prop: "good_name",
+    label: "商品名称",
+    "min-width": "120",
+  },
+
+  {
+    prop: "gys_code",
+    label: "供应商编码",
+    width: "142",
+  },
+  {
+    prop: "supplier_name",
+    label: "供货商",
+    "min-width": "160",
+  },
+  // {
+  //   prop: "cg_saler",
+  //   label: "采购员",
+  //   width: "60",
+  // },
+  // {
+  //   prop: "usable_stock",
+  //   label: "商品库存",
+  //   width: "70",
+  // },
+  {
+    prop: "unit",
+    label: "单位",
+    width: "45",
+  },
+  // {
+  //   prop: "bstatus",
+  //   label: "当前状态",
+  //   _slot_: "status",
+  //   width: "80px",
+  // },
+
+
+  // {
+  //   prop: "classArr",
+  //   label: "商品类别",
+  // },
+  {
+    prop: "color",
+    label: "商品颜色",
+    width: "70",
+  },
+  {
+    prop: "material",
+    label: "商品材质",
+    width: "70",
+  },
+  {
+    prop: "brand",
+    label: "品牌",
+    "width": "70",
+  },
+  // {
+  //   prop: "good_type",
+  //   label: "商品类型",
+  // },
+  // {后端有接口但是没有值。
+  //   prop: "specs",
+  //   label: "商品规格",
+  // },
+
+  // {
+  //   prop: "",
+  //   label: "操作",
+  //   width: "80px",
+  //   fixed: "right",
+  //   _noset_: true,
+  //   _slot_: "operation",
+  // },
+
+]

src/components/search-good-online-modal/index.js

@@ -0,0 +1,2 @@
+import Main from './main.vue'
+export default Main

src/components/search-good-online-modal/main.vue

@@ -0,0 +1,327 @@
+<template>
+  <el-dialog
+    :title="'选择已上线的商品'"
+    :center="true"
+    align="left"
+    top="8vh"
+    width="1040px"
+    @close="showModelThis = false"
+    :close-on-click-modal="false"
+    :visible.sync="showModelThis"
+    v-loading="loading"
+    element-loading-text="拼命加载中"
+    element-loading-spinner="el-icon-loading"
+    element-loading-background="rgba(0, 0, 0, 0.8)"
+    append-to-body
+  >
+    <el-card style="margin-top: -20px" class="modal-form-style">
+      <ex-table
+        v-loading="loading"
+        :table="table"
+        :data="tableData"
+        :columns="columns"
+        :page="pageInfo"
+        :size="'mini'"
+        @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="{ selection }">
+          <div style="width: 100%">
+            <el-row style="margin-top: -15px">
+              <el-col :span="24">
+                <el-col :span="4" style="width: 280px; padding: 0 0 0 0px">
+                  <el-input
+                    :size="'mini'"
+                    v-model="parmValue.good_code"
+                    :maxlength="40"
+                    clearable
+                    placeholder="商品分类"
+                  />
+                </el-col>
+                <el-col :span="4" style="width: 190px; padding: 0 0 0 10px">
+                  <el-input
+                    :size="'mini'"
+                    v-model="parmValue.good_code"
+                    :maxlength="40"
+                    clearable
+                    placeholder="所属平台"
+                  />
+                </el-col>
+                <el-col :span="4" style="width: 260px; padding: 0 0 0 10px">
+                  <el-input
+                    :size="'mini'"
+                    v-model="parmValue.good_code"
+                    :maxlength="40"
+                    clearable
+                    placeholder="商品编号"
+                  />
+                </el-col>
+
+                <el-col :span="3" class="fr" style="width: 66px">
+                  <el-button
+                    :size="'mini'"
+                    type="primary"
+                    style="float: right; margin-left: 5px"
+                    @click="searchList"
+                  >
+                    刷新
+                  </el-button>
+                </el-col>
+                <el-col :span="4" class="fr" style="width: 66px">
+                  <el-button
+                    type="warning"
+                    class="fr"
+                    :size="'mini'"
+                    @click="restSearch"
+                  >
+                    重置
+                  </el-button>
+                </el-col>
+              </el-col>
+              <el-col :span="24" style="padding: 10px 0 0 0">
+                <el-col :span="4" style="width: 280px; padding: 0">
+                  <el-select
+                    v-model="supplierCode"
+                    multiple
+                    filterable
+                    remote
+                    :multiple-limit="1"
+                    reserve-keyword
+                    :size="'mini'"
+                    clearable
+                    style="width: 100%"
+                    :placeholder="'供应商名称'"
+                    :remote-method="remoteMethod"
+                    :loading="selectLoading"
+                    @change="supplierChange"
+                  >
+                    <el-option
+                      v-for="(item, index) in options"
+                      :key="item.id + index"
+                      :label="item.name"
+                      :value="item.code + ''"
+                      :disabled="item.status !== '1'"
+                    >
+                    </el-option>
+                  </el-select>
+                </el-col>
+                <el-col :span="4" style="width: 190px; padding: 0 0 0 10px">
+                  <el-select v-model="parmValue.value"  :size="'mini'" placeholder="库存类型">
+                    <el-option
+                      v-for="item in options"
+                      :key="item.id"
+                      :label="item.name"
+                      :value="item.id"
+                    >
+                    </el-option>
+                  </el-select>
+                </el-col>
+                <el-col :span="4" style="width: 260px; padding: 0 0 0 10px">
+                  <el-input
+                    :size="'mini'"
+                    v-model="parmValue.good_name"
+                    :maxlength="40"
+                    clearable
+                    placeholder="商品名称"
+                  />
+                </el-col>
+
+                <el-col :span="3" style="width: 66px; float: right">
+                  <el-button
+                    :size="'mini'"
+                    type="success"
+                    style="float: right; margin-left: 5px"
+                    @click="resultList(selection)"
+                  >
+                    保存
+                  </el-button>
+                </el-col>
+              </el-col>
+            </el-row>
+          </div>
+        </template>
+      </ex-table>
+    </el-card>
+  </el-dialog>
+</template>
+
+<script>
+import asyncRequest from "@/apis/components/search-good-online-modal";
+import resToken from "@/mixins/resToken";
+import mixinPage from "@/mixins/elPaginationHandle";
+import { mapGetters } from "vuex";
+import columns from "./columns";
+export default {
+  name: "searchGoodOnlineModal",
+  mixins: [resToken, mixinPage],
+  computed: {
+    ...mapGetters(["tablebtnSize", "searchSize", "size"]),
+  },
+  props: ["showModel", "once"],
+
+  /**
+   * 属性集合
+   * @param {Boolean}       showModel             : 是否弹出弹窗        必填
+   * @param {Boolean}       once                  : 是否只选一条        非必填
+   */
+  /**
+   * 事件集合
+   * @searchChange             : 选中值变化调用   抛出选中数据
+   */
+  data() {
+    return {
+      options: [
+        { id: "0", name: "非库存品" },
+        { id: "1", name: "库存品" },
+      ],
+      selectLoading: false,
+      searchName: "",
+      supplierCode: [],
+      loading: true,
+      showModelThis: false,
+      parmValue: {
+        type_code: "", // 商品属性code
+        supplierNo: "", // 供应商code
+        good_code: "", // 商品编码
+        good_name: "", // 商品名称
+        wsmcode: "", //仓库code
+        page: 1, // 页码
+        size: 15, // 每页显示条数
+      },
+      tableData: [],
+      passwordModel: false,
+      passwordModelId: 0,
+      isPasswordDetail: false,
+      // 表格 - 数据
+      tableData: [],
+      // 表格 - 参数
+      table: {
+        stripe: true,
+        border: true,
+        // _defaultHeader_: ["setcol"],
+      },
+      // 表格 - 分页
+      pageInfo: {
+        size: 15,
+        curr: 1,
+        total: 0,
+      },
+      // 表格 - 列参数
+      columns: columns,
+    };
+  },
+  watch: {
+    showModel: function (val) {
+      this.showModelThis = val;
+      if (val) {
+        this.supplierCode = [];
+        this.searchList();
+      }
+    },
+    showModelThis(val) {
+      if (!val) {
+        this.$emit("cancel");
+      }
+    },
+  },
+
+  methods: {
+    supplierChange(e) {
+      if (e && e.length === 1) {
+        this.parmValue.supplierNo = e[0];
+      } else {
+        this.parmValue.supplierNo = "";
+      }
+      this.parmValue.page = 1;
+      this.searchList();
+    },
+    restSearch() {
+      this.supplierCode = [];
+      this.parmValue = {
+        type_code: "", // 商品属性code
+        supplierNo: "", // 供应商code
+        good_code: "", // 商品编码
+        good_name: "", // 商品名称
+        wsmcode: "", //仓库code
+        page: 1, // 页码
+        size: 15, // 每页显示条数
+      };
+      // 表格 - 分页
+      this.pageInfo = {
+        size: 15,
+        curr: 1,
+        total: 0,
+      };
+      this.searchList();
+    },
+    async searchList() {
+      this.loading = true;
+      const res = await asyncRequest.list(this.parmValue);
+      if (res && res.code === 0 && res.data) {
+        this.tableData = res.data.list;
+        // this.tableData.map((v) => {
+        //   // v.sale_price = this.setNum(v.sale_price);
+        //   // v.sale_fee = this.setNum(v.sale_fee);
+        //   // // v.num =
+        //   // //pa (v.sale_price);
+        //   return v;
+        // });
+        //
+        this.pageInfo.total = Number(res.data.count);
+      } else if (res && res.code >= 100 && res.code <= 104) {
+        await this.logout();
+      } else {
+        this.tableData = [];
+        this.pageInfo.total = 0;
+      }
+      this.loading = false;
+    },
+    async remoteMethod(query) {
+      this.selectLoading = true;
+      if (query !== "") {
+        this.options = [];
+        let formValue = {
+          page: 1,
+          size: 100,
+          name: query,
+          code: "",
+        };
+
+        let res = await asyncRequest.supplierList(formValue);
+        if (res && res.code === 0 && res.data) {
+          const { list } = res.data;
+          this.options = list;
+        } else if (res && res.code >= 100 && res.code <= 104) {
+          await this.logout();
+        } else {
+          this.$message.warning(res.message);
+        }
+      } else {
+        this.options = [];
+      }
+      this.selectLoading = false;
+    },
+    async resultList(selection) {
+      if (selection && selection.length > 1 && this.once) {
+        this.$message.warning("只能选择一条商品信息！");
+        return;
+      }
+      this.showModelThis = false;
+      this.$emit("resultList", selection);
+    },
+  },
+};
+</script>
+
+<style>
+</style>

src/views/goodStore/active/add.vue

@@ -3,13 +3,148 @@
     <div
       v-if="powers && powers.length > 0 && powers.some((item) => item == '007')"
     >
-      <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
-        <el-tab-pane label="基础/规格" name="1"> <base-form /></el-tab-pane>
-        <el-tab-pane label="包装/发货/图片" name="2">
-          <pack-form
-        /></el-tab-pane>
-        <el-tab-pane label="固定/阶梯成本" name="3"> <cost-form /></el-tab-pane>
-      </el-tabs>
+      <el-form
+        :model="ruleForm"
+        status-icon
+        :rules="rulesThis"
+        ref="ruleForm"
+        :size="'mini'"
+        label-width="110px"
+        class="demo-ruleForm"
+      >
+        <el-row>
+          <el-col :span="16">
+            <el-form-item label="活动标题" prop="activity_name">
+              <el-input
+                placeholder="活动标题"
+                v-model="ruleForm.activity_name"
+                maxlength="100"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="业务企业" prop="platform_code1">
+              <search-work-company
+                :value="ruleForm.platform_code1"
+                :disabled="false"
+                :size="'mini'"
+                :isDetail="false"
+                :placeholder="'业务企业'"
+                @searchChange="platform_codesearchChange"
+              />
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="16">
+            <el-form-item label="活动时间" required style="margin: 0">
+              <el-row>
+                <el-col :span="11">
+                  <el-form-item prop="datactivity_name">
+                    <el-date-picker
+                      type="datetime"
+                      placeholder="开始时间"
+                      v-model="ruleForm.activity_start"
+                      style="width: 100%"
+                    ></el-date-picker>
+                  </el-form-item>
+                </el-col>
+                <el-col class="tc" :span="2">-</el-col>
+                <el-col :span="11">
+                  <el-form-item prop="activity_end">
+                    <el-date-picker
+                      type="datetime"
+                      placeholder="结束时间"
+                      v-model="ruleForm.activity_end"
+                      style="width: 100%"
+                    ></el-date-picker>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="所属平台" prop="platform_code">
+              <search-terrace
+                :value="ruleForm.platform_code"
+                :disabled="false"
+                :size="'mini'"
+                :isDetail="false"
+                :placeholder="'所属平台'"
+                @searchChange="platform_codesearchChange"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="16">
+            <el-form-item label="活动描述" prop="activity_desc">
+              <el-input
+                placeholder="活动描述"
+                type="textarea"
+                :rows="2"
+                show-word-limit
+                v-model="ruleForm.activity_desc"
+                maxlength="500"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="库存类型" prop="is_stock">
+              <el-input
+                placeholder="商品库存类型"
+                v-model="ruleForm.is_stock"
+                maxlength="100"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item
+              label="活动商品"
+              :label-position="'top'"
+              prop="good_list"
+            >
+              <el-table
+                :data="ruleForm.spuCode"
+                stripe
+                border
+                :size="'mini'"
+                style="width: 100%"
+              >
+                <el-table-column prop="date" label="日期" width="180">
+                </el-table-column>
+                <el-table-column prop="name" label="姓名" width="180">
+                </el-table-column>
+                <el-table-column prop="address" label="地址"> </el-table-column>
+                <el-table-column fixed="right" width="100">
+                  <template slot="header" slot-scope="scope">
+                    <span>操作</span>
+                    <el-tooltip
+                      class="item"
+                      effect="dark"
+                      content="添加活动商品"
+                      placement="top"
+                    >
+                      <i
+                        class="el-icon-circle-plus-outline fr"
+                        style="font-size: 18px; margin-top: 2px"
+                        @click="openEdit('add', '0')"
+                      />
+                    </el-tooltip>
+                  </template>
+                  <template slot-scope="scope">
+                    <el-button
+                      @click="handleClick(scope.row)"
+                      type="text"
+                      size="small"
+                      >查看</el-button
+                    >
+                    <el-button type="text" size="small">编辑</el-button>
+                  </template>
+                </el-table-column>
+              </el-table>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <search-good-online-modal :once="once" :show-model="showModel" />
     </div>
     <div v-else>
       <no-auth></no-auth>
@@ -20,16 +155,12 @@
 import asyncRequest from "@/apis/service/goodStore/active";
 import resToken from "@/mixins/resToken";
 import { mapGetters } from "vuex";
-// import baseForm from "./components/baseForm";
-// import costForm from "./components/costForm";
-// import packForm from "./components/packForm";
+import searchGoodOnlineModal from "@/components/search-good-online-modal";
 export default {
   name: "activeAdd",
   mixins: [resToken],
   components: {
-    baseForm,
-    costForm,
-    packForm,
+    searchGoodOnlineModal,
   },
   computed: {
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),
@@ -50,12 +181,73 @@ export default {
       size: "small",
       activeName: "3",
       loading: false,
-   
-     
+      showModel: false,
+      once: false,
+      rulesThis: this.rules,
+      ruleForm: {},
+      rules: {
+        activity_name: [
+          {
+            required: true,
+            message: "活动标题不能为空",
+            trigger: "blur",
+          },
+        ],
+        platform_code1: [
+          {
+            type: "array",
+            required: true,
+            message: "业务公司不能为空",
+            trigger: "change",
+          },
+        ],
+        platform_code: [
+          {
+            type: "array",
+            required: true,
+            message: "所属平台不能为空",
+            trigger: "change",
+          },
+        ],
+        activity_start: [
+          {
+            required: true,
+            message: "开始时间不能为空",
+            trigger: "change",
+          },
+        ],
+        activity_end: [
+          {
+            required: true,
+            message: "结束时间不能为空",
+            trigger: "change",
+          },
+        ],
 
-    
+        activity_desc: [
+          {
+            required: true,
+            message: "活动描述不能为空",
+            trigger: "blur",
+          },
+        ],
+        is_stock: [
+          {
+            required: true,
+            message: "请选择是否库存品",
+            trigger: "change",
+          },
+        ],
 
-   
+        good_list: [
+          {
+            type: "array",
+            required: true,
+            message: "请选择活动商品",
+            trigger: "change,blur",
+          },
+        ],
+      },
     };
   },
   mounted() {
@@ -64,12 +256,41 @@ export default {
   methods: {
     async initForm() {
       this.loading = true;
-    
+      this.resetFormData();
+      this.rulesThis = this.rules;
+      await this.resetForm();
       this.loading = false;
     },
+    async resetForm() {
+      // 重置
+      await this.$nextTick(async () => {
+        if (this.$refs.ruleForm) {
+          this.$refs.ruleForm.resetFields();
+          this.$refs.ruleForm.clearValidate();
+          this.resetFormData();
+        }
+      });
+    },
+    resetFormData() {
+      this.ruleForm = {
+        activity_name: "",
+        platform_code1: [],
+        platform_code: [],
+        activity_start: "",
+        activity_end: "",
+        activity_desc: "",
+        is_stock: "",
+        good_list: [],
+      };
+    },
     handleClick(row) {
       console.log(row);
     },
+    openEdit(type, id) {
+      this.showModel = true;
+      console.log(type);
+      console.log(id);
+    },
     async initData() {
       this.loading = true;
       let res = await asyncRequest.detail({ id: this.id });
@@ -78,10 +299,6 @@ export default {
         await this.resetForm(res.data);
       }
     },
-  
-
-  
-   
   },
 };
 </script>
@@ -101,19 +318,18 @@ export default {
   }
   /deep/ .ddiv {
     border-top: 1px solid #dcdfe6;
-   
   }
   /deep/ .dtitle {
     width: 40px;
     text-align: center;
     height: 100%;
     min-height: 100%;
-    ul{
-      padding:20px 0 0 0;
+    ul {
+      padding: 20px 0 0 0;
     }
   }
   /deep/ .dmain {
-     padding: 20px 0 0 0;
+    padding: 20px 0 0 0;
     width: calc(100% - 40px);
     border-left: 1px solid #dcdfe6;
   }

src/views/goodStore/active/components/baseForm.vue

@@ -1,755 +0,0 @@
-<template>
-  <el-form
-    :model="ruleForm"
-    status-icon
-    :rules="rulesThis"
-    ref="ruleForm"
-    :size="'mini'"
-    label-width="110px"
-    class="demo-ruleForm"
-  >
-    <el-row>
-      <el-col :span="1" class="dtitle">
-        <ul style="padding: 150px 0 0 0">
-          <li>基</li>
-          <li>础</li>
-          <li>信</li>
-          <li>息</li>
-        </ul>
-      </el-col>
-      <el-col :span="23" class="dmain">
-        <el-row>
-          <el-col :span="8">
-            <el-form-item label="商品分类" prop="a1">
-              111
-              <!-- <good-class
-                :value="ruleForm.a1"
-                @handleChange="goods_class_change"
-                :disabled="false"
-                :size="'mini'"
-                :isDetail="false"
-                :placeholder="'商品分类'"
-              /> -->
-            </el-form-item>
-            <el-form-item label="商品品牌" prop="a2">
-              <search-brand
-                :value="ruleForm.a2"
-                :disabled="false"
-                :size="'mini'"
-                :isDetail="false"
-                :placeholder="'商品品牌'"
-                @searchChange="a2searchChange"
-              />
-            </el-form-item>
-            <el-form-item label="重量" prop="a3">
-              <el-input
-                placeholder="重量"
-                v-model="ruleForm.a3"
-                type="number"
-                :min="0"
-                :max="9999999999.99"
-                :step="2"
-              >
-                <template slot="append">g</template>
-              </el-input>
-            </el-form-item>
-
-            <el-form-item label="是否定制" prop="a4">
-              <el-select
-                v-model="ruleForm.a4"
-                filterable
-                clearable
-                style="width: 100%"
-                placeholder="是否定制"
-              >
-                <el-option
-                  v-for="group in options1"
-                  :key="group.id"
-                  :label="group.name"
-                  :value="group.id"
-                />
-              </el-select>
-            </el-form-item>
-            <el-form-item label="是否库存品" prop="a5">
-              <el-select
-                v-model="ruleForm.a5"
-                filterable
-                clearable
-                style="width: 100%"
-                placeholder="是否库存品"
-              >
-                <el-option
-                  v-for="group in options4"
-                  :key="group.id"
-                  :label="group.name"
-                  :value="group.id"
-                />
-              </el-select>
-            </el-form-item>
-            <el-form-item label="供应商" prop="a6">
-              <search-supplier
-                :value="ruleForm.a6"
-                :placeholder="'供应商'"
-                :disabled="false"
-                :size="'mini'"
-                :isDetail="false"
-                @searchChange="a6searchChange"
-              />
-            </el-form-item>
-            <el-form-item label="销售权限" prop="a7">
-              <el-select
-                v-model="ruleForm.a7"
-                filterable
-                clearable
-                style="width: 100%"
-                placeholder="销售权限"
-              >
-                <el-option
-                  v-for="group in options3"
-                  :key="group.id"
-                  :label="group.name"
-                  :value="group.id"
-                />
-              </el-select>
-            </el-form-item>
-            <el-form-item label="税点" prop="a8">
-              <search-tax
-                :value="ruleForm.a8"
-                :disabled="false"
-                :size="'mini'"
-                :isDetail="false"
-                :placeholder="'税点'"
-                @searchChange="a8searchChange"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="16">
-            <el-form-item label="商品名称" prop="b1">
-              <el-input
-                placeholder="请输入商品名称"
-                maxlength="100"
-                v-model="ruleForm.b1"
-              ></el-input>
-            </el-form-item>
-            <el-row>
-              <el-col :span="12">
-                <el-form-item label="商品单位" prop="b2">
-                  <search-unit
-                    :value="ruleForm.b2"
-                    :disabled="false"
-                    :size="'mini'"
-                    :isDetail="false"
-                    :placeholder="'商品单位'"
-                    @searchChange="b2searchChange"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item label="专属类型" prop="b3">
-                  <el-select
-                    v-model="ruleForm.b3"
-                    filterable
-                    clearable
-                    style="width: 100%"
-                    placeholder="专属类型"
-                  >
-                    <el-option
-                      v-for="group in options2"
-                      :key="group.id"
-                      :label="group.name"
-                      :value="group.id"
-                    />
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item label="贵金属种类" prop="b4">
-                  <search-metal-kind
-                    :value="ruleForm.b4"
-                    :disabled="false"
-                    :size="'mini'"
-                    :isDetail="false"
-                    :placeholder="'贵金属种类'"
-                    @searchChange="b4searchChange"
-                  /> </el-form-item
-              ></el-col>
-              <el-col :span="12">
-                <el-form-item label="启用实时金价" prop="b5">
-                  <el-select
-                    v-model="ruleForm.b5"
-                    filterable
-                    clearable
-                    style="width: 100%"
-                    placeholder="启用实时金价"
-                  >
-                    <el-option
-                      v-for="group in options5"
-                      :key="group.id"
-                      :label="group.name"
-                      :value="group.id"
-                    />
-                  </el-select> </el-form-item
-              ></el-col>
-              <el-col :span="12">
-                <el-form-item label="定制起订量" prop="b6">
-                  <el-input
-                    placeholder="定制起订量"
-                    v-model="ruleForm.b6"
-                    type="number"
-                    :min="0"
-                    :max="9999999999"
-                    :step="0"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item label="定制工期" prop="b7">
-                  <el-input
-                    placeholder="定制工期"
-                    v-model="ruleForm.b7"
-                    type="number"
-                    :min="0"
-                    :max="9999999999"
-                    :step="0"
-                  >
-                    <template slot="append">天</template>
-                  </el-input>
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-form-item label="售后说明" prop="b8">
-              <el-input
-                type="textarea"
-                :rows="2"
-                placeholder="售后说明"
-                v-model="ruleForm.b8"
-              >
-              </el-input>
-            </el-form-item>
-
-            <el-form-item label="工艺说明" prop="b9">
-              <el-input
-                type="textarea"
-                :rows="2"
-                placeholder="工艺说明"
-                v-model="ruleForm.b9"
-              >
-              </el-input>
-            </el-form-item>
-            <el-form-item label="商品备注" prop="bb1">
-              <el-input
-                type="textarea"
-                :rows="2"
-                placeholder="商品备注"
-                v-model="ruleForm.bb1"
-              >
-              </el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-col>
-    </el-row>
-
-    <el-row class="ddiv">
-      <el-col :span="1" class="dtitle">
-        <ul>
-          <li>规</li>
-          <li>格</li>
-          <li>信</li>
-          <li>息</li>
-        </ul>
-      </el-col>
-      <el-col :span="23" class="dmain" style="padding-left: 18px">
-        <el-table :data="tableData" :size="'mini'" border style="width: 100%">
-          <!-- <el-table-column prop="index" label="序号"> </el-table-column> -->
-          <el-table-column prop="name" label="规格类型"  />
-          <el-table-column prop="address" label="规格值"> </el-table-column>
-          <el-table-column fixed="right">
-            <template slot="header" slot-scope="scope">
-              <span>操作</span>
-              <el-tooltip
-                class="item"
-                effect="dark"
-                content="添加规格类型"
-                placement="top"
-              >
-                <i
-                  class="el-icon-circle-plus-outline fr"
-                  style="font-size: 18px; margin-top: 2px"
-                  @click="openEdit('add', {})"
-                />
-              </el-tooltip>
-            </template>
-            <template slot-scope="scope">
-              <el-button
-                @click="handleClick(scope.row)"
-                type="text"
-                size="small"
-                >新建规格值</el-button
-              >
-              <el-button
-                @click="handleClick(scope.row)"
-                type="text"
-                size="small"
-                >修改规格值</el-button
-              >
-              <el-button type="text" size="small">移除规格类型</el-button>
-            </template>
-          </el-table-column>
-        </el-table>
-        <!-- 弹窗 新增/修改 -->
-        <base-form-add-edit
-          :id="modelId"
-          :show-model="showModel"
-          :sitem="sitem"
-          @refresh="refreshEdit"
-          @cancel="showModel = false"
-        />
-      </el-col>
-    </el-row>
-  </el-form>
-</template>
-   <script>
-import asyncRequest from "@/apis/service/goodStore/active";
-import resToken from "@/mixins/resToken";
-import { mapGetters } from "vuex";
-import baseFormAddEdit from "./baseFormAddEdit";
-import { options1, options2, options3, options4, options5 } from "../columns";
-export default {
-  name: "activeAdd",
-  mixins: [resToken],
-  components: {
-    baseFormAddEdit,
-  },
-  computed: {
-    ...mapGetters(["tablebtnSize", "searchSize", "size"]),
-    powers() {
-      let tran =
-        this.$store.getters.btnList.find(
-          (item) => item.menu_route == "activeAdd"
-        ) || {};
-      if (tran && tran.action && tran.action.length > 0) {
-        return tran.action;
-      } else {
-        return [];
-      }
-    },
-  },
-  data() {
-    return {
-      showModel: false,
-      modelId: "000",
-      sitem: {},
-      size: "small",
-      rulesThis: this.rules,
-      activeName: "1",
-      loading: false,
-      tableData: [],
-      options1: options1,
-      options2: options2,
-      options3: options3,
-      options4: options4,
-      options5: options5,
-      ruleForm: {},
-      rules: {
-        a1: [
-          {
-            required: true,
-            message: "商品分类",
-            trigger: "change",
-          },
-        ],
-        a2: [
-          {
-            type: "array",
-            required: true,
-            message: "商品品牌",
-            trigger: "change",
-          },
-        ],
-        a3: [
-          {
-            required: true,
-            message: "商品重量为合法数字",
-            trigger: "blur",
-          },
-        ],
-        a4: [
-          {
-            required: true,
-            message: "请选择是否定制",
-            trigger: "change",
-          },
-        ],
-        a5: [
-          {
-            required: true,
-            message: "请选择是否库存品",
-            trigger: "change",
-          },
-        ],
-        a6: [
-          {
-            type: "array",
-            required: true,
-            message: "请选择供应商",
-            trigger: "change",
-          },
-        ],
-        a7: [
-          {
-            required: true,
-            message: "商品主图",
-            trigger: "change",
-          },
-        ],
-        a8: [
-          {
-            required: true,
-            message: "请选择税率",
-            trigger: "change",
-          },
-        ],
-        b1: [
-          {
-            required: true,
-            message: "请输入商品名称",
-            trigger: "blur",
-          },
-        ],
-        b2: [
-          {
-            required: true,
-            message: "请输入商品单位",
-            trigger: "blur",
-          },
-        ],
-        b3: [
-          {
-            required: true,
-            message: "请选择专属类型",
-            trigger: "change",
-          },
-        ],
-        b4: [
-          {
-            type: "array",
-            required: true,
-            message: "请选择贵金属种类",
-            trigger: "change",
-          },
-        ],
-        b5: [
-          {
-            required: true,
-            message: "请选择是否启用实时金价",
-            trigger: "change",
-          },
-        ],
-        b6: [
-          {
-            required: true,
-            message: "定制起订量应为合法数字",
-            trigger: "blur",
-          },
-        ],
-        b7: [
-          {
-            required: true,
-            message: "定制工期为合法数字",
-            trigger: "blur",
-          },
-        ],
-        b8: [
-          {
-            required: true,
-            message: "售后说明不能为空",
-            trigger: "blur",
-          },
-        ],
-        bb1: [
-          {
-            required: true,
-            message: "商品备注不能为空",
-            trigger: "blur",
-          },
-        ],
-      },
-      ruleForm: {},
-    };
-  },
-  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/goodStore/active/components/baseFormAddEdit.vue

@@ -1,260 +0,0 @@
-<template>
-  <el-dialog
-    v-loading="loading"
-    :title="title"
-    :center="true"
-    align="left"
-    top="18vh"
-    width="500px"
-    :close-on-click-modal="false"
-    :visible.sync="showModelThis"
-    element-loading-text="拼命加载中"
-    element-loading-spinner="el-icon-loading"
-    element-loading-background="rgba(0, 0, 0, 0.8)"
-    @close="showModelThis = false"
-  >
-    <el-card style="margin: -20px 0 0 0">
-      <el-row :gutter="10">
-        <el-col :span="24">
-          <el-form
-            ref="ruleForm"
-            :model="ruleForm"
-            status-icon
-            :size="'small'"
-            :rules="rulesThis"
-            label-width="80px"
-            class="demo-ruleForm"
-          >
-            <el-form-item label="规格类型" prop="active_name">
-              <search-spec
-                :value="ruleForm.active_name"
-                :disabled="false"
-                :size="'mini'"
-                :isDetail="false"
-                :placeholder="'规格类型'"
-                @searchChange="active_namesearchChange"
-              />
-            </el-form-item>
-            <el-form-item label="规格值" prop="logo_url">
-              <el-radio-group v-model="ruleForm.logo_url">
-                <el-radio
-                  v-for="item in specVlist"
-                  :key="item.id + item.name"
-                  :label="item.id"
-                  >{{ item.name }}</el-radio
-                >
-              </el-radio-group>
-            </el-form-item>
-            <div style="width: 100%; padding: 0 0 0 80px">
-              <el-input
-                style="width: 209px"
-                v-model="sinput"
-                :disabled="id == 'edit'"
-                :size="'small'"
-                placeholder="规格值名称，如红色"
-                maxlength="20"
-              />
-              <el-button
-                style="margin: 0 0 0 10px"
-                icon="el-icon-plus"
-                :size="'small'"
-                >新增规格值</el-button
-              >
-            </div>
-          </el-form>
-        </el-col>
-        <el-col :span="24" style="text-align: right; padding-top: 18px">
-          <el-button
-            v-if="id !== 'edit'"
-            :size="'small'"
-            type="primary"
-            @click="submitForm"
-            >保 存
-          </el-button>
-          <el-button @click="showModelThis = false" :size="'small'">{{
-            id == "edit" ? "关 闭" : "取 消"
-          }}</el-button>
-        </el-col>
-      </el-row>
-    </el-card>
-  </el-dialog>
-</template>
-<script>
-import asyncRequest from "@/apis/service/goodStore/active";
-import resToken from "@/mixins/resToken";
-export default {
-  name: "active",
-  props: ["showModel", "id", "sitem"],
-  mixins: [resToken],
-  data() {
-    return {
-      loading: false,
-      title: "",
-      sinput: "",
-      showModelThis: this.showModel,
-      select: "1",
-      specVlist: [
-        { id: "1", name: "111" },
-        { id: "2", name: "222" },
-      ],
-      activeOptions: [],
-      actionList: [],
-      ruleForm: {
-        id: "",
-        active_name: "",
-        logo_url: "",
-      },
-      rulesThis: this.rules,
-      rules: {
-        active_name: [
-          { required: true, message: "品牌名称不能为空", trigger: "change" },
-        ],
-        logo_url: [
-          { required: true, message: "品牌名称不能为空", trigger: "change" },
-        ],
-      },
-    };
-  },
-  watch: {
-    showModel: function (val) {
-      this.showModelThis = val;
-      if (val) {
-        this.initForm();
-      }
-    },
-    showModelThis(val) {
-      if (!val) {
-        this.$emit("cancel");
-      }
-    },
-  },
-  methods: {
-    async initForm() {
-      this.loading = true;
-      if (this.id === "add") {
-        this.title = "添加商品类型";
-        this.rulesThis = this.rules;
-      } else if (this.id === "005") {
-        this.title = "修改商品类型";
-        this.rulesThis = this.rules;
-      } else {
-        this.title = "品牌商品类型";
-        this.rulesThis = {};
-      }
-      await this.resetForm();
-      this.loading = false;
-    },
-    async resetForm() {
-      // 重置
-      await this.$nextTick(() => {
-        if (this.$refs.ruleForm) {
-          this.$refs.ruleForm.resetFields();
-          this.$refs.ruleForm.clearValidate();
-          const { id, active_name, logo_url } = this.sitem;
-          this.ruleForm = {
-            id: id || "",
-            active_name: active_name || "",
-            logo_url: logo_url || "",
-          };
-        }
-      });
-    },
-
-    active_namesearchChange(e) {
-      const { id, code, label } = e;
-      if (id) {
-        this.ruleForm.active_name = code;
-      } else {
-        this.ruleForm.active_name = "";
-      }
-      this.$refs.ruleForm.validateField("active_name");
-      this.getlist();
-    },
-    async getlist() {
-      const { active_name } = this.ruleForm;
-      const { code, data, message } = await asyncRequest.list({
-        active_name: active_name,
-      });
-      if (code === 0) {
-        this.options = data;
-      } else if (code >= 100 && code <= 104) {
-        await this.logout();
-      } else {
-        this.$message.warning(message);
-      }
-    },
-
-    async submitForm() {
-      await this.$refs.ruleForm.validate(async (valid) => {
-        if (valid) {
-          this.loading = true;
-          let model = JSON.parse(JSON.stringify(this.ruleForm));
-          let res = {};
-          if (this.id === "003") {
-            delete model["id"];
-            res = await asyncRequest.add(model);
-          } else {
-            res = await asyncRequest.update(model);
-          }
-          this.loading = false;
-          if (res && res.code === 0) {
-            const title = this.id === "add" ? "添加成功!" : "修改成功!";
-            this.$notify.success({
-              title,
-              message: "",
-            });
-            this.showModelThis = false;
-            // 刷新
-            this.$emit("refresh");
-          } else if (res && res.code >= 100 && res.code <= 104) {
-            await this.logout();
-          } else {
-            this.$message.warning(res.message);
-          }
-        } else {
-          console.log("error submit!!");
-          return false;
-        }
-      });
-    },
-     async submitForm1() {
-      await this.$refs.ruleForm.validate(async (valid) => {
-        if (valid) {
-          this.loading = true;
-          let model = JSON.parse(JSON.stringify(this.ruleForm));
-          let res = {};
-          if (this.id === "003") {
-            delete model["id"];
-            res = await asyncRequest.add(model);
-          } else {
-            res = await asyncRequest.update(model);
-          }
-          this.loading = false;
-          if (res && res.code === 0) {
-            const title = this.id === "add" ? "添加成功!" : "修改成功!";
-            this.$notify.success({
-              title,
-              message: "",
-            });
-            this.showModelThis = false;
-            // 刷新
-            this.$emit("refresh");
-          } else if (res && res.code >= 100 && res.code <= 104) {
-            await this.logout();
-          } else {
-            this.$message.warning(res.message);
-          }
-        } else {
-          console.log("error submit!!");
-          return false;
-        }
-      });
-    },
-  },
-};
-</script>
-
-   <style lang="scss" scoped>
-.active {
-}
-</style>

src/views/goodStore/active/components/costForm.vue

@@ -1,455 +0,0 @@
-<template>
-  <el-form
-    :model="ruleForm"
-    status-icon
-    :rules="rulesThis"
-    ref="ruleForm"
-    :size="'mini'"
-    label-width="110px"
-    class="demo-ruleForm"
-  >
-    <el-row>
-      <el-col :span="1" class="dtitle">
-        <ul style="padding: 40px 0 0 0">
-          <li>固</li>
-          <li>定</li>
-          <li>成</li>
-          <li>本</li>
-        </ul></el-col
-      >
-      <el-col :span="23" class="dmain">
-        <el-row>
-          <el-col :span="8">
-            <el-form-item label="证书费" prop="a1">
-              <el-input
-                placeholder="证书费"
-                v-model="ruleForm.a1"
-                type="number"
-                :min="0"
-                :max="9999999999.99"
-                :step="2"
-              >
-                <template slot="append">元</template>
-              </el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="包装费" prop="a2">
-              <el-input
-                placeholder="包装费"
-                v-model="ruleForm.a2"
-                type="number"
-                :min="0"
-                :max="9999999999.99"
-                :step="2"
-              >
-                <template slot="append">元</template>
-              </el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="成本工艺费" prop="a3">
-              <el-input
-                placeholder="成本工艺费"
-                v-model="ruleForm.a3"
-                type="number"
-                :min="0"
-                :max="9999999999.99"
-                :step="2"
-              >
-                <template slot="append">元</template>
-              </el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="加标费" prop="a4">
-              <el-input
-                placeholder="加标费"
-                v-model="ruleForm.a4"
-                type="number"
-                :min="0"
-                :max="9999999999.99"
-                :step="2"
-              >
-                <template slot="append">元</template>
-              </el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="打样费" prop="a5">
-              <el-input
-                placeholder="打样费"
-                v-model="ruleForm.a5"
-                type="number"
-                :min="0"
-                :max="9999999999.99"
-                :step="2"
-              >
-                <template slot="append">元</template>
-              </el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="开模费" prop="a6">
-              <el-input
-                placeholder="开模费"
-                v-model="ruleForm.a6"
-                type="number"
-                :min="0"
-                :max="9999999999.99"
-                :step="2"
-              >
-                <template slot="append">元</template>
-              </el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="调样费" prop="a7">
-              <el-input
-                placeholder="调样费"
-                v-model="ruleForm.a7"
-                type="number"
-                :min="0"
-                :max="9999999999.99"
-                :step="2"
-              >
-                <template slot="append">元</template>
-              </el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="市场价" prop="a8">
-              <el-input
-                placeholder="市场价"
-                v-model="ruleForm.a8"
-                type="number"
-                :min="0"
-                :max="9999999999.99"
-                :step="2"
-              >
-                <template slot="append">元</template>
-              </el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="含税成本裸价" prop="a9">
-              <el-input
-                placeholder="含税成本裸价"
-                v-model="ruleForm.a9"
-                type="number"
-                :min="0"
-                :max="9999999999.99"
-                :step="2"
-              >
-                <template slot="append">元</template>
-              </el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-col>
-    </el-row>
-    <el-row class="ddiv">
-      <el-col :span="1" class="dtitle">
-        <ul>
-          <li>阶</li>
-          <li>梯</li>
-          <li>成</li>
-          <li>本</li>
-        </ul></el-col
-      >
-      <el-col :span="23" class="dmain" style="padding-left: 18px">
-        <el-table
-          :data="tableData"
-          :size="'mini'"
-          border
-          stripe
-          style="width: 100%"
-        >
-          <el-table-column prop="s1" label="起订量(>=)" />
-          <el-table-column prop="s2" label="成本裸价" />
-          <el-table-column prop="s3" label="成本合计" />
-          <el-table-column prop="s4" label="其中运费" />
-          <el-table-column prop="s5" label="使用状态" />
-          <el-table-column fixed="right">
-            <template slot="header" slot-scope="scope">
-              <span>操作</span>
-              <el-tooltip effect="dark" content="添加阶梯" placement="top">
-                <i
-                  class="el-icon-circle-plus-outline tb-icon fr"
-                  @click="openEdit('add', {})"
-                ></i>
-              </el-tooltip>
-            </template>
-            <template slot-scope="scope">
-              <el-tooltip effect="dark" content="修改" placement="top">
-                <i class="el-icon-edit tb-icon" @click="openEdit('')"></i>
-              </el-tooltip>
-              <el-tooltip effect="dark" content="禁/启用" placement="top">
-                <i
-                  class="el-icon-video-pause tb-icon"
-                  @click="openEdit('')"
-                ></i>
-                <!-- el-icon-video-play -->
-              </el-tooltip>
-            </template>
-          </el-table-column>
-        </el-table>
-        <!-- 弹窗 新增/修改 -->
-        <cost-form-add-edit
-          :id="modelId"
-          :show-model="showModel"
-          :sitem="sitem"
-          @refresh="refreshEdit"
-          @cancel="showModel = false"
-        /> </el-col
-    ></el-row>
-  </el-form>
-</template>
-   <script>
-import asyncRequest from "@/apis/service/goodStore/active";
-import resToken from "@/mixins/resToken";
-import { mapGetters } from "vuex";
-import costFormAddEdit from "./costFormAddEdit";
-export default {
-  name: "activeAdd",
-  mixins: [resToken],
-  components: {
-    costFormAddEdit,
-  },
-  computed: {
-    ...mapGetters(["tablebtnSize", "searchSize", "size"]),
-    powers() {
-      let tran =
-        this.$store.getters.btnList.find(
-          (item) => item.menu_route == "activeAdd"
-        ) || {};
-      if (tran && tran.action && tran.action.length > 0) {
-        return tran.action;
-      } else {
-        return [];
-      }
-    },
-  },
-  data() {
-    return {
-      showModel: false,
-      modelId: "000",
-      sitem: {},
-      size: "small",
-      rulesThis: this.rules,
-      activeName: "1",
-      loading: false,
-      tableData: [{ id: 1, s1: "1", s2: "-", s3: "-", s4: "-", s5: "0" }],
-      rules: {
-        a1: [
-          {
-            required: true,
-            message: "证书费应为合法数字",
-            trigger: "blur",
-          },
-        ],
-        a2: [
-          {
-            required: true,
-            message: "包装费应为合法数字",
-            trigger: "blur",
-          },
-        ],
-        a3: [
-          {
-            required: true,
-            message: "成本工艺费应为合法数字",
-            trigger: "blur",
-          },
-        ],
-        a4: [
-          {
-            required: true,
-            message: "加标费应为合法数字",
-            trigger: "blur",
-          },
-        ],
-        a5: [
-          {
-            required: true,
-            message: "打样应为合法数字",
-            trigger: "blur",
-          },
-        ],
-        a6: [
-          {
-            required: true,
-            message: "开模费应为合法数字",
-            trigger: "blur",
-          },
-        ],
-        a7: [
-          {
-            required: true,
-            message: "调样费应为合法数字",
-            trigger: "blur",
-          },
-        ],
-        a8: [
-          {
-            required: true,
-            message: "市场价应为合法数字",
-            trigger: "blur",
-          },
-        ],
-        a9: [
-          {
-            required: true,
-            message: "含税成本裸价应为合法数字",
-            trigger: "blur",
-          },
-        ],
-      },
-      ruleForm: {},
-    };
-  },
-  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);
-    },
-    refreshEdit(e) {
-      console.log(e);
-    },
-    openEdit(type, sitem) {
-      this.sitem = sitem;
-      this.modelId = type;
-      this.showModel = true;
-    },
-    async initData() {
-      this.loading = true;
-      let res = await asyncRequest.detail({ id: this.id });
-      this.loading = false;
-      if (res.code === 0) {
-        await this.resetForm(res.data);
-      }
-    },
-    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: "",
-        a9: "",
-        b1: [],
-      };
-    },
-    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.catid = obj.catid[obj.catid.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;
-        }
-      });
-    },
-  },
-};
-</script>
-   <style lang="scss" scoped>
-</style>
-   

src/views/goodStore/active/components/costFormAddEdit.vue

@@ -1,293 +0,0 @@
-<template>
-  <el-dialog
-    v-loading="loading"
-    :title="title"
-    :center="true"
-    align="left"
-    top="18vh"
-    width="500px"
-    :close-on-click-modal="false"
-    :visible.sync="showModelThis"
-    element-loading-text="拼命加载中"
-    element-loading-spinner="el-icon-loading"
-    element-loading-background="rgba(0, 0, 0, 0.8)"
-    @close="showModelThis = false"
-  >
-    <el-card style="margin: -20px 0 0 0">
-      <el-row :gutter="10">
-        <el-col :span="24">
-          <el-form
-            ref="ruleForm"
-            :model="ruleForm"
-            status-icon
-            :size="'small'"
-            :rules="rulesThis"
-            label-width="80px"
-            class="demo-ruleForm"
-          >
-            <el-form-item label="起订量" prop="s1">
-              <el-input
-                placeholder="起订量"
-                v-model="ruleForm.s1"
-                type="number"
-                :min="0"
-                :max="9999999999"
-                :step="0"
-              />
-            </el-form-item>
-            <el-form-item label="成本裸价" prop="s2">
-              <el-input
-                placeholder="成本裸价"
-                v-model="ruleForm.s2"
-                type="number"
-                :min="0"
-                :max="9999999999"
-                :step="2"
-              >
-                <template slot="append">元</template>
-              </el-input>
-            </el-form-item>
-            <el-form-item label="成本合计" prop="s2">
-              <el-input
-                placeholder="成本合计"
-                v-model="ruleForm.s2"
-                type="number"
-                :min="0"
-                :max="9999999999"
-                :step="2"
-              >
-                <template slot="append">元</template>
-              </el-input>
-            </el-form-item>
-            <el-form-item label="其中运费" prop="s2">
-              <el-input
-                placeholder="其中运费"
-                v-model="ruleForm.s2"
-                type="number"
-                :min="0"
-                :max="9999999999"
-                :step="2"
-              >
-                <template slot="append">元</template>
-              </el-input>
-            </el-form-item>
-            <el-form-item label="使用状态" prop="s5">
-              <el-select
-                v-model="ruleForm.s5"
-                style="width: 100%"
-                placeholder="使用状态"
-              >
-                <el-option
-                  v-for="item in options"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                >
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-form>
-        </el-col>
-        <el-col :span="24" style="text-align: right; padding-top: 18px">
-          <el-button
-            v-if="id !== 'edit'"
-            :size="'small'"
-            type="primary"
-            @click="submitForm"
-            >保 存
-          </el-button>
-          <el-button @click="showModelThis = false" :size="'small'">{{
-            id == "edit" ? "关 闭" : "取 消"
-          }}</el-button>
-        </el-col>
-      </el-row>
-    </el-card>
-  </el-dialog>
-</template>
-<script>
-import asyncRequest from "@/apis/service/goodStore/active";
-import resToken from "@/mixins/resToken";
-export default {
-  name: "active",
-  props: ["showModel", "id", "sitem"],
-  mixins: [resToken],
-  data() {
-    return {
-      loading: false,
-      title: "",
-      showModelThis: this.showModel,
-      options: [
-        { value: "1", label: "启用" },
-        { value: "0", label: "禁用" },
-      ],
-      ruleForm: {},
-      rulesThis: this.rules,
-      rules: {
-        s1: [
-          { required: true, message: "起订量应为合法数字", trigger: "blur" },
-        ],
-        s2: [
-          { required: true, message: "成本裸价应为合法数字", trigger: "blur" },
-        ],
-        s3: [
-          { required: true, message: "成本合计应为合法数字", trigger: "blur" },
-        ],
-        s4: [
-          { required: true, message: "其中运费应为合法数字", trigger: "blur" },
-        ],
-        s5: [
-          { required: true, message: "请选择使用状态", trigger: "change" },
-        ],
-      },
-    };
-  },
-  watch: {
-    showModel: function (val) {
-      this.showModelThis = val;
-      if (val) {
-        this.initForm();
-      }
-    },
-    showModelThis(val) {
-      if (!val) {
-        this.$emit("cancel");
-      }
-    },
-  },
-  methods: {
-    async initForm() {
-      this.loading = true;
-      this.resetFormData();
-      if (this.id === "add") {
-        this.title = "添加成本阶梯";
-
-        this.rulesThis = this.rules;
-      } else if (this.id === "005") {
-        this.title = "修改成本阶梯";
-        this.rulesThis = this.rules;
-      } else {
-        this.title = "成本阶梯详情";
-        this.rulesThis = {};
-      }
-      await this.resetForm();
-      this.loading = false;
-    },
-    async resetForm() {
-      // 重置
-      await this.$nextTick(() => {
-        if (this.$refs.ruleForm) {
-          this.$refs.ruleForm.resetFields();
-          this.$refs.ruleForm.clearValidate();
-          this.resetFormData();
-        }
-      });
-    },
-    resetFormData() {
-      const { id, s1, s2, s3, s4, s5 } = this.sitem;
-      this.ruleForm = {
-        id: id || "",
-        s1: s1 || "",
-        s2: s2 || "",
-        s3: s3 || "",
-        s4: s4 || "",
-        s5: s5 || "0",
-      };
-    },
-    s1searchChange(e) {
-      const { id, code, label } = e;
-      if (id) {
-        this.ruleForm.s1 = code;
-      } else {
-        this.ruleForm.s1 = "";
-      }
-      this.$refs.ruleForm.validateField("s1");
-      this.getlist();
-    },
-    async getlist() {
-      const { s1 } = this.ruleForm;
-      const { code, data, message } = await asyncRequest.list({
-        s1: s1,
-      });
-      if (code === 0) {
-        this.options = data;
-      } else if (code >= 100 && code <= 104) {
-        await this.logout();
-      } else {
-        this.$message.warning(message);
-      }
-    },
-
-    async submitForm() {
-      await this.$refs.ruleForm.validate(async (valid) => {
-        if (valid) {
-          this.loading = true;
-          let model = JSON.parse(JSON.stringify(this.ruleForm));
-          let res = {};
-          if (this.id === "003") {
-            delete model["id"];
-            res = await asyncRequest.add(model);
-          } else {
-            res = await asyncRequest.update(model);
-          }
-          this.loading = false;
-          if (res && res.code === 0) {
-            const title = this.id === "add" ? "添加成功!" : "修改成功!";
-            this.$notify.success({
-              title,
-              message: "",
-            });
-            this.showModelThis = false;
-            // 刷新
-            this.$emit("refresh");
-          } else if (res && res.code >= 100 && res.code <= 104) {
-            await this.logout();
-          } else {
-            this.$message.warning(res.message);
-          }
-        } else {
-          console.log("error submit!!");
-          return false;
-        }
-      });
-    },
-    async submitForm1() {
-      await this.$refs.ruleForm.validate(async (valid) => {
-        if (valid) {
-          this.loading = true;
-          let model = JSON.parse(JSON.stringify(this.ruleForm));
-          let res = {};
-          if (this.id === "003") {
-            delete model["id"];
-            res = await asyncRequest.add(model);
-          } else {
-            res = await asyncRequest.update(model);
-          }
-          this.loading = false;
-          if (res && res.code === 0) {
-            const title = this.id === "add" ? "添加成功!" : "修改成功!";
-            this.$notify.success({
-              title,
-              message: "",
-            });
-            this.showModelThis = false;
-            // 刷新
-            this.$emit("refresh");
-          } else if (res && res.code >= 100 && res.code <= 104) {
-            await this.logout();
-          } else {
-            this.$message.warning(res.message);
-          }
-        } else {
-          console.log("error submit!!");
-          return false;
-        }
-      });
-    },
-  },
-};
-</script>
-
-   <style lang="scss" scoped>
-.active {
-}
-</style>

src/views/goodStore/active/components/packForm.vue

@@ -1,679 +0,0 @@
-<template>
-  <el-form
-    :model="ruleForm"
-    status-icon
-    :rules="rulesThis"
-    ref="ruleForm"
-    :size="'mini'"
-    label-width="110px"
-    class="demo-ruleForm"
-  >
-    <el-row>
-      <el-col :span="1" class="dtitle">
-        <ul>
-          <li>包</li>
-          <li>装</li>
-          <li>信</li>
-          <li>息</li>
-        </ul></el-col
-      >
-      <el-col :span="23" class="dmain">
-        <el-row>
-          <el-col :span="8">
-            <el-form-item label="包装清单" prop="a1">
-              <el-input
-                placeholder="包装清单"
-                v-model="ruleForm.a1"
-                maxlength="250"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="包装方式" prop="a2">
-              <el-input
-                placeholder="包装方式"
-                v-model="ruleForm.a2"
-                maxlength="250"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="装箱规格" prop="a3">
-              <el-input
-                placeholder="装箱规格"
-                v-model="ruleForm.a3"
-                maxlength="250"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="装箱重量" prop="a4">
-              <el-input
-                placeholder="装箱重量"
-                v-model="ruleForm.a4"
-                type="number"
-                :min="0"
-                :max="9999999999.99"
-                :step="2"
-              >
-                <template slot="append">g</template>
-              </el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="装箱尺寸" prop="a5">
-              <el-input
-                placeholder="装箱尺寸"
-                v-model="ruleForm.a5"
-                maxlength="250"
-              />
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="8">
-            <el-form-item label="商品条形码" prop="a6">
-              <el-input
-                placeholder="物流时间"
-                v-model="ruleForm.a6"
-                type="number"
-                :min="0"
-                :max="9999999999999"
-                :step="0"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-col>
-    </el-row>
-    <el-row class="ddiv">
-      <el-col :span="1" class="dtitle">
-        <ul>
-          <li>发</li>
-          <li>货</li>
-          <li>信</li>
-          <li>息</li>
-        </ul></el-col
-      >
-      <el-col :span="23" class="dmain">
-        <el-row>
-          <el-col :span="8">
-            <el-form-item label="供货区域" prop="b1">
-              <el-select
-                v-model="ruleForm.b1"
-                filterable
-                clearable
-                style="width: 100%"
-                placeholder="供货区域"
-              >
-                <el-option
-                  v-for="group in options6"
-                  :key="group.id"
-                  :label="group.name"
-                  :value="group.id"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="发货地" prop="b2">
-              <select-area
-                :placeholder="'发货地'"
-                :value="ruleForm.b2"
-                :is-detail="id !== 'add'"
-                :disabled="isDetail"
-                :size="'mini'"
-                @selectChange="selectAreab2"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="产地" prop="b3">
-              <select-area
-                :placeholder="'产地'"
-                :value="ruleForm.b3"
-                :size="'mini'"
-                :is-detail="id !== 'add'"
-                :disabled="isDetail"
-                @selectChange="selectAreab3"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="物流时间" prop="b4">
-              <el-input
-                placeholder="物流时间"
-                v-model="ruleForm.b4"
-                type="number"
-                :min="0"
-                :max="9999999999"
-                :step="0"
-              >
-                <template slot="append">天</template>
-              </el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="供货周期" prop="b5">
-              <el-input
-                placeholder="供货周期"
-                v-model="ruleForm.b5"
-                type="number"
-                :min="0"
-                :max="9999999999"
-                :step="0"
-              >
-                <template slot="append">天</template>
-              </el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="调样周期" prop="b6">
-              <el-input
-                placeholder="调样周期"
-                v-model="ruleForm.b6"
-                type="number"
-                :min="0"
-                :max="9999999999"
-                :step="0"
-              >
-                <template slot="append">天</template>
-              </el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-col>
-    </el-row>
-    <el-row class="ddiv">
-      <el-col :span="1" class="dtitle">
-        <ul>
-          <li>图</li>
-          <li>片</li>
-          <li>信</li>
-          <li>息</li>
-        </ul></el-col
-      >
-      <el-col :span="23" class="dmain">
-        <el-row style="padding: 0 0 20px 0">
-          <el-col :span="8">
-            <el-form-item label="缩略图" prop="c1" class="goodStore-upload">
-              <div class="btnupload" style="position: relative">
-                <img v-if="ruleForm.c1" :src="ruleForm.c1" class="avatar" />
-                <i v-else class="el-icon-plus avatar-uploader-icon"></i>
-                <file-upload
-                  class="Upload"
-                  :disabled="id == '007'"
-                  :accept="'.jpg,.png,.jpeg'"
-                  :multiple="true"
-                  :uploadcondition="beforeAvatarUpload"
-                  @UploadErrorEvent="UploadErrorEventc1"
-                  @UploadSuccessEvent="UploadSuccessEventc1"
-                ></file-upload>
-              </div>
-              <div class="txt-tips fl">
-                <p>尺寸比例：</p>
-                <p>1:1</p>
-              </div>
-            </el-form-item>
-            <el-form-item label="详情主图" prop="c2" class="goodStore-upload">
-              <div class="btnupload" style="position: relative">
-                <img v-if="ruleForm.c2" :src="ruleForm.c2" class="avatar" />
-                <i v-else class="el-icon-plus avatar-uploader-icon"></i>
-                <file-upload
-                  class="Upload"
-                  :disabled="id == '007'"
-                  :accept="'.jpg,.png,.jpeg'"
-                  :multiple="true"
-                  :uploadcondition="beforeAvatarUpload"
-                  @UploadErrorEvent="UploadErrorEventc2"
-                  @UploadSuccessEvent="UploadSuccessEventc2"
-                ></file-upload>
-              </div>
-            </el-form-item>
-                 <div style="font-size: 12px; color: #606266">
-            <span style="padding: 0 0 0 20px">图片大小：小于1M</span>
-            <span style="padding: 0 0 0 20px">图片类型.jpg/png/jpeg</span>
-          </div>
-          </el-col>
-          <el-col :span="16">
-            <el-form-item label="详情介绍图" prop="c3">
-              <div class="c3-div">
-                <ul v-if="ruleForm.c3" class="clear">
-                  <li class="img-show-li" v-viewer v-for="(img, iindex) in ruleForm.c3" :key="img + iindex">
-                    <img :src="img" alt="" />
-                    <i class="el-icon-close" @click="closeImg(iindex)"></i>
-                  </li>
-                  <li class="img-upload-li" v-if="ruleForm.c3.length < 10">
-                    <div class="goodStore-upload">
-                      <div class="btnupload" style="position: relative">
-                        <i class="el-icon-plus avatar-uploader-icon"></i>
-                        <file-upload
-                          class="Upload"
-                          :disabled="id == '007'"
-                          :accept="'.jpg,.png,.jpeg'"
-                          :multiple="true"
-                          :uploadcondition="beforeAvatarUpload"
-                          @UploadErrorEvent="UploadErrorEventc3"
-                          @UploadSuccessEvent="UploadSuccessEventc3"
-                        ></file-upload>
-                      </div>
-                    </div>
-                  </li>
-                </ul>
-              </div>
-            </el-form-item>
-          </el-col>
-     
-        </el-row>
-      </el-col>
-    </el-row>
-  </el-form>
-</template>
-   <script>
-import asyncRequest from "@/apis/service/goodStore/active";
-import resToken from "@/mixins/resToken";
-import { mapGetters } from "vuex";
-import { options6 } from "../columns";
-export default {
-  name: "activeAdd",
-  mixins: [resToken],
-  computed: {
-    ...mapGetters(["tablebtnSize", "searchSize", "size"]),
-    powers() {
-      let tran =
-        this.$store.getters.btnList.find(
-          (item) => item.menu_route == "activeAdd"
-        ) || {};
-      if (tran && tran.action && tran.action.length > 0) {
-        return tran.action;
-      } else {
-        return [];
-      }
-    },
-  },
-  data() {
-    return {
-      size: "small",
-      rulesThis: this.rules,
-      loading: false,
-      options6: options6,
-      ruleForm: {},
-      rules: {
-        a1: [
-          {
-            required: true,
-            message: "请输入包装清单",
-            trigger: "blur",
-          },
-        ],
-        a2: [
-          {
-            required: true,
-            message: "请输入包装方式",
-            trigger: "blur",
-          },
-        ],
-
-        a3: [
-          {
-            required: true,
-            message: "请输入装箱规格",
-            trigger: "blur",
-          },
-        ],
-        a4: [
-          {
-            required: true,
-            message: "请输入装箱重量",
-            trigger: "blur",
-          },
-        ],
-        a5: [
-          {
-            required: true,
-            message: "请输入装箱尺寸",
-            trigger: "blur",
-          },
-        ],
-        b1: [
-          {
-            required: true,
-            message: "请选择供货区域",
-            trigger: "change",
-          },
-        ],
-        b2: [
-          {
-            type: "array",
-            required: true,
-            message: "请选择发货地",
-            trigger: "change",
-          },
-        ],
-        b3: [
-          {
-            type: "array",
-            required: true,
-            message: "请选择产地",
-            trigger: "change",
-          },
-        ],
-        b4: [
-          {
-            required: true,
-            message: "请输入物流时间",
-            trigger: "blur",
-          },
-        ],
-        b5: [
-          {
-            required: true,
-            message: "请输入供货周期",
-            trigger: "blur",
-          },
-        ],
-        b6: [
-          {
-            required: true,
-            message: "请输入调样周期",
-            trigger: "blur",
-          },
-        ],
-        c1: [
-          {
-            required: true,
-            message: "商品主图",
-            trigger: "change",
-          },
-        ],
-        c2: [
-          {
-            required: true,
-            message: "商品分类",
-            trigger: "change",
-          },
-        ],
-        c3: [
-          {
-            type: "array",
-            required: true,
-            message: "商品品牌",
-            trigger: "change",
-          },
-        ],
-      },
-    };
-  },
-  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);
-    },
-    async initData() {
-      this.loading = true;
-      let res = await asyncRequest.detail({ id: this.id });
-      this.loading = false;
-      if (res.code === 0) {
-        await this.resetForm(res.data);
-      }
-    },
-    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: "",
-        b1: "",
-        b2: [],
-        b3: [],
-        b4: "",
-        b5: "",
-        b6: "",
-        c1: "",
-        c2: "",
-        c3: [],
-      };
-    },
-    //仓库省市区
-    selectAreab2(e) {
-      this.ruleForm.b2 = e;
-      this.$refs.ruleForm.validateField("b2");
-    },
-    //仓库省市区
-    selectAreab3(e) {
-      this.ruleForm.b3 = e;
-      this.$refs.ruleForm.validateField("b3");
-    },
-    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.catid = obj.catid[obj.catid.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;
-        }
-      });
-    },
-
-    closeImg(index) {
-      this.ruleForm.c3.splice(index, 1);
-      this.$refs.ruleForm.validateField("c3");
-    },
-    //图片上传成功
-    async UploadSuccessEventc1(data) {
-      await this.UploadSuccessEvent(1, data);
-    },
-    //图片上传成功
-    async UploadSuccessEventc2(data) {
-      await this.UploadSuccessEvent(2, data);
-    },
-    //图片上传成功
-    async UploadSuccessEventc3(data) {
-      await this.UploadSuccessEvent(3, data);
-    },
-    //图片上传成功
-    async UploadSuccessEvent(type, data) {
-      const { url } = data;
-      if (url === "noToken") {
-        await this.logout();
-      } else {
-        if (type === 1) {
-          this.ruleForm.c1 = url;
-          this.$refs.ruleForm.validateField("c1");
-        } else if (type === 2) {
-          this.ruleForm.c2 = url;
-          this.$refs.ruleForm.validateField("c2");
-        } else {
-          this.ruleForm.c3.push(url);
-          this.$refs.ruleForm.validateField("c3");
-        }
-        this.$message.success("图片上传成功!");
-      }
-    },
-    //图片上传失败
-    UploadErrorEventc1(res) {
-      this.imgUploadError(1, res);
-    },
-    //图片上传失败
-    UploadErrorEventc2(res) {
-      this.imgUploadError(2, res);
-    },
-    //图片上传失败
-    UploadErrorEventc3(res) {
-      this.imgUploadError(3, res);
-    },
-    imgUploadError(type, res) {
-      if (res !== "break") {
-        this.$message.error("图片上传失败!");
-        this.$refs.ruleForm.validateField(
-          type === 1 ? "c1" : type === 2 ? "c2" : "c3"
-        );
-      }
-    },
-    //判断图片规格
-    beforeAvatarUpload(file) {
-      let isJPG = false;
-      if (
-        file.type === "image/jpg" ||
-        file.type === "image/png" ||
-        file.type === "image/jpeg"
-      ) {
-        isJPG = true;
-      }
-      const isLt2M = file.size / 1024 / 1024 < 1;
-      if (!isJPG) {
-        this.$message.error("图片格式不正确！");
-      }
-      if (!isLt2M) {
-        this.$message.error("图片大小不能超过 1MB!");
-      }
-      return isJPG && isLt2M;
-    },
-  },
-};
-</script>
-   <style lang="scss" scoped>
-.activeAdd {
-  .c3-div {
-    ul {
-      float: left;
-      width: 100%;
-
-      li {
-        float: left;
-        width: 102px;
-        height: 102px;
-        overflow: hidden;
-        margin: 0 10px 10px 0;
-        border: 1px solid rgb(220, 223, 230);
-        position: relative;
-        &.img-upload-li {
-          border: 0;
-        }
-        &.img-show-li {
-          img {
-            display: inline-block;
-            width: 100%;
-          }
-          i {
-            position: absolute;
-            width: 20px;
-            height: 20px;
-            font-size: 13px;
-            text-align: center;
-            line-height: 20px;
-            top: 0;
-            right: 0;
-            z-index: 2;
-            color: rgb(220, 223, 230);
-          }
-          &:hover {
-            i {
-              color: #63cbe7;
-              &:hover {
-                cursor: pointer;
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-}
-</style>
-   

src/views/goodStore/goodsCost/columns.js

@@ -11,24 +11,29 @@ const options2 = [
 ]
 //销售权限
 const options3 = [
-  { id: "0", name: "有销售权限" },
-  { id: "1", name: "无销售权限" },
+  { id: "0", name: "无销售权限" },
+  { id: "1", name: "有销售权限" },
 ]
 
 //是否库存品
 const options4 = [
-  { id: "0", name: "库存品" },
-  { id: "1", name: "非库存品" },
+  { id: "0", name: "非库存品" },
+  { id: "1", name: "库存品" },
 ]
 //是否启用实时金价
 const options5 = [
-  { id: "0", name: "是" },
-  { id: "1", name: "否" },
+  { id: "0", name: "否" },
+  { id: "1", name: "是" },
 ]
 //供货区域
 const options6 = [
-  { id: "0", name: "全国" },
-  { id: "1", name: "全国除偏远" },
+  { id: "1", name: "全国" },
+  { id: "2", name: "全国除偏远" },
+]
+//是否启用阶梯
+const options7 = [
+  { id: "0", name: "否" },
+  { id: "1", name: "是" },
 ]
 const listCol = [
   {
@@ -88,4 +93,4 @@ const listCol = [
   },
 ]
 
-export  { options1, options2, options3, options4, options5, options6,listCol }
+export { options1, options2, options3, options4, options5, options6, options7, listCol }

src/views/goodStore/goodsCost/components/baseForm.vue

@@ -20,31 +20,117 @@
       <el-col :span="23" class="dmain">
         <el-row>
           <el-col :span="8">
-            <el-form-item label="商品分类" prop="a1">
-              111
-              <!-- <good-class
-                :value="ruleForm.a1"
+            <el-form-item label="商品分类" prop="cat_id">
+              <good-class
+                :value="ruleForm.cat_id"
                 @handleChange="goods_class_change"
                 :disabled="false"
                 :size="'mini'"
                 :isDetail="false"
                 :placeholder="'商品分类'"
-              /> -->
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="16">
+            <el-form-item label="商品名称" prop="good_name">
+              <el-input
+                placeholder="商品名称"
+                maxlength="100"
+                v-model="ruleForm.good_name"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8">
+            <el-form-item label="业务公司" prop="company_id">
+              <search-work-company
+                :value="ruleForm.company_id"
+                :placeholder="'业务公司'"
+                :disabled="false"
+                :size="'mini'"
+                :isDetail="false"
+                @searchChange="company_idsearchChange"
+              />
             </el-form-item>
-            <el-form-item label="商品品牌" prop="a2">
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="供应商" prop="supplierNo">
+              <search-supplier
+                :value="ruleForm.supplierNo"
+                :placeholder="'供应商'"
+                :disabled="false"
+                :size="'mini'"
+                :isDetail="false"
+                @searchChange="supplierNosearchChange"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="销售权限" prop="is_auth">
+              <el-select
+                v-model="ruleForm.is_auth"
+                filterable
+                clearable
+                style="width: 100%"
+                placeholder="销售权限"
+              >
+                <el-option
+                  v-for="group in options3"
+                  :key="group.id"
+                  :label="group.name"
+                  :value="group.id"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="商品品牌" prop="brandid">
               <search-brand
-                :value="ruleForm.a2"
+                :value="ruleForm.brandid"
                 :disabled="false"
                 :size="'mini'"
                 :isDetail="false"
                 :placeholder="'商品品牌'"
-                @searchChange="a2searchChange"
+                @searchChange="brandidsearchChange"
               />
             </el-form-item>
-            <el-form-item label="重量" prop="a3">
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="商品单位" prop="unit">
+              <search-unit
+                :value="ruleForm.unit"
+                :disabled="false"
+                :size="'mini'"
+                :isDetail="false"
+                :placeholder="'商品单位'"
+                @searchChange="unitsearchChange"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="专属类型" prop="is_exclusive">
+              <el-select
+                v-model="ruleForm.is_exclusive"
+                filterable
+                clearable
+                style="width: 100%"
+                placeholder="专属类型"
+              >
+                <el-option
+                  v-for="group in options2"
+                  :key="group.id"
+                  :label="group.name"
+                  :value="group.id"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8">
+            <el-form-item label="商品总重量" prop="weight">
               <el-input
-                placeholder="重量"
-                v-model="ruleForm.a3"
+                placeholder="商品总重量"
+                v-model="ruleForm.weight"
                 type="number"
                 :min="0"
                 :max="9999999999.99"
@@ -53,195 +139,155 @@
                 <template slot="append">g</template>
               </el-input>
             </el-form-item>
-
-            <el-form-item label="是否定制" prop="a4">
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="是否库存品" prop="is_stock">
               <el-select
-                v-model="ruleForm.a4"
+                v-model="ruleForm.is_stock"
                 filterable
                 clearable
                 style="width: 100%"
-                placeholder="是否定制"
+                placeholder="是否库存品"
               >
                 <el-option
-                  v-for="group in options1"
+                  v-for="group in options4"
                   :key="group.id"
                   :label="group.name"
                   :value="group.id"
                 />
               </el-select>
             </el-form-item>
-            <el-form-item label="是否库存品" prop="a5">
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="税点" prop="tax">
+              <search-tax
+                :value="ruleForm.tax"
+                :disabled="false"
+                :size="'mini'"
+                :isDetail="false"
+                :placeholder="'税点'"
+                @searchChange="taxsearchChange"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="贵金属重量" prop="noble_weight">
+              <el-input
+                placeholder="贵金属重量"
+                v-model="ruleForm.noble_weight"
+                type="number"
+                :min="0"
+                :max="9999999999.99"
+                :step="2"
+              >
+                <template slot="append">g</template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="贵金属种类" prop="noble_metal">
+              <search-metal-kind
+                :value="ruleForm.noble_metal"
+                :disabled="false"
+                :size="'mini'"
+                :isDetail="false"
+                :placeholder="'贵金属种类'"
+                @searchChange="noble_metalsearchChange"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="启用实时金价" prop="is_gold_price">
               <el-select
-                v-model="ruleForm.a5"
+                v-model="ruleForm.is_gold_price"
                 filterable
                 clearable
                 style="width: 100%"
-                placeholder="是否库存品"
+                placeholder="启用实时金价"
               >
                 <el-option
-                  v-for="group in options4"
+                  v-for="group in options5"
                   :key="group.id"
                   :label="group.name"
                   :value="group.id"
                 />
               </el-select>
             </el-form-item>
-            <el-form-item label="供应商" prop="a6">
-              <search-supplier
-                :value="ruleForm.a6"
-                :placeholder="'供应商'"
-                :disabled="false"
-                :size="'mini'"
-                :isDetail="false"
-                @searchChange="a6searchChange"
-              />
-            </el-form-item>
-            <el-form-item label="销售权限" prop="a7">
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="是否定制" prop="good_type">
               <el-select
-                v-model="ruleForm.a7"
+                v-model="ruleForm.good_type"
                 filterable
                 clearable
                 style="width: 100%"
-                placeholder="销售权限"
+                placeholder="是否定制"
               >
                 <el-option
-                  v-for="group in options3"
+                  v-for="group in options1"
                   :key="group.id"
                   :label="group.name"
                   :value="group.id"
                 />
               </el-select>
             </el-form-item>
-            <el-form-item label="税点" prop="a8">
-              <search-tax
-                :value="ruleForm.a8"
-                :disabled="false"
-                :size="'mini'"
-                :isDetail="false"
-                :placeholder="'税点'"
-                @searchChange="a8searchChange"
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="定制起订量" prop="moq">
+              <el-input
+                placeholder="定制起订量"
+                v-model="ruleForm.moq"
+                type="number"
+                :min="0"
+                :max="9999999999"
+                :step="0"
               />
             </el-form-item>
           </el-col>
-          <el-col :span="16">
-            <el-form-item label="商品名称" prop="b1">
+          <el-col :span="8">
+            <el-form-item label="定制工期" prop="customized">
               <el-input
-                placeholder="请输入商品名称"
-                maxlength="100"
-                v-model="ruleForm.b1"
-              ></el-input>
+                placeholder="定制工期"
+                v-model="ruleForm.customized"
+                type="number"
+                :min="0"
+                :max="9999999999"
+                :step="0"
+              >
+                <template slot="append">天</template>
+              </el-input>
             </el-form-item>
-            <el-row>
-              <el-col :span="12">
-                <el-form-item label="商品单位" prop="b2">
-                  <search-unit
-                    :value="ruleForm.b2"
-                    :disabled="false"
-                    :size="'mini'"
-                    :isDetail="false"
-                    :placeholder="'商品单位'"
-                    @searchChange="b2searchChange"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item label="专属类型" prop="b3">
-                  <el-select
-                    v-model="ruleForm.b3"
-                    filterable
-                    clearable
-                    style="width: 100%"
-                    placeholder="专属类型"
-                  >
-                    <el-option
-                      v-for="group in options2"
-                      :key="group.id"
-                      :label="group.name"
-                      :value="group.id"
-                    />
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item label="贵金属种类" prop="b4">
-                  <search-metal-kind
-                    :value="ruleForm.b4"
-                    :disabled="false"
-                    :size="'mini'"
-                    :isDetail="false"
-                    :placeholder="'贵金属种类'"
-                    @searchChange="b4searchChange"
-                  /> </el-form-item
-              ></el-col>
-              <el-col :span="12">
-                <el-form-item label="启用实时金价" prop="b5">
-                  <el-select
-                    v-model="ruleForm.b5"
-                    filterable
-                    clearable
-                    style="width: 100%"
-                    placeholder="启用实时金价"
-                  >
-                    <el-option
-                      v-for="group in options5"
-                      :key="group.id"
-                      :label="group.name"
-                      :value="group.id"
-                    />
-                  </el-select> </el-form-item
-              ></el-col>
-              <el-col :span="12">
-                <el-form-item label="定制起订量" prop="b6">
-                  <el-input
-                    placeholder="定制起订量"
-                    v-model="ruleForm.b6"
-                    type="number"
-                    :min="0"
-                    :max="9999999999"
-                    :step="0"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item label="定制工期" prop="b7">
-                  <el-input
-                    placeholder="定制工期"
-                    v-model="ruleForm.b7"
-                    type="number"
-                    :min="0"
-                    :max="9999999999"
-                    :step="0"
-                  >
-                    <template slot="append">天</template>
-                  </el-input>
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-form-item label="售后说明" prop="b8">
+          </el-col>
+
+          <el-col :span="8">
+            <el-form-item label="售后说明" prop="after_sales">
               <el-input
                 type="textarea"
-                :rows="2"
+                :rows="4"
                 placeholder="售后说明"
-                v-model="ruleForm.b8"
+                v-model="ruleForm.after_sales"
               >
               </el-input>
             </el-form-item>
-
-            <el-form-item label="工艺说明" prop="b9">
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="商品备注" prop="good_remark">
               <el-input
                 type="textarea"
-                :rows="2"
-                placeholder="工艺说明"
-                v-model="ruleForm.b9"
+                :rows="4"
+                placeholder="商品备注"
+                v-model="ruleForm.good_remark"
               >
               </el-input>
             </el-form-item>
-            <el-form-item label="商品备注" prop="bb1">
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="工艺说明" prop="craft_desc">
               <el-input
                 type="textarea"
-                :rows="2"
-                placeholder="商品备注"
-                v-model="ruleForm.bb1"
+                :rows="4"
+                placeholder="工艺说明"
+                v-model="ruleForm.craft_desc"
               >
               </el-input>
             </el-form-item>
@@ -262,7 +308,7 @@
       <el-col :span="23" class="dmain" style="padding-left: 18px">
         <el-table :data="tableData" :size="'mini'" border style="width: 100%">
           <!-- <el-table-column prop="index" label="序号"> </el-table-column> -->
-          <el-table-column prop="name" label="规格类型"  />
+          <el-table-column prop="name" label="规格类型" />
           <el-table-column prop="address" label="规格值"> </el-table-column>
           <el-table-column fixed="right">
             <template slot="header" slot-scope="scope">
@@ -352,14 +398,14 @@ export default {
       options5: options5,
       ruleForm: {},
       rules: {
-        a1: [
+        cat_id: [
           {
             required: true,
             message: "商品分类",
             trigger: "change",
           },
         ],
-        a2: [
+        brandid: [
           {
             type: "array",
             required: true,
@@ -367,28 +413,43 @@ export default {
             trigger: "change",
           },
         ],
-        a3: [
+        noble_weight: [
+          {
+            required: true,
+            message: "贵金属重量为合法数字",
+            trigger: "blur",
+          },
+        ],
+        weight: [
           {
             required: true,
-            message: "商品重量为合法数字",
+            message: "商品总重量为合法数字",
             trigger: "blur",
           },
         ],
-        a4: [
+        good_type: [
           {
             required: true,
             message: "请选择是否定制",
             trigger: "change",
           },
         ],
-        a5: [
+        is_stock: [
           {
             required: true,
             message: "请选择是否库存品",
             trigger: "change",
           },
         ],
-        a6: [
+        company_id: [
+          {
+            type: "array",
+            required: true,
+            message: "请选择业务公司",
+            trigger: "change",
+          },
+        ],
+        supplierNo: [
           {
             type: "array",
             required: true,
@@ -396,78 +457,77 @@ export default {
             trigger: "change",
           },
         ],
-        a7: [
+        is_auth: [
           {
             required: true,
             message: "商品主图",
             trigger: "change",
           },
         ],
-        a8: [
+        tax: [
           {
             required: true,
             message: "请选择税率",
             trigger: "change",
           },
         ],
-        b1: [
+        good_name: [
           {
             required: true,
             message: "请输入商品名称",
             trigger: "blur",
           },
         ],
-        b2: [
+        unit: [
           {
             required: true,
             message: "请输入商品单位",
             trigger: "blur",
           },
         ],
-        b3: [
+        is_exclusive: [
           {
             required: true,
             message: "请选择专属类型",
             trigger: "change",
           },
         ],
-        b4: [
+        noble_metal: [
           {
-            type: "array",
             required: true,
             message: "请选择贵金属种类",
             trigger: "change",
           },
         ],
-        b5: [
+        is_gold_price: [
           {
             required: true,
             message: "请选择是否启用实时金价",
             trigger: "change",
           },
         ],
-        b6: [
+        moq: [
           {
             required: true,
             message: "定制起订量应为合法数字",
             trigger: "blur",
           },
         ],
-        b7: [
+        customized: [
           {
             required: true,
             message: "定制工期为合法数字",
             trigger: "blur",
           },
         ],
-        b8: [
+        after_sales: [
           {
             required: true,
             message: "售后说明不能为空",
             trigger: "blur",
           },
         ],
-        bb1: [
+        good_remark: [
           {
             required: true,
             message: "商品备注不能为空",
@@ -475,7 +535,7 @@ export default {
           },
         ],
       },
-      ruleForm: {},
+   
     };
   },
   mounted() {
@@ -523,24 +583,26 @@ export default {
     },
     resetFormData() {
       this.ruleForm = {
-        a1: "",
-        a2: [],
-        a3: "",
-        a4: "",
-        a5: "",
-        a6: [],
-        a7: "",
-        a8: "",
-        b1: "2018春秋新款V领修身丝绒西装女 双排扣复古极简中长款工装外套",
-        b2: "",
-        b3: "",
-        b4: "",
-        b5: "",
-        b6: "",
-        b7: "",
-        b8: "",
-        b9: "",
-        bb1: "",
+        cat_id: "",
+        brandid: [],
+        noble_weight: "",
+        weight: "",
+        good_type: "",
+        is_stock: "",
+        supplierNo: [],
+        company_id: [],
+        is_auth: "",
+        tax: "",
+        good_name: "2018春秋新款V领修身丝绒西装女 双排扣复古极简中长款工装外套",
+        unit: "",
+        is_exclusive: "",
+        noble_metal: "",
+        is_gold_price: "",
+        moq: "",
+        customized: "",
+        after_sales: "",
+        craft_desc: "",
+        good_remark: "",
       };
     },
     refreshEdit(e) {
@@ -548,69 +610,69 @@ export default {
     },
     //商品分类选择
     goods_class_change(e) {
-      this.ruleForm.a1 = e;
-      this.$refs.ruleForm.validateField("a1");
+      this.ruleForm.cat_id = e;
+      this.$refs.ruleForm.validateField("cat_id");
     },
     //商品品牌选择
-    a2searchChange(e) {
+    brandidsearchChange(e) {
       const { id, code, label } = e;
       if (id) {
-        this.ruleForm.a2 = [id];
+        this.ruleForm.brandid = [id];
       } else {
-        this.ruleForm.a2 = [];
+        this.ruleForm.brandid = [];
       }
-      this.$refs.ruleForm.validateField("a2");
+      this.$refs.ruleForm.validateField("brandid");
     },
     //供应商选择
-    a6searchChange(e) {
+    supplierNosearchChange(e) {
       const { id, code, label } = e;
       if (id) {
-        this.ruleForm.a6 = [code];
+        this.ruleForm.supplierNo = [code];
       } else {
-        this.ruleForm.a6 = [];
+        this.ruleForm.supplierNo = [];
       }
-      this.$refs.ruleForm.validateField("a6");
+      this.$refs.ruleForm.validateField("supplierNo");
     },
-    //税点选择
-    a8searchChange(e) {
-      // console.log(e);
+    company_idsearchChange(e) {
       const { id, code, label } = e;
       if (id) {
-        this.ruleForm.a8 = label;
+        this.ruleForm.company_id = [code];
       } else {
-        this.ruleForm.a8 = "";
+        this.ruleForm.company_id = [];
       }
-      this.$refs.ruleForm.validateField("a8");
+      this.$refs.ruleForm.validateField("company_id");
     },
-    //单位选择
-    b2searchChange(e) {
+    //税点选择
+    taxsearchChange(e) {
+      // console.log(e);
       const { id, code, label } = e;
       if (id) {
-        this.ruleForm.b2 = [code];
+        this.ruleForm.tax = label;
       } else {
-        this.ruleForm.b2 = [];
+        this.ruleForm.tax = "";
       }
-      this.$refs.ruleForm.validateField("b2");
+      this.$refs.ruleForm.validateField("tax");
     },
-    //贵金属种类选择
-    b4searchChange(e) {
+    //单位选择
+    unitsearchChange(e) {
       const { id, code, label } = e;
       if (id) {
-        this.ruleForm.b4 = code;
+        this.ruleForm.unit = [code];
       } else {
-        this.ruleForm.b4 = "";
+        this.ruleForm.unit = [];
       }
-      this.$refs.ruleForm.validateField("b4");
+      this.$refs.ruleForm.validateField("unit");
     },
-    //税点选择
-    b4searchChange(e) {
+    //贵金属种类选择
+    noble_metalsearchChange(e) {
+      console.log(e);
       const { id, code, label } = e;
       if (id) {
-        this.ruleForm.b4 = code;
+        this.ruleForm.noble_metal = id;
       } else {
-        this.ruleForm.b4 = "";
+        this.ruleForm.noble_metal = "";
       }
-      this.$refs.ruleForm.validateField("b4");
+      this.$refs.ruleForm.validateField("noble_metal");
     },
     async submitForm() {
       await this.$refs.ruleForm.validate(async (valid) => {
@@ -667,7 +729,7 @@ export default {
                 this.loading = true;
                 let obj = JSON.parse(JSON.stringify(this.ruleForm));
                 obj.stock = stock;
-                obj.a1 = obj.a1[obj.a1.length - 1];
+                obj.cat_id = obj.cat_id[obj.cat_id.length - 1];
                 obj.image = obj.image.join();
                 //split(",");
                 console.log(obj);

src/views/goodStore/goodsCost/components/costForm.vue

@@ -20,10 +20,10 @@
       <el-col :span="23" class="dmain">
         <el-row>
           <el-col :span="8">
-            <el-form-item label="证书费" prop="a1">
+            <el-form-item label="证书费" prop="cert_fee">
               <el-input
                 placeholder="证书费"
-                v-model="ruleForm.a1"
+                v-model="ruleForm.cert_fee"
                 type="number"
                 :min="0"
                 :max="9999999999.99"
@@ -34,10 +34,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="包装费" prop="a2">
+            <el-form-item label="包装费" prop="packing_fee">
               <el-input
                 placeholder="包装费"
-                v-model="ruleForm.a2"
+                v-model="ruleForm.packing_fee"
                 type="number"
                 :min="0"
                 :max="9999999999.99"
@@ -48,10 +48,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="成本工艺费" prop="a3">
+            <el-form-item label="成本工艺费" prop="cost_fee">
               <el-input
                 placeholder="成本工艺费"
-                v-model="ruleForm.a3"
+                v-model="ruleForm.cost_fee"
                 type="number"
                 :min="0"
                 :max="9999999999.99"
@@ -62,10 +62,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="加标费" prop="a4">
+            <el-form-item label="加标费" prop="mark_fee">
               <el-input
                 placeholder="加标费"
-                v-model="ruleForm.a4"
+                v-model="ruleForm.mark_fee"
                 type="number"
                 :min="0"
                 :max="9999999999.99"
@@ -76,10 +76,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="打样费" prop="a5">
+            <el-form-item label="打样费" prop="demo_fee">
               <el-input
                 placeholder="打样费"
-                v-model="ruleForm.a5"
+                v-model="ruleForm.demo_fee"
                 type="number"
                 :min="0"
                 :max="9999999999.99"
@@ -90,10 +90,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="开模费" prop="a6">
+            <el-form-item label="开模费" prop="open_fee">
               <el-input
                 placeholder="开模费"
-                v-model="ruleForm.a6"
+                v-model="ruleForm.open_fee"
                 type="number"
                 :min="0"
                 :max="9999999999.99"
@@ -104,10 +104,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="调样费" prop="a7">
+            <el-form-item label="调样费" prop="sample_fee">
               <el-input
                 placeholder="调样费"
-                v-model="ruleForm.a7"
+                v-model="ruleForm.sample_fee"
                 type="number"
                 :min="0"
                 :max="9999999999.99"
@@ -118,10 +118,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="市场价" prop="a8">
+            <el-form-item label="市场价" prop="market_price">
               <el-input
                 placeholder="市场价"
-                v-model="ruleForm.a8"
+                v-model="ruleForm.market_price"
                 type="number"
                 :min="0"
                 :max="9999999999.99"
@@ -132,10 +132,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="含税成本裸价" prop="a9">
+            <el-form-item label="含税成本裸价" prop="nake_price">
               <el-input
                 placeholder="含税成本裸价"
-                v-model="ruleForm.a9"
+                v-model="ruleForm.nake_price"
                 type="number"
                 :min="0"
                 :max="9999999999.99"
@@ -158,42 +158,64 @@
         </ul></el-col
       >
       <el-col :span="23" class="dmain" style="padding-left: 18px">
-        <el-table
-          :data="tableData"
-          :size="'mini'"
-          border
-          stripe
-          style="width: 100%"
-        >
-          <el-table-column prop="s1" label="起订量(>=)" />
-          <el-table-column prop="s2" label="成本裸价" />
-          <el-table-column prop="s3" label="成本合计" />
-          <el-table-column prop="s4" label="其中运费" />
-          <el-table-column prop="s5" label="使用状态" />
-          <el-table-column fixed="right">
-            <template slot="header" slot-scope="scope">
-              <span>操作</span>
-              <el-tooltip effect="dark" content="添加阶梯" placement="top">
-                <i
-                  class="el-icon-circle-plus-outline tb-icon fr"
-                  @click="openEdit('add', {})"
-                ></i>
-              </el-tooltip>
-            </template>
-            <template slot-scope="scope">
-              <el-tooltip effect="dark" content="修改" placement="top">
-                <i class="el-icon-edit tb-icon" @click="openEdit('')"></i>
-              </el-tooltip>
-              <el-tooltip effect="dark" content="禁/启用" placement="top">
-                <i
-                  class="el-icon-video-pause tb-icon"
-                  @click="openEdit('')"
-                ></i>
-                <!-- el-icon-video-play -->
-              </el-tooltip>
-            </template>
-          </el-table-column>
-        </el-table>
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="启用阶梯" prop="is_step">
+              <el-select
+                v-model="ruleForm.is_step"
+                filterable
+                clearable
+                style="width: 100%"
+                placeholder="启用阶梯"
+              >
+                <el-option
+                  v-for="group in options5"
+                  :key="group.id"
+                  :label="group.name"
+                  :value="group.id"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-table
+              :data="tableData"
+              :size="'mini'"
+              border
+              stripe
+              style="width: 100%"
+            >
+              <el-table-column prop="s1" label="起订量(>=)" />
+              <el-table-column prop="s2" label="成本裸价" />
+              <el-table-column prop="s3" label="成本合计" />
+              <el-table-column prop="s4" label="其中运费" />
+              <el-table-column prop="s5" label="使用状态" />
+              <el-table-column fixed="right">
+                <template slot="header" slot-scope="scope">
+                  <span>操作</span>
+                  <el-tooltip effect="dark" content="添加阶梯" placement="top">
+                    <i
+                      class="el-icon-circle-plus-outline tb-icon fr"
+                      @click="openEdit('add', {})"
+                    ></i>
+                  </el-tooltip>
+                </template>
+                <template slot-scope="scope">
+                  <el-tooltip effect="dark" content="修改" placement="top">
+                    <i class="el-icon-edit tb-icon" @click="openEdit('')"></i>
+                  </el-tooltip>
+                  <el-tooltip effect="dark" content="禁/启用" placement="top">
+                    <i
+                      class="el-icon-video-pause tb-icon"
+                      @click="openEdit('')"
+                    ></i>
+                    <!-- el-icon-video-play -->
+                  </el-tooltip>
+                </template>
+              </el-table-column>
+            </el-table>
+          </el-col>
+        </el-row>
         <!-- 弹窗 新增/修改 -->
         <cost-form-add-edit
           :id="modelId"
@@ -208,6 +230,7 @@
    <script>
 import asyncRequest from "@/apis/service/goodStore/goodsCost";
 import resToken from "@/mixins/resToken";
+import { options7 } from "../columns";
 import { mapGetters } from "vuex";
 import costFormAddEdit from "./costFormAddEdit";
 export default {
@@ -234,6 +257,7 @@ export default {
     return {
       showModel: false,
       modelId: "000",
+      options7: options7,
       sitem: {},
       size: "small",
       rulesThis: this.rules,
@@ -241,69 +265,74 @@ export default {
       loading: false,
       tableData: [{ id: 1, s1: "1", s2: "-", s3: "-", s4: "-", s5: "0" }],
       rules: {
-        a1: [
+        cert_fee: [
           {
             required: true,
             message: "证书费应为合法数字",
             trigger: "blur",
           },
         ],
-        a2: [
+        packing_fee: [
           {
             required: true,
             message: "包装费应为合法数字",
             trigger: "blur",
           },
         ],
-        a3: [
+        cost_fee: [
           {
             required: true,
             message: "成本工艺费应为合法数字",
             trigger: "blur",
           },
         ],
-        a4: [
+        mark_fee: [
           {
             required: true,
             message: "加标费应为合法数字",
             trigger: "blur",
           },
         ],
-        a5: [
+        demo_fee: [
           {
             required: true,
             message: "打样应为合法数字",
             trigger: "blur",
           },
         ],
-        a6: [
+        open_fee: [
           {
             required: true,
             message: "开模费应为合法数字",
             trigger: "blur",
           },
         ],
-        a7: [
+        sample_fee: [
           {
             required: true,
             message: "调样费应为合法数字",
             trigger: "blur",
           },
         ],
-        a8: [
+        market_price: [
           {
             required: true,
             message: "市场价应为合法数字",
             trigger: "blur",
           },
         ],
-        a9: [
+        nake_price: [
           {
             required: true,
             message: "含税成本裸价应为合法数字",
             trigger: "blur",
           },
         ],
+        is_step: {
+          required: true,
+          message: "请选择是否启用阶梯",
+          trigger: "change",
+        },
       },
       ruleForm: {},
     };
@@ -350,15 +379,15 @@ export default {
     },
     resetFormData() {
       this.ruleForm = {
-        a1: "",
-        a2: "",
-        a3: "",
-        a4: "",
-        a5: "",
-        a6: "",
-        a7: "",
-        a8: "",
-        a9: "",
+        cert_fee: "",
+        packing_fee: "",
+        cost_fee: "",
+        mark_fee: "",
+        demo_fee: "",
+        open_fee: "",
+        sample_fee: "",
+        market_price: "",
+        nake_price: "",
         b1: [],
       };
     },

src/views/goodStore/goodsCost/components/packForm.vue

@@ -20,37 +20,37 @@
       <el-col :span="23" class="dmain">
         <el-row>
           <el-col :span="8">
-            <el-form-item label="包装清单" prop="a1">
+            <el-form-item label="包装清单" prop="packing_list">
               <el-input
                 placeholder="包装清单"
-                v-model="ruleForm.a1"
+                v-model="ruleForm.packing_list"
                 maxlength="250"
               />
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="包装方式" prop="a2">
+            <el-form-item label="包装方式" prop="packing_way">
               <el-input
                 placeholder="包装方式"
-                v-model="ruleForm.a2"
+                v-model="ruleForm.packing_way"
                 maxlength="250"
               />
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="装箱规格" prop="a3">
+            <el-form-item label="装箱规格" prop="packing_spec">
               <el-input
                 placeholder="装箱规格"
-                v-model="ruleForm.a3"
+                v-model="ruleForm.packing_spec"
                 maxlength="250"
               />
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="装箱重量" prop="a4">
+            <el-form-item label="装箱重量" prop="packing_weight">
               <el-input
                 placeholder="装箱重量"
-                v-model="ruleForm.a4"
+                v-model="ruleForm.packing_weight"
                 type="number"
                 :min="0"
                 :max="9999999999.99"
@@ -61,20 +61,20 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="装箱尺寸" prop="a5">
+            <el-form-item label="装箱尺寸" prop="packing_szie">
               <el-input
                 placeholder="装箱尺寸"
-                v-model="ruleForm.a5"
+                v-model="ruleForm.packing_szie"
                 maxlength="250"
               />
             </el-form-item>
           </el-col>
 
           <el-col :span="8">
-            <el-form-item label="商品条形码" prop="a6">
+            <el-form-item label="商品条形码" prop="good_bar">
               <el-input
                 placeholder="物流时间"
-                v-model="ruleForm.a6"
+                v-model="ruleForm.good_bar"
                 type="number"
                 :min="0"
                 :max="9999999999999"
@@ -97,9 +97,9 @@
       <el-col :span="23" class="dmain">
         <el-row>
           <el-col :span="8">
-            <el-form-item label="供货区域" prop="b1">
+            <el-form-item label="供货区域" prop="supply_area">
               <el-select
-                v-model="ruleForm.b1"
+                v-model="ruleForm.supply_area"
                 filterable
                 clearable
                 style="width: 100%"
@@ -115,34 +115,34 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="发货地" prop="b2">
+            <el-form-item label="发货地" prop="delivery_place">
               <select-area
                 :placeholder="'发货地'"
-                :value="ruleForm.b2"
+                :value="ruleForm.delivery_place"
                 :is-detail="id !== 'add'"
                 :disabled="isDetail"
                 :size="'mini'"
-                @selectChange="selectAreab2"
+                @selectChange="selectAreadelivery_place"
               />
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="产地" prop="b3">
+            <el-form-item label="产地" prop="origin_place">
               <select-area
                 :placeholder="'产地'"
-                :value="ruleForm.b3"
+                :value="ruleForm.origin_place"
                 :size="'mini'"
                 :is-detail="id !== 'add'"
                 :disabled="isDetail"
-                @selectChange="selectAreab3"
+                @selectChange="selectAreaorigin_place"
               />
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="物流时间" prop="b4">
+            <el-form-item label="物流时间" prop="delivery_day">
               <el-input
                 placeholder="物流时间"
-                v-model="ruleForm.b4"
+                v-model="ruleForm.delivery_day"
                 type="number"
                 :min="0"
                 :max="9999999999"
@@ -153,10 +153,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="供货周期" prop="b5">
+            <el-form-item label="供货周期" prop="lead_time">
               <el-input
                 placeholder="供货周期"
-                v-model="ruleForm.b5"
+                v-model="ruleForm.lead_time"
                 type="number"
                 :min="0"
                 :max="9999999999"
@@ -167,10 +167,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="调样周期" prop="b6">
+            <el-form-item label="调样周期" prop="sample_day">
               <el-input
                 placeholder="调样周期"
-                v-model="ruleForm.b6"
+                v-model="ruleForm.sample_day"
                 type="number"
                 :min="0"
                 :max="9999999999"
@@ -195,9 +195,9 @@
       <el-col :span="23" class="dmain">
         <el-row style="padding: 0 0 20px 0">
           <el-col :span="8">
-            <el-form-item label="缩略图" prop="c1" class="activity-upload">
+            <el-form-item label="缩略图" prop="good_thumb_img" class="activity-upload">
               <div class="btnupload" style="position: relative">
-                <img v-if="ruleForm.c1" :src="ruleForm.c1" class="avatar" />
+                <img v-if="ruleForm.good_thumb_img" :src="ruleForm.good_thumb_img" class="avatar" />
                 <i v-else class="el-icon-plus avatar-uploader-icon"></i>
                 <file-upload
                   class="Upload"
@@ -205,8 +205,8 @@
                   :accept="'.jpg,.png,.jpeg'"
                   :multiple="true"
                   :uploadcondition="beforeAvatarUpload"
-                  @UploadErrorEvent="UploadErrorEventc1"
-                  @UploadSuccessEvent="UploadSuccessEventc1"
+                  @UploadErrorEvent="UploadErrorEventgood_thumb_img"
+                  @UploadSuccessEvent="UploadSuccessEventgood_thumb_img"
                 ></file-upload>
               </div>
               <div class="txt-tips fl">
@@ -214,9 +214,9 @@
                 <p>1:1</p>
               </div>
             </el-form-item>
-            <el-form-item label="详情主图" prop="c2" class="activity-upload">
+            <el-form-item label="详情主图" prop="good_img" class="activity-upload">
               <div class="btnupload" style="position: relative">
-                <img v-if="ruleForm.c2" :src="ruleForm.c2" class="avatar" />
+                <img v-if="ruleForm.good_img" :src="ruleForm.good_img" class="avatar" />
                 <i v-else class="el-icon-plus avatar-uploader-icon"></i>
                 <file-upload
                   class="Upload"
@@ -224,8 +224,8 @@
                   :accept="'.jpg,.png,.jpeg'"
                   :multiple="true"
                   :uploadcondition="beforeAvatarUpload"
-                  @UploadErrorEvent="UploadErrorEventc2"
-                  @UploadSuccessEvent="UploadSuccessEventc2"
+                  @UploadErrorEvent="UploadErrorEventgood_img"
+                  @UploadSuccessEvent="UploadSuccessEventgood_img"
                 ></file-upload>
               </div>
             </el-form-item>
@@ -235,14 +235,14 @@
           </div>
           </el-col>
           <el-col :span="16">
-            <el-form-item label="详情介绍图" prop="c3">
-              <div class="c3-div">
-                <ul v-if="ruleForm.c3" class="clear">
-                  <li class="img-show-li" v-viewer v-for="(img, iindex) in ruleForm.c3" :key="img + iindex">
+            <el-form-item label="详情介绍图" prop="good_info_img">
+              <div class="good_info_img-div">
+                <ul v-if="ruleForm.good_info_img" class="clear">
+                  <li class="img-show-li" v-viewer v-for="(img, iindex) in ruleForm.good_info_img" :key="img + iindex">
                     <img :src="img" alt="" />
                     <i class="el-icon-close" @click="closeImg(iindex)"></i>
                   </li>
-                  <li class="img-upload-li" v-if="ruleForm.c3.length < 10">
+                  <li class="img-upload-li" v-if="ruleForm.good_info_img.length < 10">
                     <div class="activity-upload">
                       <div class="btnupload" style="position: relative">
                         <i class="el-icon-plus avatar-uploader-icon"></i>
@@ -252,8 +252,8 @@
                           :accept="'.jpg,.png,.jpeg'"
                           :multiple="true"
                           :uploadcondition="beforeAvatarUpload"
-                          @UploadErrorEvent="UploadErrorEventc3"
-                          @UploadSuccessEvent="UploadSuccessEventc3"
+                          @UploadErrorEvent="UploadErrorEventgood_info_img"
+                          @UploadSuccessEvent="UploadSuccessEventgood_info_img"
                         ></file-upload>
                       </div>
                     </div>
@@ -298,14 +298,14 @@ export default {
       options6: options6,
       ruleForm: {},
       rules: {
-        a1: [
+        packing_list: [
           {
             required: true,
             message: "请输入包装清单",
             trigger: "blur",
           },
         ],
-        a2: [
+        packing_way: [
           {
             required: true,
             message: "请输入包装方式",
@@ -313,35 +313,35 @@ export default {
           },
         ],
 
-        a3: [
+        packing_spec: [
           {
             required: true,
             message: "请输入装箱规格",
             trigger: "blur",
           },
         ],
-        a4: [
+        packing_weight: [
           {
             required: true,
             message: "请输入装箱重量",
             trigger: "blur",
           },
         ],
-        a5: [
+        packing_szie: [
           {
             required: true,
             message: "请输入装箱尺寸",
             trigger: "blur",
           },
         ],
-        b1: [
+        supply_area: [
           {
             required: true,
             message: "请选择供货区域",
             trigger: "change",
           },
         ],
-        b2: [
+        delivery_place: [
           {
             type: "array",
             required: true,
@@ -349,7 +349,7 @@ export default {
             trigger: "change",
           },
         ],
-        b3: [
+        origin_place: [
           {
             type: "array",
             required: true,
@@ -357,46 +357,46 @@ export default {
             trigger: "change",
           },
         ],
-        b4: [
+        delivery_day: [
           {
             required: true,
             message: "请输入物流时间",
             trigger: "blur",
           },
         ],
-        b5: [
+        lead_time: [
           {
             required: true,
             message: "请输入供货周期",
             trigger: "blur",
           },
         ],
-        b6: [
+        sample_day: [
           {
             required: true,
             message: "请输入调样周期",
             trigger: "blur",
           },
         ],
-        c1: [
+        good_thumb_img: [
           {
             required: true,
-            message: "商品主图",
+            message: "商品缩略图",
             trigger: "change",
           },
         ],
-        c2: [
+        good_img: [
           {
             required: true,
-            message: "商品分类",
+            message: "商品详情主图",
             trigger: "change",
           },
         ],
-        c3: [
+        good_info_img: [
           {
             type: "array",
             required: true,
-            message: "商品品牌",
+            message: "商品详情介绍图",
             trigger: "change",
           },
         ],
@@ -437,32 +437,32 @@ export default {
     },
     resetFormData() {
       this.ruleForm = {
-        a1: "",
-        a2: "",
-        a3: "",
-        a4: "",
-        a5: "",
-        a6: "",
-        b1: "",
-        b2: [],
-        b3: [],
-        b4: "",
-        b5: "",
-        b6: "",
-        c1: "",
-        c2: "",
-        c3: [],
+        packing_list: "",
+        packing_way: "",
+        packing_spec: "",
+        packing_weight: "",
+        packing_szie: "",
+        good_bar: "",
+        supply_area: "",
+        delivery_place: [],
+        origin_place: [],
+        delivery_day: "",
+        lead_time: "",
+        sample_day: "",
+        good_thumb_img: "",
+        good_img: "",
+        good_info_img: [],
       };
     },
     //仓库省市区
-    selectAreab2(e) {
-      this.ruleForm.b2 = e;
-      this.$refs.ruleForm.validateField("b2");
+    selectAreadelivery_place(e) {
+      this.ruleForm.delivery_place = e;
+      this.$refs.ruleForm.validateField("delivery_place");
     },
     //仓库省市区
-    selectAreab3(e) {
-      this.ruleForm.b3 = e;
-      this.$refs.ruleForm.validateField("b3");
+    selectAreaorigin_place(e) {
+      this.ruleForm.origin_place = e;
+      this.$refs.ruleForm.validateField("origin_place");
     },
     async submitForm() {
       await this.$refs.ruleForm.validate(async (valid) => {
@@ -551,19 +551,19 @@ export default {
     },
 
     closeImg(index) {
-      this.ruleForm.c3.splice(index, 1);
-      this.$refs.ruleForm.validateField("c3");
+      this.ruleForm.good_info_img.splice(index, 1);
+      this.$refs.ruleForm.validateField("good_info_img");
     },
     //图片上传成功
-    async UploadSuccessEventc1(data) {
+    async UploadSuccessEventgood_thumb_img(data) {
       await this.UploadSuccessEvent(1, data);
     },
     //图片上传成功
-    async UploadSuccessEventc2(data) {
+    async UploadSuccessEventgood_img(data) {
       await this.UploadSuccessEvent(2, data);
     },
     //图片上传成功
-    async UploadSuccessEventc3(data) {
+    async UploadSuccessEventgood_info_img(data) {
       await this.UploadSuccessEvent(3, data);
     },
     //图片上传成功
@@ -573,35 +573,35 @@ export default {
         await this.logout();
       } else {
         if (type === 1) {
-          this.ruleForm.c1 = url;
-          this.$refs.ruleForm.validateField("c1");
+          this.ruleForm.good_thumb_img = url;
+          this.$refs.ruleForm.validateField("good_thumb_img");
         } else if (type === 2) {
-          this.ruleForm.c2 = url;
-          this.$refs.ruleForm.validateField("c2");
+          this.ruleForm.good_img = url;
+          this.$refs.ruleForm.validateField("good_img");
         } else {
-          this.ruleForm.c3.push(url);
-          this.$refs.ruleForm.validateField("c3");
+          this.ruleForm.good_info_img.push(url);
+          this.$refs.ruleForm.validateField("good_info_img");
         }
         this.$message.success("图片上传成功!");
       }
     },
     //图片上传失败
-    UploadErrorEventc1(res) {
+    UploadErrorEventgood_thumb_img(res) {
       this.imgUploadError(1, res);
     },
     //图片上传失败
-    UploadErrorEventc2(res) {
+    UploadErrorEventgood_img(res) {
       this.imgUploadError(2, res);
     },
     //图片上传失败
-    UploadErrorEventc3(res) {
+    UploadErrorEventgood_info_img(res) {
       this.imgUploadError(3, res);
     },
     imgUploadError(type, res) {
       if (res !== "break") {
         this.$message.error("图片上传失败!");
         this.$refs.ruleForm.validateField(
-          type === 1 ? "c1" : type === 2 ? "c2" : "c3"
+          type === 1 ? "good_thumb_img" : type === 2 ? "good_img" : "good_info_img"
         );
       }
     },
@@ -629,7 +629,7 @@ export default {
 </script>
    <style lang="scss" scoped>
 .goodsCostAdd {
-  .c3-div {
+  .good_info_img-div {
     ul {
       float: left;
       width: 100%;

src/views/goodStore/goodsCost/index.vue

@@ -253,7 +253,7 @@ export default {
     };
   },
   mounted() {
-    // this.searchList();
+    this.searchList();
   },
   methods: {
     restSearch() {

src/views/goodStore/goodsOnline/index.vue

@@ -16,7 +16,8 @@
         <el-col :span="18" id="el-cor-full-style">
           <el-row :gutter="10">
             <el-col :span="6">
-              <el-cascader
+              111
+              <!-- <el-cascader
                 v-model="parmValue.catid"
                 style="width: 100%"
                 filterable
@@ -26,7 +27,7 @@
                 :options="catOptions"
                 :props="{ expandTrigger: 'hover', checkStrictly: true }"
                 @change="handleChange"
-              ></el-cascader>
+              ></el-cascader> -->
             </el-col>
             <el-col :span="6">
               <el-select
@@ -356,7 +357,6 @@ export default {
       index: 0,
       showImgModel: false,
       statusList: statusList,
-      catOptions: [],
       showLadderPrice: false,
       loading: false,
       showModel: false,
@@ -403,7 +403,6 @@ export default {
   },
   mounted() {
     this.searchList();
-    this.getAllCat();
   },
 
   methods: {
@@ -572,34 +571,7 @@ export default {
       }
       this.loading = false;
     },
-    async getAllCat() {
-      const res = await asyncRequest.catAll({});
-      if (res.code === 0 && res.data) {
-        let list = res.data;
-        list.map((v1) => {
-          v1.value = v1.id;
-          v1.label = v1.cat_name;
-          if (v1.child && v1.child.length > 0) {
-            v1.child.map((v2) => {
-              v2.value = v2.id;
-              v2.label = v2.cat_name;
-              if (v2.child && v2.child.length > 0) {
-                v2.child.map((v3) => {
-                  v3.value = v3.id;
-                  v3.label = v3.cat_name;
-                  return v3;
-                });
-                v2.children = v2.child;
-              }
-              return v2;
-            });
-            v1.children = v1.child;
-          }
-          return v1;
-        });
-        this.catOptions = list;
-      }
-    },
+   
     async statusConfirm(id, status, type) {
       if (!type) {
         return;

src/views/goodStore/sort/addEdit.vue

@@ -4,7 +4,7 @@
     :title="title"
     :center="true"
     align="left"
-    top="18vh"
+    top="12vh"
     width="600px"
     :close-on-click-modal="false"
     :visible.sync="showModelThis"
@@ -24,6 +24,14 @@
             label-width="80px"
             class="demo-ruleForm"
           >
+            <el-form-item label="上级分类" prop="pid">
+              <el-input
+                v-model="ruleForm.pid"
+                placeholder="上级分类"
+                minlength="20"
+                disabled
+              />
+            </el-form-item>
             <el-form-item label="分类名称" prop="cat_name">
               <el-input
                 v-model="ruleForm.cat_name"
@@ -48,7 +56,14 @@
                 </el-option>
               </el-select>
             </el-form-item>
-
+            <el-form-item label="科目代码" prop="科目代码">
+              <el-input
+                v-model="ruleForm.fund_code"
+                :disabled="id == '007'"
+                placeholder="科目代码"
+                minlength="50"
+              />
+            </el-form-item>
             <el-form-item label="售后说明" prop="cat_desc">
               <el-input
                 v-model="ruleForm.cat_desc"
@@ -125,18 +140,22 @@ export default {
   methods: {
     async initForm() {
       this.loading = true;
+      await this.resetForm();
       if (this.id === "003") {
         this.title = "添加分类";
         this.rulesThis = this.rules;
       } else if (this.id === "005") {
         this.title = "修改分类";
         this.rulesThis = this.rules;
+        await this.initData();
       } else {
         this.title = "分类详情";
         this.rulesThis = {};
+        await this.initData();
       }
-      await this.resetForm();
+
       await this.getAllSpecs();
+
       this.loading = false;
     },
 
@@ -170,6 +189,25 @@ export default {
         this.$message.warning(res.message);
       }
     },
+    async initData() {
+      const res = await asyncRequest.detail({ id: this.sitem.id });
+      if (res && res.code === 0 && res.data) {
+        console.log(res.data);
+        const { pid, id, cat_name, cat_desc, specs_id, fund_code } = res.data;
+        this.ruleForm = {
+          pid: pid || "",
+          id: id || "",
+          cat_name: cat_name || "",
+          specs_id: specs_id || [],
+          fund_code: fund_code || "",
+          cat_desc: cat_desc || "",
+        };
+      } else if (res && res.code >= 100 && res.code <= 104) {
+        await this.logout();
+      } else {
+        this.$message.warning(res.message);
+      }
+    },
     async submitForm() {
       await this.$refs.ruleForm.validate(async (valid) => {
         if (valid) {

src/views/goodStore/sort/index.vue

@@ -125,12 +125,6 @@
       </template>
 
       <template #operation="{ scope }">
-        <el-tooltip effect="dark" content="下级分类" placement="top">
-          <i
-            class="el-icon-arrow-right tb-icon"
-            @click="openChildren(scope.row)"
-          ></i>
-        </el-tooltip>
         <el-tooltip
           v-if="powers.some((item) => item == '007')"
           effect="dark"
@@ -190,6 +184,18 @@
             @click="deleteItem(scope.row.id)"
           ></i>
         </el-tooltip>
+
+        <el-tooltip
+          v-if="parseInt(scope.row.level) < 3"
+          effect="dark"
+          content="下级分类"
+          placement="top"
+        >
+          <i
+            class="el-icon-arrow-right tb-icon"
+            @click="openChildren(scope.row)"
+          ></i>
+        </el-tooltip>
       </template>
     </ex-table>
     <no-auth v-else></no-auth>

src/views/serviceParam/workCompany/index.vue

@@ -3,173 +3,207 @@
     <div
       v-if="powers && powers.length > 0 && powers.some((item) => item == '001')"
     >
-      <el-row style="padding: 10px 0 10px 0">
-        <el-col :span="6" style="width: 292px">
-          <period-date-picker
-            :type="1"
-            :width="'135px'"
-            :size="searchSize"
-            :start="parmValue.start"
-            :end="parmValue.end"
-            @timeReturned="handleTime"
-          />
-        </el-col>
-        <el-col :span="3" style="width: 160px; padding: 0 0 0 10px">
-          <el-select
-            v-model="parmValue.status"
-            filterable
-            clearable
-            :size="searchSize"
-            placeholder="业务企业状态"
-            style="width: 100%"
-          >
-            <el-option
-              v-for="item in statusOptions"
-              :key="'status' + item.id"
-              :label="item.label"
-              :value="item.id"
-            />
-          </el-select>
-        </el-col>
-
-        <el-col :span="3" style="width: 66px; float: right">
-          <el-button
-            type="primary"
-            :size="searchSize"
-            class="fr"
-            @click="searchList"
-          >
-            刷新
-          </el-button>
-        </el-col>
-        <el-col :span="3" style="width: 66px; float: right">
-          <el-button
-            type="warning"
-            class="fr"
-            :size="searchSize"
-            @click="restSearch"
-          >
-            重置
-          </el-button>
-        </el-col>
-      </el-row>
-      <el-row style="padding: 0 0 10px 0">
-        <el-col :span="8" style="width: 292px">
-          <el-input
-            :size="searchSize"
-            v-model="parmValue.company"
-            :maxlength="100"
-            placeholder="公司名称"
-          />
-        </el-col>
-        <el-col :span="8" style="width: 160px; padding: 0 0 0 10px">
-          <el-input
-            :size="searchSize"
-            v-model="parmValue.creater"
-            :maxlength="100"
-            placeholder="创建人"
-          />
-        </el-col>
-
-        <el-col :span="3" style="width: 66px; float: right">
-          <el-button
-            v-if="powers.some((item) => item == '003')"
-            :size="searchSize"
-            type="success"
-            class="fr"
-            @click="openModal('', '003')"
-          >
-            添加
-          </el-button>
-        </el-col>
-      </el-row>
-      <el-table
-        v-loading="false"
+      <ex-table
+        v-loading="loading"
+        :table="table"
         :data="tableData"
+        :columns="columns"
+        :page="pageInfo"
         :size="size"
-        border
-        style="width: 100%"
+        @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();
+        "
       >
-        <el-table-column prop="id" label="ID" width="100"> </el-table-column>
-        <el-table-column label="类型" width="100">
-          <template slot-scope="scope">
-            <el-tag
-              :size="tablebtnSize"
-              :type="scope.row.kh == 0 ? 'success' : ''"
-              v-text="
-                (statusOptions.find((item) => item.id == scope.row.kh) || {})
-                  .label || '--'
-              "
-            ></el-tag>
-          </template>
-        </el-table-column>
-        <el-table-column prop="name" label="名称"> </el-table-column>
-        <el-table-column prop="code" label="编码"> </el-table-column>
+        <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.start"
+                  :end="parmValue.end"
+                  @timeReturned="handleTime"
+                />
+              </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-table-column fixed="right" label="操作" width="50">
-          <template slot-scope="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.id, '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.id, '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="statusConfirm(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="statusConfirm(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="deleteById(scope.row.id)"
-              ></i>
-            </el-tooltip>
-          </template>
-        </el-table-column>
-      </el-table>
+              <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.company"
+                  :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="openModal({}, '003')"
+                >
+                  添加
+                </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="deleteById(scope.row.id)"
+            ></i>
+          </el-tooltip>
+        </template>
+      </ex-table>
       <add-edit
         :id="modelId"
         :show-model="showModel"
@@ -250,45 +284,30 @@ export default {
       // 表格 - 列参数
       columns: [
         {
-          prop: "wsm_code",
+          prop: "companyNo",
           label: "编号",
-          width: "170px",
-        },
-        {
-          prop: "name",
-          label: "仓库名称",
-        },
-        {
-          prop: "supplierNo",
-          label: "供应商编号",
-          width: "140px",
+          "max-width": "170px",
         },
+
         {
-          prop: "supplier_name",
-          label: "供应商公司",
-          "min-width": "140px",
+          prop: "company",
+          label: "公司名称",
         },
         {
           prop: "status",
           label: "状态",
-          width: "60px",
-          // sortable: true,
+          "max-width": "60px",
           _slot_: "status",
         },
         {
-          prop: "contactor_name",
+          prop: "creater",
           label: "负责人",
-          width: "70px",
-        },
-        {
-          prop: "mobile",
-          label: "负责人电话",
-          width: "100px",
         },
+
         {
           prop: "addtime",
           label: "创建时间",
-          width: "140px",
+          "max-width": "145px",
         },
         {
           prop: "",
@@ -301,8 +320,8 @@ export default {
       ],
       // 状态
       statusOptions: [
-        { id: "0", label: "禁用" },
-        { id: "1", label: "启用" },
+        { id: "0", label: "启用" },
+        { id: "1", label: "禁用" },
       ],
     };
   },