Browse Source

fix:修改卡出库导出bug

confidence
杜贤金 3 years ago
parent
commit
0d70f430c0
  1. 2
      src/main.js
  2. 27
      src/views/communicationmanage/outbound/outbound.vue
  3. 17
      src/views/informationmanage/sim/index.vue

2
src/main.js

@ -23,8 +23,6 @@ import avueUeditor from 'avue-plugin-ueditor';
import website from '@/config/website'; import website from '@/config/website';
import crudCommon from '@/mixins/crud'; import crudCommon from '@/mixins/crud';
import {baseUrl,apis} from '@/config/env'; import {baseUrl,apis} from '@/config/env';
// import dataV from '@jiaminghi/data-view'
// Vue.use(dataV)
// 注册全局crud驱动 // 注册全局crud驱动
window.$crudCommon = crudCommon; window.$crudCommon = crudCommon;
// 加载Vue拓展 // 加载Vue拓展

27
src/views/communicationmanage/outbound/outbound.vue

@ -47,9 +47,7 @@
title="您确认要同步实名吗?" title="您确认要同步实名吗?"
placement="top" placement="top"
> >
<div class="el-icon-refresh" slot="reference"> <div class="el-icon-refresh" slot="reference">&nbsp;同步实名</div>
&nbsp;同步实名
</div>
</el-popconfirm> </el-popconfirm>
</el-dropdown-item> </el-dropdown-item>
<el-dropdown-item> <el-dropdown-item>
@ -58,7 +56,11 @@
cancel-button-text="取消" cancel-button-text="取消"
@confirm="handleSimStatus(scope.row.id, scope.row.lifecycleStatus)" @confirm="handleSimStatus(scope.row.id, scope.row.lifecycleStatus)"
icon-color="red" icon-color="red"
:title="scope.row.lifecycleStatus != 4?'您确认要停机吗?':'您确认要复机吗?'" :title="
scope.row.lifecycleStatus != 4
? '您确认要停机吗?'
: '您确认要复机吗?'
"
placement="top" placement="top"
> >
<div <div
@ -105,7 +107,7 @@
v-for="(item, index) in tenantlist" v-for="(item, index) in tenantlist"
:label="item.tenantName" :label="item.tenantName"
:value="item.tenantId" :value="item.tenantId"
:key="item.tenantId" :key="index"
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -120,7 +122,7 @@
v-for="(item, index) in exportTypelist" v-for="(item, index) in exportTypelist"
:label="item.dictValue" :label="item.dictValue"
:value="item.dictKey" :value="item.dictKey"
:key="item.dictKey" :key="index"
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -433,6 +435,13 @@ export default {
label: "dictValue", label: "dictValue",
value: "dictKey", value: "dictKey",
}, },
formatter: (val, value, label) => {
if (value == -1) {
return "-";
} else {
return `${label}`;
}
},
dataType: "number", dataType: "number",
span: 12, span: 12,
labelWidth: 130, labelWidth: 130,
@ -802,7 +811,9 @@ export default {
this.website.tokenHeader this.website.tokenHeader
}=${getToken()}&tenantId=${this.distribution.tenantId}&numStart=${ }=${getToken()}&tenantId=${this.distribution.tenantId}&numStart=${
this.distribution.numStart this.distribution.numStart
}&numEnd=${this.distribution.numEnd}` }&numEnd=${this.distribution.numEnd}&exportType=${
this.distribution.exportType
}`
); );
this.dialogVisible = false; this.dialogVisible = false;
this.$refs.distribution.resetFields(); this.$refs.distribution.resetFields();
@ -866,7 +877,7 @@ export default {
} else { } else {
this.$message.error("复机失败"); this.$message.error("复机失败");
} }
}) });
} else { } else {
updateSimStatus({ id: id, operType: 0 }).then((res) => { updateSimStatus({ id: id, operType: 0 }).then((res) => {
if (res.data.code == 200) { if (res.data.code == 200) {

17
src/views/informationmanage/sim/index.vue

@ -47,9 +47,7 @@
title="您确认要同步实名吗?" title="您确认要同步实名吗?"
placement="top-start" placement="top-start"
> >
<div class="el-icon-refresh" slot="reference"> <div class="el-icon-refresh" slot="reference">&nbsp;同步实名</div>
&nbsp;同步实名
</div>
</el-popconfirm> </el-popconfirm>
</el-dropdown-item> </el-dropdown-item>
<el-dropdown-item> <el-dropdown-item>
@ -58,7 +56,11 @@
cancel-button-text="取消" cancel-button-text="取消"
@confirm="handleSimStatus(scope.row.id, scope.row.lifecycleStatus)" @confirm="handleSimStatus(scope.row.id, scope.row.lifecycleStatus)"
icon-color="red" icon-color="red"
:title="scope.row.lifecycleStatus != 4?'您确认要停机吗?':'您确认要复机吗?'" :title="
scope.row.lifecycleStatus != 4
? '您确认要停机吗?'
: '您确认要复机吗?'
"
placement="top-start" placement="top-start"
> >
<div <div
@ -148,7 +150,10 @@
<script> <script>
import { getList, getDetail, exporttype } from "@/api/informationmanage/sim.js"; import { getList, getDetail, exporttype } from "@/api/informationmanage/sim.js";
import { syncRealNameStatus, updateSimStatus} from "@/api/communication/outbound"; import {
syncRealNameStatus,
updateSimStatus,
} from "@/api/communication/outbound";
import { mapGetters } from "vuex"; import { mapGetters } from "vuex";
import { getToken } from "@/util/auth"; import { getToken } from "@/util/auth";
export default { export default {
@ -708,7 +713,7 @@ export default {
} else { } else {
this.$message.error("复机失败"); this.$message.error("复机失败");
} }
}) });
} else { } else {
updateSimStatus({ id: id, operType: 0 }).then((res) => { updateSimStatus({ id: id, operType: 0 }).then((res) => {
if (res.data.code == 200) { if (res.data.code == 200) {

Loading…
Cancel
Save