修改

src/api/manage/storage.js

@@ -114,3 +114,45 @@ export function queryOutboundOddByStoreOdd(query) {
         params: query
     })
 }
+
+
+export function statisticsPrice(query) {
+    return request({
+        url: '/system/outboundStoreSerial/statisticsPrice',
+        method: 'get',
+        params: query
+    })
+}
+
+export function outboundStoreSerialqueryPage(query) {
+    return request({
+        url: '/system/outboundStoreSerial/queryPage',
+        method: 'get',
+        params: query
+    })
+}
+
+export function outboundStoreSerialStatistics(query) {
+    return request({
+        url: '/system/outboundStoreSerial/outboundStoreSerialStatistics',
+        method: 'get',
+        params: query
+    })
+}
+
+export function queryPageDetail(query) {
+    return request({
+        url: '/system/outboundStoreSerial/queryPageDetail',
+        method: 'get',
+        params: query
+    })
+}
+
+
+export function queryShelfLife(query) {
+    return request({
+        url: '/system/storeManage/queryShelfLife',
+        method: 'get',
+        params: query
+    })
+}

src/views/manage/order.vue

@@ -227,7 +227,7 @@
         >
           <el-option label="自提" value="0"> </el-option>
           <el-option label="同城下单" value="1"> </el-option>
-          <el-option label="异地下单" value="2"> </el-option>
+          <el-option label="异地下单" value="2" v-if="activeName == 0"> </el-option>
         </el-select>
       </el-form-item>
       <el-form-item>

src/views/manage/voucher/index.vue

@@ -5,7 +5,7 @@
       <el-row>
         <el-col :span="12">
           <div style="display: flex; flex-direction: row">
-            <el-form-item label="店铺是否开启代金卷使用：">
+            <el-form-item label="店铺是否开启代金券使用：">
               <el-switch
                 v-model="enableVoucher"
                 active-text="开启"
@@ -18,7 +18,7 @@
             </el-form-item>
             <!-- <el-form-item label="折扣卷类型">
               <el-radio-group v-model="useVoucherType">
-                <el-radio :label="0" :value="0">普通满减卷</el-radio>
+                <el-radio :label="0" :value="0">普通满减券</el-radio>
                 <el-radio :label="1" :value="1">折扣卷</el-radio>
               </el-radio-group>
             </el-form-item>
@@ -38,7 +38,7 @@
     </el-form>
     <h3>规则配置</h3>
     <el-radio-group v-model="queryParams.useVoucherType" @change="radioChang">
-      <el-radio :label="0" value="0">普通满减卷</el-radio>
+      <el-radio :label="0" value="0">普通满减券</el-radio>
       <!-- <el-radio :label="1" value="1">折扣卷</el-radio> -->
     </el-radio-group>
 
@@ -49,7 +49,7 @@
     </div>
     <template v-if="queryParams.useVoucherType == 0">
       <el-col :span="24" v-if="this.form.length < 1">
-        <el-result icon="info" title="暂无规则" subTitle="请新增代金卷规则"> </el-result>
+        <el-result icon="info" title="暂无规则" subTitle="请新增代金券规则"> </el-result>
       </el-col>
       <template v-else>
         <el-form ref="form" :model="form" label-width="140px" style="margin-top: 20px">
@@ -103,7 +103,7 @@
     </template>
     <template v-if="queryParams.useVoucherType == 1">
       <el-col :span="24" v-if="person.length < 1">
-        <el-result icon="info" title="暂无规则" subTitle="请新增代金卷规则"> </el-result>
+        <el-result icon="info" title="暂无规则" subTitle="请新增代金券规则"> </el-result>
       </el-col>
       <template v-else>
         <el-form ref="form" :model="person" label-width="140px" style="margin-top: 20px">

src/views/outbound/index.vue

@@ -96,18 +96,40 @@
           label="关联入库订单编号"
           align="center"
           prop="associationStoreNum"
-        />
+        >
+          <template slot-scope="scope">
+            <div
+              v-for="(item, index) in scope.row.associationStoreNum
+                ? scope.row.associationStoreNum.split(',')
+                : []"
+              :key="index"
+            >
+              {{ item }}
+            </div>
+          </template>
+        </el-table-column>
         <el-table-column
           label="关联入库订单名称"
           align="center"
           prop="associationStoreName"
-        />
+        >
+          <template slot-scope="scope">
+            <div
+              v-for="(item, index) in scope.row.associationStoreName
+                ? scope.row.associationStoreName.split(',')
+                : []"
+              :key="index"
+            >
+              {{ item }}
+            </div>
+          </template>
+        </el-table-column>
         <el-table-column label="出库商品ID" align="center" prop="outboundGoodsId" />
         <el-table-column label="出库商品名称" align="center" prop="outboundGoodsName" />
         <el-table-column
           label="出库总数量"
           align="center"
-          prop="outboundTotalNum"
+          prop="outboundTotalNums"
           width="200"
         />
         <el-table-column
@@ -141,6 +163,13 @@
           </template>
         </el-table-column>
       </el-table>
+      <pagination
+        v-show="total > 0"
+        :total="total"
+        :page.sync="queryParams.pageNo"
+        :limit.sync="queryParams.pageSize"
+        @pagination="getList"
+      />
     </el-row>
   </div>
 </template>
@@ -160,6 +189,7 @@ export default {
       },
       dataList: [],
       loading: false,
+      total: 0,
     };
   },
   mounted() {

src/views/product/createProduct.vue

@@ -273,9 +273,9 @@ export default {
           this.form.presaleEndTime = moment(this.form.datePicker[1]).valueOf();
         }
       }
