no message

src/packageMine/pages/masterGroup/createGroup.vue

@@ -0,0 +1,171 @@
+<template>
+  <zj-page-layout :hasFooter="true">
+    <view class="form-container">
+      <view class="item" @tap="isShowWebsitDialog = true">
+        <view class="label"><text>*</text>所属网点</view>
+        <view class="picker">
+          <text class="value" v-if="websit">{{ websit.name }}</text>
+          <text class="placeholder" v-else>请选择所属网点</text>
+          <text class="iconfont icon-jinru"></text>
+        </view>
+      </view>
+      <view class="item" @tap="isShowBrandDialog = true">
+        <view class="label"><text>*</text>选择组队师傅</view>
+        <view class="picker">
+          <text class="value" v-if="worker">{{ worker.workerName }}</text>
+          <text class="placeholder" v-else>请选择</text>
+          <text class="iconfont icon-jinru"></text>
+        </view>
+      </view>
+    </view>
+
+    <template slot="footer">
+      <view class="footer-btn-group">
+        <u-button type="primary" text="提交" @click="tijiaozubie"></u-button>
+      </view>
+    </template>
+
+    <zjDialogPicker
+      ref="websitDialog"
+      :isShow="isShowWebsitDialog"
+      :multiple="false"
+      :styleType="2"
+      :title="'所属网点'"
+      :list="websitList"
+      :keyName="'name'"
+      @cancel="isShowWebsitDialog = false"
+      @confirm="confirmWebsitDialog"
+    >
+    </zjDialogPicker>
+
+    <zjDialogPicker
+      ref="workerDialog"
+      :isShow="isShowBrandDialog"
+      :multiple="false"
+      :styleType="2"
+      :title="'组队师傅'"
+      :list="workerList"
+      :keyName="'workerName'"
+      @cancel="isShowBrandDialog = false"
+      @confirm="confirmBrandDialog"
+    >
+    </zjDialogPicker>
+  </zj-page-layout>
+</template>
+
+<script>
+import zjDialogPicker from '@/components/zj-dialog/zj-dialog-picker.vue'
+export default {
+  components: {
+    zjDialogPicker
+  },
+
+  data() {
+    return {
+      websit: null,
+      websitList: [],
+      isShowWebsitDialog: false,
+      worker: null,
+      workerList: [],
+      isShowBrandDialog: false
+    }
+  },
+
+  onLoad() {
+    this.getWebsitList()
+  },
+
+  methods: {
+    getWebsitList() {
+      this.$api.get('/user/apply/websit').then(res => {
+        this.websitList = res.data
+        if (this.websitList.length == 1) {
+          this.websit = this.websitList[0]
+        }
+      })
+    },
+
+    confirmWebsitDialog(e) {
+      this.websit = this.websitList[e[0]]
+      this.isShowWebsitDialog = false
+      this.worker = null
+      this.workerList = []
+      this.getBrandList()
+    },
+
+    getBrandList() {
+      this.$api.post('/worker/team/query/websit/worker', { websitId: this.websit?.websitId }).then(res => {
+        this.workerList = res.data
+      })
+    },
+
+    confirmBrandDialog(e) {
+      this.worker = this.workerList[e[0]]
+      this.isShowBrandDialog = false
+    },
+
+    tijiaozubie() {
+      if (!this.websit) {
+        this.$toast('请选择所属网点')
+        return
+      }
+      if (!this.worker) {
+        this.$toast('请选择组队师傅')
+        return
+      }
+      this.$api
+        .post('/worker/team/add', {
+          assistantWorkerId: this.worker.workerId,
+          assistantWorkerName: this.worker.workerName,
+          websitId: this.websit?.websitId
+        })
+        .then(res => {
+          this.$navToPage(
+            {
+              delta: 1
+            },
+            'navigateBack'
+          )
+        })
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.form-container {
+  background: #ffffff;
+  margin-top: 20rpx;
+  border-top: 1px solid #f5f5f5;
+  .item {
+    height: 108rpx;
+    border-bottom: 1px solid #f5f5f5;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 0 20rpx;
+    .label {
+      margin-right: 30rpx;
+      min-width: 200rpx;
+      text {
+        color: $error-color;
+      }
+    }
+    .picker {
+      .placeholder {
+        color: $sec-font;
+      }
+      .iconfont {
+        margin-left: 12rpx;
+        color: $sec-font;
+      }
+    }
+    ::v-deep .u-radio-group {
+      flex: unset;
+      .u-radio {
+        margin-left: 50rpx;
+      }
+    }
+  }
+}
+</style>

src/packageMine/pages/masterGroup/index.vue

@@ -0,0 +1,256 @@
+<template>
+  <view style="width: 100%; height: 100vh; background: rgb(247, 248, 255)">
+    <zj-page-container>
+      <view class="toubuyangs">
+        <view class="toubuyangsTab">
+          <view class="toubuyangsTabItem" @click="tabQiehuan(0)">
+            <view>已组队（{{ tongjishuju.teamCount || 0 }}）</view>
+            <view :class="{ hengxian: true, xuanzhong: tab == 0 }"> </view>
+          </view>
+          <view class="toubuyangsTabItem" @click="tabQiehuan(1)">
+            <view>待确认（{{ tongjishuju.applyCount || 0 }}）</view>
+            <view :class="{ hengxian: true, xuanzhong: tab == 1 }"></view>
+          </view>
+        </view>
+      </view>
+      <zj-page-fill>
+        <zj-page-layout
+          :isScroll="true"
+          :refresherTriggered="refresherTriggered"
+          @refresherrefresh="refresherrefresh"
+          @scrolltolower="scrolltolower"
+        >
+          <view class="neirongquyu">
+            <view class="zhegeshineirong" v-for="(item, index) in dataList" :key="index">
+              <view class="neirongbiaot">
+                <text>小组1</text>
+                <text v-if="true" style="color: blue">{{
+                  tab
+                    ? { WAIT: '待确认', OK: '通过', FAIL: '失败' }[item.status]
+                    : { ON: '启用', OFF: '禁用' }[item.status]
+                }}</text>
+                <text v-else style="color: red">待确认</text>
+              </view>
+              <view class="neironglieju">
+                <text>网点属性：</text>
+                <text>({{ item.websitId }}){{ item.websitName }}</text>
+              </view>
+              <view class="neironglieju">
+                <text>大工名称：</text>
+                <text>{{ item.masterWorkerName }}</text>
+              </view>
+              <view class="neironglieju">
+                <text>小工名称：</text>
+                <text>{{ item.assistantWorkerName }}</text>
+              </view>
+              <view class="neironglieju">
+                <text>创建时间：</text>
+                <text>{{ item.createTime }}</text>
+              </view>
+              <view class="neironghengxin" v-if="tab"></view>
+              <view class="neironganniuqu" v-if="tab && ['WAIT'].include(item.status)">
+                <u-button type="primary" text="确认" @click="queding(item, index)"></u-button>
+              </view>
+            </view>
+            <Loading :loadStatus="loadStatus" :dataList="dataList" />
+          </view>
+        </zj-page-layout>
+      </zj-page-fill>
+      <view class="quanjuanniu">
+        <u-button type="primary" text="创建组别" @click="quchuangjian"></u-button>
+      </view>
+    </zj-page-container>
+  </view>
+</template>
+
+<script>
+import zjPageContainer from '@/components/zj-page-container/zj-page-container.vue'
+import zjPageFill from '@/components/zj-page-container/zj-page-fill.vue'
+export default {
+  components: {
+    zjPageContainer,
+    zjPageFill
+  },
+  data() {
+    return {
+      tab: 0,
+      pageNum: 1,
+      dataList: [],
+      refresherTriggered: false,
+      getBool: true,
+      loadStatus: 0,
+      tongjishuju: {}
+    }
+  },
+  onLoad() {
+    this.tabQiehuan(this.tab)
+  },
+  methods: {
+    quchuangjian() {
+      this.$navToPage({
+        url: '/packageMine/pages/masterGroup/createGroup'
+      })
+    },
+
+    tabQiehuan(index) {
+      this.tab = index
+      this.getBool = true
+      this.pageNum = 1
+      this.dataList = []
+      this.getList()
+    },
+
+    queding(item, index) {
+      this.$api
+        .post('/worker/team/confirm', {
+          id: item.id,
+          status: 'OK'
+        })
+        .then(res => {
+          this.dataList.splice(index, 1, {
+            ...item,
+            status: 'OK'
+          })
+        })
+    },
+
+    getList() {
+      this.$api.post('/worker/team/count').then(res1 => {
+        this.tongjishuju = res.data
+      })
+      if (!this.getBool) {
+        return
+      }
+      this.loadStatus = 1
+      this.$api
+        .post(this.tab ? '/worker/team/page' : '/worker/team/manage/page', {
+          pageNum: this.pageNum,
+          pageSize: 20
+        })
+        .then(res => {
+          let list = res.data.records
+          if (list.length < 20) {
+            this.loadStatus = 2
+            this.getBool = false
+          } else {
+            this.loadStatus = 0
+          }
+          this.dataList = this.dataList.concat(list)
+        })
+        .catch(() => {
+          this.loadStatus = 2
+        })
+        .finally(res => {
+          this.refresherTriggered = false
+        })
+    },
+
+    // 滚动到底部
+    scrolltolower(e) {
+      if (this.loadStatus === 0) {
+        this.pageNum++
+        this.getList()
+      }
+    },
+
+    // 触发下拉刷新
+    async refresherrefresh(e) {
+      this.refresherTriggered = true
+      this.getBool = true
+      this.pageNum = 1
+      this.dataList = []
+      this.getList()
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.quanjuanniu {
+  width: 100%;
+  height: auto;
+  padding: 30rpx;
+  box-sizing: border-box;
+}
+.neirongquyu {
+  width: 100%;
+  height: auto;
+  padding: 30rpx 30rpx 15rpx 30rpx;
+  box-sizing: border-box;
+  .zhegeshineirong {
+    width: 100%;
+    height: auto;
+    padding: 30rpx;
+    box-sizing: border-box;
+    background: #fff;
+    border-radius: 20rpx;
+    margin-bottom: 30rpx;
+    .neirongbiaot {
+      width: 100%;
+      height: auto;
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      box-sizing: border-box;
+      margin-bottom: 40rpx;
+      text {
+        font-size: 32rpx;
+        font-weight: 700;
+      }
+    }
+    .neironglieju {
+      width: 100%;
+      height: auto;
+      display: flex;
+      align-items: center;
+      justify-content: flex-start;
+      box-sizing: border-box;
+      margin-bottom: 30rpx;
+      text {
+        font-size: 28rpx;
+      }
+    }
+    .neironghengxin {
+      width: 100%;
+      border-bottom: 1rpx solid #aaa;
+      margin-bottom: 30rpx;
+    }
+    .neironganniuqu {
+      widows: 100%;
+      text-align: right;
+    }
+  }
+}
+.toubuyangs {
+  width: 100%;
+  height: auto;
+  box-sizing: border-box;
+  padding: 30rpx 30rpx 15rpx 30rpx;
+  .toubuyangsTab {
+    width: 100%;
+    height: auto;
+    padding: 30rpx;
+    box-sizing: border-box;
+    background: #fff;
+    border-radius: 20rpx;
+    display: flex;
+    align-items: center;
+    justify-content: space-around;
+    .toubuyangsTabItem {
+      box-sizing: border-box;
+      font-size: 32rpx;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      flex-direction: column;
+      .hengxian {
+        margin-top: 20rpx;
+        width: 100rpx;
+      }
+      .xuanzhong {
+        border-bottom: 4rpx solid #000;
+      }
+    }
+  }
+}
+</style>

src/packageMine/pages/phone.vue

@@ -2,182 +2,193 @@
   <zj-page-layout bgColor="#ffffff">
     <view class="all-container">
       <view class="input">
-        <u-input clearable border='bottom' placeholder="请输入手机号" v-model="phone">
-          <view class="" style="" slot='prefix'>
+        <u-input clearable border="bottom" placeholder="请输入手机号" v-model="phone">
+          <view class="" style="" slot="prefix">
             <text class="iconfont icon-shouji"></text>
           </view>
         </u-input>
       </view>
       <view class="input">
-        <u-input clearable border='bottom' placeholder="请输入验证码" v-model="code">
-          <view class="" style="" slot='prefix'>
+        <u-input clearable border="bottom" placeholder="请输入验证码" v-model="code">
+          <view class="" style="" slot="prefix">
             <text class="iconfont icon-yanzhengma"></text>
           </view>
-          <view class="" slot='suffix' @click="getCode">
-            <text class="text">{{countDown?countDown+'S':'获取验证码'}}</text>
+          <view class="" slot="suffix" @click="getCode">
+            <text class="text">{{ countDown ? countDown + 'S' : '获取验证码' }}</text>
           </view>
         </u-input>
       </view>
 
       <u-button type="primary" text="确定" :disabled="!phone || !code" @click="submitForm"></u-button>
 
-    	<zjDialogVerification ref="verification" :isShow="isShowCodeDialog" :top="codeObj.yHeight" :bgImg="codeObj.bigImage"
-    	  :maskImg="codeObj.smallImage" :isSuccess="codeObj.isSuccess" :isFail="codeObj.isFail"
-    	  @close="isShowCodeDialog = false" @refresh="refresh" @finish="finish">
-    	</zjDialogVerification>
+      <zjDialogVerification
+        ref="verification"
+        :isShow="isShowCodeDialog"
+        :top="codeObj.yHeight"
+        :bgImg="codeObj.bigImage"
+        :maskImg="codeObj.smallImage"
+        :isSuccess="codeObj.isSuccess"
+        :isFail="codeObj.isFail"
+        @close="isShowCodeDialog = false"
+        @refresh="refresh"
+        @finish="finish"
+      >
+      </zjDialogVerification>
     </view>
   </zj-page-layout>
-
 </template>
 
 <script>
-  import zjDialogVerification from "@/components/zj-dialog/zj-dialog-verification.vue";
+import zjDialogVerification from '@/components/zj-dialog/zj-dialog-verification.vue'
+
+export default {
+  components: {
+    zjDialogVerification
+  },
+
+  data() {
+    return {
+      phone: '',
+      code: '',
+      getCodeText: '获取验证码',
+      countDown: 0,
+      timer: null,
+
+      isShowCodeDialog: false,
+      codeObj: {
+        bigImage: '',
+        smallImage: '',
+        key: '',
+        yHeight: '',
+        isSuccess: false,
+        isFail: false
+      }
+    }
+  },
+  onLoad() {},
+  methods: {
+    // 获取验证码
+    getCode() {
+      if (!this.phone) {
+        this.$toast('请先填写手机号码')
+        return false
+      }
+      if (this.countDown != 0) {
+        this.$toast('请勿频繁获取验证码')
+        return false
+      }
+      if (!/^1[3456789]\d{9}$/.test(this.phone)) {
+        this.$toast('请填写正确的手机号码')
+        return false
+      }
 
-	export default {
-    components: {
-      zjDialogVerification
+      // this.init();
+      this.isShowCodeDialog = true
+      this.$refs.verification.refresh()
     },
 
-		data() {
-			return {
-				phone: '',
-				code: '',
-				getCodeText: '获取验证码',
-				countDown: 0,
-				timer: null,
-
-				isShowCodeDialog: false,
-				codeObj: {
-					bigImage: '',
-					smallImage: '',
-					key: '',
-					yHeight: '',
-					isSuccess: false,
-					isFail: false,
-				}
-			}
-		},
-		onLoad() {
-
-		},
-		methods: {
-			// 获取验证码
-			getCode() {
-				if(!this.phone) {
-					this.$toast('请先填写手机号码');
-					return false;
-				}
-				if(this.countDown != 0) {
-					this.$toast('请勿频繁获取验证码');
-					return false;
-				}
-				if(!(/^1[3456789]\d{9}$/.test(this.phone))) {
-					this.$toast('请填写正确的手机号码');
-					return false;
-				}
-
-				// this.init();
-				this.isShowCodeDialog = true;
-				this.$refs.verification.refresh();
-
-			},
-
-			// 提交表单
-			submitForm() {
-				if(!this.phone) {
-					this.$toast('请先填写手机号码');
-					return false;
-				}
-				if(!(/^1[3456789]\d{9}$/.test(this.phone))) {
-					this.$toast('请填写正确的手机号码');
-					return false;
-				}
-				if(!this.code) {
-					this.$toast('请先填写验证码');
-					return false;
-				}
+    // 提交表单
+    submitForm() {
+      if (!this.phone) {
+        this.$toast('请先填写手机号码')
+        return false
+      }
+      if (!/^1[3456789]\d{9}$/.test(this.phone)) {
+        this.$toast('请填写正确的手机号码')
+        return false
+      }
+      if (!this.code) {
+        this.$toast('请先填写验证码')
+        return false
+      }
 
-				this.$api.post('/user/phone/bind', {
+      this.$api
+        .post('/user/phone/bind', {
           phone: this.phone,
           code: this.code
-				}).then(res => {
-					this.$successToast('申请成功');
-					setTimeout(() => {
-						this.$navToPage({
-							delta: 1
-						}, 'navigateBack')
-					}, 1000)
-				})
-
-			},
-
-			// 获取图片验证码
-			init(){
-				this.$api.get('/common/getVerifi')
+        })
         .then(res => {
-					this.codeObj = res.data;
-				})
-			},
+          this.$successToast('申请成功')
+          setTimeout(() => {
+            this.$navToPage(
+              {
+                delta: 1
+              },
+              'navigateBack'
+            )
+          }, 1000)
+        })
+    },
 
-			// 刷新验证码
-			refresh(){
-				this.init()
-			},
+    // 获取图片验证码
+    init() {
+      this.$api.get('/common/getVerifi').then(res => {
+        this.codeObj = res.data
+      })
+    },
+
+    // 刷新验证码
+    refresh() {
+      this.init()
+    },
 
-			// 验证结束
-			finish(value){
-				console.log(value);
-				this.$api.post('/user/sms/send', {
+    // 验证结束
+    finish(value) {
+      console.log(value)
+      this.$api
+        .post('/user/sms/send', {
           phone: this.phone,
           key: this.codeObj.key,
           vrifyCode: Math.round(value)
-				}).then(res => {
-          this.countDown = 60;
-					this.codeObj.isSuccess = true;
-					this.codeObj.isFail = false;
-					setTimeout(() => {
-						this.isShowCodeDialog = false;
-						this.$toast('短信发送成功');
-					}, 1500)
-					this.countDown--;
-					this.timer = setInterval(() => {
-						this.countDown--;
-						if (this.countDown == 0) {
-							this.getCodeText = '重新获取';
-							clearInterval(this.timer)
-						}
-					}, 1000)
-				}).catch(res => {
-					this.codeObj.isSuccess = false;
-					this.codeObj.isFail = true;
-					setTimeout(() => {
-						this.$refs.verification.refresh();
-					}, 1500)
-				})
-			}
-		}
-	}
+        })
+        .then(res => {
+          this.countDown = 60
+          this.codeObj.isSuccess = true
+          this.codeObj.isFail = false
+          setTimeout(() => {
+            this.isShowCodeDialog = false
+            this.$toast('短信发送成功')
+          }, 1500)
+          this.countDown--
+          this.timer = setInterval(() => {
+            this.countDown--
+            if (this.countDown == 0) {
+              this.getCodeText = '重新获取'
+              clearInterval(this.timer)
+            }
+          }, 1000)
+        })
+        .catch(res => {
+          this.codeObj.isSuccess = false
+          this.codeObj.isFail = true
+          setTimeout(() => {
+            this.$refs.verification.refresh()
+          }, 1500)
+        })
+    }
+  }
+}
 </script>
 
 <style lang="scss" scoped>
-  .all-container {
-    padding: 0 30rpx;
-    .input {
-      margin-top: 30rpx;
-      ::v-deep .u-input {
-        .iconfont {
-          font-size: 36rpx;
-          color: $theme-color;
-          font-weight: 600;
-          margin-right: 12rpx;
-        }
-        .text {
-          color: $theme-color;
-        }
+.all-container {
+  padding: 0 30rpx;
+  .input {
+    margin-top: 30rpx;
+    ::v-deep .u-input {
+      .iconfont {
+        font-size: 36rpx;
+        color: $theme-color;
+        font-weight: 600;
+        margin-right: 12rpx;
+      }
+      .text {
+        color: $theme-color;
       }
     }
-    ::v-deep .u-button {
-      margin-top: 60rpx;
-    }
   }
+  ::v-deep .u-button {
+    margin-top: 60rpx;
+  }
+}
 </style>

src/pages.json

@@ -534,6 +534,18 @@
       "name": "packageMine",
       "pages": [
         {
+          "path": "pages/masterGroup/index",
+          "style": {
+            "navigationBarTitleText": "师傅组别"
+          }
+        },
+        {
+          "path": "pages/masterGroup/createGroup",
+          "style": {
+            "navigationBarTitleText": "创建组别"
+          }
+        },
+        {
           "path": "pages/coreLssuedFile/index",
           "style": {
             "navigationBarTitleText": "中心文件下发"

src/pages/mine/index.vue

@@ -356,6 +356,12 @@ export default {
           icon: 'icon-kehu',
           link: '/packageMine/pages/coreLssuedFile/index',
           show: true
+        },
+        {
+          name: '师傅组别',
+          icon: 'icon-kehu',
+          link: '/packageMine/pages/masterGroup/index',
+          show: true
         }
       ]
     },

src/static/4aGsDk0HsW.txt

@@ -0,0 +1 @@
+c50bfe86425dcfde5794fee5eb4def00

src/static/MP_verify_ePrYgpTwgdoICqs0.txt

@@ -0,0 +1 @@
+ePrYgpTwgdoICqs0