From a0c0c57709d1f2f82f536a02b113f65d7b338209 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期二, 26 十二月 2023 14:31:16 +0800
Subject: [PATCH] modified: src/page/index/sidebar/index.vue modified: src/views/plan/productionschedul/index.vue modified: src/views/quality/rawMaterial/rawMaterial-form.vue
---
src/views/plan/productionschedul/index.vue | 450 +++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 396 insertions(+), 54 deletions(-)
diff --git a/src/views/plan/productionschedul/index.vue b/src/views/plan/productionschedul/index.vue
index 3a03c19..9117ea8 100644
--- a/src/views/plan/productionschedul/index.vue
+++ b/src/views/plan/productionschedul/index.vue
@@ -2,27 +2,80 @@
<div class="mod-config">
<basic-container>
<el-row>
- <el-col :span="12">
- <div style="height:80vh;padding: 0px 10px;">
- <avue-crud :data="tableData" ref="crud" :option="option" :span-method="spanMethod"
- @refresh-change="getData"
- :page="page"
- @selection-change="selectionRow"
- :table-loading="loading">
- <template #menu="{ row, index }">
- <el-button type="text" icon="el-icon-delete" size="small" @click="deleteHandle(row, index)">鍒犻櫎</el-button>
- </template>
- </avue-crud>
- </div>
+ <el-col :span="14" style="height:100vh">
+ <el-row style="height:50%;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-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>
+ </div>
+ </el-col>
+ </el-row>
+ <el-row style="height:50%;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>
+ </div>
+ </el-col>
+ </el-row>
</el-col>
- <el-col :span="12" style="padding-left: 10px">
+ <el-col :span="10" style="padding-left: 10px">
<div style="">
<el-card>
<div slot="header" class="clearfix">
<span>璋冨害鏃堕棿绾�</span>
- <el-button v-if="scheduleList.length>0" @click="openEditDialog" style="float: right; padding: 3px 0" type="text">缂栬緫</el-button>
</div>
- <div style="height:70vh;overflow-y: scroll;">
+ <div style="height:100vh;overflow-y: scroll;">
<el-timeline>
<el-timeline-item
placement="top"
@@ -97,6 +150,31 @@
<el-button type="primary" @click="confirmEditSchedul">纭� 瀹�</el-button>
</span>
</el-dialog>
+ <el-dialog
+ title="缂栬緫"
+ :visible.sync="editDialogVisible"
+ width="50%">
+ <el-form :model="editForm" label-width="120px">
+ <el-row>
+ <el-col :span="24">
+ <el-form-item label="鐢熶骇鎯呭喌:">
+ <el-input style="width:100%" placeholder="璇疯緭鍏ョ敓浜ф儏鍐�" type="textarea" :row="2" v-model="editForm.productionStatus"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="24">
+ <el-form-item label="鐢熶骇绋嬪害:">
+ <el-input style="width:100%" placeholder="璇疯緭鍏ョ敓浜х▼搴�" type="textarea" :row="2" v-model="editForm.productionRoutine"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ </el-form>
+ <span slot="footer" class="dialog-footer">
+ <el-button @click="editDialogVisible = false">鍙� 娑�</el-button>
+ <el-button type="primary" @click="confirmEdit()">纭� 瀹�</el-button>
+ </span>
+ </el-dialog>
</div>
</template>
@@ -104,14 +182,22 @@
import {
fetchScheduleList,
fetchScheduleById,
- fillTime
+ fillTime,
+ deleteSchedul,
+ updateState,
+ checkTimeLines,
} from '@/api//plan/productionschedul'
-import TableForm from './template-form'
import ttable from '@/views/common/ztt-table.vue'
import { mapGetters } from 'vuex'
export default {
data() {
return {
+ editForm:{
+ id: null,
+ productionRoutine: null,
+ productionStatus: null,
+ },
+ editDialogVisible: false,
dialogVisible: false,
scheduleList: [],
scheduleEditList: [],
@@ -119,20 +205,145 @@
multipleSelection: [],
loading: true,
tableData: [],
+ finishedTableData: [],
page: {
- total: 10,
+ total: 0,
currentPage: 1,
- pageSize: 10
+ pageSize: 10,
+ pagerCount: 5
+ },
+ finishedPage: {
+ total: 0,
+ currentPage: 1,
+ pageSize: 10,
+ pagerCount: 5
},
option: {
- height: 400,
+ defaultSort:{
+ prop:'id',
+ order:'descending'
+ },
+ height: 230,
selection: true,
columnBtn: false,
index: true,
- rowKey: 'product',
+ indexFixed: false,
+ selectionFixed: false,
+ rowKey: 'mid',
indexLabel: '搴忓彿',
menuAlign: 'center',
- menuWidth: 100,
+ menuWidth: 130,
+ editBtn: false,
+ delBtn: false,
+ addBtn: false,
+ border: true,
+ align: 'center',
+ column: [
+ {
+ minWidth: 120,
+ prop: 'projectName',
+ label: '椤圭洰鍚嶇О',
+ overHidden: true,
+ },
+ {
+ minWidth: 100,
+ prop: 'contractNo',
+ label: '鍚堝悓鍙�',
+ overHidden: true,
+ },
+ {
+ minWidth: 120,
+ prop: 'orderTime',
+ label: '鎺ュ崟鏃ユ湡',
+ overHidden: true,
+ formatter: (row,columnValue)=> this.formatDate(row,columnValue)
+ },
+ {
+ minWidth: 120,
+ prop: 'customerName',
+ label: '瀹㈡埛鍚嶇О',
+ overHidden: true,
+ },
+ {
+ minWidth: 120,
+ prop: 'deliveryDate',
+ label: '浜よ揣鏃ユ湡',
+ overHidden: true,
+ formatter: (row,columnValue)=> this.formatDate(row,columnValue)
+ },
+ {
+ minWidth: 120,
+ prop: 'productType',
+ label: '浜у搧绫诲瀷',
+ overHidden: true,
+ },
+ {
+ minWidth: 120,
+ prop: 'product',
+ label: '浜у搧鍚�',
+ overHidden: true,
+ },
+ {
+ minWidth: 120,
+ prop: 'specs',
+ label: '瑙勬牸鍨嬪彿',
+ overHidden: true,
+ },
+ {
+ minWidth: 120,
+ prop: 'unit',
+ label: '鍗曚綅',
+ overHidden: true,
+ },
+ {
+ minWidth: 120,
+ prop: 'number',
+ label: '鏁伴噺',
+ overHidden: true,
+ },
+ {
+ minWidth: 120,
+ prop: 'productionStatus',
+ label: '鐢熶骇鎯呭喌',
+ overHidden: true,
+ },
+ {
+ minWidth: 120,
+ prop: 'productionRoutine',
+ label: '鐢熶骇绋嬪害',
+ overHidden: true,
+ },
+ {
+ minWidth: 120,
+ prop: 'projectLeader',
+ label: '椤圭洰璐熻矗浜�',
+ overHidden: true,
+ },
+ {
+ minWidth: 150,
+ prop: 'remark',
+ label: '澶囨敞',
+ overHidden: true,
+ }
+ ],
+ },
+ finishedOption: {
+ refreshBtn: false, // 鏄惁鏄剧ず鍒锋柊鎸夐挳
+ defaultSort:{
+ prop:'id',
+ order:'descending'
+ },
+ height: 250,
+ selection: true,
+ columnBtn: false,
+ index: true,
+ indexFixed: false,
+ selectionFixed: false,
+ rowKey: 'mid',
+ indexLabel: '搴忓彿',
+ menu: false,
+ menuAlign: 'center',
+ menuWidth: 130,
editBtn: false,
delBtn: false,
addBtn: false,
@@ -228,6 +439,9 @@
],
},
spanArr: [{
+ prop: 'id',
+ span: []
+ },{
prop: 'projectName',
span: []
}, {
@@ -255,24 +469,40 @@
},
components: {
ttable,
- TableForm,
},
computed: {
...mapGetters(['permissions']),
},
created(){
+ if(!this.permissions.plan_productionschedul_edit && !this.permissions.plan_productionschedul_del){
+ this.option.menu = false
+ }
this.loading = true
- this.getData()
+ this.getUnFinishedData()
+ this.getFinishedData()
this.getParamType()
- this.rowSort()
+ // this.rowSort()
this.rowCalc()
},
beforeUpdate() {
- this.rowSort()
+ // this.rowSort()
this.rowCalc()
},
watch:{
-
+ editDialogVisible(newVal){
+ if(!newVal){
+ this.editForm = {
+ id: null,
+ productionRoutine: null,
+ productionStatus: null,
+ }
+ }
+ },
+ multipleSelection(newVal){
+ if(newVal.length==0){
+ this.scheduleList = []
+ }
+ }
},
mounted() {
@@ -280,15 +510,70 @@
beforeDestroy() {
},
methods: {
+ tagFinished(){
+ if(this.multipleSelection.length < 1){
+ this.$message.warning("璇疯嚦灏戦�夋嫨涓�鏉℃暟鎹�")
+ return
+ }
+ let ids = this.multipleSelection.map(ele=>{
+ return ele.mid
+ })
+ updateState(ids).then(res=>{
+ if(res.status===200){
+ this.$message.success("鏇存柊鎴愬姛")
+ this.getUnFinishedData()
+ this.getFinishedData()
+ }
+ }).catch(error=>{
+ console.error(error);
+ })
+ },
+ confirmEdit(){
+ const _than = this
+ updateSchedul(this.editForm).then(res=>{
+ if(res.status===200){
+ _than.$message.success("鏇存柊鎴愬姛")
+ _than.editDialogVisible = false
+ _than.getUnFinishedData()
+ }
+ }).catch(error=>{
+ console.error(error);
+ })
+ },
+ editHandle(row,index){
+ if(row){
+ this.editForm.id = row.mid
+ this.editForm.productionRoutine = row.productionRoutine
+ this.editForm.productionStatus = row.productionStatus
+ this.editDialogVisible = true
+ }
+ },
openEditDialog(){
- this.scheduleEditList = JSON.parse(JSON.stringify(this.scheduleList))
- this.dialogVisible = true
+ if(this.multipleSelection.length<1){
+ this.$message.warning("璇疯嚦灏戦�夋嫨涓�鏉℃暟鎹�")
+ return
+ }
+ let mIds = this.multipleSelection.map(ele=>{
+ return ele.mid
+ })
+ checkTimeLines(mIds).then(res=>{
+ 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("閫変腑鏁版嵁鐨勮皟搴︽椂闂寸嚎涓嶄竴鑷�!")
+ }
+ }).catch(error=>{
+ console.error(error);
+ })
},
confirmEditSchedul(){
let data = this.scheduleEditList
- let orderObj = this.multipleSelection[0]
- console.log("data---",data)
- console.log("orderObj-----",orderObj)
+ let mIds = this.multipleSelection.map(ele=>{
+ return ele.mid
+ })
let obj = {
"documentActualTime": data[0].actualTime,
"documentPlanTime": data[0].planTime,
@@ -302,15 +587,14 @@
"checkPlanTime": data[4].planTime,
"productActualTime": data[5].actualTime,
"productPlanTime": data[5].planTime,
- "id": orderObj.id,
- "contractNo": orderObj.contractNo,
- "customerName": orderObj.customerName,
- "deliveryDate": orderObj.deliveryDate,
- "orderTime": orderObj.orderTime,
- "productType": orderObj.productType,
- "projectName": orderObj.projectName
+ "mids": mIds,
+ // "contractNo": orderObj.contractNo,
+ // "customerName": orderObj.customerName,
+ // "deliveryDate": orderObj.deliveryDate,
+ // "orderTime": orderObj.orderTime,
+ // "productType": orderObj.productType,
+ // "projectName": orderObj.projectName
}
- console.log("obj----->>>",obj);
fillTime(obj).then(res=>{
if(res.status===200){
this.$message.success("鏇存柊鎴愬姛")
@@ -328,7 +612,7 @@
done()
},
initTimeLine(data){
- this.scheduleList = []
+ let scheduleList = []
if(data){
let arr = [
{
@@ -362,28 +646,40 @@
planTime: data.productPlanTime,
},
]
- this.scheduleList = arr
+ scheduleList = arr
+ return scheduleList
}
},
getScheduleById(id){
if(id){
fetchScheduleById(id).then(res=>{
- this.initTimeLine(res.data.data)
+ this.scheduleList = this.initTimeLine(res.data.data)
}).catch(error=>{
console.log(error);
})
}
},
selectionRow(val){
+ // if (val.length > 1) {
+ // const preVal = val.shift();
+ // this.$refs.crud.toggleRowSelection(preVal, false);
+ // }
+ // else{
+ // this.scheduleList=[]
+ // }
+ this.multipleSelection = val
+ // this.getScheduleById(val[0].id)
+ },
+ selectionFinishedRow(val){
+ console.log(val);
if (val.length > 1) {
const preVal = val.shift();
- this.$refs.crud.toggleRowSelection(preVal, false);
+ this.$refs.finished.toggleRowSelection(preVal, false);
}
else{
this.scheduleList=[]
}
- this.multipleSelection = val
- this.getScheduleById(val[0].id)
+ this.getScheduleById(val[0].mid)
},
formatDate(row, cellValue){
if (cellValue) {
@@ -394,12 +690,29 @@
}
return ''
},
+ handleSizeChange(val){
+ if(val){
+ this.page.pageSize=val
+ this.getUnFinishedData()
+ }
+ },
+ handleCurrentChange(val){
+ if(val){
+ this.page.currentPage=val
+ this.getUnFinishedData()
+ }
+ },
// 鑾峰彇鏁版嵁鍒楄〃
- getData() {
+ getDataList(){
+ this.getUnFinishedData()
+ this.getFinishedData()
+ },
+ getUnFinishedData() {
this.loading = true
let param = {
- size: 20,
- current: 1,
+ size: this.page.pageSize,
+ current: this.page.currentPage,
+ state: false
}
fetchScheduleList(param).then((res) => {
this.tableData = res.data.data.records
@@ -409,17 +722,37 @@
})
this.loading = false
},
- handleCurrentChange(val) {
- this.multipleSelection = val
+ getFinishedData() {
+ this.loading = true
+ let param = {
+ size: this.finishedPage.pageSize,
+ current: this.finishedPage.currentPage,
+ state: true
+ }
+ fetchScheduleList(param).then((res) => {
+ this.finishedTableData = res.data.data.records
+ this.finishedPage.total = res.data.data.total
+ this.finishedPage.currentPage = res.data.data.records.pages
+ this.scheduleList = []
+ })
+ this.loading = false
},
// 鍒犻櫎
deleteHandle(row,index) {
- this.$confirm('鏄惁纭鍒犻櫎', '鎻愮ず', {
+ const _than = this
+ _than.$confirm('鏄惁纭鍒犻櫎璇ョ敓浜ц皟搴︿俊鎭�', '鎻愮ず', {
confirmButtonText: '纭畾',
cancelButtonText: '鍙栨秷',
type: 'warning'
}).then(function() {
-
+ deleteSchedul(row.mid).then(res=>{
+ if(res.status===200){
+ _than.$message.success("鍒犻櫎鎴愬姛")
+ _than.getData()
+ }
+ }).catch(error=>{
+ console.error(error)
+ })
})
},
//鍔ㄦ�佸悎骞舵柟娉�
@@ -430,7 +763,7 @@
ele.span = this.rowSpan(ele.prop, parent)
})
},
- rowSort(list) {
+ rowSort() {
let propList = this.spanArr.map(ele => ele.prop)
this.spanArr.forEach((ele, index) => {
let key = ele.prop
@@ -490,6 +823,15 @@
}
</script>
<style>
+.avue-crud__tip{
+ display: none;
+}
+.avue-crud__pagination {
+ position: relative;
+ padding: 5px 0 20px 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;
--
Gitblit v1.9.3