chore:合并分支

ZhangXianQiang

2024-04-26 319d2d82e78cfaf951178f238e9bb2a9ecafb9c6

 src/views/system/report/index.vue

@@ -52,6 +52,7 @@
          icon="el-icon-plus"
          size="mini"
          @click="handleAdd"
          v-hasPermi="['system:report:add']"
        >新增</el-button>
      </el-col>
<!--      <el-col :span="1.5">-->
@@ -72,6 +73,7 @@
          size="mini"
          :disabled="multiple"
          @click="handleDelete"
          v-hasPermi="['system:report:remove']"
        >删除</el-button>
      </el-col>
      <el-col :span="1.5">
@@ -81,6 +83,7 @@
          icon="el-icon-download"
          size="mini"
          @click="handleExport"
          v-hasPermi="['system:report:export']"
        >导出</el-button>
      </el-col>
      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -118,7 +121,7 @@
            type="text"
            icon="el-icon-edit"
            @click="handleAuditing(scope.row)"
            v-hasPermi="['system:report:audit']"
            v-hasPermi="['system:report:edit']"
            v-if="scope.row.status === 0"
          >审核</el-button>
          <el-button
@@ -175,13 +178,14 @@
        </el-form-item>
        <el-form-item label="报备时间" prop="expirTime">
          <el-date-picker
            v-model="expirTime"
            v-model="form.expirTime"
            style="width: 240px"
            value-format="yyyy-MM-dd"
            type="daterange"
            range-separator="-"
            start-placeholder="开始日期"
            end-placeholder="结束日期"
            @change="handleExpirTimeChange"
          ></el-date-picker>
        </el-form-item>
        <el-form-item label="报备内容" prop="reportContent">
@@ -458,13 +462,14 @@
        this.auditingForm = {}
      });
    },
    handleExpirTimeChange() {
      if (null != this.form.expirTime && '' != this.form.expirTime) {
        this.form["beginCreateTime"] = this.form.expirTime[0];
        this.form["endCreateTime"] = this.form.expirTime[1];
      }
    },
    /** 提交按钮 */
    submitForm() {

      if (null != this.expirTime && '' != this.expirTime) {
        this.form["beginCreateTime"] = this.expirTime[0];
        this.form["endCreateTime"] = this.expirTime[1];
      }

      // todo 判断是事前报备