From 67bb8ed26f127d39fc0f747aef32881af14b7ca6 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期五, 01 三月 2024 08:03:58 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/mm/mainProductStock/OrderAllocation.vue | 62 +++++++++++-
north-glass-erp/northglass-erp/src/views/sd/delivery/CreateDelivery.vue | 70 ++++++++++---
north-glass-erp/northglass-erp/src/views/mm/mainProductStock/FinishedGoodsIssue.vue | 56 ++++++++++
north-glass-erp/northglass-erp/src/views/mm/mainProductStock/CreateProductStock.vue | 4
north-glass-erp/northglass-erp/src/views/sd/delivery/SelectDelivery.vue | 3
north-glass-erp/northglass-erp/src/views/mm/mainProductStock/TransferRecord.vue | 1
north-glass-erp/northglass-erp/src/views/mm/mainProductStock/FinishedProductRework.vue | 58 ++++++++++-
north-glass-erp/northglass-erp/src/views/mm/mainProductStock/ReworkRecord.vue | 1
north-glass-erp/northglass-erp/src/views/mm/mainProductStock/ProductStockList.vue | 3
north-glass-erp/northglass-erp/src/views/mm/mainProductStock/TakeOutRecord.vue | 1
north-glass-erp/northglass-erp/src/views/sd/customer/CreateCustomer.vue | 4
north-glass-erp/northglass-erp/src/views/sd/delivery/SelectOrderList.vue | 2
north-glass-erp/northglass-erp/src/views/sd/customer/SelectCustomer.vue | 3
north-glass-erp/northglass-erp/src/views/mm/mainProductStock/FinishedProductOut.vue | 4
14 files changed, 216 insertions(+), 56 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 ec9abcf..cc57c2c 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
@@ -84,7 +84,6 @@
request.post(`/FinishedGoodsInventory/getseletwarehousing/1/${total.pageSize}`,filterData.value).then((res) => {
if(res.code==200){
- console.log(res.data)
total.dataTotal = res.data.total.total*1
total.pageTotal= res.data.total.pageTotal
pageNum.value=1
@@ -123,7 +122,6 @@
request.post(`/FinishedGoodsInventory/getseletwarehousing/1/${total.pageSize}`,filterData.value).then((res) => {
if(res.code==200){
- console.log(res.data)
total.dataTotal = res.data.total.total*1
total.pageTotal= res.data.total.pageTotal
pageNum.value=1
@@ -141,7 +139,6 @@
request.post(`/FinishedGoodsInventory/getseletwarehousing/${pageNum.value}/${total.pageSize}`,filterData.value).then((res) => {
if(res.code==200){
- console.log(res.data)
produceList = deepClone(res.data.data)
xGrid.value.loadData(produceList)
gridOptions.loading=false
@@ -266,7 +263,6 @@
flowcard:selectRecords
})
- console.log(flowData.value)
request.post("/FinishedGoodsInventory/addseletwarehousing",flowData.value).then((res) => {
if(res.code==200){
ElMessage.success("鍏ュ簱鎴愬姛")
diff --git a/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/FinishedGoodsIssue.vue b/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/FinishedGoodsIssue.vue
index 9260a8d..1d6612c 100644
--- a/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/FinishedGoodsIssue.vue
+++ b/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/FinishedGoodsIssue.vue
@@ -3,18 +3,20 @@
<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";
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) {
@@ -32,11 +34,9 @@
case 'verify': {
const selectRecords = $grid.getCheckboxRecords()
- console.log(selectRecords)
if (selectRecords.length > 0) {
const errMap = await $grid.validate(selectRecords)
- console.log(errMap)
if (errMap) {
ElMessage.warning("鏁版嵁鏍￠獙澶辫触")
return
@@ -84,6 +84,39 @@
}
}
},
+ 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
+ }
+
+ }
+ }
+ }
}
@@ -223,6 +256,15 @@
exportConfig: {},
scrollY:{ enabled: true },//寮�鍚櫄鎷熸粴鍔�
showOverflow:true,
+ menuConfig: {
+ body: {
+ options: [
+ [
+ { code: 'copyChecked', name: '閫変腑鐩稿悓', prefixIcon: 'vxe-icon-copy', visible: true, disabled: false },
+ ]
+ ]
+ }
+ },
columnConfig: {
resizable: true,
useKey: true
@@ -306,6 +348,9 @@
}]
})
+onMounted(()=>{
+ addListener(xGrid.value,gridOptions,cellArea.value)
+})
@@ -370,6 +415,11 @@
</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>
<style scoped>
diff --git a/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/FinishedProductOut.vue b/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/FinishedProductOut.vue
index e4b6611..157c996 100644
--- a/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/FinishedProductOut.vue
+++ b/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/FinishedProductOut.vue
@@ -89,7 +89,6 @@
request.post(`/FinishedGoodsInventory/getseletdeliveryDetail/1/${total.pageSize}`,filterData.value).then((res) => {
if(res.code==200){
- console.log(res.data)
total.dataTotal = res.data.total.total*1
total.pageTotal= res.data.total.pageTotal
pageNum.value=1
@@ -126,7 +125,6 @@
request.post(`/FinishedGoodsInventory/getseletdeliveryDetail/1/${total.pageSize}`,filterData.value).then((res) => {
if(res.code==200){
- console.log(res.data)
total.dataTotal = res.data.total.total*1
total.pageTotal= res.data.total.pageTotal
pageNum.value=1
@@ -146,7 +144,6 @@
request.post(`/FinishedGoodsInventory/getseletdeliveryDetail/${pageNum.value}/${total.pageSize}`,filterData.value).then((res) => {
if(res.code==200){
- console.log(res.data)
produceList = deepClone(res.data.data)
xGrid.value.loadData(produceList)
gridOptions.loading=false
@@ -268,7 +265,6 @@
orderDetail:selectRecords
})
- console.log(orderDetailData.value)
request.post("/FinishedGoodsInventory/adddeliveryDetail",orderDetailData.value).then((res) => {
if(res.code==200){
ElMessage.success("鍑哄簱鎴愬姛")
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 99e93df..05676f0 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,17 +4,19 @@
<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";
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) {
@@ -32,11 +34,9 @@
case 'ver': {
const selectRecords = $grid.getCheckboxRecords()
- console.log(selectRecords)
if (selectRecords.length > 0) {
const errMap = await $grid.validate(selectRecords)
- console.log(errMap)
if (errMap) {
ElMessage.warning("鏁版嵁鏍￠獙澶辫触")
return
@@ -83,6 +83,39 @@
}
}
},
+ 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)=>{
@@ -187,7 +220,6 @@
request.post(`/FinishedGoodsInventory/getSelectAllocate/${pageNum.value}/${total.pageSize}`,filterData.value).then((res) => {
if(res.code==200){
- console.log(res.data)
produceList = deepClone(res.data.data)
xGrid.value.loadData(produceList)
gridOptions.loading=false
@@ -222,6 +254,15 @@
exportConfig: {},
scrollY:{ enabled: true },//寮�鍚櫄鎷熸粴鍔�
showOverflow:true,
+ menuConfig: {
+ body: {
+ options: [
+ [
+ { code: 'copyChecked', name: '閫変腑鐩稿悓', prefixIcon: 'vxe-icon-copy', visible: true, disabled: false },
+ ]
+ ]
+ }
+ },
columnConfig: {
resizable: true,
useKey: true
@@ -307,7 +348,9 @@
}]
})
-
+onMounted(()=>{
+ addListener(xGrid.value,gridOptions,cellArea.value)
+})
</script>
@@ -372,6 +415,11 @@
</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>
<style scoped>
diff --git a/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/OrderAllocation.vue b/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/OrderAllocation.vue
index 7b9ae18..3c410ad 100644
--- a/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/OrderAllocation.vue
+++ b/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/OrderAllocation.vue
@@ -3,19 +3,21 @@
<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 userInfo from '@/stores/userInfo'
import useUserInfoStore from "@/stores/userInfo";
import {ElMessage} from "element-plus";
+import {addListener,toolbarButtonClickEvent} from "@/hook/mouseMove";
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' :{
@@ -74,6 +76,8 @@
dataTotal : 0,
pageSize : 10
})
+
+
//绗竴娆¤皟鐢�
request.post(`/FinishedGoodsInventory/getSelectAllocate/1/${total.pageSize}`,filterData.value).then((res) => {
@@ -136,7 +140,6 @@
request.post(`/FinishedGoodsInventory/getSelectAllocate/${pageNum.value}/${total.pageSize}`,filterData.value).then((res) => {
if(res.code==200){
- console.log(res.data)
produceList = deepClone(res.data.data)
xGrid.value.loadData(produceList)
gridOptions.loading=false
@@ -155,7 +158,6 @@
}
-
//瀛愮粍浠舵帴鏀跺弬鏁�
const gridOptions = reactive({
@@ -171,6 +173,15 @@
exportConfig: {},
scrollY:{ enabled: true },//寮�鍚櫄鎷熸粴鍔�
showOverflow:true,
+ menuConfig: {
+ body: {
+ options: [
+ [
+ { code: 'copyChecked', name: '閫変腑鐩稿悓', prefixIcon: 'vxe-icon-copy', visible: true, disabled: false },
+ ]
+ ]
+ }
+ },
columnConfig: {
resizable: true,
useKey: true
@@ -245,11 +256,9 @@
case 'edit': {
const selectRecords = $grid.getCheckboxRecords()
- console.log(selectRecords)
if (selectRecords.length > 0) {
const errMap = await $grid.validate(selectRecords)
- console.log(errMap)
if (errMap) {
ElMessage.warning("鏁版嵁鏍￠獙澶辫触")
return
@@ -290,8 +299,42 @@
}
}
}
+ },
+ 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 validRules = ref({
@@ -317,6 +360,10 @@
}]
+})
+
+onMounted(()=>{
+ addListener(xGrid.value,gridOptions,cellArea.value)
})
@@ -375,6 +422,11 @@
</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>
<style scoped>
diff --git a/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/ProductStockList.vue b/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/ProductStockList.vue
index 818d386..764e47a 100644
--- a/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/ProductStockList.vue
+++ b/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/ProductStockList.vue
@@ -74,7 +74,6 @@
request.post(`/FinishedGoodsInventory/getselet/1/${total.pageSize}`,filterData.value).then((res) => {
if(res.code==200){
- console.log(res.data)
total.dataTotal = res.data.total.total*1
total.pageTotal= res.data.total.pageTotal
pageNum.value=1
@@ -113,7 +112,6 @@
request.post(`/FinishedGoodsInventory/getselet/1/${total.pageSize}`,filterData.value).then((res) => {
if(res.code==200){
- console.log(res.data.data)
total.dataTotal = res.data.total.total*1
total.pageTotal= res.data.total.pageTotal
pageNum.value=1
@@ -131,7 +129,6 @@
request.post(`/FinishedGoodsInventory/getselet/${pageNum.value}/${total.pageSize}`,filterData.value).then((res) => {
if(res.code==200){
- console.log(res.data)
produceList = deepClone(res.data.data)
xGrid.value.loadData(produceList)
gridOptions.loading=false
diff --git a/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/ReworkRecord.vue b/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/ReworkRecord.vue
index 9b8836d..aeb9dcd 100644
--- a/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/ReworkRecord.vue
+++ b/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/ReworkRecord.vue
@@ -242,7 +242,6 @@
//gridOptions.columns.unshift(a)
if ($table) {
const selectRecords = $table.getCheckboxRecords()
- console.log(selectRecords)
let flowData = ref({
diff --git a/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/TakeOutRecord.vue b/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/TakeOutRecord.vue
index 0399215..4e08082 100644
--- a/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/TakeOutRecord.vue
+++ b/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/TakeOutRecord.vue
@@ -248,7 +248,6 @@
//gridOptions.columns.unshift(a)
if ($table) {
const selectRecords = $table.getCheckboxRecords()
- console.log(selectRecords)
let flowData = ref({
diff --git a/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/TransferRecord.vue b/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/TransferRecord.vue
index 332825a..e5cb795 100644
--- a/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/TransferRecord.vue
+++ b/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/TransferRecord.vue
@@ -236,7 +236,6 @@
//gridOptions.columns.unshift(a)
if ($table) {
const selectRecords = $table.getCheckboxRecords()
- console.log(selectRecords)
let flowData = ref({
diff --git a/north-glass-erp/northglass-erp/src/views/sd/customer/CreateCustomer.vue b/north-glass-erp/northglass-erp/src/views/sd/customer/CreateCustomer.vue
index fddabf4..ff99e06 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/customer/CreateCustomer.vue
+++ b/north-glass-erp/northglass-erp/src/views/sd/customer/CreateCustomer.vue
@@ -33,10 +33,7 @@
request.post(`/customer/getseletCustomer/1/100`,ruleForm.value).then((res) => {
if(res.code==200){
- console.log(res.data.data)
ruleForm.value=deepClone(res.data.data[0])
-
- console.log(ruleForm.value)
}else{
ElMessage.warning(res.msg)
@@ -87,7 +84,6 @@
customer: ruleForm
})
- console.log(flowData)
request.post("/customer/insertCustomer", flowData.value).then((res) => {
if(res.code==200){
resetForm()
diff --git a/north-glass-erp/northglass-erp/src/views/sd/customer/SelectCustomer.vue b/north-glass-erp/northglass-erp/src/views/sd/customer/SelectCustomer.vue
index d58884e..2d4d0a3 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/customer/SelectCustomer.vue
+++ b/north-glass-erp/northglass-erp/src/views/sd/customer/SelectCustomer.vue
@@ -79,7 +79,6 @@
request.post(`/customer/getseletCustomer/1/${total.pageSize}`,filterData.value).then((res) => {
if(res.code==200){
- console.log(res.data)
total.dataTotal = res.data.total.total*1
total.pageTotal= res.data.total.pageTotal
pageNum.value=1
@@ -116,7 +115,6 @@
request.post(`/customer/getseletCustomer/1/${total.pageSize}`,filterData.value).then((res) => {
if(res.code==200){
- console.log(res.data)
total.dataTotal = res.data.total.total*1
total.pageTotal= res.data.total.pageTotal
pageNum.value=1
@@ -135,7 +133,6 @@
request.post(`/customer/getseletCustomer/${pageNum.value}/${total.pageSize}`,filterData.value).then((res) => {
if(res.code==200){
- console.log(res.data)
produceList = deepClone(res.data.data)
xGrid.value.loadData(produceList)
gridOptions.loading=false
diff --git a/north-glass-erp/northglass-erp/src/views/sd/delivery/CreateDelivery.vue b/north-glass-erp/northglass-erp/src/views/sd/delivery/CreateDelivery.vue
index 098ce6a..df2c200 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/delivery/CreateDelivery.vue
+++ b/north-glass-erp/northglass-erp/src/views/sd/delivery/CreateDelivery.vue
@@ -8,13 +8,14 @@
import VXETable from "vxe-table";
import useUserInfoStore from "@/stores/userInfo";
import {ElMessage} from "element-plus";
-import validator from "vxe-table/lib/validator";
+import {addListener,toolbarButtonClickEvent} from "@/hook/mouseMove";
const router = useRouter()
const route = useRoute()
const userStore = useUserInfoStore()
const username = userStore.user.userName
const userid = userStore.user.userId
let produceList = ref([])
+let cellArea = ref()
const hasDecimal=(value)=>{
@@ -102,7 +103,6 @@
if(res.code==200){
titleSelectJson.value=deepClone(res.data)
- console.log(titleSelectJson.value)
const today = new Date
today.setTime(today.getTime() + (15 * 24 * 60 * 60 * 1000))
titleUploadData.value.deliveryDate = today.getFullYear() +
@@ -118,6 +118,8 @@
const number = ref();
onMounted(()=>{
+ //鍚敤琛ㄦ牸鎷栧姩閫変腑
+ addListener(xGrid.value,gridOptions,cellArea.value)
//鍙戣揣鏂板
const orderId = route.query.orderId
if (typeof orderId !== 'undefined' && orderId !== null && orderId !== '' && orderId !== '\n' && orderId !== '\r'){
@@ -127,7 +129,6 @@
request.post("/Delivery/getseletShippingOrderDetails/1/100",filterData.value).then((res) => {
if(res.code==200){
- console.log(res.data.title)
pageTotal.value=res.data.total
@@ -170,15 +171,12 @@
if (typeof str != 'undefined' && str != null && str !== '' && str !== '\n' && str !== '\r'){
filterData.value.deliveryDetail.deliveryId=str
- console.log(filterData)
//绗竴娆¤皟鐢�
request.post("/Delivery/getseletShippingOrderDetail/1/100",filterData.value).then((res) => {
if(res.code==200){
- console.log(res.data.data)
pageTotal.value=res.data.total
titleUploadData.value=deepClone(res.data.delivery)
- console.log(deepClone(res.data.delivery))
//鏍规嵁瀹℃牳鐘舵�佹樉绀哄鏍告寜閽垨鑰呮槸鍙嶅鎸夐挳
@@ -254,7 +252,6 @@
request.post("/Delivery/getseletShippingOrderDetail/1/100",filterData.value).then((res) => {
if(res.code==200){
- console.log(res.data.data)
pageTotal.value=res.data.total
pageNum=1
produceList = deepClone(res.data.data)
@@ -272,7 +269,6 @@
request.post("/Delivery/getseletShippingOrderDetails/1/100",filterData.value).then((res) => {
if(res.code==200){
- console.log(res.data.title)
pageTotal.value=res.data.total
pageNum=1
@@ -284,10 +280,7 @@
router.push("/login")
}
})
- }
- console.log(route.query.orderId)
- console.log(filterData.value.deliveryDetail.deliveryId)
- console.log(filterData.value)*/
+ }*/
}
@@ -307,6 +300,15 @@
exportConfig: {},
scrollY:{ enabled: true },//寮�鍚櫄鎷熸粴鍔�
showOverflow:true,
+ menuConfig: {
+ body: {
+ options: [
+ [
+ { code: 'copyChecked', name: '閫変腑鐩稿悓', prefixIcon: 'vxe-icon-copy', visible: true, disabled: false },
+ ]
+ ]
+ }
+ },
columnConfig: {
resizable: true,
useKey: true
@@ -388,14 +390,12 @@
switch (code) {
case 'add': {
const selectRecords = $grid.getCheckboxRecords()
- console.log(selectRecords)
if (selectRecords.length === 0) {
ElMessage.warning("鏈�変腑鏁版嵁")
return
}
const errMap = await $grid.validate(selectRecords)
- console.log(errMap)
if (errMap) {
ElMessage.warning("鏁版嵁鏍￠獙澶辫触")
return
@@ -426,7 +426,6 @@
deliveryId: route.query.deliveryID
})
- console.log(flowData)
request.post("/Delivery/insertDelivery", flowData.value).then((res) => {
if(res.code==200){
ElMessage.success("鍙戣揣鍗曟彁浜ゆ垚鍔�")
@@ -444,7 +443,6 @@
type: 2
})
- console.log(flowData)
request.post("/Delivery/updateDeliveryToExamine", flowData.value).then((res) => {
if (res.code == 200) {
ElMessage.success("瀹℃牳鎴愬姛")
@@ -462,7 +460,6 @@
type: 0
})
- console.log(flowData)
request.post("/Delivery/updateDeliveryToExamine", flowData.value).then((res) => {
if (res.code == 200) {
ElMessage.success("鍙嶅鎴愬姛")
@@ -474,6 +471,40 @@
})
break
}
+
+ }
+ }
+ },
+ 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
+ }
+
}
}
}
@@ -609,6 +640,11 @@
</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>
</div>
</template>
diff --git a/north-glass-erp/northglass-erp/src/views/sd/delivery/SelectDelivery.vue b/north-glass-erp/northglass-erp/src/views/sd/delivery/SelectDelivery.vue
index e3ae1e4..bdbcaf5 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/delivery/SelectDelivery.vue
+++ b/north-glass-erp/northglass-erp/src/views/sd/delivery/SelectDelivery.vue
@@ -15,7 +15,6 @@
const getTableRow = (row,type) =>{
switch (type) {
case 'edit' :{
- console.log(row)
router.push({path: '/main/delivery/createDelivery', query: { deliveryID: row.deliveryId }})
break
}
@@ -101,7 +100,6 @@
request.post(`/Delivery/getseletShippingOrder/1/${total.pageSize}/${selectDate.value}`,filterData.value).then((res) => {
if(res.code==200){
- console.log(res.data)
total.dataTotal = res.data.total.total*1
total.pageTotal= res.data.total.pageTotal
pageNum.value=1
@@ -120,7 +118,6 @@
request.post(`/Delivery/getseletShippingOrder/${pageNum.value}/${total.pageSize}/${selectDate.value}`,filterData.value).then((res) => {
if(res.code==200){
- console.log(res.data)
produceList = deepClone(res.data.data)
xGrid.value.loadData(produceList)
gridOptions.loading=false
diff --git a/north-glass-erp/northglass-erp/src/views/sd/delivery/SelectOrderList.vue b/north-glass-erp/northglass-erp/src/views/sd/delivery/SelectOrderList.vue
index 716b66f..ed54f9c 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/delivery/SelectOrderList.vue
+++ b/north-glass-erp/northglass-erp/src/views/sd/delivery/SelectOrderList.vue
@@ -67,7 +67,6 @@
request.post(`/Delivery/getSelectOrderInventory/1/${total.pageSize}/${selectDate.value}`,filterData.value).then((res) => {
if(res.code==200){
- console.log(res.data)
total.dataTotal = res.data.total.total*1
total.pageTotal= res.data.total.pageTotal
selectDate.value = res.data.selectDate
@@ -121,7 +120,6 @@
request.post(`/Delivery/getSelectOrderInventory/${pageNum.value}/${total.pageSize}/${selectDate.value}`,filterData.value).then((res) => {
if(res.code==200){
- console.log(res.data)
produceList = deepClone(res.data.data)
xGrid.value.loadData(produceList)
gridOptions.loading=false
--
Gitblit v1.8.0