wansfa 1 year ago
parent
commit
00fdafb70e
2 changed files with 2 additions and 6 deletions
  1. 1 1
      src/views/qw/qwAccounts/index.vue
  2. 1 5
      src/views/store/components/productOrder.vue

+ 1 - 1
src/views/qw/qwAccounts/index.vue

@@ -55,7 +55,7 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="序号"  width="55" type="index" align="center" />
       <el-table-column label="id" align="center" prop="id" />
-      <el-table-column label="企微账号" align="center" prop="userName" />
+      <el-table-column label="企微账号" align="center" prop="account" />
       <el-table-column label="姓名" align="center" prop="nickName" />
       <el-table-column label="手机号码" align="center" prop="phone" />
       <el-table-column label="归属公司" align="center" prop="companyName" />

+ 1 - 5
src/views/store/components/productOrder.vue

@@ -12,7 +12,7 @@
       <el-card shadow="never" style="margin-top: 15px">
       <div class="operate-container"  v-if="order!=null">
         <span style="margin-left: 20px" class="color-danger">订单状态:
-           <el-tag prop="status" v-for="(item, index) in statusOptions"    v-if="order.status==item.dictValue">{{item.dictLabel}}</el-tag>
+           <el-tag prop="status" v-for="(item, index) in statusOptions"   v-if="order.status==item.dictValue">{{item.dictLabel}}</el-tag>
         </span>
         <div class="operate-button-container" >
           <el-button size="mini" @click="editOrder()"  v-hasPermi="['store:storeOrder:edit']" >修改订单</el-button>
@@ -397,7 +397,6 @@
         <el-button size="mini" @click="updateExpress()" >同步物流发货</el-button>
       </div>
       <div class="table-layout"  v-if="erpOrder!=null">
-
         <el-row>
           <el-col :span="6" class="table-cell-title">订单编号</el-col>
           <el-col :span="6" class="table-cell-title">是否代收</el-col>
@@ -407,7 +406,6 @@
         <el-row>
           <el-col :span="6" class="table-cell">
             {{erpOrder.code}}
-
           </el-col>
           <el-col :span="6" class="table-cell">
             {{erpOrder.cod?'是':'否'}}
@@ -418,7 +416,6 @@
           <el-col :span="6" class="table-cell">
             {{erpOrder.express_name}}
           </el-col>
-
         </el-row>
         <el-row>
           <el-col :span="6" class="table-cell-title">收货人</el-col>
@@ -429,7 +426,6 @@
         <el-row>
           <el-col :span="6" class="table-cell">
             {{erpOrder.receiver_name}}
-
           </el-col>
           <el-col :span="6" class="table-cell">
             {{erpOrder.receiver_mobile}}