前端

src/api/V2/taskspost/index.js

@@ -19,8 +19,8 @@ export const API_GET_TRAN_EXAMINE = '/tranTaskInfo/getTranTask'
 // 运输任务-编辑
 export const API_GET_TRAN_EDIT = '/tranTaskInfo/api/editTranTask'
 // 审核通过不通过接口
-// export const API_POST_WORKFLOW_API_HANDLE = `/workflow/api/handle`
-export const API_POST_WORKFLOW_API_HANDLE ='/newWorkflow/api/handle'
+export const API_POST_WORKFLOW_API_HANDLE = `/workflow/api/handle`
+// export const API_POST_WORKFLOW_API_HANDLE ='/newWorkflow/api/handle'
 // 审核编辑
 export const API_POST_INOUTWAREHOUSETASK = `/inOutWarehouseTask/api/checkOrUpdateInOutTask`
 // 出入库任务-新增（编辑）

src/components/mapdrag/indexMap.vue

@@ -265,7 +265,7 @@
           viewMode: '3D',
           pitch: 0, //地圖仰角
           center: [122.122, 40.227],
-          mapStyle: 'amap://styles/dark',
+          mapStyle: 'amap://styles/c0ed286f357b7f4c7312476637a7ab04',
           buildingAnimation: false,
           showIndoorMap: false,
         });

src/views/contractManagement/purchaseContractAdd.vue

@@ -705,9 +705,9 @@ import { isUndefined } from 'xe-utils/methods'
         //    }else{
         //      this.deptBudgetList.personChargeKey= this.staffList[i].staffId
         //    }
-            
         //   }
         // }
+        this.deptBudgetList.personCharge=''
         for (var i = 0; i < this.staffList.length; i++) {
           for (var j = 0; j < e.length; j++) {
             if (this.staffList[i].staffMobilePhone == e[j]) {

src/views/home/components/ShipMap.vue

@@ -338,7 +338,7 @@ export default {
     },
     initShipMap () {
       var options = {
-        ak: '57df9eaa033b44809d4bdaf919af457e',
+        ak: 'c0ed286f357b7f4c7312476637a7ab04',
         // 初始中心点坐标
         centerPoint: [30.171, 121.27],
         zoom: 3,

src/views/home/index.vue

@@ -897,32 +897,32 @@
           maxZoom: 18,
           defaultMapType: 'MT_SEA', //默认海图
           // 公司版权信息( 支持html )，默认Elane Inc.
-          attribution: {
-            isShow: false,
-            emptyString: '&copy;2019 <a class="shipxy_small"></a>&nbsp;<a>WinSea Inc.</a>'
-          },
-          measureCtrl: {
-            isShow: false
-          },
-          mousePostionCtrl: {
-            isShow: false
-          },
-          zoomControlElane: {
-            isShow: true,
-            position: 'bottomright'
-          },
-          zoomviewControl: {
-            isShow: false,
-            position: 'bottomright'
-          },
-          basemapsControl: {
-            isShow: false,
-            position: 'topright'
-          },
-          scaleCtrl: {
-            isShow: true,
-            position: 'bottomleft'
-          }
+          // attribution: {
+          //   isShow: false,
+          //   emptyString: '&copy;2019 <a class="shipxy_small"></a>&nbsp;<a>WinSea Inc.</a>'
+          // },
+          // measureCtrl: {
+          //   isShow: false
+          // },
+          // mousePostionCtrl: {
+          //   isShow: false
+          // },
+          // zoomControlElane: {
+          //   isShow: true,
+          //   position: 'bottomright'
+          // },
+          // zoomviewControl: {
+          //   isShow: false,
+          //   position: 'bottomright'
+          // },
+          // basemapsControl: {
+          //   isShow: false,
+          //   position: 'topright'
+          // },
+          // scaleCtrl: {
+          //   isShow: true,
+          //   position: 'bottomleft'
+          // }
         }
         // 创建地图示例
         // eslint-disable-next-line no-undef
@@ -935,10 +935,10 @@
           // delayTime: 5000,
           lableFont: ['500 12px Arial', '500 12px 宋体'], // 船舶名称，文字字体，默认值：["600 12px Arial", "500 12px Arial"]
           lableTxtColor: ['#fff', '#fff'], // 船舶名称，文字颜色，默认值：["#000","#fff"]
-          lableLineColor: ['rgba(1, 30, 62, 0)', 'rgba(1, 30, 62, 0)'], //  边框颜色，默认值：["#000","#000"]
-          lableLinefillColor: ['rgba(0, 0, 0, 0.6)', 'rgba(0, 0, 0, 0.6)'], // 框内填充颜色，默认值：[null,null]
-          obliqueLineColor: ['#000', '#000'], // 船舶名称，斜线颜色，默认值：[null,null]
-          dShipColor: '#FF6437', // D+船颜色，默认：#ff6347
+          // lableLineColor: ['rgba(1, 30, 62, 0)', 'rgba(1, 30, 62, 0)'], //  边框颜色，默认值：["#000","#000"]
+          // lableLinefillColor: ['rgba(0, 0, 0, 0.6)', 'rgba(0, 0, 0, 0.6)'], // 框内填充颜色，默认值：[null,null]
+          // obliqueLineColor: ['#000', '#000'], // 船舶名称，斜线颜色，默认值：[null,null]
+          // dShipColor: '#FF6437', // D+船颜色，默认：#ff6347
           zoomLevel_data: 1,
           zoomLevel_base: 1,
           getAreaShipsCallBack: (call) => {

src/views/platformaudit/transactioninformationreview.vue

@@ -563,4 +563,4 @@
   /deep/.typeselect .el-input__inner {
     color: #8890b1;
   }
-</style>
+</style>

src/views/warehouse/warehouseManagementNoComplete.vue

@@ -541,4 +541,4 @@ export default {
   color: #ffffff;
   line-height: 20px;
 }
-</style>
+</style>

src/views/workNotification/components/WorkNotificationItem.vue

@@ -158,7 +158,6 @@ export default {
       }
     },
     checkType () {
-      console.log(this.info)
       return utils.code2Url(this.info.businessType, this.info.businessCode, this.info.acceptanceType);
     },
   }