From f3efd8af829a1c6c0801b661373b4c695b5f963a Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期六, 30 三月 2024 13:32:23 +0800
Subject: [PATCH] Merge branch 'master' of git://192.168.5.5/web/outsource-order-web
---
src/views/orderManageModule/orderManage/components/ApplyMaterialsDialog.vue | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/src/views/orderManageModule/orderManage/components/ApplyMaterialsDialog.vue b/src/views/orderManageModule/orderManage/components/ApplyMaterialsDialog.vue
index f8681db..6528d0f 100644
--- a/src/views/orderManageModule/orderManage/components/ApplyMaterialsDialog.vue
+++ b/src/views/orderManageModule/orderManage/components/ApplyMaterialsDialog.vue
@@ -11,7 +11,7 @@
<div slot="title" class="tac drawerHeader">
{{ editCommonConfig.title }}
<div v-if="editCommonConfig.infomation.status == 4" class="noPass-view">
- 瀹℃牳涓嶉�氳繃鐞嗙敱锛歿{ editCommonConfig.infomation.reson }}
+ 瀹℃牳涓嶉�氳繃鐞嗙敱锛歿{ editCommonConfig.infomation.reason }}
</div>
</div>
<el-form ref="form" class="form-box" :model="form" :rules="rules" label-position="right" label-width="115px">
@@ -67,7 +67,7 @@
<el-table-column prop="materialName" show-overflow-tooltip label="浜у搧鍚嶇О"> </el-table-column>
</template>
<template slot="tableButton">
- <el-table-column prop="amount" label="鏁伴噺" min-width="110">
+ <el-table-column prop="amount" label="鏁伴噺">
<template slot-scope="scope">
<el-input
style="width: 100%"
@@ -123,7 +123,7 @@
</template>
<script>
-// import { saveMaterialApply } from "@/api/outsourceEnterpriseManage/index"
+import { saveMaterialApply } from "@/api/orderManageModule/orderManage"
import SelectCommonDialog from "@/views/other/commonDialog/SelectCommonDialog"
export default {
name: "AddSalesDetailsDialog",
@@ -321,14 +321,14 @@
const params = this.saveParams()
console.log(params)
this.isAddloading = true
- // saveMaterialApply(params).then((res) => {
- // if (res.code === 200) {
- // this.editRow.visible = false
- // this.$message.success(this.editRow.title + "鎴愬姛锛�")
- // this.$emit("reRreshData")
- // }
- // this.isAddloading = false
- // })
+ saveMaterialApply(params).then((res) => {
+ if (res.code === 200) {
+ this.editRow.visible = false
+ this.$message.success(this.editRow.title + "鎴愬姛锛�")
+ this.$emit("reRreshData")
+ }
+ this.isAddloading = false
+ })
},
saveParams() {
let commonParam = {
@@ -360,7 +360,7 @@
for (let i in arr) {
let item = {
outsourcingOrderNumber: this.editRow.infomation.outsourcingOrderNumber,
- materialNumber: arr[i].id,
+ materialNumber: arr[i].number,
materialName: arr[i].name,
amount: 1,
unit: arr[i].unit ? arr[i].unit : 1,
@@ -368,7 +368,7 @@
specs: arr[i].specs ? arr[i].specs : ""
}
console.log(arr, "8989")
- isPush = this.getIsPush(this.productTableList.tableInfomation, arr[i].id)
+ isPush = this.getIsPush(this.productTableList.tableInfomation, arr[i].number)
if (isPush) {
this.productTableList.tableInfomation.splice(this.productTableList.tableInfomation.length, 0, item)
}
--
Gitblit v1.8.0