Merge remote-tracking branch 'origin/master'

 Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue

@@ -164,7 +164,8 @@
                           @current-change="handleCurrentChange">
            </el-pagination>
          </div>
          <el-dialog :visible.sync="syncDialogBox" append-to-body title="手动同步" top="200px" @close="syncClose" v-loading="syncLoading"width="30%">
          <el-dialog v-loading="syncLoading" :visible.sync="syncDialogBox" append-to-body title="手动同步" top="200px"
                     width="30%" @close="syncClose">
            <p style="display: inline-block">最后更新时间：</p>
            <el-date-picker
              v-model="SyncValue"
@@ -393,8 +394,6 @@
    },
  },
  created() {
    // const index = this.$route.query.id.indexOf('@name=') + '@name='.length;
    // this.result = this.$route.query.id.substring(index);
    getUserInfo().then(res => {
      this.result = res.data.data.realName
    })
@@ -439,8 +438,8 @@
            fileDocClassifyName: '',
            hasDownload: true,
            hasUpload: true,
            hasEdit:true,
            hasDel:true,
            hasEdit: true,
            hasDel: true,
            height: 'auto'
          }
        } else {
@@ -630,7 +629,7 @@
          this.syncLoading = false;
          this.syncDialogBox = false;
          this.SyncValue = "";
        }else {
        } else {
          this.syncLoading = false;
          this.syncDialogBox = false;
          this.SyncValue = "";