projects/mesxc-dy
into projects/mesxc-test
5 months ago
@@ -1,7 +1,7 @@ | |||||
### | ### | ||||
# @Author: Do not edit | # @Author: Do not edit | ||||
# @Date: 2023-08-29 09:40:39 | # @Date: 2023-08-29 09:40:39 | ||||
# @LastEditTime: 2024-04-03 11:22:19 | |||||
# @LastEditTime: 2024-04-08 16:46:49 | |||||
# @LastEditors: DY | # @LastEditors: DY | ||||
# @Description: | # @Description: | ||||
### | ### | ||||
@@ -2,7 +2,7 @@ | |||||
* @Author: zwq | * @Author: zwq | ||||
* @Date: 2021-11-18 14:16:25 | * @Date: 2021-11-18 14:16:25 | ||||
* @LastEditors: DY | * @LastEditors: DY | ||||
* @LastEditTime: 2024-03-22 08:53:20 | |||||
* @LastEditTime: 2024-04-08 10:21:46 | |||||
* @Description: | * @Description: | ||||
--> | --> | ||||
<template> | <template> | ||||
@@ -214,7 +214,9 @@ export default { | |||||
actualQuantity: this.dataForm.actualQuantity | actualQuantity: this.dataForm.actualQuantity | ||||
}).then(response => { | }).then(response => { | ||||
this.$modal.msgSuccess("操作成功!工单状态稍后将会更新!"); | this.$modal.msgSuccess("操作成功!工单状态稍后将会更新!"); | ||||
this.saveData(tempList) | |||||
if (tempList.length > 0) { | |||||
this.saveData(tempList) | |||||
} | |||||
this.visible = false; | this.visible = false; | ||||
this.$emit("refreshDataList"); | this.$emit("refreshDataList"); | ||||
}); | }); | ||||
@@ -2,7 +2,7 @@ | |||||
* @Author: zwq | * @Author: zwq | ||||
* @Date: 2021-11-18 14:16:25 | * @Date: 2021-11-18 14:16:25 | ||||
* @LastEditors: DY | * @LastEditors: DY | ||||
* @LastEditTime: 2024-03-21 16:52:46 | |||||
* @LastEditTime: 2024-04-08 14:27:29 | |||||
* @Description: | * @Description: | ||||
--> | --> | ||||
<template> | <template> | ||||
@@ -182,7 +182,8 @@ | |||||
:table-props="tableProps" | :table-props="tableProps" | ||||
:page="listQuery.pageNo" | :page="listQuery.pageNo" | ||||
:limit="listQuery.pageSize" | :limit="listQuery.pageSize" | ||||
:table-data="orderList"> | |||||
:table-data="orderList" | |||||
:max-height="tableH"> | |||||
<method-btn | <method-btn | ||||
v-if="!isdetail" | v-if="!isdetail" | ||||
slot="handleBtn" | slot="handleBtn" | ||||
@@ -209,7 +210,8 @@ | |||||
:table-props="tableProps1" | :table-props="tableProps1" | ||||
:page="listQuery1.pageNo" | :page="listQuery1.pageNo" | ||||
:limit="listQuery1.pageSize" | :limit="listQuery1.pageSize" | ||||
:table-data="materialList" /> | |||||
:table-data="materialList" | |||||
:max-height="tableH" /> | |||||
<!-- <pagination | <!-- <pagination | ||||
v-show="listQuery1.total > 0" | v-show="listQuery1.total > 0" | ||||
:total="listQuery1.total" | :total="listQuery1.total" | ||||
@@ -235,6 +237,7 @@ import SmallTitle from './SmallTitle'; | |||||
import { publicFormatter } from "@/utils/dict"; | import { publicFormatter } from "@/utils/dict"; | ||||
import { parseTime } from '@/utils/ruoyi' | import { parseTime } from '@/utils/ruoyi' | ||||
import topTabVue from '../../order/base/orderManage/components/topTab.vue'; | import topTabVue from '../../order/base/orderManage/components/topTab.vue'; | ||||
import tableHeightMixin from '@/mixins/lb/tableHeightMixin'; | |||||
const tableBtn = [ | const tableBtn = [ | ||||
{ | { | ||||
@@ -292,9 +295,11 @@ const tableProps1 = [ | |||||
]; | ]; | ||||
export default { | export default { | ||||
mixins: [tableHeightMixin], | |||||
components: { SmallTitle, topTabVue }, | components: { SmallTitle, topTabVue }, | ||||
data() { | data() { | ||||
return { | return { | ||||
heightNum: 380, | |||||
tableBtn, | tableBtn, | ||||
tableProps, | tableProps, | ||||
tableProps1, | tableProps1, | ||||
@@ -455,7 +460,7 @@ export default { | |||||
// this.listQuery.total = response.data.total; | // this.listQuery.total = response.data.total; | ||||
}); | }); | ||||
// 获取预使用原料列表 | // 获取预使用原料列表 | ||||
console.log() | |||||
console.log('111我看看', this.dataForm.materialMethod) | |||||
if (this.dataForm.id) { | if (this.dataForm.id) { | ||||
if (this.dataForm.materialMethod === 1) { | if (this.dataForm.materialMethod === 1) { | ||||
// 产品 | // 产品 | ||||
@@ -9,7 +9,8 @@ | |||||
:table-props="tableProps" | :table-props="tableProps" | ||||
:page="listQuery.pageNo" | :page="listQuery.pageNo" | ||||
:limit="listQuery.pageSize" | :limit="listQuery.pageSize" | ||||
:table-data="tableData"> | |||||
:table-data="tableData" | |||||
:max-height="tableH"> | |||||
<method-btn | <method-btn | ||||
v-if="tableBtn.length" | v-if="tableBtn.length" | ||||
slot="handleBtn" | slot="handleBtn" | ||||
@@ -62,7 +63,7 @@ import { | |||||
getCoreWOList | getCoreWOList | ||||
} from '@/api/base/coreWorkOrder'; | } from '@/api/base/coreWorkOrder'; | ||||
import { publicFormatter } from '@/utils/dict'; | import { publicFormatter } from '@/utils/dict'; | ||||
import tableHeightMixin from '@/mixins/lb/tableHeightMixin'; | |||||
const tableProps = [ | const tableProps = [ | ||||
{ | { | ||||
@@ -132,7 +133,7 @@ const tableProps = [ | |||||
]; | ]; | ||||
export default { | export default { | ||||
mixins: [basicPage], | |||||
mixins: [basicPage, tableHeightMixin], | |||||
components: { | components: { | ||||
AddWorkOrder, | AddWorkOrder, | ||||
AddOrUpdate, | AddOrUpdate, | ||||
@@ -104,21 +104,27 @@ export default { | |||||
type: 'separate', | type: 'separate', | ||||
}, | }, | ||||
{ | { | ||||
type: 'button', | |||||
type: this.$auth.hasPermi('equipment:inspection-confirm:create') | |||||
? 'button' | |||||
: '', | |||||
btnName: '新增', | btnName: '新增', | ||||
name: 'add', | name: 'add', | ||||
plain: true, | plain: true, | ||||
color: 'success', | color: 'success', | ||||
}, | }, | ||||
{ | { | ||||
type: 'button', | |||||
type: this.$auth.hasPermi('equipment:inspection-confirm:confirm') | |||||
? 'button' | |||||
: '', | |||||
btnName: '批量确认', | btnName: '批量确认', | ||||
name: 'batchConfirm', | name: 'batchConfirm', | ||||
color: 'primary', | color: 'primary', | ||||
plain: true, | plain: true, | ||||
}, | }, | ||||
{ | { | ||||
type: 'button', | |||||
type: this.$auth.hasPermi('equipment:inspection-confirm:export') | |||||
? 'button' | |||||
: '', | |||||
btnName: '导出', | btnName: '导出', | ||||
name: 'export', | name: 'export', | ||||
plain: true, | plain: true, | ||||
@@ -160,21 +160,25 @@ export default { | |||||
type: 'separate', | type: 'separate', | ||||
}, | }, | ||||
{ | { | ||||
type: 'button', | |||||
type: this.$auth.hasPermi('equipment:maintain-confirm:create') | |||||
? 'button' | |||||
: '', | |||||
btnName: '新增', | btnName: '新增', | ||||
name: 'add', | name: 'add', | ||||
plain: true, | plain: true, | ||||
color: 'success', | color: 'success', | ||||
}, | }, | ||||
{ | { | ||||
type: 'button', | |||||
type: this.$auth.hasPermi('equipment:maintain-confirm:confirm') | |||||
? 'button' | |||||
: '', | |||||
btnName: '批量确认', | btnName: '批量确认', | ||||
name: 'batchConfirm', | name: 'batchConfirm', | ||||
color: 'primary', | color: 'primary', | ||||
plain: true, | plain: true, | ||||
}, | }, | ||||
{ | { | ||||
type: this.$auth.hasPermi('equipment:maintain-record:export') | |||||
type: this.$auth.hasPermi('equipment:maintain-confirm:export') | |||||
? 'button' | ? 'button' | ||||
: '', | : '', | ||||
btnName: '导出', | btnName: '导出', | ||||
@@ -193,7 +193,7 @@ export default { | |||||
type: 'separate', | type: 'separate', | ||||
}, | }, | ||||
{ | { | ||||
type: this.$auth.hasPermi('base:quality-inspection-type:export') | |||||
type: this.$auth.hasPermi('equipment:maintain-monitor:export') | |||||
? 'button' | ? 'button' | ||||
: '', | : '', | ||||
btnName: '导出', | btnName: '导出', | ||||