8.31 to 2
This commit is contained in:
yezhenman
parent
2608f4c1d6
commit
34ef9cc394
2
public/dist/index.html
vendored
2
public/dist/index.html
vendored
@ -1 +1 @@
|
|||||||
<!DOCTYPE html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="favicon.ico"><title>erp</title><link href="css/chunk-01b147f1.cec86515.css" rel="prefetch"><link href="css/chunk-0ab08886.0080a3bb.css" rel="prefetch"><link href="css/chunk-19797d59.4a709612.css" rel="prefetch"><link href="css/chunk-1c56d4e4.a81ac70a.css" rel="prefetch"><link href="css/chunk-2a2235b7.1a0ea8f6.css" rel="prefetch"><link href="css/chunk-33e29a08.9142830e.css" rel="prefetch"><link href="css/chunk-3bcfd210.9c27e2c9.css" rel="prefetch"><link href="css/chunk-4546fe72.3bcd502b.css" rel="prefetch"><link href="css/chunk-49bc9534.0080a3bb.css" rel="prefetch"><link href="css/chunk-5e1711e0.d4b94e52.css" rel="prefetch"><link href="css/chunk-7c135f6b.b66e0a3d.css" rel="prefetch"><link href="js/chunk-01b147f1.411ddf4a.js" rel="prefetch"><link href="js/chunk-0ab08886.47a1307b.js" rel="prefetch"><link href="js/chunk-19797d59.521ebbb8.js" rel="prefetch"><link href="js/chunk-1c56d4e4.ceee754d.js" rel="prefetch"><link href="js/chunk-2a2235b7.b4b58aba.js" rel="prefetch"><link href="js/chunk-33e29a08.03cb9098.js" rel="prefetch"><link href="js/chunk-3bcfd210.374395ff.js" rel="prefetch"><link href="js/chunk-4546fe72.955bc949.js" rel="prefetch"><link href="js/chunk-49bc9534.d43fa97d.js" rel="prefetch"><link href="js/chunk-5e1711e0.4eafce54.js" rel="prefetch"><link href="js/chunk-7c135f6b.7b5f30c1.js" rel="prefetch"><link href="css/app.62fa08a2.css" rel="preload" as="style"><link href="css/chunk-vendors.a6a7f90c.css" rel="preload" as="style"><link href="js/app.1e81d417.js" rel="preload" as="script"><link href="js/chunk-vendors.dc4080e5.js" rel="preload" as="script"><link href="css/chunk-vendors.a6a7f90c.css" rel="stylesheet"><link href="css/app.62fa08a2.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but erp doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script src="js/chunk-vendors.dc4080e5.js"></script><script src="js/app.1e81d417.js"></script></body></html>
|
<!DOCTYPE html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="favicon.ico"><title>erp</title><link href="css/chunk-01b147f1.cec86515.css" rel="prefetch"><link href="css/chunk-0ab08886.0080a3bb.css" rel="prefetch"><link href="css/chunk-19797d59.4a709612.css" rel="prefetch"><link href="css/chunk-1c56d4e4.a81ac70a.css" rel="prefetch"><link href="css/chunk-2a2235b7.1a0ea8f6.css" rel="prefetch"><link href="css/chunk-33e29a08.9142830e.css" rel="prefetch"><link href="css/chunk-3bcfd210.9c27e2c9.css" rel="prefetch"><link href="css/chunk-4546fe72.3bcd502b.css" rel="prefetch"><link href="css/chunk-5e1711e0.d4b94e52.css" rel="prefetch"><link href="css/chunk-6ddd112d.0080a3bb.css" rel="prefetch"><link href="css/chunk-7c135f6b.b66e0a3d.css" rel="prefetch"><link href="js/chunk-01b147f1.411ddf4a.js" rel="prefetch"><link href="js/chunk-0ab08886.47a1307b.js" rel="prefetch"><link href="js/chunk-19797d59.521ebbb8.js" rel="prefetch"><link href="js/chunk-1c56d4e4.ceee754d.js" rel="prefetch"><link href="js/chunk-2a2235b7.b4b58aba.js" rel="prefetch"><link href="js/chunk-33e29a08.03cb9098.js" rel="prefetch"><link href="js/chunk-3bcfd210.374395ff.js" rel="prefetch"><link href="js/chunk-4546fe72.955bc949.js" rel="prefetch"><link href="js/chunk-5e1711e0.4eafce54.js" rel="prefetch"><link href="js/chunk-6ddd112d.abfd98d4.js" rel="prefetch"><link href="js/chunk-7c135f6b.7b5f30c1.js" rel="prefetch"><link href="css/app.62fa08a2.css" rel="preload" as="style"><link href="css/chunk-vendors.a6a7f90c.css" rel="preload" as="style"><link href="js/app.7feda7dd.js" rel="preload" as="script"><link href="js/chunk-vendors.dc4080e5.js" rel="preload" as="script"><link href="css/chunk-vendors.a6a7f90c.css" rel="stylesheet"><link href="css/app.62fa08a2.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but erp doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script src="js/chunk-vendors.dc4080e5.js"></script><script src="js/app.7feda7dd.js"></script></body></html>
|
||||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
4
public/dist/js/chunk-49bc9534.d43fa97d.js
vendored
4
public/dist/js/chunk-49bc9534.d43fa97d.js
vendored
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
4
public/dist/js/chunk-6ddd112d.abfd98d4.js
vendored
Normal file
4
public/dist/js/chunk-6ddd112d.abfd98d4.js
vendored
Normal file
File diff suppressed because one or more lines are too long
1
public/dist/js/chunk-6ddd112d.abfd98d4.js.map
vendored
Normal file
1
public/dist/js/chunk-6ddd112d.abfd98d4.js.map
vendored
Normal file
File diff suppressed because one or more lines are too long
@ -5,31 +5,31 @@
|
|||||||
<div class="goods" style="margin: 20px">
|
<div class="goods" style="margin: 20px">
|
||||||
<el-form ref="form" :inline="true" :model="form">
|
<el-form ref="form" :inline="true" :model="form">
|
||||||
<el-form-item label="模块:" style="margin-right: 40px">
|
<el-form-item label="模块:" style="margin-right: 40px">
|
||||||
<el-select v-model="form.moudule">
|
<el-select v-model="form.module" clearable >
|
||||||
<el-option v-for="item in mouduleOptions" :key="item.value" :label="item.label" :value="item.value">
|
<el-option v-for="item in mouduleOptions" :key="item.value" :label="item.label" :value="item.value">
|
||||||
</el-option>
|
</el-option>
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="操作:" style="margin-right: 40px">
|
<el-form-item label="操作:" style="margin-right: 40px">
|
||||||
<el-select v-model="form.action">
|
<el-select v-model="form.action" clearable>
|
||||||
<el-option v-for="item in actionOptions" :key="item.value" :label="item.label" :value="item.value">
|
<el-option v-for="item in actionOptions" :key="item.value" :label="item.label" :value="item.value">
|
||||||
</el-option>
|
</el-option>
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="目标类型:" style="margin-right: 40px">
|
<el-form-item label="目标类型:" style="margin-right: 40px">
|
||||||
<el-select v-model="form.target_ype">
|
<el-select v-model="form.target_type" clearable>
|
||||||
<el-option v-for="item in target_ypeOptions" :key="item.value" :label="item.label" :value="item.value">
|
<el-option v-for="item in target_ypeOptions" :key="item.value" :label="item.label" :value="item.value">
|
||||||
</el-option>
|
</el-option>
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="类别:" style="margin-right: 40px">
|
<el-form-item label="类别:" style="margin-right: 40px">
|
||||||
<el-select v-model="form.targetField">
|
<el-select v-model="form.targetField" clearable>
|
||||||
<el-option v-for="item in target_fieldOptions" :key="item.value" :label="item.label" :value="item.value">
|
<el-option v-for="item in target_fieldOptions" :key="item.value" :label="item.label" :value="item.value">
|
||||||
</el-option>
|
</el-option>
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="操作人:" style="margin-right: 40px">
|
<el-form-item label="操作人:" style="margin-right: 40px">
|
||||||
<el-select v-model="form.userId" placeholder="输入操作人">
|
<el-select v-model="form.userId" placeholder="输入操作人" clearable>
|
||||||
<el-option v-for="item in userOptions" :key="item.id" :label="item.name" :value="item.id">
|
<el-option v-for="item in userOptions" :key="item.id" :label="item.name" :value="item.id">
|
||||||
</el-option>
|
</el-option>
|
||||||
</el-select>
|
</el-select>
|
||||||
@ -49,15 +49,21 @@
|
|||||||
<!-- 表格 -->
|
<!-- 表格 -->
|
||||||
<el-card style="margin-top: 30px" class="box-card">
|
<el-card style="margin-top: 30px" class="box-card">
|
||||||
<el-table :data="tableData" border style="width: 100%">
|
<el-table :data="tableData" border style="width: 100%">
|
||||||
<el-table-column prop="id" label="序号"> </el-table-column>
|
<el-table-column prop="id" label="序号" width="80"> </el-table-column>
|
||||||
<el-table-column prop="module" label="模块"> </el-table-column>
|
<el-table-column prop="module" label="模块" width="80"> </el-table-column>
|
||||||
<el-table-column prop="action" label="操作"> </el-table-column>
|
<el-table-column prop="action" label="操作" width="80"> </el-table-column>
|
||||||
<el-table-column prop="target_type" label="目标类型"> </el-table-column>
|
<el-table-column prop="target_type" label="目标类型"> </el-table-column>
|
||||||
<el-table-column prop="target_id" label="目标ID"> </el-table-column>
|
<el-table-column prop="target_id" label="目标ID" width="80"> </el-table-column>
|
||||||
<el-table-column prop="target_field" label="类别"> </el-table-column>
|
<el-table-column prop="target_field" label="类别"> </el-table-column>
|
||||||
<el-table-column prop="before_update" label="操作前"> </el-table-column>
|
<el-table-column prop="before_update" label="操作前"> </el-table-column>
|
||||||
<el-table-column prop="after_update" label="操作后"> </el-table-column>
|
<el-table-column prop="after_update" label="操作后"> </el-table-column>
|
||||||
<el-table-column prop="message" label="信息"> </el-table-column>
|
<el-table-column label="信息" width="400">
|
||||||
|
<template slot-scope="scope">
|
||||||
|
<div style="overflow-x: scroll;height: 50px;white-space: nowrap;">
|
||||||
|
{{scope.row.message}}
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
<el-table-column prop="user.name" label="操作人"> </el-table-column>
|
<el-table-column prop="user.name" label="操作人"> </el-table-column>
|
||||||
<el-table-column prop="created_at" label="操作时间"> </el-table-column>
|
<el-table-column prop="created_at" label="操作时间"> </el-table-column>
|
||||||
</el-table>
|
</el-table>
|
||||||
@ -261,9 +267,9 @@
|
|||||||
],//目标类型
|
],//目标类型
|
||||||
userOptions: [], //查询用户列表
|
userOptions: [], //查询用户列表
|
||||||
form: {
|
form: {
|
||||||
moudule:'',//模块 goods-商品(单个商品记录必传),'menu' => '菜单',file-文件,permission-权限,role-角色,user-用户,plat-平台
|
module:'',//模块 goods-商品(单个商品记录必传),'menu' => '菜单',file-文件,permission-权限,role-角色,user-用户,plat-平台
|
||||||
action:'',//操作 POST-新增,PATCH-更新,DELETE-删除,'GET' => '查看',
|
action:'',//操作 POST-新增,PATCH-更新,DELETE-删除,'GET' => '查看',
|
||||||
target_ype:'',//目标类型 upload-上传,goods_sku商品规格,goods_brand-商品品牌,goods_type-商品种类,menu-菜单,permission-权限,role-角色,user-用户,kuaituantuan-快团团,miaoxuan-妙选,'goods' => '商品',
|
target_type:'',//目标类型 upload-上传,goods_sku商品规格,goods_brand-商品品牌,goods_type-商品种类,menu-菜单,permission-权限,role-角色,user-用户,kuaituantuan-快团团,miaoxuan-妙选,'goods' => '商品',
|
||||||
targetField: "",//影响字段
|
targetField: "",//影响字段
|
||||||
userId: "",//操作人id(用户列表)
|
userId: "",//操作人id(用户列表)
|
||||||
},
|
},
|
||||||
@ -300,35 +306,17 @@
|
|||||||
let queryData = {
|
let queryData = {
|
||||||
page: this.current_page,
|
page: this.current_page,
|
||||||
per_page: this.per_page,
|
per_page: this.per_page,
|
||||||
moudule: this.form.moudule,
|
module: this.form.module,
|
||||||
action:this.form.action,
|
action:this.form.action,
|
||||||
target_ype:this.form.target_ype,
|
target_type:this.form.target_type,
|
||||||
target_id: this.$route.query.id,
|
target_id: this.$route.query.id?this.$route.query.id:'',
|
||||||
target_field: this.form.targetField,
|
target_field: this.form.targetField?this.form.targetField:'',
|
||||||
user_id: this.form.userId,
|
user_id: this.form.userId,
|
||||||
startTime: this.value1[0],
|
startTime: this.value1[0]?this.value1[0]:'',
|
||||||
endTime: this.value1[1],
|
endTime: this.value1[1]?this.value1[1]:'',
|
||||||
};
|
};
|
||||||
|
|
||||||
// 对象值为空清除
|
recordList(queryData).then((res) => {
|
||||||
const newObj = filterParams(queryData);
|
|
||||||
function filterParams(obj) {
|
|
||||||
const _newPar = {};
|
|
||||||
for (const key in obj) {
|
|
||||||
// 如果对象属性的值不为空，就保存该属性（这里我做了限制，如果属性的值为0，保存该属性。如果属性的值全部是空格，属于为空。）
|
|
||||||
if (
|
|
||||||
(obj[key] === 0 || obj[key]) &&
|
|
||||||
obj[key].toString().replace(/(^\s*)|(\s*$)/g, "") !== ""
|
|
||||||
) {
|
|
||||||
// 记录属性
|
|
||||||
_newPar[key] = obj[key];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
// 返回对象
|
|
||||||
return _newPar;
|
|
||||||
}
|
|
||||||
|
|
||||||
recordList(newObj).then((res) => {
|
|
||||||
this.tableData = res.data.data;
|
this.tableData = res.data.data;
|
||||||
this.Paginationdata = res.data.meta;
|
this.Paginationdata = res.data.meta;
|
||||||
});
|
});
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user