From cdd1902016ebdeab0a0615693e36b66450202765 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期六, 02 十二月 2023 16:44:13 +0800
Subject: [PATCH] modified: src/api/plan/productionschedul.js modified: src/api/quality/packageInspect.js modified: src/views/plan/productionschedul/index.vue modified: src/views/quality/packageinspect/index.vue modified: src/views/quality/packageinspect/packageInspect-form.vue modified: vue.config.js
---
src/views/plan/productionschedul/index.vue | 130 ++++++++++++++++++++++++++++++++++++++++---
1 files changed, 120 insertions(+), 10 deletions(-)
diff --git a/src/views/plan/productionschedul/index.vue b/src/views/plan/productionschedul/index.vue
index 0775072..3a03c19 100644
--- a/src/views/plan/productionschedul/index.vue
+++ b/src/views/plan/productionschedul/index.vue
@@ -3,7 +3,7 @@
<basic-container>
<el-row>
<el-col :span="12">
- <div style="height:80vh">
+ <div style="height:80vh;padding: 0px 10px;">
<avue-crud :data="tableData" ref="crud" :option="option" :span-method="spanMethod"
@refresh-change="getData"
:page="page"
@@ -20,7 +20,7 @@
<el-card>
<div slot="header" class="clearfix">
<span>璋冨害鏃堕棿绾�</span>
- <el-button style="float: right; padding: 3px 0" type="text">鎿嶄綔鎸夐挳</el-button>
+ <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>
@@ -28,10 +28,15 @@
placement="top"
v-for="(item, index) in scheduleList"
:key="index"
- :timestamp="item.planTime">
- <el-card style="width:95%;margin: 0;padding: 0px 10px;">
- <p style="font-weight: bold;">{{item.title}}</p>
- <p>瀹為檯鏃堕棿: {{ item.actualTime }}</p>
+ :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>
@@ -41,6 +46,57 @@
</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>
@@ -48,6 +104,7 @@
import {
fetchScheduleList,
fetchScheduleById,
+ fillTime
} from '@/api//plan/productionschedul'
import TableForm from './template-form'
import ttable from '@/views/common/ztt-table.vue'
@@ -55,7 +112,9 @@
export default {
data() {
return {
+ dialogVisible: false,
scheduleList: [],
+ scheduleEditList: [],
typeOptions: [],
multipleSelection: [],
loading: true,
@@ -221,6 +280,53 @@
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){
@@ -270,10 +376,14 @@
},
selectionRow(val){
if (val.length > 1) {
- const preVal = val.shift();
- this.$refs.crud.toggleRowSelection(preVal, false);
- }
- this.getScheduleById(val[0].id)
+ 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) {
--
Gitblit v1.9.3