From 7f1c44f87f436efa73e061f458c1bb825acfb5f3 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期四, 23 十月 2025 10:23:25 +0800
Subject: [PATCH] #
---
/dev/null | 180 ------------------------------
src/main/webapp/views/erpMaterialuse/materialuse.html | 162 +++++++++++++++++++++-----
src/main/webapp/static/js/erp/LodopFuncs.js | 0
src/main/webapp/static/js/erp/zh-cn.js | 0
src/main/webapp/views/erpReceiving/erpReceiving.html | 6
5 files changed, 134 insertions(+), 214 deletions(-)
diff --git a/src/main/webapp/views/erp/LodopFuncs.js b/src/main/webapp/static/js/erp/LodopFuncs.js
similarity index 100%
rename from src/main/webapp/views/erp/LodopFuncs.js
rename to src/main/webapp/static/js/erp/LodopFuncs.js
diff --git a/src/main/webapp/views/erp/zh-cn.js b/src/main/webapp/static/js/erp/zh-cn.js
similarity index 100%
rename from src/main/webapp/views/erp/zh-cn.js
rename to src/main/webapp/static/js/erp/zh-cn.js
diff --git a/src/main/webapp/views/erp/materialuse/index.html b/src/main/webapp/views/erpMaterialuse/materialuse.html
similarity index 74%
rename from src/main/webapp/views/erp/materialuse/index.html
rename to src/main/webapp/views/erpMaterialuse/materialuse.html
index 637242c..087b7d0 100644
--- a/src/main/webapp/views/erp/materialuse/index.html
+++ b/src/main/webapp/views/erpMaterialuse/materialuse.html
@@ -7,7 +7,7 @@
<meta name="renderer" content="webkit">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
- <link rel="stylesheet" href="../../../static/evn/index.css">
+ <link rel="stylesheet" href="../../static/evn/index.css">
</head>
<body>
@@ -27,7 +27,7 @@
<el-input v-model="tableSearchParam.soCode" placeholder="璇疯緭鍏ョ敓浜у崟鍙�"></el-input>
</el-form-item>
<el-form-item label="杞﹂棿">
- <el-select v-model="tableSearchParam.depId" placeholder="閫夋嫨杞﹂棿" style="width: 240px" >
+ <el-select v-model="tableSearchParam.depId" placeholder="閫夋嫨杞﹂棿" style="width: 150px" >
<el-option
v-for="item in options"
:key="item.value"
@@ -37,7 +37,7 @@
</el-select>
</el-form-item>
<el-form-item label="鏄惁鎵撳嵃">
- <el-select v-model="tableSearchParam.izPrint" placeholder="" style="width: 240px" >
+ <el-select v-model="tableSearchParam.izPrint" placeholder="鏄惁鎵撳嵃" style="width: 150px" >
<el-option
v-for="item in printOptions"
:key="item.value"
@@ -54,22 +54,22 @@
</el-form>
<el-form :inline="true">
<el-form-item label="">
- <el-button type="primary" @click="fnPrintView('鍚�',0)">鎵撳嵃棰勮</el-button>
+ <el-button type="primary" @click="fnPrintView('鍚�')">鎵撳嵃棰勮</el-button>
</el-form-item>
<el-form-item label="">
- <el-button type="primary">鎵撳嵃</el-button>
+ <el-button type="primary" @click="fnPrint('鏄�')">鎵撳嵃</el-button>
</el-form-item>
<el-form-item label="">
- <el-button type="primary">鎾ら攢鐢熸垚</el-button>
+ <el-button type="primary" @click="fnCanelPrint()">鎾ら攢鐢熸垚</el-button>
</el-form-item>
<el-form-item label="">
- <el-button type="primary">鎵撳嵃棰勮(绾㈠瓧)</el-button>
+ <el-button type="primary" @click="fnPrintRedView('鍚�')">鎵撳嵃棰勮(绾㈠瓧)</el-button>
</el-form-item>
<el-form-item label="">
- <el-button type="primary">鎵撳嵃(绾㈠瓧)</el-button>
+ <el-button type="primary" @click="fnPrintRed('鏄�')">鎵撳嵃(绾㈠瓧)</el-button>
</el-form-item>
<el-form-item label="">
- <el-button type="primary">鎾ら攢鐢熸垚(绾㈠瓧)</el-button>
+ <el-button type="primary" @click="fnCanelPrintRed()">鎾ら攢鐢熸垚(绾㈠瓧)</el-button>
</el-form-item>
</el-form>
<el-table :data="tableData" border style="width: 100%" row-key="finterid" @selection-change="handleSelectionChange" max-height="650">
@@ -83,9 +83,9 @@
</el-table-column>
<el-table-column prop="invCode" label="鐗╂枡缂栫爜">
</el-table-column>
- <el-table-column prop="invName" label="鐗╂枡鍚嶇О" width="300" show-overflow-tooltip="true">
+ <el-table-column prop="invName" label="鐗╂枡鍚嶇О" width="300" :show-overflow-tooltip="true">
</el-table-column>
- <el-table-column prop="invStd" label="瑙勬牸" width="200" show-overflow-tooltip="true">
+ <el-table-column prop="invStd" label="瑙勬牸" width="200" :show-overflow-tooltip="true">
</el-table-column>
<el-table-column prop="depName" label="杞﹂棿">
</el-table-column>
@@ -111,15 +111,15 @@
</el-card>
</div>
- <script type="text/javascript" src="../../../static/js/jquery/jquery-3.3.1.min.js"></script>
- <script type="text/javascript" src="../../../static/js/common.js" charset="utf-8"></script>
- <script src="../../../static/evn/vue.global.js"></script>
- <script src="../../../static/evn/element-plus.js"></script>
- <script src="../../../static/evn/icons-vue.js"></script>
- <script src='../LodopFuncs.js'></script>
+ <script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
+ <script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
+ <script src="../../static/evn/vue.global.js"></script>
+ <script src="../../static/evn/element-plus.js"></script>
+ <script src="../../static/evn/icons-vue.js"></script>
+ <script src='../../static/js/erp/LodopFuncs.js'></script>
<script type="module">
// 瀵煎叆涓枃璇█鍖�
- import zhCn from '../zh-cn.js';
+ import zhCn from '../../static/js/erp/zh-cn.js';
const { createApp, ref, onMounted, onBeforeMount ,watchEffect} = Vue;
@@ -149,7 +149,7 @@
depName.value = item.label
}
})
- console.log(depName.value)
+
})
const printOptions = [
@@ -199,20 +199,30 @@
});
}
- function getDepOptions(){
+ function fnCanelPrint(){
+ const loading = ElementPlus.ElLoading.service({
+ lock: true,
+ text: 'Loading',
+ background: 'rgba(0, 0, 0, 0.7)',
+ })
$.ajax({
- url: "http://127.0.0.1:9090/basicinfo/departmentl/getlistfordropdown",
+ url:"http://127.0.0.1:9090/mo/materialuse/canelprint",
+ headers: {
+ 'token': localStorage.getItem('token')
+ },
+ data: JSON.stringify(selectList.value),
+ dataType: 'json',
contentType: 'application/json;charset=UTF-8',
- method: 'GET',
+ method: 'POST',
success: function(res) {
+ loading.close();
if (res.code == 200) {
- res.data.map(item => {
- console.log(item)
- options.value.push({
- value: item.depId, label: item.depName
- })
- console.log(options.value)
- })
+ ElementPlus.ElMessage({
+ message: "鎾ら攢鎴愬姛",
+ type: 'success'
+ });
+ } else if (res.code === 403) {
+ top.location.href = baseUrl + "/";
} else {
ElementPlus.ElMessage({
message: res.msg,
@@ -223,7 +233,92 @@
});
}
- function fnPrintView(izPrint,izRed){
+ function fnCanelPrintRed(){
+ const loading = ElementPlus.ElLoading.service({
+ lock: true,
+ text: 'Loading',
+ background: 'rgba(0, 0, 0, 0.7)',
+ })
+ $.ajax({
+ url:"http://127.0.0.1:9090/mo/materialuse/canelprint1",
+ headers: {
+ 'token': localStorage.getItem('token')
+ },
+ data: JSON.stringify(selectList.value),
+ dataType: 'json',
+ contentType: 'application/json;charset=UTF-8',
+ method: 'POST',
+ success: function(res) {
+ loading.close();
+ if (res.code == 200) {
+ ElementPlus.ElMessage({
+ message: "鎾ら攢鎴愬姛",
+ type: 'success'
+ });
+ } else if (res.code === 403) {
+ top.location.href = baseUrl + "/";
+ } else {
+ ElementPlus.ElMessage({
+ message: res.msg,
+ type: 'error'
+ });
+ }
+ }
+ });
+ }
+
+ function getDepOptions(){
+ $.ajax({
+ url: "http://127.0.0.1:9090/basicinfo/departmentl/getlistfordropdown",
+ contentType: 'application/json;charset=UTF-8',
+ method: 'GET',
+ success: function(res) {
+ if (res.code == 200) {
+ res.data.map(item => {
+ options.value.push({
+ value: item.depId, label: item.depName
+ })
+ })
+ } else {
+ ElementPlus.ElMessage({
+ message: res.msg,
+ type: 'error'
+ });
+ }
+ }
+ });
+ }
+ function fnPrint(izPrint) {
+ ElementPlus.ElMessageBox.confirm('纭畾鎵撳嵃鍚�?')
+ .then(() => {
+ print(izPrint,0)
+ })
+ .catch(() => {
+ // catch error
+ })
+
+ }
+
+ function fnPrintView(izPrint){
+ print(izPrint,0)
+ }
+
+ function fnPrintRedView(izPrint) {
+ print(izPrint,1);
+ }
+
+ function fnPrintRed(izPrint) {
+ ElementPlus.ElMessageBox.confirm('纭畾绾㈠瓧鎵撳嵃鍚�?')
+ .then(() => {
+ print(izPrint,1);
+ })
+ .catch(() => {
+ // catch error
+ })
+
+ }
+
+ function print(izPrint,izRed){
const LODOP = getLodop()
const loading = ElementPlus.ElLoading.service({
lock: true,
@@ -347,7 +442,7 @@
page()
}
function handleSelectionChange(val) {
- console.log(val)
+
selectList.value = val
}
@@ -371,7 +466,12 @@
options,
printOptions,
page,
+ fnPrint,
fnPrintView,
+ fnCanelPrint,
+ fnCanelPrintRed,
+ fnPrintRed,
+ fnPrintRedView,
handleSizeChange,
handleCurrentChange,
handleSelectionChange
diff --git a/src/main/webapp/views/erpReceiving/erpReceiving.html b/src/main/webapp/views/erpReceiving/erpReceiving.html
index 80f51a8..7426e16 100644
--- a/src/main/webapp/views/erpReceiving/erpReceiving.html
+++ b/src/main/webapp/views/erpReceiving/erpReceiving.html
@@ -67,9 +67,9 @@
</el-table-column>
<el-table-column prop="invCode" label="鐗╂枡缂栫爜">
</el-table-column>
- <el-table-column prop="invName" label="鐗╂枡鍚嶇О" width="300" show-overflow-tooltip="true">
+ <el-table-column prop="invName" label="鐗╂枡鍚嶇О" width="300" :show-overflow-tooltip="true">
</el-table-column>
- <el-table-column prop="invStd" label="瑙勬牸" width="200" show-overflow-tooltip="true">
+ <el-table-column prop="invStd" label="瑙勬牸" width="200" :show-overflow-tooltip="true">
</el-table-column>
<el-table-column prop="depName" label="杞﹂棿">
</el-table-column>
@@ -102,7 +102,7 @@
<script src="../../static/evn/icons-vue.js"></script>
<script type="module">
// 瀵煎叆涓枃璇█鍖�
- import zhCn from './zh-cn.js';
+ import zhCn from '../../static/js/erp/zh-cn.js';
const { createApp, ref, onMounted } = Vue;
diff --git a/src/main/webapp/views/erpReceiving/zh-cn.js b/src/main/webapp/views/erpReceiving/zh-cn.js
deleted file mode 100644
index 6b15954..0000000
--- a/src/main/webapp/views/erpReceiving/zh-cn.js
+++ /dev/null
@@ -1,180 +0,0 @@
-export default {
- name: 'zh-cn',
- el: {
- breadcrumb: {
- label: '闈㈠寘灞�',
- },
- colorpicker: {
- confirm: '纭畾',
- clear: '娓呯┖',
- defaultLabel: '棰滆壊閫夋嫨鍣�',
- description: '褰撳墠棰滆壊 {color}锛屾寜 Enter 閿�夋嫨鏂伴鑹�',
- alphaLabel: '閫夋嫨閫忔槑搴︾殑鍊�',
- },
- datepicker: {
- now: '姝ゅ埢',
- today: '浠婂ぉ',
- cancel: '鍙栨秷',
- clear: '娓呯┖',
- confirm: '纭畾',
- dateTablePrompt: '浣跨敤鏂瑰悜閿笌 Enter 閿彲閫夋嫨鏃ユ湡',
- monthTablePrompt: '浣跨敤鏂瑰悜閿笌 Enter 閿彲閫夋嫨鏈堜唤',
- yearTablePrompt: '浣跨敤鏂瑰悜閿笌 Enter 閿彲閫夋嫨骞翠唤',
- selectedDate: '宸查�夋棩鏈�',
- selectDate: '閫夋嫨鏃ユ湡',
- selectTime: '閫夋嫨鏃堕棿',
- startDate: '寮�濮嬫棩鏈�',
- startTime: '寮�濮嬫椂闂�',
- endDate: '缁撴潫鏃ユ湡',
- endTime: '缁撴潫鏃堕棿',
- prevYear: '鍓嶄竴骞�',
- nextYear: '鍚庝竴骞�',
- prevMonth: '涓婁釜鏈�',
- nextMonth: '涓嬩釜鏈�',
- year: '骞�',
- month1: '1 鏈�',
- month2: '2 鏈�',
- month3: '3 鏈�',
- month4: '4 鏈�',
- month5: '5 鏈�',
- month6: '6 鏈�',
- month7: '7 鏈�',
- month8: '8 鏈�',
- month9: '9 鏈�',
- month10: '10 鏈�',
- month11: '11 鏈�',
- month12: '12 鏈�',
- // week: '鍛ㄦ',
- weeks: {
- sun: '鏃�',
- mon: '涓�',
- tue: '浜�',
- wed: '涓�',
- thu: '鍥�',
- fri: '浜�',
- sat: '鍏�',
- },
- weeksFull: {
- sun: '鏄熸湡鏃�',
- mon: '鏄熸湡涓�',
- tue: '鏄熸湡浜�',
- wed: '鏄熸湡涓�',
- thu: '鏄熸湡鍥�',
- fri: '鏄熸湡浜�',
- sat: '鏄熸湡鍏�',
- },
- months: {
- jan: '涓�鏈�',
- feb: '浜屾湀',
- mar: '涓夋湀',
- apr: '鍥涙湀',
- may: '浜旀湀',
- jun: '鍏湀',
- jul: '涓冩湀',
- aug: '鍏湀',
- sep: '涔濇湀',
- oct: '鍗佹湀',
- nov: '鍗佷竴鏈�',
- dec: '鍗佷簩鏈�',
- },
- },
- inputNumber: {
- decrease: '鍑忓皯鏁板��',
- increase: '澧炲姞鏁板��',
- },
- select: {
- loading: '鍔犺浇涓�',
- noMatch: '鏃犲尮閰嶆暟鎹�',
- noData: '鏃犳暟鎹�',
- placeholder: '璇烽�夋嫨',
- },
- dropdown: {
- toggleDropdown: '鍒囨崲涓嬫媺閫夐」',
- },
- mention: {
- loading: '鍔犺浇涓�',
- },
- cascader: {
- noMatch: '鏃犲尮閰嶆暟鎹�',
- loading: '鍔犺浇涓�',
- placeholder: '璇烽�夋嫨',
- noData: '鏆傛棤鏁版嵁',
- },
- pagination: {
- goto: '鍓嶅線',
- pagesize: '鏉�/椤�',
- total: '鍏� {total} 鏉�',
- pageClassifier: '椤�',
- page: '椤�',
- prev: '涓婁竴椤�',
- next: '涓嬩竴椤�',
- currentPage: '绗� {pager} 椤�',
- prevPages: '鍚戝墠 {pager} 椤�',
- nextPages: '鍚戝悗 {pager} 椤�',
- deprecationWarning:
- '浣犱娇鐢ㄤ簡涓�浜涘凡琚簾寮冪殑鐢ㄦ硶锛岃鍙傝�� el-pagination 鐨勫畼鏂规枃妗�',
- },
- dialog: {
- close: '鍏抽棴姝ゅ璇濇',
- },
- drawer: {
- close: '鍏抽棴姝ゅ璇濇',
- },
- messagebox: {
- title: '鎻愮ず',
- confirm: '纭畾',
- cancel: '鍙栨秷',
- error: '杈撳叆鐨勬暟鎹笉鍚堟硶!',
- close: '鍏抽棴姝ゅ璇濇',
- },
- upload: {
- deleteTip: '鎸� Delete 閿彲鍒犻櫎',
- delete: '鍒犻櫎',
- preview: '鏌ョ湅鍥剧墖',
- continue: '缁х画涓婁紶',
- },
- slider: {
- defaultLabel: '婊戝潡浠嬩簬 {min} 鑷� {max}',
- defaultRangeStartLabel: '閫夋嫨璧峰鍊�',
- defaultRangeEndLabel: '閫夋嫨缁撴潫鍊�',
- },
- table: {
- emptyText: '鏆傛棤鏁版嵁',
- confirmFilter: '绛涢��',
- resetFilter: '閲嶇疆',
- clearFilter: '鍏ㄩ儴',
- sumText: '鍚堣',
- },
- tour: {
- next: '涓嬩竴姝�',
- previous: '涓婁竴姝�',
- finish: '缁撴潫瀵艰',
- },
- tree: {
- emptyText: '鏆傛棤鏁版嵁',
- },
- transfer: {
- noMatch: '鏃犲尮閰嶆暟鎹�',
- noData: '鏃犳暟鎹�',
- titles: ['鍒楄〃 1', '鍒楄〃 2'],
- filterPlaceholder: '璇疯緭鍏ユ悳绱㈠唴瀹�',
- noCheckedFormat: '鍏� {total} 椤�',
- hasCheckedFormat: '宸查�� {checked}/{total} 椤�',
- },
- image: {
- error: '鍔犺浇澶辫触',
- },
- pageHeader: {
- title: '杩斿洖',
- },
- popconfirm: {
- confirmButtonText: '纭畾',
- cancelButtonText: '鍙栨秷',
- },
- carousel: {
- leftArrow: '涓婁竴寮犲够鐏墖',
- rightArrow: '涓嬩竴寮犲够鐏墖',
- indicator: '骞荤伅鐗囧垏鎹㈣嚦绱㈠紩 {index}',
- },
- },
-}
\ No newline at end of file
--
Gitblit v1.9.1