Reviewed-on: http://git.picaiba.com/mt-fe-group/yudao-dev/pulls/270pull/273/head
@@ -2,11 +2,11 @@ | |||
* @Author: zwq | |||
* @Date: 2021-11-18 14:16:25 | |||
* @LastEditors: zhp | |||
* @LastEditTime: 2024-03-20 09:18:30 | |||
* @LastEditTime: 2024-03-22 17:11:55 | |||
* @Description: | |||
--> | |||
<template> | |||
<el-drawer :visible.sync="visible" :show-close="false" :wrapper-closable="false" class="drawer" size="50%"> | |||
<el-drawer :visible.sync="visible" :show-close="false" :wrapper-closable="true" class="drawer" size="50%"> | |||
<small-title slot="title" :no-padding="true"> | |||
{{ isdetail ? '详情' : !dataForm.id ? '新增' : '编辑' }} | |||
</small-title> | |||
@@ -75,7 +75,7 @@ | |||
:limit.sync="listQuery.pageSize" :page-sizes="[5, 10, 15]" @pagination="getList" /> | |||
</div> | |||
</div> | |||
<div class="drawer-body__footer"> | |||
<div v-if="!isdetail" class="drawer-body__footer"> | |||
<el-button style="" @click="goback()">取消</el-button> | |||
<el-button type="primary" @click="dataFormSubmit()">确定</el-button> | |||
</div> | |||
@@ -198,7 +198,7 @@ export default { | |||
} | |||
// 修改的提交 | |||
if (this.dataForm.id) { | |||
this.urlOptions.updateURL(this.dataForm).then(response => { | |||
this.urlOptions.updateURL(this.dataForm).then(res => { | |||
this.$modal.msgSuccess("修改成功"); | |||
this.visible = false; | |||
this.$emit("refreshDataList"); | |||
@@ -206,7 +206,7 @@ export default { | |||
return; | |||
} | |||
// 添加的提交 | |||
this.urlOptions.createURL(this.dataForm).then(response => { | |||
this.urlOptions.createURL(this.dataForm).then(res => { | |||
this.$modal.msgSuccess("新增成功"); | |||
this.idAttrShow = true; | |||
this.dataForm.id = res.data | |||
@@ -2,7 +2,7 @@ | |||
* @Author: zwq | |||
* @Date: 2021-11-18 14:16:25 | |||
* @LastEditors: zhp | |||
* @LastEditTime: 2024-03-22 09:01:30 | |||
* @LastEditTime: 2024-03-22 17:12:03 | |||
* @Description: | |||
--> | |||
<template> | |||
@@ -289,7 +289,7 @@ export default { | |||
} | |||
// 修改的提交 | |||
if (this.dataForm.id) { | |||
this.urlOptions.updateURL(this.dataForm).then(response => { | |||
this.urlOptions.updateURL(this.dataForm).then(res => { | |||
this.$modal.msgSuccess("修改成功"); | |||
this.visible = false; | |||
this.$emit("refreshDataList"); | |||
@@ -297,7 +297,7 @@ export default { | |||
return; | |||
} | |||
// 添加的提交 | |||
this.urlOptions.createURL(this.dataForm).then(response => { | |||
this.urlOptions.createURL(this.dataForm).then(res => { | |||
this.$modal.msgSuccess("新增成功"); | |||
this.idAttrShow = true; | |||
this.dataForm.id = res.data | |||
@@ -1,7 +1,7 @@ | |||
<!-- | |||
* @Author: zhp | |||
* @Date: 2023-11-06 15:15:30 | |||
* @LastEditTime: 2024-03-22 15:02:21 | |||
* @LastEditTime: 2024-03-22 17:13:16 | |||
* @LastEditors: zhp | |||
* @Description: | |||
--> | |||
@@ -10,7 +10,7 @@ | |||
<el-row :gutter="20"> | |||
<el-col :span="8"> | |||
<el-form-item label="工单号" prop="workOrderId"> | |||
<el-select filterable v-model="dataForm.workOrderId" placeholder="请选择工单号"> | |||
<el-select filterable v-model="dataForm.workOrderId" placeholder="请选择工单号"> | |||
<el-option v-for="dict in workOrderList" :key="dict.id" :label="dict.name" :value="dict.id" /> | |||
</el-select> | |||
</el-form-item> | |||
@@ -58,6 +58,13 @@ | |||
</el-form-item> | |||
</el-col> | |||
</el-row> | |||
<el-col :span="8"> | |||
<el-form-item label="来源" prop="source"> | |||
<el-select v-model="dataForm.source" placeholder="请选择来源" multiple> | |||
<el-option v-for="dict in sourceList" :key="dict.id" :label="dict.name" :value="dict.id" /> | |||
</el-select> | |||
</el-form-item> | |||
</el-col> | |||
<el-col :span="8"> | |||
<el-form-item label="备注" prop="remark"> | |||
<el-input v-model="dataForm.remark" placeholder="备注" /> | |||
@@ -1,7 +1,7 @@ | |||
<!-- | |||
* @Author: zhp | |||
* @Date: 2024-01-24 15:15:24 | |||
* @LastEditTime: 2024-03-22 10:14:23 | |||
* @LastEditTime: 2024-03-22 17:05:51 | |||
* @LastEditors: zhp | |||
* @Description: | |||
--> | |||
@@ -66,7 +66,7 @@ export default { | |||
}; | |||
}, | |||
created() { | |||
this.getDict() | |||
// this.getDict() | |||
this.getTodayStartTimeAndEndTime() | |||
this.getDataList() | |||
}, | |||
@@ -104,6 +104,8 @@ export default { | |||
}, | |||
async getDataList() { | |||
const res = await getCorePLList() | |||
this.proLineList = res.data; | |||
this.dataListLoading = true | |||
if (this.listQuery.reportTime.length == 0) { | |||
this.$message({ | |||
@@ -135,9 +137,9 @@ export default { | |||
// item.dailyOutputTrend = null | |||
// } | |||
item.dailyOutputTrend = item.dailyOutputTrend && item.dailyOutputTrend != 0 ? this.multipliedByHundred(item.dailyOutputTrend) + '%' : item.dailyOutputTrend == 0 ? 0 : null | |||
item.originalGlassStatisticsTrend = item.dailyOutputTrend && item.originalGlassStatisticsTrend != 0 ? this.multipliedByHundred(item.originalGlassStatisticsTrend) + '%' : item.originalGlassStatisticsTrend == 0 ? 0 : null | |||
item.actualProductTrend = item.dailyOutputTrend && item.actualProductTrend != 0 ? this.multipliedByHundred(item.actualProductTrend) + '%' : item.actualProductTrend == 0 ? 0 : null | |||
item.originalGlassPassTrend = item.dailyOutputTrend && item.originalGlassPassTrend != 0 ? this.multipliedByHundred(item.originalGlassPassTrend) + '%' : item.originalGlassPassTrend == 0 ? 0 : null | |||
item.originalGlassStatisticsTrend = item.originalGlassStatisticsTrend && item.originalGlassStatisticsTrend != 0 ? this.multipliedByHundred(item.originalGlassStatisticsTrend) + '%' : item.originalGlassStatisticsTrend == 0 ? 0 : null | |||
item.actualProductTrend = item.actualProductTrend && item.actualProductTrend != 0 ? this.multipliedByHundred(item.actualProductTrend) + '%' : item.actualProductTrend == 0 ? 0 : null | |||
item.originalGlassPassTrend = item.originalGlassPassTrend && item.originalGlassPassTrend != 0 ? this.multipliedByHundred(item.originalGlassPassTrend) + '%' : item.originalGlassPassTrend == 0 ? 0 : null | |||
} | |||
}) | |||
}) | |||
@@ -57,7 +57,7 @@ export default { | |||
}, | |||
created() { | |||
this.getCurrentMonthFirst() | |||
this.getDict() | |||
// this.getDict() | |||
this.getDataList() | |||
}, | |||
methods: { | |||
@@ -98,6 +98,8 @@ export default { | |||
}, | |||
// 获取数据列表 | |||
async getDataList() { | |||
const res = await getCorePLList() | |||
this.proLineList = res.data; | |||
this.dataListLoading = true; | |||
if (this.listQuery.reportTime.length == 0) { | |||
this.$message({ | |||
@@ -129,9 +131,9 @@ export default { | |||
// item.dailyOutputTrend = null | |||
// } | |||
item.dailyOutputTrend = item.dailyOutputTrend && item.dailyOutputTrend != 0 ? this.multipliedByHundred(item.dailyOutputTrend) + '%' : item.dailyOutputTrend == 0 ? 0 : null | |||
item.originalGlassStatisticsTrend = item.dailyOutputTrend && item.originalGlassStatisticsTrend != 0 ? this.multipliedByHundred(item.originalGlassStatisticsTrend) + '%' : item.originalGlassStatisticsTrend == 0 ? 0 : null | |||
item.actualProductTrend = item.dailyOutputTrend && item.actualProductTrend != 0 ? this.multipliedByHundred(item.actualProductTrend) + '%' : item.actualProductTrend == 0 ? 0 : null | |||
item.originalGlassPassTrend = item.dailyOutputTrend && item.originalGlassPassTrend != 0 ? this.multipliedByHundred(item.originalGlassPassTrend) + '%' : item.originalGlassPassTrend == 0 ? 0 : null | |||
item.originalGlassStatisticsTrend = item.originalGlassStatisticsTrend && item.originalGlassStatisticsTrend != 0 ? this.multipliedByHundred(item.originalGlassStatisticsTrend) + '%' : item.originalGlassStatisticsTrend == 0 ? 0 : null | |||
item.actualProductTrend = item.actualProductTrend && item.actualProductTrend != 0 ? this.multipliedByHundred(item.actualProductTrend) + '%' : item.actualProductTrend == 0 ? 0 : null | |||
item.originalGlassPassTrend = item.originalGlassPassTrend && item.originalGlassPassTrend != 0 ? this.multipliedByHundred(item.originalGlassPassTrend) + '%' : item.originalGlassPassTrend == 0 ? 0 : null | |||
} | |||
}) | |||
}) | |||
@@ -86,23 +86,23 @@ export default { | |||
}, | |||
], | |||
}; | |||
}, | |||
}, | |||
created () { | |||
// this.getDict() | |||
}, | |||
mounted() { | |||
// const day = new Date().getDay() | |||
// console.log('周四', day) | |||
this.getCurrentWeekStartTimeAndEndTime() | |||
// this.changeTime(new Date(new Date().getTime() - day * 24 * 60 * 60 * 1000)) | |||
this.getDict() | |||
this.getDataList() | |||
}, | |||
methods: { | |||
async getDict() { | |||
// 产线列表 | |||
await getCorePLList().then(res => { | |||
this.proLineList = res.data; | |||
// this.getDataList() | |||
}); | |||
}, | |||
// async getDict() { | |||
// // 产线列表 | |||
// }, | |||
getCurrentWeekStartTimeAndEndTime() { | |||
this.reportTime = new Date() | |||
var weekday = new Array(7); | |||
@@ -187,6 +187,8 @@ export default { | |||
}, | |||
// 获取数据列表 | |||
async getDataList() { | |||
const res = await getCorePLList() | |||
this.proLineList = res.data; | |||
this.dataListLoading = true; | |||
if (this.listQuery.reportTime.length == 0) { | |||
this.$message({ | |||
@@ -218,9 +220,9 @@ export default { | |||
// item.dailyOutputTrend = null | |||
// } | |||
item.dailyOutputTrend = item.dailyOutputTrend && item.dailyOutputTrend != 0 ? this.multipliedByHundred(item.dailyOutputTrend) + '%' : item.dailyOutputTrend == 0 ? 0 : null | |||
item.originalGlassStatisticsTrend = item.dailyOutputTrend && item.originalGlassStatisticsTrend != 0 ? this.multipliedByHundred(item.originalGlassStatisticsTrend) + '%' : item.originalGlassStatisticsTrend == 0 ? 0 : null | |||
item.actualProductTrend = item.dailyOutputTrend && item.actualProductTrend != 0 ? this.multipliedByHundred(item.actualProductTrend) + '%' : item.actualProductTrend == 0 ? 0 : null | |||
item.originalGlassPassTrend = item.dailyOutputTrend && item.originalGlassPassTrend != 0 ? this.multipliedByHundred(item.originalGlassPassTrend) + '%' : item.originalGlassPassTrend == 0 ? 0 : null | |||
item.originalGlassStatisticsTrend = item.originalGlassStatisticsTrend && item.originalGlassStatisticsTrend != 0 ? this.multipliedByHundred(item.originalGlassStatisticsTrend) + '%' : item.originalGlassStatisticsTrend == 0 ? 0 : null | |||
item.actualProductTrend = item.actualProductTrend && item.actualProductTrend != 0 ? this.multipliedByHundred(item.actualProductTrend) + '%' : item.actualProductTrend == 0 ? 0 : null | |||
item.originalGlassPassTrend = item.originalGlassPassTrend && item.originalGlassPassTrend != 0 ? this.multipliedByHundred(item.originalGlassPassTrend) + '%' : item.originalGlassPassTrend == 0 ? 0 : null | |||
} | |||
}) | |||
}) | |||
@@ -53,7 +53,7 @@ export default { | |||
}; | |||
}, | |||
created() { | |||
this.getDict() | |||
// this.getDict() | |||
}, | |||
mounted () { | |||
this.getCurrentYearFirst() | |||
@@ -98,6 +98,8 @@ export default { | |||
}, | |||
// 获取数据列表 | |||
async getDataList() { | |||
const res = await getCorePLList() | |||
this.proLineList = res.data; | |||
this.dataListLoading = true; | |||
if (this.listQuery.reportTime.length == 0) { | |||
this.$message({ | |||
@@ -129,9 +131,9 @@ export default { | |||
// item.dailyOutputTrend = null | |||
// } | |||
item.dailyOutputTrend = item.dailyOutputTrend && item.dailyOutputTrend != 0 ? this.multipliedByHundred(item.dailyOutputTrend) + '%' : item.dailyOutputTrend == 0 ? 0 : null | |||
item.originalGlassStatisticsTrend = item.dailyOutputTrend && item.originalGlassStatisticsTrend != 0 ? this.multipliedByHundred(item.originalGlassStatisticsTrend) + '%' : item.originalGlassStatisticsTrend == 0 ? 0 : null | |||
item.actualProductTrend = item.dailyOutputTrend && item.actualProductTrend != 0 ? this.multipliedByHundred(item.actualProductTrend) + '%' : item.actualProductTrend == 0 ? 0 : null | |||
item.originalGlassPassTrend = item.dailyOutputTrend && item.originalGlassPassTrend != 0 ? this.multipliedByHundred(item.originalGlassPassTrend) + '%' : item.originalGlassPassTrend == 0 ? 0 : null | |||
item.originalGlassStatisticsTrend = item.originalGlassStatisticsTrend && item.originalGlassStatisticsTrend != 0 ? this.multipliedByHundred(item.originalGlassStatisticsTrend) + '%' : item.originalGlassStatisticsTrend == 0 ? 0 : null | |||
item.actualProductTrend = item.actualProductTrend && item.actualProductTrend != 0 ? this.multipliedByHundred(item.actualProductTrend) + '%' : item.actualProductTrend == 0 ? 0 : null | |||
item.originalGlassPassTrend = item.originalGlassPassTrend && item.originalGlassPassTrend != 0 ? this.multipliedByHundred(item.originalGlassPassTrend) + '%' : item.originalGlassPassTrend == 0 ? 0 : null | |||
} | |||
}) | |||
}) | |||