From 10a26b9b670efef0a2adba675c794c539846aa3c Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期五, 06 九月 2024 10:18:10 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/pp/Replenish/SelectReplenish.vue | 502 ++++++++++++++++++++++++++++++++-----------------------
1 files changed, 291 insertions(+), 211 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/Replenish/SelectReplenish.vue b/north-glass-erp/northglass-erp/src/views/pp/Replenish/SelectReplenish.vue
index 1d58a78..a6e59a3 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/Replenish/SelectReplenish.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/Replenish/SelectReplenish.vue
@@ -1,8 +1,26 @@
<script setup>
-import {reactive} from "vue";
-import {useRouter} from 'vue-router'
-let router=useRouter()
+import {reactive, ref} from "vue";
+import {useRouter} from 'vue-router'
+import request from "@/utils/request";
+import {ElMessage} from "element-plus";
+import deepClone from "@/utils/deepClone";
+import {Search} from "@element-plus/icons-vue";
+import useUserInfoStore from "@/stores/userInfo";
+import {changeFilterEvent,filterChanged} from "@/hook"
+import { useI18n } from 'vue-i18n'
+import footSum from "@/hook/footSum";
+
+//璇█鑾峰彇
+const { t } = useI18n()
+
+
+const userStore = useUserInfoStore()
+const username = userStore.user.userName
+const userid = userStore.user.userId
+let router = useRouter()
+let produceList = ref([])
+const dialogFormVisible = ref(false)
const getTableRow = (row,type) =>{
switch (type) {
case 'edit' :{
@@ -21,24 +39,51 @@
}
}
-//琛ㄥ熬姹傚拰
-const sumNum = (list, field) => {
- let count = 0
- list.forEach(item => {
- count += Number(item[field])
- })
- return count.toFixed(2)
-}
+let pageNum=ref(1)
+let total = reactive({
+ pageTotal : 0,
+ dataTotal : 0,
+ pageSize : 100
+})
+
+let selectDate = ref(["",""])
+
+//绛涢�夋潯浠讹紝鏈夊閿渶瑕佸厛瀹氫箟鏄庣粏閲岄潰鐨勬暟鎹�
+let filterData = ref({
+
+
+})
+
+//绗竴娆¤皟鐢�
+request.post(`/Replenish/SelectReplenish/1/${total.pageSize}/${selectDate.value}`,filterData.value).then((res) => {
+
+ if(res.code==200){
+ total.dataTotal = res.data.total.total*1
+ total.pageTotal= res.data.total.pageTotal
+
+ selectDate.value = res.data.selectDate
+ pageNum.value=1
+
+ produceList = deepClone(res.data.data)
+ xGrid.value.loadData(produceList)
+ gridOptions.loading=false
+ }else{
+ ElMessage.warning(res.msg)
+ }
+})
+
+
+
//瀛愮粍浠舵帴鏀跺弬鏁�
-
+const xGrid = ref()
const gridOptions = reactive({
border: "full",//琛ㄦ牸鍔犺竟妗�
keepSource: true,//淇濇寔婧愭暟鎹�
align: 'center',//鏂囧瓧灞呬腑
stripe:true,//鏂戦┈绾�
- rowConfig: {isCurrent: true, isHover: true,height: 50},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
- id: 'CustomerList',
+ rowConfig: {isCurrent: true, isHover: true,height: 30},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
+ id: 'SelectReplenish',
showFooter: true,//鏄剧ず鑴�
printConfig: {},
importConfig: {},
@@ -50,7 +95,7 @@
useKey: true
},
filterConfig: { //绛涢�夐厤缃」
- remote: true
+ //remote: true
},
customConfig: {
storage: true
@@ -61,201 +106,71 @@
showStatus: true
},//琛ㄥご鍙傛暟
columns:[
- {type:'expand',fixed:"left",slots: { content:'content' },width: 50},
- { type: 'seq',fixed:"left", title: '鑷簭', width: 50 },
- {title: '鎿嶄綔', width: 80, slots: { default: 'button_slot' },fixed:"left"},
- {field: 'salesOrderNo', width: 120, title: '閿�鍞崟鍙�',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true, },
- {field: 'processCardNo',width: 120, title: '娴佺▼鍗″彿', sortable: true,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
- {field: 'entryName', width: 130,title: '椤圭洰鍚嶇О', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
- {field: 'productName',width: 120, title: '浜у搧鍚嶇О',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
- {field: 'reportingWorkNo', width: 100,title: '鎶ュ伐缂栧彿', sortable: true,showOverflow:"ellipsis"},
- {field: 'serialNumber', width: 70,title: '搴忓彿', sortable: true},
- {field: 'singlePieceName',width: 100, title: '鍗曠墖鍚嶇О', sortable: true},
- {field: 'floorNumber',width: 120, title: '妤煎眰缂栧彿', sortable: true,showOverflow:"ellipsis"},
- {field: 'marking', width: 80,title: '鏍囪', sortable: true},
- {field: 'pieces',width: 90, title: '鐗囨爣璁�', sortable: true},
- {field: 'processCardNumber',width: 120, title: '娴佺▼鍗℃暟閲�', sortable: true},
- {field: 'width',width: 80, title: '瀹�', sortable: true},
- {field: 'height',width: 80, title: '楂�', sortable: true},
- {field: 'area',width: 80, title: '闈㈢Н', sortable: true},
- {field: 'shape',width: 80, title: '褰㈢姸', sortable: true},
- {field: 'numberBroken',width: 120, title: '娆$牬鏁伴噺', sortable: true},
- {field: 'reasonType',width: 120, title: '娆$牬绫诲瀷', sortable: true},
- {field: 'reasonDamage',width: 120, title: '娆$牬鍘熷洜', sortable: true},
- {field: 'responsibilityDevice',width: 120, title: '璐d换璁惧', sortable: true},
- {field: 'reportingProcess',width: 120, title: '鎶ュ伐宸ュ簭', sortable: true},
- {field: 'responsibilityProcess',width: 120, title: '璐d换宸ュ簭', sortable: true},
- {field: 'responsibilityTeams',width: 120, title: '璐d换鐝粍', sortable: true},
- {field: 'responsibilityPersonnel',width: 120, title: '璐d换浜哄憳', sortable: true},
- {field: 'qualityInspector',width: 100, title: '璐ㄦ鍛�', sortable: true}
+
+ {type: 'expand', fixed: "left", slots: {content: 'content'}, width: 50},
+ {type:'checkbox',title: t('basicData.check'), width: 80,fixed:"left"},
+ {type: 'seq', fixed: "left", title: t('basicData.Number'), width: 50},
+ {field: 'review_status',title: t('basicData.review'), width: 50, slots: { default: 'state' }},
+ {field: 'patch_id', width: 120, title: t('replenish.patchNumber'), filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
+ {field: 'order_id', width: 120, title: t('order.orderId'), showOverflow: "ellipsis", filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
+ {field: 'process_id', width: 140, title: t('processCard.processId'), filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
+ {field: 'project', width: 120, title: t('order.project'), filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
+ {field: 'batch', width: 80, title: t('order.batch'), showOverflow: "ellipsis", filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
+ {field: 'glassNumber', width: 100, title: t('reportingWorks.glassNumber'), filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
+ {field: 'order_sort', width: 100, title:t('order.OrderNum'), filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
+ {field: 'technology_number', width: 80, title: t('replenish.mark'), showOverflow: "ellipsis", filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
+ {field: 'patch_type', width: 100, title: t('reportingWorks.breakageType'), filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
+ {field: 'patch_reason', width: 120, title: t('reportingWorks.breakageReason'), filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
+ {field: 'responsible_equipment', width: 120, title: t('reportingWorks.responsibleEquipment'), filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
+ {field: 'responsible_team', width: 120, title: t('reportingWorks.responsibleTeam'), filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
+ {field: 'patch_processes', width: 120, title: t('reportingWorks.reportingProcess'), filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
+ //{field: 'building_number',width: 120, title: '妤煎眰缂栧彿', filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
+ {field: 'glass_address', width: 90, title: t('replenish.sliceMarking'), filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
+ {field: 'patch_num', width: 80, title: t('order.quantity'), filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
+ {field: 'patch_area', width: 120, title: t('order.area'), filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
+ {field: 'width', width: 80, title: t('order.width'), filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
+ {field: 'height', width: 80, title: t('order.height'), filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
+ {field: 'shape', width: 80, title: t('order.shape'), filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
+ {field: 'quality_inspector', width: 100, title: t('reportingWorks.qualityInspector'), filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
+ {field: 'reviewer', width: 100, title: t('productStock.reviewed'), filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
+ {field: 'create_time', width: 100, title: t('productStock.productionDate')},
+ {field: 'update_time', width: 120, title: t('productStock.approvedDate')},
+ {field: 'product_name', width: 120, title: t('order.product'), filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
+ {field: 'reporting_work_id', width: 100,title: t('reportingWorks.reportingWorkId'),filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
+
],//琛ㄥご鎸夐挳
toolbarConfig: {
- // buttons: [{
- //
- // }],
- import: false,
+ buttons: [
+ {
+ 'name': t('basicData.review'),status: 'primary',
+ 'code':'add'
+ },
+ {
+ 'name': t('basicData.delete'),status: 'primary',
+ 'code':'delete'
+ },
+ {
+ 'name': t('basicData.cancelReview'),status: 'primary',
+ 'code':'cancelReview'
+ }
+ ],
+ /*import: false,
export: true,
- print: true,
+ print: true,*/
zoom: true,
custom: true
},
- data: [
- {
- reportingWorkTime:'2021-01-01',
- salesOrderNo:'NG23010101',
- processCardNo:'NG23010101A01',
- entryName:'xxxx',
- productName:"xxxxxxxxx",
- reportingWorkNo:"BG2301010001",
- floorNumber:"D4-010-01",
- area:'23.11',
- reportingProcess:'閽㈠寲',
- qualityInspector:"寮犱笁",
- serialNumber:'1',
- singlePieceName: '6mm鐧界幓骞抽挗(澶�)',
- marking: '1',
- pieces: '(澶�)',
- processCardNumber: '11',
- width: '575',
- height:"2241",
- shape: '鏅舰',
- upCompletedQuantity: '12',
- completedQuantity: '1',
- numberBroken:'2',
- availableUse:'',
- returnProcess:'',
-
- reasonType: '鏈哄櫒',
- reasonDamage:'姘旀场瓒呮爣',
- available:'',
- reworkProcess:'',
- responsibilityProcess:'涓┖',
- responsibilityTeams:'涓┖涓�鐝�',
- responsibilityPersonnel:'',
- responsibilityDevice:'涓┖3#绾�',
- completed:'',
- onceBroken:'',
- },
- {
- reportingWorkTime:'2021-01-01',
- salesOrderNo:'NG23010101',
- processCardNo:'NG23010101A01',
- entryName:'xxxx',
- productName:"xxxxxxxxx",
- reportingWorkNo:"BG2301010001",
- floorNumber:"D4-010-01",
- area:'23.11',
- reportingProcess:'閽㈠寲',
- qualityInspector:"寮犱笁",
- serialNumber:'1',
- singlePieceName: '6mm鐧界幓骞抽挗(澶�)',
- marking: '1',
- pieces: '(澶�)',
- processCardNumber: '11',
- width: '575',
- height:"2241",
- shape: '鏅舰',
- upCompletedQuantity: '12',
- completedQuantity: '1',
- numberBroken:'2',
- availableUse:'',
- returnProcess:'',
-
- reasonType: '鏈哄櫒',
- reasonDamage:'姘旀场瓒呮爣',
- available:'',
- reworkProcess:'',
- responsibilityProcess:'涓┖',
- responsibilityTeams:'涓┖涓�鐝�',
- responsibilityPersonnel:'',
- responsibilityDevice:'涓┖3#绾�',
- completed:'',
- onceBroken:'',
- },
- {
- reportingWorkTime:'2021-01-01',
- salesOrderNo:'NG23010101',
- processCardNo:'NG23010101A01',
- entryName:'xxxx',
- productName:"xxxxxxxxx",
- reportingWorkNo:"BG2301010001",
- floorNumber:"D4-010-01",
- area:'23.11',
- reportingProcess:'閽㈠寲',
- qualityInspector:"寮犱笁",
- serialNumber:'1',
- singlePieceName: '6mm鐧界幓骞抽挗(澶�)',
- marking: '1',
- pieces: '(澶�)',
- processCardNumber: '11',
- width: '575',
- height:"2241",
- shape: '鏅舰',
- upCompletedQuantity: '12',
- completedQuantity: '1',
- numberBroken:'2',
- availableUse:'',
- returnProcess:'',
-
- reasonType: '鏈哄櫒',
- reasonDamage:'姘旀场瓒呮爣',
- available:'',
- reworkProcess:'',
- responsibilityProcess:'涓┖',
- responsibilityTeams:'涓┖涓�鐝�',
- responsibilityPersonnel:'',
- responsibilityDevice:'涓┖3#绾�',
- completed:'',
- onceBroken:'',
- },
- {
- reportingWorkTime:'2021-01-01',
- salesOrderNo:'NG23010101',
- processCardNo:'NG23010101A01',
- entryName:'xxxx',
- productName:"xxxxxxxxx",
- reportingWorkNo:"BG2301010001",
- floorNumber:"D4-010-01",
- area:'23.11',
- reportingProcess:'閽㈠寲',
- qualityInspector:"寮犱笁",
- serialNumber:'1',
- singlePieceName: '6mm鐧界幓骞抽挗(澶�)',
- marking: '1',
- pieces: '(澶�)',
- processCardNumber: '11',
- width: '575',
- height:"2241",
- shape: '鏅舰',
- upCompletedQuantity: '12',
- completedQuantity: '1',
- numberBroken:'2',
- availableUse:'',
- returnProcess:'',
-
- reasonType: '鏈哄櫒',
- reasonDamage:'姘旀场瓒呮爣',
- available:'',
- reworkProcess:'',
- responsibilityProcess:'涓┖',
- responsibilityTeams:'涓┖涓�鐝�',
- responsibilityPersonnel:'',
- responsibilityDevice:'涓┖3#绾�',
- completed:'',
- onceBroken:'',
- },
- ],//table body瀹為檯鏁版嵁
//鑴氶儴姹傚拰
footerMethod ({ columns, data }) {//椤佃剼鍑芥暟
- let footList=['processCardNumber','numberBroken']
+ let footList=['patch_num','patch_area']
return[
columns.map((column, columnIndex) => {
if (columnIndex === 0) {
- return '鍚堣:'
+ return t('basicData.total')
}
if (footList.includes(column.field)) {
- return sumNum(data, column.field)
+ return footSum(data, column.field)
}
return ''
})
@@ -264,43 +179,188 @@
})
+const gridEvents = {
+ toolbarButtonClick ({ code }) {
+ const $grid = xGrid.value
+ if ($grid) {
+ switch (code) {
+ case 'add': {
+ const $table = xGrid.value
+ if ($table) {
+ const selectRecords = $table.getCheckboxRecords()
+ if (selectRecords.length === 0) {
+ ElMessage.warning(t('productStock.unselectedData'))
+ return
+ }
+ let flowData = ref({
+
+ userId:userid,
+ userName:username,
+ patchLog:selectRecords
+
+ })
+ request.post("/Replenish/updateReplenish",flowData.value).then((res) => {
+ if(res.code==200 && res.data===true){
+ ElMessage.success(t('basicData.msg.ReviewSuccess'))
+ router.push({path:'/main/Replenish/SelectReplenish',query:{random:Math.random()}})
+
+ }else{
+ ElMessage.warning(t('basicData.msg.reviewFail'))
+ }
+ })
+ }
+ return
+
+ }
+ case 'delete': {
+ const $table = xGrid.value
+ if ($table) {
+ const selectRecords = $table.getCheckboxRecords()
+ if (selectRecords.length === 0) {
+ ElMessage.warning(t('productStock.unselectedData'))
+ return
+ }
+ let flowData = ref({
+ userId:userid,
+ userName:username,
+ patchLog:selectRecords
+
+ })
+ request.post("/Replenish/deleteReplenish",flowData.value).then((res) => {
+ if(res.code==200 && res.data===true){
+ ElMessage.success(t('basicData.msg.deleteSuccess'))
+ router.push({path:'/main/Replenish/SelectReplenish',query:{random:Math.random()}})
+
+ }else{
+ ElMessage.warning(t('basicData.msg.deleteFail'))
+ }
+ })
+ }
+ return
+
+ }
+ case 'cancelReview': {
+ const $table = xGrid.value
+ if ($table) {
+ const selectRecords = $table.getCheckboxRecords()
+ if (selectRecords.length === 0) {
+ ElMessage.warning(t('productStock.unselectedData'))
+ return
+ }
+ let flowData = ref({
+
+ userId:userid,
+ userName:username,
+ patchLog:selectRecords
+
+ })
+ request.post("/Replenish/updateCancelReview",flowData.value).then((res) => {
+ if(res.code==200 && res.data===true){
+ ElMessage.success(t('basicData.msg.cancelReviewSuccess'))
+ router.push({path:'/main/Replenish/SelectReplenish',query:{random:Math.random()}})
+
+ }else{
+ ElMessage.warning(t('basicData.msg.cancelReviewFailWork'))
+ }
+ })
+ }
+ return
+
+ }
+
+
+ }
+ }
+ },
+
+}
+
+
+const selectOrderList = ()=>{
+ request.post(`/Replenish/SelectReplenish/${pageNum.value}/${total.pageSize}/${selectDate.value}`,filterData.value).then((res) => {
+ if(res.code==200){
+ if (res.data.total!=null){
+ total.dataTotal = res.data.total.total*1
+ total.pageTotal= res.data.total.pageTotal
+ }
+ selectDate.value = res.data.selectDate
+
+ produceList = deepClone(res.data.data)
+ xGrid.value.loadData(produceList)
+ gridOptions.loading=false
+ }else{
+ ElMessage.warning(res.msg)
+ router.push("/login")
+ }
+ })
+}
+
+const changeDate = ()=>{
+ selectOrderList()
+}
+
+//椤佃剼璺宠浆
+const handlePageChange = ({ currentPage, pageSize }) => {
+ total.pageTotal = pageSize
+ pageNum.value=currentPage
+
+ selectOrderList()
+}
+
+const checkBoxConfig = {
+ checkMethod: ({ row }) => {
+ if (row['review_status']===1){
+ return row.disable
+ }else{
+ return !row.disable
+ }
+
+ },
+ reserve:true
+}
+
</script>
<template>
<div class="main-div-customer">
- <div id="head" style="width: 900px;">
+ <el-header height="auto" style="padding: 0;margin:0">
<el-date-picker
- v-model="value"
+ v-model="selectDate"
type="daterange"
- start-placeholder="鎶ュ伐寮�濮嬫椂闂�"
- end-placeholder="缁撴潫鏃堕棿"
+ :start-placeholder="$t('basicData.startDate')"
+ :end-placeholder="$t('basicData.endDate')"
+ format="YYYY-MM-DD"
+ value-format="YYYY-MM-DD"
+
/>
- <el-button type="primary">鏌ヨ</el-button>
- </div>
+ <el-button @click="changeDate" style="margin-top: -5px" id="searchButton" type="primary" :icon="Search">{{$t('basicData.search')}}</el-button>
+ </el-header>
+
<vxe-grid
- max-height="100%"
- @filter-change="filterChanged"
+ height="100%"
class="mytable-scrollbar"
ref="xGrid"
v-bind="gridOptions"
+ v-on="gridEvents"
+
>
- <!-- @toolbar-button-click="toolbarButtonClickEvent"-->
+ <!-- :checkbox-config="checkBoxConfig" @toolbar-button-click="toolbarButtonClickEvent"-->
<!-- 涓嬫媺鏄剧ず鎵�鏈変俊鎭彃妲�-->
- <template #content="{ row}">
+ <template #content="{ row }">
<ul class="expand-wrapper">
- <li v-for="(item,key,index) in row">
- <span style="font-weight: bold">{{key+': '}}</span>
- <span>{{ item }}</span>
+ <li v-for="(item,index) in gridOptions.columns" v-show="item.field!=undefined ">
+ <span style="font-weight: bold">{{item.title+': '}}</span>
+ <span>{{ row[item.field] }}</span>
</li>
</ul>
</template>
<!--宸﹁竟鍥哄畾鏄剧ず鐨勬彃妲�-->
<template #button_slot="{ row }">
- <el-button @click="getTableRow(row,'delete')" link type="primary" size="small">鍒犻櫎</el-button>
+ <el-button @click="getTableRow(row,'delete')" link type="primary" size="small">{{$t('basicData.delete')}}</el-button>
</template>
<template #num1_filter="{ column, $panel }">
@@ -311,6 +371,23 @@
</div>
</template>
+ <template #state="{ row,column}">
+ <el-checkbox @click.native.prevent :checked="row[column.field]===1"/>
+ </template>
+
+ <template #pager>
+ <!--浣跨敤 pager 鎻掓Ы-->
+ <vxe-pager
+ @page-change="handlePageChange"
+ :layouts="[ 'PrevPage', 'Jump','PageCount', 'NextPage', 'Total']"
+ v-model:current-page="pageNum"
+ v-model:page-size="total.pageSize"
+ v-model:pager-count="total.pageTotal"
+ :total="total.dataTotal"
+ >
+ </vxe-pager>
+ </template>
+
</vxe-grid>
</div>
@@ -319,6 +396,9 @@
<style scoped>
.main-div-customer{
width: 99%;
- height: 100%;
+ height: 94%;
+}
+#head{
+ width:40%;
}
</style>
\ No newline at end of file
--
Gitblit v1.8.0