liumin
/
zkPCproject
0
0
Форк 0
Код Проблеми 0 Запити на злиття 0 Релізи 0 Вікі Активність
Переглянути джерело

修改部分页面排序功能

newStyle
douzhuo 2 роки тому
джерело
87e6e97d0d
коміт
4251034dff
4 змінених файлів з 3586 додано та 356 видалено
Розділений перегляд
Параметри порівняння
Показати статистику Завантажити патч Завантажити файл різниці
  1. +431
    -253
      src/views/Equipment/index.vue
  2. +2
    -2
      src/views/Equipment/state.vue
  3. +3078
    -0
      py.vue
  4. +75
    -101
      src/views/Receive/index.vue

+ 431
- 253
src/views/Equipment/index.vue Переглянути файл

@@ -166,19 +166,19 @@
</el-select>
</div> -->
</div>
<div style="display:flex">
<div class="app-titel" style="margin-top: 15px">
<!-- <div class="label" style="color: #ffffff">筛选相关：</div> -->
<div style="margin-left: 20px">
<el-button type="primary" @click="screen">筛选</el-button>
<div style="display: flex">
<div class="app-titel" style="margin-top: 15px">
<!-- <div class="label" style="color: #ffffff">筛选相关：</div> -->
<div style="margin-left: 20px">
<el-button type="primary" @click="screen">筛选</el-button>
</div>
<div style="margin-left: 20px">
<el-button @click="reset" type="text">清空筛选条件</el-button>
</div>
</div>
<div style="margin-left: 20px">
<el-button @click="reset" type="text">清空筛选条件</el-button>
</div>
</div>
<div class="app-titel" style="margin-top: 15px">
<!-- <div class="label" style="color: #ffffff">筛选相关：</div> -->
<!-- <div style="margin-left: 20px">
<div class="app-titel" style="margin-top: 15px">
<!-- <div class="label" style="color: #ffffff">筛选相关：</div> -->
<!-- <div style="margin-left: 20px">
<el-button
@click="Batchreturn()"
type="primary"
@@ -186,95 +186,147 @@
>批量归还</el-button
>
</div> -->
<div style="margin-left: auto;margin-right:10px;" v-if="euq_index_downLoad">
<el-button
@click="infoMasstransfer()"
type="primary"
v-if="equ_index_bind"
:disabled="multipleSelection.length == 0"
>批量绑定</el-button
>
<el-button
@click="zkequipmentUnbind()"
type="primary"
v-if="equ_index_unbind"
:disabled="multipleSelection.length == 0"
>批量解绑</el-button
>
<el-button
@click="infoBulkbinding()"
v-if="euq_index_batch"
type="primary"
:disabled="multipleSelection.length == 0"
>批量绑定批次号</el-button
<div
style="margin-left: auto; margin-right: 10px"
v-if="euq_index_downLoad"
>
<el-button v-if="equ_index_add" @click="infoadd()" type="primary">添加</el-button>
<el-button @click="downLoad" icon="el-icon-download">导出</el-button>
<el-button
@click="infoMasstransfer()"
type="primary"
v-if="equ_index_bind"
:disabled="multipleSelection.length == 0"
>批量绑定</el-button
>
<el-button
@click="zkequipmentUnbind()"
type="primary"
v-if="equ_index_unbind"
:disabled="multipleSelection.length == 0"
>批量解绑</el-button
>
<el-button
@click="infoBulkbinding()"
v-if="euq_index_batch"
type="primary"
:disabled="multipleSelection.length == 0"
>批量绑定批次号</el-button
>
<el-button v-if="equ_index_add" @click="infoadd()" type="primary"
>添加</el-button
>
<el-button @click="downLoad" icon="el-icon-download"
>导出</el-button
>
</div>
</div>
</div>
</div>
</div>

