Merge remote-tracking branch 'origin/master'

admin-ui/src/permission.js

@@ -22,6 +22,7 @@ router.beforeEach((to, from, next) => {
       if (store.getters.roles.length === 0) {
         isRelogin.show = true
         // 判断当前用户是否已拉取完user_info信息
+        console.log("SSSSSSS")
         store.dispatch('GetInfo').then(() => {
           isRelogin.show = false
           store.dispatch('GenerateRoutes').then(accessRoutes => {

admin-ui/src/store/modules/user.js

@@ -49,8 +49,11 @@ const user = {
     // 获取用户信息
     GetInfo({ commit, state }) {
       return new Promise((resolve, reject) => {
+        console.log("GetInfo")
         getInfo().then(res => {
+          console.log('aasss', res.user)
           const user = res.user
+          console.log('user', user)
           setUserInfo(user)
           const avatar = (user.avatar == "" || user.avatar == null) ? require("@/assets/images/profile.jpg") : process.env.VUE_APP_BASE_API + user.avatar;
           if (res.roles && res.roles.length > 0) { // 验证返回的roles是否是一个非空数组
@@ -64,6 +67,7 @@ const user = {
 
           resolve(res)
         }).catch(error => {
+          console.log(error)
           reject(error)
         })
       })

admin-ui/src/utils/auth.js

@@ -20,5 +20,6 @@ export function getUserInfo() {
 }
 
 export function setUserInfo(userinfo) {
+  console.log(JSON.stringify(userinfo), infoKey)
   return Cookies.set(infoKey, JSON.stringify(userinfo))
 }

admin-ui/src/views/order/cloth/sendCloth.vue

@@ -83,15 +83,15 @@
                         <dict-tag :options="dict.type.cloth_order_status" :value="scope.row.orderStatus" />
                     </template>
                 </el-table-column>
-                <el-table-column label="操作" align="center" fixed="right" width="200">
+                <el-table-column label="操作" align="center" fixed="right" width="240">
                     <template slot-scope="scope">
                         <template v-if="scope.row.payTimeType == '1' && scope.row.payStatus != 1">
-                            <el-button type="primary" size="mini" icon="el-icon-money" @click="toPay(scope)">立刻支付</el-button>
+                            <el-button type="text" size="mini" icon="el-icon-money" @click="toPay(scope)">立刻支付</el-button>
                         </template>
                         <template v-else>
-                            <el-button type="primary" size="mini" icon="el-icon-box" @click="handleDetail(scope.row)">取衣</el-button>
-                            <el-button v-if="scope.row.orderStatus == '8' || scope.row.orderStatus == '9'" type="warning" size="mini" icon="el-icon-user" @click="selectDeliveryMan(scope)"> 分配派送员 </el-button>
-                            <el-button v-if="scope.row.orderStatus == '9'" type="success" size="mini" icon="el-icon-check" @click="confirmSend(scope)"> 确认送达 </el-button>
+                            <el-button type="text" size="mini" icon="el-icon-box" @click="handleDetail(scope.row)">取衣</el-button>
+                            <el-button v-if="scope.row.orderStatus == '8' || scope.row.orderStatus == '9'" type="text" size="mini" icon="el-icon-user" @click="selectDeliveryMan(scope)"> 分配派送员 </el-button>
+                            <el-button v-if="scope.row.orderStatus == '9'" type="text" size="mini" icon="el-icon-check" @click="confirmSend(scope)"> 确认送达 </el-button>
                         </template>
                     </template>
                 </el-table-column>
@@ -187,7 +187,35 @@
             </div>
         </el-dialog>
 
-        <!-- 支付状态弹窗组件 -->
+         <!-- 配置派送员 -->
+        <el-dialog title="配置派送员" :visible.sync="deliveryOpen" width="80%" :close-on-click-modal="false" class="take-clothes-dialog" append-to-body>
+            <el-row :gutter="15">
+                    <el-form ref="form" :model="selectDeliveryForm" :rules="rules" label-width="100px">
+                        <!-- <el-col :span="24">
+                            <el-form-item label="配送方式" prop="service_trans_id">
+                                <el-radio-group v-model="selectDeliveryForm.service_trans_id">
+                                    <el-radio-button key="0" label="0">第三方配送</el-radio-button>
+                                    <el-radio-button key="1" label="1">门店自送</el-radio-button>
+                                </el-radio-group>
+                            </el-form-item>
+                        </el-col> -->
+                        <!-- v-if="selectDeliveryForm.service_trans_id == 1" -->
+                        <el-col :span="24">
+                            <el-form-item label="派送员" prop="takeClothAppUserId">
+                                <el-select v-model="selectDeliveryForm.deliveryManId" placeholder="请选择派送员" clearable>
+                                    <el-option v-for="man in deliveryManList" :key="man.appUserId" :label="man.realName" :value="man.appUserId" />
+                                </el-select>
+                            </el-form-item>
+                        </el-col>
+                    </el-form>
+                </el-row>
+
+                <div>
+                    <el-button type="primary" @click="submitDelivery" style="margin-left: 40%">提交</el-button>
+                </div>
+        </el-dialog>
+
+       
         <pay-status-popup ref="payStatusPopup" hidePointer @paySuccess="handlePaySuccess" @confirm="handlePayConfirm" @error="handlePayError"> </pay-status-popup>
     </div>
 </template>

admin-ui/src/views/workbench/workAppointmentOrder/index.vue

@@ -486,6 +486,7 @@ export default {
   },
   created() {
     var userInfoVO = this.getUserInfo()
+    console.log(userInfoVO)
     if (userInfoVO.userType == '02') {
       this.getDeliveryList()
     } else {