Browse Source

采购申请单上增加刀具寿命,实例号 ,备注 2022年12月22日 sxm

master
[li_she] 3 years ago
parent
commit
e7f8734793
  1. 3
      src/api/knifemold/receive.js
  2. 88
      src/views/modules/knifemold/receive.vue
  3. 9
      src/views/modules/purchaseorder/purchaseRequisition.vue

3
src/api/knifemold/receive.js

@ -33,5 +33,8 @@ export const printToolData = data => createAPI(`toolMan/printToolData`,'POST',
// 关闭接收 // 关闭接收
export const closeReceiveStatus = data => createAPI(`toolMan/closeReceiveStatus`,'POST',data) export const closeReceiveStatus = data => createAPI(`toolMan/closeReceiveStatus`,'POST',data)
// 获取采购单信息
export const getPRDetailInfo = data => createAPI(`PRHeader/getPRDetailInfo`,'POST',data)

88
src/views/modules/knifemold/receive.vue

@ -85,9 +85,9 @@
width="100" width="100"
:label="buttons.operating"> :label="buttons.operating">
<template slot-scope="scope"> <template slot-scope="scope">
<a @click="closeReceive(scope.row)">{{'关闭'}}</a>
<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>
@ -125,14 +125,15 @@
</el-dialog> </el-dialog>
<el-dialog v-drag :close-on-click-modal="false" :visible.sync="poToolFlag" width="770px"> <el-dialog v-drag :close-on-click-modal="false" :visible.sync="poToolFlag" width="770px">
<span style="font-size: 13px" slot="title"> {{'接收单号:'+this.ifsToolData.transactionId + ' - 工具编码: ' + this.ifsToolData.toolId}}</span>
<span style="font-size: 13px"
slot="title"> {{ '接收单号:' + this.ifsToolData.transactionId + ' - 工具编码: ' + this.ifsToolData.toolId }}</span>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-button type="primary" :disabled="generateFlag" @click="initMailFlag()">{{buttons.generate}}</el-button>
<el-button type="primary" @click="printMethod('Y')">{{buttons.toolLabel}}</el-button>
<el-button type="primary" @click="printMethod('N')">{{buttons.screenLabel}}</el-button>
<el-button type="primary" :disabled="generateFlag" @click="initMailFlag()">{{ buttons.generate }}</el-button>
<el-button type="primary" @click="printMethod('Y')">{{ buttons.toolLabel }}</el-button>
<el-button type="primary" @click="printMethod('N')">{{ buttons.screenLabel }}</el-button>
<el-button type="primary" :disabled="receiveQuantity>1" @click="setToolInstanceId()"> <el-button type="primary" :disabled="receiveQuantity>1" @click="setToolInstanceId()">
{{buttons.manualGenerate}}
{{ buttons.manualGenerate }}
</el-button> </el-button>
</el-col> </el-col>
</el-row> </el-row>
@ -192,7 +193,8 @@
:label="buttons.cz" :label="buttons.cz"
align="center"> align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-link v-if="scope.row.status == '已接收'" @click="editToolDetail(scope.row)">{{buttons.edit}}</el-link>
<el-link v-if="scope.row.status == '已接收'" @click="editToolDetail(scope.row)">{{ buttons.edit }}
</el-link>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -223,8 +225,8 @@
</el-col> </el-col>
</el-row> </el-row>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button type="primary" @click="manualInitMailFlag()">{{'确定'}}</el-button>
<el-button type="primary" @click="toolCodeFlag=false">{{'关闭'}}</el-button>
<el-button type="primary" @click="manualInitMailFlag()">{{ '确定' }}</el-button>
<el-button type="primary" @click="toolCodeFlag=false">{{ '关闭' }}</el-button>
</span> </span>
</el-dialog> </el-dialog>
<el-dialog title="附件信息" :visible.sync="setUp.fileFlag" width="672px" :close-on-click-modal="false" <el-dialog title="附件信息" :visible.sync="setUp.fileFlag" width="672px" :close-on-click-modal="false"
@ -296,8 +298,8 @@
</template> </template>
<script> <script>
import column from "../common/column";
import {
import column from "../common/column";
import {
searchSysLanguagePackList, searchSysLanguagePackList,
searchSysLanguageParam, searchSysLanguageParam,
searchFunctionButtonList, searchFunctionButtonList,
@ -305,17 +307,17 @@
searchSysLanguage, searchSysLanguage,
searchLanguageListByLanguageCode, searchLanguageListByLanguageCode,
saveSysLanguageOne saveSysLanguageOne
} from "@/api/sysLanguage.js"
import {
} from "@/api/sysLanguage.js"
import {
saveTableDefaultList, saveTableDefaultList,
saveTableUser, saveTableUser,
getTableDefaultListLanguage, getTableDefaultListLanguage,
getTableUserListLanguage, getTableUserListLanguage,
removerDefault, removerDefault,
removerUser removerUser
} from "@/api/table.js"
} from "@/api/table.js"
import {
import {
getViewIfsList, getViewIfsList,
getPoToolList, getPoToolList,
getLocationList, getLocationList,
@ -326,19 +328,20 @@
printTool, printTool,
saveFileAssociate, saveFileAssociate,
printToolData, printToolData,
closeReceiveStatus
} from "@/api/knifemold/receive.js"
import {
closeReceiveStatus,
getPRDetailInfo
} from "@/api/knifemold/receive.js"
import {
getToolDetailList, getToolDetailList,
updateReceiveToolDetail, updateReceiveToolDetail,
} from '@/api/knifemold/tool-info.js'
} from '@/api/knifemold/tool-info.js'
import getLodop from '@/utils/LodopFuncs.js'
import axios from "axios";
import Vue from "vue";
import upload from "../common/upload";
import getLodop from '@/utils/LodopFuncs.js'
import axios from "axios";
import Vue from "vue";
import upload from "../common/upload";
export default {
export default {
components: { components: {
column column
, upload , upload
@ -1417,17 +1420,18 @@
this.saveToolInstanceId() this.saveToolInstanceId()
// this.initLocationFlag(queryLocation) // this.initLocationFlag(queryLocation)
} }
}, },
// //
closeReceive(row){
closeReceive(row) {
this.$confirm(`确定进行关闭接收操作?`, '提示', { this.$confirm(`确定进行关闭接收操作?`, '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
row.closeFlag = 'Y' row.closeFlag = 'Y'
closeReceiveStatus(row).then(({data}) =>{
if (data.code == 0){
closeReceiveStatus(row).then(({data}) => {
if (data.code == 0) {
this.$message.success(data.msg) this.$message.success(data.msg)
this.initViewIfsTable('Y') this.initViewIfsTable('Y')
} }
@ -1472,6 +1476,7 @@
if (data.code == 0) { if (data.code == 0) {
this.ifsToolData.generateQuantity += parseInt(currQty) this.ifsToolData.generateQuantity += parseInt(currQty)
this.initPoToolTable() this.initPoToolTable()
this.getPRDetailInfo()
} else { } else {
} }
this.$alert(data.msg, '操作提示', { this.$alert(data.msg, '操作提示', {
@ -1526,7 +1531,22 @@
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() {
// //
@ -1789,10 +1809,10 @@
this.getSysLanguageParamList() this.getSysLanguageParamList()
this.getFunctionButtonList() this.getFunctionButtonList()
} }
}
}
</script> </script>
<style> <style>
.sl-input {
.sl-input {
background-color: transparent; background-color: transparent;
border: 0 !important; border: 0 !important;
font-size: 12px !important; font-size: 12px !important;
@ -1800,12 +1820,12 @@
line-height: 14px !important; line-height: 14px !important;
background-color: transparent !important; background-color: transparent !important;
width: 140px; width: 140px;
}
}
.sl-input:focus, textarea:focus {
.sl-input:focus, textarea:focus {
outline: none; outline: none;
}
}
</style> </style>

9
src/views/modules/purchaseorder/purchaseRequisition.vue

@ -208,7 +208,9 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item :label="'工具编码'"> <el-form-item :label="'工具编码'">
<span v-if="showToolIdList" slot="label" @click="getBaseList(70)"><el-link>{{ '工具编码' }}</el-link> </span>
<span v-if="showToolIdList" slot="label" @click="getBaseList(70)"><el-link>{{
'工具编码'
}}</el-link> </span>
<span v-else="showToolIdList" slot="label">{{ '工具编码' }}</span> <span v-else="showToolIdList" slot="label">{{ '工具编码' }}</span>
<el-input style="text-align: left;width: 120px" <el-input style="text-align: left;width: 120px"
v-model="currentPRDetailData.partno"></el-input> v-model="currentPRDetailData.partno"></el-input>
@ -428,7 +430,10 @@ export default {
orderref1: '', orderref1: '',
orderref2: '', orderref2: '',
sysOssEntityList: [], sysOssEntityList: [],
addFlag: ''
addFlag: '',
lifespan: '',
toolInstanceId: '',
remark: ''
}, },
mainQueryData: { mainQueryData: {
startDate: '', startDate: '',

Loading…
Cancel
Save