<!-- 表格 -->
<div class="cen-tab">
<el-table
:data="tableData"
stripe
@selection-change="handleSelectionChange"
style="width: 100%"
height="390"
:header-cell-style="{background:'#F5F7FA',color:'#333333'}"
>
<el-table-column type="selection" width="55"> </el-table-column>
<el-table-column type="index" label="序号" align="center">
</el-table-column>
<el-table-column prop="imei" label="设备编号" align="center">
<template slot-scope="{ row }">
<el-tooltip class="item" effect="dark" :content="row.imei" placement="top-start">
<span style="display: block;width: 100%;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;"> {{row.imei || "-"}}</span>
</el-tooltip>
</template>
</el-table-column>
<el-table-column prop="batchId" label="批次号" align="center">
<template slot-scope="{ row }">
<el-tooltip class="item" effect="dark" :content="row.batchId" placement="top-start">
<span style="display: block;width: 100%;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;"> {{row.batchId || "-"}}</span>
</el-tooltip>
</template>
</el-table-column>
<el-table-column prop="agentName" label="代理商" align="center">
</el-table-column>
<el-table-column prop="orgName" label="公司" align="center">
<template slot-scope="{ row }">
<el-tooltip class="item" effect="dark" :content="row.orgName" placement="top-start">
<span style="display: block;width: 100%;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;"> {{row.orgName || "-"}}</span>
</el-tooltip>
</template>
</el-table-column>
<el-table-column prop="houseName" label="项目" align="center">
</el-table-column>
<el-table-column prop="userName" label="领用人" align="center">
</el-table-column>
<el-table-column prop="userPhone" label="领用人手机" align="center">
</el-table-column>
<el-table-column prop="receiveType" label="领用状态" align="center">
<template slot-scope="{ row }">
{{
row.receiveType == 1
? "未领用"
: row.receiveType == 2
? "使用中"
: "已归还"
}}
</template>
</el-table-column>
<!-- <el-table-column prop="date" label="在线状态" align="center">
<div class="tablimit">
<el-table
:data="tableData"
stripe
height="100%"
@selection-change="handleSelectionChange"
:header-cell-style="{ background: '#F5F7FA', color: '#333333' }"
>
<el-table-column type="selection" width="55"> </el-table-column>
<el-table-column type="index" label="序号" align="center">
</el-table-column>
<el-table-column prop="imei" label="设备编号" align="center">
<template slot-scope="{ row }">
<el-tooltip
class="item"
effect="dark"
:content="row.imei"
placement="top-start"
>
<span
style="
display: block;
width: 100%;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
"
>
{{ row.imei || "-" }}</span
>
</el-tooltip>
</template>
</el-table-column>
<el-table-column prop="batchId" label="批次号" align="center">
<template slot-scope="{ row }">
<el-tooltip
class="item"
effect="dark"
:content="row.batchId"
placement="top-start"
>
<span
style="
display: block;
width: 100%;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
"
>
{{ row.batchId || "-" }}</span
>
</el-tooltip>
</template>
</el-table-column>
<el-table-column prop="agentName" label="代理商" align="center">
</el-table-column>
<el-table-column prop="orgName" label="公司" align="center">
<template slot-scope="{ row }">
<el-tooltip
class="item"
effect="dark"
:content="row.orgName"
placement="top-start"
>
<span
style="
display: block;
width: 100%;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
"
>
{{ row.orgName || "-" }}</span
>
</el-tooltip>
</template>
</el-table-column>
<el-table-column prop="houseName" label="项目" align="center">
</el-table-column>
<el-table-column prop="userName" label="领用人" align="center">
</el-table-column>
<el-table-column prop="userPhone" label="领用人手机" align="center">
</el-table-column>
<el-table-column prop="receiveType" label="领用状态" align="center">
<template slot-scope="{ row }">
{{
row.receiveType == 1
? "未领用"
: row.receiveType == 2
? "使用中"
: "已归还"
}}
</template>
</el-table-column>
<!-- <el-table-column prop="date" label="在线状态" align="center">
</el-table-column>
<el-table-column prop="date" label="录音状态" align="center">
</el-table-column>
<el-table-column prop="name" label="上传状态" align="center">
</el-table-column> -->
<!-- <el-table-column
<!-- <el-table-column
prop="autoSwitch"
label="自动转写开关"
align="center"
@@ -284,37 +336,37 @@
{{ row.autoSwitch == 0 ? "已关闭" : "已开启" }}
</template>
</el-table-column> -->
<el-table-column
prop="transliterationMethodName"
label="转写方式"
align="center"
>
</el-table-column>
<el-table-column
prop="acceptanceStatus"
label="设备状态"
align="center"
>
<template slot-scope="{ row }">
{{
row.acceptanceStatus == 0
? "已验收"
: row.acceptanceStatus == 1
? "未验收"
: row.acceptanceStatus == 2
? "维修中"
: row.acceptanceStatus == 3
? "更换中"
: "已报损"
}}
</template>
</el-table-column>
<el-table-column
prop="transliterationMethodName"
label="转写方式"
align="center"
>
</el-table-column>
<el-table-column
prop="acceptanceStatus"
label="设备状态"
align="center"
>
<template slot-scope="{ row }">
{{
row.acceptanceStatus == 0
? "已验收"
: row.acceptanceStatus == 1
? "未验收"
: row.acceptanceStatus == 2
? "维修中"
: row.acceptanceStatus == 3
? "更换中"
: "已报损"
}}
</template>
</el-table-column>

