From 93cff80aba3cd6701a1534c0ebec84328918dc8b Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期三, 08 三月 2023 18:31:22 +0800
Subject: [PATCH] yxh

---
 ruoyi-ui/src/views/smartor/patphysical/index.vue            |  272 +-
 ruoyi-ui/src/views/smartor/schemetriggerscene/index.vue     |   61 
 ruoyi-ui/src/views/smartor/schemetaskrecord/index.vue       |  392 +---
 ruoyi-ui/src/views/smartor/patarchive/index.vue             |  290 +--
 ruoyi-ui/src/views/smartor/patinhosp/index.vue              |  381 +--
 ruoyi-ui/src/views/smartor/schemetriggerrule/index.vue      |  359 +---
 ruoyi-ui/src/views/smartor/schemeplan/index.vue             |  302 --
 ruoyi-ui/src/views/smartor/hecategory/index.vue             |   10 
 ruoyi-ui/src/views/smartor/schemeautofinshrule/index.vue    |   41 
 ruoyi-ui/src/views/smartor/schemecategory/index.vue         |   39 
 ruoyi-ui/src/views/smartor/schemetaskconfig/index.vue       |  446 ----
 ruoyi-ui/src/views/smartor/schemetask/index.vue             |  708 ++-----
 ruoyi-ui/src/views/smartor/patouthosp/index.vue             |  275 +-
 ruoyi-ui/src/views/smartor/schemelibrary/index.vue          |  515 +----
 ruoyi-ui/src/views/smartor/schemecalldetail/index.vue       |  538 +----
 ruoyi-ui/src/views/smartor/helibrary/index.vue              |  218 --
 ruoyi-ui/src/views/smartor/schemetaskrepeatconfig/index.vue |  293 --
 17 files changed, 1,543 insertions(+), 3,597 deletions(-)

diff --git a/ruoyi-ui/src/views/smartor/hecategory/index.vue b/ruoyi-ui/src/views/smartor/hecategory/index.vue
index 65ccda1..b568f5f 100644
--- a/ruoyi-ui/src/views/smartor/hecategory/index.vue
+++ b/ruoyi-ui/src/views/smartor/hecategory/index.vue
@@ -104,7 +104,7 @@
 
     <!-- 娣诲姞鎴栦慨鏀瑰鏁欏垎绫诲璇濇 -->
     <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 ref="form" :model="form" :rules="rules" label-width="120px">
         <el-form-item label=" 鍒嗙被鍚嶇О " prop="categoryname">
           <el-input v-model="form.categoryname" placeholder="璇疯緭鍏� 鍒嗙被鍚嶇О " />
         </el-form-item>
@@ -113,14 +113,6 @@
         </el-form-item>
         <el-form-item label=" 鍒犻櫎鏍囪 " prop="delFlag">
           <el-input v-model="form.delFlag" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" />
-        </el-form-item>
-        <el-form-item label=" 涓婁紶鏃堕棿 " prop="uploadTime">
-          <el-date-picker clearable
-            v-model="form.uploadTime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="璇烽�夋嫨 涓婁紶鏃堕棿 ">
-          </el-date-picker>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
diff --git a/ruoyi-ui/src/views/smartor/helibrary/index.vue b/ruoyi-ui/src/views/smartor/helibrary/index.vue
index 1ba760a..5342951 100644
--- a/ruoyi-ui/src/views/smartor/helibrary/index.vue
+++ b/ruoyi-ui/src/views/smartor/helibrary/index.vue
@@ -2,116 +2,24 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label=" 瀹f暀鍒嗙被 " prop="preachcategoryid">
-        <el-input
-          v-model="queryParams.preachcategoryid"
-          placeholder="璇疯緭鍏� 瀹f暀鍒嗙被 "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" 瀹f暀鍚嶇О " prop="preachname">
-        <el-input
-          v-model="queryParams.preachname"
-          placeholder="璇疯緭鍏� 瀹f暀鍚嶇О "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" 鐗堟湰 " prop="version">
-        <el-input
-          v-model="queryParams.version"
-          placeholder="璇疯緭鍏� 鐗堟湰 "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" 瀹f暀褰㈠紡 " prop="preachform">
-        <el-input
-          v-model="queryParams.preachform"
-          placeholder="璇疯緭鍏� 瀹f暀褰㈠紡 "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" 妯℃澘ID " prop="templateid">
-        <el-input
-          v-model="queryParams.templateid"
-          placeholder="璇疯緭鍏� 妯℃澘ID "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" 瀹f暀浠g爜 " prop="preachcode">
-        <el-input
-          v-model="queryParams.preachcode"
-          placeholder="璇疯緭鍏� 瀹f暀浠g爜 "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" 涓績搴揑D " prop="centerlibraryid">
-        <el-input
-          v-model="queryParams.centerlibraryid"
-          placeholder="璇疯緭鍏� 涓績搴揑D "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" 鏄惁鍚敤 " prop="isenable">
-        <el-input
-          v-model="queryParams.isenable"
-          placeholder="璇疯緭鍏� 鏄惁鍚敤 "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" 鏈烘瀯ID " prop="orgid">
-        <el-input
-          v-model="queryParams.orgid"
-          placeholder="璇疯緭鍏� 鏈烘瀯ID "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" 涓婁紶鏍囪 " prop="isupload">
-        <el-input
-          v-model="queryParams.isupload"
-          placeholder="璇疯緭鍏� 涓婁紶鏍囪 "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" 涓婁紶鏃堕棿 " prop="uploadTime">
-        <el-date-picker clearable
-          v-model="queryParams.uploadTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="璇烽�夋嫨 涓婁紶鏃堕棿 ">
-        </el-date-picker>
+        <el-input v-model="queryParams.preachcategoryid" placeholder="璇疯緭鍏� 瀹f暀鍒嗙被 " clearable
+          @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label=" 瀹f暀鍒嗙被 " prop="classification">
-        <el-input
-          v-model="queryParams.classification"
-          placeholder="璇疯緭鍏� 瀹f暀鍒嗙被 "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.classification" placeholder="璇疯緭鍏� 瀹f暀鍒嗙被 " clearable
+          @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item label=" 鏄惁鏈湴 " prop="islocal">
-        <el-input
-          v-model="queryParams.islocal"
-          placeholder="璇疯緭鍏� 鏄惁鏈湴 "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+      <el-form-item label=" 瀹f暀鍚嶇О " prop="preachname">
+        <el-input v-model="queryParams.preachname" placeholder="璇疯緭鍏� 瀹f暀鍚嶇О " clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item label=" 涓績搴撲唬鐮� " prop="centerlibrarycode">
-        <el-input
-          v-model="queryParams.centerlibrarycode"
-          placeholder="璇疯緭鍏� 涓績搴撲唬鐮� "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+      <el-form-item label=" 瀹f暀褰㈠紡 " prop="preachform">
+        <el-input v-model="queryParams.preachform" placeholder="璇疯緭鍏� 瀹f暀褰㈠紡 " clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label=" 鏄惁鍚敤 " prop="isenable">
+        <el-input v-model="queryParams.isenable" placeholder="璇疯緭鍏� 鏄惁鍚敤 " clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label=" 鏈烘瀯ID " prop="orgid">
+        <el-input v-model="queryParams.orgid" placeholder="璇疯緭鍏� 鏈烘瀯ID " clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
@@ -121,46 +29,20 @@
 
     <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="['smartor:helibrary:add']"
-        >鏂板</el-button>
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+          v-hasPermi="['smartor:helibrary:add']">鏂板</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['smartor:helibrary:edit']"
-        >淇敼</el-button>
+        <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
+          v-hasPermi="['smartor:helibrary:edit']">淇敼</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['smartor:helibrary:remove']"
-        >鍒犻櫎</el-button>
+        <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
+          v-hasPermi="['smartor:helibrary:remove']">鍒犻櫎</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['smartor:helibrary:export']"
-        >瀵煎嚭</el-button>
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
+          v-hasPermi="['smartor:helibrary:export']">瀵煎嚭</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
@@ -170,55 +52,30 @@
       <el-table-column label=" 鑷ID " align="center" prop="id" />
       <el-table-column label=" 瀹f暀鍒嗙被 " align="center" prop="preachcategoryid" />
       <el-table-column label=" 瀹f暀鍚嶇О " align="center" prop="preachname" />
-      <el-table-column label=" 鐗堟湰 " align="center" prop="version" />
       <el-table-column label=" 瀹f暀褰㈠紡 " align="center" prop="preachform" />
       <el-table-column label=" 瀹f暀鎻忚堪 " align="center" prop="preachdescription" />
       <el-table-column label=" 瀹f暀鍐呭 " align="center" prop="preachcontent" />
       <el-table-column label=" 妯℃澘ID " align="center" prop="templateid" />
       <el-table-column label=" 瀹f暀浠g爜 " align="center" prop="preachcode" />
-      <el-table-column label=" 涓績搴揑D " align="center" prop="centerlibraryid" />
       <el-table-column label=" 鏄惁鍚敤 " align="center" prop="isenable" />
       <el-table-column label=" 鏈烘瀯ID " align="center" prop="orgid" />
-      <el-table-column label=" 涓婁紶鏍囪 " align="center" prop="isupload" />
-      <el-table-column label=" 涓婁紶鏃堕棿 " align="center" prop="uploadTime" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.uploadTime, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
       <el-table-column label=" 瀹f暀鍒嗙被 " align="center" prop="classification" />
-      <el-table-column label=" 鏄惁鏈湴 " align="center" prop="islocal" />
-      <el-table-column label=" 涓績搴撲唬鐮� " align="center" prop="centerlibrarycode" />
       <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="handleUpdate(scope.row)"
-            v-hasPermi="['smartor:helibrary:edit']"
-          >淇敼</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['smartor:helibrary:remove']"
-          >鍒犻櫎</el-button>
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+            v-hasPermi="['smartor:helibrary:edit']">淇敼</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+            v-hasPermi="['smartor:helibrary:remove']">鍒犻櫎</el-button>
         </template>
       </el-table-column>
     </el-table>
-    
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
+
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+      @pagination="getList" />
 
     <!-- 娣诲姞鎴栦慨鏀瑰鏁欏簱瀵硅瘽妗� -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+    <el-dialog :title="title" :visible.sync="open" :show-close="true" :close-on-click-modal="false" width="1000px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" :inline="true" label-width="120px">
         <el-form-item label=" 瀹f暀鍒嗙被 " prop="preachcategoryid">
           <el-input v-model="form.preachcategoryid" placeholder="璇疯緭鍏� 瀹f暀鍒嗙被 " />
         </el-form-item>
@@ -235,7 +92,7 @@
           <el-input v-model="form.preachdescription" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" />
         </el-form-item>
         <el-form-item label=" 瀹f暀鍐呭 ">
-          <editor v-model="form.preachcontent" :min-height="192"/>
+          <el-input v-model="form.preachcontent" type="textarea" placeholder="璇疯緭鍏�" />
         </el-form-item>
         <el-form-item label=" 妯℃澘ID " prop="templateid">
           <el-input v-model="form.templateid" placeholder="璇疯緭鍏� 妯℃澘ID " />
@@ -259,10 +116,7 @@
           <el-input v-model="form.isupload" placeholder="璇疯緭鍏� 涓婁紶鏍囪 " />
         </el-form-item>
         <el-form-item label=" 涓婁紶鏃堕棿 " prop="uploadTime">
-          <el-date-picker clearable
-            v-model="form.uploadTime"
-            type="date"
-            value-format="yyyy-MM-dd"
+          <el-date-picker clearable v-model="form.uploadTime" type="date" value-format="yyyy-MM-dd"
             placeholder="璇烽�夋嫨 涓婁紶鏃堕棿 ">
           </el-date-picker>
         </el-form-item>
@@ -402,7 +256,7 @@
     // 澶氶�夋閫変腑鏁版嵁
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
     /** 鏂板鎸夐挳鎿嶄綔 */
@@ -444,12 +298,12 @@
     /** 鍒犻櫎鎸夐挳鎿嶄綔 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('鏄惁纭鍒犻櫎瀹f暀搴撶紪鍙蜂负"' + ids + '"鐨勬暟鎹」锛�').then(function() {
+      this.$modal.confirm('鏄惁纭鍒犻櫎瀹f暀搴撶紪鍙蜂负"' + ids + '"鐨勬暟鎹」锛�').then(function () {
         return delHelibrary(ids);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
-      }).catch(() => {});
+      }).catch(() => { });
     },
     /** 瀵煎嚭鎸夐挳鎿嶄綔 */
     handleExport() {
diff --git a/ruoyi-ui/src/views/smartor/patarchive/index.vue b/ruoyi-ui/src/views/smartor/patarchive/index.vue
index 2358b34..c77fd4a 100644
--- a/ruoyi-ui/src/views/smartor/patarchive/index.vue
+++ b/ruoyi-ui/src/views/smartor/patarchive/index.vue
@@ -2,62 +2,31 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label=" 濮撳悕 " prop="name">
-        <el-input
-          v-model="queryParams.name"
-          placeholder="璇疯緭鍏� 濮撳悕 "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.name" placeholder="璇疯緭鍏� 濮撳悕 " clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label=" 璇佷欢鍙风爜 " prop="iccardno">
-        <el-input
-          v-model="queryParams.iccardno"
-          placeholder="璇疯緭鍏� 璇佷欢鍙风爜 "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.iccardno" placeholder="璇疯緭鍏� 璇佷欢鍙风爜 " clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label=" 鏉ユ簮 " prop="source">
         <el-select v-model="queryParams.source" placeholder="璇烽�夋嫨 鏉ユ簮 " clearable>
-          <el-option
-            v-for="dict in dict.type.sys_patientfrom"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
+          <el-option v-for="dict in dict.type.sys_patientfrom" :key="dict.value" :label="dict.label"
+            :value="dict.value" />
         </el-select>
       </el-form-item>
       <el-form-item label=" 鎵嬫満鍙风爜 " prop="telcode">
-        <el-input
-          v-model="queryParams.telcode"
-          placeholder="璇疯緭鍏� 鎵嬫満鍙风爜 "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.telcode" placeholder="璇疯緭鍏� 鎵嬫満鍙风爜 " clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label=" 鏈烘瀯ID " prop="orgid">
         <el-select v-model="queryParams.orgid" placeholder="璇烽�夋嫨 鏈烘瀯ID " clearable>
-          <el-option
-            v-for="dict in dict.type.sys_patientfrom"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
+          <el-option v-for="dict in dict.type.sys_patientfrom" :key="dict.value" :label="dict.label"
+            :value="dict.value" />
         </el-select>
       </el-form-item>
       <el-form-item label=" 涓婁紶鏍囪 " prop="isupload">
-        <el-input
-          v-model="queryParams.isupload"
-          placeholder="璇疯緭鍏� 涓婁紶鏍囪 "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.isupload" placeholder="璇疯緭鍏� 涓婁紶鏍囪 " clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label=" 涓婁紶鏃堕棿 " prop="uploadTime">
-        <el-date-picker clearable
-          v-model="queryParams.uploadTime"
-          type="date"
-          value-format="yyyy-MM-dd"
+        <el-date-picker clearable v-model="queryParams.uploadTime" type="date" value-format="yyyy-MM-dd"
           placeholder="璇烽�夋嫨 涓婁紶鏃堕棿 ">
         </el-date-picker>
       </el-form-item>
@@ -69,46 +38,20 @@
 
     <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="['smartor:patarchive:add']"
-        >鏂板</el-button>
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+          v-hasPermi="['smartor:patarchive:add']">鏂板</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['smartor:patarchive:edit']"
-        >淇敼</el-button>
+        <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
+          v-hasPermi="['smartor:patarchive:edit']">淇敼</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['smartor:patarchive:remove']"
-        >鍒犻櫎</el-button>
+        <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
+          v-hasPermi="['smartor:patarchive:remove']">鍒犻櫎</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['smartor:patarchive:export']"
-        >瀵煎嚭</el-button>
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
+          v-hasPermi="['smartor:patarchive:export']">瀵煎嚭</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
@@ -119,7 +62,7 @@
       <el-table-column label=" 濮撳悕 " align="center" prop="name" />
       <el-table-column label=" 鎬у埆 " align="center" prop="sex">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.sys_user_sex" :value="scope.row.sex"/>
+          <dict-tag :options="dict.type.sys_user_sex" :value="scope.row.sex" />
         </template>
       </el-table-column>
       <el-table-column label=" 璇佷欢鍙风爜 " align="center" prop="iccardno" />
@@ -131,127 +74,104 @@
       <el-table-column label=" 骞撮緞 " align="center" prop="age" />
       <el-table-column label=" 鏉ユ簮 " align="center" prop="source">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.sys_patientfrom" :value="scope.row.source"/>
+          <dict-tag :options="dict.type.sys_patientfrom" :value="scope.row.source" />
         </template>
       </el-table-column>
       <el-table-column label=" 鎵嬫満鍙风爜 " align="center" prop="telcode" />
       <el-table-column label=" 鏈烘瀯ID " align="center" prop="orgid">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.sys_patientfrom" :value="scope.row.orgid"/>
+          <dict-tag :options="dict.type.sys_patientfrom" :value="scope.row.orgid" />
         </template>
       </el-table-column>
       <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="handleUpdate(scope.row)"
-            v-hasPermi="['smartor:patarchive:edit']"
-          >淇敼</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['smartor:patarchive:remove']"
-          >鍒犻櫎</el-button>
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+            v-hasPermi="['smartor:patarchive:edit']">淇敼</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+            v-hasPermi="['smartor:patarchive:remove']">鍒犻櫎</el-button>
         </template>
       </el-table-column>
     </el-table>
-    
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
+
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+      @pagination="getList" />
 
     <!-- 娣诲姞鎴栦慨鏀规偅鑰呮。妗堝璇濇 -->
-    <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=" 濮撳悕 " prop="name">
-          <el-input v-model="form.name" placeholder="璇疯緭鍏� 濮撳悕 " />
-        </el-form-item>
-        <el-form-item label=" 鎬у埆 " prop="sex">
-          <el-select v-model="form.sex" placeholder="璇烽�夋嫨 鎬у埆 ">
-            <el-option
-              v-for="dict in dict.type.sys_user_sex"
-              :key="dict.value"
-              :label="dict.label"
-              :value="parseInt(dict.value)"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label=" 璇佷欢鍙风爜 " prop="iccardno">
-          <el-input v-model="form.iccardno" placeholder="璇疯緭鍏� 璇佷欢鍙风爜 " />
-        </el-form-item>
-        <el-form-item label=" 鐢熸棩 " prop="birthdate">
-          <el-date-picker clearable
-            v-model="form.birthdate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="璇烽�夋嫨 鐢熸棩 ">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label=" 骞撮緞 " prop="age">
-          <el-input v-model="form.age" placeholder="璇疯緭鍏� 骞撮緞 " />
-        </el-form-item>
-        <el-form-item label=" 鏉ユ簮 " prop="source">
-          <el-select v-model="form.source" placeholder="璇烽�夋嫨 鏉ユ簮 ">
-            <el-option
-              v-for="dict in dict.type.sys_patientfrom"
-              :key="dict.value"
-              :label="dict.label"
-              :value="parseInt(dict.value)"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label=" 寤烘。鏃堕棿 " prop="archivetime">
-          <el-date-picker clearable
-            v-model="form.archivetime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="璇烽�夋嫨 寤烘。鏃堕棿 ">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label=" 寤烘。浜� " prop="archiveby">
-          <el-input v-model="form.archiveby" placeholder="璇疯緭鍏� 寤烘。浜� " />
-        </el-form-item>
-        <el-form-item label=" 鎵嬫満鍙风爜 " prop="telcode">
-          <el-input v-model="form.telcode" placeholder="璇疯緭鍏� 鎵嬫満鍙风爜 " />
-        </el-form-item>
-        <el-form-item label=" 浜插睘鍙风爜 " prop="relativetelcode">
-          <el-input v-model="form.relativetelcode" placeholder="璇疯緭鍏� 浜插睘鍙风爜 " />
-        </el-form-item>
-        <el-form-item label=" 鏈烘瀯ID " prop="orgid">
-          <el-select v-model="form.orgid" placeholder="璇烽�夋嫨 鏈烘瀯ID ">
-            <el-option
-              v-for="dict in dict.type.sys_patientfrom"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label=" 寰俊openid " prop="openid">
-          <el-input v-model="form.openid" placeholder="璇疯緭鍏� 寰俊openid " />
-        </el-form-item>
-        <el-form-item label=" 鍒犻櫎鏍囪 " prop="delFlag">
-          <el-input v-model="form.delFlag" placeholder="璇疯緭鍏� 鍒犻櫎鏍囪 " />
-        </el-form-item>
-        <el-form-item label=" 涓婁紶鏍囪 " prop="isupload">
-          <el-input v-model="form.isupload" placeholder="璇疯緭鍏� 涓婁紶鏍囪 " />
-        </el-form-item>
-        <el-form-item label=" 涓婁紶鏃堕棿 " prop="uploadTime">
-          <el-date-picker clearable
-            v-model="form.uploadTime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="璇烽�夋嫨 涓婁紶鏃堕棿 ">
-          </el-date-picker>
-        </el-form-item>
+    <el-dialog :title="title" :visible.sync="open" :showclose="true" :close-on-click-modal="false" :inline="true" width="1000px"  append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+        <el-row>
+          <el-col :span="12"><el-form-item label=" 濮撳悕 " prop="name">
+              <el-input v-model="form.name" placeholder="璇疯緭鍏� 濮撳悕 " />
+            </el-form-item></el-col>
+          <el-col :span="12"><el-form-item label=" 鎬у埆 " prop="sex">
+              <el-select v-model="form.sex" placeholder="璇烽�夋嫨 鎬у埆 ">
+                <el-option v-for="dict in dict.type.sys_user_sex" :key="dict.value" :label="dict.label"
+                  :value="parseInt(dict.value)"></el-option>
+              </el-select>
+            </el-form-item></el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12"><el-form-item label=" 璇佷欢鍙风爜 " prop="iccardno">
+              <el-input v-model="form.iccardno" placeholder="璇疯緭鍏� 璇佷欢鍙风爜 " />
+            </el-form-item></el-col>
+          <el-col :span="12"><el-form-item label=" 鐢熸棩 " prop="birthdate">
+              <el-date-picker clearable v-model="form.birthdate" type="date" value-format="yyyy-MM-dd"
+                placeholder="璇烽�夋嫨 鐢熸棩 ">
+              </el-date-picker>
+            </el-form-item></el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12"><el-form-item label=" 骞撮緞 " prop="age">
+              <el-input v-model="form.age" placeholder="璇疯緭鍏� 骞撮緞 " />
+            </el-form-item></el-col>
+          <el-col :span="12"><el-form-item label=" 鏉ユ簮 " prop="source">
+              <el-select v-model="form.source" placeholder="璇烽�夋嫨 鏉ユ簮 ">
+                <el-option v-for="dict in dict.type.sys_patientfrom" :key="dict.value" :label="dict.label"
+                  :value="parseInt(dict.value)"></el-option>
+              </el-select>
+            </el-form-item></el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12"><el-form-item label=" 寤烘。鏃堕棿 " prop="archivetime">
+              <el-date-picker clearable v-model="form.archivetime" type="date" value-format="yyyy-MM-dd"
+                placeholder="璇烽�夋嫨 寤烘。鏃堕棿 ">
+              </el-date-picker>
+            </el-form-item></el-col>
+          <el-col :span="12"><el-form-item label=" 寤烘。浜� " prop="archiveby">
+              <el-input v-model="form.archiveby" placeholder="璇疯緭鍏� 寤烘。浜� " />
+            </el-form-item></el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12"> <el-form-item label=" 鎵嬫満鍙风爜 " prop="telcode">
+              <el-input v-model="form.telcode" placeholder="璇疯緭鍏� 鎵嬫満鍙风爜 " />
+            </el-form-item></el-col>
+          <el-col :span="12"><el-form-item label=" 浜插睘鍙风爜 " prop="relativetelcode">
+              <el-input v-model="form.relativetelcode" placeholder="璇疯緭鍏� 浜插睘鍙风爜 " />
+            </el-form-item></el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12"><el-form-item label=" 鏈烘瀯ID " prop="orgid">
+              <el-select v-model="form.orgid" placeholder="璇烽�夋嫨 鏈烘瀯ID ">
+                <el-option v-for="dict in dict.type.sys_patientfrom" :key="dict.value" :label="dict.label"
+                  :value="dict.value"> <el-form-item label=" 寰俊openid " prop="openid">
+                    <el-input v-model="form.openid" placeholder="璇疯緭鍏� 寰俊openid " />
+                  </el-form-item></el-option>
+              </el-select>
+            </el-form-item></el-col>
+          <el-col :span="12"><el-form-item label=" 鍒犻櫎鏍囪 " prop="delFlag">
+              <el-input v-model="form.delFlag" placeholder="璇疯緭鍏� 鍒犻櫎鏍囪 " />
+            </el-form-item></el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12"><el-form-item label=" 涓婁紶鏍囪 " prop="isupload">
+              <el-input v-model="form.isupload" placeholder="璇疯緭鍏� 涓婁紶鏍囪 " />
+            </el-form-item></el-col>
+          <el-col :span="12"><el-form-item label=" 涓婁紶鏃堕棿 " prop="uploadTime">
+              <el-date-picker clearable v-model="form.uploadTime" type="date" value-format="yyyy-MM-dd"
+                placeholder="璇烽�夋嫨 涓婁紶鏃堕棿 ">
+              </el-date-picker>
+            </el-form-item></el-col>
+        </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
@@ -370,7 +290,7 @@
     // 澶氶�夋閫変腑鏁版嵁
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.patid)
-      this.single = selection.length!==1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
     /** 鏂板鎸夐挳鎿嶄綔 */
@@ -412,12 +332,12 @@
     /** 鍒犻櫎鎸夐挳鎿嶄綔 */
     handleDelete(row) {
       const patids = row.patid || this.ids;
-      this.$modal.confirm('鏄惁纭鍒犻櫎鎮h�呮。妗堢紪鍙蜂负"' + patids + '"鐨勬暟鎹」锛�').then(function() {
+      this.$modal.confirm('鏄惁纭鍒犻櫎鎮h�呮。妗堢紪鍙蜂负"' + patids + '"鐨勬暟鎹」锛�').then(function () {
         return delPatarchive(patids);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
-      }).catch(() => {});
+      }).catch(() => { });
     },
     /** 瀵煎嚭鎸夐挳鎿嶄綔 */
     handleExport() {
diff --git a/ruoyi-ui/src/views/smartor/patinhosp/index.vue b/ruoyi-ui/src/views/smartor/patinhosp/index.vue
index e007cd6..1848c75 100644
--- a/ruoyi-ui/src/views/smartor/patinhosp/index.vue
+++ b/ruoyi-ui/src/views/smartor/patinhosp/index.vue
@@ -2,60 +2,32 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label=" 鍖婚櫌鍚嶇О " prop="hospitalname">
-        <el-input
-          v-model="queryParams.hospitalname"
-          placeholder="璇疯緭鍏� 鍖婚櫌鍚嶇О "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.hospitalname" placeholder="璇疯緭鍏� 鍖婚櫌鍚嶇О " clearable
+          @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label=" 闄㈠尯鍚嶇О " prop="hospitaldistrictname">
-        <el-input
-          v-model="queryParams.hospitaldistrictname"
-          placeholder="璇疯緭鍏� 闄㈠尯鍚嶇О "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.hospitaldistrictname" placeholder="璇疯緭鍏� 闄㈠尯鍚嶇О " clearable
+          @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label=" 鍑洪櫌鏃堕棿 " prop="endtime">
-        <el-date-picker clearable
-          v-model="queryParams.endtime"
-          type="date"
-          value-format="yyyy-MM-dd"
+        <el-date-picker clearable v-model="queryParams.endtime" type="date" value-format="yyyy-MM-dd"
           placeholder="璇烽�夋嫨 鍑洪櫌鏃堕棿 ">
         </el-date-picker>
       </el-form-item>
       <el-form-item label=" 鍑洪櫌璇婃柇 " prop="leavediagname">
-        <el-input
-          v-model="queryParams.leavediagname"
-          placeholder="璇疯緭鍏� 鍑洪櫌璇婃柇 "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.leavediagname" placeholder="璇疯緭鍏� 鍑洪櫌璇婃柇 " clearable
+          @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label=" 鍖荤敓鍚嶇О " prop="drname">
-        <el-input
-          v-model="queryParams.drname"
-          placeholder="璇疯緭鍏� 鍖荤敓鍚嶇О "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.drname" placeholder="璇疯緭鍏� 鍖荤敓鍚嶇О " clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label=" 鍑洪櫌绉戝鍚嶇О " prop="leaveldeptname">
-        <el-input
-          v-model="queryParams.leaveldeptname"
-          placeholder="璇疯緭鍏� 鍑洪櫌绉戝鍚嶇О "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.leaveldeptname" placeholder="璇疯緭鍏� 鍑洪櫌绉戝鍚嶇О " clearable
+          @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label=" 鍑洪櫌鐥呭尯鍚嶇О " prop="leavehospitaldistrictname">
-        <el-input
-          v-model="queryParams.leavehospitaldistrictname"
-          placeholder="璇疯緭鍏� 鍑洪櫌鐥呭尯鍚嶇О "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.leavehospitaldistrictname" placeholder="璇疯緭鍏� 鍑洪櫌鐥呭尯鍚嶇О " clearable
+          @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
@@ -65,46 +37,20 @@
 
     <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="['smartor:patinhosp:add']"
-        >鏂板</el-button>
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+          v-hasPermi="['smartor:patinhosp:add']">鏂板</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['smartor:patinhosp:edit']"
-        >淇敼</el-button>
+        <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
+          v-hasPermi="['smartor:patinhosp:edit']">淇敼</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['smartor:patinhosp:remove']"
-        >鍒犻櫎</el-button>
+        <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
+          v-hasPermi="['smartor:patinhosp:remove']">鍒犻櫎</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['smartor:patinhosp:export']"
-        >瀵煎嚭</el-button>
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
+          v-hasPermi="['smartor:patinhosp:export']">瀵煎嚭</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
@@ -132,148 +78,155 @@
       <el-table-column label=" 鍑洪櫌鐥呭尯鍚嶇О " align="center" prop="leavehospitaldistrictname" />
       <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="handleUpdate(scope.row)"
-            v-hasPermi="['smartor:patinhosp:edit']"
-          >淇敼</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['smartor:patinhosp:remove']"
-          >鍒犻櫎</el-button>
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+            v-hasPermi="['smartor:patinhosp:edit']">淇敼</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+            v-hasPermi="['smartor:patinhosp:remove']">鍒犻櫎</el-button>
         </template>
       </el-table-column>
     </el-table>
-    
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
+
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+      @pagination="getList" />
 
     <!-- 娣诲姞鎴栦慨鏀规偅鑰呬綇闄㈣褰曞璇濇 -->
-    <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=" 娴佹按鍙� " prop="serialnum">
-          <el-input v-model="form.serialnum" placeholder="璇疯緭鍏� 娴佹按鍙� " />
-        </el-form-item>
-        <el-form-item label=" 鍖婚櫌鍚嶇О " prop="hospitalname">
-          <el-input v-model="form.hospitalname" placeholder="璇疯緭鍏� 鍖婚櫌鍚嶇О " />
-        </el-form-item>
-        <el-form-item label=" 鍖婚櫌缂栧彿 " prop="hospitalcode">
-          <el-input v-model="form.hospitalcode" placeholder="璇疯緭鍏� 鍖婚櫌缂栧彿 " />
-        </el-form-item>
-        <el-form-item label=" 闄㈠尯缂栧彿 " prop="hospitaldistrictcode">
-          <el-input v-model="form.hospitaldistrictcode" placeholder="璇疯緭鍏� 闄㈠尯缂栧彿 " />
-        </el-form-item>
-        <el-form-item label=" 闄㈠尯鍚嶇О " prop="hospitaldistrictname">
-          <el-input v-model="form.hospitaldistrictname" placeholder="璇疯緭鍏� 闄㈠尯鍚嶇О " />
-        </el-form-item>
-        <el-form-item label=" 鍏ラ櫌璇婃柇ICD鍊� " prop="icd10code">
-          <el-input v-model="form.icd10code" placeholder="璇疯緭鍏� 鍏ラ櫌璇婃柇ICD鍊� " />
-        </el-form-item>
-        <el-form-item label=" 鍏ラ櫌璇婃柇鍚嶇О " prop="diagname">
-          <el-input v-model="form.diagname" placeholder="璇疯緭鍏� 鍏ラ櫌璇婃柇鍚嶇О " />
-        </el-form-item>
-        <el-form-item label=" 鍏ラ櫌鏃堕棿 " prop="starttime">
-          <el-date-picker clearable
-            v-model="form.starttime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="璇烽�夋嫨 鍏ラ櫌鏃堕棿 ">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label=" 鍑洪櫌鏃堕棿 " prop="endtime">
-          <el-date-picker clearable
-            v-model="form.endtime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="璇烽�夋嫨 鍑洪櫌鏃堕棿 ">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label=" 鍏ラ櫌绉戝浠g爜 " prop="deptcode">
-          <el-input v-model="form.deptcode" placeholder="璇疯緭鍏� 鍏ラ櫌绉戝浠g爜 " />
-        </el-form-item>
-        <el-form-item label=" 鍏ラ櫌绉戝鍚嶇О " prop="deptname">
-          <el-input v-model="form.deptname" placeholder="璇疯緭鍏� 鍏ラ櫌绉戝鍚嶇О " />
-        </el-form-item>
-        <el-form-item label=" 鎴块棿鍙� " prop="roomno">
-          <el-input v-model="form.roomno" placeholder="璇疯緭鍏� 鎴块棿鍙� " />
-        </el-form-item>
-        <el-form-item label=" 搴婁綅鍙� " prop="bedno">
-          <el-input v-model="form.bedno" placeholder="璇疯緭鍏� 搴婁綅鍙� " />
-        </el-form-item>
-        <el-form-item label=" 鏈烘瀯ID " prop="orgid">
-          <el-input v-model="form.orgid" placeholder="璇疯緭鍏� 鏈烘瀯ID " />
-        </el-form-item>
-        <el-form-item label=" 鍒犻櫎鏍囪 " prop="delFlag">
-          <el-input v-model="form.delFlag" placeholder="璇疯緭鍏� 鍒犻櫎鏍囪 " />
-        </el-form-item>
-        <el-form-item label=" 涓婁紶鏍囪 " prop="isupload">
-          <el-input v-model="form.isupload" placeholder="璇疯緭鍏� 涓婁紶鏍囪 " />
-        </el-form-item>
-        <el-form-item label=" 涓婁紶鏃堕棿 " prop="uploadTime">
-          <el-date-picker clearable
-            v-model="form.uploadTime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="璇烽�夋嫨 涓婁紶鏃堕棿 ">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label=" 妗fID " prop="patid">
-          <el-input v-model="form.patid" placeholder="璇疯緭鍏� 妗fID " />
-        </el-form-item>
-        <el-form-item label=" 鍑洪櫌璇婃柇 " prop="leavediagname">
-          <el-input v-model="form.leavediagname" placeholder="璇疯緭鍏� 鍑洪櫌璇婃柇 " />
-        </el-form-item>
-        <el-form-item label=" 鍑洪櫌璇婃柇ICD鍊� " prop="leaveicd10code">
-          <el-input v-model="form.leaveicd10code" placeholder="璇疯緭鍏� 鍑洪櫌璇婃柇ICD鍊� " />
-        </el-form-item>
-        <el-form-item label=" 鍖荤敓宸ュ彿 " prop="drcode">
-          <el-input v-model="form.drcode" placeholder="璇疯緭鍏� 鍖荤敓宸ュ彿 " />
-        </el-form-item>
-        <el-form-item label=" 鍖荤敓鍚嶇О " prop="drname">
-          <el-input v-model="form.drname" placeholder="璇疯緭鍏� 鍖荤敓鍚嶇О " />
-        </el-form-item>
-        <el-form-item label=" 鍑洪櫌绉戝浠g爜 " prop="leaveldeptcode">
-          <el-input v-model="form.leaveldeptcode" placeholder="璇疯緭鍏� 鍑洪櫌绉戝浠g爜 " />
-        </el-form-item>
-        <el-form-item label=" 鍑洪櫌绉戝鍚嶇О " prop="leaveldeptname">
-          <el-input v-model="form.leaveldeptname" placeholder="璇疯緭鍏� 鍑洪櫌绉戝鍚嶇О " />
-        </el-form-item>
-        <el-form-item label=" 鐥呭尯ID " prop="hospitaldistrictid">
-          <el-input v-model="form.hospitaldistrictid" placeholder="璇疯緭鍏� 鐥呭尯ID " />
-        </el-form-item>
-        <el-form-item label=" 鍑洪櫌鐥呭尯缂栧彿 " prop="leavehospitaldistrictcode">
-          <el-input v-model="form.leavehospitaldistrictcode" placeholder="璇疯緭鍏� 鍑洪櫌鐥呭尯缂栧彿 " />
-        </el-form-item>
-        <el-form-item label=" 鍑洪櫌鐥呭尯鍚嶇О " prop="leavehospitaldistrictname">
-          <el-input v-model="form.leavehospitaldistrictname" placeholder="璇疯緭鍏� 鍑洪櫌鐥呭尯鍚嶇О " />
-        </el-form-item>
-        <el-form-item label=" 鍑洪櫌鐥呭尯ID " prop="leavehospitaldistrictid">
-          <el-input v-model="form.leavehospitaldistrictid" placeholder="璇疯緭鍏� 鍑洪櫌鐥呭尯ID " />
-        </el-form-item>
-        <el-form-item label=" 鍏ラ櫌绉戝ID " prop="deptid">
-          <el-input v-model="form.deptid" placeholder="璇疯緭鍏� 鍏ラ櫌绉戝ID " />
-        </el-form-item>
-        <el-form-item label=" 鍑洪櫌绉戝ID " prop="leaveldeptid">
-          <el-input v-model="form.leaveldeptid" placeholder="璇疯緭鍏� 鍑洪櫌绉戝ID " />
-        </el-form-item>
-        <el-form-item label=" 鏂规鐘舵�佹搷浣滄椂闂� " prop="schemetime">
-          <el-date-picker clearable
-            v-model="form.schemetime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="璇烽�夋嫨 鏂规鐘舵�佹搷浣滄椂闂� ">
-          </el-date-picker>
-        </el-form-item>
+    <el-dialog :title="title" :visible.sync="open" :showclose="true" :close-on-click-modal="false" :inline="true"
+      width="1000px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+        <el-row>
+          <el-col :span="12"><el-form-item label=" 娴佹按鍙� " prop="serialnum">
+              <el-input v-model="form.serialnum" placeholder="璇疯緭鍏� 娴佹按鍙� " />
+            </el-form-item></el-col>
+          <el-col :span="12"><el-form-item label=" 鍖婚櫌鍚嶇О " prop="hospitalname">
+              <el-input v-model="form.hospitalname" placeholder="璇疯緭鍏� 鍖婚櫌鍚嶇О " />
+            </el-form-item></el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12"><el-form-item label=" 鍖婚櫌缂栧彿 " prop="hospitalcode">
+              <el-input v-model="form.hospitalcode" placeholder="璇疯緭鍏� 鍖婚櫌缂栧彿 " />
+            </el-form-item></el-col>
+          <el-col :span="12"> <el-form-item label=" 闄㈠尯缂栧彿 " prop="hospitaldistrictcode">
+              <el-input v-model="form.hospitaldistrictcode" placeholder="璇疯緭鍏� 闄㈠尯缂栧彿 " />
+            </el-form-item></el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12"><el-form-item label=" 闄㈠尯鍚嶇О " prop="hospitaldistrictname">
+              <el-input v-model="form.hospitaldistrictname" placeholder="璇疯緭鍏� 闄㈠尯鍚嶇О " />
+            </el-form-item></el-col>
+          <el-col :span="12"><el-form-item label=" 鍏ラ櫌璇婃柇ICD鍊� " prop="icd10code">
+              <el-input v-model="form.icd10code" placeholder="璇疯緭鍏� 鍏ラ櫌璇婃柇ICD鍊� " />
+            </el-form-item></el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12"><el-form-item label=" 鍏ラ櫌璇婃柇鍚嶇О " prop="diagname">
+              <el-input v-model="form.diagname" placeholder="璇疯緭鍏� 鍏ラ櫌璇婃柇鍚嶇О " />
+            </el-form-item></el-col>
+          <el-col :span="12"><el-form-item label=" 鍏ラ櫌鏃堕棿 " prop="starttime">
+              <el-date-picker clearable v-model="form.starttime" type="date" value-format="yyyy-MM-dd"
+                placeholder="璇烽�夋嫨 鍏ラ櫌鏃堕棿 ">
+              </el-date-picker>
+            </el-form-item></el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12"><el-form-item label=" 鍑洪櫌鏃堕棿 " prop="endtime">
+              <el-date-picker clearable v-model="form.endtime" type="date" value-format="yyyy-MM-dd"
+                placeholder="璇烽�夋嫨 鍑洪櫌鏃堕棿 ">
+              </el-date-picker>
+            </el-form-item></el-col>
+          <el-col :span="12"><el-form-item label=" 鍏ラ櫌绉戝浠g爜 " prop="deptcode">
+              <el-input v-model="form.deptcode" placeholder="璇疯緭鍏� 鍏ラ櫌绉戝浠g爜 " />
+            </el-form-item></el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12"><el-form-item label=" 鍏ラ櫌绉戝鍚嶇О " prop="deptname">
+              <el-input v-model="form.deptname" placeholder="璇疯緭鍏� 鍏ラ櫌绉戝鍚嶇О " />
+            </el-form-item></el-col>
+          <el-col :span="12"><el-form-item label=" 鎴块棿鍙� " prop="roomno">
+              <el-input v-model="form.roomno" placeholder="璇疯緭鍏� 鎴块棿鍙� " />
+            </el-form-item></el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12"><el-form-item label=" 搴婁綅鍙� " prop="bedno">
+              <el-input v-model="form.bedno" placeholder="璇疯緭鍏� 搴婁綅鍙� " />
+            </el-form-item></el-col>
+          <el-col :span="12"><el-form-item label=" 鏈烘瀯ID " prop="orgid">
+              <el-input v-model="form.orgid" placeholder="璇疯緭鍏� 鏈烘瀯ID " />
+            </el-form-item></el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12"><el-form-item label=" 鍒犻櫎鏍囪 " prop="delFlag">
+              <el-input v-model="form.delFlag" placeholder="璇疯緭鍏� 鍒犻櫎鏍囪 " />
+            </el-form-item></el-col>
+          <el-col :span="12"><el-form-item label=" 涓婁紶鏍囪 " prop="isupload">
+              <el-input v-model="form.isupload" placeholder="璇疯緭鍏� 涓婁紶鏍囪 " />
+            </el-form-item></el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12"><el-form-item label=" 涓婁紶鏃堕棿 " prop="uploadTime">
+              <el-date-picker clearable v-model="form.uploadTime" type="date" value-format="yyyy-MM-dd"
+                placeholder="璇烽�夋嫨 涓婁紶鏃堕棿 ">
+              </el-date-picker>
+            </el-form-item></el-col>
+          <el-col :span="12"><el-form-item label=" 妗fID " prop="patid">
+              <el-input v-model="form.patid" placeholder="璇疯緭鍏� 妗fID " />
+            </el-form-item></el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12"> <el-form-item label=" 鍑洪櫌璇婃柇 " prop="leavediagname">
+              <el-input v-model="form.leavediagname" placeholder="璇疯緭鍏� 鍑洪櫌璇婃柇 " />
+            </el-form-item></el-col>
+          <el-col :span="12"> <el-form-item label=" 鍑洪櫌璇婃柇ICD鍊� " prop="leaveicd10code">
+              <el-input v-model="form.leaveicd10code" placeholder="璇疯緭鍏� 鍑洪櫌璇婃柇ICD鍊� " />
+            </el-form-item></el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12"> <el-form-item label=" 鍖荤敓宸ュ彿 " prop="drcode">
+              <el-input v-model="form.drcode" placeholder="璇疯緭鍏� 鍖荤敓宸ュ彿 " />
+            </el-form-item></el-col>
+          <el-col :span="12"> <el-form-item label=" 鍖荤敓鍚嶇О " prop="drname">
+              <el-input v-model="form.drname" placeholder="璇疯緭鍏� 鍖荤敓鍚嶇О " />
+            </el-form-item></el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12"> <el-form-item label=" 鍑洪櫌绉戝浠g爜 " prop="leaveldeptcode">
+              <el-input v-model="form.leaveldeptcode" placeholder="璇疯緭鍏� 鍑洪櫌绉戝浠g爜 " />
+            </el-form-item></el-col>
+          <el-col :span="12"><el-form-item label=" 鍑洪櫌绉戝鍚嶇О " prop="leaveldeptname">
+              <el-input v-model="form.leaveldeptname" placeholder="璇疯緭鍏� 鍑洪櫌绉戝鍚嶇О " />
+            </el-form-item></el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12"> <el-form-item label=" 鐥呭尯ID " prop="hospitaldistrictid">
+              <el-input v-model="form.hospitaldistrictid" placeholder="璇疯緭鍏� 鐥呭尯ID " />
+            </el-form-item></el-col>
+          <el-col :span="12"><el-form-item label=" 鍑洪櫌鐥呭尯缂栧彿 " prop="leavehospitaldistrictcode">
+              <el-input v-model="form.leavehospitaldistrictcode" placeholder="璇疯緭鍏� 鍑洪櫌鐥呭尯缂栧彿 " />
+            </el-form-item></el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12"><el-form-item label=" 鍑洪櫌鐥呭尯鍚嶇О " prop="leavehospitaldistrictname">
+              <el-input v-model="form.leavehospitaldistrictname" placeholder="璇疯緭鍏� 鍑洪櫌鐥呭尯鍚嶇О " />
+            </el-form-item></el-col>
+          <el-col :span="12"><el-form-item label=" 鍑洪櫌鐥呭尯ID " prop="leavehospitaldistrictid">
+              <el-input v-model="form.leavehospitaldistrictid" placeholder="璇疯緭鍏� 鍑洪櫌鐥呭尯ID " />
+            </el-form-item></el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12"><el-form-item label=" 鍏ラ櫌绉戝ID " prop="deptid">
+              <el-input v-model="form.deptid" placeholder="璇疯緭鍏� 鍏ラ櫌绉戝ID " />
+            </el-form-item></el-col>
+          <el-col :span="12"><el-form-item label=" 鍑洪櫌绉戝ID " prop="leaveldeptid">
+              <el-input v-model="form.leaveldeptid" placeholder="璇疯緭鍏� 鍑洪櫌绉戝ID " />
+            </el-form-item></el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12"><el-form-item label=" 鏂规鐘舵�佹搷浣滄椂闂� " prop="schemetime">
+              <el-date-picker clearable v-model="form.schemetime" type="date" value-format="yyyy-MM-dd"
+                placeholder="璇烽�夋嫨 鏂规鐘舵�佹搷浣滄椂闂� ">
+              </el-date-picker>
+            </el-form-item></el-col>
+        </el-row>
+
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
@@ -408,7 +361,7 @@
     // 澶氶�夋閫変腑鏁版嵁
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.inhospid)
-      this.single = selection.length!==1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
     /** 鏂板鎸夐挳鎿嶄綔 */
