Home Verkennen Help
Registreren Inloggen
wutt
/
manHourHousekeeper
1
0
Vork 0
Bestanden Issues 0 Pull-aanvragen 0 Wiki
Bladeren bron

Merge branch 'master' of http://47.100.37.243:10191/wutt/manHourHousekeeper

zhouyy 4 maanden geleden
bovenliggende
6bbe4f84c9 87194bacdb
commit
4bf6976db6
10 gewijzigde bestanden met toevoegingen van 44 en 40 verwijderingen
Zij-aan-zij weergave Toon Diff Stats
  1. 1 1
      fhKeeper/formulahousekeeper/customerBuler-crm-h5/index.html
  2. 1 1
      fhKeeper/formulahousekeeper/customerBuler-crm-h5/src/components/common/pullDownSelector.vue
  3. 3 3
      fhKeeper/formulahousekeeper/customerBuler-crm-h5/src/components/common/translationComponent.vue
  4. 9 12
      fhKeeper/formulahousekeeper/customerBuler-crm-h5/src/pages/moduleList/moduleList.vue
  5. 7 2
      fhKeeper/formulahousekeeper/customerBuler-crm-h5/src/pages/tabbar/home/index.vue
  6. 2 2
      fhKeeper/formulahousekeeper/customerBuler-crm-h5/vite.config.js
  7. 5 2
      fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/controller/WeiXinCorpController.java
  8. 11 12
      fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ReportServiceImpl.java
  9. 4 4
      fhKeeper/formulahousekeeper/timesheet/src/views/projectApproval/projectApproval.vue
  10. 1 1
      fhKeeper/formulahousekeeper/timesheet/src/views/workReport/daily.vue

+ 1 - 1
fhKeeper/formulahousekeeper/customerBuler-crm-h5/index.html
Bestand weergeven 

@@ -7,7 +7,7 @@
 
     <title>客户管家</title>
 
     <script src="https://res.wx.qq.com/open/js/jweixin-1.2.0.js" referrerpolicy="origin"></script>
 
     <script src="https://open.work.weixin.qq.com/wwopen/js/jwxwork-1.0.0.js" referrerpolicy="origin"></script>
 
-    <script src="https://s.url.cn/qqun/qun/qqweb/m/qun/confession/js/vconsole.min.js "></script>
 
+    <!-- <script src="https://s.url.cn/qqun/qun/qqweb/m/qun/confession/js/vconsole.min.js "></script> -->
 
   </head>
 
   <body>
 
     <div id="app"></div>

+ 1 - 1
fhKeeper/formulahousekeeper/customerBuler-crm-h5/src/components/common/pullDownSelector.vue
Bestand weergeven 

@@ -57,7 +57,7 @@
 
 </template>
 
 
 <script setup>
 
-import { ref, onBeforeUpdate, reactive, watch, onMounted } from "vue";
 
+import { ref, onBeforeUpdate, reactive, watch, onMounted, onActivated } from "vue";
 
 import { manualCopying, useDebounce } from "@hooks/useCommon";
 
 import requests from "@common/requests";
 
 import { GET_ALL_PERSONNEL } from "@hooks/useApi";

+ 3 - 3
fhKeeper/formulahousekeeper/customerBuler-crm-h5/src/components/common/translationComponent.vue
Bestand weergeven 

@@ -1,5 +1,5 @@
 
 <template>
 
-  <template v-if="userInfo.userInfo.userNameNeedTranslate == 1">
 
+  <!-- <template v-if="userInfo.userInfo.userNameNeedTranslate == 1">
 
     <template v-if="Array.isArray(openId)">
 
       <template v-for="(item, index) in openId">
 
         <ww-open-data :type='type' :openid='item'></ww-open-data>
 
@@ -8,9 +8,9 @@
 
     </template>
 
     <ww-open-data :type='type' :openid='openId' v-else></ww-open-data>
 
   </template>
 
-  <template v-else>
 
+  <template v-else> -->
 
     {{ Array.isArray(openId) ? openId.join(',') : openId }}
 
-  </template>
 
+  <!-- </template> -->
 
 </template>
 
 
 <script setup>

+ 9 - 12
fhKeeper/formulahousekeeper/customerBuler-crm-h5/src/pages/moduleList/moduleList.vue
Bestand weergeven 

@@ -176,16 +176,12 @@
 
                             <img src="/src/assets/image/noTopMounted.png" class="w-full h-full">
 
                           </div>
 
                         </template>
 
-                        <template v-permission="[queryParameters?.jurisdiction?.edit]">
 
-                          <div class="buttonCircle rounded-full" @click="edit(item)" >
 