<!-- <el-table-column prop="name" label="转写方式" align="center">
<!-- <el-table-column prop="name" label="转写方式" align="center">
</el-table-column> -->
<!-- <el-table-column prop="name" label="开机指示灯" align="center">
<!-- <el-table-column prop="name" label="开机指示灯" align="center">
</el-table-column> -->
<!-- <el-table-column
<!-- <el-table-column
prop="name"
label="电池电量"
width="200"
@@ -338,33 +390,33 @@
<el-table-column prop="name" label="关机类型" align="center">
</el-table-column> -->

<el-table-column
prop="createTime"
label="添加时间"
align="center"
width="150"
>
</el-table-column>
<!-- <el-table-column prop="name" label="购买时间" align="center">
<el-table-column
prop="createTime"
label="添加时间"
align="center"
width="150"
>
</el-table-column>
<!-- <el-table-column prop="name" label="购买时间" align="center">
</el-table-column> -->
<el-table-column
prop="bindHouseTime"
label="绑定项目时间"
align="center"
width="150"
>
</el-table-column>
<!-- <el-table-column
<el-table-column
prop="bindHouseTime"
label="绑定项目时间"
align="center"
width="150"
>
</el-table-column>
<!-- <el-table-column
prop="name"
label="绑定代理时间"
align="center"
width="150"
>
</el-table-column> -->
<!-- scope -->
<el-table-column label="操作" align="center" fixed="right" width="80">
<template slot-scope="{ row }">
<!-- <el-button v-if="row.receiveType == 2 && euq_index_back" type="text" @click="toinifoThereturn()">归还</el-button>
<!-- scope -->
<el-table-column label="操作" align="center" fixed="right" width="80">
<template slot-scope="{ row }">
<!-- <el-button v-if="row.receiveType == 2 && euq_index_back" type="text" @click="toinifoThereturn()">归还</el-button>
<el-button v-if="equ_index_change" type="text" @click="infotranscription()">转写方式</el-button>
<el-button v-if="equ_index_auto" type="text" @click="isAutoSwitch()">自动转写</el-button>
<el-button v-if="row.acceptanceStatus == 1 && equ_index_makeSure" type="text" @click="acceptance()">验收</el-button>
@@ -372,22 +424,41 @@
<el-button v-if="orgType == 0 && equ_index_bind&&row.receiveType!=2" type="text" @click="toinfobinding()">绑定</el-button>
<el-button v-if="equ_index_del&&row.receiveType!=2" type="text" @click="toinifodelete()">删除</el-button> -->

<el-dropdown v-if="(row.receiveType == 2 && euq_index_back)||equ_index_change||equ_index_auto||(row.acceptanceStatus == 1 && equ_index_makeSure)||(row.acceptanceStatus != (1 || 0) && euq_index_normal)||( equ_index_bind&&row.receiveType!=2)||(equ_index_del&&row.receiveType!=2)||(equ_index_ubind&&row.propertyId)" @command="handleCommand($event, row)" trigger="click">
<span style="color: #2671E2; font-size: 12px; margin-left: 10px; cursor: pointer;">
更多<i class="el-icon-arrow-down el-icon--right"></i>
</span>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item
command="toinifoThereturn"
v-if="row.receiveType == 2 && euq_index_back"
>归还</el-dropdown-item
<el-dropdown
v-if="
(row.receiveType == 2 && euq_index_back) ||
equ_index_change ||
equ_index_auto ||
(row.acceptanceStatus == 1 && equ_index_makeSure) ||
(row.acceptanceStatus != (1 || 0) && euq_index_normal) ||
(equ_index_bind && row.receiveType != 2) ||
(equ_index_del && row.receiveType != 2) ||
(equ_index_ubind && row.propertyId)
"
@command="handleCommand($event, row)"
trigger="click"
>
<span
style="
color: #2671e2;
font-size: 12px;
margin-left: 10px;
cursor: pointer;
"
>

更多<i class="el-icon-arrow-down el-icon--right"></i>
</span>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item
command="zhuanxeishezhi"
>转写设置</el-dropdown-item
>
<!-- <el-dropdown-item
command="toinifoThereturn"
v-if="row.receiveType == 2 && euq_index_back"
>归还</el-dropdown-item
>