@@ -450,12 +403,12 @@
     /** 鍒犻櫎鎸夐挳鎿嶄綔 */
     handleDelete(row) {
       const inhospids = row.inhospid || this.ids;
-      this.$modal.confirm('鏄惁纭鍒犻櫎鎮h�呬綇闄㈣褰曠紪鍙蜂负"' + inhospids + '"鐨勬暟鎹」锛�').then(function() {
+      this.$modal.confirm('鏄惁纭鍒犻櫎鎮h�呬綇闄㈣褰曠紪鍙蜂负"' + inhospids + '"鐨勬暟鎹」锛�').then(function () {
         return delPatinhosp(inhospids);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
-      }).catch(() => {});
+      }).catch(() => { });
     },
     /** 瀵煎嚭鎸夐挳鎿嶄綔 */
     handleExport() {
diff --git a/ruoyi-ui/src/views/smartor/patouthosp/index.vue b/ruoyi-ui/src/views/smartor/patouthosp/index.vue
index 3b4a54c..277298e 100644
--- a/ruoyi-ui/src/views/smartor/patouthosp/index.vue
+++ b/ruoyi-ui/src/views/smartor/patouthosp/index.vue
@@ -2,44 +2,22 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label=" 鍖婚櫌鍚嶇О " prop="hospitalname">
-        <el-input
-          v-model="queryParams.hospitalname"
-          placeholder="璇疯緭鍏� 鍖婚櫌鍚嶇О "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.hospitalname" placeholder="璇疯緭鍏� 鍖婚櫌鍚嶇О " clearable
+          @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label=" 绉戝鍚嶇О " prop="deptname">
-        <el-input
-          v-model="queryParams.deptname"
-          placeholder="璇疯緭鍏� 绉戝鍚嶇О "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.deptname" placeholder="璇疯緭鍏� 绉戝鍚嶇О " clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label=" 鍖荤敓鍚嶇О " prop="drname">
-        <el-input
-          v-model="queryParams.drname"
-          placeholder="璇疯緭鍏� 鍖荤敓鍚嶇О "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.drname" placeholder="璇疯緭鍏� 鍖荤敓鍚嶇О " clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label=" 灏辫瘖鏃ユ湡 " prop="admitdate">
-        <el-date-picker clearable
-          v-model="queryParams.admitdate"
-          type="date"
-          value-format="yyyy-MM-dd"
+        <el-date-picker clearable v-model="queryParams.admitdate" type="date" value-format="yyyy-MM-dd"
           placeholder="璇烽�夋嫨 灏辫瘖鏃ユ湡 ">
         </el-date-picker>
       </el-form-item>
       <el-form-item label=" 鏈烘瀯ID " prop="orgid">
-        <el-input
-          v-model="queryParams.orgid"
-          placeholder="璇疯緭鍏� 鏈烘瀯ID "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.orgid" placeholder="璇疯緭鍏� 鏈烘瀯ID " clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
@@ -49,46 +27,20 @@
 
     <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="['smartor:patouthosp:add']"
-        >鏂板</el-button>
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+          v-hasPermi="['smartor:patouthosp:add']">鏂板</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['smartor:patouthosp:edit']"
-        >淇敼</el-button>
+        <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
+          v-hasPermi="['smartor:patouthosp:edit']">淇敼</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['smartor:patouthosp:remove']"
-        >鍒犻櫎</el-button>
+        <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
+          v-hasPermi="['smartor:patouthosp:remove']">鍒犻櫎</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['smartor:patouthosp:export']"
-        >瀵煎嚭</el-button>
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
+          v-hasPermi="['smartor:patouthosp:export']">瀵煎嚭</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
@@ -106,7 +58,8 @@
         </template>
       </el-table-column>
       <el-table-column label=" 鏈烘瀯ID " align="center" prop="orgid" />
-      <el-table-column label=" 鏄惁鐢熸垚鏂规鐘舵��;0鏈敓鎴� 1鐢熸垚灏辫瘖 9鏃犲尮閰嶆柟妗� " align="center" prop="schemestatus" />
+      <!-- 鏄惁鐢熸垚鏂规鐘舵��;0鏈敓鎴� 1鐢熸垚灏辫瘖 9鏃犲尮閰嶆柟妗�  -->
+      <el-table-column label=" 鏄惁鐢熸垚鏂规 " align="center" prop="schemestatus" />
       <el-table-column label=" 鏂规鐘舵�佹搷浣滄椂闂� " align="center" prop="schemetime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.schemetime, '{y}-{m}-{d}') }}</span>
@@ -114,107 +67,105 @@
       </el-table-column>
       <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="handleUpdate(scope.row)"
-            v-hasPermi="['smartor:patouthosp:edit']"
-          >淇敼</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['smartor:patouthosp:remove']"
-          >鍒犻櫎</el-button>
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+            v-hasPermi="['smartor:patouthosp:edit']">淇敼</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+            v-hasPermi="['smartor:patouthosp:remove']">鍒犻櫎</el-button>
         </template>
       </el-table-column>
     </el-table>
-    
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
+
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+      @pagination="getList" />
 
     <!-- 娣诲姞鎴栦慨鏀规偅鑰呴棬璇婅褰曞璇濇 -->
-    <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=" 娴佹按鍙� " prop="serialnum">
-          <el-input v-model="form.serialnum" placeholder="璇疯緭鍏� 娴佹按鍙� " />
-        </el-form-item>
-        <el-form-item label=" 妗fID " prop="patid">
-          <el-input v-model="form.patid" placeholder="璇疯緭鍏� 妗fID " />
-        </el-form-item>
-        <el-form-item label=" 鍖婚櫌鍚嶇О " prop="hospitalname">
-          <el-input v-model="form.hospitalname" placeholder="璇疯緭鍏� 鍖婚櫌鍚嶇О " />
-        </el-form-item>
-        <el-form-item label=" 鍖婚櫌缂栧彿 " prop="hospitalcode">
-          <el-input v-model="form.hospitalcode" placeholder="璇疯緭鍏� 鍖婚櫌缂栧彿 " />
-        </el-form-item>
-        <el-form-item label=" 璇婃柇ICD鍊� " prop="icd10code">
-          <el-input v-model="form.icd10code" placeholder="璇疯緭鍏� 璇婃柇ICD鍊� " />
-        </el-form-item>
-        <el-form-item label=" 璇婃柇鍚嶇О " prop="diagname">
-          <el-input v-model="form.diagname" placeholder="璇疯緭鍏� 璇婃柇鍚嶇О " />
-        </el-form-item>
-        <el-form-item label=" 绉戝浠g爜 " prop="deptcode">
-          <el-input v-model="form.deptcode" placeholder="璇疯緭鍏� 绉戝浠g爜 " />
-        </el-form-item>
-        <el-form-item label=" 绉戝鍚嶇О " prop="deptname">
-          <el-input v-model="form.deptname" placeholder="璇疯緭鍏� 绉戝鍚嶇О " />
-        </el-form-item>
-        <el-form-item label=" 鍖荤敓宸ュ彿 " prop="drcode">
-          <el-input v-model="form.drcode" placeholder="璇疯緭鍏� 鍖荤敓宸ュ彿 " />
-        </el-form-item>
-        <el-form-item label=" 鍖荤敓鍚嶇О " prop="drname">
-          <el-input v-model="form.drname" placeholder="璇疯緭鍏� 鍖荤敓鍚嶇О " />
-        </el-form-item>
-        <el-form-item label=" 灏辫瘖鏃ユ湡 " prop="admitdate">
-          <el-date-picker clearable
-            v-model="form.admitdate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="璇烽�夋嫨 灏辫瘖鏃ユ湡 ">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label=" 鏈烘瀯ID " prop="orgid">
-          <el-input v-model="form.orgid" placeholder="璇疯緭鍏� 鏈烘瀯ID " />
-        </el-form-item>
-        <el-form-item label=" 鍒犻櫎鏍囪 " prop="delFlag">
-          <el-input v-model="form.delFlag" placeholder="璇疯緭鍏� 鍒犻櫎鏍囪 " />
-        </el-form-item>
-        <el-form-item label=" 涓婁紶鏍囪 " prop="isupload">
-          <el-input v-model="form.isupload" placeholder="璇疯緭鍏� 涓婁紶鏍囪 " />
-        </el-form-item>
-        <el-form-item label=" 涓婁紶鏃堕棿 " prop="uploadTime">
-          <el-date-picker clearable
-            v-model="form.uploadTime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="璇烽�夋嫨 涓婁紶鏃堕棿 ">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label=" 绉戝ID " prop="deptid">
-          <el-input v-model="form.deptid" placeholder="璇疯緭鍏� 绉戝ID " />
-        </el-form-item>
-        <el-form-item label=" 鏂规鐘舵�佹搷浣滄椂闂� " prop="schemetime">
-          <el-date-picker clearable
-            v-model="form.schemetime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="璇烽�夋嫨 鏂规鐘舵�佹搷浣滄椂闂� ">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label=" 鐜扮梾鍙� " prop="hpi">
-          <el-input v-model="form.hpi" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" />
-        </el-form-item>
-        <el-form-item label=" 涓昏堪 " prop="mainsuit">
-          <el-input v-model="form.mainsuit" placeholder="璇疯緭鍏� 涓昏堪 " />
-        </el-form-item>
+    <el-dialog :title="title" :visible.sync="open" :showclose="true" :close-on-click-modal="false" :inline="true"
+      width="1000px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+        <el-row>
+          <el-col :span="12"><el-form-item label=" 娴佹按鍙� " prop="serialnum">
+              <el-input v-model="form.serialnum" placeholder="璇疯緭鍏� 娴佹按鍙� " />
+            </el-form-item></el-col>
+          <el-col :span="12"><el-form-item label=" 妗fID " prop="patid">
+              <el-input v-model="form.patid" placeholder="璇疯緭鍏� 妗fID " />
+            </el-form-item></el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12"><el-form-item label=" 鍖婚櫌鍚嶇О " prop="hospitalname">
+              <el-input v-model="form.hospitalname" placeholder="璇疯緭鍏� 鍖婚櫌鍚嶇О " />
+            </el-form-item></el-col>
+          <el-col :span="12"><el-form-item label=" 鍖婚櫌缂栧彿 " prop="hospitalcode">
+              <el-input v-model="form.hospitalcode" placeholder="璇疯緭鍏� 鍖婚櫌缂栧彿 " />
+            </el-form-item></el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12"><el-form-item label=" 璇婃柇ICD鍊� " prop="icd10code">
+              <el-input v-model="form.icd10code" placeholder="璇疯緭鍏� 璇婃柇ICD鍊� " />
+            </el-form-item></el-col>
+          <el-col :span="12"> <el-form-item label=" 璇婃柇鍚嶇О " prop="diagname">
+              <el-input v-model="form.diagname" placeholder="璇疯緭鍏� 璇婃柇鍚嶇О " />
+            </el-form-item></el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12"><el-form-item label=" 绉戝浠g爜 " prop="deptcode">
+              <el-input v-model="form.deptcode" placeholder="璇疯緭鍏� 绉戝浠g爜 " />
+            </el-form-item></el-col>
+          <el-col :span="12"><el-form-item label=" 绉戝鍚嶇О " prop="deptname">
+              <el-input v-model="form.deptname" placeholder="璇疯緭鍏� 绉戝鍚嶇О " />
+            </el-form-item></el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12"><el-form-item label=" 鍖荤敓宸ュ彿 " prop="drcode">
+              <el-input v-model="form.drcode" placeholder="璇疯緭鍏� 鍖荤敓宸ュ彿 " />
+            </el-form-item></el-col>
+          <el-col :span="12"><el-form-item label=" 鍖荤敓鍚嶇О " prop="drname">
+              <el-input v-model="form.drname" placeholder="璇疯緭鍏� 鍖荤敓鍚嶇О " />
+            </el-form-item></el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12"><el-form-item label=" 灏辫瘖鏃ユ湡 " prop="admitdate">
+              <el-date-picker clearable v-model="form.admitdate" type="date" value-format="yyyy-MM-dd"
+                placeholder="璇烽�夋嫨 灏辫瘖鏃ユ湡 ">
+              </el-date-picker>
+            </el-form-item></el-col>
+
+        </el-row><el-row>
+          <el-col :span="24"><el-form-item label=" 鐜扮梾鍙� " prop="hpi">
+              <el-input v-model="form.hpi" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" />
+            </el-form-item></el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24"><el-form-item label=" 涓昏堪 " prop="mainsuit">
+              <el-input v-model="form.mainsuit" placeholder="璇疯緭鍏� 涓昏堪 " />
+            </el-form-item></el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12"><el-form-item label=" 鍒犻櫎鏍囪 " prop="delFlag">
+              <el-input v-model="form.delFlag" placeholder="璇疯緭鍏� 鍒犻櫎鏍囪 " />
+            </el-form-item></el-col>
+          <el-col :span="12"> <el-form-item label=" 涓婁紶鏍囪 " prop="isupload">
+              <el-input v-model="form.isupload" placeholder="璇疯緭鍏� 涓婁紶鏍囪 " />
+            </el-form-item></el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12"><el-form-item label=" 涓婁紶鏃堕棿 " prop="uploadTime">
+              <el-date-picker clearable v-model="form.uploadTime" type="date" value-format="yyyy-MM-dd"
+                placeholder="璇烽�夋嫨 涓婁紶鏃堕棿 ">
+              </el-date-picker>
+            </el-form-item></el-col>
+          <el-col :span="12"><el-form-item label=" 绉戝ID " prop="deptid">
+              <el-input v-model="form.deptid" placeholder="璇疯緭鍏� 绉戝ID " />
+            </el-form-item></el-col><el-col :span="12"> <el-form-item label=" 鏈烘瀯ID " prop="orgid">
+              <el-input v-model="form.orgid" placeholder="璇疯緭鍏� 鏈烘瀯ID " />
+            </el-form-item></el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12"> <el-form-item label=" 鏂规鐘舵�佹搷浣滄椂闂� " prop="schemetime">
+              <el-date-picker clearable v-model="form.schemetime" type="date" value-format="yyyy-MM-dd"
+                placeholder="璇烽�夋嫨 鏂规鐘舵�佹搷浣滄椂闂� ">
+              </el-date-picker>
+            </el-form-item></el-col> </el-row>
+
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
@@ -334,7 +285,7 @@
     // 澶氶�夋閫変腑鏁版嵁
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
     /** 鏂板鎸夐挳鎿嶄綔 */
@@ -376,12 +327,12 @@
     /** 鍒犻櫎鎸夐挳鎿嶄綔 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('鏄惁纭鍒犻櫎鎮h�呴棬璇婅褰曠紪鍙蜂负"' + ids + '"鐨勬暟鎹」锛�').then(function() {
+      this.$modal.confirm('鏄惁纭鍒犻櫎鎮h�呴棬璇婅褰曠紪鍙蜂负"' + ids + '"鐨勬暟鎹」锛�').then(function () {
         return delPatouthosp(ids);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
-      }).catch(() => {});
+      }).catch(() => { });
     },
     /** 瀵煎嚭鎸夐挳鎿嶄綔 */
     handleExport() {
diff --git a/ruoyi-ui/src/views/smartor/patphysical/index.vue b/ruoyi-ui/src/views/smartor/patphysical/index.vue
index e0c8344..be2e8f8 100644
--- a/ruoyi-ui/src/views/smartor/patphysical/index.vue
+++ b/ruoyi-ui/src/views/smartor/patphysical/index.vue
@@ -2,44 +2,23 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label=" 浣撴鍗曚綅/鍖婚櫌 " prop="hospitalname">
-        <el-input
-          v-model="queryParams.hospitalname"
-          placeholder="璇疯緭鍏� 浣撴鍗曚綅/鍖婚櫌 "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.hospitalname" placeholder="璇疯緭鍏� 浣撴鍗曚綅/鍖婚櫌 " clearable
+          @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label=" 浣撴鏃堕棿 " prop="physicaldate">
-        <el-date-picker clearable
-          v-model="queryParams.physicaldate"
-          type="date"
-          value-format="yyyy-MM-dd"
+        <el-date-picker clearable v-model="queryParams.physicaldate" type="date" value-format="yyyy-MM-dd"
           placeholder="璇烽�夋嫨 浣撴鏃堕棿 ">
         </el-date-picker>
       </el-form-item>
       <el-form-item label=" 鏈烘瀯ID " prop="orgid">
-        <el-input
-          v-model="queryParams.orgid"
-          placeholder="璇疯緭鍏� 鏈烘瀯ID "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.orgid" placeholder="璇疯緭鍏� 鏈烘瀯ID " clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label=" 绉戝鍚嶇О " prop="deptname">
-        <el-input
-          v-model="queryParams.deptname"
-          placeholder="璇疯緭鍏� 绉戝鍚嶇О "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.deptname" placeholder="璇疯緭鍏� 绉戝鍚嶇О " clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label=" 浣撴椤圭洰鍚嶇О " prop="projectname">
-        <el-input
-          v-model="queryParams.projectname"
-          placeholder="璇疯緭鍏� 浣撴椤圭洰鍚嶇О "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.projectname" placeholder="璇疯緭鍏� 浣撴椤圭洰鍚嶇О " clearable
+          @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
@@ -49,46 +28,20 @@
 
     <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="['smartor:patphysical:add']"
-        >鏂板</el-button>
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+          v-hasPermi="['smartor:patphysical:add']">鏂板</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['smartor:patphysical:edit']"
-        >淇敼</el-button>
+        <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
+          v-hasPermi="['smartor:patphysical:edit']">淇敼</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['smartor:patphysical:remove']"
-        >鍒犻櫎</el-button>
+        <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
+          v-hasPermi="['smartor:patphysical:remove']">鍒犻櫎</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['smartor:patphysical:export']"
-        >瀵煎嚭</el-button>
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
+          v-hasPermi="['smartor:patphysical:export']">瀵煎嚭</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
@@ -109,107 +62,104 @@
       <el-table-column label=" 浣撴椤圭洰鍚嶇О " align="center" prop="projectname" />
       <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="handleUpdate(scope.row)"
-            v-hasPermi="['smartor:patphysical:edit']"
-          >淇敼</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['smartor:patphysical:remove']"
-          >鍒犻櫎</el-button>
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+            v-hasPermi="['smartor:patphysical:edit']">淇敼</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+            v-hasPermi="['smartor:patphysical:remove']">鍒犻櫎</el-button>
         </template>
       </el-table-column>
     </el-table>
-    
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
+
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+      @pagination="getList" />
 
     <!-- 娣诲姞鎴栦慨鏀规偅鑰呬綋妫�璁板綍瀵硅瘽妗� -->
-    <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=" 娴佹按鍙� " prop="serialnum">
-          <el-input v-model="form.serialnum" placeholder="璇疯緭鍏� 娴佹按鍙� " />
-        </el-form-item>
-        <el-form-item label=" 妗fID " prop="patid">
-          <el-input v-model="form.patid" placeholder="璇疯緭鍏� 妗fID " />
-        </el-form-item>
-        <el-form-item label=" 鎬荤粨鍖荤敓宸ュ彿 " prop="drcode">
-          <el-input v-model="form.drcode" placeholder="璇疯緭鍏� 鎬荤粨鍖荤敓宸ュ彿 " />
-        </el-form-item>
-        <el-form-item label=" 鎬荤粨鍖荤敓鍚嶇О " prop="drname">
-          <el-input v-model="form.drname" placeholder="璇疯緭鍏� 鎬荤粨鍖荤敓鍚嶇О " />
-        </el-form-item>
-        <el-form-item label=" 浣撴鍗曚綅/鍖婚櫌缂栧彿 " prop="hospitalcode">
-          <el-input v-model="form.hospitalcode" placeholder="璇疯緭鍏� 浣撴鍗曚綅/鍖婚櫌缂栧彿 " />
-        </el-form-item>
-        <el-form-item label=" 浣撴鍗曚綅/鍖婚櫌 " prop="hospitalname">
-          <el-input v-model="form.hospitalname" placeholder="璇疯緭鍏� 浣撴鍗曚綅/鍖婚櫌 " />
-        </el-form-item>
-        <el-form-item label=" 浣撴鏃堕棿 " prop="physicaldate">
-          <el-date-picker clearable
-            v-model="form.physicaldate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="璇烽�夋嫨 浣撴鏃堕棿 ">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label=" 鏈烘瀯ID " prop="orgid">
-          <el-input v-model="form.orgid" placeholder="璇疯緭鍏� 鏈烘瀯ID " />
-        </el-form-item>
-        <el-form-item label=" 鍒犻櫎鏍囪 " prop="delFlag">
-          <el-input v-model="form.delFlag" placeholder="璇疯緭鍏� 鍒犻櫎鏍囪 " />
-        </el-form-item>
-        <el-form-item label=" 涓婁紶鏍囪 " prop="isupload">
-          <el-input v-model="form.isupload" placeholder="璇疯緭鍏� 涓婁紶鏍囪 " />
-        </el-form-item>
-        <el-form-item label=" 涓婁紶鏃堕棿 " prop="uploadTime">
-          <el-date-picker clearable
-            v-model="form.uploadTime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="璇烽�夋嫨 涓婁紶鏃堕棿 ">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label=" 绉戝浠g爜 " prop="deptcode">
-          <el-input v-model="form.deptcode" placeholder="璇疯緭鍏� 绉戝浠g爜 " />
-        </el-form-item>
-        <el-form-item label=" 绉戝鍚嶇О " prop="deptname">
-          <el-input v-model="form.deptname" placeholder="璇疯緭鍏� 绉戝鍚嶇О " />
-        </el-form-item>
-        <el-form-item label=" 浣撴椤圭洰鍚嶇О " prop="projectname">
-          <el-input v-model="form.projectname" placeholder="璇疯緭鍏� 浣撴椤圭洰鍚嶇О " />
-        </el-form-item>
-        <el-form-item label=" 浣撴椤圭洰缂栫爜 " prop="projectcode">
-          <el-input v-model="form.projectcode" placeholder="璇疯緭鍏� 浣撴椤圭洰缂栫爜 " />
-        </el-form-item>
-        <el-form-item label=" 鐘舵��;0.宸查绾� 1.宸蹭綋妫� 2.鎶ュ憡宸插嚭 " prop="state">
-          <el-input v-model="form.state" placeholder="璇疯緭鍏� 鐘舵��;0.宸查绾� 1.宸蹭綋妫� 2.鎶ュ憡宸插嚭 " />
-        </el-form-item>
-        <el-form-item label=" 绉戝ID " prop="deptid">
-          <el-input v-model="form.deptid" placeholder="璇疯緭鍏� 绉戝ID " />
-        </el-form-item>
-        <el-form-item label=" 浣撴濂楅ID " prop="projectid">
-          <el-input v-model="form.projectid" placeholder="璇疯緭鍏� 浣撴濂楅ID " />
-        </el-form-item>
-        <el-form-item label=" 鏂规鐘舵�佹搷浣滄椂闂� " prop="schemetime">
-          <el-date-picker clearable
-            v-model="form.schemetime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="璇烽�夋嫨 鏂规鐘舵�佹搷浣滄椂闂� ">
-          </el-date-picker>
-        </el-form-item>
+    <el-dialog :title="title" :visible.sync="open" :showclose="true" :close-on-click-modal="false" :inline="true"
+      width="1000px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+        <el-row>
+          <el-col :span="12"><el-form-item label=" 娴佹按鍙� " prop="serialnum">
+              <el-input v-model="form.serialnum" placeholder="璇疯緭鍏� 娴佹按鍙� " />
+            </el-form-item></el-col>
+          <el-col :span="12"> <el-form-item label=" 妗fID " prop="patid">
+              <el-input v-model="form.patid" placeholder="璇疯緭鍏� 妗fID " />
+            </el-form-item></el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12"><el-form-item label=" 鎬荤粨鍖荤敓宸ュ彿 " prop="drcode">
+              <el-input v-model="form.drcode" placeholder="璇疯緭鍏� 鎬荤粨鍖荤敓宸ュ彿 " />
+            </el-form-item></el-col>
+          <el-col :span="12"> <el-form-item label=" 鎬荤粨鍖荤敓鍚嶇О " prop="drname">
+              <el-input v-model="form.drname" placeholder="璇疯緭鍏� 鎬荤粨鍖荤敓鍚嶇О " />
+            </el-form-item></el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12"><el-form-item label=" 浣撴鍗曚綅/鍖婚櫌缂栧彿 " prop="hospitalcode">
+              <el-input v-model="form.hospitalcode" placeholder="璇疯緭鍏� 浣撴鍗曚綅/鍖婚櫌缂栧彿 " />
+            </el-form-item></el-col>
+          <el-col :span="12"><el-form-item label=" 浣撴鍗曚綅/鍖婚櫌 " prop="hospitalname">
+              <el-input v-model="form.hospitalname" placeholder="璇疯緭鍏� 浣撴鍗曚綅/鍖婚櫌 " />
+            </el-form-item></el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12"><el-form-item label=" 浣撴鏃堕棿 " prop="physicaldate">
+              <el-date-picker clearable v-model="form.physicaldate" type="date" value-format="yyyy-MM-dd"
+                placeholder="璇烽�夋嫨 浣撴鏃堕棿 ">
+              </el-date-picker>
+            </el-form-item></el-col>
+          <el-col :span="12"><el-form-item label=" 鏈烘瀯ID " prop="orgid">
+              <el-input v-model="form.orgid" placeholder="璇疯緭鍏� 鏈烘瀯ID " />
+            </el-form-item></el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12"><el-form-item label=" 鍒犻櫎鏍囪 " prop="delFlag">
+              <el-input v-model="form.delFlag" placeholder="璇疯緭鍏� 鍒犻櫎鏍囪 " />
+            </el-form-item></el-col>
+          <el-col :span="12"> <el-form-item label=" 涓婁紶鏍囪 " prop="isupload">
+              <el-input v-model="form.isupload" placeholder="璇疯緭鍏� 涓婁紶鏍囪 " />
+            </el-form-item></el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12"> <el-form-item label=" 涓婁紶鏃堕棿 " prop="uploadTime">
+              <el-date-picker clearable v-model="form.uploadTime" type="date" value-format="yyyy-MM-dd"
+                placeholder="璇烽�夋嫨 涓婁紶鏃堕棿 ">
+              </el-date-picker>
+            </el-form-item></el-col>
+          <el-col :span="12"><el-form-item label=" 绉戝浠g爜 " prop="deptcode">
+              <el-input v-model="form.deptcode" placeholder="璇疯緭鍏� 绉戝浠g爜 " />
+            </el-form-item></el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12"><el-form-item label=" 绉戝鍚嶇О " prop="deptname">
+              <el-input v-model="form.deptname" placeholder="璇疯緭鍏� 绉戝鍚嶇О " />
+            </el-form-item></el-col>
+          <el-col :span="12"><el-form-item label=" 浣撴椤圭洰鍚嶇О " prop="projectname">
+              <el-input v-model="form.projectname" placeholder="璇疯緭鍏� 浣撴椤圭洰鍚嶇О " />
+            </el-form-item></el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12"><el-form-item label=" 浣撴椤圭洰缂栫爜 " prop="projectcode">
+              <el-input v-model="form.projectcode" placeholder="璇疯緭鍏� 浣撴椤圭洰缂栫爜 " />
+            </el-form-item></el-col>
+          <el-col :span="12"><el-form-item label=" 鐘舵��;0.宸查绾� 1.宸蹭綋妫� 2.鎶ュ憡宸插嚭 " prop="state">
+              <el-input v-model="form.state" placeholder="璇疯緭鍏� 鐘舵��;0.宸查绾� 1.宸蹭綋妫� 2.鎶ュ憡宸插嚭 " />
+            </el-form-item></el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12"><el-form-item label=" 绉戝ID " prop="deptid">
+              <el-input v-model="form.deptid" placeholder="璇疯緭鍏� 绉戝ID " />
+            </el-form-item></el-col>
+          <el-col :span="12"><el-form-item label=" 浣撴濂楅ID " prop="projectid">
+              <el-input v-model="form.projectid" placeholder="璇疯緭鍏� 浣撴濂楅ID " />
+            </el-form-item></el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12"><el-form-item label=" 鏂规鐘舵�佹搷浣滄椂闂� " prop="schemetime">
+              <el-date-picker clearable v-model="form.schemetime" type="date" value-format="yyyy-MM-dd"
+                placeholder="璇烽�夋嫨 鏂规鐘舵�佹搷浣滄椂闂� ">
+              </el-date-picker>
+            </el-form-item></el-col>
+        </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
@@ -330,7 +280,7 @@
     // 澶氶�夋閫変腑鏁版嵁
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
     /** 鏂板鎸夐挳鎿嶄綔 */
@@ -372,12 +322,12 @@
     /** 鍒犻櫎鎸夐挳鎿嶄綔 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('鏄惁纭鍒犻櫎鎮h�呬綋妫�璁板綍缂栧彿涓�"' + ids + '"鐨勬暟鎹」锛�').then(function() {
+      this.$modal.confirm('鏄惁纭鍒犻櫎鎮h�呬綋妫�璁板綍缂栧彿涓�"' + ids + '"鐨勬暟鎹」锛�').then(function () {
         return delPatphysical(ids);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
-      }).catch(() => {});
+      }).catch(() => { });
     },
     /** 瀵煎嚭鎸夐挳鎿嶄綔 */
     handleExport() {
diff --git a/ruoyi-ui/src/views/smartor/schemeautofinshrule/index.vue b/ruoyi-ui/src/views/smartor/schemeautofinshrule/index.vue
index c5a5245..2c3d03a 100644
--- a/ruoyi-ui/src/views/smartor/schemeautofinshrule/index.vue
+++ b/ruoyi-ui/src/views/smartor/schemeautofinshrule/index.vue
@@ -9,14 +9,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label=" 瑙勫垯鐩稿叧鍊�;Type 涓�2鏃� 1.鍦ㄩ櫌 2.绂婚櫌 3.姝讳骸 Type涓�3鏃跺搴旀柟妗圛D 澶氶�夐�楀彿闅斿紑 " prop="rulevalue">
-        <el-input
-          v-model="queryParams.rulevalue"
-          placeholder="璇疯緭鍏� 瑙勫垯鐩稿叧鍊�;Type 涓�2鏃� 1.鍦ㄩ櫌 2.绂婚櫌 3.姝讳骸 Type涓�3鏃跺搴旀柟妗圛D 澶氶�夐�楀彿闅斿紑 "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item label=" 鏈烘瀯ID " prop="orgid">
         <el-input
           v-model="queryParams.orgid"
@@ -81,8 +73,8 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label=" 鑷ID " align="center" prop="id" />
       <el-table-column label=" 鏂规ID " align="center" prop="schemeid" />
-      <el-table-column label=" 瑙勫垯绫诲瀷;1.鎵�鏈変换鍔″畬鎴愯嚜鍔ㄧ粨妗� 2.鎮h�呯姸鎬� 3.浜掓枼绠$悊鏂规 " align="center" prop="ruletype" />
-      <el-table-column label=" 瑙勫垯鐩稿叧鍊�;Type 涓�2鏃� 1.鍦ㄩ櫌 2.绂婚櫌 3.姝讳骸 Type涓�3鏃跺搴旀柟妗圛D 澶氶�夐�楀彿闅斿紑 " align="center" prop="rulevalue" />
+      <el-table-column label=" 瑙勫垯绫诲瀷 " align="center" prop="ruletype" />
+      <el-table-column label=" 瑙勫垯鐩稿叧鍊� " align="center" prop="rulevalue" />
       <el-table-column label=" 鏈烘瀯ID " align="center" prop="orgid" />
       <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -113,12 +105,15 @@
     />
 
     <!-- 娣诲姞鎴栦慨鏀规柟妗堢粨妗堣鍒欏璇濇 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+    <el-dialog :title="title" :visible.sync="open" :show-close="true" :close-on-click-modal="false" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-form-item label=" 鏂规ID " prop="schemeid">
           <el-input v-model="form.schemeid" placeholder="璇疯緭鍏� 鏂规ID " />
         </el-form-item>
-        <el-form-item label=" 瑙勫垯鐩稿叧鍊�;Type 涓�2鏃� 1.鍦ㄩ櫌 2.绂婚櫌 3.姝讳骸 Type涓�3鏃跺搴旀柟妗圛D 澶氶�夐�楀彿闅斿紑 " prop="rulevalue">
+        <el-form-item label=" 瑙勫垯绫诲瀷 " prop="ruletype">
+          <el-input v-model="form.ruletype" placeholder="璇疯緭鍏� 鏂规ID " />
+        </el-form-item>
+        <el-form-item label=" 瑙勫垯鐩稿叧鍊� " prop="rulevalue">
           <el-input v-model="form.rulevalue" placeholder="璇疯緭鍏� 瑙勫垯鐩稿叧鍊�;Type 涓�2鏃� 1.鍦ㄩ櫌 2.绂婚櫌 3.姝讳骸 Type涓�3鏃跺搴旀柟妗圛D 澶氶�夐�楀彿闅斿紑 " />
         </el-form-item>
         <el-form-item label=" 鏈烘瀯ID " prop="orgid">
@@ -133,25 +128,7 @@
               :value="dict.value"
             ></el-option>
           </el-select>
-        </el-form-item>
-        <el-form-item label=" 涓婁紶鏍囪 " prop="isupload">
-          <el-select v-model="form.isupload" placeholder="璇烽�夋嫨 涓婁紶鏍囪 ">
-            <el-option
-              v-for="dict in dict.type.sys_common_status"
-              :key="dict.value"
-              :label="dict.label"
-              :value="parseInt(dict.value)"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label=" 涓婁紶鏃堕棿 " prop="uploadTime">
-          <el-date-picker clearable
-            v-model="form.uploadTime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="璇烽�夋嫨 涓婁紶鏃堕棿 ">
-          </el-date-picker>
-        </el-form-item>
+        </el-form-item>       
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
diff --git a/ruoyi-ui/src/views/smartor/schemecalldetail/index.vue b/ruoyi-ui/src/views/smartor/schemecalldetail/index.vue
index a278fb7..bbae89a 100644
--- a/ruoyi-ui/src/views/smartor/schemecalldetail/index.vue
+++ b/ruoyi-ui/src/views/smartor/schemecalldetail/index.vue
@@ -1,229 +1,29 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label=" 閫氳瘽鏍囪瘑 " prop="uuid">
-        <el-input
-          v-model="queryParams.uuid"
-          placeholder="璇疯緭鍏� 閫氳瘽鏍囪瘑 "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
+
       <el-form-item label=" 鐩爣鍙风爜 " prop="phone">
-        <el-input
-          v-model="queryParams.phone"
-          placeholder="璇疯緭鍏� 鐩爣鍙风爜 "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.phone" placeholder="璇疯緭鍏� 鐩爣鍙风爜 " clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item label=" 褰撳墠鍥炶皟鐨勮姹傜被鍨� " prop="operate">
-        <el-input
-          v-model="queryParams.operate"
-          placeholder="璇疯緭鍏� 褰撳墠鍥炶皟鐨勮姹傜被鍨� "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+      <el-form-item label=" 澶栨樉鍙风爜 " prop="displayno">
+        <el-input v-model="queryParams.displayno" placeholder="璇疯緭鍏� 鍛煎彨澶栫嚎鏃朵娇鐢ㄧ殑澶栨樉鍙风爜 " clearable
+          @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item label=" 鍛煎彨澶栫嚎鏃朵娇鐢ㄧ殑澶栨樉鍙风爜 " prop="displayno">
-        <el-input
-          v-model="queryParams.displayno"
-          placeholder="璇疯緭鍏� 鍛煎彨澶栫嚎鏃朵娇鐢ㄧ殑澶栨樉鍙风爜 "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" 鏄惁涓哄懠鍏ラ�氳瘽 " prop="inbound">
-        <el-input
-          v-model="queryParams.inbound"
-          placeholder="璇疯緭鍏� 鏄惁涓哄懠鍏ラ�氳瘽 "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" 鏄惁涓哄懠鍏ヨ姹傛搷浣�(鍛煎叆鐨刬nbound鍧囦负true锛岄娆¤姹傛椂incoming涓簍rue) 濡傛灉涓嶅簲绛旓紝鍒欎細鎸傛柇褰撳墠鍛煎叆锛� " prop="incoming">
-        <el-input
-          v-model="queryParams.incoming"
-          placeholder="璇疯緭鍏� 鏄惁涓哄懠鍏ヨ姹傛搷浣�(鍛煎叆鐨刬nbound鍧囦负true锛岄娆¤姹傛椂incoming涓簍rue) 濡傛灉涓嶅簲绛旓紝鍒欎細鎸傛柇褰撳墠鍛煎叆锛� "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" 鍒嗛厤鏃堕棿 " prop="assigntime">
-        <el-input
-          v-model="queryParams.assigntime"
-          placeholder="璇疯緭鍏� 鍒嗛厤鏃堕棿 "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" 寮�濮嬫椂闂达紝濡傛灉鍛煎叆鐨勫垯涓哄懠鍏ュ紑濮嬫椂闂� " prop="starttime">
-        <el-input
-          v-model="queryParams.starttime"
-          placeholder="璇疯緭鍏� 寮�濮嬫椂闂达紝濡傛灉鍛煎叆鐨勫垯涓哄懠鍏ュ紑濮嬫椂闂� "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" 搴旂瓟鏃堕棿 " prop="answertime">
-        <el-input
-          v-model="queryParams.answertime"
-          placeholder="璇疯緭鍏� 搴旂瓟鏃堕棿 "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" 鏍囪瘑褰撳墠鏄惁涓洪潤榛樺洖璋� " prop="silent">
-        <el-input
-          v-model="queryParams.silent"
-          placeholder="璇疯緭鍏� 鏍囪瘑褰撳墠鏄惁涓洪潤榛樺洖璋� "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" 鏀跺埌鐨勬寜閿唴瀹� " prop="dtmfKey">
-        <el-input
-          v-model="queryParams.dtmfKey"
-          placeholder="璇疯緭鍏� 鏀跺埌鐨勬寜閿唴瀹� "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" 闊充箰鎾斁鎴栧仠姝㈡椂鐩稿叧闊充箰鍚嶇О " prop="musicpath">
-        <el-input
-          v-model="queryParams.musicpath"
-          placeholder="璇疯緭鍏� 闊充箰鎾斁鎴栧仠姝㈡椂鐩稿叧闊充箰鍚嶇О "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" 褰撳墠鍙ュ瓙鐨勭储寮曞彿 " prop="sentindex">
-        <el-input
-          v-model="queryParams.sentindex"
-          placeholder="璇疯緭鍏� 褰撳墠鍙ュ瓙鐨勭储寮曞彿 "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" 褰撳墠鏄惁涓鸿璇濆紑濮� " prop="sentbegin">
-        <el-input
-          v-model="queryParams.sentbegin"
-          placeholder="璇疯緭鍏� 褰撳墠鏄惁涓鸿璇濆紑濮� "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" 褰撳墠asr鏂囨湰 閫氳瘽寮�濮嬫椂闂寸偣锛屾绉掓暟 " prop="begintime">
-        <el-input
-          v-model="queryParams.begintime"
-          placeholder="璇疯緭鍏� 褰撳墠asr鏂囨湰 閫氳瘽寮�濮嬫椂闂寸偣锛屾绉掓暟 "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" 褰撳墠asr鏂囨湰 鎵�澶� 缁撴潫鏃堕棿鐐癸紝姣鏁帮紝褰撳墠鏂囨湰涓嶆槸鍙ュ瓙缁撴潫鏃讹紝鍒欎负-1 " prop="endtime">
-        <el-input
-          v-model="queryParams.endtime"
-          placeholder="璇疯緭鍏� 褰撳墠asr鏂囨湰 鎵�澶� 缁撴潫鏃堕棿鐐癸紝姣鏁帮紝褰撳墠鏂囨湰涓嶆槸鍙ュ瓙缁撴潫鏃讹紝鍒欎负-1 "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" 鏍囪瘑褰撳墠鏄惁涓哄彞瀛愮粨鏉� " prop="sentend">
-        <el-input
-          v-model="queryParams.sentend"
-          placeholder="璇疯緭鍏� 鏍囪瘑褰撳墠鏄惁涓哄彞瀛愮粨鏉� "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" 褰撳墠鍙ュ瓙鐨勫綍闊虫枃浠惰矾寰勶紝鍙ュ瓙鏈粨鏉熸椂涓虹┖銆� " prop="recordpath">
-        <el-input
-          v-model="queryParams.recordpath"
-          placeholder="璇疯緭鍏� 褰撳墠鍙ュ瓙鐨勫綍闊虫枃浠惰矾寰勶紝鍙ュ瓙鏈粨鏉熸椂涓虹┖銆� "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" 褰撳墠鍙ュ瓙褰曢煶url璺緞銆� " prop="recordurl">
-        <el-input
-          v-model="queryParams.recordurl"
-          placeholder="璇疯緭鍏� 褰撳墠鍙ュ瓙褰曢煶url璺緞銆� "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+      <el-form-item label=" 鏄惁鍛煎叆 " prop="inbound">
+        <el-input v-model="queryParams.inbound" placeholder="璇疯緭鍏� 鏄惁涓哄懠鍏ラ�氳瘽 " clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label=" 鍦烘櫙ID " prop="sceneid">
-        <el-input
-          v-model="queryParams.sceneid"
-          placeholder="璇疯緭鍏� 鍦烘櫙ID "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" 鍏宠仈浠诲姟璁板綍ID " prop="taskrecordid">
-        <el-input
-          v-model="queryParams.taskrecordid"
-          placeholder="璇疯緭鍏� 鍏宠仈浠诲姟璁板綍ID "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" 褰撳墠娴佺▼ID " prop="flowiid">
-        <el-input
-          v-model="queryParams.flowiid"
-          placeholder="璇疯緭鍏� 褰撳墠娴佺▼ID "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" 褰撳墠鑺傜偣ID " prop="flownodeid">
-        <el-input
-          v-model="queryParams.flownodeid"
-          placeholder="璇疯緭鍏� 褰撳墠鑺傜偣ID "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.sceneid" placeholder="璇疯緭鍏� 鍦烘櫙ID " clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label=" 璇嗗埆鎰忓浘鍊� " prop="intentvalue">
-        <el-input
-          v-model="queryParams.intentvalue"
-          placeholder="璇疯緭鍏� 璇嗗埆鎰忓浘鍊� "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.intentvalue" placeholder="璇疯緭鍏� 璇嗗埆鎰忓浘鍊� " clearable
+          @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label=" 鍖归厤鏂囨湰 " prop="matchedtext">
-        <el-input
-          v-model="queryParams.matchedtext"
-          placeholder="璇疯緭鍏� 鍖归厤鏂囨湰 "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.matchedtext" placeholder="璇疯緭鍏� 鍖归厤鏂囨湰 " clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label=" 鏈烘瀯ID " prop="orgid">
-        <el-input
-          v-model="queryParams.orgid"
-          placeholder="璇疯緭鍏� 鏈烘瀯ID "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" 涓婁紶鏍囪 " prop="isupload">
-        <el-input
-          v-model="queryParams.isupload"
-          placeholder="璇疯緭鍏� 涓婁紶鏍囪 "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" 涓婁紶鏃堕棿 " prop="uploadTime">
-        <el-date-picker clearable
-          v-model="queryParams.uploadTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="璇烽�夋嫨 涓婁紶鏃堕棿 ">
-        </el-date-picker>
+        <el-input v-model="queryParams.orgid" placeholder="璇疯緭鍏� 鏈烘瀯ID " clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
@@ -233,46 +33,20 @@
 
     <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="['smartor:schemecalldetail:add']"
-        >鏂板</el-button>
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+          v-hasPermi="['smartor:schemecalldetail:add']">鏂板</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['smartor:schemecalldetail:edit']"
-        >淇敼</el-button>
+        <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
+          v-hasPermi="['smartor:schemecalldetail:edit']">淇敼</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['smartor:schemecalldetail:remove']"
-        >鍒犻櫎</el-button>
+        <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
+          v-hasPermi="['smartor:schemecalldetail:remove']">鍒犻櫎</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['smartor:schemecalldetail:export']"
-        >瀵煎嚭</el-button>
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
+          v-hasPermi="['smartor:schemecalldetail:export']">瀵煎嚭</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
@@ -285,9 +59,9 @@
       <el-table-column label=" 褰撳墠鍥炶皟鐨勮姹傜被鍨� " align="center" prop="operate" />
       <el-table-column label=" 鍛煎彨澶栫嚎鏃朵娇鐢ㄧ殑澶栨樉鍙风爜 " align="center" prop="displayno" />
       <el-table-column label=" 鏄惁涓哄懠鍏ラ�氳瘽 " align="center" prop="inbound" />
-      <el-table-column label=" 鏄惁涓哄懠鍏ヨ姹傛搷浣�(鍛煎叆鐨刬nbound鍧囦负true锛岄娆¤姹傛椂incoming涓簍rue) 濡傛灉涓嶅簲绛旓紝鍒欎細鎸傛柇褰撳墠鍛煎叆锛� " align="center" prop="incoming" />
+      <el-table-column label=" 鏄惁涓哄懠鍏ヨ姹傛搷浣� " align="center" prop="incoming" />
       <el-table-column label=" 鍒嗛厤鏃堕棿 " align="center" prop="assigntime" />
-      <el-table-column label=" 寮�濮嬫椂闂达紝濡傛灉鍛煎叆鐨勫垯涓哄懠鍏ュ紑濮嬫椂闂� " align="center" prop="starttime" />
+      <el-table-column label=" 寮�濮嬫椂闂� " align="center" prop="starttime" />
       <el-table-column label=" 搴旂瓟鏃堕棿 " align="center" prop="answertime" />
       <el-table-column label=" 鏍囪瘑褰撳墠鏄惁涓洪潤榛樺洖璋� " align="center" prop="silent" />
       <el-table-column label=" 鏀跺埌鐨勬寜閿唴瀹� " align="center" prop="dtmfKey" />
@@ -295,10 +69,6 @@
       <el-table-column label=" 褰撳墠鍙ュ瓙鐨勭储寮曞彿 " align="center" prop="sentindex" />
       <el-table-column label=" 褰撳墠鏄惁涓鸿璇濆紑濮� " align="center" prop="sentbegin" />
       <el-table-column label=" 褰撳墠鏀跺埌鐨凙SR璇嗗埆鏂囨湰 " align="center" prop="asrtext" />
-      <el-table-column label=" 褰撳墠asr鏂囨湰 閫氳瘽寮�濮嬫椂闂寸偣锛屾绉掓暟 " align="center" prop="begintime" />
-      <el-table-column label=" 褰撳墠asr鏂囨湰 鎵�澶� 缁撴潫鏃堕棿鐐癸紝姣鏁帮紝褰撳墠鏂囨湰涓嶆槸鍙ュ瓙缁撴潫鏃讹紝鍒欎负-1 " align="center" prop="endtime" />
-      <el-table-column label=" 鏍囪瘑褰撳墠鏄惁涓哄彞瀛愮粨鏉� " align="center" prop="sentend" />
-      <el-table-column label=" 褰撳墠鍙ュ瓙鐨勫綍闊虫枃浠惰矾寰勶紝鍙ュ瓙鏈粨鏉熸椂涓虹┖銆� " align="center" prop="recordpath" />
       <el-table-column label=" 褰撳墠鍙ュ瓙褰曢煶url璺緞銆� " align="center" prop="recordurl" />
       <el-table-column label=" 鍦烘櫙ID " align="center" prop="sceneid" />
       <el-table-column label=" 鍏宠仈浠诲姟璁板綍ID " align="center" prop="taskrecordid" />
@@ -309,144 +79,140 @@
       <el-table-column label=" 璇嗗埆鎰忓浘鍊� " align="center" prop="intentvalue" />
       <el-table-column label=" 鍖归厤鏂囨湰 " align="center" prop="matchedtext" />
       <el-table-column label=" 鏈烘瀯ID " align="center" prop="orgid" />
-      <el-table-column label=" 涓婁紶鏍囪 " align="center" prop="isupload" />
-      <el-table-column label=" 涓婁紶鏃堕棿 " align="center" prop="uploadTime" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.uploadTime, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
+
       <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="handleUpdate(scope.row)"
-            v-hasPermi="['smartor:schemecalldetail:edit']"
-          >淇敼</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['smartor:schemecalldetail:remove']"
-          >鍒犻櫎</el-button>
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+            v-hasPermi="['smartor:schemecalldetail:edit']">淇敼</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+            v-hasPermi="['smartor:schemecalldetail:remove']">鍒犻櫎</el-button>
         </template>
       </el-table-column>
     </el-table>
-    
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
+
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+      @pagination="getList" />
 
     <!-- 娣诲姞鎴栦慨鏀规柟妗圓I澶栧懠浠诲姟璇︽儏瀵硅瘽妗� -->
-    <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=" 閫氳瘽鏍囪瘑 " prop="uuid">
-          <el-input v-model="form.uuid" placeholder="璇疯緭鍏� 閫氳瘽鏍囪瘑 " />
-        </el-form-item>
-        <el-form-item label=" 鐩爣鍙风爜 " prop="phone">
-          <el-input v-model="form.phone" placeholder="璇疯緭鍏� 鐩爣鍙风爜 " />
-        </el-form-item>
-        <el-form-item label=" 褰撳墠鍥炶皟鐨勮姹傜被鍨� " prop="operate">
-          <el-input v-model="form.operate" placeholder="璇疯緭鍏� 褰撳墠鍥炶皟鐨勮姹傜被鍨� " />
-        </el-form-item>
-        <el-form-item label=" 鍛煎彨澶栫嚎鏃朵娇鐢ㄧ殑澶栨樉鍙风爜 " prop="displayno">
-          <el-input v-model="form.displayno" placeholder="璇疯緭鍏� 鍛煎彨澶栫嚎鏃朵娇鐢ㄧ殑澶栨樉鍙风爜 " />
-        </el-form-item>
-        <el-form-item label=" 鏄惁涓哄懠鍏ラ�氳瘽 " prop="inbound">
-          <el-input v-model="form.inbound" placeholder="璇疯緭鍏� 鏄惁涓哄懠鍏ラ�氳瘽 " />
-        </el-form-item>
-        <el-form-item label=" 鏄惁涓哄懠鍏ヨ姹傛搷浣�(鍛煎叆鐨刬nbound鍧囦负true锛岄娆¤姹傛椂incoming涓簍rue) 濡傛灉涓嶅簲绛旓紝鍒欎細鎸傛柇褰撳墠鍛煎叆锛� " prop="incoming">
-          <el-input v-model="form.incoming" placeholder="璇疯緭鍏� 鏄惁涓哄懠鍏ヨ姹傛搷浣�(鍛煎叆鐨刬nbound鍧囦负true锛岄娆¤姹傛椂incoming涓簍rue) 濡傛灉涓嶅簲绛旓紝鍒欎細鎸傛柇褰撳墠鍛煎叆锛� " />
-        </el-form-item>
-        <el-form-item label=" 鍒嗛厤鏃堕棿 " prop="assigntime">
-          <el-input v-model="form.assigntime" placeholder="璇疯緭鍏� 鍒嗛厤鏃堕棿 " />
-        </el-form-item>
-        <el-form-item label=" 寮�濮嬫椂闂达紝濡傛灉鍛煎叆鐨勫垯涓哄懠鍏ュ紑濮嬫椂闂� " prop="starttime">
-          <el-input v-model="form.starttime" placeholder="璇疯緭鍏� 寮�濮嬫椂闂达紝濡傛灉鍛煎叆鐨勫垯涓哄懠鍏ュ紑濮嬫椂闂� " />
-        </el-form-item>
-        <el-form-item label=" 搴旂瓟鏃堕棿 " prop="answertime">
-          <el-input v-model="form.answertime" placeholder="璇疯緭鍏� 搴旂瓟鏃堕棿 " />
-        </el-form-item>
-        <el-form-item label=" 鏍囪瘑褰撳墠鏄惁涓洪潤榛樺洖璋� " prop="silent">
-          <el-input v-model="form.silent" placeholder="璇疯緭鍏� 鏍囪瘑褰撳墠鏄惁涓洪潤榛樺洖璋� " />
-        </el-form-item>
-        <el-form-item label=" 鏀跺埌鐨勬寜閿唴瀹� " prop="dtmfKey">
-          <el-input v-model="form.dtmfKey" placeholder="璇疯緭鍏� 鏀跺埌鐨勬寜閿唴瀹� " />
-        </el-form-item>
-        <el-form-item label=" 闊充箰鎾斁鎴栧仠姝㈡椂鐩稿叧闊充箰鍚嶇О " prop="musicpath">
-          <el-input v-model="form.musicpath" placeholder="璇疯緭鍏� 闊充箰鎾斁鎴栧仠姝㈡椂鐩稿叧闊充箰鍚嶇О " />
-        </el-form-item>
-        <el-form-item label=" 褰撳墠鍙ュ瓙鐨勭储寮曞彿 " prop="sentindex">
-          <el-input v-model="form.sentindex" placeholder="璇疯緭鍏� 褰撳墠鍙ュ瓙鐨勭储寮曞彿 " />
-        </el-form-item>
-        <el-form-item label=" 褰撳墠鏄惁涓鸿璇濆紑濮� " prop="sentbegin">
-          <el-input v-model="form.sentbegin" placeholder="璇疯緭鍏� 褰撳墠鏄惁涓鸿璇濆紑濮� " />
-        </el-form-item>
-        <el-form-item label=" 褰撳墠鏀跺埌鐨凙SR璇嗗埆鏂囨湰 " prop="asrtext">
-          <el-input v-model="form.asrtext" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" />
-        </el-form-item>
-        <el-form-item label=" 褰撳墠asr鏂囨湰 閫氳瘽寮�濮嬫椂闂寸偣锛屾绉掓暟 " prop="begintime">
-          <el-input v-model="form.begintime" placeholder="璇疯緭鍏� 褰撳墠asr鏂囨湰 閫氳瘽寮�濮嬫椂闂寸偣锛屾绉掓暟 " />
-        </el-form-item>
-        <el-form-item label=" 褰撳墠asr鏂囨湰 鎵�澶� 缁撴潫鏃堕棿鐐癸紝姣鏁帮紝褰撳墠鏂囨湰涓嶆槸鍙ュ瓙缁撴潫鏃讹紝鍒欎负-1 " prop="endtime">
-          <el-input v-model="form.endtime" placeholder="璇疯緭鍏� 褰撳墠asr鏂囨湰 鎵�澶� 缁撴潫鏃堕棿鐐癸紝姣鏁帮紝褰撳墠鏂囨湰涓嶆槸鍙ュ瓙缁撴潫鏃讹紝鍒欎负-1 " />
-        </el-form-item>
-        <el-form-item label=" 鏍囪瘑褰撳墠鏄惁涓哄彞瀛愮粨鏉� " prop="sentend">
-          <el-input v-model="form.sentend" placeholder="璇疯緭鍏� 鏍囪瘑褰撳墠鏄惁涓哄彞瀛愮粨鏉� " />
-        </el-form-item>
-        <el-form-item label=" 褰撳墠鍙ュ瓙鐨勫綍闊虫枃浠惰矾寰勶紝鍙ュ瓙鏈粨鏉熸椂涓虹┖銆� " prop="recordpath">
-          <el-input v-model="form.recordpath" placeholder="璇疯緭鍏� 褰撳墠鍙ュ瓙鐨勫綍闊虫枃浠惰矾寰勶紝鍙ュ瓙鏈粨鏉熸椂涓虹┖銆� " />
-        </el-form-item>
-        <el-form-item label=" 褰撳墠鍙ュ瓙褰曢煶url璺緞銆� " prop="recordurl">
-          <el-input v-model="form.recordurl" placeholder="璇疯緭鍏� 褰撳墠鍙ュ瓙褰曢煶url璺緞銆� " />
-        </el-form-item>
-        <el-form-item label=" 鍦烘櫙ID " prop="sceneid">
-          <el-input v-model="form.sceneid" placeholder="璇疯緭鍏� 鍦烘櫙ID " />
-        </el-form-item>
-        <el-form-item label=" 鍏宠仈浠诲姟璁板綍ID " prop="taskrecordid">
-          <el-input v-model="form.taskrecordid" placeholder="璇疯緭鍏� 鍏宠仈浠诲姟璁板綍ID " />
-        </el-form-item>
-        <el-form-item label=" 褰撳墠娴佺▼ID " prop="flowiid">
-          <el-input v-model="form.flowiid" placeholder="璇疯緭鍏� 褰撳墠娴佺▼ID " />
-        </el-form-item>
-        <el-form-item label=" 褰撳墠鑺傜偣ID " prop="flownodeid">
-          <el-input v-model="form.flownodeid" placeholder="璇疯緭鍏� 褰撳墠鑺傜偣ID " />
-        </el-form-item>
-        <el-form-item label=" 璇濇湳鏂囨湰 " prop="corpustext">
-          <el-input v-model="form.corpustext" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" />
-        </el-form-item>
-        <el-form-item label=" 璇濇湳璇煶 " prop="corpusvoice">
-          <el-input v-model="form.corpusvoice" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" />
-        </el-form-item>
-        <el-form-item label=" 璇嗗埆鎰忓浘鍊� " prop="intentvalue">
-          <el-input v-model="form.intentvalue" placeholder="璇疯緭鍏� 璇嗗埆鎰忓浘鍊� " />
-        </el-form-item>
-        <el-form-item label=" 鍖归厤鏂囨湰 " prop="matchedtext">
-          <el-input v-model="form.matchedtext" placeholder="璇疯緭鍏� 鍖归厤鏂囨湰 " />
-        </el-form-item>
-        <el-form-item label=" 鏈烘瀯ID " prop="orgid">
-          <el-input v-model="form.orgid" placeholder="璇疯緭鍏� 鏈烘瀯ID " />
-        </el-form-item>
-        <el-form-item label=" 鍒犻櫎鏍囪 " prop="delFlag">
-          <el-input v-model="form.delFlag" placeholder="璇疯緭鍏� 鍒犻櫎鏍囪 " />
-        </el-form-item>
-        <el-form-item label=" 涓婁紶鏍囪 " prop="isupload">
-          <el-input v-model="form.isupload" placeholder="璇疯緭鍏� 涓婁紶鏍囪 " />
-        </el-form-item>
-        <el-form-item label=" 涓婁紶鏃堕棿 " prop="uploadTime">
-          <el-date-picker clearable
-            v-model="form.uploadTime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="璇烽�夋嫨 涓婁紶鏃堕棿 ">
-          </el-date-picker>
-        </el-form-item>
+    <el-dialog :title="title" :visible.sync="open" :show-close="true" :close-on-click-modal="false" width="1000px"
+      append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+        <el-row>
+          <el-col :span="12"><el-form-item label=" 閫氳瘽鏍囪瘑 " prop="uuid">
+              <el-input v-model="form.uuid" placeholder="璇疯緭鍏� 閫氳瘽鏍囪瘑 " />
+            </el-form-item></el-col>
+          <el-col :span="12"><el-form-item label=" 鐩爣鍙风爜 " prop="phone">
+              <el-input v-model="form.phone" placeholder="璇疯緭鍏� 鐩爣鍙风爜 " />
+            </el-form-item></el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12"><el-form-item label=" 褰撳墠鍥炶皟鐨勮姹傜被鍨� " prop="operate">
+              <el-input v-model="form.operate" placeholder="璇疯緭鍏� 褰撳墠鍥炶皟鐨勮姹傜被鍨� " />
+            </el-form-item></el-col>
+          <el-col :span="12"><el-form-item label=" 鍛煎彨澶栫嚎鏃朵娇鐢ㄧ殑澶栨樉鍙风爜 " prop="displayno">
+              <el-input v-model="form.displayno" placeholder="璇疯緭鍏� 鍛煎彨澶栫嚎鏃朵娇鐢ㄧ殑澶栨樉鍙风爜 " />
+            </el-form-item></el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12"><el-form-item label=" 鏄惁涓哄懠鍏ラ�氳瘽 " prop="inbound">
+              <el-input v-model="form.inbound" placeholder="璇疯緭鍏� 鏄惁涓哄懠鍏ラ�氳瘽 " />
+            </el-form-item></el-col>
+          <el-col :span="12"><el-form-item label=" 鏄惁涓哄懠鍏ヨ姹傛搷浣� " prop="incoming">
+              <el-input v-model="form.incoming"
+                placeholder="璇疯緭鍏� 鏄惁涓哄懠鍏ヨ姹傛搷浣�(鍛煎叆鐨刬nbound鍧囦负true锛岄娆¤姹傛椂incoming涓簍rue) 濡傛灉涓嶅簲绛旓紝鍒欎細鎸傛柇褰撳墠鍛煎叆锛� " />
+            </el-form-item></el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12"><el-form-item label=" 鍒嗛厤鏃堕棿 " prop="assigntime">
+              <el-input v-model="form.assigntime" placeholder="璇疯緭鍏� 鍒嗛厤鏃堕棿 " />
+            </el-form-item></el-col>
+          <el-col :span="12"><el-form-item label=" 寮�濮嬫椂闂� " prop="starttime">
+              <el-input v-model="form.starttime" placeholder="璇疯緭鍏� 寮�濮嬫椂闂达紝濡傛灉鍛煎叆鐨勫垯涓哄懠鍏ュ紑濮嬫椂闂� " />
+            </el-form-item></el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12"><el-form-item label=" 搴旂瓟鏃堕棿 " prop="answertime">
+              <el-input v-model="form.answertime" placeholder="璇疯緭鍏� 搴旂瓟鏃堕棿 " />
+            </el-form-item></el-col>
+          <el-col :span="12"><el-form-item label=" 鏍囪瘑褰撳墠鏄惁涓洪潤榛樺洖璋� " prop="silent">
+              <el-input v-model="form.silent" placeholder="璇疯緭鍏� 鏍囪瘑褰撳墠鏄惁涓洪潤榛樺洖璋� " />
+            </el-form-item></el-col>
+        </el-row> <el-row>
+          <el-col :span="12"><el-form-item label=" 鏀跺埌鐨勬寜閿唴瀹� " prop="dtmfKey">
+              <el-input v-model="form.dtmfKey" placeholder="璇疯緭鍏� 鏀跺埌鐨勬寜閿唴瀹� " />
+            </el-form-item></el-col>
+          <el-col :span="12"><el-form-item label=" 闊充箰鎾斁鎴栧仠姝㈡椂鐩稿叧闊充箰鍚嶇О " prop="musicpath">
+              <el-input v-model="form.musicpath" placeholder="璇疯緭鍏� 闊充箰鎾斁鎴栧仠姝㈡椂鐩稿叧闊充箰鍚嶇О " />
+            </el-form-item></el-col>
+        </el-row> <el-row>
+          <el-col :span="12"><el-form-item label=" 褰撳墠鍙ュ瓙鐨勭储寮曞彿 " prop="sentindex">
+              <el-input v-model="form.sentindex" placeholder="璇疯緭鍏� 褰撳墠鍙ュ瓙鐨勭储寮曞彿 " />
+            </el-form-item></el-col>
+          <el-col :span="12"><el-form-item label=" 褰撳墠鏄惁涓鸿璇濆紑濮� " prop="sentbegin">
+              <el-input v-model="form.sentbegin" placeholder="璇疯緭鍏� 褰撳墠鏄惁涓鸿璇濆紑濮� " />
+            </el-form-item></el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12"><el-form-item label=" 褰撳墠鏀跺埌鐨凙SR璇嗗埆鏂囨湰 " prop="asrtext">
+              <el-input v-model="form.asrtext" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" />
+            </el-form-item></el-col>
+          <el-col :span="12"><el-form-item label=" 褰撳墠asr鏂囨湰 " prop="begintime">
+              <el-input v-model="form.begintime" placeholder="璇疯緭鍏� 褰撳墠asr鏂囨湰 閫氳瘽寮�濮嬫椂闂寸偣锛屾绉掓暟 " />
+            </el-form-item></el-col>
+        </el-row><el-row>
+          <el-col :span="12"><el-form-item label=" 缁撴潫鏃堕棿鐐� " prop="endtime">
+              <el-input v-model="form.endtime" placeholder="璇疯緭鍏� 褰撳墠asr鏂囨湰 鎵�澶� 缁撴潫鏃堕棿鐐癸紝姣鏁帮紝褰撳墠鏂囨湰涓嶆槸鍙ュ瓙缁撴潫鏃讹紝鍒欎负-1 " />
+            </el-form-item></el-col>
+          <el-col :span="12"> <el-form-item label=" 鏄惁涓哄彞瀛愮粨鏉� " prop="sentend">
+              <el-input v-model="form.sentend" placeholder="璇疯緭鍏� 鏍囪瘑褰撳墠鏄惁涓哄彞瀛愮粨鏉� " />
+            </el-form-item></el-col>
+        </el-row><el-row>
+          <el-col :span="12"><el-form-item label=" 褰撳墠鍙ュ瓙鐨勫綍闊虫枃浠惰矾寰� " prop="recordpath">
+              <el-input v-model="form.recordpath" placeholder="璇疯緭鍏� 褰撳墠鍙ュ瓙鐨勫綍闊虫枃浠惰矾寰勶紝鍙ュ瓙鏈粨鏉熸椂涓虹┖銆� " />
+            </el-form-item></el-col>
+          <el-col :span="12"> <el-form-item label=" 褰曢煶url璺緞 " prop="recordurl">
+              <el-input v-model="form.recordurl" placeholder="璇疯緭鍏� 褰撳墠鍙ュ瓙褰曢煶url璺緞銆� " />
+            </el-form-item></el-col>
+        </el-row><el-row>
+          <el-col :span="12"><el-form-item label=" 鍦烘櫙ID " prop="sceneid">
+              <el-input v-model="form.sceneid" placeholder="璇疯緭鍏� 鍦烘櫙ID " />
+            </el-form-item></el-col>
+          <el-col :span="12"><el-form-item label=" 鍏宠仈浠诲姟璁板綍ID " prop="taskrecordid">
+              <el-input v-model="form.taskrecordid" placeholder="璇疯緭鍏� 鍏宠仈浠诲姟璁板綍ID " />
+            </el-form-item></el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12"><el-form-item label=" 褰撳墠娴佺▼ID " prop="flowiid">
+              <el-input v-model="form.flowiid" placeholder="璇疯緭鍏� 褰撳墠娴佺▼ID " />
+            </el-form-item></el-col>
+          <el-col :span="12"> <el-form-item label=" 褰撳墠鑺傜偣ID " prop="flownodeid">
+              <el-input v-model="form.flownodeid" placeholder="璇疯緭鍏� 褰撳墠鑺傜偣ID " />
+            </el-form-item></el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12"> <el-form-item label=" 璇濇湳鏂囨湰 " prop="corpustext">
+              <el-input v-model="form.corpustext" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" />
+            </el-form-item></el-col>
+          <el-col :span="12"><el-form-item label=" 璇濇湳璇煶 " prop="corpusvoice">
+              <el-input v-model="form.corpusvoice" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" />
+            </el-form-item></el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12"><el-form-item label=" 璇嗗埆鎰忓浘鍊� " prop="intentvalue">
+              <el-input v-model="form.intentvalue" placeholder="璇疯緭鍏� 璇嗗埆鎰忓浘鍊� " />
+            </el-form-item></el-col>
+          <el-col :span="12"><el-form-item label=" 鍖归厤鏂囨湰 " prop="matchedtext">
+              <el-input v-model="form.matchedtext" placeholder="璇疯緭鍏� 鍖归厤鏂囨湰 " />
+            </el-form-item></el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12"><el-form-item label=" 鏈烘瀯ID " prop="orgid">
+              <el-input v-model="form.orgid" placeholder="璇疯緭鍏� 鏈烘瀯ID " />
+            </el-form-item></el-col>
+          <el-col :span="12"><el-form-item label=" 鍒犻櫎鏍囪 " prop="delFlag">
+              <el-input v-model="form.delFlag" placeholder="璇疯緭鍏� 鍒犻櫎鏍囪 " />
+            </el-form-item></el-col>
+        </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
@@ -604,7 +370,7 @@
     // 澶氶�夋閫変腑鏁版嵁
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
     /** 鏂板鎸夐挳鎿嶄綔 */
@@ -646,12 +412,12 @@
     /** 鍒犻櫎鎸夐挳鎿嶄綔 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('鏄惁纭鍒犻櫎鏂规AI澶栧懠浠诲姟璇︽儏缂栧彿涓�"' + ids + '"鐨勬暟鎹」锛�').then(function() {
+      this.$modal.confirm('鏄惁纭鍒犻櫎鏂规AI澶栧懠浠诲姟璇︽儏缂栧彿涓�"' + ids + '"鐨勬暟鎹」锛�').then(function () {
         return delSchemecalldetail(ids);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
-      }).catch(() => {});
+      }).catch(() => { });
     },
     /** 瀵煎嚭鎸夐挳鎿嶄綔 */
     handleExport() {
diff --git a/ruoyi-ui/src/views/smartor/schemecategory/index.vue b/ruoyi-ui/src/views/smartor/schemecategory/index.vue
index e680f78..1681716 100644
--- a/ruoyi-ui/src/views/smartor/schemecategory/index.vue
+++ b/ruoyi-ui/src/views/smartor/schemecategory/index.vue
@@ -17,14 +17,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label=" 鏄惁閫氱敤 0.鍚� 1.鏄� " prop="iscurrency">
-        <el-input
-          v-model="queryParams.iscurrency"
-          placeholder="璇疯緭鍏� 鏄惁閫氱敤 0.鍚� 1.鏄� "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
@@ -81,8 +73,9 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label=" 鑷ID " align="center" prop="id" />
       <el-table-column label=" 鍒嗙被鍚嶇О " align="center" prop="categoryname" />
-      <el-table-column label=" 鏈烘瀯ID " align="center" prop="orgid" />
-      <el-table-column label=" 鏄惁閫氱敤 0.鍚� 1.鏄� " align="center" prop="iscurrency" />
+      <el-table-column label=" 鎵�灞炴満鏋� " align="center" prop="orgid" />
+      <el-table-column label=" 鏄惁閫氱敤 " align="center" prop="iscurrency" />
+      <el-table-column label=" 鍒犻櫎鏍囪 " align="center" prop="delFlag" />
       <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -112,15 +105,15 @@
     />
 
     <!-- 娣诲姞鎴栦慨鏀规柟妗堝垎绫诲璇濇 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+    <el-dialog :title="title" :visible.sync="open" :showclose="true" :close-on-click-modal="false" :inline="true" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-form-item label=" 鍒嗙被鍚嶇О " prop="categoryname">
           <el-input v-model="form.categoryname" placeholder="璇疯緭鍏� 鍒嗙被鍚嶇О " />
         </el-form-item>
         <el-form-item label=" 鏈烘瀯ID " prop="orgid">
           <el-input v-model="form.orgid" placeholder="璇疯緭鍏� 鏈烘瀯ID " />
         </el-form-item>
-        <el-form-item label=" 鏄惁閫氱敤 0.鍚� 1.鏄� " prop="iscurrency">
+        <el-form-item label=" 鏄惁閫氱敤 " prop="iscurrency">
           <el-input v-model="form.iscurrency" placeholder="璇疯緭鍏� 鏄惁閫氱敤 0.鍚� 1.鏄� " />
         </el-form-item>
         <el-form-item label=" 鍒犻櫎鏍囪 " prop="delFlag">
@@ -132,25 +125,7 @@
               :value="dict.value"
             ></el-option>
           </el-select>
-        </el-form-item>
-        <el-form-item label=" 涓婁紶鏍囪 " prop="isupload">
-          <el-select v-model="form.isupload" placeholder="璇烽�夋嫨 涓婁紶鏍囪 ">
-            <el-option
-              v-for="dict in dict.type.sys_common_status"
-              :key="dict.value"
-              :label="dict.label"
-              :value="parseInt(dict.value)"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label=" 涓婁紶鏃堕棿 " prop="uploadTime">
-          <el-date-picker clearable
-            v-model="form.uploadTime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="璇烽�夋嫨 涓婁紶鏃堕棿 ">
-          </el-date-picker>
-        </el-form-item>
+        </el-form-item>        
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
diff --git a/ruoyi-ui/src/views/smartor/schemelibrary/index.vue b/ruoyi-ui/src/views/smartor/schemelibrary/index.vue
index 2a2dd74..62c3813 100644
--- a/ruoyi-ui/src/views/smartor/schemelibrary/index.vue
+++ b/ruoyi-ui/src/views/smartor/schemelibrary/index.vue
@@ -1,197 +1,37 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label=" 鏂规鍒嗙被ID " prop="schemecategoryid">
-        <el-input
-          v-model="queryParams.schemecategoryid"
-          placeholder="璇疯緭鍏� 鏂规鍒嗙被ID "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item label=" 鏂规鍚嶇О " prop="schemename">
-        <el-input
-          v-model="queryParams.schemename"
-          placeholder="璇疯緭鍏� 鏂规鍚嶇О "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" 妯℃澘ID " prop="templateid">
-        <el-input
-          v-model="queryParams.templateid"
-          placeholder="璇疯緭鍏� 妯℃澘ID "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" 鐗堟湰 " prop="version">
-        <el-input
-          v-model="queryParams.version"
-          placeholder="璇疯緭鍏� 鐗堟湰 "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.schemename" placeholder="璇疯緭鍏� 鏂规鍚嶇О " clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label=" 鏂规浠g爜 " prop="schemecode">
-        <el-input
-          v-model="queryParams.schemecode"
-          placeholder="璇疯緭鍏� 鏂规浠g爜 "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.schemecode" placeholder="璇疯緭鍏� 鏂规浠g爜 " clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item label=" 涓績搴揑D " prop="centerlibraryid">
-        <el-input
-          v-model="queryParams.centerlibraryid"
-          placeholder="璇疯緭鍏� 涓績搴揑D "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+      <el-form-item label=" 鎮h�呮潵婧� " prop="patientsource">
+        <el-input v-model="queryParams.patientsource" placeholder="璇疯緭鍏� 鎮h�呮潵婧� " clearable
+          @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item label=" 鎮h�呮潵婧�;1.鍑洪櫌 2.鍦ㄩ櫌 3.闂ㄨ瘖 4.浣撴 5.鏃� " prop="patientsource">
-        <el-input
-          v-model="queryParams.patientsource"
-          placeholder="璇疯緭鍏� 鎮h�呮潵婧�;1.鍑洪櫌 2.鍦ㄩ櫌 3.闂ㄨ瘖 4.浣撴 5.鏃� "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+      <el-form-item label=" 鑷姩缁撴 " prop="autofinsh">
+        <el-input v-model="queryParams.autofinsh" placeholder="璇疯緭鍏� 鑷姩缁撴;0.鍚� 1.鏄� " clearable
+          @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item label=" 绉戝瑙勫垯;0.涓嶅寘鍚� 1.鍖呭惈 " prop="ruledept">
-        <el-input
-          v-model="queryParams.ruledept"
-          placeholder="璇疯緭鍏� 绉戝瑙勫垯;0.涓嶅寘鍚� 1.鍖呭惈 "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" 鐥呭尯瑙勫垯;0.涓嶅寘鍚� 1.鍖呭惈 " prop="ruleward">
-        <el-input
-          v-model="queryParams.ruleward"
-          placeholder="璇疯緭鍏� 鐥呭尯瑙勫垯;0.涓嶅寘鍚� 1.鍖呭惈 "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" 閲嶅澶勭悊;1.鏂拌鍒掕嚜鍔ㄧ粨妗� 2.鍘熻鍒掕嚜鍔ㄧ粨妗� " prop="repeathandle">
-        <el-input
-          v-model="queryParams.repeathandle"
-          placeholder="璇疯緭鍏� 閲嶅澶勭悊;1.鏂拌鍒掕嚜鍔ㄧ粨妗� 2.鍘熻鍒掕嚜鍔ㄧ粨妗� "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" 杩囨湡澶勭悊;1.鑷姩鍏抽棴 2.鑷姩鎵ц 3.浜哄伐澶勭悊 " prop="expirehandle">
-        <el-input
-          v-model="queryParams.expirehandle"
-          placeholder="璇疯緭鍏� 杩囨湡澶勭悊;1.鑷姩鍏抽棴 2.鑷姩鎵ц 3.浜哄伐澶勭悊 "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" 鑷姩缁撴;0.鍚� 1.鏄� " prop="autofinsh">
-        <el-input
-          v-model="queryParams.autofinsh"
-          placeholder="璇疯緭鍏� 鑷姩缁撴;0.鍚� 1.鏄� "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" 鍩虹嚎鏃堕棿;1.鍔犲叆鍚� 2.鍑洪櫌鍚� 3.灏辫瘖鍚� 4.鍏ラ櫌鍚� 5.鎵嬫湳鍓� 6.鎵嬫湳鍚� 7.寮�鑽墠 8.妫�楠岀敵璇峰悗 9.妫�楠屽畬鎴愬悗 10.妫�鏌ョ敵璇峰悗 11.妫�鏌ュ畬鎴愬悗 12.浜嬩欢鍙戠敓鍚� 13.鍩虹嚎鏃ユ湡鍚� " prop="baselinetime">
-        <el-input
-          v-model="queryParams.baselinetime"
-          placeholder="璇疯緭鍏� 鍩虹嚎鏃堕棿;1.鍔犲叆鍚� 2.鍑洪櫌鍚� 3.灏辫瘖鍚� 4.鍏ラ櫌鍚� 5.鎵嬫湳鍓� 6.鎵嬫湳鍚� 7.寮�鑽墠 8.妫�楠岀敵璇峰悗 9.妫�楠屽畬鎴愬悗 10.妫�鏌ョ敵璇峰悗 11.妫�鏌ュ畬鎴愬悗 12.浜嬩欢鍙戠敓鍚� 13.鍩虹嚎鏃ユ湡鍚� "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" 瑙﹀彂鏉′欢;0.鏃� 1.鏈� " prop="triggerornot">
-        <el-input
-          v-model="queryParams.triggerornot"
-          placeholder="璇疯緭鍏� 瑙﹀彂鏉′欢;0.鏃� 1.鏈� "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+      <el-form-item label=" 瑙﹀彂鏉′欢 " prop="triggerornot">
+        <el-input v-model="queryParams.triggerornot" placeholder="璇疯緭鍏� 瑙﹀彂鏉′欢;0.鏃� 1.鏈� " clearable
+          @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label=" 鏄惁鍚敤 " prop="isenable">
-        <el-input
-          v-model="queryParams.isenable"
-          placeholder="璇疯緭鍏� 鏄惁鍚敤 "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.isenable" placeholder="璇疯緭鍏� 鏄惁鍚敤 " clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label=" 鏈烘瀯ID " prop="orgid">
-        <el-input
-          v-model="queryParams.orgid"
-          placeholder="璇疯緭鍏� 鏈烘瀯ID "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.orgid" placeholder="璇疯緭鍏� 鏈烘瀯ID " clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item label=" 涓婁紶鏍囪 " prop="isupload">
-        <el-input
-          v-model="queryParams.isupload"
-          placeholder="璇疯緭鍏� 涓婁紶鏍囪 "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+
+      <el-form-item label=" 鐘舵�� " prop="state">
+        <el-input v-model="queryParams.state" placeholder="璇疯緭鍏� 鐘舵�� " clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item label=" 涓婁紶鏃堕棿 " prop="uploadTime">
-        <el-date-picker clearable
-          v-model="queryParams.uploadTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="璇烽�夋嫨 涓婁紶鏃堕棿 ">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label=" 鐘舵��;0鏈紑鍚紝1宸插紑鍚紝2鍏抽棴 " prop="state">
-        <el-input
-          v-model="queryParams.state"
-          placeholder="璇疯緭鍏� 鐘舵��;0鏈紑鍚紝1宸插紑鍚紝2鍏抽棴 "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" 寮�鍚汉 " prop="openBy">
-        <el-input
-          v-model="queryParams.openBy"
-          placeholder="璇疯緭鍏� 寮�鍚汉 "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" 寮�鍚椂闂� " prop="openTime">
-        <el-date-picker clearable
-          v-model="queryParams.openTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="璇烽�夋嫨 寮�鍚椂闂� ">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label=" 涓績搴撲唬鐮� " prop="centerlibrarycode">
-        <el-input
-          v-model="queryParams.centerlibrarycode"
-          placeholder="璇疯緭鍏� 涓績搴撲唬鐮� "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" 鏄惁鏈湴 " prop="islocal">
-        <el-input
-          v-model="queryParams.islocal"
-          placeholder="璇疯緭鍏� 鏄惁鏈湴 "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" 鏄惁閫氱敤;0.鍚� 1.鏄� " prop="iscurrency">
-        <el-input
-          v-model="queryParams.iscurrency"
-          placeholder="璇疯緭鍏� 鏄惁閫氱敤;0.鍚� 1.鏄� "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+
+      <el-form-item label=" 鏄惁閫氱敤 " prop="iscurrency">
+        <el-input v-model="queryParams.iscurrency" placeholder="璇疯緭鍏� 鏄惁閫氱敤 " clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
@@ -201,46 +41,20 @@
 
     <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="['smartor:schemelibrary:add']"
-        >鏂板</el-button>
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+          v-hasPermi="['smartor:schemelibrary:add']">鏂板</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['smartor:schemelibrary:edit']"
-        >淇敼</el-button>
+        <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
+          v-hasPermi="['smartor:schemelibrary:edit']">淇敼</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['smartor:schemelibrary:remove']"
-        >鍒犻櫎</el-button>
+        <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
+          v-hasPermi="['smartor:schemelibrary:remove']">鍒犻櫎</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['smartor:schemelibrary:export']"
-        >瀵煎嚭</el-button>
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
+          v-hasPermi="['smartor:schemelibrary:export']">瀵煎嚭</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
@@ -255,16 +69,16 @@
       <el-table-column label=" 鐗堟湰 " align="center" prop="version" />
       <el-table-column label=" 鏂规浠g爜 " align="center" prop="schemecode" />
       <el-table-column label=" 涓績搴揑D " align="center" prop="centerlibraryid" />
-      <el-table-column label=" 鎮h�呮潵婧�;1.鍑洪櫌 2.鍦ㄩ櫌 3.闂ㄨ瘖 4.浣撴 5.鏃� " align="center" prop="patientsource" />
-      <el-table-column label=" 鎵�灞炵瀹D;澶氫釜绉戝閫楀彿闅斿紑 " align="center" prop="belongdeptid" />
-      <el-table-column label=" 绉戝瑙勫垯;0.涓嶅寘鍚� 1.鍖呭惈 " align="center" prop="ruledept" />
-      <el-table-column label=" 鎵�灞炵梾鍖篒D;澶氫釜鐥呭尯閫楀彿闅斿紑 " align="center" prop="belongwardid" />
-      <el-table-column label=" 鐥呭尯瑙勫垯;0.涓嶅寘鍚� 1.鍖呭惈 " align="center" prop="ruleward" />
-      <el-table-column label=" 閲嶅澶勭悊;1.鏂拌鍒掕嚜鍔ㄧ粨妗� 2.鍘熻鍒掕嚜鍔ㄧ粨妗� " align="center" prop="repeathandle" />
-      <el-table-column label=" 杩囨湡澶勭悊;1.鑷姩鍏抽棴 2.鑷姩鎵ц 3.浜哄伐澶勭悊 " align="center" prop="expirehandle" />
-      <el-table-column label=" 鑷姩缁撴;0.鍚� 1.鏄� " align="center" prop="autofinsh" />
-      <el-table-column label=" 鍩虹嚎鏃堕棿;1.鍔犲叆鍚� 2.鍑洪櫌鍚� 3.灏辫瘖鍚� 4.鍏ラ櫌鍚� 5.鎵嬫湳鍓� 6.鎵嬫湳鍚� 7.寮�鑽墠 8.妫�楠岀敵璇峰悗 9.妫�楠屽畬鎴愬悗 10.妫�鏌ョ敵璇峰悗 11.妫�鏌ュ畬鎴愬悗 12.浜嬩欢鍙戠敓鍚� 13.鍩虹嚎鏃ユ湡鍚� " align="center" prop="baselinetime" />
-      <el-table-column label=" 瑙﹀彂鏉′欢;0.鏃� 1.鏈� " align="center" prop="triggerornot" />
+      <el-table-column label=" 鎮h�呮潵婧� " align="center" prop="patientsource" />
+      <el-table-column label=" 鎵�灞炵瀹� " align="center" prop="belongdeptid" />
+      <el-table-column label=" 绉戝瑙勫垯 " align="center" prop="ruledept" />
+      <el-table-column label=" 鎵�灞炵梾鍖� " align="center" prop="belongwardid" />
+      <el-table-column label=" 鐥呭尯瑙勫垯 " align="center" prop="ruleward" />
+      <el-table-column label=" 閲嶅澶勭悊 " align="center" prop="repeathandle" />
+      <el-table-column label=" 杩囨湡澶勭悊 " align="center" prop="expirehandle" />
+      <el-table-column label=" 鑷姩缁撴 " align="center" prop="autofinsh" />
+      <el-table-column label=" 鍩虹嚎鏃堕棿 " align="center" prop="baselinetime" />
+      <el-table-column label=" 瑙﹀彂鏉′欢 " align="center" prop="triggerornot" />
       <el-table-column label=" 鏄惁鍚敤 " align="center" prop="isenable" />
       <el-table-column label=" 鏈烘瀯ID " align="center" prop="orgid" />
       <el-table-column label=" 涓婁紶鏍囪 " align="center" prop="isupload" />
@@ -273,7 +87,7 @@
           <span>{{ parseTime(scope.row.uploadTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label=" 鐘舵��;0鏈紑鍚紝1宸插紑鍚紝2鍏抽棴 " align="center" prop="state" />
+      <el-table-column label=" 鐘舵�� " align="center" prop="state" />
       <el-table-column label=" 寮�鍚汉 " align="center" prop="openBy" />
       <el-table-column label=" 寮�鍚椂闂� " align="center" prop="openTime" width="180">
         <template slot-scope="scope">
@@ -282,132 +96,141 @@
       </el-table-column>
       <el-table-column label=" 涓績搴撲唬鐮� " align="center" prop="centerlibrarycode" />
       <el-table-column label=" 鏄惁鏈湴 " align="center" prop="islocal" />
-      <el-table-column label=" 鏄惁閫氱敤;0.鍚� 1.鏄� " align="center" prop="iscurrency" />
+      <el-table-column label=" 鏄惁閫氱敤 " align="center" prop="iscurrency" />
       <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="handleUpdate(scope.row)"
-            v-hasPermi="['smartor:schemelibrary:edit']"
-          >淇敼</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['smartor:schemelibrary:remove']"
-          >鍒犻櫎</el-button>
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+            v-hasPermi="['smartor:schemelibrary:edit']">淇敼</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+            v-hasPermi="['smartor:schemelibrary:remove']">鍒犻櫎</el-button>
         </template>
       </el-table-column>
     </el-table>
-    
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
+
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+      @pagination="getList" />
 
     <!-- 娣诲姞鎴栦慨鏀规湇鍔℃柟妗堝簱瀵硅瘽妗� -->
-    <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=" 鏂规鍒嗙被ID " prop="schemecategoryid">
-          <el-input v-model="form.schemecategoryid" placeholder="璇疯緭鍏� 鏂规鍒嗙被ID " />
-        </el-form-item>
-        <el-form-item label=" 鏂规鍚嶇О " prop="schemename">
-          <el-input v-model="form.schemename" placeholder="璇疯緭鍏� 鏂规鍚嶇О " />
-        </el-form-item>
-        <el-form-item label=" 鏂规鎻忚堪 " prop="description">
-          <el-input v-model="form.description" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" />
-        </el-form-item>
-        <el-form-item label=" 妯℃澘ID " prop="templateid">
-          <el-input v-model="form.templateid" placeholder="璇疯緭鍏� 妯℃澘ID " />
-        </el-form-item>
-        <el-form-item label=" 鐗堟湰 " prop="version">
-          <el-input v-model="form.version" placeholder="璇疯緭鍏� 鐗堟湰 " />
-        </el-form-item>
-        <el-form-item label=" 鏂规浠g爜 " prop="schemecode">
-          <el-input v-model="form.schemecode" placeholder="璇疯緭鍏� 鏂规浠g爜 " />
-        </el-form-item>
-        <el-form-item label=" 涓績搴揑D " prop="centerlibraryid">
-          <el-input v-model="form.centerlibraryid" placeholder="璇疯緭鍏� 涓績搴揑D " />
-        </el-form-item>
-        <el-form-item label=" 鎮h�呮潵婧�;1.鍑洪櫌 2.鍦ㄩ櫌 3.闂ㄨ瘖 4.浣撴 5.鏃� " prop="patientsource">
-          <el-input v-model="form.patientsource" placeholder="璇疯緭鍏� 鎮h�呮潵婧�;1.鍑洪櫌 2.鍦ㄩ櫌 3.闂ㄨ瘖 4.浣撴 5.鏃� " />
-        </el-form-item>
-        <el-form-item label=" 鎵�灞炵瀹D;澶氫釜绉戝閫楀彿闅斿紑 " prop="belongdeptid">
-          <el-input v-model="form.belongdeptid" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" />
-        </el-form-item>
-        <el-form-item label=" 绉戝瑙勫垯;0.涓嶅寘鍚� 1.鍖呭惈 " prop="ruledept">
-          <el-input v-model="form.ruledept" placeholder="璇疯緭鍏� 绉戝瑙勫垯;0.涓嶅寘鍚� 1.鍖呭惈 " />
-        </el-form-item>
-        <el-form-item label=" 鎵�灞炵梾鍖篒D;澶氫釜鐥呭尯閫楀彿闅斿紑 " prop="belongwardid">
-          <el-input v-model="form.belongwardid" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" />
-        </el-form-item>
-        <el-form-item label=" 鐥呭尯瑙勫垯;0.涓嶅寘鍚� 1.鍖呭惈 " prop="ruleward">
-          <el-input v-model="form.ruleward" placeholder="璇疯緭鍏� 鐥呭尯瑙勫垯;0.涓嶅寘鍚� 1.鍖呭惈 " />
-        </el-form-item>
-        <el-form-item label=" 閲嶅澶勭悊;1.鏂拌鍒掕嚜鍔ㄧ粨妗� 2.鍘熻鍒掕嚜鍔ㄧ粨妗� " prop="repeathandle">
-          <el-input v-model="form.repeathandle" placeholder="璇疯緭鍏� 閲嶅澶勭悊;1.鏂拌鍒掕嚜鍔ㄧ粨妗� 2.鍘熻鍒掕嚜鍔ㄧ粨妗� " />
-        </el-form-item>
-        <el-form-item label=" 杩囨湡澶勭悊;1.鑷姩鍏抽棴 2.鑷姩鎵ц 3.浜哄伐澶勭悊 " prop="expirehandle">
-          <el-input v-model="form.expirehandle" placeholder="璇疯緭鍏� 杩囨湡澶勭悊;1.鑷姩鍏抽棴 2.鑷姩鎵ц 3.浜哄伐澶勭悊 " />
-        </el-form-item>
-        <el-form-item label=" 鑷姩缁撴;0.鍚� 1.鏄� " prop="autofinsh">
-          <el-input v-model="form.autofinsh" placeholder="璇疯緭鍏� 鑷姩缁撴;0.鍚� 1.鏄� " />
-        </el-form-item>
-        <el-form-item label=" 鍩虹嚎鏃堕棿;1.鍔犲叆鍚� 2.鍑洪櫌鍚� 3.灏辫瘖鍚� 4.鍏ラ櫌鍚� 5.鎵嬫湳鍓� 6.鎵嬫湳鍚� 7.寮�鑽墠 8.妫�楠岀敵璇峰悗 9.妫�楠屽畬鎴愬悗 10.妫�鏌ョ敵璇峰悗 11.妫�鏌ュ畬鎴愬悗 12.浜嬩欢鍙戠敓鍚� 13.鍩虹嚎鏃ユ湡鍚� " prop="baselinetime">
-          <el-input v-model="form.baselinetime" placeholder="璇疯緭鍏� 鍩虹嚎鏃堕棿;1.鍔犲叆鍚� 2.鍑洪櫌鍚� 3.灏辫瘖鍚� 4.鍏ラ櫌鍚� 5.鎵嬫湳鍓� 6.鎵嬫湳鍚� 7.寮�鑽墠 8.妫�楠岀敵璇峰悗 9.妫�楠屽畬鎴愬悗 10.妫�鏌ョ敵璇峰悗 11.妫�鏌ュ畬鎴愬悗 12.浜嬩欢鍙戠敓鍚� 13.鍩虹嚎鏃ユ湡鍚� " />
-        </el-form-item>
-        <el-form-item label=" 瑙﹀彂鏉′欢;0.鏃� 1.鏈� " prop="triggerornot">
-          <el-input v-model="form.triggerornot" placeholder="璇疯緭鍏� 瑙﹀彂鏉′欢;0.鏃� 1.鏈� " />
-        </el-form-item>
-        <el-form-item label=" 鏄惁鍚敤 " prop="isenable">
-          <el-input v-model="form.isenable" placeholder="璇疯緭鍏� 鏄惁鍚敤 " />
-        </el-form-item>
-        <el-form-item label=" 鏈烘瀯ID " prop="orgid">
-          <el-input v-model="form.orgid" placeholder="璇疯緭鍏� 鏈烘瀯ID " />
-        </el-form-item>
-        <el-form-item label=" 鍒犻櫎鏍囪 " prop="delFlag">
-          <el-input v-model="form.delFlag" placeholder="璇疯緭鍏� 鍒犻櫎鏍囪 " />
-        </el-form-item>
-        <el-form-item label=" 涓婁紶鏍囪 " prop="isupload">
-          <el-input v-model="form.isupload" placeholder="璇疯緭鍏� 涓婁紶鏍囪 " />
-        </el-form-item>
-        <el-form-item label=" 涓婁紶鏃堕棿 " prop="uploadTime">
-          <el-date-picker clearable
-            v-model="form.uploadTime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="璇烽�夋嫨 涓婁紶鏃堕棿 ">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label=" 鐘舵��;0鏈紑鍚紝1宸插紑鍚紝2鍏抽棴 " prop="state">
-          <el-input v-model="form.state" placeholder="璇疯緭鍏� 鐘舵��;0鏈紑鍚紝1宸插紑鍚紝2鍏抽棴 " />
-        </el-form-item>
-        <el-form-item label=" 寮�鍚汉 " prop="openBy">
-          <el-input v-model="form.openBy" placeholder="璇疯緭鍏� 寮�鍚汉 " />
-        </el-form-item>
-        <el-form-item label=" 寮�鍚椂闂� " prop="openTime">
-          <el-date-picker clearable
-            v-model="form.openTime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="璇烽�夋嫨 寮�鍚椂闂� ">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label=" 涓績搴撲唬鐮� " prop="centerlibrarycode">
-          <el-input v-model="form.centerlibrarycode" placeholder="璇疯緭鍏� 涓績搴撲唬鐮� " />
-        </el-form-item>
-        <el-form-item label=" 鏄惁鏈湴 " prop="islocal">
-          <el-input v-model="form.islocal" placeholder="璇疯緭鍏� 鏄惁鏈湴 " />
-        </el-form-item>
-        <el-form-item label=" 鏄惁閫氱敤;0.鍚� 1.鏄� " prop="iscurrency">
-          <el-input v-model="form.iscurrency" placeholder="璇疯緭鍏� 鏄惁閫氱敤;0.鍚� 1.鏄� " />
-        </el-form-item>
+    <el-dialog :title="title" :visible.sync="open" :showclose="true" :close-on-click-modal="false" :inline="true"
+      width="1000px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+        <el-row>
+          <el-col :span="12"><el-form-item label=" 鏂规鍒嗙被ID " prop="schemecategoryid">
+              <el-input v-model="form.schemecategoryid" placeholder="璇疯緭鍏� 鏂规鍒嗙被ID " />
+            </el-form-item></el-col>
+          <el-col :span="12"><el-form-item label=" 鏂规鍚嶇О " prop="schemename">
+              <el-input v-model="form.schemename" placeholder="璇疯緭鍏� 鏂规鍚嶇О " />
+            </el-form-item></el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12"><el-form-item label=" 鏂规鎻忚堪 " prop="description">
+              <el-input v-model="form.description" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" />
+            </el-form-item></el-col>
+          <el-col :span="12"><el-form-item label=" 妯℃澘ID " prop="templateid">
+              <el-input v-model="form.templateid" placeholder="璇疯緭鍏� 妯℃澘ID " />
+            </el-form-item></el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12"><el-form-item label=" 鐗堟湰 " prop="version">
+              <el-input v-model="form.version" placeholder="璇疯緭鍏� 鐗堟湰 " />
+            </el-form-item></el-col>
+          <el-col :span="12"><el-form-item label=" 鏂规浠g爜 " prop="schemecode">
+              <el-input v-model="form.schemecode" placeholder="璇疯緭鍏� 鏂规浠g爜 " />
+            </el-form-item></el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12"><el-form-item label=" 涓績搴揑D " prop="centerlibraryid">
+              <el-input v-model="form.centerlibraryid" placeholder="璇疯緭鍏� 涓績搴揑D " />
+            </el-form-item></el-col>
+          <el-col :span="12"> <el-form-item label=" 鎮h�呮潵婧� " prop="patientsource">
+              <el-input v-model="form.patientsource" placeholder="璇疯緭鍏� 鎮h�呮潵婧�;1.鍑洪櫌 2.鍦ㄩ櫌 3.闂ㄨ瘖 4.浣撴 5.鏃� " />
+            </el-form-item></el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12"><el-form-item label=" 鎵�灞炵瀹� " prop="belongdeptid">
+              <el-input v-model="form.belongdeptid" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" />
+            </el-form-item></el-col>
+          <el-col :span="12"><el-form-item label=" 绉戝瑙勫垯 " prop="ruledept">
+              <el-input v-model="form.ruledept" placeholder="璇疯緭鍏� 绉戝瑙勫垯;0.涓嶅寘鍚� 1.鍖呭惈 " />
+            </el-form-item></el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12"><el-form-item label=" 鎵�灞炵梾鍖� " prop="belongwardid">
+              <el-input v-model="form.belongwardid" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" />
+            </el-form-item></el-col>
+          <el-col :span="12"><el-form-item label=" 鐥呭尯瑙勫垯 " prop="ruleward">
+              <el-input v-model="form.ruleward" placeholder="璇疯緭鍏� 鐥呭尯瑙勫垯;0.涓嶅寘鍚� 1.鍖呭惈 " />
+            </el-form-item></el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12"><el-form-item label=" 閲嶅澶勭悊 " prop="repeathandle">
+              <el-input v-model="form.repeathandle" placeholder="璇疯緭鍏� 閲嶅澶勭悊;1.鏂拌鍒掕嚜鍔ㄧ粨妗� 2.鍘熻鍒掕嚜鍔ㄧ粨妗� " />
+            </el-form-item></el-col>
+          <el-col :span="12"><el-form-item label=" 杩囨湡澶勭悊 " prop="expirehandle">
+              <el-input v-model="form.expirehandle" placeholder="璇疯緭鍏� 杩囨湡澶勭悊;1.鑷姩鍏抽棴 2.鑷姩鎵ц 3.浜哄伐澶勭悊 " />
+            </el-form-item></el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12"><el-form-item label=" 鑷姩缁撴 " prop="autofinsh">
+              <el-input v-model="form.autofinsh" placeholder="璇疯緭鍏� 鑷姩缁撴;0.鍚� 1.鏄� " />
+            </el-form-item></el-col>
+          <el-col :span="12"><el-form-item label=" 鍩虹嚎鏃堕棿 " prop="baselinetime">
+              <el-input v-model="form.baselinetime"
+                placeholder="璇疯緭鍏� 鍩虹嚎鏃堕棿;1.鍔犲叆鍚� 2.鍑洪櫌鍚� 3.灏辫瘖鍚� 4.鍏ラ櫌鍚� 5.鎵嬫湳鍓� 6.鎵嬫湳鍚� 7.寮�鑽墠 8.妫�楠岀敵璇峰悗 9.妫�楠屽畬鎴愬悗 10.妫�鏌ョ敵璇峰悗 11.妫�鏌ュ畬鎴愬悗 12.浜嬩欢鍙戠敓鍚� 13.鍩虹嚎鏃ユ湡鍚� " />
+            </el-form-item></el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12"><el-form-item label=" 瑙﹀彂鏉′欢 " prop="triggerornot">
+              <el-input v-model="form.triggerornot" placeholder="璇疯緭鍏� 瑙﹀彂鏉′欢;0.鏃� 1.鏈� " />
+            </el-form-item></el-col>
+          <el-col :span="12"><el-form-item label=" 鏄惁鍚敤 " prop="isenable">
+              <el-input v-model="form.isenable" placeholder="璇疯緭鍏� 鏄惁鍚敤 " />
+            </el-form-item></el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12"><el-form-item label=" 鏈烘瀯ID " prop="orgid">
+              <el-input v-model="form.orgid" placeholder="璇疯緭鍏� 鏈烘瀯ID " />
+            </el-form-item></el-col>
+          <el-col :span="12"><el-form-item label=" 鍒犻櫎鏍囪 " prop="delFlag">
+              <el-input v-model="form.delFlag" placeholder="璇疯緭鍏� 鍒犻櫎鏍囪 " />
+            </el-form-item></el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12"><el-form-item label=" 涓婁紶鏍囪 " prop="isupload">
+              <el-input v-model="form.isupload" placeholder="璇疯緭鍏� 涓婁紶鏍囪 " />
+            </el-form-item></el-col>
+          <el-col :span="12"><el-form-item label=" 涓婁紶鏃堕棿 " prop="uploadTime">
+              <el-date-picker clearable v-model="form.uploadTime" type="date" value-format="yyyy-MM-dd"
+                placeholder="璇烽�夋嫨 涓婁紶鏃堕棿 ">
+              </el-date-picker>
+            </el-form-item></el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12"><el-form-item label=" 鐘舵�� " prop="state">
+              <el-input v-model="form.state" placeholder="璇疯緭鍏� 鐘舵��;0鏈紑鍚�,1宸插紑鍚�,2鍏抽棴 " />
+            </el-form-item></el-col>
+          <el-col :span="12"><el-form-item label=" 寮�鍚汉 " prop="openBy">
+              <el-input v-model="form.openBy" placeholder="璇疯緭鍏� 寮�鍚汉 " />
+            </el-form-item></el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12"><el-form-item label=" 寮�鍚椂闂� " prop="openTime">
+              <el-date-picker clearable v-model="form.openTime" type="date" value-format="yyyy-MM-dd"
+                placeholder="璇烽�夋嫨 寮�鍚椂闂� ">
+              </el-date-picker>
+            </el-form-item></el-col>
+          <el-col :span="12"><el-form-item label=" 涓績搴撲唬鐮� " prop="centerlibrarycode">
+              <el-input v-model="form.centerlibrarycode" placeholder="璇疯緭鍏� 涓績搴撲唬鐮� " />
+            </el-form-item></el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12"><el-form-item label=" 鏄惁鏈湴 " prop="islocal">
+              <el-input v-model="form.islocal" placeholder="璇疯緭鍏� 鏄惁鏈湴 " />
+            </el-form-item></el-col>
+          <el-col :span="12"><el-form-item label=" 鏄惁閫氱敤 " prop="iscurrency">
+              <el-input v-model="form.iscurrency" placeholder="璇疯緭鍏� 鏄惁閫氱敤;0.鍚� 1.鏄� " />
+            </el-form-item></el-col>
+        </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
@@ -557,7 +380,7 @@
     // 澶氶�夋閫変腑鏁版嵁
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
     /** 鏂板鎸夐挳鎿嶄綔 */
@@ -599,12 +422,12 @@
     /** 鍒犻櫎鎸夐挳鎿嶄綔 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('鏄惁纭鍒犻櫎鏈嶅姟鏂规搴撶紪鍙蜂负"' + ids + '"鐨勬暟鎹」锛�').then(function() {
+      this.$modal.confirm('鏄惁纭鍒犻櫎鏈嶅姟鏂规搴撶紪鍙蜂负"' + ids + '"鐨勬暟鎹」锛�').then(function () {
         return delSchemelibrary(ids);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
-      }).catch(() => {});
+      }).catch(() => { });
     },
     /** 瀵煎嚭鎸夐挳鎿嶄綔 */
     handleExport() {
diff --git a/ruoyi-ui/src/views/smartor/schemeplan/index.vue b/ruoyi-ui/src/views/smartor/schemeplan/index.vue
index 48ee8e5..af8e598 100644
--- a/ruoyi-ui/src/views/smartor/schemeplan/index.vue
+++ b/ruoyi-ui/src/views/smartor/schemeplan/index.vue
@@ -2,108 +2,24 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label=" 鏂规ID " prop="schemeid">
-        <el-input
-          v-model="queryParams.schemeid"
-          placeholder="璇疯緭鍏� 鏂规ID "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.schemeid" placeholder="璇疯緭鍏� 鏂规ID " clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label=" 鏂规浠g爜 " prop="schemecode">
-        <el-input
-          v-model="queryParams.schemecode"
-          placeholder="璇疯緭鍏� 鏂规浠g爜 "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.schemecode" placeholder="璇疯緭鍏� 鏂规浠g爜 " clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label=" 鎮h�匢D " prop="patientid">
-        <el-input
-          v-model="queryParams.patientid"
-          placeholder="璇疯緭鍏� 鎮h�匢D "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.patientid" placeholder="璇疯緭鍏� 鎮h�匢D " clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item label=" 瀵瑰簲璁板綍娴佹按鍙� " prop="serialnum">
-        <el-input
-          v-model="queryParams.serialnum"
-          placeholder="璇疯緭鍏� 瀵瑰簲璁板綍娴佹按鍙� "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" 灏辫瘖ID " prop="visitid">
-        <el-input
-          v-model="queryParams.visitid"
-          placeholder="璇疯緭鍏� 灏辫瘖ID "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" 鐘舵��;0.寰呭紑濮� 1.杩涜涓� 9.宸茬粨妗� " prop="state">
-        <el-input
-          v-model="queryParams.state"
-          placeholder="璇疯緭鍏� 鐘舵��;0.寰呭紑濮� 1.杩涜涓� 9.宸茬粨妗� "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" 缁撴鏃堕棿 " prop="finshtime">
-        <el-date-picker clearable
-          v-model="queryParams.finshtime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="璇烽�夋嫨 缁撴鏃堕棿 ">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label=" 鎮h�呮潵婧�;0.鍏ㄩ櫌(閫氱敤) 1.鍑洪櫌 2.鍦ㄩ櫌 3.闂ㄨ瘖 4.浣撴 5.鏃� " prop="patientsource">
-        <el-input
-          v-model="queryParams.patientsource"
-          placeholder="璇疯緭鍏� 鎮h�呮潵婧�;0.鍏ㄩ櫌(閫氱敤) 1.鍑洪櫌 2.鍦ㄩ櫌 3.闂ㄨ瘖 4.浣撴 5.鏃� "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+      <el-form-item label=" 鐘舵�� " prop="state">
+        <el-input v-model="queryParams.state" placeholder="璇疯緭鍏� 鐘舵�� " clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label=" 鍩虹嚎鏃堕棿 " prop="basetime">
-        <el-date-picker clearable
-          v-model="queryParams.basetime"
-          type="date"
-          value-format="yyyy-MM-dd"
+        <el-date-picker clearable v-model="queryParams.basetime" type="date" value-format="yyyy-MM-dd"
           placeholder="璇烽�夋嫨 鍩虹嚎鏃堕棿 ">
         </el-date-picker>
       </el-form-item>
       <el-form-item label=" 鏈烘瀯ID " prop="orgid">
-        <el-input
-          v-model="queryParams.orgid"
-          placeholder="璇疯緭鍏� 鏈烘瀯ID "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" 鍏宠仈琛↖D " prop="relationid">
-        <el-input
-          v-model="queryParams.relationid"
-          placeholder="璇疯緭鍏� 鍏宠仈琛↖D "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" 涓婁紶鏍囪 " prop="isupload">
-        <el-input
-          v-model="queryParams.isupload"
-          placeholder="璇疯緭鍏� 涓婁紶鏍囪 "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" 涓婁紶鏃堕棿 " prop="uploadTime">
-        <el-date-picker clearable
-          v-model="queryParams.uploadTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="璇烽�夋嫨 涓婁紶鏃堕棿 ">
-        </el-date-picker>
+        <el-input v-model="queryParams.orgid" placeholder="璇疯緭鍏� 鏈烘瀯ID " clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
@@ -113,67 +29,38 @@
 
     <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="['smartor:schemeplan:add']"
-        >鏂板</el-button>
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+          v-hasPermi="['smartor:schemeplan:add']">鏂板</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['smartor:schemeplan:edit']"
-        >淇敼</el-button>
+        <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
+          v-hasPermi="['smartor:schemeplan:edit']">淇敼</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['smartor:schemeplan:remove']"
-        >鍒犻櫎</el-button>
+        <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
+          v-hasPermi="['smartor:schemeplan:remove']">鍒犻櫎</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['smartor:schemeplan:export']"
-        >瀵煎嚭</el-button>
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
+          v-hasPermi="['smartor:schemeplan:export']">瀵煎嚭</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="schemeplanList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label=" 鑷ID " align="center" prop="id" />
       <el-table-column label=" 鏂规ID " align="center" prop="schemeid" />
       <el-table-column label=" 鏂规浠g爜 " align="center" prop="schemecode" />
       <el-table-column label=" 鎮h�匢D " align="center" prop="patientid" />
-      <el-table-column label=" 瀵瑰簲璁板綍娴佹按鍙� " align="center" prop="serialnum" />
       <el-table-column label=" 灏辫瘖ID " align="center" prop="visitid" />
       <el-table-column label=" 灏辫瘖绫诲瀷 " align="center" prop="visittype" />
-      <el-table-column label=" 鐘舵��;0.寰呭紑濮� 1.杩涜涓� 9.宸茬粨妗� " align="center" prop="state" />
+      <el-table-column label=" 鐘舵�� " align="center" prop="state" />
       <el-table-column label=" 缁撴鏃堕棿 " align="center" prop="finshtime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.finshtime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label=" 鏉ユ簮绫诲瀷;1.鑷姩鐢熸垚 2.鎵嬪姩鍖归厤 3.鎵嬪姩娣诲姞 3.鎵归噺瀵煎叆 " align="center" prop="sourcetype" />
-      <el-table-column label=" 鎮h�呮潵婧�;0.鍏ㄩ櫌(閫氱敤) 1.鍑洪櫌 2.鍦ㄩ櫌 3.闂ㄨ瘖 4.浣撴 5.鏃� " align="center" prop="patientsource" />
+      <el-table-column label=" 鏉ユ簮绫诲瀷 " align="center" prop="sourcetype" />
       <el-table-column label=" 缁撴绫诲瀷 " align="center" prop="finshtype" />
       <el-table-column label=" 缁撴璇存槑 " align="center" prop="finshdesc" />
       <el-table-column label=" 鍩虹嚎鏃堕棿 " align="center" prop="basetime" width="180">
@@ -182,104 +69,71 @@
         </template>
       </el-table-column>
       <el-table-column label=" 鏈烘瀯ID " align="center" prop="orgid" />
-      <el-table-column label=" 鍏宠仈琛↖D " align="center" prop="relationid" />
-      <el-table-column label=" 涓婁紶鏍囪 " align="center" prop="isupload" />
-      <el-table-column label=" 涓婁紶鏃堕棿 " align="center" prop="uploadTime" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.uploadTime, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
       <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="handleUpdate(scope.row)"
-            v-hasPermi="['smartor:schemeplan:edit']"
-          >淇敼</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['smartor:schemeplan:remove']"
-          >鍒犻櫎</el-button>
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+            v-hasPermi="['smartor:schemeplan:edit']">淇敼</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+            v-hasPermi="['smartor:schemeplan:remove']">鍒犻櫎</el-button>
         </template>
       </el-table-column>
     </el-table>
-    
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
+
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+      @pagination="getList" />
 
     <!-- 娣诲姞鎴栦慨鏀圭鐞嗚鍒掑璇濇 -->
-    <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=" 鏂规ID " prop="schemeid">
-          <el-input v-model="form.schemeid" placeholder="璇疯緭鍏� 鏂规ID " />
-        </el-form-item>
-        <el-form-item label=" 鏂规浠g爜 " prop="schemecode">
-          <el-input v-model="form.schemecode" placeholder="璇疯緭鍏� 鏂规浠g爜 " />
-        </el-form-item>
-        <el-form-item label=" 鎮h�匢D " prop="patientid">
-          <el-input v-model="form.patientid" placeholder="璇疯緭鍏� 鎮h�匢D " />
-        </el-form-item>
-        <el-form-item label=" 瀵瑰簲璁板綍娴佹按鍙� " prop="serialnum">
-          <el-input v-model="form.serialnum" placeholder="璇疯緭鍏� 瀵瑰簲璁板綍娴佹按鍙� " />
-        </el-form-item>
-        <el-form-item label=" 灏辫瘖ID " prop="visitid">
-          <el-input v-model="form.visitid" placeholder="璇疯緭鍏� 灏辫瘖ID " />
-        </el-form-item>
-        <el-form-item label=" 鐘舵��;0.寰呭紑濮� 1.杩涜涓� 9.宸茬粨妗� " prop="state">
-          <el-input v-model="form.state" placeholder="璇疯緭鍏� 鐘舵��;0.寰呭紑濮� 1.杩涜涓� 9.宸茬粨妗� " />
-        </el-form-item>
-        <el-form-item label=" 缁撴鏃堕棿 " prop="finshtime">
-          <el-date-picker clearable
-            v-model="form.finshtime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="璇烽�夋嫨 缁撴鏃堕棿 ">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label=" 鎮h�呮潵婧�;0.鍏ㄩ櫌(閫氱敤) 1.鍑洪櫌 2.鍦ㄩ櫌 3.闂ㄨ瘖 4.浣撴 5.鏃� " prop="patientsource">
-          <el-input v-model="form.patientsource" placeholder="璇疯緭鍏� 鎮h�呮潵婧�;0.鍏ㄩ櫌(閫氱敤) 1.鍑洪櫌 2.鍦ㄩ櫌 3.闂ㄨ瘖 4.浣撴 5.鏃� " />
-        </el-form-item>
-        <el-form-item label=" 缁撴璇存槑 " prop="finshdesc">
-          <el-input v-model="form.finshdesc" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" />
-        </el-form-item>
-        <el-form-item label=" 鍩虹嚎鏃堕棿 " prop="basetime">
-          <el-date-picker clearable
-            v-model="form.basetime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="璇烽�夋嫨 鍩虹嚎鏃堕棿 ">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label=" 鏈烘瀯ID " prop="orgid">
-          <el-input v-model="form.orgid" placeholder="璇疯緭鍏� 鏈烘瀯ID " />
-        </el-form-item>
-        <el-form-item label=" 鍏宠仈琛↖D " prop="relationid">
-          <el-input v-model="form.relationid" placeholder="璇疯緭鍏� 鍏宠仈琛↖D " />
-        </el-form-item>
-        <el-form-item label=" 鍒犻櫎鏍囪 " prop="delFlag">
-          <el-input v-model="form.delFlag" placeholder="璇疯緭鍏� 鍒犻櫎鏍囪 " />
-        </el-form-item>
-        <el-form-item label=" 涓婁紶鏍囪 " prop="isupload">
-          <el-input v-model="form.isupload" placeholder="璇疯緭鍏� 涓婁紶鏍囪 " />
-        </el-form-item>
-        <el-form-item label=" 涓婁紶鏃堕棿 " prop="uploadTime">
-          <el-date-picker clearable
-            v-model="form.uploadTime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="璇烽�夋嫨 涓婁紶鏃堕棿 ">
-          </el-date-picker>
-        </el-form-item>
+    <el-dialog :title="title" :visible.sync="open" :showclose="true" :close-on-click-modal="false" :inline="true"
+      width="1000px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+        <el-row>
+          <el-col :span="12"> <el-form-item label=" 鏂规浠g爜 " prop="schemecode">
+              <el-input v-model="form.schemecode" placeholder="璇疯緭鍏� 鏂规浠g爜 " />
+            </el-form-item></el-col>
+          <el-col :span="12"><el-form-item label=" 鎮h�匢D " prop="patientid">
+              <el-input v-model="form.patientid" placeholder="璇疯緭鍏� 鎮h�匢D " />
+            </el-form-item></el-col>
+        </el-row><el-row>
+          <el-col :span="12"><el-form-item label=" 瀵瑰簲璁板綍娴佹按鍙� " prop="serialnum">
+              <el-input v-model="form.serialnum" placeholder="璇疯緭鍏� 瀵瑰簲璁板綍娴佹按鍙� " />
+            </el-form-item></el-col>
+          <el-col :span="12"><el-form-item label=" 灏辫瘖ID " prop="visitid">
+              <el-input v-model="form.visitid" placeholder="璇疯緭鍏� 灏辫瘖ID " />
+            </el-form-item></el-col>
+        </el-row><el-row>
+          <el-col :span="12"> <el-form-item label=" 鐘舵�� " prop="state">
+              <!--鐘舵��;0.寰呭紑濮� 1.杩涜涓� 9.宸茬粨妗�-->
+              <el-input v-model="form.state" placeholder="璇疯緭鍏� 鐘舵�� " />
+            </el-form-item></el-col>
+          <el-col :span="12"> <el-form-item label=" 缁撴鏃堕棿 " prop="finshtime">
+              <el-date-picker clearable v-model="form.finshtime" type="date" value-format="yyyy-MM-dd"
+                placeholder="璇烽�夋嫨 缁撴鏃堕棿 ">
+              </el-date-picker>
+            </el-form-item></el-col>
+        </el-row><el-row>
+          <!--鎮h�呮潵婧�:0.鍏ㄩ櫌(閫氱敤) 1.鍑洪櫌 2.鍦ㄩ櫌 3.闂ㄨ瘖 4.浣撴 5.鏃�-->
+          <el-col :span="12"><el-form-item label=" 鎮h�呮潵婧� " prop="patientsource">
+              <el-input v-model="form.patientsource" placeholder="璇疯緭鍏� 鎮h�呮潵婧� " />
+            </el-form-item></el-col>
+          <el-col :span="12"><el-form-item label=" 缁撴璇存槑 " prop="finshdesc">
+              <el-input v-model="form.finshdesc" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" />
+            </el-form-item></el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12"><el-form-item label=" 鍩虹嚎鏃堕棿 " prop="basetime">
+              <el-date-picker clearable v-model="form.basetime" type="date" value-format="yyyy-MM-dd"
+                placeholder="璇烽�夋嫨 鍩虹嚎鏃堕棿 ">
+              </el-date-picker>
+            </el-form-item></el-col>
+          <el-col :span="12"><el-form-item label=" 鏈烘瀯ID " prop="orgid">
+              <el-input v-model="form.orgid" placeholder="璇疯緭鍏� 鏈烘瀯ID " />
+            </el-form-item></el-col>
+        </el-row><el-row>
+          <el-col :span="12"><el-form-item label=" 鍒犻櫎鏍囪 " prop="delFlag">
+              <el-input v-model="form.delFlag" placeholder="璇疯緭鍏� 鍒犻櫎鏍囪 " />
+            </el-form-item></el-col>
+          <el-col :span="12"></el-col>
+        </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
@@ -409,7 +263,7 @@
     // 澶氶�夋閫変腑鏁版嵁
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
     /** 鏂板鎸夐挳鎿嶄綔 */
@@ -451,12 +305,12 @@
     /** 鍒犻櫎鎸夐挳鎿嶄綔 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('鏄惁纭鍒犻櫎绠$悊璁″垝缂栧彿涓�"' + ids + '"鐨勬暟鎹」锛�').then(function() {
+      this.$modal.confirm('鏄惁纭鍒犻櫎绠$悊璁″垝缂栧彿涓�"' + ids + '"鐨勬暟鎹」锛�').then(function () {
         return delSchemeplan(ids);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
-      }).catch(() => {});
+      }).catch(() => { });
     },
     /** 瀵煎嚭鎸夐挳鎿嶄綔 */
     handleExport() {
diff --git a/ruoyi-ui/src/views/smartor/schemetask/index.vue b/ruoyi-ui/src/views/smartor/schemetask/index.vue
index 4414c12..4a76231 100644
--- a/ruoyi-ui/src/views/smartor/schemetask/index.vue
+++ b/ruoyi-ui/src/views/smartor/schemetask/index.vue
@@ -1,318 +1,59 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label=" 鏂规ID " prop="schemeid">
-        <el-input
-          v-model="queryParams.schemeid"
-          placeholder="璇疯緭鍏� 鏂规ID "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" 璁″垝ID " prop="schemeplanid">
-        <el-input
-          v-model="queryParams.schemeplanid"
-          placeholder="璇疯緭鍏� 璁″垝ID "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item label=" 鎮h�匢D " prop="patientid">
-        <el-input
-          v-model="queryParams.patientid"
-          placeholder="璇疯緭鍏� 鎮h�匢D "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.patientid" placeholder="璇疯緭鍏� 鎮h�匢D " clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item label=" 鐘舵��;0.寰呭紑濮� 1.杩涜涓� 2.宸插畬鎴� 3.澶辫 9.宸插叧闂� " prop="state">
-        <el-input
-          v-model="queryParams.state"
-          placeholder="璇疯緭鍏� 鐘舵��;0.寰呭紑濮� 1.杩涜涓� 2.宸插畬鎴� 3.澶辫 9.宸插叧闂� "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+      <el-form-item label=" 鐘舵�� " prop="state">
+        <el-input v-model="queryParams.state" placeholder="璇疯緭鍏� 鐘舵�� " clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label=" 鍩虹嚎鏃堕棿 " prop="baselinetime">
-        <el-date-picker clearable
-          v-model="queryParams.baselinetime"
-          type="date"
-          value-format="yyyy-MM-dd"
+        <el-date-picker clearable v-model="queryParams.baselinetime" type="date" value-format="yyyy-MM-dd"
           placeholder="璇烽�夋嫨 鍩虹嚎鏃堕棿 ">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label=" 璁″垝鎵ц鏃堕棿 " prop="plantime">
-        <el-date-picker clearable
-          v-model="queryParams.plantime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="璇烽�夋嫨 璁″垝鎵ц鏃堕棿 ">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label=" 瀹為檯瀹屾垚鏃堕棿 " prop="actualtime">
-        <el-date-picker clearable
-          v-model="queryParams.actualtime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="璇烽�夋嫨 瀹為檯瀹屾垚鏃堕棿 ">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label=" 閫炬湡鏃堕棿 " prop="overtime">
-        <el-date-picker clearable
-          v-model="queryParams.overtime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="璇烽�夋嫨 閫炬湡鏃堕棿 ">
-        </el-date-picker>
-      </el-form-item>
       <el-form-item label=" 鏈烘瀯ID " prop="orgid">
-        <el-input
-          v-model="queryParams.orgid"
-          placeholder="璇疯緭鍏� 鏈烘瀯ID "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.orgid" placeholder="璇疯緭鍏� 鏈烘瀯ID " clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item label=" 涓婁紶鏍囪 " prop="isupload">
-        <el-input
-          v-model="queryParams.isupload"
-          placeholder="璇疯緭鍏� 涓婁紶鏍囪 "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+      <el-form-item label=" 浠诲姟鏉ユ簮 " prop="tasksource">
+        <el-input v-model="queryParams.tasksource" placeholder="璇疯緭鍏� 浠诲姟鏉ユ簮 " clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item label=" 涓婁紶鏃堕棿 " prop="uploadTime">
-        <el-date-picker clearable
-          v-model="queryParams.uploadTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="璇烽�夋嫨 涓婁紶鏃堕棿 ">
-        </el-date-picker>
+      <el-form-item label=" 鏄惁浜哄伐澶勭悊 " prop="isartificial">
+        <el-input v-model="queryParams.isartificial" placeholder="璇疯緭鍏� 鏄惁浜哄伐澶勭悊 " clearable
+          @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item label=" 鎮h�呮潵婧�;0.鍏ㄩ櫌(閫氱敤) 1.鍑洪櫌 2.鍦ㄩ櫌 3.闂ㄨ瘖 4.浣撴 5.鏃� " prop="patientsource">
-        <el-input
-          v-model="queryParams.patientsource"
-          placeholder="璇疯緭鍏� 鎮h�呮潵婧�;0.鍏ㄩ櫌(閫氱敤) 1.鍑洪櫌 2.鍦ㄩ櫌 3.闂ㄨ瘖 4.浣撴 5.鏃� "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" 閰嶇疆ID " prop="taskconfigid">
-        <el-input
-          v-model="queryParams.taskconfigid"
-          placeholder="璇疯緭鍏� 閰嶇疆ID "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" 鍏宠仈缂栧彿 绉戝&椤圭洰&闂嵎&瀹f暀 " prop="relationid">
-        <el-input
-          v-model="queryParams.relationid"
-          placeholder="璇疯緭鍏� 鍏宠仈缂栧彿 绉戝&椤圭洰&闂嵎&瀹f暀 "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" 鍏宠仈鍚嶇О " prop="relationname">
-        <el-input
-          v-model="queryParams.relationname"
-          placeholder="璇疯緭鍏� 鍏宠仈鍚嶇О "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" 鍏抽棴鏃堕棿 " prop="finshtime">
-        <el-date-picker clearable
-          v-model="queryParams.finshtime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="璇烽�夋嫨 鍏抽棴鏃堕棿 ">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label=" 鏈夋晥鏈� " prop="termvaliditytime">
-        <el-date-picker clearable
-          v-model="queryParams.termvaliditytime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="璇烽�夋嫨 鏈夋晥鏈� ">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label=" 灏辫瘖ID " prop="visitid">
-        <el-input
-          v-model="queryParams.visitid"
-          placeholder="璇疯緭鍏� 灏辫瘖ID "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" 浠诲姟鏉ユ簮;0.鑷姩鍒涘缓 1.鎵嬪姩鍒涘缓 " prop="tasksource">
-        <el-input
-          v-model="queryParams.tasksource"
-          placeholder="璇疯緭鍏� 浠诲姟鏉ユ簮;0.鑷姩鍒涘缓 1.鎵嬪姩鍒涘缓 "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" 鏄惁浜哄伐澶勭悊;1鏄� 0鍚� " prop="isartificial">
-        <el-input
-          v-model="queryParams.isartificial"
-          placeholder="璇疯緭鍏� 鏄惁浜哄伐澶勭悊;1鏄� 0鍚� "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" 灏嗛�炬湡鏃堕棿 " prop="overduetipstime">
-        <el-date-picker clearable
-          v-model="queryParams.overduetipstime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="璇烽�夋嫨 灏嗛�炬湡鏃堕棿 ">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label=" 鏄惁寮傚父璺熻繘浠诲姟;1鏄� 0鍚� " prop="isabnormal">
-        <el-input
-          v-model="queryParams.isabnormal"
-          placeholder="璇疯緭鍏� 鏄惁寮傚父璺熻繘浠诲姟;1鏄� 0鍚� "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" 宸茬粡浜哄伐澶勭悊鏍囧織;1宸茬粡浜哄伐澶勭悊杩�  0杩樻湭杩涜浜哄伐澶勭悊 " prop="artificialtag">
-        <el-input
-          v-model="queryParams.artificialtag"
-          placeholder="璇疯緭鍏� 宸茬粡浜哄伐澶勭悊鏍囧織;1宸茬粡浜哄伐澶勭悊杩�  0杩樻湭杩涜浜哄伐澶勭悊 "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" 鍏宠仈浠g爜 闂嵎&瀹f暀 " prop="relationcode">
-        <el-input
-          v-model="queryParams.relationcode"
-          placeholder="璇疯緭鍏� 鍏宠仈浠g爜 闂嵎&瀹f暀 "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+      <el-form-item label=" 鏄惁寮傚父璺熻繘浠诲姟 " prop="isabnormal">
+        <el-input v-model="queryParams.isabnormal" placeholder="璇疯緭鍏� 鏄惁寮傚父璺熻繘浠诲姟 " clearable
+          @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label=" 鏂规浠g爜 " prop="schemecode">
-        <el-input
-          v-model="queryParams.schemecode"
-          placeholder="璇疯緭鍏� 鏂规浠g爜 "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.schemecode" placeholder="璇疯緭鍏� 鏂规浠g爜 " clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item label=" 鏈�鍚庝竴娆¤鍒掓墽琛屾椂闂� " prop="lastplantime">
-        <el-date-picker clearable
-          v-model="queryParams.lastplantime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="璇烽�夋嫨 鏈�鍚庝竴娆¤鍒掓墽琛屾椂闂� ">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label=" 鏄惁涓烘祴璇曚换鍔�;0.鍚� 1.鏄� " prop="istest">
-        <el-input
-          v-model="queryParams.istest"
-          placeholder="璇疯緭鍏� 鏄惁涓烘祴璇曚换鍔�;0.鍚� 1.鏄� "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" 绗竴娆¤鍒掓墽琛屾椂闂� " prop="firstplantime">
-        <el-date-picker clearable
-          v-model="queryParams.firstplantime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="璇烽�夋嫨 绗竴娆¤鍒掓墽琛屾椂闂� ">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label=" 閲嶅彂娆℃暟;Null琛ㄧず鏃犻渶閲嶅彂 0琛ㄧず闇�瑕侀噸鍙� 鏁板瓧琛ㄧず宸茬粡閲嶅彂浜嗗嚑娆� " prop="repeatsecond">
-        <el-input
-          v-model="queryParams.repeatsecond"
-          placeholder="璇疯緭鍏� 閲嶅彂娆℃暟;Null琛ㄧず鏃犻渶閲嶅彂 0琛ㄧず闇�瑕侀噸鍙� 鏁板瓧琛ㄧず宸茬粡閲嶅彂浜嗗嚑娆� "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" 鏄惁瀛樺湪閲嶅彂鏍囪 " prop="isrepeat">
-        <el-input
-          v-model="queryParams.isrepeat"
-          placeholder="璇疯緭鍏� 鏄惁瀛樺湪閲嶅彂鏍囪 "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" 鎵嬪姩鎵ц鏍囪 " prop="ismanual">
-        <el-input
-          v-model="queryParams.ismanual"
-          placeholder="璇疯緭鍏� 鎵嬪姩鎵ц鏍囪 "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" 澶辫鏃堕棿 " prop="losstime">
-        <el-date-picker clearable
-          v-model="queryParams.losstime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="璇烽�夋嫨 澶辫鏃堕棿 ">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label=" " prop="relationlistid">
-        <el-input
-          v-model="queryParams.relationlistid"
-          placeholder="璇疯緭鍏� "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+      <el-form-item label=" 鏄惁閲嶅彂 " prop="isrepeat">
+        <el-input v-model="queryParams.isrepeat" placeholder="璇疯緭鍏� 鏄惁瀛樺湪閲嶅彂鏍囪 " clearable
+          @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
       </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="['smartor:schemetask:add']"
-        >鏂板</el-button>
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+          v-hasPermi="['smartor:schemetask:add']">鏂板</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['smartor:schemetask:edit']"
-        >淇敼</el-button>
+        <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
+          v-hasPermi="['smartor:schemetask:edit']">淇敼</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['smartor:schemetask:remove']"
-        >鍒犻櫎</el-button>
+        <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
+          v-hasPermi="['smartor:schemetask:remove']">鍒犻櫎</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['smartor:schemetask:export']"
-        >瀵煎嚭</el-button>
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
+          v-hasPermi="['smartor:schemetask:export']">瀵煎嚭</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
@@ -323,7 +64,7 @@
       <el-table-column label=" 鏂规ID " align="center" prop="schemeid" />
       <el-table-column label=" 璁″垝ID " align="center" prop="schemeplanid" />
       <el-table-column label=" 鎮h�匢D " align="center" prop="patientid" />
-      <el-table-column label=" 鐘舵��;0.寰呭紑濮� 1.杩涜涓� 2.宸插畬鎴� 3.澶辫 9.宸插叧闂� " align="center" prop="state" />
+      <el-table-column label=" 鐘舵�� " align="center" prop="state" />
       <el-table-column label=" 鍩虹嚎鏃堕棿 " align="center" prop="baselinetime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.baselinetime, '{y}-{m}-{d}') }}</span>
@@ -351,9 +92,9 @@
           <span>{{ parseTime(scope.row.uploadTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label=" 鎮h�呮潵婧�;0.鍏ㄩ櫌(閫氱敤) 1.鍑洪櫌 2.鍦ㄩ櫌 3.闂ㄨ瘖 4.浣撴 5.鏃� " align="center" prop="patientsource" />
+      <el-table-column label=" 鎮h�呮潵婧� " align="center" prop="patientsource" />
       <el-table-column label=" 閰嶇疆ID " align="center" prop="taskconfigid" />
-      <el-table-column label=" 鍏宠仈缂栧彿 绉戝&椤圭洰&闂嵎&瀹f暀 " align="center" prop="relationid" />
+      <el-table-column label=" 鍏宠仈缂栧彿 " align="center" prop="relationid" />
       <el-table-column label=" 鍏宠仈鍚嶇О " align="center" prop="relationname" />
       <el-table-column label=" 浠嬬粛&鎻愰啋鍐呭 " align="center" prop="content" />
       <el-table-column label=" 鎻愮ず鍐呭 " align="center" prop="tipscontent" />
@@ -363,26 +104,26 @@
           <span>{{ parseTime(scope.row.finshtime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label=" 鍏抽棴绫诲瀷;0.鑷姩鍏抽棴 1.浠诲姟閲嶅 2.鎮h�呮浜� 3.鎮h�呮嫆缁濈鐞� 4.鎮h�呴厤鍚堝害涓嶅 5.鎮h�呬綇闄� 6.鍏朵粬 " align="center" prop="finshtype" />
+      <el-table-column label=" 鍏抽棴绫诲瀷 " align="center" prop="finshtype" />
       <el-table-column label=" 鍏抽棴璇存槑 " align="center" prop="finshdesc" />
       <el-table-column label=" 鏈夋晥鏈� " align="center" prop="termvaliditytime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.termvaliditytime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label=" 鏄惁鐢熸垚鏂规;0鏈敓鎴� 1鐢熸垚 9鏃犲尮閰嶆柟妗� " align="center" prop="schemestatus" />
+      <el-table-column label=" 鏄惁鐢熸垚鏂规 " align="center" prop="schemestatus" />
       <el-table-column label=" 灏辫瘖ID " align="center" prop="visitid" />
       <el-table-column label=" 灏辫瘖绫诲瀷 " align="center" prop="visittype" />
-      <el-table-column label=" 浠诲姟鏉ユ簮;0.鑷姩鍒涘缓 1.鎵嬪姩鍒涘缓 " align="center" prop="tasksource" />
-      <el-table-column label=" 鍏宠仈椤圭洰绫诲瀷;1.妫�鏌� 2.妫�楠� " align="center" prop="relationtype" />
-      <el-table-column label=" 鏄惁浜哄伐澶勭悊;1鏄� 0鍚� " align="center" prop="isartificial" />
+      <el-table-column label=" 浠诲姟鏉ユ簮 " align="center" prop="tasksource" />
+      <el-table-column label=" 鍏宠仈椤圭洰绫诲瀷 " align="center" prop="relationtype" />
+      <el-table-column label=" 鏄惁浜哄伐澶勭悊 " align="center" prop="isartificial" />
       <el-table-column label=" 灏嗛�炬湡鏃堕棿 " align="center" prop="overduetipstime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.overduetipstime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label=" 鏄惁寮傚父璺熻繘浠诲姟;1鏄� 0鍚� " align="center" prop="isabnormal" />
-      <el-table-column label=" 宸茬粡浜哄伐澶勭悊鏍囧織;1宸茬粡浜哄伐澶勭悊杩�  0杩樻湭杩涜浜哄伐澶勭悊 " align="center" prop="artificialtag" />
+      <el-table-column label=" 鏄惁寮傚父璺熻繘浠诲姟 " align="center" prop="isabnormal" />
+      <el-table-column label=" 宸茬粡浜哄伐澶勭悊鏍囧織 " align="center" prop="artificialtag" />
       <el-table-column label=" 鍏宠仈浠g爜 闂嵎&瀹f暀 " align="center" prop="relationcode" />
       <el-table-column label=" 鏂规浠g爜 " align="center" prop="schemecode" />
       <el-table-column label=" 鏈�鍚庝竴娆¤鍒掓墽琛屾椂闂� " align="center" prop="lastplantime" width="180">
@@ -390,13 +131,13 @@
           <span>{{ parseTime(scope.row.lastplantime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label=" 鏄惁涓烘祴璇曚换鍔�;0.鍚� 1.鏄� " align="center" prop="istest" />
+      <el-table-column label=" 鏄惁涓烘祴璇曚换鍔� " align="center" prop="istest" />
       <el-table-column label=" 绗竴娆¤鍒掓墽琛屾椂闂� " align="center" prop="firstplantime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.firstplantime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label=" 閲嶅彂娆℃暟;Null琛ㄧず鏃犻渶閲嶅彂 0琛ㄧず闇�瑕侀噸鍙� 鏁板瓧琛ㄧず宸茬粡閲嶅彂浜嗗嚑娆� " align="center" prop="repeatsecond" />
+      <el-table-column label=" 閲嶅彂娆℃暟 " align="center" prop="repeatsecond" />
       <el-table-column label=" 鏄惁瀛樺湪閲嶅彂鏍囪 " align="center" prop="isrepeat" />
       <el-table-column label=" 鎵嬪姩鎵ц鏍囪 " align="center" prop="ismanual" />
       <el-table-column label=" 澶辫鏃堕棿 " align="center" prop="losstime" width="180">
@@ -407,201 +148,190 @@
       <el-table-column label=" " align="center" prop="relationlistid" />
       <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="handleUpdate(scope.row)"
-            v-hasPermi="['smartor:schemetask:edit']"
-          >淇敼</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['smartor:schemetask:remove']"
-          >鍒犻櫎</el-button>
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+            v-hasPermi="['smartor:schemetask:edit']">淇敼</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+            v-hasPermi="['smartor:schemetask:remove']">鍒犻櫎</el-button>
         </template>
       </el-table-column>
     </el-table>
-    
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
+
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+      @pagination="getList" />
 
     <!-- 娣诲姞鎴栦慨鏀规柟妗堜换鍔″璇濇 -->
-    <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=" 鏂规ID " prop="schemeid">
-          <el-input v-model="form.schemeid" placeholder="璇疯緭鍏� 鏂规ID " />
-        </el-form-item>
-        <el-form-item label=" 璁″垝ID " prop="schemeplanid">
-          <el-input v-model="form.schemeplanid" placeholder="璇疯緭鍏� 璁″垝ID " />
-        </el-form-item>
-        <el-form-item label=" 鎮h�匢D " prop="patientid">
-          <el-input v-model="form.patientid" placeholder="璇疯緭鍏� 鎮h�匢D " />
-        </el-form-item>
-        <el-form-item label=" 鐘舵��;0.寰呭紑濮� 1.杩涜涓� 2.宸插畬鎴� 3.澶辫 9.宸插叧闂� " prop="state">
-          <el-input v-model="form.state" placeholder="璇疯緭鍏� 鐘舵��;0.寰呭紑濮� 1.杩涜涓� 2.宸插畬鎴� 3.澶辫 9.宸插叧闂� " />
-        </el-form-item>
-        <el-form-item label=" 鍩虹嚎鏃堕棿 " prop="baselinetime">
-          <el-date-picker clearable
-            v-model="form.baselinetime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="璇烽�夋嫨 鍩虹嚎鏃堕棿 ">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label=" 璁″垝鎵ц鏃堕棿 " prop="plantime">
-          <el-date-picker clearable
-            v-model="form.plantime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="璇烽�夋嫨 璁″垝鎵ц鏃堕棿 ">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label=" 瀹為檯瀹屾垚鏃堕棿 " prop="actualtime">
-          <el-date-picker clearable
-            v-model="form.actualtime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="璇烽�夋嫨 瀹為檯瀹屾垚鏃堕棿 ">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label=" 閫炬湡鏃堕棿 " prop="overtime">
-          <el-date-picker clearable
-            v-model="form.overtime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="璇烽�夋嫨 閫炬湡鏃堕棿 ">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label=" 鏈烘瀯ID " prop="orgid">
-          <el-input v-model="form.orgid" placeholder="璇疯緭鍏� 鏈烘瀯ID " />
-        </el-form-item>
-        <el-form-item label=" 鍒犻櫎鏍囪 " prop="delFlag">
-          <el-input v-model="form.delFlag" placeholder="璇疯緭鍏� 鍒犻櫎鏍囪 " />
-        </el-form-item>
-        <el-form-item label=" 涓婁紶鏍囪 " prop="isupload">
-          <el-input v-model="form.isupload" placeholder="璇疯緭鍏� 涓婁紶鏍囪 " />
-        </el-form-item>
-        <el-form-item label=" 涓婁紶鏃堕棿 " prop="uploadTime">
-          <el-date-picker clearable
-            v-model="form.uploadTime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="璇烽�夋嫨 涓婁紶鏃堕棿 ">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label=" 鎮h�呮潵婧�;0.鍏ㄩ櫌(閫氱敤) 1.鍑洪櫌 2.鍦ㄩ櫌 3.闂ㄨ瘖 4.浣撴 5.鏃� " prop="patientsource">
-          <el-input v-model="form.patientsource" placeholder="璇疯緭鍏� 鎮h�呮潵婧�;0.鍏ㄩ櫌(閫氱敤) 1.鍑洪櫌 2.鍦ㄩ櫌 3.闂ㄨ瘖 4.浣撴 5.鏃� " />
-        </el-form-item>
-        <el-form-item label=" 閰嶇疆ID " prop="taskconfigid">
-          <el-input v-model="form.taskconfigid" placeholder="璇疯緭鍏� 閰嶇疆ID " />
-        </el-form-item>
-        <el-form-item label=" 鍏宠仈缂栧彿 绉戝&椤圭洰&闂嵎&瀹f暀 " prop="relationid">
-          <el-input v-model="form.relationid" placeholder="璇疯緭鍏� 鍏宠仈缂栧彿 绉戝&椤圭洰&闂嵎&瀹f暀 " />
-        </el-form-item>
-        <el-form-item label=" 鍏宠仈鍚嶇О " prop="relationname">
-          <el-input v-model="form.relationname" placeholder="璇疯緭鍏� 鍏宠仈鍚嶇О " />
-        </el-form-item>
-        <el-form-item label=" 浠嬬粛&鎻愰啋鍐呭 ">
-          <editor v-model="form.content" :min-height="192"/>
-        </el-form-item>
-        <el-form-item label=" 鎻愮ず鍐呭 ">
-          <editor v-model="form.tipscontent" :min-height="192"/>
-        </el-form-item>
-        <el-form-item label=" 鍏抽棴鏃堕棿 " prop="finshtime">
-          <el-date-picker clearable
-            v-model="form.finshtime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="璇烽�夋嫨 鍏抽棴鏃堕棿 ">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label=" 鍏抽棴璇存槑 " prop="finshdesc">
-          <el-input v-model="form.finshdesc" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" />
-        </el-form-item>
-        <el-form-item label=" 鏈夋晥鏈� " prop="termvaliditytime">
-          <el-date-picker clearable
-            v-model="form.termvaliditytime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="璇烽�夋嫨 鏈夋晥鏈� ">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label=" 灏辫瘖ID " prop="visitid">
-          <el-input v-model="form.visitid" placeholder="璇疯緭鍏� 灏辫瘖ID " />
-        </el-form-item>
-        <el-form-item label=" 浠诲姟鏉ユ簮;0.鑷姩鍒涘缓 1.鎵嬪姩鍒涘缓 " prop="tasksource">
-          <el-input v-model="form.tasksource" placeholder="璇疯緭鍏� 浠诲姟鏉ユ簮;0.鑷姩鍒涘缓 1.鎵嬪姩鍒涘缓 " />
-        </el-form-item>
-        <el-form-item label=" 鏄惁浜哄伐澶勭悊;1鏄� 0鍚� " prop="isartificial">
-          <el-input v-model="form.isartificial" placeholder="璇疯緭鍏� 鏄惁浜哄伐澶勭悊;1鏄� 0鍚� " />
-        </el-form-item>
-        <el-form-item label=" 灏嗛�炬湡鏃堕棿 " prop="overduetipstime">
-          <el-date-picker clearable
-            v-model="form.overduetipstime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="璇烽�夋嫨 灏嗛�炬湡鏃堕棿 ">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label=" 鏄惁寮傚父璺熻繘浠诲姟;1鏄� 0鍚� " prop="isabnormal">
-          <el-input v-model="form.isabnormal" placeholder="璇疯緭鍏� 鏄惁寮傚父璺熻繘浠诲姟;1鏄� 0鍚� " />
-        </el-form-item>
-        <el-form-item label=" 宸茬粡浜哄伐澶勭悊鏍囧織;1宸茬粡浜哄伐澶勭悊杩�  0杩樻湭杩涜浜哄伐澶勭悊 " prop="artificialtag">
-          <el-input v-model="form.artificialtag" placeholder="璇疯緭鍏� 宸茬粡浜哄伐澶勭悊鏍囧織;1宸茬粡浜哄伐澶勭悊杩�  0杩樻湭杩涜浜哄伐澶勭悊 " />
-        </el-form-item>
-        <el-form-item label=" 鍏宠仈浠g爜 闂嵎&瀹f暀 " prop="relationcode">
-          <el-input v-model="form.relationcode" placeholder="璇疯緭鍏� 鍏宠仈浠g爜 闂嵎&瀹f暀 " />
-        </el-form-item>
-        <el-form-item label=" 鏂规浠g爜 " prop="schemecode">
-          <el-input v-model="form.schemecode" placeholder="璇疯緭鍏� 鏂规浠g爜 " />
-        </el-form-item>
-        <el-form-item label=" 鏈�鍚庝竴娆¤鍒掓墽琛屾椂闂� " prop="lastplantime">
-          <el-date-picker clearable
-            v-model="form.lastplantime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="璇烽�夋嫨 鏈�鍚庝竴娆¤鍒掓墽琛屾椂闂� ">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label=" 鏄惁涓烘祴璇曚换鍔�;0.鍚� 1.鏄� " prop="istest">
-          <el-input v-model="form.istest" placeholder="璇疯緭鍏� 鏄惁涓烘祴璇曚换鍔�;0.鍚� 1.鏄� " />
-        </el-form-item>
-        <el-form-item label=" 绗竴娆¤鍒掓墽琛屾椂闂� " prop="firstplantime">
-          <el-date-picker clearable
-            v-model="form.firstplantime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="璇烽�夋嫨 绗竴娆¤鍒掓墽琛屾椂闂� ">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label=" 閲嶅彂娆℃暟;Null琛ㄧず鏃犻渶閲嶅彂 0琛ㄧず闇�瑕侀噸鍙� 鏁板瓧琛ㄧず宸茬粡閲嶅彂浜嗗嚑娆� " prop="repeatsecond">
-          <el-input v-model="form.repeatsecond" placeholder="璇疯緭鍏� 閲嶅彂娆℃暟;Null琛ㄧず鏃犻渶閲嶅彂 0琛ㄧず闇�瑕侀噸鍙� 鏁板瓧琛ㄧず宸茬粡閲嶅彂浜嗗嚑娆� " />
-        </el-form-item>
-        <el-form-item label=" 鏄惁瀛樺湪閲嶅彂鏍囪 " prop="isrepeat">
-          <el-input v-model="form.isrepeat" placeholder="璇疯緭鍏� 鏄惁瀛樺湪閲嶅彂鏍囪 " />
-        </el-form-item>
-        <el-form-item label=" 鎵嬪姩鎵ц鏍囪 " prop="ismanual">
-          <el-input v-model="form.ismanual" placeholder="璇疯緭鍏� 鎵嬪姩鎵ц鏍囪 " />
-        </el-form-item>
-        <el-form-item label=" 澶辫鏃堕棿 " prop="losstime">
-          <el-date-picker clearable
-            v-model="form.losstime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="璇烽�夋嫨 澶辫鏃堕棿 ">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label=" " prop="relationlistid">
-          <el-input v-model="form.relationlistid" placeholder="璇疯緭鍏� " />
-        </el-form-item>
+    <el-dialog :title="title" :visible.sync="open" :showclose="true" :close-on-click-modal="false" :inline="true"
+      width="1000px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+        <el-row>
+          <el-col :span="12"> <el-form-item label=" 鏂规ID " prop="schemeid">
+              <el-input v-model="form.schemeid" placeholder="璇疯緭鍏� 鏂规ID " />
+            </el-form-item></el-col>
+          <el-col :span="12"><el-form-item label=" 璁″垝ID " prop="schemeplanid">
+              <el-input v-model="form.schemeplanid" placeholder="璇疯緭鍏� 璁″垝ID " />
+            </el-form-item></el-col>
+        </el-row><el-row>
+          <el-col :span="12"><el-form-item label=" 鎮h�匢D " prop="patientid">
+              <el-input v-model="form.patientid" placeholder="璇疯緭鍏� 鎮h�匢D " />
+            </el-form-item></el-col>
+          <el-col :span="12"><el-form-item label=" 鐘舵�� " prop="state">
+              <el-input v-model="form.state" placeholder="璇疯緭鍏� 鐘舵��;0.寰呭紑濮� 1.杩涜涓� 2.宸插畬鎴� 3.澶辫 9.宸插叧闂� " />
+            </el-form-item></el-col>
+        </el-row><el-row>
+          <el-col :span="12"><el-form-item label=" 鍩虹嚎鏃堕棿 " prop="baselinetime">
+              <el-date-picker clearable v-model="form.baselinetime" type="date" value-format="yyyy-MM-dd"
+                placeholder="璇烽�夋嫨 鍩虹嚎鏃堕棿 ">
+              </el-date-picker>
+            </el-form-item></el-col>
+          <el-col :span="12"><el-form-item label=" 璁″垝鎵ц鏃堕棿 " prop="plantime">
+              <el-date-picker clearable v-model="form.plantime" type="date" value-format="yyyy-MM-dd"
+                placeholder="璇烽�夋嫨 璁″垝鎵ц鏃堕棿 ">
+              </el-date-picker>
+            </el-form-item></el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12"><el-form-item label=" 瀹為檯瀹屾垚鏃堕棿 " prop="actualtime">
+              <el-date-picker clearable v-model="form.actualtime" type="date" value-format="yyyy-MM-dd"
+                placeholder="璇烽�夋嫨 瀹為檯瀹屾垚鏃堕棿 ">
+              </el-date-picker>
+            </el-form-item></el-col>
+          <el-col :span="12"> <el-form-item label=" 閫炬湡鏃堕棿 " prop="overtime">
+              <el-date-picker clearable v-model="form.overtime" type="date" value-format="yyyy-MM-dd"
+                placeholder="璇烽�夋嫨 閫炬湡鏃堕棿 ">
+              </el-date-picker>
+            </el-form-item></el-col>
+        </el-row> <el-row>
+          <el-col :span="12"><el-form-item label=" 鏈烘瀯ID " prop="orgid">
+              <el-input v-model="form.orgid" placeholder="璇疯緭鍏� 鏈烘瀯ID " />
+            </el-form-item></el-col>
+          <el-col :span="12"><el-form-item label=" 鍒犻櫎鏍囪 " prop="delFlag">
+              <el-input v-model="form.delFlag" placeholder="璇疯緭鍏� 鍒犻櫎鏍囪 " />
+            </el-form-item></el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12"><el-form-item label=" 涓婁紶鏍囪 " prop="isupload">
+              <el-input v-model="form.isupload" placeholder="璇疯緭鍏� 涓婁紶鏍囪 " />
+            </el-form-item></el-col>
+          <el-col :span="12"><el-form-item label=" 涓婁紶鏃堕棿 " prop="uploadTime">
+              <el-date-picker clearable v-model="form.uploadTime" type="date" value-format="yyyy-MM-dd"
+                placeholder="璇烽�夋嫨 涓婁紶鏃堕棿 ">
+              </el-date-picker>
+            </el-form-item></el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12"><el-form-item label=" 鎮h�呮潵婧� " prop="patientsource">
+              <el-input v-model="form.patientsource" placeholder="璇疯緭鍏� 鎮h�呮潵婧�;0.鍏ㄩ櫌(閫氱敤) 1.鍑洪櫌 2.鍦ㄩ櫌 3.闂ㄨ瘖 4.浣撴 5.鏃� " />
+            </el-form-item></el-col>
+          <el-col :span="12"><el-form-item label=" 閰嶇疆ID " prop="taskconfigid">
+              <el-input v-model="form.taskconfigid" placeholder="璇疯緭鍏� 閰嶇疆ID " />
+            </el-form-item></el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12"><el-form-item label=" 鍏宠仈缂栧彿 " prop="relationid">
+              <el-input v-model="form.relationid" placeholder="璇疯緭鍏� 鍏宠仈缂栧彿 绉戝&椤圭洰&闂嵎&瀹f暀 " />
+            </el-form-item></el-col>
+          <el-col :span="12"><el-form-item label=" 鍏宠仈鍚嶇О " prop="relationname">
+              <el-input v-model="form.relationname" placeholder="璇疯緭鍏� 鍏宠仈鍚嶇О " />
+            </el-form-item></el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12"><el-form-item label=" 浠嬬粛&鎻愰啋鍐呭 ">
+              <el-input v-model="form.content"  placeholder="璇疯緭鍏� 浠嬬粛鎻愰啋鍐呭 " />
+            </el-form-item></el-col>
+          <el-col :span="12"><el-form-item label=" 鎻愮ず鍐呭 ">
+              <el-input v-model="form.tipscontent"  placeholder="璇疯緭鍏� 鎻愮ず鍐呭 " />
+            </el-form-item></el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12"><el-form-item label=" 鍏抽棴鏃堕棿 " prop="finshtime">
+              <el-date-picker clearable v-model="form.finshtime" type="date" value-format="yyyy-MM-dd"
+                placeholder="璇烽�夋嫨 鍏抽棴鏃堕棿 ">
+              </el-date-picker>
+            </el-form-item></el-col>
+          <el-col :span="12"><el-form-item label=" 鍏抽棴璇存槑 " prop="finshdesc">
+              <el-input v-model="form.finshdesc" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" />
+            </el-form-item></el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12"><el-form-item label=" 鏈夋晥鏈� " prop="termvaliditytime">
+              <el-date-picker clearable v-model="form.termvaliditytime" type="date" value-format="yyyy-MM-dd"
+                placeholder="璇烽�夋嫨 鏈夋晥鏈� ">
+              </el-date-picker>
+            </el-form-item></el-col>
+          <el-col :span="12"><el-form-item label=" 灏辫瘖ID " prop="visitid">
+              <el-input v-model="form.visitid" placeholder="璇疯緭鍏� 灏辫瘖ID " />
+            </el-form-item></el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12"><el-form-item label=" 浠诲姟鏉ユ簮 " prop="tasksource">
+              <el-input v-model="form.tasksource" placeholder="璇疯緭鍏� 浠诲姟鏉ユ簮;0.鑷姩鍒涘缓 1.鎵嬪姩鍒涘缓 " />
+            </el-form-item></el-col>
+          <el-col :span="12"><el-form-item label=" 鏄惁浜哄伐澶勭悊 " prop="isartificial">
+              <el-input v-model="form.isartificial" placeholder="璇疯緭鍏� 鏄惁浜哄伐澶勭悊;1鏄� 0鍚� " />
+            </el-form-item></el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12"><el-form-item label=" 灏嗛�炬湡鏃堕棿 " prop="overduetipstime">
+              <el-date-picker clearable v-model="form.overduetipstime" type="date" value-format="yyyy-MM-dd"
+                placeholder="璇烽�夋嫨 灏嗛�炬湡鏃堕棿 ">
+              </el-date-picker>
+            </el-form-item></el-col>
+          <el-col :span="12"><el-form-item label=" 鏄惁寮傚父璺熻繘浠诲姟 " prop="isabnormal">
+              <el-input v-model="form.isabnormal" placeholder="璇疯緭鍏� 鏄惁寮傚父璺熻繘浠诲姟;1鏄� 0鍚� " />
+            </el-form-item></el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12"><el-form-item label=" 宸茬粡浜哄伐澶勭悊鏍囧織 " prop="artificialtag">
+              <el-input v-model="form.artificialtag" placeholder="璇疯緭鍏� 宸茬粡浜哄伐澶勭悊鏍囧織;1宸茬粡浜哄伐澶勭悊杩�  0杩樻湭杩涜浜哄伐澶勭悊 " />
+            </el-form-item></el-col>
+          <el-col :span="12"><el-form-item label=" 鍏宠仈浠g爜 闂嵎&瀹f暀 " prop="relationcode">
+              <el-input v-model="form.relationcode" placeholder="璇疯緭鍏� 鍏宠仈浠g爜 闂嵎&瀹f暀 " />
+            </el-form-item></el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12"><el-form-item label=" 鏂规浠g爜 " prop="schemecode">
+              <el-input v-model="form.schemecode" placeholder="璇疯緭鍏� 鏂规浠g爜 " />
+            </el-form-item></el-col>
+          <el-col :span="12"><el-form-item label=" 鏈�鍚庝竴娆¤鍒掓墽琛屾椂闂� " prop="lastplantime">
+              <el-date-picker clearable v-model="form.lastplantime" type="date" value-format="yyyy-MM-dd"
+                placeholder="璇烽�夋嫨 鏈�鍚庝竴娆¤鍒掓墽琛屾椂闂� ">
+              </el-date-picker>
+            </el-form-item></el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12"><el-form-item label=" 鏄惁涓烘祴璇曚换鍔� " prop="istest">
+              <el-input v-model="form.istest" placeholder="璇疯緭鍏� 鏄惁涓烘祴璇曚换鍔�;0.鍚� 1.鏄� " />
+            </el-form-item></el-col>
+          <el-col :span="12"><el-form-item label=" 绗竴娆¤鍒掓墽琛屾椂闂� " prop="firstplantime">
+              <el-date-picker clearable v-model="form.firstplantime" type="date" value-format="yyyy-MM-dd"
+                placeholder="璇烽�夋嫨 绗竴娆¤鍒掓墽琛屾椂闂� ">
+              </el-date-picker>
+            </el-form-item></el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12"><el-form-item label=" 閲嶅彂娆℃暟 " prop="repeatsecond">
+              <el-input v-model="form.repeatsecond" placeholder="璇疯緭鍏� 閲嶅彂娆℃暟;Null琛ㄧず鏃犻渶閲嶅彂 0琛ㄧず闇�瑕侀噸鍙� 鏁板瓧琛ㄧず宸茬粡閲嶅彂浜嗗嚑娆� " />
+            </el-form-item></el-col>
+          <el-col :span="12"> <el-form-item label=" 鏄惁瀛樺湪閲嶅彂鏍囪 " prop="isrepeat">
+              <el-input v-model="form.isrepeat" placeholder="璇疯緭鍏� 鏄惁瀛樺湪閲嶅彂鏍囪 " />
+            </el-form-item></el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="12"><el-form-item label=" 鎵嬪姩鎵ц鏍囪 " prop="ismanual">
+              <el-input v-model="form.ismanual" placeholder="璇疯緭鍏� 鎵嬪姩鎵ц鏍囪 " />
+            </el-form-item></el-col>
+          <el-col :span="12"><el-form-item label=" 澶辫鏃堕棿 " prop="losstime">
+              <el-date-picker clearable v-model="form.losstime" type="date" value-format="yyyy-MM-dd"
+                placeholder="璇烽�夋嫨 澶辫鏃堕棿 ">
+              </el-date-picker>
+            </el-form-item></el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12"><el-form-item label=" " prop="relationlistid">
+              <el-input v-model="form.relationlistid" placeholder="璇疯緭鍏� " />
+            </el-form-item></el-col>
+        </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
@@ -779,7 +509,7 @@
     // 澶氶�夋閫変腑鏁版嵁
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
     /** 鏂板鎸夐挳鎿嶄綔 */
@@ -821,12 +551,12 @@
     /** 鍒犻櫎鎸夐挳鎿嶄綔 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('鏄惁纭鍒犻櫎鏂规浠诲姟缂栧彿涓�"' + ids + '"鐨勬暟鎹」锛�').then(function() {
+      this.$modal.confirm('鏄惁纭鍒犻櫎鏂规浠诲姟缂栧彿涓�"' + ids + '"鐨勬暟鎹」锛�').then(function () {
         return delSchemetask(ids);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
-      }).catch(() => {});
+      }).catch(() => { });
     },
     /** 瀵煎嚭鎸夐挳鎿嶄綔 */
     handleExport() {
diff --git a/ruoyi-ui/src/views/smartor/schemetaskconfig/index.vue b/ruoyi-ui/src/views/smartor/schemetaskconfig/index.vue
index 128165b..360f832 100644
--- a/ruoyi-ui/src/views/smartor/schemetaskconfig/index.vue
+++ b/ruoyi-ui/src/views/smartor/schemetaskconfig/index.vue
@@ -2,276 +2,19 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label=" 鏂规ID " prop="schemeid">
-        <el-input
-          v-model="queryParams.schemeid"
-          placeholder="璇疯緭鍏� 鏂规ID "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.schemeid" placeholder="璇疯緭鍏� 鏂规ID " clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item label=" 瑙﹀彂鍦烘櫙ID " prop="triggersceneid">
-        <el-input
-          v-model="queryParams.triggersceneid"
-          placeholder="璇疯緭鍏� 瑙﹀彂鍦烘櫙ID "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" 瑙﹀彂瑙勫垯ID " prop="triggerruleid">
-        <el-input
-          v-model="queryParams.triggerruleid"
-          placeholder="璇疯緭鍏� 瑙﹀彂瑙勫垯ID "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" 鏄惁鍛ㄦ湡浠诲姟;0.鍚� 1.鏄� " prop="iscycle">
-        <el-input
-          v-model="queryParams.iscycle"
-          placeholder="璇疯緭鍏� 鏄惁鍛ㄦ湡浠诲姟;0.鍚� 1.鏄� "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" 璁″垝鎵ц鏃堕棿鏁板�� " prop="planexecutevalue">
-        <el-input
-          v-model="queryParams.planexecutevalue"
-          placeholder="璇疯緭鍏� 璁″垝鎵ц鏃堕棿鏁板�� "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" 璁″垝鎵ц鏃堕棿鍗曚綅;1.澶� 2.鍛� 3.鏈� 4.骞� " prop="planexecuteunit">
-        <el-input
-          v-model="queryParams.planexecuteunit"
-          placeholder="璇疯緭鍏� 璁″垝鎵ц鏃堕棿鍗曚綅;1.澶� 2.鍛� 3.鏈� 4.骞� "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" 璁″垝鎵ц鍏蜂綋鏃堕棿 " prop="planexecutetime">
-        <el-input
-          v-model="queryParams.planexecutetime"
-          placeholder="璇疯緭鍏� 璁″垝鎵ц鍏蜂綋鏃堕棿 "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" 璁″垝鎵ц鏄惁瀹炴椂;0.瀹氭椂 1.瀹炴椂 " prop="isrealtime">
-        <el-input
-          v-model="queryParams.isrealtime"
-          placeholder="璇疯緭鍏� 璁″垝鎵ц鏄惁瀹炴椂;0.瀹氭椂 1.瀹炴椂 "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" 鍛ㄦ湡棰戠巼 " prop="cyclefrequency">
-        <el-input
-          v-model="queryParams.cyclefrequency"
-          placeholder="璇疯緭鍏� 鍛ㄦ湡棰戠巼 "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" 鍛ㄦ湡棰戠巼鍗曚綅;1.澶� 2.鍛� 3.鏈� 4.骞� " prop="cyclefrequencyunit">
-        <el-input
-          v-model="queryParams.cyclefrequencyunit"
-          placeholder="璇疯緭鍏� 鍛ㄦ湡棰戠巼鍗曚綅;1.澶� 2.鍛� 3.鏈� 4.骞� "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" 鍛ㄦ湡棰戠巼娆℃暟 " prop="cyclefrequencycount">
-        <el-input
-          v-model="queryParams.cyclefrequencycount"
-          placeholder="璇疯緭鍏� 鍛ㄦ湡棰戠巼娆℃暟 "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" 鏈夋晥鏈熷ぉ鏁� " prop="termvalidityday">
-        <el-input
-          v-model="queryParams.termvalidityday"
-          placeholder="璇疯緭鍏� 鏈夋晥鏈熷ぉ鏁� "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" 鏈夋晥鏈熻鍒�;1.褰撳ぉ 2.鎻愬墠 3.寤惰繜 4.鎻愬墠鎴栧欢杩� " prop="termvalidityrule">
-        <el-input
-          v-model="queryParams.termvalidityrule"
-          placeholder="璇疯緭鍏� 鏈夋晥鏈熻鍒�;1.褰撳ぉ 2.鎻愬墠 3.寤惰繜 4.鎻愬墠鎴栧欢杩� "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" 鏈夋晥鏈熷墠鎻愰啋澶╂暟 " prop="termvaliditytipsday">
-        <el-input
-          v-model="queryParams.termvaliditytipsday"
-          placeholder="璇疯緭鍏� 鏈夋晥鏈熷墠鎻愰啋澶╂暟 "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" 鏈夋晥鏈熸彁閱掑綋澶╁叿浣撴椂闂� " prop="termvaliditytipstime">
-        <el-input
-          v-model="queryParams.termvaliditytipstime"
-          placeholder="璇疯緭鍏� 鏈夋晥鏈熸彁閱掑綋澶╁叿浣撴椂闂� "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" 鍏宠仈缂栧彿 绉戝&椤圭洰 " prop="relationid">
-        <el-input
-          v-model="queryParams.relationid"
-          placeholder="璇疯緭鍏� 鍏宠仈缂栧彿 绉戝&椤圭洰 "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" 鏈夐檺鏈熼檺/澶� " prop="limitedday">
-        <el-input
-          v-model="queryParams.limitedday"
-          placeholder="璇疯緭鍏� 鏈夐檺鏈熼檺/澶� "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" 閫炬湡鍒ゆ柇澶╂暟 " prop="overdueday">
-        <el-input
-          v-model="queryParams.overdueday"
-          placeholder="璇疯緭鍏� 閫炬湡鍒ゆ柇澶╂暟 "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" 閫炬湡鍓嶆彁閱掑ぉ鏁� " prop="overduetipsday">
-        <el-input
-          v-model="queryParams.overduetipsday"
-          placeholder="璇疯緭鍏� 閫炬湡鍓嶆彁閱掑ぉ鏁� "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" 澶辫鍒ゆ柇澶╂暟 " prop="lossday">
-        <el-input
-          v-model="queryParams.lossday"
-          placeholder="璇疯緭鍏� 澶辫鍒ゆ柇澶╂暟 "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" 鎵ц妯℃澘 寰俊&AI澶栧懠妯℃澘 " prop="executetemplate">
-        <el-input
-          v-model="queryParams.executetemplate"
-          placeholder="璇疯緭鍏� 鎵ц妯℃澘 寰俊&AI澶栧懠妯℃澘 "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" 棰濆鎵ц妯℃澘 鐭俊妯℃澘 " prop="executetemplateextra">
-        <el-input
-          v-model="queryParams.executetemplateextra"
-          placeholder="璇疯緭鍏� 棰濆鎵ц妯℃澘 鐭俊妯℃澘 "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" 鎵ц椤哄簭;1.寰俊浼樺厛 2.鐭俊浼樺厛 3.鍚屾椂鍙戦�� " prop="executeorder">
-        <el-input
-          v-model="queryParams.executeorder"
-          placeholder="璇疯緭鍏� 鎵ц椤哄簭;1.寰俊浼樺厛 2.鐭俊浼樺厛 3.鍚屾椂鍙戦�� "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+      <el-form-item label=" 鎵ц妯℃澘 " prop="executetemplate">
+        <el-input v-model="queryParams.executetemplate" placeholder="璇疯緭鍏� 鎵ц妯℃澘 寰俊&AI澶栧懠妯℃澘 " clearable
+          @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label=" 鏈烘瀯ID " prop="orgid">
-        <el-input
-          v-model="queryParams.orgid"
-          placeholder="璇疯緭鍏� 鏈烘瀯ID "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.orgid" placeholder="璇疯緭鍏� 鏈烘瀯ID " clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item label=" 涓婁紶鏍囪 " prop="isupload">
-        <el-input
-          v-model="queryParams.isupload"
-          placeholder="璇疯緭鍏� 涓婁紶鏍囪 "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" 涓婁紶鏃堕棿 " prop="uploadTime">
-        <el-date-picker clearable
-          v-model="queryParams.uploadTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="璇烽�夋嫨 涓婁紶鏃堕棿 ">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label=" 鏄惁鏈湴 " prop="islocal">
-        <el-input
-          v-model="queryParams.islocal"
-          placeholder="璇疯緭鍏� 鏄惁鏈湴 "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
+
       <el-form-item label=" 璇煶鍚堟垚鍘傚晢 " prop="voicemanufacturers">
-        <el-input
-          v-model="queryParams.voicemanufacturers"
-          placeholder="璇疯緭鍏� 璇煶鍚堟垚鍘傚晢 "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" 璇煶鍚堟垚閰嶇疆 " prop="voiceconfig">
-        <el-input
-          v-model="queryParams.voiceconfig"
-          placeholder="璇疯緭鍏� 璇煶鍚堟垚閰嶇疆 "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" 瀹屾垚鏉′欢;1閫氳瘽鐘舵��  2澶嶆牳鐘舵�� " prop="completecondition">
-        <el-input
-          v-model="queryParams.completecondition"
-          placeholder="璇疯緭鍏� 瀹屾垚鏉′欢;1閫氳瘽鐘舵��  2澶嶆牳鐘舵�� "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" 瀹屾垚鏉′欢瀵瑰簲鐘舵�� " prop="completeconditionstate">
-        <el-input
-          v-model="queryParams.completeconditionstate"
-          placeholder="璇疯緭鍏� 瀹屾垚鏉′欢瀵瑰簲鐘舵�� "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" 鍏宠仈缂栧彿 绉戝&椤圭洰(澶氶��) " prop="relationlistid">
-        <el-input
-          v-model="queryParams.relationlistid"
-          placeholder="璇疯緭鍏� 鍏宠仈缂栧彿 绉戝&椤圭洰(澶氶��) "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" 鍏宠仈浠g爜 闂嵎&瀹f暀 " prop="relationcode">
-        <el-input
-          v-model="queryParams.relationcode"
-          placeholder="璇疯緭鍏� 鍏宠仈浠g爜 闂嵎&瀹f暀 "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" 鏄惁瀛樺湪閲嶅彂鏍囪 " prop="isrepeat">
-        <el-input
-          v-model="queryParams.isrepeat"
-          placeholder="璇疯緭鍏� 鏄惁瀛樺湪閲嶅彂鏍囪 "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.voicemanufacturers" placeholder="璇疯緭鍏� 璇煶鍚堟垚鍘傚晢 " clearable
+          @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
@@ -281,46 +24,20 @@
 
     <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="['smartor:schemetaskconfig:add']"
-        >鏂板</el-button>
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+          v-hasPermi="['smartor:schemetaskconfig:add']">鏂板</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['smartor:schemetaskconfig:edit']"
-        >淇敼</el-button>
+        <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
+          v-hasPermi="['smartor:schemetaskconfig:edit']">淇敼</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['smartor:schemetaskconfig:remove']"
-        >鍒犻櫎</el-button>
+        <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
+          v-hasPermi="['smartor:schemetaskconfig:remove']">鍒犻櫎</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['smartor:schemetaskconfig:export']"
-        >瀵煎嚭</el-button>
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
+          v-hasPermi="['smartor:schemetaskconfig:export']">瀵煎嚭</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
@@ -331,81 +48,40 @@
       <el-table-column label=" 鏂规ID " align="center" prop="schemeid" />
       <el-table-column label=" 瑙﹀彂鍦烘櫙ID " align="center" prop="triggersceneid" />
       <el-table-column label=" 瑙﹀彂瑙勫垯ID " align="center" prop="triggerruleid" />
-      <el-table-column label=" 浠诲姟绫诲瀷;1.闅忚浠诲姟 2.瀹f暀浠诲姟 3. 鎻愰啋浠诲姟 4. 澶嶈瘖绠$悊浠诲姟 5. 澶嶆煡绠$悊浠诲姟 6.鍏朵粬浠诲姟 " align="center" prop="tasktype" />
-      <el-table-column label=" 鏄惁鍛ㄦ湡浠诲姟;0.鍚� 1.鏄� " align="center" prop="iscycle" />
-      <el-table-column label=" 璁″垝鎵ц鏃堕棿鏁板�� " align="center" prop="planexecutevalue" />
-      <el-table-column label=" 璁″垝鎵ц鏃堕棿鍗曚綅;1.澶� 2.鍛� 3.鏈� 4.骞� " align="center" prop="planexecuteunit" />
-      <el-table-column label=" 璁″垝鎵ц鍏蜂綋鏃堕棿 " align="center" prop="planexecutetime" />
-      <el-table-column label=" 璁″垝鎵ц绫诲瀷;1.褰撳ぉ鎵ц 2.绗簩澶╂寜鎸囧畾鏃堕棿鎵ц 3.璁″垝鏃堕棿鏃╀簬鎸囧畾鏃堕棿涓嶆墽琛� " align="center" prop="planexecutetype" />
-      <el-table-column label=" 璁″垝鎵ц鏄惁瀹炴椂;0.瀹氭椂 1.瀹炴椂 " align="center" prop="isrealtime" />
-      <el-table-column label=" 鍛ㄦ湡棰戠巼 " align="center" prop="cyclefrequency" />
-      <el-table-column label=" 鍛ㄦ湡棰戠巼鍗曚綅;1.澶� 2.鍛� 3.鏈� 4.骞� " align="center" prop="cyclefrequencyunit" />
-      <el-table-column label=" 鍛ㄦ湡棰戠巼娆℃暟 " align="center" prop="cyclefrequencycount" />
-      <el-table-column label=" 鏈夋晥鏈熷ぉ鏁� " align="center" prop="termvalidityday" />
-      <el-table-column label=" 鏈夋晥鏈熻鍒�;1.褰撳ぉ 2.鎻愬墠 3.寤惰繜 4.鎻愬墠鎴栧欢杩� " align="center" prop="termvalidityrule" />
-      <el-table-column label=" 鏈夋晥鏈熷墠鎻愰啋澶╂暟 " align="center" prop="termvaliditytipsday" />
-      <el-table-column label=" 鏈夋晥鏈熸彁閱掑綋澶╁叿浣撴椂闂� " align="center" prop="termvaliditytipstime" />
-      <el-table-column label=" 鍏宠仈缂栧彿 绉戝&椤圭洰 " align="center" prop="relationid" />
+      <el-table-column label=" 浠诲姟绫诲瀷 " align="center" prop="tasktype" />
+      <el-table-column label=" 鏄惁鍛ㄦ湡浠诲姟 " align="center" prop="iscycle" />
+      <el-table-column label=" 璁″垝鎵ц绫诲瀷 " align="center" prop="planexecutetype" />
+      <el-table-column label=" 璁″垝鎵ц鏄惁瀹炴椂 " align="center" prop="isrealtime" />
       <el-table-column label=" 浠嬬粛&鎻愰啋鍐呭 " align="center" prop="content" />
-      <el-table-column label=" 鎻愮ず鍐呭 " align="center" prop="tipscontent" />
-      <el-table-column label=" 鏈夐檺鏈熼檺/澶� " align="center" prop="limitedday" />
-      <el-table-column label=" 閫炬湡鍒ゆ柇澶╂暟 " align="center" prop="overdueday" />
-      <el-table-column label=" 閫炬湡鍓嶆彁閱掑ぉ鏁� " align="center" prop="overduetipsday" />
-      <el-table-column label=" 澶辫鍒ゆ柇澶╂暟 " align="center" prop="lossday" />
-      <el-table-column label=" 鎵ц鏂瑰紡;1.寰俊/鐭俊 2.AI鐢佃瘽 3.涓嶈嚜鍔ㄥ彂閫� 4.寰俊 5.鐭俊 6.浼佷笟寰俊 7.浼佷笟寰俊缇� 8.閽夐拤 9.閽夐拤缇� 10.椋炰功 11.椋炰功缇� " align="center" prop="executetype" />
-      <el-table-column label=" 鎵ц妯℃澘 寰俊&AI澶栧懠妯℃澘 " align="center" prop="executetemplate" />
-      <el-table-column label=" 棰濆鎵ц妯℃澘 鐭俊妯℃澘 " align="center" prop="executetemplateextra" />
-      <el-table-column label=" 鎵ц椤哄簭;1.寰俊浼樺厛 2.鐭俊浼樺厛 3.鍚屾椂鍙戦�� " align="center" prop="executeorder" />
-      <el-table-column label=" 鎵ц璇煶绫诲瀷;1.褰曢煶 2.TTS " align="center" prop="executevoicetype" />
+      <el-table-column label=" 鎵ц鏂瑰紡 "
+        align="center" prop="executetype" />
+      <el-table-column label=" 鎵ц妯℃澘 " align="center" prop="executetemplate" />
+      <el-table-column label=" 棰濆鎵ц妯℃澘 " align="center" prop="executetemplateextra" />
+      <el-table-column label=" 鎵ц椤哄簭 " align="center" prop="executeorder" />
+      <el-table-column label=" 鎵ц璇煶绫诲瀷 " align="center" prop="executevoicetype" />
       <el-table-column label=" 褰曢煶鏂囦欢&TTS鍙傛暟 " align="center" prop="executevoicecontent" />
       <el-table-column label=" 鎻愰啋鍖绘姢浜哄憳ID" align="center" prop="exeutetipspersonid" />
       <el-table-column label=" 鏈烘瀯ID " align="center" prop="orgid" />
-      <el-table-column label=" 涓婁紶鏍囪 " align="center" prop="isupload" />
-      <el-table-column label=" 涓婁紶鏃堕棿 " align="center" prop="uploadTime" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.uploadTime, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label=" 鏄惁鏈湴 " align="center" prop="islocal" />
       <el-table-column label=" 鍏宠仈椤圭洰绫诲瀷;1.妫�鏌� 2.妫�楠� " align="center" prop="relationtype" />
       <el-table-column label=" 璇煶鍚堟垚鍘傚晢 " align="center" prop="voicemanufacturers" />
-      <el-table-column label=" 璇煶鍚堟垚閰嶇疆 " align="center" prop="voiceconfig" />
-      <el-table-column label=" 瀹屾垚鏉′欢;1閫氳瘽鐘舵��  2澶嶆牳鐘舵�� " align="center" prop="completecondition" />
       <el-table-column label=" 瀹屾垚鏉′欢瀵瑰簲鐘舵�� " align="center" prop="completeconditionstate" />
-      <el-table-column label=" 鍏宠仈缂栧彿 绉戝&椤圭洰(澶氶��) " align="center" prop="relationlistid" />
-      <el-table-column label=" 鍏宠仈浠g爜 闂嵎&瀹f暀 " align="center" prop="relationcode" />
       <el-table-column label=" 鏄惁瀛樺湪閲嶅彂鏍囪 " align="center" prop="isrepeat" />
       <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="handleUpdate(scope.row)"
-            v-hasPermi="['smartor:schemetaskconfig:edit']"
-          >淇敼</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['smartor:schemetaskconfig:remove']"
-          >鍒犻櫎</el-button>
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+            v-hasPermi="['smartor:schemetaskconfig:edit']">淇敼</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+            v-hasPermi="['smartor:schemetaskconfig:remove']">鍒犻櫎</el-button>
         </template>
       </el-table-column>
     </el-table>
-    
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
+
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+      @pagination="getList" />
 
     <!-- 娣诲姞鎴栦慨鏀规柟妗堜换鍔¢厤缃璇濇 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+    <el-dialog :title="title" :visible.sync="open" :show-close="true" :close-on-click-modal="false" width="1000px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" :inline="true" label-width="120px">
         <el-form-item label=" 鏂规ID " prop="schemeid">
           <el-input v-model="form.schemeid" placeholder="璇疯緭鍏� 鏂规ID " />
         </el-form-item>
@@ -415,25 +91,25 @@
         <el-form-item label=" 瑙﹀彂瑙勫垯ID " prop="triggerruleid">
           <el-input v-model="form.triggerruleid" placeholder="璇疯緭鍏� 瑙﹀彂瑙勫垯ID " />
         </el-form-item>
-        <el-form-item label=" 鏄惁鍛ㄦ湡浠诲姟;0.鍚� 1.鏄� " prop="iscycle">
+        <el-form-item label=" 鏄惁鍛ㄦ湡浠诲姟 " prop="iscycle">
           <el-input v-model="form.iscycle" placeholder="璇疯緭鍏� 鏄惁鍛ㄦ湡浠诲姟;0.鍚� 1.鏄� " />
         </el-form-item>
         <el-form-item label=" 璁″垝鎵ц鏃堕棿鏁板�� " prop="planexecutevalue">
           <el-input v-model="form.planexecutevalue" placeholder="璇疯緭鍏� 璁″垝鎵ц鏃堕棿鏁板�� " />
         </el-form-item>
-        <el-form-item label=" 璁″垝鎵ц鏃堕棿鍗曚綅;1.澶� 2.鍛� 3.鏈� 4.骞� " prop="planexecuteunit">
+        <el-form-item label=" 璁″垝鎵ц鏃堕棿鍗曚綅 " prop="planexecuteunit">
           <el-input v-model="form.planexecuteunit" placeholder="璇疯緭鍏� 璁″垝鎵ц鏃堕棿鍗曚綅;1.澶� 2.鍛� 3.鏈� 4.骞� " />
         </el-form-item>
         <el-form-item label=" 璁″垝鎵ц鍏蜂綋鏃堕棿 " prop="planexecutetime">
           <el-input v-model="form.planexecutetime" placeholder="璇疯緭鍏� 璁″垝鎵ц鍏蜂綋鏃堕棿 " />
         </el-form-item>
-        <el-form-item label=" 璁″垝鎵ц鏄惁瀹炴椂;0.瀹氭椂 1.瀹炴椂 " prop="isrealtime">
+        <el-form-item label=" 璁″垝鎵ц鏄惁瀹炴椂 " prop="isrealtime">
           <el-input v-model="form.isrealtime" placeholder="璇疯緭鍏� 璁″垝鎵ц鏄惁瀹炴椂;0.瀹氭椂 1.瀹炴椂 " />
         </el-form-item>
         <el-form-item label=" 鍛ㄦ湡棰戠巼 " prop="cyclefrequency">
           <el-input v-model="form.cyclefrequency" placeholder="璇疯緭鍏� 鍛ㄦ湡棰戠巼 " />
         </el-form-item>
-        <el-form-item label=" 鍛ㄦ湡棰戠巼鍗曚綅;1.澶� 2.鍛� 3.鏈� 4.骞� " prop="cyclefrequencyunit">
+        <el-form-item label=" 鍛ㄦ湡棰戠巼鍗曚綅 " prop="cyclefrequencyunit">
           <el-input v-model="form.cyclefrequencyunit" placeholder="璇疯緭鍏� 鍛ㄦ湡棰戠巼鍗曚綅;1.澶� 2.鍛� 3.鏈� 4.骞� " />
         </el-form-item>
         <el-form-item label=" 鍛ㄦ湡棰戠巼娆℃暟 " prop="cyclefrequencycount">
@@ -442,7 +118,7 @@
         <el-form-item label=" 鏈夋晥鏈熷ぉ鏁� " prop="termvalidityday">
           <el-input v-model="form.termvalidityday" placeholder="璇疯緭鍏� 鏈夋晥鏈熷ぉ鏁� " />
         </el-form-item>
-        <el-form-item label=" 鏈夋晥鏈熻鍒�;1.褰撳ぉ 2.鎻愬墠 3.寤惰繜 4.鎻愬墠鎴栧欢杩� " prop="termvalidityrule">
+        <el-form-item label=" 鏈夋晥鏈熻鍒� " prop="termvalidityrule">
           <el-input v-model="form.termvalidityrule" placeholder="璇疯緭鍏� 鏈夋晥鏈熻鍒�;1.褰撳ぉ 2.鎻愬墠 3.寤惰繜 4.鎻愬墠鎴栧欢杩� " />
         </el-form-item>
         <el-form-item label=" 鏈夋晥鏈熷墠鎻愰啋澶╂暟 " prop="termvaliditytipsday">
@@ -455,10 +131,10 @@
           <el-input v-model="form.relationid" placeholder="璇疯緭鍏� 鍏宠仈缂栧彿 绉戝&椤圭洰 " />
         </el-form-item>
         <el-form-item label=" 浠嬬粛&鎻愰啋鍐呭 ">
-          <editor v-model="form.content" :min-height="192"/>
+          <el-input v-model="form.content" placeholder="璇疯緭鍏� 浠嬬粛&鎻愰啋鍐呭 " />
         </el-form-item>
         <el-form-item label=" 鎻愮ず鍐呭 ">
-          <editor v-model="form.tipscontent" :min-height="192"/>
+          <el-input v-model="form.tipscontent" placeholder="璇疯緭鍏� 鎻愮ず鍐呭 " />
         </el-form-item>
         <el-form-item label=" 鏈夐檺鏈熼檺/澶� " prop="limitedday">
           <el-input v-model="form.limitedday" placeholder="璇疯緭鍏� 鏈夐檺鏈熼檺/澶� " />
@@ -472,20 +148,20 @@
         <el-form-item label=" 澶辫鍒ゆ柇澶╂暟 " prop="lossday">
           <el-input v-model="form.lossday" placeholder="璇疯緭鍏� 澶辫鍒ゆ柇澶╂暟 " />
         </el-form-item>
-        <el-form-item label=" 鎵ц妯℃澘 寰俊&AI澶栧懠妯℃澘 " prop="executetemplate">
+        <el-form-item label=" 鎵ц妯℃澘 " prop="executetemplate">
           <el-input v-model="form.executetemplate" placeholder="璇疯緭鍏� 鎵ц妯℃澘 寰俊&AI澶栧懠妯℃澘 " />
         </el-form-item>
-        <el-form-item label=" 棰濆鎵ц妯℃澘 鐭俊妯℃澘 " prop="executetemplateextra">
+        <el-form-item label=" 棰濆鎵ц妯℃澘 " prop="executetemplateextra">
           <el-input v-model="form.executetemplateextra" placeholder="璇疯緭鍏� 棰濆鎵ц妯℃澘 鐭俊妯℃澘 " />
         </el-form-item>
-        <el-form-item label=" 鎵ц椤哄簭;1.寰俊浼樺厛 2.鐭俊浼樺厛 3.鍚屾椂鍙戦�� " prop="executeorder">
+        <el-form-item label=" 鎵ц椤哄簭 " prop="executeorder">
           <el-input v-model="form.executeorder" placeholder="璇疯緭鍏� 鎵ц椤哄簭;1.寰俊浼樺厛 2.鐭俊浼樺厛 3.鍚屾椂鍙戦�� " />
         </el-form-item>
         <el-form-item label=" 褰曢煶鏂囦欢&TTS鍙傛暟 ">
-          <editor v-model="form.executevoicecontent" :min-height="192"/>
+          <el-input v-model="form.executevoicecontent" placeholder="璇疯緭鍏� 褰曢煶鏂囦欢&TTS鍙傛暟 " />
         </el-form-item>
         <el-form-item label=" 鎻愰啋鍖绘姢浜哄憳ID" prop="exeutetipspersonid">
-          <el-input v-model="form.exeutetipspersonid" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" />
+          <el-input v-model="form.exeutetipspersonid" placeholder="璇疯緭鍏� 鎻愰啋鍖绘姢浜哄憳ID " />
         </el-form-item>
         <el-form-item label=" 鏈烘瀯ID " prop="orgid">
           <el-input v-model="form.orgid" placeholder="璇疯緭鍏� 鏈烘瀯ID " />
@@ -493,39 +169,25 @@
         <el-form-item label=" 鍒犻櫎鏍囪 " prop="delFlag">
           <el-input v-model="form.delFlag" placeholder="璇疯緭鍏� 鍒犻櫎鏍囪 " />
         </el-form-item>
-        <el-form-item label=" 涓婁紶鏍囪 " prop="isupload">
-          <el-input v-model="form.isupload" placeholder="璇疯緭鍏� 涓婁紶鏍囪 " />
-        </el-form-item>
-        <el-form-item label=" 涓婁紶鏃堕棿 " prop="uploadTime">
-          <el-date-picker clearable
-            v-model="form.uploadTime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="璇烽�夋嫨 涓婁紶鏃堕棿 ">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label=" 鏄惁鏈湴 " prop="islocal">
-          <el-input v-model="form.islocal" placeholder="璇疯緭鍏� 鏄惁鏈湴 " />
-        </el-form-item>
         <el-form-item label=" 璇煶鍚堟垚鍘傚晢 " prop="voicemanufacturers">
           <el-input v-model="form.voicemanufacturers" placeholder="璇疯緭鍏� 璇煶鍚堟垚鍘傚晢 " />
         </el-form-item>
         <el-form-item label=" 璇煶鍚堟垚閰嶇疆 " prop="voiceconfig">
           <el-input v-model="form.voiceconfig" placeholder="璇疯緭鍏� 璇煶鍚堟垚閰嶇疆 " />
         </el-form-item>
-        <el-form-item label=" 瀹屾垚鏉′欢;1閫氳瘽鐘舵��  2澶嶆牳鐘舵�� " prop="completecondition">
+        <el-form-item label=" 瀹屾垚鏉′欢 " prop="completecondition">
           <el-input v-model="form.completecondition" placeholder="璇疯緭鍏� 瀹屾垚鏉′欢;1閫氳瘽鐘舵��  2澶嶆牳鐘舵�� " />
         </el-form-item>
         <el-form-item label=" 瀹屾垚鏉′欢瀵瑰簲鐘舵�� " prop="completeconditionstate">
           <el-input v-model="form.completeconditionstate" placeholder="璇疯緭鍏� 瀹屾垚鏉′欢瀵瑰簲鐘舵�� " />
         </el-form-item>
-        <el-form-item label=" 鍏宠仈缂栧彿 绉戝&椤圭洰(澶氶��) " prop="relationlistid">
+        <el-form-item label=" 鍏宠仈缂栧彿 " prop="relationlistid">
           <el-input v-model="form.relationlistid" placeholder="璇疯緭鍏� 鍏宠仈缂栧彿 绉戝&椤圭洰(澶氶��) " />
         </el-form-item>
-        <el-form-item label=" 鍏宠仈浠g爜 闂嵎&瀹f暀 " prop="relationcode">
+        <el-form-item label=" 鍏宠仈浠g爜 " prop="relationcode">
           <el-input v-model="form.relationcode" placeholder="璇疯緭鍏� 鍏宠仈浠g爜 闂嵎&瀹f暀 " />
         </el-form-item>
-        <el-form-item label=" 鏄惁瀛樺湪閲嶅彂鏍囪 " prop="isrepeat">
+        <el-form-item label=" 鏄惁閲嶅彂 " prop="isrepeat">
           <el-input v-model="form.isrepeat" placeholder="璇疯緭鍏� 鏄惁瀛樺湪閲嶅彂鏍囪 " />
         </el-form-item>
       </el-form>
@@ -709,7 +371,7 @@
     // 澶氶�夋閫変腑鏁版嵁
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
     /** 鏂板鎸夐挳鎿嶄綔 */
@@ -751,12 +413,12 @@
     /** 鍒犻櫎鎸夐挳鎿嶄綔 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('鏄惁纭鍒犻櫎鏂规浠诲姟閰嶇疆缂栧彿涓�"' + ids + '"鐨勬暟鎹」锛�').then(function() {
+      this.$modal.confirm('鏄惁纭鍒犻櫎鏂规浠诲姟閰嶇疆缂栧彿涓�"' + ids + '"鐨勬暟鎹」锛�').then(function () {
         return delSchemetaskconfig(ids);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
-      }).catch(() => {});
+      }).catch(() => { });
     },
     /** 瀵煎嚭鎸夐挳鎿嶄綔 */
     handleExport() {
diff --git a/ruoyi-ui/src/views/smartor/schemetaskrecord/index.vue b/ruoyi-ui/src/views/smartor/schemetaskrecord/index.vue
index 205839f..e769b4c 100644
--- a/ruoyi-ui/src/views/smartor/schemetaskrecord/index.vue
+++ b/ruoyi-ui/src/views/smartor/schemetaskrecord/index.vue
@@ -2,132 +2,19 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label=" 浠诲姟ID " prop="taskid">
-        <el-input
-          v-model="queryParams.taskid"
-          placeholder="璇疯緭鍏� 浠诲姟ID "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.taskid" placeholder="璇疯緭鍏� 浠诲姟ID " clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label=" 鏈烘瀯ID " prop="orgid">
-        <el-input
-          v-model="queryParams.orgid"
-          placeholder="璇疯緭鍏� 鏈烘瀯ID "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" 涓婁紶鏍囪 " prop="isupload">
-        <el-input
-          v-model="queryParams.isupload"
-          placeholder="璇疯緭鍏� 涓婁紶鏍囪 "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" 涓婁紶鏃堕棿 " prop="uploadTime">
-        <el-date-picker clearable
-          v-model="queryParams.uploadTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="璇烽�夋嫨 涓婁紶鏃堕棿 ">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label=" 鍏宠仈ID;闂嵎缁撴灉ID " prop="relationid">
-        <el-input
-          v-model="queryParams.relationid"
-          placeholder="璇疯緭鍏� 鍏宠仈ID;闂嵎缁撴灉ID "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" 鍙戦�佹椂闂�/澶栧懠鏃堕棿/闅忚鏃堕棿 " prop="sendtime">
-        <el-date-picker clearable
-          v-model="queryParams.sendtime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="璇烽�夋嫨 鍙戦�佹椂闂�/澶栧懠鏃堕棿/闅忚鏃堕棿 ">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label=" 鎿嶄綔浜�/闅忚浜�/澶嶆牳浜� " prop="operator">
-        <el-input
-          v-model="queryParams.operator"
-          placeholder="璇疯緭鍏� 鎿嶄綔浜�/闅忚浜�/澶嶆牳浜� "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" 鍥炲鏃堕棿/鎸傛柇鏃堕棿 " prop="replytime">
-        <el-date-picker clearable
-          v-model="queryParams.replytime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="璇烽�夋嫨 鍥炲鏃堕棿/鎸傛柇鏃堕棿 ">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label=" 澶嶆牳鏃堕棿 " prop="reviewtime">
-        <el-date-picker clearable
-          v-model="queryParams.reviewtime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="璇烽�夋嫨 澶嶆牳鏃堕棿 ">
-        </el-date-picker>
+        <el-input v-model="queryParams.orgid" placeholder="璇疯緭鍏� 鏈烘瀯ID " clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label=" 鐘舵�� " prop="state">
-        <el-input
-          v-model="queryParams.state"
-          placeholder="璇疯緭鍏� 鐘舵�� "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" 澶嶆牳鐘舵��;0寰呭鏍� 1鎴愬姛 2澶辫触 " prop="reviewstate">
-        <el-input
-          v-model="queryParams.reviewstate"
-          placeholder="璇疯緭鍏� 澶嶆牳鐘舵��;0寰呭鏍� 1鎴愬姛 2澶辫触 "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.state" placeholder="璇疯緭鍏� 鐘舵�� " clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label=" 鍏宠仈鍦烘櫙ID " prop="sceneid">
-        <el-input
-          v-model="queryParams.sceneid"
-          placeholder="璇疯緭鍏� 鍏宠仈鍦烘櫙ID "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" 鏍囪瘑 " prop="uuid">
-        <el-input
-          v-model="queryParams.uuid"
-          placeholder="璇疯緭鍏� 鏍囪瘑 "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" 鍙戦�佺殑鐩爣鍙风爜" prop="sendphone">
-        <el-input
-          v-model="queryParams.sendphone"
-          placeholder="璇疯緭鍏� 鍙戦�佺殑鐩爣鍙风爜"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.sceneid" placeholder="璇疯緭鍏� 鍏宠仈鍦烘櫙ID " clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label=" 鏄惁鍐嶆鎵ц " prop="isagain">
-        <el-input
-          v-model="queryParams.isagain"
-          placeholder="璇疯緭鍏� 鏄惁鍐嶆鎵ц "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" 鍧愬腑ID " prop="seatsid">
-        <el-input
-          v-model="queryParams.seatsid"
-          placeholder="璇疯緭鍏� 鍧愬腑ID "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.isagain" placeholder="璇疯緭鍏� 鏄惁鍐嶆鎵ц " clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
@@ -137,46 +24,20 @@
 
     <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="['smartor:schemetaskrecord:add']"
-        >鏂板</el-button>
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+          v-hasPermi="['smartor:schemetaskrecord:add']">鏂板</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['smartor:schemetaskrecord:edit']"
-        >淇敼</el-button>
+        <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
+          v-hasPermi="['smartor:schemetaskrecord:edit']">淇敼</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['smartor:schemetaskrecord:remove']"
-        >鍒犻櫎</el-button>
+        <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
+          v-hasPermi="['smartor:schemetaskrecord:remove']">鍒犻櫎</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['smartor:schemetaskrecord:export']"
-        >瀵煎嚭</el-button>
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
+          v-hasPermi="['smartor:schemetaskrecord:export']">瀵煎嚭</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
@@ -184,20 +45,21 @@
     <el-table v-loading="loading" :data="schemetaskrecordList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label=" 鑷ID " align="center" prop="id" />
-      <el-table-column label=" 绫诲瀷;0.浜哄伐 1.寰俊 2.鐭俊 3.AI鐢佃瘽 " align="center" prop="recordtype" />
+      <el-table-column label=" 绫诲瀷 " align="center" prop="recordtype">
+        <template slot-scope="scope">
+          <el-select v-model="scope.row.reviewtime">
+            <el-option value='0'>浜哄伐</el-option>
+            <el-option value='1'>寰俊</el-option>
+            <el-option value='2'>鐭俊</el-option>
+            <el-option value='3'>AI鐢佃瘽</el-option></el-select>
+        </template></el-table-column>
       <el-table-column label=" 浠诲姟ID " align="center" prop="taskid" />
       <el-table-column label=" 缁撴灉 " align="center" prop="result" />
-      <el-table-column label=" 澶囨敞 " align="center" prop="remark" />
       <el-table-column label=" 鏈烘瀯ID " align="center" prop="orgid" />
-      <el-table-column label=" 涓婁紶鏍囪 " align="center" prop="isupload" />
-      <el-table-column label=" 涓婁紶鏃堕棿 " align="center" prop="uploadTime" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.uploadTime, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label=" 鍏宠仈ID;闂嵎缁撴灉ID " align="center" prop="relationid" />
-      <el-table-column label=" 娓犻亾绫诲瀷;榛樿0  绫诲瀷涓哄井淇�/鐭俊鏃�-1.寰俊 2鐭俊 " align="center" prop="channeltype" />
-      <el-table-column label=" 鍙戦�佹椂闂�/澶栧懠鏃堕棿/闅忚鏃堕棿 " align="center" prop="sendtime" width="180">
+      <el-table-column label=" 澶囨敞 " align="center" prop="remark" />
+      <el-table-column label=" 闂嵎缁撴灉ID " align="center" prop="relationid" />
+      <el-table-column label=" 娓犻亾绫诲瀷 " align="center" prop="channeltype" />
+      <el-table-column label=" 鍙戦�佹椂闂� " align="center" prop="sendtime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.sendtime, '{y}-{m}-{d}') }}</span>
         </template>
@@ -214,7 +76,7 @@
         </template>
       </el-table-column>
       <el-table-column label=" 鐘舵�� " align="center" prop="state" />
-      <el-table-column label=" 澶嶆牳鐘舵��;0寰呭鏍� 1鎴愬姛 2澶辫触 " align="center" prop="reviewstate" />
+      <el-table-column label=" 澶嶆牳鐘舵�� " align="center" prop="reviewstate" />
       <el-table-column label=" 鍏宠仈鍦烘櫙ID " align="center" prop="sceneid" />
       <el-table-column label=" 鏍囪瘑 " align="center" prop="uuid" />
       <el-table-column label=" 鍙戦�佺殑鐩爣鍙风爜" align="center" prop="sendphone" />
@@ -223,112 +85,106 @@
       <el-table-column label=" 鎵嬪姩澶勭悊绫诲瀷 " align="center" prop="handletype" />
       <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="handleUpdate(scope.row)"
-            v-hasPermi="['smartor:schemetaskrecord:edit']"
-          >淇敼</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['smartor:schemetaskrecord:remove']"
-          >鍒犻櫎</el-button>
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+            v-hasPermi="['smartor:schemetaskrecord:edit']">淇敼</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+            v-hasPermi="['smartor:schemetaskrecord:remove']">鍒犻櫎</el-button>
         </template>
       </el-table-column>
     </el-table>
-    
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
+
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+      @pagination="getList" />
 
     <!-- 娣诲姞鎴栦慨鏀规柟妗堜换鍔″鐞嗚褰曞璇濇 -->
-    <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=" 浠诲姟ID " prop="taskid">
-          <el-input v-model="form.taskid" placeholder="璇疯緭鍏� 浠诲姟ID " />
-        </el-form-item>
-        <el-form-item label=" 缁撴灉 " prop="result">
-          <el-input v-model="form.result" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" />
-        </el-form-item>
-        <el-form-item label=" 澶囨敞 " prop="remark">
-          <el-input v-model="form.remark" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" />
-        </el-form-item>
-        <el-form-item label=" 鏈烘瀯ID " prop="orgid">
-          <el-input v-model="form.orgid" placeholder="璇疯緭鍏� 鏈烘瀯ID " />
-        </el-form-item>
-        <el-form-item label=" 鍒犻櫎鏍囪 " prop="delFlag">
-          <el-input v-model="form.delFlag" placeholder="璇疯緭鍏� 鍒犻櫎鏍囪 " />
-        </el-form-item>
-        <el-form-item label=" 涓婁紶鏍囪 " prop="isupload">
-          <el-input v-model="form.isupload" placeholder="璇疯緭鍏� 涓婁紶鏍囪 " />
-        </el-form-item>
-        <el-form-item label=" 涓婁紶鏃堕棿 " prop="uploadTime">
-          <el-date-picker clearable
-            v-model="form.uploadTime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="璇烽�夋嫨 涓婁紶鏃堕棿 ">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label=" 鍏宠仈ID;闂嵎缁撴灉ID " prop="relationid">
-          <el-input v-model="form.relationid" placeholder="璇疯緭鍏� 鍏宠仈ID;闂嵎缁撴灉ID " />
-        </el-form-item>
-        <el-form-item label=" 鍙戦�佹椂闂�/澶栧懠鏃堕棿/闅忚鏃堕棿 " prop="sendtime">
-          <el-date-picker clearable
-            v-model="form.sendtime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="璇烽�夋嫨 鍙戦�佹椂闂�/澶栧懠鏃堕棿/闅忚鏃堕棿 ">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label=" 鎿嶄綔浜�/闅忚浜�/澶嶆牳浜� " prop="operator">
-          <el-input v-model="form.operator" placeholder="璇疯緭鍏� 鎿嶄綔浜�/闅忚浜�/澶嶆牳浜� " />
-        </el-form-item>
-        <el-form-item label=" 鍥炲鏃堕棿/鎸傛柇鏃堕棿 " prop="replytime">
-          <el-date-picker clearable
-            v-model="form.replytime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="璇烽�夋嫨 鍥炲鏃堕棿/鎸傛柇鏃堕棿 ">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label=" 澶嶆牳鏃堕棿 " prop="reviewtime">
-          <el-date-picker clearable
-            v-model="form.reviewtime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="璇烽�夋嫨 澶嶆牳鏃堕棿 ">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label=" 鐘舵�� " prop="state">
-          <el-input v-model="form.state" placeholder="璇疯緭鍏� 鐘舵�� " />
-        </el-form-item>
-        <el-form-item label=" 澶嶆牳鐘舵��;0寰呭鏍� 1鎴愬姛 2澶辫触 " prop="reviewstate">
-          <el-input v-model="form.reviewstate" placeholder="璇疯緭鍏� 澶嶆牳鐘舵��;0寰呭鏍� 1鎴愬姛 2澶辫触 " />
-        </el-form-item>
-        <el-form-item label=" 鍏宠仈鍦烘櫙ID " prop="sceneid">
-          <el-input v-model="form.sceneid" placeholder="璇疯緭鍏� 鍏宠仈鍦烘櫙ID " />
-        </el-form-item>
-        <el-form-item label=" 鏍囪瘑 " prop="uuid">
-          <el-input v-model="form.uuid" placeholder="璇疯緭鍏� 鏍囪瘑 " />
-        </el-form-item>
-        <el-form-item label=" 鍙戦�佺殑鐩爣鍙风爜" prop="sendphone">
-          <el-input v-model="form.sendphone" placeholder="璇疯緭鍏� 鍙戦�佺殑鐩爣鍙风爜" />
-        </el-form-item>
-        <el-form-item label=" 鏄惁鍐嶆鎵ц " prop="isagain">
-          <el-input v-model="form.isagain" placeholder="璇疯緭鍏� 鏄惁鍐嶆鎵ц " />
-        </el-form-item>
-        <el-form-item label=" 鍧愬腑ID " prop="seatsid">
-          <el-input v-model="form.seatsid" placeholder="璇疯緭鍏� 鍧愬腑ID " />
-        </el-form-item>
+    <el-dialog :title="title" :visible.sync="open" :show-close="true" :close-on-click-modal="false" width="1000px"
+      append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" :inline="true" label-width="120px">
+        <el-row>
+          <el-col :span="12"><el-form-item label=" 浠诲姟ID " prop="taskid">
+              <el-input v-model="form.taskid" placeholder="璇疯緭鍏� 浠诲姟ID " />
+            </el-form-item></el-col>
+          <el-col :span="12"><el-form-item label=" 缁撴灉 " prop="result">
+              <el-input v-model="form.result" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" />
+            </el-form-item></el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12"><el-form-item label=" 澶囨敞 " prop="remark">
+              <el-input v-model="form.remark" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" />
+            </el-form-item></el-col>
+          <el-col :span="12"><el-form-item label=" 鏈烘瀯ID " prop="orgid">
+              <el-input v-model="form.orgid" placeholder="璇疯緭鍏� 鏈烘瀯ID " />
+            </el-form-item></el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12"><el-form-item label=" 鍒犻櫎鏍囪 " prop="delFlag">
+              <el-input v-model="form.delFlag" placeholder="璇疯緭鍏� 鍒犻櫎鏍囪 " />
+            </el-form-item></el-col>
+          <el-col :span="12"><el-form-item label=" 涓婁紶鏍囪 " prop="isupload">
+              <el-input v-model="form.isupload" placeholder="璇疯緭鍏� 涓婁紶鏍囪 " />
+            </el-form-item></el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12"><el-form-item label=" 涓婁紶鏃堕棿 " prop="uploadTime">
+              <el-date-picker clearable v-model="form.uploadTime" type="date" value-format="yyyy-MM-dd"
+                placeholder="璇烽�夋嫨 涓婁紶鏃堕棿 ">
+              </el-date-picker>
+            </el-form-item></el-col>
+          <el-col :span="12"><el-form-item label=" 闂嵎缁撴灉ID " prop="relationid">
+              <el-input v-model="form.relationid" placeholder="璇疯緭鍏� 鍏宠仈ID;闂嵎缁撴灉ID " />
+            </el-form-item></el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12"><el-form-item label=" 鍙戦�佹椂闂� " prop="sendtime">
+              <el-date-picker clearable v-model="form.sendtime" type="date" value-format="yyyy-MM-dd"
+                placeholder="璇烽�夋嫨 鍙戦�佹椂闂�/澶栧懠鏃堕棿/闅忚鏃堕棿 ">
+              </el-date-picker>
+            </el-form-item></el-col>
+          <el-col :span="12"><el-form-item label=" 鎿嶄綔浜� " prop="operator">
+              <el-input v-model="form.operator" placeholder="璇疯緭鍏� 鎿嶄綔浜�/闅忚浜�/澶嶆牳浜� " />
+            </el-form-item></el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12"><el-form-item label=" 鍥炲鏃堕棿/鎸傛柇鏃堕棿 " prop="replytime">
+              <el-date-picker clearable v-model="form.replytime" type="date" value-format="yyyy-MM-dd"
+                placeholder="璇烽�夋嫨 鍥炲鏃堕棿/鎸傛柇鏃堕棿 ">
+              </el-date-picker>
+            </el-form-item></el-col>
+          <el-col :span="12"><el-form-item label=" 澶嶆牳鏃堕棿 " prop="reviewtime">
+              <el-date-picker clearable v-model="form.reviewtime" type="date" value-format="yyyy-MM-dd"
+                placeholder="璇烽�夋嫨 澶嶆牳鏃堕棿 ">
+              </el-date-picker>
+            </el-form-item></el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12"><el-form-item label=" 鐘舵�� " prop="state">
+              <el-input v-model="form.state" placeholder="璇疯緭鍏� 鐘舵�� " />
+            </el-form-item></el-col>
+          <el-col :span="12"><el-form-item label=" 澶嶆牳鐘舵�� " prop="reviewstate">
+              <el-input v-model="form.reviewstate" placeholder="璇疯緭鍏� 澶嶆牳鐘舵��;0寰呭鏍� 1鎴愬姛 2澶辫触 " />
+            </el-form-item></el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12"><el-form-item label=" 鍏宠仈鍦烘櫙ID " prop="sceneid">
+              <el-input v-model="form.sceneid" placeholder="璇疯緭鍏� 鍏宠仈鍦烘櫙ID " />
+            </el-form-item></el-col>
+          <el-col :span="12"><el-form-item label=" 鏍囪瘑 " prop="uuid">
+              <el-input v-model="form.uuid" placeholder="璇疯緭鍏� 鏍囪瘑 " />
+            </el-form-item></el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12"><el-form-item label=" 鍙戦�佺殑鐩爣鍙风爜" prop="sendphone">
+              <el-input v-model="form.sendphone" placeholder="璇疯緭鍏� 鍙戦�佺殑鐩爣鍙风爜" />
+            </el-form-item></el-col>
+          <el-col :span="12"><el-form-item label=" 鏄惁鍐嶆鎵ц " prop="isagain">
+              <el-input v-model="form.isagain" placeholder="璇疯緭鍏� 鏄惁鍐嶆鎵ц " />
+            </el-form-item></el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12"><el-form-item label=" 鍧愬腑ID " prop="seatsid">
+              <el-input v-model="form.seatsid" placeholder="璇疯緭鍏� 鍧愬腑ID " />
+            </el-form-item></el-col>
+        </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
@@ -465,7 +321,7 @@
     // 澶氶�夋閫変腑鏁版嵁
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
     /** 鏂板鎸夐挳鎿嶄綔 */
@@ -507,12 +363,12 @@
     /** 鍒犻櫎鎸夐挳鎿嶄綔 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('鏄惁纭鍒犻櫎鏂规浠诲姟澶勭悊璁板綍缂栧彿涓�"' + ids + '"鐨勬暟鎹」锛�').then(function() {
+      this.$modal.confirm('鏄惁纭鍒犻櫎鏂规浠诲姟澶勭悊璁板綍缂栧彿涓�"' + ids + '"鐨勬暟鎹」锛�').then(function () {
         return delSchemetaskrecord(ids);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
-      }).catch(() => {});
+      }).catch(() => { });
     },
     /** 瀵煎嚭鎸夐挳鎿嶄綔 */
     handleExport() {
diff --git a/ruoyi-ui/src/views/smartor/schemetaskrepeatconfig/index.vue b/ruoyi-ui/src/views/smartor/schemetaskrepeatconfig/index.vue
index 661e446..51f096e 100644
--- a/ruoyi-ui/src/views/smartor/schemetaskrepeatconfig/index.vue
+++ b/ruoyi-ui/src/views/smartor/schemetaskrepeatconfig/index.vue
@@ -2,100 +2,18 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label=" 鏂规ID " prop="schemeid">
-        <el-input
-          v-model="queryParams.schemeid"
-          placeholder="璇疯緭鍏� 鏂规ID "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.schemeid" placeholder="璇疯緭鍏� 鏂规ID " clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label=" 瑙﹀彂鍦烘櫙ID " prop="triggersceneid">
-        <el-input
-          v-model="queryParams.triggersceneid"
-          placeholder="璇疯緭鍏� 瑙﹀彂鍦烘櫙ID "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.triggersceneid" placeholder="璇疯緭鍏� 瑙﹀彂鍦烘櫙ID " clearable
+          @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item label=" 瑙﹀彂瑙勫垯ID " prop="triggerruleid">
-        <el-input
-          v-model="queryParams.triggerruleid"
-          placeholder="璇疯緭鍏� 瑙﹀彂瑙勫垯ID "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" 浠诲姟閰嶇疆ID " prop="taskconfigid">
-        <el-input
-          v-model="queryParams.taskconfigid"
-          placeholder="璇疯緭鍏� 浠诲姟閰嶇疆ID "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" 鎵ц澶辫触鏁板�� " prop="executefailvalue">
-        <el-input
-          v-model="queryParams.executefailvalue"
-          placeholder="璇疯緭鍏� 鎵ц澶辫触鏁板�� "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" 鎵ц澶辫触鍗曚綅;1.鍒嗛挓 2.灏忔椂 " prop="executefailunit">
-        <el-input
-          v-model="queryParams.executefailunit"
-          placeholder="璇疯緭鍏� 鎵ц澶辫触鍗曚綅;1.鍒嗛挓 2.灏忔椂 "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" 鎵ц妯℃澘 寰俊&AI澶栧懠妯℃澘 " prop="executetemplate">
-        <el-input
-          v-model="queryParams.executetemplate"
-          placeholder="璇疯緭鍏� 鎵ц妯℃澘 寰俊&AI澶栧懠妯℃澘 "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" 棰濆鎵ц妯℃澘 鐭俊妯℃澘 " prop="executetemplateextra">
-        <el-input
-          v-model="queryParams.executetemplateextra"
-          placeholder="璇疯緭鍏� 棰濆鎵ц妯℃澘 鐭俊妯℃澘 "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" 鎵ц椤哄簭;1.寰俊浼樺厛 2.鐭俊浼樺厛 3.鍚屾椂鍙戦�� " prop="executeorder">
-        <el-input
-          v-model="queryParams.executeorder"
-          placeholder="璇疯緭鍏� 鎵ц椤哄簭;1.寰俊浼樺厛 2.鐭俊浼樺厛 3.鍚屾椂鍙戦�� "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+      <el-form-item label=" 鎵ц椤哄簭 " prop="executeorder">
+        <el-input v-model="queryParams.executeorder" placeholder="璇疯緭鍏� 鎵ц椤哄簭;1.寰俊浼樺厛 2.鐭俊浼樺厛 3.鍚屾椂鍙戦�� " clearable
+          @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label=" 鏈烘瀯ID " prop="orgid">
-        <el-input
-          v-model="queryParams.orgid"
-          placeholder="璇疯緭鍏� 鏈烘瀯ID "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" 涓婁紶鏍囪 " prop="isupload">
-        <el-input
-          v-model="queryParams.isupload"
-          placeholder="璇疯緭鍏� 涓婁紶鏍囪 "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" 涓婁紶鏃堕棿 " prop="uploadTime">
-        <el-date-picker clearable
-          v-model="queryParams.uploadTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="璇烽�夋嫨 涓婁紶鏃堕棿 ">
-        </el-date-picker>
+        <el-input v-model="queryParams.orgid" placeholder="璇疯緭鍏� 鏈烘瀯ID " clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
@@ -105,46 +23,20 @@
 
     <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="['smartor:schemetaskrepeatconfig:add']"
-        >鏂板</el-button>
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+          v-hasPermi="['smartor:schemetaskrepeatconfig:add']">鏂板</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['smartor:schemetaskrepeatconfig:edit']"
-        >淇敼</el-button>
+        <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
+          v-hasPermi="['smartor:schemetaskrepeatconfig:edit']">淇敼</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['smartor:schemetaskrepeatconfig:remove']"
-        >鍒犻櫎</el-button>
+        <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
+          v-hasPermi="['smartor:schemetaskrepeatconfig:remove']">鍒犻櫎</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['smartor:schemetaskrepeatconfig:export']"
-        >瀵煎嚭</el-button>
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
+          v-hasPermi="['smartor:schemetaskrepeatconfig:export']">瀵煎嚭</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
@@ -156,100 +48,81 @@
       <el-table-column label=" 瑙﹀彂鍦烘櫙ID " align="center" prop="triggersceneid" />
       <el-table-column label=" 瑙﹀彂瑙勫垯ID " align="center" prop="triggerruleid" />
       <el-table-column label=" 浠诲姟閰嶇疆ID " align="center" prop="taskconfigid" />
-      <el-table-column label=" 鎵ц鏂瑰紡;1.寰俊/鐭俊 2.AI鐢佃瘽 3.涓嶈嚜鍔ㄥ彂閫� 4.寰俊 5.鐭俊 6.浼佷笟寰俊 7.浼佷笟寰俊缇� 8.閽夐拤 9.閽夐拤缇� 10.椋炰功 11.椋炰功缇� " align="center" prop="executetype" />
-      <el-table-column label=" 鎵ц澶辫触绫诲瀷;1.澶栧懠澶辫触 2.鏃犲洖澶� " align="center" prop="executefailtype" />
+      <el-table-column label=" 鎵ц鏂瑰紡 " align="center" prop="executetype" />
+      <el-table-column label=" 鎵ц澶辫触绫诲瀷 " align="center" prop="executefailtype" />
       <el-table-column label=" 鎵ц澶辫触鏁板�� " align="center" prop="executefailvalue" />
-      <el-table-column label=" 鎵ц澶辫触鍗曚綅;1.鍒嗛挓 2.灏忔椂 " align="center" prop="executefailunit" />
-      <el-table-column label=" 鎵ц妯℃澘 寰俊&AI澶栧懠妯℃澘 " align="center" prop="executetemplate" />
-      <el-table-column label=" 棰濆鎵ц妯℃澘 鐭俊妯℃澘 " align="center" prop="executetemplateextra" />
-      <el-table-column label=" 鎵ц椤哄簭;1.寰俊浼樺厛 2.鐭俊浼樺厛 3.鍚屾椂鍙戦�� " align="center" prop="executeorder" />
-      <el-table-column label=" 鎵ц璇煶绫诲瀷;1.褰曢煶 2.TTS " align="center" prop="executevoicetype" />
+      <el-table-column label=" 鎵ц澶辫触鍗曚綅 " align="center" prop="executefailunit" />
+      <el-table-column label=" 鎵ц妯℃澘 " align="center" prop="executetemplate" />
+      <el-table-column label=" 棰濆鎵ц妯℃澘 " align="center" prop="executetemplateextra" />
+      <el-table-column label=" 鎵ц椤哄簭 " align="center" prop="executeorder" />
+      <el-table-column label=" 鎵ц璇煶绫诲瀷 " align="center" prop="executevoicetype" />
       <el-table-column label=" 褰曢煶鏂囦欢&TTS鍙傛暟 " align="center" prop="executevoicecontent" />
       <el-table-column label=" 鏈烘瀯ID " align="center" prop="orgid" />
-      <el-table-column label=" 涓婁紶鏍囪 " align="center" prop="isupload" />
-      <el-table-column label=" 涓婁紶鏃堕棿 " align="center" prop="uploadTime" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.uploadTime, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
       <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="handleUpdate(scope.row)"
-            v-hasPermi="['smartor:schemetaskrepeatconfig:edit']"
-          >淇敼</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['smartor:schemetaskrepeatconfig:remove']"
-          >鍒犻櫎</el-button>
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+            v-hasPermi="['smartor:schemetaskrepeatconfig:edit']">淇敼</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+            v-hasPermi="['smartor:schemetaskrepeatconfig:remove']">鍒犻櫎</el-button>
         </template>
       </el-table-column>
     </el-table>
-    
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
+
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+      @pagination="getList" />
 
     <!-- 娣诲姞鎴栦慨鏀规柟妗堜换鍔¢噸鍙戦厤缃璇濇 -->
-    <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=" 鏂规ID " prop="schemeid">
-          <el-input v-model="form.schemeid" placeholder="璇疯緭鍏� 鏂规ID " />
-        </el-form-item>
-        <el-form-item label=" 瑙﹀彂鍦烘櫙ID " prop="triggersceneid">
-          <el-input v-model="form.triggersceneid" placeholder="璇疯緭鍏� 瑙﹀彂鍦烘櫙ID " />
-        </el-form-item>
-        <el-form-item label=" 瑙﹀彂瑙勫垯ID " prop="triggerruleid">
-          <el-input v-model="form.triggerruleid" placeholder="璇疯緭鍏� 瑙﹀彂瑙勫垯ID " />
-        </el-form-item>
-        <el-form-item label=" 浠诲姟閰嶇疆ID " prop="taskconfigid">
-          <el-input v-model="form.taskconfigid" placeholder="璇疯緭鍏� 浠诲姟閰嶇疆ID " />
-        </el-form-item>
-        <el-form-item label=" 鎵ц澶辫触鏁板�� " prop="executefailvalue">
-          <el-input v-model="form.executefailvalue" placeholder="璇疯緭鍏� 鎵ц澶辫触鏁板�� " />
-        </el-form-item>
-        <el-form-item label=" 鎵ц澶辫触鍗曚綅;1.鍒嗛挓 2.灏忔椂 " prop="executefailunit">
-          <el-input v-model="form.executefailunit" placeholder="璇疯緭鍏� 鎵ц澶辫触鍗曚綅;1.鍒嗛挓 2.灏忔椂 " />
-        </el-form-item>
-        <el-form-item label=" 鎵ц妯℃澘 寰俊&AI澶栧懠妯℃澘 " prop="executetemplate">
-          <el-input v-model="form.executetemplate" placeholder="璇疯緭鍏� 鎵ц妯℃澘 寰俊&AI澶栧懠妯℃澘 " />
-        </el-form-item>
-        <el-form-item label=" 棰濆鎵ц妯℃澘 鐭俊妯℃澘 " prop="executetemplateextra">
-          <el-input v-model="form.executetemplateextra" placeholder="璇疯緭鍏� 棰濆鎵ц妯℃澘 鐭俊妯℃澘 " />
-        </el-form-item>
-        <el-form-item label=" 鎵ц椤哄簭;1.寰俊浼樺厛 2.鐭俊浼樺厛 3.鍚屾椂鍙戦�� " prop="executeorder">
-          <el-input v-model="form.executeorder" placeholder="璇疯緭鍏� 鎵ц椤哄簭;1.寰俊浼樺厛 2.鐭俊浼樺厛 3.鍚屾椂鍙戦�� " />
-        </el-form-item>
-        <el-form-item label=" 褰曢煶鏂囦欢&TTS鍙傛暟 ">
-          <editor v-model="form.executevoicecontent" :min-height="192"/>
-        </el-form-item>
-        <el-form-item label=" 鏈烘瀯ID " prop="orgid">
-          <el-input v-model="form.orgid" placeholder="璇疯緭鍏� 鏈烘瀯ID " />
-        </el-form-item>
-        <el-form-item label=" 鍒犻櫎鏍囪 " prop="delFlag">
-          <el-input v-model="form.delFlag" placeholder="璇疯緭鍏� 鍒犻櫎鏍囪 " />
-        </el-form-item>
-        <el-form-item label=" 涓婁紶鏍囪 " prop="isupload">
-          <el-input v-model="form.isupload" placeholder="璇疯緭鍏� 涓婁紶鏍囪 " />
-        </el-form-item>
-        <el-form-item label=" 涓婁紶鏃堕棿 " prop="uploadTime">
-          <el-date-picker clearable
-            v-model="form.uploadTime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="璇烽�夋嫨 涓婁紶鏃堕棿 ">
-          </el-date-picker>
-        </el-form-item>
+    <el-dialog :title="title" :visible.sync="open" :show-close="true" :close-on-click-modal="false" :inline="true" width="1000px"
+      append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+        <el-row>
+          <el-col :span="12"><el-form-item label=" 鏂规ID " prop="schemeid">
+              <el-input v-model="form.schemeid" placeholder="璇疯緭鍏� 鏂规ID " />
+            </el-form-item></el-col>
+          <el-col :span="12"><el-form-item label=" 瑙﹀彂鍦烘櫙ID " prop="triggersceneid">
+              <el-input v-model="form.triggersceneid" placeholder="璇疯緭鍏� 瑙﹀彂鍦烘櫙ID " />
+            </el-form-item></el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12"><el-form-item label=" 瑙﹀彂瑙勫垯ID " prop="triggerruleid">
+              <el-input v-model="form.triggerruleid" placeholder="璇疯緭鍏� 瑙﹀彂瑙勫垯ID " />
+            </el-form-item></el-col>
+          <el-col :span="12"><el-form-item label=" 浠诲姟閰嶇疆ID " prop="taskconfigid">
+              <el-input v-model="form.taskconfigid" placeholder="璇疯緭鍏� 浠诲姟閰嶇疆ID " />
+            </el-form-item></el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12"><el-form-item label=" 鎵ц澶辫触鏁板�� " prop="executefailvalue">
+              <el-input v-model="form.executefailvalue" placeholder="璇疯緭鍏� 鎵ц澶辫触鏁板�� " />
+            </el-form-item></el-col>
+          <el-col :span="12"><el-form-item label=" 鎵ц澶辫触鍗曚綅 " prop="executefailunit">
+              <el-input v-model="form.executefailunit" placeholder="璇疯緭鍏� 鎵ц澶辫触鍗曚綅;1.鍒嗛挓 2.灏忔椂 " />
+            </el-form-item></el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12"><el-form-item label=" 鎵ц妯℃澘 " prop="executetemplate">
+              <el-input v-model="form.executetemplate" placeholder="璇疯緭鍏� 鎵ц妯℃澘 寰俊&AI澶栧懠妯℃澘 " />
+            </el-form-item></el-col>
+          <el-col :span="12"><el-form-item label=" 棰濆鎵ц妯℃澘 " prop="executetemplateextra">
+              <el-input v-model="form.executetemplateextra" placeholder="璇疯緭鍏� 棰濆鎵ц妯℃澘 鐭俊妯℃澘 " />
+            </el-form-item></el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12"><el-form-item label=" 鎵ц椤哄簭 " prop="executeorder">
+              <el-input v-model="form.executeorder" placeholder="璇疯緭鍏� 鎵ц椤哄簭;1.寰俊浼樺厛 2.鐭俊浼樺厛 3.鍚屾椂鍙戦�� " />
+            </el-form-item></el-col>
+          <el-col :span="12"><el-form-item label=" 褰曢煶鏂囦欢&TTS鍙傛暟 "  prop="executevoicecontent">
+              <el-input v-model="form.executevoicecontent" placeholder="璇疯緭鍏� 褰曢煶鏂囦欢&TTS鍙傛暟 "  />
+            </el-form-item></el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12"><el-form-item label=" 鏈烘瀯ID " prop="orgid">
+              <el-input v-model="form.orgid" placeholder="璇疯緭鍏� 鏈烘瀯ID " />
+            </el-form-item></el-col>
+          <el-col :span="12"><el-form-item label=" 鍒犻櫎鏍囪 " prop="delFlag">
+              <el-input v-model="form.delFlag" placeholder="璇疯緭鍏� 鍒犻櫎鏍囪 " />
+            </el-form-item></el-col>
+        </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
@@ -377,7 +250,7 @@
     // 澶氶�夋閫変腑鏁版嵁
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
     /** 鏂板鎸夐挳鎿嶄綔 */
@@ -419,12 +292,12 @@
     /** 鍒犻櫎鎸夐挳鎿嶄綔 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('鏄惁纭鍒犻櫎鏂规浠诲姟閲嶅彂閰嶇疆缂栧彿涓�"' + ids + '"鐨勬暟鎹」锛�').then(function() {
+      this.$modal.confirm('鏄惁纭鍒犻櫎鏂规浠诲姟閲嶅彂閰嶇疆缂栧彿涓�"' + ids + '"鐨勬暟鎹」锛�').then(function () {
         return delSchemetaskrepeatconfig(ids);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
-      }).catch(() => {});
+      }).catch(() => { });
     },
     /** 瀵煎嚭鎸夐挳鎿嶄綔 */
     handleExport() {
diff --git a/ruoyi-ui/src/views/smartor/schemetriggerrule/index.vue b/ruoyi-ui/src/views/smartor/schemetriggerrule/index.vue
index 25d14c6..50349fe 100644
--- a/ruoyi-ui/src/views/smartor/schemetriggerrule/index.vue
+++ b/ruoyi-ui/src/views/smartor/schemetriggerrule/index.vue
@@ -1,141 +1,19 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label=" 涓旀垨 " prop="orand">
-        <el-input
-          v-model="queryParams.orand"
-          placeholder="璇疯緭鍏� 涓旀垨 "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" 瑙勫垯鏉′欢 " prop="ruleconditions">
-        <el-input
-          v-model="queryParams.ruleconditions"
-          placeholder="璇疯緭鍏� 瑙勫垯鏉′欢 "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" 鐖舵潯浠� " prop="parentresultconditionsid">
-        <el-input
-          v-model="queryParams.parentresultconditionsid"
-          placeholder="璇疯緭鍏� 鐖舵潯浠� "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+      <el-form-item label=" 鏉′欢绫诲瀷 " prop="conditionstype">
+        <el-input v-model="queryParams.conditionstype" placeholder="璇疯緭鍏� 鏉′欢绫诲瀷 " clearable
+          @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label=" 鏈烘瀯ID " prop="orgid">
-        <el-input
-          v-model="queryParams.orgid"
-          placeholder="璇疯緭鍏� 鏈烘瀯ID "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" 涓婁紶鏍囪 " prop="isupload">
-        <el-input
-          v-model="queryParams.isupload"
-          placeholder="璇疯緭鍏� 涓婁紶鏍囪 "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" 涓婁紶鏃堕棿 " prop="uploadTime">
-        <el-date-picker clearable
-          v-model="queryParams.uploadTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="璇烽�夋嫨 涓婁紶鏃堕棿 ">
-        </el-date-picker>
+        <el-input v-model="queryParams.orgid" placeholder="璇疯緭鍏� 鏈烘瀯ID " clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label=" 鏂规ID " prop="schemeid">
-        <el-input
-          v-model="queryParams.schemeid"
-          placeholder="璇疯緭鍏� 鏂规ID "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.schemeid" placeholder="璇疯緭鍏� 鏂规ID " clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label=" 瑙﹀彂鍦烘櫙ID " prop="triggersceneid">
-        <el-input
-          v-model="queryParams.triggersceneid"
-          placeholder="璇疯緭鍏� 瑙﹀彂鍦烘櫙ID "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" " prop="conditionstypesecord">
-        <el-input
-          v-model="queryParams.conditionstypesecord"
-          placeholder="璇疯緭鍏� "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" 涓夌骇鏉′欢绫诲瀷 " prop="conditionstypethree">
-        <el-input
-          v-model="queryParams.conditionstypethree"
-          placeholder="璇疯緭鍏� 涓夌骇鏉′欢绫诲瀷 "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" 楠岃瘉瑙勫垯;鏁板�肩洿鎺ヨ緭鍏ワ紱鑼冨洿鐢ㄦí鏉�" prop="verifyrule">
-        <el-input
-          v-model="queryParams.verifyrule"
-          placeholder="璇疯緭鍏� 楠岃瘉瑙勫垯;鏁板�肩洿鎺ヨ緭鍏ワ紱鑼冨洿鐢ㄦí鏉�"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" 棰濆瑙勫垯鏉′欢 " prop="extraruleconditions">
-        <el-input
-          v-model="queryParams.extraruleconditions"
-          placeholder="璇疯緭鍏� 棰濆瑙勫垯鏉′欢 "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" 棰濆楠岃瘉瑙勫垯 " prop="extraverifyrule">
-        <el-input
-          v-model="queryParams.extraverifyrule"
-          placeholder="璇疯緭鍏� 棰濆楠岃瘉瑙勫垯 "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" 鍒嗙粍缂栧彿 " prop="number">
-        <el-input
-          v-model="queryParams.number"
-          placeholder="璇疯緭鍏� 鍒嗙粍缂栧彿 "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" 鐖剁骇鍒嗙粍 " prop="groupnumber">
-        <el-input
-          v-model="queryParams.groupnumber"
-          placeholder="璇疯緭鍏� 鐖剁骇鍒嗙粍 "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" 鐖朵笖鎴� " prop="grouporand">
-        <el-input
-          v-model="queryParams.grouporand"
-          placeholder="璇疯緭鍏� 鐖朵笖鎴� "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" 鏄惁蹇呭~ " prop="isrequired">
-        <el-input
-          v-model="queryParams.isrequired"
-          placeholder="璇疯緭鍏� 鏄惁蹇呭~ "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.triggersceneid" placeholder="璇疯緭鍏� 瑙﹀彂鍦烘櫙ID " clearable
+          @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
@@ -145,46 +23,20 @@
 
     <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="['smartor:schemetriggerrule:add']"
-        >鏂板</el-button>
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+          v-hasPermi="['smartor:schemetriggerrule:add']">鏂板</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['smartor:schemetriggerrule:edit']"
-        >淇敼</el-button>
+        <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
+          v-hasPermi="['smartor:schemetriggerrule:edit']">淇敼</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['smartor:schemetriggerrule:remove']"
-        >鍒犻櫎</el-button>
+        <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
+          v-hasPermi="['smartor:schemetriggerrule:remove']">鍒犻櫎</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['smartor:schemetriggerrule:export']"
-        >瀵煎嚭</el-button>
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
+          v-hasPermi="['smartor:schemetriggerrule:export']">瀵煎嚭</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
@@ -192,22 +44,15 @@
     <el-table v-loading="loading" :data="schemetriggerruleList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label=" 鑷ID " align="center" prop="id" />
-      <el-table-column label=" 鏉′欢绫诲瀷;1.鎮h�呭睘鎬� 2.璇婄枟淇℃伅 3.鐩戞祴鍊� 4.浠诲姟淇℃伅 " align="center" prop="conditionstype" />
-      <el-table-column label=" 涓旀垨 " align="center" prop="orand" />
+      <el-table-column label=" 鏉′欢绫诲瀷 " align="center" prop="conditionstype" />
       <el-table-column label=" 瑙勫垯鏉′欢 " align="center" prop="ruleconditions" />
       <el-table-column label=" 鐖舵潯浠� " align="center" prop="parentresultconditionsid" />
       <el-table-column label=" 鏈烘瀯ID " align="center" prop="orgid" />
-      <el-table-column label=" 涓婁紶鏍囪 " align="center" prop="isupload" />
-      <el-table-column label=" 涓婁紶鏃堕棿 " align="center" prop="uploadTime" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.uploadTime, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
       <el-table-column label=" 鏂规ID " align="center" prop="schemeid" />
       <el-table-column label=" 瑙﹀彂鍦烘櫙ID " align="center" prop="triggersceneid" />
       <el-table-column label=" " align="center" prop="conditionstypesecord" />
       <el-table-column label=" 涓夌骇鏉′欢绫诲瀷 " align="center" prop="conditionstypethree" />
-      <el-table-column label=" 楠岃瘉瑙勫垯;鏁板�肩洿鎺ヨ緭鍏ワ紱鑼冨洿鐢ㄦí鏉�" align="center" prop="verifyrule" />
+      <el-table-column label=" 楠岃瘉瑙勫垯" align="center" prop="verifyrule" />
       <el-table-column label=" 棰濆瑙勫垯鏉′欢 " align="center" prop="extraruleconditions" />
       <el-table-column label=" 棰濆楠岃瘉瑙勫垯 " align="center" prop="extraverifyrule" />
       <el-table-column label=" 鍒嗙粍缂栧彿 " align="center" prop="number" />
@@ -216,94 +61,92 @@
       <el-table-column label=" 鏄惁蹇呭~ " align="center" prop="isrequired" />
       <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="handleUpdate(scope.row)"
-            v-hasPermi="['smartor:schemetriggerrule:edit']"
-          >淇敼</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['smartor:schemetriggerrule:remove']"
-          >鍒犻櫎</el-button>
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+            v-hasPermi="['smartor:schemetriggerrule:edit']">淇敼</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+            v-hasPermi="['smartor:schemetriggerrule:remove']">鍒犻櫎</el-button>
         </template>
       </el-table-column>
     </el-table>
-    
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
+
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+      @pagination="getList" />
 
     <!-- 娣诲姞鎴栦慨鏀规柟妗堣Е鍙戞潯浠惰鍒欏璇濇 -->
-    <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=" 涓旀垨 " prop="orand">
-          <el-input v-model="form.orand" placeholder="璇疯緭鍏� 涓旀垨 " />
-        </el-form-item>
-        <el-form-item label=" 瑙勫垯鏉′欢 " prop="ruleconditions">
-          <el-input v-model="form.ruleconditions" placeholder="璇疯緭鍏� 瑙勫垯鏉′欢 " />
-        </el-form-item>
-        <el-form-item label=" 鐖舵潯浠� " prop="parentresultconditionsid">
-          <el-input v-model="form.parentresultconditionsid" placeholder="璇疯緭鍏� 鐖舵潯浠� " />
-        </el-form-item>
-        <el-form-item label=" 鏈烘瀯ID " prop="orgid">
-          <el-input v-model="form.orgid" placeholder="璇疯緭鍏� 鏈烘瀯ID " />
-        </el-form-item>
-        <el-form-item label=" 鍒犻櫎鏍囪 " prop="delFlag">
-          <el-input v-model="form.delFlag" placeholder="璇疯緭鍏� 鍒犻櫎鏍囪 " />
-        </el-form-item>
-        <el-form-item label=" 涓婁紶鏍囪 " prop="isupload">
-          <el-input v-model="form.isupload" placeholder="璇疯緭鍏� 涓婁紶鏍囪 " />
-        </el-form-item>
-        <el-form-item label=" 涓婁紶鏃堕棿 " prop="uploadTime">
-          <el-date-picker clearable
-            v-model="form.uploadTime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="璇烽�夋嫨 涓婁紶鏃堕棿 ">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label=" 鏂规ID " prop="schemeid">
-          <el-input v-model="form.schemeid" placeholder="璇疯緭鍏� 鏂规ID " />
-        </el-form-item>
-        <el-form-item label=" 瑙﹀彂鍦烘櫙ID " prop="triggersceneid">
-          <el-input v-model="form.triggersceneid" placeholder="璇疯緭鍏� 瑙﹀彂鍦烘櫙ID " />
-        </el-form-item>
-        <el-form-item label=" " prop="conditionstypesecord">
-          <el-input v-model="form.conditionstypesecord" placeholder="璇疯緭鍏� " />
-        </el-form-item>
-        <el-form-item label=" 涓夌骇鏉′欢绫诲瀷 " prop="conditionstypethree">
-          <el-input v-model="form.conditionstypethree" placeholder="璇疯緭鍏� 涓夌骇鏉′欢绫诲瀷 " />
-        </el-form-item>
-        <el-form-item label=" 楠岃瘉瑙勫垯;鏁板�肩洿鎺ヨ緭鍏ワ紱鑼冨洿鐢ㄦí鏉�" prop="verifyrule">
-          <el-input v-model="form.verifyrule" placeholder="璇疯緭鍏� 楠岃瘉瑙勫垯;鏁板�肩洿鎺ヨ緭鍏ワ紱鑼冨洿鐢ㄦí鏉�" />
-        </el-form-item>
-        <el-form-item label=" 棰濆瑙勫垯鏉′欢 " prop="extraruleconditions">
-          <el-input v-model="form.extraruleconditions" placeholder="璇疯緭鍏� 棰濆瑙勫垯鏉′欢 " />
-        </el-form-item>
-        <el-form-item label=" 棰濆楠岃瘉瑙勫垯 " prop="extraverifyrule">
-          <el-input v-model="form.extraverifyrule" placeholder="璇疯緭鍏� 棰濆楠岃瘉瑙勫垯 " />
-        </el-form-item>
-        <el-form-item label=" 鍒嗙粍缂栧彿 " prop="number">
-          <el-input v-model="form.number" placeholder="璇疯緭鍏� 鍒嗙粍缂栧彿 " />
-        </el-form-item>
-        <el-form-item label=" 鐖剁骇鍒嗙粍 " prop="groupnumber">
-          <el-input v-model="form.groupnumber" placeholder="璇疯緭鍏� 鐖剁骇鍒嗙粍 " />
-        </el-form-item>
-        <el-form-item label=" 鐖朵笖鎴� " prop="grouporand">
-          <el-input v-model="form.grouporand" placeholder="璇疯緭鍏� 鐖朵笖鎴� " />
-        </el-form-item>
-        <el-form-item label=" 鏄惁蹇呭~ " prop="isrequired">
-          <el-input v-model="form.isrequired" placeholder="璇疯緭鍏� 鏄惁蹇呭~ " />
-        </el-form-item>
+    <el-dialog :title="title" :visible.sync="open" :show-close="true" :close-on-click-modal="false" width="1200px"
+      append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+        <el-row>
+          <el-col :span="12"><el-form-item label=" 涓旀垨 " prop="orand">
+              <el-input v-model="form.orand" placeholder="璇疯緭鍏� 涓旀垨 " />
+            </el-form-item></el-col>
+          <el-col :span="12"><el-form-item label=" 瑙勫垯鏉′欢 " prop="ruleconditions">
+              <el-input v-model="form.ruleconditions" placeholder="璇疯緭鍏� 瑙勫垯鏉′欢 " />
+            </el-form-item></el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12"><el-form-item label=" 鐖舵潯浠� " prop="parentresultconditionsid">
+              <el-input v-model="form.parentresultconditionsid" placeholder="璇疯緭鍏� 鐖舵潯浠� " />
+            </el-form-item></el-col>
+          <el-col :span="12"><el-form-item label=" 鏈烘瀯ID " prop="orgid">
+              <el-input v-model="form.orgid" placeholder="璇疯緭鍏� 鏈烘瀯ID " />
+            </el-form-item></el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12"><el-form-item label=" 鍒犻櫎鏍囪 " prop="delFlag">
+              <el-input v-model="form.delFlag" placeholder="璇疯緭鍏� 鍒犻櫎鏍囪 " />
+            </el-form-item></el-col>
+          <el-col :span="12"><el-form-item label=" 涓婁紶鏍囪 " prop="isupload">
+              <el-input v-model="form.isupload" placeholder="璇疯緭鍏� 涓婁紶鏍囪 " />
+            </el-form-item></el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12"> <el-form-item label=" 涓婁紶鏃堕棿 " prop="uploadTime">
+              <el-date-picker clearable v-model="form.uploadTime" type="date" value-format="yyyy-MM-dd"
+                placeholder="璇烽�夋嫨 涓婁紶鏃堕棿 ">
+              </el-date-picker>
+            </el-form-item></el-col>
+          <el-col :span="12"><el-form-item label=" 鏂规ID " prop="schemeid">
+              <el-input v-model="form.schemeid" placeholder="璇疯緭鍏� 鏂规ID " />
+            </el-form-item></el-col>
+        </el-row><el-row>
+          <el-col :span="12"><el-form-item label=" 瑙﹀彂鍦烘櫙ID " prop="triggersceneid">
+              <el-input v-model="form.triggersceneid" placeholder="璇疯緭鍏� 瑙﹀彂鍦烘櫙ID " />
+            </el-form-item></el-col>
+          <el-col :span="12"><el-form-item label=" " prop="conditionstypesecord">
+              <el-input v-model="form.conditionstypesecord" placeholder="璇疯緭鍏� " />
+            </el-form-item></el-col>
+        </el-row><el-row>
+          <el-col :span="12"><el-form-item label=" 涓夌骇鏉′欢绫诲瀷 " prop="conditionstypethree">
+              <el-input v-model="form.conditionstypethree" placeholder="璇疯緭鍏� 涓夌骇鏉′欢绫诲瀷 " />
+            </el-form-item></el-col>
+          <el-col :span="12"><el-form-item label=" 楠岃瘉瑙勫垯" prop="verifyrule">
+              <el-input v-model="form.verifyrule" placeholder="璇疯緭鍏� 楠岃瘉瑙勫垯;鏁板�肩洿鎺ヨ緭鍏ワ紱鑼冨洿鐢ㄦí鏉�" />
+            </el-form-item></el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12"> <el-form-item label=" 棰濆瑙勫垯鏉′欢 " prop="extraruleconditions">
+              <el-input v-model="form.extraruleconditions" placeholder="璇疯緭鍏� 棰濆瑙勫垯鏉′欢 " />
+            </el-form-item></el-col>
+          <el-col :span="12"><el-form-item label=" 棰濆楠岃瘉瑙勫垯 " prop="extraverifyrule">
+              <el-input v-model="form.extraverifyrule" placeholder="璇疯緭鍏� 棰濆楠岃瘉瑙勫垯 " />
+            </el-form-item></el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12"><el-form-item label=" 鍒嗙粍缂栧彿 " prop="number">
+              <el-input v-model="form.number" placeholder="璇疯緭鍏� 鍒嗙粍缂栧彿 " />
+            </el-form-item></el-col>
+          <el-col :span="12"><el-form-item label=" 鐖剁骇鍒嗙粍 " prop="groupnumber">
+              <el-input v-model="form.groupnumber" placeholder="璇疯緭鍏� 鐖剁骇鍒嗙粍 " />
+            </el-form-item></el-col>
+        </el-row> <el-row>
+          <el-col :span="12"><el-form-item label=" 鐖朵笖鎴� " prop="grouporand">
+              <el-input v-model="form.grouporand" placeholder="璇疯緭鍏� 鐖朵笖鎴� " />
+            </el-form-item></el-col>
+          <el-col :span="12"><el-form-item label=" 鏄惁蹇呭~ " prop="isrequired">
+              <el-input v-model="form.isrequired" placeholder="璇疯緭鍏� 鏄惁蹇呭~ " />
+            </el-form-item></el-col>
+        </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
@@ -435,7 +278,7 @@
     // 澶氶�夋閫変腑鏁版嵁
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
     /** 鏂板鎸夐挳鎿嶄綔 */
@@ -477,12 +320,12 @@
     /** 鍒犻櫎鎸夐挳鎿嶄綔 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('鏄惁纭鍒犻櫎鏂规瑙﹀彂鏉′欢瑙勫垯缂栧彿涓�"' + ids + '"鐨勬暟鎹」锛�').then(function() {
+      this.$modal.confirm('鏄惁纭鍒犻櫎鏂规瑙﹀彂鏉′欢瑙勫垯缂栧彿涓�"' + ids + '"鐨勬暟鎹」锛�').then(function () {
         return delSchemetriggerrule(ids);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
-      }).catch(() => {});
+      }).catch(() => { });
     },
     /** 瀵煎嚭鎸夐挳鎿嶄綔 */
     handleExport() {
diff --git a/ruoyi-ui/src/views/smartor/schemetriggerscene/index.vue b/ruoyi-ui/src/views/smartor/schemetriggerscene/index.vue
index 07882f1..0959c7b 100644
--- a/ruoyi-ui/src/views/smartor/schemetriggerscene/index.vue
+++ b/ruoyi-ui/src/views/smartor/schemetriggerscene/index.vue
@@ -9,15 +9,15 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label=" 鍩虹嚎鏃堕棿;1.鍔犲叆鍚� 2.鍑洪櫌鍚� 3.灏辫瘖鍚� 4.鍏ラ櫌鍚� 5.鎵嬫湳鍓� 6.鎵嬫湳鍚� 7.寮�鑽墠 8.妫�楠岀敵璇峰悗 9.妫�楠屽畬鎴愬悗 10.妫�鏌ョ敵璇峰悗 11.妫�鏌ュ畬鎴愬悗 12.浜嬩欢鍙戠敓鍚� 13.鍩虹嚎鏃ユ湡鍚� " prop="baselinetime">
+      <el-form-item label=" 鍩虹嚎鏃堕棿 " prop="baselinetime">
         <el-input
           v-model="queryParams.baselinetime"
-          placeholder="璇疯緭鍏� 鍩虹嚎鏃堕棿;1.鍔犲叆鍚� 2.鍑洪櫌鍚� 3.灏辫瘖鍚� 4.鍏ラ櫌鍚� 5.鎵嬫湳鍓� 6.鎵嬫湳鍚� 7.寮�鑽墠 8.妫�楠岀敵璇峰悗 9.妫�楠屽畬鎴愬悗 10.妫�鏌ョ敵璇峰悗 11.妫�鏌ュ畬鎴愬悗 12.浜嬩欢鍙戠敓鍚� 13.鍩虹嚎鏃ユ湡鍚� "
+          placeholder="璇疯緭鍏� 鍩虹嚎鏃堕棿 "
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label=" 瑙﹀彂鏉′欢;0.鏃� 1.鏈� " prop="triggerornot">
+      <el-form-item label=" 瑙﹀彂鏉′欢 " prop="triggerornot">
         <el-input
           v-model="queryParams.triggerornot"
           placeholder="璇疯緭鍏� 瑙﹀彂鏉′欢;0.鏃� 1.鏈� "
@@ -33,26 +33,10 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label=" 涓婁紶鏍囪 " prop="isupload">
-        <el-input
-          v-model="queryParams.isupload"
-          placeholder="璇疯緭鍏� 涓婁紶鏍囪 "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" 涓婁紶鏃堕棿 " prop="uploadTime">
-        <el-date-picker clearable
-          v-model="queryParams.uploadTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="璇烽�夋嫨 涓婁紶鏃堕棿 ">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label=" 鏄惁涓轰富璺緞;0.鍚� 1.鏄� " prop="ismain">
+      <el-form-item label=" 鏄惁涓轰富璺緞 " prop="ismain">
         <el-input
           v-model="queryParams.ismain"
-          placeholder="璇疯緭鍏� 鏄惁涓轰富璺緞;0.鍚� 1.鏄� "
+          placeholder="璇疯緭鍏� 鏄惁涓轰富璺緞 "
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -113,16 +97,10 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label=" 鑷ID " align="center" prop="id" />
       <el-table-column label=" 鏂规ID " align="center" prop="schemeid" />
-      <el-table-column label=" 鍩虹嚎鏃堕棿;1.鍔犲叆鍚� 2.鍑洪櫌鍚� 3.灏辫瘖鍚� 4.鍏ラ櫌鍚� 5.鎵嬫湳鍓� 6.鎵嬫湳鍚� 7.寮�鑽墠 8.妫�楠岀敵璇峰悗 9.妫�楠屽畬鎴愬悗 10.妫�鏌ョ敵璇峰悗 11.妫�鏌ュ畬鎴愬悗 12.浜嬩欢鍙戠敓鍚� 13.鍩虹嚎鏃ユ湡鍚� " align="center" prop="baselinetime" />
-      <el-table-column label=" 瑙﹀彂鏉′欢;0.鏃� 1.鏈� " align="center" prop="triggerornot" />
-      <el-table-column label=" 鏈烘瀯ID " align="center" prop="orgid" />
-      <el-table-column label=" 涓婁紶鏍囪 " align="center" prop="isupload" />
-      <el-table-column label=" 涓婁紶鏃堕棿 " align="center" prop="uploadTime" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.uploadTime, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label=" 鏄惁涓轰富璺緞;0.鍚� 1.鏄� " align="center" prop="ismain" />
+      <el-table-column label=" 鍩虹嚎鏃堕棿 " align="center" prop="baselinetime" />
+      <el-table-column label=" 瑙﹀彂鏉′欢 " align="center" prop="triggerornot" />
+      <el-table-column label=" 鏄惁涓轰富璺緞 " align="center" prop="ismain" />
+      <el-table-column label=" 鏈烘瀯ID " align="center" prop="orgid" />       
       <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -152,15 +130,15 @@
     />
 
     <!-- 娣诲姞鎴栦慨鏀规柟妗堣Е鍙戝満鏅璇濇 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+    <el-dialog :title="title" :visible.sync="open" :show-close="true" :close-on-click-modal="false" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-form-item label=" 鏂规ID " prop="schemeid">
           <el-input v-model="form.schemeid" placeholder="璇疯緭鍏� 鏂规ID " />
         </el-form-item>
-        <el-form-item label=" 鍩虹嚎鏃堕棿;1.鍔犲叆鍚� 2.鍑洪櫌鍚� 3.灏辫瘖鍚� 4.鍏ラ櫌鍚� 5.鎵嬫湳鍓� 6.鎵嬫湳鍚� 7.寮�鑽墠 8.妫�楠岀敵璇峰悗 9.妫�楠屽畬鎴愬悗 10.妫�鏌ョ敵璇峰悗 11.妫�鏌ュ畬鎴愬悗 12.浜嬩欢鍙戠敓鍚� 13.鍩虹嚎鏃ユ湡鍚� " prop="baselinetime">
+        <el-form-item label=" 鍩虹嚎鏃堕棿 " prop="baselinetime">
           <el-input v-model="form.baselinetime" placeholder="璇疯緭鍏� 鍩虹嚎鏃堕棿;1.鍔犲叆鍚� 2.鍑洪櫌鍚� 3.灏辫瘖鍚� 4.鍏ラ櫌鍚� 5.鎵嬫湳鍓� 6.鎵嬫湳鍚� 7.寮�鑽墠 8.妫�楠岀敵璇峰悗 9.妫�楠屽畬鎴愬悗 10.妫�鏌ョ敵璇峰悗 11.妫�鏌ュ畬鎴愬悗 12.浜嬩欢鍙戠敓鍚� 13.鍩虹嚎鏃ユ湡鍚� " />
         </el-form-item>
-        <el-form-item label=" 瑙﹀彂鏉′欢;0.鏃� 1.鏈� " prop="triggerornot">
+        <el-form-item label=" 瑙﹀彂鏉′欢 " prop="triggerornot">
           <el-input v-model="form.triggerornot" placeholder="璇疯緭鍏� 瑙﹀彂鏉′欢;0.鏃� 1.鏈� " />
         </el-form-item>
         <el-form-item label=" 鏈烘瀯ID " prop="orgid">
@@ -169,18 +147,7 @@
         <el-form-item label=" 鍒犻櫎鏍囪 " prop="delFlag">
           <el-input v-model="form.delFlag" placeholder="璇疯緭鍏� 鍒犻櫎鏍囪 " />
         </el-form-item>
-        <el-form-item label=" 涓婁紶鏍囪 " prop="isupload">
-          <el-input v-model="form.isupload" placeholder="璇疯緭鍏� 涓婁紶鏍囪 " />
-        </el-form-item>
-        <el-form-item label=" 涓婁紶鏃堕棿 " prop="uploadTime">
-          <el-date-picker clearable
-            v-model="form.uploadTime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="璇烽�夋嫨 涓婁紶鏃堕棿 ">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label=" 鏄惁涓轰富璺緞;0.鍚� 1.鏄� " prop="ismain">
+        <el-form-item label=" 鏄惁涓轰富璺緞 " prop="ismain">
           <el-input v-model="form.ismain" placeholder="璇疯緭鍏� 鏄惁涓轰富璺緞;0.鍚� 1.鏄� " />
         </el-form-item>
       </el-form>

--
Gitblit v1.9.3