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

工具修改 2022年12月22日 sxm

master
[li_she] 3 years ago
parent
f73e59fba4
commit
b74b1ac710
6 changed files with 212 additions and 13 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/views/modules/auditManagement/auditRules.vue
  2. 9
      src/views/modules/auditManagement/auditType.vue
  3. 42
      src/views/modules/knifemold/receive.vue
  4. 132
      src/views/modules/knifemold/tool-info-list.vue
  5. 6
      src/views/modules/knifemold/tool-info.vue
  6. 34
      src/views/modules/purchaseorder/purchaseRequisition.vue

2
src/views/modules/auditManagement/auditRules.vue
View File

@ -124,7 +124,7 @@
<el-input style="width: 135px;" v-model="saveAuditRuleData.ruleId" :disabled="saveAuditRuleData.id!=0"></el-input> <el-input style="width: 135px;" v-model="saveAuditRuleData.ruleId" :disabled="saveAuditRuleData.id!=0"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="labels.inputSearch6"> <el-form-item :label="labels.inputSearch6">
<el-input style="width: 135px;" v-model="saveAuditRuleData.ruleDesc" :disabled="saveAuditRuleData.id!=0"></el-input>
<el-input style="width: 135px;" v-model="saveAuditRuleData.ruleDesc" ></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="labels.inputSearch7"> <el-form-item :label="labels.inputSearch7">
<!-- <el-input style="width: 135px;" v-model="saveAuditRuleData.recordTypeDb"></el-input>--> <!-- <el-input style="width: 135px;" v-model="saveAuditRuleData.recordTypeDb"></el-input>-->

9
src/views/modules/auditManagement/auditType.vue
View File

@ -8,7 +8,10 @@
</span> </span>
</div> </div>
<el-button @click="getDataList()" type="primary">{{buttons.search}}</el-button> <el-button @click="getDataList()" type="primary">{{buttons.search}}</el-button>
<!-- <el-button @click="initModel()" type="primary">{{buttons.add}}</el-button>-->
<el-button @click="initModel()" type="primary">{{buttons.add}}</el-button>
<el-button @click="saveColumnList()" type="primary" v-show="showDefault">{{buttons.defaultTable}}
</el-button>
<el-button @click="userSetting" type="primary">{{ buttons.settingTable}}</el-button>
<download-excel <download-excel
:fields="fields()" :fields="fields()"
:data="exportData" :data="exportData"
@ -88,8 +91,8 @@
width="80" width="80"
:label="buttons.cz"> :label="buttons.cz">
<template slot-scope="scope"> <template slot-scope="scope">
<a @click="initModel(scope.row)" v-if="!authEdit">{{buttons.edit}}</a>
<!-- <a @click="delAuditType(scope.row)">{{buttons.delete}}</a>-->
<a @click="initModel(scope.row)">{{buttons.edit}}</a>
<a @click="delAuditType(scope.row)">{{buttons.delete}}</a>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>

42
src/views/modules/knifemold/receive.vue
View File