<el-dropdown-item command="zhuanxeishezhi"
>转写设置</el-dropdown-item
>
<!-- <el-dropdown-item
command="infotranscription"
v-if="equ_index_change"
>转写方式</el-dropdown-item
@@ -395,36 +466,41 @@
<el-dropdown-item command="isAutoSwitch" v-if="equ_index_auto"
>自动转写</el-dropdown-item
> -->
<el-dropdown-item
command="acceptance"
v-if="row.acceptanceStatus == 1 && equ_index_makeSure"
>验收</el-dropdown-item
>
<!-- <el-dropdown-item
<el-dropdown-item
command="acceptance"
v-if="row.acceptanceStatus == 1 && equ_index_makeSure"
>验收</el-dropdown-item
>
<!-- <el-dropdown-item
command="getRight"
v-if="row.acceptanceStatus != (1 || 0) && euq_index_normal"
>恢复正常</el-dropdown-item
> -->
<el-dropdown-item
command="toinfobinding"
v-if="equ_index_bind&&row.receiveType!=2&&!row.propertyId"
>绑定</el-dropdown-item
>
<el-dropdown-item
command="equipmentUnbind"
v-if="equ_index_ubind&&row.propertyId"
>解绑</el-dropdown-item
>
<!-- <el-dropdown-item command="infoeditor">修改</el-dropdown-item> -->
<el-dropdown-item command="toinifodelete" v-if="equ_index_del&&row.receiveType!=2"
>删除</el-dropdown-item
>
</el-dropdown-menu>
</el-dropdown>
</template>
</el-table-column>
</el-table>
<div style="display: flex; justify-content: flex-end; margin-top: 10px">
<el-dropdown-item
command="toinfobinding"
v-if="
equ_index_bind && row.receiveType != 2 && !row.propertyId
"
>绑定</el-dropdown-item
>
<el-dropdown-item
command="equipmentUnbind"
v-if="equ_index_ubind && row.propertyId"
>解绑</el-dropdown-item
>
<!-- <el-dropdown-item command="infoeditor">修改</el-dropdown-item> -->
<el-dropdown-item
command="toinifodelete"
v-if="equ_index_del && row.receiveType != 2"
>删除</el-dropdown-item
>
</el-dropdown-menu>
</el-dropdown>
</template>
</el-table-column>
</el-table>
</div>
<div style="flex-shrink: 0;display: flex; justify-content: flex-end; margin-top: 10px">
<el-pagination
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
@@ -442,7 +518,8 @@
title="新增设备"
:visible.sync="dialogVisible"
@close="resetImei"
:center="true" width="600px"
:center="true"
width="600px"
>
<el-form
:model="addForm"
@@ -452,7 +529,13 @@
label-width="100px"
>
<el-form-item label="设备号" prop="imei">
<el-input v-model="addForm.imei" placeholder="设备号" style="width: 80%" maxlength="20" clearable></el-input>
<el-input
v-model="addForm.imei"
placeholder="设备号"
style="width: 80%"
maxlength="20"
clearable
></el-input>
</el-form-item>
<!-- <el-form-item label="转写方式" prop="defaultTransliteration">
<el-radio-group v-model="addForm.defaultTransliteration">
@@ -489,13 +572,29 @@
></el-input>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer" style="border-top:1px solid #eee;padding-top: 20px;display: flex;justify-content: end;">
<div
slot="footer"
class="dialog-footer"
style="
border-top: 1px solid #eee;
padding-top: 20px;
display: flex;
justify-content: end;
"
>
<el-button @click="dialogVisible = false">取 消</el-button>
<el-button type="primary" :loading="loadingFlag" @click="addEquipment()">保存</el-button>
<el-button type="primary" :loading="loadingFlag" @click="addEquipment()"
>保存</el-button
>
</div>
</el-dialog>

<el-dialog title="编辑" :visible.sync="dialogVisible2" :center="true" width="600px">
<el-dialog
title="编辑"
:visible.sync="dialogVisible2"
:center="true"
width="600px"
>
<el-form
:model="editForm"
label-position="labelPosition"
@@ -533,20 +632,34 @@
></el-input>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer" style="border-top:1px solid #eee;padding-top: 20px;display: flex;justify-content: end;">
<div
slot="footer"
class="dialog-footer"
style="
border-top: 1px solid #eee;
padding-top: 20px;
display: flex;
justify-content: end;
"
>
<el-button @click="dialogVisible2 = false">取 消</el-button>
<el-button type="primary" @click="editor()">保存</el-button>
</div>
</el-dialog>

<el-dialog title="绑定" :center="true" width="600px" :visible.sync="dialogVisible3" @close="resetBind">
<el-dialog
title="绑定"
:center="true"
width="600px"
:visible.sync="dialogVisible3"
@close="resetBind"
>
<el-form
:model="bindForm"
label-position="labelPosition"
ref="bindForm"
:rules="bindRules"
label-width="100px"
>
<!-- <el-form-item label="绑定" prop="choic">
<el-radio-group v-model="bindForm.choic">
@@ -584,7 +697,16 @@
></el-input>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer" style="border-top:1px solid #eee;padding-top: 20px;display: flex;justify-content: end;">
<div
slot="footer"
class="dialog-footer"
style="
border-top: 1px solid #eee;
padding-top: 20px;
display: flex;
justify-content: end;
"
>
<el-button @click="dialogVisible3 = false">取 消</el-button>
<el-button type="primary" @click="binding()">保存</el-button>
</div>
@@ -611,7 +733,6 @@
placeholder="请选择"
filterable
clearable

