Merge remote-tracking branch 'origin/test-dev' into test-dev

src/views/formula/edit.vue

@@ -512,6 +512,10 @@ export default {
     iswbstype:{//是否是公共wbs
       type:String,
       default:''
+    },
+    pkeyId:{
+      type:String,
+      default:''//表单pkeyId
     }
   },
     mounted() {
@@ -1968,7 +1972,10 @@ console.log(remark,'remark');
             // 获取点击节点的第一张表
             console.log(this.eleTableList[0],'this.eleTableList[0]');
             // let tabId= this.eleTableList[0].initTableId; pkeyId
-            let tabId= this.eleTableList[0].pkeyId!==-1&&this.eleTableList[0].pkeyId!==null?this.eleTableList[0].pkeyId:this.eleTableList[0].id;
+            // let tabId= this.eleTableList[0].pkeyId!==-1&&this.eleTableList[0].pkeyId!==null?this.eleTableList[0].pkeyId:this.eleTableList[0].id;
+            let tabId=this.pkeyId?this.pkeyId:this.eleTableList[0].pkeyId!==-1&&this.eleTableList[0].pkeyId!==null?this.eleTableList[0].pkeyId:this.eleTableList[0].id;
+            console.log(this.pkeyId,'this.pkeyId');
+            
             console.log("wbsPrivateGetNodeTabAndParam")
             this.getTableEle(tabId);
             setTimeout(() => {

src/views/formula/edit1.vue

@@ -731,6 +731,11 @@ export default {
         // 开启 “加载中” 动画
         if(node.level == 0) this.loading = true
         if(!this.elementType) {
+          if (node.level != 0 && !node.data.hasChildren) {
+            this.loading = false
+            resolve(null)
+            return
+          }
          tabTypeLazyTreeAll({parentId,current:1,size:1000,hasPartFormula:this.fromcurNode.hasPartFormula}).then(res => {
             // 请求接口，返回数据
             let data = res.data.data.records;

src/views/manager/projectinfo/tree.vue

@@ -2004,6 +2004,8 @@
         :globaltype="formulaCurRow.globaltype"
         :iswbstype="0"
         @hideDialog="formulaCompVisible = false"
+        :pkeyId="curEleTable.pkeyId"
+
         v-if="formulaCompVisible"
       ></FormulaEdit>
     </el-dialog>
@@ -4558,6 +4560,8 @@ clearSearch1() {
        this.formulaCompVisible = true;
         this.formulaCurRow.elementType = false;
         this.istableType = true;
+        console.log(this.formulaCurRow,'this.formulaCurRow.elementType');
+        
     },
     //关闭公式弹窗
     closeformulaComp() {

src/views/system/user.vue

@@ -334,6 +334,7 @@
             :option="excelOption"
             v-model="excelForm"
             :upload-after="uploadAfter"
+             ref="excelForm"
           >
             <template slot="excelTemplate">
               <el-button
@@ -1538,12 +1539,24 @@ export default {
     },
     handleImport() {
       this.excelBox = true;
+         this.excelForm = {
+              excelFile: null,
+              isCovered: 0
+            };
     },
     uploadAfter(res, done, loading, column) {
-      window.console.log(column);
-      this.excelBox = false;
-      this.refreshChange();
-      done();
+      // window.console.log(column);
+      // this.excelBox = false;
+      // this.refreshChange();
+      // done();
+        // 关闭导入弹窗
+        this.excelBox = false;
+        // 刷新数据列表
+        this.refreshChange();
+        // 重置上传表单中的文件字段
+           // 方法1：重置整个表单
+
+        done();
     },
     handleExport() {
       this.$confirm("是否导出用户数据?", "提示", {

src/views/tentative/components/dataMap.vue

@@ -334,7 +334,7 @@ export default {
           })
         this.formoptions.forEach((ele)=>{
          this.listArr.forEach(async(eleItem,eleIndex)=>{
-          if(ele.pkeyId===eleItem.trialTabId){
+          if(ele.pkeyId==eleItem.trialTabId){
             eleItem.initTabId=ele.initTabId
             await this.getEleList(ele.initTabId)
            this.changeEle(eleItem.elementId,eleIndex)