Merge branch 'master' of http://47.110.251.215:3000/web/saber into master

src/api/formula/formula.js

@@ -0,0 +1,13 @@
+import request from '@/router/axios';
+
+export const getTypeMap = (params) => {
+  return request({
+    url: '/api/blade-manager/fb/getTypeMap',
+    method: 'get',
+    params: {
+      ...params,
+    }
+  })
+}
+
+

src/router/views/index.js

@@ -157,5 +157,18 @@ export default [{
             component: () =>
                 import ( /* webpackChunkName: "views" */ '@/views/manager/projectinfo/tree')
         }]
-    }
+    },{
+        path: '/formula',
+        component: Layout,
+        redirect: '/formula/edit',
+        children: [{
+            path: 'edit',
+            name: '编辑公式',
+            meta: {
+                i18n: 'formula'
+            },
+            component: () =>
+                import ( /* webpackChunkName: "views" */ '@/views/formula/edit')
+        }]
+    },
 ]

src/views/formula/component/formulaItem.vue

@@ -0,0 +1,50 @@
+<template>
+  <span :class="getItemClass(item)" @click="itemClick(item)">
+    {{item.name}}
+  </span>
+</template>
+
+<script>
+export default {
+  name: "formulaItem",
+  props: {
+    item: {
+      type: Object,
+      default: function () {
+        return {};
+      }
+    },
+  },
+  data(){
+    return{
+
+    }
+  },
+  methods:{
+    itemClick(item){
+      item.selected = !item.selected;
+      this.$emit('click',{
+        selected:item.selected,
+        item
+      })
+    },
+    getItemClass(item){
+      let obj = {};
+      obj[item.type.toLocaleLowerCase()+'-class']=true;
+      if(item.selected){
+        obj.selected = true;
+      }
+      return obj;
+    }
+  }
+}
+</script>
+<style scoped lang="scss">
+  .element-class{
+    cursor: pointer;
+    padding: 0 3px;
+    &.selected{
+      color: #f0720a;
+    }
+  }
+</style>

src/views/formula/edit.vue

