diff --git a/src/const/capital/productstoreList.js b/src/const/capital/productstoreList.js index 82a0007..dbbb76f 100644 --- a/src/const/capital/productstoreList.js +++ b/src/const/capital/productstoreList.js @@ -114,15 +114,15 @@ export const optionList = { label: "存放地点", prop: "location", overHidden: true, - type: "select", + type: "input", span: 8, - dicData: [ - { label: "仓库一", value: "0" }, - { label: "仓库二", value: "1" }, - { label: "仓库三", value: "2" }, - ], - rules: [{ required: true, message: "请选择固定资产", trigger: "blur" }], - slot: true, + // dicData: [ + // { label: "仓库一", value: "0" }, + // { label: "仓库二", value: "1" }, + // { label: "仓库三", value: "2" }, + // ], + rules: [{ required: true, message: "请输入存放地点", trigger: "blur" }], + // slot: true, }, { label: "是否已确认", @@ -142,12 +142,14 @@ export const optionList = { { label: "库存", value: 2 }, { label: "已报废", value: 3 }, ], - rules: [{ required: true, message: "请选择固定资产", trigger: "blur" }], + rules: [{ required: true, message: "请选择状态", trigger: "blur" }], slot: true, }, { label: "物品质检状态", prop: "testStatus", + addDisplay: false, + editDisplay: false, overHidden: true, span: 8, slot: true, diff --git a/src/page/login/index.vue b/src/page/login/index.vue index 0301b20..9aef45c 100644 --- a/src/page/login/index.vue +++ b/src/page/login/index.vue @@ -185,5 +185,4 @@ export default { letter-spacing: 2px; // margin-top: 20px; } - diff --git a/src/views/capital/productstoreList.vue b/src/views/capital/productstoreList.vue index 156134a..bf8001f 100644 --- a/src/views/capital/productstoreList.vue +++ b/src/views/capital/productstoreList.vue @@ -163,7 +163,7 @@ :limit="1" :file-list="filesList" > - 选择附件 + 选择附件
请上传 .xls,.xlsx 标准格式文件且每次只能上传一个附件
@@ -1639,13 +1639,12 @@ export default { edditPro(row, index){ this.filesList = [] if(row.attachName !== '' && row.attach !== ''){ - this.filesList.push({name:row.attachName,path:row.attach}) + this.filesList.push({name:row.attachName,path:row.attach}) } this.$refs.crud.rowEdit(row, index) }, // 控制是否上传 fileSuccess(file, fileList) { - console.log('filr ===================>') // 文件上传控制格式 let suffix = this.getFileType(file.name); //获取文件后缀名 let suffixArray = ["xls", "xlsx"]; //限制的文件类型,根据情况自己定义 @@ -1659,7 +1658,6 @@ export default { this.assetsFlag = false; return false; } else { - console.log('limit ===============>') if(this.fileList.length > 1){ this.$message({ message: "每次只能上传一个文件", @@ -1680,13 +1678,21 @@ export default { } }, fileRemove(file, fileList) { - if(file.response.code == 200){ - let arr = fileList.filter(item => item.path !== file.response.data.path) - this.fileList = arr + if(file.status == 'success'){ + if(file.response){ + if(file.response.code == 200){ + let arr = fileList.filter(item => item.path !== file.response.data.path) + this.fileList = arr + this.filesList = arr + } + }else{ + let arr = fileList.filter(item => item.path !== file.path) + this.fileList = arr + this.filesList = arr + } } }, uploadSuccess(response, file, fileList) { - console.log('res ==============>',response) if (response.code == 200) { this.$message({ showClose: true,