潘超林 преди 6 месеца
родител
ревизия
5145d3a3cd
променени са 2 файла, в които са добавени 34 реда и са изтрити 3 реда
  1. 17 0
      src/views/product/list/allProduct.vue
  2. 17 3
      src/views/product/module/sales-info.vue

+ 17 - 0
src/views/product/list/allProduct.vue

@@ -176,6 +176,23 @@
           <span v-else> </span>
         </template>
       </el-table-column>
+
+      <el-table-column label="快递类型" align="center">
+        <template slot-scope="scope">
+          <span>
+            {{
+              scope.row.expressType == 0
+                ? "水果"
+                : scope.row.expressType == 1
+                ? "生鲜"
+                : scope.row.expressType == 2
+                ? "普快"
+                : ""
+            }}
+          </span>
+        </template>
+      </el-table-column>
+
       <el-table-column label="销售方式" align="center">
         <template slot-scope="scope">
           <span v-if="scope.row.scope == 1">

+ 17 - 3
src/views/product/module/sales-info.vue

@@ -20,6 +20,19 @@
         </el-form-item>
       </el-col>
       <el-col :span="24">
+        <el-form-item prop="giftDesc" label="快递类型">
+          <el-radio v-model="form.expressType" :label="0" :value="0" @change="passValue"
+            >水果</el-radio
+          >
+          <el-radio v-model="form.expressType" :label="1" :value="1" @change="passValue"
+            >生鲜</el-radio
+          >
+          <el-radio v-model="form.expressType" :label="2" :value="2" @change="passValue"
+            >普快</el-radio
+          >
+        </el-form-item>
+      </el-col>
+      <el-col :span="24">
         <el-form-item prop="unit">
           <span slot="label">计量单位</span>
           <el-select v-model="form.unit" placeholder="请选择" @change="passValue">
@@ -297,7 +310,7 @@
             <el-table-column
               prop="address"
               label="商品单价"
-              width="80"
+              width="120"
               v-if="saleType == 4"
             >
               <template slot-scope="scope">
@@ -305,7 +318,7 @@
                 元/{{ form.unit }}
               </template>
             </el-table-column>
-            <el-table-column prop="address" label="商品单价" width="80" v-else>
+            <el-table-column prop="address" label="商品单价" width="120" v-else>
               <template slot-scope="scope">
                 {{
                   scope.row.skuPriceList[0].price
@@ -487,8 +500,8 @@ export default {
   components: { Amap },
   data() {
     return {
-      fhsj: "",
       form: {
+        expressType: 0,
         unit: "斤",
         props: [],
         freeShipping: 0,
@@ -537,6 +550,7 @@ export default {
   methods: {
     getFormInfo(record) {
       this.addr = record.shippingAddr;
+      this.form.expressType = record.expressType;
       this.form.shippingAddrBean = {
         addr: record.shippingAddr,
         addrDetail: record.shippingAddrBean