@@ -0,0 +1,410 @@
+<template>
+  <basic-container>
+    <div class="box-dashed flex">
+      <div class="retain-box">
+        <el-checkbox v-model="isRetain"></el-checkbox>
+        <span>保留</span>
+        <el-input-number
+          v-model="retainNum"
+          :step="1"
+          :disabled="!isRetain"
+          size="small"
+        ></el-input-number>
+        <span class="retain">位</span>
+      </div>
+      <div>
+        <el-menu
+          :default-active="activeIndex"
+          class="el-menu-demo"
+          mode="horizontal"
+          @select="handleSelect"
+        >
+          <el-submenu v-for="(value,key,index) in formulaList" :key="key" :index="key">
+            <template slot="title">
+              <span>{{key}}</span>
+            </template>
+            <el-menu-item v-for="(item2,index2) in value" :key="index2" :index="(index+1) +'-' + (index2+1)">{{item2.name}}</el-menu-item>
+          </el-submenu>
+        </el-menu>
+      </div>
+    </div>
+    <div class="box-dashed">
+      <div class="mg-b-20">函数公式</div>
+      <div class="edit-text">
+        <span>默认A</span>
+        <span>=</span>
+        <span>元素B</span>
+      </div>
+      <div class="flex jc-sb">
+        <div></div>
+        <div><el-button type="info" size="small" @click="operationVisible = true">重置函数</el-button></div>
+      </div>
+    </div>
+    <div v-show="operationVisible" class="operation-box">
+      <div>选择参数设置</div>
+      <div>
+        <el-row :gutter="20">
+          <el-col :span="8">
+            <el-card shadow="never">
+              <el-scrollbar style="height: 460px">
+                <el-tree
+                  class="filter-tree"
+                  lazy
+                  :load="loadNode"
+                  @node-click="getNodeDetail"
+                  :props="defaultProps"
+                  :expand-on-click-node="false"
+                  highlight-current
+                  node-key="id"
+                  ref="tree"
+                >
+                </el-tree>
+              </el-scrollbar>
+            </el-card>
+          </el-col>
+          <el-col :span="16">
+            <el-select v-model="eleTableId" @change="getTableEle" placeholder="请选择元素表">
+              <el-option  v-for="item in eleTableList" :key="item.id" :label="item.tableName" :value="item.id"></el-option>
+            </el-select>
+            <div class="mg-t-10 mg-b-10 no-mb-col">
+              <el-scrollbar style="height: 210px">
+                <el-row>
+                  <el-col :span="6" v-for="item in eleList" :key="item.id">
+                    <div class="ele-box">
+                      <span>{{item.eName}}</span>
+                      <el-checkbox v-model="item.checked" @change="value => eleCheckHandle(value,item)"></el-checkbox>
+                    </div>
+                  </el-col>
+                </el-row>
+              </el-scrollbar>
+            </div>
+            <div class="flex jc-sb">
+              <div>定位数据位置:</div>
+              <div>
+                <el-link :underline="false" type="primary" class="mg-r-20" @click="eleAddFormula">元素添加到公式</el-link>
+                <el-link :underline="false" type="primary" class="mg-r-10" @click="addBrackets('(',false)">(</el-link>
+                <el-link :underline="false" type="primary" class="mg-r-10" @click="addBrackets(')',true)">)</el-link>
+                <el-link :underline="false" type="primary" class="mg-r-10" @click="addBrackets('[',false)">【</el-link>
+                <el-link :underline="false" type="primary" class="mg-r-10" @click="addBrackets(']',true)">】</el-link>
+                <el-link :underline="false" type="primary">输入值</el-link>
+              </div>
+            </div>
+            <div class="border-grey sele-ele-box">
+              <div>
+                <formula-item 
+                  v-for="(item,index) in selectEleFormula" :key="index" 
+                  :item="item" @click="obj => eleFormulaClick(obj,index)"
+                >
+                </formula-item>
+              </div>
+            </div>
+          </el-col>
+        </el-row>
+        <div class="text-align-c">
+          <el-button size="small" type="primary">保存</el-button>
+          <el-button size="small" @click="operationVisible = false">取消</el-button>
+        </div>
+      </div>
+    </div>
+    <div v-show="!operationVisible">
+      <div class="box-dashed">
+        <div class="mg-b-20">函数公式运算执行溯源</div>
+        <div>
+          <el-select
+            v-model="projectId"
+            @change="projectChange"
+            placeholder="请选择项目"
+            style="width: 380px"
+          >
+            <el-option
+              v-for="item in projectList"
+              :key="item.id"
+              :label="item.projectName"
+              :value="item.id"
+            ></el-option>
+          </el-select>
+          <el-select v-model="contractId" placeholder="请选择合同段">
+            <el-option
+              v-for="item in contractList"
+              :key="item.id"
+              :label="item.contractName"
+              :value="item.id"
+            ></el-option>
+          </el-select>
+          <el-button type="info">查询</el-button>
+        </div>
+      </div>
+      <div class="text-align-c">
+        <el-button type="warning">取消</el-button>
+        <el-button type="primary">保存</el-button>
+      </div>
+    </div>
+  </basic-container>
+</template>
+
+<script>
+import { getLazytree,selectByNodeTable,selectFormElements} from "@/api/manager/wbstree";
+import { getProjectList } from "@/api/manager/projectinfo";
+import { findContractByProjectId } from "@/api/manager/contractinfo";
+import { getTypeMap } from "@/api/formula/formula";
+import {mapGetters} from "vuex";
+import formulaItem from "./component/formulaItem"
+export default {
+  components: {
+    formulaItem
+  },
+  data() {
+    return {
+      wbsid: "", //从哪个wbs树过来的
+
+      isRetain: false, //是否保留小数
+      retainNum: 2, //保留几位小数
+      formulaList:{},
+      activeIndex: "1-1", //当前选择的公式
+
+      projectList: [], //项目备选列表
+      projectId: "", //溯源的项目ID
+      curProjiect: {}, //当前项目对象
+      contractList: [], //合同段备选列表
+      contractId: "", //合同段id
+
+      operationVisible: false, //基础运算弹窗
+      defaultProps: {
+        children: "children",
+        label: "title",
+        isLeaf: function (data) {
+          return !data.hasChildren;
+        },
+      },
+      eleTableId:'',//选中的元素表id
+      eleTableList:[],
+      eleList:[],
+      selectEleFormula:[],
+      curSeleEleIndex:0,//公式文字里面选中的元素索引
+
+      symbolReg:/(\+|-|\*|\/)（.+）/,
+    };
+  },
+  computed: {
+    ...mapGetters(["userInfo"]),
+
+    // selectEleFormulaText:function(){
+    //   let text = '';
+    //   this.selectEleFormula.forEach((Element)=>{
+    //     text+=Element.name;
+    //   })
+    //   return text
+    // }
+  },
+  created() {
+    this.wbsid = this.$route.query.wbsid;
+    this.init();
+  },
+  methods: {
+    init() {
+      this.getProjectList();
+      this.getTypeMap();
+    },
+
+    //懒加载树
+    loadNode(node, resolve) {
+      let pid = 0;
+      if (node.level != 0) {
+        pid = node.data.id;
+      }
+      getLazytree(this.wbsid, pid, this.userInfo.tenant_id).then((res) => {
+        let arr = [];
+        if (Array.isArray(res.data.data)) {
+          arr = res.data.data;
+        }
+        return resolve(arr);
+      });
+    },
+
+    //获取项目列表
+    getProjectList() {
+      getProjectList(1, 999).then((res) => {
+        this.projectList = res.data.data.records;
+      });
+    },
+
+    //选择公式处理
+    handleSelect(index,indexPath) {
+      //console.log(index,'index')
+      //console.log(indexPath,'indexPath')
+      if(this.operationVisible){
+        this.openerationSelect(index,indexPath)
+      }
+    },
+
+    //在选择元素模式下点选公式
+    openerationSelect(index,indexPath){
+      if(indexPath[0]!='基础运算'){
+        this.$message({
+          type: "warning",
+          message: "当前只能使用基础运算"
+        });
+        return;
+      }
+      let formulaindex = Number(indexPath[1].split('-')[1])-1;
+      this.eleAddFormulaHandle(this.formulaList[indexPath[0]][formulaindex]);
+    },
+
+    //溯源项目id切换
+    projectChange(id) {
+      for (let i = 0; i < this.projectList.length; i++) {
+        if (id == this.projectList[i].id) {
+          this.curProjiect = this.projectList[i];
+          //根据项目id获取合同段列表
+          findContractByProjectId(this.curProjiect.id).then((res) => {
+            this.contractList = res.data.data;
+            this.contractId = "";
+          });
+          return;
+        }
+      }
+    },
+
+    eleAddFormula(){
+      for (let i = 0; i < this.eleList.length; i++) {
+        if (this.eleList[i].checked) {
+          this.eleAddFormulaHandle(this.eleList[i]);
+          break;
+        }
+      }
+    },
+
+    //把元素加到公式里
+    eleAddFormulaHandle(ele){
+      if(ele.tableElementKey){
+        //元素
+        this.selectEleFormula.push({
+          type:'Element',
+          name:ele.eName,
+          id:ele.id,
+          selected:false,
+          tableElementKey:ele.tableElementKey
+        })
+      }else if(ele.template && ele.example){
+        //运算符号
+        this.selectEleFormula.push({
+          type:'Operator',
+          name:this.symbolReg.exec(ele.name)[1],
+          selected:false,
+          template:ele.template
+        })
+      }else if(ele.type == 'Brackets'){
+        //括号
+        this.selectEleFormula.splice(ele.selectIndex,0,{
+          type:'Brackets',
+          name:ele.name,
+          selected:false,
+        })
+      }
+    },
+
+    //添加括号
+    addBrackets(text,type){
+      //type 是true 表示在元素右边插入
+      if(this.curSeleEleIndex == Number(this.curSeleEleIndex)){
+        this.eleAddFormulaHandle({
+          type:'Brackets',
+          name:text,
+          selectIndex:type?Number(this.curSeleEleIndex)+1:this.curSeleEleIndex
+        })
+        //如果在左边插入index要增1
+        if(!type){
+          this.curSeleEleIndex = Number(this.curSeleEleIndex)+1;
+        }
+      }
+    },
+
+    //勾选元素
+    eleCheckHandle(checked,item){
+      if(checked){
+        this.eleList.forEach((ele)=>{
+          this.$set(ele,'checked',false);
+          //ele.checked = false;
+        })
+        item.checked = true;
+      }
+    },
+
+    //点选公式中的元素
+    eleFormulaClick({selected,item},index){
+      if(selected){
+        this.selectEleFormula.forEach((ele)=>{
+          ele.selected = false;
+        })
+        item.selected = true;
+        this.curSeleEleIndex = index;
+      }else{
+        this.curSeleEleIndex = 0;
+      }
+    },
+
+    getNodeDetail(data) {
+      selectByNodeTable(data.id).then((res)=>{
+        if(res.data.data.length){
+          this.eleTableList = res.data.data;
+        }else{
+          this.eleTableList = [];
+        }
+      })
+    },
+
+    getTableEle(tableId){
+      selectFormElements(tableId).then((res)=>{
+        this.eleList = res.data.data;
+      })
+    },
+
+    getTypeMap(){
+      getTypeMap().then((res)=>{
+        //console.log(res)
+        this.formulaList = res.data.data;
+      })
+    }
+  },
+};
+</script>
+
+<style scoped lang="scss">
+.box-dashed {
+  border: 1px dashed #bbbbbb;
+  border-radius: 6px;
+  padding: 10px;
+  margin-bottom: 10px;
+}
+.retain-box {
+  border-right: 1px dashed #bbbbbb;
+}
+.retain {
+  line-height: 50px;
+  margin-right: 10px;
+}
+.edit-text {
+  font-size: 26px;
+  margin-left: 20px;
+}
+
+.el-menu--popup .el-menu-item.is-active {
+  background-color: #fff;
+}
+.ele-box{
+  border: 1px solid #bbb;
+  height: 26px;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 6px;
+}
+.no-mb-col .el-col{
+  margin-bottom: 0px;
+}
+.sele-ele-box{
+  height: 160px;
+  padding: 20px;
+  margin-top: 10px;;
+}
+</style>

