src/api/modules/pre-sale.js

@@ -1,7 +1,7 @@
 import $http from "@/utils/httpRequest.js";
 
 export const preSale = {
-  //预售商品列表
+  //优惠券列表
   preSaleProducts: (data) => {
     return $http.request({
       url: `/merchant-api/product/advance/sell/page`,
@@ -9,11 +9,4 @@ export const preSale = {
       data,
     });
   },
-  addPreSaleProducts: (data) => {
-    return $http.request({
-      url: `/merchant-api/product/batch/save/advance/sell`,
-      method: "post",
-      data,
-    });
-  },
 };

src/views/modules/presale/products/index.vue

@@ -99,8 +99,6 @@
       </obj-table-plus>
       <!-- 添加或编辑 -->
       <add-or-update
-        :marketId="formInline.marketId"
-        :shopId="formInline.shopId"
         @queryList="$refs.oTable.reload()"
         ref="addOrUpdate"
       ></add-or-update>
@@ -130,7 +128,6 @@ export default {
   data() {
     return {
       activeName: "5",
-      advanceSellStatus: "",
       dataList: [],
       formInline: {
         name: "",
@@ -238,7 +235,7 @@ export default {
           pageNumber: pageNo,
           pageSize: pageSize,
           ...this.formInline,
-          advanceSellStatus: this.advanceSellStatus,
+          advanceSellStatus: this.activeName,
           merchantId: JSON.parse(sessionStorage.getItem("userInfo")).merchantId,
           productQuerySortParam: [],
         })
@@ -262,12 +259,6 @@ export default {
       this.$refs.oTable.reload();
     },
     handleClick(e) {
-      console.log(e.name);
-      if (e.name == "5") {
-        this.advanceSellStatus = "";
-      } else {
-        this.advanceSellStatus = e.name;
-      }
       this.$refs.oTable.reload();
     },
     addEarlyWarning() {
@@ -282,7 +273,7 @@ export default {
         {
           title: "商品ID",
           align: "center",
-          field: "id",
+          field: "name",
         },
         {
           title: "商品图",
@@ -308,15 +299,7 @@ export default {
         {
           title: "定金支付时间",
           align: "center",
-          field: "startTime",
+          field: "name",
-          type: "jsx",
-          render: ({ row }) => {
-            return (
-              <span>
-                {row.startTime}至{row.endTime}
-              </span>
-            );
-          },
         },
         {
           title: "尾款支付时间",
@@ -324,11 +307,15 @@ export default {
           field: "minSalePrice",
           type: "jsx",
           render: ({ row }) => {
+            if (row.minSalePrice == row.maxSalePrice) {
+              return <span>￥{row.minSalePrice}</span>;
+            } else {
               return (
                 <span>
-                {row.balancePaymentStartTime}至{row.balancePaymentEndTime}
+                  ￥{row.minSalePrice}~￥{row.maxSalePrice}
                 </span>
               );
+            }
           },
         },
         {
@@ -345,96 +332,12 @@ export default {
         {
           title: "定金",
           align: "center",
-          field: "earnestMoney",
+          field: "saleNum",
-          type: "jsx",
-          render: ({ row }) => {
-            if (
-              Math.min.apply(
-                Math,
-                row.productSpecificationList.map((item) => item.earnestMoney)
-              ) ==
-              Math.max.apply(
-                Math,
-                row.productSpecificationList.map((item) => item.earnestMoney)
-              )
-            ) {
-              return (
-                <span>
-                  {Math.min.apply(
-                    Math,
-                    row.productSpecificationList.map(
-                      (item) => item.earnestMoney
-                    )
-                  )}
-                </span>
-              );
-            } else {
-              return (
-                <span>
-                  {Math.min.apply(
-                    Math,
-                    row.productSpecificationList.map(
-                      (item) => item.earnestMoney
-                    )
-                  )}
-                  至
-                  {Math.max.apply(
-                    Math,
-                    row.productSpecificationList.map(
-                      (item) => item.earnestMoney
-                    )
-                  )}
-                </span>
-              );
-            }
-          },
         },
         {
           title: "尾款",
           align: "center",
-          field: "balancePayment",
+          field: "stockNum",
-          type: "jsx",
-          render: ({ row }) => {
-            if (
-              Math.min.apply(
-                Math,
-                row.productSpecificationList.map((item) => item.balancePayment)
-              ) ==
-              Math.max.apply(
-                Math,
-                row.productSpecificationList.map((item) => item.balancePayment)
-              )
-            ) {
-              return (
-                <span>
-                  {Math.min.apply(
-                    Math,
-                    row.productSpecificationList.map(
-                      (item) => item.balancePayment
-                    )
-                  )}
-                </span>
-              );
-            } else {
-              return (
-                <span>
-                  {Math.min.apply(
-                    Math,
-                    row.productSpecificationList.map(
-                      (item) => item.balancePayment
-                    )
-                  )}
-                  至
-                  {Math.max.apply(
-                    Math,
-                    row.productSpecificationList.map(
-                      (item) => item.balancePayment
-                    )
-                  )}
-                </span>
-              );
-            }
-          },
         },
         {
           title: "状态",
@@ -442,14 +345,10 @@ export default {
           field: "status",
           type: "jsx",
           render: ({ row }) => {
-            if (row.advanceSellStatus == "0") {
+            if (row.status == "DOWN") {
               return <span>未开始</span>;
-            } else if (row.advanceSellStatus == "1") {
+            } else {
-              return <span>进行中</span>;
+              return <span>上架</span>;
-            } else if (row.advanceSellStatus == "2") {
-              return <span>已结束</span>;
-            } else if (row.advanceSellStatus == "3") {
-              return <span>已关闭</span>;
             }
           },
         },
@@ -462,6 +361,7 @@ export default {
           render: ({ row }) => {
             let edit = () => {
               console.log(row);
+
               this.$refs.addOrUpdate.toggle(row).update();
             };
             let priceAdjustment = () => {
@@ -484,7 +384,12 @@ export default {
                 >
                   查看
                 </el-button>
-                <el-button size="mini" type="primary" onClick={edit}>
+                <el-button
+                  size="mini"
+                  disabled={row.status != "DOWN"}
+                  type="primary"
+                  onClick={edit}
+                >
                   编辑
                 </el-button>
 

src/views/modules/presale/products/popup/add-or-update.vue

@@ -17,66 +17,42 @@
         >
           <el-row>
             <el-col :span="12">
-              <el-form-item label="订金支付时间：" prop="startTime">
+              <el-form-item label="订金支付时间：" prop="name">
                 <el-date-picker
                   @change="getOrderTime"
-                  format="yyyy-MM-dd HH:mm:ss"
-                  data-format="yyyy-MM-dd HH:mm:ss"
-                  value-format="yyyy-MM-dd HH:mm:ss"
                   v-model="orderTime"
                   type="datetimerange"
                   range-separator="至"
                   start-placeholder="开始日期"
                   end-placeholder="结束日期"
-                  :editable="false"
                 >
                 </el-date-picker> </el-form-item
             ></el-col>
             <el-col :span="12">
-              <el-form-item
+              <el-form-item label="尾款支付时间：" prop="name">
-                label="尾款支付时间："
-                prop="balancePaymentStartTime"
-              >
                 <el-date-picker
-                  @change="getArrearsTime"
-                  format="yyyy-MM-dd"
-                  data-format="yyyy-MM-dd"
-                  value-format="yyyy-MM-dd HH:mm:ss"
                   v-model="arrears"
                   type="datetimerange"
                   range-separator="至"
                   start-placeholder="开始日期"
                   end-placeholder="结束日期"
-                  :picker-options="pickerOptions"
                 >
                 </el-date-picker> </el-form-item
             ></el-col>
           </el-row>
-          <el-form-item
+          <el-form-item label="预计发货时间：" prop="name">
-            label="预计发货时间："
-            prop="estimatedStartDeliveryTime"
-          >
             <el-date-picker
-              format="yyyy-MM-dd HH:mm"
-              data-format="yyyy-MM-dd HH:mm"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              @change="deliveryTime"
               v-model="delivery"
               type="datetimerange"
               range-separator="至"
               start-placeholder="开始日期"
               end-placeholder="结束日期"
-              :picker-options="pickerOptions"
             >
             </el-date-picker>
           </el-form-item>
           <el-form-item label="定金可退：" prop="name">
-            <el-radio v-model="ruleForm.isRefundEarnestMoney" :label="1"
+            <el-radio v-model="ruleForm.radio" label="1">是</el-radio>
-              >是</el-radio
+            <el-radio v-model="ruleForm.radio" label="2">否</el-radio>
-            >
-            <el-radio v-model="ruleForm.isRefundEarnestMoney" :label="2"
-              >否</el-radio
-            >
             <span>
               选择是，用户可在付尾款前申请退定金（申请后自动退，无需审核），或付尾款时间结束后系统自动退定金
             </span>
@@ -92,69 +68,43 @@
           已选择商品
         </div>
         <div style="padding: 20px">
-          <div
+          <div style="border-top: 1px solid #ccc; padding: 10px 0 0 0">
-            v-for="item in ruleForm.productList"
-            :key="item.id"
-            style="border-top: 1px solid #ccc; padding: 10px 0 0 0"
-          >
             <div style="font-size: 16px; margin-bottom: 20px">
-              <span>商品ID:{{ item.productId }}</span>
+              <span>商品ID:</span>
-              <span style="margin-left: 20px">商品名称:{{ item.name }}</span>
+              <span style="margin-left: 20px">商品名称:</span>
             </div>
             <el-table
               border
               ref="multipleTable"
-              :data="item.productSpecificationList"
+              :data="tableData"
               tooltip-effect="dark"
               style="width: 100%"
               @selection-change="handleSelectionChange"
             >
               <el-table-column align="center" label="是否预售" width="80">
                 <template slot-scope="scope">
-                  <el-checkbox
+                  <el-checkbox v-model="scope.row.isShow"></el-checkbox>
-                    :true-label="1"
-                    :false-label="0"
-                    v-model="scope.row.isAdvanceSell"
-                  ></el-checkbox>
-                </template>
-              </el-table-column>
-              <el-table-column align="center" label="SKU-ID" prop="id" />
-              <el-table-column align="center" label="规格" prop="attributeList">
-                <template slot-scope="scope">
-                  <span>{{ scope.row.attributeValue }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column align="center" label="属性" prop="address">
-                <template slot-scope="scope">
-                  <span>{{
-                    scope.row.attributeList
-                      ? scope.row.attributeList[0].attributeName
-                      : "无"
-                  }}</span>
                 </template>
               </el-table-column>
+              <el-table-column align="center" label="SKU-ID" prop="date" />
+              <el-table-column align="center" label="规格" prop="name" />
+              <el-table-column align="center" label="属性" prop="address" />
               <el-table-column
                 align="center"
                 label="销售价"
-                prop="marketPrice"
+                prop="address"
                 width="120"
               />
               <el-table-column align="center" label="*是否预售" width="200">
                 <template slot="header">
-                  <span style="color: red">*预售价</span>
+                  <span style="color: red">*是否预售</span>
                 </template>
                 <template slot-scope="scope">
-                  <el-input-number
+                  <el-input
-                    @change="
+                    v-if="scope.row.isShow"
-                      scope.row.balancePayment =
-                        scope.row.presalePrice - scope.row.earnestMoney
-                    "
-                    v-if="scope.row.isAdvanceSell"
                     v-model="scope.row.presalePrice"
-                    :min="0"
+                    placeholder="请输入销售价"
-                    :max="scope.row.marketPrice"
+                  ></el-input>
-                    label="请输入销售价"
-                  ></el-input-number>
                 </template>
               </el-table-column>
               <el-table-column align="center" label="*定金" width="200">
@@ -162,25 +112,17 @@
                   <span style="color: red">*定金</span>
                 </template>
                 <template slot-scope="scope">
-                  <el-input-number
+                  <el-input
-                    @change="
+                    v-if="scope.row.isShow"
-                      scope.row.balancePayment =
+                    v-model="scope.row.presalePrice"
-                        scope.row.presalePrice - scope.row.earnestMoney
+                    placeholder="请输入订金"
-                    "
+                  ></el-input>
-                    v-if="scope.row.isAdvanceSell"
-                    v-model="scope.row.earnestMoney"
-                    :min="0"
-                    :max="scope.row.presalePrice"
-                    label="请输入订金"
-                  ></el-input-number>
                 </template>
               </el-table-column>
               <el-table-column align="center" label="尾款" width="200">
                 <template slot-scope="scope">
-                  <span v-if="scope.row.isAdvanceSell">{{
+                  <span v-if="scope.row.isShow">{{
                     scope.row.presalePrice
-                      ? scope.row.presalePrice - scope.row.earnestMoney
-                      : ""
                   }}</span>
                 </template>
               </el-table-column>
@@ -189,45 +131,24 @@
                   <span style="color: red">*预售库存</span>
                 </template>
                 <template slot-scope="scope">
-                  <el-input-number
+                  <el-input
-                    v-if="scope.row.isAdvanceSell"
+                    v-if="scope.row.isShow"
-                    v-model="scope.row.advanceSellStockNum"
+                    v-model="scope.row.presalePrice"
-                    :min="0"
+                    placeholder="请输入预售库存"
-                    :max="999999"
+                  ></el-input>
-                    :step="10"
-                    :precision="0"
-                    label="请输入预售库存"
-                  ></el-input-number>
                 </template>
               </el-table-column>
             </el-table>
           </div>
-          <el-empty
-            v-show="ruleForm.productList.length == 0"
-            description="请选择商品"
-          ></el-empty>
         </div>
       </div>
-      <!-- 选择商品 -->
     </obj-modal>
-    <commodity @getProduct="getProduct" ref="commodity"></commodity>
   </div>
 </template>
 <script>
-import commodity from "./commodity.vue";
 import { debounce, cloneDeep } from "lodash";
 export default {
-  components: { commodity },
+  components: {},
-  props: {
-    marketId: {
-      type: String,
-      default: "",
-    },
-    shopId: {
-      type: String,
-      default: "",
-    },
-  },
   data() {
     return {
       isAdd: true,
@@ -240,13 +161,9 @@ export default {
       },
       modalData: {},
       ruleForm: {
-        productList: [],
+        name: "",
-        isRefundEarnestMoney: 1, //定金可退 1是 2否
+        value: "1",
-      },
+        radio: "1",
-      pickerOptions: {
-        disabledDate(time) {
-          return time.getTime() < Date.now();
-        },
       },
       orderTime: [], //订单支付时间
       arrears: [], //尾款时间
@@ -295,17 +212,10 @@ export default {
         this.modalConfig.show = false;
       }
       if (e) {
-        this.init(cloneDeep(e));
+        this.init(cloneDeep(e.row));
       }
       return {
-        add: () => {
+        add: (data) => {
-          this.orderTime = [];
-          this.arrears = [];
-          this.delivery = [];
-          this.ruleForm = {
-            productList: [],
-            isRefundEarnestMoney: 1, //定金可退 1是 2否
-          };
           this.modalConfig.title = "新增预售";
           this.isAdd = true;
         },
@@ -316,78 +226,24 @@ export default {
       };
     },
     init(row) {
-      console.log(row.startTime, row.endTime);
+      this.modalData = row;
-      this.orderTime = [row.startTime, row.endTime];
-      this.arrears = [row.balancePaymentStartTime, row.balancePaymentEndTime];
-      this.delivery = [];
-      this.ruleForm.productList = [
-        {
-          productId: row.id,
-          name: row.name,
-          productSpecificationList: row.productSpecificationList,
-        },
-      ];
-      console.log(this.orderTime, this.arrears, this.delivery);
-
-      // this.ruleForm = row;
     },
     //订单支付时间
     getOrderTime(e) {
       if (e) {
-        console.log(e);
+        ruleForm.startTime = e[0];
-        this.ruleForm.startTime = e[0];
+        ruleForm.endTime = e[1];
-        this.ruleForm.endTime = e[1];
       } else {
-        this.ruleForm.startTime = "";
+        ruleForm.startTime = "";
-        this.ruleForm.endTime = "";
+        ruleForm.endTime = "";
-      }
-    },
-    //尾款支付时间
-    getArrearsTime(e) {
-      if (e) {
-        console.log(e);
-        this.ruleForm.balancePaymentStartTime = e[0];
-        this.ruleForm.balancePaymentEndTime = e[1];
-      } else {
-        this.ruleForm.balancePaymentStartTime = "";
-        this.ruleForm.balancePaymentEndTime = "";
-      }
-    },
-    //发货时间
-    deliveryTime(e) {
-      if (e) {
-        console.log(e);
-        this.ruleForm.estimatedStartDeliveryTime = e[0];
-        this.ruleForm.estimatedEndDeliveryTime = e[1];
-      } else {
-        this.ruleForm.estimatedStartDeliveryTime = "";
-        this.ruleForm.estimatedEndDeliveryTime = "";
       }
     },
     selectProduct() {
-      console.log("选择商品", this.marketId, this.shopId);
+      console.log("选择商品");
-      this.$nextTick(() => {
-        this.$refs.commodity.toggle().add({
-          marketId: this.marketId,
-          shopId: this.shopId,
-        });
-      });
     },
     handleSelectionChange(e) {
       console.log(e);
     },
-    getProduct(row) {
-      this.ruleForm.productList = row.map((item) => {
-        return {
-          productId: item.id,
-          name: item.name,
-          productSpecificationList: item.productSpecificationList,
-        };
-      });
-      console.log(this.ruleForm.productList, this.ruleForm.productList.length);
-
-      console.log("获取商品");
-    },
   },
   computed: {
     modalHandles() {
@@ -403,17 +259,12 @@ export default {
           type: "primary",
           // submit: true,
           handle: () => {
-            this.$api.preSale.addPreSaleProducts(this.ruleForm).then((res) => {
+            this.$refs.ruleForm.validate((valid) => {
-              console.log("确认", res);
+              if (valid) {
-              // this.toggle();
+                this.$emit("getAttribute", this.ruleForm);
+                this.toggle();
+              }
             });
-            // console.log("确认", this.ruleForm);
-            // this.$refs.ruleForm.validate((valid) => {
-            //   if (valid) {
-            //     this.$emit("getAttribute", this.ruleForm);
-            //     this.toggle();
-            //   }
-            // });
           },
         },
       ];

src/views/modules/presale/products/popup/commodity.vue

@@ -17,13 +17,31 @@
         :tableEvent="tableEvent"
         :enableAutoQuery="false"
       >
-        <template slot="tableTop">
+        <!-- <template slot="tableTop">
         <el-form :inline="true" :model="formInline" class="demo-form-inline">
-            <el-form-item label="商品搜索">
+          <el-form-item v-if="marketList.length > 0" label="菜市场">
-              <el-input
+            <el-select
-                v-model="formList.name"
+              @change="getData"
-                placeholder="商品搜索"
+              v-model="formInline.marketId"
-              ></el-input>
+              placeholder="请选择菜市场"
+            >
+              <el-option
+                v-for="item in marketList"
+                :key="item.marketId"
+                :label="item.marketName"
+                :value="item.marketId"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item v-if="marketList.length > 0" label="店铺">
+            <el-select v-model="formInline.shopId" placeholder="请选择店铺">
+              <el-option
+                v-for="item in storeList"
+                :key="item.shopId"
+                :label="item.shopName"
+                :value="item.shopId"
+              ></el-option>
+            </el-select>
           </el-form-item>
           <el-form-item>
             <el-button type="primary" @click="$refs.oTable.reload()"
@@ -31,7 +49,7 @@
             >
           </el-form-item>
         </el-form>
-        </template>
+      </template> -->
       </obj-table-plus>
     </template>
   </obj-modal>
@@ -45,7 +63,7 @@ export default {
       isAdd: true,
       //表格属性
       modalConfig: {
-        title: "请点击选择商品 (提示：最多选择5个商品)",
+        title: "请点击选择商品",
         show: false,
         width: "1000px",
       },
@@ -58,11 +76,14 @@ export default {
         "row-id": "id",
         "show-overflow": false,
       },
-      selectList: [],
+      selectList: {},
-      formInline: {},
+      tableEvent: {
-      formList: {
+        "current-change": async (e) => {
-        name: "",
+          console.log(e.row);
+          this.selectList = e.row;
         },
+      },
+      formInline: {},
     };
   },
   methods: {
@@ -100,7 +121,6 @@ export default {
       }
       return {
         add: (row) => {
-          console.log(row);
           this.formInline = row;
           this.isAdd = true;
           this.$nextTick(() => {
@@ -117,7 +137,7 @@ export default {
   computed: {
     tableCols() {
       return [
-        { type: "checkbox", width: "60px", fixed: "left" },
+        { type: "seq", width: "60px", align: "center", title: "序号" },
         {
           title: "商品图",
           field: "productPhotoList",
@@ -202,17 +222,6 @@ export default {
         },
       ];
     },
-    tableEvent() {
-      return {
-        "checkbox-all": ({ records, reserves }) => {
-          this.selectList = [...records, ...reserves];
-        },
-        "checkbox-change": ({ records, reserves }) => {
-          console.log(this.selectList, "2");
-          this.selectList = [...records, ...reserves];
-        },
-      };
-    },
   },
 };
 </script>