From 432bbf252ffc66393ac10e14958a8c412b3e401c Mon Sep 17 00:00:00 2001 From: zhangxp <zhangxp@chicecm.com> Date: 星期三, 07 六月 2023 16:06:55 +0800 Subject: [PATCH] 申领单页面只缺一个申领单状态接口 --- Source/UBCS-WEB/src/views/integration/integrationIndex.vue | 78 +++++++++++++++++++++++---------------- 1 files changed, 46 insertions(+), 32 deletions(-) diff --git a/Source/UBCS-WEB/src/views/integration/integrationIndex.vue b/Source/UBCS-WEB/src/views/integration/integrationIndex.vue index b3ae9fc..1c3a45a 100644 --- a/Source/UBCS-WEB/src/views/integration/integrationIndex.vue +++ b/Source/UBCS-WEB/src/views/integration/integrationIndex.vue @@ -16,7 +16,7 @@ <el-card> <el-form :model="form"> <el-form-item label="闆嗗洟鍒嗙被" label-width="70px" size="small"> - <el-select clearable ref="selectTree" v-model="form.groupValue" placeholder="璇烽�夋嫨" + <el-select clearable ref="selectTree" v-model="groupVal" placeholder="璇烽�夋嫨" popper-class="popperTreeSelect"> <el-option :value="groupVal" :label="groupVal"> <el-tree ref="groupTree" :data="groupTreeData" empty-text="鏆傛棤鏁版嵁" :props="defaultProps" @@ -33,11 +33,16 @@ @row-dblclick="handleMapingRowClick" @selection-change="selectionChange" @select="setCurrentRow" @select-all="handleSelectAll"> <template slot="menuLeft"> - <el-button icon="el-icon-plus" size="small" type="primary" :disabled="disabledPush" @click="dialogPush = true">鏂� 澧� + <el-button icon="el-icon-plus" size="small" type="primary" :disabled="disabledPush" + @click="dialogPush = true">鏂� 澧� </el-button> <el-button icon="el-icon-check" size="small" type="primary" @click="handleSave">淇� 瀛� </el-button> - <el-button icon="el-icon-connection" size="small" type="primary" @click="handleSync">鍚屾妯″瀷 + <el-button icon="el-icon-connection" size="small" type="primary" + @click="handleSync('all')">鍚屾涓绘ā鍨� + </el-button> + <el-button icon="el-icon-connection" size="small" type="primary" + @click="handleSync('one')">鍚屾璇︾粏妯″瀷 </el-button> </template> </avue-crud> @@ -50,23 +55,8 @@ </el-card> </el-main> </el-container> - <!-- <el-dialog title="缂栫爜灞炴��" :visible.sync="dialogPush" append-to-body="true" destroy-on-close width="30%" - :before-close="handleClose"> - <el-form :model="form"> - <el-form-item label="鏌ヨ鏉′欢" label-width="70px" size="small"> - <el-input v-model="form.name" autocomplete="off" @change="handleQuery"></el-input> - </el-form-item> - </el-form> - <p class="text_tip">*閫夋嫨鍒嗙被杩涜灞炴�ц繃婊�, 鎴栬�呰緭鍏ュ睘鎬х殑鍏ㄦ嫾鎴栬�呯畝鎷艰繘琛屾煡璇�! 濡�: 濮撳悕 (鍙緭鍏m鎴杧inming )</p> - <transfer v-model="transferValue" :data="transferData" :filter-method="filterMethod" - filter-placeholder="璇疯緭鍏ユ嫾闊冲叏鎷兼垨鑰呮嫾闊崇缉鍐�" :props="transferProps"></transfer> - <span slot="footer" class="dialog-footer"> - <el-button @click="dialogPush = false">鍙� 娑�</el-button> - <el-button type="primary" @click="handelTransferSave">淇� 瀛�</el-button> - </span> - </el-dialog> --> - <integration-transfer :visible.sync="dialogPush" :data="transferData" :props="transferProps" - @save="handelTransferSave"></integration-transfer> + <integration-transfer :visible.sync="dialogPush" :data="transferData" :disabledData="filtermapping" + :props="transferProps" @save="handelTransferSave"></integration-transfer> </div> </template> <script> @@ -196,6 +186,17 @@ window.handleBlur = that.handleBlur }, + computed: { + filtermapping() { + const data = this.mappingData.filter(item => { + return !(Object.prototype.hasOwnProperty.call(item, 'targetAttrName') && (item.targetAttrName === null || item.targetAttrName === undefined || item.targetAttrName === "")) + }) + const transfer = data.map(obj => { + return obj.targetAttrName + }) + return transfer + } + }, methods: { // 鎺ュ彛宸︿晶鏍� async getReferCodeClassifyTree() { @@ -220,6 +221,7 @@ if (response.status === 200) { this.loading = false this.mappingData = response.data.data + console.log(this.filtermapping) } }, // 鎺ュ彛鑾峰彇灞炴�ф槧灏勫彇鍊艰寖鍥� @@ -276,11 +278,25 @@ message: "淇濆瓨鎴愬姛!" }); } - }, // 鍚屾鏁版嵁 - async handleSync() { - const response = await syncClassifyModel({ dockingPreAttrMappingVOList: this.tableData }) + async handleSync(type = 'all') { + let param = { operationType: type } + if (type === 'one') { + param.classifyId = this.form.groupValue + } + if (this.form.groupValue === '' && type === 'one') { + this.$message({ + type: "error", + message: "璇烽�夋嫨涓�鏉¢泦鍥㈠垎绫�" + }); + } else { + console.log(param) + const response = await syncClassifyModel(param) + if (response.status === 200) { + console.log(response) + } + } }, handelTransferSave(event) { let that = this @@ -295,7 +311,7 @@ const findRow = that.mappingData.findIndex(item => item.metaListId === that.mappingForm.metaListId) that.mappingData[findRow].targetAttrName = transferValue[0].name that.mappingData[findRow].targetAttrId = transferValue[0].oid - this.dialogPush =false + this.dialogPush = false } }, @@ -312,7 +328,7 @@ }, // 闆嗗洟鍒嗙被鏍戠偣鍑� handleNodeClick(data) { - this.form.groupValue = data.name + this.form.groupValue = data.oid this.groupVal = data.name this.$refs.selectTree.blur() this.getGridAttrMapping(data.oid) @@ -328,14 +344,13 @@ if (event === 'mapping') this.$refs.crudMapping.rowCell(this.mappingForm, this.mappingForm.$index) }, // 闆嗗洟鏄犲皠灞炴�ц閫夋嫨鍗曞厓鏍肩紪杈戯紙鍙屽嚮锛� - handleMapingRowClick(row, column, cell, event) { - console.log(row) + handleMapingRowClick(row, column) { clearTimeout(this.times) this.mappingForm = row if (column.label === '榛樿鍊�' || column.label === '灞炴�у悕绉�') this.$refs.crudMapping.rowCell(row, row.$index) }, // 闆嗗洟鏄犲皠灞炴�ц閫夋嫨锛堝崟鍑伙級 - handleMapingClick(row, column, cell, event) { + handleMapingClick(row) { clearTimeout(this.times) this.mappingForm = row this.times = setTimeout(() => { @@ -343,15 +358,14 @@ }, 300) }, // 灞炴�у彇鍊艰寖鍥村崟鍏冩牸缂栬緫锛堝弻鍑伙級 - handleRowClick(row, column, cell, event) { + handleRowClick(row) { this.rangeForm = row this.$refs.crudRange.rowCell(row, row.$index) }, // 灞炴�у彇鍊艰寖鍥村崟鍏冩牸缂栬緫鍚� - handleUpdate(row, index, done, loading) { + handleUpdate(row, index, done) { console.log(row) console.log(index) - let data = [] const findRow = this.mappingData.findIndex(item => item.metaListId === row.metaListId) this.rangeData[index] = row console.log(this.rangeData) @@ -365,7 +379,7 @@ done(); }, // 灞炴�у彇鍊艰寖鍥村崟鍏冩牸缂栬緫鍚� - handleMapingUpdate(row, index, done, loading) { + handleMapingUpdate(row, index, done) { console.log(row) console.log('淇敼鍚�', row) this.$message({ -- Gitblit v1.9.3