From 266e4bf654c55ce2f7e9271048e4625f1b8b49f6 Mon Sep 17 00:00:00 2001
From: heshaofeng <heshaofeng@hnkhzn.com>
Date: 星期一, 29 十二月 2025 14:36:08 +0800
Subject: [PATCH] Merge branch 'htq20251215' of http://115.159.85.185:8098/r/ZhongRui/ALDbanyunxiangmu into htq20251215
---
项目代码/WIDESEA_WMSClient/src/extension/inbound/inboundOrder.js | 669 ++++++++++++++++++++++++-------------------------------
1 files changed, 291 insertions(+), 378 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/inbound/inboundOrder.js" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/inbound/inboundOrder.js"
index 335d0cf..e70505c 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/inbound/inboundOrder.js"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/inbound/inboundOrder.js"
@@ -1,61 +1,45 @@
//姝s鏂囦欢鏄敤鏉ヨ嚜瀹氫箟鎵╁睍涓氬姟浠ｇ爜锛屽彲浠ユ墿灞曚竴浜涜嚜瀹氫箟椤甸潰鎴栬�呴噸鏂伴厤缃敓鎴愮殑浠ｇ爜
-import http from '@/api/http.js'
-import { h, createVNode, render, reactive, ref } from 'vue';
-import { ElDialog, ElForm, ElFormItem, ElInput, ElButton, ElMessage, ElSelect, ElOption } from 'element-plus'; // 寮曞叆ElMessage锛岃В鍐虫彁绀烘棤鍙嶅簲
-import gridHeader from './extend/EmptyTrayInbound.vue'
+import gridHeader from "./extend/EmptyTrayInbound.vue";
+import gridBody from "./extend/Pallet.vue";
+import http from "@/api/http.js";
+import { h, createVNode, render, reactive, ref } from "vue";
+import {
+ ElDialog,
+ ElForm,
+ ElFormItem,
+ ElInput,
+ ElButton,
+ ElMessage,
+ ElSelect,
+ ElOption,
+} from "element-plus";
let extension = {
components: {
//鏌ヨ鐣岄潰鎵╁睍缁勪欢
gridHeader: gridHeader,
- gridBody: '',
- gridFooter: '',
+ gridBody: gridBody,
+ gridFooter: "",
//鏂板缓銆佺紪杈戝脊鍑烘鎵╁睍缁勪欢
- modelHeader: '',
- modelBody: '',
- modelFooter: ''
+ modelHeader: "",
+ modelBody: "",
+ modelFooter: "",
},
- tableAction: '', //鎸囧畾鏌愬紶琛ㄧ殑鏉冮檺(杩欓噷濉啓琛ㄥ悕,榛樿涓嶇敤濉啓)
+ tableAction: "", //鎸囧畾鏌愬紶琛ㄧ殑鏉冮檺(杩欓噷濉啓琛ㄥ悕,榛樿涓嶇敤濉啓)
buttons: {
view: [
{
- name: '缁勭洏',
- type: 'primary',
- value: '缁勭洏',
- onClick: function () { // 淇1锛氱Щ闄ゆ棤鐢╮ow鍙傛暟锛屽姞鏃ュ織璋冭瘯
- console.log('缁勭洏鎸夐挳琚偣鍑伙紝寮�濮嬫牎楠�');
- const selectedRows = this.$refs.table.getSelected();
-
- // 鏍￠獙1锛氭槸鍚﹂�変腑琛�
- if (selectedRows.length === 0) {
- console.log('鏍￠獙涓嶉�氳繃锛氭湭閫変腑浠讳綍鍗曟嵁');
- ElMessage.warning('璇烽�夋嫨涓�鏉″崟鎹�');
- return;
- }
- // 鏍￠獙2锛氭槸鍚﹂�変腑鍗曡
- if (selectedRows.length > 1) {
- console.log('鏍￠獙涓嶉�氳繃锛氶�変腑澶氳鍗曟嵁');
- ElMessage.warning('鍙兘閫夋嫨涓�鏉″崟鎹�');
- return;
- }
-
- const targetRow = selectedRows[0];
-
- this.$emit('openPalletDialog', targetRow.inboundOrderNo);
- }
- },
- {
- name: '鎾ら攢缁勭洏',
- type: 'primary',
- value: '鎾ら攢缁勭洏',
- onClick: function () {
- console.log('鎾ら攢缁勭洏鎸夐挳琚偣鍑�');
- const mountNode = document.createElement('div');
+ name: "鎾ら攢缁勭洏",
+ type: "primary",
+ value: "鎾ら攢缁勭洏",
+ onClick: function() {
+ console.log("鎾ら攢缁勭洏鎸夐挳琚偣鍑�");
+ const mountNode = document.createElement("div");
document.body.appendChild(mountNode);
// 鍝嶅簲寮忚〃鍗曟暟鎹細鎵樼洏鍙凤紙蹇呭～锛�
const formData = reactive({
- palletCode: '', // 鎵樼洏鍙疯緭鍏ユ
- barcode: ''
+ palletCode: "", // 鎵樼洏鍙疯緭鍏ユ
+ barcode: "",
});
// 鎻愪氦琛ㄥ崟鐨勭粺涓�閫昏緫
@@ -65,32 +49,32 @@
// 鎵ц琛ㄥ崟鏍￠獙锛堟墭鐩樺彿蹇呭～锛�
await formRef.validate();
} catch (err) {
- ElMessage.warning('璇疯緭鍏ユ湁鏁堢殑鎵樼洏鍙�');
+ ElMessage.warning("璇疯緭鍏ユ湁鏁堢殑鎵樼洏鍙�");
return;
}
// 鍙戣捣鎾ら攢缁勭洏璇锋眰
try {
- //console.log('鍙戣捣鎾ら攢缁勭洏璇锋眰锛屾墭鐩樺彿锛�', formData.palletCode.trim());
- const response = await http.post('/api/InboundOrder/UndoPalletGroup?palletCode=' + formData.palletCode.trim() + '&barcode=' + formData.barcode.trim());
-
-
+ const response = await http.post(
+ "/api/InboundOrder/UndoPalletGroup?palletCode=" +
+ formData.palletCode.trim() +
+ "&barcode=" +
+ formData.barcode.trim()
+ );
const { status, message, data } = response;
if (status) {
ElMessage.success(response.message);
- console.log(response.message)
this.refresh(); // 鎴愬姛鍚庡埛鏂板垪琛�
// 鍏抽棴瀵硅瘽妗�
render(null, mountNode);
document.body.removeChild(mountNode);
} else {
- console.log('鎾ら攢缁勭洏澶辫触锛屽悗绔彁绀猴細', message);
- ElMessage.error(message || data?.message || '鎾ら攢缁勭洏澶辫触');
+ ElMessage.error(message || data?.message || "鎾ら攢缁勭洏澶辫触");
selectPalletCodeInput(); // 閫変腑杈撳叆妗嗘柟渚块噸鏂拌緭鍏�
}
} catch (error) {
- console.error('鎾ら攢缁勭洏璇锋眰寮傚父锛�', error);
- ElMessage.error('缃戠粶寮傚父鎴栨帴鍙ｉ敊璇紝璇风◢鍚庨噸璇�');
+ console.error("鎾ら攢缁勭洏璇锋眰寮傚父锛�", error);
+ ElMessage.error("缃戠粶寮傚父鎴栨帴鍙ｉ敊璇紝璇风◢鍚庨噸璇�");
selectPalletCodeInput();
}
};
@@ -100,7 +84,8 @@
setTimeout(() => {
const inputRef = vnode.component.refs.palletCodeInput;
if (inputRef) {
- const targetInput = inputRef.$el?.querySelector('input') || inputRef;
+ const targetInput =
+ inputRef.$el?.querySelector("input") || inputRef;
targetInput?.focus();
targetInput?.select();
}
@@ -108,349 +93,277 @@
};
// 鍒涘缓瀵硅瘽妗哣Node
- const vnode = createVNode(ElDialog, {
- title: '鎾ら攢缁勭洏',
- width: '400px',
- modelValue: true,
- appendToBody: true,
- onOpened: () => {
- // 瀵硅瘽妗嗘墦寮�鍚庤嚜鍔ㄨ仛鐒﹁緭鍏ユ
- setTimeout(() => {
- const inputRef = vnode.component.refs.palletCodeInput;
- inputRef?.focus();
- }, 100);
- },
- 'onUpdate:modelValue': (isVisible) => {
- if (!isVisible) {
- render(null, mountNode);
- document.body.removeChild(mountNode);
- }
- }
- }, {
- default: () => h(ElForm, {
- model: formData,
- rules: {
- palletCode: [
- { required: true, message: '璇疯緭鍏ユ墭鐩樺彿', trigger: ['blur', 'enter'] },
- { min: 1, max: 50, message: '鎵樼洏鍙烽暱搴︿笉鑳借秴杩�50涓瓧绗�', trigger: ['blur', 'input'] }
- ]
+ const vnode = createVNode(
+ ElDialog,
+ {
+ title: "鎾ら攢缁勭洏",
+ width: "400px",
+ modelValue: true,
+ appendToBody: true,
+ onOpened: () => {
+ // 瀵硅瘽妗嗘墦寮�鍚庤嚜鍔ㄨ仛鐒﹁緭鍏ユ
+ setTimeout(() => {
+ const inputRef = vnode.component.refs.palletCodeInput;
+ inputRef?.focus();
+ }, 100);
},
- ref: 'cancelPalletForm'
- }, [
- // 鎵樼洏鍙疯緭鍏ラ」
- h(ElFormItem, { label: '鎵樼洏鍙�', prop: 'palletCode', required: true }, [
- h(ElInput, {
- type: 'text',
- modelValue: formData.palletCode,
- 'onUpdate:modelValue': (val) => {
- formData.palletCode = val;
+ "onUpdate:modelValue": (isVisible) => {
+ if (!isVisible) {
+ render(null, mountNode);
+ document.body.removeChild(mountNode);
+ }
+ },
+ },
+ {
+ default: () =>
+ h(
+ ElForm,
+ {
+ model: formData,
+ rules: {
+ palletCode: [
+ {
+ required: true,
+ message: "璇疯緭鍏ユ墭鐩樺彿",
+ trigger: ["blur", "enter"],
+ },
+ {
+ min: 1,
+ max: 50,
+ message: "鎵樼洏鍙烽暱搴︿笉鑳借秴杩�50涓瓧绗�",
+ trigger: ["blur", "input"],
+ },
+ ],
+ },
+ ref: "cancelPalletForm",
},
- ref: 'palletCodeInput',
- placeholder: '鎵爜杈撳叆鎴栨墜鍔ㄨ緭鍏ユ墭鐩樺彿',
- maxLength: 50,
- // 鐩戝惉鍥炶溅浜嬩欢锛堟壂鐮佹灙榛樿浼氬彂閫佸洖杞︼級
- onKeydown: (e) => {
- if (e.key === 'Enter') {
- e.preventDefault();
- submitForm();
- }
- }
- })
- ]),
- h(ElFormItem, { label: '鏉＄爜', prop: 'barcode' }, [
- h(ElInput, {
- type: 'text',
- modelValue: formData.barcode,
- 'onUpdate:modelValue': (val) => {
- formData.barcode = val;
- },
- placeholder: '鍙�夛紝鎵爜杈撳叆鎴栨墜鍔ㄨ緭鍏ユ潯鐮�',
- maxLength: 50,
- onKeydown: (e) => {
- if (e.key === 'Enter') {
- e.preventDefault();
- submitForm();
- }
- }
- })
- ]),
- // 搴曢儴鎸夐挳鍖�
- h('div', { style: { textAlign: 'right', marginTop: '16px' } }, [
- h(ElButton, {
- type: 'text',
- onClick: () => {
- render(null, mountNode);
- document.body.removeChild(mountNode);
- ElMessage.info('鍙栨秷鎾ら攢缁勭洏');
- }
- }, '鍙栨秷'),
- h(ElButton, {
- type: 'primary',
- onClick: submitForm.bind(this) // 缁戝畾this涓婁笅鏂�
- }, '纭鎾ら攢')
- ])
- ])
- });
+ [
+ // 鎵樼洏鍙疯緭鍏ラ」
+ h(
+ ElFormItem,
+ { label: "鎵樼洏鏉＄爜", prop: "palletCode", required: true },
+ [
+ h(ElInput, {
+ type: "text",
+ modelValue: formData.palletCode,
+ "onUpdate:modelValue": (val) => {
+ formData.palletCode = val;
+ },
+ ref: "palletCodeInput",
+ placeholder: "鎵爜杈撳叆鎴栨墜鍔ㄨ緭鍏ユ墭鐩樺彿",
+ maxLength: 50,
+ // 鐩戝惉鍥炶溅浜嬩欢锛堟壂鐮佹灙榛樿浼氬彂閫佸洖杞︼級
+ onKeydown: (e) => {
+ if (e.key === "Enter") {
+ e.preventDefault();
+ submitForm();
+ }
+ },
+ }),
+ ]
+ ),
+ h(ElFormItem, { label: " 鍐呯鏍囩", prop: "barcode" }, [
+ h(ElInput, {
+ type: "text",
+ modelValue: formData.barcode,
+ "onUpdate:modelValue": (val) => {
+ formData.barcode = val;
+ },
+ placeholder: "鍙�夛紝鎵爜杈撳叆鎴栨墜鍔ㄨ緭鍏ユ潯鐮�",
+ maxLength: 50,
+ onKeydown: (e) => {
+ if (e.key === "Enter") {
+ e.preventDefault();
+ submitForm();
+ }
+ },
+ }),
+ ]),
+ // 搴曢儴鎸夐挳鍖�
+ h(
+ "div",
+ { style: { textAlign: "right", marginTop: "16px" } },
+ [
+ h(
+ ElButton,
+ {
+ type: "text",
+ onClick: () => {
+ render(null, mountNode);
+ document.body.removeChild(mountNode);
+ ElMessage.info("鍙栨秷鎾ら攢缁勭洏");
+ },
+ },
+ "鍙栨秷"
+ ),
+ h(
+ ElButton,
+ {
+ type: "primary",
+ onClick: submitForm.bind(this), // 缁戝畾this涓婁笅鏂�
+ },
+ "纭鎾ら攢"
+ ),
+ ]
+ ),
+ ]
+ ),
+ }
+ );
vnode.appContext = this.$.appContext;
render(vnode, mountNode);
- }
- },
- {
- name: '鍒嗘壒鍏ュ簱',
- type: 'primary',
- value: '鍒嗘壒鍏ュ簱',
- onClick: async function () {
- console.log('鍒嗘壒鍏ュ簱鎸夐挳琚偣鍑伙紝寮�濮嬫牎楠�');
- const selectedRows = this.$refs.table.getSelected();
-
- // 鏍￠獙1锛氭槸鍚﹂�変腑琛岋紙鑷冲皯閫夋嫨涓�鏉★級
- if (selectedRows.length === 0) {
- console.log('鏍￠獙涓嶉�氳繃锛氭湭閫変腑浠讳綍鍗曟嵁');
- ElMessage.warning('璇烽�夋嫨鑷冲皯涓�鏉″崟鎹�');
- return;
- }
-
- // 鏀堕泦鎵�鏈夐�変腑鍗曟嵁鐨勭紪鍙凤紙杩囨护鏃犲崟鎹彿鐨勫紓甯歌锛�
- const inboundOrderNos = selectedRows
- .filter(row => row.inboundOrderNo)
- .map(row => row.inboundOrderNo);
-
- // 鏍￠獙2锛氭槸鍚︽湁鏈夋晥鍗曟嵁鍙�
- if (inboundOrderNos.length === 0) {
- console.log('鏍￠獙涓嶉�氳繃锛氶�変腑鍗曟嵁鏃犳湁鏁堢紪鍙�');
- ElMessage.warning('閫変腑鐨勫崟鎹腑鏃犳湁鏁堢紪鍙凤紝璇烽噸鏂伴�夋嫨');
- return;
- }
-
- try {
- console.log('鍙戣捣鍒嗘壒鍏ュ簱璇锋眰锛屽弬鏁帮細', { inboundOrderNos });
- const response = await http.post('/api/InboundOrder/BatchOrderFeedbackToMes', {
- orderNos: inboundOrderNos,
- inout: 1
- });
-
- const { status, message, data } = response;
- if (status) {
- console.log('鍒嗘壒鍏ュ簱鎴愬姛锛屽悗绔繑鍥烇細', data);
- ElMessage.success(`鍒嗘壒鍏ュ簱鎴愬姛锛乣);
- this.refresh(); // 鍏ュ簱鎴愬姛鍚庡埛鏂板垪琛紙澶嶇敤鍘熸湁閫昏緫锛�
- } else {
- console.log('鍒嗘壒鍏ュ簱澶辫触锛屽悗绔彁绀猴細', message);
- ElMessage.error(message || data?.message || '鍒嗘壒鍏ュ簱澶辫触');
- }
- } catch (error) {
- console.error('鍒嗘壒鍏ュ簱璇锋眰寮傚父锛�', error);
- ElMessage.error('缃戠粶寮傚父鎴栨帴鍙ｉ敊璇紝璇风◢鍚庨噸璇�');
- }
- }
+ },
},
// {
- // name: '绌烘墭鐩樺叆搴�',
+ // name: '鍒嗘壒鍏ュ簱',
// type: 'primary',
- // value: '绌烘墭鐩樺叆搴�',
+ // value: '鍒嗘壒鍏ュ簱',
+ // onClick: async function () {
+ // console.log('鍒嗘壒鍏ュ簱鎸夐挳琚偣鍑伙紝寮�濮嬫牎楠�');
+ // const selectedRows = this.$refs.table.getSelected();
- // onClick: function () {
- // const mountNode = document.createElement('div');
- // document.body.appendChild(mountNode);
-
- // // 鍝嶅簲寮忚〃鍗曟暟鎹細鏂欑鐮侊紙蹇呭～锛屾壂鐮佹灙/鎵嬪姩杈撳叆锛�
- // const formData = reactive({
- // boxCode: '',
- // warehouseCode: ''
- // });
-
- // const warehouses = ref([]);
- // const isLoadingWarehouses = ref(false);
-
- // const getWarehouseList = async () => {
- // isLoadingWarehouses.value = true;
- // try {
- // const { data, status } = await http.post('/api/LocationInfo/GetLocationTypes');
- // if (status && Array.isArray(data)) {
- // // 鏍煎紡鍖栦粨搴撻�夐」锛氶�傞厤ElSelect鐨刲abel-value鏍煎紡
- // warehouses.value = data.map(item => ({
- // label: item.locationTypeDesc,
- // value: item.locationType
- // }));
- // } else {
- // ElMessage.error('鑾峰彇鍖哄煙鍒楄〃澶辫触');
- // warehouses.value = [];
- // }
- // } catch (err) {
- // ElMessage.error('鍖哄煙鏁版嵁璇锋眰寮傚父锛岃绋嶅悗閲嶈瘯');
- // warehouses.value = [];
- // } finally {
- // isLoadingWarehouses.value = false;
- // }
- // };
-
- // // 鎻愪氦琛ㄥ崟鐨勭粺涓�閫昏緫锛堜緵鍥炶溅瑙﹀彂鍜屾寜閽偣鍑诲叡鐢級
- // const submitForm = async () => {
- // const formRef = vnode.component.refs.batchInForm;
- // try {
- // // 鎵ц琛ㄥ崟鏍￠獙锛堟枡绠辩爜蹇呭～锛�
- // await formRef.validate();
- // } catch (err) {
- // ElMessage.warning('璇疯緭鍏ユ湁鏁堢殑鏂欑鐮�');
- // return;
- // }
-
-
- // http.post('/api/InboundOrder/EmptyMaterielGroup', {
- // palletCode: formData.boxCode.trim(),
- // warehouseCode: formData.warehouseCode
- // }).then(({ data, status, message }) => {
- // if (status) {
- // ElMessage.success(`鍏ュ簱鎴愬姛锛屾枡绠辩爜锛�${formData.boxCode.trim()}`);
- // this.refresh();
- // formData.boxCode = '';
-
- // setTimeout(() => {
- // const inputRef = vnode.component.refs.boxCodeInput;
- // inputRef?.focus();
- // }, 100);
- // } else {
- // ElMessage.error(message || data?.message || '鍏ュ簱澶辫触');
- // selectBoxCodeInput();
- // }
- // }).catch(() => {
- // ElMessage.error('璇锋眰澶辫触锛岃绋嶅悗閲嶈瘯');
- // selectBoxCodeInput();
- // });
- // };
-
- // const selectBoxCodeInput = () => {
- // setTimeout(() => {
- // const inputRef = vnode.component.refs.boxCodeInput;
- // if (inputRef) {
- // const targetInput = inputRef.$el?.querySelector('input') || inputRef;
- // targetInput?.focus();
- // targetInput?.select();
- // }
- // }, 100);
+ // // 鏍￠獙1锛氭槸鍚﹂�変腑琛岋紙鑷冲皯閫夋嫨涓�鏉★級
+ // if (selectedRows.length === 0) {
+ // console.log('鏍￠獙涓嶉�氳繃锛氭湭閫変腑浠讳綍鍗曟嵁');
+ // ElMessage.warning('璇烽�夋嫨鑷冲皯涓�鏉″崟鎹�');
+ // return;
// }
- // const vnode = createVNode(ElDialog, {
- // title: '绌烘墭鐩樺叆搴�',
- // width: '400px',
- // modelValue: true,
- // appendToBody: true,
- // onOpened: async () => {
- // await getWarehouseList();
- // const inputRef = vnode.component.refs.boxCodeInput;
- // inputRef?.focus();
- // },
- // 'onUpdate:modelValue': (isVisible) => {
- // if (!isVisible) {
- // render(null, mountNode);
- // document.body.removeChild(mountNode);
- // }
+ // // 鏀堕泦鎵�鏈夐�変腑鍗曟嵁鐨勭紪鍙凤紙杩囨护鏃犲崟鎹彿鐨勫紓甯歌锛�
+ // const inboundOrderNos = selectedRows
+ // .filter(row => row.inboundOrderNo)
+ // .map(row => row.inboundOrderNo);
+
+ // // 鏍￠獙2锛氭槸鍚︽湁鏈夋晥鍗曟嵁鍙�
+ // if (inboundOrderNos.length === 0) {
+ // console.log('鏍￠獙涓嶉�氳繃锛氶�変腑鍗曟嵁鏃犳湁鏁堢紪鍙�');
+ // ElMessage.warning('閫変腑鐨勫崟鎹腑鏃犳湁鏁堢紪鍙凤紝璇烽噸鏂伴�夋嫨');
+ // return;
+ // }
+
+ // try {
+ // console.log('鍙戣捣鍒嗘壒鍏ュ簱璇锋眰锛屽弬鏁帮細', { inboundOrderNos });
+ // const response = await http.post('/api/InboundOrder/BatchOrderFeedbackToMes', {
+ // orderNos: inboundOrderNos,
+ // inout: 1
+ // });
+
+ // const { status, message, data } = response;
+ // if (status) {
+ // console.log('鍒嗘壒鍏ュ簱鎴愬姛锛屽悗绔繑鍥烇細', data);
+ // ElMessage.success(`鍒嗘壒鍏ュ簱鎴愬姛锛乣);
+ // this.refresh(); // 鍏ュ簱鎴愬姛鍚庡埛鏂板垪琛紙澶嶇敤鍘熸湁閫昏緫锛�
+ // } else {
+ // console.log('鍒嗘壒鍏ュ簱澶辫触锛屽悗绔彁绀猴細', message);
+ // ElMessage.error(message || data?.message || '鍒嗘壒鍏ュ簱澶辫触');
// }
- // }, {
- // default: () => h(ElForm, {
- // model: formData,
- // rules: {
- // boxCode: [
- // { required: true, message: '璇疯緭鍏ユ枡绠辩爜', trigger: ['blur', 'enter'] }
- // ],
- // warehouseCode: [
- // { required: true, message: '璇烽�夋嫨鍖哄煙', trigger: ['change', 'blur'] }
- // ]
- // },
- // ref: 'batchInForm'
- // }, [
- // //浠撳簱鏁版嵁
- // h(ElFormItem, { label: '鍖哄煙', prop: 'warehouseCode', required: true }, [
- // h(ElSelect, {
- // modelValue: formData.warehouseCode,
- // 'onUpdate:modelValue': (val) => {
- // formData.warehouseCode = val;
- // },
- // placeholder: '璇烽�夋嫨鍏ュ簱鍖哄煙',
- // filterable: true, // 鏀寔鎼滅储浠撳簱
- // loading: isLoadingWarehouses.value, // 鍔犺浇鐘舵��
- // style: { width: '100%' }
- // }, [
- // // 娓叉煋浠撳簱涓嬫媺閫夐」
- // warehouses.value.map(item => h(ElOption, {
- // label: item.label,
- // value: item.value
- // }))
- // ])
- // ]),
- // // 鏂欑鐮佽緭鍏ラ」锛堟敮鎸佽仛鐒︺�佸洖杞︽彁浜わ級
- // h(ElFormItem, { label: '鏂欑鐮�', prop: 'boxCode', required: true }, [
- // h(ElInput, {
- // type: 'text',
- // modelValue: formData.boxCode,
- // 'onUpdate:modelValue': (val) => {
- // formData.boxCode = val;
- // },
- // ref: 'boxCodeInput',
- // placeholder: '鎵爜杈撳叆鎴栨墜鍔ㄨ緭鍏ユ枡绠辩爜',
- // // 鐩戝惉鍥炶溅浜嬩欢锛堟壂鐮佹灙榛樿浼氬彂閫佸洖杞︼級
- // onKeydown: (e) => {
- // if (e.key === 'Enter') {
- // e.preventDefault();
- // submitForm();
- // }
- // }
- // })
- // ]),
- // // 搴曢儴鎸夐挳鍖�
- // h('div', { style: { textAlign: 'right', marginTop: '16px' } }, [
- // h(ElButton, {
- // type: 'text',
- // onClick: () => {
- // render(null, mountNode);
- // document.body.removeChild(mountNode);
- // ElMessage.info('鍙栨秷鍏ュ簱浠诲姟');
- // }
- // }, '鍙栨秷'),
- // h(ElButton, {
- // type: 'primary',
- // onClick: submitForm
- // }, '纭畾')
- // ])
- // ])
- // });
-
- // vnode.appContext = this.$.appContext;
- // render(vnode, mountNode);
+ // } catch (error) {
+ // console.error('鍒嗘壒鍏ュ簱璇锋眰寮傚父锛�', error);
+ // ElMessage.error('缃戠粶寮傚父鎴栨帴鍙ｉ敊璇紝璇风◢鍚庨噸璇�');
+ // }
// }
- // }
- ], box: [], detail: []
+ // },
+ ],
+ box: [],
+ detail: [],
},
methods: {
//涓嬮潰杩欎簺鏂规硶鍙互淇濈暀涔熷彲浠ュ垹闄�
onInit() {
- var EmptyTrayInboundBtn = this.buttons.find(x => x.value == "EmptyTrayInbound");
- if (EmptyTrayInboundBtn != null) {
- EmptyTrayInboundBtn.onClick = () => {
- this.$refs.gridHeader.open();
- }
- }
+ var EmptyTrayInboundBtn = this.buttons.find(
+ (x) => x.value == "EmptyTrayInbound"
+ );
+ if (EmptyTrayInboundBtn != null) {
+ EmptyTrayInboundBtn.onClick = () => {
+ this.$refs.gridHeader.open();
+ };
+ }
+ var BatchInOrderFeedbackToMesBtn = this.buttons.find(
+ (x) => x.value == "BatchInOrderFeedbackToMes"
+ );
+ if (BatchInOrderFeedbackToMesBtn != null) {
+ BatchInOrderFeedbackToMesBtn.onClick = () => {
+ var rows = this.$refs.table.getSelected();
+ // 鏍￠獙鏄惁鏈夐�変腑鏁版嵁
+ if (!rows || rows.length === 0) {
+ return this.$Message.error("璇峰厛閫夋嫨闇�瑕佸鐞嗙殑鍗曟嵁");
+ }
+ if (rows.length > 1) {
+ return this.$Message.error("璇烽�夋嫨涓�鏉℃暟鎹�");
+ }
+ this.http.post(`api/Inbound/BatchInOrderFeedbackToMes?id=${rows[0].id}`,{},"鏁版嵁澶勭悊涓�...")
+ .then((x) => {
+ if (x.status) {
+ this.$Message.success(x.message);
+ this.refresh();
+ } else {
+ return this.$Message.error(x.message);
+ }
+ })
+ .catch((error) => {
+ // 澧炲姞寮傚父鎹曡幏锛屽鐞嗙綉缁滈敊璇瓑鎯呭喌
+ //_this.$Message.error('璇锋眰澶辫触锛�' + (error.message || '鏈煡閿欒'));
+ });
+ };
+ }
+ // let BatchInOrderFeedbackToMesBtn = this.buttons.find((x) => x.value == "BatchInOrderFeedbackToMes");
+ // if (BatchInOrderFeedbackToMesBtn != null) {
+ // BatchInOrderFeedbackToMesBtn.onClick = ()=> {
+ // let selectedRows = this.$refs.table.getSelected();
- this.columns.forEach(column => {
- if (column.field === 'orderStatistics') {
+ // // 鏍￠獙鏄惁鏈夐�変腑鏁版嵁
+ // if (!selectedRows || selectedRows.length === 0) {
+ // return this.$Message.warning("璇峰厛閫夋嫨闇�瑕佸鐞嗙殑鍗曟嵁");
+ // }
+ // if (selectedRows.length > 1) {
+ // return this.$Message.warning("璇烽�夋嫨涓�鏉℃暟鎹�");
+ // }
+ // this.http.post(`api/Inbound/BatchInOrderFeedbackToMes?orderNo=${selectedRows[0].orderNo}`,{},"鏁版嵁澶勭悊涓�...")
+ // .then((x) => {
+ // if (x.status) {
+ // this.$Message.success("鍒嗘壒鍑哄簱鍥炶皟瀹屾垚");
+ // this.refresh();
+ // } else {
+ // return this.$Message.error("鍒嗘壒鍑哄簱鍥炶皟澶辫触");
+ // }
+ // })
+ // .catch((error) => {
+ // // 澧炲姞寮傚父鎹曡幏锛屽鐞嗙綉缁滈敊璇瓑鎯呭喌
+ // //_this.$Message.error('璇锋眰澶辫触锛�' + (error.message || '鏈煡閿欒'));
+ // });
+ // };
+ // }
+
+ var GroupPalletBtn = this.buttons.find((x) => x.value == "GroupPallet");
+ if (GroupPalletBtn != null) {
+ GroupPalletBtn.onClick = () => {
+ // console.log(this.$refs)
+ this.$refs.gridBody.open();
+ };
+ }
+
+ this.columns.forEach((column) => {
+ if (column.field === "orderStatistics") {
column.formatter = (row) => {
// 鏍￠獙details鏄惁瀛樺湪涓旀湁鏁版嵁
if (row.details && row.details.length > 0) {
//鎸塵aterielCode鍒嗙粍缁熻orderQuantity鎬诲拰
const materielSumMap = row.details.reduce((acc, item) => {
- const materielCode = item.materielCode || '鏈煡鐗╂枡';
+ const materielCode = item.materielCode || "鏈煡鐗╂枡";
const quantity = Number(item.orderQuantity) || 0;
acc[materielCode] = (acc[materielCode] || 0) + quantity;
return acc;
}, {});
//姣忎釜鐗╂枡椤圭敓鎴愮嫭绔媎iv锛岃法琛屾樉绀�
- const displayItems = Object.entries(materielSumMap).map(([code, total]) => {
- return `<div style="line-height: 1.5; white-space: normal;">${code}锛�${total}涓�</div>`;
- });
- const displayContent = displayItems.join('');
+ const displayItems = Object.entries(materielSumMap).map(
+ ([code, total]) => {
+ return `<div style="line-height: 1.5; white-space: normal;">${code}锛�${total}涓�</div>`;
+ }
+ );
+ const displayContent = displayItems.join("");
return `<div style="color: #F56C6C; white-space: normal; word-break: break-all;">${displayContent}</div>`;
} else {
return '<span style="color: #F56C6C">鏃犲叆搴撴槑缁�</span>';
@@ -460,7 +373,6 @@
});
},
onInited() {
-
//妗嗘灦鍒濆鍖栭厤缃悗
//濡傛灉瑕侀厤缃槑缁嗚〃,鍦ㄦ鏂规硶鎿嶄綔
//this.detailOptions.columns.forEach(column=>{ });
@@ -469,12 +381,13 @@
//鐣岄潰鏌ヨ鍓�,鍙互缁檖aram.wheres娣诲姞鏌ヨ鍙傛暟
//杩斿洖false锛屽垯涓嶄細鎵ц鏌ヨ
// this.searchFormFields.orderType=[0]
- let wheres = [{
- 'name': 'orderType',
- 'value': '0',
- 'displayType': 'text'
- }];
-
+ let wheres = [
+ {
+ name: "orderType",
+ value: "0",
+ displayType: "text",
+ },
+ ];
param.wheres.push(...wheres);
return true;
@@ -501,7 +414,7 @@
//(3)this.editFormFields.瀛楁='xxx';
//濡傛灉闇�瑕佺粰涓嬫媺妗嗚缃粯璁ゅ�硷紝璇烽亶鍘唗his.editFormOptions鎵惧埌瀛楁閰嶇疆瀵瑰簲data灞炴�х殑key鍊�
//鐪嬩笉鎳傚氨鎶婅緭鍑虹湅锛歝onsole.log(this.editFormOptions)
- }
- }
+ },
+ },
};
-export default extension;
\ No newline at end of file
+export default extension;
--
Gitblit v1.9.3