bug1128

src/views/formula/edit1.vue

@@ -536,6 +536,10 @@ export default {
       type:Object,
       default:''
     },
+    tableType:{
+        type:Boolean,
+        default:false
+    }
   },
   data() {
     return {
@@ -720,10 +724,19 @@ export default {
                   this.loading=false
                  resolve(data);
                 this.$nextTick(() => {
-                  let expandid=Number(this.fromcurNode.parentId)-1
+                  console.log(this.tableType,'tableType1111111111');
+                  
+                  // if(this.tableType){
+                  //  let expandid=Number(this.tableType)-1
+                  // }else{
+                  //    let expandid=Number(this.fromcurNode.parentId)-1
+                  // }
+                  console.log(this.fromcurNode,'this.fromcurNode');
+                  let expandid=this.tableType? Number(this.fromcurNode.tableType)-1:Number(this.fromcurNode.parentId)-1
+                  console.log(expandid,'expandid');
                    node.childNodes[expandid].expand();
 
-                    let paramsId = this.fromcurNode.id
+                    let paramsId = this.fromcurNode.initTableId
                   console.log(paramsId, "paramsId")
                   let isArray = Array.isArray(this.$refs.tree)
                   if (isArray) {
@@ -1549,7 +1562,7 @@ export default {
        this.page.current=1;
       this.page.currentPage=1;
       this.input3=''
-        if(data.hasChildren===false){
+        if(data.hasChildren===false||data.isLinkTable===2){
            this.eleListable=true;
            getTableElments(data.initTableId ).then((res)=>{
              if(res.data.code==200){

src/views/manager/projectinfo/detail.vue

@@ -86,6 +86,15 @@
                       <template slot="append">万元</template>
                     </el-input>
                   </el-form-item>
+                  <el-form-item
+                    label="电签类别"
+                    prop="estimatedAmount"
+                  >
+                    <el-radio-group v-model="projectForm.isOpenRandomNumber">
+                      <el-radio :label="0">安心签</el-radio>
+                      <el-radio :label="1">东方中讯</el-radio>
+                    </el-radio-group>
+                  </el-form-item>
                 </el-col>
                 <el-col :span="12">
                   <el-form-item

src/views/manager/projectinfo/tree.vue

@@ -1416,6 +1416,8 @@
       class="full-dialog"
     >
       <FormulaEdit
+        :fromcurNode="curEleTable"
+       
         :wbsid="id"
         :nodeid="curTreeData.id"
         :eleid="formulaCurRow.id"
@@ -1427,8 +1429,8 @@
     </el-dialog>
       <!-- 全局公式 -->
     <el-dialog title="" :visible.sync="formulaCompVisible1" fullscreen append-to-body class="full-dialog">
-      <FormulaEditone  :wbsid="id" :nodeid="curTreeData.id" :eleid="formulaCurRow.id"   :elementType="formulaCurRow.elementType"  :projectid="projectid"
-      :globaltype="formulaCurRow.globaltype" @hideDialog="formulaCompVisible1 = false"
+      <FormulaEditone  :wbsid="id" :nodeid="curTreeData.id" :eleid="formulaCurRow.id"   :elementType="formulaCurRow.elementType"  :projectid="projectid"  :tableType="istableType"
+      :globaltype="formulaCurRow.globaltype" @hideDialog="formulaCompVisible1 = false"  :fromcurNode="curEleTable"
        v-if="formulaCompVisible1">
        </FormulaEditone>
     </el-dialog>
@@ -1630,6 +1632,7 @@ export default {
     };
 
     return {
+      fromcurNode:{},
       formDatass: [],
       editElementFormTag: false,
       jiedianId: "",
@@ -1755,6 +1758,7 @@ export default {
       tempList: [],
 
       curEleTable: {},
+      istableType:true,
       editEleVisible: false,
       editEleList: [],
       eleReg: /(≥|≤|±|【】)?([^≥≤±【】]*)/,
@@ -2154,6 +2158,7 @@ export default {
     handleEditFormula(index, row) {
       console.log('编辑元素公式',row);
       this.curEleTable = row;
+     
       selectFormElements(this.curEleTable.id).then((res) => {
         this.editEleListFilter = res.data.data;
         this.editEleListAll = [].concat(this.editEleListFilter);
@@ -2480,7 +2485,8 @@ export default {
       this.formulaCurRow.globaltype = type;
       if(type===1){
           this.formulaCompVisible1 = true;
-           this.formulaCurRow.elementType = true;
+           this.formulaCurRow.elementType = false;
+            this.istableType=true;
       }else{
           this.formulaCompVisible = true;