diff --git a/src/api/purchase/goodsEntry.js b/src/api/purchase/goodsEntry.js index e69de29b..b5e9b9ed 100644 --- a/src/api/purchase/goodsEntry.js +++ b/src/api/purchase/goodsEntry.js @@ -0,0 +1,20 @@ +import request from '@/utils/request' +import { parseStrEmpty } from '@/utils/bonus' + +// // 外层批量验收合格API +// export function acceptOuterVerify(data) { +// return request({ +// url: '/material/purchase_check_info/outerVerify', +// method: 'put', +// data: data +// }) +// } + +// 内层批量验收合格API +export function purchaseWarehouse(data) { + return request({ + url: '/material/purchase/storage/warehouse', + method: 'post', + data: data + }) +} \ No newline at end of file diff --git a/src/views/material/back/component/addReturn.vue b/src/views/material/back/component/addReturn.vue index 3a510008..cd278ec3 100644 --- a/src/views/material/back/component/addReturn.vue +++ b/src/views/material/back/component/addReturn.vue @@ -472,16 +472,14 @@ export default { { required: true, message: '请选择退料单位', - trigger: 'blur', - type: 'number', + trigger: 'change', }, ], proId: [ { required: true, message: '请选择退料工程', - trigger: 'blur', - type: 'number', + trigger: 'change', }, ], backPerson: [ diff --git a/src/views/material/back/component/dialogFormByCq.vue b/src/views/material/back/component/dialogFormByCq.vue index fec5ea4d..008ba045 100644 --- a/src/views/material/back/component/dialogFormByCq.vue +++ b/src/views/material/back/component/dialogFormByCq.vue @@ -32,7 +32,7 @@
退料编码明细
+
+
+
+ 工程名称：{{ rowObj.proName }} +
+
+ 退料时间：{{ rowObj.createTime }} +
+
+
+
+ 退料单位：{{ rowObj.unitName }} +
+
+ 单号：{{ rowObj.code }} +
+
+
- + @@ -110,6 +128,11 @@ +
+
审核人：
+
退料人：
+
操作人：
+
diff --git a/src/views/material/back/component/home.vue b/src/views/material/back/component/home.vue index f2f37f5f..36c20499 100644 --- a/src/views/material/back/component/home.vue +++ b/src/views/material/back/component/home.vue @@ -122,22 +122,17 @@ - 退料接收 + 退料接收 提交 + >提交 - 提交 退料单 diff --git a/src/views/material/purchase/goodsEntry/detail.vue b/src/views/material/purchase/goodsEntry/detail.vue index b2c81812..9282d071 100644 --- a/src/views/material/purchase/goodsEntry/detail.vue +++ b/src/views/material/purchase/goodsEntry/detail.vue @@ -48,7 +48,7 @@ > - + @@ -87,12 +87,12 @@ @@ -158,6 +158,7 @@ import { getDeviceType} from "@/api/ma/device"; import { getManufacturerSelect} from "@/api/ma/supplier"; import { getPurchaseDetailsList,getPurchaseFileList,uploadPurchaseFile } from "@/api/purchase/goodsAccept"; +import { purchaseWarehouse } from "@/api/purchase/goodsEntry"; import { downloadFile } from '@/utils/download' import { getToken } from '@/utils/auth' export default { @@ -295,6 +296,26 @@ export default { this.single = selection.length != 1 this.multiple = !selection.length }, + //入库 + pass(row) { + let obj = { + // taskId: this.taskId, + purchaseId: row.id + }; + console.log(obj) + purchaseWarehouse(obj).then((res)=>{ + console.log(res) + if(res.code==200){ + this.$modal.msgSuccess('操作成功') + this.getList() + } + }) + }, + //不合格 + reject(row) { + + }, + //文件管理 openFileDialog(row){ this.rowData=row;