wenhongquan 3 gadi atpakaļ
vecāks
revīzija
bea99931d3

+ 109 - 77
src/components/Task/Add/index.vue

@@ -3,32 +3,26 @@
     <el-form :model="taskinfo" label-width="120px">
     <el-form :model="taskinfo" label-width="120px">
       <el-row>
       <el-row>
         <el-col :span="12">
         <el-col :span="12">
-          <el-form-item label="工单:">
+          <el-form-item label="系统工单:">
             <el-input v-model="taskinfo.taskCode" />
             <el-input v-model="taskinfo.taskCode" />
           </el-form-item>
           </el-form-item>
         </el-col>
         </el-col>
-
         <el-col :span="12">
         <el-col :span="12">
-          <el-form-item label="行政区:">
+          <el-form-item label="事件分类:">
             <el-select
             <el-select
-              v-model="taskinfo.taskArea"
+              v-model="taskinfo.taskEventCategory"
               class="m-1"
               class="m-1"
               placeholder="请选择"
               placeholder="请选择"
             >
             >
               <el-option
               <el-option
-                v-for="item in sys_area"
+                v-for="item in task_event_category"
                 :label="item.label"
                 :label="item.label"
-                :value="item.value"
+                :value="parseInt(item.value)"
               ></el-option>
               ></el-option>
             </el-select>
             </el-select>
           </el-form-item>
           </el-form-item>
         </el-col>
         </el-col>
         <el-col :span="12">
         <el-col :span="12">
-          <el-form-item label="其他工单号">
-            <el-input v-model="taskinfo.taskOtherId" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
           <el-form-item label="事件来源:">
           <el-form-item label="事件来源:">
             <el-select
             <el-select
               v-model="taskinfo.taskType"
               v-model="taskinfo.taskType"
@@ -44,38 +38,27 @@
           </el-form-item>
           </el-form-item>
         </el-col>
         </el-col>
         <el-col :span="12">
         <el-col :span="12">
-          <el-form-item label="道路名">
-            <el-input v-model="taskinfo.taskAddrRoad" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="投诉人电话">
-            <el-input v-model="taskinfo.taskComplainConnect" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="班组区域:">
-            <el-tree-select
-              v-model="taskinfo.taskDeptRange"
-              multiple
-              :data="treedept"
-              check-strictly="true"
-            />
+          <el-form-item label="事件类型:">
+            <el-select
+              v-model="taskinfo.taskEventType"
+              class="m-1"
+              placeholder="请选择"
+            >
+              <el-option
+                v-for="item in task_event_type"
+                :label="item.label"
+                :value="parseInt(item.value)"
+              ></el-option>
+            </el-select>
           </el-form-item>
           </el-form-item>
         </el-col>
         </el-col>
-
         <el-col :span="12">
         <el-col :span="12">
-          <el-form-item label="来件时间:">
-            <el-date-picker
-              v-model="taskinfo.taskTime"
-              type="datetime"
-              placeholder="请选择"
-            />
+          <el-form-item label="来件工单号">
+            <el-input v-model="taskinfo.taskOtherId" />
           </el-form-item>
           </el-form-item>
         </el-col>
         </el-col>
-
         <el-col :span="12">
         <el-col :span="12">
-          <el-form-item label="要求完成时间:">
+          <el-form-item label="办理时限:">
             <el-date-picker
             <el-date-picker
               v-model="taskinfo.taskReqCompleteTime"
               v-model="taskinfo.taskReqCompleteTime"
               type="datetime"
               type="datetime"
@@ -85,64 +68,40 @@
         </el-col>
         </el-col>
 
 
         <el-col :span="12">
         <el-col :span="12">
-          <el-form-item label="事件分类:">
-            <el-select
-              v-model="taskinfo.taskEventCategory"
-              class="m-1"
-              placeholder="请选择"
-            >
-              <el-option
-                v-for="item in task_event_category"
-                :label="item.label"
-                :value="parseInt(item.value)"
-              ></el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
-
-        <el-col :span="12">
-          <el-form-item label="事件类型:">
+          <el-form-item label="行政区:">
             <el-select
             <el-select
-              v-model="taskinfo.taskEventType"
+              v-model="taskinfo.taskArea"
               class="m-1"
               class="m-1"
               placeholder="请选择"
               placeholder="请选择"
             >
             >
               <el-option
               <el-option
-                v-for="item in task_event_type"
+                v-for="item in sys_area"
                 :label="item.label"
                 :label="item.label"
-                :value="parseInt(item.value)"
+                :value="item.value"
               ></el-option>
               ></el-option>
             </el-select>
             </el-select>
           </el-form-item>
           </el-form-item>
         </el-col>
         </el-col>
 
 
         <el-col :span="12">
         <el-col :span="12">
-          <el-form-item label="任务内容:">
-            <el-input v-model="taskinfo.taskContent" />
+          <el-form-item label="处理时限">
+            <el-input disabled v-model="taskinfo.taskTime" />
           </el-form-item>
           </el-form-item>
         </el-col>
         </el-col>
 
 