-      if (this.form.bannerList?.length > 0) {
-        this.form.bannerList.shift();
-      }
+      // if (this.form.bannerList?.length > 0) {
+      //   this.form.bannerList.shift();
+      // }
       saveGoodsDraft(this.form).then((res) => {
         if (res.code == 200) {
           this.$message.success(`发布成功！请前往草稿箱查看`);
@@ -343,9 +343,9 @@ export default {
           this.form.presaleEndTime = moment(this.form.datePicker[1]).valueOf();
         }
       }
-      if (this.form.bannerList?.length > 0) {
-        this.form.bannerList.shift();
-      }
+      // if (this.form.bannerList?.length > 0) {
+      //   this.form.bannerList.shift();
+      // }
       this.btnLading = true;
       publishGoods(this.form).then((res) => {
         if (res.code == 200) {

src/views/product/list/allProduct.vue

@@ -786,7 +786,7 @@ export default {
     },
     handleDelist() {
       if (this.multipleSelection.length < 1) {
-        this.$message.error("请选择要导出的商品！");
+        this.$message.error("请选择要下架的商品！");
         return;
       }
       for (let index = 0; index < this.multipleSelection.length; index++) {

src/views/product/module/basic-info.vue

@@ -281,6 +281,7 @@ export default {
           sort: 1,
         });
       }
+
       this.$forceUpdate();
     },
 
@@ -343,7 +344,8 @@ export default {
 
     passValue() {
       this.form.bannerList = [];
-      if (this.bannerList?.length > 1) {
+      if (this.bannerList.length > 0) {
+        console.log("bannerList", this.bannerList);
         for (let index = 0; index < this.bannerList.length; index++) {
           this.form.bannerList.push({
             fileUrl: this.bannerList[index].url || this.bannerList[index].fileUrl,
@@ -351,9 +353,12 @@ export default {
           });
         }
         this.form.pic = this.bannerList[0].url || this.bannerList[0].fileUrl;
+        if (this.form.pic) {
+          this.form.bannerList.shift();
+        }
+      } else {
+        this.form.pic = "";
       }
-      console.log("xxczczx", this.form);
-
       this.$emit("updateValue", this.form);
     },
 

src/views/product/updateProduct.vue

@@ -412,9 +412,9 @@ export default {
       if (this.form.categoryId?.length > 0) {
         this.form.categoryId = this.form.categoryId[this.form.categoryId.length - 1];
       }
-      if (this.form.bannerList?.length > 0) {
-        this.form.bannerList.shift();
-      }
+      // if (this.form.bannerList?.length > 0) {
+      //   this.form.bannerList.shift();
+      // }
       saveGoodsDraft(this.form).then((res) => {
         if (res.code == 200) {
           this.$message.success(`保存成功！请前往草稿箱查看`);
@@ -442,9 +442,9 @@ export default {
         this.$message.error(`商品规格不能为空`);
         return;
       }
-      if (this.form.bannerList?.length > 0) {
-        this.form.bannerList.shift();
-      }
+      // if (this.form.bannerList?.length > 0) {
+      //   this.form.bannerList.shift();
+      // }
       this.btnLading = true;
 
       if (!this.form.presaleStartTime && !this.form.presaleEndTime) {

src/views/running/detail.vue

@@ -0,0 +1,423 @@
+<template>
+  <div class="app-container">
+    <div class="header">
+      <div style="display: flex; flex-direction: row; align-items: center">
+        <div class="name">
+          {{ info ? info.spuName : "" }}
+        </div>
+        <div class="no">
+          商品ID:{{ info ? info.spuId : "" }}
+          <i class="el-icon-document-copy" @click="copy"></i>
+        </div>
+      </div>
+      <div>
+        出入库时间：<el-date-picker
+          v-model="dateRange"
+          type="datetimerange"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          @change="datePicker"
+        >
+        </el-date-picker>
+      </div>
+    </div>
+    <div class="main">
+      <div class="item">
+        <div class="value">
+          {{ tj ? tj.canOutboundNum : 0 }}
+        </div>
+        <div class="label">当前库存数量(斤)</div>
+      </div>
+      <div class="item">
+        <div class="value">
+          {{ tj ? tj.canOutboundTotalPrice : 0 }}
+        </div>
+        <div class="label">当前库存总金额(￥)</div>
+      </div>
+      <div class="item">
+        <div class="value">
+          {{ tj ? tj.storeNum : 0 }}
+        </div>
+        <div class="label">入库总数量(斤)</div>
+      </div>
+      <div class="item">
+        <div class="value">
+          {{ tj ? tj.storeTotalPrice : 0 }}
+        </div>
+        <div class="label">入库总金额(￥)</div>
+      </div>
+      <div class="item">
+        <div class="value">
+          {{ tj ? tj.outBoundNum : 0 }}
+        </div>
+        <div class="label">出库数量(斤)</div>
+      </div>
+      <div class="item">
+        <div class="value">
+          {{ tj ? tj.outBoundTotalPrice : 0 }}
+        </div>
+        <div class="label">出库总金额(￥)</div>
+      </div>
+      <div class="item">
+        <div class="value">
+          {{ tj ? tj.outBoundProfit : 0 }}
+        </div>
+        <div class="label">已出库利润(￥)</div>
+      </div>
+    </div>
+    <el-tabs v-model="queryParams.storeOutboundType" @tab-click="getList">
+      <el-tab-pane label="入库记录" :name="0">
+        <el-form
+          :model="queryParams"
+          ref="queryForm"
+          size="small"
+          :inline="true"
+          label-width="100px"
+        >
+          <el-form-item prop="key">
+            <el-input
+              v-model="queryParams.key"
+              style="width: 200px"
+              placeholder="入库单号/入库订单名称"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="入库时间" prop="storeTime">
+            <el-date-picker
+              v-model="queryParams.storeTime"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              type="datetimerange"
+              range-separator="至"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              @change="rksjchange"
+            >
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" icon="el-icon-search" size="mini" @click="getList"
+              >搜索</el-button
+            >
+            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+              >重置</el-button
+            >
+          </el-form-item>
+          <el-row :gutter="10" class="mb8">
+            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+              >批量导出</el-button
+            >
+          </el-row>
+        </el-form>
+        <el-table
+          v-loading="loading"
+          :data="tableList"
+          @selection-change="handleSelectionChange"
+          row-key="id"
+        >
+          <el-table-column type="selection" width="50" align="center" />
+          <el-table-column label="入库单号" align="center" prop="storeOdd" width="200" />
+          <el-table-column label="入库订单名称" align="center" prop="storeOddName" />
+          <el-table-column label="入库时间" align="center" prop="storeDate" width="200" />
+          <el-table-column label="商品规格信息" align="storeGoods" width="120">
+            <template slot-scope="scope">
+              skuId:{{ scope.row.skuId }}<br />
+              规格:{{
+                scope.row.skuSpecs ? JSON.parse(scope.row.skuSpecs)[0].specsName : ""
+              }}<br />
+              内容:{{
+                scope.row.skuSpecs ? JSON.parse(scope.row.skuSpecs)[0].specsValue : ""
+              }}
+              <br />计量单位:{{ scope.row.spuUnit }}
+            </template>
+          </el-table-column>
+          <el-table-column label="单位换算" align="center" prop="storeUnit">
+            <template slot-scope="scope">
+              <div>
+                1{{ scope.row.spuUnit }} ≈{{ scope.row.unitConversion
+                }}{{ scope.row.storeUnit }}
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column label="入库数量" align="center" prop="storeNum" />
+          <el-table-column label="单价(￥)" align="center" prop="storeUnitPrice">
+            <template slot-scope="scope">
+              {{ scope.row.storeUnitPrice }}元/ {{ scope.row.storeUnit }}
+            </template>
+          </el-table-column>
+          <el-table-column label="合计金额(￥)" align="center" prop="totalStorePrice" />
+          <el-table-column label="当前库存数量" align="center" prop="storeNum" />
+          <el-table-column
+            label="当前库存总金额(￥)"
+            align="center"
+            prop="totalStorePrice"
+          />
+        </el-table>
+      </el-tab-pane>
+      <el-tab-pane label="出库记录" :name="1">
+        <el-form
+          :model="queryParams"
+          ref="queryForm"
+          size="small"
+          :inline="true"
+          label-width="100px"
+        >
+          <el-form-item prop="key">
+            <el-input
+              v-model="queryParams.key"
+              style="width: 300px"
+              placeholder="出库单号,关联入库订单编号,关联入库订单商品名称"
+            ></el-input>
+          </el-form-item>
+          <el-form-item prop="outboundType" label="出库类型">
+            <el-select v-model="queryParams.outboundType" placeholder="请选择">
+              <el-option label="全部" value="" />
+              <el-option label="销售出库" value="1" />
+              <el-option label="平台出库" value="2" />
+              <el-option label="下捡出库" value="0" />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="出库时间" prop="outboundTime">
+            <el-date-picker
+              v-model="queryParams.outboundTime"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              type="datetimerange"
+              range-separator="至"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              @change="cksjchange"
+              style="width: 200px"
+            >
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" icon="el-icon-search" size="mini" @click="getList"
+              >搜索</el-button
+            >
+            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+              >重置</el-button
+            >
+          </el-form-item>
+          <el-row :gutter="10" class="mb8">
+            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+              >批量导出</el-button
+            >
+          </el-row>
+        </el-form>
+        <el-table
+          :data="tableList"
+          @selection-change="handleSelectionChange"
+          row-key="id"
+          v-loading="loading"
+        >
+          <el-table-column type="selection" width="50" align="center" />
+          <el-table-column label="出库单号" align="center" prop="outboundOdd" />
+
+          <el-table-column label="出库类型" align="center" prop="outboundType">
+            <template slot-scope="scope">
+              {{
+                scope.row.outboundType == 0
+                  ? "下捡出库"
+                  : scope.row.outboundType == 1
+                  ? "销售出库"
+                  : scope.row.outboundType == 2
+                  ? "平台出库"
+                  : ""
+              }}
+            </template>
+          </el-table-column>
+          <el-table-column label="出库时间" align="center" prop="outboundDate" />
+          <el-table-column
+            label="关联入库单号"
+            align="center"
+            prop="associationStoreNum"
+          />
+          <el-table-column
+            label="关联入库订单名称"
+            align="center"
+            prop="associationStoreName"
+          />
+          <el-table-column label="商品规格信息" align="storeGoods" width="120">
+            <template slot-scope="scope">
+              skuId:{{ scope.row.skuId }}<br />
+              规格:{{
+                scope.row.skuSpecs ? JSON.parse(scope.row.skuSpecs)[0].specsName : ""
+              }}<br />
+              内容:{{
+                scope.row.skuSpecs ? JSON.parse(scope.row.skuSpecs)[0].specsValue : ""
+              }}
+              <br />计量单位:{{ scope.row.spuUnit }}
+            </template>
+          </el-table-column>
+          <el-table-column label="单位换算" align="center" prop="storeUnit">
+            <template slot-scope="scope">
+              <div>
+                1{{ scope.row.spuUnit }} ≈{{ scope.row.unitConversion
+                }}{{ scope.row.storeUnit }}
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column label="浮动重量" align="center">
+            <template slot-scope="scope">
+              {{ scope.row.floatingWeight }} {{ scope.row.storeUnit }}
+            </template>
+          </el-table-column>
+          <el-table-column label="出库总数量" align="center" prop="outboundNum" />
+          <el-table-column label="销售单价(￥)" align="center" prop="salePrice" />
+          <el-table-column
+            label="合计金额(￥)"
+            align="center"
+            prop="outBoundTotalPrice"
+          />
+        </el-table>
+      </el-tab-pane>
+    </el-tabs>
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.pageNo"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+  </div>
+</template>
+
+<script>
+import { outboundStoreSerialStatistics, queryPageDetail } from "@/api/manage/storage";
+export default {
+  data() {
+    return {
+      info: {},
+      tableList: [],
+      tj: {},
+      queryParams: {
+        pageSize: 10,
+        pageNo: 1,
+        storeOutboundType: 0,
+        outboundType: "",
+        outboundTime: "",
+        storeGoodsId: this.$route.query.storeGoodsId,
+        outboundStartTime: "",
+        outboundEndTime: "",
+        storeStartTime: "",
+        storeEndTime: "",
+        storeTime: "",
+      },
+      total: 0,
+      dateRange: [],
+      loading: false,
+    };
+  },
+  mounted() {
+    this.info = this.$route.query;
+    this.getStorageInfo();
+    this.getList();
+  },
+  methods: {
+    datePicker(val) {
+      this.getStorageInfo(val);
+    },
+    resetQuery() {
+      this.queryParams.storeTime = "";
+      this.queryParams.outboundTime = "";
+      this.queryParams.outboundStartTime = "";
+      this.queryParams.outboundEndTime = "";
+      this.queryParams.storeStartTime = "";
+      this.queryParams.storeEndTime = "";
+      this.resetForm("queryForm");
+      this.getList();
+    },
+    cksjchange(val) {
+      this.queryParams.outboundStartTime = val[0];
+      this.queryParams.outboundEndTime = val[1];
+    },
+    rksjchange(val) {
+      this.queryParams.storeStartTime = val[0];
+      this.queryParams.storeEndTime = val[1];
+    },
+
+    getList() {
+      this.loading = true;
+      queryPageDetail(this.queryParams).then((res) => {
+        if (res.code == 200) {
+          this.tableList = res.data.records;
+          this.loading = false;
+          this.total = res.data.total;
+        }
+      });
+    },
+
+    getStorageInfo(val) {
+      let params = {
+        storeGoodsId: this.info.storeGoodsId,
+      };
+      if (val) {
+        params.startTime = val[0];
+        params.endTime = val[1];
+      }
+      outboundStoreSerialStatistics(params).then((res) => {
+        if (res.code == 200) {
+          this.tj = res.data;
+        }
+      });
+    },
+
+    copy() {
+      const textarea = document.createElement("textarea");
+      textarea.value = this.info.spuId;
+      document.body.appendChild(textarea);
+      textarea.select();
+      document.execCommand("copy");
+      document.body.removeChild(textarea);
+      this.$message.success("复制成功");
+    },
+  },
+};
+</script>
+
+<style scoped lang="scss">
+.header {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: space-between;
+  .name {
+    font-size: 18px;
+    font-weight: 500;
+  }
+  .no {
+    margin-left: 20px;
+    font-size: 18px;
+    font-weight: 500;
+  }
+}
+.main1 {
+  margin-top: 20px;
+  border-radius: 20px;
+  padding: 15px;
+  display: flex;
+  flex-direction: row;
+  justify-content: space-around;
+  align-items: center;
+}
+.main {
+  margin-top: 20px;
+  background: #f4f4f4;
+  border-radius: 20px;
+  padding: 15px;
+  display: flex;
+  flex-direction: row;
+  justify-content: space-around;
+  align-items: center;
+  .item {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    font-weight: 500;
+    line-height: 30px;
+    .value {
+      font-size: 24px;
+    }
+  }
+}
+</style>

src/views/running/index.vue

@@ -0,0 +1,387 @@
+<template>
+  <div class="app-container">
+    <el-row :gutter="20">
+      <el-col :span="24">
+        <!--用户数据-->
+        <el-radio-group v-model="day" size="medium" @change="radioChange">
+          <el-radio-button :label="0" :value="0">当日</el-radio-button>
+          <el-radio-button :label="1" :value="1">本周</el-radio-button>
+          <el-radio-button :label="2" :value="2">本月</el-radio-button>
+          <el-radio-button :label="3" :value="3">自定义时间</el-radio-button>
+        </el-radio-group>
+        <el-date-picker
+          style="margin-left: 10px"
+          v-if="day == 3"
+          @change="pickerChange"
+          v-model="dateRange"
+          value-format="yyyy-MM-dd"
+          type="datetimerange"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        >
+        </el-date-picker>
+      </el-col>
+      <el-col :span="24" style="margin-top: 30px">
+        <div class="header" style="width: 100%" v-if="!hdUserId">
+          <el-row class="row" :gutter="12">
+            <el-col :span="8">
+              <el-card shadow="always">
+                <div class="item">
+                  <div style="padding: 0px 10px 10px 10px">
+                    <span>所有商品总入库金额(￥)</span>
+                  </div>
+                  <div class="count">
+                    {{ statistics ? statistics.totalPrice : 0 }}
+                  </div>
+                </div>
+              </el-card>
+            </el-col>
+            <el-col :span="8">
+              <el-card shadow="always">
+                <div class="item">
+                  <div style="padding: 0px 10px 10px 10px">
+                    <span>所有商品总出库金额(￥)</span>
+                  </div>
+                  <div class="count">
+                    {{ statistics ? statistics.outBoundNumTotalPrice : 0 }}
+                  </div>
+                </div>
+              </el-card>
+            </el-col>
+            <el-col :span="8">
+              <el-card shadow="always">
+                <div class="item">
+                  <div style="padding: 0px 10px 10px 10px">
+                    <span>所有商品总出库利润(￥)</span>
+                  </div>
+                  <div class="count">
+                    {{ statistics ? statistics.outBoundProfit : 0 }}
+                  </div>
+                </div>
+              </el-card>
+            </el-col>
+          </el-row>
+        </div>
+      </el-col>
+      <el-col :span="24" :xs="24" style="margin-top: 30px">
+        <el-form
+          :model="queryParams"
+          ref="queryForm"
+          size="small"
+          :inline="true"
+          v-show="showSearch"
+          label-width="100px"
+        >
+          <el-form-item prop="key">
+            <el-input
+              v-model="queryParams.key"
+              style="width: 200px"
+              placeholder="商品ID/商品名称"
+            ></el-input>
+          </el-form-item>
+          <el-form-item prop="categoryId">
+            <el-cascader
+              v-model="queryParams.categoryId"
+              ref="formCascader"
+              placeholder="请选择分类"
+              :props="categoryprops"
+              @change="cascaderChange"
+            />
+          </el-form-item>
+
+          <el-form-item label="商品状态" prop="spuStatus">
+            <el-select
+              v-model="queryParams.spuStatus"
+              placeholder="请选择商品状态"
+              style="width: 240px"
+            >
+              <el-option label="全部" value=""> </el-option>
+              <el-option label="售罄" value="2"> </el-option>
+              <el-option label="上架" value="0"> </el-option>
+              <el-option label="下架" value="1"> </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" icon="el-icon-search" size="mini" @click="getList"
+              >搜索</el-button
+            >
+            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+              >重置</el-button
+            >
+          </el-form-item>
+        </el-form>
+
+        <el-row :gutter="10" class="mb8">
+          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+            >批量导出</el-button
+          >
+          <right-toolbar
+            :showSearch.sync="showSearch"
+            @queryTable="getList"
+          ></right-toolbar>
+        </el-row>
+      </el-col>
+      <el-table v-loading="loading" :data="dataList">
+        <el-table-column type="selection" width="50" align="center" />
+        <el-table-column label="商品ID" align="center" prop="spuId" />
+        <el-table-column label="商品名称" align="center" prop="spuName" />
+        <el-table-column label="商品分类" align="center" prop="categoryName" />
+        <el-table-column label="商品状态" align="storeGoods">
+          <template slot-scope="scope">
+            {{
+              scope.row.spuStatus == 0
+                ? "上架"
+                : scope.row.spuStatus == 1
+                ? "下架"
+                : scope.row.spuStatus == 2
+                ? "售罄"
+                : ""
+            }}
+          </template>
+        </el-table-column>
+        <el-table-column label="当前库存数量" align="center" prop="canOutboundNum" />
+        <el-table-column
+          label="当前库存总金额(￥)"
+          align="center"
+          prop="canOutboundTotalPrice"
+          width="150"
+        />
+        <el-table-column label="入库总数量" align="center" prop="totalStoreNum" />
+        <el-table-column
+          label="入库总金额(￥)"
+          align="center"
+          prop="totalOutboundPrice"
+        />
+        <el-table-column
+          label="出库总数量"
+          align="center"
+          prop="totalOutboundNum"
+          width="200"
+        />
+        <el-table-column
+          label="出库总金额(￥)"
+          align="center"
+          prop="totalOutboundPrice"
+        />
+        <el-table-column
+          label="已出库利润(￥)"
+          align="center"
+          prop="outBoundProfit"
+          width="200"
+        />
+
+        <el-table-column
+          label="操作"
+          align="center"
+          width="160"
+          class-name="small-padding fixed-width"
+        >
+          <template slot-scope="scope">
+            <el-button
+              size="mini"
+              type="text"
+              @click="handleDetail(scope.row)"
+              v-hasPermi="['storage:detail']"
+              >流水详情</el-button
+            >
+          </template>
+        </el-table-column>
+      </el-table>
+      <pagination
+        v-show="total > 0"
+        :total="total"
+        :page.sync="queryParams.pageNo"
+        :limit.sync="queryParams.pageSize"
+        @pagination="getList"
+      />
+    </el-row>
+  </div>
+</template>
+
+<script>
+import {
+  outboundStoreSerialqueryPage,
+  storeManageRemove,
+  statisticsPrice,
+} from "@/api/manage/storage.js";
+import { getClassificationListPage } from "@/api/common/index";
+export default {
+  data() {
+    return {
+      day: 0,
+      showSearch: true,
+      queryParams: {
+        key: "",
+        pageNo: 1,
+        pageSize: 10,
+        storeTime: "",
+        createTime: "",
+      },
+      dataList: [],
+      loading: false,
+      statistics: {},
+      dateRange: [],
+      categoryprops: {
+        checkStrictly: true,
+        lazy: true,
+        lazyLoad: this.categoryLazyLoad,
+      },
+      total: 0,
+    };
+  },
+  mounted() {
+    this.getList();
+    this.getstatisticsPrice();
+  },
+  methods: {
+    pickerChange(val) {
+      this.getstatisticsPrice(val);
+    },
+    radioChange() {
+      if (this.day != 3) {
+        this.getstatisticsPrice();
+      }
+    },
+    getstatisticsPrice(val) {
+      let startTime;
+      let endTime;
+      let dayType;
+      if (this.day != 3) {
+        dayType = this.day;
+      } else {
+        dayType = "";
+      }
+      if (val) {
+        startTime = val[0];
+        endTime = val[1];
+      }
+
+      statisticsPrice({ dayType: dayType, startTime: startTime, endTime: endTime }).then(
+        (res) => {
+          if (res.code == 200) {
+            this.statistics = res.data;
+          }
+        }
+      );
+    },
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.getList();
+    },
+    getList() {
+      this.loading = true;
+      outboundStoreSerialqueryPage(this.queryParams).then((res) => {
+        this.dialogVisible = true;
+        this.dataList = res.data.records;
+        this.total = res.data.total;
+        this.loading = false;
+      });
+    },
+    handleRemove(record) {
+      this.$confirm("是否确认删除该记录,删除后无法恢复？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          storeManageRemove(record.id).then((res) => {
+            if (res.code == 200) {
+              this.$message.success("删除成功！");
+              this.getList();
+            }
+          });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "已取消操作",
+          });
+        });
+    },
+    handleDetail(record) {
+      this.$router.push({ path: "/storage/running/detail", query: record });
+    },
+
+    categoryLazyLoad(node, resolve) {
+      let that = this;
+      let level = node.level;
+      console.log(node);
+      if (!node.data) {
+        getClassificationListPage({ parentId: 0 }).then((res) => {
+          //接口
+          const nodes = Array.from(res.data).map((item, index) => ({
+            value: item.id,
+            label: `${item.className}`,
+            leaf: level >= 2,
+          }));
+          console.log("111", node);
+          // 通过调用resolve将子节点数据返回，通知组件数据加载完成
+          resolve(nodes);
+        });
+      } else if (level == 1) {
+        getClassificationListPage({ parentId: node.data.value }).then((res) => {
+          const nodes = Array.from(res.data).map((item) => ({
+            value: item.id,
+            label: `${item.className}`,
+            leaf: level >= 2,
+            // level: 2,
+          }));
+          // 通过调用resolve将子节点数据返回，通知组件数据加载完成
+          resolve(nodes);
+        });
+      } else if (level == 2) {
+        getClassificationListPage({ parentId: node.data.value }).then((res) => {
+          const nodes = Array.from(res.data).map((item) => ({
+            value: item.id,
+            label: `${item.className}`,
+            leaf: level >= 1,
+            level: 1,
+          }));
+          // 通过调用resolve将子节点数据返回，通知组件数据加载完成
+          resolve(nodes);
+        });
+      } else {
+        resolve({});
+      }
+    },
+    cascaderChange(val) {
+      if (val.length == 1) {
+        this.queryParams.categoryId = val[0];
+      } else if (val.length == 2) {
+        this.queryParams.categoryId = val[1];
+      } else if (val.length == 3) {
+        this.queryParams.categoryId = val[2];
+      }
+    },
+  },
+};
+</script>
+
+<style scoped lang="scss">
+.header {
+  margin-bottom: 30px;
+  .item {
+    height: 100px;
+  }
+  .row {
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+    align-items: center;
+    .count {
+      padding: 10px;
+      margin-top: 10px;
+      font-size: 20px;
+      font-weight: 500;
+      text-align: center;
+      color: #164bd3e6;
+    }
+    .zz {
+      font-size: 14px;
+      color: red;
+      padding: 0px 10px;
+    }
+  }
+}
+</style>

src/views/shelflife/index.vue

@@ -0,0 +1,174 @@
+<template>
+  <div class="app-container">
+    <el-row :gutter="20">
+      <!--用户数据-->
+      <el-col :span="24" :xs="24">
+        <el-form
+          :model="queryParams"
+          ref="queryForm"
+          size="small"
+          :inline="true"
+          v-show="showSearch"
+          label-width="100px"
+        >
+          <el-form-item prop="key">
+            <el-input
+              v-model="queryParams.key"
+              style="width: 400px"
+              placeholder="入库单号,入库订单名称,商品ID,商品名称搜索"
+            ></el-input>
+          </el-form-item>
+          <el-form-item prop="statusCode" label="状态">
+            <el-select v-model="queryParams.statusCode" placeholder="请选择">
+              <el-option label="正常" :value="0" />
+              <el-option label="即将到期" :value="1" />
+              <el-option label="已到期" :value="2" />
+            </el-select>
+          </el-form-item>
+
+          <el-form-item>
+            <el-button type="primary" icon="el-icon-search" size="mini" @click="getList"
+              >搜索</el-button
+            >
+            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+              >重置</el-button
+            >
+          </el-form-item>
+        </el-form>
+
+        <el-row :gutter="10" class="mb8">
+          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+            >批量导出</el-button
+          >
+          <el-button type="primary" icon="el-icon-plus" size="mini" @click="addStorage"
+            >新增</el-button
+          >
+          <right-toolbar
+            :showSearch.sync="showSearch"
+            @queryTable="getList"
+          ></right-toolbar>
+        </el-row>
+      </el-col>
+      <el-table v-loading="loading" :data="dataList">
+        <el-table-column type="selection" width="50" align="center" />
+        <el-table-column label="入库单号" align="center" prop="storeOdd" width="200" />
+        <el-table-column label="入库订单名称" align="center" prop="storeOddName" />
+        <el-table-column label="商品ID" align="center" prop="dxSpuId" width="200" />
+        <el-table-column label="商品名称" prop="spuName" width="200"> </el-table-column>
+        <el-table-column label="生产日期" align="center" prop="produceDate" />
+        <el-table-column label="状态" align="center" prop="statusCode">
+          <template slot-scope="scope">
+            <el-tag type="success" v-if="scope.row.statusCode == 0">正常</el-tag>
+            <el-tag type="warning" v-else-if="scope.row.statusCode == 1">即将到期</el-tag>
+            <el-tag type="danger" v-else-if="scope.row.statusCode == 2">已到期</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="保质期" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.shelfLife }}
+            {{
+              scope.row.shelfLifeUnit == 0
+                ? "天"
+                : scope.row.shelfLifeUnit == 1
+                ? "月"
+                : "年"
+            }}
+          </template>
+        </el-table-column>
+        <el-table-column label="剩余天数（天）" align="center" prop="remainingDays" />
+        <el-table-column
+          label="预警天数(天)"
+          align="center"
+          prop="warningDay"
+          width="200"
+        />
+      </el-table>
+      <pagination
+        v-show="total > 0"
+        :total="total"
+        :page.sync="queryParams.pageNo"
+        :limit.sync="queryParams.pageSize"
+        @pagination="getList"
+      />
+    </el-row>
+  </div>
+</template>
+
+<script>
+import { queryShelfLife, storeManageRemove } from "@/api/manage/storage.js";
+export default {
+  data() {
+    return {
+      showSearch: true,
+      queryParams: {
+        key: "",
+        pageNo: 1,
+        pageSize: 10,
+        storeTime: "",
+        createTime: "",
+      },
+      dataList: [],
+      loading: false,
+      total: 0,
+    };
+  },
+  mounted() {
+    this.getList();
+  },
+  methods: {
+    rksjchange(val) {
+      this.queryParams.storeStartTime = val[0];
+      this.queryParams.storeEndTime = val[1];
+    },
+    scsjchange(val) {
+      this.queryParams.createStartTime = val[0];
+      this.queryParams.createEndTime = val[1];
+    },
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.getList();
+    },
+    getList() {
+      this.loading = true;
+      queryShelfLife(this.queryParams).then((res) => {
+        this.dialogVisible = true;
+        this.dataList = res.data.records;
+        this.total = res.data.total;
+        this.loading = false;
+      });
+    },
+    handleRemove(record) {
+      this.$confirm("是否确认删除该记录,删除后无法恢复？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          storeManageRemove(record.id).then((res) => {
+            if (res.code == 200) {
+              this.$message.success("删除成功！");
+              this.getList();
+            }
+          });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "已取消操作",
+          });
+        });
+    },
+    handleDetail(record) {
+      this.$router.push({ path: "/storage/storage/look", query: record });
+    },
+    handleEdit(record) {
+      this.$router.push({ path: "/storage/storage/edit", query: record });
+    },
+    addStorage() {
+      this.$router.push({ path: "/storage/storage/add" });
+    },
+  },
+};
+</script>
+
+<style></style>

