diff --git a/src/api/quality/income.js b/src/api/quality/income.js index b94bd51..c859d3d 100644 --- a/src/api/quality/income.js +++ b/src/api/quality/income.js @@ -119,9 +119,10 @@ export function commitActualValue(recordId, actualValues) { } //审核结果提交 -export function commitCheckResult(recordId) { +export function commitCheckResult(recordId,typeCode) { const data = { - recordId + recordId, + typeCode } return request({ url: '/quality/qcIncome/commitCheckResult', diff --git a/src/api/quality/qcProduce.js b/src/api/quality/qcProduce.js index bf7b4ad..70dc437 100644 --- a/src/api/quality/qcProduce.js +++ b/src/api/quality/qcProduce.js @@ -50,4 +50,30 @@ export function getQcListWorkCenter(query) { method: 'get', params: query }); - } \ No newline at end of file + } + +// 查询检测类型列表 +export function getCheckTypes(typeCode) { + const data = { + typeCode + } + return request({ + url: '/quality/qcProduce/getCheckTypes', + method: 'put', + data: data + }); + } + + +//状态修改 +export function changeProduceStatus(recordId, status) { + const data = { + recordId, + status + } + return request({ + url: '/quality/qcProduce/changeProduceStatus', + method: 'put', + data: data + }) + } diff --git a/src/api/quality/warehousing.js b/src/api/quality/warehousing.js index 377aef8..d77ae27 100644 --- a/src/api/quality/warehousing.js +++ b/src/api/quality/warehousing.js @@ -42,3 +42,13 @@ export function delWarehousing(recordId) { method: 'delete' }); } + + +// 查询工作中心列表 +export function getQcListLoc(query) { + return request({ + url: '/quality/qcWarehousing/getQcListLoc', + method: 'get', + params: query + }); +} \ No newline at end of file diff --git a/src/components/FileUpload/index.vue b/src/components/FileUpload/index.vue index 340bf49..ca7be84 100644 --- a/src/components/FileUpload/index.vue +++ b/src/components/FileUpload/index.vue @@ -55,12 +55,12 @@ export default { // 大小限制(MB) fileSize: { type: Number, - default: 5, + default: 50, }, // 文件类型, 例如['png', 'jpg', 'jpeg'] fileType: { type: Array, - default: () => ["doc", "xls", "docx", "xlsx","ppt", "txt", "pdf",'png', 'jpg', 'jpeg'], + default: () => ["doc", "xls", "docx", "xlsx","ppt", "txt", "pdf",'png', 'jpg', 'jpeg','apk'], }, // 是否显示提示 isShowTip: { diff --git a/src/views/quality/checkType/index.vue b/src/views/quality/checkType/index.vue index 10aac8a..26b8a43 100644 --- a/src/views/quality/checkType/index.vue +++ b/src/views/quality/checkType/index.vue @@ -1,14 +1,6 @@ - + - - - - - + + @@ -101,11 +98,11 @@ diff --git a/src/views/system/apkFile/index.vue b/src/views/system/apkFile/index.vue index 8c7aac5..1849ac6 100644 --- a/src/views/system/apkFile/index.vue +++ b/src/views/system/apkFile/index.vue @@ -110,10 +110,9 @@ - + + + @@ -165,9 +164,11 @@ export default { attr2: null, attr3: null, attr4: null, + fileList:'' }, // 表单参数 form: {}, + fileList:[], // 表单校验 rules: { fileName: [ @@ -244,12 +245,30 @@ export default { const id = row.id || this.ids getFile(id).then(response => { this.form = response.data; + /** + if(response.data.files != null){ + var newFiles = []; + response.data.files.forEach(item =>{ + var newfile = {}; + newfile.name = item.fileName; + newfile.url = item.fileAddress; + newFiles.push(newfile); + }) + this.form.fileList = newFiles; + } + **/ + this.open = true; this.title = "修改手持apk版本控制"; }); }, /** 提交按钮 */ submitForm() { + + if(Array.isArray(this.form.fileList)){ + this.form.fileList = this.listToString(this.form.fileList); + } + this.$refs["form"].validate(valid => { if (valid) { if (this.form.id != null) { diff --git a/src/views/technology/process/index.vue b/src/views/technology/process/index.vue index 425a70b..a916475 100644 --- a/src/views/technology/process/index.vue +++ b/src/views/technology/process/index.vue @@ -129,6 +129,12 @@ /> + - + -