暂存

src/apis/components/search-exclusive.js

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

src/components/globalComponents/search-exclusive/index.js

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

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

@@ -0,0 +1,91 @@
+<template>
+  <el-cascader
+    :size="size || 'medium'"
+    style="width: 100%"
+    filterable
+    clearable
+    v-model="values"
+    :options="options"
+    :placeholder="placeholder || ''"
+    :props="{
+      expandTrigger: 'hover',
+      children: 'child',
+      value: 'id',
+      label: 'name',
+    }"
+    :disabled="disabled"
+    @change="handleChange"
+  ></el-cascader>
+</template>
+
+<script>
+import asyncRequest from "@/apis/components/search-exclusive";
+export default {
+  name: "searchExclusive",
+  props: ["size", "value", "isDetail", "placeholder", "disabled"],
+  /**
+   * 属性集合
+   * @param {String}        size                   : 组件大小 非必填
+   * @param {Array}         value                  : 选中值  必填
+   * @param {String}        placeholder            : 提示信息            非必填
+   * @param {Boolean}       isDetail               : 是否是详情逻辑       必填
+   * @param {Boolean}       disabled               : 是否禁用            必填
+   */
+  /**
+   * 事件集合
+   * @selectChange            : 选中值变化调用   抛出选中数据
+   */
+  watch: {
+    value: function (val, old) {
+      this.values=val
+    },
+  },
+  data() {
+    return {
+      values:[],
+      options: [],
+      loading: true,
+    };
+  },
+  mounted() {
+    this.options = [];
+    this.loading = false;
+    this.remoteMethod();
+  },
+  methods: {
+    handleChange(value) {
+      this.$emit("selectChange", value);
+    },
+    async remoteMethod() {
+      this.loading = true;
+      this.options = [];
+      const { code, data, message } = await asyncRequest.list({});
+      if (code === 0) {
+        let list = JSON.parse(JSON.stringify(data));
+        list.map((e) => {
+          if (e.child.length === 0) {
+            delete e["child"];
+          } else {
+            e.child.map((a) => {
+              if (a.child.length === 0) {
+                delete a["child"];
+              }
+              return a;
+            });
+          }
+          return e;
+        });
+        this.options = list;
+      } else if (code >= 100 && code <= 104) {
+        await this.logout();
+      } else {
+        this.$message.warning(message);
+      }
+      this.loading = false;
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+</style>

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

@@ -1,8 +1,4 @@
 <template>
-  <!-- multiple
-    filterable
-    remote
-    :multiple-limit="1" :remote-method="remoteMethod" -->
   <el-select
     v-model="value"
     filterable
@@ -104,6 +100,7 @@ export default {
       }
       this.selectLoading = false;
     },
+
   },
 };
 </script>

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

