Browse Source

去掉一些字段,删除发起会议按钮

lcmxs 1 year ago
parent
commit
476cfa1a8a

+ 11 - 11
src/views/AttendMeeting/index.vue

@@ -40,17 +40,17 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-if="checkPermi(['business:JOINTCONFERENCE:add'])"
-          >发起会议</el-button
-        >
-      </el-col>
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="primary"-->
+<!--          plain-->
+<!--          icon="el-icon-plus"-->
+<!--          size="mini"-->
+<!--          @click="handleAdd"-->
+<!--          v-if="checkPermi(['business:JOINTCONFERENCE:add'])"-->
+<!--          >发起会议</el-button-->
+<!--        >-->
+<!--      </el-col>-->
       <!-- <el-col :span="1.5">
         <el-button
           type="success"

+ 36 - 36
src/views/GATHER/index.vue

@@ -169,12 +169,12 @@
           {{ scope.row.deptId_dictText }}
         </template>
       </el-table-column>
-      <el-table-column label="数据类型" width="140" align="center" prop="type">
-        <template slot-scope="scope">
-          <span v-if="scope.row.type == 0">量化指标数据</span>
-          <span v-if="scope.row.type == 1">月报表数据</span>
-        </template>
-      </el-table-column>
+<!--      <el-table-column label="数据类型" width="140" align="center" prop="type">-->
+<!--        <template slot-scope="scope">-->
+<!--          <span v-if="scope.row.type == 0">量化指标数据</span>-->
+<!--          <span v-if="scope.row.type == 1">月报表数据</span>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
       <el-table-column label="年份" align="center" prop="month">
         <template slot-scope="scope">
           {{ scope.row.year }}
@@ -326,7 +326,7 @@
               checkPermi(['gather:GATHER:approve'])
             "
           >
-           
+
               <el-button
                 @click="handleDetail(scope.row,3)"
                 style="margin: 0 2px"
@@ -386,7 +386,7 @@
           >
           <!-- {{scope.row.collStatus}}--{{scope.row.approveStatus}} -->
 
-          
+
           <el-button
             style="margin: 0 2px"
             v-if="
@@ -497,23 +497,23 @@
         type="border-card"
         @tab-click="handleClick"
       > -->
-        
 
-       <div 
+
+       <div
        v-for="(item, index) in tabList"
           :key="index + 'tabs'"
           :label="item.normName"
           :name="item.normName"
        >
 
-       <el-col :span="24"   
+       <el-col :span="24"
        style="border:1px solid rgba(0, 0, 0, .05); margin-bottom: 5px; padding: 4px;"
        >
         <p style="font-weight: 600;margin:0;margin-bottom: 5px; font-size: 17px;">{{ item.normName }}</p>
-        
+
           <template v-for="listItem in form.feeLists">
               <el-form
