【公式配置】在公式配置页面缺少表单搜索、质检wbs-dialog关闭蒙层未消失、关闭公式配置弹窗接口报错

src/config/index.json

@@ -1,11 +1,7 @@
 {
-  "target11": "http://127.0.0.1:8090",
+  "target": "http://127.0.0.1:8090",
 
-
-  "target22": "http://39.108.216.210:8090",
-  "target": "http://192.168.0.109:8090",
-  "target33": "http://219.151.181.73:8090",
-  "target3": "http://183.247.216.148:28090",
+  "target11": "http://192.168.0.109:8090",
   "dev": {
     "port": 1888
   }

src/views/formula/edit.vue

@@ -74,9 +74,22 @@
             </el-col>
             <el-col :span="16" class="h-100p flex flex-d-c ov-hidden">
               <!-- 放出来的代码——start -->
-              <div style="display:flex">
+              <!-- <div style="display:flex">
                 <el-input placeholder="请输入你想搜索的元素字段" v-model="inputele" clearable @clear="clearinput"> </el-input>
                 <el-button type="primary" icon="el-icon-search" size="small" @click="searchChange">搜索</el-button>
+              </div> -->
+              <div class="flex" style="justify-content: space-between;width:100%">
+                <el-select v-model="eleTableId" @change="getTableEle" placeholder="请选择元素表1" style="width:48%">
+                  <el-option v-if="paramDataList.length" label="选择节点参数2" value="选择节点参数"></el-option>
+                  <el-option v-for="item in eleTableList" :key="item.id" :label="item.tableName"
+                    :value="(item.pkeyId !== null && item.pkeyId !== -1) ? item.pkeyId : item.id"></el-option>
+                </el-select>
+                <!-- 搜索元素下拉框 -->
+                <el-select v-model="input3" filterable clearable placeholder="搜索元素字段" @change="getInput"
+                  style="width:48%">
+                  <el-option v-for="item in eleList1" :key="item.id" :label="item.eName" :value="item.eName">
+                  </el-option>
+                </el-select>
               </div>
               <div class="mg-t-10 no-mb-col flex1 ov-hidden"
                 style="height: 360px; overflow-y: auto; max-height: 360px;">

src/views/manager/projectinfo/editElement/editElement.vue

@@ -76,7 +76,7 @@
       </el-dialog>
 
       <el-dialog title="添加新元素字段" :visible="AddNewElementField == '新增元素'" width="60%" :before-close="handleClose"
-        :close-on-click-modal="false" :modal-append-to-body="false" style="z-index: 999999;">
+        :close-on-click-modal="false" append-to-body>
         <div>
           <i @click="addyuansu" class="el-icon-circle-plus marbottom10"
             style="color:red; font-size:24px; float: right;cursor: pointer;"></i>

src/views/manager/projectinfo/tree.vue

@@ -199,12 +199,11 @@
             </div>
           </template>
           <div class="flex mg-t-20" v-if="leftType == 5 || leftType == 4">
-              <span>当前项目信息表</span>
-              <el-button type="text" style="margin-left: 10px" icon="el-icon-edit-outline" class="text-icon"
-                @click="editEditElementForm"></el-button>
-              <el-button v-if="isNodeType" type="text" icon="el-icon-sort" class="text-icon"
-                @click="privateTableSort()"></el-button>
-         
+            <span>当前项目信息表</span>
+            <el-button type="text" style="margin-left: 10px" icon="el-icon-edit-outline" class="text-icon"
+              @click="editEditElementForm"></el-button>
+            <el-button v-if="isNodeType" type="text" icon="el-icon-sort" class="text-icon"
+              @click="privateTableSort()"></el-button>
           </div>
           <template v-if="leftType == 5">
             <div style="
@@ -226,20 +225,26 @@
                           <span v-else>{{ scope.row.tableName }}</span>
                         </template>
                       </el-table-column>
-                      <el-table-column v-if="leftType === 5" align="center" prop="elementTotal" width="80"
-                        label="字段总量"></el-table-column>
+                      <el-table-column align="center" prop="elementTotal" width="80" label="字段总量"></el-table-column>
                       <el-table-column align="center" prop="tableType" :formatter="formatTableType"
                         label="表单类型"></el-table-column>
                       <el-table-column align="center" prop="fillRate" label="填报率"></el-table-column>
-                      <el-table-column label="是否关联清表" prop="isLinkTable" align="center" v-if="leftType === 4">
+                      <!-- <el-table-column label="是否关联清表" prop="isLinkTable" align="center" v-if="leftType === 4">
                         <template slot-scope="scope">
                           <span v-if="scope.row.isLinkTable == 2">是</span>
                           <span v-else>否</span>
                         </template>
+                      </el-table-column> -->
+                      <el-table-column align="center" prop="tableOwner" :formatter="formatOwner" label="所属方">
                       </el-table-column>
-                      <el-table-column align="center" prop="tableOwner" :formatter="formatOwner"
-                        label="所属方"></el-table-column>
-                      <el-table-column label="操作" align="center" width="500" v-if="leftType == 4">
+                      <el-table-column align="center" prop="htmlElementError" :formatter="formatOwner"
+                        label="是否存在错误key">
+                        <template slot-scope="scope">
+                          <span v-if="scope.row.htmlElementError == 0">否</span>
+                          <span v-else-if="scope.row.htmlElementError == 1">是</span>
+                        </template>
+                      </el-table-column>
+                      <!-- <el-table-column label="操作" align="center" width="500" v-if="leftType == 4">
                         <template slot-scope="scope">
                           <el-link type="primary" @click="Associationlist(scope)">关联清表
                           </el-link>
@@ -274,8 +279,8 @@
                           <el-link class="mg-l-10" type="danger" @click="handleDelete(scope.$index, scope.row)">删除表单
                           </el-link>
                         </template>
-                      </el-table-column>
-                      <el-table-column label="操作" align="center" width="500" v-if="leftType == 5">
+                      </el-table-column> -->
+                      <el-table-column label="操作" align="center" width="500">
                         <template slot-scope="scope">
                           <el-button size="mini" @click="handlePreview(scope.$index, scope.row)">预览
                           </el-button>
@@ -318,8 +323,8 @@
                       <span v-else>否</span>
                     </template>
                   </el-table-column>
-                  <el-table-column align="center" prop="tableOwner" :formatter="formatOwner"
-                    label="所属方"></el-table-column>
+                  <el-table-column align="center" prop="tableOwner" :formatter="formatOwner" label="所属方">
+                  </el-table-column>
                   <el-table-column label="操作" align="center">
                     <template slot-scope="scope">
                       <el-button size="mini" @click="handlePreview(scope.$index, scope.row)">预览
@@ -350,15 +355,21 @@
                     <el-table-column align="center" prop="tableType" :formatter="formatTableType"
                       label="表单类型"></el-table-column>
                     <el-table-column align="center" prop="fillRate" label="填报率"></el-table-column>
-                    <el-table-column label="是否关联清表" prop="isLinkTable" align="center" v-if="leftType === 4">
+                    <el-table-column label="是否关联清表" prop="isLinkTable" align="center">
                       <template slot-scope="scope">
                         <span v-if="scope.row.isLinkTable == 2">是</span>
                         <span v-else>否</span>
                       </template>
                     </el-table-column>
-                    <el-table-column align="center" prop="tableOwner" :formatter="formatOwner"
-                      label="所属方"></el-table-column>
-                    <el-table-column label="操作" align="center" width="500" v-if="leftType == 4">
+                    <el-table-column align="center" prop="tableOwner" :formatter="formatOwner" label="所属方">
+                    </el-table-column>
+                    <el-table-column align="center" prop="htmlElementError" :formatter="formatOwner" label="是否存在错误key">
+                      <template slot-scope="scope">
+                        <span v-if="scope.row.htmlElementError == 0">否</span>
+                        <span v-else-if="scope.row.htmlElementError == 1">是</span>
+                      </template>
+                    </el-table-column>
+                    <el-table-column label="操作" align="center" width="500">
                       <template slot-scope="scope">
                         <el-link type="primary" @click="Associationlist(scope)">关联清表
                         </el-link>
@@ -402,7 +413,7 @@
                         </el-link>
                       </template>
                     </el-table-column>
-                    <el-table-column label="操作" align="center" width="500" v-if="leftType == 5">
+                    <!-- <el-table-column label="操作" align="center" width="500" v-if="leftType == 5">
                       <template slot-scope="scope">
                         <el-button size="mini" @click="handlePreview(scope.$index, scope.row)">预览
                         </el-button>
@@ -426,7 +437,7 @@
                           @click="handleDelete(scope.$index, scope.row)">删除
                         </el-button>
                       </template>
-                    </el-table-column>
+                    </el-table-column> -->
                   </el-table>
                 </div>
               </template>
@@ -499,8 +510,8 @@
                     <span v-else>否</span>
                   </template>
                 </el-table-column>
-                <el-table-column align="center" prop="tableOwner" :formatter="formatOwner"
-                  label="所属方"></el-table-column>
+                <el-table-column align="center" prop="tableOwner" :formatter="formatOwner" label="所属方">
+                </el-table-column>
                 <el-table-column label="操作" align="center">
                   <template slot-scope="scope">
                     <el-link type="primary" @click="Associationlist(scope)">关联清表
@@ -1075,7 +1086,7 @@
         @hideDialog="formulaCompVisible = false" :pkeyId="curEleTable.pkeyId" v-if="formulaCompVisible"></FormulaEdit>
     </el-dialog>
     <!-- 全局公式 -->
-    <!-- <el-dialog
+    <el-dialog
       title=""
       :visible.sync="formulaCompVisible1"
       fullscreen
@@ -1097,7 +1108,7 @@
         v-if="formulaCompVisible1"
       >
       </FormulaEditone>
-    </el-dialog> -->
+    </el-dialog>
 
     <!-- 编辑元素 -->
     <el-dialog title="　" :visible.sync="editElementVisible" fullscreen append-to-body class="full-dialog">
@@ -1779,7 +1790,7 @@ export default {
           return !data.hasChildren;
         },
       },
