From 8b73e9cbdf4035ef1aa1026c979222a7e4ca5e01 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期四, 19 十月 2023 23:07:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/wel/Statistic.vue | 18 +++++++++---------
Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue | 15 +++++++++++++--
Source/UBCS-WEB/src/components/code-dialog-page/maxSerialnumDialog.vue | 8 +++++++-
Source/UBCS-WEB/src/api/code/maxSerialNum.js | 15 +++++++++++++--
4 files changed, 42 insertions(+), 14 deletions(-)
diff --git a/Source/UBCS-WEB/src/api/code/maxSerialNum.js b/Source/UBCS-WEB/src/api/code/maxSerialNum.js
index 7e9ed4e..747105e 100644
--- a/Source/UBCS-WEB/src/api/code/maxSerialNum.js
+++ b/Source/UBCS-WEB/src/api/code/maxSerialNum.js
@@ -11,8 +11,19 @@
//淇濆瓨鏈�澶ф祦姘村彿
export const saveMaxSerialNum = (data) => {
return request({
- url: '/api/ubcs-code/ubcs-code/codeBasicSecController/setMaxSerialNumberForCodeRule',
+ url: '/api/ubcs-code/codeBasicSecController/setMaxSerialNumberForCodeRule',
method: 'post',
data: data
})
- }
\ No newline at end of file
+ }
+
+export const getMaxSerialNumber = (codeRuleOid,secDTOList) => {
+ return request({
+ url: '/api/ubcs-code/codeBasicSecController/getMaxSerialNumberForCodeRule',
+ method: 'get',
+ params:{
+ codeRuleOid,
+ secDTOList
+ }
+ })
+}
diff --git a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
index 9ca0d57..c7ea7bc 100644
--- a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
+++ b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
@@ -35,7 +35,7 @@
<el-option label="瀹℃牳涓�" value="Auditing"></el-option>
</el-select></span>
</div>
- <el-table ref="dataTable" v-loading="isLoading" :data="tableData"
+ <el-table class="custom-scrollbar" ref="dataTable" v-loading="isLoading" :data="tableData"
:height="tableHeight" border
@select="handleSelection" @cell-click="handleCellClick" @row-click="handleRowClick"
@select-all="handleSelectionAll" @selection-change="handleSelectionChange"
@@ -966,5 +966,16 @@
.bottom {
margin-top: 10px;
}
-
+//.custom-scrollbar::-webkit-scrollbar {
+// width: 10px !important;;/* 璁剧疆婊氬姩鏉＄殑瀹藉害 */
+//}
+//
+//.custom-scrollbar::-webkit-scrollbar-thumb {
+// background-color: #a11313 !important;; /* 璁剧疆婊氬姩鏉＄殑棰滆壊 */
+// border-radius: 5px !important;; /* 璁剧疆婊氬姩鏉＄殑杈规寮у害 */
+//}
+//
+//.custom-scrollbar::-webkit-scrollbar-track {
+// background-color: #f1f1f1 !important;; /* 璁剧疆婊氬姩鏉＄殑杞ㄩ亾棰滆壊 */
+//}
</style>
diff --git a/Source/UBCS-WEB/src/components/code-dialog-page/maxSerialnumDialog.vue b/Source/UBCS-WEB/src/components/code-dialog-page/maxSerialnumDialog.vue
index 183b735..5b39ad3 100644
--- a/Source/UBCS-WEB/src/components/code-dialog-page/maxSerialnumDialog.vue
+++ b/Source/UBCS-WEB/src/components/code-dialog-page/maxSerialnumDialog.vue
@@ -20,7 +20,7 @@
</template>
<script>
import FormTemplate from "@/components/FormTemplate/FormTemplate";
-import { getCodePrice, saveMaxSerialNum } from "@/api/code/maxSerialNum.js"
+import { getCodePrice, saveMaxSerialNum, getMaxSerialNumber } from "@/api/code/maxSerialNum.js"
export default {
name: 'maxSerialnumDialog',
components: {
@@ -189,6 +189,12 @@
this.confirmLoadding = false
}
})
+ // let object={}
+ // object['secDTOList'] = arrCode;
+ // object['codeRuleOid'] = this.ruleOid;
+ // getMaxSerialNumber(object.codeRuleOid,object.secDTOList).then(res=>{
+ // console.log(res)
+ // })
},
// 鍙傜収缁勪欢鏁版嵁鍙樻洿
diff --git a/Source/UBCS-WEB/src/views/wel/Statistic.vue b/Source/UBCS-WEB/src/views/wel/Statistic.vue
index e3c52bc..741d0bd 100644
--- a/Source/UBCS-WEB/src/views/wel/Statistic.vue
+++ b/Source/UBCS-WEB/src/views/wel/Statistic.vue
@@ -8,10 +8,10 @@
<el-dialog :visible.sync="dialogTableVisible" append-to-body class="avue-dialog avue-dialog--top" title="涓绘暟鎹厤缃�"
top='-40px'>
<el-table
+ ref="TableBox"
:data="Crud.data"
border
style="width: 100%"
- ref="TableBox"
@selection-change="selectionChange"
@row-click="TableRoute">
<el-table-column
@@ -136,7 +136,7 @@
this.$message.success('淇濆瓨鎴愬姛锛�')
//娓呴櫎宸叉湁鏁扮粍涓璸ush鏁版嵁
this.newData = [];
- this.option.data=[]
+ this.option.data = []
this.MasterGetList()
this.dialogTableVisible = false;
//瀛椾綋鍜岃竟妗嗛噸鏂板姞杞�
@@ -147,16 +147,16 @@
},
MoreHandler() {
this.dialogTableVisible = true;
- let checkedrow=[]
- this.newData.forEach(item=>{
- this.option.data.forEach(v=>{
- if(item.code === v.code){
+ let checkedrow = []
+ this.newData.forEach(item => {
+ this.option.data.forEach(v => {
+ if (item.code === v.code) {
checkedrow.push(item)
}
})
})
- console.log(checkedrow)
- this.$nextTick(()=>{
+ // console.log(checkedrow)
+ this.$nextTick(() => {
checkedrow.forEach(row => {
this.$refs.TableBox.toggleRowSelection(row, true) // 鍥炴樉
})
@@ -179,7 +179,7 @@
this.Crud.data = this.newData;
if (item.isDefault === 1) {
const colors = ['rgb(49, 180, 141)', 'rgb(56, 161, 242)', 'rgb(117, 56, 199)', 'rgb(242, 104, 31)',
- 'rgb(19, 150, 111)','rgb(26, 131, 212)', 'rgb(87, 26, 169)', 'rgb(212, 83, 1)'];
+ 'rgb(19, 150, 111)', 'rgb(26, 131, 212)', 'rgb(87, 26, 169)', 'rgb(212, 83, 1)'];
const color = colors[index % colors.length];
this.option.data.push({
click: (item) => {
--
Gitblit v1.9.3