From f2cccc16416b6c80cb206752536e5597d7bc1b59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A3=AE=E5=B1=BF=E6=B5=B7=E5=B7=B7?= <15711450175@163.com>
Date: Thu, 16 Sep 2021 10:16:43 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=B2=E7=BB=8F=E5=AE=8C=E6=88=90=20=20=20?=
 =?UTF-8?q?=20=20=E4=BB=93=E5=BA=93=E7=AE=A1=E7=90=86=E7=B3=BB=E7=BB=9F?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=BB=E5=8A=A1=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/templates/system/recordtask/add.html  | 6 +++++-
 .../main/resources/templates/system/recordtask/edit.html | 6 +++++-
 .../templates/system/recordtask/recordtask.html          | 9 ++++++++-
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/templates/system/recordtask/add.html b/ruoyi-admin/src/main/resources/templates/system/recordtask/add.html
index 5ff5d74..e53f7f2 100644
--- a/ruoyi-admin/src/main/resources/templates/system/recordtask/add.html
+++ b/ruoyi-admin/src/main/resources/templates/system/recordtask/add.html
@@ -63,9 +63,13 @@
             </div>
             <div class="form-group">    
                 <label class="col-sm-3 control-label">任务状态：</label>
+
                 <div class="col-sm-8">
-                    <input name="taskStatus" class="form-control" type="text">
+                    <select name="taskStatus" class="form-control m-b" th:with="type=${@dict.getType('location_status')}">
+                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                    </select>
                 </div>
+
             </div>
             <div class="form-group">    
                 <label class="col-sm-3 control-label">返回标识：</label>
diff --git a/ruoyi-admin/src/main/resources/templates/system/recordtask/edit.html b/ruoyi-admin/src/main/resources/templates/system/recordtask/edit.html
index faaeab1..3fa3cf0 100644
--- a/ruoyi-admin/src/main/resources/templates/system/recordtask/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/system/recordtask/edit.html
@@ -64,9 +64,13 @@
             </div>
             <div class="form-group">    
                 <label class="col-sm-3 control-label">任务状态：</label>
+
                 <div class="col-sm-8">
-                    <input name="taskStatus" th:field="*{taskStatus}" class="form-control" type="text">
+                    <select name="taskStatus" class="form-control m-b" th:with="type=${@dict.getType('location_status')}">
+                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{locationStatus}"></option>
+                    </select>
                 </div>
+
             </div>
             <div class="form-group">    
                 <label class="col-sm-3 control-label">返回标识：</label>
diff --git a/ruoyi-admin/src/main/resources/templates/system/recordtask/recordtask.html b/ruoyi-admin/src/main/resources/templates/system/recordtask/recordtask.html
index aaa9736..a029975 100644
--- a/ruoyi-admin/src/main/resources/templates/system/recordtask/recordtask.html
+++ b/ruoyi-admin/src/main/resources/templates/system/recordtask/recordtask.html
@@ -50,6 +50,10 @@
     <script th:inline="javascript">
         var editFlag = [[${@permission.hasPermi('system:recordtask:edit')}]];
         var removeFlag = [[${@permission.hasPermi('system:recordtask:remove')}]];
+
+
+        var locationStatus = [[${@dict.getType('location_status')}]];
+
         var prefix = ctx + "system/recordtask";
 
         $(function() {
@@ -106,7 +110,10 @@
                 },
                 {
                     field: 'taskStatus',
-                    title: '任务状态'
+                    title: '任务状态',
+                    formatter: function(value, row, index) {
+                        return $.table.selectDictLabel(locationStatus, value);
+                    }
                 },
                 {
                     field: 'returnFlag',