From 2505df3e3c3a0b5223d02d5279828e4849d6e6dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=9F=B9=E5=8F=8B?= <17852335869@163.com>
Date: Tue, 14 Feb 2023 18:03:09 +0800
Subject: [PATCH] =?UTF-8?q?1.=20=E5=B7=A5=E5=8D=95=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E7=BB=86=E8=8A=82=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/maintenance/system.vue              |  18 +--
 src/views/maintenance/task.vue                |  20 ++--
 .../workflow/process/components/form.vue      |   7 +-
 .../plugin/workflow/process/workorder.vue     | 111 ++++++++++++++----
 4 files changed, 114 insertions(+), 42 deletions(-)

diff --git a/src/views/maintenance/system.vue b/src/views/maintenance/system.vue
index 197710e..3fde65f 100644
--- a/src/views/maintenance/system.vue
+++ b/src/views/maintenance/system.vue
@@ -55,20 +55,24 @@
             >
             </el-option>
           </el-select>
-        </div>
-        <div style="display: flex">
+          <div style="display: flex">
           <el-button class="search-btn" @click="searchHandle(1)"
             >查询</el-button
           >
+          <div class="search-reset" @click="searchHandle(2)">
+            <i class="el-icon-refresh-right" style="font-size: 20px"></i>
+          </div>
+        </div>
+        </div>
+        <div style="display: flex">
+         
           <el-button
             class="search-btn"
             style="margin: 0; background: #2ee27c"
             @click="addHandle"
             >新增</el-button
           >
-          <div class="search-reset" @click="searchHandle(2)">
-            <i class="el-icon-refresh-right" style="font-size: 20px"></i>
-          </div>
+         
         </div>
       </div>
     </el-form>
@@ -284,9 +288,9 @@ export default {
 }
 .search-reset {
   width: 46px;
-  height: 46px !important;
+  height: 44px !important;
   background: #ff9130;
-  margin-left: 20px;
+  margin-left: 0px;
   color: #fff;
   text-align: center;
   line-height: 46px;
diff --git a/src/views/maintenance/task.vue b/src/views/maintenance/task.vue
index 5977552..1846cdf 100644
--- a/src/views/maintenance/task.vue
+++ b/src/views/maintenance/task.vue
@@ -58,20 +58,24 @@
             placeholder="请输入创建人"
             class="search-input"
           ></el-input>
-        </div>
-        <div style="display: flex">
+          <div style="display: flex">
           <el-button class="search-btn" @click="searchHandle(1)"
             >查询</el-button
           >
+          <div class="search-reset" @click="searchHandle(2)">
+            <i class="el-icon-refresh-right" style="font-size: 20px"></i>
+          </div>
+        </div>
+        </div>
+        <div style="display: flex">
+         
           <el-button
             class="search-btn"
             style="margin: 0; background: #2ee27c"
             @click="addHandle"
             >新增</el-button
           >
-          <div class="search-reset" @click="searchHandle(2)">
-            <i class="el-icon-refresh-right" style="font-size: 20px"></i>
-          </div>
+        
         </div>
       </div>
     </el-form>
@@ -284,13 +288,13 @@ export default {
   height: 46px !important;
   background: #2e92f6;
   color: #fff;
-  margin: 0 20px;
+  margin-left: 40px;
+  margin-right: 20px;
 }
 .search-reset {
   width: 46px;
-  height: 46px !important;
+  height: 44px !important;
   background: #ff9130;
-  margin-left: 20px;
   color: #fff;
   text-align: center;
   line-height: 46px;
diff --git a/src/views/plugin/workflow/process/components/form.vue b/src/views/plugin/workflow/process/components/form.vue
index c988bfb..2ba68b7 100644
--- a/src/views/plugin/workflow/process/components/form.vue
+++ b/src/views/plugin/workflow/process/components/form.vue
@@ -33,11 +33,14 @@
                   }}</span>
                 </template>
               </el-table-column>
-              <el-table-column prop="path" label="地址" width="180">
+              <el-table-column prop="path" label="上传人" width="180">
               </el-table-column>
+              <el-table-column prop="path" label="上传时间" width="180">
+              </el-table-column>
+              
               <el-table-column label="操作">
                 <template slot-scope="scope">
-                  <i class="el-icon-delete"></i>
+                  <i class="el-icon-delete" style="cursor: pointer"></i>
                 </template>
               </el-table-column>
             </el-table>
