| Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Source/UBCS-WEB/src/components/Master/MasterTransfer.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
@@ -240,6 +240,7 @@ let slotColumnList = []; formItemList.forEach((formItem) => { formItem = this.resetFormConfig(formItem); console.log(formItem) //属性码段规则 if (formItem.secType === "codeattrsec") { this.attrList.push(formItem); @@ -247,6 +248,7 @@ //系列号规则 if (formItem.field === "codeStandardEditType") { if (this.status === "amend") { console.log("formItem-amend",formItem) formItem.readOnly = true; } } @@ -296,8 +298,8 @@ this.codeattrsecValue = val.value; return; } //是否系列-系列号 if (val.column.field === "isSeries") { //修订为-系列号 if (val.column.field === "reviseSeries") { if (val.value === "false") { this.isShow = true; } else { @@ -323,7 +325,8 @@ field: formItem.field, type: this.columnType[formItem.type], dicData: this.getDataList(formItem.type, formItem.data), disabled: this.type === "detail" ? true : formItem.readOnly || (formItem.codeValueApplyStatus && formItem.codeValueApplyStatus == 2 ? true : false), disabled: this.type === "detail" ? true : formItem.readOnly || (formItem.codeValueApplyStatus && formItem.codeValueApplyStatus == 2 ? true : false) || (this.status === 'amend' ? (formItem.field === "reviseSeries" ? (formItem.value == 'false' ? true : false) : false) : false), prepend: this.preOrSufFixShow("text", formItem.prefix), append: this.preOrSufFixShow("text", formItem.suffix), prefixIcon: this.preOrSufFixShow("icon", formItem.prefix), Source/UBCS-WEB/src/components/Master/MasterTransfer.vue
@@ -157,7 +157,6 @@ 'conditionMap[oid]': this.ids, ...this.exportArrTwo, limit: -1 }).then(res => { // console.log('res',res) if (res) { func.downloadFileByBlobHandler(res); this.escHandler() @@ -185,7 +184,6 @@ this.exportArrTwo[`attrIdIndexMap[${index}]`] = prop; }); exportCode({codeClassifyOid: this.codeClassifyOid, ...this.exportArrTwo, limit: -1}).then(res => { // console.log('res',res) if (res) { func.downloadFileByBlobHandler(res); this.escHandler() @@ -193,7 +191,6 @@ }) } else { exportCode({codeClassifyOid: this.codeClassifyOid, ...this.exportArr, limit: -1}).then(res => { // console.log('res',res) if (res) { func.downloadFileByBlobHandler(res); this.escHandler() Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
@@ -99,8 +99,8 @@ </FormTemplateDialog> <!-- 修订--> <FormTemplateDialog :codeClassifyOid="this.codeClassifyOid" :codeRuleOid="this.codeRuleOid" :disabledProp="disabledProp" :templateOid="templateOid" :title="'数据修订'" :visible.sync="amendvisible" status="amend" :selectRow="selectRow" :disabledProp="disabledProp" :selectRow="selectRow" :templateOid="templateOid" :title="'数据修订'" :visible.sync="amendvisible" status="amend" type="add" @submit="amendSumbit"></FormTemplateDialog> <!-- 新增--> <FormTemplateDialog :TreeValue="TreeValue" :codeClassifyOid="this.codeClassifyOid" @@ -111,9 +111,9 @@ </FormTemplateDialog> <!-- 修改--> <FormTemplateDialog :codeClassifyOid="this.codeClassifyOid" :codeRuleOid="this.codeRuleOid" :disabledProp="disabledProp" :templateOid="templateOid" :title="'修改编码信息'" :disabledProp="disabledProp" :rowOid="rowOid" :templateOid="templateOid" :title="'修改编码信息'" :visible.sync="editvisible" :rowOid="rowOid" type="edit" @submit="EditSumbit"></FormTemplateDialog> <!-- 批量编辑--> <!-- <MasterEditBulk :visible.sync="bulkeditvisible" ></MasterEditBulk>--> @@ -393,9 +393,9 @@ this.doLayout() }, watch: { isLoading:{ handler(newval){ console.log(newval) isLoading: { handler(newval) { // console.log(newval) } }, tableHeadDataFateher: { @@ -500,6 +500,7 @@ } }, cellStatusFind(lcstatus) { this.isLoading = true; TableData({ templateOid: this.templateOid, codeClassifyOid: this.codeClassifyOid, @@ -507,7 +508,10 @@ limit: this.page.pageSize, 'conditionMap[lcstatus]': lcstatus }).then(res => { this.tableData = res.data.data // console.log(res) this.tableData = res.data.data; this.page.total = res.data.total; this.isLoading = false; }) }, //展开附件 @@ -563,25 +567,28 @@ if (uniqueFlag === 'importGroupCode') return this.importGroupCode("groupCode") }); }, importGroupCode(type){ importGroupCode(type) { this.batchImportData.visible = true this.batchImportData.type = type this.batchImportData.codeClassifyOid = this.codeClassifyOid }, //集团码导出 excelGroupCode(){ excelGroupCode() { this.isLoading = true; exportGroupCodeExcel({ codeClassifyOid: this.codeClassifyOid, }).then(res => { console.log(res.data) console.log(res) if (res) { func.downloadFileByBlobHandler(res); this.$message.success('下载成功，请查看！'); this.isLoading = false; } }).catch(error=>{ this.$message.error(error); }).catch(error => { console.log(error) if (error) { this.$message.error('请查看下载的错误文件！'); } this.isLoading = false; }) }, @@ -624,7 +631,7 @@ } }); if (foundItem) { if(this.selectRow.length >= 1){ if (this.selectRow.length >= 1) { this.$confirm('已有参照是否取消勾选继续执行？', '提示', { confirmButtonText: '确定', cancelButtonText: '取消', @@ -640,7 +647,7 @@ message: '已取消当前操作' }); }); }else { } else { this.amendvisible = true; } } else { @@ -658,9 +665,9 @@ this.$message.warning('当前选择的分类不是叶子节点，不允许批量编辑！') return; } this.batchImportData.visible = true this.batchImportData.type = type this.batchImportData.codeClassifyOid = this.codeClassifyOid this.batchImportData.visible = true this.batchImportData.type = type this.batchImportData.codeClassifyOid = this.codeClassifyOid }, addSaveHandler() { this.$nextTick(() => { @@ -1061,10 +1068,7 @@ }, //输入回车搜索 tableFindInp() { /*if (this.WupinFindValue.trim() === '') { this.$message.warning('输入值不能为空') return; }*/ this.isLoading = true; TableData({ templateOid: this.templateOid, codeClassifyOid: this.codeClassifyOid, @@ -1073,7 +1077,8 @@ ['conditionMap[' + this.keyWordFind + ']']: '*' + this.WupinFindValue + '*' }).then(res => { this.tableData = res.data.data; // this.page.total = res.data.data.total; this.page.total = res.data.total; this.isLoading = false; }) }
@@ -2,45 +2,44 @@ <template> <el-container> <!-- 左侧菜单--> <el-aside> <el-aside style="width: 20%;"> <basic-container> <div> <div> <div style="display: flex; flex-direction: column;"> <div style="display: flex;justify-content: space-around"> <el-collapse accordion> <el-collapse-item style="padding-left: 3px;"> <template slot="title"> <div style="display: flex;justify-content: space-around;"> <el-button v-if="permissionList.TreeAddStatus" plain size="mini" type="primary" @click="TreeAdd">添加 </el-button> <el-button v-if="permissionList.TreeEditStatus" plain size="mini" type="primary" @click="TreeEdit">修改 </el-button> <el-button v-if="permissionList.TreeDelStatus" plain size="mini" type="primary" @click="TreeDel">删除 </el-button> </div> <div style="display: flex; margin-top: 10px;justify-content: space-around"> <el-button v-if="permissionList.flushedStatus" plain size="mini" type="primary" @click="flushed">刷新 </el-button> <el-button v-if="permissionList.EnableStatus" plain size="mini" type="primary" @click="Enable">启用 </el-button> <el-button v-if="permissionList.DeactivateStatus" plain size="mini" type="primary" @click="Deactivate"> 停用 </el-button> </div> <div style="display: flex; margin-top: 10px;justify-content: space-around"> <el-button v-if="permissionList.ImportExcelStatus" plain size="mini" type="primary" @click.native="ImportExcel">导入 </el-button> <el-button v-if="permissionList.ExportExcelStatus" plain size="mini" type="primary" @click="ExportExcel">导出 </el-button> <el-button v-if="permissionList.ExportExcelStatus" plain size="mini" type="primary" @click="testHandler">测试 </el-button> </div> </template> <div> <el-button v-if="permissionList.EnableStatus" plain size="mini" type="primary" @click="Enable">启用 </el-button> <el-button v-if="permissionList.DeactivateStatus" plain size="mini" type="primary" @click="Deactivate"> 停用 </el-button> <el-button v-if="permissionList.ImportExcelStatus" plain size="mini" type="primary" @click.native="ImportExcel">导入 </el-button> <el-button v-if="permissionList.ExportExcelStatus" plain size="mini" type="primary" @click="ExportExcel">导出 </el-button> </div> <div style="display: flex;justify-content: space-around;margin-top: 5px;margin-bottom: 5px"> <div style="margin-top: 10px;margin-bottom: 10px"> <el-button v-if="permissionList.ExportExcelStatus" plain size="mini" type="primary" @click="testHandler">流水处理 </el-button> </div> </div> </el-collapse-item> </el-collapse> <!-- 左侧树--> <div style="height: calc(100vh - 230px);overflow: auto;"> <div style="height: calc(100vh - 194px);overflow: auto;"> <avue-tree ref="tree" v-model="CloneTreeAvueform" v-loading="loading" :data="CloneTreedata" :defaultExpandAll="false" :option="Treeoption" @@ -107,7 +106,6 @@ :nodeList="nodeList" @MasterHandler="MasterHandler" @flushed="flushed" @referTreeForm="referTreeForm"></classifyTreeform> </el-dialog> </div> </basic-container> </el-aside> <el-main> @@ -439,6 +437,7 @@ name: "classifyTrees.vue", data() { return { activeName: 'first', masterRow: null, AddLoading: false, // 定义一个变量来保存树请求的数量 @@ -885,6 +884,9 @@ created() { }, methods: { handleTabClick(){ }, testHandler(){ if(this.nodeClickList.length <=0 ){ this.$message.warning('请至少选择一条数据！')
