From 6fd4776c9ade790b10149e01352fd0c26422a344 Mon Sep 17 00:00:00 2001
From: PQZ <pangqingzhou@gmail.com>
Date: Thu, 12 Sep 2024 18:37:51 +0800
Subject: [PATCH] 1

---
 .../repair/project/form/RepairProjectForm.vue | 289 ++++++++++--------
 src/views/repair/project/index.vue            | 103 +++----
 2 files changed, 206 insertions(+), 186 deletions(-)

diff --git a/src/views/repair/project/form/RepairProjectForm.vue b/src/views/repair/project/form/RepairProjectForm.vue
index dcbe45f..8a58c04 100644
--- a/src/views/repair/project/form/RepairProjectForm.vue
+++ b/src/views/repair/project/form/RepairProjectForm.vue
@@ -3,43 +3,79 @@
     <!-- 对话框(添加 / 修改) -->
     <el-dialog :title="dialogTitle" :visible.sync="dialogVisible" width="45%" v-dialogDrag append-to-body>
       <el-form ref="formRef" :model="formData" :rules="formRules" v-loading="formLoading" label-width="100px">
-                    <el-form-item label="名称" prop="name">
-                      <el-input v-model="formData.name" placeholder="请输入名称" />
-                    </el-form-item>
-                    <el-form-item label="成本" prop="cost">
-                      <el-input v-model="formData.cost" placeholder="请输入成本" />
-                    </el-form-item>
-                    <el-form-item label="规格" prop="spec">
-                      <el-input v-model="formData.spec" placeholder="请输入规格" />
-                    </el-form-item>
-                    <el-form-item label="售价" prop="price">
-                      <el-input v-model="formData.price" placeholder="请输入售价" />
-                    </el-form-item>
-                    <el-form-item label="编码" prop="code">
-                      <el-input v-model="formData.code" placeholder="请输入编码" />
-                    </el-form-item>
-                    <el-form-item label="单位" prop="unit">
-                      <el-input v-model="formData.unit" placeholder="请输入单位" />
-                    </el-form-item>
-                    <el-form-item label="分类" prop="type">
-                      <el-select v-model="formData.type" placeholder="请选择分类">
-                            <el-option label="请选择字典生成" value="" />
-                      </el-select>
-                    </el-form-item>
-                    <el-form-item label="工时" prop="manHour">
-                      <el-input v-model="formData.manHour" placeholder="请输入工时" />
-                    </el-form-item>
-                    <el-form-item label="是否自助（0否1是）" prop="isSelf">
-                      <el-input v-model="formData.isSelf" placeholder="请输入是否自助（0否1是）" />
-                    </el-form-item>
-                    <el-form-item label="是否允许分店公用此产品（0否1是）" prop="isPublic">
-                      <el-input v-model="formData.isPublic" placeholder="请输入是否允许分店公用此产品（0否1是）" />
-                    </el-form-item>
-                    <el-form-item label="备注" prop="remark">
-                      <el-input v-model="formData.remark" placeholder="请输入备注" />
-                    </el-form-item>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="名称" prop="name">
+              <el-input v-model="formData.name" placeholder="请输入名称"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="编码" prop="code">
+              <el-input v-model="formData.code" placeholder="请输入编码"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="成本" prop="cost">
+              <el-input v-model="formData.cost" placeholder="请输入成本"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="售价" prop="price">
+              <el-input v-model="formData.price" placeholder="请输入售价"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="规格" prop="spec">
+              <el-input v-model="formData.spec" placeholder="请输入规格"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="单位" prop="unit">
+              <el-input v-model="formData.unit" placeholder="请输入单位"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="分类" prop="type">
+              <el-select v-model="formData.type" placeholder="请选择分类">
+                <el-option label="请选择字典生成" value=""/>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="工时" prop="manHour">
+              <el-input v-model="formData.manHour" placeholder="请输入工时"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="是否自助" prop="isSelf">
+              <el-input v-model="formData.isSelf" placeholder="请输入是否自助"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="分店公用" prop="isPublic">
+              <el-input v-model="formData.isPublic" placeholder="请输入是否允许分店公用此产品"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="备注" prop="remark">
+              <el-input type="textarea" v-model="formData.remark" placeholder="请输入备注"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
-              <div slot="footer" class="dialog-footer">
+      <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm" :disabled="formLoading">确 定</el-button>
         <el-button @click="dialogVisible = false">取 消</el-button>
       </div>
