From a0010bcabbfbc3771aa05d54094f5d02bcdd5609 Mon Sep 17 00:00:00 2001
From: llj <132905093+newwwwwwtree@users.noreply.github.com>
Date: 星期一, 15 十二月 2025 08:42:50 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI
---
src/views/FbStepFoldOutBillList/fbStepFoldOutBillListEdit.vue | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/src/views/FbStepFoldOutBillList/fbStepFoldOutBillListEdit.vue b/src/views/FbStepFoldOutBillList/fbStepFoldOutBillListEdit.vue
index 9d5d3cc..60a8031 100644
--- a/src/views/FbStepFoldOutBillList/fbStepFoldOutBillListEdit.vue
+++ b/src/views/FbStepFoldOutBillList/fbStepFoldOutBillListEdit.vue
@@ -101,7 +101,7 @@
<el-row :gutter="20">
<el-col :span="8">
<el-form-item label="楠屾敹">
- <el-input v-model="form.HSecManagerName" placeholder="楠屾敹" style="width: calc(100% - 50px)" />
+ <el-input v-model="form.HSecManagerName" placeholder="楠屾敹" style="width: calc(100% - 50px)" />
<el-button type="primary" icon="el-icon-search" @click="showEmployeeDialog('inspector')">
</el-button>
</el-form-item>
@@ -382,7 +382,7 @@
:dialog-type="currentDialogType"
:dialog-title="employeeDialogTitle"
@select="handleEmployeeSelect"
- />
+ />
</div>
</template>
@@ -504,7 +504,7 @@
}
],
selectedRows: [],
- baseURL: process.env.VUE_APP_BASE_URL || 'http://47.96.97.237/API/'
+ baseURL: process.env.VUE_APP_BASE_API || 'http://47.96.97.237/API/'
}
},
computed: {
@@ -815,7 +815,7 @@
}
console.log(`閫夋嫨鐨�${type}:`, data)
},
-
+
handleSupplierSelect(data, type) {
this.form.HSupID = data.HItemID
@@ -823,7 +823,7 @@
console.log('閫夋嫨鐨勪緵搴斿晢:', data)
},
-
+
// 琛ㄦ牸鎿嶄綔
handleAddLine() {
this.tableData.push({
@@ -898,11 +898,11 @@
}
// 纭繚琛ㄦ牸鏁版嵁涓殑浠撳簱ID涔熸湁鍊�
- const hasValidTableData = this.tableData.every(row =>
- row.HMaterID && row.HMaterID !== 0 &&
+ const hasValidTableData = this.tableData.every(row =>
+ row.HMaterID && row.HMaterID !== 0 &&
row.HUnitID && row.HUnitID !== 0
)
-
+
if (!hasValidTableData) {
// this.$message.error('璇峰畬鍠勮〃鏍间腑鐨勭墿鏂欏拰鍗曚綅淇℃伅')
// return
@@ -919,14 +919,14 @@
// })
// }
//const formData=JSON.stringify(this.form)+';'+JSON.stringify(this.tableData)+';'+this.operationType+';'+(sessionStorage['HUserName'] || 'admin');
- const submitData =
- JSON.stringify(this.form) + ';' +
- JSON.stringify(this.tableData) + ';' +
- this.operationType + ';' +
+ const submitData =
+ JSON.stringify(this.form) + ';' +
+ JSON.stringify(this.tableData) + ';' +
+ this.operationType + ';' +
(sessionStorage['HUserName'] || 'admin') + ';' +
JSON.stringify({ main: this.form, table: this.tableData })
console.log('鎻愪氦鐨勫畬鏁存暟鎹�:', submitData)
-
+
const response = await axios.post(`${this.baseURL}/Kf_StepFoldOutBill/Kf_StepFoldOutBillEdit`, {
sMainSub: submitData
})
@@ -1004,4 +1004,4 @@
.el-input-number {
width: 100%;
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.9.1