>
<el-option
v-for="item in batchList"
@@ -623,7 +744,16 @@
</el-select>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer" style="border-top:1px solid #eee;padding-top: 20px;display: flex;justify-content: end;">
<div
slot="footer"
class="dialog-footer"
style="
border-top: 1px solid #eee;
padding-top: 20px;
display: flex;
justify-content: end;
"
>
<el-button @click="dialogVisible4 = false">取 消</el-button>
<el-button type="primary" @click="Bulkbinding()">保存</el-button>
</div>
@@ -661,7 +791,16 @@
</el-select>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer" style="border-top:1px solid #eee;padding-top: 20px;display: flex;justify-content: end;">
<div
slot="footer"
class="dialog-footer"
style="
border-top: 1px solid #eee;
padding-top: 20px;
display: flex;
justify-content: end;
"
>
<el-button @click="dialogVisible5 = false">取 消</el-button>
<el-button type="primary" @click="Masstransfer()">保存</el-button>
</div>
@@ -671,7 +810,8 @@
title="领用"
:visible.sync="receiveVisible"
@close="resetReceive"
:center="true" width="600px"
:center="true"
width="600px"
>
<el-form
:model="receiveForm"
@@ -711,27 +851,45 @@
</el-select>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer" style="border-top:1px solid #eee;padding-top: 20px;display: flex;justify-content: end;">
<div
slot="footer"
class="dialog-footer"
style="
border-top: 1px solid #eee;
padding-top: 20px;
display: flex;
justify-content: end;
"
>
<el-button @click="receiveVisible = false">取 消</el-button>
<el-button type="primary" @click="saveReceive()">保存</el-button>
</div>
</el-dialog>


<el-dialog
title="转写设置"
:visible.sync="receiveVisiblescd"
:center="true" width="600px"
:center="true"
width="600px"
>
<div>
<span>转写方式：</span>
<el-radio-group v-model="radioindex" style="margin-left:30px;">
<div>
<span>转写方式：</span>
<el-radio-group v-model="radioindex" style="margin-left: 30px">
<el-radio :label="0">关闭转写</el-radio>
<el-radio :label="1">科大讯飞</el-radio>
<el-radio :label="2">思必驰</el-radio>
</el-radio-group>
</div>
<div slot="footer" class="dialog-footer" style="border-top:1px solid #eee;padding-top: 20px;display: flex;justify-content: end;">
</div>
<div
slot="footer"
class="dialog-footer"
style="
border-top: 1px solid #eee;
padding-top: 20px;
display: flex;
justify-content: end;
"
>
<el-button @click="receiveVisiblescd = false">取 消</el-button>
<el-button type="primary" @click="shezhizhuanxei()">保存</el-button>
</div>
@@ -741,7 +899,7 @@

