From 5309f0aae4dc789cee92a8d7de4985c22d6ce259 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 19 三月 2024 17:32:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/views/system/publish/index.vue |  145 +++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 130 insertions(+), 15 deletions(-)

diff --git a/src/views/system/publish/index.vue b/src/views/system/publish/index.vue
index 7c10d18..b508a11 100644
--- a/src/views/system/publish/index.vue
+++ b/src/views/system/publish/index.vue
@@ -117,12 +117,25 @@
         <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.state"/>
       </template>
       </el-table-column>
-      <el-table-column label="鍒涘缓浜�" align="center" prop="createUserName" />
-      <el-table-column label="鍒涘缓鏃堕棿" align="center" prop="createTime" />
       <el-table-column label="淇敼浜�" align="center" prop="updateUserName" />
-      <el-table-column label="淇敼鏃堕棿" align="center" prop="updateTime" />
+      <el-table-column label="淇敼鏃堕棿" align="center" prop="updateTime" width="170px" />
+      <el-table-column label="瀹℃牳鐘舵��" align="center" prop="auditState">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.platform_audit_state" :value="scope.row.auditState"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="瀹℃牳浜�" align="center" prop="auditUser" />
+      <el-table-column label="瀹℃牳鏃堕棿" align="center" prop="auditTime" width="170px"/>
+      <el-table-column label="瀹℃牳鎰忚" align="center" prop="auditDescription" />
       <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-s-check"
+            @click="handleAudit(scope.row)"
+            v-hasPermi="['examine:publish:audit']"
+          >瀹℃牳</el-button>
           <el-button
             size="mini"
             type="text"
@@ -146,7 +159,7 @@
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />
-
+  <div>
     <!-- 娣诲姞鎴栦慨鏀硅�冩牳鍙戝竷瀵硅瘽妗� -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
@@ -175,22 +188,22 @@
               v-for="dict in dict.type.platform_examine_range"
               :key="dict.value"
               :label="dict.label"
-              :value="dict.value"
+              :value="parseInt(dict.value)"
             />
           </el-select>
         </el-form-item>
-        <el-form-item label="鑰冩牳棰戠巼" prop="frequency">
-          <el-select
-            v-model="form.frequency"
-            placeholder="鑰冩牳棰戠巼"
-            clearable
-            style="width: 170px"
-          >
+        <el-form-item label="鑰冩牳棰戠巼">
+            <el-select
+              v-model="form.frequency"
+              placeholder="鑰冩牳棰戠巼"
+              clearable
+              style="width: 170px"
+            >
             <el-option
               v-for="dict in dict.type.platform_examine_frequency"
               :key="dict.value"
               :label="dict.label"
-              :value="dict.value"
+              :value="parseInt(dict.value)"
             />
           </el-select>
         </el-form-item>
@@ -208,7 +221,7 @@
               v-for="dict in dict.type.sys_normal_disable"
               :key="dict.value"
               :label="dict.label"
-              :value="dict.value"
+              :value="parseInt(dict.value)"
             />
           </el-select>
         </el-form-item>
@@ -221,6 +234,94 @@
         <el-button @click="cancel">鍙� 娑�</el-button>
       </div>
     </el-dialog>
