Browse Source

Merge remote-tracking branch 'origin/master'

master
zelian_wu 2 years ago
parent
commit
8c6335ba97
  1. 23
      src/views/modules/base/upload_file.vue
  2. 95
      src/views/modules/changeManagement/changeRequest.vue
  3. 10
      src/views/modules/common/uploadFileList.vue
  4. 24
      src/views/modules/part/routingManagement.vue

23
src/views/modules/base/upload_file.vue

@ -12,7 +12,7 @@
<el-row>
<el-col :span="24">
<el-upload class="customer-upload" drag
action="javascript:void(0);" ref="uploadFile" :limit="3"
action="javascript:void(0);" ref="uploadFile" :limit="3" multiple :on-remove="onRemove"
:before-upload="beforeUploadHandle" :on-change="onChange"
accept="*" :auto-upload="false"
style="text-align: left;">
@ -54,7 +54,8 @@ export default {
createBy: '',
dataNo: '',
fileRemark: '',
folder: ''
folder: '',
file: ''
},
}
@ -77,6 +78,10 @@ export default {
this.fileList.push(file)
},
onRemove (file,fileList) {
this.fileList = fileList
},
// modal
closeDialog () {
this.fileList = []
@ -95,16 +100,10 @@ export default {
this.$message.error("请先上传文件!")
return false
}
// const formData = new FormData()
// //
// formData.append("file", this.fileList[0].raw)
// formData.append("orderRef1", this.pageData.site)
// formData.append("orderRef2", this.pageData.dataNo)
// formData.append("fileRemark", this.pageData.fileRemark)
// formData.append("folder", this.pageData.folder)
this.pageData.file = this.fileList[0].raw
for (let i = 0; i < this.fileList.length; i++) {
this.pageData.file[i] = this.fileList[i].raw
}
//this.pageData.file = this.fileList
this.$emit('refreshPageTables', this.pageData)
this.$message.success('操作成功!')
this.closeDialog()

95
src/views/modules/changeManagement/changeRequest.vue

@ -656,7 +656,7 @@
<el-form-item :label="'模板'">
<el-select v-model="chooseModelData2.codeNo" placeholder="请选择" style="width: 120px">
<el-option
v-for = "i in modelList"
v-for = "i in modelList2"
:key = "i.codeNo"
:label = "i.codeDesc"
:value = "i.codeNo">
@ -775,6 +775,7 @@
<!-- 上传文件的modal -->
<changeUploadFile ref="changeUploadFile" @refreshPageTables="getFileData" v-drag></changeUploadFile>
<upload-file-list ref="changeRef" v-if="modalFlag" folder="change" title="工程变更文件上传" :upload-status="true" :label="'变更单号:'" :file-list.sync="fileData.file" :no="modalData.changeNo" :upload-dialog.sync="uploadDialog"></upload-file-list>
</div>
</template>
@ -796,11 +797,14 @@
import {
uploadFile //
} from '@/api/oss/oss.js'
import {uploadFileList} from "../../../api/test/testInformation";
import DictDataSelect from '../sys/dict-data-select.vue'
import changeUploadFile from "../base/upload_file.vue"
import dayjs from "dayjs";
import UploadFileList from "../common/uploadFileList.vue";
export default {
components: {
UploadFileList,
changeUploadFile,
DictDataSelect,
ChooseList
@ -808,6 +812,7 @@
data() {
return {
uploadDialog: false,
form: [],
//
exportData: [],
@ -945,11 +950,19 @@
itemDesc: '',
codeNo: ''
},
fileData: {
file: [],
orderRef1: '',
orderRef2: '',
fileRemark: '',
folder: ''
},
// ======== ========
dataList: [],
chooseDataList: [],
fileList: [],
modelList: [],
modelList2: [],
modelCSList: [],
itemList: [],
itemList2: [],
@ -1681,6 +1694,7 @@
created () {
this.getDataList()
this.getEcnModel()
this.getEcnModel2()
this.getEcnCSModel()
},
@ -1911,6 +1925,13 @@
createBy: this.$store.state.user.name,
chooseCSItemList: []
}
this.fileData = {
file: [],
orderRef1: '',
orderRef2: '',
fileRemark: '',
folder: ''
}
this.chooseItemList = []
this.chooseItemList2 = []
this.getDepartmentByUserName()
@ -2006,15 +2027,27 @@
}
this.modalData.detailList = this.chooseDataList
this.modalData.ecnTypeData = this.form
this.fileData.orderRef1 = this.modalData.site
this.fileData.orderRef2 = this.modalData.changeNo
this.fileData.fileRemark = this.$refs.changeRef.fileRemark
this.fileData.folder = 'change'
let tempData = new FormData()
for (let i in this.fileData) {
if (i === 'file') {
for (let j = 0; j < this.fileData.file.length; j++) {
tempData.append("file", this.fileData.file[j].raw)
}
continue
}
tempData.append(i, this.fileData[i])
}
changeRequestSave(this.modalData).then(({data}) => {
if (data && data.code === 0) {
for (let i = 0; i <this.fileList.length; i++) {
uploadFile(this.fileList[i]).then(({data}) => {
if (data.code !== 0) {
this.$message.warning(data.msg)
}
})
}
uploadFileList("/upload/test",tempData).then(({data}) => {
if (data.code !== 0) {
this.$message.warning(data.msg)
}
})
this.getDataList()
this.basicInformationFlag = false
this.$message({
@ -2229,23 +2262,24 @@
dataNo: this.modalData.changeNo,
fileRemark: '',
folder: 'change',
file: []
}
this.uploadDialog = true
//
this.$nextTick(() => {
this.$refs.changeUploadFile.init(currentData)
})
// this.$nextTick(() => {
// this.$refs.changeUploadFile.init(currentData)
// })
},
//
getFileData (fData) {
const formData = new FormData()
//
formData.append("file", fData.file)
formData.append("orderRef1", fData.site)
formData.append("orderRef2", fData.dataNo)
formData.append("fileRemark", fData.fileRemark)
formData.append("folder", fData.folder)
this.fileList.push(formData)
this.fileData = {
file: fData.file,
orderRef1: fData.site,
orderRef2: fData.dataNo,
fileRemark: fData.fileRemark,
folder: fData.folder
}
},
// ECN
@ -2312,7 +2346,7 @@
itemNo: '',
itemDesc: '',
functionType: 'ECN',
codeNo: this.modelList.length > 0 ? this.modelList[0].codeNo : ''
codeNo: this.modelList2.length > 0 ? this.modelList2[0].codeNo : ''
}
//
//this.$nextTick(() => this.$refs.itemTable2.clearSelection())
@ -2410,7 +2444,8 @@
getEcnModel () {
let tempData = {
site: this.$store.state.user.site,
functionType: 'ECN'
functionType: 'ECN',
codeNo: 'E001'
}
getEcnModel(tempData).then(({data}) => {
if (data.code === 0) {
@ -2419,14 +2454,26 @@
})
},
// ===================================
// ECN
getEcnModel2 () {
let tempData = {
site: this.$store.state.user.site,
functionType: 'ECN',
codeNo: 'E002'
}
getEcnModel(tempData).then(({data}) => {
if (data.code === 0) {
this.modelList2 = data.rows
}
})
},
//
getEcnCSModel () {
let tempData = {
site: this.$store.state.user.site,
functionType: 'ECN'
functionType: 'ECN',
codeNo: 'E003'
}
getEcnModel(tempData).then(({data}) => {
if (data.code === 0) {

10
src/views/modules/common/uploadFileList.vue

@ -8,6 +8,10 @@ export default {
type:Boolean,
default:false,
},
title:{
type:String,
default:'测试文件',
},
label:{
type:String,
default: '',
@ -40,9 +44,11 @@ export default {
},
methods:{
closeFileUpdate(){
this.$emit('update:uploadDialog',false)
if (this.uploadStatus){
return
}
this.fileRemark = '';
this.$refs.uploadFile.clearFiles();
this.$emit("update:fileList",[])
},
@ -88,7 +94,7 @@ export default {
<template>
<div>
<el-dialog title="测试文件" v-drag @close="closeFileUpdate" :visible.sync="uploadDialog" width="400px" append-to-body >
<el-dialog :title="title" v-drag @close="closeFileUpdate" :visible="uploadDialog" width="400px" append-to-body >
<el-form label-position="top" label-width="80px">
<el-form-item :label="label" >
<el-input v-model="no" readonly style="width: 120px"></el-input>
@ -108,7 +114,7 @@ export default {
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button type="primary" @click="upload">保存</el-button>
<el-button type="primary" v-if="!uploadStatus" @click="upload">保存</el-button>
<el-button type="primary" @click="$emit('update:uploadDialog',false)">关闭</el-button>
</span>
</el-dialog>

24
src/views/modules/part/routingManagement.vue

@ -1058,7 +1058,9 @@ export default {
toolQty: '',
remark: '',
createBy: '',
updateBy: ''
updateBy: '',
ifsRowId: '',
ifsRowVersion: ''
},
copyRoutingData: {
site: '',
@ -1123,7 +1125,9 @@ export default {
signOffRequired: '',
inspectionSignOffRequired: '',
createBy: '',
updateBy: ''
updateBy: '',
ifsRowId: '',
ifsRowVersion: ''
},
// ======== ========
dataList: [],
@ -2713,7 +2717,9 @@ export default {
toolDescription: '',
toolQty: 1,
remark: '',
createBy: this.$store.state.user.name
createBy: this.$store.state.user.name,
ifsRowId: '',
ifsRowVersion: ''
}
this.queryAlternativeList()
this.saveRoutingToolModal = true
@ -2739,7 +2745,9 @@ export default {
toolDescription: row.toolDescription,
toolQty: row.toolQty,
remark: row.remark,
updateBy: this.$store.state.user.name
updateBy: this.$store.state.user.name,
ifsRowId: row.ifsRowId,
ifsRowVersion: row.ifsRowVersion
}
this.queryAlternativeList()
this.saveRoutingToolModal = true
@ -3405,7 +3413,9 @@ export default {
signOffRequired: 'Not Required',
inspectionSignOffRequired: 'Not Required',
createBy: this.$store.state.user.name,
updateBy: ''
updateBy: '',
ifsRowId: '',
ifsRowVersion: ''
}
// seq
getGuidelineSeq(this.workGuidelineData).then(({data}) => {
@ -3441,7 +3451,9 @@ export default {
signOffRequired: row.signOffRequired,
inspectionSignOffRequired: row.inspectionSignOffRequired,
createBy: '',
updateBy: this.$store.state.user.name
updateBy: this.$store.state.user.name,
ifsRowId: row.ifsRowId,
ifsRowVersion: row.ifsRowVersion
}
//
this.saveWorkGuidelineModal = true

Loading…
Cancel
Save