提交日历

chengxiangling

2025-05-15 5f5173e9de4509660a3d88e156f3a980da75908e

提交日历

 src/views/basicData/calendar/index.vue

@@ -1013,15 +1013,13 @@
    console.log(response.data, "response.data");
    form.value.content = JSON.parse(response.data.content.value);
    weekDaysSettingList.value = response.data.content.weekdays;

    //  else if (form.value.type === "2") {
    //   holidays.value = JSON.parse(response.data.content.value).holidays;
    // }
    form.value.applicableTranslate= applicableTranslateArr(response.data);
    console.log(form.value.applicableTranslate,"form.value.applicableTranslate")
  });
 
}
// 设置节假日
function handleSetHolidays(row) {
  let applicableTranslateArr = JSON.parse(row.applicableTranslate).map(
let applicableTranslateArr = (row)=>{
  return JSON.parse(row.applicableTranslate).map(
    (item) => {
      return Object.keys(item).map((n) => {
        console.log(item);
@@ -1035,10 +1033,13 @@
      });
    }
  );
} 
// 设置节假日
function handleSetHolidays(row) {
  console.log(applicableTranslateArr, "applicableTranslateArr");
  form.value = {
    ...row,
    applicableTranslate: applicableTranslateArr,
    applicableTranslate: applicableTranslateArr(row),
  };
  if (!row.holidays) {
    formHolidays.value = {

 src/views/basicData/gasMaterialUsage/index.vue

@@ -2,10 +2,10 @@
  <div class="app-container">
    <el-row :gutter="20">
      <el-col>
        <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
        <el-form :model="queryParams" ref="queryRef" :inline="true" label-position="left" v-show="showSearch">
          <el-row :gutter="20">
            <el-col :span="6">
              <el-form-item label="料号" prop="itemNumber">
            <el-col :span="8">
              <el-form-item label="料号" prop="itemNumber" :style="{ width: '100%' }">
                <el-input
                    v-model="queryParams.itemNumber"
                    placeholder="请输入料号"
@@ -14,8 +14,8 @@
                />
              </el-form-item>
            </el-col>
            <el-col :span="6">
              <el-form-item label="图号" prop="drawingNo">
            <el-col :span="8">
              <el-form-item label="图号" prop="drawingNo" :style="{ width: '100%' }">
                <el-input
                    v-model="queryParams.drawingNo"
                    placeholder="请输入图号"
@@ -24,8 +24,8 @@
                />
              </el-form-item>
            </el-col>
            <el-col :span="6">
              <el-form-item label="版本" prop="version">
            <el-col :span="8">
              <el-form-item label="版本" prop="version" :style="{ width: '100%' }">
                <el-input
                    v-model="queryParams.version"
                    placeholder="请输入版本"
@@ -34,8 +34,10 @@
                />
              </el-form-item>
            </el-col>
            <el-col :span="6">
              <el-form-item label="工序名称" prop="processName">
          </el-row>
          <el-row :gutter="20">
            <el-col :span="8">
              <el-form-item label="工序名称" prop="processName" :style="{ width: '100%' }">
                <el-input
                    v-model="queryParams.processName"
                    placeholder="请输入工序名称"
@@ -44,8 +46,8 @@
                />
              </el-form-item>
            </el-col>
            <el-col :span="24" style="text-align: right;">
              <el-form-item>
            <el-col :span="16" style="text-align: right;">
              <el-form-item class="column-with-margin">
                <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
                <el-button icon="Refresh" @click="resetQuery">重置</el-button>
              </el-form-item>
@@ -351,3 +353,8 @@

getList();
</script>
<style scoped>
.column-with-margin {
  margin-right: 0px;
}
</style>