@@ -19,6 +19,7 @@ export default [
   {
     prop: "cat_name",
     label: "分类",
+    "min-width": "100px",
   },
   {
     prop: "brand_name",
@@ -31,7 +32,7 @@ export default [
     width: "70px",
   },
   {
-    prop: "good_unit",
+    prop: "unit",
     label: "单位",
     width: "45px",
   },
@@ -44,22 +45,22 @@ export default [
   {
     prop: "supplierNo",
     label: "供应商编号",
-    width: "110px",
+    width: "160px",
   },
   {
     prop: "supplier_name",
     label: "供应商名称",
-    width: "110px",
+    width: "150px",
   },
   {
     prop: "companyNo",
     label: "业务公司编号",
-    width: "110px",
+    width: "160px",
   },
   {
     prop: "company",
     label: "业务公司名称",
-    width: "110px",
+    width: "150px",
   },
 
 

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

@@ -51,11 +51,11 @@
               <el-col :span="4" style="width: 228px; padding: 0 0 0 10px">
                 <search-brand
                   :value="brandid"
-                  :disabled="type === 'view' || type === 'editCoin'"
+                  :disabled="false"
                   :size="'mini'"
-                  :isDetail="type !== 'add'"
+                  :isDetail="false"
                   :names="brand_name"
-                  :placeholder="'商品品牌'"
+                  :placeholder="'品牌'"
                   @searchChange="brandidsearchChange"
                 />
               </el-col>
@@ -81,28 +81,6 @@
                   />
                 </el-select>
               </el-col>
-              <!-- <el-col :span="4" style="width: 210px; padding: 0 0 0 10px">
-                <el-select
-                  v-model="parmValue.status"
-                  filterable
-                  clearable
-                  :size="searchSize"
-                  placeholder="状态"
-                  style="width: 100%"
-                  @change="
-                    pageInfo.curr = 1;
-                    parmValue.page = 1;
-                    searchList();
-                  "
-                >
-                  <el-option
-                    v-for="item in statusList"
-                    :key="'status' + item.code"
-                    :label="item.name"
-                    :value="item.code"
-                  />
-                </el-select>
-              </el-col> -->
               <el-col
                 :span="3"
                 class="fr"
@@ -134,7 +112,7 @@
               <el-col :span="4" style="width: 518px">
                 <el-input
                   :size="searchSize"
-                  v-model="parmValue.name"
+                  v-model="sinput"
                   :maxlength="40"
                   @blur="
                     pageInfo.curr = 1;
@@ -149,7 +127,9 @@
                     placeholder="关键字类型"
                   >
                     <el-option label="商品编号" value="1" />
-                    <el-option label="商品名称" value="2" /> </el-select
+                    <el-option label="商品名称" value="2" />
+                    <el-option label="业务公司名称" value="3" />
+                    <el-option label="供应商名称" value="4" /> </el-select
                 ></el-input>
               </el-col>
               <el-col
@@ -226,6 +206,8 @@ export default {
         { id: "0", name: "否" },
         { id: "1", name: "是" },
       ],
+      sinput: "",
+      select: "1",
       options: [],
       selectLoading: false,
       searchName: "",
@@ -233,11 +215,15 @@ export default {
       loading: true,
       showModelThis: false,
       parmValue: {
-        type_code: "", // 商品属性code
+        type_code: "", // 是否定制
         supplierNo: "", // 供应商code
-        good_code: "", // 商品编码
+        cat_id: [],
+        brandid: [],
+        spucode: "", // 商品编码
         good_name: "", // 商品名称
-        wsmcode: "", //仓库code
+        status: "1", //
+        company: "",
+        supplier: "",
         page: 1, // 页码
         size: 15, // 每页显示条数
       },
@@ -267,8 +253,8 @@ export default {
     showModel: function (val) {
       this.showModelThis = val;
       if (val) {
-        this.supplierCode = [];
-        this.searchList();
+        // this.supplierCode = [];
+        this.restSearch();
       }
     },
     showModelThis(val) {
@@ -279,23 +265,29 @@ export default {
   },
 
   methods: {
-    supplierChange(e) {
-      if (e && e.length === 1) {
-        this.parmValue.supplierNo = e[0];
-      } else {
-        this.parmValue.supplierNo = "";
-      }
-      this.parmValue.page = 1;
-      this.searchList();
-    },
+    // 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.sinput = "";
+      this.select = "1";
+      // this.supplierCode = [];
       this.parmValue = {
-        type_code: "", // 商品属性code
+        type_code: "", // 是否定制
         supplierNo: "", // 供应商code
-        good_code: "", // 商品编码
+        spucode: "", // 商品编码
+        cat_id: [],
+        brandid: [],
         good_name: "", // 商品名称
-        wsmcode: "", //仓库code
+        status: "1", //
+        company: "",
+        supplier: "",
         page: 1, // 页码
         size: 15, // 每页显示条数
       };
@@ -307,9 +299,32 @@ export default {
       };
       this.searchList();
     },
+    async goods_class_change(e) {
+      this.parmValue.cat_id = e;
+      this.pageInfo.curr = 1;
+      this.parmValue.page = 1;
+      await this.searchList();
+    },
+    async brandidsearchChange(e) {
+      const { id } = e;
+      this.parmValue.brandid = id ? [id] : [];
+      this.pageInfo.curr = 1;
+      this.parmValue.page = 1;
+      await this.searchList();
+    },
     async searchList() {
       this.loading = true;
-      const res = await asyncRequest.list(this.parmValue);
+      this.parmValue.spucode = this.select === "1" ? this.sinput : "";
+      this.parmValue.good_name = this.select === "2" ? this.sinput : "";
+      this.parmValue.company = this.select === "3" ? this.sinput : "";
+      this.parmValue.supplier = this.select === "4" ? this.sinput : "";
+      let model = JSON.parse(JSON.stringify(this.parmValue));
+      model.cat_id =
+        model.cat_id.length > 0 ? model.cat_id[model.cat_id.length - 1] : "";
+      model.brandid =
+        model.brandid.length > 0 ? model.brandid[model.brandid.length - 1] : "";
+
+      const res = await asyncRequest.list(model);
       if (res && res.code === 0 && res.data) {
         this.tableData = res.data.list;
         this.tableData.forEach((a) => {

src/views/goodStore/goodsCost/columns.js

@@ -142,15 +142,15 @@ const rules = {
     {
       type: "array",
       required: true,
-      message: "商品分类",
+      message: "请选择商品分类",
       trigger: "change",
     },
   ],
   brandid: [
     {
       type: "array",
-      required: false,
-      message: "商品品牌",
+      required: true,
+      message: "请选择商品品牌",
       trigger: "change",
     },
   ],
@@ -229,6 +229,7 @@ const rules = {
   is_exclusive: [
     {
       required: true,
+      type: "array",
       message: "请选择专属类型",
       trigger: "change",
     },
@@ -363,6 +364,13 @@ const rules = {
       trigger: "blur",
     },
   ],
+  good_size: [
+    {
+      required: true,
+      message: "请输入商品尺寸",
+      trigger: "blur",
+    },
+  ],
   good_thumb_img: [
     {
       required: true,

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

@@ -7,7 +7,6 @@
     :size="'mini'"
     v-loading="loading"
     label-width="110px"
-    class="demo-ruleForm"
   >
     <el-row class="ddiv">
       <el-col :span="1" class="dtitle">
@@ -45,7 +44,7 @@
               ></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
+          <el-col :span="12">
             <el-form-item label="业务公司" prop="company_id">
               <search-work-company
                 :value="ruleForm.company_id"
@@ -59,7 +58,7 @@
               />
             </el-form-item>
           </el-col>
-          <el-col :span="16">
+          <el-col :span="12">
             <el-form-item label="供应商" prop="supplierNo">
               <search-supplier
                 :value="ruleForm.supplierNo"
@@ -134,21 +133,15 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="专属类型" prop="is_exclusive">
-              <el-select
-                v-model="ruleForm.is_exclusive"
-                filterable
-                clearable
+              <search-exclusive
                 :disabled="type === 'view' || type === 'editCoin'"
                 style="width: 100%"
+                :isDetail="type !== 'add'"
+                :size="'mini'"
                 placeholder="专属类型"
-              >
-                <el-option
-                  v-for="group in options2"
-                  :key="group.id"
-                  :label="group.name"
-                  :value="group.id"
-                />
-              </el-select>
+                :value="ruleForm.is_exclusive"
+                @selectChange="exclusiveSearchChange"
+              />
             </el-form-item>
           </el-col>
 
@@ -194,10 +187,7 @@
           <el-col :span="24" v-show="is_noble">
             <el-row>
               <el-col :span="8">
-                <el-form-item
-                  label="贵金属重量"
-                  :prop="is_noble ? 'noble_weight' : ''"
-                >
+                <el-form-item label="贵金属重量" prop="noble_weight">
                   <digital-input
                     :values="ruleForm.noble_weight"
                     :placeholder="'贵金属重量'"
@@ -219,10 +209,7 @@
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item
-                  label="贵金属种类"
-                  :prop="is_noble ? 'noble_metal' : ''"
-                >
+                <el-form-item label="贵金属种类" prop="noble_metal">
                   <search-metal-kind
                     :value="ruleForm.noble_metal"
                     :disabled="
@@ -238,10 +225,7 @@
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item
-                  label="启用实时金价"
-                  :prop="is_noble ? 'is_gold_price' : ''"
-                >
+                <el-form-item label="启用实时金价" prop="is_gold_price">
                   <el-select
                     v-model="ruleForm.is_gold_price"
                     filterable
@@ -263,7 +247,7 @@
                   </el-select>
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
+              <el-col :span="6">
                 <el-form-item label="有无工差" prop="is_diff">
                   <el-select
                     v-model="ruleForm.is_diff"
@@ -286,12 +270,11 @@
                   </el-select>
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
-                <el-form-item label="配置要求" prop="config">
+              <el-col :span="10">
+                <el-form-item label="配置要求" prop="config" label-width="85px">
                   <el-select
                     v-model="ruleForm.config"
                     multiple
-                    collapse-tags
                     :disabled="type === 'view'"
                     style="width: 100%"
                     placeholder="配置要求"
@@ -307,9 +290,9 @@
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="其他要求" prop="other_config">
+                <el-form-item label="其他配置要求" prop="other_config">
                   <el-input
-                    placeholder="其他要求"
+                    placeholder="其他配置要求"
                     maxlength="100"
                     :disabled="type === 'view'"
                     v-model="ruleForm.other_config"
@@ -367,6 +350,7 @@
                 clearable
                 style="width: 100%"
                 placeholder="是否定制"
+                @change="good_type_change"
               >
                 <el-option
                   v-for="group in options1"
@@ -378,16 +362,13 @@
             </el-form-item>
           </el-col>
           <el-col :span="8" v-show="ruleForm.good_type === '1'">
-            <el-form-item
-              label="定制起订量"
-              :prop="ruleForm.good_type === '1' ? 'moq' : ''"
-            >
+            <el-form-item label="定制起订量" prop="moq">
               <digital-input
                 :values="ruleForm.moq"
                 :placeholder="'定制起订量'"
                 :name="'ruleForm.moq'"
                 :min="0"
-                :disabled="type === 'view' || type === 'editCoin'"
+                :disabled=" type === 'view' || type === 'editBase'"
                 :max="100000000000"
                 :position="'right'"
                 :precision="0"
@@ -399,16 +380,13 @@
             </el-form-item>
           </el-col>
           <el-col :span="8" v-show="ruleForm.good_type === '1'">
-            <el-form-item
-              label="定制工期"
-              :prop="ruleForm.good_type === '1' ? 'customized' : ''"
-            >
+            <el-form-item label="定制工期" prop="customized">
               <digital-input
                 :values="ruleForm.customized"
                 :placeholder="'定制工期'"
                 :name="'ruleForm.customized'"
                 :min="0"
-                :disabled="type === 'view' || type === 'editCoin'"
+                :disabled=" type === 'view' || type === 'editBase' "
                 :max="100000000000"
                 :position="'right'"
                 :precision="0"
@@ -497,17 +475,7 @@
       >
       <el-col :span="23" class="dmain">
         <el-row>
-          <el-col :span="8">
-            <el-form-item label="包装清单" prop="packing_list">
-              <el-input
-                placeholder="包装清单"
-                :disabled="type === 'view' || type === 'editCoin'"
-                v-model="ruleForm.packing_list"
-                maxlength="250"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
+          <el-col :span="6">
             <el-form-item label="包装方式" prop="packing_way">
               <el-input
                 placeholder="包装方式"
@@ -517,7 +485,7 @@
               />
             </el-form-item>
           </el-col>
-          <el-col :span="8">
+          <el-col :span="6">
             <el-form-item label="装箱规格" prop="packing_spec">
               <el-input
                 placeholder="装箱规格"
@@ -527,7 +495,7 @@
               />
             </el-form-item>
           </el-col>
-          <el-col :span="8">
+          <el-col :span="6">
             <el-form-item label="装箱重量" prop="packing_weight">
               <digital-input
                 :values="ruleForm.packing_weight"
@@ -545,7 +513,7 @@
               />
             </el-form-item>
           </el-col>
-          <el-col :span="8">
+          <el-col :span="6">
             <el-form-item label="装箱尺寸" prop="packing_size">
               <el-input
                 placeholder="装箱尺寸"
@@ -555,8 +523,17 @@
               />
             </el-form-item>
           </el-col>
-
-          <el-col :span="8">
+          <el-col :span="6">
+            <el-form-item label="商品尺寸" prop="good_size">
+              <el-input
+                placeholder="商品尺寸"
+                :disabled="type === 'view' || type === 'editCoin'"
+                v-model="ruleForm.good_size"
+                maxlength="250"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
             <el-form-item label="商品条形码" prop="good_bar">
               <el-input
                 placeholder="商品条形码"
@@ -569,6 +546,16 @@
               />
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item label="包装清单" prop="packing_list">
+              <el-input
+                placeholder="包装清单"
+                :disabled="type === 'view' || type === 'editCoin'"
+                v-model="ruleForm.packing_list"
+                maxlength="250"
+              />
+            </el-form-item>
+          </el-col>
         </el-row>
       </el-col>
     </el-row>
@@ -1099,7 +1086,7 @@ export default {
   },
   data() {
     return {
-      spec_tableData:[],
+      spec_tableData: [],
       cat_id_name: "",
       brand_name: "",
       unit_name: "",
@@ -1142,6 +1129,7 @@ export default {
       this.resetFormData();
       this.rulesThis = this.rules;
       await this.resetForm();
+
       this.loading = false;
     },
     number_change(e, key) {
@@ -1390,12 +1378,12 @@ export default {
         this.ladder_tableData.push(item);
       } else {
         this.ladder_tableData.forEach((i, findex) => {
-          if (findex === parseInt(i.index)) {
-            this.spec_tableData[findex].id = id;
-            this.spec_tableData[findex].cost_fee = cost_fee;
-            this.spec_tableData[findex].delivery_fee = delivery_fee;
-            this.spec_tableData[findex].min_num = min_num;
-            this.spec_tableData[findex].spec_value_value = spec_value_value;
+          if (findex=== parseInt(index+"")) {
+            this.ladder_tableData[findex].id = id;
+            this.ladder_tableData[findex].cost_fee = cost_fee;
+            this.ladder_tableData[findex].delivery_fee = delivery_fee;
+            this.ladder_tableData[findex].min_num = min_num;
+            this.ladder_tableData[findex].spec_value_value = spec_value_value;
           }
         });
       }
@@ -1435,7 +1423,7 @@ export default {
         tax: "",
         good_name: "",
         unit: [],
-        is_exclusive: "",
+        is_exclusive: [],
         noble_metal: "",
         is_gold_price: "",
         moq: "0",
@@ -1449,6 +1437,7 @@ export default {
         packing_spec: "",
         packing_weight: "",
         packing_size: "",
+        good_size: "",
         good_bar: "",
         supply_area: "",
         delivery_place: [],
@@ -1512,6 +1501,7 @@ export default {
             weight, //	string	重量
             packing_way, //	string	包装方式
             packing_size, //	string	包装尺寸
+            good_size, //商品尺寸
             packing_spec, //	string	包装规格
             packing_list, //	string	包装清单
             packing_weight, //	string	装箱重量
@@ -1563,6 +1553,7 @@ export default {
             });
           }
           this.is_noble = isok;
+          this.sch_is_noble();
 
           let spec_list1 =
             speclist && speclist.length > 0
@@ -1612,7 +1603,7 @@ export default {
             tax: tax ? tax + "%" : "",
             good_name: good_name || "",
             unit: good_unit ? [good_unit] : [],
-            is_exclusive: is_exclusive || "",
+            is_exclusive: is_exclusive || [],
             noble_metal: noble_metal || "",
             is_gold_price: is_gold_price || "",
             moq: moq || "0",
@@ -1626,6 +1617,7 @@ export default {
             packing_spec: packing_spec || "",
             packing_weight: packing_weight || "",
             packing_size: packing_size || "",
+            good_size: good_size || "",
             good_bar: good_bar || "",
             supply_area: supply_area || "",
             delivery_place: (delivery_place || "").split(","),
@@ -1653,10 +1645,23 @@ export default {
             config: config ? config.split(",") : [],
             other_config: other_config || "",
           };
-          // console.log(this.ruleForm.noble_metal);
+          this.good_type_change();
         }
       });
     },
+    sch_is_noble() {
+      let list = [
+        "noble_weight",
+        "noble_metal",
+        "is_gold_price",
+        "is_diff",
+        "config",
+        "other_config",
+      ];
+      for (let i = 0; i < list.length; i++) {
+        this.rulesThis[list[i]].required = this.is_noble;
+      }
+    },
     setModel(model, type) {
       let item = null;
       if (type === 1) {
@@ -1718,6 +1723,7 @@ export default {
       this.ruleForm.after_sales = cat_desc || "";
       this.$refs.ruleForm.validateField("after_sales");
       this.is_noble = pid === "6";
+      this.sch_is_noble();
     },
 
     //商品品牌选择
@@ -1756,6 +1762,11 @@ export default {
       this.ruleForm.tax = e;
       this.$refs.ruleForm.validateField("tax");
     },
+    //专属类型选择
+    exclusiveSearchChange(e) {
+      this.ruleForm.is_exclusive = e;
+      this.$refs.ruleForm.validateField("is_exclusive");
+    },
     //单位选择
     unitsearchChange(e) {
       const { id, code, label } = e;
@@ -1822,6 +1833,12 @@ export default {
         this.$message.success("图片上传成功!");
       }
     },
+    good_type_change() {
+      let list = ["moq", "customized"];
+      for (let i = 0; i < list.length; i++) {
+        this.rulesThis[list[i]].required = this.ruleForm.good_type === "1";
+      }
+    },
     //图片上传失败
     UploadErrorEventgood_thumb_img(res) {
       this.imgUploadError(1, res);

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

@@ -191,10 +191,10 @@ export default {
       this.ruleForm = {
         id: id || "",
         index: this.index,
-        min_num: min_num || "",
-        cost_fee: cost_fee || "",
-        nake_fee: nake_fee || "",
-        delivery_fee: delivery_fee || "",
+        min_num: min_num || "0",
+        cost_fee: cost_fee || "0",
+        nake_fee: nake_fee || "0",
+        delivery_fee: delivery_fee || "0",
       };
     },
 

src/views/goodStore/goodsCost/detail.vue

@@ -6,7 +6,7 @@
       v-if="powers && powers.length > 0 && powers.some((item) => item == '007')"
     >
       <el-tabs v-model="activeTabs">
-        <el-tab-pane label="新建商品" name="0" v-if="queryType === 'add'">
+        <el-tab-pane label="新建商品成本" name="0" v-if="queryType === 'add'">
           <base-form
             v-if="newTime !== ''"
             :type="queryType"
@@ -16,9 +16,9 @@
             @refresh="refresh"
           />
         </el-tab-pane>
-        <el-tab-pane label="商品详情" name="1" v-if="queryType !== 'add'">
+        <el-tab-pane label="商品成本详情" name="1" v-if="queryType !== 'add'">
           <el-collapse v-model="activeNames" style="margin: -18px 0 0 0">
-            <el-collapse-item title="商品详情" name="0">
+            <el-collapse-item title="商品成本详情" name="0">
               <base-form
                 v-if="newTime !== ''"
                 :type="queryType"
@@ -157,14 +157,7 @@ export default {
       console.log(row);
     },
     async refresh(e) {
-      const { spuCode } = e;
-
-      let model = {
-        id: this.queryType === "add" ? spuCode : this.queryId,
-        type: "view",
-      };
-      this.routeReGoto("goodsCostDetail", model);
-      await this.initForm();
+      await this.routeReGoto("goodsCost", {});
     },
     async initData() {
       this.loading = true;
@@ -191,13 +184,10 @@ export default {
 </script>
    <style lang="scss" scoped>
 .goodsCostDetail {
-  position: relative;
-  height: 100%;
   width: 100%;
   box-sizing: border-box;
   .goodsCostDetail-main {
-    overflow-y: scroll;
-    position: relative;
+    box-sizing: border-box;
     padding: 10px;
     height: 100%;
     width: 100%;

src/views/sellOut/project/index.vue

@@ -42,7 +42,7 @@
                     "
                   >
                     <el-option
-                      v-for="item in statusList"
+                      v-for="item in statusOptions"
                       :key="'project' + item.id"
                       :label="item.label"
                       :value="item.id"
@@ -141,7 +141,6 @@
         <template #status="{ scope }">
           <el-tag
             :size="tablebtnSize"
-            :type="scope.row.status == '0' ? 'warning' : ''"
             v-text="
               (statusOptions.find((item) => item.id == scope.row.status) || {})
                 .label || '--'
@@ -212,7 +211,8 @@ export default {
         { id: "2", label: "待客户选择商品" },
         { id: "3", label: "待项目方案制定" },
         { id: "4", label: "待方案选择" },
-        { id: "5", label: "项目结束" },
+        { id: "5", label: "项目待下单" },
+        { id: "6", label: "项目已结束" },
       ],
 
       loading: true,