Merge branch 'qingban' of http://192.168.101.4:3000/jiaxiaoqiang/JG-ADMIN-TEMP into qingban

src/views/plan/schedule/index.vue

@@ -163,9 +163,6 @@ option.value = Object.assign(option.value, {
     {
       label: "排序",
       prop: "operationSort",
-      formatter: (val) => {
-        return val.operationSort + 1;
-      },
       editDisabled: true,
       width: 60,
     },

src/views/plan/workOrder/index.vue

@@ -90,12 +90,12 @@
             @click="revoke(row.id)"
             type="primary"
             :size="size">撤销</el-button>
-        <el-button
+<!--        <el-button
             icon="el-icon-setting"
             text
             @click="jumpPage(row.workOrderCode,1)"
             type="primary"
-            :size="size">领用申请</el-button>
+            :size="size">领用申请</el-button>-->
         <el-button
             icon="el-icon-setting"
             text