前端gjy

src/components/WsUpload/index.vue

@@ -39,7 +39,7 @@
       </template>
       <template v-slot:file="{ file }">
         <div class="thumbnail-group">
-          <winsea-picture-view
+          <!-- <winsea-picture-view
             v-if="isPictureFile(file)"
             class="el-upload-list__item-thumbnail"
             picturesShowType="fold"
@@ -47,9 +47,8 @@
             :pic-list="_getFileImgs"
             :width="110"
             :height="110"
-          />
+          /> -->
           <img
-            v-else
             class="el-upload-list__item-thumbnail"
             :class="getFileClass(file)"
           />

src/layout/index/sidebar/sidebarItem.vue

@@ -109,9 +109,11 @@ export default {
       return generateTitle(item[this.labelKey], (item.meta || {}).title, this)
     },
     vaildAvtive(item) {
+      console.log(item)
       const groupFlag = (item['group'] || []).some((ele) =>
         this.$route.path.includes(ele)
       )
+      console.log(groupFlag)
       if (groupFlag)
         // console.info(groupFlag, 'groupFlag', item['group'], this.$route.path, this.nowTagValue, item[this.pathKey])
         return this.nowTagValue === item[this.pathKey] || groupFlag

src/views/taskManagement/component/routers/route.js

@@ -104,16 +104,14 @@ const tranManagementRouter = {
     },
     //出入库任务
     {
-      path: 'tranManagementWarehouseInOutTask',
+      path: 'tranManagementWarehouseInOuttask',
       component: () =>
         import(/* webpackChunkName: "applDetail" */ '@/views/taskManagement/tranManagementWarehouseInOutTask'),
-      name: 'tranManagementWarehouseInOutTask',
+      name: 'tranManagementWarehouseInOuttask',
       meta: {
         title: 'tranManagementWarehouseInOutTask',
         shortcutEntrance: 'tranManagement',
-        module: 'warehouseManagement.warehouse.warehouseInfoTask',
-        permissicon: [],
-        keepAlive: true
+        module: 'warehouseManagement.warehouse.warehouseInfoTask.View',
       },
     },
     //出入库任务查看

src/views/taskManagement/inOutWarehouseTaskEdit.vue

@@ -921,9 +921,7 @@ export default {
             this.dataList = response[0]
             this.dataList1 = response[1]
           } else {
-            console.log(response[0].taskTypeKey)
             if(response[0].taskTypeKey==2){
-              
               this.dataList1 = response[0]
             }else{
               this.dataList = response[0]

src/views/taskManagement/tranManagementTransportAdd.vue

@@ -212,12 +212,15 @@
             v-if="index == deptBudgetList.tranProcessInfoList.length - 1"
           >最终阶段</span> -->
           <el-checkbox
-          @change='engflagchange'
-           class='endflag'
+          @change="(val) => engflagchange(val,index)"
+            class="endflag"
+            true-label="1"
+            false-label="0"
             v-if="index == deptBudgetList.tranProcessInfoList.length - 1"
             v-model="item.endFlag"
             :label="1"
-          >最终阶段</el-checkbox>
+            >最终阶段</el-checkbox
+          >
         </div>
         <ws-info-table>
           <el-form-item label="运输方式" span="1" prop="waterContent">

src/views/taskManagement/tranManagementTransportEdit.vue

@@ -485,7 +485,6 @@ export default {
       this.deptBudgetList.tranProcessInfoList[0].weight = e
     },
     engflagchange(e,index) {
-      console.log(e)
       this.endflag = e
       if (this.endflag) {
         this.deptBudgetList.tranProcessInfoList[

src/views/taskManagement/tranManagementWarehouseInOutTaskAdd.vue

@@ -794,7 +794,7 @@ export default {
       this.$router.go(-1)
     },
     returnsales() {
-      this.$router.push({ path: 'tranManagementWarehouseInOutTask' })
+      this.$router.push({ path: 'tranManagementWarehouseInOuttask' })
     },
     // 获取当前年月日
     getdate() {
@@ -935,7 +935,7 @@ export default {
             .toPromise()
             .then((response) => {
               this.$message.success('添加成功')
-              this.$router.push({ path: 'tranManagementWarehouseInOutTask' })
+              this.$router.push({ path: 'tranManagementWarehouseInOuttask' })
             })
     },
     //提交按钮

src/views/taskManagement/tranManagementWarehouseInOutTaskAudit.vue

@@ -832,7 +832,7 @@ export default {
       this.$router.go(-1)
     },
     returnsales() {
-      this.$router.push({ path: 'tranManagementWarehouseInOutTask' })
+      this.$router.push({ path: 'tranManagementWarehouseInOuttask' })
     },
     // 获取当前年月日
     getdate() {
@@ -978,7 +978,7 @@ export default {
               woekflowhandle({taskId:list.taskId,approved:true,auditMind:'34',needReapply:false}).toPromise()
             .then((response) => {
               this.$message.success('审核成功')
-              this.$router.push({ path: 'tranManagementWarehouseInOutTask' })
+              this.$router.push({ path: 'tranManagementWarehouseInOuttask' })
             })
               
             })
@@ -994,7 +994,7 @@ export default {
               woekflowhandle({taskId:list.taskId,approved:true,auditMind:this.auditMind,needReapply:false}).toPromise()
             .then((response) => {
               this.$message.success('驳回成功')
-              this.$router.push({ path: 'tranManagementWarehouseInOutTask' })
+              this.$router.push({ path: 'tranManagementWarehouseInOuttask' })
             })
               
             })

src/views/taskManagement/tranManagementWarehouseInOutTaskEdit.vue

@@ -783,7 +783,7 @@ export default {
       this.$router.go(-1)
     },
     returnsales() {
-      this.$router.push({ path: 'tranManagementWarehouseInOutTask' })
+      this.$router.push({ path: 'tranManagementWarehouseInOuttask' })
     },
     // 获取当前年月日
     getdate() {
@@ -924,7 +924,7 @@ export default {
             .toPromise()
             .then((response) => {
               this.$message.success('编辑成功')
-              this.$router.push({ path: 'tranManagementWarehouseInOutTask' })
+              this.$router.push({ path: 'tranManagementWarehouseInOuttask' })
             })
     },
     //提交按钮

src/views/warehouse/component/router/index.js

@@ -8,7 +8,7 @@ const warehouseManagementRouter = {
   alwaysShow: true, // will always show the root menu
   meta: {
     title: 'warehouseManagementList',
-    module: 'warehouseManagement',
+    module: 'warehouseManagement.warehouse.warehouseInfo',
     icon: '-cangkubeifen'
   },
   children: [
@@ -20,7 +20,7 @@ const warehouseManagementRouter = {
       meta: {
         title: 'warehouseManagementList',
         shortcutEntrance: 'warehouseManagementList',
-        module: 'warehouseManagement.warehouse',
+        module: 'warehouseManagement.warehouse.warehouseInfo',
         permissicon: [],
         keepAlive: true
         // module: 'procurement.sparepart.applDetail'