From fcd6de629c4f6b8d9e610da854f15ef40115b058 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期二, 07 五月 2024 17:03:49 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/mm/mainProductStock/FinishedProductRework.vue | 440 +++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 317 insertions(+), 123 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/FinishedProductRework.vue b/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/FinishedProductRework.vue
index 6450da7..9beacdd 100644
--- a/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/FinishedProductRework.vue
+++ b/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/FinishedProductRework.vue
@@ -4,52 +4,245 @@
<script setup>
-import {reactive, ref} from "vue";
+import {onMounted, reactive, ref} from "vue";
import {useRouter} from 'vue-router'
+import request from "@/utils/request";
+import deepClone from "@/utils/deepClone";
+import useUserInfoStore from "@/stores/userInfo";
+import {ElMessage} from "element-plus";
+import {addListener,toolbarButtonClickEvent} from "@/hook/mouseMove";
+import { useI18n } from 'vue-i18n'
+
+//璇█鑾峰彇
+const { t } = useI18n()
+const userStore = useUserInfoStore()
+const username = userStore.user.userName
+const userid = userStore.user.userId
let router=useRouter()
+let produceList = ref([])
+let cellArea = ref()
+
const getTableRow = (row,type) =>{
switch (type) {
- case 'edit' :{
- //alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑缂栬緫淇℃伅')
- router.push({path: '/main/productStock/OrderAllocation', query: { id: row.id }})
- break
- }
- case 'back':{
- router.push({path: '/main/productStock/FinishedProductRework', query: { id: row.id }})
- break
- }
- case 'out' :{
- //alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑缂栬緫淇℃伅')
- router.push({path: '/main/productStock/FinishedGoodsIssue', query: { id: row.id }})
- break
- }
}
}
+
+let operateType = ref(null)
+let remarks = ref(null)
const xGrid = ref();
const gridEvents = {
- toolbarButtonClick({ code }) {
+ async toolbarButtonClick({code}) {
const $grid = xGrid.value
- if($grid){
- switch (code){
- case 'ver':{
- alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑缂栬緫淇℃伅')
- // router.push({path: '/main/productStock/OrderAllocation'});
- // return;
- break
+ if ($grid) {
+ switch (code) {
+ case 'ver': {
+
+ const selectRecords = $grid.getCheckboxRecords()
+
+ if (selectRecords.length > 0) {
+ const errMap = await $grid.validate(selectRecords)
+ if (errMap) {
+ ElMessage.warning(t('productStock.dataVerificationFailed'))
+ return
+ }
+ } else {
+ ElMessage.warning(t('productStock.unselectedData'))
+ return
+ }
+
+ const operatetype = operateType._rawValue
+ if(operatetype === null || operatetype === undefined || operatetype === ''){
+ ElMessage.warning(t('productStock.pleaseSelectTheTypeOfRework'))
+ return
+ }
+
+ let flowData = ref({
+
+ userId: userid,
+ userName: username,
+ operateType: operateType,
+ remarks: remarks,
+ orderDetail: selectRecords
+
+ })
+ request.post("/FinishedGoodsInventory/updateFinishedGoodsInventoryRework", flowData.value).then((res) => {
+ if (res.code == 200) {
+ ElMessage.success(t('productStock.reworkSuccessful'))
+ router.push({path:'/main/productStock/FinishedProductRework',query:{random:Math.random()}})
+ } else {
+ ElMessage.warning(res.msg)
+ router.push("/login")
+ }
+ })
+
+
+
+ return
}
- case 'record':{
- router.push({path: '/main/productStock/ReworkRecord'});
- return;
- break;
- }
- case 'rework':{
- router.push({path: '/main/productStock/FinishedProductRework'});
- return;
- break;
+ case 'rework': {
+ router.push({path: '/main/productStock/TakeOutRecord'});
+
+ return
}
}
}
},
+ menuClick ({ menu, row, column }) {
+ const $grid = xGrid.value
+ if ($grid) {
+ switch (menu.code) {
+
+ case 'copyChecked' :{
+ let result = toolbarButtonClickEvent()
+ if(result){
+ const dataList = xGrid.value.getTableData().visibleData
+ let firstVal=null;
+ if(result.cell.indexOf('.')>-1){
+ firstVal = eval("dataList["+result.start +"]."+result.cell)
+ }else {
+ firstVal=dataList[result.start][result.cell];
+ }
+ dataList.forEach((item,index) =>{
+ if(index>=result.start && index<=result.end){
+ if(result.cell.indexOf('.')>-1){
+ const columnArr = result.cell.split('.')
+ item[columnArr[0]][columnArr[1]] = firstVal
+ }else{
+ item[result.cell] = firstVal
+ }
+
+ }
+ })
+ }
+ break
+ }
+
+ }
+ }
+ }
+}
+
+const hasDecimal=(value)=>{
+ const regex=/\./ // 瀹氫箟姝ｅ垯琛ㄨ揪寮忥紝鏌ユ壘灏忔暟鐐�
+ return regex.test(value) //杩斿洖true/false
+}
+
+const hasDecimalhtml=(item,row)=>{
+ let aa=item.split('.').length
+ if (aa===2){
+ return row[item.split('.')[0]][item.split('.')[1]]
+ }else if(aa===3){
+ return row[item.split('.')[0]][item.split('.')[1]][item.split('.')[2]]
+ }
+
+
+}
+
+//绛涢�夋潯浠讹紝鏈夊閿渶瑕佸厛瀹氫箟鏄庣粏閲岄潰鐨勬暟鎹�
+let filterData = ref({
+ finishedGoodsInventory:{
+ orderNumber:'',
+ orderId:'',
+ quantityAvailable:'',
+ actualSignalArea:'',
+ area:'',
+ storageRegion:''
+ },
+ order:{
+ project:'',
+ customerId:'',
+ customerName:''
+
+ }
+})
+
+let takeOut = ref(null)
+
+let pageNum=ref(1)
+let total = reactive({
+ pageTotal : 0,
+ dataTotal : 0,
+ pageSize : 100
+})
+//绗竴娆¤皟鐢�
+request.post(`/FinishedGoodsInventory/getSelectAllocate/1/${total.pageSize}`,filterData.value).then((res) => {
+
+ if(res.code==200){
+ total.dataTotal = res.data.total.total*1
+ total.pageTotal= res.data.total.pageTotal
+ pageNum.value=1
+ takeOut.value=res.data.types
+ produceList = deepClone(res.data.data)
+ xGrid.value.loadData(produceList)
+ gridOptions.loading=false
+ }else{
+ ElMessage.warning(res.msg)
+ router.push("/login")
+ }
+})
+
+
+let pageState = null
+
+/*浣跨敤绛涢�夛紝鍚庣鑾峰彇鏁版嵁*/
+const changeFilterEvent = (event, option, $panel,) => {
+ // 鎵嬪姩瑙﹀彂绛涢��
+ $panel.changeOption(event, !!option.data, option)
+}
+function filterChanged(column){
+ gridOptions.loading=true
+ //绛涢�夋潯浠跺彂鐢熷彉鍖栨潯浠跺彂鐢熷彉鍖�
+ let value = column.datas[0]!=undefined?column.datas[0]:''
+ value = value.trim()
+ //鍒ゆ柇鏄惁瀛樺湪澶栭敭
+ if (column.property.indexOf('.')>-1){
+ const columnArr = column.property.split('.')
+ filterData.value[columnArr[0]] = {
+ [columnArr[1]]:value
+ }
+ }else{
+ filterData.value[column.property] = value
+ }
+ request.post(`/FinishedGoodsInventory/getSelectAllocate/1/${total.pageSize}`,filterData.value).then((res) => {
+
+ if(res.code==200){
+ total.dataTotal = res.data.total.total*1
+ total.pageTotal= res.data.total.pageTotal
+ pageNum.value=1
+ produceList = deepClone(res.data.data)
+ xGrid.value.loadData(produceList)
+ gridOptions.loading=false
+ }else{
+ ElMessage.warning(res.msg)
+ router.push("/login")
+ }
+ })
+}
+
+const selectOrderList = ()=>{
+
+ request.post(`/FinishedGoodsInventory/getSelectAllocate/${pageNum.value}/${total.pageSize}`,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
+ }
+ produceList = deepClone(res.data.data)
+ xGrid.value.loadData(produceList)
+ gridOptions.loading=false
+ }else{
+ ElMessage.warning(res.msg)
+ router.push("/login")
+ }
+ })
+}
+//椤佃剼璺宠浆
+const handlePageChange = ({ currentPage, pageSize }) => {
+ total.pageTotal = pageSize
+ pageNum.value=currentPage
+
+ selectOrderList()
}
@@ -61,7 +254,7 @@
keepSource: true,//淇濇寔婧愭暟鎹�
align: 'center',//鏂囧瓧灞呬腑
stripe:true,//鏂戦┈绾�
- rowConfig: {isCurrent: true, isHover: true,height: 50},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
+ rowConfig: {isCurrent: true, isHover: true,height: 30},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
id: 'CustomerList',
showFooter: true,//鏄剧ず鑴�
printConfig: {},
@@ -69,6 +262,15 @@
exportConfig: {},
scrollY:{ enabled: true },//寮�鍚櫄鎷熸粴鍔�
showOverflow:true,
+ menuConfig: {
+ body: {
+ options: [
+ [
+ { code: 'copyChecked', name: t('basicData.selectSame'), prefixIcon: 'vxe-icon-copy', visible: true, disabled: false },
+ ]
+ ]
+ }
+ },
columnConfig: {
resizable: true,
useKey: true
@@ -86,102 +288,44 @@
},//琛ㄥご鍙傛暟
columns:[
{type:'expand',fixed:"left",slots: { content:'content' },width: '50'},
- { type: 'checkbox',fixed:"left", title: '閫夋嫨', width: '80' },
- // { type: 'seq',fixed:"left", title: '鑷簭', width: '80' },
- // {title: '鎿嶄綔', width: '220', slots: { default: 'button_slot' },fixed:"left"},
- {field: 'SalesOrderNumber', width: '150',title: '閿�鍞崟鍙�', sortable: true,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
- {field: 'ProjectName', width: '120',title: '椤圭洰鍚嶇О', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
- {field: 'ProcessCardNumber',width: '100', title: '娴佺▼鍗″彿', sortable: true,showOverflow:"ellipsis"},
- {field: 'FinishedProductNumber', width: '100',title: '鎴愬搧缂栧彿', sortable: true},
- {field: 'Quantity',width: '140', title: '鏁伴噺', sortable: true},
- {field: 'ReworkQuantity',width: '140', title: '杩斿伐鏁伴噺',editRender: { name: 'input', attrs: { placeholder: '' } }, sortable: true},
- {field: 'ProductNumber',width: '100', title: '浜у搧缂栧彿', sortable: true},
- {field: 'CustomerNumber', width: '100',title: '瀹㈡埛缂栧彿', sortable: true},
- {field: 'CustomerName',width: '100', title: '瀹㈡埛鍚嶇О', sortable: true},
- {field: 'Length', width: '100',title: '闀垮害', sortable: true},
- {field: 'Width',width: '100', title: '瀹藉害', sortable: true},
- {field: 'Thickness', width: '100',title: '鍘氬害', sortable: true},
- {field: 'SingleArea',width: '140', title: '鍗曠墖闈㈢Н', sortable: true},
- {field: 'TotalArea',width: '100', title: '鎬婚潰绉�', sortable: true},
- {field: 'StorageArea',width: '100', title: '搴撳尯', sortable: true},
- {field: 'Location',width: '100', title: '搴撲綅', sortable: true},
+ { type: 'checkbox',fixed:"left", title: t('basicData.check'), width: '80' },
+ { type: 'seq',fixed:"left", title: t('basicData.Number'), width: '80' },
+ {field: 'finishedGoodsInventory.orderId', width: '150',title: t('order.orderId'),showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+ {field: 'order.project', width: '150',title: t('order.project'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+ {field: 'productId',width: '150', title: t('order.productId'), filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+ {field: 'productName', width: '150',title: t('order.product'), filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+ {field: 'finishedGoodsInventory.quantityAvailable',width: '140', title: t('order.quantity'), filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+ {field: 'quantity',width: '140', title: t('productStock.reworkQuantity'),editRender: { name: 'input', attrs: { placeholder: '' } }},
+ {field: 'order.customerId', width: '100',title: t('customer.customerNumber'), filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+ {field: 'order.customerName',width: '150', title: t('customer.customerName'), filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+ {field: 'width', width: '100',title: t('order.width'), filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+ {field: 'height',width: '100', title: t('order.height'), filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+ {field: 'finishedGoodsInventory.actualSignalArea',width: '140', title: t('productStock.singlePieceArea'), filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+ {field: 'finishedGoodsInventory.area',width: '150', title: t('productStock.totalArea'), filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+ {field: 'finishedGoodsInventory.storageRegion',width: '100', title:t('productStock.inventoryArea'), filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
],//琛ㄥご鎸夐挳
toolbarConfig: {
buttons: [{
- 'name': '杩斿伐纭',
+ 'name': t('productStock.reworkConfirmation'),
status: 'primary',
'code':'ver'
},
{
- 'name': '杩斿伐璁板綍',
- 'code':'record'
+ 'name': t('productStock.reworkRecords'),
+ 'code':'rework'
}],
- import: false,
- export: true,
- print: true,
+ /*import: false,
+ export: true,
+ print: true,*/
zoom: true,
custom: true
},
- data: [
- {
- "SalesOrderNumber": "NG23072003",
- "ProjectName": "閽㈠寲鐜荤拑",
- "ProcessCardNumber": "NG23072003A01",
- 'FinishedProductNumber':'',
- 'FinishedProductName':'',
- 'BoxNumber':'',
- "CustomerNumber": "KD0071",
- "CustomerName": "浠�",
- "Length": "1075.00",
- "Width": "440.00",
- "Thickness": "3.00",
- "Quantity": "360",
- "SingleArea": "0.473000",
- "TotalArea": "170.28",
- "StorageArea": "0.47",
- "Location": "170.28",
- },{
- "SalesOrderNumber": "NG23072003",
- "ProjectName": "閽㈠寲鐜荤拑",
- "ProcessCardNumber": "NG23072003A01",
- 'FinishedProductNumber':'',
- 'FinishedProductName':'',
- 'BoxNumber':'',
- "CustomerNumber": "KD0071",
- "CustomerName": "浠�",
- "Length": "1075.00",
- "Width": "440.00",
- "Thickness": "3.00",
- "Quantity": "360",
- "SingleArea": "0.473000",
- "TotalArea": "170.28",
- "StorageArea": "0.47",
- "Location": "170.28",
- },{
- "SalesOrderNumber": "NG23072003",
- "ProjectName": "閽㈠寲鐜荤拑",
- "ProcessCardNumber": "NG23072003A01",
- 'FinishedProductNumber':'',
- 'FinishedProductName':'',
- 'BoxNumber':'',
- "CustomerNumber": "KD0071",
- "CustomerName": "浠�",
- "Length": "1075.00",
- "Width": "440.00",
- "Thickness": "3.00",
- "Quantity": "360",
- "SingleArea": "0.473000",
- "TotalArea": "170.28",
- "StorageArea": "0.47",
- "Location": "170.28",
- },
- ],//table body瀹為檯鏁版嵁
footerMethod ({ columns, data }) {//椤佃剼鍑芥暟
return[
columns.map((column, columnIndex) => {
if (columnIndex === 0) {
- return '鍚堣:'
+ return t('basicData.total')
}
// if (props.tableProp.footList.includes(column.field)) {
// return sumNum(data, column.field)
@@ -193,12 +337,39 @@
})
+/*鏁版嵁鏍￠獙*/
+const validRules = ref({
+ quantity: [{
+ validator (e) {
+ if (e.row.quantity > e.row.finishedGoodsInventory.quantityAvailable) {
+ return new Error(t('productStock.theReworkQuantityCannotBeGreaterThanTheOrderQuantity'))
+ }else if (e.row.quantity ==="") {
+ return new Error(t('productStock.reworkQuantityCannotBeEmptyOr0'))
+ }
+ const regex = /^[1-9]\d*$/g
+ if ( !regex.test(e.row.quantity) ) {
+ return new Error(t('productStock.pleaseEnterAPositiveInteger'))
+ }
+ }
+
+ }]
+})
+
+onMounted(()=>{
+ addListener(xGrid.value,gridOptions,cellArea.value)
+})
</script>
<template>
<div class="main-div-customer">
+ <vxe-select v-model="operateType" :placeholder="$t('productStock.pleaseSelectTheTypeOfRework')">
+ <vxe-option v-for="(item,index) in takeOut" :key="index" :value="item.operateTypeName" :label="item.operateTypeName" ></vxe-option>
+ </vxe-select>
+
+ <vxe-input v-model="remarks" :placeholder="$t('productStock.pleaseEnterANote')"></vxe-input>
+
<vxe-grid
max-height="100%"
@filter-change="filterChanged"
@@ -206,24 +377,21 @@
ref="xGrid"
v-bind="gridOptions"
v-on="gridEvents"
+ :edit-rules="validRules"
>
<!-- @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 v-if="hasDecimal(item.field)">{{ hasDecimalhtml(item.field,row) }}</span>
+ <span v-else>{{ row[item.field] }}</span>
</li>
</ul>
</template>
- <!--宸﹁竟鍥哄畾鏄剧ず鐨勬彃妲�-->
- <template #button_slot="{ row }">
- <el-button @click="getTableRow(row,'edit')" link type="primary" size="small">璁㈠崟璋冩嫧</el-button>
- <el-button @click="getTableRow(row,'out')" link type="primary" size="small">鎴愬搧棰嗗嚭</el-button>
- <el-button @click="getTableRow(row,'back')" link type="primary" size="small">鎴愬搧杩斿伐</el-button>
- </template>
+
<template #num1_filter="{ column, $panel }">
<div>
@@ -233,8 +401,27 @@
</div>
</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>
+ <div class="vxe-table--cell-area" ref="cellArea" >
+ <span class="vxe-table--cell-main-area" ></span>
+
+ <span class="vxe-table--cell-active-area" ></span>
</div>
</template>
@@ -243,4 +430,11 @@
width: 99%;
height: 100%;
}
+.vxe-grid {
+ /* 绂佺敤娴忚鍣ㄩ粯璁ら�変腑 */
+ -webkit-user-select: none;
+ -moz-user-select: none;
+ -ms-user-select: none;
+ user-select: none;
+}
</style>
\ No newline at end of file
--
Gitblit v1.8.0