配送员优化

README.md

@@ -35,4 +35,3 @@ npm run build:prod
 1.新增消费场所商品类型静态页面
 2.新增消费场所商品管理静态页面
 3.新增消费场所预约管理静态页面
-

src/views/recharge/cateringManagement/personnel/index.vue

@@ -209,6 +209,9 @@ export default {
       exportLoading: false,
       // 选中数组
       ids: [],
+      zid:[],
+      userName:[],
+      openid:[],
       // 非单个禁用
       single: true,
       // 非多个禁用
@@ -310,22 +313,25 @@ export default {
       people(this.queryParams).then(response => {
         let data1 = response.data.records
         for(let i =0;i<data1.length;i++){
-           data1[i].deptName = JSON.parse(data1[i].dept).name
+          data1[i].deptName = JSON.parse(data1[i].dept).name
+          data1[i].isSend = "0"
+          data1[i].people = "0"
+          data1[i].dreUserId = undefined
+          data1[i].openId = data1[i].openId
+          data1[i].userName = data1[i].name || ''
         }
         if(data1.length>0){
           getPeople({current:1,size:500}).then(res => {
             let data2 = res.data.records
             if(data2.length>0){
-              for(let i =0;i<data1.length;i++){
-                data1[i].isSend = "0"
-                data1[i].people = "0"
-                data1[i].dreUserId = undefined
-                for(let a=0;a<data2.length;a++){
-                  if(data1[i].sid == data2[a].sid ){
-                    data1[i].isSend = data2[a].isSend ? "1" : "0"
-                    data1[i].delFlag = data2[a].delFlag ? "1" : "0"
-                    data1[i].dreUserId = data2[a].dreUserId
-                    data1[i].people = "1"
+              for(let i =0;i<data2.length;i++){
+                for(let a=0;a<data1.length;a++){
+                  if(data1[a].sid == data2[i].sid ){
+                    data1[a].isSend = data2[i].isSend ? "1" : "0"
+                    data1[a].delFlag = data2[i].delFlag ? "1" : "0"
+                    data1[a].dreUserId = data2[i].dreUserId
+                    data1[a].openId = data2[i].dreOpenId ? data2[i].dreOpenId : data2[i].openId ? data2[i].openId ? data1[a].openId : data1[a].openId : ''
+                    data1[a].people = "1"
                   }
                 }
               }
@@ -339,10 +345,11 @@ export default {
         }else{
           this.userList = response.data.records
         }
-
+        setTimeout(()=>{
+          console.log(this.userList)
+        },1000)
         this.total = response.data.total;
         this.loading = false;
-
       })
     },
     /** 查询部门下拉树结构 */
@@ -423,6 +430,8 @@ export default {
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.sid);
       this.zid = selection.map(item => item.dreUserId);
+      this.userName = selection.map(item => item.userName);
+      this.openid = selection.map(item => item.openid);
       this.single = selection.length != 1;
       this.multiple = !selection.length;
     },
@@ -458,10 +467,12 @@ export default {
       if(this.open){
         let data = []
         for(let i =0;i<this.ids.length;i++){
-          data[i] = {userId:undefined,isSend:undefined,delFlag:undefined,id:undefined}
+          data[i] = {userId:undefined,isSend:undefined,delFlag:undefined,id:undefined,userName:'',openId :''}
           data[i].userId = this.ids[i]
           data[i].isSend = this.form.isSend == '1' ? 1 : 0
           data[i].delFlag = this.form.people == "1" ? true : false
+          data[i].userName = this.userName[i]  || ''
+          data[i].openId  = this.openid[i]  || ''
           data[i].id = this.zid[i]
         }
         updataPeople(data).then(response =>{
@@ -493,9 +504,15 @@ export default {
            data[i].deptName = JSON.parse(data[i].dept).name
            data[i].people = "1"
            data[i].isSend = data[i].isSend ? "1" : "0"
-           data[i].id = data.dreUserId
+           data[i].id = data[i].dreUserId
+           data[i].userName = data[i].name  || ''
+           data[i].openId = data[i].dreOpenId ? data[i].dreOpenId : data[i].openId
+           if(!data[i].openId){
+             data[i].openId = ""
+           }
         }
         this.userList2 = data
+
       })
     },
     /**配送员单独设置 */
@@ -505,7 +522,7 @@ export default {
           row.isSend = "0"
         }
       }else{
-        let data = [{userId:undefined,delFlag:undefined,isSend:undefined,id:undefined}]
+        let data = [{userId:undefined,delFlag:undefined,isSend:undefined,id:undefined,userName:'',openId :''}]
         if(row.people == "1"){
           data[0].isSend=  row.isSend
           data[0].delFlag = true
@@ -515,6 +532,8 @@ export default {
         }
         data[0].id = row.dreUserId
         data[0].userId = row.sid
+        data[0].userName = row.userName || ''
+        data[0].openId  = row.openId  || ''
         updataPeople(data).then(response =>{
           if(data[0].delFlag){
             this.msgSuccess(`人员绑定完成`)
@@ -529,21 +548,10 @@ export default {
           this.getList();
         })
       }
-
-      // if(this.open2){
-      //   if(row.people == "1"){
-      //     data[0].isSend=  row.isSend
-      //     data[0].delFlag = true
-      //   }else{
-      //     data[0].isSend = 0
-      //     data[0].delFlag = false
-      //   }
-      //   this.allPeopleShow()
-      // }
     },
     /**公众号推送单独设置 */
     handleSend(row){
-        let data = [{userId:undefined,delFlag:undefined,isSend:undefined,id:undefined}]
+        let data = [{userId:undefined,delFlag:undefined,isSend:undefined,id:undefined,userName:'',openId :''}]
         if(row.isSend == "1"){
           data[0].isSend = 1
           if(row.people == "0"){
@@ -559,6 +567,8 @@ export default {
         }
         data[0].id = row.dreUserId
         data[0].userId = row.sid
+        data[0].userName = row.userName || ''
+        data[0].openId = row.openId  || ''
         updataPeople(data).then(response =>{
           if(data[0].delFlag){
             this.msgSuccess(`公众号推送绑定完成`)
@@ -571,32 +581,11 @@ export default {
           }
         }).catch(err=>{
           this.getList();
+          if(this.open2){
+            this.allPeopleShow()
+          }
         })
     },
-    /** 导出按钮操作 */
-    // handleExport() {
-    //   let queryParams = {...this.queryParams};
-    //   delete queryParams.current
-    //   delete queryParams.size
-    //   this.exportLoading = true;
-    //   staffExport(queryParams).then(response =>{
-    //     this.exportLoading = false;
-    //     localStorage.setItem('fileExportId', response.data)
-    //     this.$router.push({path:'/recharge/fileExport'})
-    //     // setTimeout(()=>{
-    //     //   listRecharge({current:1,size:1,id:response.id}).then(res=>{
-    //     //     var a = document.createElement("a"); //创建一个<a></a>标签
-    //     //     a.href = res.data.records[0].url; // 给a标签的href属性值加上地址，注意，这里是绝对路径，不用加 点.
-    //     //     a.download = "配餐记录" + getNowTime(); //设置下载文件文件名，这里加上.xlsx指定文件类型，pdf文件就指定.fpd即可
-    //     //     a.style.display = "none"; // 障眼法藏起来a标签
-    //     //     document.body.appendChild(a); // 将a标签追加到文档对象中
-    //     //     a.click(); // 模拟点击了a标签，会触发a标签的href的读取，浏览器就会自动下载了
-    //     //     a.remove();
-    //     //     this.exportLoading = false;
-    //     //   })
-    //     // },1000)
-    //   })
-    // }
   }
 };
 </script>

src/views/recharge/cateringManagement/record/index.vue

@@ -271,21 +271,14 @@ export default {
             sendTime:undefined,
             sendEndTime:undefined,
         }
-        let sid = undefined
-        axios.get("https://smartpark.caih.com/dxapi/dxtop/staff/one",{
-          params:{
-            id:this.$store.state.user.user.centerUserId
-          }
-        }).then(res=>{
-          sid = res.data.data.sid
-          if(status == "1"){
-              data.receiveUserName = this.$store.state.user.user.nickName
-              data.receiveUserId = sid
+        if(status == "1"){
+              data.receiveUserName = this.$store.state.user.user.userName
+              data.receiveUserId = this.$store.state.user.user.userId
               data.receiveTime = time
           }
           if(status == "2"){
-              data.sendUserName= this.$store.state.user.user.nickName
-              data.sendUserId = sid
+              data.sendUserName= this.$store.state.user.user.userName
+              data.sendUserId = this.$store.state.user.user.userId
               data.sendTime = time
           }
           if(status == "3"){
@@ -304,8 +297,6 @@ export default {
             this.open = false
             this.getList()
           })
-        })
-
       }else{
         this.msgError("该账号不具备centerUserId参数,无法对配餐管理做修改，请改为人员账号登录");
       }

src/views/system/user/index.vue

@@ -100,8 +100,8 @@
         <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange" height="calc(100vh - 12vh - 120px)">
           <el-table-column type="selection" width="50" align="center" />
           <el-table-column label="用户编号" align="center" key="userId" prop="userId" v-if="columns[0].visible"  show-overflow-tooltip />
-          <el-table-column label="用户名称" align="center" key="userName" prop="userName" v-if="columns[1].visible"  show-overflow-tooltip  />
-          <el-table-column label="用户昵称" align="center" key="nickName" prop="nickName" v-if="columns[2].visible"  show-overflow-tooltip  />
+          <el-table-column label="账户名称" align="center" key="userName" prop="userName" v-if="columns[1].visible"  show-overflow-tooltip  />
+          <el-table-column label="用户名称" align="center" key="nickName" prop="nickName" v-if="columns[2].visible"  show-overflow-tooltip  />
           <el-table-column label="部门" align="center" key="deptName" prop="dept.deptName" v-if="columns[3].visible"  show-overflow-tooltip  />
           <el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber" v-if="columns[4].visible"  show-overflow-tooltip />
           <el-table-column label="状态" align="center" key="status" v-if="columns[5].visible">
@@ -177,8 +177,8 @@
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-row>
           <el-col :span="12">
-            <el-form-item label="用户昵称" prop="nickName">
-              <el-input v-model.trim="form.nickName" placeholder="请输入用户昵称" maxlength="15" show-word-limit />
+            <el-form-item label="用户名称" prop="nickName">
+              <el-input v-model.trim="form.nickName" placeholder="请输入用户名称" maxlength="15" show-word-limit />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -201,13 +201,13 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item v-if="form.userId == undefined" label="用户名称" prop="userName">
-              <el-input v-model.trim="form.userName" placeholder="请输入用户名称" maxlength="30" />
+            <el-form-item v-if="form.userId == undefined" label="账户名称" prop="userName">
+              <el-input v-model.trim="form.userName" placeholder="请输入账户名称" maxlength="30" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item v-if="form.userId == undefined" label="用户密码" prop="password">
-              <el-input v-model.trim="form.password" placeholder="请输入用户密码" type="password" maxlength="20" show-password @input="onInput()" />
+            <el-form-item v-if="form.userId == undefined" label="账户密码" prop="password">
+              <el-input v-model.trim="form.password" placeholder="请输入账户密码" type="password" maxlength="20" show-password @input="onInput()" />
             </el-form-item>
           </el-col>
         </el-row>