From 723edfdd07208ec27409d1cffb70b9a4eac69446 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 18 三月 2024 16:13:22 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/sd/order/SelectOrder.vue | 26 +++++++++++++++++++++-----
1 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/sd/order/SelectOrder.vue b/north-glass-erp/northglass-erp/src/views/sd/order/SelectOrder.vue
index 4fc0bc4..c009259 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/order/SelectOrder.vue
+++ b/north-glass-erp/northglass-erp/src/views/sd/order/SelectOrder.vue
@@ -1,7 +1,7 @@
<script setup>
import {Search} from "@element-plus/icons-vue"
import {useRouter} from "vue-router"
- import {reactive, ref} from "vue"
+ import {computed, reactive, ref} from "vue"
import ProcessCardProgress from '@/views/pp/report/ProcessCardProgress.vue'
import request from "@/utils/request";
import deepClone from "@/utils/deepClone"
@@ -166,6 +166,7 @@
}
request.post(`/order/getOrderList/1/${total.pageSize}/${orderType.value}/${selectDate.value}`,filterData.value).then((res) => {
if(res.code==200){
+ total.dataTotal = res.data.total.total*1
total.pageTotal=parseInt(res.data.total)
pageNum.value=1
orderList.value = deepClone(res.data.data)
@@ -186,10 +187,12 @@
request.post(`/order/getOrderList/${pageNum.value}/${total.pageSize}/${orderType.value}/${selectDate.value}`
,filterData).then((res) => {
if(res.code==200){
- //total.pageTotal = res.data.total.pageTotal
+ total.dataTotal = res.data.total.total*1
+ total.pageTotal = res.data.total.pageTotal
selectDate.value=res.data.selectDate
orderList.value = deepClone(res.data.data)
xGrid.value.loadData(orderList.value)
+ console.log(xGrid.value.getTableData().fullData)
}else{
ElMessage.warning(res.msg)
}
@@ -238,6 +241,10 @@
}
}
+ const showCheckbox = computed(()=>(item)=>{ //璁＄畻灞炴�т紶閫掑弬鏁�
+ return 2 === item
+ })
+
</script>
@@ -265,7 +272,7 @@
<!-- 涓嬫媺鏄剧ず鎵�鏈変俊鎭彃妲�-->
<template #content="{ row }">
<ul class="expand-wrapper">
- <li v-for="(item,index) in gridOptions.columns" v-show="item.field!=undefined && index>9">
+ <li v-for="(item,index) in gridOptions.columns" v-show="item.field!==undefined && index>9">
<span style="font-weight: bold">{{item.title+': '}}</span>
<span>{{ row[item.field] }}</span>
</li>
@@ -273,13 +280,22 @@
</template>
<template #state="{ row,column}">
- <el-checkbox @click.native.prevent :indeterminate="row[column.field]===1" :checked="row[column.field]===2"/>
+ <el-checkbox
+ v-if="row[column.field] === 2"
+ @click.native.prevent
+ :indeterminate="row[column.field]===1"
+ :checked="true"/>
+ <el-checkbox
+ v-else
+ @click.native.prevent
+ :indeterminate="row[column.field]===1"
+ :checked="false"/>
</template>
<!--宸﹁竟鍥哄畾鏄剧ず鐨勬彃妲�-->
<template #button_slot="{ row }">
<el-button @click="getTableRow(row,'edit')" link type="primary" size="small">{{ $t('basicData.edit') }}</el-button>
- <el-popconfirm @confirm="getTableRow(row,'delete')" :title="$t('basicData.deleteConfirm')">
+ <el-popconfirm @confirm="getTableRow(row,'delete')" :title="$t('searchOrder.deleteConfirm')">
<template #reference>
<el-button link type="primary" size="small">{{ $t('basicData.delete') }}</el-button>
</template>
--
Gitblit v1.8.0