pref: 处理BUG

components/mobile/staffManagement/StaffList.vue

@@ -31,10 +31,10 @@
             <div class="bg" v-for="item in staffDataList">
               <div class="staff-list">
                 <!--<div class="list-item"><span>UU账号：</span><span v-text="item.userUU">100000721</span></div>-->
-                <div class="list-item"><span>姓名：</span><span v-text="item.userName">张洪别</span></div>
+                <div class="list-item"><span>姓名：</span><span v-text="item.userName" class="overflow-text">张洪别</span></div>
                 <!--<div class="list-item"><span>性别：</span><span v-text="(item.userSex === 'F' || item.userSex === '女') ? '女' : (item.userSex === 'M' || item.userSex === '男') ? '男' : '-'">男</span></div>-->
                 <div class="list-item"><span>手机：</span><span v-text="item.userTel">12345678901</span></div>
-                <div class="list-item"><span>邮箱：</span><span v-text="item.userEmail || '-'">12345678901</span></div>
+                <div class="list-item"><span>邮箱：</span><span class="overflow-text" v-text="item.userEmail || '-'">12345678901</span></div>
                 <div class="list-item"><span>角色：</span><span class="role" v-for="role in item.roles" v-text="role.desc ? role.desc.slice(0,2) : ''" v-bind:class="'bg' + role.color">普通</span></div>
               </div>
               <div class="list-footer">
@@ -55,10 +55,10 @@
           <div class="list-content" v-if="AuditList && AuditList.length">
             <div class="bg" v-for="item in AuditList">
               <div class="staff-list">
-                <div class="list-item"><span>用户名：</span><span v-text="item.user.vipName"></span></div>
+                <div class="list-item"><span>用户名：</span><span class="overflow-text" v-text="item.user.vipName"></span></div>
                 <!--<div class="list-item"><span>UU账号：</span><span v-text="item.user.userUU">100000721</span></div>-->
                 <div class="list-item"><span>手机：</span><span v-text="item.user.mobile">12345678901</span></div>
-                <div class="list-item"><span>邮箱：</span><span v-text="item.user.email || '-'">12345678901</span></div>
+                <div class="list-item"><span>邮箱：</span><span class="overflow-text" v-text="item.user.email || '-'">12345678901</span></div>
               </div>
               <div class="list-footer">
                 <div class="edit handle" @click="agreeEvent(item, '1')"><i class="iconfont icon-check-circle"></i><span>同意</span></div>