-        <!-- <el-col :span="12">
-          <el-form-item label="设施编号:">
-            <el-input v-model="taskinfo.taskFacilitieCode" />
-          </el-form-item>
-        </el-col> -->
-
         <el-col :span="12">
         <el-col :span="12">
-          <el-form-item label="是否需要确认:">
-            <el-select
-              v-model="taskinfo.remark"
-              class="m-1"
-              placeholder="请选择"
-            >
-              <el-option label="是" value="1"></el-option>
-              <el-option label="否" value="0"></el-option>
-            </el-select>
+          <el-form-item label="班组区域:">
+            <el-tree-select
+              v-model="taskinfo.taskDeptRange"
+              multiple
+              :data="treedept"
+              check-strictly="true"
+            />
           </el-form-item>
           </el-form-item>
         </el-col>
         </el-col>
 
 
         <el-col :span="12">
         <el-col :span="12">
-          <el-form-item label="接单人员">
+          <el-form-item label="录单员">
             <el-select
             <el-select
               v-model="taskinfo.taskReporter"
               v-model="taskinfo.taskReporter"
               placeholder="请选择人员"
               placeholder="请选择人员"
@@ -159,14 +118,76 @@
           </el-form-item>
           </el-form-item>
         </el-col>
         </el-col>
 
 
+
+
+
+
+
+
+
+
+
+
+<!--        <el-col :span="12">-->
+<!--          <el-form-item label="投诉人电话">-->
+<!--            <el-input v-model="taskinfo.taskComplainConnect" />-->
+<!--          </el-form-item>-->
+<!--        </el-col>-->
+
+
+<!--        <el-col :span="12">-->
+<!--          <el-form-item label="来件时间:">-->
+<!--            <el-date-picker-->
+<!--              v-model="taskinfo.taskTime"-->
+<!--              type="datetime"-->
+<!--              placeholder="请选择"-->
+<!--            />-->
+<!--          </el-form-item>-->
+<!--        </el-col>-->
+
+
+
+
+
+
+
+<!--        <el-col :span="12">-->
+<!--          <el-form-item label="任务内容:">-->
+<!--            <el-input v-model="taskinfo.taskContent" />-->
+<!--          </el-form-item>-->
+<!--        </el-col>-->
+
+
+
+<!--        <el-col :span="12">-->
+<!--          <el-form-item label="是否需要确认:">-->
+<!--            <el-select-->
+<!--              v-model="taskinfo.remark"-->
+<!--              class="m-1"-->
+<!--              placeholder="请选择"-->
+<!--            >-->
+<!--              <el-option label="是" value="1"></el-option>-->
+<!--              <el-option label="否" value="0"></el-option>-->
+<!--            </el-select>-->
+<!--          </el-form-item>-->
+<!--        </el-col>-->
+
+
+
         <el-col :span="24">
         <el-col :span="24">
           <el-form-item label="来件备注:">
           <el-form-item label="来件备注:">
-            <el-input v-model="taskinfo.taskFromRemark" />
+            <el-input v-model="taskinfo.taskFromRemark"  type="textarea"/>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="24">
+          <el-form-item label="道路名">
+            <el-input v-model="taskinfo.taskAddrRoad" />
           </el-form-item>
           </el-form-item>
         </el-col>
         </el-col>
 
 
         <el-col :span="12">
         <el-col :span="12">
-          <el-form-item label="事件地址">
+          <el-form-item label="详细地址">
             <div style="position: relative; width: 100%">
             <div style="position: relative; width: 100%">
               <div style="width: 80%">
               <div style="width: 80%">
                 <el-input v-model="taskinfo.taskAddr" />
                 <el-input v-model="taskinfo.taskAddr" />
@@ -372,6 +393,17 @@ export default defineComponent({
         taskinfo.value.taskVideos = fileList1.value;
         taskinfo.value.taskVideos = fileList1.value;
       }
       }
     );
     );
+    watch(()=>taskinfo.value.taskType,()=>{
+      if(task_type.value && task_type.value.length>0){
+        for (const index in task_type.value) {
+          var typec = task_type.value[index];
+          if((typec.value+"") === (taskinfo.value.taskType+"")){
+            taskinfo.value.taskTime  = moment().add(typec.remark,'hours').format('YYYY-MM-DD HH:mm:ss')
+          }
+        }
+      }
+    })
+
     const updateallvalue = () => {
     const updateallvalue = () => {
       context.emit("update:taskinfo", taskinfo.value);
       context.emit("update:taskinfo", taskinfo.value);
     };
     };

+ 10 - 7
src/views/task/detail/index.vue

@@ -100,7 +100,7 @@
                   .join(",")
                   .join(",")
               }}</el-col
               }}</el-col
             >
             >
-            <el-col :span="6">来件时间:{{ taskinfo.taskTime }}</el-col>
+            <el-col :span="6">来件时间:{{ taskinfo.createTime }}</el-col>
             <!-- <el-col :span="6"
             <!-- <el-col :span="6"
               >设施编号:{{ taskinfo.taskFacilitieCode }}</el-col
               >设施编号:{{ taskinfo.taskFacilitieCode }}</el-col
             > -->
             > -->