src/views/storage/add.vue

@@ -176,9 +176,9 @@
               placeholder="请选择"
               style="width: 100px"
             >
-              <el-option label="天" value="天" />
-              <el-option label="月" value="月" />
-              <el-option label="年" value="年" />
+              <el-option label="天" :value="0" />
+              <el-option label="月" :value="1" />
+              <el-option label="年" :value="2" />
             </el-select>
           </el-form-item>
         </el-col>
@@ -366,7 +366,7 @@ export default {
         produceDate: "",
         remark: "",
         shelfLife: "",
-        shelfLifeUnit: "天",
+        shelfLifeUnit: 0,
         storeDate: "",
         storeGoodsList: [],
         storeOdd: "",

src/views/storage/edit.vue

@@ -176,9 +176,9 @@
               placeholder="请选择"
               style="width: 100px"
             >
-              <el-option label="天" value="天" />
-              <el-option label="月" value="月" />
-              <el-option label="年" value="年" />
+              <el-option label="天" :value="0" />
+              <el-option label="月" :value="1" />
+              <el-option label="年" :value="2" />
             </el-select>
           </el-form-item>
         </el-col>
@@ -371,7 +371,7 @@ export default {
         produceDate: "",
         remark: "",
         shelfLife: "",
-        shelfLifeUnit: "天",
+        shelfLifeUnit: 0,
         storeDate: "",
         storeGoodsList: [],
         storeOdd: "",

src/views/storage/index.vue

@@ -119,6 +119,13 @@
           </template>
         </el-table-column>
       </el-table>
+      <pagination
+        v-show="total > 0"
+        :total="total"
+        :page.sync="queryParams.pageNo"
+        :limit.sync="queryParams.pageSize"
+        @pagination="getList"
+      />
     </el-row>
   </div>
 </template>
@@ -138,6 +145,7 @@ export default {
       },
       dataList: [],
       loading: false,
+      total: 0,
     };
   },
   mounted() {

src/views/storage/look.vue

@@ -56,7 +56,18 @@
           info ? info.produceDate : ""
         }}</el-descriptions-item>
         <el-descriptions-item label="保质期"
