From ffeda1528cb303dee5f73e0a16ab4a21b2fcbe26 Mon Sep 17 00:00:00 2001
From: chen.lin <1442464845@qq.com>
Date: 星期二, 27 一月 2026 15:45:21 +0800
Subject: [PATCH] ERP生产管理-生成收料通知单-增加按钮重新同步 -对应前端
---
src/main/webapp/views/erpMaterialwwout/materialwwout.html | 188 ++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 171 insertions(+), 17 deletions(-)
diff --git a/src/main/webapp/views/erpMaterialwwout/materialwwout.html b/src/main/webapp/views/erpMaterialwwout/materialwwout.html
index 83b5372..28a801b 100644
--- a/src/main/webapp/views/erpMaterialwwout/materialwwout.html
+++ b/src/main/webapp/views/erpMaterialwwout/materialwwout.html
@@ -76,10 +76,10 @@
<el-button type="primary" @click="fnTongBu()">鐢熸垚濮斿鍑哄簱鍗�</el-button>
</el-form-item>
<el-form-item label="">
- <el-button type="primary">鎾ら攢鐢熸垚</el-button>
+ <el-button type="primary" @click="fnCanelTongBu()">鎾ら攢鐢熸垚</el-button>
</el-form-item>
<el-form-item label="">
- <el-button type="primary">鏁版嵁鏌ヨ</el-button>
+ <el-button type="primary" @click="dialogVisible = true">鏁版嵁鏌ヨ</el-button>
</el-form-item>
</el-form>
@@ -109,18 +109,76 @@
<el-table-column prop="wqty" label="鏈彂鏁伴噺">
</el-table-column>
<el-table-column prop="qty" label="瀹炲彂鏁伴噺">
+ <template #default="scope">
+ <el-input v-model="scope.row.qty"></el-input>
+ </template>
</el-table-column>
<el-table-column prop="izSync" label="鏄惁鐢熸垚">
</el-table-column>
</el-table>
-<!-- <div style="margin-top: 10px">-->
-<!-- <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"-->
-<!-- :current-page="currentPage" :page-sizes="pageSizes" :page-size="pageSize"-->
-<!-- layout="total, sizes, prev, pager, next, jumper" :total="pageTotal">-->
-<!-- </el-pagination>-->
-<!-- </div>-->
-
+ <el-dialog v-model="dialogVisible" fullscreen>
+ <el-form :inline="true" label-width="auto">
+ <el-form-item label="寮�宸ユ棩鏈�">
+
+ <div>
+ <el-date-picker
+ v-model="tableSearchParamDialog.dateStart"
+ type="date"
+ placeholder="寮�濮嬫棩鏈�"
+ style="width: 150px;"
+ :default-time="defaultTime"
+ />
+ </div>
+ <div style="margin-left: 5px;margin-right: 5px">
+ <span >-</span>
+ </div>
+ <div>
+ <el-date-picker
+ v-model="tableSearchParamDialog.dateEnd"
+ type="date"
+ placeholder="缁撴潫鏃ユ湡"
+ style="width: 150px;"
+ :default-time="defaultTime"
+ />
+ </div>
+ </el-form-item>
+ <el-form-item label="鏄惁鐢熸垚">
+ <el-select v-model="tableSearchParamDialog.isSync" placeholder="鏄惁鐢熸垚" style="width: 150px" >
+ <el-option
+ v-for="item in printOptions"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ />
+ </el-select>
+ </el-form-item>
+ <el-form-item label="">
+ <el-button type="primary" @click="dialogPage" circle >
+ <el-icon><Search /></el-icon>
+ </el-button>
+ </el-form-item>
+ </el-form>
+ <el-table :data="tableDataDialog" border style="width: 100%" row-key="id" @selection-change="handleSelectionChangeDialog" max-height="650">
+ <el-table-column type="selection" >
+ </el-table-column>
+ <el-table-column type="index" width="50" >
+ </el-table-column>
+ <el-table-column prop="dateStart" label="寮�宸ユ棩鏈�" >
+ </el-table-column>
+ <el-table-column prop="dateEnd" label="瀹屾垚鏃ユ湡">
+ </el-table-column>
+ <el-table-column prop="izPrint" label="鏄惁鎵撳嵃">
+ </el-table-column>
+ <el-table-column prop="izSync" label="鏄惁鐢熸垚">
+ </el-table-column>
+ </el-table>
+ <template #footer>
+ <div class="dialog-footer" style="text-align: left;">
+ <el-button @click="dialogVisible = false">鍏抽棴</el-button>
+ </div>
+ </template>
+ </el-dialog>
</el-card>
</div>
@@ -150,7 +208,13 @@
venId:null,
izJs:"鍚�"
})
+ const tableSearchParamDialog = ref({
+ dateStart:new Date(),
+ dateEnd: new Date(),
+ izSync: null
+ })
const tableData = ref([])
+ const tableDataDialog = ref([])
const defaultTime = ref(new Date())
const fullscreenLoading = ref(false)
@@ -160,6 +224,8 @@
const depName = ref('')
const options = ref([])
+
+ const dialogVisible = ref(false)
watchEffect(() =>{
options.value.map(item =>{
@@ -198,7 +264,7 @@
background: 'rgba(0, 0, 0, 0.7)',
})
$.ajax({
- url: "http://127.0.0.1:9090/mo/materialwwout/getList",
+ url: "http://127.0.0.1:8133/mo/materialwwout/getList",
headers: {
'token': localStorage.getItem('token')
},
@@ -210,6 +276,44 @@
loading.close()
if (res.code == 200) {
tableData.value = res.data
+ ElementPlus.ElMessage({
+ message: "鎷夊彇鏁版嵁瀹屾垚",
+ type: 'success'
+ });
+ } else if (res.code === 403) {
+ top.location.href = baseUrl + "/";
+ } else {
+ ElementPlus.ElMessage({
+ message: res.msg,
+ type: 'error'
+ });
+ }
+ }
+ });
+ }
+
+ function dialogPage(){
+ let data = JSON.parse(JSON.stringify(tableSearchParamDialog.value))
+ data.curr = currentPage.value
+ data.limit = pageSize.value
+ const loading = ElementPlus.ElLoading.service({
+ lock: true,
+ text: 'Loading',
+ background: 'rgba(0, 0, 0, 0.7)',
+ })
+ $.ajax({
+ url: "http://127.0.0.1:8133/mo/materialwwout/getListView",
+ headers: {
+ 'token': localStorage.getItem('token')
+ },
+ data: data,
+ dataType: 'json',
+ contentType: 'application/json;charset=UTF-8',
+ method: 'GET',
+ success: function(res) {
+ loading.close()
+ if (res.code == 200) {
+ tableDataDialog.value = res.data
ElementPlus.ElMessage({
message: "鎷夊彇鏁版嵁瀹屾垚",
type: 'success'
@@ -251,7 +355,7 @@
background: 'rgba(0, 0, 0, 0.7)',
})
$.ajax({
- url:"http://127.0.0.1:9090/mo/materialwwout/tongbu",
+ url:"http://127.0.0.1:8133/mo/materialwwout/tongbu",
headers: {
'token': localStorage.getItem('token')
},
@@ -264,6 +368,48 @@
if (res.code == 200) {
ElementPlus.ElMessage({
message: "鐢熸垚鎴愬姛",
+ type: 'success'
+ });
+ page()
+ } else if (res.code === 403) {
+ top.location.href = baseUrl + "/";
+ } else {
+ ElementPlus.ElMessage({
+ message: res.msg,
+ type: 'error'
+ });
+ }
+ }
+ });
+ }
+
+ function fnCanelTongBu(){
+ if (selectList.value.length === 0){
+ ElementPlus.ElMessage({
+ message: "璇峰厛閫夋嫨",
+ type: 'error'
+ });
+ return ;
+ }
+ const loading = ElementPlus.ElLoading.service({
+ lock: true,
+ text: 'Loading',
+ background: 'rgba(0, 0, 0, 0.7)',
+ })
+ $.ajax({
+ url:"http://127.0.0.1:8133/mo/materialwwout/caneltongbu",
+ headers: {
+ 'token': localStorage.getItem('token')
+ },
+ data: JSON.stringify(selectList.value),
+ dataType: 'json',
+ contentType: 'application/json;charset=UTF-8',
+ method: 'POST',
+ success: function(res) {
+ loading.close();
+ if (res.code == 200) {
+ ElementPlus.ElMessage({
+ message: "鎾ら攢鎴愬姛",
type: 'success'
});
page()
@@ -293,7 +439,7 @@
background: 'rgba(0, 0, 0, 0.7)',
})
$.ajax({
- url:"http://127.0.0.1:9090/mo/materialuse/canelprint",
+ url:"http://127.0.0.1:8133/mo/materialuse/canelprint",
headers: {
'token': localStorage.getItem('token')
},
@@ -325,7 +471,7 @@
function getVendor(){
$.ajax({
- url: "http://127.0.0.1:9090/basicinfo/vendor/getlistfordropdown",
+ url: "http://127.0.0.1:8133/basicinfo/vendor/getlistfordropdown",
contentType: 'application/json;charset=UTF-8',
method: 'GET',
success: function(res) {
@@ -394,7 +540,7 @@
data.create_time = tableSearchParam.value.datetime[0] + " - " + tableSearchParam.value.datetime[1]
}
$.ajax({
- url: "http://127.0.0.1:9090/mo/materialwwout/updateprint",
+ url: "http://127.0.0.1:8133/mo/materialwwout/updateprint",
headers: {
'token': localStorage.getItem('token')
},
@@ -548,8 +694,10 @@
currentPage.value = val
page()
}
- function handleSelectionChange(val) {
-
+ function handleSelectionChange(val) {
+ selectList.value = val
+ }
+ function handleSelectionChangeDialog(val) {
selectList.value = val
}
@@ -564,23 +712,29 @@
return {
tableData,
+ tableDataDialog,
currentPage,
pageSizes,
pageSize,
pageTotal,
tableSearchParam,
+ tableSearchParamDialog,
defaultTime,
selectData,
options,
printOptions,
+ dialogVisible,
page,
+ dialogPage,
fnPrint,
fnPrintView,
fnCanelPrint,
fnTongBu,
+ fnCanelTongBu,
handleSizeChange,
handleCurrentChange,
- handleSelectionChange
+ handleSelectionChange,
+ handleSelectionChangeDialog
}
}
--
Gitblit v1.9.1