@@ -140,12 +140,15 @@
           </el-row>
           </el-row>
           <el-row>
           <el-row>
             <el-col :span="6"
             <el-col :span="6"
-              >是否需要确认:{{ taskinfo.remark === "1" ? "是" : "否" }}</el-col
-            >
-            <el-col :span="6">来件备注:{{ taskinfo.taskFromRemark }}</el-col>
-            <el-col :span="6"
-              >投诉人电话:{{ taskinfo.taskComplainConnect }}</el-col
+            >处置时限:{{ taskinfo.taskTime }}</el-col
             >
             >
+<!--            <el-col :span="6"-->
+<!--              >是否需要确认:{{ taskinfo.remark === "1" ? "是" : "否" }}</el-col-->
+<!--            >-->
+            <el-col :span="18">来件备注:{{ taskinfo.taskFromRemark }}</el-col>
+<!--            <el-col :span="6"-->
+<!--              >投诉人电话:{{ taskinfo.taskComplainConnect }}</el-col-->
+<!--            >-->
           </el-row>
           </el-row>
           <el-row>
           <el-row>
             <el-col :span="24">详细地址:{{ taskinfo.taskAddr }}</el-col>
             <el-col :span="24">详细地址:{{ taskinfo.taskAddr }}</el-col>
@@ -153,7 +156,7 @@
           </el-row>
           </el-row>
           <el-row>
           <el-row>
             <el-col :span="12">现场照片:</el-col>
             <el-col :span="12">现场照片:</el-col>
-            <el-col :span="12">任务内容:{{ taskinfo.taskContent }}</el-col>
+<!--            <el-col :span="12">任务内容:{{ taskinfo.taskContent }}</el-col>-->
           </el-row>
           </el-row>
 
 
           <el-row>
           <el-row>

+ 5 - 5
src/views/task/list/index.vue

@@ -82,7 +82,7 @@
               </el-button>
               </el-button>
               </el-form-item>
               </el-form-item>
               <el-form-item>
               <el-form-item>
-                <el-button type="success" @click="addtask" v-if="route.params.status==1">新增</el-button>
+                <el-button type="success" @click="addtask" v-if="route.params.status==1">新增工单</el-button>
               </el-form-item>
               </el-form-item>
             </div>
             </div>
           </el-col>
           </el-col>
@@ -124,13 +124,12 @@
             </template>
             </template>
           </el-table-column>
           </el-table-column>
           <el-table-column prop="taskAddrRoad" label="道路名" />
           <el-table-column prop="taskAddrRoad" label="道路名" />
-          <el-table-column prop="taskContent" label="任务内容" />
-          <el-table-column prop="taskTime" label="来件时间" />
+<!--          <el-table-column prop="taskContent" label="任务内容" />-->
+          <el-table-column prop="createTime" label="来件时间" />
            <el-table-column prop="taskTime" label="剩余时间" v-if="currentstatus!=6">
            <el-table-column prop="taskTime" label="剩余时间" v-if="currentstatus!=6">
               <template #default="scope"><div>
               <template #default="scope"><div>
                 <div v-if="scope.row.taskReqCompleteTime!=null && scope.row.status<5" :class="moment(scope.row.taskReqCompleteTime).diff(moment(),'days')<2?'tip-e':(moment(scope.row.taskReqCompleteTime).diff(moment(),'days')<3?'tip-w':(moment(scope.row.taskReqCompleteTime).diff(moment(),'days')>5?'tip-i':''))">
                 <div v-if="scope.row.taskReqCompleteTime!=null && scope.row.status<5" :class="moment(scope.row.taskReqCompleteTime).diff(moment(),'days')<2?'tip-e':(moment(scope.row.taskReqCompleteTime).diff(moment(),'days')<3?'tip-w':(moment(scope.row.taskReqCompleteTime).diff(moment(),'days')>5?'tip-i':''))">
                    <el-icon style="vertical-align: middle;"><Clock /></el-icon> <span> {{ moment(scope.row.taskReqCompleteTime).diff(moment(),'days')}}天</span>
                    <el-icon style="vertical-align: middle;"><Clock /></el-icon> <span> {{ moment(scope.row.taskReqCompleteTime).diff(moment(),'days')}}天</span>
-
                  </div>
                  </div>
                  <div v-if="scope.row.taskReqCompleteTime==null">
                  <div v-if="scope.row.taskReqCompleteTime==null">
                   -
                   -
@@ -351,8 +350,9 @@ const getList = () => {
       queryparameters.value.status = currentstatus.value;
       queryparameters.value.status = currentstatus.value;
     }
     }
   } else {
   } else {
+    delete queryparameters.value.status
 
 
-    // queryparameters.value.status = "";
+     // queryparameters.value.status = "";
   }
   }
  var query =  proxy.addDateRange(queryparameters.value, qdate.value)
  var query =  proxy.addDateRange(queryparameters.value, qdate.value)
   if (query.searchkey!=undefined && query.searchkey !== '') {
   if (query.searchkey!=undefined && query.searchkey !== '') {