yangjun
/
sadjv3_admin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

2024年6月8日 新增配置功能和路由

This commit is contained in:
bai 2024-06-08 21:13:41 +08:00
parent 163b1b4780
commit 7b8beb6182
5 changed files with 4700 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -7,6 +7,7 @@ yarn-error.log*
/test/unit/coverage/
/test/e2e/reports/
selenium-debug.log
nodePath.txt
# Editor directories and files
.idea

6
init.bat
View File

@ -1,7 +1,7 @@
set /P nodePath=<nodePath.txt
set path=%nodePath%;%path%
::yarn --registry https://registry.npm.taobao.org || npm install -g yarn --registry https://registry.npm.taobao.org && yarn --registry https://registry.npm.taobao.org
::https://registry.npmmirror.com
::yarn --registry https://registry.npmmirror.com
::如果报‘pnpm error (CERT_HAS_EXPIRED). Will retry in 10 seconds. 2 retries left.’执行下一行更改源
::npm config set registry https://registry.npmmirror.com
pnpm install
::npm config set registry https://registry.npmmirror.com -- npm rebuild node-sass
npm install --registry https://registry.npmmirror.com

2
src/router/index.js
View File

@ -130,6 +130,8 @@ const mainRoutes = {
// 2024.06.08
{ path: '/packageOrder', component: _import('bl/order/packageOrder'), name: 'packageOrder', meta: { title: '服务包订单', isTab: true } },
{ path: '/travelConf', component: _import('travelConf/index'), name: 'travelConf', meta: { title: '出行配置', isTab: true } },
],
beforeEnter(to, from, next) {
let token = Vue.cookie.get('token')

170
src/views/allocation/allocationList.vue
View File

@ -347,6 +347,59 @@
</el-table-column>
</el-table>
</el-tab-pane>
<!-- 修改与取消服务配置 -->
<el-tab-pane label="修改与取消服务配置" name="v3_order_form">
<el-table v-loading="tableDataLoading" :data="tableData">
<el-table-column fixed prop="type" label="编号" align="center" width="80">
</el-table-column>
<el-table-column prop="min" label="类型">
</el-table-column>
<el-table-column prop="value" label="内容" width="500">
<template slot-scope="scope">
<div
style="display: -webkit-box;-webkit-box-orient: vertical;-webkit-line-clamp: 3;overflow: hidden;max-height:80px;">
{{ scope.row.value }}
</div>
</template>
</el-table-column>
<el-table-column prop="createAt" label="创建时间">
</el-table-column>
<el-table-column label="操作" prop="id" width="120">
<template slot-scope="scope">
<el-button size="mini" type="primary" :disabled="!isAuth('allocationList:update')" @click="amend(scope.$index, scope.row)">
编辑
</el-button>
</template>
</el-table-column>
</el-table>
</el-tab-pane>
<!-- 出行配置(新) -->
<el-tab-pane label="出行配置" name="v3_travel_conf">
<el-table v-loading="tableDataLoading" :data="tableData">
<el-table-column fixed prop="type" label="编号" align="center" width="80">
</el-table-column>
<el-table-column prop="min" label="类型">
</el-table-column>
<el-table-column prop="value" label="内容" width="500">
<template slot-scope="scope">
<div
style="display: -webkit-box;-webkit-box-orient: vertical;-webkit-line-clamp: 3;overflow: hidden;max-height:80px;">
{{ scope.row.value }}
</div>
</template>
</el-table-column>
<el-table-column prop="createAt" label="创建时间">
</el-table-column>
<el-table-column label="操作" prop="id" width="120">
<template slot-scope="scope">
<el-button size="mini" type="primary" :disabled="!isAuth('allocationList:update')" @click="amend(scope.$index, scope.row)">
编辑
</el-button>
</template>
</el-table-column>
</el-table>
</el-tab-pane>
<!-- <el-tab-pane label="商家配置" name="shop">
<el-table v-loading="tableDataLoading" :data="tableData">
<el-table-column fixed prop="type" label="编号" align="center" width="80">
@ -468,6 +521,41 @@
</div>
</div>
</div>
<div v-else-if="form.conditionFrom == 'v3_order_form'">
<template v-if="form.type == 437">
<!-- 三个数据，数字 -->
<el-input-number :controls="false" :precision="1" :min="0" :step="1" :value="getSplitValue(0,0)" @change="(v) => form.value = `${v || 0},${getSplitValue(1,0)},${getSplitValue(2,0)}`"/>小时
<el-input-number :controls="false" :precision="1" :min="0" :step="1" :value="getSplitValue(1,0)" @change="(v) => form.value = `${getSplitValue(0,0)},${v || 0},${getSplitValue(2,0)}`"/>小时
<el-input-number :controls="false" :precision="2" :min="0" :step="1" :value="getSplitValue(2,0)" @change="(v) => form.value = `${getSplitValue(0,0)},${getSplitValue(1,0)},${v}`"/>元
</template>
<template v-else-if="form.type == 438">
<!-- //两个数据，数字 -->
<el-input-number :controls="false" :precision="1" :min="0" :step="1" :value="getSplitValue(0,0)" @change="(v) => form.value = `${v},${getSplitValue(1,0)}`"/>小时
<el-input-number :controls="false" :precision="2" :min="0" :step="1" :value="getSplitValue(1,0)" @change="(v) => form.value = `${getSplitValue(0,0)},${v || 0}`"/>元
</template>
<template v-else-if="form.type == 439">
<!-- //三个数据，1个数字，两个百分比 -->
<el-input-number :controls="false" :precision="0" :min="0" :step="1" :value="getSplitValue(0,0)" @change="(v) => form.value = `${v || 0},${getSplitValue(1,0)},${getSplitValue(2,0)}`"/>分钟
<el-input-number :controls="false" :precision="0" :min="0" :max="100" :step="1" :value="getSplitValue(1,0)" @change="(v) => form.value = `${getSplitValue(0,0)},${v || 0},${getSplitValue(2,0)}`"/>%
<el-input-number :controls="false" :precision="2" :min="0" :max="100" :step="1" :value="getSplitValue(2,0)" @change="(v) => form.value = `${getSplitValue(0,0)},${getSplitValue(1,0)},${v || 0}`"/>%
</template>
<template v-else>
<!-- 纯数字，最小为0, -->
<el-input-number :precision="2" :min="0" :step="1" v-model="form.value" style="width:65%;" @change="(v) => form.value = v || 0"></el-input-number>
</template>
</div>
<div v-else-if="form.conditionFrom == 'v3_travel_conf'">
<template v-if="form.type == 443 || form.type == 444">
<!-- 两个日期 -->
<!-- <el-date-picker style="width: 160px;margin-left: 10px;" align="right" type="datetime" format="yyyy-MM-dd" value-format="yyyy-MM-dd" placeholder="选择开始时间"/> -->
<!-- <el-date-picker :value="[getSplitValue(0,'0521'), getSplitValue(1,'0823')]" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" format="yyyy-MM-dd" value-format="MMdd" @changerange="log"/> -->
<el-date-picker v-model="form.value2" type="daterange" style="width:65%;" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" format="yyyy-MM-dd" value-format="MMdd" @change="(vs) => form.value = (vs || ['','']).join(',')"/>
</template>
<template v-else-if="form.type == 445 || form.type == 446">
<!-- 两个时间 -->
<el-time-picker v-model="form.value2" style="width:65%;" format="HH:mm:ss" value-format="HHmmss" is-range range-separator="至" start-placeholder="开始时间" end-placeholder="结束时间" placeholder="选择时间范围" @change="(vs) => form.value = (vs || ['','']).join(',')"/>
</template>
</div>
<el-input v-else v-model="form.value" style="width:65%;"></el-input>
<!-- <el-input v-model="form.value" style="width:65%;"></el-input> -->
</el-form-item>
@ -580,6 +668,7 @@ export default {
id: '',
min: '',
value: '',
value2: '',
type: '',
},
dividedDetailsForm: {
@ -651,7 +740,18 @@ export default {
}
},
methods: {
log(...d) {
console.log('log ->',...d);
},
getSplitValue(index = 0, defTxt = '', splitTxt = ',') {
return this.getSplitOtherValue(null,index,defTxt,splitTxt);
},
getSplitOtherValue(v, index = 0, defTxt = '', splitTxt = ',') {
let value = v;
if(!value) value = this.form.value || '';
let txts = value.split(splitTxt);
return txts[index] || defTxt;
},
changeServerType() {
console.log(this.serverValue);
this.getDividedDetailsList();
@ -687,70 +787,61 @@ export default {
if (tab._props.label == '全局系统配置') {
this.condition = 'xitong'
this.dataSelect()
}
if (tab._props.label == '首页配置') {
} else if (tab._props.label == '首页配置') {
this.condition = 'shouye'
this.dataSelect()
}
if (tab._props.label == '微信配置') {
} else if (tab._props.label == '微信配置') {
this.condition = 'weixin'
this.dataSelect()
}
if (tab._props.label == '支付宝配置') {
} else if (tab._props.label == '支付宝配置') {
this.condition = 'zhifubao'
this.dataSelect()
}
if (tab._props.label == '短信配置') {
} else if (tab._props.label == '短信配置') {
this.condition = 'duanxin'
this.dataSelect()
}
if (tab._props.label == '任务系统配置') {
} else if (tab._props.label == '任务系统配置') {
this.condition = 'renwu'
this.dataSelect()
}
if (tab._props.label == '协议配置') {
} else if (tab._props.label == '协议配置') {
this.condition = 'xieyi'
this.dataSelect()
}
if (tab._props.label == 'APP消息推送配置') {
} else if (tab._props.label == 'APP消息推送配置') {
this.condition = 'push'
this.dataSelect()
}
if (tab._props.label == '文件上传配置') {
} else if (tab._props.label == '文件上传配置') {
this.condition = 'oss'
this.dataSelect()
}
if (tab._props.label == '开关配置') {
} else if (tab._props.label == '开关配置') {
this.condition = 'kaiguan'
this.dataSelect()
}
if (tab._props.label == '图片配置') {
} else if (tab._props.label == '图片配置') {
this.condition = 'image'
this.dataSelect()
} if (tab._props.label == '分成明细配置') {
} else if (tab._props.label == '分成明细配置') {
this.condition = 'fcmx';
this.getDividedDetailsList();
this.getServer();
}
if (tab._props.label == '出行配置') {
} else if (tab._props.label == '出行配置-') {
this.condition = 'chuxing'
this.dataSelect()
}
if (tab._props.label == '语音配置') {
} else if (tab._props.label == '语音配置') {
this.condition = 'yuyin'
this.dataSelect()
}
if (tab._props.label == '服务费配置') {
} else if (tab._props.label == '服务费配置') {
this.condition = 'fuwufei'
this.dataSelect()
}
if (tab._props.label == '客服配置') {
} else if (tab._props.label == '客服配置') {
this.condition = 'kefu'
this.dataSelect()
}
if (tab._props.label == '商家配置') {
} else if (tab._props.label == '商家配置') {
this.condition = 'shop'
this.dataSelect()
} else if (tab._props.label == '修改与取消服务配置') {
this.condition = 'v3_order_form'
this.dataSelect()
} else if (tab._props.label == '出行配置') {
this.condition = 'v3_travel_conf'
this.dataSelect()
}
},
getDividedDetailsList() {
@ -794,6 +885,8 @@ export default {
if (this.form.type == 330) {
this.address = rows.value
this.select()
} else if(this.form.type == 443 || this.form.type == 444 || this.form.type == 445 || this.form.type == 446) {
this.form.value2 = [ this.getSplitOtherValue(rows.value,0), this.getSplitOtherValue(rows.value,1) ];
}
},
openDividedDialog(index, rows) {
@ -812,17 +905,22 @@ export default {
amendNoticeTo() {
if (this.form.type == 330) {
this.form.value = this.address
}
if (this.form.conditionFrom == "xitong" && this.form.type == 433) {
} else if (this.form.conditionFrom == "xitong" && this.form.type == 433) {
if (this.form.value) window.localStorage.setItem("ringOrderId", this.form.value);
}
if (this.form.conditionFrom == "xitong" && this.form.type == 100000) {
} else if (this.form.conditionFrom == "xitong" && this.form.type == 100000) {
let regRule = new RegExp("^[0-9]*[1-9][0-9]*$");
if (!regRule.test(this.form.value)) {
this.form.value = "10";
this.$message.error('当前值只能输入正整数');
return;
}
} else if(this.form.type == 443) {
//判断不能为空
if(!this.form.value || this.form.value == ','){
this.$message.error('请选择日期');
return;
}
}
console.log(this.form);
this.$http({

4560
src/views/travelConf/index.vue Normal file
View File

File diff suppressed because it is too large Load Diff