¶Ô±ÈÐÂÎļþ |
| | |
| | | <template> |
| | | <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> |
| | | <el-col :span="12" 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;"> |
| | | <el-timeline> |
| | | <el-timeline-item |
| | | placement="top" |
| | | v-for="(item, index) in scheduleList" |
| | | :key="index" |
| | | :timestamp="item.title"> |
| | | <el-card shadow="hover" :body-style="{margin: '0',padding:'0px 20px 0px 20px'}" style="width:90%;"> |
| | | <p> |
| | | <span style="font-weight: bold;">è®¡åæ¶é´: </span> |
| | | {{item.planTime}} |
| | | </p> |
| | | <p> |
| | | <span style="font-weight: bold;">å®é
æ¶é´: </span> |
| | | {{ item.actualTime }}</p> |
| | | </el-card> |
| | | </el-timeline-item> |
| | | </el-timeline> |
| | | </div> |
| | | </el-card> |
| | | </div> |
| | | </el-col> |
| | | </el-row> |
| | | </basic-container> |
| | | <el-dialog |
| | | title="ç¼è¾æ¶é´çº¿" |
| | | :visible.sync="dialogVisible" |
| | | top="5vh" |
| | | width="50%" |
| | | :before-close="handleClose"> |
| | | <div style="height:60vh;overflow-y: scroll;"> |
| | | <el-timeline> |
| | | <el-timeline-item |
| | | placement="top" |
| | | v-for="(item, index) in scheduleEditList" |
| | | :key="index" |
| | | :timestamp="item.title"> |
| | | <el-card shadow="hover" style="width:90%" :body-style="{padding:'20px 20px 5px 20px'}"> |
| | | <el-row> |
| | | <el-col :span="3"> |
| | | <p style="font-weight: bold;line-height: 50%;">è®¡åæ¶é´: </p> |
| | | </el-col> |
| | | <el-col :span="21"> |
| | | <el-date-picker |
| | | style="width:100%" |
| | | v-model="item.planTime" |
| | | value-format="yyyy-MM-dd HH:mm:ss" |
| | | type="datetime" |
| | | placeholder="éæ©æ¥ææ¶é´"> |
| | | </el-date-picker> |
| | | </el-col> |
| | | </el-row> |
| | | <el-row> |
| | | <el-col :span="3"> |
| | | <p style="font-weight: bold;line-height: 50%;">å®é
æ¶é´: </p> |
| | | </el-col> |
| | | <el-col :span="21"> |
| | | <el-date-picker |
| | | style="width:100%" |
| | | v-model="item.actualTime" |
| | | value-format="yyyy-MM-dd HH:mm:ss" |
| | | type="datetime" |
| | | placeholder="éæ©æ¥ææ¶é´"> |
| | | </el-date-picker> |
| | | </el-col> |
| | | </el-row> |
| | | </el-card> |
| | | </el-timeline-item> |
| | | </el-timeline> |
| | | </div> |
| | | <span slot="footer" class="dialog-footer"> |
| | | <el-button @click="dialogVisible = false">å æ¶</el-button> |
| | | <el-button type="primary" @click="confirmEditSchedul">ç¡® å®</el-button> |
| | | </span> |
| | | </el-dialog> |
| | | </div> |
| | | </template> |
| | | |
| | | <script> |
| | | import { |
| | | fetchScheduleList, |
| | | fetchScheduleById, |
| | | fillTime |
| | | } 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 { |
| | | dialogVisible: false, |
| | | scheduleList: [], |
| | | scheduleEditList: [], |
| | | typeOptions: [], |
| | | multipleSelection: [], |
| | | loading: true, |
| | | tableData: [], |
| | | page: { |
| | | total: 10, |
| | | currentPage: 1, |
| | | pageSize: 10 |
| | | }, |
| | | option: { |
| | | height: 400, |
| | | selection: true, |
| | | columnBtn: false, |
| | | index: true, |
| | | rowKey: 'product', |
| | | indexLabel: 'åºå·', |
| | | menuAlign: 'center', |
| | | menuWidth: 100, |
| | | 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, |
| | | } |
| | | ], |
| | | }, |
| | | spanArr: [{ |
| | | prop: 'projectName', |
| | | span: [] |
| | | }, { |
| | | prop: 'contractNo', |
| | | span: [] |
| | | }, |
| | | { |
| | | prop: 'orderTime', |
| | | span: [] |
| | | }, |
| | | { |
| | | prop: 'customerName', |
| | | span: [] |
| | | }, |
| | | { |
| | | prop: 'deliveryDate', |
| | | span: [] |
| | | }, |
| | | { |
| | | prop: 'productType', |
| | | span: [] |
| | | }, |
| | | ], |
| | | } |
| | | }, |
| | | components: { |
| | | ttable, |
| | | TableForm, |
| | | }, |
| | | computed: { |
| | | ...mapGetters(['permissions']), |
| | | }, |
| | | created(){ |
| | | this.loading = true |
| | | this.getData() |
| | | this.getParamType() |
| | | this.rowSort() |
| | | this.rowCalc() |
| | | }, |
| | | beforeUpdate() { |
| | | this.rowSort() |
| | | this.rowCalc() |
| | | }, |
| | | watch:{ |
| | | |
| | | }, |
| | | mounted() { |
| | | |
| | | }, |
| | | beforeDestroy() { |
| | | }, |
| | | methods: { |
| | | openEditDialog(){ |
| | | this.scheduleEditList = JSON.parse(JSON.stringify(this.scheduleList)) |
| | | this.dialogVisible = true |
| | | }, |
| | | confirmEditSchedul(){ |
| | | let data = this.scheduleEditList |
| | | let orderObj = this.multipleSelection[0] |
| | | console.log("data---",data) |
| | | console.log("orderObj-----",orderObj) |
| | | let obj = { |
| | | "documentActualTime": data[0].actualTime, |
| | | "documentPlanTime": data[0].planTime, |
| | | "bomActualTime": data[1].actualTime, |
| | | "bomPlanTime": data[1].planTime, |
| | | "contractActualTime": data[2].actualTime, |
| | | "contractPlanTime": data[2].planTime, |
| | | "arrivalActualTime": data[3].actualTime, |
| | | "arrivalPlanTime": data[3].planTime, |
| | | "checkActualTime": data[4].actualTime, |
| | | "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 |
| | | } |
| | | console.log("obj----->>>",obj); |
| | | fillTime(obj).then(res=>{ |
| | | if(res.status===200){ |
| | | this.$message.success("æ´æ°æå") |
| | | }else{ |
| | | this.$message.error("æ´æ°å¤±è´¥") |
| | | } |
| | | this.getScheduleById(orderObj.id) |
| | | this.dialogVisible = false |
| | | }).catch(error=>{ |
| | | console.log(error); |
| | | }) |
| | | |
| | | }, |
| | | handleClose(done){ |
| | | done() |
| | | }, |
| | | initTimeLine(data){ |
| | | this.scheduleList = [] |
| | | if(data){ |
| | | let arr = [ |
| | | { |
| | | title: 'æä»¶ç¾å', |
| | | actualTime: data.documentActualTime, |
| | | planTime: data.documentPlanTime, |
| | | }, |
| | | { |
| | | title: 'ä¸è¾¾ç©æéæ±', |
| | | actualTime: data.bomActualTime, |
| | | planTime: data.bomPlanTime, |
| | | }, |
| | | { |
| | | title: 'éè´è¯¢ä»·+ååç¾è®¢', |
| | | actualTime: data.contractActualTime, |
| | | planTime: data.contractPlanTime, |
| | | }, |
| | | { |
| | | title: 'ç©æéè´å°è´§', |
| | | actualTime: data.arrivalActualTime, |
| | | planTime: data.arrivalPlanTime, |
| | | }, |
| | | { |
| | | title: 'ç©æå°è´§æ£éª', |
| | | actualTime: data.checkActualTime, |
| | | planTime: data.checkPlanTime, |
| | | }, |
| | | { |
| | | title: '颿ãè£
ç®±å
¥åº', |
| | | actualTime: data.productActualTime, |
| | | planTime: data.productPlanTime, |
| | | }, |
| | | ] |
| | | this.scheduleList = arr |
| | | } |
| | | }, |
| | | getScheduleById(id){ |
| | | if(id){ |
| | | fetchScheduleById(id).then(res=>{ |
| | | 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) |
| | | }, |
| | | formatDate(row, cellValue){ |
| | | if (cellValue) { |
| | | const dutyDateList = /\d{4}-\d{1,2}-\d{1,2}/g.exec(cellValue) |
| | | if (dutyDateList && dutyDateList.length > 0) { |
| | | return dutyDateList[0] |
| | | } |
| | | } |
| | | return '' |
| | | }, |
| | | // è·åæ°æ®å表 |
| | | getData() { |
| | | this.loading = true |
| | | let param = { |
| | | size: 20, |
| | | current: 1, |
| | | } |
| | | fetchScheduleList(param).then((res) => { |
| | | this.tableData = res.data.data.records |
| | | this.page.total = res.data.data.total |
| | | this.page.currentPage = res.data.data.records.pages |
| | | this.scheduleList = [] |
| | | }) |
| | | this.loading = false |
| | | }, |
| | | handleCurrentChange(val) { |
| | | this.multipleSelection = val |
| | | }, |
| | | // å é¤ |
| | | deleteHandle(row,index) { |
| | | this.$confirm('æ¯å¦ç¡®è®¤å é¤', 'æç¤º', { |
| | | confirmButtonText: 'ç¡®å®', |
| | | cancelButtonText: 'åæ¶', |
| | | type: 'warning' |
| | | }).then(function() { |
| | | |
| | | }) |
| | | }, |
| | | //卿åå¹¶æ¹æ³ |
| | | rowCalc() { |
| | | this.spanArr.forEach((ele, index) => { |
| | | let parent |
| | | if (index !== 0) parent = this.spanArr[ele.parent || index - 1].span |
| | | ele.span = this.rowSpan(ele.prop, parent) |
| | | }) |
| | | }, |
| | | rowSort(list) { |
| | | let propList = this.spanArr.map(ele => ele.prop) |
| | | this.spanArr.forEach((ele, index) => { |
| | | let key = ele.prop |
| | | this.tableData = this.tableData.sort((a, b) => { |
| | | let flag = true; |
| | | for (let i = 0; i < index; i++) { |
| | | let prop = this.spanArr[i].prop |
| | | flag = flag && a[prop] == b[prop] |
| | | } |
| | | if (flag) { |
| | | if (a[key] < b[key]) { return 1; } |
| | | else if (a[key] > b[key]) { return -1; } |
| | | return 0; |
| | | } |
| | | return 0; |
| | | }) |
| | | }) |
| | | }, |
| | | rowSpan(key, parent) { |
| | | let list = []; |
| | | let position = 0; |
| | | this.tableData.forEach((item, index) => { |
| | | if (index === 0) { |
| | | list.push(1) |
| | | let position = 0; |
| | | } else { |
| | | if (this.tableData[index][key] === this.tableData[index - 1][key]) { |
| | | if (parent && parent[index] !== 0) { |
| | | list.push(1) |
| | | position = index |
| | | } else { |
| | | list[position] += 1; |
| | | list.push(0) |
| | | } |
| | | } else { |
| | | list.push(1) |
| | | position = index |
| | | } |
| | | } |
| | | }) |
| | | return list |
| | | }, |
| | | spanMethod({ row, column, rowIndex, columnIndex }) { |
| | | for (let i = 0; i < this.spanArr.length; i++) { |
| | | const ele = this.spanArr[i] |
| | | if (column.property == ele.prop) { |
| | | const _row = ele.span[rowIndex]; |
| | | const _col = _row > 0 ? 1 : 0; |
| | | return { |
| | | rowspan: _row, |
| | | colspan: _col |
| | | } |
| | | } |
| | | } |
| | | } |
| | | } |
| | | } |
| | | </script> |
| | | <style> |
| | | .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> |