第三方服务修改,新增设备审核,第三方仓库,仓库字典修改,第三方单据类型修改,业务单据提交修改等等

master
anthonyywj2 3 years ago
parent 12786817df
commit 7c93cd4df4

11
package-lock.json generated

@ -17,6 +17,7 @@
"node-sass": "^6.0.1",
"nprogress": "^0.2.0",
"pinyin": "^2.10.2",
"qrcodejs2": "^0.0.2",
"vue": "2.5.16",
"vue-router": "^3.0.1",
"vuedraggable": "^2.17.0",
@ -15329,6 +15330,11 @@
"teleport": ">=0.2.0"
}
},
"node_modules/qrcodejs2": {
"version": "0.0.2",
"resolved": "https://registry.npmjs.org/qrcodejs2/-/qrcodejs2-0.0.2.tgz",
"integrity": "sha1-Rlr+Xjnxn6zsuTLBH3oYYQkUauE="
},
"node_modules/qs": {
"version": "6.5.2",
"resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
@ -34112,6 +34118,11 @@
"integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=",
"dev": true
},
"qrcodejs2": {
"version": "0.0.2",
"resolved": "https://registry.npmjs.org/qrcodejs2/-/qrcodejs2-0.0.2.tgz",
"integrity": "sha1-Rlr+Xjnxn6zsuTLBH3oYYQkUauE="
},
"qs": {
"version": "6.5.2",
"resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",

@ -19,6 +19,7 @@
"node-sass": "^6.0.1",
"nprogress": "^0.2.0",
"pinyin": "^2.10.2",
"qrcodejs2": "^0.0.2",
"vue": "2.5.16",
"vue-router": "^3.0.1",
"vuedraggable": "^2.17.0",

@ -0,0 +1,27 @@
import axios from "../../utils/axios";
export function registerList(query) {
return axios({
url: "/sale/device/registerList",
method: "get",
params: query
});
}
export function check(data) {
return axios({
url: "/sale/device/check",
method: "post",
data: data
});
}
export function deleterKey(data) {
return axios({
url: "/sale/info/deleterKey",
method: "post",
data: data
});
}

@ -15,6 +15,7 @@ import authAdmin from "../views/userManage/admin/authAdmin.vue";
import authRole from "../views/userManage/admin/authRole.vue";
import authPermissionRule from "../views/userManage/admin/authPermissionRule.vue";
import systemParamConfig from "../views/userManage/param/systemParamConfig.vue";
import phoneRegisterManage from "../views/userManage/param/phoneRegisterManage.vue";
import systemPDFTemplate from "../views/userManage/param/systemPDFTemplate";
import systemPDFModule from "../views/userManage/param/systemPDFModule";
import thirdSysApi from "../views/userManage/param/ThirdSysApiUpload.vue";
@ -228,7 +229,15 @@ export const asyncRouterMap = [
},
]
},
{
path: "phoneRegisterManage",
component: phoneRegisterManage,
name: "设备管理",
icon: "",
meta: {
authRule: ["admin/phoneRegisterManage"]
}
},
{
path: "/systemParam",
component: Empty,

@ -130,16 +130,6 @@
</el-table-column>
</el-table>
<!-- <el-tree-->
<!-- :data="mergeList"-->
<!-- :props="defaultProps"-->
<!-- node-key="id"-->
<!-- style="width: 50%"-->
<!-- default-expand-all-->
<!-- :expand-on-click-node="false"-->
<!-- :render-content="renderContent"-->
<!-- >-->
<!-- </el-tree>-->
</el-card>
<div>
<el-card style="width: 49%; float: left; margin-right: 0px;">
@ -476,14 +466,14 @@
</el-form-item>
</el-col>
</el-row>
<!-- <el-row :gutter="20" class="el-row" type="flex">-->
<!-- <el-col :span="12" class="el-col">-->
<!-- <div class="text item">-->
<!-- <el-checkbox v-model="formData.spUse" :disabled="formData.level!='1'">使-->
<!-- </el-checkbox>-->
<!-- </div>-->
<!-- </el-col>-->
<!-- </el-row>-->
<!-- <el-row :gutter="20" class="el-row" type="flex">-->
<!-- <el-col :span="12" class="el-col">-->
<!-- <div class="text item">-->
<!-- <el-checkbox v-model="formData.spUse" :disabled="formData.level!='1'">使-->
<!-- </el-checkbox>-->
<!-- </div>-->
<!-- </el-col>-->
<!-- </el-row>-->
<!-- <el-form-item v-if="formData.pid == 0">-->
@ -516,6 +506,23 @@
<el-dialog title="关联仓库" :visible.sync="thrWareHouseVisible">
<el-form :inline="true" :model="query" class="query-form" size="mini">
<el-form-item class="query-form-item">
<el-input
v-model="thirdQuery.name"
clearable
placeholder="仓库名称"
style="width: 400px"
></el-input>
</el-form-item>
<el-form-item>
<el-button-group>
<el-button type="primary" icon="search" @click="intentSelect"></el-button>
</el-button-group>
</el-form-item>
</el-form>
<el-table
:data="thrWarehouseData"
style="width: 100%;margin-top: 10px;"
@ -549,7 +556,13 @@
</template>
</el-table-column>
</el-table>
<el-pagination
:page-size="query.limit"
@current-change="handleCurrentChange"
layout="prev, pager, next"
:total="total"
>
</el-pagination>
<div slot="footer" class="dialog-footer">
<el-button @click.native="hideThrWarehouseTable()">取消</el-button>
<el-button
@ -666,7 +679,14 @@ export default {
sysList: [],
checkThrWarehouseRow: null,
currentSysId: null,
thirdSysVisible: false
thirdSysVisible: false,
total: 0,
thirdQuery: {
name:null,
page: 1,
limit: 10
, thirdSysFk: "thirdId",
}
};
},
methods: {
@ -1219,17 +1239,27 @@ export default {
})
},
intentSelect(row) {
this.currentSysId = row.sysId;
if (row != null)
this.currentSysId = row.sysId;
//
filterThrList().then((res) => {
this.thirdQuery.thirdSysFk = this.currentSysId;
filterThrList(this.thirdQuery).then((res) => {
this.thrWarehouseData = res.data.list;
this.total = res.data.total || 0;
this.thrWareHouseVisible = true;
}).catch((error) => {
this.thrWarehouseData = [];
this.total = 0;
this.thrWareHouseVisible = true;
this.$message.error("第三方仓库数据加载失败");
});
},
handleCurrentChange(val) {
this.thirdQuery.page = val;
this.intentSelect();
},
changeThrWarehouse(row) {
this.checkThrWarehouseRow = row;
},

File diff suppressed because it is too large Load Diff

@ -48,6 +48,7 @@
border
default-expand-all
:tree-props="{children: 'children', hasChildren: 'hasChildren'}">
<el-table-column type="index" label="序号" width="50"></el-table-column>
<el-table-column
prop="code"
label="仓库编码"
@ -57,7 +58,6 @@
prop="name"
label="仓库名称"
>
</el-table-column>
<el-table-column
prop="advanceType"
@ -66,14 +66,11 @@
<span>{{ enableMap[scope.row.advanceType] }}</span>
</template>
</el-table-column>
<!-- <el-table-column-->
<!-- prop="isDefault"-->
<!-- label="是否默认库存">-->
<!-- <template slot-scope="scope">-->
<!-- <span>{{ enableMap[scope.row.isDefault] }}</span>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column prop="thirdName" label="第三方系统名称"></el-table-column>
<el-table-column prop="thirdName" label="第三方系统名称">
<template slot-scope="scope">
<span>{{ getThirdSysFkName(scope.row.thirdSysFk) }}</span>
</template>
</el-table-column>
<el-table-column label="操作" fixed="right">
<template slot-scope="scope">
@ -93,22 +90,17 @@
</el-button
>
</template>
<!-- :disabled="scope.row.code==1000 ||scope.row.code==1001"-->
</el-table-column>
</el-table>
<!-- <el-tree-->
<!-- :data="mergeList"-->
<!-- :props="defaultProps"-->
<!-- node-key="id"-->
<!-- style="width: 50%"-->
<!-- default-expand-all-->
<!-- :expand-on-click-node="false"-->
<!-- :render-content="renderContent"-->
<!-- >-->
<!-- </el-tree>-->
</el-card>
<el-pagination
:page-size="query.limit"
@current-change="handleCurrentChange"
layout="prev, pager, next"
:total="total"
>
</el-pagination>
<!--表单界面-->
<el-dialog
:title="formMap[formName]"
@ -174,8 +166,6 @@
>
</div>
</el-dialog>
<el-dialog
:title="formMap[formName]"
:close-on-click-modal="false"
@ -225,21 +215,6 @@
</el-radio-group>
</el-form-item>
<!-- <el-form-item v-if="formData.pid == 0">-->
<!-- <el-row :gutter="20" class="el-row" type="flex">-->
<!-- <el-col :span="4" class="el-col">-->
<!-- <div class="text item">-->
<!-- <el-checkbox v-model="formData.advanceType"></el-checkbox>-->
<!-- </div>-->
<!-- </el-col>-->
<!-- <el-col :span="4" class="el-col">-->
<!-- <div class="text item">-->
<!-- <el-checkbox v-model="formData.isDefault"></el-checkbox>-->
<!-- </div>-->
<!-- </el-col>-->
<!-- </el-row>-->
<!-- </el-form-item>-->
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click.native="hideForm">取消</el-button>
@ -271,7 +246,9 @@ const formJson = {
code: null,
status: 1,
advanceType: false,
isDefault: false
isDefault: false,
page: 1,
limit: 20,
};
export default {
data() {
@ -283,7 +260,9 @@ export default {
code: null,
status: null,
advanceType: null,
isDefault: null
isDefault: null,
page: 1,
limit: 20,
},
mergeList: [],
node: null,
@ -291,6 +270,7 @@ export default {
children: "children",
label: "name"
},
total: 0,
treeList: [],
loading: true,
index: null,
@ -325,16 +305,12 @@ export default {
};
},
methods: {
/*eslint-disable */
// <el-button
// style="font-size: 12px;"
// type="text"
// on-click={() => this.handleSubForm(node, data, "add")}
// >
//
// </el-button>
handleCurrentChange(val) {
this.query.page = val;
this.getList();
},
renderContent(h, {node, data, store}) {
return (
<span
@ -386,12 +362,14 @@ export default {
.then((response) => {
this.loading = false;
this.mergeList = response.data.list || [];
this.total = response.data.total || 0;
this.treeList = response.data.tree_list || [];
this.getQueryThirdSysFkName(this.query.thirdSysFk);
})
.catch(() => {
this.loading = false;
this.mergeList = [];
this.total = 0;
this.treeList = [];
});
},
@ -409,6 +387,14 @@ export default {
}
})
},
getThirdSysFkName(thirdSys) {
for (let i = 0; i < this.thirdSys.length; i++) {
if (this.thirdSys[i].thirdId === thirdSys) {
return this.thirdSys[i].thirdName;
}
}
},
//
resetForm() {
if (this.$refs["dataForm"]) {
@ -636,8 +622,8 @@ export default {
},
created() {
//
this.getList();
this.getBasicThirdSys();
this.getList();
},
};
</script>

@ -0,0 +1,357 @@
<template>
<div>
<el-form :inline="true" :model="filterQuery" class="query-form" size="mini">
<el-row>
<el-form-item class="query-form-item">
<el-select v-model="filterQuery.isCheck" placeholder="审核状态">
<el-option label="全部" value=""></el-option>
<el-option label="未审核" value="0"></el-option>
<el-option label="已审核" value="1"></el-option>
<el-option label="未通过" value="2"></el-option>
</el-select>
</el-form-item>
<el-form-item>
<el-button-group>
<el-button
type="primary"
icon="el-icon-refresh"
@click="onReset"
></el-button>
<el-button type="primary" icon="search" @click="onSubmit"
>查询
</el-button
>
<el-button type="primary" icon="search" @click="qrCodeGeneration"
>手持终端地址配置
</el-button
>
</el-button-group>
</el-form-item>
</el-row>
</el-form>
<el-dialog title="手持终端服务IP地址设置" :visible.sync="qrCodeVisible" width="27%">
<div id="qrCodeUrl"></div>
<span slot="footer" class="dialog-footer">
<el-button @click="qrCodeVisible = false">取消</el-button>
</span>
</el-dialog>
<el-table v-loading="loading" :data="list" style="width: 100%">
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="IMEI唯一识别码" prop="imei" width="230"></el-table-column>
<el-table-column
label="登记说明"
prop="remark"
></el-table-column>
<el-table-column
label="申请人"
prop="companyName"
></el-table-column>
<el-table-column label="审核状态" prop="isCheck" width="120">
<template slot-scope="scope">
<span>{{ checkFlag[scope.row.isCheck] }}</span>
</template>
</el-table-column>
<el-table-column label="操作" fixed="right">
<template slot-scope="scope">
<el-button
type="text"
size="small"
v-if="scope.row.isCheck !== 1"
@click.native.stop="checkDialog(scope.row)"
>审核
</el-button
>
<el-button
type="text"
size="small"
@click.native.stop="editDialog(scope.row)"
>编辑
</el-button
>
<el-button
type="text"
size="small"
@click.native.stop="deleteDialog(scope.row)"
>删除
</el-button
>
</template>
</el-table-column>
</el-table>
<el-dialog
title="审核"
:close-on-click-modal="false"
:close-on-press-escape="false"
:visible.sync="centerDialogVisible"
width="30%"
center
>
<el-row :gutter="20" class="el-row" type="flex">
<el-col :span="6">
<div class="ao-text">
<span>IMEI</span>
</div>
</el-col>
<el-col :span="12">
<el-input
size="small"
placeholder=""
v-model="checkQuery.imei"
disabled
></el-input>
</el-col>
</el-row>
<el-row :gutter="20" class="el-row" type="flex" style="margin-top: 10px">
<el-col :span="6">
<div class="ao-text">
<span>登记说明</span>
</div>
</el-col>
<el-col :span="12">
<el-input
size="small"
placeholder=""
v-model="checkQuery.remark"
></el-input>
</el-col>
</el-row>
<span slot="footer" class="dialog-footer" style="margin-top: 40px">
<el-button @click="centerDialogVisible = false">取消</el-button>
<el-button type="primary" @click="passRegister"></el-button>
<el-button type="primary" @click="noPassRegister"></el-button>
</span>
</el-dialog>
<el-dialog
title="编辑"
:close-on-click-modal="false"
:close-on-press-escape="false"
:visible.sync="editDialogVisible"
width="30%"
center
>
<el-row :gutter="20" class="el-row" type="flex">
<el-col :span="6">
<div class="ao-text">
<span>IMEI</span>
</div>
</el-col>
<el-col :span="12">
<el-input
size="small"
placeholder=""
v-model="checkQuery.imei"
disabled
></el-input>
</el-col>
</el-row>
<el-row :gutter="20" class="el-row" type="flex" style="margin-top: 10px">
<el-col :span="6">
<div class="ao-text">
<span>登记说明</span>
</div>
</el-col>
<el-col :span="12">
<el-input
size="small"
placeholder=""
v-model="checkQuery.remark"
></el-input>
</el-col>
</el-row>
<span slot="footer" class="dialog-footer" style="margin-top: 40px">
<el-button @click="editDialogVisible = false">取消</el-button>
<el-button type="primary" @click="confirmEdit"></el-button>
</span>
</el-dialog>
<el-pagination
:page-size="filterQuery.limit"
@current-change="handleCurrentChange"
layout="prev, pager, next"
:total="total"
></el-pagination>
</div>
</template>
<script>
import {registerList, check, deleterKey} from "../../../api/auth/deviceCheck";
import QRCode from 'qrcodejs2'
import axios from "axios";
export default {
data() {
return {
filterQuery: {
isCheck: "",
page: 1,
limit: 20,
},
value: "",
total: 0,
checkFlag: {
0: "未审核",
1: "已通过",
2: "已拒绝",
},
list: [],
addDialogVisible: false,
centerDialogVisible: false,
check: "",
checkQuery: {
imei: null,
remark: null,
},
editDialogVisible: false,
qrCodeVisible: false,
serverUrl: false,
};
},
methods: {
onReset() {
this.$router.push({
path: "",
});
this.filterQuery = {
isCheck: "",
page: 1,
limit: 20,
};
this.getList();
},
onSubmit() {
this.getList();
},
getList() {
this.loading = true;
registerList(this.filterQuery)
.then((response) => {
this.loading = false;
this.list = response.data.list || [];
this.total = response.data.total || 0;
})
.catch(() => {
this.loading = false;
this.list = [];
this.total = 0;
});
},
editDialog(row) {
this.checkQuery = row;
this.editDialogVisible = true;
},
cancelDialog() {
this.addDialogVisible = false;
},
handleCheckedChange(val) {
console.log(val);
},
handleSizeChange(val) {
this.filterQuery.limit = val;
this.getList();
},
handleCurrentChange(val) {
this.filterQuery.page = val;
this.getList();
},
checkRegister() {
this.loading = true;
check(this.checkQuery)
.then((response) => {
if (response.code === 20000) {
this.getList();
this.$message({
type: "success",
message: "更新成功!",
});
} else {
this.$message.warning("更新失败");
this.loading = false;
}
})
.catch(() => {
});
},
checkDialog(row) {
this.checkQuery = row;
this.centerDialogVisible = true;
},
confirmEdit() {
this.ch
this.checkRegister();
},
deleteDialog(row) {
let query = {
id: row.id,
}
deleterKey(query)
.then((response) => {
if (response.code === 20000) {
this.getList();
this.$message({
type: "success",
message: "删除成功!",
});
} else {
this.$message.warning("删除失败");
this.loading = false;
}
})
.catch(() => {
});
},
passRegister() {
this.checkQuery.isCheck = 1;
this.checkRegister();
this.centerDialogVisible = false;
},
noPassRegister() {
this.checkQuery.isCheck = 2;
this.checkRegister();
this.centerDialogVisible = false;
},
qrCodeGeneration() {
this.qrCodeVisible = true;
this.$nextTick(function () {
document.getElementById("qrCodeUrl").innerHTML = "";
let qrCodeUrl = new QRCode("qrCodeUrl", {
width: 200,
height: 200,
text: this.serverUrl,
colorDark: "#409EFF",
colorLight: "#fff"
});
});
}
},
mounted() {
},
created() {
this.getList();
axios.get("./config.json").then(res => {
//
this.serverUrl = res.data.BASE_URL;
});
},
};
</script>
Loading…
Cancel
Save