Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun-pc

src/views/contractManagement/purchaseContractAdd.vue

@@ -789,6 +789,7 @@ export default {
     },
     // 上传附件
     uploadSuccessHandle(e) {
+      console.log(e)
       this.addressUrls.push(e.url)
       // this.deptBudgetList.addressUrl = this.addressUrls.toString
     },

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

@@ -116,10 +116,10 @@ const tranManagementRouter = {
     },
     //出入库任务查看
     {
-      path: 'inOutWarehouseTaskEdit',
+      path: 'inOutWarehousetaskEdit',
       component: () =>
         import(/* webpackChunkName: "applDetail" */ '@/views/taskManagement/inOutWarehouseTaskEdit'),
-      name: 'inOutWarehouseTaskEdit',
+      name: 'inOutWarehousetaskEdit',
       meta: {
         title: 'inOutWarehouseTaskEdit',
         shortcutEntrance: 'tranManagement',
@@ -129,10 +129,10 @@ const tranManagementRouter = {
     },
     //出入库任务添加
     {
-      path: 'tranManagementWarehouseInOutTaskAdd',
+      path: 'tranManagementWarehouseInOuttaskAdd',
       component: () =>
         import(/* webpackChunkName: "applDetail" */ '@/views/taskManagement/tranManagementWarehouseInOutTaskAdd'),
-      name: 'tranManagementWarehouseInOutTaskAdd',
+      name: 'tranManagementWarehouseInOuttaskAdd',
       meta: {
         title: 'tranManagementWarehouseInOutTaskAdd',
         shortcutEntrance: 'tranManagement',
@@ -144,10 +144,10 @@ const tranManagementRouter = {
     },
     //出入库任务编辑
     {
-      path: 'tranManagementWarehouseInOutTaskEdit',
+      path: 'tranManagementWarehouseInOuttaskedit',
       component: () =>
         import(/* webpackChunkName: "applDetail" */ '@/views/taskManagement/tranManagementWarehouseInOutTaskEdit'),
-      name: 'tranManagementWarehouseInOutTaskEdit',
+      name: 'tranManagementWarehouseInOuttaskedit',
       meta: {
         title: 'tranManagementWarehouseInOutTaskEdit',
         shortcutEntrance: 'tranManagement',
@@ -159,7 +159,7 @@ const tranManagementRouter = {
     },
     //出入库任务审核
     {
-      path: 'tranManagementWarehouseInOutTaskaudit',
+      path: 'tranManagementWarehouseInOuttaskaudit',
       component: () =>
         import(/* webpackChunkName: "applDetail" */ '@/views/taskManagement/tranManagementWarehouseInOutTaskAudit'),
       name: 'tranManagementWarehouseInOutTaskEdit',

src/views/taskManagement/inOutWarehouseTaskEdit.vue

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

src/views/taskManagement/tranManagementWarehouseInOutTask.vue

@@ -336,7 +336,7 @@ export default {
   methods: {
     //添加
     handleAdd() {
-      this.$router.push({ path: 'tranManagementWarehouseInOutTaskAdd' })
+      this.$router.push({ path: 'tranManagementWarehouseInOuttaskAdd' })
     },
     //查找
     lookUp() {
@@ -393,7 +393,7 @@ export default {
     //编辑
     delivery(item) {
       this.$router.push({
-        path: 'tranManagementWarehouseInOutTaskEdit',
+        path: 'tranManagementWarehouseInOuttaskedit',
         query: {
           relevanceId: item.relevanceId,
         },
@@ -401,7 +401,7 @@ export default {
     },
     audit(item) {
       this.$router.push({
-        path: 'tranManagementWarehouseInOutTaskaudit',
+        path: 'tranManagementWarehouseInOuttaskaudit',
         query: {
           relevanceId: item.relevanceId,
           taskId: item.taskId,
@@ -444,7 +444,7 @@ export default {
     //查看//传参
     nocomplete(row) {
       this.$router.push({
-        path: 'inOutWarehouseTaskEdit',
+        path: 'inOutWarehousetaskEdit',
         query: {
           relevanceId: row.relevanceId,
           businessKey:row.id,

src/views/taskManagement/tranManagementWarehouseInOutTaskAudit.vue

@@ -1125,18 +1125,14 @@ export default {
         return
       }
       if (this.dataList.taskTypeKey == 1) {
-        this.dataList.inOutTaskNo = this.inOutTaskNo
         this.requestaudit(this.dataList)
       } else if (this.dataList1.taskTypeKey == 2) {
-        this.dataList1.inOutTaskNo = this.inOutTaskNo1
         this.requestaudit(this.dataList1)
       } else if (
         this.dataList.taskTypeKey == 3 ||
         this.dataList.taskTypeKey == 4
       ) {
-        this.dataList.inOutTaskNo = this.inOutTaskNo
         this.requestaudit(this.dataList, 'repetition')
-        this.dataList1.inOutTaskNo = this.inOutTaskNo1
         if (!this.deletetask) {
           this.requestaudit(this.dataList1, 'repetition')
         }
@@ -1298,6 +1294,8 @@ export default {
                     response[0].inOutTaskNo.indexOf('C') + 1,
                     response[0].inOutTaskNo.length
                   )
+              }else if (response[0].taskTypeKey == 2){
+                this.dataList1 = response[0]
               }
               this.dataList = response[0]
             }