fix(商品成本):组合商品子商品数量必须大于一

src/apis/service/sellOut/combinedAdd/index.js

@@ -13,7 +13,7 @@ export default {
   // 更新
   update: (data, params) => http(api + 'update', data, 'post', params),
   // 修改状态
-  status: (data, params) => http(api + 'salediffcheck', data, 'post', params),
+  status: (data, params) => http(api + 'combindstatus', data, 'post', params),
   // 通知业务部门
   fstatus: (data, params) => http(api + 'salediffstatus', data, 'post', params),
 

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

@@ -1295,9 +1295,9 @@ export default {
     handleProductSelected(evt) {
       const { childCode, child_name } = evt;
       const item = { childCode, child_name, child_num: 1 };
-      const childCodes = this.childTableData.map(({childCode}) => childCode)
+      const childCodes = this.childTableData.map(({ childCode }) => childCode);
 
-      if(!childCodes.includes(childCode)){
+      if (!childCodes.includes(childCode)) {
         this.childTableData.push(item);
       }
     },
@@ -1461,18 +1461,14 @@ export default {
                 let n = parseInt(si.min_num);
                 min = n < min ? n : min;
               });
-              // console.log(smoq, min, smoq < min);
+
               if (smoq < min) {
                 this.$message.warning("备库起订量不能低于成本最低起订量！");
                 this.loading = false;
                 return;
               }
             }
-            // if (is_step === "0" && this.ladder_tableData.length > 1) {
-            //   this.$message.warning("不启用阶梯成本，只能录入一条阶梯成本信息！");
-            //   this.loading = false;
-            //   return;
-            // }
+
             if (this.is_noble) {
               if (noble_weight * 1000 > weight * 1000) {
                 this.$message.warning("贵金属总重量不能大于商品总重量！");
@@ -1480,6 +1476,7 @@ export default {
                 return;
               }
             }
+
             if (is_gold_price === "1" && this.is_noble) {
               let is_p = true;
               this.ladder_tableData.forEach(v => {
@@ -1487,13 +1484,6 @@ export default {
                   is_p = false;
                 }
               });
-              // if (!is_p) {
-              //  this.$message.warning(
-              //    "启用实时金价的贵金属商品不能填写成本单价！"
-              //  );
-              //  this.loading = false;
-              //  return;
-              //}
             }
 
             let model = JSON.parse(JSON.stringify(this.ruleForm));
@@ -1521,6 +1511,11 @@ export default {
                 return;
               }
 
+              if (this.childTableData.length === 1) {
+                this.message.warning("子商品数量必须大于1!");
+                return;
+              }
+
               if (this.type === "add") {
                 model.combind_list = this.childTableData.map(item => ({
                   ...item,
@@ -1562,7 +1557,6 @@ export default {
               }
             }
 
-            console.log(model);
             if (this.type === "add") {
               delete model["spuCode"];
               res = await asyncRequest.add(model);

src/views/goodStore/goodsCost/detail.vue

@@ -52,7 +52,7 @@
 
                   <template slot="is_combind">
                     {{
-                      String(sitem.is_combind) === '1' ? '组合商品' : '非组合商品'
+                    String(sitem.is_combind) === '1' ? '组合商品' : '非组合商品'
                     }}
                   </template>
 

src/views/goodStore/goodsOnline/components/fixed-price-form.vue

@@ -1008,13 +1008,14 @@ export default {
               ) {
                 const { sale_price, new_sale_price, cost_fee, new_cost_fee } =
                   this.addrForm.good_ladder[index] || {};
+
                 const _salePrice = Number(sale_price);
                 const _systemSalePrice = Number(new_sale_price);
                 const _costFee = Number(cost_fee);
                 const _systemCostFee = Number(new_cost_fee);
 
                 if (
-                  Number(this.sitem.is_gold_price) !== 1 &&
+                  Number(this.sitem.is_fixed) === 1 &&
                   _salePrice < _systemSalePrice
                 ) {
                   this.$message.warning(
@@ -1025,7 +1026,7 @@ export default {
                 }
 
                 if (
-                  Number(this.sitem.is_gold_price) === 1 &&
+                  Number(this.sitem.is_fixed) === 0 &&
                   _costFee < _systemCostFee
                 ) {
                   this.$message.warning(

src/views/goodStore/goodsOnline/detail.vue

@@ -466,6 +466,8 @@ export default {
         } = this.sitem;
         this.spuCode = spuCode;
         this.ladderlist = JSON.parse(JSON.stringify(ladderlist));
+        console.log(ladderlist);
+
         this.nakelist = JSON.parse(JSON.stringify(nakelist));
         let cat = "";
         if (cat_info && cat_info.length > 0) {

src/views/sellOut/combinedAdd/columns.js

@@ -11,7 +11,6 @@ const columns = [
     minWidth: '125px'
   },
   {
-    prop: 'TODO',
     label: '商品分类',
     minWidth: '125px',
     _slot_:'catinfo'
@@ -22,10 +21,10 @@ const columns = [
     minWidth: '125px',
   },
   {
-    prop: 'TODO',
+    prop: 'specInfo',
     label: '商品规格',
     minWidth: '125px',
-    _slot_:'spec'
+    _slot_:'specInfo'
   },
   {
     prop: 'status',
@@ -122,14 +121,30 @@ const detailColumns = [
     span:8
   },
   {
-    prop:'createtime',
-    label:'创建时间',
-    span:8
+    label: '状态',
+    prop: 'status',
+    span: 8,
+    _slot_: 'status'
   },
   {
     label:'仓库名称',
     prop:'wsm_name',
     span:8
+  },
+  {
+    label:'仓库类型',
+    prop:'wsm_type',
+    span:8
+  },
+  {
+    label:'创建时间',
+    prop:'createtime',
+    span:8
+  },
+  {
+    label: '备注',
+    prop: 'remark',
+    span: 24
   }
 ]
 

src/views/sellOut/combinedAdd/detail.vue

@@ -10,14 +10,46 @@
 
             <template v-else>
               <el-collapse-item title="组合商品详情" name="2" v-if="sitem">
-                <show-data-table :sitem="sitem" :newTime="newTime" :columns="detailColumns" />
+                <show-data-table :sitem="sitem" :newTime="newTime" :columns="detailColumns">
+                  <template #status>
+                    <el-tag
+                      size="mini"
+                      :type="sitem.status == '1' ? 'warning' : ''"
+                    >{{(statusOptions.find((item) => item.id == String(sitem.status)) || {}).label || '--'}}</el-tag>
+                  </template>
+                </show-data-table>
               </el-collapse-item>
+
+              <el-collapse-item title="子商品信息" name="4">
+                <el-table :data="sitem ? sitem.combindgood : []" size="mini" border>
+                  <el-table-column label="子商品成本编号" prop="childCode" min-width="160px" />
+                  <el-table-column
+                    label="子商品名称"
+                    prop="child_name"
+                    min-width="180px"
+                    show-overflow-tooltip
+                  />
+                  <el-table-column label="组合比例" prop="child_num" />
+                  <el-table-column label="锁定库存总数">
+                    <template slot-scope="{ row }">{{ row.usable_stock || 0 }}</template>
+                  </el-table-column>
+                  <el-table-column label="锁定库存可用库存数">
+                    <template slot-scope="{ row }">{{ row.usable_stock || 0 }}</template>
+                  </el-table-column>
+                  <el-table-column label="未锁定库存数" prop="usable_stock">
+                    <template slot-scope="{ row }">{{ row.usable_stock || 0 }}</template>
+                  </el-table-column>
+                </el-table>
+              </el-collapse-item>
+
               <el-collapse-item
+                v-if="Number(sitem.status) === 1 && !isSupertube"
                 title="待审核"
                 name="3"
-                v-if="Number(sitem.status) === 1 && !isSupertube"
               >
-                <wait-approval @confirm="setStatus" />
+                <div style="width:600px">
+                  <wait-approval @confirm="setStatus" />
+                </div>
               </el-collapse-item>
             </template>
           </el-collapse>
@@ -68,8 +100,9 @@ export default {
       activeTabs: "1",
       activeNames: ["-1", "0", "1", "2", "3", "4", "5", "10"],
       statusOptions: [
-        { value: "1", label: "待业务部门审核" },
-        { value: "2", label: "审批已完成" }
+        { id: "1", label: "待审核" },
+        { id: "2", label: "审核通过" },
+        { id: "3", label: "审核驳回" }
       ],
       detailColumns,
       xs_order_type_options,
@@ -113,13 +146,13 @@ export default {
       this.newTime = new Date().valueOf() + "";
     },
 
-    async setStatus(parm) {
+    async setStatus(param) {
       if (!this.loading) {
         this.loading = true;
 
         let model = {
           id: this.queryId,
-          ...parm
+          ...param
         };
 
         const res = await asyncRequest.status(model);

src/views/sellOut/combinedAdd/index.vue

@@ -77,11 +77,15 @@
                     "
                 >
                   <template #prepend>
-                    <el-select v-model="parmValue.key" style="width:100px" @change="
+                    <el-select
+                      v-model="parmValue.key"
+                      style="width:100px"
+                      @change="
                       pageInfo.curr = 1;
                       parmValue.page = 1;
                       searchList();
-                    ">
+                    "
+                    >
                       <el-option label="商品名称" value="spuCode" />
                       <el-option label="商品编码" value="good_name" />
                     </el-select>
@@ -133,6 +137,15 @@
           ></el-tag>
         </template>
 
+        <template #catinfo="{ scope }">{{scope.row.catInfo.map(({name}) => name).join("-")}}</template>
+
+        <template #specInfo="{ scope }">
+          <span
+            v-for="(si, sii) in scope.row.specInfo"
+            :key="sii + si.spec_value_id"
+          >{{ sii === 0 ? "" : "-" }}{{ si.spec_name }}[{{ si.spec_value }}]</span>
+        </template>
+
         <template #order_type="{ scope }">
           <el-tag
             :size="tablebtnSize"
@@ -169,7 +182,10 @@ import companyHelper from "@/mixins/companyHelper";
 import { mapGetters } from "vuex";
 import { columns } from "./columns";
 
-import { xs_order_source_options, xs_order_type_options } from "@/assets/js/statusList";
+import {
+  xs_order_source_options,
+  xs_order_type_options
+} from "@/assets/js/statusList";
 
 export default {
   name: "zxDiffOrder",
@@ -197,9 +213,9 @@ export default {
       sitem: null,
       // 状态
       statusOptions: [
-        { id: "0", label: "不限状态" },
-        { id: "1", label: "在售中" },
-        { id: "2", label: "已下架" }
+        { id: "1", label: "待审核" },
+        { id: "2", label: "审核通过" },
+        { id: "3", label: "审核驳回" }
       ],
       statusList: [
         "样品竞价单",
@@ -221,11 +237,11 @@ export default {
       isDetail: false,
       modelId: 0,
       parmValue: {
-        key:'spuCode',
-        value:"",
+        key: "spuCode",
+        value: "",
         status: "",
         create_start: "",
-        create_end:"",
+        create_end: "",
         page: 1, // 页码
         size: 15 // 每页显示条数
       },
@@ -320,7 +336,10 @@ export default {
       } else {
         this.parmValue.create_end = "";
       }
-      if (this.parmValue.create_start !== "" && this.parmValue.create_end !== "") {
+      if (
+        this.parmValue.create_start !== "" &&
+        this.parmValue.create_end !== ""
+      ) {
         this.parmValue.page = 1;
         await this.searchList();
       }
@@ -336,10 +355,10 @@ export default {
       this.input = "";
       this.parmValue = {
         status: "",
-        key:'spuCode',
-        value:"",
+        key: "spuCode",
+        value: "",
         create_start: "",
-        create_end:"",
+        create_end: "",
         page: 1, // 页码
         size: 15 // 每页显示条数
       };
@@ -396,7 +415,8 @@ export default {
     },
     async searchList() {
       if (
-        (this.parmValue.create_start !== "" && this.parmValue.create_end === "") ||
+        (this.parmValue.create_start !== "" &&
+          this.parmValue.create_end === "") ||
         (this.parmValue.create_start == "" && this.parmValue.create_end != "")
       ) {
         this.$message.warning("开始时间和结束时间不能为空");
@@ -404,12 +424,12 @@ export default {
       }
       this.loading = true;
 
-      const { key, value, ...rest } = this.parmValue
+      const { key, value, ...rest } = this.parmValue;
 
       const res = await asyncRequest.list({
         needRela: true,
         [key]: value,
-        ...rest,
+        ...rest
       });
 
       if (res && res.code === 0 && res.data) {