Merge remote-tracking branch 'origin/master'

 Source/UBCS-WEB/src/api/GetItem.js

@@ -138,10 +138,10 @@
}

//手动同步
export const syncSearch = (params) => {
export const syncSearch = (data) => {
  return request({
    url: 'ubcs-code/dockingManagement/searchItemDataForERP',
    method: 'get',
    params
    url: '/api/ubcs-code/dockingManagement/searchItemDataForERP',
    method: 'post',
    data
  })
}

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

@@ -164,14 +164,14 @@
                           @current-change="handleCurrentChange">
            </el-pagination>
          </div>
          <el-dialog title="手动同步" :visible.sync="syncDialogBox"append-to-body @close="syncClose" top="200px">
          <el-dialog :visible.sync="syncDialogBox" append-to-body title="手动同步" top="200px" @close="syncClose" v-loading="syncLoading"width="30%">
            <p style="display: inline-block">最后更新时间：</p>
            <el-date-picker
              style="width: 300px"
              v-model="SyncValue"
              type="date"
              placeholder="选择日期"
              format="yyyy 年 MM 月 dd 日 HH 时 mm 分 ss 秒"
              placeholder="选择日期"
              style="width: 300px"
              type="date"
              value-format="yyyy-MM-dd HH:mm:ss">
            </el-date-picker>
            <div slot="footer" class="dialog-footer">
@@ -283,8 +283,9 @@
  data() {
    return {
      //手动同步model
      SyncValue:'',
      syncDialogBox:false,
      SyncValue: '',
      syncLoading: false,
      syncDialogBox: false,
      isTimeStatus: false,
      isTimeName: '',
      dateValue: "",
@@ -611,21 +612,25 @@
      });
    },
    //手动同步
    manualSyncing(){
    manualSyncing() {
      this.syncDialogBox = true;
    },
    //手动同步关闭
    syncClose(){
    syncClose() {
      this.syncDialogBox = false;
    },
    //手动同步确定
    submitSync(){
      if(this.SyncValue){
        syncSearch({enDate:this.SyncValue}).then(res=>{
    async submitSync() {
      if (this.SyncValue) {
        this.syncLoading = true;
        const response = await syncSearch({enDate: this.SyncValue})
        if (response.status === 200) {
          this.$message.success('同步成功！')
          this.syncLoading = false;
          this.syncDialogBox = false;
        })
      }else {
          this.SyncValue = "";
        }
      } else {
        this.$message.warning('请选择最后更新时间！')
      }
    },