-          >{{ info ? info.shelfLife : "" }}{{ info ? info.shelfLifeUnit : "" }}
+          >{{ info ? info.shelfLife : ""
+          }}{{
+            info
+              ? info.shelfLifeUnit == 0
+                ? "天"
+                : info.shelfLifeUnit == 1
+                ? "月"
+                : info.shelfLifeUnit == 2
+                ? "年"
+                : ""
+              : ""
+          }}
         </el-descriptions-item>
         <el-descriptions-item label="预警天数"
           >{{ info ? info.warningDay : "" }}
@@ -91,7 +102,10 @@
           <el-table-column label="规格内容" align="center" prop="skuSpecName" />
           <el-table-column label="单位换算" align="center" width="200">
             <template slot-scope="scope">
-              <div>1{{ scope.row.spuUnit }} ≈{{ scope.row.unitConversion }}斤</div>
+              <div>
+                1{{ scope.row.spuUnit }} ≈{{ scope.row.unitConversion
+                }}{{ info.storeUnit }}
+              </div>
             </template>
           </el-table-column>
           <el-table-column label="浮动重量" align="center">

src/views/transmission/createProduct.vue

@@ -24,7 +24,7 @@
             <el-button type="primary" @click="submitFormDraft">存入草稿箱</el-button>
           </div>
         </el-col>
