yuhongqi 5 днів тому
батько
коміт
22651c4897

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

@@ -170,7 +170,7 @@
       <el-table-column label="用户ID" align="center" prop="userId" />
       <el-table-column label="收货人" align="center" prop="userName" />
       <el-table-column label="手机号" align="center" prop="userPhone" />
-      <el-table-column label="地址" align="center" prop="userAddress" />
+<!--      <el-table-column label="地址" align="center" prop="userAddress" />-->
       <el-table-column label="支付金额" align="center" prop="payMoney" />
       <el-table-column label="订单金额" align="center" prop="totalPrice" />
       <el-table-column label="物流编号" align="center" prop="deliveryCode" />

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

@@ -19,54 +19,54 @@
                   <el-tag prop="status" v-for="(ite, index) in orderOptions"    v-if="item.status==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>-->
+<!--            <el-button size="mini" @click="finishOrder()" v-hasPermi="['live:liveOrder:good']">确认收货</el-button>-->
 <!--          </div>-->
           <div class="operate-button-container"  v-if="item.status==2&&item.orderType==1">
-            <el-button size="mini" @click="sendVisible=true" v-hasPermi="['his:liveOrder:sendGoods']">发货</el-button>
+            <el-button size="mini" @click="sendVisible=true" v-hasPermi="['live:liveOrder:sendGoods']">发货</el-button>
           </div>
           <div class="operate-button-container"  v-if="item.status==2&&item.orderType==2">
-            <el-button size="mini" @click="tuiOrder()" v-hasPermi="['his:liveOrder:sendHisGoods']" >推送订单</el-button>
+            <el-button size="mini" @click="tuiOrder()" v-hasPermi="['live:liveOrder:sendHisGoods']" >推送订单</el-button>
           </div>
-<!--          <div class="operate-button-container" v-if="item.inquiryOrderId!=null&&item.inquiryOrderId!=''" v-hasPermi="['his:liveOrder:inquiry']">-->
+<!--          <div class="operate-button-container" v-if="item.inquiryOrderId!=null&&item.inquiryOrderId!=''" v-hasPermi="['live:liveOrder:inquiry']">-->
 <!--            <el-button size="mini" @click="getInquiryOrder()" >问诊订单</el-button>-->
 <!--          </div>-->
-<!--          <div class="operate-button-container" v-if="item.packageOrderId!=null&&item.packageOrderId!=''" v-hasPermi="['his:liveOrder:package']" >-->
+<!--          <div class="operate-button-container" v-if="item.packageOrderId!=null&&item.packageOrderId!=''" v-hasPermi="['live:liveOrder:package']" >-->
 <!--            <el-button size="mini" @click="getPackageOrder()" >套餐包订单</el-button>-->
 <!--          </div>-->
-          <div class="operate-button-container"   v-if="item.deliverySn!=null" v-hasPermi="['his:liveOrder:express']">
+          <div class="operate-button-container"   v-if="item.deliverySn!=null" v-hasPermi="['live:liveOrder:express']">
             <el-button size="mini" @click="showExpress()" >查看物流</el-button>
           </div>
           <div class="operate-button-container" >
-            <el-button size="mini" @click="editDelivery()"  v-hasPermi="['his:liveOrder:updateDelivery']" >修改物流单号</el-button>
+            <el-button size="mini" @click="editDelivery()"  v-hasPermi="['live:liveOrder:updateDelivery']" >修改物流单号</el-button>
           </div>
 
           <div class="operate-button-container" >
-            <el-button size="mini" @click="editOrder()"  v-hasPermi="['his:liveOrder:edit']" >修改订单</el-button>
+            <el-button size="mini" @click="editOrder()"  v-hasPermi="['live:liveOrder:edit']" >修改订单</el-button>
           </div>
-<!--          <div class="operate-button-container" v-if="item.status ==2 && item.extendOrderId == null && item.deliverySn == null&&item.orderType==1"   v-hasPermi="['his:liveOrder:createErpOrder']">-->
+<!--          <div class="operate-button-container" v-if="item.status ==2 && item.extendOrderId == null && item.deliverySn == null&&item.orderType==1"   v-hasPermi="['live:liveOrder:createErpOrder']">-->
 <!--            <el-button size="mini" @click="addErpOrder()" >创建ERP订单信息</el-button>-->
 <!--          </div>-->
-<!--          <div class="operate-button-container" v-if="item.extendOrderId!=null && item.orderType==1"  v-hasPermi="['his:liveOrder:getEroOrder']"  >-->
+<!--          <div class="operate-button-container" v-if="item.extendOrderId!=null && item.orderType==1"  v-hasPermi="['live:liveOrder:getEroOrder']"  >-->
 <!--            <el-button size="mini" @click="showErpOrder()" >ERP订单信息</el-button>-->
 <!--          </div>-->
