修改

src/api/manage/storage.js

@@ -155,4 +155,14 @@ export function queryShelfLife(query) {
         method: 'get',
         params: query
     })
+}
+
+
+
+export function storeManageExport(query) {
+    return request({
+        url: '/system/storeManage/export',
+        method: 'post',
+        data: query
+    })
 }

src/views/manage/active.vue

@@ -79,14 +79,14 @@
           <el-tag type="success" v-if="scope.row.tag > 0">{{
             scope.row.tag == 1
               ? "年货节"
-              : scope.row.tag == 2
-              ? "6.18"
-              : scope.row.tag == 3
-              ? "国庆大促"
-              : scope.row.tag == 4
-              ? "双十一"
-              : scope.row.tag == 5
-              ? "双十二"
+              : scope.row.tag == 9
+              ? "清库专区"
+              : scope.row.tag == 8
+              ? "集采预售"
+              : scope.row.tag == 7
+              ? "团批秒杀"
+              : scope.row.tag == 6
+              ? "新店福利"
               : ""
           }}</el-tag>
         </template>

src/views/outbound/edit.vue

@@ -155,6 +155,7 @@
                     style="width: 100px"
                     show-word-limit
                     @input="passValue"
+                    disabled
                   >
                     <span slot="suffix">{{ scope.row.spuUnit }}</span>
                   </el-input>
@@ -169,6 +170,7 @@
                     style="width: 100px"
                     show-word-limit
                     @input="passValue"
+                    disabled
                   >
                     <span slot="suffix">元/{{ scope.row.spuUnit }}</span>
                   </el-input>

src/views/outbound/index.vue

@@ -63,7 +63,7 @@
         </el-form>
 
         <el-row :gutter="10" class="mb8">
-          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+          <el-button icon="el-icon-refresh" size="mini" @click="handleExport"
             >批量导出</el-button
           >
           <el-button type="primary" icon="el-icon-plus" size="mini" @click="addStorage"
@@ -75,7 +75,11 @@
           ></right-toolbar>
         </el-row>
       </el-col>
-      <el-table v-loading="loading" :data="dataList">
+      <el-table
+        v-loading="loading"
+        :data="dataList"
+        @selection-change="handleSelectionChange"
+      >
         <el-table-column type="selection" width="50" align="center" />
         <el-table-column label="出库单号" align="center" prop="outboundOdd" />
         <el-table-column label="出库时间" align="center" prop="outboundDate" />
@@ -190,6 +194,7 @@ export default {
       dataList: [],
       loading: false,
       total: 0,
+      ids: [],
     };
   },
   mounted() {
@@ -205,6 +210,10 @@ export default {
       this.queryParams.outboundEndTime = val[1];
     },
     resetQuery() {
+      this.queryParams.createStartTime = "";
+      this.queryParams.createEndTime = "";
+      this.queryParams.outboundStartTime = "";
+      this.queryParams.outboundEndTime = "";
       this.resetForm("queryForm");
       this.getList();
     },
@@ -217,7 +226,20 @@ export default {
         this.loading = false;
       });
     },
-
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map((item) => item.id);
+    },
+    handleExport() {
+      this.queryParams.ids = this.ids.toString();
+      this.download(
+        "system/outboundManage/export",
+        {
+          ...this.queryParams,
+        },
+        `出库信息表_${new Date().getTime()}.xlsx`
+      );
+    },
     handleDetail(record) {
       this.$router.push({ path: "/storage/outbound/look", query: record });
     },

src/views/product/createProduct.vue

@@ -10,6 +10,7 @@
             @updateValue="updateValue"
             ref="salesRefs"
             :saleType="form.saleType"
+            :saleModels="form.saleModel"
           ></salesInfo>
           <el-descriptions title="商品详情" column="1"> </el-descriptions>
           <productInfo @updateValue="updateValue" ref="productRefs"></productInfo>