-      leftType: 5,
+      leftType: 5, // 5 表单设置  4 元素设置
       curTreeData: {},
       curTreeNode: {},
       tableData: [],
@@ -3236,34 +3247,34 @@ export default {
     },
 
     //跳转到公式配置页面
-    // toFormulaEdit(row, type) {
-    //   this.curEleTable.hasPartFormula = row.hasPartFormula;
-    //   this.formulaCurRow = row;
-    //   this.formulaCurRow.globaltype = type;
-    //   if (type === 10) {
-    //     this.formulaCompVisible1 = true;
-    //     this.formulaCurRow.elementType = false;
-    //     this.istableType = true;
-    //   } else {
-    //     this.formulaCompVisible = true;
-    //   }
-    // },
     toFormulaEdit(row, type) {
       this.curEleTable.hasPartFormula = row.hasPartFormula;
       this.formulaCurRow = row;
       this.formulaCurRow.globaltype = type;
-      // if (type === 10) {
-      //   this.formulaCompVisible1 = true;
-      //   this.formulaCurRow.elementType = false;
-      //   this.istableType = true;
-      // } else {
-      //   this.formulaCompVisible1 = true;
-      // }
-      this.formulaCompVisible = true;
-      this.formulaCurRow.elementType = false;
-      this.istableType = true;
-      console.log(this.formulaCurRow, "this.formulaCurRow.elementType");
+      if (type === 10) {
+        this.formulaCompVisible1 = true;
+        this.formulaCurRow.elementType = false;
+        this.istableType = true;
+      } else {
+        this.formulaCompVisible = true;
+      }
     },
