From e89438773fc23ad67be9d3e4f5b4f068a2439606 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期三, 28 六月 2023 16:48:34 +0800
Subject: [PATCH] 主题库布局和行编辑修改
---
Source/UBCS-WEB/src/api/MasterData/master.js | 9
Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue | 7
Source/UBCS-WEB/src/api/work/businese.js | 9
Source/UBCS-WEB/src/views/work/process/leave/handle.vue | 6
Source/UBCS-WEB/vue.config.js | 13
Source/UBCS-WEB/src/components/work/BusinessWork.vue | 38 +-
Source/UBCS-WEB/src/components/Tree/TemplatePro.vue | 3
Source/UBCS-WEB/src/components/Tree/attrCrud.vue | 889 +++++++++++++++++++++++++++-------------------------
8 files changed, 508 insertions(+), 466 deletions(-)
diff --git a/Source/UBCS-WEB/src/api/MasterData/master.js b/Source/UBCS-WEB/src/api/MasterData/master.js
index 42f1b6c..6480a77 100644
--- a/Source/UBCS-WEB/src/api/MasterData/master.js
+++ b/Source/UBCS-WEB/src/api/MasterData/master.js
@@ -9,3 +9,12 @@
}
})
}
+export const defaultReferDataGrid = (params) => {
+ return request({
+ url: '/api/ubcs-code/mdmEngineController/defaultReferDataGrid',
+ method: 'get',
+ params:{
+ ...params
+ }
+ })
+}
diff --git a/Source/UBCS-WEB/src/api/work/businese.js b/Source/UBCS-WEB/src/api/work/businese.js
index 011c585..5ac038b 100644
--- a/Source/UBCS-WEB/src/api/work/businese.js
+++ b/Source/UBCS-WEB/src/api/work/businese.js
@@ -2,15 +2,6 @@
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:{
diff --git a/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue
index 48731fd..e9fd52a 100644
--- a/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue
+++ b/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue
@@ -289,9 +289,9 @@
// 杞崲鏁版嵁true鍜宖alse
formatBoolean(row, column) {
if (column.property === "xiaoshouwl"
- ||column.property === "shifoupihaoguanli"
- ||column.property === "caigouwl"
- ||column.property === "kucunwl"
+ ||column.property === "shifoupihaoguanli"
+ ||column.property === "caigouwl"
+ ||column.property === "kucunwl"
||column.property === "passing") {
return row[column.property] =='true'? "鏄�" : "鍚�";
}
@@ -441,6 +441,7 @@
this.rowOid = "";
}
this.selectRow = row;
+ this.parameter.ids = [];
row.forEach((item) => {
this.parameter.ids.push(item.oid);
});
diff --git a/Source/UBCS-WEB/src/components/Tree/TemplatePro.vue b/Source/UBCS-WEB/src/components/Tree/TemplatePro.vue
index 034e42f..714d5d0 100644
--- a/Source/UBCS-WEB/src/components/Tree/TemplatePro.vue
+++ b/Source/UBCS-WEB/src/components/Tree/TemplatePro.vue
@@ -45,8 +45,7 @@
methods: {
// Tab鏍忓垏鎹�
handleChange(column) {
- this.type = column
- this.$message.success(JSON.stringify(column))
+ this.type = column;
},
}
}
diff --git a/Source/UBCS-WEB/src/components/Tree/attrCrud.vue b/Source/UBCS-WEB/src/components/Tree/attrCrud.vue
index 9c78bd5..7649338 100644
--- a/Source/UBCS-WEB/src/components/Tree/attrCrud.vue
+++ b/Source/UBCS-WEB/src/components/Tree/attrCrud.vue
@@ -1,48 +1,169 @@
<template>
- <avue-crud :data="ProData" :option="option" @sort-change="sortChange" @row-update="addUpdate"
- @cell-click="handleRowClick" @select="selectHandle" @row-del="CrudRowDel">
- <template slot="menuLeft">
- <el-button v-if="attrEditVisible == false && attrFlagChiledren==false" size="small" type="primary" @click="busineHandle">锛� 娣诲姞 {{msg}}</el-button>
- <el-dialog :visible.sync="addVisible" append-to-body title="浠庝笟鍔＄被鍨嬩腑閫夋嫨灞炴��" >
- <avue-crud :data="businessData" :option="businessOption" @select="businessSelect">
- <template slot="menuLeft">
- <div style="display: flex;">
- <el-select>
- <el-option>灞炴�ц嫳鏂囧悕绉�</el-option>
- <el-option>灞炴�т腑鏂囧悕绉�</el-option>
- </el-select>
- <el-input style="width: 300px;margin-left: 20px"></el-input>
- <el-button size="small" style="margin-left: 10px">鏌ヨ</el-button>
- </div>
+ <!-- <avue-crud :data="ProData" :option="option" @sort-change="sortChange" @row-update="addUpdate"-->
+ <!-- @cell-click="handleRowClick" @select="selectHandle" @row-del="CrudRowDel">-->
+ <div>
+ <div style="display: flex;flex-wrap: wrap;" v-if="this.crudArray.length>=1">
+ <!--鏂板-->
+ <el-button v-if="attrEditVisible == false && attrFlagChiledren==false" size="small" type="primary"
+ @click="busineHandle">锛� 娣诲姞 {{ msg }}
+ </el-button>
+ <!-- 鍏ㄥ睆缂栬緫-->
+ <el-button v-if=" attrEditVisible == false && attrFlagChiledren==false" size="small" @click="fullscreenHandle">
+ 鍏ㄥ睆缂栬緫
+ </el-button>
+ <!-- 缁勫悎瑙勫垯-->
+ <el-button size="small" @click="isShowHandler">缁勫悎瑙勫垯</el-button>
+ <!-- 楠岃瘉瑙勫垯-->
+ <el-button icon="el-icon-info" size="small" @click="rulesVisible=true">楠岃瘉瑙勫垯</el-button>
+ <!-- 灞炴�у垎缁�-->
+ <el-button icon="el-icon-menu" size="small" @click="attrVisibleHandle">灞炴�у垎缁�</el-button>
+ <!-- 鍒嗙被娉ㄥ叆-->
+ <el-button icon="el-icon-magic-stick" size="small" @click="injectBtn">鍒嗙被娉ㄥ叆</el-button>
+ <!-- 鏋氫妇娉ㄥ叆-->
+ <el-button size="small" @click="enmuVisHandle">鏋氫妇娉ㄥ叆</el-button>
+ <!-- 绾ц仈灞炴��-->
+ <el-button size="small" @click="CascadeHandle">绾ц仈灞炴��</el-button>
+ <!-- 棰勮鎺掑簭-->
+ <el-button size="small">棰勮鎺掑簭</el-button>
+ <!-- 淇濆瓨-->
+ <el-button size="small" @click="addsHandler">淇濆瓨</el-button>
+ <!-- 鍒犻櫎-->
+ <el-button size="small" @click="CrudRemove">鍒犻櫎</el-button>
+ <!-- 閲嶇疆-->
+ <el-button size="small" @click="reset">閲嶇疆</el-button>
+ <!-- 鍚屾鍒板叾浠栨ā鏉�-->
+ <el-button size="small"@click="syncHandle">鍚屾鍒板叾浠栨ā鏉�</el-button>
+ <!-- 缂栫爜鐢宠棰勮-->
+ <el-button size="small" @click="applicationHandle" style="">缂栫爜鐢宠棰勮</el-button>
+ <!-- 楠岃瘉瑙勫垯-->
+
+ </div>
+<!-- 寮圭獥-->
+ <div>
+ <!-- 缂栫爜鐢宠棰勮-->
+ <FormTemplateDialog
+ :codeClassifyOid="this.codeClassifyOid"
+ :templateOid="this.crudOid"
+ :type="add"
+ :visible.sync="addvisible"
+ >
+ </FormTemplateDialog>
+ <!-- 绾ц仈灞炴��-->
+ <el-dialog :visible.sync="CascadeVisible" append-to-body title="璇烽�夋嫨绾ц仈灞炴��">
+ <avue-crud ref="crud" :data="CascadeData" :option="CascadeOption" @row-click="CascaderowClick">
+ <template slot="radio"
+ slot-scope="{row}">
+ <el-radio v-model="selectRow"
+ :label="row.$index">
+ </el-radio>
</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 style="display: flex ;padding-top: 18px;justify-content: right">
+ <el-button size="small" type="primary" @click="CascadeAddHandle">纭畾</el-button>
+ <el-button size="small" style="margin-left: 10px" @click="casRemove">娓呴櫎鍐呭</el-button>
+ <el-button size="small" style="margin-left: 10px" @click="CascadeVisible=false">鍙栨秷</el-button>
</div>
</el-dialog>
- </template>
- <!-- 鍏ㄥ睆缂栬緫-->
- <template slot="menuLeft">
- <el-button v-if=" attrEditVisible == false && attrFlagChiledren==false" size="small" @click="fullscreenHandle">鍏ㄥ睆缂栬緫</el-button>
- <el-dialog :visible.sync="attrEditVisible" append-to-body fullscreen="true">
- <attrCrud :ProData="this.ProData" :attrFlagChiledren="this.attrFlag"></attrCrud>
+ <!-- 鏋氫妇娉ㄥ叆-->
+ <el-dialog :visible.sync="enumVisible" append-to-body title="鏋氫妇娉ㄥ叆">
+ <!-- 娓叉煋琛ㄦ牸鍙婃寜閽� -->
+ <!-- 娓叉煋琛ㄦ牸鍙婃寜閽� -->
+ <div>
+ <el-button icon="el-icon-plus" type="primary" @click="addRow">鏂板</el-button>
+ <el-table :data="tableData" style="width: 100%" @cell-click="handleCellClick"
+ @selection-change="handleSelectionChange">
+ <!-- 娓叉煋琛ㄦ牸鍒楀強浼犲弬 -->
+ <el-table-column label="搴忓彿" type="index"></el-table-column>
+ <el-table-column
+ type="selection"
+ width="55">
+ </el-table-column>
+ <el-table-column label="閫夐」鍊�" prop="key">
+ <template slot-scope="{ row }">
+ <!-- 缂栬緫鍜屽睍绀洪�昏緫 -->
+ <el-input v-if="editingRow === row && editShow == 'key'" v-model="row.key" @blur="saveRow"></el-input>
+ <span v-else>{{ row.key }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column label="閫夐」涓枃鏍囩" prop="value">
+ <template slot-scope="{ row }">
+ <!-- 缂栬緫鍜屽睍绀洪�昏緫 -->
+ <el-input v-if="editingRow === row && editShow == 'value'" v-model="row.value"
+ @blur="saveRow"></el-input>
+ <span v-else>{{ row.value }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column fixed="right" label="鎿嶄綔" width="120">
+ <template slot-scope="scope">
+ <el-button size="small" type="text" @click.native.prevent="enumDeleteRow(scope.$index, tableData)">
+ 绉婚櫎
+ </el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ <template>
+ <div style="display: flex;justify-content: right;margin-top: 15px">
+ <el-button size="small" type="primary" @click="enumAddHandle">淇濆瓨</el-button>
+ <el-button size="small" @click="enumVisible=false">鍙栨秷</el-button>
+ </div>
+ </template>
+ </div>
</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>
-
- </template>
- <!-- 楠岃瘉瑙勫垯-->
- <template slot="menuLeft">
- <el-button icon="el-icon-info" size="small" @click="rulesVisible=true">楠岃瘉瑙勫垯</el-button>
+ <!-- 鍒嗙被娉ㄥ叆-->
+ <el-dialog :visible.sync="injectVisible" append-to-body class="mydialog"
+ style="width: 1400px; left:14vw ;top: 10vh;" title="鍒嗙被娉ㄥ叆">
+ <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锛氬綍鍏ヨ祫婧愭暟鎹椂锛岃灞炴�у搴旂殑鍊兼牴鎹眰绾у叧绯诲幓瀵瑰簲鐨勫垎绫婚噷鍙�
+ <br/>4锛氬眰绾у繀椤绘槸澶т簬0鐨勬暣鏁板��
+ </div>
+ <div style="padding-top: 15px;padding-left: 35px">
+ <el-form ref="injectForm" label-width="80px">
+ <el-form-item label="娉ㄥ叆绫诲瀷">
+ <el-radio-group v-model="injectOption.type">
+ <el-radio label="鍒嗙被鍚嶇О"></el-radio>
+ <el-radio label="鍒嗙被浠ｅ彿"></el-radio>
+ </el-radio-group>
+ </el-form-item>
+ <el-form-item label="灞傜骇璁剧疆">
+ <el-radio-group v-model="injectOption.set">
+ <el-radio label="鏈�灏忓眰"></el-radio>
+ <el-radio label="鎸囧畾灞�"></el-radio>
+ <el-input-number v-if="this.injectOption.set == '鎸囧畾灞�'" v-model="injectOption.injectNum" :max="10" :min="0"
+ controls-position="right"></el-input-number>
+ </el-radio-group>
+ </el-form-item>
+ <el-form-item label="鍙慨鏀�">
+ <el-radio-group v-model="injectOption.change">
+ <el-radio label="鏄�"></el-radio>
+ <el-radio label="鍚�"></el-radio>
+ </el-radio-group>
+ </el-form-item>
+ </el-form>
+ </div>
+ </div>
+ <div style="display: flex;justify-content: flex-end">
+ <el-button size="small" type="primary" @click="injectAddHandle">纭畾</el-button>
+ <el-button size="small" @click="injectHandleReset">娓呴櫎鍐呭</el-button>
+ <el-button size="small" @click="injectRemove">鍙栨秷</el-button>
+ </div>
+ </el-dialog>
+ <!-- 灞炴�у垎缁�-->
+ <el-dialog :visible.sync="attrVisible" append-to-body style="width: 800px; left:30vw;top: 10vh ;"
+ title="杈撳叆鍒嗙粍鐨勫悕绉�">
+ <el-form ref="form" label-width="70px">
+ <el-form-item label="灞炴�у垎缁�">
+ <el-input v-model="attrModel"></el-input>
+ </el-form-item>
+ <div style="display: flex;justify-content: flex-end">
+ <el-button size="small" type="primary" @click="attrHandle">鎻愪氦</el-button>
+ <el-button size="small" @click="attrRemove">娓呯┖</el-button>
+ </div>
+ </el-form>
+ </el-dialog>
+ <!-- 楠岃瘉瑙勫垯-->
<el-dialog :visible.sync="rulesVisible" append-to-body title="灞炴�ч獙璇佽鍒�">
<el-container style="border: 1px solid #9e3333;padding: 10px">
<el-aside style="width: 330px;">
@@ -80,216 +201,131 @@
</el-main>
</el-container>
</el-dialog>
- </template>
- <template slot="keyattrflag">
- <el-switch></el-switch>
- </template>
- <!-- 灞炴�у垎缁�-->
- <template slot="menuLeft">
- <el-button icon="el-icon-menu" size="small" @click="attrVisibleHandle">灞炴�у垎缁�</el-button>
-
- <el-dialog :visible.sync="attrVisible" append-to-body style="width: 800px; left:30vw;top: 10vh ;"
- title="杈撳叆鍒嗙粍鐨勫悕绉�">
- <el-form ref="form" label-width="70px">
- <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>
- </el-form>
+ <!-- 鍏ㄥ睆缂栬緫-->
+ <el-dialog :visible.sync="attrEditVisible" append-to-body fullscreen="true">
+ <attrCrud :ProData="this.ProData" :attrFlagChiledren="this.attrFlag"></attrCrud>
</el-dialog>
- </template>
- <!-- 鍒嗙被娉ㄥ叆-->
- <template slot="menuLeft">
- <el-button icon="el-icon-magic-stick" size="small" @click="injectBtn">鍒嗙被娉ㄥ叆</el-button>
- <el-dialog :visible.sync="injectVisible" append-to-body class="mydialog"
- style="width: 1400px; left:14vw ;top: 10vh;" title="鍒嗙被娉ㄥ叆">
- <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锛氬綍鍏ヨ祫婧愭暟鎹椂锛岃灞炴�у搴旂殑鍊兼牴鎹眰绾у叧绯诲幓瀵瑰簲鐨勫垎绫婚噷鍙�
- <br/>4锛氬眰绾у繀椤绘槸澶т簬0鐨勬暣鏁板��
- </div>
- <div style="padding-top: 15px;padding-left: 35px">
- <el-form ref="injectForm" label-width="80px">
- <el-form-item label="娉ㄥ叆绫诲瀷">
- <el-radio-group v-model="injectOption.type">
- <el-radio label="鍒嗙被鍚嶇О"></el-radio>
- <el-radio label="鍒嗙被浠ｅ彿"></el-radio>
- </el-radio-group>
- </el-form-item>
- <el-form-item label="灞傜骇璁剧疆">
- <el-radio-group v-model="injectOption.set">
- <el-radio label="鏈�灏忓眰"></el-radio>
- <el-radio label="鎸囧畾灞�"></el-radio>
- <el-input-number v-model="injectOption.injectNum" controls-position="right" :min="0" :max="10" v-if="this.injectOption.set == '鎸囧畾灞�'"></el-input-number>
- </el-radio-group>
- </el-form-item>
- <el-form-item label="鍙慨鏀�">
- <el-radio-group v-model="injectOption.change">
- <el-radio label="鏄�"></el-radio>
- <el-radio label="鍚�"></el-radio>
- </el-radio-group>
- </el-form-item>
- </el-form>
- </div>
- </div>
- <div style="display: flex;justify-content: flex-end">
- <el-button size="small" type="primary" @click="injectAddHandle">纭畾</el-button>
- <el-button size="small" @click="injectHandleReset">娓呴櫎鍐呭</el-button>
- <el-button size="small" @click="injectRemove">鍙栨秷</el-button>
- </div>
- </el-dialog>
- </template>
- <!-- 鏋氫妇娉ㄥ叆-->
- <template slot="menuLeft">
- <el-button size="small" @click="enmuVisHandle">鏋氫妇娉ㄥ叆</el-button>
- <el-dialog :visible.sync="enumVisible" append-to-body title="鏋氫妇娉ㄥ叆">
- <!-- 娓叉煋琛ㄦ牸鍙婃寜閽� -->
- <!-- 娓叉煋琛ㄦ牸鍙婃寜閽� -->
- <div>
- <el-button icon="el-icon-plus" type="primary" @click="addRow">鏂板</el-button>
- <el-table :data="tableData" style="width: 100%" @cell-click="handleCellClick" @selection-change="handleSelectionChange">
- <!-- 娓叉煋琛ㄦ牸鍒楀強浼犲弬 -->
- <el-table-column label="搴忓彿" type="index"></el-table-column>
- <el-table-column
- type="selection"
- width="55">
- </el-table-column>
- <el-table-column label="閫夐」鍊�" prop="key">
- <template slot-scope="{ row }">
- <!-- 缂栬緫鍜屽睍绀洪�昏緫 -->
- <el-input v-if="editingRow === row && editShow == 'key'" v-model="row.key" @blur="saveRow"></el-input>
- <span v-else>{{ row.key }}</span>
- </template>
- </el-table-column>
- <el-table-column label="閫夐」涓枃鏍囩" prop="value">
- <template slot-scope="{ row }">
- <!-- 缂栬緫鍜屽睍绀洪�昏緫 -->
- <el-input v-if="editingRow === row && editShow == 'value'" v-model="row.value" @blur="saveRow"></el-input>
- <span v-else>{{ row.value }}</span>
- </template>
- </el-table-column>
- <el-table-column fixed="right" label="鎿嶄綔" width="120">
- <template slot-scope="scope">
- <el-button size="small" type="text" @click.native.prevent="enumDeleteRow(scope.$index, tableData)">
- 绉婚櫎
- </el-button>
- </template>
- </el-table-column>
- </el-table>
- <template>
- <div style="display: flex;justify-content: right;margin-top: 15px">
- <el-button type="primary" size="small" @click="enumAddHandle">淇濆瓨</el-button>
- <el-button size="small" @click="enumVisible=false">鍙栨秷</el-button>
+ <!-- 缁勫悎瑙勫垯-->
+ <formula-editor :systemVariableTableData="systemVariableTableData"
+ :thisSceneTableData="thisSceneTableData"
+ :visible.sync="isShowformulaEdit"
+ @updateFormulaContent="updataFormlaContent"
+ ></formula-editor>
+ <!-- 鏂板 -->
+ <el-dialog :visible.sync="addVisible" append-to-body title="浠庝笟鍔＄被鍨嬩腑閫夋嫨灞炴��">
+ <avue-crud :data="businessData" :option="businessOption" @select="businessSelect">
+ <template slot="menuLeft">
+ <div style="display: flex;">
+ <el-select>
+ <el-option>灞炴�ц嫳鏂囧悕绉�</el-option>
+ <el-option>灞炴�т腑鏂囧悕绉�</el-option>
+ </el-select>
+ <el-input style="width: 300px;margin-left: 20px"></el-input>
+ <el-button size="small" style="margin-left: 10px">鏌ヨ</el-button>
</div>
- </template>
- </div>
- </el-dialog>
- </template>
- <!-- 绾ц仈灞炴��-->
- <template slot="menuLeft">
- <el-button size="small" @click="CascadeHandle">绾ц仈灞炴��</el-button>
- <el-dialog :visible.sync="CascadeVisible" append-to-body title="璇烽�夋嫨绾ц仈灞炴��">
- <avue-crud ref="crud" :data="CascadeData" :option="CascadeOption" @row-click="CascaderowClick">
- <template slot="radio"
- slot-scope="{row}">
- <el-radio v-model="selectRow"
- :label="row.$index">
- </el-radio>
+
</template>
</avue-crud>
- <div style="display: flex ;padding-top: 18px;justify-content: right">
- <el-button size="small" type="primary" @click="CascadeAddHandle">纭畾</el-button>
- <el-button size="small" style="margin-left: 10px" @click="casRemove">娓呴櫎鍐呭</el-button>
- <el-button size="small" style="margin-left: 10px" @click="CascadeVisible=false">鍙栨秷</el-button>
+ <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 size="small">棰勮鎺掑簭</el-button>
- </template>
- <!-- 淇濆瓨-->
- <template slot="menuLeft">
- <el-button size="small" @click="addsHandler">淇濆瓨</el-button>
- </template>
- <!-- 鍒犻櫎-->
- <template slot="menuLeft">
- <el-button size="small" @click="CrudRemove">鍒犻櫎</el-button>
- </template>
- <!-- 閲嶇疆-->
- <template slot="menuLeft">
- <el-button size="small" @click="reset">閲嶇疆</el-button>
- </template>
- <!-- 鍚屾鍒板叾浠栨ā鏉�-->
- <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"
+ </div>
+ <el-table :data="ProData"
+ style="width: 100%"
+ @cell-click="handleCellClicks"
+ @select="selectHandle"
+ v-if="this.crudArray.length>=1"
+
+ >
+ <el-table-column
+ type="selection"
+ width="55">
+ </el-table-column>
+ <el-table-column fixed label="搴忓彿" type="index" width="55"></el-table-column>
+ <el-table-column v-for="item in this.option.column" :key="item.id"
+ :label="item.label"
+ :prop="item.prop"
+ :width="item.label.length >=4 ?'150':item.label.length==3 ?'120':'90'"
+ :show-overflow-tooltip="true"
+ align="center"
>
- </FormTemplateDialog>
- </template>
- </avue-crud>
+ <template slot-scope="{ row }">
+ <el-input v-if="editingRows === row && editShows== item.prop" v-model="row[item.prop]"
+ @blur="saveRows"></el-input>
+ <span v-else>{{ row[item.prop] }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column
+ fixed="right"
+ label="鎿嶄綔"
+ width="120">
+ <template slot-scope="scope">
+ <el-button
+ size="small"
+ type="text"
+ @click.native.prevent="CrudRowDel(scope.row)">
+ 绉婚櫎
+ </el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ </div>
+ <!-- </avue-crud>-->
</template>
<script>
-import {AttrByBtm,gridCodeClassifyTemplateAttr,batchAddSave,copyto} from '@/api/template/templateAttr'
+import {AttrByBtm, gridCodeClassifyTemplateAttr, batchAddSave, copyto} from '@/api/template/templateAttr'
+
export default {
name: "attrCrud .vue",
// props: ['ProData','crudOid','crudArray','Formlist','codeClassifyOid'],
- props:{
- ProData:{
- type:Array,
+ props: {
+ ProData: {
+ type: Array,
},
- crudOid:{
- type:String,
- default:''
+ crudOid: {
+ type: String,
+ default: ''
},
- crudArray:{
- type:Array,
+ crudArray: {
+ type: Array,
},
- Formlist:{
- type:Array,
+ Formlist: {
+ type: Array,
},
- codeClassifyOid:{
- type:String,
- default:''
+ codeClassifyOid: {
+ type: String,
+ default: ''
},
- attrFlagChiledren:{
- type:Boolean,
- default:false
+ attrFlagChiledren: {
+ type: Boolean,
+ default: false
},
},
data() {
return {
- attrFlag:false,
+ editingRows: null,
+ editShows:"",
+ attrFlag: false,
//缂栫爜鐢宠棰勮option
- applicationoption:{
- column:[]
+ applicationoption: {
+ column: []
},
// 缂栫爜鐢宠棰勮data
- applicationData:[],
+ applicationData: [],
//涓氬姟绫诲瀷鍗曢�夋暟缁�
- busineSelectList:[],
+ busineSelectList: [],
//涓氬姟绫诲瀷娣诲姞鏁版嵁
- busineAddList:{},
+ busineAddList: {},
//琛ㄦ牸鍗曢�夋暟缁�
- CrudSelect:[],
+ CrudSelect: [],
//琛ㄦ牸oid
- CrudOid:"",
+ CrudOid: "",
//鍦烘櫙鍙橀噺
- thisSceneTableData:[
+ thisSceneTableData: [
{
formula: "lcstatus",
desc: "鐘舵��",
@@ -316,67 +352,67 @@
},
],
// 绯荤粺鍙橀噺
- systemVariableTableData:[
+ systemVariableTableData: [
{
formula: "#CURRENTUSER.OID#",
desc: "褰撳墠鐢ㄦ埛鐨勪富閿�",
},
{
- formula:"#CURRENTUSER.ID",
- desc:"褰撳墠鐢ㄦ埛鐨勮处鎴�"
+ formula: "#CURRENTUSER.ID",
+ desc: "褰撳墠鐢ㄦ埛鐨勮处鎴�"
},
{
- formula:"#CURRENTTIME#",
- desc:"褰撳墠鏃堕棿"
+ formula: "#CURRENTTIME#",
+ desc: "褰撳墠鏃堕棿"
},
{
- formula:"#CURRENTDATE#",
- desc:"褰撳墠鏃ユ湡"
+ formula: "#CURRENTDATE#",
+ desc: "褰撳墠鏃ユ湡"
},
{
- formula:"#CURRENTDATETIME#",
- desc:"褰撳墠鏃ユ湡鏃堕棿"
+ formula: "#CURRENTDATETIME#",
+ desc: "褰撳墠鏃ユ湡鏃堕棿"
},
{
- formula:"#CURRENTUSER_NAME#",
- desc:"褰撳墠鐢ㄦ埛鐨勫鍚�"
+ formula: "#CURRENTUSER_NAME#",
+ desc: "褰撳墠鐢ㄦ埛鐨勫鍚�"
},
{
- formula:"#CURRENTUSER.SECRETGRADE#",
- desc:"褰撳墠鐢ㄦ埛瀵嗙骇"
+ formula: "#CURRENTUSER.SECRETGRADE#",
+ desc: "褰撳墠鐢ㄦ埛瀵嗙骇"
},
{
- formula:"#CURRENTUSER.IPSECRET#",
- desc:"褰撳墠鐢ㄦ埛鐨処P瀵嗙骇"
+ formula: "#CURRENTUSER.IPSECRET#",
+ desc: "褰撳墠鐢ㄦ埛鐨処P瀵嗙骇"
},
{
- formula:"#CURRENTUSER.BUSINESSUNIT#",
- desc:"褰撳墠鐢ㄦ埛鎵�灞炰笟鍔″崟鍏�"
+ formula: "#CURRENTUSER.BUSINESSUNIT#",
+ desc: "褰撳墠鐢ㄦ埛鎵�灞炰笟鍔″崟鍏�"
},
{
- formula:"#CURRENTUSER.BUSINESSUNITNAME#",
- desc:"褰撳墠鐢ㄦ埛鎵�灞炰笟鍔″崟鍏冨悕绉�"
+ formula: "#CURRENTUSER.BUSINESSUNITNAME#",
+ desc: "褰撳墠鐢ㄦ埛鎵�灞炰笟鍔″崟鍏冨悕绉�"
},
{
- formula:"#CURRENTUSER.GROUPOID#",
- desc:"褰撳墠鐢ㄦ埛鐨勯儴闂ㄤ富閿�"
+ formula: "#CURRENTUSER.GROUPOID#",
+ desc: "褰撳墠鐢ㄦ埛鐨勯儴闂ㄤ富閿�"
},
{
- formula:"#CURRENTUSER.GROUPNAME#",
- desc:"褰撳墠鐢ㄦ埛鎵�灞為儴闂ㄥ悕绉�"
+ formula: "#CURRENTUSER.GROUPNAME#",
+ desc: "褰撳墠鐢ㄦ埛鎵�灞為儴闂ㄥ悕绉�"
},
{
- formula:"#CURRENTUSER.EMAIL#",
- desc:"褰撳墠鐢ㄦ埛閭欢鍦板潃"
+ formula: "#CURRENTUSER.EMAIL#",
+ desc: "褰撳墠鐢ㄦ埛閭欢鍦板潃"
},
{
- formula:"#CURRENTUSER.ROLENAME#",
- desc:"褰撳墠鐢ㄦ埛鎵�灞炶鑹插悕绉� "
+ formula: "#CURRENTUSER.ROLENAME#",
+ desc: "褰撳墠鐢ㄦ埛鎵�灞炶鑹插悕绉� "
},
],
CascadeVisible: false,
attrEditVisible: false,
- isShowformulaEdit:false,
+ isShowformulaEdit: false,
// 绾ц仈鍗曢��
selectRow: '',
// 绾ц仈data
@@ -417,60 +453,60 @@
{
label: '鍏抽敭灞炴��',
prop: 'keyAttrFlag',
- type:'text',
- dicData:[
+ type: 'text',
+ dicData: [
{
- label:"鏄�",
- value:'true'
+ label: "鏄�",
+ value: 'true'
},
{
- label:"鍚�",
- value:'false'
+ label: "鍚�",
+ value: 'false'
}
]
},
{
label: '鏌ヨ灞炴��',
prop: 'queryAttrFlag',
- type:'text',
- dicData:[
+ type: 'text',
+ dicData: [
{
- label:"鏄�",
- value:'true'
+ label: "鏄�",
+ value: 'true'
},
{
- label:"鍚�",
- value:'false'
+ label: "鍚�",
+ value: 'false'
}
]
},
{
label: '楂樼骇鏌ヨ灞炴��',
prop: 'seniorQueryAttrFlag',
- type:'text',
- dicData:[
+ type: 'text',
+ dicData: [
{
- label:"鏄�",
- value:'true'
+ label: "鏄�",
+ value: 'true'
},
{
- label:"鍚�",
- value:'false'
+ label: "鍚�",
+ value: 'false'
}
]
},
{
label: '鐩镐技鏌ラ噸灞炴��',
prop: 'sameRepeatAttrFlag',
- type:'text',
- dicData:[
+ type: 'text',
+ dicData: [
{
- label:"鏄�",
- value:'true'
+ label: "鏄�",
+ value: 'true'
},
{
- label:"鍚�",
- value:'false'
+ label: "鍚�",
+ value: 'false'
}
]
},
@@ -485,45 +521,45 @@
{
label: '蹇呰緭',
prop: 'requireFlag',
- type:'text',
- dicData:[
+ type: 'text',
+ dicData: [
{
- label:"鏄�",
- value:'true'
+ label: "鏄�",
+ value: 'true'
},
{
- label:"鍚�",
- value:'false'
+ label: "鍚�",
+ value: 'false'
}
]
},
{
label: "琛ㄥ崟鏄剧ず",
prop: "formDisplayFlag",
- type:'text',
- dicData:[
+ type: 'text',
+ dicData: [
{
- label:"鏄�",
- value:'true'
+ label: "鏄�",
+ value: 'true'
},
{
- label:"鍚�",
- value:'false'
+ label: "鍚�",
+ value: 'false'
}
]
},
{
label: "鍒楄〃鏄剧ず",
prop: "tableDisplayFlag",
- type:'text',
- dicData:[
+ type: 'text',
+ dicData: [
{
- label:"鏄�",
- value:'true'
+ label: "鏄�",
+ value: 'true'
},
{
- label:"鍚�",
- value:'false'
+ label: "鍚�",
+ value: 'false'
}
]
},
@@ -534,15 +570,15 @@
{
label: "鍒楄〃鎺掑簭",
prop: "sortAttrFlag",
- type:'text',
- dicData:[
+ type: 'text',
+ dicData: [
{
- label:"鏄�",
- value:'true'
+ label: "鏄�",
+ value: 'true'
},
{
- label:"鍚�",
- value:'false'
+ label: "鍚�",
+ value: 'false'
}
]
},
@@ -550,15 +586,15 @@
{
label: "澶氳鏂囨湰",
prop: "textAreaFlag",
- type:'text',
- dicData:[
+ type: 'text',
+ dicData: [
{
- label:"鏄�",
- value:'true'
+ label: "鏄�",
+ value: 'true'
},
{
- label:"鍚�",
- value:'false'
+ label: "鍚�",
+ value: 'false'
}
]
},
@@ -656,7 +692,7 @@
//鏋氫妇娉ㄥ叆
enumVisible: false,
//鏋氫妇娉ㄥ叆澶氶�変繚瀛樻暟缁�
- enumRow:[],
+ enumRow: [],
// 鍒嗙被娉ㄥ叆寮瑰嚭妗�
injectVisible: false,
// 娣诲姞寮瑰嚭妗�
@@ -666,18 +702,18 @@
//灞炴�у垎缁勫脊鍑烘
attrVisible: false,
//灞炴�у垎缁勮緭鍏ユ
- attrModel:"",
+ attrModel: "",
//褰撳墠鍗曢�夋ā鏉垮睘鎬�
- attrRow:{},
+ attrRow: {},
//缂栫爜鐢宠棰勮寮瑰嚭妗�
- addvisible:false,
+ addvisible: false,
//鍒嗙被娉ㄥ叆option
injectOption: {
- type:"鍒嗙被鍚嶇О",
- set:"鏈�灏忓眰",
- change:"鏄�",
+ type: "鍒嗙被鍚嶇О",
+ set: "鏈�灏忓眰",
+ change: "鏄�",
//鍒嗙被娉ㄥ叆璁℃暟鍣�
- injectNum:0,
+ injectNum: 0,
},
// 灞炴�ч獙璇佽緭鍏ユ
RulesForm: {
@@ -822,14 +858,14 @@
// 鏂板涓氬姟绫诲瀷
businessData: [],
businessOption: {
- indexClassName:"搴忓彿",
- indexLabelClassName:'搴忓彿',
+ indexClassName: "搴忓彿",
+ indexLabelClassName: '搴忓彿',
index: true,
border: true,
addBtn: false,
- menu:false,
- selection:true,
- height:500,
+ menu: false,
+ selection: true,
+ height: 500,
column: [
{
label: "灞炴�ц嫳鏂囧悕绉�",
@@ -878,8 +914,7 @@
]
},
//妯℃澘灞炴��
- data: [
- ],
+ data: [],
// 褰撳墠琛�
rowList: [],
// 褰撳墠鍗曞厓鏍�
@@ -889,7 +924,7 @@
index: true,
border: true,
editBtn: false,
- selection:true,
+ selection: true,
labelWidth: 110,
cellBtn: true,
cancelBtn: false,
@@ -1116,7 +1151,7 @@
width: 105,
},
],
- List:[]
+ List: []
}
}
},
@@ -1126,29 +1161,30 @@
},
methods: {
+
//灞炴�у垎缁勬寜閽�
- attrVisibleHandle(){
- if(this.CrudSelect.length>1){
+ attrVisibleHandle() {
+ if (this.CrudSelect.length > 1) {
this.$message.warning('鍙兘閫夋嫨涓�鏉℃ā鏉垮睘鎬�')
- }else if(this.CrudSelect<1){
+ } else if (this.CrudSelect < 1) {
this.$message.warning('璇烽�夋嫨涓�鏉℃ā鏉垮睘鎬�')
- }else if(this.CrudSelect.length === 1){
- this.attrVisible=true;
+ } else if (this.CrudSelect.length === 1) {
+ this.attrVisible = true;
}
},
//灞炴�у垎缁勬彁浜�
- attrHandle(){
- this.$set(this.attrRow,'attributeGroup',this.attrModel)
- this.attrModel=""
- this.attrVisible=false
+ attrHandle() {
+ this.$set(this.attrRow, 'attributeGroup', this.attrModel)
+ this.attrModel = ""
+ this.attrVisible = false
},
//灞炴�у垎缁勬竻绌�
- attrRemove(){
- this.attrModel=""
+ attrRemove() {
+ this.attrModel = ""
},
//琛ㄦ牸鏁版嵁
- CrudRend(){
- if(this.crudOid != ''){
+ CrudRend() {
+ if (this.crudOid != '') {
gridCodeClassifyTemplateAttr({'conditionMap[classifyTemplateOid]': this.crudOid}).then(res => {
this.ProData = res.data.data;
}).catch(res => {
@@ -1157,65 +1193,67 @@
}
},
//涓氬姟绫诲瀷淇濆瓨
- busineAddHandle(){
- if(this.busineSelectList.length>1){
+ busineAddHandle() {
+ if (this.busineSelectList.length > 1) {
this.$message.warning('璇烽�夋嫨涓�鏉′笟鍔＄被鍨嬫暟鎹�')
- }else {
- this.$set(this.busineAddList,'classifytemplateoid',this.crudOid)
- this.$set(this.busineAddList,'oid','')
+ } else {
+ this.$set(this.busineAddList, 'classifytemplateoid', this.crudOid)
+ this.$set(this.busineAddList, 'oid', '')
this.ProData.push(JSON.parse(JSON.stringify(this.busineAddList)))
- this.addVisible=false;
+ this.addVisible = false;
}
},
//涓氬姟绫诲瀷鍗曢��
- businessSelect(selection,row){
- this.busineSelectList=selection
- this.busineAddList=row
+ businessSelect(selection, row) {
+ this.busineSelectList = selection
+ this.busineAddList = row
},
// 浠庝笟鍔＄被鍨嬩腑閫夋嫨鏁版嵁
- busineHandle(){
- if(this.crudArray.length<1){
+ busineHandle() {
+ if (this.crudArray.length < 1) {
this.$message.error('璇烽�夋嫨涓�鏉℃ā鏉�')
- }else {
- this.addVisible=true;
- AttrByBtm({'conditionMap[oid]': this.crudOid}).then(res=>{
- this.businessData=res.data.data;
+ } else {
+ this.addVisible = true;
+ AttrByBtm({'conditionMap[oid]': this.crudOid}).then(res => {
+ this.businessData = res.data.data;
})
}
},
// 绾ц仈灞炴�ф寜閽�
- CascadeHandle(){
- if(this.CrudSelect.length >1){
+ CascadeHandle() {
+ if (this.CrudSelect.length > 1) {
this.$message.warning('鍙兘閫夋嫨涓�鏉℃ā鏉垮睘鎬�')
- }else if(this.CrudSelect.length<1){
+ } else if (this.CrudSelect.length < 1) {
this.$message.warning('璇烽�夋嫨涓�鏉℃ā鏉垮睘鎬�')
- }else if(this.CrudSelect.length === 1){
- this.CascadeVisible=true;
- gridCodeClassifyTemplateAttr({'conditionMap[classifyTemplateOid]': this.Formlist[0].oid,
- 'conditionMap[oid_notequal]':this.CrudOid
- }).then(res=>{
- this.CascadeData=res.data.data;
+ } else if (this.CrudSelect.length === 1) {
+ this.CascadeVisible = true;
+ gridCodeClassifyTemplateAttr({
+ 'conditionMap[classifyTemplateOid]': this.Formlist[0].oid,
+ 'conditionMap[oid_notequal]': this.CrudOid
+ }).then(res => {
+ this.CascadeData = res.data.data;
})
}
},
//琛ㄦ牸鍗曢��
- selectHandle(selection,row){
- this.CrudOid=row.oid;
- this.CrudSelect=selection;
- this.attrRow=row;
+ selectHandle(selection, row) {
+ this.CrudOid = row.oid;
+ this.CrudSelect = selection;
+ this.attrRow = row;
+ console.log('123',row,selection)
},
//淇濆瓨
- addsHandler(){
- batchAddSave(this.ProData).then(res=>{
+ addsHandler() {
+ batchAddSave(this.ProData).then(res => {
this.$message.success('淇濆瓨鎴愬姛')
})
},
//绾ц仈淇濆瓨
- CascadeAddHandle(){
- let CascadeString="";
- CascadeString=this.attrRow.id+(this.attrRow.name);
- this.$set(this.attrRow,'parentCode',CascadeString)
- this.CascadeVisible=false;
+ CascadeAddHandle() {
+ let CascadeString = "";
+ CascadeString = this.attrRow.id + (this.attrRow.name);
+ this.$set(this.attrRow, 'parentCode', CascadeString)
+ this.CascadeVisible = false;
},
//绾ц仈灞炴�ф竻闄�
casRemove() {
@@ -1224,6 +1262,15 @@
// 绾ц仈灞炴�ц鍗曢��
CascaderowClick(row) {
this.selectRow = row.$index
+ },
+ //琛ㄦ牸琛岀紪杈�
+ handleCellClicks(row, column) {
+ this.editingRows = row;
+ this.editShows = column.property;
+ this.rowOid = row.oid;
+ },
+ saveRows() {
+ this.editingRows = null;
},
// 鏋氫妇娉ㄥ叆娣诲姞涓�琛岀┖鏁版嵁
addRow() {
@@ -1242,26 +1289,26 @@
this.tableData.splice(row, 1)
},
//鏋氫妇娉ㄥ叆鎸夐挳
- enmuVisHandle(){
- if(this.CrudSelect.length>1){
+ enmuVisHandle() {
+ if (this.CrudSelect.length > 1) {
this.$message.warning('鍙兘閫夋嫨涓�鏉℃ā鏉垮睘鎬�')
- }else if(this.CrudSelect<1){
+ } else if (this.CrudSelect < 1) {
this.$message.warning('璇烽�夋嫨涓�鏉℃ā鏉垮睘鎬�')
- }else if(this.CrudSelect.length === 1){
- this.enumVisible=true;
+ } else if (this.CrudSelect.length === 1) {
+ this.enumVisible = true;
}
},
//鏋氫妇娉ㄥ叆澶氶�夋
- handleSelectionChange(row){
- this.enumRow=JSON.parse(JSON.stringify(row));
+ handleSelectionChange(row) {
+ this.enumRow = JSON.parse(JSON.stringify(row));
},
//鏋氫妇娉ㄥ叆淇濆瓨
- enumAddHandle(){
- if(this.enumRow.length<1){
+ enumAddHandle() {
+ if (this.enumRow.length < 1) {
this.$message.warning('璇疯嚦灏戦�夋嫨涓�鏉℃暟鎹�')
- }else {
- this.$set(this.attrRow,'enumString',this.enumRow);
- this.enumVisible=false;
+ } else {
+ this.$set(this.attrRow, 'enumString', this.enumRow);
+ this.enumVisible = false;
}
},
// 灏嗘鍦ㄧ紪杈戠殑琛岀殑鐘舵�佸彉涓� null 锛屽嵆閫�鍑虹紪杈戠姸鎬�
@@ -1283,31 +1330,31 @@
},
//楠岃瘉瑙勫垯妫�鏌�
rulesExamine() {
- if(this.RulesForm.expressionText.test(this.RulesForm.TestContent)){
+ if (this.RulesForm.expressionText.test(this.RulesForm.TestContent)) {
this.$message.success('鏍￠獙鎴愬姛')
}
},
//鐐瑰嚮鍒嗙被娉ㄥ叆鎸夐挳
- injectBtn(){
- if(this.CrudSelect.length>1){
+ injectBtn() {
+ if (this.CrudSelect.length > 1) {
this.$message.warning('鍙兘閫夋嫨涓�鏉℃ā鏉挎暟鎹�')
- }else if(this.CrudSelect.length<1){
+ } else if (this.CrudSelect.length < 1) {
this.$message.warning('璇烽�夋嫨涓�鏉℃ā鏉挎暟鎹�')
- }else if(this.CrudSelect.length === 1){
- this.injectVisible=true
+ } else if (this.CrudSelect.length === 1) {
+ this.injectVisible = true
}
},
//鍒嗙被娉ㄥ叆淇濆瓨
- injectAddHandle(){
- this.$set(this.attrRow,'classifyInvokeLevel',this.injectOption);
- this.injectVisible=false
+ injectAddHandle() {
+ this.$set(this.attrRow, 'classifyInvokeLevel', this.injectOption);
+ this.injectVisible = false
},
//鍒嗙被娉ㄥ叆娓呯┖
injectHandleReset() {
- this.injectOption.type="";
- this.injectOption.set="";
- this.injectOption.change="";
- this.injectOption.injectNum="";
+ this.injectOption.type = "";
+ this.injectOption.set = "";
+ this.injectOption.change = "";
+ this.injectOption.injectNum = "";
},
// 鍒嗙被娉ㄥ叆鍙栨秷
injectRemove() {
@@ -1333,71 +1380,61 @@
// }
}
},
- //缂栬緫淇濆瓨浜嬩欢
- addUpdate(val, row, done) {
- console.log(val, row)
- //鍙栧弽锛屾妸涔嬪墠鐨勭姸鎬佺偣鍑讳繚瀛樺悗閲嶆柊閲嶇疆涓篺alse锛屼笉鐒跺啀鐐瑰嚮鍗曞厓鏍肩紪杈戯紝涔嬪墠缂栬緫鐨勫崟鍏冩牸涔熶細闅忕潃涓嬫鐐瑰嚮鑰屽嚭鏉�
- this.rowCellList.cell = false
- this.rowList.$cellEdit = false
- console.log(this.arr)
- //鍔犱笂done鍏抽棴淇濆瓨鍚庝笉鍙紪杈戠殑鐘舵��
- done()
- },
//琛ㄦ牸鎿嶄綔鏍忓垹闄�
- CrudRowDel(row){
- this.ProData.splice(row.$index,1)
+ CrudRowDel(row) {
+ this.ProData.splice(row.$index, 1)
},
//琛ㄦ牸鍒犻櫎
- CrudRemove(){
- this.ProData.splice(this.attrRow.$index,1)
+ CrudRemove() {
+ this.ProData.splice(this.attrRow.$index, 1)
},
//琛ㄦ牸閲嶇疆
- reset(){
+ reset() {
this.CrudRend()
},
//鍚屾鍒板叾浠栨ā鏉�
- syncHandle(){
- if(this.CrudSelect.length>1){
+ syncHandle() {
+ if (this.CrudSelect.length > 1) {
this.$message.warning('鍙兘閫夋嫨涓�鏉℃ā鏉垮睘鎬ф暟鎹�')
- }else if(this.CrudSelect.length<1){
+ } else if (this.CrudSelect.length < 1) {
this.$message.warning('璇烽�夋嫨涓�鏉℃ā鏉垮睘鎬ф暟鎹�')
- }else if(this.CrudSelect.length === 1){
- copyto({oid:this.attrRow.oid}).then(res=>{
+ } else if (this.CrudSelect.length === 1) {
+ copyto({oid: this.attrRow.oid}).then(res => {
this.$message.success('鍚屾鎴愬姛')
})
}
},
//缂栫爜鐢宠棰勮
- applicationHandle(){
- this.addvisible=true;
+ applicationHandle() {
+ this.addvisible = true;
},
//缁勫悎瑙勫垯
- isShowHandler(){
- if(this.CrudSelect.length>1){
+ isShowHandler() {
+ if (this.CrudSelect.length > 1) {
this.$message.warning('鍙兘閫夋嫨涓�鏉℃ā鏉垮睘鎬ф暟鎹�')
- }else if(this.CrudSelect.length<1){
+ } else if (this.CrudSelect.length < 1) {
this.$message.warning('璇烽�夋嫨涓�鏉℃ā鏉垮睘鎬ф暟鎹�')
- }else if(this.CrudSelect.length === 1){
- this.isShowformulaEdit=true;
+ } else if (this.CrudSelect.length === 1) {
+ this.isShowformulaEdit = true;
}
},
//鍏ㄥ睆缂栬緫
- fullscreenHandle(){
- if(this.crudArray.length<1){
+ fullscreenHandle() {
+ if (this.crudArray.length < 1) {
this.$message.warning('璇烽�夋嫨涓�涓ā鏉�')
- }else {
- this.attrEditVisible=true;
- this.attrFlag=true;
+ } else {
+ this.attrEditVisible = true;
+ this.attrFlag = true;
}
},
//閫�鍑哄叏灞忕紪杈�
- escEdit(){
- this.attrFlagChiledren=false;
- this.attrEditVisible=false;
+ escEdit() {
+ this.attrFlagChiledren = false;
+ this.attrEditVisible = false;
},
- updataFormlaContent(val){
- this.$set(this.attrRow,'componentRule',val)
+ updataFormlaContent(val) {
+ this.$set(this.attrRow, 'componentRule', val)
},
// 鎺掑簭
sortChange(val) {
diff --git a/Source/UBCS-WEB/src/components/work/BusinessWork.vue b/Source/UBCS-WEB/src/components/work/BusinessWork.vue
index 97e3f18..178c19f 100644
--- a/Source/UBCS-WEB/src/components/work/BusinessWork.vue
+++ b/Source/UBCS-WEB/src/components/work/BusinessWork.vue
@@ -1,6 +1,6 @@
<template>
<div>
- <el-button @click="add"></el-button>
+ <el-button @click="HandlerRend"></el-button>
<el-table :data="data">
<el-table-column
fixed
@@ -18,12 +18,13 @@
</template>
<script>
-import {businese,add} from '@/api/work/businese'
+import {businese} from '@/api/work/businese'
export default {
name: "BusinessWork",
- props:['oid','templateId'],
+ props:['ids','templateId'],
data() {
return {
+ BuinessOids:[],
data:[
{
label:'app'
@@ -31,21 +32,27 @@
]
}
},
+ watch:{
+ ids:{
+ handler(newval,oldval){
+ this.BuinessOids=newval;
+ this.HandlerRend()
+ console.log(newval)
+ console.log(this.BuinessOids)
+ },
+ deep:true
+ }
+ },
created() {
- businese({oid: this.oid,
- templateOid: this.templateId}).then(res=>{
- console.log(res)
- })
+ // this.HandlerRend()
+ },
+ mounted() {
},
methods:{
- add(){
- // businese({oid: this.oid[2],
- // templateOid: this.templateId}).then(res=>{
- // console.log(res)
- // })
- add({
+ HandlerRend(){
+ businese({
btmType:'wupin',
- 'conditionMap[oid]':'D49A28F3-3740-D0EF-A3C6-5A71CA6978CC'
+ 'conditionMap[oid]':this.BuinessOids.toString()
}).then(res=>{
console.log(res)
})
@@ -57,6 +64,3 @@
<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/views/work/process/leave/handle.vue b/Source/UBCS-WEB/src/views/work/process/leave/handle.vue
index 9bf8b4a..ffcad37 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>
+ <businesswork :ids="ids" :templateId="templateId"></businesswork>
</el-tab-pane>
<el-tab-pane label="娴佺▼璺熻釜" name="second">
<avue-crud :data="flowList" :option="option" ref="crud">
@@ -75,7 +75,7 @@
export default {
data() {
return {
- oid:'',
+ ids:[],
templateId:'',
taskId: '',
businessId: '',
@@ -140,7 +140,7 @@
async apiGetBtnTask(id) {
const response = await getBtnTask({ processInstanceId: id })
const res = response.data
- this.oid=res.data.variables.ids;
+ this.ids=res.data.variables.ids;
this.templateId=res.data.variables.templateId;
if (res.success) {
console.log(res)
diff --git a/Source/UBCS-WEB/vue.config.js b/Source/UBCS-WEB/vue.config.js
index ee6c698..646c67d 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://192.168.1.51:37000',
+ // target: 'http://localhost:37000',
+ // target: 'http://localhost:37000',
+ target: 'http://192.168.1.51:37000',
// target: 'http://192.168.1.46: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',
+ // target: 'http://192.168.1.104:37000',
// target: 'http://192.168.1.63:37000',
- // target: 'http://192.168.3.7:37000',
+ //target: 'http://192.168.3.7: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