|
@@ -25,8 +25,10 @@
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
<el-form-item label="订单状态" prop="status">
|
|
<el-form-item label="订单状态" prop="status">
|
|
|
<el-select v-model="searchForm.status" placeholder="请选择" size="small" :clearable="true">
|
|
<el-select v-model="searchForm.status" placeholder="请选择" size="small" :clearable="true">
|
|
|
- <el-option :key="2" label="待发货" value="待发货"></el-option>
|
|
|
|
|
|
|
+ <el-option :key="1" label="待付款" value="待付款"></el-option>
|
|
|
|
|
+ <el-option :key="3" label="待发货" value="待发货"></el-option>
|
|
|
<el-option :key="3" label="已发货" value="已发货"></el-option>
|
|
<el-option :key="3" label="已发货" value="已发货"></el-option>
|
|
|
|
|
+ <el-option :key="6" label="交易失败" value="交易失败"></el-option>
|
|
|
</el-select>
|
|
</el-select>
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
<el-form-item label="视频状态" prop="status">
|
|
<el-form-item label="视频状态" prop="status">
|
|
@@ -128,9 +130,12 @@
|
|
|
@click="openDeliveryPage(deliveryOrder.dvyFlowId, deliveryOrder.dvyNo)">{{ deliveryOrder.dvyFlowId }}
|
|
@click="openDeliveryPage(deliveryOrder.dvyFlowId, deliveryOrder.dvyNo)">{{ deliveryOrder.dvyFlowId }}
|
|
|
</div>
|
|
</div>
|
|
|
</div>
|
|
</div>
|
|
|
-<!-- <el-tag v-if="scope.row.status === '已发货'" type="success">-->
|
|
|
|
|
-<!-- -->
|
|
|
|
|
-<!-- </el-tag>-->
|
|
|
|
|
|
|
+ <el-tag v-if="scope.row.status === '待付款'" type="primary">
|
|
|
|
|
+ {{scope.row.status}}
|
|
|
|
|
+ </el-tag>
|
|
|
|
|
+ <el-tag v-if="scope.row.status === '交易失败'" type="danger">
|
|
|
|
|
+ {{scope.row.status}}
|
|
|
|
|
+ </el-tag>
|
|
|
<el-tag v-if="scope.row.status.indexOf('部分发货') != -1" type="warning">{{scope.row.status}}</el-tag>
|
|
<el-tag v-if="scope.row.status.indexOf('部分发货') != -1" type="warning">{{scope.row.status}}</el-tag>
|
|
|
</template>
|
|
</template>
|
|
|
</el-table-column>
|
|
</el-table-column>
|