+
+    <!-- 瀹℃牳鑰冩牳鍙戝竷瀵硅瘽妗� -->
+    <el-dialog :title="title" :visible.sync="auditOpen" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+        <el-form-item label="鑰冩牳鍚�" prop="examineName">
+          <el-input v-model="form.examineName" placeholder="璇疯緭鍏ヨ�冩牳鍚�" disabled/>
+        </el-form-item>
+        <el-form-item label="鑰冩牳妯℃澘" prop="templateId">
+          <el-select v-model="form.templateId" placeholder="鑰冩牳妯℃澘" disabled>
+            <el-option
+              v-for="item in templateList"
+              :key="item.id"
+              :label="item.value"
+              :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="鑰冩牳鑼冨洿" prop="examineRange" >
+          <el-select
+            v-model="form.examineRange"
+            placeholder="鑰冩牳鑼冨洿"
+            clearable
+            style="width: 170px"
+            disabled
+          >
+            <el-option
+              v-for="dict in dict.type.platform_examine_range"
+              :key="dict.value"
+              :label="dict.label"
+              :value="parseInt(dict.value)"
+            />
+          </el-select>
+        </el-form-item>
+
+        <el-form-item label="鑰冩牳棰戠巼" prop="frequency" >
+          <el-select
+            v-model="form.frequency"
+            placeholder="鑰冩牳棰戠巼"
+            clearable
+            style="width: 170px"
+            disabled
+          >
+            <el-option
+              v-for="dict in dict.type.platform_examine_frequency"
+              :key="dict.value"
+              :label="dict.label"
+              :value="parseInt(dict.value)"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="鎶ヨ鍒嗘暟闃堝��" prop="alarmScore">
+          <el-input v-model="form.alarmScore" placeholder="璇疯緭鍏ュ垎鏁�" style="width: 170px"  disabled/>
+        </el-form-item>
+        <el-form-item label="鑰冩牳鐘舵��" prop="state">
+          <el-select
+            v-model="form.state"
+            placeholder="鑰冩牳鐘舵��"
+            clearable
+            style="width: 170px"
+            disabled
+          >
+            <el-option
+              v-for="dict in dict.type.sys_normal_disable"
+              :key="dict.value"
+              :label="dict.label"
+              :value="parseInt(dict.value)"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="鎻忚堪" prop="description">
+          <el-input v-model="form.description" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" disabled/>
+        </el-form-item>
+        <el-form-item label="瀹℃牳缁撴灉" prop="auditState" >
+          <el-radio-group v-model="form.auditState">
+            <el-radio :label="1">閫氳繃</el-radio>
+            <el-radio :label="2">椹冲洖</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="瀹℃牳璇存槑" prop="auditDescription" >
+          <el-input v-model="form.auditDescription" type="textarea" show-word-limit maxlength="100" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
+        <el-button @click="cancel">鍙� 娑�</el-button>
+      </div>
+    </el-dialog>
+  </div>
   </div>
 </template>
 
@@ -229,7 +330,7 @@
 import { templateSelect } from "@/api/platform/check-template";
 export default {
   name: "Publish",
-  dicts: ['sys_normal_disable','platform_examine_range','platform_examine_frequency'],
+  dicts: ['sys_normal_disable','platform_examine_range','platform_examine_frequency','platform_audit_state'],
   data() {
     return {
       // 閬僵灞�
@@ -250,6 +351,7 @@
       title: "",
       // 鏄惁鏄剧ず寮瑰嚭灞�
       open: false,
+      auditOpen: false,
       // 鏌ヨ鍙傛暟
       queryParams: {
         pageNum: 1,
@@ -291,6 +393,7 @@
     // 鍙栨秷鎸夐挳
     cancel() {
       this.open = false;
+      this.auditOpen = false;
       this.reset();
     },
     // 琛ㄥ崟閲嶇疆
@@ -341,6 +444,16 @@
         this.title = "淇敼鑰冩牳鍙戝竷";
       });
     },
+    /** 淇敼鎸夐挳鎿嶄綔 */
+    handleAudit(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getPublish(id).then(response => {
+        this.form = response.data;
+        this.auditOpen = true;
+        this.title = "瀹℃牳鑰冩牳鍙戝竷";
+      });
+    },
     /** 鎻愪氦鎸夐挳 */
     submitForm() {
       this.$refs["form"].validate(valid => {
@@ -349,12 +462,14 @@
             updatePublish(this.form).then(response => {
               this.$modal.msgSuccess("淇敼鎴愬姛");
               this.open = false;
+              this.auditOpen = false;
               this.getList();
             });
           } else {
             addPublish(this.form).then(response => {
               this.$modal.msgSuccess("鏂板鎴愬姛");
               this.open = false;
+              this.auditOpen = false;
               this.getList();
             });
           }

--
Gitblit v1.8.0