Merge branch 'dev' into 'master'

Dev

See merge request !22

src/views/taskManage/edit.vue

@@ -78,7 +78,7 @@
         ></el-date-picker>
       </el-form-item>
       <br />
-      <el-form-item label="工单标题">
+      <el-form-item label="工单标题" required prop="title">
         <el-input
           style="width: 732px"
           v-model="editForm.title"
@@ -167,6 +167,9 @@ export default {
   methods: {
     onSubmit() {
       this.$refs.editForm.validate((v) => {
+        if (!this.editForm.content) {
+          return this.$message.warning('请输入工单内容')
+        }
         if (v) {
           let url = ''
           if (this.isEdit) {

src/views/taskManage/index.vue

@@ -37,7 +37,18 @@
         ref="form"
         class="search_form"
       >
-        <el-form-item label="创建时间">
+        <el-form-item>
+          <el-select
+            v-model="searchForm.prop"
+            placeholder="请选择"
+            clearable
+            style="width:100px"
+          >
+          <el-option label="开始时间" value="startTime"></el-option>
+          <el-option label="创建时间" value="createTime"></el-option>
+        </el-select>
+        </el-form-item>
+        <el-form-item>
           <choose-time-period
             v-model="periodTime"
           ></choose-time-period>
@@ -387,7 +398,7 @@
       <el-form size="mini">
         <el-form-item label="预计完成时间">
           <el-date-picker
-            style="width:100%"
+            style="width: 100%"
             v-model="estimateCompleteTime"
             value-format="yyyy-MM-dd HH:mm:ss"
             type="datetime"
@@ -397,10 +408,15 @@
         </el-form-item>
       </el-form>
       <span slot="footer">
-        <el-button size="small" @click="completeVisible = false"
+        <el-button
+          size="small"
+          @click="completeVisible = false"
           >取消</el-button
         >
-        <el-button size="small" type="primary" @click="submitTime"
+        <el-button
+          size="small"
+          type="primary"
+          @click="submitTime"
           >确认</el-button
         >
       </span>
@@ -463,7 +479,7 @@ export default {
       selections: [],
       is_tab: '1',
       statusCode: 'PRE_HANDLING',
-      searchForm: { timeProp: 'create_time' },
+      searchForm: { timeProp: 'create_time', leader: '', prop: 'createTime' },
       isEdit: false,
       sourceData: [],
       currentRowId: '',
@@ -497,7 +513,7 @@ export default {
     )
   },
   computed: {
-    ...mapState(['deptStaff']),
+    ...mapState(['deptStaff', 'userInfo']),
     tableColumns() {
       // const employeeId = this.employeeId
       return [
@@ -550,7 +566,12 @@ export default {
           label: '描述',
           key: 'content',
           render: (item) => {
-            return <div domPropsInnerHTML={item.content}></div>
+            return (
+              <div
+                class="description"
+                domPropsInnerHTML={item.content}
+              ></div>
+            )
           },
         },
         {
@@ -559,6 +580,11 @@ export default {
           width: 130,
         },
         {
+          label: '开始时间',
+          key: 'startTime',
+          width: 130,
+        },
+        {
           label: '期望完成时间',
           key: 'expectCompleteTime',
           width: 130,
@@ -783,6 +809,9 @@ export default {
       }
     },
     handleNodeClick(data) {
+      if (data.statusCode !== 'IN_PROGRESS') {
+        this.searchForm.leader = ''
+      }
       this.statusCode = data.statusCode
       this.getlist()
     },
@@ -836,9 +865,7 @@ export default {
         return
       }
       try {
-        const res = await completeWorkOrder(
-          item.id,
-        )
+        const res = await completeWorkOrder(item.id)
         if (res.code === 200) {
           this.getlist()
           this.getOrderTree()
@@ -852,7 +879,10 @@ export default {
         return this.$message.warning('请选择预计完成时间')
       }
       try {
-        const res = await startWorder(this.rowId, this.estimateCompleteTime)
+        const res = await startWorder(
+          this.rowId,
+          this.estimateCompleteTime,
+        )
         if (res.code === 200) {
           this.getlist()
           this.getOrderTree()
@@ -900,6 +930,19 @@ export default {
       this.textarea = ''
     },
   },
+  watch: {
+    statusCode(val) {
+      if (val === 'IN_PROGRESS') {
+        this.$set(
+          this.searchForm,
+          'leader',
+          this.userInfo.id,
+        )
+      } else {
+        this.$set(this.searchForm, 'leader', '')
+      }
+    },
+  },
 }
 </script>
 <style lang="scss" scoped>
@@ -1194,4 +1237,12 @@ export default {
     }
   }
 }
+
+.description {
+  display: flex;
+
+  & p:not(:first-child) {
+    margin-left: 6px;
+  }
+}
 </style>