From ac9336875dea20beef20a2fee481929b882d2a15 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期六, 12 十月 2024 09:09:31 +0800
Subject: [PATCH] ll
---
admin/src/components/common/RichEditor.vue | 9 +
admin/src/views/platform/LogisticsRecord/waybill.vue | 17 ++++
admin/src/components/common/QueryForm/queryForm.vue | 59 ++++++--------
admin/src/views/platform/LogisticsRecord/leaveAuth.vue | 9 ++
admin/src/api/system/sms.js | 8 ++
admin/src/views/system/smsMessage.vue | 53 ++++++++++---
screen/src/views/PlatformCall.vue | 1
admin/src/views/business/visitorSources.vue | 30 +++++-
pda/utils/config.js | 4
h5/pages/staff/task/driver.vue | 6 +
admin/src/views/platform/LogisticsRecord/subscribe.vue | 14 +++
admin/src/views/business/relativeMember.vue | 8 +
pda/pages/index/control.vue | 2
pda/manifest.json | 2
admin/src/views/business/internalMember.vue | 2
15 files changed, 156 insertions(+), 68 deletions(-)
diff --git a/admin/src/api/system/sms.js b/admin/src/api/system/sms.js
index e0f700b..9a34d4d 100644
--- a/admin/src/api/system/sms.js
+++ b/admin/src/api/system/sms.js
@@ -8,3 +8,11 @@
export function SmsStatusUpdate (data) {
return request.post('/visitsAdmin/cloudService/business/smsConfig/updateById', data)
}
+// 鐭俊閫氱煡 鎵归噺鐘舵�佹洿鏂�
+export function SmsStatussUpdate (data) {
+ return request.get('/visitsAdmin/cloudService/business/smsConfig/updateStatus/batch', {
+ params: {
+ ...data
+ }
+ })
+}
diff --git a/admin/src/components/common/QueryForm/queryForm.vue b/admin/src/components/common/QueryForm/queryForm.vue
index 9eedeab..c56d064 100644
--- a/admin/src/components/common/QueryForm/queryForm.vue
+++ b/admin/src/components/common/QueryForm/queryForm.vue
@@ -2,15 +2,13 @@
<div class="doumee-filter">
<el-form inline label-suffix="锛�" @submit.native.prevent>
<template v-for="(item, index) in queryFormConfig.formItems">
- <el-form-item v-if="item.type === 'input' && (showZk || index < listLength)" :key="item.filed"
- :label="item.label">
+ <el-form-item v-if="item.type === 'input' && (showZk || index < listLength)" :key="item.filed">
<el-input v-model="searchForm[item.filed]"
:clearable="(item.clearable !== null && item.clearable !== undefined && item.clearable !== '') ? item.clearable : true"
- :placeholder="item.placeholder ? item.placeholder : '璇疯緭鍏�' + item.label" class="w200"
+ :placeholder="item.label" class="w200"
@change="changeForm(item.filed)" @keyup.enter.native="handlekeyup(item.keyup || false)" />
</el-form-item>
- <el-form-item v-if="item.type === 'moneySelect' && (showZk || index < listLength)" :key="item.label"
- :label="item.label">
+ <el-form-item v-if="item.type === 'moneySelect' && (showZk || index < listLength)" :key="item.label">
<el-input v-model="searchForm[item.filedStrt]"
:clearable="(item.clearable !== null && item.clearable !== undefined && item.clearable !== '') ? item.clearable : true"
:placeholder="item.start" style="width: 150px" />
@@ -19,49 +17,42 @@
:clearable="(item.clearable !== null && item.clearable !== undefined && item.clearable !== '') ? item.clearable : true"
:placeholder="item.end" style="width: 150px" />
</el-form-item>
- <el-form-item v-if="item.type === 'select' && (showZk || index < listLength)" :key="item.filed"
- :label="item.label">
+ <el-form-item v-if="item.type === 'select' && (showZk || index < listLength)" :key="item.filed">
<el-select v-model="searchForm[item.filed]" :filterable="item.filterable || true"
:clearable="(item.clearable !== null && item.clearable !== undefined && item.clearable !== '') ? item.clearable : true"
- :placeholder="item.placeholder ? item.placeholder : '璇烽�夋嫨' + item.label" class="w200"
+ :placeholder="item.label" class="w200"
@change="changeForm(item.filed)">
<el-option v-for="opt, i in item.options" :key="i" :value="item.valueCode ? opt[item.valueCode] : opt.value"
:label="item.labelCode ? opt[item.labelCode] : opt.label" />
</el-select>
</el-form-item>
- <el-form-item v-if="item.type === 'date' && (showZk || index < listLength)" :key="item.filed"
- :label="item.label || '鏃ユ湡'">
+ <el-form-item v-if="item.type === 'date' && (showZk || index < listLength)" :key="item.filed">
<el-date-picker v-model="searchForm[item.filed]" type="date" value-format="yyyy-MM-dd" class="w200"
:clearable="(item.clearable !== null && item.clearable !== undefined && item.clearable !== '') ? item.clearable : true"
- :placeholder="item.placeholder || '璇烽�夋嫨鏃ユ湡'" :picker-options="item.pickerOptions || {}"
+ :placeholder="item.label" :picker-options="item.pickerOptions || {}"
@change="changeForm(item.filed)" />
</el-form-item>
- <el-form-item v-if="item.type === 'daterange' && (showZk || index < listLength)" :key="item.filed"
- :label="item.label || ''">
+ <el-form-item v-if="item.type === 'daterange' && (showZk || index < listLength)" :key="item.filed">
<el-date-picker v-model="searchForm[item.filed]" value-format="yyyy-MM-dd" type="daterange"
range-separator="鑷�"
:clearable="(item.clearable !== null && item.clearable !== undefined && item.clearable !== '') ? item.clearable : true"
:start-placeholder="item.start || ''" :end-placeholder="item.end || ''"
:picker-options="item.pickerOptions || {}" class="w400" @change="changeForm(item.filed)" />
</el-form-item>
- <el-form-item v-if="item.type === 'timePicker' && (showZk || index < listLength)" :key="item.filed"
- :label="item.label || '閫夋嫨鏃堕棿'">
+ <el-form-item v-if="item.type === 'timePicker' && (showZk || index < listLength)" :key="item.filed">
<el-time-picker v-model="searchForm[item.filed]" is-range range-separator="鑷�" format="HH:mm"
value-format="HH:mm" start-placeholder="寮�濮嬫椂闂�" end-placeholder="缁撴潫鏃堕棿" placeholder="閫夋嫨鏃堕棿鑼冨洿" class="w400"
@change="changeForm(item.filed)" />
</el-form-item>
- <el-form-item v-if="item.type === 'datetimerange' && (showZk || index < listLength)" :key="item.filed"
- :label="item.label || '閫夋嫨鏃ユ湡'">
+ <el-form-item v-if="item.type === 'datetimerange' && (showZk || index < listLength)" :key="item.filed">
<el-date-picker v-model="searchForm[item.filed]" format="yyyy-MM-dd HH:mm:ss"
- value-format="yyyy-MM-dd HH:mm:ss" type="datetimerange"
- :default-time="['00:00:00', '23:59:59']"
+ value-format="yyyy-MM-dd HH:mm:ss" type="datetimerange" :default-time="['00:00:00', '23:59:59']"
:picker-options="item.pickerOptions || pickerOptions" range-separator="鑷�"
:clearable="(item.clearable !== null && item.clearable !== undefined && item.clearable !== '') ? item.clearable : true"
:start-placeholder="item.start || '寮�濮嬫椂闂�'" :end-placeholder="item.end || '缁撴潫鏃堕棿'" class="w400"
@change="changeForm(item.filed)" />
</el-form-item>
- <el-form-item v-if="item.type === 'slot' && (showZk || index < listLength)" :key="item.filed"
- :label="item.label">
+ <el-form-item v-if="item.type === 'slot' && (showZk || index < listLength)" :key="item.filed">
<slot :name="item.filed" />
</el-form-item>
</template>
@@ -100,13 +91,13 @@
default: () => { }
}
},
- data () {
+ data() {
return {
showZk: false,
pickerOptions: {
shortcuts: [{
text: '杩�7澶�',
- onClick (picker) {
+ onClick(picker) {
const end = new Date()
const start = new Date()
start.setTime(end.getTime() - 3600 * 1000 * 24 * 6)
@@ -115,7 +106,7 @@
},
{
text: '杩�30澶�',
- onClick (picker) {
+ onClick(picker) {
const end = new Date()
const start = new Date()
start.setTime(end.getTime() - 3600 * 1000 * 24 * 29)
@@ -124,7 +115,7 @@
},
{
text: '杩�60澶�',
- onClick (picker) {
+ onClick(picker) {
const end = new Date()
const start = new Date()
start.setTime(end.getTime() - 3600 * 1000 * 24 * 59)
@@ -133,14 +124,14 @@
},
{
text: '杩�90澶�',
- onClick (picker) {
+ onClick(picker) {
const end = new Date()
const start = new Date()
start.setTime(end.getTime() - 3600 * 1000 * 24 * 89)
picker.$emit('pick', [start, end])
}
}],
- disabledDate (time) {
+ disabledDate(time) {
var curDate = new Date(new Date().toLocaleDateString()).getTime()
var preDate = new Date(curDate + 24 * 60 * 60 * 1000 - 1)
return time.getTime() > preDate
@@ -151,31 +142,31 @@
emits: ['input', 'handleQuery', 'clear'],
computed: {
searchForm: {
- get () {
+ get() {
return this.value
},
- set (value) {
+ set(value) {
this.$emit('input', value)
}
}
},
methods: {
- handleQuery () {
+ handleQuery() {
this.$emit('handleQuery')
},
- handlekeyup (pd) {
+ handlekeyup(pd) {
if (pd) {
this.$emit('handleQuery')
}
},
- changeForm (filed) {
+ changeForm(filed) {
this.$emit('changeForm', filed)
},
- zkBtn () {
+ zkBtn() {
this.showZk = !this.showZk
this.$emit('zkBtn', this.zk)
},
- clear () {
+ clear() {
this.$emit('clear')
}
}
diff --git a/admin/src/components/common/RichEditor.vue b/admin/src/components/common/RichEditor.vue
index 09786fb..d144c66 100644
--- a/admin/src/components/common/RichEditor.vue
+++ b/admin/src/components/common/RichEditor.vue
@@ -1,7 +1,7 @@
<template>
<div :style="styleEditor">
<Toolbar style="border-bottom: 1px solid #ccc" :editor="editor" :defaultConfig="toolbarConfig" :mode="mode" />
- <Editor style="height: 300px; overflow-y: hidden;" v-model="html" :defaultConfig="editorConfig" :mode="mode"
+ <Editor style="max-height: 300px;min-height: 100px; overflow-y: hidden;" v-model="html" :defaultConfig="editorConfig" :mode="mode"
@onCreated="onCreated" @onChange="onChange" />
</div>
</template>
@@ -10,6 +10,7 @@
import Vue from 'vue'
import { Editor, Toolbar } from '@wangeditor/editor-for-vue'
import { Loading } from 'element-ui';
+let loadingInstance = null
export default Vue.extend({
props: {
richData: { // 鐖剁粍浠朵紶閫掔殑鏁版嵁
@@ -149,7 +150,7 @@
timeout: 10 * 1000, //10 绉�
// 涓婁紶鍓�
onBeforeUpload(files) {
- Loading.service({
+ loadingInstance = Loading.service({
lock: true,
text: '涓婁紶涓�...',
spinner: 'el-icon-loading',
@@ -162,7 +163,7 @@
console.log(res);
// 鍥犱负鑷畾涔夋彃鍏ュ鑷磑nSuccess涓巓nFailed鍥炶皟鍑芥暟涓嶈捣浣滅敤,鑷繁鎵嬪姩澶勭悊
// 鍏堝叧闂瓑寰呯殑Message
- Loading.service({
+ loadingInstance = Loading.service({
lock: true,
text: '涓婁紶涓�...',
spinner: 'el-icon-loading',
@@ -187,6 +188,7 @@
// 鍗曚釜鏂囦欢涓婁紶澶辫触
onFailed(file, res) {
console.log(`${file.originalFilename} 涓婁紶澶辫触`, res);
+ loadingInstance.close();
},
// 涓婁紶杩涘害鐨勫洖璋冨嚱鏁�
onProgress(progress) {
@@ -195,6 +197,7 @@
},
// 涓婁紶閿欒锛屾垨鑰呰Е鍙� timeout 瓒呮椂
onError(file, err, res) {
+ loadingInstance.close();
console.log(`${file.originalFilename} 涓婁紶鍑洪敊`, err, res);
}
},
diff --git a/admin/src/views/business/internalMember.vue b/admin/src/views/business/internalMember.vue
index f0568a1..ba0ad77 100644
--- a/admin/src/views/business/internalMember.vue
+++ b/admin/src/views/business/internalMember.vue
@@ -58,7 +58,7 @@
<li><el-button type="danger" @click="deleteByIdInBatch" icon="el-icon-delete"
v-permissions="['business:member:delete']">鎵归噺鍒犻櫎</el-button></li>
<li><el-button type="primary" v-permissions="['business:empower:create']" @click="startEmpowerBatch()"
- icon="el-icon-plus">涓嬪彂鎺堟潈</el-button></li>
+ >涓嬪彂鎺堟潈</el-button></li>
<li style="float: right">
<el-checkbox style="font-size: 12px" label="1" v-model="searchForm.includeChild" key="1"
@change="search">鏄惁鍖呭惈涓嬬骇缁勭粐</el-checkbox>
diff --git a/admin/src/views/business/relativeMember.vue b/admin/src/views/business/relativeMember.vue
index 5452250..026d7f3 100644
--- a/admin/src/views/business/relativeMember.vue
+++ b/admin/src/views/business/relativeMember.vue
@@ -65,8 +65,8 @@
icon="el-icon-plus" v-permissions="['business:traintime:create']">鍩硅鏈熷鍏�</el-button></li>
<li><el-button type="danger" @click="deleteByIdInBatch" icon="el-icon-delete"
v-permissions="['business:member:delete']">鎵归噺鍒犻櫎</el-button></li>
- <li><el-button type="primary" v-permissions="['business:empower:create']" @click="startEmpowerBatch()"
- icon="el-icon-plus">涓嬪彂鎺堟潈</el-button></li>
+ <li><el-button type="primary" v-permissions="['business:empower:create']" @click="startEmpowerBatch()">涓嬪彂鎺堟潈</el-button></li>
+ <li><el-button type="primary" v-permissions="['business:empower:exportExcel']" @click="exportExcel">瀵煎嚭</el-button></li>
</ul>
<el-table v-loading="isWorking.search" :data="tableData.list" stripe @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55"></el-table-column>
@@ -147,7 +147,7 @@
<el-table-column label="鍗＄墖" min-width="80px">
<template slot-scope="{row}">
<el-button @click="$refs.cardOpeningRecord.open('寮�鍗¤褰�', row.id)" type="text">{{ row.memberCardCount ||
- '0'}}</el-button>
+ '0' }}</el-button>
</template>
</el-table-column>
<el-table-column prop="editorName" label="鎿嶄綔浜�" min-width="100px"></el-table-column>
@@ -383,6 +383,7 @@
<style lang="scss" scoped>
@import '@/assets/style/variables.scss';
+
.box {
width: 100%;
display: flex;
@@ -399,6 +400,7 @@
height: 100%;
}
}
+
.zhuguan {
color: $primary-color;
border: 1px solid $primary-color;
diff --git a/admin/src/views/business/visitorSources.vue b/admin/src/views/business/visitorSources.vue
index 0aee304..84bdd07 100644
--- a/admin/src/views/business/visitorSources.vue
+++ b/admin/src/views/business/visitorSources.vue
@@ -75,25 +75,28 @@
/>
</el-form-item>
<el-form-item label="鍦ㄥ洯椤荤煡:" prop="visitNotice">
- <el-tiptap
+ <!-- <el-tiptap
style="width: 50%"
v-model="form.visitNotice"
:extensions="extensions"
- />
+ /> -->
+ <RichEditor style="width: 70%" :richData="form.visitNotice" :styleEditor="styleEditor" @getWangedditor="getWangedditor" :readonly="false"/>
</el-form-item>
<el-form-item label="璁垮棰勭害鎸囧崡:" prop="visitNotice">
- <el-tiptap
+ <!-- <el-tiptap
style="width: 50%"
v-model="form.visitTips"
:extensions="extensions"
- />
+ /> -->
+ <RichEditor style="width: 70%" :richData="form.visitTips" :styleEditor="styleEditor" @getWangedditor="getWangedditor1" :readonly="false"/>
</el-form-item>
<el-form-item label="璁垮鍏ュ洯瀵艰鍥�:" prop="visitNotice">
- <el-tiptap
+ <!-- <el-tiptap
style="width: 50%"
v-model="form.visitMap"
:extensions="extensions"
- />
+ /> -->
+ <RichEditor style="width: 70%" :richData="form.visitMap" :styleEditor="styleEditor" @getWangedditor="getWangedditor2" :readonly="false"/>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="submit">淇濆瓨閰嶇疆椤�</el-button>
@@ -104,6 +107,7 @@
<script>
import { getVisitConfigDTO, updateVisitConfig } from '@/api/system/common'
+import RichEditor from '@/components/common/RichEditor'
import {
// necessary extensions
Doc,
@@ -131,7 +135,9 @@
import { upload } from '@/api/system/common'
export default {
name: 'visitorSources',
-
+ components: {
+ RichEditor
+ },
data() {
return {
form: {
@@ -148,6 +154,7 @@
visitTips: '',
frezzDays: null
},
+ styleEditor:'border: 1px solid #ccc;display: inline-block;',
extensions: [
new Doc(),
new Text(),
@@ -188,6 +195,15 @@
},
methods: {
+ getWangedditor(val){
+ this.form.visitNotice =val
+ },
+ getWangedditor1(val){
+ this.form.visitTips =val
+ },
+ getWangedditor2(val){
+ this.form.visitMap =val
+ },
getData() {
getVisitConfigDTO({})
.then(res => {
diff --git a/admin/src/views/platform/LogisticsRecord/leaveAuth.vue b/admin/src/views/platform/LogisticsRecord/leaveAuth.vue
index 35a4005..70e321d 100644
--- a/admin/src/views/platform/LogisticsRecord/leaveAuth.vue
+++ b/admin/src/views/platform/LogisticsRecord/leaveAuth.vue
@@ -121,6 +121,15 @@
label: '椹鹃┒鍛�'
},
{
+ filed: 'queryStatusForPower',
+ type: 'select',
+ label: '鎺堟潈鐘舵��',
+ options: [
+ { value: '9,10', label: '宸叉巿鏉�' },
+ { value: '6', label: '鏈巿鏉�' }
+ ]
+ },
+ {
filed: 'selDate',
type: 'datetimerange',
label: '浣滀笟瀹屾垚鏃堕棿鎼滅储',
diff --git a/admin/src/views/platform/LogisticsRecord/subscribe.vue b/admin/src/views/platform/LogisticsRecord/subscribe.vue
index 02ec74c..d68bd50 100644
--- a/admin/src/views/platform/LogisticsRecord/subscribe.vue
+++ b/admin/src/views/platform/LogisticsRecord/subscribe.vue
@@ -171,6 +171,18 @@
label: '鍚堝悓鍗曞彿'
},
{
+ filed: 'status',
+ type: 'select',
+ label: '瀹℃壒缁撴灉',
+ options: [
+ { value: 0, label: '寰呭鎵�' },
+ { value: 1, label: '瀹℃壒涓�' },
+ { value: 2, label: '瀹℃壒閫氳繃' },
+ { value: 3, label: '瀹℃壒椹冲洖' },
+ { value: 4, label: '宸插彇娑�' },
+ ]
+ },
+ {
filed: 'selDate',
type: 'datetimerange',
label: '鎿嶄綔鏃堕棿',
@@ -289,7 +301,7 @@
selDate: [],
fastdate: 0,
}
- this.getList()
+ this.changeRadio('0')
},
handleDetail(row) {
this.isShowDriver = true
diff --git a/admin/src/views/platform/LogisticsRecord/waybill.vue b/admin/src/views/platform/LogisticsRecord/waybill.vue
index 3786ca0..dd34efc 100644
--- a/admin/src/views/platform/LogisticsRecord/waybill.vue
+++ b/admin/src/views/platform/LogisticsRecord/waybill.vue
@@ -105,6 +105,23 @@
label: '杞︾墝鍙�'
},
{
+ filed: 'status',
+ type: 'select',
+ label: '浣滀笟鐘舵��',
+ options: [
+ { value: 3, label: '鍏ュ洯绛夊緟' },
+ { value: 4, label: '鏈堝彴绛夊緟' },
+ { value: 5, label: '浣滀笟涓�' },
+ { value: 6, label: '浣滀笟瀹屾垚' },
+ { value: 7, label: '杞Щ涓�' },
+ { value: 8, label: '寮傚父鎸傝捣' },
+ { value: 9, label: '宸叉巿鏉冪鍥�' },
+ { value: 10, label: '宸茬鍥�' },
+ { value: 11, label: '宸茶繃鍙�' },
+ { value: 12, label: '宸插彇娑�' },
+ ]
+ },
+ {
filed: 'selDate',
type: 'datetimerange',
label: '鎿嶄綔鏃堕棿',
diff --git a/admin/src/views/system/smsMessage.vue b/admin/src/views/system/smsMessage.vue
index 9b1052e..f3f551f 100644
--- a/admin/src/views/system/smsMessage.vue
+++ b/admin/src/views/system/smsMessage.vue
@@ -1,20 +1,22 @@
<template>
<div class="main_app">
- <QueryForm v-model="filters" :query-form-config="queryFormConfig" @handleQuery="getList(1)"
- @clear="clear">
+ <QueryForm v-model="filters" :query-form-config="queryFormConfig" @handleQuery="getList(1)" @clear="clear">
</QueryForm>
- <!-- <div class="pt16">
- <el-button :loading="exLoading" @click="handleEx"
- v-permissions="['business:platformjob:exportExcel']">瀵煎嚭</el-button>
- </div> -->
- <el-table class="mb20" v-loading="loading" :data="list" stripe>
+ <div class="pt16 mb10">
+ <el-button type="primary" @click="batchStatus(0)"
+ v-permissions="['business:platformjob:update']">鎵归噺鍚敤</el-button>
+ <el-button @click="batchStatus(1)" v-permissions="['business:platformjob:update']">鎵归噺绂佺敤</el-button>
+ </div>
+ <el-table @selection-change="handleSelectionChange" class="mb20" v-loading="loading" :data="list" stripe>
+ <el-table-column align="center" type="selection" width="55">
+ </el-table-column>
<el-table-column prop="name" label="娑堟伅鏍囬" min-width="160" show-overflow-tooltip />
<el-table-column prop="code" label="娑堟伅缂栫爜" min-width="150" show-overflow-tooltip />
<el-table-column prop="content" label="娑堟伅妯℃澘" min-width="300" show-overflow-tooltip />
<el-table-column label="鐘舵��" width="120" align="center" fixed="right">
<template v-slot="scope">
- <el-switch v-model="scope.row.status" @change="changeStatus(scope.row)" :active-value="0" :inactive-value="1">
- </el-switch>
+ <el-switch v-permissions="['business:platformjob:update']" v-model="scope.row.status" @change="changeStatus(scope.row)" :active-value="0" :inactive-value="1">
+ </el-switch>
</template>
</el-table-column>
</el-table>
@@ -25,7 +27,7 @@
<script>
import Pagination from '@/components/common/Pagination'
import QueryForm from '@/components/common/QueryForm'
-import { getSmsList, SmsStatusUpdate } from '@/api/system/sms'
+import { getSmsList, SmsStatusUpdate, SmsStatussUpdate } from '@/api/system/sms'
import GlobalWindow from '@/components/common/GlobalWindow'
import { Message } from 'element-ui'
@@ -38,6 +40,7 @@
},
data() {
return {
+ ids: [],
isShowDetail: false,
exLoading: false,
loading: false,
@@ -78,8 +81,32 @@
this.getList()
},
methods: {
+ handleSelectionChange(val) {
+ this.ids = val.map(i => i.id)
+ console.log('ids', this.ids)
+ },
+ batchStatus(status) {
+ const { ids } = this
+ if (ids.length == 0) return Message.error('璇峰厛閫夋嫨瑕佹洿鏀圭殑鐭俊閫氱煡')
+ this.$confirm(`纭畾${status == 0 ? '鍚敤' : '绂佺敤'}閫変腑鐨勬墍鏈夌煭淇￠�氱煡鍚�?`, '鎻愮ず', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning'
+ }).then(() => {
+ SmsStatussUpdate({
+ ids: ids.join(','),
+ status
+ }).then(res => {
+ Message.success('鎵归噺鏇存柊鎴愬姛')
+ this.getList()
+ }, () => {
+ this.getList()
+ })
+ })
+
+ },
changeStatus(row) {
- console.log('row', row);
+ console.log('row', row)
SmsStatusUpdate({
...row
}).then(res => {
@@ -109,8 +136,8 @@
this.loading = false
})
},
-
-
+
+
clear() {
this.pagination.page = 1
this.filters = {}
diff --git a/h5/pages/staff/task/driver.vue b/h5/pages/staff/task/driver.vue
index 421cfdd..7018b5d 100644
--- a/h5/pages/staff/task/driver.vue
+++ b/h5/pages/staff/task/driver.vue
@@ -101,7 +101,11 @@
</view>
</view>
<view class="emyty"></view>
- <view class="main_footer">
+ <view v-if="
+ info.approveDateVO != null &&
+ info.approveDateVO.canBeApproved != null &&
+ info.approveDateVO.canBeApproved == 1
+ " class="main_footer">
<view class="btn" @click="handleSub('0')">鎷掔粷</view>
<view class="btn agree" @click="handleSub('1')">鍚屾剰</view>
</view>
diff --git a/pda/manifest.json b/pda/manifest.json
index efecef9..cb7800a 100644
--- a/pda/manifest.json
+++ b/pda/manifest.json
@@ -18,7 +18,7 @@
"proxy": {
"/gateway_interface": {
// 杩欎釜瀛楁鍚嶉渶涓庝綘閰嶇疆鐨刡asePrefixUrl涓�鑷达紝绯荤粺璇嗗埆鍒板甫鏈�/dev-api璇锋眰鐨勫湴鍧�鏃讹紝浼氬湪鍓嶉潰鎷兼帴涓婁唬鐞嗘湇鍔″櫒鍦板潃
- "target" : "http://10.50.250.178:8088/gateway_interface", // 浠ｇ悊鏈嶅姟鍣ㄥ煙鍚嶆垨IP鍦板潃
+ "target" : "http://10.50.250.253:8088/gateway_interface", // 浠ｇ悊鏈嶅姟鍣ㄥ煙鍚嶆垨IP鍦板潃
// "target": "http://192.168.0.100:10010", // 浠ｇ悊鏈嶅姟鍣ㄥ煙鍚嶆垨IP鍦板潃
"changeOrigin": true, // 鍏佽璺ㄥ煙
"pathRewrite": {
diff --git a/pda/pages/index/control.vue b/pda/pages/index/control.vue
index 904ea22..739a7d0 100644
--- a/pda/pages/index/control.vue
+++ b/pda/pages/index/control.vue
@@ -36,7 +36,7 @@
},
getPlatformGroup() {
getPlatformGroupList({
- queryData: 1,
+ queryData: 0,
queryType: 0
}).then(res => {
this.platformGroupList = res.data || []
diff --git a/pda/utils/config.js b/pda/utils/config.js
index cccc897..0d82c16 100644
--- a/pda/utils/config.js
+++ b/pda/utils/config.js
@@ -1,6 +1,6 @@
-export const baseUrl = 'gateway_interface/'
-// export const baseUrl = 'http://10.50.250.178:8088/gateway_interface/'
+// export const baseUrl = 'gateway_interface/'
+export const baseUrl = 'http://10.50.250.253:8088/gateway_interface/'
export const uploadAvatar = `${baseUrl}visitsAdmin/cloudService/web/public/uploadFtp.do`
export const uploadUrl = `${baseUrl}visitsAdmin/cloudService/public/uploadBatch`
diff --git a/screen/src/views/PlatformCall.vue b/screen/src/views/PlatformCall.vue
index 98a699d..312e4c6 100644
--- a/screen/src/views/PlatformCall.vue
+++ b/screen/src/views/PlatformCall.vue
@@ -30,7 +30,6 @@
}else{
item.optTimeTemp = '-'
}
-
}
// item.optTimeTemp = dayjs.duration(Math.abs(new Date().getTime() - item.optTime)).format('HH:mm')
}
--
Gitblit v1.9.3