ecinc-cloud-moadesktop 9.6.258 → 9.6.261

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. package/lib/ecmoadesktop.common.js +46 -28
  2. package/lib/ecmoadesktop.umd.js +46 -28
  3. package/lib/ecmoadesktop.umd.min.js +2 -2
  4. package/package.json +1 -1
package/lib/ecmoadesktop.common.js CHANGED
@@ -244,6 +244,7 @@ __webpack_require__.r(__webpack_exports__);
244
244
 
245
245
  var $parent = '';
246
246
  var timeSpanData = null; // 考勤时段
247
+ var dkAddr = null; //人员排班打卡地址
247
248
  var p1 = null; // 打卡位置经纬度
248
249
  var gpsScope = null;
249
250
  var curAddress = null;
@@ -270,6 +271,7 @@ function getDis(lng, lat) {
270
271
  if (!addrs || addrs.length === 0) {
271
272
  return;
272
273
  } else if (addrs.length === 1) {
274
+ dkAddr = addrs[0];
273
275
  p1 = new T.LngLat(parseFloat(addrs[0].gpsXy.split(',')[0]), parseFloat(addrs[0].gpsXy.split(',')[1]));
274
276
  dis = mapObj.getDistance(p1, p2); // 返回 p1 到 p2 间的地面距离，单位：米
275
277
 
@@ -281,12 +283,14 @@ function getDis(lng, lat) {
281
283
  //console.log('dis' + i, distance)
282
284
  if (i === 0) {
283
285
  dis = distance; // 第一次赋值
286
+ dkAddr = v;
284
287
  p1 = p;
285
288
  gpsScope = v.gpsScope;
286
289
  } else {
287
290
  if (dis > distance) {
288
291
  // 上次定位距离大于当前两点之差
289
292
  dis = distance;
293
+ dkAddr = v;
290
294
  p1 = p;
291
295
  gpsScope = v.gpsScope;
292
296
  }
@@ -314,11 +318,25 @@ function getCurAddress(lng, lat) {
314
318
  function curLocationAndDis() {
315
319
  var device = js_cookie__WEBPACK_IMPORTED_MODULE_0___default().get('device');
316
320
  return new Promise(function (resolve) {
321
+ //H5地图定位
322
+ var lo = new T.Geolocation();
323
+ function h5Position(e) {
324
+ if (this.getStatus() == 0) {
325
+ getDis(e.lnglat.lng, e.lnglat.lat);
326
+ getCurAddress(e.lnglat.lng, e.lnglat.lat);
327
+ resolve(true);
328
+ } else {
329
+ //console.log('Geolocation getCurrentPosition status', lo.getStatus())
330
+ resolve(false);
331
+ }
332
+ }
317
333
  if (window.mappType === 'ecinc') {
318
334
  //APP定位
335
+ var locationed = false;
319
336
  $parent.$wv.getLocationInformation(function (res) {
320
337
  if (typeof res === 'string') res = JSON.parse(res);
321
338
  if (res && res.data) {
339
+ locationed = true;
322
340
  getDis(Number(res.data.longitude), Number(res.data.latitude));
323
341
  getCurAddress(Number(res.data.longitude), Number(res.data.latitude));
324
342
  resolve(true);
@@ -327,19 +345,13 @@ function curLocationAndDis() {
327
345
  resolve(false);
328
346
  }
329
347
  });
330
- } else if (window.isOpenMapLocation === 1) {
331
- //H5地图定位
332
- var h5Position = function h5Position(e) {
333
- if (this.getStatus() == 0) {
334
- getDis(e.lnglat.lng, e.lnglat.lat);
335
- getCurAddress(e.lnglat.lng, e.lnglat.lat);
336
- resolve(true);
337
- } else {
338
- //console.log('Geolocation getCurrentPosition status', lo.getStatus())
339
- resolve(false);
348
+ setTimeout(function () {
349
+ //gps定位超时，使用H5地图定位
350
+ if (!locationed && window.isOpenMapLocation === 1 && (location.protocol.toLocaleLowerCase() === 'https:' || location.href.indexOf('127.0.0.1') !== -1 || location.href.indexOf('localhost') !== -1)) {
351
+ lo.getCurrentPosition(h5Position);
340
352
  }
341
- };
342
- var lo = new T.Geolocation();
353
+ }, 2000);
354
+ } else if (window.isOpenMapLocation === 1 && (location.protocol.toLocaleLowerCase() === 'https:' || location.href.indexOf('127.0.0.1') !== -1 || location.href.indexOf('localhost') !== -1)) {
343
355
  lo.getCurrentPosition(h5Position);
344
356
  } else if (device === 'qywx') {
345
357
  // 企业微信定位
@@ -356,6 +368,8 @@ function curLocationAndDis() {
356
368
  consloe.log('用户拒绝获取位置信息');
357
369
  }
358
370
  });
371
+ } else {
372
+ resolve(false);
359
373
  }
360
374
  });
361
375
  }
@@ -478,7 +492,11 @@ var defaultMethods = {
478
492
  orgName: loginUser.orgName,
479
493
  personSchId: timeSpanData.personSchId,
480
494
  timeId: timeSpanData.timeInterval.id,
481
- unitAddress: curAddress
495
+ unitAddress: curAddress,
496
+ //定位地址
497
+ addressName: dkAddr.memo,
498
+ //人员排班中的移动打卡地址名称
499
+ addressId: dkAddr.id //人员排班中的移动打卡地址ID
482
500
  }
483
501
  }).then(function (response) {
484
502
  if (response.code === 'success') {
@@ -758,7 +776,7 @@ ___CSS_LOADER_EXPORT___.push([module.id, "#work-setting[data-v-653165e4]{positio
758
776
 
759
777
  /***/ }),
760
778
 
761
- /***/ 4581:
779
+ /***/ 8872:
762
780
  /***/ (function(module, __webpack_exports__, __webpack_require__) {
763
781
 
764
782
  "use strict";
@@ -772,7 +790,7 @@ __webpack_require__.r(__webpack_exports__);
772
790
 
773
791
  var ___CSS_LOADER_EXPORT___ = _node_modules_css_loader_dist_runtime_api_js__WEBPACK_IMPORTED_MODULE_1___default()((_node_modules_css_loader_dist_runtime_noSourceMaps_js__WEBPACK_IMPORTED_MODULE_0___default()));
774
792
  // Module
775
- ___CSS_LOADER_EXPORT___.push([module.id, ".no-data[data-v-57f248a0]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;height:100%;margin-top:100px}.no-data span[data-v-57f248a0]{color:#999;font-size:13px}.work_pageContent[data-v-57f248a0]{min-height:360px;overflow:hidden;position:relative;border-radius:6px;background:#fff}.work_pageContent .tab-block[data-v-57f248a0]{height:44px}.work_pageContent .tab-type[data-v-57f248a0]{display:-webkit-box;display:-ms-flexbox;display:flex;height:44px;-webkit-box-align:center;-ms-flex-align:center;align-items:center;background:#fff;border-bottom:1px solid #ebedf0;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;position:relative;z-index:9;padding:0 12px}.work_pageContent .tab-type .tab-item[data-v-57f248a0]{cursor:pointer;font-size:14px;font-family:PingFangSC-Semibold,PingFang SC;color:#999}.work_pageContent .tab-type .tab-active[data-v-57f248a0]{color:#333;font-weight:700}.work_pageContent .table-box[data-v-57f248a0]:after{content:\"\";position:absolute;bottom:0;left:50%;-webkit-transform:translateX(-50%);transform:translateX(-50%);width:calc(100% - 28px);background:#ebedf0;height:1px}.work_pageContent .table-box[data-v-57f248a0]{height:68px;position:relative;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;padding:0 14px;font-family:PingFangSC-Regular,PingFang SC}.work_pageContent .table-box[data-v-57f248a0]:last-child{border-bottom:none}.work_pageContent .table-box .top[data-v-57f248a0]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.work_pageContent .table-box .top .top-left[data-v-57f248a0]{font-size:14px;color:#333;font-weight:700;width:calc(100% - 100px);overflow:hidden;white-space:nowrap;text-overflow:ellipsis}.work_pageContent .table-box .top .top-right[data-v-57f248a0]{width:auto;padding:0 5px;height:20px;background:#e8f4ff;border-radius:2px;text-align:center;line-height:20px;font-size:12px;color:#409eff;max-width:70px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;display:inline-block}.work_pageContent .table-box .bottom[data-v-57f248a0]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;margin-top:12px;color:#999}", ""]);
793
+ ___CSS_LOADER_EXPORT___.push([module.id, ".no-data[data-v-d9bf6de0]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;height:100%;margin-top:100px}.no-data span[data-v-d9bf6de0]{color:#999;font-size:13px}.work_pageContent[data-v-d9bf6de0]{min-height:360px;overflow:hidden;position:relative;border-radius:6px;background:#fff}.work_pageContent .tab-block[data-v-d9bf6de0]{height:44px}.work_pageContent .tab-type[data-v-d9bf6de0]{display:-webkit-box;display:-ms-flexbox;display:flex;height:44px;-webkit-box-align:center;-ms-flex-align:center;align-items:center;background:#fff;border-bottom:1px solid #ebedf0;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;position:relative;z-index:9;padding:0 12px}.work_pageContent .tab-type .tab-item[data-v-d9bf6de0]{cursor:pointer;font-size:14px;font-family:PingFangSC-Semibold,PingFang SC;color:#999}.work_pageContent .tab-type .tab-active[data-v-d9bf6de0]{color:#333;font-weight:700}.work_pageContent .table-box[data-v-d9bf6de0]:after{content:\"\";position:absolute;bottom:0;left:50%;-webkit-transform:translateX(-50%);transform:translateX(-50%);width:calc(100% - 28px);background:#ebedf0;height:1px}.work_pageContent .table-box[data-v-d9bf6de0]{height:68px;position:relative;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;padding:0 14px;font-family:PingFangSC-Regular,PingFang SC}.work_pageContent .table-box[data-v-d9bf6de0]:last-child{border-bottom:none}.work_pageContent .table-box .top[data-v-d9bf6de0]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.work_pageContent .table-box .top .top-left[data-v-d9bf6de0]{font-size:14px;color:#333;font-weight:700;width:calc(100% - 100px);overflow:hidden;white-space:nowrap;text-overflow:ellipsis}.work_pageContent .table-box .top .top-right[data-v-d9bf6de0]{width:auto;padding:0 5px;height:20px;background:#e8f4ff;border-radius:2px;text-align:center;line-height:20px;font-size:12px;color:#409eff;max-width:70px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;display:inline-block}.work_pageContent .table-box .bottom[data-v-d9bf6de0]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;margin-top:12px;color:#999}", ""]);
776
794
  // Exports
777
795
  /* harmony default export */ __webpack_exports__["default"] = (___CSS_LOADER_EXPORT___);
778
796
 
@@ -22744,19 +22762,19 @@ var update = add("3274dc8a", content, true, {"sourceMap":false,"shadowMode":fals
22744
22762
 
22745
22763
  /***/ }),
22746
22764
 
22747
- /***/ 9659:
22765
+ /***/ 7398:
22748
22766
  /***/ (function(module, __unused_webpack_exports, __webpack_require__) {
22749
22767
 
22750
22768
  // style-loader: Adds some css to the DOM by adding a <style> tag
22751
22769
 
22752
22770
  // load the styles
22753
- var content = __webpack_require__(4581);
22771
+ var content = __webpack_require__(8872);
22754
22772
  if(content.__esModule) content = content.default;
22755
22773
  if(typeof content === 'string') content = [[module.id, content, '']];
22756
22774
  if(content.locals) module.exports = content.locals;
22757
22775
  // add the styles to the DOM
22758
22776
  var add = (__webpack_require__(9548)/* ["default"] */ .A)
22759
- var update = add("3375e766", content, true, {"sourceMap":false,"shadowMode":false});
22777
+ var update = add("ca1d9144", content, true, {"sourceMap":false,"shadowMode":false});
22760
22778
 
22761
22779
  /***/ }),
22762
22780
 
@@ -23556,8 +23574,8 @@ var component = normalizeComponent(
23556
23574
  )
23557
23575
 
23558
23576
  /* harmony default export */ var workTzgg = (component.exports);
23559
- ;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecmoa/desktop/src/components/workTodo.vue?vue&type=template&id=57f248a0&scoped=true
23560
- var workTodovue_type_template_id_57f248a0_scoped_true_render = function render() {
23577
+ ;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecmoa/desktop/src/components/workTodo.vue?vue&type=template&id=d9bf6de0&scoped=true
23578
+ var workTodovue_type_template_id_d9bf6de0_scoped_true_render = function render() {
23561
23579
  var _vm = this,
23562
23580
  _c = _vm._self._c;
23563
23581
  return _c('div', {
@@ -23684,7 +23702,7 @@ var workTodovue_type_template_id_57f248a0_scoped_true_render = function render()
23684
23702
  }]
23685
23703
  }, [_vm._v("暂无数据~")])]) : _vm._e()], 2);
23686
23704
  };
23687
- var workTodovue_type_template_id_57f248a0_scoped_true_staticRenderFns = [];
23705
+ var workTodovue_type_template_id_d9bf6de0_scoped_true_staticRenderFns = [];
23688
23706
 
23689
23707
  // EXTERNAL MODULE: ./node_modules/moment/moment.js
23690
23708
  var moment = __webpack_require__(5093);
@@ -23821,7 +23839,7 @@ var todo_form_enum = {
23821
23839
  var busiCodesData = [];
23822
23840
  if (this.appletData.appRoute) {
23823
23841
  var formTypeTabs = JSON.parse(this.appletData.appRoute.replace(/\n/g, ''));
23824
- console.log('🚀 ~ getListCount ~ formTypeTabs:', formTypeTabs);
23842
+ //console.log('🚀 ~ getListCount ~ formTypeTabs:', formTypeTabs)
23825
23843
  if (formTypeTabs.length > 0) {
23826
23844
  var arrayData = formTypeTabs[0].tabTitle;
23827
23845
  this.formTypeTabs = arrayData;
@@ -23964,9 +23982,9 @@ var todo_form_enum = {
23964
23982
  });
23965
23983
  ;// CONCATENATED MODULE: ./packages/ecmoa/desktop/src/components/workTodo.vue?vue&type=script&lang=js
23966
23984
  /* harmony default export */ var components_workTodovue_type_script_lang_js = (workTodovue_type_script_lang_js);
23967
- // EXTERNAL MODULE: ./node_modules/vue-style-loader/index.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecmoa/desktop/src/components/workTodo.vue?vue&type=style&index=0&id=57f248a0&prod&scoped=true&lang=scss
23968
- var workTodovue_type_style_index_0_id_57f248a0_prod_scoped_true_lang_scss = __webpack_require__(9659);
23969
- ;// CONCATENATED MODULE: ./packages/ecmoa/desktop/src/components/workTodo.vue?vue&type=style&index=0&id=57f248a0&prod&scoped=true&lang=scss
23985
+ // EXTERNAL MODULE: ./node_modules/vue-style-loader/index.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecmoa/desktop/src/components/workTodo.vue?vue&type=style&index=0&id=d9bf6de0&prod&scoped=true&lang=scss
23986
+ var workTodovue_type_style_index_0_id_d9bf6de0_prod_scoped_true_lang_scss = __webpack_require__(7398);
23987
+ ;// CONCATENATED MODULE: ./packages/ecmoa/desktop/src/components/workTodo.vue?vue&type=style&index=0&id=d9bf6de0&prod&scoped=true&lang=scss
23970
23988
 
23971
23989
  ;// CONCATENATED MODULE: ./packages/ecmoa/desktop/src/components/workTodo.vue
23972
23990
 
@@ -23979,11 +23997,11 @@ var workTodovue_type_style_index_0_id_57f248a0_prod_scoped_true_lang_scss = __we
23979
23997
 
23980
23998
  var workTodo_component = normalizeComponent(
23981
23999
  components_workTodovue_type_script_lang_js,
23982
- workTodovue_type_template_id_57f248a0_scoped_true_render,
23983
- workTodovue_type_template_id_57f248a0_scoped_true_staticRenderFns,
24000
+ workTodovue_type_template_id_d9bf6de0_scoped_true_render,
24001
+ workTodovue_type_template_id_d9bf6de0_scoped_true_staticRenderFns,
23984
24002
  false,
23985
24003
  null,
23986
- "57f248a0",
24004
+ "d9bf6de0",
23987
24005
  null
23988
24006
 
23989
24007
  )
package/lib/ecmoadesktop.umd.js CHANGED
@@ -254,6 +254,7 @@ __webpack_require__.r(__webpack_exports__);
254
254
 
255
255
  var $parent = '';
256
256
  var timeSpanData = null; // 考勤时段
257
+ var dkAddr = null; //人员排班打卡地址
257
258
  var p1 = null; // 打卡位置经纬度
258
259
  var gpsScope = null;
259
260
  var curAddress = null;
@@ -280,6 +281,7 @@ function getDis(lng, lat) {
280
281
  if (!addrs || addrs.length === 0) {
281
282
  return;
282
283
  } else if (addrs.length === 1) {
284
+ dkAddr = addrs[0];
283
285
  p1 = new T.LngLat(parseFloat(addrs[0].gpsXy.split(',')[0]), parseFloat(addrs[0].gpsXy.split(',')[1]));
284
286
  dis = mapObj.getDistance(p1, p2); // 返回 p1 到 p2 间的地面距离，单位：米
285
287
 
@@ -291,12 +293,14 @@ function getDis(lng, lat) {
291
293
  //console.log('dis' + i, distance)
292
294
  if (i === 0) {
293
295
  dis = distance; // 第一次赋值
296
+ dkAddr = v;
294
297
  p1 = p;
295
298
  gpsScope = v.gpsScope;
296
299
  } else {
297
300
  if (dis > distance) {
298
301
  // 上次定位距离大于当前两点之差
299
302
  dis = distance;
303
+ dkAddr = v;
300
304
  p1 = p;
301
305
  gpsScope = v.gpsScope;
302
306
  }
@@ -324,11 +328,25 @@ function getCurAddress(lng, lat) {
324
328
  function curLocationAndDis() {
325
329
  var device = js_cookie__WEBPACK_IMPORTED_MODULE_0___default().get('device');
326
330
  return new Promise(function (resolve) {
331
+ //H5地图定位
332
+ var lo = new T.Geolocation();
333
+ function h5Position(e) {
334
+ if (this.getStatus() == 0) {
335
+ getDis(e.lnglat.lng, e.lnglat.lat);
336
+ getCurAddress(e.lnglat.lng, e.lnglat.lat);
337
+ resolve(true);
338
+ } else {
339
+ //console.log('Geolocation getCurrentPosition status', lo.getStatus())
340
+ resolve(false);
341
+ }
342
+ }
327
343
  if (window.mappType === 'ecinc') {
328
344
  //APP定位
345
+ var locationed = false;
329
346
  $parent.$wv.getLocationInformation(function (res) {
330
347
  if (typeof res === 'string') res = JSON.parse(res);
331
348
  if (res && res.data) {
349
+ locationed = true;
332
350
  getDis(Number(res.data.longitude), Number(res.data.latitude));
333
351
  getCurAddress(Number(res.data.longitude), Number(res.data.latitude));
334
352
  resolve(true);
@@ -337,19 +355,13 @@ function curLocationAndDis() {
337
355
  resolve(false);
338
356
  }
339
357
  });
340
- } else if (window.isOpenMapLocation === 1) {
341
- //H5地图定位
342
- var h5Position = function h5Position(e) {
343
- if (this.getStatus() == 0) {
344
- getDis(e.lnglat.lng, e.lnglat.lat);
345
- getCurAddress(e.lnglat.lng, e.lnglat.lat);
346
- resolve(true);
347
- } else {
348
- //console.log('Geolocation getCurrentPosition status', lo.getStatus())
349
- resolve(false);
358
+ setTimeout(function () {
359
+ //gps定位超时，使用H5地图定位
360
+ if (!locationed && window.isOpenMapLocation === 1 && (location.protocol.toLocaleLowerCase() === 'https:' || location.href.indexOf('127.0.0.1') !== -1 || location.href.indexOf('localhost') !== -1)) {
361
+ lo.getCurrentPosition(h5Position);
350
362
  }
351
- };
352
- var lo = new T.Geolocation();
363
+ }, 2000);
364
+ } else if (window.isOpenMapLocation === 1 && (location.protocol.toLocaleLowerCase() === 'https:' || location.href.indexOf('127.0.0.1') !== -1 || location.href.indexOf('localhost') !== -1)) {
353
365
  lo.getCurrentPosition(h5Position);
354
366
  } else if (device === 'qywx') {
355
367
  // 企业微信定位
@@ -366,6 +378,8 @@ function curLocationAndDis() {
366
378
  consloe.log('用户拒绝获取位置信息');
367
379
  }
368
380
  });
381
+ } else {
382
+ resolve(false);
369
383
  }
370
384
  });
371
385
  }
@@ -488,7 +502,11 @@ var defaultMethods = {
488
502
  orgName: loginUser.orgName,
489
503
  personSchId: timeSpanData.personSchId,
490
504
  timeId: timeSpanData.timeInterval.id,
491
- unitAddress: curAddress
505
+ unitAddress: curAddress,
506
+ //定位地址
507
+ addressName: dkAddr.memo,
508
+ //人员排班中的移动打卡地址名称
509
+ addressId: dkAddr.id //人员排班中的移动打卡地址ID
492
510
  }
493
511
  }).then(function (response) {
494
512
  if (response.code === 'success') {
@@ -768,7 +786,7 @@ ___CSS_LOADER_EXPORT___.push([module.id, "#work-setting[data-v-653165e4]{positio
768
786
 
769
787
  /***/ }),
770
788
 
771
- /***/ 7301:
789
+ /***/ 7944:
772
790
  /***/ (function(module, __webpack_exports__, __webpack_require__) {
773
791
 
774
792
  "use strict";
@@ -782,7 +800,7 @@ __webpack_require__.r(__webpack_exports__);
782
800
 
783
801
  var ___CSS_LOADER_EXPORT___ = _node_modules_css_loader_dist_runtime_api_js__WEBPACK_IMPORTED_MODULE_1___default()((_node_modules_css_loader_dist_runtime_noSourceMaps_js__WEBPACK_IMPORTED_MODULE_0___default()));
784
802
  // Module
785
- ___CSS_LOADER_EXPORT___.push([module.id, ".no-data[data-v-57f248a0]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;height:100%;margin-top:100px}.no-data span[data-v-57f248a0]{color:#999;font-size:13px}.work_pageContent[data-v-57f248a0]{min-height:360px;overflow:hidden;position:relative;border-radius:6px;background:#fff}.work_pageContent .tab-block[data-v-57f248a0]{height:44px}.work_pageContent .tab-type[data-v-57f248a0]{display:-webkit-box;display:-ms-flexbox;display:flex;height:44px;-webkit-box-align:center;-ms-flex-align:center;align-items:center;background:#fff;border-bottom:1px solid #ebedf0;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;position:relative;z-index:9;padding:0 12px}.work_pageContent .tab-type .tab-item[data-v-57f248a0]{cursor:pointer;font-size:14px;font-family:PingFangSC-Semibold,PingFang SC;color:#999}.work_pageContent .tab-type .tab-active[data-v-57f248a0]{color:#333;font-weight:700}.work_pageContent .table-box[data-v-57f248a0]:after{content:\"\";position:absolute;bottom:0;left:50%;-webkit-transform:translateX(-50%);transform:translateX(-50%);width:calc(100% - 28px);background:#ebedf0;height:1px}.work_pageContent .table-box[data-v-57f248a0]{height:68px;position:relative;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;padding:0 14px;font-family:PingFangSC-Regular,PingFang SC}.work_pageContent .table-box[data-v-57f248a0]:last-child{border-bottom:none}.work_pageContent .table-box .top[data-v-57f248a0]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.work_pageContent .table-box .top .top-left[data-v-57f248a0]{font-size:14px;color:#333;font-weight:700;width:calc(100% - 100px);overflow:hidden;white-space:nowrap;text-overflow:ellipsis}.work_pageContent .table-box .top .top-right[data-v-57f248a0]{width:auto;padding:0 5px;height:20px;background:#e8f4ff;border-radius:2px;text-align:center;line-height:20px;font-size:12px;color:#409eff;max-width:70px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;display:inline-block}.work_pageContent .table-box .bottom[data-v-57f248a0]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;margin-top:12px;color:#999}", ""]);
803
+ ___CSS_LOADER_EXPORT___.push([module.id, ".no-data[data-v-d9bf6de0]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;height:100%;margin-top:100px}.no-data span[data-v-d9bf6de0]{color:#999;font-size:13px}.work_pageContent[data-v-d9bf6de0]{min-height:360px;overflow:hidden;position:relative;border-radius:6px;background:#fff}.work_pageContent .tab-block[data-v-d9bf6de0]{height:44px}.work_pageContent .tab-type[data-v-d9bf6de0]{display:-webkit-box;display:-ms-flexbox;display:flex;height:44px;-webkit-box-align:center;-ms-flex-align:center;align-items:center;background:#fff;border-bottom:1px solid #ebedf0;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;position:relative;z-index:9;padding:0 12px}.work_pageContent .tab-type .tab-item[data-v-d9bf6de0]{cursor:pointer;font-size:14px;font-family:PingFangSC-Semibold,PingFang SC;color:#999}.work_pageContent .tab-type .tab-active[data-v-d9bf6de0]{color:#333;font-weight:700}.work_pageContent .table-box[data-v-d9bf6de0]:after{content:\"\";position:absolute;bottom:0;left:50%;-webkit-transform:translateX(-50%);transform:translateX(-50%);width:calc(100% - 28px);background:#ebedf0;height:1px}.work_pageContent .table-box[data-v-d9bf6de0]{height:68px;position:relative;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;padding:0 14px;font-family:PingFangSC-Regular,PingFang SC}.work_pageContent .table-box[data-v-d9bf6de0]:last-child{border-bottom:none}.work_pageContent .table-box .top[data-v-d9bf6de0]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.work_pageContent .table-box .top .top-left[data-v-d9bf6de0]{font-size:14px;color:#333;font-weight:700;width:calc(100% - 100px);overflow:hidden;white-space:nowrap;text-overflow:ellipsis}.work_pageContent .table-box .top .top-right[data-v-d9bf6de0]{width:auto;padding:0 5px;height:20px;background:#e8f4ff;border-radius:2px;text-align:center;line-height:20px;font-size:12px;color:#409eff;max-width:70px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;display:inline-block}.work_pageContent .table-box .bottom[data-v-d9bf6de0]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;margin-top:12px;color:#999}", ""]);
786
804
  // Exports
787
805
  /* harmony default export */ __webpack_exports__["default"] = (___CSS_LOADER_EXPORT___);
788
806
 
@@ -22754,19 +22772,19 @@ var update = add("cf71d38a", content, true, {"sourceMap":false,"shadowMode":fals
22754
22772
 
22755
22773
  /***/ }),
22756
22774
 
22757
- /***/ 6089:
22775
+ /***/ 9108:
22758
22776
  /***/ (function(module, __unused_webpack_exports, __webpack_require__) {
22759
22777
 
22760
22778
  // style-loader: Adds some css to the DOM by adding a <style> tag
22761
22779
 
22762
22780
  // load the styles
22763
- var content = __webpack_require__(7301);
22781
+ var content = __webpack_require__(7944);
22764
22782
  if(content.__esModule) content = content.default;
22765
22783
  if(typeof content === 'string') content = [[module.id, content, '']];
22766
22784
  if(content.locals) module.exports = content.locals;
22767
22785
  // add the styles to the DOM
22768
22786
  var add = (__webpack_require__(9548)/* ["default"] */ .A)
22769
- var update = add("2663f0cd", content, true, {"sourceMap":false,"shadowMode":false});
22787
+ var update = add("49dfc844", content, true, {"sourceMap":false,"shadowMode":false});
22770
22788
 
22771
22789
  /***/ }),
22772
22790
 
@@ -23566,8 +23584,8 @@ var component = normalizeComponent(
23566
23584
  )
23567
23585
 
23568
23586
  /* harmony default export */ var workTzgg = (component.exports);
23569
- ;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-82.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecmoa/desktop/src/components/workTodo.vue?vue&type=template&id=57f248a0&scoped=true
23570
- var workTodovue_type_template_id_57f248a0_scoped_true_render = function render() {
23587
+ ;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-82.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecmoa/desktop/src/components/workTodo.vue?vue&type=template&id=d9bf6de0&scoped=true
23588
+ var workTodovue_type_template_id_d9bf6de0_scoped_true_render = function render() {
23571
23589
  var _vm = this,
23572
23590
  _c = _vm._self._c;
23573
23591
  return _c('div', {
@@ -23694,7 +23712,7 @@ var workTodovue_type_template_id_57f248a0_scoped_true_render = function render()
23694
23712
  }]
23695
23713
  }, [_vm._v("暂无数据~")])]) : _vm._e()], 2);
23696
23714
  };
23697
- var workTodovue_type_template_id_57f248a0_scoped_true_staticRenderFns = [];
23715
+ var workTodovue_type_template_id_d9bf6de0_scoped_true_staticRenderFns = [];
23698
23716
 
23699
23717
  // EXTERNAL MODULE: ./node_modules/moment/moment.js
23700
23718
  var moment = __webpack_require__(5093);
@@ -23831,7 +23849,7 @@ var todo_form_enum = {
23831
23849
  var busiCodesData = [];
23832
23850
  if (this.appletData.appRoute) {
23833
23851
  var formTypeTabs = JSON.parse(this.appletData.appRoute.replace(/\n/g, ''));
23834
- console.log('🚀 ~ getListCount ~ formTypeTabs:', formTypeTabs);
23852
+ //console.log('🚀 ~ getListCount ~ formTypeTabs:', formTypeTabs)
23835
23853
  if (formTypeTabs.length > 0) {
23836
23854
  var arrayData = formTypeTabs[0].tabTitle;
23837
23855
  this.formTypeTabs = arrayData;
@@ -23974,9 +23992,9 @@ var todo_form_enum = {
23974
23992
  });
23975
23993
  ;// CONCATENATED MODULE: ./packages/ecmoa/desktop/src/components/workTodo.vue?vue&type=script&lang=js
23976
23994
  /* harmony default export */ var components_workTodovue_type_script_lang_js = (workTodovue_type_script_lang_js);
23977
- // EXTERNAL MODULE: ./node_modules/vue-style-loader/index.js??clonedRuleSet-64.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-64.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-64.use[2]!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-64.use[3]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-64.use[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecmoa/desktop/src/components/workTodo.vue?vue&type=style&index=0&id=57f248a0&prod&scoped=true&lang=scss
23978
- var workTodovue_type_style_index_0_id_57f248a0_prod_scoped_true_lang_scss = __webpack_require__(6089);
23979
- ;// CONCATENATED MODULE: ./packages/ecmoa/desktop/src/components/workTodo.vue?vue&type=style&index=0&id=57f248a0&prod&scoped=true&lang=scss
23995
+ // EXTERNAL MODULE: ./node_modules/vue-style-loader/index.js??clonedRuleSet-64.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-64.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-64.use[2]!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-64.use[3]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-64.use[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecmoa/desktop/src/components/workTodo.vue?vue&type=style&index=0&id=d9bf6de0&prod&scoped=true&lang=scss
23996
+ var workTodovue_type_style_index_0_id_d9bf6de0_prod_scoped_true_lang_scss = __webpack_require__(9108);
23997
+ ;// CONCATENATED MODULE: ./packages/ecmoa/desktop/src/components/workTodo.vue?vue&type=style&index=0&id=d9bf6de0&prod&scoped=true&lang=scss
23980
23998
 
23981
23999
  ;// CONCATENATED MODULE: ./packages/ecmoa/desktop/src/components/workTodo.vue
23982
24000
 
@@ -23989,11 +24007,11 @@ var workTodovue_type_style_index_0_id_57f248a0_prod_scoped_true_lang_scss = __we
23989
24007
 
23990
24008
  var workTodo_component = normalizeComponent(
23991
24009
  components_workTodovue_type_script_lang_js,
23992
- workTodovue_type_template_id_57f248a0_scoped_true_render,
23993
- workTodovue_type_template_id_57f248a0_scoped_true_staticRenderFns,
24010
+ workTodovue_type_template_id_d9bf6de0_scoped_true_render,
24011
+ workTodovue_type_template_id_d9bf6de0_scoped_true_staticRenderFns,
23994
24012
  false,
23995
24013
  null,
23996
- "57f248a0",
24014
+ "d9bf6de0",
23997
24015
  null
23998
24016
 
23999
24017
  )