Ver Fonte

修复直播相关问题

yh há 1 semana atrás
pai
commit
36f29c4040

+ 2 - 1
src/views/hisStore/storeProduct/index.vue

@@ -37,7 +37,7 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="所属公司">
+      <el-form-item label="所属公司" prop="companyId">
         <el-select style="width: 240px" v-model="companyId" multiple placeholder="请选择企业" clearable size="small" >
           <el-option
             v-for="item in companyOptions"
@@ -1584,6 +1584,7 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm("queryForm");
+      this.companyId = null;
       this.handleQuery();
     },
     // 多选框选中数据

+ 1 - 1
src/views/live/liveOrder/liveOrderDetails.vue

@@ -16,7 +16,7 @@
       <el-card shadow="never" style="margin-top: 15px">
         <div class="operate-container"  v-if="item!=null">
                <span style="margin-left: 20px" class="color-danger">订单状态:
-                  <el-tag prop="status" v-for="(ite, index) in orderOptions"    v-if="item.status==ite.dictValue">{{ite.dictLabel}}</el-tag>
+                  <el-tag prop="status" v-for="(ite, index) in orderOptions"    v-if="item.status+1==ite.dictValue">{{ite.dictLabel}}</el-tag>
                </span>
           <div class="operate-button-container" v-if="item.status==3">
             <el-button size="mini" @click="finishOrder()" v-hasPermi="['his:liveOrder:good']">确认收货</el-button>