|
|
@@ -2,7 +2,7 @@ |
|
|
|
* @Author: zwq |
|
|
|
* @Date: 2021-11-18 14:16:25 |
|
|
|
* @LastEditors: DY |
|
|
|
* @LastEditTime: 2024-03-21 16:52:46 |
|
|
|
* @LastEditTime: 2024-04-08 14:27:29 |
|
|
|
* @Description: |
|
|
|
--> |
|
|
|
<template> |
|
|
@@ -182,7 +182,8 @@ |
|
|
|
:table-props="tableProps" |
|
|
|
:page="listQuery.pageNo" |
|
|
|
:limit="listQuery.pageSize" |
|
|
|
:table-data="orderList"> |
|
|
|
:table-data="orderList" |
|
|
|
:max-height="tableH"> |
|
|
|
<method-btn |
|
|
|
v-if="!isdetail" |
|
|
|
slot="handleBtn" |
|
|
@@ -209,7 +210,8 @@ |
|
|
|
:table-props="tableProps1" |
|
|
|
:page="listQuery1.pageNo" |
|
|
|
:limit="listQuery1.pageSize" |
|
|
|
:table-data="materialList" /> |
|
|
|
:table-data="materialList" |
|
|
|
:max-height="tableH" /> |
|
|
|
<!-- <pagination |
|
|
|
v-show="listQuery1.total > 0" |
|
|
|
:total="listQuery1.total" |
|
|
@@ -235,6 +237,7 @@ import SmallTitle from './SmallTitle'; |
|
|
|
import { publicFormatter } from "@/utils/dict"; |
|
|
|
import { parseTime } from '@/utils/ruoyi' |
|
|
|
import topTabVue from '../../order/base/orderManage/components/topTab.vue'; |
|
|
|
import tableHeightMixin from '@/mixins/lb/tableHeightMixin'; |
|
|
|
|
|
|
|
const tableBtn = [ |
|
|
|
{ |
|
|
@@ -292,9 +295,11 @@ const tableProps1 = [ |
|
|
|
]; |
|
|
|
|
|
|
|
export default { |
|
|
|
mixins: [tableHeightMixin], |
|
|
|
components: { SmallTitle, topTabVue }, |
|
|
|
data() { |
|
|
|
return { |
|
|
|
heightNum: 380, |
|
|
|
tableBtn, |
|
|
|
tableProps, |
|
|
|
tableProps1, |
|
|
@@ -455,7 +460,7 @@ export default { |
|
|
|
// this.listQuery.total = response.data.total; |
|
|
|
}); |
|
|
|
// 获取预使用原料列表 |
|
|
|
console.log() |
|
|
|
console.log('111我看看', this.dataForm.materialMethod) |
|
|
|
if (this.dataForm.id) { |
|
|
|
if (this.dataForm.materialMethod === 1) { |
|
|
|
// 产品 |
|
|
|