Merge branch 'V0.0.2' of http://10.87.10.227:4000/jzyd_yyds/soc_web into V0.0.2

src/views/scorestatistics/pointsDialog.vue

@@ -58,6 +58,10 @@
         </el-table-column>
         <el-table-column label="状态" prop="execStatusText"> </el-table-column>
       </el-table>
+      <div slot="footer" class="dialog-footer">
+        <!-- <el-button type="primary" @click="onSubmit">确定</el-button> -->
+        <el-button @click="onHide">关闭</el-button>
+      </div>
     </DialogCom>
   </div>
 </template>
@@ -95,6 +99,10 @@ export default {
         this.itemTableList=data||[]
       });
     },
+    onHide(){
+      this.monthNum = false;
+      this.itemTableList=[]
+    }
   },
 };
 </script>

src/views/scorestatistics/scorestatisticsDialog.vue

@@ -57,7 +57,7 @@
 
       <div slot="footer" class="dialog-footer">
         <!-- <el-button type="primary" @click="onSubmit">确定</el-button> -->
-        <el-button @click="onHide">取消</el-button>
+        <el-button @click="onHide">关闭</el-button>
       </div>
       <!-- 月度指数弹框 -->
     </DialogCom>
@@ -144,6 +144,10 @@
         </el-table-column>
         <el-table-column label="扣分" prop="score"> </el-table-column>
       </el-table>
+      <div slot="footer" class="dialog-footer">
+        <!-- <el-button type="primary" @click="onSubmit">确定</el-button> -->
+        <el-button @click="closeHandler">关闭</el-button>
+      </div>
     </DialogCom>
     <!-- 扣分明细弹框 -->
     <points ref="points" :monthNumeData="monthNumeData"></points>
@@ -238,6 +242,18 @@ export default {
 
       this.tableData = [];
     },
+    closeHandler(){
+      this.monthNum=false
+      this.itemTableList=[]
+      this.monthNumeData={
+        firstOrgName: "",
+        secondOrgName: "",
+        orgTypeText: "",
+        date: "",
+        levelName: "",
+        dataScore: "",
+      }
+    },
     monthNumInit(row) {
       this.monthNum = true;
 
@@ -294,6 +310,7 @@ export default {
     cardHandler(item) {
       this.radio = item.typeCode;
       this.itemTableList = item.detailList;
+      
     },
     //打开前的回调
     openHandler() {},