UReport报表调整

src/views/mes/report/index.vue

@@ -15,17 +15,17 @@
       </el-form-item>
     </el-form>
 
-<!--    <el-row :gutter="10" class="mb8">-->
-<!--      <el-col :span="1.5">-->
-<!--        <el-button-->
-<!--          type="primary"-->
-<!--          plain-->
-<!--          icon="el-icon-plus"-->
-<!--          size="mini"-->
-<!--          @click="handleAdd"-->
-<!--          v-hasPermi="['ureport:add']"-->
-<!--        >新增</el-button>-->
-<!--      </el-col>-->
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['ureport:add']"
+        >新增</el-button>
+      </el-col>
 <!--      <el-col :span="1.5">-->
 <!--        <el-button-->
 <!--          type="success"-->
@@ -58,12 +58,13 @@
 <!--          v-hasPermi="['ureport:export']"-->
 <!--        >导出</el-button>-->
 <!--      </el-col>-->
-<!--      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>-->
-<!--    </el-row>-->
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
 
     <el-table v-loading="loading" :data="listData" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="报表名称" align="center" prop="name" />
+      <el-table-column label="模板类型" align="center" prop="reportType" />
       <el-table-column label="创建时间" align="center" prop="createTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
@@ -74,15 +75,23 @@
           <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
+      <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"
             type="text"
             icon="el-icon-edit"
-            @click="handlePreview(scope.row.name)"
+            @click="handleDesigner(scope.row.name)"
+            v-hasPermi="['mes:report:edit']"
+          >设计</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
             v-hasPermi="['mes:report:edit']"
-          >预览</el-button>
+          >修改</el-button>
           <el-button
             size="mini"
             type="text"
@@ -105,9 +114,22 @@
     <!-- 添加或修改报表管理对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="${comment}" prop="name">
+        <el-form-item label="报表名称" prop="name">
           <el-input v-model="form.name" placeholder="请输入报表名称" />
         </el-form-item>
+        <el-form-item label="报表类型" prop="reportType">
+          <el-select v-model="form.reportType" placeholder="请选择模板类型">
+            <el-option
+              v-for="dict in dict.type.sys_report_type"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -122,6 +144,7 @@ import { listReport, getReport, delReport, addReport, updateReport } from "@/api
 
 export default {
   name: "ureport",
+  dicts: ["sys_report_type","sys_yes_no"],
   data() {
     return {
       // 遮罩层
@@ -213,8 +236,8 @@ export default {
       this.title = "添加报表管理";
     },
     /** 报表预览 */
-    handlePreview(name) {
-      window.open(`${this.website.reportUrl}/preview?_u=mysql:`+name)
+    handleDesigner(name) {
+      window.open(`${this.website.reportUrl}/designer?_u=mysql:`+name)
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -237,7 +260,7 @@ export default {
               this.getList();
             });
           } else {
-            addReport(this.form).then(response => {
+            addReport({...this.form,'isPrintTemplate':'1'}).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();