Skip to content

T
template_vue
Commit f93e5086 authored by 高宇's avatar 高宇
Browse files
Options

Merge remote-tracking branch 'origin/project1' into project1

parents bbc0a031 d844afe8
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1487 additions and 810 deletions
src/api/equipment/draw.js 0 → 100644
View file @ f93e5086
import request from '@/utils/request'
import Qs from 'qs'
// 查询基础信息列表
export function listWbApply(query) {
return request({
url: '/wbapply/queryWbApplyByPagination',
method: 'get',
params: query
})
}
export function getlistRole() {
return request({
url: 'system/role/listAll',
method: 'get'
})
}
// 查询角色详细
export function getRole(businessId) {
return request({
url: '/system/role/detail/' + businessId,
method: 'get'
})
}
// 新增角色
export function addRole(data) {
data = Qs.stringify(data)
return request({
url: '/system/role/add',
method: 'post',
data: data,
headers: {
'Content-Type': 'application/x-www-form-urlencoded'
}
})
}
// 修改角色
export function updateRole(data) {
const businessId = data.businessId
data = Qs.stringify(data)
return request({
url: '/system/role/update/' + businessId,
method: 'put',
data,
headers: {
'Content-Type': 'application/x-www-form-urlencoded'
}
})
}
// 角色数据权限
export function dataScope(data) {
data = Qs.stringify(data)
return request({
url: '/system/role/dataScope',
method: 'put',
data,
headers: {
'Content-Type': 'application/x-www-form-urlencoded'
}
})
}
// 角色状态修改
export function changeRoleStatus(businessId, flag) {
const data = {
businessId,
flag
}
return request({
url: '/system/role/changeStatus',
method: 'put',
params: data
})
}
// 删除角色
export function delRole(roleId) {
return request({
url: '/system/role/deleteLogical/' + roleId,
method: 'delete'
})
}
// 导出角色
export function exportRole(query) {
return request({
url: '/system/role/export',
method: 'get',
params: query,
responseType: 'blob'
})
}
src/api/processLibrary/InventoryRecord.js
View file @ f93e5086
import request from '@/utils/request' import request from '@/utils/request'
export function listLog(queryParams) { export function listLog(queryParams) {
console.log('this is date:', queryParams.dateRange)
return request({ return request({
url: '/wbwarehouselog/queryWbWarehouseLogByPagination', url: '/wbwarehouselog/queryWbWarehouseLogByPagination',
method: 'get', method: 'get',
......
src/components/Table/BaseTable/index.vue
View file @ f93e5086
<template> <template>
<div> <div style="padding:5px 10px">
<div class="mb12 font-small-bold">{{ allTableArguments.listName }}</div> <div class="mb12 font-small-bold">{{ allTableArguments.listName }}</div>
<div class="tableList" style="height:600px;"> <div class="tableList" style=" height:600px;">
<el-scrollbar style="height: 100%;"> <el-scrollbar style="height: 100%;">
<el-table <el-table
v-loading="allTableArguments.loading" v-loading="allTableArguments.loading"
...@@ -11,46 +11,6 @@ ...@@ -11,46 +11,6 @@
style="width: 100%" style="width: 100%"
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
> >
<!-- <el-table-column type="index" label="序号" width="50" :index="allTableArguments.nIndex" />-->
<!-- <el-table-column label="工序名称" prop="processName" :show-overflow-tooltip="true">-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.processName || '-' }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="生产车间" prop="workshop">-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.workshop || '-' }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="操作时间" :show-overflow-tooltip="true" align="center" prop="createTime">-->
<!-- <template slot-scope="scope">-->
<!-- <span>{{ scope.row.createTime | transformDateByFormat('YYYY-MM-DD HH:mm') }}</span>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="操作人" prop="createBy" width="210px">-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.createBy || '-' }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column-->
<!-- label="操作"-->
<!-- class-name="small-padding fixed-width"-->
<!-- width="180px"-->
<!-- >-->
<!-- <template slot-scope="scope">-->
<!-- <div class="processListBtns">-->
<!-- <el-button :type="typeParent" :size="size" @click="handleDetail(scope.row)">-->
<!-- 详情-->
<!-- </el-button>-->
<!-- <el-button :type="typeParent" :size="size" @click="handleUpdate(scope.row)">-->
<!-- 修改-->
<!-- </el-button>-->
<!-- <el-button :type="typeParent" :size="size" @click="handleDelete(scope.row)">-->
<!-- 删除-->
<!-- </el-button>-->
<!-- </div>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column type="index" label="序号" width="50" :index="allTableArguments.nIndex" /> <el-table-column type="index" label="序号" width="50" :index="allTableArguments.nIndex" />
...@@ -100,14 +60,14 @@ ...@@ -100,14 +60,14 @@
<!-- 操作按钮 --> <!-- 操作按钮 -->
<span v-if="column.isOperation" class="processListBtns"> <span v-if="column.isOperation" class="processListBtns">
<span v-for="(operations, index) in column.operation" :key="index"> <span v-for="(operations, index) in column.operation" :key="index">
<el-button v-if="operations.isShow(row,$index)" :icon="operations.icon" :type="typeParent" :style="{color:operations.color}" :size="size" @click="operations.buttonClick(row,$index)">{{ operations.label }}</el-button> <el-button v-if=" operations.clickType === '1' " :icon="operations.icon" :type="typeParent" :style="{color:operations.color}" :size="size" @click="handleDetail">{{ operations.label }}</el-button>
<el-button v-else-if=" operations.clickType === '2' " :icon="operations.icon" :type="typeParent" :style="{color:operations.color}" :size="size" @click="handleUpdate">{{ operations.label }}</el-button>
<el-button v-else-if=" operations.clickType === '3' " :icon="operations.icon" :type="typeParent" :style="{color:operations.color}" :size="size" @click="handleDelete">{{ operations.label }}</el-button>
</span> </span>
</span> </span>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
</el-scrollbar> </el-scrollbar>
<div /> <div />
</div> </div>
...@@ -171,7 +131,7 @@ export default { ...@@ -171,7 +131,7 @@ export default {
/* TODO: 这里是控制内容列表的样式 */ /* TODO: 这里是控制内容列表的样式 */
.processListBtns { .processListBtns {
.el-button { .el-button {
margin: 0 7px; margin: 0 12px;
} }
} }
......
src/views/equipment/basicInfo.vue
View file @ f93e5086
This diff is collapsed.
src/views/equipment/boundManagement.vue
View file @ f93e5086
...@@ -152,7 +152,6 @@ ...@@ -152,7 +152,6 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="plocation：" prop="plocation"> <el-form-item label="plocation：" prop="plocation">
...@@ -160,21 +159,8 @@ ...@@ -160,21 +159,8 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label=" 操作时间：" prop="createDate"> <el-form-item label="厚度：" prop="phd">
<el-input v-model.trim="singleDetails.createDate" :readonly="true" /> <el-input v-model.trim="singleDetails.phd" :readonly="true" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="操作员：" prop="createName">
<el-input v-model.trim="singleDetails.createName" :readonly="true" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="prank：" prop="prank">
<el-input v-model.trim="singleDetails.prank" :readonly="true" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -190,10 +176,22 @@ ...@@ -190,10 +176,22 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-form-item label="厚度：" prop="phd"> <el-form-item label="parnk：" prop="prank">
<el-input v-model.trim="singleDetails.phd" :readonly="true" /> <el-input v-model.trim="singleDetails.prank" :readonly="true" />
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-row>
<el-col :span="12">
<el-form-item label="操作员：" prop="createName">
<el-input v-model.trim="singleDetails.createName" :readonly="true" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label=" 操作时间：" prop="createDate">
<el-input v-model.trim="singleDetails.createDate" :readonly="true" />
</el-form-item>
</el-col>
</el-row>
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
......
src/views/equipment/draw.vue
View file @ f93e5086
This diff is collapsed.
src/views/equipment/management.vue
View file @ f93e5086
...@@ -140,7 +140,6 @@ ...@@ -140,7 +140,6 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="plocation：" prop="plocation"> <el-form-item label="plocation：" prop="plocation">
...@@ -148,21 +147,8 @@ ...@@ -148,21 +147,8 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label=" 操作时间：" prop="createDate"> <el-form-item label="厚度：" prop="phd">
<el-input v-model.trim="singleDetails.createDate" :readonly="true" /> <el-input v-model.trim="singleDetails.phd" :readonly="true" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="操作员：" prop="createName">
<el-input v-model.trim="singleDetails.createName" :readonly="true" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="prank：" prop="prank">
<el-input v-model.trim="singleDetails.prank" :readonly="true" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -178,10 +164,22 @@ ...@@ -178,10 +164,22 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-form-item label="厚度：" prop="phd"> <el-form-item label="parnk：" prop="prank">
<el-input v-model.trim="singleDetails.phd" :readonly="true" /> <el-input v-model.trim="singleDetails.prank" :readonly="true" />
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-row>
<el-col :span="12">
<el-form-item label="操作员：" prop="createName">
<el-input v-model.trim="singleDetails.createName" :readonly="true" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label=" 操作时间：" prop="createDate">
<el-input v-model.trim="singleDetails.createDate" :readonly="true" />
</el-form-item>
</el-col>
</el-row>
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
......
src/views/processManagement/basicProcessManagement/index.vue
View file @ f93e5086
...@@ -149,7 +149,6 @@ ...@@ -149,7 +149,6 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="plocation：" prop="plocation"> <el-form-item label="plocation：" prop="plocation">
...@@ -157,21 +156,8 @@ ...@@ -157,21 +156,8 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label=" 操作时间：" prop="createDate"> <el-form-item label="厚度：" prop="phd">
<el-input v-model.trim="singleDetails.createDate" :readonly="true" /> <el-input v-model.trim="singleDetails.phd" :readonly="true" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="操作员：" prop="createName">
<el-input v-model.trim="singleDetails.createName" :readonly="true" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="prank：" prop="prank">
<el-input v-model.trim="singleDetails.prank" :readonly="true" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -187,10 +173,22 @@ ...@@ -187,10 +173,22 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-form-item label="厚度：" prop="phd"> <el-form-item label="parnk：" prop="prank">
<el-input v-model.trim="singleDetails.phd" :readonly="true" /> <el-input v-model.trim="singleDetails.prank" :readonly="true" />
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-row>
<el-col :span="12">
<el-form-item label="操作员：" prop="createName">
<el-input v-model.trim="singleDetails.createName" :readonly="true" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label=" 操作时间：" prop="createDate">
<el-input v-model.trim="singleDetails.createDate" :readonly="true" />
</el-form-item>
</el-col>
</el-row>
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
......
src/views/processManagement/draw.vue 0 → 100644
View file @ f93e5086
This diff is collapsed.
src/views/system/user/index.vue
View file @ f93e5086
...@@ -184,8 +184,8 @@ ...@@ -184,8 +184,8 @@
<pagination <pagination
v-show="total>0" v-show="total>0"
:total="total" :total="total"
:page.sync="queryParams.pageNum" :page.sync="queryParams.page"
:limit.sync="queryParams.pageSize" :limit.sync="queryParams.rows"
@pagination="getList" @pagination="getList"
/> />
</el-col> </el-col>
...@@ -529,8 +529,8 @@ export default { ...@@ -529,8 +529,8 @@ export default {
}, },
// 查询参数 // 查询参数
queryParams: { queryParams: {
pageNum: 1, page: 1,
pageSize: 10, rows: 10,
username: undefined, username: undefined,
email: undefined, email: undefined,
phone: undefined, phone: undefined,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment