wenhongquan 3 سال پیش
والد
کامیت
6c9504f71b
3فایلهای تغییر یافته به همراه96 افزوده شده و 45 حذف شده
  1. 10 0
      src/components/ImageUpload/index.vue
  2. 14 1
      src/views/task/detail/index.vue
  3. 72 44
      src/views/task/list/index.vue

+ 10 - 0
src/components/ImageUpload/index.vue

@@ -7,6 +7,7 @@
       :on-success="handleUploadSuccess"
       :before-upload="handleBeforeUpload"
       :limit="limit"
+      drag
       :on-error="handleUploadError"
       :on-exceed="handleExceed"
       name="file"
@@ -186,3 +187,12 @@ function listToString(list, separator) {
   return strs != "" ? strs.substr(0, strs.length - 1) : "";
 }
 </script>
+<style>
+.el-upload-dragger{
+    width: 100%;
+    height: 100%;
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+}
+</style>

+ 14 - 1
src/views/task/detail/index.vue

@@ -530,7 +530,20 @@
       <div>
         <el-form :model="shobj" label-width="120px">
           <el-form-item label="审核人员">
-            <el-input v-model="shobj.hcry" placeholder="请输入核查人员"></el-input>
+            <el-select
+              v-model="shobj.hcry"
+              placeholder="请选择核查人员"
+              style="width: 100%"
+               filterable
+              allow-create
+            >
+              <el-option
+                v-for="item in allusers"
+                :label="item.nickName"
+                :value="item.nickName"
+              />
+            </el-select>
+
           </el-form-item>
 
           <el-form-item label="核查备注"

+ 72 - 44
src/views/task/list/index.vue

@@ -6,50 +6,77 @@
         v-model="queryparameters"
         class="demo-form-inline"
       >
-        <el-form-item label="任务时间">
-          <el-date-picker
-            v-model="qdate"
-            type="daterange"
-            value-format="YYYY-MM-DD"
-            range-separator="到"
-            start-placeholder="开始时间"
-            end-placeholder="结束时间"
-          />
-        </el-form-item>
-        <el-form-item label="任务状态" v-if="currentstatus == 1">
-          <el-select
-            v-model="queryparameters.status"
-            class="m-1"
-            placeholder="请选择"
-          >
-            <el-option
-              v-for="item in task_status"
-              :label="item.label"
-              :value="item.value"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="区属">
-          <el-select
-            v-model="queryparameters.taskArea"
-            class="m-2"
-            placeholder="请选择"
-          >
-            <el-option
-              v-for="item in sys_area"
-              :label="item.label"
-              :value="item.value"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <div style="float: right">
-          <el-form-item>
-            <el-button type="primary" @click="getList">查询</el-button>
-          </el-form-item>
-          <el-form-item>
-            <el-button type="success" @click="addtask">新增</el-button>
-          </el-form-item>
-        </div>
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="任务时间">
+              <el-date-picker
+                v-model="qdate"
+                type="daterange"
+                value-format="YYYY-MM-DD"
+                range-separator="到"
+                start-placeholder="开始时间"
+                end-placeholder="结束时间"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="4" v-if="currentstatus == 1">
+            <el-form-item label="任务状态" >
+              <el-select
+                v-model="queryparameters.status"
+                class="m-1"
+                placeholder="请选择"
+              >
+                <el-option
+                  v-for="item in task_status"
+                  :label="item.label"
+                  :value="item.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="4">
+            <el-form-item label="事件来源">
+              <el-select
+                v-model="queryparameters.taskType"
+                class="m-2"
+                placeholder="请选择"
+              >
+                <el-option
+                  v-for="item in task_type"
+                  :label="item.label"
+                  :value="item.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item label="区属">
+              <el-select
+                v-model="queryparameters.taskArea"
+                class="m-2"
+                placeholder="请选择"
+              >
+                <el-option
+                  v-for="item in sys_area"
+                  :label="item.label"
+                  :value="item.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="4">
+            <div style="float: right">
+              <el-form-item>
+                <el-button type="primary" @click="getList">查询</el-button>
+              </el-form-item>
+              <el-form-item>
+                <el-button type="success" @click="addtask">新增</el-button>
+              </el-form-item>
+            </div>
+          </el-col>
+        </el-row>
       </el-form>
 
       <div>
@@ -186,6 +213,7 @@ const {
 const queryparameters = ref({
   status: "",
   taskArea: "",
+  taskType: "",
   pageNum: 1,
   pageSize: 10,
 });