src/views/manager/projectinfo/detail.vue

@@ -124,6 +124,7 @@
                       :min="0"
                       label="路基"
                     ></el-input-number>
+                    <span>公里(KM)</span>
                   </el-form-item>
                   <el-form-item
                     label="计划完工日期"
@@ -694,7 +695,7 @@ export default {
         postId: '',
         rId: this.rId,
       }).then((res) => {
-        this.contractUserList = res.data.data;
+        this.contractUserList = res.data.data.records;
       })
     },
 

src/views/manager/wbsinfo/edit.vue

@@ -25,7 +25,7 @@
                         type="text" icon="el-icon-more" class="normal-black">
                       </el-button>
                       <el-dropdown-menu slot="dropdown">
-                        <el-dropdown-item @click.native="setLeftType(1,data,node)" icon="el-icon-circle-plus-outline" v-if="data.deptCategory != 6">新增子级</el-dropdown-item>
+                        <el-dropdown-item @click.native="setLeftType(1,data,node)" icon="el-icon-circle-plus-outline" v-if="data.deptCategory != 6 && data.isExistForm != 1">新增子级</el-dropdown-item>
                         <el-dropdown-item @click.native="setLeftType(2,data,node)" icon="el-icon-edit">编辑节点</el-dropdown-item>
                         <el-dropdown-item @click.native="setLeftType(3,data,node)" icon="el-icon-document-copy">复制节点</el-dropdown-item>
                         <el-dropdown-item @click.native="deleNode(data,node)" icon="el-icon-close" v-if="node.level !=1">删除节点</el-dropdown-item>