+    // toFormulaEdit(row, type) {
+    //   this.curEleTable.hasPartFormula = row.hasPartFormula;
+    //   this.formulaCurRow = row;
+    //   this.formulaCurRow.globaltype = type;
+    //   // if (type === 10) {
+    //   //   this.formulaCompVisible1 = true;
+    //   //   this.formulaCurRow.elementType = false;
+    //   //   this.istableType = true;
+    //   // } else {
+    //   //   this.formulaCompVisible1 = true;
+    //   // }
+    //   this.formulaCompVisible = true;
+    //   this.formulaCurRow.elementType = false;
+    //   this.istableType = true;
+    //   console.log(this.formulaCurRow, "this.formulaCurRow.elementType");
+    // },
     //关闭公式弹窗
     closeformulaComp() {
       console.log("关闭");

src/views/manager/wbsinfo/edit.vue

@@ -2568,7 +2568,7 @@ export default {
     //关闭公式弹窗
     closeformulaComp1() {
       console.log("关闭");
-      selectFormElements(  this.checkRow.id, { type: 0 }).then((res) => {
+      selectFormElements(  this.checkRow.id, { type: 1 }).then((res) => {
         this.editEleListFilter = res.data.data;
         this.editEleListAll = [].concat(this.editEleListFilter);
       });