mt-fe-group/yudao-dev
13
0
Fork 0
Code Issues Pull Requests 1 Releases Wiki Activity

修改bug

Browse Source
This commit is contained in:
‘937886381’
2024-03-12 11:18:06 +08:00
parent 3be7ac4237
commit 0457514f1e
10 changed files with 58 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/views/report/productionDayReport/index.vue
View File

@@ -1,7 +1,7 @@
<!--
* @Author: zhp
* @Date: 2023-12-12 13:45:25
* @LastEditTime: 2024-03-11 16:13:38
* @LastEditTime: 2024-03-12 11:17:53
* @LastEditors: zhp
* @Description:
-->
@@ -114,13 +114,14 @@
<template slot-scope="scope">
<el-input v-if="!disabled" v-model="scope.row.goodProductPassTrend" :disabled="disabled">
</el-input>
<span v-else>{{ scope.row.goodProductPassTrend ? scope.row.goodProductPassTrend + '%' : undefined }} </span>
<span v-else>{{ scope.row.goodProductPassTrend ? scope.row.goodProductPassTrend + '%' : undefined }}
</span>
</template>
</el-table-column>
</el-table-column>
</el-table-column>
<div class="remark" slot="append">
<el-input placeholder="备注" v-if="disabled" v-model="remark" :disabled="disabled">
<div style="height: 50px;" class="remark" slot="append">
<el-input placeholder="备注" v-if="!disabled" v-model="remark" :disabled="disabled">
</el-input>
<span v-else>{{ remark }} </span>
</div>
@@ -530,14 +531,13 @@ export default {
const result = await Promise.all([
await updateSumProductionDataList(obj),
await updateProductionDataList(updateArr),
]);
if (result[0] == true && result[1] == true) {
])
console.log(result);
if (result[0].data == true && result[1].data == true) {
// console.log(res)
this.disabled = true
this.isSave = false
this.getDataList()
} else {
this.$modal.msgError('更新失败');
}
},
async getDict() {

13
src/views/report/productionMonthReport/index.vue
View File

@@ -1,7 +1,7 @@
<!--
* @Author: zhp
* @Date: 2023-12-12 13:45:25
* @LastEditTime: 2024-03-11 16:16:31
* @LastEditTime: 2024-03-12 11:14:04
* @LastEditors: zhp
* @Description:
-->
@@ -122,8 +122,8 @@
</el-table-column>
</el-table-column>
</el-table-column>
<div class="remark" slot="append">
<el-input placeholder="备注" v-if="disabled" v-model="remark" :disabled="disabled">
<div style="height: 50px;" class="remark" slot="append">
<el-input placeholder="备注" v-if="!disabled" v-model="remark" :disabled="disabled">
</el-input>
<span v-else>{{ remark }} </span>
</div>
@@ -535,14 +535,13 @@ export default {
const result = await Promise.all([
await updateSumProductionDataList(obj),
await updateProductionDataList(updateArr),
]);
if (result[0] == true && result[1] == true) {
])
console.log(result);
if (result[0].data == true && result[1].data == true) {
// console.log(res)
this.disabled = true
this.isSave = false
this.getDataList()
} else {
this.$modal.msgError('更新失败');
}
},
async getDataList() {

24
src/views/report/productionShipmentsReport/index.vue
View File

@@ -1,7 +1,7 @@
<!--
* @Author: zhp
* @Date: 2023-12-12 13:45:25
* @LastEditTime: 2024-03-11 15:43:16
* @LastEditTime: 2024-03-12 11:17:14
* @LastEditors: zhp
* @Description:
-->
@@ -33,6 +33,12 @@
<span v-else>{{ scope.row.glassType }} </span>
</template>
</el-table-column>
<el-table-column prop="productionH" label="厚度" align="center">
<template slot-scope="scope">
<el-input v-if="!disabled" v-model="scope.row.productionH" :disabled="disabled"></el-input>
<span v-else>{{ scope.row.productionH }} </span>
</template>
</el-table-column>
<el-table-column label="规格" align="center">
<el-table-column label="成品" align="center">
<el-table-column :show-header="false">
@@ -154,8 +160,8 @@
</el-table-column>
<!-- </el-table-column> -->
<div class="remark" slot="append">
<el-input placeholder="备注" v-if="disabled" v-model="remark" :disabled="disabled">
<div style="height: 50px;" class="remark" slot="append">
<el-input placeholder="备注" v-if="!disabled" v-model="remark" :disabled="disabled">
</el-input>
<span v-else>{{ remark }} </span>
</div>
@@ -180,8 +186,10 @@
<script>
import {
getAutoDeliveDataList,
updateSumAutoDeliveDataList,
updateAutoDeliveDataList
// updateSumAutoDeliveDataList,
// updateAutoDeliveDataList
updateAutoDeliveDataList,
updateSumAutoDeliveDataList
} from '@/api/report/production';
// import Editor from '@/components/Editor';
import moment from 'moment';
@@ -509,10 +517,10 @@ export default {
let updateArr = this.list
// console.log(JSON.stringify(updateArr[1]))
const result = await Promise.all([
await updateSumProductionDataList(obj),
await updateAutoDeliveDataList(updateArr),
await updateAutoDeliveDataList(obj),
await updateSumAutoDeliveDataList(updateArr),
]);
if (result[0] == true && result[1] == true) {
if (result[0].data == true && result[1].data == true) {
// console.log(res)
this.disabled = true
this.isSave = false

11
src/views/report/productionWeekReport/index.vue
View File

@@ -1,7 +1,7 @@
<!--
* @Author: zhp
* @Date: 2023-12-12 13:45:25
* @LastEditTime: 2024-03-11 17:05:50
* @LastEditTime: 2024-03-12 11:14:55
* @LastEditors: zhp
* @Description:
-->
@@ -123,8 +123,8 @@
</el-table-column>
</el-table-column>
</el-table-column>
<div class="remark" slot="append">
<el-input placeholder="备注" v-if="disabled" v-model="remark" :disabled="disabled">
<div style="height: 50px;" class="remark" slot="append">
<el-input placeholder="备注" v-if="!disabled" v-model="remark" :disabled="disabled">
</el-input>
<span v-else>{{ remark }} </span>
</div>
@@ -505,14 +505,13 @@ export default {
const result = await Promise.all([
await updateSumProductionDataList(obj),
await updateProductionDataList(updateArr),
]);
])
console.log(result);
if (result[0].data == true && result[1].data == true) {
// console.log(res)
this.disabled = true
this.isSave = false
this.getDataList()
} else {
this.$modal.msgError('更新失败');
}
},
changeTime(val) {

11
src/views/report/productionYearReport/index.vue
View File

@@ -1,7 +1,7 @@
<!--
* @Author: zhp
* @Date: 2023-12-12 13:45:25
* @LastEditTime: 2024-03-11 16:18:07
* @LastEditTime: 2024-03-12 11:15:05
* @LastEditors: zhp
* @Description:
-->
@@ -126,8 +126,8 @@
</el-table-column>
</el-table-column>
</el-table-column>
<div class="remark" slot="append">
<el-input placeholder="备注" v-if="disabled" v-model="remark" :disabled="disabled">
<div style="height: 50px;" class="remark" slot="append">
<el-input placeholder="备注" v-if="!disabled" v-model="remark" :disabled="disabled">
</el-input>
<span v-else>{{ remark }} </span>
</div>
@@ -449,14 +449,13 @@ export default {
const result = await Promise.all([
await updateSumProductionDataList(obj),
await updateProductionDataList(updateArr),
]);
])
console.log(result);
if (result[0].data == true && result[1].data == true) {
// console.log(res)
this.disabled = true
this.isSave = false
this.getDataList()
} else {
this.$modal.msgError('更新失败');
}
},
transformYear(timeStamp) {// 本年最后一天