Merge branch 'hezhihong_bug修复'

# Conflicts:
#	src/views/AttendMeeting/index.vue

src/views/AttendMeeting/index.vue

@@ -125,22 +125,22 @@
             size="mini"
             type="text"
             @click="goDetail(scope.row)"
-            v-hasPermi="['business:JOINTCONFERENCE:edit']"
+            v-hasPermi="['business:JOINTCONFERENCE:query']"
             >会议详情</el-button
           >
           <el-button
             size="mini"
             type="text"
             @click="handleUnit(scope.row)"
-            v-hasPermi="['business:JOINTCONFERENCE:edit']"
+            v-hasPermi="['business:JOINTCONFERENCE:query']"
             >单位指派</el-button
           >
           <el-button
             size="mini"
             type="text"
-            @click="handleReply(scope.row)"
-            v-hasPermi="['business:JOINTCONFERENCE:edit']"
-            >回复会议</el-button
+            @click="handleUnit(scope.row)"
+            v-hasPermi="['business:JOINTCONFERENCE:query']"
+            >会议回复</el-button
           >
         </template>
       </el-table-column>

src/views/GATHER/index.vue

@@ -370,9 +370,11 @@ export default {
         callback(new Error('请输入数字和正确格式的数字'));
       } else if (value.split('.').length > 2) {
         callback(new Error('请输入正确格式的数字')); //防止输入多个小数点
-      } else if (value.indexOf('.') != -1 && value.split('.')[1].length > 2) {
-        callback(new Error('最多只能输入两位小数')); //小数点后两位
-      } else {
+      }
+      // else if (value.indexOf('.') != -1 && value.split('.')[1].length > 2) {
+      //   callback(new Error('最多只能输入两位小数')); //小数点后两位
+      // }
+      else {
         callback();
       }
     },
@@ -382,9 +384,11 @@ export default {
         callback(new Error('请输入正数和正确格式的数字'));
       } else if (value.split('.').length > 2) {
         callback(new Error('请输入正确格式的数字')); //防止输入多个小数点
-      } else if (value.indexOf('.') != -1 && value.split('.')[1].length > 2) {
-        callback(new Error('最多只能输入两位小数')); //小数点后两位
-      } else {
+      }
+      // else if (value.indexOf('.') != -1 && value.split('.')[1].length > 2) {
+      //   callback(new Error('最多只能输入两位小数')); //小数点后两位
+      // }
+      else {
         callback();
       }
     },

src/views/JOINTCONFERENCE/index.vue

@@ -125,14 +125,14 @@
             size="mini"
             type="text"
             @click="goDetail(scope.row)"
-            v-hasPermi="['business:JOINTCONFERENCE:edit']"
+            v-hasPermi="['business:JOINTCONFERENCE:query']"
             >会议详情</el-button
           >
           <el-button
             size="mini"
             type="text"
             @click="handleUnit(scope.row)"
-            v-hasPermi="['business:JOINTCONFERENCE:edit']"
+            v-hasPermi="['business:JOINTCONFERENCE:query']"
             >单位指派</el-button
           >
         </template>