wilson
/
rongxing-vue
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

工具明细 2022年12月23日 sxm

master
[li_she] 3 years ago
parent
607167d379
commit
0052506808
2 changed files with 115 additions and 93 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      src/api/knifemold/tool-info.js
  2. 207
      src/views/modules/knifemold/tool-info.vue

1
src/api/knifemold/tool-info.js
View File

@ -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)

207
src/views/modules/knifemold/tool-info.vue
View File

@ -3,16 +3,19 @@
<fieldset class="customer-field" style="width: 100%; padding: 0.35em 0.75em 0.425em;">
<el-row>
<el-col :span="24">
<el-button @click="initToolHeaderModel('Y')" :disabled = "authAdd" type="primary">{{ buttons.new }}</el-button>
<el-button @click="initToolHeaderModel('N')" :disabled = "authEdit" type="primary">{{ buttons.edit }}</el-button>
<el-button @click="deleteToolHeader()" :disabled = "authDelete" type="primary">{{ buttons.delete }}</el-button>
<el-button @click="initToolHeaderModel('Y')" :disabled="authAdd" type="primary">{{ buttons.new }}</el-button>
<el-button @click="initToolHeaderModel('N')" :disabled="authEdit" type="primary">{{
buttons.edit
}}
</el-button>
<el-button @click="deleteToolHeader()" :disabled="authDelete" type="primary">{{ buttons.delete }}</el-button>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form :inline="true" label-position="top" label-width="100px">
<el-form-item>
<el-link slot="label" @click="getBaseList(70)"> {{labels.headerInputLabel1}}</el-link>
<el-link slot="label" @click="getBaseList(70)"> {{ labels.headerInputLabel1 }}</el-link>
<el-input style="width: 100px;"
@keyup.enter.native="getHeaderData"
v-model="headerData.toolId"></el-input> <!---->
@ -76,11 +79,17 @@
<el-row>
<el-col :span="7">
<fieldset class="customer-field" style="width: 98%;">
<legend>{{labels.dataInfo}}</legend>
<legend>{{ labels.dataInfo }}</legend>
<el-form :inline="true" label-position="top" label-width="95px" style="padding: 5px;">
<el-form-item>
<el-button @click="initToolModel('Y')" :disabled = "authAdd" type="primary">{{ buttons.new2 }}</el-button>
<el-button @click="initToolModel('N')" :disabled = "authEdit" type="primary">{{ buttons.edit }}</el-button>
<el-button @click="initToolModel('Y')" :disabled="authAdd" type="primary">{{
buttons.new2
}}
</el-button>
<el-button @click="initToolModel('N')" :disabled="authEdit" type="primary">{{
buttons.edit
}}
</el-button>
<el-button @click="printMethod('Y')" type="primary">{{ buttons.toolPrint }}</el-button>
<el-button @click="printMethod('N')" type="primary">{{ buttons.toolPrint2 }}</el-button>
</el-form-item>
@ -90,7 +99,8 @@
<el-col :span="12">
<el-form-item :label="labels.leftInputLabel1">
<el-select @change="toolInstanceIdChange(currentDetailData.toolInstanceId)"
v-model="currentDetailData.toolInstanceId" :placeholder="labels.placeholder" style="width: 150px;">
v-model="currentDetailData.toolInstanceId" :placeholder="labels.placeholder"
style="width: 150px;">
<el-option
v-for="item in selectList.select4"
:key="item.value"
@ -150,47 +160,57 @@
</el-col>
<el-col :span="12">
<el-form-item :label="labels.leftInputLabel10">
<el-input style="width: 150px;" readonly v-model="currentDetailData.actualUseQty"></el-input>
<el-input style="width: 150px;" readonly v-model="currentDetailData.lifespan"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item :label="'总使用寿命'">
<el-input style="width: 150px;" readonly v-model="currentDetailData.actualUseQty"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item :label="labels.leftInputLabel11">
<el-input style="width: 150px;" readonly v-model="currentDetailData.strCreateDate"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item :label="labels.leftInputLabel12">
<el-input style="width: 150px;" readonly v-model="currentDetailData.createdBy"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item :label="labels.leftInputLabel13">
<el-input style="width: 150px;" readonly v-model="currentDetailData.orderNo"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item :label="labels.locationId">
<el-input style="width: 150px;" readonly v-model="currentDetailData.locationId"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-col :span="12">
<el-form-item :label="labels.leftInputLabel14">
<el-input style="width: 300px;" readonly v-model="currentDetailData.remark"></el-input>
<el-input style="width: 150px;" readonly v-model="currentDetailData.remark"></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
</fieldset>
</el-col>
<el-col :span="17">
<fieldset class="customer-field" style="width: 100%; ">
<legend>{{labels.rightInputLabel1}}</legend>
<legend>{{ labels.rightInputLabel1 }}</legend>
<el-table
width="100%"
:height="height/2"
@ -210,7 +230,7 @@
:width="item.columnWidth"
:label="item.columnLabel">
<template slot-scope="scope">
<span v-if="!item.columnHidden"> {{scope.row[item.columnProp]}}</span>
<span v-if="!item.columnHidden"> {{ scope.row[item.columnProp] }}</span>
<span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
style="width: 100px; height: 80px"/></span>
</template>
@ -218,7 +238,7 @@
</el-table>
</fieldset>
<fieldset class="customer-field" style="width: 100%; ">
<legend>{{labels.rightInputLabel2}}</legend>
<legend>{{ labels.rightInputLabel2 }}</legend>
<el-table
width="100%"
:height="height/2"
@ -238,7 +258,7 @@
:width="item.columnWidth"
:label="item.columnLabel">
<template slot-scope="scope">
<span v-if="!item.columnHidden"> {{scope.row[item.columnProp]}}</span>
<span v-if="!item.columnHidden"> {{ scope.row[item.columnProp] }}</span>
<span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
style="width: 100px; height: 80px"/></span>
</template>
@ -268,7 +288,7 @@
:min-width="item.columnWidth"
:label="item.columnLabel">
<template slot-scope="scope">
<span v-if="!item.columnHidden"> {{scope.row[item.columnProp]}}</span>
<span v-if="!item.columnHidden"> {{ scope.row[item.columnProp] }}</span>
<span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
style="width: 100px; height: 80px"/></span>
</template>
@ -293,7 +313,7 @@
<el-input style="width: 100px;" v-model="editHeaderData.spec"></el-input>
</el-form-item>
<el-form-item>
<el-link slot="label" @click="getBaseList(23)"> {{labels.headerInputLabel5}}</el-link>
<el-link slot="label" @click="getBaseList(23)"> {{ labels.headerInputLabel5 }}</el-link>
<el-input style="width: 100px;" v-model="editHeaderData.familyId"></el-input>
</el-form-item>
<el-form-item :label="labels.headerInputLabel6">
@ -301,7 +321,7 @@
v-model="editHeaderData.familyName"></el-input>
</el-form-item>
<el-form-item>
<el-link slot="label" @click="getBaseList(7)"> {{labels.headerInputLabel7}}</el-link>
<el-link slot="label" @click="getBaseList(7)"> {{ labels.headerInputLabel7 }}</el-link>
<el-input style="width: 100px;" readonly v-model="editHeaderData.umid"></el-input>
</el-form-item>
<el-form-item :label="labels.headerInputLabel9">
@ -322,8 +342,8 @@
</el-form>
<span slot="footer" class="dialog-footer">
<el-button type="primary" @click="saveAndUpdateToolHeader()">{{buttons.true}}</el-button>
<el-button type="primary" @click="toolHeaderShow = false">{{buttons.cancel}}</el-button>
<el-button type="primary" @click="saveAndUpdateToolHeader()">{{ buttons.true }}</el-button>
<el-button type="primary" @click="toolHeaderShow = false">{{ buttons.cancel }}</el-button>
</span>
</el-dialog>
<!--新增或编辑实例-->
@ -342,7 +362,7 @@
<!-- <el-input style="width: 130px;" :readonly="toolDetailAddOrEdit" v-model="editData.status"></el-input>-->
</el-form-item>
<el-form-item>
<span slot="label" @click="getBaseList(3)"><el-link>{{labels.supplierId}}</el-link> </span>
<span slot="label" @click="getBaseList(3)"><el-link>{{ labels.supplierId }}</el-link> </span>
<el-input style="width: 130px;" v-model="editData.supplierId"></el-input>
</el-form-item>
<el-form-item :label="labels.leftInputLabel4">
@ -385,7 +405,7 @@
</el-form-item>
<el-form-item :label="labels.leftInputLabel10">
<el-input oninput="value=value.replace(/[^0-9]/g,'')" style="width: 130px;"
v-model="editData.actualUseQty"></el-input>
v-model="editData.lifespan"></el-input>
</el-form-item>
<el-form-item :label="labels.locationId">
<el-input style="width: 130px;" v-model="editData.locationId"></el-input>
@ -395,8 +415,8 @@
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button type="primary" @click="saveAndUpdateToolDetail()">{{buttons.true}}</el-button>
<el-button type="primary" @click="setUp.toolEditFlag = false">{{buttons.cancel}}</el-button>
<el-button type="primary" @click="saveAndUpdateToolDetail()">{{ buttons.true }}</el-button>
<el-button type="primary" @click="setUp.toolEditFlag = false">{{ buttons.cancel }}</el-button>
</span>
</el-dialog>
@ -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()

Write Preview
Loading…
Cancel
Save