diff --git a/src/views/plugin/workflow/process/workorder.vue b/src/views/plugin/workflow/process/workorder.vue
index c1c795a..f4d3ec8 100644
--- a/src/views/plugin/workflow/process/workorder.vue
+++ b/src/views/plugin/workflow/process/workorder.vue
@@ -5,7 +5,7 @@
         <div>
           <el-select
             v-model="searchForm.company"
-            placeholder="公司"
+            placeholder="任务父类"
             class="search-select"
           >
             <el-option
@@ -18,7 +18,7 @@
           </el-select>
           <el-select
             v-model="searchForm.company"
-            placeholder="公司"
+            placeholder="任务种类"
             class="search-select"
           >
             <el-option
@@ -31,7 +31,7 @@
           </el-select>
           <el-select
             v-model="searchForm.company"
-            placeholder="公司"
+            placeholder="当前责任人"
             class="search-select"
           >
             <el-option
@@ -44,7 +44,7 @@
           </el-select>
           <el-select
             v-model="searchForm.company"
-            placeholder="公司"
+            placeholder="管理部门"
             class="search-select"
           >
             <el-option
@@ -55,30 +55,87 @@
             >
             </el-option>
           </el-select>
-        </div>
-        <div style="display: flex">
-          <el-input
-            :rows="18"
-            v-model="searchForm.name"
-            placeholder="请输入"
-            class="search-input"
-          ></el-input>
-          <el-button class="search-btn" @click="searchHandle(1)"
-            >查询</el-button
+          <el-select
+            v-model="searchForm.company"
+            placeholder="任务级别"
+            class="search-select"
+          >
+            <el-option
+              v-for="item in conpanyList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
+          <el-select
+            v-model="searchForm.company"
+            placeholder="审批状态"
+            class="search-select"
           >
+            <el-option
+              v-for="item in conpanyList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
+          <el-select
+            v-model="searchForm.company"
+            placeholder="发起人"
+            class="search-select"
+          >
+            <el-option
+              v-for="item in conpanyList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
+          <el-date-picker
+            style="width: 314px; margin-right: 20px"
+            v-model="searchForm.timeArr"
+            format="yyyy-MM-dd HH:mm"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            class="search-picker"
+            type="datetimerange"
+            range-separator="至"
+            start-placeholder="创建开始日期"
+            end-placeholder="创建结束日期"
+          ></el-date-picker>
+        </div>
+        <div class="search-line">
+          <div style="display: flex">
+            <el-date-picker
+              style="width: 314px; margin-right: 20px"
+              v-model="searchForm.timeArr"
+              format="yyyy-MM-dd HH:mm"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              class="search-picker"
+              type="datetimerange"
+              range-separator="至"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+            ></el-date-picker>
+            <el-button class="search-btn" @click="searchHandle(1)"
+              >查询</el-button
+            >
+            <div class="search-reset" @click="searchHandle(2)">
+              <i class="el-icon-refresh-right" style="font-size: 20px"></i>
+            </div>
+          </div>
           <el-button
             class="search-btn"
             style="margin: 0; background: #2ee27c"
             @click="exportHandle"
             >导出</el-button
           >
-          <div class="search-reset" @click="searchHandle(2)">
-            <i class="el-icon-refresh-right" style="font-size: 20px"></i>
-          </div>
         </div>
       </div>
     </el-form>
-    <div style="margin-top:30px;">
+    <div style="margin-top: 30px">
       <avue-crud
         id="avue-id"
         ref="crud"
@@ -143,12 +200,12 @@ export default {
     },
     // 查询重置
     searchHandle(index) {
-      if(index === 1) {
+      if (index === 1) {
         // 查询
-      }else {
+      } else {
         // 重置
       }
-      this.onLoad()
+      this.onLoad();
     },
     // 导出
     exportHandle() {},
@@ -157,8 +214,13 @@ export default {
 </script>
 <style lang="scss" scoped>
 .search {
-  display: flex;
-  justify-content: space-between;
+  // display: flex;
+  // justify-content: space-between;
+}
+.search-line {
+ margin-top: 20px;
+ display: flex;
+ justify-content: space-between;
 }
 .search-select {
   width: 150px;
@@ -176,9 +238,8 @@ export default {
 }
 .search-reset {
   width: 46px;
-  height: 46px !important;
+  height: 44px !important;
   background: #ff9130;
-  margin-left: 20px;
   color: #fff;
   text-align: center;
   line-height: 46px;