diff --git a/package-lock.json b/package-lock.json index 3185096..8e9f81b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3546,8 +3546,9 @@ }, "node_modules/print-js": { "version": "1.6.0", - "resolved": "https://registry.npmjs.org/print-js/-/print-js-1.6.0.tgz", - "integrity": "sha512-BfnOIzSKbqGRtO4o0rnj/K3681BSd2QUrsIZy/+WdCIugjIswjmx3lDEZpXB2ruGf9d4b3YNINri81+J0FsBWg==" + "resolved": "https://registry.npmmirror.com/print-js/-/print-js-1.6.0.tgz", + "integrity": "sha512-BfnOIzSKbqGRtO4o0rnj/K3681BSd2QUrsIZy/+WdCIugjIswjmx3lDEZpXB2ruGf9d4b3YNINri81+J0FsBWg==", + "license": "MIT" }, "node_modules/prismjs": { "version": "1.29.0", @@ -6784,7 +6785,7 @@ }, "print-js": { "version": "1.6.0", - "resolved": "https://registry.npmjs.org/print-js/-/print-js-1.6.0.tgz", + "resolved": "https://registry.npmmirror.com/print-js/-/print-js-1.6.0.tgz", "integrity": "sha512-BfnOIzSKbqGRtO4o0rnj/K3681BSd2QUrsIZy/+WdCIugjIswjmx3lDEZpXB2ruGf9d4b3YNINri81+J0FsBWg==" }, "prismjs": { diff --git a/src/views/materialReceiptNotice/ceshi.vue b/src/views/materialReceiptNotice/ceshi.vue index fb772de..bd069e6 100644 --- a/src/views/materialReceiptNotice/ceshi.vue +++ b/src/views/materialReceiptNotice/ceshi.vue @@ -1,187 +1,131 @@ diff --git a/src/views/materialReceiptNotice/index.vue b/src/views/materialReceiptNotice/index.vue index 3c8383a..06318ae 100644 --- a/src/views/materialReceiptNotice/index.vue +++ b/src/views/materialReceiptNotice/index.vue @@ -126,7 +126,7 @@ const state = reactive({ selectedData: [], chengNuoJiaoQiP: '', newChengNuoJiaoQiP: '', - selectedDataShow: false, + selectedDataShow: true, loading: false, }); const selectionChange = (list: any) => { diff --git a/src/views/materialReceiptNotice/selectedData.vue b/src/views/materialReceiptNotice/selectedData.vue index b654450..50683d7 100644 --- a/src/views/materialReceiptNotice/selectedData.vue +++ b/src/views/materialReceiptNotice/selectedData.vue @@ -1,32 +1,56 @@ \ No newline at end of file + diff --git a/src/views/mssPurchaseOrder/index.vue b/src/views/mssPurchaseOrder/index.vue index ef9df1f..d2e29bd 100644 --- a/src/views/mssPurchaseOrder/index.vue +++ b/src/views/mssPurchaseOrder/index.vue @@ -1,6 +1,57 @@ + - - - @@ -129,10 +137,10 @@ const state = reactive({ pageSize: 30, }, option: { - height: '720', + height: '730', tip: false, - index: false, - menu: false, + index: true, + menu: true, menuWidth: 120, border: true, delBtn: false, @@ -140,6 +148,7 @@ const state = reactive({ align: 'center', // searchLabelWidth:100, selection: true, + reserveSelection: true, searchMenuSpan: 3, addBtn: false, column: [ @@ -291,17 +300,35 @@ const getList = () => { }) .then((res: any) => { state.loading = false; + if (res.resultCode === 0) { state.data = res.data.dataList; + state.page.total = res.data.total; + setTimeout(() => { + console.log(document.querySelector('.avue-crud__body').scrollHeight) + },1000) } }); }; // 页面加载时 -onMounted(() => {}); +onMounted(() => { + +});