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

2023-07-31

master
杨奉源 2 years ago
parent
90f41f5709
commit
7880df74db
4 changed files with 68 additions and 131 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. 5
      src/api/knifemold/tool-info.js
  2. 108
      src/views/modules/knifemold/tool-info-list.vue
  3. 43
      src/views/modules/knifemold/tool-info.vue
  4. 43
      src/views/modules/knifemold/toolUseQtyAssess.vue

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

@ -50,11 +50,8 @@ export const queryToolOperatorRecord = data => createAPI(`toolInfo/queryToolOper
export const saveToolUseQtyAssess = data => createAPI(`toolInfo/saveToolUseQtyAssess`, 'POST', data)
export const getToolUseQtyAssessList = data => createAPI(`toolInfo/getToolUseQtyAssessList`, 'POST', data)
export const checkToolUseQtyAssess = data => createAPI(`toolInfo/checkToolUseQtyAssess`, 'POST', data)
export const getItemModal = data => createAPI(`toolInfo/getItemModal`, 'POST', data)
export const itemSaveData = data => createAPI(`toolInfo/itemSaveData`, 'POST', data)
export const getItemData = data => createAPI(`toolInfo/getItemData`, 'POST', data)
export const deleteItemModal = data => createAPI(`toolInfo/deleteItemModal`, 'POST', data)
export const checkAssessRecord = data => createAPI(`toolInfo/checkAssessRecord`, 'POST', data)

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

@ -62,10 +62,10 @@
header-align="center"
align="center"
width="100"
:label="'操作'">
:label="'打印标签'">
<template slot-scope="scope">
<el-link @click="printMethod(scope.row,'Y')">工具标签</el-link>
<el-link @click="printMethod(scope.row,'N')">| 网版</el-link>
<!-- <el-link @click="printMethod(scope.row,'N')">| 网版</el-link>-->
</template>
</el-table-column>
<el-table-column
@ -146,8 +146,9 @@
import getLodop from '@/utils/LodopFuncs.js'
import column from '../common/column'
import Chooselist from '@/views/modules/common/Chooselist'
import {getToolInfoList,saveToolUseQtyAssess} from '@/api/knifemold/tool-info.js'
import {getToolInfoList, saveToolUseQtyAssess, checkAssessRecord} from '@/api/knifemold/tool-info.js'
import {printToolData} from '@/api/knifemold/receive.js'
import {printToolLabelPreview} from "@/views/modules/print/label/print_tool_label_preview.js"
var functionId = '106001005'
export default {
components: {column, Chooselist},
@ -455,7 +456,18 @@ export default {
this.assessData.estUseQty = row.estUseQty
this.assessData.ActualUseQty = row.ActualUseQty
this.assessData.prop = row.prop
this.useQtyAssessFlag = true
this.assessData.addUseQty = ''
checkAssessRecord(this.assessData).then(({data}) => {
if (data.code === 0) {
if (data.total <= 0) {
this.useQtyAssessFlag = true
} else {
this.$alert('已存在该工具实例的寿命评估！', '提示', {
confirmButtonText: '确定'
})
}
}
})
},
printMethod (row, printType) {
let dto = {
@ -481,88 +493,20 @@ export default {
toolInstanceId: row.toolInstanceId
}
printDataList.push(printData)
if (printType === 'Y') {
this.labelPrintGJ(printDataList)
} else {
this.labelPrintWB(printDataList)
}
this.labelPrintGJ(printDataList)
}
})
},
labelPrintWB (printDataList) {
const LODOP = getLodop()
if (LODOP) {
// 循环调用打印机
for (let i = 0; i < printDataList.length; i++) {
let printData = printDataList[i]
LODOP.NewPage()
LODOP.SET_PRINT_PAGESIZE(0, 700, 180, '')
LODOP.SET_PRINT_MODE('PRINT_NOCOLLATE', 1)
LODOP.ADD_PRINT_RECT(2, 5, 250, 67, 0, 1)
LODOP.ADD_PRINT_LINE(19, 5, 18, 255, 0, 1)
LODOP.ADD_PRINT_LINE(36, 5, 35, 205, 0, 1)
LODOP.ADD_PRINT_LINE(54, 5, 53, 205, 0, 1)
LODOP.ADD_PRINT_LINE(2, 65, 69, 66, 0, 1)
LODOP.ADD_PRINT_LINE(68, 205, 18, 206, 0, 1)
LODOP.ADD_PRINT_BARCODE(21, 208, 90, 60, 'QRCode', printData.toolInstanceId)
LODOP.ADD_PRINT_TEXT(5, 9, 60, 14, '工具名称')
LODOP.ADD_PRINT_TEXT(21, 9, 60, 15, '工具编号')
LODOP.ADD_PRINT_TEXT(38, 9, 60, 15, '实例编号')
LODOP.ADD_PRINT_TEXT(55, 9, 60, 15, '经办人')
LODOP.ADD_PRINT_TEXT(4, 70, 180, 14, printData.toolDescription)
LODOP.SET_PRINT_STYLEA(0, 'Alignment', 2)
LODOP.ADD_PRINT_TEXT(21, 71, 133, 14, printData.toolId)
LODOP.ADD_PRINT_TEXT(39, 71, 133, 14, printData.toolInstanceId)
LODOP.ADD_PRINT_TEXT(55, 71, 133, 14, printData.createdBy)
}
LODOP.PREVIEW()
}
},
labelPrintGJ (printDataList) {
const LODOP = getLodop()
if (LODOP) {
// 循环调用打印机
for (let i = 0; i < printDataList.length; i++) {
let printData = printDataList[i]
LODOP.NewPage()
LODOP.SET_PRINT_PAGESIZE(0, 700, 540, '')
LODOP.ADD_PRINT_RECT(6, 5, 250, 190, 0, 1)
LODOP.ADD_PRINT_LINE(24, 5, 23, 255, 0, 1)
LODOP.ADD_PRINT_LINE(41, 5, 40, 255, 0, 1)
LODOP.ADD_PRINT_LINE(58, 5, 57, 255, 0, 1)
LODOP.ADD_PRINT_LINE(75, 5, 74, 255, 0, 1)
LODOP.ADD_PRINT_LINE(92, 5, 91, 255, 0, 1)
LODOP.ADD_PRINT_LINE(109, 5, 108, 255, 0, 1)
LODOP.ADD_PRINT_LINE(126, 5, 125, 178, 0, 1)
LODOP.ADD_PRINT_LINE(144, 5, 143, 178, 0, 1)
LODOP.ADD_PRINT_LINE(162, 5, 161, 178, 0, 1)
LODOP.ADD_PRINT_LINE(179, 5, 178, 255, 0, 1)
LODOP.ADD_PRINT_LINE(23, 65, 195, 66, 0, 1)
LODOP.ADD_PRINT_LINE(178, 177, 108, 178, 0, 1)
LODOP.ADD_PRINT_BARCODE(110, 183, 110, 85, 'QRCode', printData.toolInstanceId)
LODOP.ADD_PRINT_TEXT(9, 94, 100, 14, '工具标签')
LODOP.SET_PRINT_STYLEA(0, 'Bold', 1)
LODOP.ADD_PRINT_TEXT(26, 9, 60, 14, '工具名称')
LODOP.ADD_PRINT_TEXT(43, 9, 60, 15, '规格型号')
LODOP.ADD_PRINT_TEXT(60, 9, 60, 15, '工具编号')
LODOP.ADD_PRINT_TEXT(77, 9, 60, 15, '实例编号')
LODOP.ADD_PRINT_TEXT(94, 9, 60, 15, '厂商')
LODOP.ADD_PRINT_TEXT(111, 9, 60, 15, '入库日期')
LODOP.ADD_PRINT_TEXT(129, 9, 60, 15, '库位')
LODOP.ADD_PRINT_TEXT(147, 9, 60, 15, '经办人')
LODOP.ADD_PRINT_TEXT(181, 9, 60, 15, '检验签章')
LODOP.ADD_PRINT_TEXT(25, 72, 180, 14, printData.toolDescription)
LODOP.SET_PRINT_STYLEA(0, 'Alignment', 2)
LODOP.ADD_PRINT_TEXT(42, 72, 180, 14, printData.spec) // 规格
LODOP.ADD_PRINT_TEXT(60, 72, 180, 14, printData.toolId)
LODOP.ADD_PRINT_TEXT(78, 71, 180, 14, printData.toolInstanceId)
LODOP.ADD_PRINT_TEXT(94, 71, 180, 14, printData.SupplierName)
LODOP.ADD_PRINT_TEXT(111, 71, 95, 14, this.dayjs(printData.createDate).format('YYYY-MM-DD'))
LODOP.ADD_PRINT_TEXT(130, 71, 95, 14, printData.locationId)
LODOP.ADD_PRINT_TEXT(148, 71, 95, 14, printData.createdBy)
}
LODOP.PREVIEW()
labelPrintGJ(row) {
let array = [];
let data = {
toolId: row[0].toolId,
toolInstanceId: row[0].toolInstanceId,
spec: row[0].spec,
locationId: row[0].locationId
}
array.push(data)
printToolLabelPreview(array);
},
// --------------- 业务 -------------------
getDataList () {

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

@ -81,7 +81,6 @@
<el-button @click="initToolModel('copy')" type="primary">复制</el-button>
<el-button @click="initToolModel('N')" type="primary">编辑</el-button>
<el-button @click="printMethod('Y')" type="primary">工具标签</el-button>
<el-button @click="addUseQty()" type="primary">发起</el-button>
<!-- <el-button @click="printMethod('N')" type="primary">网版</el-button>-->
</el-form-item>
</el-form>
@ -504,7 +503,7 @@
</span>
</el-dialog>
<el-dialog title="工具属性清单" :close-on-click-modal="false" v-drag :visible.sync="toolItemModelFlag" width="830px">
<el-form :inline="true" label-position="top" >
<el-form :inline="true" label-position="top" >
<el-form-item >
<el-button type="primary" @click="addItemModal()">新增</el-button>
</el-form-item>
@ -514,7 +513,6 @@
:data="itemModalList"
border
v-loading="dataListLoading"
style="width: 100%;">
<el-table-column
v-for="(item,index) in columnDetailList" :key="index"
@ -527,9 +525,8 @@
: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.columnImage"><img :src="scope.row[item.columnProp]"
style="width: 100px; height: 80px"/></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>
</el-table-column>
<el-table-column
@ -539,16 +536,16 @@
width="130"
label="操作">
<template slot-scope="scope">
<a type="text" size="small" @click="updateItemModal(scope.row)">编辑</a>
<a type="text" size="small" @click="deleteItemModal(scope.row)">删除</a>
<a type="text" size="small" @click="updateItemModal(scope.row)">编辑</a>
<a type="text" size="small" @click="deleteItemModal(scope.row)">删除</a>
</template>
</el-table-column>
</el-table>
<span slot="footer" class="dialog-footer">
<el-button type="primary" @click="toolItemModelFlag = false">关闭</el-button>
</span>
<el-button type="primary" @click="toolItemModelFlag = false">关闭</el-button>
</span>
</el-dialog>
<el-dialog title="属性项目" :close-on-click-modal="false" v-drag :visible.sync="itemModalFlag" width="430px">
<el-dialog title="属性项目" :close-on-click-modal="false" v-drag :visible.sync="itemModalFlag" width="310px">
<el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
<el-form-item >
<el-link slot="label" @click="getBaseList(1004)">属性编码</el-link>
@ -569,8 +566,7 @@
<span slot="footer" class="dialog-footer">
<el-button type="primary" @click="itemSaveData()">保存</el-button>
<el-button type="primary" @click="itemModalFlag = false">关闭</el-button>
</span>
</span>
</el-dialog>
<Chooselist ref="baseList" @getBaseData="getBaseData"></Chooselist>
@ -601,9 +597,7 @@ import {
} from '@/api/knifemold/tool-info.js'
import {printToolData} from '@/api/knifemold/receive.js'
import {searchProcessRouteTool} from '@/api/base/productProcessRoute.js'
import {
printToolLabelPreview,
} from "@/views/modules/print/label/print_tool_label_preview.js"
import {printToolLabelPreview} from "@/views/modules/print/label/print_tool_label_preview.js"
var functionId = '106001003'
export default {
components: {
@ -1895,7 +1889,7 @@ export default {
tableName: "点检项目表",
columnProp: 'toolItemNo',
headerAlign: "center",
align: "left",
align: "center",
columnLabel: '属性编码',
columnHidden: false,
columnImage: false,
@ -1913,7 +1907,7 @@ export default {
tableName: "点检项目表",
columnProp: 'toolItemDesc',
headerAlign: "center",
align: "left",
align: "center",
columnLabel: '属性名称',
columnHidden: false,
columnImage: false,
@ -1931,7 +1925,7 @@ export default {
tableName: "点检项目表",
columnProp: 'valueType',
headerAlign: "center",
align: "left",
align: "center",
columnLabel: '属性类型',
columnHidden: false,
columnImage: false,
@ -1949,7 +1943,7 @@ export default {
tableName: "common",
columnProp: 'textValue',
headerAlign: "center",
align: "left",
align: "center",
columnLabel: '文本值',
columnHidden: false,
columnImage: false,
@ -1967,7 +1961,7 @@ export default {
tableName: "common",
columnProp: 'numValue',
headerAlign: "center",
align: "left",
align: "center",
columnLabel: '数字值',
columnHidden: false,
columnImage: false,
@ -2156,7 +2150,6 @@ export default {
locationId: row[0].locationId
}
array.push(data)
console.log(array)
printToolLabelPreview(array);
},
getBaseData(val) {
@ -2412,12 +2405,6 @@ export default {
this.getDetailList()
}
})
},
/**
* 发起新增使用寿命
*/
addUseQty () {
},
fields() {
let json = '{'

43
src/views/modules/knifemold/toolUseQtyAssess.vue
View File

@ -364,23 +364,32 @@ export default {
* 审核
*/
checkToolUseQtyAssess () {
this.checkData.status = '已完成'
checkToolUseQtyAssess(this.checkData).then(({data}) => {
if (data && data.code === 0) {
this.getDataList()
this.checkFlag = false
this.$message({
message: '操作成功',
type: 'success',
duration: 1500,
onClose: () => {
}
})
} else {
this.$alert(data.msg, '错误', {
confirmButtonText: '确定'
})
}
this.$confirm(`是否为 `+ this.checkData.toolInstanceId + ` 新增 ` + this.checkData.addUseQty + ' 寿命？', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.checkData.status = '已完成'
checkToolUseQtyAssess(this.checkData).then(({data}) => {
if (data && data.code === 0) {
this.getDataList()
this.checkFlag = false
// 刷新工具信息页面
this.$emit('refreshPageTables');
this.$message({
message: '操作成功',
type: 'success',
duration: 1500,
onClose: () => {
}
})
} else {
this.$alert(data.msg, '错误', {
confirmButtonText: '确定'
})
}
})
}).catch(() => {
})
},
/**

Write Preview
Loading…
Cancel
Save