<script>
import { mapGetters } from "vuex";
import { exportMethodPost} from "@/util/util";
import { exportMethodPost } from "@/util/util";
export default {
data() {
return {
@@ -839,7 +997,7 @@ export default {
dialogVisible4: false,
dialogVisible5: false,
receiveVisible: false,
loadingFlag:false,
loadingFlag: false,
batchForm: {
batchId: "",
imeis: "",
@@ -887,9 +1045,9 @@ export default {
{ color: "#1989fa", percentage: 80 },
{ color: "#6f7ad3", percentage: 100 },
],
radioindex:'',
radioindexid:'',
receiveVisiblescd:false
radioindex: "",
radioindexid: "",
receiveVisiblescd: false,
};
},
computed: {
@@ -910,8 +1068,8 @@ export default {
this.euq_index_downLoad = this.permissions["euq_index_downLoad"];
},
mounted() {
if(this.$route.query.time){
this.time=[this.$route.query.time,this.$route.query.time]
if (this.$route.query.time) {
this.time = [this.$route.query.time, this.$route.query.time];
this.searchForm.startDate = this.time[0];
this.searchForm.endDate = this.time[1];
}
@@ -923,30 +1081,36 @@ export default {
this.zkhousePage();
},
methods: {
downLoad(){
downLoad() {
let obj = {
timeType:1,
orgType: localStorage.getItem("orgType"),
orgCode: localStorage.getItem("orgCode"),
agentId: localStorage.getItem("agentId"),
houseId: localStorage.getItem("houseId"),
...this.searchForm,
timeType: 1,
orgType: localStorage.getItem("orgType"),
orgCode: localStorage.getItem("orgCode"),
agentId: localStorage.getItem("agentId"),
houseId: localStorage.getItem("houseId"),
...this.searchForm,
};
exportMethodPost('autoSR/zk/equipment/equipmentManagementExport','设备使用统计',obj)
exportMethodPost(
"autoSR/zk/equipment/equipmentManagementExport",
"设备使用统计",
obj
);
},
//转写设置
zhuanxeishezhi(row){
this.radioindexid=row.id;
this.radioindex=row.transliterationMethod;
this.receiveVisiblescd=true;
zhuanxeishezhi(row) {
this.radioindexid = row.id;
this.radioindex = row.transliterationMethod;
this.receiveVisiblescd = true;
},
//转写设置确认
shezhizhuanxei(){
this.$api.api.updateTranslationMethod({
id: this.radioindexid,
transliterationMethod:this.radioindex,
}).then((res) => {
this.receiveVisiblescd=false;
//转写设置确认
shezhizhuanxei() {
this.$api.api
.updateTranslationMethod({
id: this.radioindexid,
transliterationMethod: this.radioindex,
})
.then((res) => {
this.receiveVisiblescd = false;
this.$message({
type: "success",
message: "修改成功!",
@@ -1036,7 +1200,7 @@ export default {
batchId: "",
remark: "",
};
this.$refs.addForm.resetFields()
this.$refs.addForm.resetFields();
},
resetBind() {
this.bindForm = {
@@ -1061,7 +1225,7 @@ export default {
.equipmentManagement({
size: this.size,
current: this.currentPage,
timeType:1,
timeType: 1,
orgType: localStorage.getItem("orgType"),
orgCode: localStorage.getItem("orgCode"),
agentId: localStorage.getItem("agentId"),
@@ -1141,7 +1305,7 @@ export default {
// });
});
},
equipmentUnbind(row){
equipmentUnbind(row) {
this.$confirm("确认解绑吗?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
@@ -1237,9 +1401,9 @@ export default {
},
//绑定
toinfobinding(row) {
if(row.receiveType==2){
this.$message.warning('设备使用中不能删除')
return
if (row.receiveType == 2) {
this.$message.warning("设备使用中不能删除");
return;
}
this.dialogVisible3 = true;
this.bindForm.imeis = row.imei;
@@ -1274,7 +1438,7 @@ export default {
this.$api.api
.findHouseByUser({
orgType: localStorage.getItem("orgType"),
houseTypes:'0,1,2,3'
houseTypes: "0,1,2,3",
})
.then((res) => {
// console.log(res)
@@ -1288,14 +1452,14 @@ export default {
addEquipment() {
this.$refs.addForm.validate((valid) => {
if (valid) {
this.loadingFlag=true
this.loadingFlag = true;
console.log(this.addForm);
this.$api.api.equipmentAdd(this.addForm).then((res) => {
console.log(res);
setTimeout(() => {
this.loadingFlag=false
console.log('防重')
}, 1);
this.loadingFlag = false;
console.log("防重");
}, 1);
this.$message.success("添加成功");
this.dialogVisible = false;
this.equipmentManagement();
@@ -1404,10 +1568,12 @@ export default {
}
)
.then(() => {
this.$api.api.updateTranslationMethod({
this.$api.api
.updateTranslationMethod({
id: row.id,
defaultTransliteration: row.defaultTransliteration == 0 ? 1 : 0,
}).then((res) => {
})
.then((res) => {
this.$message({
type: "success",
message: "修改成功!",
@@ -1451,9 +1617,9 @@ export default {
},
//删除
toinifodelete(row) {
if(row.receiveType==2){
this.$message.warning('设备使用中不能删除')
return
if (row.receiveType == 2) {
this.$message.warning("设备使用中不能删除");
return;
}
this.$confirm("此操作将永久删除, 是否继续?", "提示", {
confirmButtonText: "确定",
@@ -1497,15 +1663,26 @@ export default {
<style scoped="scoped" lang="scss" >
.box-center {
width: 100%;
height: 95%;
padding: 15px;
min-width: 1000px;
padding-bottom: 100px;
// padding-bottom: 100px;
display: flex;
flex-direction: column;
}
.cen-tab {
width: 100%;
height: calc(100% - 94px - 30px);
flex-grow: 1;
padding: 15px;
background: #ffffff;
margin-top: 15px;
display: flex;
flex-direction: column;
.tablimit {
width: 100%;
height: calc(100% - 42px);
}
}
.tophove {
color: #ffffff;
@@ -1518,6 +1695,7 @@ export default {
border-radius: 4px;
padding-top: 15px;
padding-bottom: 15px;
flex-shrink: 0;
.app-titel {
width: 100%;
display: flex;
@@ -1556,27 +1734,27 @@ export default {
.div-inp {
width: 250px;
}
/deep/ .el-table__header-wrapper{
thead{
tr{
th{
background: #F5F7FA;
/deep/ .el-table__header-wrapper {
thead {
tr {
th {
background: #f5f7fa;
color: #333333;
}
}
}
}
/deep/ .el-dialog--center{
/deep/ .el-dialog--center {
border-radius: 8px;
.el-dialog__title{
.el-dialog__title {
font-weight: bold;
}
}
/deep/ .el-button--primary{
background: #2671E2 !important;
border: 1px solid #2671E2 !important;
/deep/ .el-button--primary {
background: #2671e2 !important;
border: 1px solid #2671e2 !important;
}
/deep/ .el-button--text{
color: #2671E2;
/deep/ .el-button--text {
color: #2671e2;
}
</style>

+ 2
- 2
src/views/Equipment/state.vue Переглянути файл

@@ -350,10 +350,10 @@
<el-table-column type="selection" width="55"> </el-table-column>
<el-table-column type="index" label="序号" align="center">
</el-table-column>
<el-table-column prop="imei" label="设备编号" align="center">
<el-table-column prop="imei" width="150" label="设备编号" align="center">
<template slot-scope="{ row }">
<el-tooltip class="item" effect="dark" :content="row.imei" placement="top-start">
<span style="display: block;width: 100%;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;"> {{row.imei || "-"}}</span>
<span style="display: block;width: 100%;"> {{row.imei || "-"}}</span>
</el-tooltip>
</template>
</el-table-column>


py.vue
Різницю між файлами не показано, бо вона завелика
Переглянути файл


+ 75
- 101
src/views/Receive/index.vue Переглянути файл

@@ -1,9 +1,5 @@
<template>
<div class="box-center" style="cursor: pointer">
<!-- <div class="biaotibox">
<div>客户接待详情</div>
<div><i @click="gojianyi()" class="el-icon-close"></i></div>
</div> -->
<div class="topbox">
<div class="topzuo">
<div class="title" style="display: flex">
@@ -71,7 +67,6 @@
>
</div>
</div>
<!-- 导出 -->
<div
v-if="permissions.cus_index_downLoad_word"
class="outDownLoad"
@@ -213,7 +208,6 @@
>
</div>
</div>
<!-- box-shadow: -10px 0px 7px -7px #d1d1d1 inset; -->
<div class="headboxbott">
<div
class="headovfu"
@@ -250,11 +244,8 @@
>
</div>
</div>
<div
style="width: 100%; margin-top: 20px; border-top: 1px solid #ccc"
>
<div style="height: calc(100% - 100px);">
<div class="center2" id="center2">
<!-- roleindex -->
<div
class="text"
:data-bg="item.bg"
@@ -326,72 +317,66 @@
</div>
</div>
<div class="topzuo-you" style="overflow-y: auto">
<div
style="
width: 100%;
height: 44px;
border-bottom: 1rpx solid #e0e0e0;
display: flex;
margin: 10px 0;
align-items: center;
"
>
<div style="padding: 0 10px; height: 100px;display: flex;flex-direction: column;justify-content: space-between; border-bottom: 1px solid #e0e0e0">
<div
style="flex: 1; font-size: 16px; color: #333333; text-indent: 5%"
>
客户意向
</div>

<el-button
v-if="rec_index_makesure"
style="
margin-right: 10px;
border: 1px solid #2671e2;
color: #2671e2;
width: 100%;
height: 44px;
display: flex;
align-items: center;
"
plain
@click="Acqtap()"
>校准</el-button
>
</div>
<div
class="pingfenbox"
style="
margin: 10px 0 20px;
padding: 0px 10px 28px 10px;
height: auto;
"
>
<!-- <div :class="{ activecllasscet: kehuyixiangcenterindex == 0 }" @click="customerofintention(0)">
<div
style="
flex: 1;
font-size: 16px;
color: #333333;
text-indent: 5%;
"
>
客户意向
</div>

<el-button
v-if="rec_index_makesure"
style="
margin-right: 10px;
border: 1px solid #2671e2;
color: #2671e2;
"
plain
@click="Acqtap()"
>校准</el-button
>
</div>

<div class="pingfenbox">
<el-button
:class="{ activecllasscet: kehuyixiangcenterindex == 0 }"
type=""
style="
height: 32px;
border-right: none;
border-radius: 5px 0 0 5px;
"
@click="customerofintention(0)"
>系统分析
</el-button>
<el-button
:class="{ activecllasscet: kehuyixiangcenterindex == 1 }"
type=""
style="
margin-left: 0px;
height: 32px;
border-left: none;
border-radius: 0 5px 5px 0;
"
@click="customerofintention(1)"
>人工校准</el-button
>
</div>
<div :class="{ activecllasscet: kehuyixiangcenterindex == 1 }" @click="customerofintention(1)">
</div> -->
<el-button
:class="{ activecllasscet: kehuyixiangcenterindex == 0 }"
type=""
style="
height: 32px;
border-right: none;
border-radius: 5px 0 0 5px;
"
@click="customerofintention(0)"
>系统分析
</el-button>
<el-button
:class="{ activecllasscet: kehuyixiangcenterindex == 1 }"
type=""
style="
margin-left: 0px;
height: 32px;
border-left: none;
border-radius: 0 5px 5px 0;
"
@click="customerofintention(1)"
>人工校准</el-button
>
</div>

<div
v-if="Getintentionlist && Getintentionlist.length == 0"
style="width: 100%; text-align: center; line-height: 100px"
@@ -463,13 +448,12 @@
</div>
</div>
<div class="topyou">
<div style="padding: 0 10px; height: 100px;display: flex;flex-direction: column;justify-content: space-between; border-bottom: 1px solid #e0e0e0">
<div
style="
width: 100%;
height: 44px;
border-bottom: 1rpx solid #e0e0e0;
display: flex;
margin: 10px 0;
align-items: center;
"
>
@@ -480,16 +464,7 @@
</div>
</div>

<div
class="pingfenbox"
style="padding: 0px 10px 28px 10px; height: auto"
>
<!-- <div :class="{ activecllasscet: zhixingcenterindex == 0 }" @click="recordclick(0)">
销讲总执行率{{ userinformationlist.fraction || 0 }}%
</div>
<div v-if="rec_index_todo" :class="{ activecllasscet: zhixingcenterindex == 1 }" @click="recordclick(1)">
禁忌执行
</div> -->
<div class="pingfenbox">
<el-button
:class="{ activecllasscet: zhixingcenterindex == 0 }"
type=""
@@ -511,13 +486,13 @@
>禁忌执行</el-button
>
</div>
</div>
<div v-if="zhixingcenterindex == 0">
<div
style="
width: 100%;
height: 44px;
border-bottom: 1rpx solid #e0e0e0;
border-bottom: 1px solid #e0e0e0;
display: flex;
align-items: center;
background: #f0f6ff;
@@ -539,7 +514,6 @@
</div>
</div>

<!-- v-bind:style="{ height: zxldivhe + 'px' }" -->
<div id="zxldiv" v-if="zhixingcenterindex == 0">
<div class="zxlBox" v-for="(item, index) in ratelist" :key="index">
<div class="zxlLev1" @click="changeshow(index)">
@@ -582,9 +556,6 @@
}}%</span
>
</div>
<!-- {{
}}% -->
<div style="width: 40px; text-align: center">
<i
v-if="item.show == true"
@@ -1063,7 +1034,7 @@
width="600px"
:close-on-click-modal="false"
>
<div style="margin-top: 10px;">
<div style="margin-top: 10px">
<div style="display: flex; align-items: center">
<div
style="
@@ -1821,7 +1792,7 @@ export default {
});
},
addRole() {
console.log("添加角色")
console.log("添加角色");
this.roleList.push({
name: String.fromCharCode(this.roleList.length + 65),
});
@@ -2346,10 +2317,12 @@ export default {
}

.center2 {
border-top: 1px solid rgb(224, 224, 224);
padding: 0 15px;
width: 100%;
height: calc(80vh - 285px);
height: 100%;
overflow-y: scroll;

.right {
.content123ss {
justify-content: end;
@@ -2370,11 +2343,11 @@ export default {
}

.box-center {
width: 100%;
height: 100%;
padding: 15px;
width: 100%;
height: 95%;
min-width: 1000px;
padding-bottom: 100px;
// padding-bottom: 100px;
background: #ffffff;
}

@@ -2744,7 +2717,7 @@ export default {
width: 100%;
display: flex;
margin-top: 12px;
height: calc(80vh - 156px);
height: calc(100% - 156px);

.topzuo {
width: 70%;
@@ -2760,14 +2733,15 @@ export default {

.zuo-titbox {
width: 100%;
height: 100%;
display: flex;
flex-direction: column;

// height: 120px;
// border-bottom: 1px solid #e0e0e0;
.searchbox {
flex-shrink: 0;
width: 100%;
height: 50px;
display: flex;
margin-top: 6px;
justify-content: center;
align-items: center;

@@ -2810,6 +2784,7 @@ export default {
}

.headboxbott {
flex-shrink: 0;
width: 100%;
height: 50px;
display: flex;
@@ -2817,10 +2792,9 @@ export default {
}

.headovfu {
flex: 1;
flex-grow: 1;
height: 40px;
overflow: hidden;
margin-top: 10px;
padding: 0 10px !important;
}

@@ -2857,6 +2831,7 @@ export default {
height: 40px;
display: flex;
flex-wrap: nowrap;
align-items: center;
}

/*滚动条样式*/
@@ -2926,7 +2901,6 @@ export default {
width: 100%;
height: 46px;
line-height: 46px;
border-bottom: 1px solid #e0e0e0;
display: flex;
}



Писати Попередній перегляд
Завантаження…
Відмінити
Зберегти