From 26aa014b40fa80905990997bc848db975861c916 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期四, 05 十二月 2024 13:27:48 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/pp/processCard/SelectProcessCard.vue | 167 ++++++++++++++++++++++++++++---------------------------
1 files changed, 84 insertions(+), 83 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectProcessCard.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectProcessCard.vue
index 455f1b8..235e497 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectProcessCard.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectProcessCard.vue
@@ -430,9 +430,8 @@
</script>
<template>
- <div class="main-div-customer">
- <div id="selectForm">
- <el-row :gutter="0">
+ <div style="width: 100%;height: 100%">
+ <div class="head">
<el-date-picker
v-model="orderInfo.workOrderDate"
:default-time="defaultTime"
@@ -447,105 +446,107 @@
<el-button
id="select"
:icon="Search"
+ style="margin-top: -5px"
type="primary" @click="getWorkOrder">{{ $t('basicData.search') }}
</el-button>
- </el-row>
</div>
- <vxe-grid
- ref="xGrid"
- :checkbox-config="checkBoxConfig"
- class="mytable-scrollbar"
- height="100%"
- v-bind="gridOptions"
- v-on="gridEvents"
- @filter-change="filterChanged"
+ <div class="main-table">
+ <vxe-grid
+ ref="xGrid"
+ :checkbox-config="checkBoxConfig"
+ class="mytable-scrollbar"
+ height="100%"
+ v-bind="gridOptions"
+ v-on="gridEvents"
+ @filter-change="filterChanged"
- >
- <!-- @toolbar-button-click="toolbarButtonClickEvent"-->
- <!-- 涓嬫媺鏄剧ず鎵�鏈変俊鎭彃妲�-->
- <template #content="{ row }">
- <ul class="expand-wrapper">
- <li v-for="(item,index) in gridOptions.columns" v-show="item.field!=undefined ">
- <span style="font-weight: bold">{{ item.title + ': ' }}</span>
- <span v-if="hasDecimal(item.field)">{{ row[item.field.split('.')[0]][item.field.split('.')[1]] }}</span>
- <span v-else>{{ row[item.field] }}</span>
+ >
+ <!-- @toolbar-button-click="toolbarButtonClickEvent"-->
+ <!-- 涓嬫媺鏄剧ず鎵�鏈変俊鎭彃妲�-->
+ <template #content="{ row }">
+ <ul class="expand-wrapper">
+ <li v-for="(item,index) in gridOptions.columns" v-show="item.field!=undefined ">
+ <span style="font-weight: bold">{{ item.title + ': ' }}</span>
+ <span v-if="hasDecimal(item.field)">{{ row[item.field.split('.')[0]][item.field.split('.')[1]] }}</span>
+ <span v-else>{{ row[item.field] }}</span>
- </li>
- </ul>
- </template>
+ </li>
+ </ul>
+ </template>
- <!--宸﹁竟鍥哄畾鏄剧ず鐨勬彃妲�-->
+ <!--宸﹁竟鍥哄畾鏄剧ず鐨勬彃妲�-->
- <template #button_slot="{ row }">
- <!-- <el-button @click="getTableRow(row,'select')" link type="primary" size="small">{{$t('basicData.edit')}}-->
- <!-- </el-button>-->
- <el-button v-if="userStore.user.permissions.indexOf('selectProcessCard.edit') > -1"
- link
- size="small"
- type="primary"
- @click="getTableRow(row,'select')">
- {{ $t('basicData.edit') }}
- </el-button>
- <!-- <el-button v-if="row.layoutStatus=='鍙帓鐗�'" @click="getTableRow(row,'setType')" link type="primary" size="small">{{$t('processCard.composing')}}</el-button>-->
- <!-- <el-button v-else-if="row.layoutStatus=='涓嶅彲鎺掔増'" @click="getTableRow(row,'setType')" link type="primary" size="small">{{$t('processCard.composingOk')}}</el-button>-->
- <!-- <el-button v-else-if="row.layoutStatus=='宸叉帓鐗�'" disabled @click="getTableRow(row,'setType')" link type="primary" size="small">{{$t('processCard.typesetter')}}</el-button>-->
- <!-- <el-button @click="getTableRow(row,'delete')" link type="primary" size="small">{{$t('basicData.delete')}}</el-button>-->
-<!-- <el-popconfirm :title="$t('searchOrder.deleteConfirm')" @confirm="getTableRow(row,'delete')">-->
-<!-- <template #reference>-->
-<!-- <el-button link size="small" type="primary">{{ $t('basicData.delete') }}</el-button>-->
-<!-- </template>-->
-<!-- </el-popconfirm>-->
- </template>
+ <template #button_slot="{ row }">
+ <!-- <el-button @click="getTableRow(row,'select')" link type="primary" size="small">{{$t('basicData.edit')}}-->
+ <!-- </el-button>-->
+ <el-button v-if="userStore.user.permissions.indexOf('selectProcessCard.edit') > -1"
+ link
+ size="small"
+ type="primary"
+ @click="getTableRow(row,'select')">
+ {{ $t('basicData.edit') }}
+ </el-button>
+ <!-- <el-button v-if="row.layoutStatus=='鍙帓鐗�'" @click="getTableRow(row,'setType')" link type="primary" size="small">{{$t('processCard.composing')}}</el-button>-->
+ <!-- <el-button v-else-if="row.layoutStatus=='涓嶅彲鎺掔増'" @click="getTableRow(row,'setType')" link type="primary" size="small">{{$t('processCard.composingOk')}}</el-button>-->
+ <!-- <el-button v-else-if="row.layoutStatus=='宸叉帓鐗�'" disabled @click="getTableRow(row,'setType')" link type="primary" size="small">{{$t('processCard.typesetter')}}</el-button>-->
+ <!-- <el-button @click="getTableRow(row,'delete')" link type="primary" size="small">{{$t('basicData.delete')}}</el-button>-->
+ <!-- <el-popconfirm :title="$t('searchOrder.deleteConfirm')" @confirm="getTableRow(row,'delete')">-->
+ <!-- <template #reference>-->
+ <!-- <el-button link size="small" type="primary">{{ $t('basicData.delete') }}</el-button>-->
+ <!-- </template>-->
+ <!-- </el-popconfirm>-->
+ </template>
- <template #num1_filter="{ column, $panel }">
- <div>
- <div v-for="(option, index) in column.filters" :key="index">
- <input v-model="option.data" type="text"
- @keyup.enter.native="$panel.confirmFilter()"
- @input="changeFilterEvent($event, option, $panel)"/>
+ <template #num1_filter="{ column, $panel }">
+ <div>
+ <div v-for="(option, index) in column.filters" :key="index">
+ <input v-model="option.data" type="text"
+ @keyup.enter.native="$panel.confirmFilter()"
+ @input="changeFilterEvent($event, option, $panel)"/>
+ </div>
</div>
- </div>
- </template>
- <template #select_filter="{ column, $panel }">
- <div>
+ </template>
+ <template #select_filter="{ column, $panel }">
+ <div>
- <div v-for="(option, index) in column.filters" :key="index">
- <select v-model="option.data" @change="changeFilterEvent($event, option, $panel)" style="width: 100%">
- <option :value="$t('processCard.typesetter')" :label="$t('processCard.typesetter')"></option>
- <option :value="$t('processCard.composingOk')" :label="$t('processCard.composingOk')"></option>
- <option :value="$t('processCard.composingNo')" :label="$t('processCard.composingNo')"></option>
- </select>
+ <div v-for="(option, index) in column.filters" :key="index">
+ <select v-model="option.data" @change="changeFilterEvent($event, option, $panel)" style="width: 100%">
+ <option :value="$t('processCard.typesetter')" :label="$t('processCard.typesetter')"></option>
+ <option :value="$t('processCard.composingOk')" :label="$t('processCard.composingOk')"></option>
+ <option :value="$t('processCard.composingNo')" :label="$t('processCard.composingNo')"></option>
+ </select>
+ </div>
</div>
- </div>
- </template>
- <template #pager>
- <!--浣跨敤 pager 鎻掓Ы-->
- <!-- 'PrevJump','NextJump', -->
- <vxe-pager
- v-model:current-page="pageNum"
- v-model:page-size="total.pageSize"
- v-model:pager-count="total.pageTotal"
- :layouts="[ 'PrevPage', 'Jump','PageCount', 'NextPage', 'Total']"
- :total="total.dataTotal"
- @page-change="handlePageChange"
- >
- </vxe-pager>
- </template>
+ </template>
+ <template #pager>
+ <!--浣跨敤 pager 鎻掓Ы-->
+ <!-- 'PrevJump','NextJump', -->
+ <vxe-pager
+ v-model:current-page="pageNum"
+ v-model:page-size="total.pageSize"
+ v-model:pager-count="total.pageTotal"
+ :layouts="[ 'PrevPage', 'Jump','PageCount', 'NextPage', 'Total']"
+ :total="total.dataTotal"
+ @page-change="handlePageChange"
+ >
+ </vxe-pager>
+ </template>
- </vxe-grid>
+ </vxe-grid>
+ </div>
</div>
</template>
<style scoped>
-.main-div-customer {
- width: 99%;
- height: 95%;
+.head{
+ width: 100%;
+ height: 35px;
}
-#selectForm {
- width: 40%;
- text-align: center;
+.main-table{
+ width: 100%;
+ height: calc(100% - 35px);
}
</style>
\ No newline at end of file
--
Gitblit v1.8.0