@@ -360,6 +361,8 @@ export default {
     },
     updateValue(val) {
       this.form = { ...this.form, ...val };
+      console.log(this.form);
+      
       if (this.form.saleType == 2) {
         this.$refs.salesRefs.setShowCom(true);
       } else if (this.form.scope == 0) {

src/views/product/list/allProduct.vue

@@ -229,23 +229,44 @@
           <span v-else> </span>
         </template>
       </el-table-column>
-      <el-table-column label="关联活动" align="center" prop="promotionTitle">
+
+      <el-table-column label="销售模式" align="center">
         <template slot-scope="scope">
-          {{ scope.row.promotionTag === "1" ? "年货节" : "" }}
+          <span v-if="scope.row.scope == 1">
+            {{
+              scope.row.saleModel == 1
+                ? "普通商品"
+                : scope.row.saleModel == 2
+                ? "采集预售"
+                : scope.row.saleModel == 3
+                ? "团批秒杀"
+                : scope.row.saleModel == 4
+                ? "清库专区"
+                : scope.row.saleModel == 5
+                ? "新店福利"
+                : ""
+            }}
+          </span>
+          <span v-else> </span>
         </template>
       </el-table-column>
-
-      <!-- <el-table-column label="发布状态" align="center">
+      <el-table-column label="关联活动" align="center" prop="promotionTitle">
         <template slot-scope="scope">
           {{
-            scope.row.releaseStatus == 0
-              ? "未发布"
-              : scope.row.releaseStatus == 1
-              ? "已发布"
+            scope.row.promotionTag == 1
+              ? "年货节"
+              : scope.row.promotionTag == 9
+              ? "清库专区"
+              : scope.row.promotionTag == 8
+              ? "集采预售"
+              : scope.row.promotionTag == 7
+              ? "团批秒杀"
+              : scope.row.promotionTag == 6
+              ? "新店福利"
               : ""
           }}
         </template>
-      </el-table-column> -->
+      </el-table-column>
       <el-table-column label="商品属性" align="center" width="150">
         <template slot-scope="scope">
           <div v-for="(item, index) in scope.row.propNew" :key="index">
@@ -406,7 +427,19 @@
         <el-table-column prop="tag" label="备注" width="160">
           <template slot-scope="scope">
             <el-tag>
-              {{ scope.row.tag == 1 ? "年货节" : "" }}
+              {{
+                scope.row.tag == 1
+                  ? "年货节"
+                  : scope.row.tag == 9
+                  ? "清库专区"
+                  : scope.row.tag == 8
+                  ? "集采预售"
+                  : scope.row.tag == 7
+                  ? "团批秒杀"
+                  : scope.row.tag == 6
+                  ? "新店福利"
+                  : ""
+              }}
             </el-tag>
           </template>
         </el-table-column>

src/views/product/list/draftProduct.vue

@@ -86,10 +86,10 @@
           {{ scope.row.scope == 0 ? "全国" : scope.row.scope == 1 ? "同城" : "特价" }}
         </template>
       </el-table-column>
-      <el-table-column label="销售模式" align="center">
+      <el-table-column label="销售方式" align="center">
         <template slot-scope="scope">
           <span v-if="scope.row.scope == 0">
-            {{ scope.row.saleModel == 1 ? "现货" : "预售" }}
+            {{ scope.row.saleType == 1 ? "现货" : "预售" }}
           </span>
           <span v-else> </span>
         </template>

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

@@ -26,16 +26,28 @@
           </el-radio-group>
         </el-form-item>
       </el-col>
+      <el-col :span="24" v-if="form.saleType != 4">
+        <el-form-item prop="saleType">
+          <span slot="label">销售模式</span>
+          <el-radio-group v-model="form.saleModel" @change="passValue">
+            <el-radio :label="1" :value="1">普通商品</el-radio>
+            <el-radio :label="5" :value="5">新店福利</el-radio>
+            <el-radio :label="3" :value="3">团批秒杀</el-radio>
+            <el-radio :label="4" :value="4">清库专区</el-radio>
+            <el-radio :label="2" :value="2">集采预售</el-radio>
+          </el-radio-group>
+        </el-form-item>
+      </el-col>
       <el-col :span="24" v-if="shopInfo.scope == 0 && form.saleType == 0">
         <el-form-item prop="saleModel">
           <span slot="label">销售模式</span>
-          <el-radio-group v-model="form.saleModel" @change="passValue">
+          <el-radio-group v-model="form.saleType" @change="passValue">
             <el-radio :label="1">现货</el-radio>
             <el-radio :label="2" v-if="shopInfo.scope == 0">预售</el-radio>
           </el-radio-group>
         </el-form-item>
       </el-col>
-      <el-col :span="24" v-if="form.saleModel == 2">
+      <el-col :span="24" v-if="form.saleModel == 2 || form.saleType == 2">
         <el-form-item prop="datePicker">
           <span slot="label">预售时间</span>
           <el-date-picker

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

@@ -293,6 +293,43 @@
                 </el-input-number>
               </template>
             </el-table-column>
+            <el-table-column
+              v-if="saleType != 4"
+              width="160"
+              :label="
+                saleModel == 5
+                  ? '福利价'
+                  : saleModel == 3
+                  ? '秒杀价'
+                  : saleModel == 4
+                  ? '清库价'
+                  : saleModel == 2
+                  ? '预售价'
+                  : '原价'
+              "
+            >
+              <template slot-scope="scope">
+                <el-input-number
+                  :controls="false"
+                  v-model="scope.row.skuPriceList[0].price"
+                  :placeholder="
+                    saleModel == 5
+                      ? '福利价'
+                      : saleModel == 3
+                      ? '秒杀价'
+                      : saleModel == 4
+                      ? '清库价'
+                      : saleModel == 2
+                      ? '预售价'
+                      : '原价'
+                  "
+                  clearable
+                  @input="passValue"
+                >
+                  <template slot="suffix"> {{ form.unit }}/元 </template>
+                </el-input-number>
+              </template>
+            </el-table-column>
 
             <el-table-column label="批发价" width="160" v-if="saleType != 4">
               <template slot-scope="scope">
@@ -318,6 +355,7 @@
                 元/{{ form.unit }}
               </template>
             </el-table-column>
+
             <el-table-column prop="address" label="商品单价" width="120" v-else>
               <template slot-scope="scope">
                 {{
@@ -328,6 +366,7 @@
                 元/{{ form.unit }}
               </template>
             </el-table-column>
+
             <el-table-column label="净重量(kg )" width="160">
               <template slot-scope="scope">
                 <el-input-number
@@ -496,7 +535,7 @@ import { getStoreInfo } from "@/api/common/index";
 import Amap from "@/components/Map/map.vue";
 import { getDict } from "@/api/common/index.js";
 export default {
-  props: ["data", "saleType"],
+  props: ["data", "saleType", "saleModels"],
   components: { Amap },
   data() {
     return {
@@ -541,8 +580,17 @@ export default {
       sj: true,
       showCom: true,
       skuIds: [],
+      saleModel: 1,
     };
   },
+  watch: {
+    //监听文件url改变时重新赋值
+    saleModels(newVal, oldVal) {
+      console.log("azxczx", newVal);
+      this.saleModel = newVal;
+      this.$forceUpdate();
+    },
+  },
   mounted() {
     this.getInfo();
     this.getdictImpl();
@@ -550,6 +598,7 @@ export default {
 
   methods: {
     getFormInfo(record) {
+      this.saleModel = record.saleModel;
       this.addr = record.shippingAddr;
       this.form.expressType = record.expressType;
       this.form.shippingAddrBean = {
@@ -662,7 +711,7 @@ export default {
           });
         });
       } else {
-        if (this.saleType != 4) {
+        if (this.saleType == 4) {
           this.form.skuList.forEach((e) => {
             e.skuPriceList.forEach((a) => {
               a.price = a.originalPrice;

src/views/product/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>

src/views/running/detail.vue

@@ -104,7 +104,7 @@
             >
           </el-form-item>
           <el-row :gutter="10" class="mb8">
-            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+            <el-button icon="el-icon-refresh" size="mini" @click="handleExportr"
               >批量导出</el-button
             >
           </el-row>
@@ -146,11 +146,11 @@
             </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="canOutboundNum" />
           <el-table-column
             label="当前库存总金额(￥)"
             align="center"
-            prop="totalStorePrice"
+            prop="canOutboundTotalPrice"
           />
         </el-table>
       </el-tab-pane>
@@ -199,7 +199,7 @@
             >
           </el-form-item>
           <el-row :gutter="10" class="mb8">
-            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+            <el-button icon="el-icon-refresh" size="mini" @click="handleExportc"
               >批量导出</el-button
             >
           </el-row>
@@ -306,6 +306,7 @@ export default {
       total: 0,
       dateRange: [],
       loading: false,
+      ids: [],
     };
   },
   mounted() {
@@ -314,6 +315,30 @@ export default {
     this.getList();
   },
   methods: {
+    handleExportr() {
+      this.queryParams.ids = this.ids.toString();
+      this.download(
+        "system/outboundStoreSerial/storeExport",
+        {
+          ...this.queryParams,
+        },
+        `入库流水表_${new Date().getTime()}.xlsx`
+      );
+    },
+    handleExportc() {
+      this.queryParams.ids = this.ids.toString();
+      this.download(
+        "system/outboundStoreSerial/outboundExport",
+        {
+          ...this.queryParams,
+        },
+        `出库流水表_${new Date().getTime()}.xlsx`
+      );
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map((item) => item.id);
+    },
     datePicker(val) {
       this.getStorageInfo(val);
     },
@@ -337,6 +362,7 @@ export default {
     },
 
     getList() {
+      this.ids = [];
       this.loading = true;
       queryPageDetail(this.queryParams).then((res) => {
         if (res.code == 200) {

src/views/running/index.vue

@@ -113,7 +113,7 @@
         </el-form>
 
         <el-row :gutter="10" class="mb8">
-          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+          <el-button icon="el-icon-refresh" size="mini" @click="handleExport"
             >批量导出</el-button
           >
           <right-toolbar
@@ -122,7 +122,11 @@
           ></right-toolbar>
         </el-row>
       </el-col>
-      <el-table v-loading="loading" :data="dataList">
+      <el-table
+        v-loading="loading"
+        :data="dataList"
+        @selection-change="handleSelectionChange"
+      >
         <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" />
@@ -148,11 +152,7 @@
           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="totalStorePrice" />
         <el-table-column
           label="出库总数量"
           align="center"
@@ -228,6 +228,7 @@ export default {
         lazyLoad: this.categoryLazyLoad,
       },
       total: 0,
+      ids: [],
     };
   },
   mounted() {
@@ -235,6 +236,22 @@ export default {
     this.getstatisticsPrice();
   },
   methods: {
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map((item) => item.spuId);
+      console.log(this.ids);
+      
+    },
+    handleExport() {
+      this.queryParams.spuIds = this.ids.toString();
+      this.download(
+        "system/outboundStoreSerial/export",
+        {
+          ...this.queryParams,
+        },
+        `出入库流水表_${new Date().getTime()}.xlsx`
+      );
+    },
     pickerChange(val) {
       this.getstatisticsPrice(val);
     },

src/views/shelflife/index.vue

@@ -37,19 +37,23 @@
         </el-form>
 
         <el-row :gutter="10" class="mb8">
-          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+          <el-button icon="el-icon-refresh" size="mini" @click="handleExport"
             >批量导出</el-button
           >
-          <el-button type="primary" icon="el-icon-plus" size="mini" @click="addStorage"
+          <!-- <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
+        v-loading="loading"
+        :data="dataList"
+        @selection-change="handleSelectionChange"
+      >
         <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" />
@@ -110,6 +114,7 @@ export default {
       dataList: [],
       loading: false,
       total: 0,
+      ids: [],
     };
   },
   mounted() {
@@ -124,6 +129,10 @@ export default {
       this.queryParams.createStartTime = val[0];
       this.queryParams.createEndTime = val[1];
     },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map((item) => item.id);
+    },
     resetQuery() {
       this.resetForm("queryForm");
       this.getList();
@@ -137,6 +146,16 @@ export default {
         this.loading = false;
       });
     },
+    handleExport() {
+      this.queryParams.ids = this.ids.toString();
+      this.download(
+        "system/storeManage/exportShelfLife",
+        {
+          ...this.queryParams,
+        },
+        `保质期管理表_${new Date().getTime()}.xlsx`
+      );
+    },
     handleRemove(record) {
       this.$confirm("是否确认删除该记录,删除后无法恢复？", "提示", {
         confirmButtonText: "确定",

src/views/storage/add.vue

@@ -156,21 +156,18 @@
               type="datetime"
               placeholder="选择日期时间"
               style="width: 300px"
-              value-format="yyyy-MM-dd HH:mm:ss"
+              value-format="yyyy-MM-dd"
             >
             </el-date-picker>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="保质期" prop="shelfLife">
-            <el-input
+            <el-input-number
               v-model="form.shelfLife"
-              placeholder="请输入保质期"
-              clearable
-              style="width: 300px"
-              show-word-limit
-              @input="passValue"
-            />
+              @change="passValue"
+              label="请输入保质期"
+            ></el-input-number>
             <el-select
               v-model="form.shelfLifeUnit"
               placeholder="请选择"
@@ -184,14 +181,20 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="预警天数" prop="warningDay">
-            <el-input
+            <el-input-number
+              v-model="form.warningDay"
+              @change="passValue"
+              label="请输入预警天数"
+            ></el-input-number>
+
+            <!-- <el-input
               v-model="form.warningDay"
               placeholder="请输入预警天数"
               clearable
               style="width: 300px"
               show-word-limit
               @input="passValue"
-            />
+            /> -->
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -378,6 +381,7 @@ export default {
       },
       multipleSelection: [],
       rules: {
+        shelfLife: [{ required: true, message: "保质期不能为空", trigger: "blur" }],
         storeOddName: [
           { required: true, message: "入库订单名称不能为空", trigger: "blur" },
         ],

src/views/storage/edit.vue

@@ -156,7 +156,7 @@
               type="datetime"
               placeholder="选择日期时间"
               style="width: 300px"
-              value-format="yyyy-MM-dd HH:mm:ss"
+              value-format="yyyy-MM-dd"
             >
             </el-date-picker>
           </el-form-item>
@@ -383,6 +383,7 @@ export default {
       },
       multipleSelection: [],
       rules: {
+        shelfLife: [{ required: true, message: "保质期不能为空", trigger: "blur" }],
         storeOddName: [
           { required: true, message: "入库订单名称不能为空", trigger: "blur" },
         ],

src/views/storage/index.vue

@@ -30,7 +30,7 @@
             >
             </el-date-picker>
           </el-form-item>
-          <el-form-item label="生产时间" prop="createTime">
+          <el-form-item label="操作时间" prop="createTime">
             <el-date-picker
               v-model="queryParams.createTime"
               value-format="yyyy-MM-dd HH:mm:ss"
@@ -53,7 +53,7 @@
         </el-form>
 
         <el-row :gutter="10" class="mb8">
-          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+          <el-button icon="el-icon-refresh" size="mini" @click="handleExport"
             >批量导出</el-button
           >
           <el-button type="primary" icon="el-icon-plus" size="mini" @click="addStorage"
@@ -65,7 +65,11 @@
           ></right-toolbar>
         </el-row>
       </el-col>
-      <el-table v-loading="loading" :data="dataList">
+      <el-table
+        v-loading="loading"
+        :data="dataList"
+        @selection-change="handleSelectionChange"
+      >
         <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" />
@@ -86,7 +90,34 @@
         <el-table-column label="入库数量" align="center" prop="storeNum" />
         <el-table-column label="合计金额(￥)" align="center" prop="totalPrice" />
         <el-table-column label="已出库数量(斤)" align="center" prop="outBoundNum" />
-        <el-table-column label="生产日期" align="center" prop="produceDate" width="200" />
+        <el-table-column label="生产日期" align="center" prop="produceDate" />
+        <el-table-column label="保质期" align="center" prop="shelfLife">
+          <template slot-scope="scope">
+            {{ scope.row.shelfLife }}
+            {{
+              scope.row.shelfLifeUnit == 0
+                ? "天"
+                : scope.row.shelfLifeUnit == 1
+                ? "月"
+                : scope.row.shelfLifeUnit == 2
+                ? "年"
+                : ""
+            }}
+          </template>
+        </el-table-column>
+        <el-table-column
+          label="供应商名称"
+          align="center"
+          prop="supplierName"
+          width="150"
+        />
+        <el-table-column
+          label="供应商电话"
+          align="center"
+          prop="supplierPhone"
+          width="150"
+        />
+        <el-table-column label="操作时间" align="center" prop="createTime" width="200" />
         <el-table-column
           label="操作"
           align="center"
@@ -108,14 +139,14 @@
               v-hasPermi="['storage:edit']"
               >编辑</el-button
             >
-            <el-button
+            <!-- <el-button
               size="mini"
               type="text"
               style="color: red"
               @click="handleRemove(scope.row)"
               v-hasPermi="['storage:remove']"
               >删除</el-button
-            >
+            > -->
           </template>
         </el-table-column>
       </el-table>
@@ -131,7 +162,7 @@
 </template>
 
 <script>
-import { queryPage, storeManageRemove } from "@/api/manage/storage.js";
+import { queryPage, storeManageRemove, storeManageExport } from "@/api/manage/storage.js";
 export default {
   data() {
     return {
@@ -146,12 +177,24 @@ export default {
       dataList: [],
       loading: false,
       total: 0,
+      ids: [],
     };
   },
   mounted() {
     this.getList();
   },
   methods: {
+    handleExport() {
+      this.queryParams.ids = this.ids.toString();
+      this.download(
+        "system/storeManage/export",
+        {
+          ...this.queryParams,
+        },
+        `入库信息表_${new Date().getTime()}.xlsx`
+      );
+    },
+
     rksjchange(val) {
       this.queryParams.storeStartTime = val[0];
       this.queryParams.storeEndTime = val[1];
@@ -161,9 +204,18 @@ export default {
       this.queryParams.createEndTime = val[1];
     },
     resetQuery() {
+      this.queryParams.storeStartTime = "";
+      this.queryParams.storeEndTime = "";
+      this.queryParams.createStartTime = "";
+      this.queryParams.createEndTime = "";
       this.resetForm("queryForm");
       this.getList();
     },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map((item) => item.id);
+    },
+
     getList() {
       this.loading = true;
       queryPage(this.queryParams).then((res) => {

src/views/transmission/list/allProduct.vue

@@ -40,10 +40,10 @@
           <el-option label="下架" value="1"> </el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="销售模式" prop="saleModel">
+      <el-form-item label="销售方式" prop="saleModel">
         <el-select
           v-model="queryParams.saleModel"
-          placeholder="请选择销售模式"
+          placeholder="请选择销售方式"
           style="width: 240px"
         >
           <el-option label="全部" value=""> </el-option>
@@ -124,7 +124,7 @@
       <el-table-column label="价格" align="center" width="120">
         <template slot-scope="scope">
           {{ scope.row.lowestPrice.toFixed(2) }}/{{ scope.row.unit }}
-        </template>
+        </template> 
       </el-table-column>
 
       <el-table-column label="起批量" align="center">

src/views/transmission/list/draftProduct.vue

@@ -82,12 +82,21 @@
         </template>
       </el-table-column>
 
-      <el-table-column label="销售方式" align="center">
+      <el-table-column label="销售模式" align="center">
         <template slot-scope="scope">
-          <span v-if="scope.row.scope == 0">
-            {{ scope.row.saleModel == 1 ? "现货" : "预售" }}
-          </span>
-          <span v-else> </span>
+          {{
+            scope.row.saleModel == 1
+              ? "现货"
+              : scope.row.saleModel == 2
+              ? "预售"
+              : scope.row.saleModel == 3
+              ? "团购秒杀"
+              : scope.row.saleModel == 4
+              ? "特价"
+              : scope.row.saleModel == 5
+              ? "新人福利"
+              : ""
+          }}
         </template>
       </el-table-column>
 

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

@@ -10,7 +10,7 @@
     <el-row>
       <el-col :span="24">
         <el-form-item prop="saleType">
-          <span slot="label">销售模式</span>
+          <span slot="label">销售方式</span>
           <el-radio-group
             v-model="form.saleModel"
             @change="passValue"
@@ -159,7 +159,7 @@ export default {
       },
       rules: {
         saleType: [{ required: true, message: "销售方式不能为空", trigger: "blur" }],
-        saleModel: [{ required: true, message: "销售模式不能为空", trigger: "blur" }],
+        saleModel: [{ required: true, message: "销售方式不能为空", trigger: "blur" }],
         categoryId: [{ required: true, message: "分类不能为空", trigger: "blur" }],
         title: [{ required: true, message: "商品名称不能为空", trigger: "blur" }],
         giftDesc: [{ required: true, message: "礼包描述不能为空", trigger: "blur" }],