diff --git a/src/api/knifemold/tool-info.js b/src/api/knifemold/tool-info.js
index 70ebbb6..ab38a84 100644
--- a/src/api/knifemold/tool-info.js
+++ b/src/api/knifemold/tool-info.js
@@ -50,7 +50,6 @@ export const updatePoReceiptListR = data => createAPI(`toolInfo/updatePoReceiptL
export const updateToolDetailInfo = data => createAPI(`toolInfo/updateToolDetailInfo`, 'POST', data)
-
// 修改工具接收编码
export const updateReceiveToolDetail = data => createAPI(`PRHeader/updateReceiveToolDetail`, 'POST', data)
diff --git a/src/views/modules/knifemold/tool-info.vue b/src/views/modules/knifemold/tool-info.vue
index 33ebf70..0c11ecf 100644
--- a/src/views/modules/knifemold/tool-info.vue
+++ b/src/views/modules/knifemold/tool-info.vue
@@ -3,16 +3,19 @@
-
+
- {{scope.row[item.columnProp]}}
+ {{ scope.row[item.columnProp] }}
@@ -218,7 +238,7 @@
-
+
- {{scope.row[item.columnProp]}}
+ {{ scope.row[item.columnProp] }}
@@ -268,7 +288,7 @@
:min-width="item.columnWidth"
:label="item.columnLabel">
- {{scope.row[item.columnProp]}}
+ {{ scope.row[item.columnProp] }}
@@ -293,7 +313,7 @@
- {{labels.headerInputLabel5}}
+ {{ labels.headerInputLabel5 }}
@@ -301,7 +321,7 @@
v-model="editHeaderData.familyName">
- {{labels.headerInputLabel7}}
+ {{ labels.headerInputLabel7 }}
@@ -322,8 +342,8 @@
@@ -342,7 +362,7 @@
- {{labels.supplierId}}
+ {{ labels.supplierId }}
@@ -385,7 +405,7 @@
+ v-model="editData.lifespan">
@@ -395,8 +415,8 @@
@@ -441,6 +461,7 @@ import {
getToolInstanceIdUseHist,
getSfdcToolingHistList,
getToolHeaderList,
+ updateToolDetailInfo,
updateToolDetail,
saveToolInfoDetail,
editToolHeader,
@@ -454,7 +475,8 @@ import {
import {
searchProcessRouteTool,
} from "@/api/base/productProcessRoute.js"
-var functionId='106001003';
+
+var functionId = '106001003';
export default {
components: {
column,
@@ -465,7 +487,7 @@ export default {
authEdit: false,
authAdd: false,
authDelete: false,
- jumpFlag:true,
+ jumpFlag: true,
menuId: this.$route.meta.menuId,
labels: {
tip1: '未投用',
@@ -503,24 +525,24 @@ export default {
leftInputLabel15: '工具实例信息',
rightInputLabel1: '工具使用记录:',
rightInputLabel2: '工具维修记录:',
- tool:'工具实例',
- dataInfo:'数据明细/编辑',
- placeholder:'请选择',
- locationId:'库位编码',
- productlist:'使用该工具的产品清单',
- toolInfo:'工具信息',
- supplierId:'供应商编码',
- placeholder2:'选择日期',
- point:'提示',
- true:'确定',
- cancel:'取消',
- deleteAsk:'确定进行删除操作?',
- toolInstanceIdIn:'请选择工具信息!',
- warning1:'预计使用寿命必须大于0',
- toolIdIn:'工具编号不能为空,请选择',
- familyIdIn:'工具分类不能为空,请选择',
- umidIn:'计量单位不能为空,请选择',
- cancelAsk:'是否取消收藏?',
+ tool: '工具实例',
+ dataInfo: '数据明细/编辑',
+ placeholder: '请选择',
+ locationId: '库位编码',
+ productlist: '使用该工具的产品清单',
+ toolInfo: '工具信息',
+ supplierId: '供应商编码',
+ placeholder2: '选择日期',
+ point: '提示',
+ true: '确定',
+ cancel: '取消',
+ deleteAsk: '确定进行删除操作?',
+ toolInstanceIdIn: '请选择工具信息!',
+ warning1: '预计使用寿命必须大于0',
+ toolIdIn: '工具编号不能为空,请选择',
+ familyIdIn: '工具分类不能为空,请选择',
+ umidIn: '计量单位不能为空,请选择',
+ cancelAsk: '是否取消收藏?',
},
buttons: {
add: '添加',
@@ -530,12 +552,12 @@ export default {
cz: '操作',
search: '查询',
download: '导出',
- new:'新增',
- new2:'新建',
- toolPrint:'工具标签',
- toolPrint2:'网版',
- true:'确定',
- cancel:'取消',
+ new: '新增',
+ new2: '新建',
+ toolPrint: '工具标签',
+ toolPrint2: '网版',
+ true: '确定',
+ cancel: '取消',
},
queryButton: {
functionId: functionId,
@@ -661,6 +683,7 @@ export default {
strPhaseInDate: '',
strPhaseOutDate: '',
strPurchaseDate: '',
+ lifespan: ''
},
detailList: [],
headerData: {
@@ -819,7 +842,7 @@ export default {
userId: this.$store.state.user.name,
functionId: 106001003,
tableId: "service106001003",
- serialNumber: '106001003Table2strDeliveryDate',
+ serialNumber: '106001003Table2strDeliveryDate',
tableName: "工具维修记录",
columnProp: "strDeliveryDate",
headerAlign: "center",
@@ -836,7 +859,7 @@ export default {
userId: this.$store.state.user.name,
functionId: 106001003,
tableId: "service106001003",
- serialNumber: '106001003Table2supplierName',
+ serialNumber: '106001003Table2supplierName',
tableName: "工具维修记录",
columnProp: "supplierName",
headerAlign: "center",
@@ -853,7 +876,7 @@ export default {
userId: this.$store.state.user.name,
functionId: 106001003,
tableId: "service106001003",
- serialNumber: '106001003Table2strReturnDate',
+ serialNumber: '106001003Table2strReturnDate',
tableName: "工具维修记录",
columnProp: "strReturnDate",
headerAlign: "center",
@@ -870,7 +893,7 @@ export default {
userId: this.$store.state.user.name,
functionId: 106001003,
tableId: "service106001003",
- serialNumber: '106001003Table2createdBy',
+ serialNumber: '106001003Table2createdBy',
tableName: "工具维修记录",
columnProp: "createdBy",
headerAlign: "center",
@@ -906,8 +929,8 @@ export default {
routeToolList: [
{
userId: this.$store.state.user.name,
- functionId: 106001003,
- serialNumber: '106001003Table3PartNo',
+ functionId: 106001003,
+ serialNumber: '106001003Table3PartNo',
tableId: "106001003Table3",
tableName: "工具使用清单",
columnProp: "partNo",
@@ -924,8 +947,8 @@ export default {
},
{
userId: this.$store.state.user.name,
- functionId: 106001003,
- serialNumber: '106001003Table3PartDescription',
+ functionId: 106001003,
+ serialNumber: '106001003Table3PartDescription',
tableId: "106001003Table3",
tableName: "工具使用清单",
columnProp: "partDescription",
@@ -942,8 +965,8 @@ export default {
},
{
userId: this.$store.state.user.name,
- functionId: 106001003,
- serialNumber: '106001003Table3Spec',
+ functionId: 106001003,
+ serialNumber: '106001003Table3Spec',
tableId: "106001003Table3",
tableName: "工具使用清单",
columnProp: "spec",
@@ -960,8 +983,8 @@ export default {
},
{
userId: this.$store.state.user.name,
- functionId: 106001003,
- serialNumber: '106001003Table3RevNo',
+ functionId: 106001003,
+ serialNumber: '106001003Table3RevNo',
tableId: "106001003Table3",
tableName: "工具使用清单",
columnProp: "revNo",
@@ -978,8 +1001,8 @@ export default {
},
{
userId: this.$store.state.user.name,
- functionId: 106001003,
- serialNumber: '106001003Table3ItemNo',
+ functionId: 106001003,
+ serialNumber: '106001003Table3ItemNo',
tableId: "106001003Table3",
tableName: "工具使用清单",
columnProp: "itemNo",
@@ -996,8 +1019,8 @@ export default {
},
{
userId: this.$store.state.user.name,
- functionId: 106001003,
- serialNumber: '106001003Table3active',
+ functionId: 106001003,
+ serialNumber: '106001003Table3active',
tableId: "106001003Table3",
tableName: "工具使用清单",
columnProp: "active",
@@ -1015,8 +1038,8 @@ export default {
{
userId: this.$store.state.user.name,
- functionId: 106001003,
- serialNumber: '106001003Table3toolqty',
+ functionId: 106001003,
+ serialNumber: '106001003Table3toolqty',
tableId: "106001003Table3",
tableName: "工具使用清单",
columnProp: "toolqty",
@@ -1033,8 +1056,8 @@ export default {
},
{
userId: this.$store.state.user.name,
- functionId: 106001003,
- serialNumber: '106001003Table3remark',
+ functionId: 106001003,
+ serialNumber: '106001003Table3remark',
tableId: "106001003Table3",
tableName: "工具使用清单",
columnProp: "remark",
@@ -1051,8 +1074,8 @@ export default {
},
{
userId: this.$store.state.user.name,
- functionId: 106001003,
- serialNumber: '106001003Table3createdate',
+ functionId: 106001003,
+ serialNumber: '106001003Table3createdate',
tableId: "106001003Table3",
tableName: "工具使用清单",
columnProp: "createdate",
@@ -1069,8 +1092,8 @@ export default {
},
{
userId: this.$store.state.user.name,
- functionId: 106001003,
- serialNumber: '106001003Table3createby',
+ functionId: 106001003,
+ serialNumber: '106001003Table3createby',
tableId: "106001003Table3",
tableName: "工具使用清单",
columnProp: "createby",
@@ -1215,7 +1238,7 @@ export default {
deleteToolHeader() {
this.$confirm(this.labels.deleteAsk, this.labels.point, {
confirmButtonText: this.labels.true,
- cancelButtonText:this.labels.cancel,
+ cancelButtonText: this.labels.cancel,
type: 'warning'
}).then(() => {
let dto = {
@@ -1447,7 +1470,7 @@ export default {
return
}
if (this.toolDetailAddOrEdit) {
- await updateToolDetail(this.editData).then(({data}) => {
+ await updateToolDetailInfo(this.editData).then(({data}) => {
if (data.code == 0) {
this.$message.success(data.msg)
this.setUp.toolEditFlag = false
@@ -1649,7 +1672,7 @@ export default {
favoriteFunction() {
let userFavorite = {
userId: this.$store.state.user.id,
- functionId: 106001003,
+ functionId: 106001003,
}
if (this.favorite) {
// 取消收藏
@@ -1785,7 +1808,7 @@ export default {
columnSortable: item.columnSortable,
columnWidth: item.columnWidth,
format: item.format,
- functionId: 106001003,
+ functionId: 106001003,
sortLv: item.sortLv,
status: true,
fixed: item.fixed,
@@ -1799,7 +1822,7 @@ export default {
// 保存页面 button label title 属性
let buttons = this.buttonList.map(item => {
return item = {
- functionId: 106001003,
+ functionId: 106001003,
languageValue: item.languageValue,
objectId: item.objectId,
objectType: item.objectType,
@@ -1902,12 +1925,12 @@ export default {
finishDownload() {
},
//获取按钮的权限数据
- getButtonAuthData(){
- let updateFlag = this.isAuth(this.menuId+":revise");
- let fullControFlag = this.isAuth(this.menuId+":fullContro");
- let deleteFlag = this.isAuth(this.menuId+":remove");
+ getButtonAuthData() {
+ let updateFlag = this.isAuth(this.menuId + ":revise");
+ let fullControFlag = this.isAuth(this.menuId + ":fullContro");
+ let deleteFlag = this.isAuth(this.menuId + ":remove");
//处理页面的权限数据
- this.authEdit = !updateFlag ||!fullControFlag;
+ this.authEdit = !updateFlag || !fullControFlag;
this.authAdd = !fullControFlag;
this.authDelete = !deleteFlag;
@@ -1946,7 +1969,7 @@ export default {
// 获取 tableDefault 列
async getColumnList2(tableId, columnId) {
this.queryTable.tableId = tableId
- let queryTable= {
+ let queryTable = {
functionId: this.$route.meta.menuId,
tableId: tableId,
languageCode: this.$i18n.locale
@@ -1975,9 +1998,9 @@ export default {
},
created() {
- this.getTableUserColumn2('toolUseHist106001003',1)
- this.getTableUserColumn2('service106001003',2)
- this.getTableUserColumn2('106001003Table3',3)
+ this.getTableUserColumn2('toolUseHist106001003', 1)
+ this.getTableUserColumn2('service106001003', 2)
+ this.getTableUserColumn2('106001003Table3', 3)
//获取按钮的权限
this.getButtonAuthData();
this.getTableUserColumn()