Merge branch 'master' into houxq

src/views/gwglxt/fwng/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div v-loading.fullscreen.lock="fullscreenLoading">
     <div class="d-flex flex-between">
       <div>
         <el-button type="primary" size="medium" @click="addFWNG">
@@ -67,7 +67,7 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="标题" prop="bt">
+        <el-form-item label="标题">
           <el-input v-model="dialogForm_fwng.bt" placeholder="请输入标题"></el-input>
         </el-form-item>
         <el-form-item label="发文字号" prop="fwzh">
@@ -180,6 +180,7 @@ export default {
       }
     }
     return {
+      fullscreenLoading: false,
       keyword: "",
       tableData: [],
       lxLIST:[],
@@ -384,8 +385,8 @@ export default {
     //table表格中switch 切换
     switchChange(val, row) {
       //lb_check 1:已确认,2：待确认;
-      console.log(val,"00")
       if (row.lb_check_option_k == '1') {
+        this.fullscreenLoading = true;
         let transObj = {
           issubmit:1,
           lb_id: row.lb_id,
@@ -396,6 +397,7 @@ export default {
         fwng_lb_edit(transObj)
           .then(res => {
             if (res.code == 1) {
+              this.fullscreenLoading = false;
               this.$message({
                 message: "编辑成功！",
                 type: "success",

src/views/xmlxsb/bbtj/xq/index.vue

@@ -179,12 +179,21 @@ export default {
       this.multipleSelection.forEach(item => {
         expId.push(item.xm_id);
       })
-      let stringExpId = expId.join();
-      let link =
+      if (expId.length>0) {
+        let stringExpId = expId.join();
+        let link =
         window.globalVariables.api +
-        "/jdbg/xmlxsb_xmsq/index?api=xls&page=1&limit=10000&token=" +
-        Token+"&ids="+stringExpId;
-      window.open(link, "_blank");
+          "/jdbg/xmlxsb_xmsq/index?api=xls&page=1&limit=10000&token=" +
+          Token+"&ids="+stringExpId;
+        window.open(link, "_blank");
+      } else {//没有选择任何一个
+        this.$message({
+          message: "请至少选择一项，进行导出~",
+          type: 'error'
+        });
+        return 
+      }
+      
     },
     //多选
     handleSelectionChange(val) {