-                            <img src="/src/assets/image/edit.png" class="w-full h-full">
 
-                          </div>
 
-                        </template>
 
-                        <template v-permission="[queryParameters?.jurisdiction?.delete]">
 
-                          <div class="buttonCircle rounded-full" @click="deleteRow(item)" >
 
-                            <img src="/src/assets/image/delete.png" class="w-full h-full">
 
-                          </div>
 
-                        </template>
 
+                        <div class="buttonCircle rounded-full" @click="edit(item)" v-permission="[queryParameters?.jurisdiction?.edit]">
 
+                          <img src="/src/assets/image/edit.png" class="w-full h-full">
 
+                        </div>
 
+                        <div class="buttonCircle rounded-full" @click="deleteRow(item)" v-permission="[queryParameters?.jurisdiction?.delete]">
 
+                          <img src="/src/assets/image/delete.png" class="w-full h-full">
 
+                        </div>
 
                       </div>
 
                     </template>
 
                   </van-swipe-cell>
 
@@ -359,14 +355,14 @@ function deleteRow(row) {
 
 
 // 顶置事件
 
 function topMounted(row) {
 
-  requests.post(queryParameters?.value.topMountedInterface, { ids: row.id }).then((res) => {
 
+  requests.post(queryParameters?.value.topMountedInterface, { id: row.id }).then((res) => {
 
     toastSuccess('顶置成功')
 
     onRefresh(true)
 
   })
 
 }
 
 
 function noTopMounted(row) {
 
-  requests.post(queryParameters?.value.cancelTheTopMountedInterface, { ids: row.id }).then((res) => {
 
+  requests.post(queryParameters?.value.cancelTheTopMountedInterface, { id: row.id }).then((res) => {
 
     toastSuccess('取消顶置成功')
 
     onRefresh(true)
 
   })
 
@@ -463,6 +459,7 @@ function reloadListData(data) {
 
   refreshing.value = false
 
   isLoading.value = false
 
   finished.value = false
 
+  searchVal.value = ''
 
   listData.value = { records: [], pageIndex: 0, pageSize: 20, total: 0, totalPage: 0 }
 
   popUpWindowArray.value = popUpWindowArray.value.filter(item => !item.removeModule.includes(queryParameters.value?.key))
 
   if (!fixedData.formJson[queryParameters.value.key]) {

+ 7 - 2
fhKeeper/formulahousekeeper/customerBuler-crm-h5/src/pages/tabbar/home/index.vue
Bestand weergeven 

@@ -61,6 +61,7 @@ import { routingInfos } from "@utility/generalVariables.js";
 
 import Footer from "@components/page/footer.vue";
 
 import Workbench from "./component/workbench.vue";
 
 import DataAnalysis from "./component/dataAnalysis.vue";
 
+import requests from "@common/requests"
 
 
 
 const userInfo = useInfoStore()
 
@@ -88,8 +89,11 @@ function returnImageAddress(rows) {
 
 
 function obtainEnterpriseWeChatParameters(data = {}) {
 
   const token = data.id
 
-  const curUrl = window.location.href.split('#')[0]
 
+  // const curUrl = window.location.href.split('home')[0]
 
+  const curUrl = window.location.href
 
   console.log(wx, '开始调用接口')
 
+  console.log(token, curUrl)
 
+  console.log(requests, '<==== requests')
 
   requests.post('/wxcorp/getCorpWXConfig', { url: curUrl, token }).then((res) => {
 
     console.log(res, '<====== 返回的参数 /wxcorp/getCorpWXConfig')
 
     wx.config({
 
@@ -136,7 +140,8 @@ function obtainEnterpriseWeChatParameters(data = {}) {
 
       // config信息验证失败会执行error函数，如签名过期导致验证失败，具体错误信息可以打开config的debug模式查看，也可以在返回的res参数中查看，对于SPA可以在这里更新签名。
 
       // alert('wxConfig发生异常:'+JSON.stringify(res));
 
       // 企业第一次授权安装进入后会报not in reliable domain的错误，刷新后正常
 
-      location.reload();
 
+      // location.reload();
 
+      console.log(res, '<===== 失败3')
 
     });
 
   }).catch(err => {
 
     alert(err);

+ 2 - 2
fhKeeper/formulahousekeeper/customerBuler-crm-h5/vite.config.js
Bestand weergeven 

@@ -5,8 +5,8 @@ import Components from "unplugin-vue-components/vite";
 
 import { VantResolver } from "unplugin-vue-components/resolvers";
 
 import { postcssConfig } from "./postcss.config.js";
 
 
-const target = 'http://192.168.2.7:10010';
 
-// const target = 'http://192.168.2.3:10010';
 
+// const target = 'http://192.168.2.7:10010';
 
+const target = 'http://192.168.2.3:10010';
 
 // const target = 'http://192.168.2.17:10010';
 
 // const target = 'http://47.101.180.183:10010';

+ 5 - 2
fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/controller/WeiXinCorpController.java
Bestand weergeven 

@@ -348,6 +348,7 @@ public class WeiXinCorpController {
 
                 String forObject = this.restTemplate.getForObject(getTicketUrl, String.class);
 
                 JSONObject json = JSONObject.parseObject(forObject);
 
                 log.info("返回："+json.toJSONString());
 
+                System.out.println("返回："+json.toJSONString());
 
                 if (json.getIntValue("errcode") == 0) {
 
                     String ticket = json.getString("ticket");
 
                     Item it = new Item();
 
@@ -376,6 +377,8 @@ public class WeiXinCorpController {
 
             packageParams.put("sign", sign);
 
             packageParams.put("appid", wxCorpInfo.getCorpid());//这里使用企业微信corpId
 
             msg.data = packageParams;
 
+            System.out.println("最后返回："+packageParams);
 
+            log.info("最后返回："+packageParams);
 
         } catch (Exception e) {
 
             e.printStackTrace();
 
             msg.setError(e.getMessage());
 
@@ -1301,7 +1304,7 @@ public class WeiXinCorpController {
 
                     JSONArray jsonArray = obj.getJSONObject("auth_info").getJSONArray("agent");
 
                     for (int i=0;i<jsonArray.size(); i++) {
 
                         JSONObject jsonObject = jsonArray.getJSONObject(i);
 
-                        if (jsonObject.getString("name").equals("客户管家")) {
 
+                        if (jsonObject.getString("name").contains("客户管家")) {
 
                             int agentId = jsonObject.getInteger("agentid");
 
                             data.setAgentid(agentId);
 
                             //授权模式：0为管理员授权；1为成员授权
 
@@ -1435,7 +1438,7 @@ public class WeiXinCorpController {
 
                     JSONArray jsonArray = obj.getJSONObject("auth_info").getJSONArray("agent");
 
                     for (int i=0;i<jsonArray.size(); i++) {
 
                         JSONObject jsonObject = jsonArray.getJSONObject(i);
 
-                        if (jsonObject.getString("name").equals("客户管家")) {
 
+                        if (jsonObject.getString("name").contains("客户管家")) {
 
                             int agentId = jsonObject.getInteger("agentid");
 
                             data.setAgentid(agentId);
 
                         }

+ 11 - 12
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ReportServiceImpl.java
Bestand weergeven 

@@ -1435,17 +1435,17 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
 
                     if (first.isPresent()) {
 
                         reportOwner = first.get().getName();
 
                     }
 
-                    String msg = null;
 
-                    if (report.getFillUserid()==null) {
 
-                        //自己填写自己的
 
-                        //msg = reportOwner+"提交了日报";
 
-                        msg = MessageUtils.message("profession.submit",reportOwner);
 
-                    } else {
 
-                        //代填的
 
-                        first = userList.stream().filter(u -> u.getId().equals(log.getOperatorId())).findFirst();
 
-                        //msg = first.get().getName()+"为" + reportOwner+"代填了日报";
 
-                        msg = MessageUtils.message("profession.submitReplace",first.get().getName(),reportOwner);
 
-                    }
 
+                    String msg = MessageUtils.message("profession.submit",reportOwner);
 
+//                    if (report.getFillUserid()==null) {
 
+//                        //自己填写自己的
 
+//                        //msg = reportOwner+"提交了日报";
 
+////                        msg = MessageUtils.message("profession.submit",reportOwner);
 
+//                    } else {
 
+//                        //代填的
 
+////                        first = userList.stream().filter(u -> u.getId().equals(log.getOperatorId())).findFirst();
 
+//                        //msg = first.get().getName()+"为" + reportOwner+"代填了日报";
 
+////                        msg = MessageUtils.message("profession.submitReplace",first.get().getName(),reportOwner);
 
+//                    }
 
                     log.setMsg(msg);
 
                     log.setCompanyId(companyId);
 
                     log.setReportIds(report.getId()+"");
 
@@ -1453,7 +1453,6 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
 
                     detail.setOperatorId(log.getOperatorId());
 
                     detail.setOperateDate(log.getOperateDate());
 
                     detail.setMsg(log.getMsg());
 
-
 
                 } else {
 
                     ReportLog reportLog = oldLog.get();
 
                     reportLog.setReportIds(reportLog.getReportIds()+","+report.getId());

+ 4 - 4
fhKeeper/formulahousekeeper/timesheet/src/views/projectApproval/projectApproval.vue
Bestand weergeven 

@@ -81,8 +81,8 @@
 
                         <el-table-column :label="$t('operation')" :width="300" align="left" fixed="right">
 
                             <template slot-scope="scope">
 
                                 <el-button size="mini" type="primary" v-if="(permissions.projectApprovalEdit||permissions.projectApprovalCheck)&&scope.row.status!=1" @click="handleAdd(scope.$index, scope.row)">{{'编辑'}}</el-button>
 
-                                <!-- <el-button size="mini" v-if="(permissions.projectApprovalEdit||permissions.projectApprovalCheck) && scope.row.status==0"  @click="check(scope.row,1)">{{'通过'}}</el-button>
 
-                                <el-button size="mini" v-if="(permissions.projectApprovalEdit||permissions.projectApprovalCheck) && scope.row.status==0" @click="check(scope.row,2)">{{'驳回'}}</el-button> -->
 
+                                <el-button size="mini" type="success" v-if="(permissions.projectApprovalEdit||permissions.projectApprovalCheck) && scope.row.status==0"  @click="check(scope.row,1)" >{{'通过'}}</el-button>
 
+                                <el-button size="mini" v-if="(permissions.projectApprovalEdit||permissions.projectApprovalCheck) && scope.row.status==0" @click="check(scope.row,2)">{{'驳回'}}</el-button>
 
                                 <el-button size="mini" v-if="(permissions.projectApprovalEdit ||permissions.projectApprovalCheck) && scope.row.status==1" @click="check(scope.row,3)">{{'撤销'}}</el-button>
 
                             </template>
 
                         </el-table-column>
 
@@ -226,7 +226,7 @@
 
                                     </el-tabs>
 
                                 </div>
 
                                 <el-divider></el-divider>
 
-                                <!-- <template>
 
+                                <template>
 
                                     <div><span>{{'审核人'}}</span></div>
 
                                     <div>
 
                                         <div v-for="(item, index) in pointList" :key="index" >
 
@@ -242,7 +242,7 @@
 
                                         <span>{{item.status==0?'待审核':item.status==1?"已审核":"已驳回"}}</span>
 
                                         </div>
 
                                     </div>
 
-                                </template> -->
 
+                                </template>
 
                             </el-form>  
                         </div>
 
                         <div slot="footer" class="dialog-footer;">

+ 1 - 1
fhKeeper/formulahousekeeper/timesheet/src/views/workReport/daily.vue
Bestand weergeven 

@@ -139,7 +139,7 @@
 
                                     <el-link v-if="user.timeType.enableNewWeeklyfill == 1" type="primary" style="margin-right:10px;" :underline="false" @click="isSubstitude=false;fillInReportCustom()">{{ $t('textLink.fillInAWeek') }}</el-link>
 
                                     <!-- <el-link type="primary" style="margin-right:10px;" :underline="false" @click="isSubstitude=false;fillInReportCustom()">按周填报123</el-link> -->
 
                                     <el-link type="primary" style="margin-right:10px;" :underline="false" @click="isSubstitude=false;weekIndex++,fillWeekDialogVisiCustomTwo=true" v-if="user.timeType.enableNewWeeklyfill==2">按周填报</el-link>
 
-                                    <el-link type="primary" v-if="user.companyId != 5978 && permissions.reportsFillOut && user.timeType.enableNewWeeklyfill != 1" style="margin-right:10px;" :underline="false" @click="isSubstitude=true; fillInReport(-1,(user.companyId == 5814||user.companyId==5693)?2:0)">{{$t('textLink.helpToFillIn')}}</el-link>
 
+                                    <el-link type="primary" v-if="user.companyId != 5978 && permissions.reportsFillOut && user.timeType.enableNewWeeklyfill != 1" style="margin-right:10px;" :underline="false" @click="isSubstitude=true; fillInReport(-1,(user.companyId == 5814||user.companyId==5693 || user.companyId==4407)?2:0)">{{$t('textLink.helpToFillIn')}}</el-link>
 
                                     <!-- 苏州景昱，按周填报的模式进行代填日报 -->
 
                                     <el-link type="primary" v-if="user.companyId == 5978 && permissions.reportsFillOut && user.timeType.enableNewWeeklyfill != 1" style="margin-right:10px;" :underline="false" @click="isSubstitude=true; fillInReportss();">{{$t('textLink.helpToFillIn')}}</el-link>