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/sd/delivery/CreateDelivery.vue | 70 ++++++++++++++++++++++++++--------
1 files changed, 53 insertions(+), 17 deletions(-)
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>
--
Gitblit v1.8.0