Browse Source

荣欣 新增文件删除

master
zuowenwen 4 years ago
parent
commit
e6b9ac0111
  1. 3
      src/api/knifemold/receive.js
  2. 3
      src/api/purchaseorder/purchaseRequisition.js
  3. 31
      src/views/modules/knifemold/receive.vue
  4. 17
      src/views/modules/purchaseorder/procurementReview.vue
  5. 82
      src/views/modules/purchaseorder/purchaseRequisition.vue

3
src/api/knifemold/receive.js

@ -24,5 +24,8 @@ export const getFileList = data => createAPI(`sys/oss/getSysOssEntityList`,'POST
// 获取工具打印
export const printTool = data => createAPI(`toolMan/printTool`,'POST',data)
// 保存文件关联关系
export const saveFileAssociate = data => createAPI(`PRHeader/saveFileAssociate`,'POST',data)

3
src/api/purchaseorder/purchaseRequisition.js

@ -30,6 +30,9 @@ export const getFileList = data => createAPI(`sys/oss/getSysOssEntityList`,'POST
//获取工具类型
export const getPartFamilyList = data => createAPI(`base/getPartFamilyList`,'POST' ,data)
//获取工具类型
export const delFileAssociate = data => createAPI(`PRHeader/delFileAssociate`,'POST' ,data)

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

@ -171,6 +171,9 @@
<el-dialog title="附件信息" :visible.sync="setUp.fileFlag" width="672px" :close-on-click-modal="false"
:close-on-press-escape="false" v-drag>
<el-form :inline="true" label-position="top">
<el-form-item style="margin-top: 10px">
<upload v-on:childByValue="childByValue"></upload>
</el-form-item>
<el-table
height="170"
:data="fileList"
@ -281,13 +284,16 @@
exportList,
getFileList,
printTool,
saveFileAssociate,
} from "@/api/knifemold/receive.js"
import axios from "axios";
import Vue from "vue";
import upload from "../common/upload";
export default {
components: {
column
,upload
},
data() {
return {
@ -874,7 +880,9 @@
totalPage: 0,
dataListLoading: false,
dataListSelections: [],
addOrUpdateVisible: false
addOrUpdateVisible: false,
insertFileList : [],
currentData : {},
}
},
activated() {
@ -901,6 +909,24 @@
}
},
methods: {
childByValue(childValue) {
// childValue
this.fileList.push(childValue)
this.saveAssociate(childValue)
},
saveAssociate(row){
let jsonList = [];
let jsonData = {
site : this.site,
sysOssId : row.id,
type : 'ReveiveFile',
associatedField1: this.currentData.transactionId,
}
jsonList.push(jsonData)
saveFileAssociate(jsonList).then(({data}) =>{
})
},
printMethod(val){
if (this.currSelectList.length <= 0){
this.$alert('请选择工具信息!', '操作提示', {
@ -972,6 +998,7 @@
},
//
initFileModel(row){
this.currentData = row
this.getFileList(row)
this.setUp.fileFlag = true
},
@ -979,7 +1006,7 @@
getFileList(row){
let jsonData = {
site : row.site,
type : 'PRFile',
// type : 'PRFile',
associatedField1 : row.transactionId
}
this.fileList = []

17
src/views/modules/purchaseorder/procurementReview.vue

@ -506,6 +506,23 @@
status: true,
fixed: false
},
{
userId: this.$store.state.user.name,
functionId: 2101,
serialNumber: 'review2101FamilyName',
tableId: "review2101",
tableName: "PRHeader",
columnProp: "familyName",
headerAlign: "center",
align: "left",
columnLabel: "工具类型",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: false
},
{
userId: this.$store.state.user.name,
functionId: 2101,

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

@ -122,6 +122,7 @@
layout="total, sizes, prev, pager, next, jumper">
</el-pagination>
<el-dialog :close-on-click-modal="false" :show-close="false" :close-on-press-escape="false" title="设置table列"
:visible.sync="visible" width="1000px" v-drag>
<el-form @keyup.enter.native="updateColumnList()"
@ -188,16 +189,9 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item :label="inputSearch10">
<el-select v-model="currentPRDetailData.supplierid" filterable placeholder="请选择" style="width: 143px">
<el-option
v-for="(item ,index) in supplierList"
:key="index"
:label="item.suppliername"
:value="item.supplierid"
>
</el-option>
</el-select>
<el-form-item >
<span slot="label" @click="getBaseList(3)">{{inputSearch10}} </span>
<el-input v-model="currentPRDetailData.supplierid" style="width: 143px"></el-input>
</el-form-item>
<el-form-item :label="inputSearch6">
<el-input style="text-align: left;width: 143px" onkeyup="this.value = this.value.toUpperCase()"
@ -264,6 +258,7 @@
<template slot-scope="scope">
<a @click="fileDownload(scope.row)">{{ buttons.fileDownload }}</a>
<a @click="filePreview(scope.row)">{{ buttons.preview }}</a>
<a @click="delFile(scope.row)">{{ buttons.delete }}</a>
</template>
</el-table-column>
</el-table>
@ -346,11 +341,14 @@
</el-dialog>
<Chooselist ref="baseList" @getBaseData="getBaseData"></Chooselist>
</div>
</template>
<script>
import Chooselist from '@/views/modules/common/Chooselist'
import {
searchSysLanguagePackList,
searchSysLanguageParam,
@ -380,15 +378,20 @@ import {
downFtpFile,
getFileList,
getPartFamilyList,
delFileAssociate,
} from '@/api/purchaseorder/purchaseRequisition.js'
import upload from "../common/upload";
import axios from "axios";
import Vue from "vue";
export default {
components: {upload},
components: {
upload
,Chooselist},
data() {
return {
//
tagNo : "",
pdfUrl : '',
insertFileList: [],
fileList: [],
@ -405,7 +408,7 @@ export default {
inputSearch7: '申请数量',
inputSearch8: '预估单价',
inputSearch9: '预估总价',
inputSearch10: '供应商名称',
inputSearch10: '供应商编码',
inputSearch11: '刀模名称',
inputSearch12: '审批结果',
inputSearch13: '工具类型',
@ -638,6 +641,23 @@ export default {
status: true,
fixed: false
},
{
userId: this.$store.state.user.name,
functionId: 2001,
serialNumber: 'PRHeader2001FamilyName',
tableId: "PRHeaderTable",
tableName: "PRHeader",
columnProp: "familyName",
headerAlign: "center",
align: "center",
columnLabel: "工具类型",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: false
},
{
userId: this.$store.state.user.name,
functionId: 2001,
@ -1084,6 +1104,36 @@ export default {
},
methods: {
delFile(row){
console.log(row)
this.fileList = this.fileList.filter(item => item.id != row.id);
if(this.currentPRDetailData.requisitionno != ''){
let jsonData = {
sysOssId : row.id,
type : 'PRFile'
}
delFileAssociate(jsonData).then(({data}) => {
})
}
},
getBaseData(val){
if (this.tagNo === 3){
this.currentPRDetailData.supplierid = val.SupplierID
this.this.currentPRDetailData.suppliername = val.SupplierName
}
},
//
getBaseList(val){
this.tagNo = val
this.$nextTick(() => {
let strVal = "";
if (val === 3){
strVal = this.currentPRDetailData.supplierid
}
this.$refs.baseList.init(val,strVal)
})
},
getPartFamily(){
let jsonData = {
site : this.site,
@ -1247,10 +1297,10 @@ export default {
}
let partNo = this.currentPRDetailData.partno.toUpperCase()
this.currentPRDetailData.partno = partNo
let filter = this.supplierList.filter(item => item.supplierid === this.currentPRDetailData.supplierid);
this.currentPRDetailData.suppliername = filter[0].suppliername
this.currentPRDetailData.currency = filter[0].currency
this.currentPRDetailData.taxcode = filter[0].taxcode
// let filter = this.supplierList.filter(item => item.supplierid === this.currentPRDetailData.supplierid);
// this.currentPRDetailData.suppliername = filter[0].suppliername
this.currentPRDetailData.currency = ""
this.currentPRDetailData.taxcode = ""
this.currentPRDetailData.fileType = 'PRFile'
this.currentPRDetailData.sysOssEntityList = this.insertFileList
savePRDetail(this.currentPRDetailData).then(({data}) => {

Loading…
Cancel
Save