From f27c71d7dfaedce4d9791830c704066a50bdcb51 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期三, 23 八月 2023 16:04:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/code/code.vue | 26 +
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/MdmIOService.java | 2
Source/UBCS-WEB/src/components/FormTemplate/index.vue | 7
Source/UBCS/ubcs-service-api/ubcs-applyjtcodeservice-api/src/main/java/com/vci/ubcs/code/applyjtcodeservice/feign/IMdmInterJtClient.java | 4
Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/Scheduling/DockingApplyGroupCodeSyncScheduling.java | 4
Source/UBCS/ubcs-service/ubcs-code/pom.xml | 7
Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue | 1
Source/UBCS-WEB/src/components/code-dialog-page/maxSerialnumDialog.vue | 306 +++++++++++++++++++++
Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue | 429 ++----------------------------
Source/UBCS-WEB/src/main.js | 2
Source/UBCS-WEB/vue.config.js | 4
Source/UBCS-WEB/src/api/code/maxSerialNum.js | 18 +
12 files changed, 403 insertions(+), 407 deletions(-)
diff --git a/Source/UBCS-WEB/src/api/code/maxSerialNum.js b/Source/UBCS-WEB/src/api/code/maxSerialNum.js
new file mode 100644
index 0000000..7e9ed4e
--- /dev/null
+++ b/Source/UBCS-WEB/src/api/code/maxSerialNum.js
@@ -0,0 +1,18 @@
+import request from '@/router/axios';
+
+// 鐮佹
+export const getCodePrice = (data) => {
+ return request({
+ url: '/api/ubcs-code/ubcs-code/codeBasicSecController/getCodeRuleAndBasicSecByRuleOid',
+ method: 'get',
+ params: data
+ })
+}
+//淇濆瓨鏈�澶ф祦姘村彿
+export const saveMaxSerialNum = (data) => {
+ return request({
+ url: '/api/ubcs-code/ubcs-code/codeBasicSecController/setMaxSerialNumberForCodeRule',
+ method: 'post',
+ data: data
+ })
+ }
\ No newline at end of file
diff --git a/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue b/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
index e7fe577..b53cf1a 100644
--- a/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
+++ b/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
@@ -50,7 +50,7 @@
// 榛樿绂佺敤鍏冪礌
disabledProp: {
type: Array,
- default: () => ["id","lcstatus"],
+ default: () => ["id", "lcstatus"],
},
templateOid: {
type: String,
@@ -80,6 +80,11 @@
type: Object,
default: () => ({}),
},
+ // 涓�琛屾斁鍑犱釜琛ㄥ崟
+ trendsSpan: {
+ type: Number,
+ default: 8,
+ },
},
data() {
return {
@@ -103,395 +108,6 @@
date: "date",
refer: "refer",
},
- // 鍋囨暟鎹�
- testItems: [
- {
- comboxKey: null,
- customClass: null,
- data: null,
- dateFormate: "",
- defaultValue: "",
- displayExtension: null,
- extendAttrMap: null,
- extendAttrString: null,
- field: "id",
- hidden: false,
- keyAttr: false,
- prefix: "",
- readOnly: false,
- referConfig: null,
- required: false,
- selectLibFlag: "",
- showField: null,
- suffix: "",
- text: "浼犲�肩鐢ㄥ姛鑳�",
- tooltips: "",
- type: "combox",
- unique: false,
- verify: "",
- },
- {
- customClass: null,
- data: null,
- dateFormate: "",
- defaultValue: "",
- displayExtension: null,
- extendAttrMap: null,
- extendAttrString: null,
- field: "state",
- hidden: false,
- keyAttr: false,
- prefix: "",
- readOnly: true,
- referConfig: null,
- required: false,
- selectLibFlag: "",
- showField: null,
- suffix: "",
- text: "鎺ュ彛绂佺敤鍔熻兘",
- tooltips: "",
- type: "combox",
- unique: false,
- verify: "",
- },
- {
- comboxKey: null,
- customClass: null,
- data: null,
- dateFormate: "",
- defaultValue: "",
- displayExtension: null,
- extendAttrMap: null,
- extendAttrString: null,
- field: "oldcode",
- hidden: false,
- keyAttr: false,
- prefix: "el-icon-search",
- readOnly: false,
- referConfig: null,
- required: false,
- selectLibFlag: "",
- showField: null,
- suffix: "鏂囨湰鍚庣紑娴嬭瘯",
- text: "鍓嶅悗缂�鍔熻兘",
- tooltips: "",
- type: "text",
- unique: false,
- verify: "",
- },
- {
- comboxKey: null,
- customClass: null,
- data: null,
- dateFormate: "",
- defaultValue: "",
- displayExtension: null,
- extendAttrMap: null,
- extendAttrString: null,
- field: "materialname",
- hidden: false,
- keyAttr: false,
- prefix: "",
- readOnly: false,
- referConfig: null,
- required: true,
- selectLibFlag: "",
- showField: null,
- suffix: "",
- text: "姝ｅ垯鏍￠獙鍔熻兘",
- tooltips: "璇疯緭鍏ユ暟瀛�",
- type: "text",
- unique: false,
- verify: /^[0-9]+$/g,
- },
- {
- comboxKey: null,
- customClass: null,
- data: [
- {
- attributes: {},
- key: "model_type",
- value: "妯″瀷",
- },
- {
- attributes: {},
- key: "part_type",
- value: "闆朵欢",
- },
- ],
- dateFormate: "",
- defaultValue: "",
- displayExtension: null,
- extendAttrMap: null,
- extendAttrString: null,
- field: "dataSelect",
- hidden: false,
- keyAttr: false,
- prefix: "",
- readOnly: false,
- referConfig: null,
- required: false,
- selectLibFlag: "",
- showField: null,
- suffix: "",
- text: "鐩存帴杩斿洖涓嬫媺",
- tooltips: "",
- type: "combox",
- unique: false,
- verify: "",
- },
- {
- comboxKey: "formTemplateTest",
- customClass: null,
- data: [],
- dateFormate: "",
- defaultValue: "",
- displayExtension: null,
- extendAttrMap: null,
- extendAttrString: null,
- field: "dictSelect",
- hidden: false,
- keyAttr: false,
- prefix: "",
- readOnly: false,
- referConfig: null,
- required: false,
- selectLibFlag: "",
- showField: null,
- suffix: "",
- text: "瀛楀吀杩斿洖涓嬫媺",
- tooltips: "",
- type: "combox",
- unique: false,
- verify: "",
- },
- {
- comboxKey: null,
- customClass: null,
- data: null,
- dateFormate: "",
- defaultValue: "",
- displayExtension: null,
- extendAttrMap: null,
- extendAttrString: null,
- field: "firstfl",
- hidden: false,
- keyAttr: false,
- prefix: "",
- readOnly: false,
- referConfig: null,
- required: false,
- selectLibFlag: "",
- showField: null,
- suffix: "",
- text: "鏁板瓧杈撳叆妗�",
- tooltips: "",
- type: "number",
- unique: false,
- verify: "",
- },
- {
- comboxKey: null,
- customClass: null,
- data: null,
- dateFormate: "yyyy-MM-dd HH:mm:ss",
- defaultValue: "",
- displayExtension: null,
- extendAttrMap: null,
- extendAttrString: null,
- field: "datetime",
- hidden: false,
- keyAttr: false,
- prefix: "",
- readOnly: false,
- referConfig: null,
- required: false,
- selectLibFlag: "",
- showField: null,
- suffix: "",
- text: "鏃ユ湡鏃堕棿閫夋嫨鍣�",
- tooltips: "",
- type: "datetime",
- unique: false,
- verify: "",
- },
- {
- comboxKey: null,
- customClass: null,
- data: null,
- dateFormate: "",
- defaultValue: "",
- displayExtension: null,
- extendAttrMap: null,
- extendAttrString: null,
- field: "time",
- hidden: false,
- keyAttr: false,
- prefix: "",
- readOnly: false,
- referConfig: null,
- required: false,
- selectLibFlag: "",
- showField: null,
- suffix: "",
- text: "鏃堕棿閫夋嫨鍣�",
- tooltips: "",
- type: "date",
- unique: false,
- verify: "",
- },
- {
- comboxKey: null,
- customClass: null,
- data: null,
- dateFormate: "",
- defaultValue: "false",
- displayExtension: null,
- extendAttrMap: null,
- extendAttrString: null,
- field: "xiaoshouwl",
- hidden: false,
- keyAttr: false,
- prefix: "",
- readOnly: false,
- referConfig: null,
- required: false,
- selectLibFlag: "",
- showField: null,
- suffix: "",
- text: "寮�鍏�",
- tooltips: "",
- type: "truefalse",
- unique: false,
- verify: "",
- },
- {
- comboxKey: null,
- customClass: null,
- data: null,
- dateFormate: "",
- defaultValue: "鎴戞槸榛樿鍊�",
- displayExtension: null,
- extendAttrMap: null,
- extendAttrString: null,
- field: "tuhao",
- hidden: false,
- keyAttr: false,
- prefix: "",
- readOnly: false,
- referConfig: null,
- required: false,
- selectLibFlag: "",
- showField: null,
- suffix: "",
- text: "榛樿鍊煎姛鑳�",
- tooltips: "鎻愮ず",
- type: "text",
- unique: false,
- verify: "",
- },
- {
- comboxKey: null,
- customClass: null,
- data: null,
- dateFormate: "",
- defaultValue: "",
- displayExtension: null,
- extendAttrMap: null,
- extendAttrString: null,
- field: "xinghaoguige",
- hidden: false,
- keyAttr: true,
- prefix: "",
- readOnly: false,
- referConfig: null,
- required: false,
- selectLibFlag: "",
- showField: null,
- suffix: "",
- text: "灞炴�у叧閿��",
- tooltips: "",
- type: "text",
- unique: false,
- verify: "",
- },
- {
- comboxKey: null,
- customClass: null,
- data: null,
- dateFormate: "",
- defaultValue: "",
- displayExtension: null,
- extendAttrMap: null,
- extendAttrString: null,
- field: "jiliangdw",
- hidden: false,
- keyAttr: false,
- prefix: "",
- readOnly: false,
- tip: "鎴戞槸鎻愮ず鍔熻兘",
- required: false,
- selectLibFlag: "",
- showField: "jiliangdwname",
- suffix: "",
- text: "鎻愮ず鍔熻兘",
- tooltips: "",
- type: "text",
- unique: false,
- verify: "",
- },
- {
- comboxKey: null,
- customClass: null,
- data: null,
- dateFormate: "",
- defaultValue: "",
- displayExtension: null,
- extendAttrMap: null,
- extendAttrString: null,
- field: "textarea",
- hidden: false,
- keyAttr: false,
- prefix: "",
- readOnly: false,
- referConfig: null,
- required: false,
- selectLibFlag: "",
- showField: null,
- suffix: "",
- text: "鏂囨湰鍩�",
- tooltips: "",
- type: "textarea",
- unique: false,
- verify: "",
- },
- {
- comboxKey: null,
- customClass: null,
- data: null,
- dateFormate: "",
- defaultValue: "",
- displayExtension: null,
- extendAttrMap: null,
- extendAttrString: null,
- field: "cz",
- hidden: false,
- keyAttr: false,
- prefix: "",
- readOnly: true,
- referConfig: {},
- required: false,
- selectLibFlag: "",
- showField: "depId",
- suffix: "",
- text: "鍙傜収",
- tooltips: "",
- type: "refer",
- unique: false,
- verify: "",
- },
- ],
- trendsSpan: 8,
defaultValue: {},
// 琛ㄥ崟灞炴��
attributes: [],
@@ -501,9 +117,20 @@
mounted() {
this.handleResize();
},
+ computed: {
+ localTrendsSpan() {
+ if (this.trendsSpan) {
+ return this.trendsSpan;
+ } else {
+ let windowWidth = document.body.clientWidth;
+ return 24 / Math.floor(windowWidth / 500);
+ }
+ },
+ },
methods: {
// 娓叉煋琛ㄥ崟妯℃澘
templateRender(formItemList) {
+ console.log(formItemList, "formItemList");
// 鏃犻渶鍒嗙粍鏁版嵁
let column = [];
let group = [];
@@ -523,7 +150,8 @@
if (
formItem.type === "combox" &&
formItem.comboxKey &&
- (!Array.isArray(formItem.dicData) || formItem.dicData.length === 0) &&(!Array.isArray(formItem.data) || formItem.data.length === 0)
+ (!Array.isArray(formItem.dicData) || formItem.dicData.length === 0) &&
+ (!Array.isArray(formItem.data) || formItem.data.length === 0)
) {
dictKeys.push({ dictKey: formItem.comboxKey, field: formItem.field });
}
@@ -531,9 +159,9 @@
if (this.disabledProp.includes(formItem.field)) {
formItem.readOnly = true;
}
- if(formItem.field=='lcstatus'){
- formItem.field=formItem.field+'_text';
- formItem.readOnly=true;
+ if (formItem.field == "lcstatus") {
+ formItem.field = formItem.field + "_text";
+ formItem.readOnly = true;
}
// 璁剧疆琛ㄥ崟鏍￠獙鐨勮鍒欙紝鏂囨湰
let message = "璇烽�夋嫨";
@@ -576,7 +204,11 @@
options: formItem.referConfig,
}
: {},
- span: formItem.span ? formItem.span : formItem.type === "textarea" ? 24 : this.trendsSpan,
+ span: formItem.span
+ ? formItem.span
+ : formItem.type === "textarea"
+ ? 24
+ : this.localTrendsSpan,
rules: [
{
required: formItem.required,
@@ -603,6 +235,7 @@
}
});
this.slotColumnList = slotColumnList;
+ console.log(column, "column");
this.$set(this.option, "column", column);
this.$set(this.option, "group", group);
this.updateIndex++;
@@ -646,9 +279,9 @@
},
// 鏍规嵁灞忓箷鍔ㄦ�侀厤缃〃鍗曞竷灞�
handleResize() {
- let windowWidth = document.body.clientWidth;
- this.trendsSpan = 24 / Math.floor(windowWidth / 500);
- this.updateIndex++;
+ // let windowWidth = document.body.clientWidth;
+ // this.trendsSpan = 24 / Math.floor(windowWidth / 500);
+ // this.updateIndex++;
},
// 鍓嶅悗缂�
preOrSufFixShow(type, val) {
diff --git a/Source/UBCS-WEB/src/components/FormTemplate/index.vue b/Source/UBCS-WEB/src/components/FormTemplate/index.vue
index e41a812..d2585c3 100644
--- a/Source/UBCS-WEB/src/components/FormTemplate/index.vue
+++ b/Source/UBCS-WEB/src/components/FormTemplate/index.vue
@@ -137,7 +137,10 @@
codefixedsec: "combox",
codeclassifysec: "refer",
codevariablesec: "text",
+ codeattrsec: "text",
+ codelevelsec: "text",
coderefersec: "refer",
+ codedatesec: "date"
},
selfColumnConfig: {
function: {
@@ -156,6 +159,7 @@
label: "name",
maxlength: "codeSecLength",
data: "fixedValueVOList",
+ dateFormate: "codeDateFormatStr"
},
directVoluation: {
search: true,
@@ -265,6 +269,9 @@
"codeclassifysec",
"codevariablesec",
"coderefersec",
+ "codeattrsec",
+ "codelevelsec",
+ "codedatesec"
];
this.secVOList = (res.data.data.secVOList || []).filter((item) =>
typeList.includes(item.secType)
diff --git a/Source/UBCS-WEB/src/components/code-dialog-page/maxSerialnumDialog.vue b/Source/UBCS-WEB/src/components/code-dialog-page/maxSerialnumDialog.vue
new file mode 100644
index 0000000..6db53ba
--- /dev/null
+++ b/Source/UBCS-WEB/src/components/code-dialog-page/maxSerialnumDialog.vue
@@ -0,0 +1,306 @@
+<template>
+ <el-dialog title="鏈�澶ф祦姘村彿" width="30%" append-to-body="true" :visible.sync="dialogVisible">
+ <el-form :label-position="right" ref="ruleForm" label-width="80px" :model="formModel" :rules="rules">
+ <el-form-item label="娴佹按鍙�" prop="maxSecNum">
+ <el-input v-model="formModel.maxSecNum"></el-input>
+ </el-form-item>
+ </el-form>
+ <el-tabs v-model="activeName" type="border-card" @tab-click="handleClick">
+ <el-tab-pane label="鏈�澶ф祦姘村彿" name="codeApply">
+ <form-template v-bind="$attrs" type="add" :selfColumnType="selfColumnType" :trendsSpan="24"
+ :selfColumnConfig="selfColumnConfig" ref="CodeApply" @getFormData="getCodeApplyFormData"
+ @referConfigDataUpdate="referConfigDataUpdate"></form-template>
+ </el-tab-pane>
+ </el-tabs>
+ <div slot="footer" class="dialog-footer">
+ <el-button @click="cancel">鍙� 娑�</el-button>
+ <el-button type="primary" :loading="confirmLoadding" @click="comfirm">纭� 瀹�</el-button>
+ </div>
+ </el-dialog>
+</template>
+<script>
+import FormTemplate from "@/components/FormTemplate/FormTemplate";
+import { getCodePrice, saveMaxSerialNum } from "@/api/code/maxSerialNum.js"
+export default {
+ name: 'maxSerialnumDialog',
+ components: {
+ FormTemplate
+ },
+ props: {
+ // 鏄惁鎵撳紑
+ visible: {
+ typeof: Boolean,
+ default: false
+ },
+ // ruleOid
+ ruleOid: {
+ typeof: String,
+ default: ""
+ }
+ },
+ watch: {
+ visible(n) {
+ this.dialogVisible = n;
+ },
+ dialogVisible(n) {
+ this.$emit('update:visible', n)
+ if (n) this.apiGetCode()
+ },
+ selfColumnConfig: {
+ handler(newval) {
+ // console.log('selfColumnConfig', newval)
+ },
+ immediate: true,
+ deep: true
+ }
+ },
+ data() {
+ return {
+ dialogVisible: this.visible,
+ activeName: 'codePrice',
+ confirmLoadding: false,
+ codeApplyForm: {},
+ secVOList: [],
+ formModel: {
+ maxSecNum: '',
+ codeRuleOid: '',
+ secDTOList: []
+ },
+ rules: {
+ maxSecNum: [
+ { required: true, message: '璇疯緭鍏ユ祦姘村彿', trigger: 'blur' }
+ ],
+ },
+ selfColumnType: {
+ codefixedsec: "combox",
+ codeclassifysec: "refer",
+ codevariablesec: "text",
+ codeattrsec: "text",
+ codelevelsec: "text",
+ coderefersec: "refer",
+ codedatesec: "date",
+ },
+ selfColumnConfig: {
+ function: {
+ required: this.isRequired,
+ dicData: this.getOptionList,
+ type: this.getType,
+ referConfig: this.getReferConfig,
+ readOnly: this.getDisabled,
+ },
+ exchange: {
+ text: "name",
+ field: "oid",
+ prop: "oid",
+ showField: "name",
+ parentClassifySecOid: "parentClassifySecOid",
+ label: "name",
+ maxlength: "codeSecLength",
+ data: "fixedValueVOList",
+ dateFormate: "codeDateFormatStr"
+ },
+ directVoluation: {
+ search: true,
+ props: {
+ label: "id",
+ value: "id",
+ },
+ },
+ },
+ }
+ },
+ methods: {
+ // 鑾峰彇鐮佹
+ async apiGetCode() {
+ this.activeName = "codeApply";
+ const response = await getCodePrice({ ruleOid: this.ruleOid })
+ const res = response.data
+ if (res.success && res.code === 200) {
+ const typeList = [
+ "codefixedsec",
+ "codeclassifysec",
+ "codevariablesec",
+ "coderefersec",
+ "codeattrsec",
+ "codelevelsec",
+ "codedatesec"
+ ];
+ this.secVOList = (res.data.secVOList || []).filter((item) =>
+ typeList.includes(item.secType)
+ );
+ if (this.secVOList.length > 0) {
+ // this.showCodeApply = true;
+
+ this.$nextTick(() => {
+ this.$refs.CodeApply.templateRender(this.secVOList);
+ });
+ } else {
+ // this.showCodeApply = false;
+ }
+ }
+ },
+ handleClick(tab, event) {
+ // console.log(event)
+ },
+ getCodeApplyFormData(codeApplyForm) {
+ this.codeApplyForm = codeApplyForm;
+ },
+ // 鍙栨秷
+ cancel() {
+ this.dialogVisible = false
+ this.formModel['secDTOList'] = []
+ this.formModel['codeRuleOid'] = ''
+ this.formModel['maxSecNum'] = ''
+ this.$refs.ruleForm.clearValidate('maxSecNum')
+
+ },
+ // 纭
+ async comfirm() {
+ console.log(this.codeApplyForm)
+ const objcodekey = Object.keys(this.codeApplyForm)
+ console.log(objcodekey)
+ const filteredObj = objcodekey.reduce((acc, key) => {
+ const pattern = /[\u4e00-\u9fa5]/; // 鍖归厤涓枃瀛楃鐨勬鍒欒〃杈惧紡
+ if (!pattern.test(key)) {
+ acc[key] = this.codeApplyForm[key];
+ }
+ return acc;
+ }, {});
+
+ const arrCode = Object.entries(filteredObj).map(([key, value]) => {
+ return {
+ secOid: key,
+ secValue: value
+ }
+ })
+ this.formModel['secDTOList'] = arrCode
+ this.formModel['codeRuleOid'] = this.ruleOid
+ console.log(this.formModel)
+ this.confirmLoadding = true
+ const rule = await this.$refs.CodeApply.validate()
+ this.$refs.ruleForm.validate(res => {
+ if (rule && res) {
+ console.log(rule)
+ saveMaxSerialNum(this.formModel).then(res => {
+ if (res.data.success) {
+ this.$message.success('鎿嶄綔鎴愬姛锛�');
+ this.confirmLoadding = false
+ this.cancel()
+ }
+ })
+ } else {
+ this.confirmLoadding = false
+ }
+ })
+
+ },
+ // 鍙傜収缁勪欢鏁版嵁鍙樻洿
+ referConfigDataUpdate(data) {
+ // console.log(data)
+ const { field } = data;
+ this.secVOList = this.secVOList.map((item) => {
+ if (item.parentClassifySecOid === field) {
+ this.$refs.CodeApply.form[item.oid] = undefined;
+ this.$refs.CodeApply.form[item.name] = undefined;
+ }
+ return item;
+ });
+ this.$refs.CodeApply.templateRender(this.secVOList);
+ },
+ isRequired(item) {
+ return item.nullableFlag != "true";
+ },
+ getType(item) {
+ return this.selfColumnType[item.secType];
+ },
+ getDisabled(item) {
+ if (item.secType === "codeclassifysec") {
+ if (item.parentClassifySecOid) {
+ if (!this.codeApplyForm[item.parentClassifySecOid]) {
+ return true;
+ } else {
+ return false;
+ }
+ }
+ }
+ },
+ getReferConfig(item) {
+ // console.log(item)
+ let params = {};
+ if (item.secType == "codeclassifysec") {
+ params = {
+ isMuti: false,
+ type: "grid",
+ tableConfig: {
+ limit: -1,
+ cols: [
+ {
+ field: "id",
+ title: "鑻辨枃鍚嶇О",
+ sort: true,
+ width: 150,
+ },
+ {
+ field: "name",
+ title: "涓枃鍚嶇О",
+ sort: true,
+ width: 150,
+ },
+ {
+ field: "description",
+ title: "鎻忚堪",
+ width: 250,
+ },
+ ],
+ queryColumns: [
+ {
+ field: "id",
+ title: "鑻辨枃鍚嶇О",
+ },
+ {
+ field: "name",
+ title: "涓枃鍚嶇О",
+ },
+ ],
+ },
+ url: "api/ubcs-code/ubcs-code/mdmEngineController/listCodeClassifyValueBySecOid",
+ extraParams: {
+ classifySecOid: item.oid,
+ parentClassifyValueOid: item.parentClassifySecOid
+ ? this.codeApplyForm[item.parentClassifySecOid]
+ : "",
+ },
+ };
+ } else if (item.secType == "coderefersec") {
+ params = JSON.parse(item.referValueInfo);
+ }
+ // console.log(params)
+ return params;
+
+ },
+ getOptionList(item) {
+ if (
+ Array.isArray(item.fixedValueVOList) &&
+ item.fixedValueVOList.length > 0
+ ) {
+ const configAttr = {
+ key: "id",
+ value: "id",
+ };
+ const optionList = item.fixedValueVOList.map((item) => {
+ for (const key in configAttr) {
+ if (Object.hasOwnProperty.call(configAttr, key)) {
+ const element = configAttr[key];
+ item[key] = item[element];
+ }
+ }
+ return item;
+ });
+ return optionList;
+ } else {
+ return [];
+ }
+ },
+ }
+}
+</script>
\ No newline at end of file
diff --git a/Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue b/Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue
index 4639d3f..ab1ee06 100644
--- a/Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue
+++ b/Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue
@@ -176,7 +176,6 @@
hidden: (!this.controllerSecret)
}];
} else {
- debugger;
this.option.column = this.options.tableConfig.cols.map(item => {
if (item.field != 'LAY_TABLE_INDEX' && item.field != 'LAY_CHECKED') {
return {
diff --git a/Source/UBCS-WEB/src/main.js b/Source/UBCS-WEB/src/main.js
index a4c5b4c..c409b2d 100644
--- a/Source/UBCS-WEB/src/main.js
+++ b/Source/UBCS-WEB/src/main.js
@@ -53,6 +53,7 @@
import businesswork from "@/components/work/BusinessWork"
import MasterTransfer from "@/components/Master/MasterTransfer";
import ThemeImport from "@/components/Theme/ThemeImport";
+import maxSerialnumDialog from '@/components/code-dialog-page/maxSerialnumDialog'
// 灏嗗伐鍏峰嚱鏁版坊鍔犲埌鍏ㄥ眬
import utilFunc from './util/func'
Vue.prototype.$utilFunc = utilFunc
@@ -106,6 +107,7 @@
Vue.component('businesswork', businesswork)
Vue.component('MasterTransfer', MasterTransfer)
Vue.component('ThemeImport', ThemeImport)
+Vue.component('maxSerialnumDialog', maxSerialnumDialog)
// 鍔犺浇鐩稿叧url鍦板潃
Object.keys(urls).forEach(key => {
diff --git a/Source/UBCS-WEB/src/views/code/code.vue b/Source/UBCS-WEB/src/views/code/code.vue
index 08666d7..4b4fadd 100644
--- a/Source/UBCS-WEB/src/views/code/code.vue
+++ b/Source/UBCS-WEB/src/views/code/code.vue
@@ -106,6 +106,13 @@
@click="escapeOwner">
杞Щ鎵�鏈夎��
</el-button>
+ <el-button
+ size="small"
+ icon="el-icon-guide"
+ plain
+ @click="maxSerialNum">
+ 鏈�澶ф祦姘村彿
+ </el-button>
</template>
</avue-crud>
</basic-container>
@@ -248,6 +255,9 @@
<el-button type="primary" @click="escapeOwnerConfirm">纭� 瀹�</el-button>
</span>
</el-dialog>
+
+ <!-- 鏈�澶ф祦姘村彿瀵硅瘽妗� -->
+ <max-serialnum-dialog :visible.sync="maxSerial.visible" :ruleOid="maxSerial.ruleOid"></max-serialnum-dialog>
<!-- 鍩虹鐮佹灞曠ず鍖哄煙 -->
<basic-container class="code-basicsec-container">
@@ -875,6 +885,12 @@
ruleOwner: '', // 褰撳墠瑕佽浆绉荤粰鍝釜瑙勫垯绠＄悊鍛樼殑ID
releadDisabled: false, // 閬垮厤瑙勫垯鍙戝竷閲嶅鎻愪氦
+ /*鏈�澶ф祦姘村彿*/
+ maxSerial:{
+ visible:false,
+
+ },
+
/*浣跨敤鑼冨洿瀵硅瘽妗嗘樉绀烘帶鍒�*/
codeRangeSettingBox: false,
useRangeData: [],
@@ -2787,6 +2803,16 @@
let enumList = this.getLocalStorageEnum("codeGetValueType");
this.enumParam.codeGetValueType = enumList.length>0 ? enumList:[];
},
+ // 鏈�澶ф祦姘村彿
+ maxSerialNum(){
+ console.log(this.selectionList)
+ if (this.selectionList.length === 0) {
+ this.$message.warning("璇烽�夋嫨涓�鏉＄紪鐮佽鍒欙紒");
+ return;
+ }
+ this.maxSerial.visible = true
+ this.maxSerial.ruleOid = this.selectionList[0]['oid']
+ }
}
};
diff --git a/Source/UBCS-WEB/vue.config.js b/Source/UBCS-WEB/vue.config.js
index b400aa7..e8138f2 100644
--- a/Source/UBCS-WEB/vue.config.js
+++ b/Source/UBCS-WEB/vue.config.js
@@ -28,8 +28,8 @@
//鏈湴鏈嶅姟鎺ュ彛鍦板潃
// target: 'http://127.0.0.1',
// target: 'http://192.168.1.51:37000',
- target: 'http://dev.vci-tech.com:37000',
- // target: 'http://192.168.1.104:37000',
+ // target: 'http://dev.vci-tech.com:37000',
+ target: 'http://192.168.1.16:37000',
// target: 'http://192.168.0.105:37000',
// target: 'http://192.168.0.103:37000',
// target: 'http://192.168.1.63:37000',
diff --git a/Source/UBCS/ubcs-service-api/ubcs-applyjtcodeservice-api/src/main/java/com/vci/ubcs/code/applyjtcodeservice/feign/IMdmInterJtClient.java b/Source/UBCS/ubcs-service-api/ubcs-applyjtcodeservice-api/src/main/java/com/vci/ubcs/code/applyjtcodeservice/feign/IMdmInterJtClient.java
index 7882b0c..9cedde4 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-applyjtcodeservice-api/src/main/java/com/vci/ubcs/code/applyjtcodeservice/feign/IMdmInterJtClient.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-applyjtcodeservice-api/src/main/java/com/vci/ubcs/code/applyjtcodeservice/feign/IMdmInterJtClient.java
@@ -32,7 +32,7 @@
* @return 杩斿洖瀛樺偍鏄惁鎴愬姛淇℃伅
*/
@GetMapping(APPLYGROUPCODE)
- public R applyGroupCode(String oids,String btmName);
+ public R applyGroupCode(@RequestParam("oids")String oids,@RequestParam("btmName")String btmName);
/***
@@ -42,7 +42,7 @@
* @return 杩斿洖瀛樺偍鏄惁鎴愬姛淇℃伅
*/
@PostMapping(RECEIVE_EDITAPPLY)
- public R receiveEditApply(String oids,String btmName);
+ public R receiveEditApply(@RequestParam("oids")String oids,@RequestParam("btmName")String btmName);
/***
* 灏嗛泦鍥㈢敵璇锋垚鍔熺殑缂栫爜瀛樺叆鐩稿叧鏁版嵁涔嬩腑
diff --git a/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/Scheduling/DockingApplyGroupCodeSyncScheduling.java b/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/Scheduling/DockingApplyGroupCodeSyncScheduling.java
index 4b5b57b..b89743d 100644
--- a/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/Scheduling/DockingApplyGroupCodeSyncScheduling.java
+++ b/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/Scheduling/DockingApplyGroupCodeSyncScheduling.java
@@ -20,8 +20,8 @@
@Slf4j
public class DockingApplyGroupCodeSyncScheduling {
- @Resource
- private IGroupCodeDuckingSyncService groupCodeDuckingSyncService;
+// @Resource
+ //private IGroupCodeDuckingSyncService groupCodeDuckingSyncService;
@Value("${apply.groupCode.isStart:false}")
public boolean APPLY_GRUPCODE_SYNC_ISSTARE;
diff --git a/Source/UBCS/ubcs-service/ubcs-code/pom.xml b/Source/UBCS/ubcs-service/ubcs-code/pom.xml
index 319b461..ab5623a 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/pom.xml
+++ b/Source/UBCS/ubcs-service/ubcs-code/pom.xml
@@ -154,7 +154,12 @@
<artifactId>ubcs-file-api</artifactId>
<version>3.0.1.RELEASE</version>
</dependency>
-
+ <dependency>
+ <groupId>com.vci.ubcs</groupId>
+ <artifactId>ubcs-applyjtcodeservice-api</artifactId>
+ <version>3.0.1.RELEASE</version>
+ <scope>compile</scope>
+ </dependency>
</dependencies>
<build>
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/MdmIOService.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/MdmIOService.java
index 82dab4b..897b2e7 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/MdmIOService.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/MdmIOService.java
@@ -110,5 +110,5 @@
* @param resultDataObjectDetailDOs 閿欒淇℃伅
* @return 鏈夐敊璇俊鎭殑excel
*/
- void batchSyncApplyCode(CodeOrderDTO orderDTO, DataObjectVO dataObjectVO, LinkedList<XMLResultDataObjectDetailDO> resultDataObjectDetailDOs,boolean isCodeOrGroupCode);
+ void batchSyncApplyCode(CodeOrderDTO orderDTO, DataObjectVO dataObjectVO, LinkedList<XMLResultDataObjectDetailDO> resultDataObjectDetailDOs);
}
--
Gitblit v1.9.3