@@ -235,7 +235,7 @@
       },
       // 员工列表删除员工
       openDelete (item) {
-        if (this.isAdmin) {
+        if (this.isRoleAdmin) {
           if (item.userUU === this.userInfo.userUU) {
             this.setRemindText('自己不可修改自己')
           } else {
@@ -250,7 +250,6 @@
       sureDelete () {
         this.$http.delete('/basic/user/' + this.currentObject.userUU)
           .then(response => {
-            // console.log(response)
             this.showDelete = false
             this.setRemindText('用户' + this.currentObject.userUU + '删除成功')
             this.page = 1
@@ -480,11 +479,17 @@
             span {
               display: inline-block;
               font-size: .28rem;
+              word-wrap: break-word;
+              word-break: normal;
               &:first-child {
                 width: 1.3rem;
                 text-align: right;
                 color: #3f84f6;
               }
+              &.overflow-text {
+                width:5rem;
+                vertical-align: top;
+              }
               &:last-child {
                 color: #666;
               }

pages/mobile/center/user/btobarCheck.vue

@@ -240,37 +240,19 @@
               <div class="clearfix choosescreen-result-list" v-for="(item, index) in type.details">
                 <div>
                   <div class="choosescreen-result-list-content">
-                    <div style="border-bottom: 1px solid #D3D3D3;padding-bottom: 0.2rem">
-                      <!--<span class="item inline-block" @click="checkChildItem(item, index, key)" v-show="!isShowApcheckList.showApcheck && !item.haveChecked">
-                        <label class="mobile-cart-check" :class="{active: item.check}"></label>
-                      </span>-->
-                      <div class="inline-block" style="margin-left: 0.15rem">
-                        <div class="OverHidden" :class="{'div62': item.haveChecked}">验收单：<span>{{item.inoutno}}</span></div>
-                        <div class="OverHidden" :class="{'div62': item.haveChecked}">发货单：<span>{{item.sendcode}}</span></div>
-                        <div class="OverHidden">单据日期：<span>{{item.pidate | time}}</span></div>
-                        <!--<div class="OverHidden">序号：<span>{{index + 1}}</span></div>-->
-                        <!--<div class="OverHidden">类型：<span>{{item.piclass}}</span></div>-->
-
-                      </div>
-                    </div>
-                    <div style="padding-top: 0.2rem">
-                      <!--<span class="item inline-block" style="opacity: 0"  v-show="!isShowApcheckList.showApcheck && !item.haveChecked">-->
-                        <!--<label class="mobile-cart-check"></label>-->
-                      <!--</span>-->
-                      <div class="inline-block" style="margin-left: 0.15rem">
-                        <div class="OverHidden" :class="{'div62': item.haveChecked}">物料名称：<span>{{item.prodtitle}}</span></div>
-                        <div class="OverHidden" :class="{'div62': item.haveChecked}">规格型号：<span>{{item.prodspec}}</span></div>
-                        <div class="OverHidden" :class="{'div62': item.haveChecked}">发货数量：<span>{{item.qty}}</span></div>
-                        <div class="OverHidden" :class="{'div62': item.haveChecked}">验收数量：<span>{{item.thischeckqty}}</span></div>
-                        <div class="OverHidden" :class="{'div62': item.haveChecked}">单价：<span>{{item.currency}}：{{item.orderprice}}</span></div>
-                        <!--<div class="OverHidden">发货单：<span>{{item.sendcode}}</span></div>-->
-                        <div class="OverHidden" :class="{'div62': item.haveChecked}">税率：<span>{{item.taxrate}}%</span></div>
-                        <div class="OverHidden clearfix" :class="{'div62': item.haveChecked}" v-if="item.haveChecked === 1">
-                          <div class="pull-left">对账人：<span>{{item.recorder}}</span></div>
-                          <div class="pull-right">已对账</div>
-                        </div>
-                        <!--<div class="OverHidden">客户料号：<span>{{item.prodcode}}</span></div>-->
-                        <!--<div class="OverHidden">金额：<span>{{}}</span></div>-->
+                    <div class="inline-block" style="margin-left: 0.15rem">
+                      <div class="OverHidden" :class="{'div62': item.haveChecked}">验收单：<span>{{item.inoutno}}</span></div>
+                      <div class="OverHidden" :class="{'div62': item.haveChecked}">发货单：<span>{{item.sendcode}}</span></div>
+                      <div class="OverHidden" :class="{'div62': item.haveChecked}">物料编号：<span>{{item.prodcode}}</span></div>
+                      <div class="OverHidden" :class="{'div62': item.haveChecked}">物料名称：<span>{{item.prodtitle}}</span></div>
+                      <div class="OverHidden" :class="{'div62': item.haveChecked}">规格型号：<span>{{item.prodspec}}</span></div>
+                      <div class="OverHidden" :class="{'div62': item.haveChecked}">发货数量：<span>{{item.qty}}</span></div>
+                      <div class="OverHidden" :class="{'div62': item.haveChecked}">验收数量：<span>{{item.thischeckqty}}</span></div>
+                      <div class="OverHidden" :class="{'div62': item.haveChecked}">单价：<span>{{item.currency}}：{{item.orderprice}}</span></div>
+                      <div class="OverHidden" :class="{'div62': item.haveChecked}">税率：<span>{{item.taxrate}}%</span></div>
+                      <div class="OverHidden clearfix" :class="{'div62': item.haveChecked}" v-if="item.haveChecked === 1">
+                        <div class="pull-left">对账人：<span>{{item.recorder}}</span></div>
+                        <div class="pull-right">已对账</div>
                       </div>
                     </div>
                   </div>

pages/mobile/center/vendor/btobapCheck.vue

@@ -230,9 +230,9 @@
           <div v-if="isShowApcheckList.list.length > 0">
             <div class="choosescreen-result-lists" v-for="(type, key) in isShowApcheckList.list">
               <div class="choosescreen-details">
-                    <span class="item inline-block" @click="checkItem(type, key)" v-show="!isShowApcheckList.showApcheck && !type.allChecked">
-                      <label class="mobile-cart-check" :class="{active: type.check}"></label>
-                    </span>
+                <span class="item inline-block" @click="checkItem(type, key)" v-show="!isShowApcheckList.showApcheck && !type.allChecked">
+                  <label class="mobile-cart-check" :class="{active: type.check}"></label>
+                </span>
                 <div class="inline-block" style="margin-left: 0.15rem">
                   <div class="OverHidden" style="font-weight: bold;">订单：<span style="color:#3f84f6;">{{type.orderCode}}</span></div>
                 </div>
@@ -240,37 +240,23 @@
               <div class="clearfix choosescreen-result-list" v-for="(item, index) in type.details">
                 <div>
                   <div class="choosescreen-result-list-content">
-                    <div style="border-bottom: 1px solid #D3D3D3;padding-bottom: 0.2rem">
                     <span class="item inline-block" @click="checkChildItem(item, index, key)" v-show="!isShowApcheckList.showApcheck && !item.haveChecked">
-                      <label class="mobile-cart-check" :class="{active: item.check}"></label>
-                    </span>
+                        <label class="mobile-cart-check" :class="{active: item.check}"></label>
+                      </span>
                     <div class="inline-block" style="margin-left: 0.15rem">
                       <div class="OverHidden" :class="{'div62': item.haveChecked}">验收单：<span>{{item.inoutno}}</span></div>
                       <div class="OverHidden" :class="{'div62': item.haveChecked}">发货单：<span>{{item.sendcode}}</span></div>
-                      <div class="OverHidden">单据日期：<span>{{item.pidate | time}}</span></div>
-                      <!--<div class="OverHidden">序号：<span>{{index + 1}}</span></div>-->
-                      <!--<div class="OverHidden">类型：<span>{{item.piclass}}</span></div>-->
-
-                    </div>
-                    </div>
-                    <div style="padding-top: 0.2rem">
-                    <span class="item inline-block" style="opacity: 0"  v-show="!isShowApcheckList.showApcheck && !item.haveChecked">
-                      <label class="mobile-cart-check"></label>
-                    </span>
-                      <div class="inline-block" style="margin-left: 0.15rem">
-                        <div class="OverHidden" :class="{'div62': item.haveChecked}">物料名称：<span>{{item.prodtitle}}</span></div>
-                        <div class="OverHidden" :class="{'div62': item.haveChecked}">规格型号：<span>{{item.prodspec}}</span></div>
-                        <div class="OverHidden" :class="{'div62': item.haveChecked}">发货数量：<span>{{item.qty}}</span></div>
-                        <div class="OverHidden" :class="{'div62': item.haveChecked}">验收数量：<span>{{item.thischeckqty}}</span></div>
-                        <div class="OverHidden" :class="{'div62': item.haveChecked}">单价：<span>{{item.currency}}：{{item.orderprice}}</span></div>
-                        <!--<div class="OverHidden">发货单：<span>{{item.sendcode}}</span></div>-->
-                        <div class="OverHidden" :class="{'div62': item.haveChecked}">税率：<span>{{item.taxrate}}%</span></div>
-                        <div class="OverHidden clearfix" :class="{'div62': item.haveChecked}" v-if="item.haveChecked === 1">
-                          <div class="pull-left">对账人：<span>{{item.recorder}}</span></div>
-                          <div class="pull-right">已对账</div>
-                        </div>
-                        <!--<div class="OverHidden">客户料号：<span>{{item.prodcode}}</span></div>-->
-                        <!--<div class="OverHidden">金额：<span>{{}}</span></div>-->
+                      <div class="OverHidden" :class="{'div62': item.haveChecked}">物料编号：<span>{{item.prodcode}}</span></div>
+                      <div class="OverHidden" :class="{'div62': item.haveChecked}">物料名称：<span>{{item.prodtitle}}</span></div>
+                      <div class="OverHidden" :class="{'div62': item.haveChecked}">规格型号：<span>{{item.prodspec}}</span></div>
+                      <div class="OverHidden" :class="{'div62': item.haveChecked}">发货数量：<span>{{item.qty}}</span></div>
+                      <div class="OverHidden" :class="{'div62': item.haveChecked}">验收数量：<span>{{item.thischeckqty}}</span></div>
+                      <div class="OverHidden" :class="{'div62': item.haveChecked}">单价：<span>{{item.currency}}：{{item.orderprice}}</span></div>
+                      <div class="OverHidden" :class="{'div62': item.haveChecked}">税率：<span>{{item.taxrate}}%</span></div>
+                      <div class="OverHidden clearfix" :class="{'div62': item.haveChecked}">
+                        <div class="pull-left">对账人：<span>{{item.recorder || '-'}}</span></div>
+                        <div class="pull-right" v-if="item.haveChecked === 1">已对账</div>
+                        <div class="pull-right" v-if="item.haveChecked !== 1">未对账</div>
                       </div>
                     </div>
                   </div>

plugins/mixin.js

@@ -22,13 +22,10 @@ Vue.mixin({
       return this.$store.state.option.currency
     },
     isAdmin () {
-      let isAdmin = null
-      if (this.user.data.enterprise) {
-        this.user.data.enterprise.enAdminuu === this.user.data.userUU ? isAdmin = true : isAdmin = false
-      } else {
-        isAdmin = false
-      }
-      return isAdmin
+      return this.user.data.sys
+    },
+    isRoleAdmin () {
+      return this.user.data.roleAdmin
     },
     sortEnterprises () {
       if (this.user.data.enterprises) {