-        <phoneView style="position: absolute; bottom: 50px; right: 50px">
+        <phoneView style="position: absolute; bottom: -80px; right: 50px">
           <div slot="conts">
             <div>
               <el-carousel height="200px">
@@ -274,9 +274,6 @@ export default {
           this.form.presaleEndTime = moment(this.form.datePicker[1]).valueOf();
         }
       }
-      if (this.form.bannerList?.length > 0) {
-        this.form.bannerList.shift();
-      }
       saveGoodsDraft(this.form).then((res) => {
         if (res.code == 200) {
           this.$message.success(`发布成功！请前往草稿箱查看`);
@@ -344,9 +341,9 @@ export default {
           this.form.presaleEndTime = moment(this.form.datePicker[1]).valueOf();
         }
       }
-      if (this.form.bannerList?.length > 0) {
-        this.form.bannerList.shift();
-      }
+      // if (this.form.bannerList?.length > 0) {
+      //   this.form.bannerList.shift();
+      // }
       this.btnLading = true;
       publishGoods(this.form).then((res) => {
         if (res.code == 200) {

src/views/transmission/list/allProduct.vue

@@ -664,7 +664,7 @@ export default {
     },
     handleDelist() {
       if (this.multipleSelection.length < 1) {
-        this.$message.error("请选择要导出的商品！");
+        this.$message.error("请选择要下架的商品！");
         return;
       }
       for (let index = 0; index < this.multipleSelection.length; index++) {
@@ -725,7 +725,7 @@ export default {
         {
           ...this.queryParams,
         },
-        `商品信息_${new Date().getTime()}.xlsx`
+        `同城秒送商品信息_${new Date().getTime()}.xlsx`
       );
     },
     BatchRemove() {
@@ -838,8 +838,6 @@ export default {
       });
     },
     handleUpdate(record) {
-      console.log("1231231", record);
-
       if (record.scope == 2) {
         this.$message.error("特价商品不能编辑商品，请先取消特价！");
         return false;
@@ -851,7 +849,7 @@ export default {
       window.localStorage.setItem("productInfo", JSON.stringify(params));
       this.$router.push({
         path: "/product/transmission/updateProduct",
-        query: { params },
+        query: { params, type: "" },
       });
     },
     computePrice(data) {

src/views/transmission/list/draftProduct.vue

@@ -260,7 +260,7 @@ export default {
       window.localStorage.setItem("productInfo", JSON.stringify(params));
       this.$router.push({
         path: "/product/transmission/updateProduct",
-        query: { params },
+        query: { params, type: "cg" },
       });
     },
   },

src/views/transmission/module/basic-info.vue

@@ -8,10 +8,14 @@
     :rules="rules"
   >
     <el-row>
-      <el-col :span="24" v-if="actionType != 'edit'">
+      <el-col :span="24">
         <el-form-item prop="saleType">
           <span slot="label">销售模式</span>
-          <el-radio-group v-model="form.saleModel" @change="passValue">
+          <el-radio-group
+            v-model="form.saleModel"
+            @change="passValue"
+            :disabled="actionType == 'edit'"
+          >
             <el-radio :label="1" :value="1">普通商品</el-radio>
             <el-radio :label="5" :value="5">新人福利</el-radio>
             <el-radio :label="3" :value="3">团购秒杀</el-radio>
@@ -171,7 +175,6 @@ export default {
       shopInfo: {},
       categoryName: "",
       radio: "",
-
       actionType: "",
     };
   },
@@ -180,8 +183,13 @@ export default {
   },
 
   methods: {
-    getFormInfo(record) {
-      this.actionType = "edit";
+    getFormInfo(record, type) {
+      if (type != "cg") {
+        this.actionType = "edit";
+      } else {
+        this.actionType = "";
+      }
+
       this.form.datePicker = [];
       this.form.categoryId = record.categoryId;
       this.form.categoryIds = record.categoryIds;
@@ -262,7 +270,8 @@ export default {
 
     passValue() {
       this.form.bannerList = [];
-      if (this.bannerList?.length > 1) {
+      if (this.bannerList.length > 0) {
+        console.log("bannerList", this.bannerList);
         for (let index = 0; index < this.bannerList.length; index++) {
           this.form.bannerList.push({
             fileUrl: this.bannerList[index].url || this.bannerList[index].fileUrl,
@@ -270,6 +279,11 @@ export default {
           });
         }
         this.form.pic = this.bannerList[0].url || this.bannerList[0].fileUrl;
+        if (this.form.pic) {
+          this.form.bannerList.shift();
+        }
+      } else {
+        this.form.pic = "";
       }
       this.$emit("updateValue", this.form);
     },

src/views/transmission/module/sales-info.vue

@@ -314,6 +314,7 @@ export default {
     saleModels(newVal, oldVal) {
       console.log("azxczx", newVal);
       this.saleModel = newVal;
+      this.$forceUpdate();
     },
   },
   mounted() {
@@ -322,6 +323,7 @@ export default {
   },
   methods: {
     getFormInfo(record) {
+      this.saleModel = record.saleModel;
       this.addr = record.shippingAddr;
       this.form.expressType = record.expressType;
       this.form.shippingAddrBean = {
@@ -350,22 +352,13 @@ export default {
       if (this.form.freeShipping) {
         this.form.freeShipping = record.freeShipping;
       }
-
       this.form.skuList = record.skuList;
     },
 
     setShowCom(val) {
       this.showCom = val;
     },
-    compilatePrice(data) {
-      if (data.price) {
-        return data.price.toFixed(2);
-      } else if (data.originalPrice) {
-        return data.originalPrice.toFixed(2);
-      } else if (data.originalPrice && data.price) {
-        return data.price.toFixed(2);
-      }
-    },
+
     formvalidate() {
       let that = this;
       return new Promise((resolve) => {
@@ -403,44 +396,17 @@ export default {
         }
       });
     },
-    computePrice(data) {
-      if (this.shopInfo.scope == 0) {
-        if (
-          data.skuCost.purchaseFee &&
-          data.skuCost.laborFee &&
-          data.skuCost.agencyFee &&
-          data.skuCost.materialFee
-        ) {
-          return (
-            Number(data.skuCost.purchaseFee) +
-            Number(data.skuCost.laborFee) +
-            Number(data.skuCost.agencyFee) +
-            Number(data.skuCost.materialFee)
-          ).toFixed(2);
-        } else {
-          return 0;
-        }
-      } else {
-      }
-    },
+
     passValue() {
-      if (this.shopInfo.scope == 0) {
+      console.log(this.form);
+      console.log("model", this.saleModel);
+
+      if (this.saleModel == 1) {
         this.form.skuList.forEach((e) => {
-          e.skuPriceList.forEach((a) => {
-            a.price = this.computePrice(e);
-            a.originalPrice = this.computePrice(e);
-            a.lowestPrice = this.computePrice(e);
-          });
+          e.skuPriceList[0].price = e.skuPriceList[0].originalPrice;
         });
-      } else {
-        if (this.saleType != 4) {
-          this.form.skuList.forEach((e) => {
-            e.skuPriceList.forEach((a) => {
-              a.price = a.originalPrice;
-            });
-          });
-        }
       }
+
       this.$emit("updateValue", this.form);
     },
     Mapaddress(data) {

src/views/transmission/updateProduct.vue

@@ -10,6 +10,7 @@
             ref="salesRefs"
             @updateValue="updateValue"
             @skuRemove="skuRemove"
+            :saleModels="form.saleModel"
           ></salesInfo>
           <el-descriptions title="商品详情" column="1"> </el-descriptions>
           <productInfo ref="productRefs" @updateValue="updateValue"></productInfo>
@@ -27,7 +28,7 @@
             >
           </div>
         </el-col>
-        <phoneView style="position: absolute; bottom: 50px; right: 50px">
+        <phoneView style="position: absolute; bottom: 0px; right: 50px">
           <div slot="conts">
             <div>
               <el-carousel height="200px">
@@ -314,7 +315,7 @@ export default {
             } else {
               this.$refs.salesRefs.setShowCom(true);
             }
-            this.$refs.basicRefs.getFormInfo(this.form);
+            this.$refs.basicRefs.getFormInfo(this.form, this.$route.query.type);
             this.$refs.salesRefs.getFormInfo(this.form);
             this.$refs.productRefs.getFormInfo(this.form);
           }
@@ -356,7 +357,7 @@ export default {
             } else {
               this.$refs.salesRefs.setShowCom(true);
             }
-            this.$refs.basicRefs.getFormInfo(this.form);
+            this.$refs.basicRefs.getFormInfo(this.form, this.$route.query.type);
             this.$refs.salesRefs.getFormInfo(this.form);
             this.$refs.productRefs.getFormInfo(this.form);
           }
@@ -412,9 +413,7 @@ export default {
       if (this.form.categoryId?.length > 0) {
         this.form.categoryId = this.form.categoryId[this.form.categoryId.length - 1];
       }
-      if (this.form.bannerList?.length > 0) {
-        this.form.bannerList.shift();
-      }
+
       saveGoodsDraft(this.form).then((res) => {
         if (res.code == 200) {
           this.$message.success(`保存成功！请前往草稿箱查看`);
@@ -442,9 +441,9 @@ export default {
         this.$message.error(`商品规格不能为空`);
         return;
       }
-      if (this.form.bannerList?.length > 0) {
-        this.form.bannerList.shift();
-      }
+      // if (this.form.bannerList?.length > 0) {
+      //   this.form.bannerList.shift();
+      // }
       this.btnLading = true;
 
       if (!this.form.presaleStartTime && !this.form.presaleEndTime) {
@@ -491,6 +490,7 @@ export default {
     },
     updateValue(val) {
       this.form = { ...this.form, ...val };
+      console.log("xzczxczx", this.form);
 
       if (this.form.saleType == 2) {
         this.$refs.salesRefs.setShowCom(true);

vue.config.js

@@ -36,7 +36,7 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        target: `http://192.168.3.98:30023/merchant`,
+        target: `http://192.168.3.107:30023/merchant`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''