Merge branch 'dev' of http://192.168.50.149:8085/r/aps-kj-web into dev

dy

2025-04-14 587c89a718c83997a8323fa243cbd59c04e3dbc2

 src/views/basicData/ApsResourceGroup/index.vue

@@ -44,7 +44,7 @@
          plain 
          icon="Upload" 
          @click="handleImport" 
          v-hasPermi="['partPlan:import']"
          v-hasPermi="['ApsResourceGroup:ApsResourceGroup:importData']"
          >导入</el-button>
      </el-col>
      <el-col :span="1.5">
@@ -69,7 +69,7 @@
    >
    </HxlhTable>
  <!-- 用户导入对话框 -->
  <el-dialog :title="upload.title" v-model="upload.open" width="90%" append-to-body>
  <el-dialog :title="upload.title" v-model="upload.open" width="90%" append-to-body @close="dialogCancel">
      <el-row :gutter="10">
        <el-col>
          <div style="border-bottom: 1px solid #ccc;" >
@@ -94,28 +94,6 @@
              </div>
            </template>
          </el-upload>
        </el-col>
      </el-row>
      <el-row style="margin-top: 20px;">
        <el-form-item label="截止机加需求日期" prop="requestDate" >
          <el-date-picker clearable
            v-model="requestDate"
            type="datetime"
            value-format="YYYY-MM-DD HH:mm:ss"
            placeholder="请选择机加需求日期">
          </el-date-picker>
        </el-form-item>
        <el-col>
          <div>
            <el-button
              type="success"
              plain
              icon="Check"
              :disabled="planned"
              @click="uploadParse"
              v-hasPermi="['partPlan:edit']"
            >上传并解析</el-button>
          </div>
        </el-col>
      </el-row>
      <el-row>
@@ -148,9 +126,29 @@
            <h4>共上传<span style="color: blue;">{{ total }}</span>条资源池数据</h4>
          </div>
        </el-col>
        <el-col>
          <el-form-item label="截止机加需求日期" prop="requestDate" >
            <el-date-picker clearable
              v-model="requestDate"
              type="date"
              value-format="YYYY-MM-DD HH:mm:ss"
              placeholder="请选择机加需求日期"
              :disabled-date="disabledDate"
              >
            </el-date-picker>
          </el-form-item>
        </el-col>
      </el-row>
      <template #footer>
        <div class="dialog-footer">
          <el-button
            type="success"
            plain
            icon="Check"
            :disabled="planned"
            @click="uploadParse"
            v-hasPermi="['partPlan:edit']"
          >确认上传</el-button>
          <el-button @click="dialogCancel">取 消</el-button>
        </div>
      </template>
@@ -185,7 +183,16 @@
const exampleHeight = ref("500px");
const uploadRef = ref();
const exampleList = ref([]);
const requestDate = ref();
const requestDate = ref(null);
// 计算当前时间往后推 15 天的日期
const disabledDate = (time) => {
  // return time.getTime() > Date.now()
   // 计算 15 天的毫秒数
   const fifteenDaysInMillis = 15 * 24 * 60 * 60 * 1000;
    // 计算当前时间加上 15 天后的毫秒数
    const maxTime = Date.now() + fifteenDaysInMillis;
    return time.getTime() > maxTime;
}
/*** 用户导入参数 */
const upload = reactive({
  // 是否显示弹出层（用户导入）
@@ -316,7 +323,7 @@
    loading.value = false;
  });
}

function handleCheckboxChange(){}
// 取消按钮
function cancel() {
  open.value = false;
@@ -494,7 +501,7 @@
  isError.value = false;
  planned.value = true;
  upload.open = false;
  
  upload.isUploading = false;
}

getList();