From aa7b19831312d3e8d7eb19fd4e0a44505be24e93 Mon Sep 17 00:00:00 2001 From: 田源 <lastanimals@163.com> Date: 星期一, 26 六月 2023 19:55:30 +0800 Subject: [PATCH] 业务数据列表 --- Source/UBCS-WEB/src/page/login/index.vue | 1 Source/UBCS-WEB/src/components/Tree/classifyTrees.vue | 22 Source/UBCS-WEB/src/components/template/SetPersonnel.vue | 6 Source/UBCS-WEB/src/components/Tree/classifyTreeform.vue | 149 +++++++++ Source/UBCS-WEB/vue.config.js | 9 Source/UBCS-WEB/src/api/Theme/vciTheme.js | 9 Source/UBCS-WEB/src/page/login/userlogin.vue | 2 Source/UBCS-WEB/src/api/batchImport/index.js | 125 ++++---- Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue | 151 ++++----- Source/UBCS-WEB/src/api/work/businese.js | 20 + Source/UBCS-WEB/src/views/work/process/leave/handle.vue | 6 Source/UBCS-WEB/src/main.js | 2 Source/UBCS-WEB/src/components/work/BusinessWork.vue | 62 ++++ Source/UBCS-WEB/src/components/Tree/attrCrud.vue | 298 +++++++++---------- 14 files changed, 538 insertions(+), 324 deletions(-) diff --git a/Source/UBCS-WEB/src/api/Theme/vciTheme.js b/Source/UBCS-WEB/src/api/Theme/vciTheme.js new file mode 100644 index 0000000..9ec6520 --- /dev/null +++ b/Source/UBCS-WEB/src/api/Theme/vciTheme.js @@ -0,0 +1,9 @@ +import request from "@/router/axios"; +// 琛ㄥ崟鏁版嵁鎵ц浠g爜 +export function executeCode(params) { + return request({ + url: 'api/ubcs-code/uiDataController/defaultReferDataGrid', + method: 'get', + params + }) +} diff --git a/Source/UBCS-WEB/src/api/batchImport/index.js b/Source/UBCS-WEB/src/api/batchImport/index.js index d795f54..d2d006b 100644 --- a/Source/UBCS-WEB/src/api/batchImport/index.js +++ b/Source/UBCS-WEB/src/api/batchImport/index.js @@ -1,62 +1,63 @@ - -import request from '@/router/axios'; - -// 鍘嗗彶瀵煎叆妯℃澘涓嬭浇 -export const downloadHistoryImportTemplate = (params) => { - return request({ - url: '/api/ubcs-code/mdmEngineController/downloadImportExcelHistory', - method: 'get', - params, - responseType: 'blob' - }) -} -// 涓嬭浇閿欒鏃ュ織 -export const downloadErrorFile = (params) => { - return request({ - url: '/api/ubcs-code/mdmEngineController/downloadErrorFile', - method: 'get', - params, - responseType: 'blob' - }) -} -// 瀵煎叆鏁版嵁灞曠ず -export const importDataShow = (redisOid) => { - return request({ - url: '/api/ubcs-code/mdmEngineController/gridclassifys', - method: 'get', - params: {redisOid: redisOid + "-class"} - }) -} -// 鑾峰彇鍘嗗彶鏁版嵁姝g‘鏁版嵁 -export const getHistoryLeftTree = (redisOid) => { - return request({ - url: '/api/ubcs-code/mdmEngineController/gridValidata', - method: 'get', - params: {redisOid: redisOid + "-ok"} - }) -} -// 鑾峰彇鍘嗗彶鐩镐技椤� -export const getHistoryResembleTable = (params) => { - return request({ - url: '/api/ubcs-code/mdmEngineController/gridResemble', - method: 'get', - params - }) -} - -// 鑾峰彇妯℃澘 -export function getFormTemplate(params) { - return request({ - url: 'api/ubcs-code/ubcs-code/mdmEngineController/getFormDefineByTemplateOid', - method: 'get', - params - }) -} -// 鑾峰彇褰撳墠琛岀浉浼奸」鏁版嵁 -export function getCurretnSelectedRowResemble(params) { - return request({ - url: 'api/ubcs-code/ubcs-code/mdmEngineController/gridRowResemble', - method: 'get', - params - }) -} + +import request from '@/router/axios'; + +// 鍘嗗彶瀵煎叆妯℃澘涓嬭浇 +export const downloadHistoryImportTemplate = (params) => { + return request({ + url: '/api/ubcs-code/mdmEngineController/downloadImportExcelHistory', + method: 'get', + params, + responseType: 'blob' + }) +} +// 涓嬭浇閿欒鏃ュ織 +export const downloadErrorFile = (params) => { + ret + return request({ + url: '/api/ubcs-code/mdmEngineController/downloadErrorFile', + method: 'get', + params, + responseType: 'blob' + }) +} +// 瀵煎叆鏁版嵁灞曠ず +export const importDataShow = (redisOid) => { + return request({ + url: '/api/ubcs-code/mdmEngineController/gridclassifys', + method: 'get', + params: {redisOid: redisOid + "-class"} + }) +} +// 鑾峰彇鍘嗗彶鏁版嵁姝g‘鏁版嵁 +export const getHistoryLeftTree = (redisOid) => { + return request({ + url: '/api/ubcs-code/mdmEngineController/gridValidata', + method: 'get', + params: {redisOid: redisOid + "-ok"} + }) +} +// 鑾峰彇鍘嗗彶鐩镐技椤� +export const getHistoryResembleTable = (params) => { + return request({ + url: '/api/ubcs-code/mdmEngineController/gridResemble', + method: 'get', + params + }) +} + +// 鑾峰彇妯℃澘 +export function getFormTemplate(params) { + return request({ + url: 'api/ubcs-code/ubcs-code/mdmEngineController/getFormDefineByTemplateOid', + method: 'get', + params + }) +} +// 鑾峰彇褰撳墠琛岀浉浼奸」鏁版嵁 +export function getCurretnSelectedRowResemble(params) { + return request({ + url: 'api/ubcs-code/ubcs-code/mdmEngineController/gridRowResemble', + method: 'get', + params + }) +} diff --git a/Source/UBCS-WEB/src/api/work/businese.js b/Source/UBCS-WEB/src/api/work/businese.js new file mode 100644 index 0000000..011c585 --- /dev/null +++ b/Source/UBCS-WEB/src/api/work/businese.js @@ -0,0 +1,20 @@ +import request from "@/router/axios"; + +export const businese = (params) => { + return request({ + url: '/api/ubcs-code/mdmEngineController/getDataByOid', + method: 'get', + params:{ + ...params + } + }) +} +export const add = (params) => { + return request({ + url: '/api/ubcs-code/mdmEngineController/getTableDataByOids', + method: 'get', + params:{ + ...params + } + }) +} diff --git a/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue index f58d3b0..fe309bf 100644 --- a/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue +++ b/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue @@ -1,70 +1,26 @@ <template> <basic-container> <div class="testbox"> - <div style="margin-top: 10px;display: flex;flex-wrap: wrap;width: 100%;"> + <div> <el-button plain size="small" type="primary" @click="addvisible=true">澧炲姞 </el-button> - <FormTemplateDialog - :codeClassifyOid="this.codeClassifyOid" - :codeRuleOid="this.codeRuleOid" - :disabledProp="disabledProp" - :templateOid="templateOid" - type="add" - :visible.sync="addvisible" - @submit="AddSumbit" - > - </FormTemplateDialog> <el-button plain size="small" type="primary" @click="editHandler">缂栬緫 </el-button> - <FormTemplateDialog - :codeClassifyOid="this.codeClassifyOid" - :codeRuleOid="this.codeRuleOid" - :disabledProp="disabledProp" - :rowOid="rowOid" - :templateOid="templateOid" - type="edit" - :title="'淇敼缂栫爜淇℃伅'" - :visible.sync="editvisible" - @submit="EditSumbit" - ></FormTemplateDialog> <el-button plain size="small" type="primary">鎵归噺瀵煎叆鐢宠</el-button> - <el-button plain size="small" type="primary" @click="historyVisible = true">鍘嗗彶鏁版嵁瀵煎叆</el-button> + <el-button plain size="small" type="primary">鍘嗗彶鏁版嵁瀵煎叆</el-button> <el-button plain size="small" type="primary">鎵归噺鐢宠缂栫爜</el-button> <el-button plain size="small" type="primary">鎵归噺鍙戝竷</el-button> <el-button plain size="small" type="primary">鏌ョ湅娴佺▼鍘嗗彶</el-button> <el-button plain size="small" type="primary">鍒犻櫎</el-button> <el-button plain size="small" type="primary" @click="setHandler">鍙戝竷</el-button> - <set-personnel :visible.sync="visibleFlow" :parameter="parameter" - ></set-personnel> <el-button plain size="small" type="primary" @click="DataChange">鏁版嵁鏇存敼</el-button> - <FormTemplateDialog - :codeClassifyOid="this.codeClassifyOid" - :codeRuleOid="this.codeRuleOid" - :disabledProp="disabledProp" - :rowOid="rowOid" - :templateOid="templateOid" - :type="edit" - :title="'宸插彂甯冩暟鎹洿鏀�'" - :visible.sync="DataVisible" - ></FormTemplateDialog> <el-button plain size="small" type="primary" @click="huishouHandler">鍥炴敹</el-button> <el-button plain size="small" type="primary" @click="openD">瀵煎嚭 - <integration-transfer :data="transferData" :props="transferProps" - :visible.sync="dialogPush" @save="handelTransferSave"></integration-transfer> </el-button> <el-button plain size="small" type="primary" @click="findHandler">鏌ヨ - <advanced-query :options="this.options" :visible.sync="findvisible" - @echoContion="echoContion"></advanced-query> </el-button> <el-button plain size="small" type="primary" @click="similarHandler">鐩镐技椤规煡璇�</el-button> - <ResembleQueryDialog - :visible.sync="similarVisible" - :templateOid="templateOid" - :codeClassifyOid="codeClassifyOid" - :rowOid="rowOid" - :codeRuleOid="this.codeRuleOid" - ></ResembleQueryDialog> - <el-button plain size="small" style="margin-left: 1px;margin-top:10px" type="primary">鍒锋柊</el-button> + <el-button plain size="small" type="primary">鍒锋柊</el-button> <el-input placeholder="璇疯緭鍏ュ叧閿瓧鎸夊洖杞︽煡璇�" size="small" style="width: 180px;margin-left: 5px;margin-top:10px"></el-input> </div> @@ -99,6 +55,50 @@ <!-- </div>--> </el-table> </el-row> + <FormTemplateDialog + :codeClassifyOid="this.codeClassifyOid" + :codeRuleOid="this.codeRuleOid" + :disabledProp="disabledProp" + :templateOid="templateOid" + type="add" + :visible.sync="addvisible" + @submit="AddSumbit" + > + </FormTemplateDialog> + <FormTemplateDialog + :codeClassifyOid="this.codeClassifyOid" + :codeRuleOid="this.codeRuleOid" + :disabledProp="disabledProp" + :rowOid="rowOid" + :templateOid="templateOid" + type="edit" + :title="'淇敼缂栫爜淇℃伅'" + :visible.sync="editvisible" + @submit="EditSumbit" + ></FormTemplateDialog> + <FormTemplateDialog + :codeClassifyOid="this.codeClassifyOid" + :codeRuleOid="this.codeRuleOid" + :disabledProp="disabledProp" + :rowOid="rowOid" + :templateOid="templateOid" + :type="edit" + :title="'宸插彂甯冩暟鎹洿鏀�'" + :visible.sync="DataVisible" + ></FormTemplateDialog> + <set-personnel :visible.sync="visibleFlow" :parameter="this.parameter" + ></set-personnel> + <advanced-query :options="this.options" :visible.sync="findvisible" + @echoContion="echoContion"></advanced-query> + <integration-transfer :data="transferData" :props="transferProps" + :visible.sync="dialogPush" @save="handelTransferSave"></integration-transfer> + <ResembleQueryDialog + :visible.sync="similarVisible" + :templateOid="templateOid" + :codeClassifyOid="codeClassifyOid" + :rowOid="rowOid" + :codeRuleOid="this.codeRuleOid" + ></ResembleQueryDialog> </div> <div class="block" style="display: flex;justify-content: flex-end"> <el-pagination @@ -111,7 +111,6 @@ @current-change="handleCurrentChange"> </el-pagination> </div> - <historyImport :visible.sync="historyVisible" :codeClassifyOid="codeClassifyOid" type="historyImport"></historyImport> </basic-container> </template> <script> @@ -120,13 +119,11 @@ import integrationTransfer from '@/views/integration/integrationTransfer' import SetPersonnel from '@/components/template/SetPersonnel' import ResembleQueryDialog from "@/components/FormTemplate/ResembleQueryDialog.vue"; -import historyImport from '../BatchImport/index.vue' export default { components: { integrationTransfer, SetPersonnel, - ResembleQueryDialog, - historyImport + ResembleQueryDialog }, name: "Crud.vue", props: { @@ -153,6 +150,7 @@ }, templateOid: { type: String, + default:'' }, tableHeadDataFateher: { type: Array, @@ -171,10 +169,10 @@ similarVisible:false, //鍙戝竷 parameter:{ - ids:['0000','22222222'], - code:this.templateOid, + ids:[], + code:'', type:'PUBLIC', - template:'妯℃澘template' + template:'' }, visibleFlow: false, transferData: [], @@ -183,7 +181,6 @@ label: 'name' }, tableHeadFindDatas:[], - templateOid: "", addvisible: false, editvisible: false, findvisible: false, @@ -212,26 +209,19 @@ items: {}, seniorQueryColumns: [], selectRow: [], - historyVisible: false + userName:"" } }, computed: {}, created() { - // this.CrudHeaderRend(); - // this.tableHeadHandle() + }, mounted() { - }, activated() { this.doLayout() }, watch: { - tableHeadDataFateher:{ - handler(newval,oldval){ - this.options=newval.tableDefineVO.seniorQueryColumns - } - }, codeClassifyOid: { handler(newval, oldval) { this.codeClassifyOid = newval; @@ -254,16 +244,27 @@ this.page.total = newval; } }, + templateOid:{ + handler(newval,oldval) { + this.parameter.code=newval; + }, + deep:true + } }, methods: { setHandler() { - this.visibleFlow = true; - }, - huishouHandler() { + console.log('1111') + console.log('鐖�',this.parameter) + if (this.selectRow.length <= 0) { + this.$message.warning('璇烽�夋嫨涓�鏉℃暟鎹�') + } else { + this.userName=localStorage.getItem('username') + this.parameter.template=this.userName+'-鍙戝竷'+'[鐗╁搧]' + this.visibleFlow = true; + } }, openD() { - this.dialogPush = true; this.getListCodeByClassId() }, async getListCodeByClassId() { @@ -376,7 +377,6 @@ }, //鍒嗛〉鍒锋柊 async onLoad(val) { - console.log('鍒嗛〉', this.templateOid) await TableData({ templateOid: this.templateOid, codeClassifyOid: this.codeClassifyOid, @@ -394,14 +394,12 @@ this.rowOid='' } this.selectRow = row; - console.log(row) + row.forEach(item=>{ + this.parameter.ids.push(item.oid) + }) }, //缂栬緫 editHandler() { - console.log('row',this.rowOid) - console.log('temp',this.templateOid) - console.log('code',this.codeClassifyOid) - console.log('rule',this.coderuleoid) if (this.selectRow.length <= 0) { this.$message.warning('璇烽�夋嫨涓�鏉℃暟鎹�') } else if (this.selectRow.length > 1) { @@ -415,16 +413,13 @@ //楂樼骇鏌ヨ鎸夐挳 findHandler(){ this.findvisible=true; - console.log(this.options) }, // 楂樼骇鏌ヨ echoContion(val) { - console.log(val) FindData({templateOid:this.templateOid, codeClassifyOid: this.codeClassifyOid, ...val }).then(res=>{ - console.log(res) }) }, //鐩镐技椤规煡璇� @@ -452,11 +447,9 @@ }, //澧炲姞淇濆瓨 AddSumbit(val){ - console.log(val) this.addvisible=false }, EditSumbit(val){ - console.log(val) this.editvisible=false } } diff --git a/Source/UBCS-WEB/src/components/Tree/attrCrud.vue b/Source/UBCS-WEB/src/components/Tree/attrCrud.vue index 0bf7a8a..9c78bd5 100644 --- a/Source/UBCS-WEB/src/components/Tree/attrCrud.vue +++ b/Source/UBCS-WEB/src/components/Tree/attrCrud.vue @@ -17,35 +17,34 @@ </template> </avue-crud> - <div style="display: flex;justify-content: flex-end;margin-top: 15px"> - <el-button size="small" type="primary" @click="busineAddHandle">淇濆瓨</el-button> - <el-button size="small" type="primary">鍙栨秷</el-button> - </div> + <div style="display: flex;justify-content: flex-end;margin-top: 15px"> + <el-button size="small" type="primary" @click="busineAddHandle">淇濆瓨</el-button> + <el-button size="small" type="primary">鍙栨秷</el-button> + </div> </el-dialog> </template> <!-- 鍏ㄥ睆缂栬緫--> <template slot="menuLeft"> <el-button v-if=" attrEditVisible == false && attrFlagChiledren==false" size="small" @click="fullscreenHandle">鍏ㄥ睆缂栬緫</el-button> -<!-- <el-button v-if="attrFlagChiledren !=false" size="small" plain type="success" @click="escEdit">閫�鍑哄叏灞忕紪杈�</el-button>--> <el-dialog :visible.sync="attrEditVisible" append-to-body fullscreen="true"> - <attrCrud :ProData="this.ProData" :attrFlagChiledren="this.attrFlag"></attrCrud> + <attrCrud :ProData="this.ProData" :attrFlagChiledren="this.attrFlag"></attrCrud> </el-dialog> </template> -<!-- 缁勫悎瑙勫垯--> + <!-- 缁勫悎瑙勫垯--> <template slot="menuLeft"> <el-button size="small" @click="isShowHandler">缁勫悎瑙勫垯</el-button> - <formula-editor :visible.sync="isShowformulaEdit" - :systemVariableTableData="systemVariableTableData" - :thisSceneTableData="thisSceneTableData" - @updateFormulaContent="updataFormlaContent" - ></formula-editor> + <formula-editor :visible.sync="isShowformulaEdit" + :systemVariableTableData="systemVariableTableData" + :thisSceneTableData="thisSceneTableData" + @updateFormulaContent="updataFormlaContent" + ></formula-editor> </template> <!-- 楠岃瘉瑙勫垯--> <template slot="menuLeft"> <el-button icon="el-icon-info" size="small" @click="rulesVisible=true">楠岃瘉瑙勫垯</el-button> <el-dialog :visible.sync="rulesVisible" append-to-body title="灞炴�ч獙璇佽鍒�"> - <el-container style="border: 1px solid #eee;padding: 10px"> + <el-container style="border: 1px solid #9e3333;padding: 10px"> <el-aside style="width: 330px;"> <div style="display: flex"> <p style="display: inline-block;width: 160px"> 姝e垯琛ㄨ揪寮忥細</p> @@ -95,10 +94,10 @@ <el-form-item label="灞炴�у垎缁�"> <el-input v-model="attrModel"></el-input> </el-form-item> - <div style="display: flex;justify-content: flex-end"> - <el-button type="primary" @click="attrHandle" size="small">鎻愪氦</el-button> - <el-button size="small" @click="attrRemove">娓呯┖</el-button> - </div> + <div style="display: flex;justify-content: flex-end"> + <el-button type="primary" @click="attrHandle" size="small">鎻愪氦</el-button> + <el-button size="small" @click="attrRemove">娓呯┖</el-button> + </div> </el-form> </el-dialog> </template> @@ -110,7 +109,7 @@ <div class="injectBox"> <div style="color: #FF5722;margin: 1px 0 5px 20px">鍒嗙被灞傜骇鍏宠仈璇存槑锛�</div> <div - style="color: #01AAED;margin: 0 10px 0 45px;line-height: 20px">1锛氫富瑕佹槸璁剧疆妯℃澘灞炴�у拰鍒嗙被鐨勫叧绯�<br/>2锛氬鍒嗙被灞傜骇璁剧疆涓�2 <br/>3锛氬綍鍏ヨ祫婧愭暟鎹椂锛岃灞炴�у搴旂殑鍊兼牴鎹眰绾у叧绯诲幓瀵瑰簲鐨勫垎绫婚噷鍙� + style="color: #01aaed;margin: 0 10px 0 45px;line-height: 20px">1锛氫富瑕佹槸璁剧疆妯℃澘灞炴�у拰鍒嗙被鐨勫叧绯�<br/>2锛氬鍒嗙被灞傜骇璁剧疆涓�2 <br/>3锛氬綍鍏ヨ祫婧愭暟鎹椂锛岃灞炴�у搴旂殑鍊兼牴鎹眰绾у叧绯诲幓瀵瑰簲鐨勫垎绫婚噷鍙� <br/>4锛氬眰绾у繀椤绘槸澶т簬0鐨勬暣鏁板�� </div> <div style="padding-top: 15px;padding-left: 35px"> @@ -229,16 +228,16 @@ <template slot="menuLeft"> <el-button size="small" style="margin-top: 10px" @click="syncHandle">鍚屾鍒板叾浠栨ā鏉�</el-button> </template> -<!-- 缂栫爜鐢宠棰勮--> + <!-- 缂栫爜鐢宠棰勮--> <template slot="menuLeft"> <el-button size="small" style="margin-top: 10px" @click="applicationHandle">缂栫爜鐢宠棰勮</el-button> - <FormTemplateDialog - :visible.sync="addvisible" - :type="add" - :templateOid="this.crudOid" - :codeClassifyOid="this.codeClassifyOid" - > - </FormTemplateDialog> + <FormTemplateDialog + :visible.sync="addvisible" + :type="add" + :templateOid="this.crudOid" + :codeClassifyOid="this.codeClassifyOid" + > + </FormTemplateDialog> </template> </avue-crud> </template> @@ -708,117 +707,117 @@ //灞炴�ч獙璇佽鍒檇ata rulesData: [ {bds: '[\u3000\uff01-\uff5f]+', description: '鍏ㄨ绗﹀彿'}, - {bds: '[^\u3000\uff01-\uff5f]+', description: '鍗婅绗﹀彿'}, - {bds: '(([-|+]{1}[\\d]+鈩冿綖[-|+]{1}[\\d]+鈩�)|鏃�)', description: '娓╁害鑼冨洿锛岀ず渚� -55鈩冿綖+125鈩�'}, - {bds: '[\\d]{15}|[\\d]{18}|[\\d]{17}X', description: '韬唤璇佸彿鐮�(15鎴�18浣嶆暟瀛椼��17浣嶆暟瀛梄) '}, - {bds: '鐢穦濂硘鐢锋�濂虫��', description: '涓枃鎬у埆'}, - {bds: '[\\d]+', description: '鏁板瓧'}, - {bds: '[a-zA-Z]+', description: '瀛楁瘝'}, - {bds: '[A-Z]+', description: '澶у啓瀛楁瘝'}, - {bds: '[a-z]+', description: '灏忓啓瀛楁瘝'}, - {bds: '[0-9a-zA-Z]+', description: '瀛楁瘝銆佹暟瀛楃粍鍚�'}, - {bds: '((0[\\d]{3}-[\\d]{7})|(0[\\d]{2}-[\\d]{8})|([\\d]{7,8}))', description: '鐢佃瘽鍙风爜'}, - {bds: '-?[1-9]\\d*', description: '鏁存暟'}, - {bds: '[1-9]\\d*', description: '姝f暣鏁�'}, - {bds: '-[1-9]\\d*', description: '璐熸暣鏁�'}, - {bds: '-[1-9]\\d*|0', description: '闈炴鏁存暟(璐熸暣鏁�+0)'}, - {bds: '[1-9]\\d*|0', description: '闈炶礋鏁存暟(姝f暣鏁�+0)'}, - {bds: '-?([1-9]\\d*\\.\\d*|0\\.\\d*[1-9]\\d*|0?\\.0+|0)', description: '娴偣鏁�'}, - {bds: '[1-9]\\d*\\.\\d*|0\\.\\d*[1-9]\\d*', description: '姝f诞鐐规暟'}, - {bds: '-[1-9]\\d*\\.\\d*|0\\.\\d*[1-9]\\d*', description: '璐熸诞鐐规暟'}, - {bds: '[(-([1-9]\\d*\\.\\d*|0\\.\\d*[1-9]\\d*))|0?\\.0+|0', description: '闈炴娴偣鏁帮紙璐熸诞鐐规暟 + 0锛�'}, - {bds: '[1-9]\\d*\\.\\d*|0\\.\\d*[1-9]\\d*|0?\\.0+|0', description: '闈炶礋娴偣鏁帮紙姝f诞鐐规暟 + 0锛�'}, - {bds: 'x', description: '瀛楃 x'}, - {bds: '\\\\', description: '鍙嶆枩绾垮瓧绗�'}, - {bds: '\\0n', description: '甯︽湁鍏繘鍒跺�� 0 鐨勫瓧绗� n (0 <= n <= 7)'}, - {bds: '\\0nn', description: '甯︽湁鍏繘鍒跺�� 0 鐨勫瓧绗� nn (0 <= n <= 7)'}, - {bds: '\\0mnn', description: '甯︽湁鍏繘鍒跺�� 0 鐨勫瓧绗� mnn锛�0 <= m <= 3銆�0 <= n <= 7锛�'}, - {bds: '\\xhh', description: '甯︽湁鍗佸叚杩涘埗鍊� 0x 鐨勫瓧绗� hh'}, - {bds: '\\uhhhh', description: '甯︽湁鍗佸叚杩涘埗鍊� 0x 鐨勫瓧绗� hhhh'}, - {bds: '\\t', description: '鍒惰〃绗� (\'\u0009\')'}, - {bds: '\\n', description: '鏂拌锛堟崲琛岋級绗� (\'\u000A\')'}, - {bds: '\\r', description: '鍥炶溅绗� (\'\u000D\')'}, - {bds: '\\f', description: '鎹㈤〉绗� (\'\u000C\')'}, - {bds: '\\a', description: '鎶ヨ (bell) 绗� (\'\u0007\')'}, - {bds: '\\e', description: '杞箟绗� (\'\u001B\')'}, - {bds: '\\cx', description: '瀵瑰簲浜� x 鐨勬帶鍒剁'}, - {bds: '[abc]', description: 'a銆乥 鎴� c锛堢畝鍗曠被锛�'}, - {bds: '[^abc]', description: '浠讳綍瀛楃锛岄櫎浜� a銆乥 鎴� c锛堝惁瀹氾級'}, - {bds: '[a-zA-Z]', description: 'a 鍒� z 鎴� A 鍒� Z锛屼袱澶寸殑瀛楁瘝鍖呮嫭鍦ㄥ唴锛堣寖鍥达級'}, - {bds: '[a-d[m-p]]', description: 'a 鍒� d 鎴� m 鍒� p锛歔a-dm-p]锛堝苟闆嗭級'}, - {bds: '[a-z&&[def]]', description: '\td銆乪 鎴� f锛堜氦闆嗭級'}, - {bds: '[a-z&&[^bc]]', description: 'a 鍒� z锛岄櫎浜� b 鍜� c锛歔ad-z]锛堝噺鍘伙級'}, - {bds: '[a-z&&[^m-p]]', description: 'a 鍒� z锛岃�岄潪 m 鍒� p锛歔a-lq-z]锛堝噺鍘伙級'}, - {bds: '.', description: '浠讳綍瀛楃锛堜笌琛岀粨鏉熺鍙兘鍖归厤涔熷彲鑳戒笉鍖归厤锛�'}, - {bds: '\\d', description: '鏁板瓧锛歔0-9]'}, - {bds: '\\D', description: '闈炴暟瀛楋細 [^0-9]'}, - {bds: '\\s', description: '绌虹櫧瀛楃锛歔 \\t\\n\x0B\\f\\r]'}, - {bds: '\\S', description: '闈炵┖鐧藉瓧绗︼細[^\\s]'}, - {bds: '\\w', description: '鍗曡瘝瀛楃锛歔a-zA-Z_0-9]'}, - {bds: '\\W', description: '闈炲崟璇嶅瓧绗︼細[^\\w]'}, - {bds: '\\p{Lower}', description: '灏忓啓瀛楁瘝瀛楃锛歔a-z]'}, - {bds: '\\p{Upper}', description: '澶у啓瀛楁瘝瀛楃锛歔A-Z]'}, - {bds: '\\p{ASCII}', description: '鎵�鏈� ASCII锛歔\x00-\x7F]'}, - {bds: '\\p{Alpha}', description: '瀛楁瘝瀛楃锛歔\\p{Lower}\\p{Upper}]'}, - {bds: '\\p{Digit}', description: '鍗佽繘鍒舵暟瀛楋細[0-9]'}, - {bds: '\\p{Alnum}', description: '瀛楁瘝鏁板瓧瀛楃锛歔\\p{Alpha}\\p{Digit}]'}, - {bds: '\\p{Punct}', description: '鏍囩偣绗﹀彿锛�!"#$%&\'()*+,-./:;<=>?@[\\]^_`{|}~'}, - {bds: '\\p{Graph}', description: '鍙瀛楃锛歔\\p{Alnum}\\p{Punct}]'}, - {bds: '\\p{Print}', description: '鍙墦鍗板瓧绗︼細[\\p{Graph}\x20]'}, - {bds: '\\p{Blank}', description: '绌烘牸鎴栧埗琛ㄧ锛歔 \\t]'}, - {bds: '\\p{Cntrl}', description: '鎺у埗瀛楃锛歔\x00-\x1F\x7F]'}, - {bds: '\\p{XDigit}', description: '鍗佸叚杩涘埗鏁板瓧锛歔0-9a-fA-F]'}, - {bds: '\\p{Space}', description: '绌虹櫧瀛楃锛歔 \\t\\n\x0B\\f\\r]'}, - {bds: '\\p{javaLowerCase}', description: '绛夋晥浜� java.lang.Character.isLowerCase()'}, - {bds: '\\p{javaUpperCase}', description: '绛夋晥浜� java.lang.Character.isUpperCase()'}, - {bds: '\\p{javaWhitespace}', description: '绛夋晥浜� java.lang.Character.isWhitespace()'}, - {bds: '\\p{javaMirrored}', description: '绛夋晥浜� java.lang.Character.isMirrored()'}, - {bds: '\\p{InGreek}', description: 'Greek 鍧楋紙绠�鍗曞潡锛変腑鐨勫瓧绗�'}, - {bds: '\\p{Lu}', description: '澶у啓瀛楁瘝锛堢畝鍗曠被鍒級'}, - {bds: '\\p{Sc}', description: '璐у竵绗﹀彿'}, - {bds: '\\P{InGreek}', description: '鎵�鏈夊瓧绗︼紝Greek 鍧椾腑鐨勯櫎澶栵紙鍚﹀畾锛�'}, - {bds: '[\\p{L}&&[^\\p{Lu}]]', description: '鎵�鏈夊瓧姣嶏紝澶у啓瀛楁瘝闄ゅ锛堝噺鍘伙級'}, - {bds: '^', description: '琛岀殑寮�澶�'}, - {bds: '$', description: '琛岀殑缁撳熬'}, - {bds: '\\b', description: '鍗曡瘝杈圭晫'}, - {bds: '\\B', description: '闈炲崟璇嶈竟鐣�'}, - {bds: '\\A', description: '杈撳叆鐨勫紑澶�'}, - {bds: '\\G', description: '涓婁竴涓尮閰嶇殑缁撳熬'}, - {bds: '\\Z', description: '杈撳叆鐨勭粨灏撅紝浠呯敤浜庢渶鍚庣殑缁撴潫绗︼紙濡傛灉鏈夌殑璇濓級'}, - {bds: '\\z', description: '杈撳叆鐨勭粨灏�'}, - {bds: 'X ?', description: 'X锛屼竴娆℃垨涓�娆′篃娌℃湁'}, - {bds: 'X *', description: 'X锛岄浂娆℃垨澶氭'}, - {bds: 'X +', description: 'X锛屼竴娆℃垨澶氭'}, - {bds: 'X {n }', description: 'X锛屾伆濂� n 娆�'}, - {bds: 'X {n ,}', description: 'X锛岃嚦灏� n 娆�'}, - {bds: 'X {n ,m }', description: 'X锛岃嚦灏� n 娆★紝浣嗘槸涓嶈秴杩� m 娆�'}, - {bds: 'X ??', description: 'X锛屼竴娆℃垨涓�娆′篃娌℃湁'}, - {bds: 'X *?', description: 'X锛岄浂娆℃垨澶氭'}, - {bds: 'X +?', description: 'X锛屼竴娆℃垨澶氭'}, - {bds: 'X {n }?', description: 'X锛屾伆濂� n 娆�'}, - {bds: 'X {n ,}?', description: 'X锛岃嚦灏� n 娆�'}, - {bds: 'X {n ,m }?', description: 'X锛岃嚦灏� n 娆★紝浣嗘槸涓嶈秴杩� m 娆�'}, - {bds: 'X ?+', description: 'X锛屼竴娆℃垨涓�娆′篃娌℃湁'}, - {bds: 'X *+', description: 'X锛岄浂娆℃垨澶氭'}, - {bds: 'X ++', description: 'X锛屼竴娆℃垨澶氭'}, - {bds: 'X {n }+', description: 'X锛屾伆濂� n 娆�'}, - {bds: 'X {n ,}+', description: 'X锛岃嚦灏� n 娆�'}, - {bds: 'X {n ,m }+', description: 'X锛岃嚦灏� n 娆★紝浣嗘槸涓嶈秴杩� m 娆�'}, - {bds: 'XY', description: 'X 鍚庤窡 Y'}, - {bds: 'X |Y', description: 'X 鎴� Y'}, - {bds: '(X )', description: 'X锛屼綔涓烘崟鑾风粍'}, - {bds: '\\n', description: '浠讳綍鍖归厤鐨� n<sup>th</sup> 鎹曡幏缁�'}, - {bds: '\\', description: 'Nothing锛屼絾鏄紩鐢ㄤ互涓嬪瓧绗�'}, - {bds: '\\Q', description: 'Nothing锛屼絾鏄紩鐢ㄦ墍鏈夊瓧绗︼紝鐩村埌 \\E'}, - {bds: '\\E', description: 'Nothing锛屼絾鏄粨鏉熶粠 \\Q 寮�濮嬬殑寮曠敤'}, - {bds: '(?:X )', description: 'X锛屼綔涓洪潪鎹曡幏缁�'}, - {bds: '(?idmsux-idmsux)', description: 'Nothing锛屼絾鏄皢鍖归厤鏍囧織鐢� on 杞负 off'}, - {bds: '(?idmsux-idmsux:X )', description: 'X锛屼綔涓哄甫鏈夌粰瀹氭爣蹇� on - off 鐨勯潪鎹曡幏缁�'}, - {bds: '(?=X )', description: 'X锛岄�氳繃闆跺搴︾殑姝� lookahead'}, - {bds: '(?!X )', description: 'X锛岄�氳繃闆跺搴︾殑璐� lookahead'}, - {bds: '(?<=X )', description: 'X锛岄�氳繃闆跺搴︾殑姝� lookbehind'}, - {bds: '(?<!X )', description: 'X锛岄�氳繃闆跺搴︾殑璐� lookbehind'}, - {bds: '(?>X )', description: 'X锛屼綔涓虹嫭绔嬬殑闈炴崟鑾风粍'} + {bds: '[^\u3000\uff01-\uff5f]+', description: '鍗婅绗﹀彿'}, + {bds: '(([-|+]{1}[\\d]+鈩冿綖[-|+]{1}[\\d]+鈩�)|鏃�)', description: '娓╁害鑼冨洿锛岀ず渚� -55鈩冿綖+125鈩�'}, + {bds: '[\\d]{15}|[\\d]{18}|[\\d]{17}X', description: '韬唤璇佸彿鐮�(15鎴�18浣嶆暟瀛椼��17浣嶆暟瀛梄) '}, + {bds: '鐢穦濂硘鐢锋�濂虫��', description: '涓枃鎬у埆'}, + {bds: '[\\d]+', description: '鏁板瓧'}, + {bds: '[a-zA-Z]+', description: '瀛楁瘝'}, + {bds: '[A-Z]+', description: '澶у啓瀛楁瘝'}, + {bds: '[a-z]+', description: '灏忓啓瀛楁瘝'}, + {bds: '[0-9a-zA-Z]+', description: '瀛楁瘝銆佹暟瀛楃粍鍚�'}, + {bds: '((0[\\d]{3}-[\\d]{7})|(0[\\d]{2}-[\\d]{8})|([\\d]{7,8}))', description: '鐢佃瘽鍙风爜'}, + {bds: '-?[1-9]\\d*', description: '鏁存暟'}, + {bds: '[1-9]\\d*', description: '姝f暣鏁�'}, + {bds: '-[1-9]\\d*', description: '璐熸暣鏁�'}, + {bds: '-[1-9]\\d*|0', description: '闈炴鏁存暟(璐熸暣鏁�+0)'}, + {bds: '[1-9]\\d*|0', description: '闈炶礋鏁存暟(姝f暣鏁�+0)'}, + {bds: '-?([1-9]\\d*\\.\\d*|0\\.\\d*[1-9]\\d*|0?\\.0+|0)', description: '娴偣鏁�'}, + {bds: '[1-9]\\d*\\.\\d*|0\\.\\d*[1-9]\\d*', description: '姝f诞鐐规暟'}, + {bds: '-[1-9]\\d*\\.\\d*|0\\.\\d*[1-9]\\d*', description: '璐熸诞鐐规暟'}, + {bds: '[(-([1-9]\\d*\\.\\d*|0\\.\\d*[1-9]\\d*))|0?\\.0+|0', description: '闈炴娴偣鏁帮紙璐熸诞鐐规暟 + 0锛�'}, + {bds: '[1-9]\\d*\\.\\d*|0\\.\\d*[1-9]\\d*|0?\\.0+|0', description: '闈炶礋娴偣鏁帮紙姝f诞鐐规暟 + 0锛�'}, + {bds: 'x', description: '瀛楃 x'}, + {bds: '\\\\', description: '鍙嶆枩绾垮瓧绗�'}, + {bds: '\\0n', description: '甯︽湁鍏繘鍒跺�� 0 鐨勫瓧绗� n (0 <= n <= 7)'}, + {bds: '\\0nn', description: '甯︽湁鍏繘鍒跺�� 0 鐨勫瓧绗� nn (0 <= n <= 7)'}, + {bds: '\\0mnn', description: '甯︽湁鍏繘鍒跺�� 0 鐨勫瓧绗� mnn锛�0 <= m <= 3銆�0 <= n <= 7锛�'}, + {bds: '\\xhh', description: '甯︽湁鍗佸叚杩涘埗鍊� 0x 鐨勫瓧绗� hh'}, + {bds: '\\uhhhh', description: '甯︽湁鍗佸叚杩涘埗鍊� 0x 鐨勫瓧绗� hhhh'}, + {bds: '\\t', description: '鍒惰〃绗� (\'\u0009\')'}, + {bds: '\\n', description: '鏂拌锛堟崲琛岋級绗� (\'\u000A\')'}, + {bds: '\\r', description: '鍥炶溅绗� (\'\u000D\')'}, + {bds: '\\f', description: '鎹㈤〉绗� (\'\u000C\')'}, + {bds: '\\a', description: '鎶ヨ (bell) 绗� (\'\u0007\')'}, + {bds: '\\e', description: '杞箟绗� (\'\u001B\')'}, + {bds: '\\cx', description: '瀵瑰簲浜� x 鐨勬帶鍒剁'}, + {bds: '[abc]', description: 'a銆乥 鎴� c锛堢畝鍗曠被锛�'}, + {bds: '[^abc]', description: '浠讳綍瀛楃锛岄櫎浜� a銆乥 鎴� c锛堝惁瀹氾級'}, + {bds: '[a-zA-Z]', description: 'a 鍒� z 鎴� A 鍒� Z锛屼袱澶寸殑瀛楁瘝鍖呮嫭鍦ㄥ唴锛堣寖鍥达級'}, + {bds: '[a-d[m-p]]', description: 'a 鍒� d 鎴� m 鍒� p锛歔a-dm-p]锛堝苟闆嗭級'}, + {bds: '[a-z&&[def]]', description: '\td銆乪 鎴� f锛堜氦闆嗭級'}, + {bds: '[a-z&&[^bc]]', description: 'a 鍒� z锛岄櫎浜� b 鍜� c锛歔ad-z]锛堝噺鍘伙級'}, + {bds: '[a-z&&[^m-p]]', description: 'a 鍒� z锛岃�岄潪 m 鍒� p锛歔a-lq-z]锛堝噺鍘伙級'}, + {bds: '.', description: '浠讳綍瀛楃锛堜笌琛岀粨鏉熺鍙兘鍖归厤涔熷彲鑳戒笉鍖归厤锛�'}, + {bds: '\\d', description: '鏁板瓧锛歔0-9]'}, + {bds: '\\D', description: '闈炴暟瀛楋細 [^0-9]'}, + {bds: '\\s', description: '绌虹櫧瀛楃锛歔 \\t\\n\x0B\\f\\r]'}, + {bds: '\\S', description: '闈炵┖鐧藉瓧绗︼細[^\\s]'}, + {bds: '\\w', description: '鍗曡瘝瀛楃锛歔a-zA-Z_0-9]'}, + {bds: '\\W', description: '闈炲崟璇嶅瓧绗︼細[^\\w]'}, + {bds: '\\p{Lower}', description: '灏忓啓瀛楁瘝瀛楃锛歔a-z]'}, + {bds: '\\p{Upper}', description: '澶у啓瀛楁瘝瀛楃锛歔A-Z]'}, + {bds: '\\p{ASCII}', description: '鎵�鏈� ASCII锛歔\x00-\x7F]'}, + {bds: '\\p{Alpha}', description: '瀛楁瘝瀛楃锛歔\\p{Lower}\\p{Upper}]'}, + {bds: '\\p{Digit}', description: '鍗佽繘鍒舵暟瀛楋細[0-9]'}, + {bds: '\\p{Alnum}', description: '瀛楁瘝鏁板瓧瀛楃锛歔\\p{Alpha}\\p{Digit}]'}, + {bds: '\\p{Punct}', description: '鏍囩偣绗﹀彿锛�!"#$%&\'()*+,-./:;<=>?@[\\]^_`{|}~'}, + {bds: '\\p{Graph}', description: '鍙瀛楃锛歔\\p{Alnum}\\p{Punct}]'}, + {bds: '\\p{Print}', description: '鍙墦鍗板瓧绗︼細[\\p{Graph}\x20]'}, + {bds: '\\p{Blank}', description: '绌烘牸鎴栧埗琛ㄧ锛歔 \\t]'}, + {bds: '\\p{Cntrl}', description: '鎺у埗瀛楃锛歔\x00-\x1F\x7F]'}, + {bds: '\\p{XDigit}', description: '鍗佸叚杩涘埗鏁板瓧锛歔0-9a-fA-F]'}, + {bds: '\\p{Space}', description: '绌虹櫧瀛楃锛歔 \\t\\n\x0B\\f\\r]'}, + {bds: '\\p{javaLowerCase}', description: '绛夋晥浜� java.lang.Character.isLowerCase()'}, + {bds: '\\p{javaUpperCase}', description: '绛夋晥浜� java.lang.Character.isUpperCase()'}, + {bds: '\\p{javaWhitespace}', description: '绛夋晥浜� java.lang.Character.isWhitespace()'}, + {bds: '\\p{javaMirrored}', description: '绛夋晥浜� java.lang.Character.isMirrored()'}, + {bds: '\\p{InGreek}', description: 'Greek 鍧楋紙绠�鍗曞潡锛変腑鐨勫瓧绗�'}, + {bds: '\\p{Lu}', description: '澶у啓瀛楁瘝锛堢畝鍗曠被鍒級'}, + {bds: '\\p{Sc}', description: '璐у竵绗﹀彿'}, + {bds: '\\P{InGreek}', description: '鎵�鏈夊瓧绗︼紝Greek 鍧椾腑鐨勯櫎澶栵紙鍚﹀畾锛�'}, + {bds: '[\\p{L}&&[^\\p{Lu}]]', description: '鎵�鏈夊瓧姣嶏紝澶у啓瀛楁瘝闄ゅ锛堝噺鍘伙級'}, + {bds: '^', description: '琛岀殑寮�澶�'}, + {bds: '$', description: '琛岀殑缁撳熬'}, + {bds: '\\b', description: '鍗曡瘝杈圭晫'}, + {bds: '\\B', description: '闈炲崟璇嶈竟鐣�'}, + {bds: '\\A', description: '杈撳叆鐨勫紑澶�'}, + {bds: '\\G', description: '涓婁竴涓尮閰嶇殑缁撳熬'}, + {bds: '\\Z', description: '杈撳叆鐨勭粨灏撅紝浠呯敤浜庢渶鍚庣殑缁撴潫绗︼紙濡傛灉鏈夌殑璇濓級'}, + {bds: '\\z', description: '杈撳叆鐨勭粨灏�'}, + {bds: 'X ?', description: 'X锛屼竴娆℃垨涓�娆′篃娌℃湁'}, + {bds: 'X *', description: 'X锛岄浂娆℃垨澶氭'}, + {bds: 'X +', description: 'X锛屼竴娆℃垨澶氭'}, + {bds: 'X {n }', description: 'X锛屾伆濂� n 娆�'}, + {bds: 'X {n ,}', description: 'X锛岃嚦灏� n 娆�'}, + {bds: 'X {n ,m }', description: 'X锛岃嚦灏� n 娆★紝浣嗘槸涓嶈秴杩� m 娆�'}, + {bds: 'X ??', description: 'X锛屼竴娆℃垨涓�娆′篃娌℃湁'}, + {bds: 'X *?', description: 'X锛岄浂娆℃垨澶氭'}, + {bds: 'X +?', description: 'X锛屼竴娆℃垨澶氭'}, + {bds: 'X {n }?', description: 'X锛屾伆濂� n 娆�'}, + {bds: 'X {n ,}?', description: 'X锛岃嚦灏� n 娆�'}, + {bds: 'X {n ,m }?', description: 'X锛岃嚦灏� n 娆★紝浣嗘槸涓嶈秴杩� m 娆�'}, + {bds: 'X ?+', description: 'X锛屼竴娆℃垨涓�娆′篃娌℃湁'}, + {bds: 'X *+', description: 'X锛岄浂娆℃垨澶氭'}, + {bds: 'X ++', description: 'X锛屼竴娆℃垨澶氭'}, + {bds: 'X {n }+', description: 'X锛屾伆濂� n 娆�'}, + {bds: 'X {n ,}+', description: 'X锛岃嚦灏� n 娆�'}, + {bds: 'X {n ,m }+', description: 'X锛岃嚦灏� n 娆★紝浣嗘槸涓嶈秴杩� m 娆�'}, + {bds: 'XY', description: 'X 鍚庤窡 Y'}, + {bds: 'X |Y', description: 'X 鎴� Y'}, + {bds: '(X )', description: 'X锛屼綔涓烘崟鑾风粍'}, + {bds: '\\n', description: '浠讳綍鍖归厤鐨� n<sup>th</sup> 鎹曡幏缁�'}, + {bds: '\\', description: 'Nothing锛屼絾鏄紩鐢ㄤ互涓嬪瓧绗�'}, + {bds: '\\Q', description: 'Nothing锛屼絾鏄紩鐢ㄦ墍鏈夊瓧绗︼紝鐩村埌 \\E'}, + {bds: '\\E', description: 'Nothing锛屼絾鏄粨鏉熶粠 \\Q 寮�濮嬬殑寮曠敤'}, + {bds: '(?:X )', description: 'X锛屼綔涓洪潪鎹曡幏缁�'}, + {bds: '(?idmsux-idmsux)', description: 'Nothing锛屼絾鏄皢鍖归厤鏍囧織鐢� on 杞负 off'}, + {bds: '(?idmsux-idmsux:X )', description: 'X锛屼綔涓哄甫鏈夌粰瀹氭爣蹇� on - off 鐨勯潪鎹曡幏缁�'}, + {bds: '(?=X )', description: 'X锛岄�氳繃闆跺搴︾殑姝� lookahead'}, + {bds: '(?!X )', description: 'X锛岄�氳繃闆跺搴︾殑璐� lookahead'}, + {bds: '(?<=X )', description: 'X锛岄�氳繃闆跺搴︾殑姝� lookbehind'}, + {bds: '(?<!X )', description: 'X锛岄�氳繃闆跺搴︾殑璐� lookbehind'}, + {bds: '(?>X )', description: 'X锛屼綔涓虹嫭绔嬬殑闈炴崟鑾风粍'} ], // 鏂板涓氬姟绫诲瀷 businessData: [], @@ -1165,9 +1164,7 @@ this.$set(this.busineAddList,'classifytemplateoid',this.crudOid) this.$set(this.busineAddList,'oid','') this.ProData.push(JSON.parse(JSON.stringify(this.busineAddList))) - console.log(this.busineAddList) this.addVisible=false; - console.log('prodata',this.ProData) } }, //涓氬姟绫诲瀷鍗曢�� @@ -1183,14 +1180,13 @@ this.addVisible=true; AttrByBtm({'conditionMap[oid]': this.crudOid}).then(res=>{ this.businessData=res.data.data; - console.log(res.data) }) } }, // 绾ц仈灞炴�ф寜閽� CascadeHandle(){ if(this.CrudSelect.length >1){ - this.$message.warning('鍙兘閫夋嫨涓�鏉℃ā鏉垮睘鎬�') + this.$message.warning('鍙兘閫夋嫨涓�鏉℃ā鏉垮睘鎬�') }else if(this.CrudSelect.length<1){ this.$message.warning('璇烽�夋嫨涓�鏉℃ā鏉垮睘鎬�') }else if(this.CrudSelect.length === 1){ @@ -1207,12 +1203,10 @@ this.CrudOid=row.oid; this.CrudSelect=selection; this.attrRow=row; - console.log(selection.length) }, //淇濆瓨 addsHandler(){ batchAddSave(this.ProData).then(res=>{ - console.log(res) this.$message.success('淇濆瓨鎴愬姛') }) }, @@ -1230,7 +1224,6 @@ // 绾ц仈灞炴�ц鍗曢�� CascaderowClick(row) { this.selectRow = row.$index - console.log(row) }, // 鏋氫妇娉ㄥ叆娣诲姞涓�琛岀┖鏁版嵁 addRow() { @@ -1246,7 +1239,6 @@ }, //鏋氫妇娉ㄥ叆鍒犻櫎 enumDeleteRow(row) { - console.log(row) this.tableData.splice(row, 1) }, //鏋氫妇娉ㄥ叆鎸夐挳 @@ -1261,12 +1253,10 @@ }, //鏋氫妇娉ㄥ叆澶氶�夋 handleSelectionChange(row){ - console.log(row) this.enumRow=JSON.parse(JSON.stringify(row)); }, //鏋氫妇娉ㄥ叆淇濆瓨 enumAddHandle(){ - console.log(this.enumRow) if(this.enumRow.length<1){ this.$message.warning('璇疯嚦灏戦�夋嫨涓�鏉℃暟鎹�') }else { @@ -1341,10 +1331,6 @@ // const cellName=this.List[0] // // } - console.log("list", this.List) - console.log(column) - // console.log(row) - console.log(column.columnKey) } }, //缂栬緫淇濆瓨浜嬩欢 @@ -1384,11 +1370,6 @@ //缂栫爜鐢宠棰勮 applicationHandle(){ this.addvisible=true; - console.log('temp',this.crudOid) - console.log('code',this.codeClassifyOid) - // getFormDefineByTemplate({templateOid:this.crudOid,codeClassifyOid:this.codeClassifyOid}).then(res=>{ - // console.log(res) - // }) }, //缁勫悎瑙勫垯 isShowHandler(){ @@ -1397,7 +1378,7 @@ }else if(this.CrudSelect.length<1){ this.$message.warning('璇烽�夋嫨涓�鏉℃ā鏉垮睘鎬ф暟鎹�') }else if(this.CrudSelect.length === 1){ - this.isShowformulaEdit=true; + this.isShowformulaEdit=true; } }, //鍏ㄥ睆缂栬緫 @@ -1407,7 +1388,6 @@ }else { this.attrEditVisible=true; this.attrFlag=true; - console.log(this.attrEditVisible) } }, @@ -1415,10 +1395,8 @@ escEdit(){ this.attrFlagChiledren=false; this.attrEditVisible=false; - console.log(this.attrEditVisible) }, updataFormlaContent(val){ - console.log(val) this.$set(this.attrRow,'componentRule',val) }, // 鎺掑簭 diff --git a/Source/UBCS-WEB/src/components/Tree/classifyTreeform.vue b/Source/UBCS-WEB/src/components/Tree/classifyTreeform.vue index e0a2f86..cb2f4ff 100644 --- a/Source/UBCS-WEB/src/components/Tree/classifyTreeform.vue +++ b/Source/UBCS-WEB/src/components/Tree/classifyTreeform.vue @@ -1,15 +1,72 @@ <template> - <avue-form v-model="TreeNewForm" :option="option" @submit="submit"> - </avue-form> - + <div> + <avue-form v-model="loneTreeNewForm" :option="option" @submit="submit" v-if="flag == 'renonly'"> + </avue-form> + <avue-form v-model="loneTreeNewForm" :option="options" @submit="submit" v-else-if="flag == 'edit'"> + </avue-form> + <div> + <el-dialog :visible.sync="dialogVisible" title="涓恒�愮紪鐮佽鍒欍�戦�夊彇鍊�" append-to-body> + <div> + <el-input placeholder="璇烽�夋嫨鍐呭" v-model="masterInput" class="input-with-select"> + <el-select v-model="MasterSearchSelects" placeholder="璇烽�夋嫨"> + <el-option label="鑻辨枃鍚嶇О" value="0"></el-option> + <el-option label="涓枃鍚嶇О" value="1"></el-option> + </el-select> + <el-button slot="append" icon="el-icon-search"></el-button> + </el-input> + </div> + <avue-crud :data="masterData" :option="masterOption" @select="masterSelect"></avue-crud> + <div style="padding-top: 10px;display: flex; justify-content: flex-end" > + <el-button type="primary" size="small" @click="MasterHandlerClick">纭畾</el-button> + <el-button size="small" @click="dialogVisible=false">鍙栨秷</el-button> + </div> + </el-dialog> + </div> + </div> </template> <script> export default { name: "classifyTreeform.vue", - props: ["TreeNewForm"], + props: ['loneTreeNewForm','flag'], data() { return { + masterInput:'', + MasterSearchSelects:"", + masterData:[ + { + id:'001', + name:'001', + description:'001' + }, + { + id:'002', + name:'002', + description:'002' + } + ], + masterOption:{ + addBtn:false, + index:true, + border:true, + selection:true, + height:380, + column:[ + { + label:'鑻辨枃鍚嶇О', + prop:'id' + }, + { + label:'涓枃鍚嶇О', + prop:'name' + }, + { + label:'鎻忚堪', + prop:'description' + } + ] + }, + dialogVisible:false, form: { name: "鍝堝搱", sex: "鐢�" @@ -45,6 +102,7 @@ label:"鎻忚堪", prop:"description", labelWidth:128, + readonly: true, }, { label: '瀛樺偍鐨勪笟鍔$被鍨�', @@ -61,6 +119,66 @@ label:"缂栫爜瑙勫垯", prop:"coderuleoidName", labelWidth:128, + readonly: true, + }, + { + label:"鍏抽敭灞炴�ф煡璇㈣鍒�", + prop:"codekeyattrrepeatoidName", + labelWidth:128, + readonly: true, + }, + { + label:"鐩镐技鏌ヨ瑙勫垯", + prop:"codeResembleRuleOidName", + labelWidth:128, + readonly: true, + }, + ] + }, + options: { + submitBtn:false, + emptyBtn:false, + column: [ + { + label: '涓婚搴�/鍒嗙被缂栧彿', + prop: 'btmtypeid', + labelWidth:128, + rules: [{ + required: true, + message: "涓婚搴�/鍒嗙被缂栧彿", + trigger: "blur" + }] + }, + { + label: '涓婚搴�/鍒嗙被鍚嶇О', + prop: 'name', + labelWidth:128, + rules: [{ + required: true, + message: "涓婚搴�/鍒嗙被鍚嶇О", + trigger: "blur" + }] + }, + { + label:"鎻忚堪", + prop:"description", + labelWidth:128, + }, + { + label: '瀛樺偍鐨勪笟鍔$被鍨�', + prop: 'btmtypename', + labelWidth:128, + rules: [{ + required: true, + message: "瀛樺偍鐨勪笟鍔$被鍨�", + trigger: "blur" + }] + }, + { + label:"缂栫爜瑙勫垯", + prop:"coderuleoidName", + labelWidth:128, + focus:this.CodeFoucus }, { label:"鍏抽敭灞炴�ф煡璇㈣鍒�", @@ -72,9 +190,11 @@ prop:"codeResembleRuleOidName", labelWidth:128, }, + ] }, - FormList: {} + FormList: {}, + masterSelectList:[] } }, methods: { @@ -85,6 +205,25 @@ error(err) { this.$message.success('璇锋煡鐪嬫帶鍒跺彴'); console.log(err) + }, + CodeFoucus(){ + this.dialogVisible=true; + console.log(this.dialogVisible) + }, + MasterHandlerClick(){ + if(this.masterSelectList.length>1){ + this.$message.warning('鍙兘閫夋嫨涓�鏉℃暟鎹�') + }else if(this.masterSelectList.length<=0){ + this.$message.warning('璇烽�夋嫨涓�鏉℃暟鎹�') + }else { + this.dialogVisible=false; + console.log(this.masterInput) + console.log(this.MasterSearchSelect) + } + }, + masterSelect(row){ + console.log(row) + this.masterSelectList=row; } } } diff --git a/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue b/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue index 624ebf8..6793b75 100644 --- a/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue +++ b/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue @@ -49,7 +49,7 @@ </el-dialog> <!-- 淇敼瀵硅瘽妗�--> <el-dialog :visible.sync="TreeEditFormVisible" append-to-body title="淇敼鍒嗙被"> - <classifyTreeform ref="childForm" :loneTreeNewForm="TreeList" :nodeList="nodeList"></classifyTreeform> + <classifyTreeform ref="childForm" :loneTreeNewForm="TreeList" :nodeList="nodeList" :flag="'edit'"></classifyTreeform> </el-dialog> <avue-tree ref="tree" v-model="CloneTreeAvueform" v-loading="loading" :data="CloneTreedata" :defaultExpandAll="false" :option="Treeoption" @@ -65,7 +65,7 @@ <!-- 鍙充晶琛ㄦ牸--> <avue-tabs :option="tabOption" @change="handleChange"></avue-tabs> <span v-if="type.prop==='tab1'"> - <classifyTreeform ref="childForm" :TreeNewForm="TreeList" :nodeList="nodeList"></classifyTreeform> + <classifyTreeform ref="childForm" :loneTreeNewForm="TreeList" :nodeList="nodeList" :flag="'renonly'"></classifyTreeform> </span> <span v-else-if="type.prop==='tab2'"> <basic-container> @@ -595,14 +595,16 @@ }, //淇敼鍥炲~ TreeEdit() { - if (this.nodeClickList == "") { - this.$message({ - type: 'warning', - message: '璇峰厛浠庢爲涓婇�夋嫨涓�鏉℃暟鎹�!' - }); - } else { - this.TreeEditFormVisible = true - } + // if (this.nodeClickList == "") { + // this.$message({ + // type: 'warning', + // message: '璇峰厛浠庢爲涓婇�夋嫨涓�鏉℃暟鎹�!' + // }); + // } else { + // this.TreeEditFormVisible = true; + // console.log('---',this.CloneTreedata) + // } + this.TreeEditFormVisible=true; }, //鏍戝埛鏂� flushed() { diff --git a/Source/UBCS-WEB/src/components/template/SetPersonnel.vue b/Source/UBCS-WEB/src/components/template/SetPersonnel.vue index f96be3f..a0e23bf 100644 --- a/Source/UBCS-WEB/src/components/template/SetPersonnel.vue +++ b/Source/UBCS-WEB/src/components/template/SetPersonnel.vue @@ -114,8 +114,12 @@ mounted() { // this.apiInit() // this.apiDict() + console.log('---',this.parameter) }, - methods: { + created() { + console.log('parameter',this.parameter) + }, + methods: { setSaveParam() { return { processName: this.parameter[this.parameterKeys.flowTemplate], diff --git a/Source/UBCS-WEB/src/components/work/BusinessWork.vue b/Source/UBCS-WEB/src/components/work/BusinessWork.vue new file mode 100644 index 0000000..97e3f18 --- /dev/null +++ b/Source/UBCS-WEB/src/components/work/BusinessWork.vue @@ -0,0 +1,62 @@ +<template> +<div> + <el-button @click="add"></el-button> + <el-table :data="data"> + <el-table-column + fixed + type="selection" + width="55"> + </el-table-column> + <el-table-column + fixed + label="搴忓彿" + type="index" + width="55"> + </el-table-column> + </el-table> +</div> +</template> + +<script> +import {businese,add} from '@/api/work/businese' +export default { + name: "BusinessWork", + props:['oid','templateId'], + data() { + return { + data:[ + { + label:'app' + } + ] + } + }, + created() { + businese({oid: this.oid, + templateOid: this.templateId}).then(res=>{ + console.log(res) + }) + }, + methods:{ + add(){ + // businese({oid: this.oid[2], + // templateOid: this.templateId}).then(res=>{ + // console.log(res) + // }) + add({ + btmType:'wupin', + 'conditionMap[oid]':'D49A28F3-3740-D0EF-A3C6-5A71CA6978CC' + }).then(res=>{ + console.log(res) + }) + } + } +} +</script> + +<style scoped> + +</style> + +<!--mdmEngineController/getTableDataByOids?page=1&limit=-1&btmType=wupin&conditionMap%5B%27oid%27%5D=90DC514B-396D-9664-67D0-1587640FE15E&_=1687773044552--> +<!--mdmEngineController/getTableDataByOids?conditionMap%5Boid%5D=D49A28F3-3740-D0EF-A3C6-5A71CA6978CC--> diff --git a/Source/UBCS-WEB/src/main.js b/Source/UBCS-WEB/src/main.js index 4da7c3d..fe04f15 100644 --- a/Source/UBCS-WEB/src/main.js +++ b/Source/UBCS-WEB/src/main.js @@ -51,6 +51,7 @@ import MasterTree from "@/components/Master/MasterTree"; import FlowPath from "@/components/template/FlowPath"; import Stage from "@/components/template/Stage"; +import businesswork from "@/components/work/BusinessWork" // 灏嗗伐鍏峰嚱鏁版坊鍔犲埌鍏ㄥ眬 import utilFunc from './util/func' @@ -104,6 +105,7 @@ Vue.component('FlowPath',FlowPath) Vue.component('Stage',Stage) Vue.component('Divider', Divider) +Vue.component('businesswork', businesswork) // 鍔犺浇鐩稿叧url鍦板潃 Object.keys(urls).forEach(key => { diff --git a/Source/UBCS-WEB/src/page/login/index.vue b/Source/UBCS-WEB/src/page/login/index.vue index 5e47bb9..a66f092 100644 --- a/Source/UBCS-WEB/src/page/login/index.vue +++ b/Source/UBCS-WEB/src/page/login/index.vue @@ -66,7 +66,6 @@ name: "login", components: { userLogin, - thirdLogin, topLang, topColor diff --git a/Source/UBCS-WEB/src/page/login/userlogin.vue b/Source/UBCS-WEB/src/page/login/userlogin.vue index 7e52c25..f3b99c5 100644 --- a/Source/UBCS-WEB/src/page/login/userlogin.vue +++ b/Source/UBCS-WEB/src/page/login/userlogin.vue @@ -229,7 +229,7 @@ }, handleLogin: function () { this.userInfo = this.$store.state.upadatastatus - //console.log(this.userInfo) + localStorage.setItem('username',this.loginForm.username) this.$refs.loginForm.validate(valid => { if (valid) { const loading = this.$loading({ diff --git a/Source/UBCS-WEB/src/views/work/process/leave/handle.vue b/Source/UBCS-WEB/src/views/work/process/leave/handle.vue index 665405d..9bf8b4a 100644 --- a/Source/UBCS-WEB/src/views/work/process/leave/handle.vue +++ b/Source/UBCS-WEB/src/views/work/process/leave/handle.vue @@ -5,7 +5,7 @@ <el-card class="dialogwarp_tab_card"> <el-tabs v-model="activeName" @tab-click="handleClick"> <el-tab-pane label="涓氬姟鏁版嵁淇℃伅" name="first"> - + <businesswork :oid="oid" :templateId="templateId"></businesswork> </el-tab-pane> <el-tab-pane label="娴佺▼璺熻釜" name="second"> <avue-crud :data="flowList" :option="option" ref="crud"> @@ -75,6 +75,8 @@ export default { data() { return { + oid:'', + templateId:'', taskId: '', businessId: '', processInstanceId: '', @@ -138,6 +140,8 @@ async apiGetBtnTask(id) { const response = await getBtnTask({ processInstanceId: id }) const res = response.data + this.oid=res.data.variables.ids; + this.templateId=res.data.variables.templateId; if (res.success) { console.log(res) this.btnList = res.data.toTasks diff --git a/Source/UBCS-WEB/vue.config.js b/Source/UBCS-WEB/vue.config.js index d9634f7..40853d9 100644 --- a/Source/UBCS-WEB/vue.config.js +++ b/Source/UBCS-WEB/vue.config.js @@ -25,15 +25,16 @@ port: 38000, proxy: { '/api': { - //鏈湴鏈嶅姟鎺ュ彛鍦板潃 // target: 'http://localhost:37000', + // target: 'http://localhost:37000', + // target: 'http://192.168.1.51:37000', // target: 'http://192.168.1.46:37000', - //target: 'http://192.168.1.46:37000', // target: 'http://dev.vci-tech.com:37000', - // target: 'http://192.168.1.104:37000', + // target: 'http://192.168.1.51:37000/', + // target: 'http://192.168.1.104:37000', // target: 'http://192.168.1.63:37000', //target: 'http://192.168.3.7:37000', - //target: 'http://dev.vci-tech.com:37000', + // target: 'http://dev.vci-tech.com:37000', //target: 'http://192.168.1.51:37000/', target:'http://192.168.1.104:37000', //杩滅▼婕旂ず鏈嶅姟鍦板潃,鍙敤浜庣洿鎺ュ惎鍔ㄩ」鐩� -- Gitblit v1.9.3