@ -82,8 +82,9 @@
width="100" width="100"
:label="buttons.operating"> :label="buttons.operating">
<template slot-scope="scope"> <template slot-scope="scope">
<a @click="initBannersFlag(scope.row)">{{buttons.receive}}</a>
<a @click="initFileModel(scope.row)">{{buttons.appendixInfo}}</a>
<a @click="closeReceive(scope.row)">{{ '关闭' }}</a>
<a @click="initBannersFlag(scope.row)">{{ buttons.receive }}</a>
<a @click="initFileModel(scope.row)">{{ buttons.appendixInfo }}</a>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -321,7 +322,9 @@ import {
getFileList, getFileList,
printTool, printTool,
saveFileAssociate, saveFileAssociate,
printToolData
printToolData,
closeReceiveStatus,
getPRDetailInfo
} from "@/api/knifemold/receive.js" } from "@/api/knifemold/receive.js"
import { import {
getToolDetailList, getToolDetailList,
@ -1454,6 +1457,24 @@ export default {
this.saveToolInstanceId() this.saveToolInstanceId()
// this.initLocationFlag(queryLocation) // this.initLocationFlag(queryLocation)
} }
},
// 关闭接收
closeReceive(row) {
this.$confirm(`确定进行关闭接收操作?`, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
row.closeFlag = 'Y'
closeReceiveStatus(row).then(({data}) => {
if (data.code == 0) {
this.$message.success(data.msg)
this.initViewIfsTable('Y')
}
})
})
}, },
//保存接收信息 //保存接收信息
saveToolInstanceId() { saveToolInstanceId() {
@ -1546,7 +1567,22 @@ export default {
this.torNumacc = this.ifsToolData.torNumacc this.torNumacc = this.ifsToolData.torNumacc
this.torNumdown = this.ifsToolData.torNumdown this.torNumdown = this.ifsToolData.torNumdown
this.initPoToolTable() this.initPoToolTable()
this.getPRDetailInfo()
}
},
// 获取采购申请的寿命 , 单价
getPRDetailInfo() {
let query = {
site: this.$store.state.user.site,
// 接收号
requisitionno: this.ifsToolData.transactionId,
} }
getPRDetailInfo(query).then(({data}) => {
if (data.code == 0) {
this.invoicePrice = data.data.price
this.serviceLife = data.data.lifespan
}
})
}, },
initPoToolTable() { initPoToolTable() {
//是否显示加载效果 //是否显示加载效果

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

@ -62,6 +62,17 @@
v-loading="dataListLoading" v-loading="dataListLoading"
highlight-current-row highlight-current-row
> >
<el-table-column
fixed="left"
header-align="center"
align="left"
width="100"
:label="'操作'">
<template slot-scope="scope">
<el-link @click="printMethod(scope.row,'Y')">工具标签</el-link>
<el-link @click="printMethod(scope.row,'N')">| 网版</el-link>
</template>
</el-table-column>
<el-table-column <el-table-column
v-for="(item,index) in columnList" :key="index" v-for="(item,index) in columnList" :key="index"
:sortable="item.columnSortable" :sortable="item.columnSortable"
@ -99,6 +110,7 @@
</template> </template>
<script> <script>
import getLodop from '@/utils/LodopFuncs.js'
import column from "../common/column"; import column from "../common/column";
import Chooselist from '@/views/modules/common/Chooselist' import Chooselist from '@/views/modules/common/Chooselist'
import { import {
@ -121,6 +133,9 @@ import {
import { import {
getToolInfoList getToolInfoList
} from '@/api/knifemold/tool-info.js' } from '@/api/knifemold/tool-info.js'
import {
printToolData
} from "@/api/knifemold/receive.js"
var functionId='106001005'; var functionId='106001005';
export default { export default {
components: { components: {
@ -421,6 +436,123 @@ export default {
}) })
}, },
methods: { methods: {
printMethod(row, printType) {
let dto = {
site: this.$store.state.user.site,
toolInstanceId: row.toolInstanceId
}
printToolData(dto).then(({data}) => {
if (data.code == 0) {
let printDataList = []
let printData = {
SupplierName: data.data.SupplierName,
createDate: data.data.createDate,
createdBy: data.data.createdBy,
estUseQty: data.data.estUseQty,
locationId: data.data.locationId,
phaseInDate: data.data.phaseInDate,
site: data.data.site,
spec: data.data.spec,
status: data.data.status,
supplierId: data.data.supplierId,
toolDescription: data.data.toolDescription,
toolId: data.data.toolId,
toolInstanceId: row.toolInstanceId
}
printDataList.push(printData)
if (printType == 'Y') {
this.labelPrintGJ(printDataList)
} else {
this.labelPrintWB(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.PRINT_DESIGN();
LODOP.PREVIEW();
// LODOP.PRINT();
}
},
labelPrintGJ(printDataList) {
const LODOP = getLodop()
if (LODOP) {
//LODOP.SET_LICENSES("","7B5624CC84EF99D6B17F27DF4AF4310C","","");
//LODOP.SET_LICENSES("", "7B5624CC84E599D6B17F27DF40F4310C", "", "");
//循环调用打印机
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.PRINT_DESIGN();
LODOP.PREVIEW();
//LODOP.PRINT();
}
},
// --------------- 业务 ------------------- // --------------- 业务 -------------------
getDataList() { getDataList() {
this.dataListLoading = true this.dataListLoading = true

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

@ -395,7 +395,7 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button type="primary" :disabled="setUp.saveToolFlag" @click="saveAndUpdateToolDetail()">{{buttons.true}}</el-button>
<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="setUp.toolEditFlag = false">{{buttons.cancel}}</el-button>
</span> </span>
</el-dialog> </el-dialog>
@ -1444,6 +1444,7 @@ export default {
this.editData.phaseOutDate = this.editData.strPhaseOutDate this.editData.phaseOutDate = this.editData.strPhaseOutDate
if (!this.editData.estUseQty || this.editData.estUseQty == 0) { if (!this.editData.estUseQty || this.editData.estUseQty == 0) {
this.$message.warning(this.labels.warning1) this.$message.warning(this.labels.warning1)
return
} }
if (this.toolDetailAddOrEdit) { if (this.toolDetailAddOrEdit) {
await updateToolDetail(this.editData).then(({data}) => { await updateToolDetail(this.editData).then(({data}) => {
@ -1486,12 +1487,15 @@ export default {
saveAndUpdateToolHeader() { saveAndUpdateToolHeader() {
if (!this.editHeaderData.toolId) { if (!this.editHeaderData.toolId) {
this.$message.warning(this.labels.toolIdIn) this.$message.warning(this.labels.toolIdIn)
return
} }
if (!this.editHeaderData.familyId) { if (!this.editHeaderData.familyId) {
this.$message.warning(this.labels.familyIdIn) this.$message.warning(this.labels.familyIdIn)
return
} }
if (!this.editHeaderData.umid) { if (!this.editHeaderData.umid) {
this.$message.warning(this.labels.umidIn) this.$message.warning(this.labels.umidIn)
return
} }
this.editHeaderData.active = this.editHeaderData.active ? 'Y' : 'N' this.editHeaderData.active = this.editHeaderData.active ? 'Y' : 'N'
if (this.toolDetailAddOrEdit) { if (this.toolDetailAddOrEdit) {

34
src/views/modules/purchaseorder/purchaseRequisition.vue
View File

@ -224,9 +224,24 @@
v-model="currentPRDetailData.totalPrice" v-model="currentPRDetailData.totalPrice"
:disabled="true"></el-input> :disabled="true"></el-input>
</el-form-item> </el-form-item>
<el-form-item v-if="addFlagShow" :label="labels.addFlag">
<el-radio v-model="currentPRDetailData.addFlag" label="1">{{labels.yes}}</el-radio>
<el-radio v-model="currentPRDetailData.addFlag" label="2">{{labels.no}}</el-radio>
<el-form-item v-if="addFlagShow" :label="'是否新增'">
<el-radio v-model="currentPRDetailData.addFlag" label="1">是</el-radio>
<el-radio v-model="currentPRDetailData.addFlag" label="2">否</el-radio>
</el-form-item>
<el-form-item :label="'寿命'">
<el-input oninput="value=value.replace(/^\.+|[^\d.]/g,'')" style="text-align: right;width: 120px"
v-model="currentPRDetailData.lifespan"
></el-input>
</el-form-item>
<el-form-item :label="'实例号'">
<el-input style="text-align: right;width: 120px"
v-model="currentPRDetailData.toolInstanceId"
></el-input>
</el-form-item>
<el-form-item :label="'备注'">
<el-input style="text-align: right;width: 315px"
v-model="currentPRDetailData.remark"
></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
</el-col> </el-col>
@ -492,7 +507,10 @@ export default {
orderref1: '', orderref1: '',
orderref2: '', orderref2: '',
sysOssEntityList: [], sysOssEntityList: [],
addFlag: ''
addFlag: '',
toolInstanceId: '',
lifespan: '',
remark:''
}, },
mainQueryData: { mainQueryData: {
startDate: '', startDate: '',
@ -1317,7 +1335,7 @@ export default {
}) })
}, },
initReapply(row) { initReapply(row) {
this.currentPRDetailData.orderref1 = row.requisitionno``
this.currentPRDetailData.orderref1 = row.requisitionno
this.currentPRDetailData.orderref2 = row.itemno this.currentPRDetailData.orderref2 = row.itemno
this.initAddModel(null, 'Y') this.initAddModel(null, 'Y')
}, },
@ -1341,6 +1359,9 @@ export default {
this.currentPRDetailData.partdesc = '' this.currentPRDetailData.partdesc = ''
this.currentPRDetailData.orderref1 = '' this.currentPRDetailData.orderref1 = ''
this.currentPRDetailData.addFlag = '' this.currentPRDetailData.addFlag = ''
this.currentPRDetailData.lifespan = ''
this.currentPRDetailData.remark = ''
this.currentPRDetailData.toolInstanceId = ''
this.addFlagShow = true this.addFlagShow = true
} else { } else {
this.addFlagShow = false this.addFlagShow = false
@ -1356,6 +1377,9 @@ export default {
this.currentPRDetailData.taxCode = row.taxCode this.currentPRDetailData.taxCode = row.taxCode
this.currentPRDetailData.partDesc = row.partdesc this.currentPRDetailData.partDesc = row.partdesc
this.currentPRDetailData.orderref1 = row.orderref1 this.currentPRDetailData.orderref1 = row.orderref1
this.currentPRDetailData.lifespan = row.lifespan
this.currentPRDetailData.remark = row.remark
this.currentPRDetailData.toolInstanceId = row.toolInstanceId
this.getFileList(row) this.getFileList(row)
} }
/* if (val != 'Y') { /* if (val != 'Y') {

Write Preview
Loading…
Cancel
Save