|
@@ -284,6 +284,12 @@
|
|
|
prop="id"
|
|
|
label="id"
|
|
|
></el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ align="center"
|
|
|
+ prop="majorDataType"
|
|
|
+ :formatter="formMajorType"
|
|
|
+ label="内业资料类型"
|
|
|
+ ></el-table-column>
|
|
|
</el-table>
|
|
|
</div>
|
|
|
<div class="flex jc-sb">
|
|
@@ -2393,6 +2399,7 @@ export default {
|
|
|
this.getDataTypelist();
|
|
|
this.getOwnerTypelist();
|
|
|
this.getStandardTypeOptions();
|
|
|
+ this.getMajorDataTypeList();
|
|
|
|
|
|
this.defaultExpandedKeys = getStore({ name: this.expandName });
|
|
|
this.projectName = this.$route.query.projectName;
|
|
@@ -2512,7 +2519,7 @@ export default {
|
|
|
this.dialogVisible = true;
|
|
|
this.editType = type;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
getDetail(data.id, this.id, this.projectid).then((res) => {
|
|
|
let parentName = "";
|
|
|
if (node.parent.data) {
|
|
@@ -3303,6 +3310,16 @@ export default {
|
|
|
}
|
|
|
return cellValue;
|
|
|
},
|
|
|
+ formMajorType(row, column, cellValue) {
|
|
|
+
|
|
|
+
|
|
|
+ for (let i = 0; i < this.majorDataTypeList.length; i++) {
|
|
|
+ if (this.majorDataTypeList[i].dictKey == cellValue) {
|
|
|
+ return this.majorDataTypeList[i].dictValue;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ return cellValue;
|
|
|
+ },
|
|
|
|
|
|
// filterNode(value, data) {
|
|
|
// if (!value) return true;
|
|
@@ -4458,7 +4475,9 @@ export default {
|
|
|
this.fileTreeLoading=false
|
|
|
if(res.data.data){
|
|
|
this.fileTreeData = res.data.data;
|
|
|
- this.deCheckTreeKeys = this.fileTreeData.filter(node => node.status === 11).map(node => node.id);
|
|
|
+
|
|
|
+
|
|
|
+ // this.deCheckTreeKeys = this.fileTreeData.filter(node => node.status === 11).map(node => node.id);
|
|
|
|
|
|
}else{
|
|
|
this.fileTreeData =[]
|
|
@@ -4502,11 +4521,10 @@ export default {
|
|
|
return result
|
|
|
},
|
|
|
saveFileSize(){
|
|
|
- this.fileTableData[this.chooseFileIndex].ruleSizeValId =this.deCheckTreeKeys
|
|
|
- console.log(this. deCheckTreeKeys,'this. deCheckTreeKeys');
|
|
|
-
|
|
|
+ // const checkedNodes = this.getCheckedNodes(this.fileTreeData, this.deCheckTreeKeys).filter(node => node.status !== 11)
|
|
|
const checkedNodes = this.getCheckedNodes(this.fileTreeData, this.deCheckTreeKeys)
|
|
|
- this.fileTableData[this.chooseFileIndex].ruleSizeVal = checkedNodes.map(node => node.nodeName).join('、')
|
|
|
+ this.fileTableData[this.chooseFileIndex].ruleSizeValId = checkedNodes.map(node => node.id)
|
|
|
+ this.fileTableData[this.chooseFileIndex].ruleSizeVal = checkedNodes.map(node => node.nodeName).join('、')
|
|
|
this.chooseFileVisible = false;
|
|
|
this.isShowSize=false
|
|
|
setTimeout(()=>{
|