From 54016236bdc50a44492e563e65d1d0c72918813e Mon Sep 17 00:00:00 2001
From: ZhangXianQiang <1135831638@qq.com>
Date: 星期二, 26 三月 2024 09:55:34 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/zgyw-ui

---
 src/views/system/report/index.vue |   34 +++++++++++++++++++++++++++++++---
 1 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/src/views/system/report/index.vue b/src/views/system/report/index.vue
index e78d801..6f360b9 100644
--- a/src/views/system/report/index.vue
+++ b/src/views/system/report/index.vue
@@ -17,6 +17,16 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="鎶ュ绫诲瀷" prop="reportType">
+        <el-select
+          v-model="queryParams.reportType"
+          placeholder="鎶ュ绫诲瀷"
+          clearable
+        >
+          <el-option label="浜嬪墠鎶ュ" value="浜嬪墠鎶ュ" />
+          <el-option label="浜嬪悗鎶ュ" value="浜嬪悗鎶ュ" />
+        </el-select>
+      </el-form-item>
       <el-form-item label="鎶ュ鏃堕棿">
         <el-date-picker
           v-model="daterangeCreateTime"
@@ -81,6 +91,7 @@
       <el-table-column label="杩愮淮鍗曚綅" align="center" prop="unitName" />
       <el-table-column label="鎶ュ浜哄憳" align="center" prop="peopleName" />
       <el-table-column label="鐐逛綅" align="center" prop="pointName" />
+      <el-table-column label="鎶ュ绫诲瀷" align="center" prop="reportType" />
       <el-table-column label="鎶ュ鍐呭" align="center" prop="reportContent" />
       <el-table-column label="涓婃姤鏉愭枡" align="center" prop="reportMaterials" />
       <el-table-column label="鏁呴殰绫诲瀷" align="center" prop="errorType" />
@@ -103,7 +114,7 @@
             type="text"
             icon="el-icon-edit"
             @click="handleAuditing(scope.row)"
-            v-hasPermi="['system:report:auditing']"
+            v-hasPermi="['system:report:audit']"
           >瀹℃牳</el-button>
           <el-button
             size="mini"
@@ -144,6 +155,12 @@
             </el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="鎶ュ绫诲瀷" prop="reportType">
+          <el-select v-model="form.reportType">
+            <el-option label="浜嬪墠鎶ュ" value="浜嬪墠鎶ュ"/>
+            <el-option label="浜嬪悗鎶ュ" value="浜嬪悗鎶ュ"/>
+          </el-select>
+        </el-form-item>
         <el-form-item label="鏁呴殰绫诲瀷" prop="errorType">
           <el-select v-model="form.errorType">
             <el-option label="甯傛斂鏂藉伐" value="甯傛斂鏂藉伐"/>
@@ -177,6 +194,9 @@
         <el-form-item label="鎶ュ浜哄憳">
           <el-input v-model="auditingForm.peopleName" disabled />
         </el-form-item>
+        <el-form-item label="鎶ュ绫诲瀷">
+          <el-input v-model="auditingForm.reportType" disabled />
+        </el-form-item>
         <el-form-item label="鏁呴殰绫诲瀷">
           <el-input v-model="auditingForm.errorType" disabled />
         </el-form-item>
@@ -196,6 +216,7 @@
         <el-button @click="auditingCancel">鍙� 娑�</el-button>
       </div>
     </el-dialog>
+
   </div>
 </template>
 
@@ -242,7 +263,8 @@
         errorType: "",
         reportContent: "",
         auditing: "",
-        suggest: ""
+        suggest: "",
+        reportType: "",
       },
       // 鏌ヨ鍙傛暟
       queryParams: {
@@ -273,6 +295,9 @@
         reportMaterials: [
           { required: true, message: "涓婃姤鏉愭枡涓嶈兘涓虹┖", trigger: "blur" }
         ],
+        reportType: [
+          { required: true, message: "璇烽�夋嫨鎶ュ绫诲瀷", trigger: "blur" }
+        ],
       }
     };
   },
@@ -291,6 +316,7 @@
       this.auditingForm.peopleName =row.peopleName
       this.auditingForm.errorType =row.errorType
       this.auditingForm.reportContent =row.reportContent
+      this.auditingForm.reportType =row.reportType
     },
     // 杩滅▼鎼滅储鐐逛綅
     remoteGetPoints(query) {
@@ -382,6 +408,8 @@
     },
     /** 鎻愪氦鎸夐挳 */
     submitForm() {
+      // todo 鍒ゆ柇鏄簨鍓嶆姤澶�
+
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.id != null) {
@@ -392,7 +420,7 @@
             });
           } else {
             addReport(this.form).then(response => {
-              this.$modal.msgSuccess("鏂板鎴愬姛");
+              this.$modal.msgSuccess("鎴愬姛鎻愪氦鎶ュ");
               this.open = false;
               this.getList();
             });

--
Gitblit v1.8.0