From a89a1c3f3f82e8adb40170919efcd096e9d225f3 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期五, 29 十二月 2023 11:28:13 +0800
Subject: [PATCH] modified: src/views/plan/productionschedul/index.vue modified: src/views/warehouse/pallettransports/index.vue
---
src/views/plan/productionschedul/index.vue | 179 +++++++++++++++++++-------------------------
src/views/warehouse/pallettransports/index.vue | 10 --
2 files changed, 78 insertions(+), 111 deletions(-)
diff --git a/src/views/plan/productionschedul/index.vue b/src/views/plan/productionschedul/index.vue
index cd1b614..e762066 100644
--- a/src/views/plan/productionschedul/index.vue
+++ b/src/views/plan/productionschedul/index.vue
@@ -2,74 +2,79 @@
<div class="mod-config">
<basic-container>
<el-row>
- <el-col :span="14" style="height:100vh">
- <el-row style="height:70%;padding:0px 10px;">
- <el-col :span="24">
- <div>
- <span style="position: relative;top:40px;color:#E84738">鏈畬鎴�</span>
- <span style="position: relative;top:30px;left:61%;z-index: 11">
+ <el-col :span="16" style="height:100vh">
+ <el-row style="height:65%;padding:0px 10px;">
+ <el-col :span="24" style="margin: 0;">
+ <div style="display:flex;height:36px;justify-content: space-between;align-items:center;">
+ <div><span style="color:#E84738;font-weight: bold;">鏈畬鎴�</span></div>
+ <div>
<el-button @click="tagFinished" size="mini" round type="success">鏍囪宸插畬鎴�</el-button>
<el-button size="mini" round type="primary"
v-if="permissions.plan_productionschedul_edit_line"
@click="openEditDialog">缂栬緫鏃堕棿绾�</el-button>
- </span>
- <avue-crud
- :data="tableData"
- ref="crud"
- :option="option"
- :span-method="spanMethod"
- @refresh-change="getDataList"
- @current-change="handleCurrentChange"
- @size-change="handleSizeChange"
- :page="page"
- @selection-change="selectionRow"
- :table-loading="loading">
- <template #menu="{ row, index }">
- <el-button
- v-if="permissions.plan_productionschedul_edit"
- type="text"
- icon="el-icon-edit"
- size="small"
- @click="editHandle(row, index)">缂栬緫</el-button>
- <el-button
- v-if="permissions.plan_productionschedul_del"
- type="text"
- icon="el-icon-delete"
- size="small"
- @click="deleteHandle(row, index)">鍒犻櫎</el-button>
- </template>
- </avue-crud>
+ <el-tooltip content="鍒锋柊">
+ <el-button circle icon="el-icon-refresh" @click="getDataList"></el-button>
+ </el-tooltip>
+ </div>
</div>
+ <avue-crud
+ class="unfinished-crud"
+ :data="tableData"
+ ref="crud"
+ :option="option"
+ :span-method="spanMethod"
+ @refresh-change="getDataList"
+ @current-change="handleCurrentChange"
+ @size-change="handleSizeChange"
+ :page="page"
+ @selection-change="selectionRow"
+ :table-loading="loading">
+ <template #menu="{ row, index }">
+ <el-button
+ v-if="permissions.plan_productionschedul_edit"
+ type="text"
+ icon="el-icon-edit"
+ size="small"
+ @click="editHandle(row, index)">缂栬緫</el-button>
+ <el-button
+ v-if="permissions.plan_productionschedul_del"
+ type="text"
+ icon="el-icon-delete"
+ size="small"
+ @click="deleteHandle(row, index)">鍒犻櫎</el-button>
+ </template>
+ </avue-crud>
</el-col>
</el-row>
- <el-row style="height:30%;padding:0px 10px;">
- <el-col :span="24">
- <div>
- <span style="position: relative;top:0px;color:#34BD66">宸插畬鎴�</span>
- <avue-crud
- :data="finishedTableData"
- ref="finished"
- :option="finishedOption"
- :span-method="spanMethod"
- @refresh-change="getFinishedData"
- @current-change="handleCurrentChange"
- @size-change="handleSizeChange"
- :page="finishedPage"
- @selection-change="selectionFinishedRow">
- <!-- <template #menu="{ row, index }">
- <el-button
- v-if="permissions.plan_productionschedul_del"
- type="text"
- icon="el-icon-delete"
- size="small"
- @click="deleteHandle(row, index)">鍒犻櫎</el-button>
- </template> -->
- </avue-crud>
+ <el-row style="height:35%;padding:0px 10px;">
+ <el-col :span="24" style="margin: 0;">
+ <div style="display:flex;height:36px;justify-content: space-between;align-items:center;">
+ <div><span style="color:#34BD66;font-weight: bold;">宸插畬鎴�</span></div>
</div>
+ <avue-crud
+ class="finished-crud"
+ :data="finishedTableData"
+ ref="finished"
+ :option="finishedOption"
+ :span-method="spanMethod"
+ @refresh-change="getFinishedData"
+ @current-change="handleCurrentChange"
+ @size-change="handleSizeChange"
+ :page="finishedPage"
+ @selection-change="selectionFinishedRow">
+ <!-- <template #menu="{ row, index }">
+ <el-button
+ v-if="permissions.plan_productionschedul_del"
+ type="text"
+ icon="el-icon-delete"
+ size="small"
+ @click="deleteHandle(row, index)">鍒犻櫎</el-button>
+ </template> -->
+ </avue-crud>
</el-col>
</el-row>
</el-col>
- <el-col :span="10" style="padding-left: 10px">
+ <el-col :span="8" style="padding-left: 10px">
<div style="">
<el-card>
<div slot="header" class="clearfix">
@@ -225,7 +230,7 @@
prop:'id',
order:'descending'
},
- height: 360,
+ height: 370,
selection: true,
columnBtn: false,
index: true,
@@ -335,7 +340,7 @@
prop:'id',
order:'descending'
},
- height: 150,
+ height: 230,
selection: true,
columnBtn: false,
index: true,
@@ -562,7 +567,6 @@
if(res.data.data.length==1){
let dataList = this.initTimeLine(res.data.data[0])
this.scheduleEditList = dataList
- console.log(this.scheduleEditList);
this.dialogVisible = true
}else{
this.$message.error("閫変腑鏁版嵁鐨勮皟搴︽椂闂寸嚎涓嶄竴鑷�!")
@@ -606,7 +610,7 @@
this.getScheduleById(orderObj.id)
this.dialogVisible = false
}).catch(error=>{
- console.log(error);
+ console.error(error);
})
},
@@ -657,7 +661,7 @@
fetchScheduleById(id).then(res=>{
this.scheduleList = this.initTimeLine(res.data.data)
}).catch(error=>{
- console.log(error);
+ console.error(error);
})
}
},
@@ -824,51 +828,22 @@
}
</script>
<style>
-.avue-crud__tip{
+.unfinished-crud .avue-crud__tip{
+ display: none;
+}
+.unfinished-crud .avue-crud__menu{
+ display: none;
+}
+.finished-crud .avue-crud__tip{
+ display: none;
+}
+.finished-crud .avue-crud__menu{
display: none;
}
.avue-crud__pagination {
position: relative;
- padding: 5px 0 20px 20px;
+ padding: 0px 0 0px 20px;
text-align: right;
z-index: 10;
-}
-.basic-template-table .el-table__body .el-table__row td:first-child .cell {
- padding-left: 0px;
- padding-right: 0px;
-}
-
-.basic-template-table .el-table__body .el-table__row:hover {
- cursor: move;
-}
-
-.basic-template-table .el-table__body .el-table__row:hover .icon {
- display: inline-block;
-}
-
-.basic-template-table .el-table__body .el-table__row .icon {
- color: rgba(0, 0, 0, 0.45);
- font-size: 12px;
- line-height: 18px;
- display: none;
-}
-
-.aufontAll {
- font-family: aufontAll !important;
- font-size: 14px;
- font-style: normal;
- -webkit-font-smoothing: antialiased;
- -moz-osx-font-smoothing: grayscale;
-}
-
-.h-icon-all-drag {
- background: url('/img/tz.png') center center no-repeat;
- background-size: cover;
- font-size: 14px;
-}
-.h-icon-all-drag:before {
- content: '\E63E';
- font-size: 14px;
- visibility: hidden;
}
</style>
diff --git a/src/views/warehouse/pallettransports/index.vue b/src/views/warehouse/pallettransports/index.vue
index e40e69e..503244e 100644
--- a/src/views/warehouse/pallettransports/index.vue
+++ b/src/views/warehouse/pallettransports/index.vue
@@ -395,7 +395,6 @@
palletTransportsMaterialSelectionChange() {
if(this.cid){
selectAll({transportsId:this.cid}).then((res)=>{
- console.log(res.data.data);
this.palletTransportsDetailData = res.data.data.map(el =>{
return{
part_no:el.partNo,
@@ -434,7 +433,6 @@
},
// 鍗曡閫変腑
handleCurrentChange(row) {
- console.log(row,"--->1");
this.palletTransportsMaterialMultipleSelection = row
// this.palletTransportsMaterialData.forEach((item) => {
// // 鎺掍粬,姣忔閫夋嫨鏃舵妸鍏朵粬閫夐」閮芥竻闄�
@@ -646,7 +644,6 @@
// 鑾峰彇绉诲簱鏄庣粏鏁版嵁鍒楄〃
getPalletTransportsDetailData() {
let transportsDetails =[]
- console.log(this.palletTransportsMaterialMultipleSelection,"----+");
transportsDetails = this.palletTransportsMaterialMultipleSelection.map(el =>{
return{
partNo:el.partNo,
@@ -749,14 +746,10 @@
},
//鏀瑰彉
moveLocation(val){
- console.log(val,"---->");
let num = Number(val.transfer_quantity)
this.palletTransportsDetailMultipleSelection.forEach(el =>{
- console.log(el.transfer_quantity);
- el.transfer_quantity = num
+ el.transfer_quantity = num
})
- console.log(this.palletTransportsDetailMultipleSelection,"--->123");
-
},
updateStockFun(){
let data = []
@@ -821,7 +814,6 @@
this.showDetailStock = true
},
palletTransportsDetailSelectionChange(val) {
- console.log(val,"-=-=-=");
this.palletTransportsDetailMultipleSelection = val
},
getOptasks() {
--
Gitblit v1.9.3