fix

src/views/sellOut/combinedAdd/components/baseForm.vue

@@ -20,108 +20,7 @@
            :spucode="productinfo.spuCode"
            :isStockInfo="true"
          />
-        <!-- <show-data-table border :columns="productColumns" :sitem="productinfo">
-          <template slot="packing_spec">
-            <el-tag
-              size="mini"
-            >{{ ( options6.find(({id}) => id === productinfo.supply_area) || {}).name || '--' }}</el-tag>
-          </template>
-
-          <template slot="is_auth">
-            <el-tag
-              size="mini"
-            >{{ ( options3.find(({id}) => id === productinfo.is_auth) || {}).name || '--' }}</el-tag>
-          </template>
-
-          <template slot="good_info_img">
-            <div style="max-height: 24px; overflow: hidden">
-              <el-image
-                style="height: 24px; width: 24px"
-                :src="productinfo.good_info_img"
-                :preview-src-list="[productinfo.good_info_img]"
-              />
-            </div>
-          </template>
-
-          <template slot="cat_info">
-            {{
-            productinfo.cat_info
-            ? productinfo.cat_info.map(({ name }) => name).join("_")
-            : "--"
-            }}
-          </template>
-
-          <template slot="is_combind">
-            {{
-            String(productinfo.is_combind) === '1' ? '组合商品' : '非组合商品'
-            }}
-          </template>
-
-          <template slot="good_name">
-            <img
-              v-if="productinfo.good_thumb_img"
-              v-viewer
-              style="width: 23px; height: 23px; margin: 0 5px 0 0"
-              class="fl"
-              :src="productinfo.good_thumb_img"
-              alt
-            />
-            <span>{{ productinfo.good_name }}</span>
-            <span v-for="(si, i) in productinfo.speclist" :key="si.spec_id + i">
-              <span v-if="i !== 0">-</span>
-              <span v-else>_</span>
-              <span>{{ si.spec_name }}[{{ si.spec_value }}]</span>
-            </span>
-            <el-popover placement="top" width="300" trigger="hover">
-              <ul>
-                <li v-if="newTime !== '' && isDisplayPrivateField('1')">
-                  <span>商品成本编号：</span>
-                  <span>{{ productinfo.spuCode }}</span>
-                </li>
-              </ul>
-              <i slot="reference" class="el-icon-warning-outline fr" />
-            </el-popover>
-          </template>
-
-          <template slot="noble">
-            <span v-if="productinfo.noble_metal">
-              {{ productinfo.noble_weight ? productinfo.noble_weight : "0" }}g-{{
-              productinfo.noble_name
-              }}-{{ productinfo.gold_price ? productinfo.gold_price : "0" }}元/g-{{
-              productinfo.is_gold_price + "" === "0" ? "不" : ""
-              }}启用实时金价-{{ productinfo.is_diff + "" === "1" ? "有" : "无" }}工差-{{
-              productinfo.config
-              }}-{{ productinfo.other_config }}
-            </span>
-          </template>
-
-          <template slot="weight">{{ productinfo.weight }}g</template>
-          <template slot="tax">{{ productinfo.tax }}%</template>
-          <template slot="is_stock">{{ String(productinfo.is_stock) === "0" ? "非库存品" : "库存品" }}</template>
-          <template
-            slot="is_exclusive"
-          >{{ String(productinfo.is_exclusive) === "0" ? "非泰康" : "泰康" }}</template>
-          <template slot="noble_weight">{{ productinfo.noble_weight }}g</template>
-          <template slot="is_gold_price">
-            {{
-            String(productinfo.is_gold_price) === "1" ? "是" : "否"
-            }}
-          </template>
-          <template slot="is_diff">
-            {{
-            String(productinfo.is_diff) === "1" ? "有公差" : "无工差"
-            }}
-          </template>
-
-          <template slot="packing_weight">{{ productinfo.packing_weight }}g</template>
-
-          <template slot="delivery_day">{{ productinfo.delivery_day }}天</template>
-          <template slot="lead_time">{{ productinfo.lead_time }}天</template>
-          <template slot="sample_day">{{ productinfo.sample_day }}天</template>
-          <template slot="delivery_place">{{ delivery_place }}</template>
-          <template slot="origin_place">{{ origin_place }}</template>
-        </show-data-table> -->
-
+ 
         <el-tooltip v-if="type !== 'view'" content="重新选择组合商品" placement="top">
           <i
             class="el-icon-circle-close"
@@ -288,8 +187,6 @@ export default {
       try {
         await this.$refs.ruleForm.validate();
         const { usable_stock, ...params } = this.ruleForm;
-
-        // (row.child_num || 0) * ( ruleForm.stock_num || 0
         for (let item of this.productinfo.combind_list) {
           const { child_num, usable_stock, child_name } = item;
           if (
@@ -303,11 +200,10 @@ export default {
         }
 
         this.loading.full = true;
-        const { code, message } = await asyncRequest.add({
-          ...params,
-          flag: "1"
+        const { code, message } = await asyncRequest.add({ ...params, flag: "1"
         });
         this.loading.full = false;
+
         if (Number(code) === 0) {
           this.$router.push("/sellOut/combinedAdd");
           return;

src/views/sellOut/combinedRemove/detail.vue

@@ -63,7 +63,7 @@
               </el-collapse-item>
 
              <el-collapse-item
-                v-if="Number(sitem.status) === 1 && !isSupertube && ppowers.includes('1')"
+                v-if="sitem && Number(sitem.status) === 1 && !isSupertube && ppowers.includes('1')"
                 title="待审核"
                 name="3"
               >
@@ -86,7 +86,7 @@
 import ProductDetail from "@/components/details/src/product.vue";
 import asyncRequest from "@/apis/service/sellOut/combinedAdd";
 import { xs_order_type_options } from "@/assets/js/statusList";
-import { showColumns, detailColumns_j } from "./columns";
+import { showColumns, detailColumns } from "./columns";
 import WaitApproval from "./components/waitApproval";
 import mixinPage from "@/mixins/elPaginationHandle";
 import BaseForm from "./components/baseForm";
@@ -132,7 +132,7 @@ export default {
         { id: "2", label: "审核通过" },
         { id: "3", label: "审核驳回" }
       ],
-      detailColumns_j,
+      detailColumns_j:detailColumns,
       xs_order_type_options,
       customer_remark_options: [
         {
@@ -164,7 +164,7 @@ export default {
           label: "不接受工差-退回重做"
         }
       ],
-      sitem: null,
+      sitem: {},
       status: "",
       newTime: "",
       loading: false,