Merge branch 'dev' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend-mes into dengfei

src/views/oneClickWorkReporting/index.vue

@@ -988,7 +988,9 @@
         </el-table-column>
         <el-table-column label="操作" align="center" width="60">
           <template slot-scope="scope">
-            <span class="handle_stop" @click="handleStop(scope.row)">中止</span>
+            <span class="handle_stop"
+            v-if="$hasPermission('mes:oneClickWorkReporting:stop')"
+            @click="handleStop(scope.row)">中止</span>
           </template>
         </el-table-column>
       </el-table>

src/views/produceOrder/components/releaseDialog/index.vue

@@ -3,7 +3,7 @@
     :before-close="cancel"
     :close-on-click-modal="false"
     :maxable="true"
-    :title="'派单'"
+    title="任务派单"
     :visible.sync="dispatchVisible"
     :width="modelWidth"
     append-to-body
@@ -289,11 +289,6 @@
                 <el-date-picker
                   v-model="row.startTime"
                   :disabled="permissions(row, item)"
-                  :picker-options="{
-                    disabledDate: function (time) {
-                      return validDate.startDisabledDate(row, 'endTime', time);
-                    }
-                  }"
                   @change="handleStartTimeChange(row, item)"
                   class="w100"
                   placeholder="开始时间"
@@ -305,12 +300,6 @@
                 <el-date-picker
                   v-model="row.endTime"
                   :disabled="permissions(row, item)"
-                  :picker-options="{
-                    disabledDate: (time) =>
-                      validDate.endDisabledDate(row, 'startTime', time),
-                    disabledTime: (date) =>
-                      validDate.endDisabledTime(row, 'startTime', date)
-                  }"
                   class="w100"
                   placeholder="完成时间"
                   type="datetime"