소스 검색

问题修复

gangyj 3 년 전
부모
커밋
923678f081
3개의 변경된 파일29개의 추가작업 그리고 4개의 파일을 삭제
  1. 1 1
      src/views/manager/projectinfo/detail.vue
  2. 22 1
      src/views/manager/projectinfo/tree.vue
  3. 6 2
      src/views/manager/wbsinfo/edit.vue

+ 1 - 1
src/views/manager/projectinfo/detail.vue

@@ -650,7 +650,7 @@
         let refId = this.projectForm.referenceWbsTemplateId;
           if(refId && refId>0){
             //有引用id,回显
-            this.selected = true;
+            //this.selected = true;
             this.templateType = this.projectForm.wbsType;
             await this.getTreeList();
             let priv={};

+ 22 - 1
src/views/manager/projectinfo/tree.vue

@@ -9,6 +9,7 @@
               placeholder="输入关键字进行过滤"
               v-model="filterText"
               @input="filterChange"
+              clearable
             ></el-input>
             <!-- <el-button type="info" class="mg-l-20">导入划分</el-button> -->
           </div>
@@ -614,6 +615,16 @@
                   placeholder="请选择"
                   style="width:120px"
                 >
+                  <el-option
+                    :key="5"
+                    label=">"
+                    value=">"
+                  ></el-option>
+                  <el-option
+                    :key="6"
+                    label="<"
+                    value="<"
+                  ></el-option>
                   <el-option
                     :key="1"
                     label="≥"
@@ -849,6 +860,16 @@
                 placeholder="请选择"
                 style="width:120px"
               >
+                <el-option
+                  :key="5"
+                  label=">"
+                  value=">"
+                ></el-option>
+                <el-option
+                  :key="6"
+                  label="<"
+                  value="<"
+                ></el-option>
                 <el-option
                   :key="1"
                   label="≥"
@@ -1336,7 +1357,7 @@ export default {
       curEleTable: {},
       editEleVisible: false,
       editEleList: [],
-      eleReg: /(≥|≤|±|【】)?([^≥≤±【】]*)/,
+      eleReg: /(>|<|≥|≤|±|【】)?([^≥≤±【】]*)/,
 
       editEleFormulaVisible: false,
       formulaInput: '',

+ 6 - 2
src/views/manager/wbsinfo/edit.vue

@@ -5,7 +5,7 @@
       <div class="box">
         <p>工程节点信息</p>
         <div class="flex">
-          <el-input placeholder="输入关键字进行过滤" v-model="filterText" @input="filterChange"></el-input>
+          <el-input placeholder="输入关键字进行过滤" v-model="filterText" @input="filterChange" clearable></el-input>
           <!-- <el-button type="info" class="mg-l-20">导入划分</el-button> -->
         </div>
         <el-scrollbar>
@@ -220,6 +220,8 @@
               <template slot-scope="scope">
                 <div class="flex">
                   <el-select v-model="scope.row.allow" size="small" placeholder="请选择" style="width:120px">
+                    <el-option :key="5" label=">" value=">"></el-option>
+                    <el-option :key="6" label="<" value="<"></el-option>
                     <el-option :key="1" label="≥" value="≥"></el-option>
                     <el-option :key="2" label="≤" value="≤"></el-option>
                     <el-option :key="3" label="±" value="±"></el-option>
@@ -299,6 +301,8 @@
             <template slot-scope="scope">
               <div class="flex">
                 <el-select v-model="scope.row.allow" size="small" placeholder="请选择" style="width:120px">
+                  <el-option :key="5" label=">" value=">"></el-option>
+                  <el-option :key="6" label="<" value="<"></el-option>
                   <el-option :key="1" label="≥" value="≥"></el-option>
                   <el-option :key="2" label="≤" value="≤"></el-option>
                   <el-option :key="3" label="±" value="±"></el-option>
@@ -547,7 +551,7 @@
         curEleTable:{},
         editEleVisible:false,
         editEleList:[],
-        eleReg:/(≥|≤|±|【】)?([^≥≤±【】]*)/,
+        eleReg:/(>|<|≥|≤|±|【】)?([^≥≤±【】]*)/,
 
         editEleFormulaVisible:false,
         formulaInput:'',