Merge remote-tracking branch 'origin/dev' into dev

src/layout/components/Navbar.vue

@@ -8,7 +8,7 @@
     <div class="right-menu">
       <template v-if="device!=='mobile'">
         <el-badge :value="matterNum !== 0 ? matterNum : '' " class="right-menu-item badge">
-         <div @click="$router.push('/bpm/task/todo')" style="font-size: 28px; color: #cccccc;cursor: pointer;" class="el-icon-postcard"></div>
+         <div @click="$router.push('/task/todo')" style="font-size: 28px; color: #cccccc;cursor: pointer;" class="el-icon-postcard"></div>
         </el-badge>
 
         <el-badge :value="notMessage !== 0 ? notMessage : '' " class="right-menu-item badge">
@@ -136,7 +136,7 @@ export default {
     }
   },
   methods: {
-    
+
     toggleSideBar() {
       this.$store.dispatch('app/toggleSideBar')
     },
@@ -216,7 +216,7 @@ export default {
       font-size: 18px;
       color: #5a5e66;
       vertical-align: text-bottom;
-      margin-right: 6px;
+      margin-right: 15px;
       &.hover-effect {
         cursor: pointer;
         transition: background .3s;

src/views/ecw/order/transferWarehousing.vue

@@ -129,7 +129,7 @@
         <el-form-item label="原因类型">
           <dict-selector v-model="params.manualExceptionType" form-type="checkbox" :type="DICT_TYPE.MANUAL_EXCEPTION_TYPE" multiple ></dict-selector>
         </el-form-item>
-        <el-form-item label="附件">
+        <el-form-item required label="附件">
           <image-upload v-model="params.exceptionUrls"></image-upload>
         </el-form-item>
         <el-form-item label="详细信息">
@@ -137,7 +137,7 @@
         </el-form-item>
       </el-form>
       <span slot="footer" class="dialog-footer">
-        <el-button  type="primary" @click="submit2(false)">转异完成并入仓</el-button>
+        <el-button  type="primary" @click="submit2(false)">确认并完成入仓</el-button>
         <el-button @click="escapeBol = false">取消</el-button>
       </span>
     </el-dialog>

src/views/ecw/order/warehousing/index.vue

@@ -131,7 +131,7 @@
         <el-form-item label="原因类型">
           <dict-selector v-model="form.manualExceptionType" form-type="checkbox" :type="DICT_TYPE.MANUAL_EXCEPTION_TYPE" multiple ></dict-selector>
         </el-form-item>
-        <el-form-item label="附件">
+        <el-form-item required label="附件">
           <image-upload v-model="form.exceptionUrls"></image-upload>
         </el-form-item>
         <el-form-item label="详细信息">
@@ -139,7 +139,7 @@
         </el-form-item>
       </el-form>
       <span slot="footer" class="dialog-footer">
-        <el-button  type="primary" @click="handleSubmit">转异完成并入仓</el-button>
+        <el-button  type="primary" @click="handleSubmit">确认并完成入仓</el-button>
         <el-button @click="escapeBol = false">取消</el-button>
       </span>
     </el-dialog>