Merge pull request #32 from lanyulei/dev

添加工单删除功能

src/api/process/work-order.js

@@ -71,3 +71,11 @@ export function activeOrder(data, workOrderId) {
     data
   })
 }
+
+// 删除工单
+export function deleteWorkOrder(workOrderId) {
+  return request({
+    url: `/api/v1/work-order/delete/${workOrderId}`,
+    method: 'delete'
+  })
+}

src/views/process/list/all.vue

@@ -55,7 +55,7 @@
             <span>{{ parseTime(scope.row.create_time) }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="180">
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="240">
           <template slot-scope="scope">
             <el-button
               v-permisaction="['process:list:all:select']"
@@ -80,6 +80,13 @@
               icon="el-icon-switch-button"
               @click="handleUnity(scope.row)"
             >结单</el-button>
+            <el-button
+              v-permisaction="['process:list:all:delete']"
+              size="mini"
+              type="text"
+              icon="el-icon-delete"
+              @click="handleDelete(scope.row)"
+            >删除</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -122,7 +129,7 @@
 </template>
 
 <script>
-import { workOrderList, unityWorkOrder, inversionWorkOrder } from '@/api/process/work-order'
+import { workOrderList, unityWorkOrder, inversionWorkOrder, deleteWorkOrder } from '@/api/process/work-order'
 import { listUser } from '@/api/system/sysuser'
 export default {
   data() {
@@ -174,6 +181,26 @@ export default {
     handleView(row) {
       this.$router.push({ name: 'ProcessListHandle', query: { workOrderId: row.id, processId: row.process }})
     },
+    handleDelete(row) {
+      this.$confirm('此操作将删除该数据, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        deleteWorkOrder(row.id).then(response => {
+          this.$message({
+            type: 'success',
+            message: '删除成功!'
+          })
+          this.getList()
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消'
+        })
+      })
+    },
     handleUnity(row) {
       this.$confirm('此操作将会结束该工单, 是否继续?', '提示', {
         confirmButtonText: '确定',

src/views/system/dept/index.vue

@@ -129,6 +129,17 @@
               <el-input v-model="form.email" placeholder="请输入邮箱" maxlength="50" />
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item label="部门状态">
+              <el-radio-group v-model="form.status">
+                <el-radio
+                  v-for="dict in statusOptions"
+                  :key="dict.value"
+                  :label="dict.value"
+                >{{ dict.label }}</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -197,7 +208,11 @@ export default {
             trigger: 'blur'
           }
         ]
-      }
+      },
+      statusOptions: [
+        { label: '正常', value: '0' },
+        { label: '停用', value: '1' }
+      ]
     }
   },
   created() {