kelvin/wms-gj-vue
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

refactor: 名称修改

Browse Source
This commit is contained in:
LJW 2024-11-21 14:35:37 +08:00
parent 60e9c84b05
commit 0e6a53ad70
15 changed files with 63 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/api/mes/md/baseKnife.js
View File

@ -1,6 +1,6 @@
import request from '@/utils/request'
// 查询刀具台账列表
// 查询工具台账列表
export function listBaseKnife(query) {
return request({
url: '/mes/md/baseKnife/list',
@ -9,7 +9,7 @@ export function listBaseKnife(query) {
})
}
// 查询刀具台账详细
// 查询工具台账详细
export function getBaseKnife(baseKnifeId) {
return request({
url: '/mes/md/baseKnife/' + baseKnifeId,
@ -25,7 +25,7 @@ export function isDuplicateRfid(rfid) {
})
}
// 新增刀具台账
// 新增工具台账
export function addBaseKnife(data) {
return request({
url: '/mes/md/baseKnife',
@ -34,7 +34,7 @@ export function addBaseKnife(data) {
})
}
// 修改刀具台账
// 修改工具台账
export function updateBaseKnife(data) {
return request({
url: '/mes/md/baseKnife',
@ -43,7 +43,7 @@ export function updateBaseKnife(data) {
})
}
// 删除刀具台账
// 删除工具台账
export function delBaseKnife(baseKnifeId) {
return request({
url: '/mes/md/baseKnife/' + baseKnifeId,
@ -51,7 +51,7 @@ export function delBaseKnife(baseKnifeId) {
})
}
// 重置刀具台账寿命
// 重置工具台账寿命
export function resetBaseKnife(baseKnifeId) {
return request({
url: '/mes/md/baseKnife/reset/' + baseKnifeId,

14
src/api/mes/md/inventoryBatch.js
View File

@ -1,6 +1,6 @@
import request from '@/utils/request'
// 查询刀具台账列表
// 查询工具台账列表
export function listInventoryBatch(query) {
return request({
url: '/mes/md/inventoryBatch/list',
@ -9,7 +9,7 @@ export function listInventoryBatch(query) {
})
}
// 查询刀具台账详细
// 查询工具台账详细
export function getBaseKnife(baseKnifeId) {
return request({
url: '/mes/md/baseKnife/' + baseKnifeId,
@ -17,7 +17,7 @@ export function getBaseKnife(baseKnifeId) {
})
}
// 新增刀具台账
// 新增工具台账
export function addBaseKnife(data) {
return request({
url: '/mes/md/baseKnife',
@ -26,7 +26,7 @@ export function addBaseKnife(data) {
})
}
// 修改刀具台账
// 修改工具台账
export function updateBaseKnife(data) {
return request({
url: '/mes/md/baseKnife',
@ -35,7 +35,7 @@ export function updateBaseKnife(data) {
})
}
// 删除刀具台账
// 删除工具台账
export function delBaseKnife(baseKnifeId) {
return request({
url: '/mes/md/baseKnife/' + baseKnifeId,
@ -43,7 +43,7 @@ export function delBaseKnife(baseKnifeId) {
})
}
// 重置刀具台账寿命
// 重置工具台账寿命
export function resetBaseKnife(baseKnifeId) {
return request({
url: '/mes/md/baseKnife/reset/' + baseKnifeId,
@ -51,7 +51,7 @@ export function resetBaseKnife(baseKnifeId) {
})
}
// 重置刀具台账寿命
// 重置工具台账寿命
export function submitZdTask(data) {
return request({
url: '/mes/md/baseKnife/zdTask',

2
src/components/Editor/index.vue
View File

@ -71,7 +71,7 @@ export default {
bounds: document.body,
debug: "warn",
modules: {
// 刀具栏配置
// 工具栏配置
toolbar: [
["bold", "italic", "underline", "strike"], // 加粗 斜体 下划线 删除线
["blockquote", "code-block"], // 引用 代码块

2
src/components/qcindexSelect/single.vue
View File

@ -43,7 +43,7 @@
<dict-tag :options="dict.type.mes_index_type" :value="scope.row.indexType"/>
</template>
</el-table-column>
<el-table-column label="检测刀具" align="center" prop="qcTool" />
<el-table-column label="检测工具" align="center" prop="qcTool" />
</el-table>
<pagination
v-show="total>0"

2
src/main.js
View File

@ -24,7 +24,7 @@ import { parseTime, resetForm, addDateRange, selectDictLabel, selectDictLabels,
import { checkPermi } from './utils/permission';
// 分页组件
import Pagination from "@/components/Pagination";
// 自定义表格刀具组件
// 自定义表格工具组件
import RightToolbar from "@/components/RightToolbar"
// 富文本组件
import Editor from "@/components/Editor"

2
src/utils/calendar.js
View File

@ -567,7 +567,7 @@ const calendar = {
// 农历节日修正：农历12月小月则29号除夕，大月则30号除夕
// 此处取巧修正：当前为农历12月29号时增加一次判断并且把lunarFestivalDate设置为12-30以正确取得除夕
// 天朝农历节日遇闰月过前不过后的原则，此处取农历12月天数不考虑闰月
// 农历润12月在本刀具支持的200年区间内仅1574年出现
// 农历润12月在本工具支持的200年区间内仅1574年出现
if (month === 12 && day === 29 && this.monthDays(year, month) === 29) {
lunarFestivalDate = '12-30';
}

16
src/views/index_v1.vue
View File

@ -364,7 +364,7 @@
<li>更多操作按钮添加权限控制</li>
<li>导入用户样式优化</li>
<li>提取通用方法到基类控制器</li>
<li>优化使用权限刀具获取用户信息</li>
<li>优化使用权限工具获取用户信息</li>
<li>优化用户不能删除自己</li>
<li>优化XSS跨站脚本过滤</li>
<li>优化代码生成模板</li>
@ -394,7 +394,7 @@
<li>FileUpload组件支持多文件上传</li>
<li>文件上传组件添加数量限制属性</li>
<li>富文本编辑组件添加类型属性</li>
<li>富文本组件刀具栏配置视频</li>
<li>富文本组件工具栏配置视频</li>
<li>封装通用iframe组件</li>
<li>限制超级管理员不允许操作</li>
<li>用户信息长度校验限制</li>
@ -412,7 +412,7 @@
<li>修复用户搜索分页变量错误</li>
<li>修复导出角色数据范围翻译缺少仅本人</li>
<li>修复表单构建选择下拉选择控制台报错问题</li>
<li>优化图片刀具类读取文件</li>
<li>优化图片工具类读取文件</li>
<li>其他细节优化</li>
</ol>
</el-collapse-item>
@ -459,7 +459,7 @@
<el-collapse-item title="v3.4.0 - 2021-02-22">
<ol>
<li>代码生成模板支持主子表</li>
<li>表格右侧刀具栏组件支持显隐列</li>
<li>表格右侧工具栏组件支持显隐列</li>
<li>图片组件添加预览&移除功能</li>
<li>Excel注解支持Image图片导出</li>
<li>操作按钮组调整为朴素按钮样式</li>
@ -477,7 +477,7 @@
<li>修正侧边栏静态路由丢失问题</li>
<li>修复角色管理-编辑角色-功能权限显示异常</li>
<li>配置文件新增redis数据库索引属性</li>
<li>权限刀具类增加admin判断</li>
<li>权限工具类增加admin判断</li>
<li>角色非自定义权限范围清空选择值</li>
<li>修复导入数据为负浮点数时丢失精度问题</li>
<li>移除path-to-regexp正则匹配插件</li>
@ -582,7 +582,7 @@
<li>表格操作列间距调整</li>
<li>限制系统内置参数不允许删除</li>
<li>富文本组件优化，支持自定义高度&图片冲突问题</li>
<li>富文本刀具栏样式对齐</li>
<li>富文本工具栏样式对齐</li>
<li>导入excel整形值校验优化</li>
<li>修复页签关闭所有时固定标签路由不刷新问题</li>
<li>表单构建布局型组件新增按钮</li>
@ -600,7 +600,7 @@
<el-collapse-item title="v3.1.0 - 2020-08-13">
<ol>
<li>表格刀具栏右侧添加刷新&显隐查询组件</li>
<li>表格工具栏右侧添加刷新&显隐查询组件</li>
<li>后端支持CORS跨域请求</li>
<li>代码生成支持选择上级菜单</li>
<li>代码生成支持自定义路径</li>
@ -646,7 +646,7 @@
<li>修复布局为small者mini用户表单显示错位问题</li>
<li>修复热部署导致的强换异常问题</li>
<li>修改用户管理复选框宽度，防止部分浏览器出现省略号</li>
<li>IpUtils刀具，清除Xss特殊字符，防止Xff注入攻击</li>
<li>IpUtils工具，清除Xss特殊字符，防止Xff注入攻击</li>
<li>生成domain 如果是浮点型 统一用BigDecimal</li>
<li>定时任务调整label-width，防止部署出现错位</li>
<li>调整表头固定列默认样式</li>

2
src/views/login.vue
View File

@ -1,7 +1,7 @@
<template>
<div class="login">
<el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
<h3 class="title">智能刀具库WMS（内部）V1.0.0</h3>
<h3 class="title">智能工具库WMS（内部）V1.0.0</h3>
<el-form-item prop="username">
<el-input
v-model="loginForm.username"

12
src/views/mes/md/baseKnife/baseKnifeSelectCmps.vue
View File

@ -58,7 +58,7 @@ export default {
this.$emit("change", e);
this.handleClose();
},
/** 查询刀具台账列表 */
/** 查询工具台账列表 */
getList() {
this.loading = true;
@ -83,8 +83,8 @@ export default {
<!-- <el-table-column label="更新时间" align="center" prop="baseKnifeId" />-->
<el-table-column label="#" align="center" prop="baseKnifeId" min-width="55" :show-overflow-tooltip="true"/>
<!-- <el-table-column label="rfid" align="center" prop="rfid" />-->
<el-table-column label="刀具编码" align="center" prop="knifeCode" min-width="180" :show-overflow-tooltip="true"/>
<el-table-column label="刀具名称" align="center" prop="knifeName" min-width="180" :show-overflow-tooltip="true"/>
<el-table-column label="工具编码" align="center" prop="knifeCode" min-width="180" :show-overflow-tooltip="true"/>
<el-table-column label="工具名称" align="center" prop="knifeName" min-width="180" :show-overflow-tooltip="true"/>
<el-table-column label="物料类型" align="center" key="itemOrProduct" prop="itemOrProduct"
:show-overflow-tooltip="true">
<template slot-scope="scope">
@ -92,12 +92,12 @@ export default {
</template>
</el-table-column>
<!-- <el-table-column label="计量单位" align="center" prop="knifeUnit" min-width="120" />-->
<!-- <el-table-column label="刀具类型" align="center" prop="knifeType" min-width="120" />-->
<!-- <el-table-column label="工具类型" align="center" prop="knifeType" min-width="120" />-->
<!-- <el-table-column label="安全库存" align="center" prop="safeStock" />-->
<!-- <el-table-column label="标准数量" align="center" prop="standardQuantity" />-->
<el-table-column label="库位编码" align="center" prop="areaCode" min-width="120" :show-overflow-tooltip="true"/>
<el-table-column label="刀具寿命" align="center" prop="knifeLife" min-width="100" :show-overflow-tooltip="true"/>
<el-table-column label="刀具状态" align="center" prop="knifeFineState" min-width="100"
<el-table-column label="工具寿命" align="center" prop="knifeLife" min-width="100" :show-overflow-tooltip="true"/>
<el-table-column label="工具状态" align="center" prop="knifeFineState" min-width="100"
:show-overflow-tooltip="true">
<template slot-scope="scope">
<dict-tag :options="dict.type.knife_fine_status" :value="scope.row.knifeFineState"/>

44
src/views/mes/md/baseKnife/index.vue
View File

@ -17,7 +17,7 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item label="刀具类型" prop="itemOrProduct">
<el-form-item label="工具类型" prop="itemOrProduct">
<el-select v-model="queryParams.itemOrProduct" placeholder="请选择物料类型" clearable>
<el-option
v-for="dict in dict.type.mes_item_product"
@ -27,8 +27,8 @@
/>
</el-select>
</el-form-item>
<el-form-item label="刀具状态" prop="itemFineState">
<el-select v-model="queryParams.itemFineState" placeholder="请选择刀具状态" clearable>
<el-form-item label="工具状态" prop="itemFineState">
<el-select v-model="queryParams.itemFineState" placeholder="请选择工具状态" clearable>
<el-option
v-for="dict in dict.type.knife_fine_status"
:key="dict.value"
@ -59,8 +59,8 @@
<!-- <el-table-column label="更新时间" align="center" prop="baseKnifeId" />-->
<el-table-column label="台账ID" align="center" prop="baseKnifeId" min-width="55" :show-overflow-tooltip="true"/>
<!-- <el-table-column label="rfid" align="center" prop="rfid" />-->
<el-table-column label="刀具编码" align="center" prop="knifeCode" min-width="180" :show-overflow-tooltip="true"/>
<el-table-column label="刀具名称" align="center" prop="knifeName" min-width="180" :show-overflow-tooltip="true"/>
<el-table-column label="工具编码" align="center" prop="knifeCode" min-width="180" :show-overflow-tooltip="true"/>
<el-table-column label="工具名称" align="center" prop="knifeName" min-width="180" :show-overflow-tooltip="true"/>
<el-table-column label="物料类型" align="center" key="itemOrProduct" prop="itemOrProduct"
:show-overflow-tooltip="true">
<template slot-scope="scope">
@ -68,12 +68,12 @@
</template>
</el-table-column>
<!-- <el-table-column label="计量单位" align="center" prop="knifeUnit" min-width="120" />-->
<!-- <el-table-column label="刀具类型" align="center" prop="knifeType" min-width="120" />-->
<!-- <el-table-column label="工具类型" align="center" prop="knifeType" min-width="120" />-->
<!-- <el-table-column label="安全库存" align="center" prop="safeStock" />-->
<!-- <el-table-column label="标准数量" align="center" prop="standardQuantity" />-->
<el-table-column label="库位名称" align="center" prop="areaName" min-width="120" :show-overflow-tooltip="true"/>
<el-table-column label="刀具寿命" align="center" prop="knifeLife" min-width="100" :show-overflow-tooltip="true"/>
<el-table-column label="刀具状态" align="center" prop="knifeFineState" min-width="100"
<!-- <el-table-column label="工具寿命" align="center" prop="knifeLife" min-width="100" :show-overflow-tooltip="true"/>-->
<el-table-column label="工具状态" align="center" prop="knifeFineState" min-width="100"
:show-overflow-tooltip="true">
<template slot-scope="scope">
<dict-tag :options="dict.type.knife_fine_status" :value="scope.row.knifeFineState"/>
@ -87,11 +87,11 @@
<!-- <el-table-column label="锁定开始时间" align="center" prop="lockedStartTime" min-width="180" :show-overflow-tooltip="true"/>-->
<!-- <el-table-column label="锁定结束时间" align="center" prop="lockedEndTime" min-width="180" :show-overflow-tooltip="true"/>-->
<el-table-column label="归属计划单" align="center" prop="planSheet" min-width="120"/>
<el-table-column label="重置次数" align="center" prop="resetCount" min-width="100">
<template slot-scope="scope">
<span v-if="scope.row.itemOrProduct == 'PRODUCT'">{{ scope.row.resetCount }}</span>
</template>
</el-table-column>
<!-- <el-table-column label="重置次数" align="center" prop="resetCount" min-width="100">-->
<!-- <template slot-scope="scope">-->
<!-- <span v-if="scope.row.itemOrProduct == 'PRODUCT'">{{ scope.row.resetCount }}</span>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="备注" align="center" prop="remark" />-->
<!-- <el-table-column label="预留字段4" align="center" prop="attr4" />-->
<!-- <el-table-column label="创建者" align="center" prop="createBy" />-->
@ -144,10 +144,10 @@
<el-form-item label="台账编号：">{{ form.baseKnifeId }}</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="刀具编码：">{{ form.knifeCode }}</el-form-item>
<el-form-item label="工具编码：">{{ form.knifeCode }}</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="刀具名称：">{{ form.knifeName }}</el-form-item>
<el-form-item label="工具名称：">{{ form.knifeName }}</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="物料类型：">
@ -155,7 +155,7 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="刀具类型：">{{ form.knifeType }}</el-form-item>
<el-form-item label="工具类型：">{{ form.knifeType }}</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="计量单位：">{{ form.knifeUnit }}</el-form-item>
@ -172,10 +172,10 @@
<el-form-item label="计划单：">{{ form.planSheet }}</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="刀具寿命：">{{ form.knifeLife }}</el-form-item>
<el-form-item label="工具寿命：">{{ form.knifeLife }}</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="刀具状态：">
<el-form-item label="工具状态：">
<dict-tag :options="dict.type.knife_fine_status" :value="form.knifeFineState"/>
</el-form-item>
</el-col>
@ -314,7 +314,7 @@ export default {
showSearch: true,
// 总条数
total: 0,
// 刀具台账表格数据
// 工具台账表格数据
BaseKnifeList: [],
// 物料产品表格数据
mdItemList: [],
@ -360,7 +360,7 @@ export default {
this.getList();
},
methods: {
/** 查询刀具台账列表 */
/** 查询工具台账列表 */
getList() {
this.loading = true;
@ -431,7 +431,7 @@ export default {
handleAdd() {
this.reset();
this.open = true;
this.title = "添加刀具台账";
this.title = "添加工具台账";
},
/** 修改按钮操作 */
handleUpdate(row) {
@ -441,7 +441,7 @@ export default {
this.form = response.data;
this.mdItemList = response.data.mdItemList;
this.open = true;
this.title = "修改刀具台账";
this.title = "修改工具台账";
});
},
/** 提交按钮 */

2
src/views/mes/qc/ipqc/line.vue
View File

@ -8,7 +8,7 @@
<dict-tag :options="dict.type.mes_index_type" :value="scope.row.indexType"/>
</template>
</el-table-column>
<el-table-column label="检测刀具" align="center" prop="qcTool" />
<el-table-column label="检测工具" align="center" prop="qcTool" />
<el-table-column label="检测要求" align="center" prop="checkMethod" />
<el-table-column label="标准值" align="center" prop="standerVal" />
<el-table-column label="单位" align="center" prop="unitOfMeasure" />

2
src/views/mes/qc/iqc/iqcline.vue
View File

@ -7,7 +7,7 @@
<dict-tag :options="dict.type.mes_index_type" :value="scope.row.indexType"/>
</template>
</el-table-column>
<el-table-column label="检测刀具" align="center" prop="qcTool" />
<el-table-column label="检测工具" align="center" prop="qcTool" />
<el-table-column label="检测要求" align="center" prop="checkMethod" />
<el-table-column label="标准值" align="center" prop="standerVal" />
<el-table-column label="单位" align="center" prop="unitOfMeasure" />

2
src/views/mes/qc/oqc/line.vue
View File

@ -9,7 +9,7 @@
<dict-tag :options="dict.type.mes_index_type" :value="scope.row.indexType"/>
</template>
</el-table-column>
<el-table-column label="检测刀具" align="center" prop="qcTool" />
<el-table-column label="检测工具" align="center" prop="qcTool" />
<el-table-column label="检测要求" width="150px" align="center" prop="checkMethod" :show-overflow-tooltip="true"/>
<el-table-column label="标准值" align="center" prop="standerVal" />
<el-table-column label="单位" align="center" prop="unitOfMeasure" />

6
src/views/mes/qc/qcindex/index.vue
View File

@ -88,7 +88,7 @@
<dict-tag :options="dict.type.mes_index_type" :value="scope.row.indexType"/>
</template>
</el-table-column>
<el-table-column label="检测刀具" align="center" prop="qcTool" />
<el-table-column label="检测工具" align="center" prop="qcTool" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
@ -155,8 +155,8 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="检测刀具" prop="qcTool">
<el-input v-model="form.qcTool" placeholder="请输入检测刀具" />
<el-form-item label="检测工具" prop="qcTool">
<el-input v-model="form.qcTool" placeholder="请输入检测工具" />
</el-form-item>
</el-col>
</el-row>

6
src/views/mes/qc/qctemplate/templateindex.vue
View File

@ -44,7 +44,7 @@
<dict-tag :options="dict.type.mes_index_type" :value="scope.row.indexType"/>
</template>
</el-table-column>
<el-table-column label="检测刀具" align="center" prop="qcTool" />
<el-table-column label="检测工具" align="center" prop="qcTool" />
<el-table-column label="检测方法" align="center" prop="checkMethod" :show-overflow-tooltip="true"/>
<el-table-column label="标准值" align="center" prop="standerVal" />
<el-table-column label="单位" align="center" prop="unitOfMeasure" />
@ -91,8 +91,8 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="检测刀具" prop="qcTool">
<el-input v-model="form.qcTool" placeholder="请输入检测刀具" />
<el-form-item label="检测工具" prop="qcTool">
<el-input v-model="form.qcTool" placeholder="请输入检测工具" />
</el-form-item>
</el-col>
</el-row>