Merge remote-tracking branch 'origin/master'

src/views/formula/edit.vue

@@ -426,7 +426,7 @@ export default {
         // '去重':'datas-repeat',
         // '去空':'datas-reme',
         '下标取数':'datas-getlist',
-        '数组转字符串':"datas-join",
+        // '数组转字符串':"datas-join",
         '判断':'ifelse'
       },
 

src/views/formula/formulaArrayToString.js

@@ -92,12 +92,12 @@ function transformArguments(children,curEle,eleMap){
             }else if(a && a.type){
               fcText += a.name;
             }else{
-              fcText += a?a:'""';
+              fcText += a?a:"''";
             }
           })
 
         }else{
-          fcText += arg?arg:'""';
+          fcText += arg?arg:"''";
         }
 
       }else{

src/views/formula/formulaStringToArray.js

@@ -384,7 +384,7 @@ export const formulaStringToArray = (text,elemap,formulaMap) => {
       //匹配文本
       let word = nuText.match(wordReg)[0];
       console.log('匹配文本',word)
-      if(word == '""'){
+      if(word == "''"){
         word = "";
       }
 

src/views/manager/projectinfo/tree.vue

@@ -1201,13 +1201,13 @@
       <div class="flex mg-b-10">
         <el-input
           v-model="formulaInput"
-          placeholder="请输入内容"
-          size="samll"
+          placeholder="请输入名称"
+          size="samll" clearable @clear="searchFormulaName"
         ></el-input>
-        <el-button type="info">保存</el-button>
+        <el-button type="info" class="mg-l-10" @click="searchFormulaName">搜索</el-button>
       </div>
       <el-table
-        :data="editEleList"
+        :data="editEleListFilter"
         border
         style="width: 100%"
         height="400px"
@@ -1231,7 +1231,7 @@
             <!-- <el-link
               class="mg-l-10"
               type="danger"
-              @click="delEleRowHandle(scope.$index,editEleList)"
+              @click="delEleRowHandle(scope.$index,editEleListFilter)"
             >删除</el-link> -->
           </template>
         </el-table-column>
@@ -1659,6 +1659,8 @@ export default {
 
       editEleFormulaVisible: false,
       formulaInput: '',
+      editEleListFilter:[],
+      editEleListAll:[],
 
       importTemplateVisible: false,
       fileUrl: '',
@@ -1993,11 +1995,19 @@ export default {
       this.curEleTable = row;
       selectFormElements(this.curEleTable.id).then((res) => {
 
-        this.editEleList = res.data.data;
+        this.editEleListFilter = res.data.data;
+        this.editEleListAll = [].concat(this.editEleListFilter);
       })
       this.editEleFormulaVisible = true;
     },
 
+    //搜索 筛选
+    searchFormulaName(){
+      this.editEleListFilter = this.editEleListAll.filter((ele)=>{
+        return ele.eName.indexOf(this.formulaInput) > -1;
+      })
+    },
+
     saveNewEle (row) {
       row.eAllowDeviation = (row.allow ? row.allow : '') + (row.deviation ? row.deviation : '');
       row.fId = this.curEleTable.id;
@@ -2557,6 +2567,19 @@ export default {
     },
     async nodeInfoSave () {//节点参数弹框保存按钮
       if (this.nodeInfoTable) {
+        if(this.nodeInfoTable.length == 0){
+          await this.saveOrUpdateBatch([{
+            "wbsId": this.jiedianId,
+            "type": -1,
+          }])
+          this.nodeInfoVisible = false
+          this.$message({
+            type: "success",
+            message: "保存参数节点成功!"
+          })
+          return;
+        }
+
         let tag = true
         this.nodeInfoTable.forEach(val => {
           if (!val.k | !val.v) {
@@ -2790,7 +2813,7 @@ export default {
         return;
       }
       this.setLeftType(4,this.curTreeData,this.curTreeNode);
-      //this.showType = 2;
+      // this.showType = 2;
     },
 
     editNodeHandle(){

src/views/manager/projectinfo/treeTemplate/template/electronicSignature.vue

@@ -266,6 +266,7 @@ export default {
     async saveSingInfo() {
       const {data: res} = await saveSig({dataInfo: this.setsignaTable,tabId:this.pkeyId1})
       if (res.code === 200) {
+        this.$parent.copss();
         this.$message({
           type: "success",
           message: "操作成功"

src/views/manager/wbsinfo/edit.vue

@@ -195,14 +195,15 @@
         </div>
       </el-col>
       <el-col :span="14" class="h-100p flex flex-d-c">
-        <div class="mg-b-10">
-          <el-button type="primary" size="medium" icon="el-icon-plus" @click="addNodeHandle">新增节点</el-button>
-          <el-button type="primary" size="medium" icon="el-icon-edit-outline" @click="editNodeHandle">编辑当前节点</el-button>
-          <el-button type="primary" size="medium" icon="el-icon-document-copy" @click="copyNodeHandle">复制当前节点</el-button>
-          <el-button type="warning" size="medium" icon="el-icon-delete" @click="delNodeHandle">删除当前节点</el-button>
-          <el-button class="el-btn-purple" type="primary" size="medium" icon="el-icon-s-grid" @click="eleFormulaHandle" v-if="leftType==5">元素公式设置</el-button>
-          <el-button class="el-btn-purple" type="primary" size="medium" icon="el-icon-s-grid" @click="eleHandle" v-else>元素设置</el-button>
-          <el-button class="el-btn-purple" type="primary" size="medium" icon="el-icon-help" @click="nodeInfoHandle">节点参数设置</el-button>
+        <div>
+          <el-button type="primary" size="medium" icon="el-icon-plus" class="mg-b-10" @click="addNodeHandle">新增节点</el-button>
+          <el-button type="primary" size="medium" icon="el-icon-edit-outline" class="mg-b-10" @click="editNodeHandle">编辑当前节点</el-button>
+          <el-button type="primary" size="medium" icon="el-icon-document-copy" class="mg-b-10" @click="copyNodeHandle">复制当前节点</el-button>
+          <el-button type="warning" size="medium" icon="el-icon-delete" class="mg-b-10" @click="delNodeHandle">删除当前节点</el-button>
+          <el-button type="primary" size="medium" icon="el-icon-upload" v-show="curTreeNode && curTreeNode.level == 2" class="mg-b-10" @click="importTemplate(curTreeData,curTreeNode)">导入划分</el-button>
+          <el-button class="el-btn-purple mg-b-10" type="primary" size="medium" icon="el-icon-s-grid" @click="eleFormulaHandle" v-if="leftType==5">元素公式设置</el-button>
+          <el-button class="el-btn-purple mg-b-10" type="primary" size="medium" icon="el-icon-s-grid" @click="eleHandle" v-else>元素设置</el-button>
+          <el-button class="el-btn-purple mg-b-10" type="primary" size="medium" icon="el-icon-help" @click="nodeInfoHandle">节点参数设置</el-button>
         </div>
         <template v-if="leftType==5">
           <div class="mg-b-10">节点信息</div>
@@ -1213,9 +1214,9 @@
         <el-input
           v-model="formulaInput"
           placeholder="请输入名称"
-          size="samll"
+          size="samll" clearable @clear="searchFormulaName"
         ></el-input>
-        <el-button type="info" @click="searchFormulaName">搜索</el-button>
+        <el-button type="info" class="mg-l-10" @click="searchFormulaName">搜索</el-button>
       </div>
       <el-table
         :data="editEleListFilter"
@@ -2588,6 +2589,19 @@ export default {
     },
     async nodeInfoSave () {//节点参数弹框保存按钮
       if (this.nodeInfoTable) {
+        if(this.nodeInfoTable.length == 0){
+          await this.saveOrUpdateBatch([{
+            "wbsId": this.jiedianId,
+            "type": -1,
+          }])
+          this.nodeInfoVisible = false
+          this.$message({
+            type: "success",
+            message: "保存参数节点成功!"
+          })
+          return;
+        }
+
         let tag = true
         this.nodeInfoTable.forEach(val => {
           if (!val.k | !val.v) {

src/views/system/user.vue

@@ -1243,7 +1243,11 @@ export default {
       if (res.code === 200) {
         res.data.forEach(val => {
           val.contractName = val.dataInfo[0].id
-          val.roleName = val.dataInfo[0].roleType + '|' + val.dataInfo[0].roleName
+          if(val.dataInfo[0].roleType){
+            val.roleName = val.dataInfo[0].roleType + '|' + val.dataInfo[0].roleName
+          }else{
+            val.roleName = val.dataInfo[0].roleName
+          }
         })
         this.fromss.projectAndUserList = res.data
       }