@@ -53,7 +53,7 @@
                         type="text" icon="el-icon-more" class="normal-black">
                       </el-button>
                       <el-dropdown-menu slot="dropdown">
-                        <el-dropdown-item @click.native="setLeftType(1,data,node)" icon="el-icon-circle-plus-outline" v-if="data.deptCategory != 6">新增子级</el-dropdown-item>
+                        <el-dropdown-item @click.native="setLeftType(1,data,node)" icon="el-icon-circle-plus-outline" v-if="data.deptCategory != 6 && data.isExistForm != 1">新增子级</el-dropdown-item>
                         <el-dropdown-item @click.native="setLeftType(2,data,node)" icon="el-icon-edit">编辑节点</el-dropdown-item>
                         <el-dropdown-item @click.native="setLeftType(3,data,node)" icon="el-icon-document-copy">复制节点</el-dropdown-item>
                         <el-dropdown-item @click.native="deleNode(data,node)" icon="el-icon-close" v-if="node.level !=1">删除节点</el-dropdown-item>
@@ -530,7 +530,7 @@
           children: 'children',
           label: 'title',
           isLeaf: function(data){
-            return !data.hasChildren;
+            return !data.hasChildren || (data.isExistForm==1);
           }
         },
         leftType:5,
@@ -708,9 +708,10 @@
           res.data.data.parentName = parentName;
           this.tableData = [res.data.data];
           if(type == 1){
+            //console.log(node.parent)
             this.nodeDetail = {
               parentId:res.data.data.id,
-              parentName:parentName
+              parentName:data.title
             };
           }else{
             this.nodeDetail = Object.assign({},res.data.data);
@@ -1011,7 +1012,7 @@
           return;
         }
         this.treeLoad = true;
-        getAlltree(this.userInfo.tenant_id,'',this.id).then((res)=>{
+        getAlltree(this.userInfo.tenant_id,1,this.id).then((res)=>{
           this.treeLoad = false;
           this.treeData = res.data.data;
           this.$nextTick(()=>{
@@ -1032,6 +1033,7 @@
             type: "warning",
             message: "请先选择文件再进行导入"
           });
+          return;
         }
         let forms = new FormData();
         forms.append('excelFile', this.upFile);