@@ -48,99 +84,102 @@
 </template>
 
 <script>
-  import * as RepairProjectApi from '@/api/repair/project';
-      export default {
-    name: "RepairProjectForm",
-    components: {
-                    },
-    data() {
-      return {
-        // 弹出层标题
-        dialogTitle: "",
-        // 是否显示弹出层
-        dialogVisible: false,
-        // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
-        formLoading: false,
-        // 表单参数
-        formData: {
-                            id: undefined,
-                            name: undefined,
-                            cost: undefined,
-                            spec: undefined,
-                            price: undefined,
-                            code: undefined,
-                            unit: undefined,
-                            type: undefined,
-                            manHour: undefined,
-                            isSelf: undefined,
-                            isPublic: undefined,
-                            remark: undefined,
-        },
-        // 表单校验
-        formRules: {
-        },
-                        };
-    },
-    methods: {
-      /** 打开弹窗 */
-     async open(id) {
-        this.dialogVisible = true;
-        this.reset();
-        // 修改时，设置数据
-        if (id) {
-          this.formLoading = true;
-          try {
-            const res = await RepairProjectApi.getRepairProject(id);
-            this.formData = res.data;
-            this.title = "修改维修项目";
-          } finally {
-            this.formLoading = false;
-          }
-        }
-        this.title = "新增维修项目";
-              },
-      /** 提交按钮 */
-      async submitForm() {
-        // 校验主表
-        await this.$refs["formRef"].validate();
-                  this.formLoading = true;
+import * as RepairProjectApi from '@/api/repair/project';
+
+export default {
+  name: "RepairProjectForm",
+  components: {},
+  data() {
+    return {
+      // 弹出层标题
+      dialogTitle: "",
+      // 是否显示弹出层
+      dialogVisible: false,
+      // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+      formLoading: false,
+      // 表单参数
+      formData: {
+        id: undefined,
+        name: undefined,
+        cost: undefined,
+        spec: undefined,
+        price: undefined,
+        code: undefined,
+        unit: undefined,
+        type: undefined,
+        manHour: undefined,
+        isSelf: undefined,
+        isPublic: undefined,
+        remark: undefined,
+        corpId:'',
+        corpIds:[],
+      },
+      // 表单校验
+      formRules: {},
+    };
+  },
+  methods: {
+    /** 打开弹窗 */
+    async open(id) {
+      this.dialogVisible = true;
+      this.reset();
+      // 修改时，设置数据
+      if (id) {
+        this.formLoading = true;
         try {
-          const data = this.formData;
-                  // 修改的提交
-          if (data.id) {
-            await RepairProjectApi.updateRepairProject(data);
-            this.$modal.msgSuccess("修改成功");
-            this.dialogVisible = false;
-            this.$emit('success');
-            return;
-          }
-          // 添加的提交
-          await RepairProjectApi.createRepairProject(data);
-          this.$modal.msgSuccess("新增成功");
-          this.dialogVisible = false;
-          this.$emit('success');
+          const res = await RepairProjectApi.getRepairProject(id);
+          this.formData = res.data;
+          this.title = "修改维修项目";
         } finally {
           this.formLoading = false;
         }
-      },
-                      /** 表单重置 */
-      reset() {
-        this.formData = {
-                            id: undefined,
-                            name: undefined,
-                            cost: undefined,
-                            spec: undefined,
-                            price: undefined,
-                            code: undefined,
-                            unit: undefined,
-                            type: undefined,
-                            manHour: undefined,
-                            isSelf: undefined,
-                            isPublic: undefined,
-                            remark: undefined,
-        };
-        this.resetForm("formRef");
       }
+      this.title = "新增维修项目";
+    },
+    /** 提交按钮 */
+    async submitForm() {
+      // 校验主表
+      await this.$refs["formRef"].validate();
+      this.formLoading = true;
+      try {
+        const data = this.formData;
+        // 修改的提交
+        if (data.id) {
+          await RepairProjectApi.updateRepairProject(data);
+          this.$modal.msgSuccess("修改成功");
+          this.dialogVisible = false;
+          this.$emit('success');
+          return;
+        }
+        // 添加的提交
+        await RepairProjectApi.createRepairProject(data);
+        this.$modal.msgSuccess("新增成功");
+        this.dialogVisible = false;
+        this.$emit('success');
+      } finally {
+        this.formLoading = false;
+      }
+    },
+    /** 表单重置 */
+    reset() {
+      this.formData = {
+        id: undefined,
+        name: undefined,
+        cost: undefined,
+        spec: undefined,
+        price: undefined,
+        code: undefined,
+        unit: undefined,
+        type: undefined,
+        manHour: undefined,
+        isSelf: undefined,
+        isPublic: undefined,
+        remark: undefined,
+        corpId:'',
+        corpIds:[],
+      };
+      this.resetForm("formRef");
     }
-  };
+  }
+};
 </script>
diff --git a/src/views/repair/project/index.vue b/src/views/repair/project/index.vue
index c258d91..fd9e651 100644
--- a/src/views/repair/project/index.vue
+++ b/src/views/repair/project/index.vue
@@ -5,37 +5,13 @@
       <el-form-item label="名称" prop="name">
         <el-input v-model="queryParams.name" placeholder="请输入名称" clearable @keyup.enter.native="handleQuery"/>
       </el-form-item>
-      <el-form-item label="成本" prop="cost">
-        <el-input v-model="queryParams.cost" placeholder="请输入成本" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="规格" prop="spec">
-        <el-input v-model="queryParams.spec" placeholder="请输入规格" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="售价" prop="price">
-        <el-input v-model="queryParams.price" placeholder="请输入售价" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="编码" prop="code">
-        <el-input v-model="queryParams.code" placeholder="请输入编码" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="单位" prop="unit">
-        <el-input v-model="queryParams.unit" placeholder="请输入单位" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
+
       <el-form-item label="分类" prop="type">
         <el-select v-model="queryParams.type" placeholder="请选择分类" clearable size="small">
-          <el-option label="请选择字典生成" value="" />
+          <el-option label="请选择字典生成" value=""/>
         </el-select>
       </el-form-item>
-      <el-form-item label="工时" prop="manHour">
-        <el-input v-model="queryParams.manHour" placeholder="请输入工时" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
 
-      <el-form-item label="备注" prop="remark">
-        <el-input v-model="queryParams.remark" placeholder="请输入备注" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="创建时间" prop="createTime">
-        <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
-                        range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
-      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
@@ -46,26 +22,27 @@
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="openForm(undefined)"
-                   v-hasPermi="['repair:project:create']">新增</el-button>
+                   v-hasPermi="['repair:project:create']">新增
+        </el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
-                   v-hasPermi="['repair:project:export']">导出</el-button>
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
+                   :loading="exportLoading"
+                   v-hasPermi="['repair:project:export']">导出
+        </el-button>
       </el-col>
-              <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
-
-            <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
-            <el-table-column label="主键标识" align="center" prop="id" />
-      <el-table-column label="名称" align="center" prop="name" />
-      <el-table-column label="成本" align="center" prop="cost" />
-      <el-table-column label="规格" align="center" prop="spec" />
-      <el-table-column label="售价" align="center" prop="price" />
-      <el-table-column label="编码" align="center" prop="code" />
-      <el-table-column label="单位" align="center" prop="unit" />
-      <el-table-column label="分类" align="center" prop="type" />
-      <el-table-column label="工时" align="center" prop="manHour" />
-      <el-table-column label="备注" align="center" prop="remark" />
+    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
+      <el-table-column label="名称" align="center" prop="name"/>
+      <el-table-column label="成本" align="center" prop="cost"/>
+      <el-table-column label="规格" align="center" prop="spec"/>
+      <el-table-column label="售价" align="center" prop="price"/>
+      <el-table-column label="编码" align="center" prop="code"/>
+      <el-table-column label="单位" align="center" prop="unit"/>
+      <el-table-column label="分类" align="center" prop="type"/>
+      <el-table-column label="工时" align="center" prop="manHour"/>
+      <el-table-column label="备注" align="center" prop="remark"/>
       <el-table-column label="创建时间" align="center" prop="createTime" width="180">
         <template v-slot="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
@@ -74,9 +51,11 @@
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template v-slot="scope">
           <el-button size="mini" type="text" icon="el-icon-edit" @click="openForm(scope.row.id)"
-                     v-hasPermi="['repair:project:update']">修改</el-button>
+                     v-hasPermi="['repair:project:update']">修改
+          </el-button>
           <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-                     v-hasPermi="['repair:project:delete']">删除</el-button>
+                     v-hasPermi="['repair:project:delete']">删除
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -84,17 +63,18 @@
     <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
                 @pagination="getList"/>
     <!-- 对话框(添加 / 修改) -->
-    <RepairProjectForm ref="formRef" @success="getList" />
-    </div>
+    <RepairProjectForm ref="formRef" @success="getList"/>
+  </div>
 </template>
 
 <script>
 import * as RepairProjectApi from '@/api/repair/project';
 import RepairProjectForm from './form/RepairProjectForm.vue';
+
 export default {
   name: "RepairProject",
   components: {
-          RepairProjectForm,
+    RepairProjectForm,
   },
   data() {
     return {
@@ -104,8 +84,8 @@ export default {
       exportLoading: false,
       // 显示搜索条件
       showSearch: true,
-              // 总条数
-        total: 0,
+      // 总条数
+      total: 0,
       // 维修项目列表
       list: [],
       // 是否展开，默认全部展开
@@ -116,8 +96,8 @@ export default {
       currentRow: {},
       // 查询参数
       queryParams: {
-                    pageNo: 1,
-            pageSize: 10,
+        pageNo: 1,
+        pageSize: 10,
         name: null,
         cost: null,
         spec: null,
@@ -131,7 +111,7 @@ export default {
         remark: null,
         createTime: [],
       },
-            };
+    };
   },
   created() {
     this.getList();
@@ -140,9 +120,9 @@ export default {
     /** 查询列表 */
     async getList() {
       try {
-      this.loading = true;
-              const res = await RepairProjectApi.getRepairProjectPage(this.queryParams);
-        this.list = res.data.list;
+        this.loading = true;
+        const res = await RepairProjectApi.getRepairProjectPage(this.queryParams);
+        this.list = res.data.records;
         this.total = res.data.total;
       } finally {
         this.loading = false;
@@ -165,12 +145,13 @@ export default {
     /** 删除按钮操作 */
     async handleDelete(row) {
       const id = row.id;
-      await this.$modal.confirm('是否确认删除维修项目编号为"' + id + '"的数据项?')
+      await this.$modal.confirm('是否确认删除维修项目名称为"' + row.name + '"的数据项?')
       try {
-       await RepairProjectApi.deleteRepairProject(id);
-       await this.getList();
-       this.$modal.msgSuccess("删除成功");
-      } catch {}
+        await RepairProjectApi.deleteRepairProject(id);
+        await this.getList();
+        this.$modal.msgSuccess("删除成功");
+      } catch {
+      }
     },
     /** 导出按钮操作 */
     async handleExport() {
@@ -184,6 +165,6 @@ export default {
         this.exportLoading = false;
       }
     },
-              }
+  }
 };
 </script>