-              
+
                 v-if="listItem.normId == item.normId"
                 :rules="
                   validatorList(
@@ -549,7 +549,7 @@
               </el-form>
             </template>
       </el-col>
-          <!-- <el-col :span="8" v-else 
+          <!-- <el-col :span="8" v-else
           style="padding:10px;border:1px solid rgba(0, 0, 0, .05);width: 32%;margin: 5px;"
           >
             {{ item.normName }}
@@ -585,7 +585,7 @@
               </el-form>
             </template>
           </el-col> -->
-        
+
          <!-- <template v-for="listItem in form.feeLists">
               <el-form
                 v-if="listItem.normId == item.normId"
@@ -617,11 +617,11 @@
                 </el-col>
               </el-form>
             </template> -->
-       
+
        </div>
-        
+
       <!-- </el-tabs> -->
-      
+
       <div slot="footer" class="dialog-footer">
         <el-button v-if="checkPermi(['gather:GATHER:add'])" type="primary" @click="submitForm('add')">确 定</el-button>
         <el-button v-if="this.form.collStatus!=1 &&checkPermi(['gather:GATHER:draft'])" @click="submitForm('draft')" type="warning">暂 存</el-button>
@@ -639,18 +639,18 @@
       append-to-body
       :close-on-click-modal="false"
     >
-    <div 
+    <div
        v-for="(item, index) in tabList"
           :key="index + 'tabs'"
           :label="item.normName"
           :name="item.normName"
        >
 
-       <el-col :span="24"   
+       <el-col :span="24"
        style="border:1px solid rgba(0, 0, 0, .05); margin-bottom: 5px; padding: 4px"
        >
         <p style="font-weight: 600;margin:0; margin-bottom: 5px; font-size: 17px;">{{ item.normName }}</p>
-        
+
           <template v-for="listItem in form.feeLists">
               <el-form
                 v-if="listItem.normId == item.normId"
@@ -688,13 +688,13 @@
             </template>
         </el-col>
 </div>
-      
+
       <div slot="footer" class="dialog-footer">
         <el-button v-if="audit &&  (this.form.collStatus != 2 && this.form.collStatus==1)" type="primary" @click="handleAudit(form)">提交审核</el-button>
         <el-button type="primary" @click="submitForm('edit')" v-if="edit && isEdit"
           >确 定</el-button
         >
-        
+
         <el-button @click="submitForm('draft')" v-if="edit && this.form.collStatus!=1" type="warning">暂 存</el-button>
 
         <el-button type="primary" v-if="check" @click="handleCheck(1)"
@@ -746,18 +746,18 @@
       append-to-body
       :close-on-click-modal="false"
     >
-    <div 
+    <div
        v-for="(item, index) in tabList"
           :key="index + 'tabs'"
           :label="item.normName"
           :name="item.normName"
        >
 
-       <el-col :span="24"   
+       <el-col :span="24"
        style="border:1px solid rgba(0, 0, 0, .05); margin-bottom: 5px; padding: 4px"
        >
         <p style="font-weight: 600;margin:0; margin-bottom: 5px; font-size: 17px;">{{ item.normName }}</p>
-        
+
           <template v-for="listItem in form.feeLists">
               <el-form
                 v-if="listItem.normId == item.normId"
@@ -784,7 +784,7 @@
                   >
                   <el-input
                       :disabled="false"
-                      
+
                       v-model="listItem.collCalue"
                       :placeholder="'请输入' + listItem.normfeeName"
                     ></el-input>
@@ -795,13 +795,13 @@
             </template>
         </el-col>
 </div>
-      
+
       <div slot="footer" class="dialog-footer">
         <!-- <el-button v-if="audit &&  (this.form.collStatus != 2 && this.form.collStatus==1)" type="primary" @click="handleAudit(form)">提交审核</el-button> -->
-        <el-button type="primary" @click="submitForm('edit',1)" 
+        <el-button type="primary" @click="submitForm('edit',1)"
           >确 定</el-button
         >
-        
+
         <!-- <el-button @click="submitForm('draft')" v-if="edit && this.form.collStatus!=1" type="warning">暂 存</el-button>
 
         <el-button type="primary" v-if="check" @click="handleCheck(1)"
@@ -1417,7 +1417,7 @@ export default {
           });
         });
       });
-      
+
     },
     // 湾办修改
     handleWbEdit(row){
@@ -1432,9 +1432,9 @@ export default {
           if(item.funit == "%" && item.collCalue){
             item.collCalue = item.collCalue.toFixed(2);
           }
-          
+
         })
-        
+
         this.regionList.forEach(item=>{
           if(item.value == this.form.deptId){
             this.deptName = item.label;
@@ -1486,9 +1486,9 @@ export default {
           if(item.funit == "%" && item.collCalue){
             item.collCalue = item.collCalue.toFixed(2);
           }
-          
+
         })
-        
+
         this.openDetail = true;
         this.regionList.forEach(item=>{
           if(item.value == this.form.deptId){
@@ -1631,6 +1631,6 @@ export default {
     font-size: 16px;
     background: #3333331a;
   }
- 
+
 }
 </style>

+ 4 - 4
src/views/JOINTCONFERENCE/detail.vue

@@ -4,8 +4,8 @@
       <el-descriptions-item label="标题"  :span="2" >
         <span v-html="form.conference.conferenceTitle"></span>
       </el-descriptions-item>
-      
-      
+
+
       <el-descriptions-item cetent  label="限期日期" >
         <span v-if="form.conference.type != 1 && form.conference.date!=null" v-text="form.conference.date"></span>
         <span v-else>---</span>
@@ -21,7 +21,7 @@
           }}</div
         >
       </el-descriptions-item>
-      
+
       <el-descriptions-item label="协作单位" :span="2" >
         <span v-text="form.conference.cooperativeUnit"></span>
       </el-descriptions-item>
@@ -55,7 +55,7 @@
           v-html="form.conference.conferenceContent"
         ></div>
       </div>
-      
+
       <el-form-item label="协作要求" prop="collaborativeContent">
         <el-input
           :disabled="true"

+ 1 - 1
src/views/norm/feeindex.vue

@@ -80,7 +80,7 @@
           width="150"
           show-overflow-tooltip
         />
-        <el-table-column label="分类占比" width="80" show-overflow-tooltip align="center" prop="normRatio" />
+<!--        <el-table-column label="分类占比" width="80" show-overflow-tooltip align="center" prop="normRatio" />-->
         <el-table-column
           label="指标编码"
           align="center"