Bläddra i källkod

修改团购订单是否可以发货

YY 2 år sedan
förälder
incheckning
113dc36f01

+ 12 - 0
src/components/orderParts/detail/parts/card-3.vue

@@ -35,6 +35,10 @@
               </el-col>
             </el-col>
           </el-col>
+          <el-col :span="24" class="bode">
+            <el-col :span="6">是否可以发货</el-col>
+            <el-col :span="18" class="other">{{ getGroup_status() }}</el-col>
+          </el-col>
           <el-col :span="24" class="bode">
             <el-col :span="6">下单时间</el-col>
             <el-col :span="18" class="other">{{ form.buy_time }}</el-col>
@@ -96,6 +100,14 @@ export default {
     getActLength() {
       return _.get(this.total_detail, 'act.length');
     },
+    getGroup_status() {
+      let name;
+      if (this.form.group_status == '0') name = '不可发货,该团购正在开团中';
+      else if (this.form.group_status == '1') name = '可以发货';
+      else if (this.form.group_status == '-1') name = '不可发货,该团购已散团';
+      else if (this.form.group_status == '2') name = '不可发货,该团购正在准备中';
+      return name;
+    },
     // 选择商品
     getFile(value) {
       let name;

+ 39 - 36
src/components/orderParts/detail/parts/card-4.vue

@@ -23,43 +23,46 @@
               </el-col>
             </el-col>
           </el-col>
-          <el-col :span="24" class="form" v-if="form.status == '1' || form.status == '2'">
-            <el-form :model="form" ref="form" :rules="rules" label-width="100px" class="demo-ruleForm">
-              <el-form-item label="快递类型" prop="transport_type">
-                <el-select v-model="form.transport_type" clearable filterable placeholder="请选择快递类型" size="small" style="width: 100%">
-                  <el-option v-for="i in transport_typeList" :key="i.label" :label="i.label" :value="i.value"> </el-option>
-                </el-select>
-              </el-form-item>
-              <el-form-item label="寄出运单号" prop="shop_transport_no" v-if="form.transport_type == '0'">
-                <el-input v-model="form.shop_transport_no" placeholder="请输入运单号" size="small"></el-input>
-              </el-form-item>
-              <el-form-item label="快递公司" prop="shop_transport_type" v-if="form.transport_type == '0'">
-                <el-select
-                  v-model="form.shop_transport_type"
-                  filterable
-                  remote
-                  reserve-keyword
-                  placeholder="请选择快递公司"
-                  :remote-method="querySearch"
-                  :loading="loading"
-                  @change="handleSelect"
-                  size="small"
-                  style="width: 100%"
-                >
-                  <el-option v-for="item in shop_transport_typeList" :key="item.id" :label="item.label" :value="item.value"> </el-option>
-                </el-select>
-              </el-form-item>
-              <el-form-item>
-                <el-col>
-                  <el-button type="primary" @click="onSubmit('form', '2')" v-if="(form.status == '1' || form.status == '2-') && status == '0'">
-                    保存
-                  </el-button>
-                  <el-button type="primary" @click="onSubmit('form', '2')" v-if="form.status == '2'"> 保存 </el-button>
-                  <el-button type="warning" @click="onConfirm('3', '是否确认收货')" v-if="form.status == '2'"> 确认收货 </el-button>
-                </el-col>
-              </el-form-item>
-            </el-form>
+          <el-col :span="24" v-if="form.group_status && form.group_status == '1'">
+            <el-col :span="24" class="form" v-if="form.status == '1' || form.status == '2'">
+              <el-form :model="form" ref="form" :rules="rules" label-width="100px" class="demo-ruleForm">
+                <el-form-item label="快递类型" prop="transport_type">
+                  <el-select v-model="form.transport_type" clearable filterable placeholder="请选择快递类型" size="small" style="width: 100%">
+                    <el-option v-for="i in transport_typeList" :key="i.label" :label="i.label" :value="i.value"> </el-option>
+                  </el-select>
+                </el-form-item>
+                <el-form-item label="寄出运单号" prop="shop_transport_no" v-if="form.transport_type == '0'">
+                  <el-input v-model="form.shop_transport_no" placeholder="请输入运单号" size="small"></el-input>
+                </el-form-item>
+                <el-form-item label="快递公司" prop="shop_transport_type" v-if="form.transport_type == '0'">
+                  <el-select
+                    v-model="form.shop_transport_type"
+                    filterable
+                    remote
+                    reserve-keyword
+                    placeholder="请选择快递公司"
+                    :remote-method="querySearch"
+                    :loading="loading"
+                    @change="handleSelect"
+                    size="small"
+                    style="width: 100%"
+                  >
+                    <el-option v-for="item in shop_transport_typeList" :key="item.id" :label="item.label" :value="item.value"> </el-option>
+                  </el-select>
+                </el-form-item>
+                <el-form-item>
+                  <el-col>
+                    <el-button type="primary" @click="onSubmit('form', '2')" v-if="(form.status == '1' || form.status == '2-') && status == '0'">
+                      保存
+                    </el-button>
+                    <el-button type="primary" @click="onSubmit('form', '2')" v-if="form.status == '2'"> 保存 </el-button>
+                    <el-button type="warning" @click="onConfirm('3', '是否确认收货')" v-if="form.status == '2'"> 确认收货 </el-button>
+                  </el-col>
+                </el-form-item>
+              </el-form>
+            </el-col>
           </el-col>
+          <el-col :span="24" v-else> 团未开团成功,不允许发货 </el-col>
         </el-col>
         <!-- 物流信息 -->
         <el-col :span="9" class="one" v-if="form.transport_type == '0' && logList.length != 0">

+ 13 - 1
src/components/orderParts/parts/detail-3.vue

@@ -36,6 +36,9 @@
             <template #is_afterSale="{ row }">
               <span :style="{ color: row.is_afterSale === true ? 'red' : '' }"> {{ row.is_afterSale === true ? '该订单有商品申请售后' : '未申请售后' }}</span>
             </template>
+            <template #group_status="{ row }">
+              <span :style="{ color: row.group_status === '1' ? '#1ed500' : '' }"> {{ getGroup_status(row.group_status) }}</span>
+            </template>
           </data-table>
         </el-col>
       </el-col>
@@ -74,7 +77,8 @@ export default {
         { label: '规格名称', model: 'spec' },
         { label: '支付金额', model: 'pay' },
         { label: '购买数量', model: 'num' },
-        { label: '是否售后', model: 'is_afterSale', format: (i) => (i === true ? '该订单有商品申请售后' : '未申请售后'), custom: true },
+        { label: '是否可以发货', model: 'group_status', custom: true },
+        { label: '是否售后', model: 'is_afterSale', custom: true },
       ],
       // 多选值
       selected: [],
@@ -124,6 +128,14 @@ export default {
       let name = i.name + ',' + i.phone;
       return name;
     },
+    getGroup_status(i) {
+      let name;
+      if (i == '0') name = '不可发货,该团购正在开团中';
+      else if (i == '1') name = '可以发货';
+      else if (i == '-1') name = '不可发货,该团购已散团';
+      else if (i == '2') name = '不可发货,该团购正在准备中';
+      return name;
+    },
     // 详情
     toDetail({ data }) {
       this.$emit('toDetails', data._id);

+ 1 - 0
src/views/platGroup/order/index.vue

@@ -179,6 +179,7 @@ export default {
       let shopname = i.map((e) => e.shop_name);
       return shopname.join(',');
     },
+
     // 重置
     toClose() {
       this.searchForm = {};