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/CreateProductStock.vue | 364 +++++++++++++++++++++++++++++++++------------------
1 files changed, 237 insertions(+), 127 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/CreateProductStock.vue b/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/CreateProductStock.vue
index 8a7f575..3800db8 100644
--- a/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/CreateProductStock.vue
+++ b/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/CreateProductStock.vue
@@ -2,7 +2,22 @@
import {reactive, ref} from "vue";
import {useRouter} from 'vue-router'
+import request from "@/utils/request"
+import deepClone from "@/utils/deepClone"
+import VXETable from "vxe-table";
+import useUserInfoStore from "@/stores/userInfo";
+import {ElMessage} from "element-plus";
+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 tableRef = ref([])
const getTableRow = (row,type) =>{
switch (type) {
case 'edit' :{
@@ -24,6 +39,135 @@
+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({
+ orderDetail:{
+ orderNumber:'',
+ productName:'',
+ productId:'',
+ width:'',
+ height:'',
+ quantity:''
+ },
+ order:{
+ orderId:'',
+ creater:'',
+ project:'',
+ area:'',
+ batch:''
+
+ }
+})
+
+let pageNum=ref(1)
+let total = reactive({
+ pageTotal : 0,
+ dataTotal : 0,
+ pageSize : 100
+})
+
+
+//绗竴娆¤皟鐢�
+request.post(`/FinishedGoodsInventory/getSelectWarehousing/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")
+ }
+})
+
+
+
+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/getSelectWarehousing/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/getSelectWarehousing/${pageNum.value}/${total.pageSize}`,filterData.value).then((res) => {
+
+ if(res.code==200){
+ 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()
+}
+
+
+
+
+
+
+
+
+
//瀛愮粍浠舵帴鏀跺弬鏁�
const gridOptions = reactive({
@@ -31,7 +175,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: {},
@@ -55,139 +199,49 @@
showStatus: true
},//琛ㄥご鍙傛暟
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: 'floorNumber', width: '120',title: '妤煎眰缂栧彿', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
- {field: 'finishedProductNumber',width: '100', title: '鎴愬搧缂栧彿', sortable: true,showOverflow:"ellipsis"},
- {field: 'finishedProductName', width: '100',title: ' 鎴愬搧鍚嶇О', sortable: true},
- {field: 'productName',width: '100', title: '浜у搧鍚嶇О', sortable: true},
- {field: 'length', width: '100',title: '闀垮害', sortable: true},
- {field: 'width',width: '100', title: '瀹藉害', sortable: true},
- {field: 'salesperson', width: '100',title: '涓氬姟鍛�', sortable: true},
- {field: 'customerName',width: '100', title: '瀹㈡埛鍚嶇О', sortable: true},
- {field: 'projectName', width: '100',title: '椤圭洰鍚嶇О', sortable: true},
- {field: 'orderNumber',width: '140', title: '璁㈠簭', sortable: true},
- {field: 'totalOrders',width: '140', title: '璁㈠崟鎬绘暟', sortable: true},
- {field: 'quantity',width: '100', title: '鏁伴噺', sortable: true},
- {field: 'completion',width: '140', title: '瀹屽伐', sortable: true},
- {field: 'area',width: '140', title: '闈㈢Н', sortable: true},
- {field: 'processCardNumber',width: '100', title: '娴佺▼鍗″彿', sortable: true},
- {field: 'quantityEntered',width: '100', title: '宸插叆鏁伴噺', sortable: true},
- {field: 'nextProcess',width: '100', title: ' 涓嬪伐搴�', sortable: true},
- {field: 'Batch',width: '100', title: '鎵规', sortable: true},
+ {type:'expand',fixed:"left",slots: { content:'content' },width: '60'},
+ { type: 'checkbox',fixed:"left", title: t('basicData.check'), width: '80' },
+ { type: 'seq',fixed:"left", title: t('basicData.Number'), width: '80' },
+ {field: 'order.orderId', width: '150',title: t('order.orderId'), showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+ //{field: 'orderDetail.buildingNumber', width: '120',title: '妤煎彿',filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+ {field: 'orderDetail.productId',width: '100', title: t('order.productId'), filters:[{ data: '' }],showOverflow:"ellipsis",slots: { filter: 'num1_filter' }},
+ {field: 'orderDetail.productName',width: '100', title: t('order.product'), filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+ {field: 'orderDetail.width', width: '100',title: t('order.width'), filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+ {field: 'orderDetail.height',width: '100', title: t('order.height'), filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+ {field: 'order.creater', width: '100',title: t('order.salesman'), filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+ {field: 'order.project', width: '100',title: t('order.project'), filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+ {field: 'orderNumber',width: '140', title: t('order.OrderNum'), filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+ {field: 'orderDetail.quantity',width: '140', title: t('productStock.totalNumberOfOrders'), filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+ {field: 'inventoryQuantity',width: '100', title: t('productStock.quantityToBeStockedIn'), filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+ {field: 'order.area',width: '140', title: t('order.area'), filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+ {field: 'processId',width: '100', title: t('processCard.processId'), filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+ {field: 'receivedQuantity',width: '100', title: t('productStock.quantityAlreadyInStock'), filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+ {field: 'order.batch',width: '100', title: t('order.batch'), filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
],//琛ㄥご鎸夐挳
toolbarConfig: {
buttons: [{
- 'name': '纭鍏ュ簱',status: 'primary',
-
- 'code':'add'
- }
+ 'name': t('productStock.confirmReceiptOfGoods'),status: 'primary',
+ 'code':'add'
+ },
+ {
+ 'name': t('productStock.warehousingRecords'),status: 'primary',
+ 'code':'jump'
+ }
],
- import: false,
- export: true,
- print: true,
+ /*import: false,
+ export: true,
+ print: true,*/
zoom: true,
custom: true
- },
- data: [
- {
- "SalesOrderNumber": "NG23072003",
- "floorNumber": "10059419",
- "finishedProductNumber": "0604000027",
- "finishedProductName": "NG23072003A01",
- "productName": '閽㈠寲鐜荤拑',
- "length": "1075.00",
- "width": "440.00",
- "salesperson": "灏忓渤",
- "customerName": "澶уご",
- "projectName": "Tempered Glass",
- "orderNumber": "1",
- "totalOrders": "3800",
- "quantity": "1140",
- "completion":'1140',
- "area": "505.270000",
- "processCardNumber": "NG23112311A01",
- "quantityEntered": "0",
- "nextProcess": "Finished Product",
- "Batch": "涓�",
- },
- {
- "SalesOrderNumber": "NG23072003",
- "floorNumber": "10059419",
- "finishedProductNumber": "0604000027",
- "finishedProductName": "NG23072003A01",
- "productName": '閽㈠寲鐜荤拑',
- "length": "1075.00",
- "width": "440.00",
- "salesperson": "灏忓渤",
- "customerName": "澶уご",
- "projectName": "Tempered Glass",
- "orderNumber": "1",
- "totalOrders": "3800",
- "quantity": "1140",
- "completion":'1140',
- "area": "505.270000",
- "processCardNumber": "NG23112311A01",
- "quantityEntered": "0",
- "nextProcess": "Finished Product",
- "Batch": "涓�",
- },
- {
- "SalesOrderNumber": "NG23072003",
- "floorNumber": "10059419",
- "finishedProductNumber": "0604000027",
- "finishedProductName": "NG23072003A01",
- "productName": '閽㈠寲鐜荤拑',
- "length": "1075.00",
- "width": "440.00",
- "salesperson": "灏忓渤",
- "customerName": "澶уご",
- "projectName": "Tempered Glass",
- "orderNumber": "1",
- "totalOrders": "3800",
- "quantity": "1140",
- "completion":'1140',
- "area": "505.270000",
- "processCardNumber": "NG23112311A01",
- "quantityEntered": "0",
- "nextProcess": "Finished Product",
- "Batch": "涓�",
- },
- {
- "SalesOrderNumber": "NG23072003",
- "floorNumber": "10059419",
- "finishedProductNumber": "0604000027",
- "finishedProductName": "NG23072003A01",
- "productName": '閽㈠寲鐜荤拑',
- "length": "1075.00",
- "width": "440.00",
- "salesperson": "灏忓渤",
- "customerName": "澶уご",
- "projectName": "Tempered Glass",
- "orderNumber": "1",
- "totalOrders": "3800",
- "quantity": "1140",
- "completion":'1140',
- "area": "505.270000",
- "processCardNumber": "NG23112311A01",
- "quantityEntered": "0",
- "nextProcess": "Finished Product",
- "Batch": "涓�",
- },
-
- ],//table body瀹為檯鏁版嵁
+ }
+ ,//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)
- // }
+
return ''
})
]
@@ -195,14 +249,45 @@
})
const xGrid = ref();
+const storageRegion = ref(null);
+const remark = ref(null);
+
const gridEvents = {
toolbarButtonClick ({ code }) {
const $grid = xGrid.value
if ($grid) {
switch (code) {
case 'add': {
- alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑缂栬緫淇℃伅')
+ const $table = xGrid.value
+ if ($table) {
+ const selectRecords = $table.getCheckboxRecords()
+
+ let flowData = ref({
+ userId:userid,
+ userName:username,
+ storageRegion:storageRegion.value,
+ remark:remark.value,
+ flowcard:selectRecords
+ })
+
+ request.post("/FinishedGoodsInventory/addSelectWarehousing",flowData.value).then((res) => {
+ if(res.code==200){
+ ElMessage.success(t('productStock.receivedSuccessfully'))
+ router.push({path:'/main/productStock/CreateProductStock',query:{random:Math.random()}})
+ }else{
+ ElMessage.warning(res.msg)
+ router.push("/login")
+ }
+ })
+
+ }
return;
+
+ }
+ case 'jump': {
+ router.push({path: '/main/productStock/storageRecord', query: { storageType: '鍏ュ簱' }})
+ return;
+
}
}
@@ -215,6 +300,17 @@
<template>
<div class="main-div-customer">
+ <div id="selectForm">
+ <el-input style="width: 200px" v-model="storageRegion" class="m-2" :placeholder="$t('productStock.pleaseEnterTheStorageLocation')">
+ </el-input>
+ <el-input style="width: 200px" v-model="remark" class="m-2" :placeholder="$t('productStock.pleaseEnterANote')">
+ </el-input>
+
+
+
+ </div>
+
+
<vxe-grid
max-height="100%"
@filter-change="filterChanged"
@@ -227,9 +323,10 @@
<!-- 涓嬫媺鏄剧ず鎵�鏈変俊鎭彃妲�-->
<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,key,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>
@@ -249,6 +346,19 @@
</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>
--
Gitblit v1.8.0