-<!--          <div class="operate-button-container" v-if="item.tuiMoneyStatus==0 && item.status==4"  v-hasPermi="['his:liveOrder:editTuiMoney']"  >-->
+<!--          <div class="operate-button-container" v-if="item.tuiMoneyStatus==0 && item.status==4"  v-hasPermi="['live:liveOrder:editTuiMoney']"  >-->
 <!--            <el-button size="mini" @click="editTuiMoney1()" >解冻</el-button>-->
 <!--          </div>-->
-<!--          <div class="operate-button-container" v-if="item.tuiMoneyStatus==1 && item.status==4"  v-hasPermi="['his:liveOrder:editTuiMoney']"  >-->
+<!--          <div class="operate-button-container" v-if="item.tuiMoneyStatus==1 && item.status==4"  v-hasPermi="['live:liveOrder:editTuiMoney']"  >-->
 <!--            <el-button size="mini" @click="editTuiMoney2()" >冻结</el-button>-->
 <!--          </div>-->
-<!--          <div class="operate-button-container"  v-if="item.followTime!=null&&item.followTime!=''"   v-hasPermi="['his:liveOrder:msgList']"  >-->
+<!--          <div class="operate-button-container"  v-if="item.followTime!=null&&item.followTime!=''"   v-hasPermi="['live:liveOrder:msgList']"  >-->
 <!--            <el-button size="mini" @click="followMsg()" >随访记录</el-button>-->
 <!--          </div>-->
 
           <div class="operate-button-container" v-if="item.status>1">
-            <el-button size="mini" @click="refund()" v-hasPermi="['his:liveOrder:afterSales']">申请退款</el-button>
+            <el-button size="mini" @click="refund()" v-hasPermi="['live:liveOrder:afterSales']">申请退款</el-button>
           </div>
 <!--          <div class="operate-button-container" v-if="item.status== -2" >-->
-<!--            <el-button size="mini" @click="returnCost()"  v-hasPermi="['his:liveOrder:returnCost']" >成本退还</el-button>-->
+<!--            <el-button size="mini" @click="returnCost()"  v-hasPermi="['live:liveOrder:returnCost']" >成本退还</el-button>-->
 <!--          </div>-->
 <!--          <div class="operate-button-container" >-->
-<!--            <el-button size="mini" @click="sendFollowMsg()" v-if="item.status>1" v-hasPermi="['his:liveOrder:sendMsg']">发送随访消息</el-button>-->
+<!--            <el-button size="mini" @click="sendFollowMsg()" v-if="item.status>1" v-hasPermi="['live:liveOrder:sendMsg']">发送随访消息</el-button>-->
 <!--          </div>-->
         </div>
         <div class="desct">
@@ -81,7 +81,7 @@
           <el-descriptions-item label="店铺名称"  ><span v-if="item!=null">{{item.storeName}}</span></el-descriptions-item>
           <el-descriptions-item label="收货人" >  <span v-if="item!=null">{{item.userName}}</span>  </el-descriptions-item>
           <el-descriptions-item label="收货人电话" > <span v-if="item!=null">{{item.userPhone}}</span>
-            <el-button icon="el-icon-search" size="mini" @click="handlePhone()" style="margin-left: 20px;" circle v-hasPermi="['his:liveOrder:queryPhone']"></el-button>
+            <el-button icon="el-icon-search" size="mini" @click="handlePhone()" style="margin-left: 20px;" circle v-hasPermi="['live:liveOrder:queryPhone']"></el-button>
           </el-descriptions-item>
           <el-descriptions-item label="详细地址" > <span>{{item.userAddress}}</span>  </el-descriptions-item>
           <el-descriptions-item label="所属公司"><span v-if="item!=null">{{item.companyName}}</span></el-descriptions-item>
@@ -208,7 +208,7 @@
 
     <el-dialog :title="editDy.title" :visible.sync="editDy.open" width="600px" append-to-body>
       <el-form ref="editDyForm" :model="editDyForm" :rules="editDyRules" label-width="100px">
-        <div  v-hasPermi="['his:liveOrder:updateErpOrder']"  style="margin-bottom: 20px;" >
+        <div  v-hasPermi="['live:liveOrder:updateErpOrder']"  style="margin-bottom: 20px;" >
           <el-button size="mini" @click="updateErpOrder" >同步物流单号信息</el-button>
         </div>
         <el-form-item label="物流公司" prop="deliveryCode" >