前端

src/views/statisticalReport/autoSettlementList.vue

@@ -115,7 +115,7 @@
               !scope.row.actualLosschange && scope.row.actualLoss
             ">{{ scope.row.actualLoss }}</span>
             <input v-if="scope.row.actualLosschange" style="width: 60px" v-model="actualLoss" type="text" />
-            <div v-hasPermission="`report.transportationReport.wuliu`">
+            <div style="display:inline-block;" v-hasPermission="`report.transportationReport.wuliu`">
             <i @click="changeactualLoss(scope.row)" v-if="
               (scope.row.actualLosschange &&
                 scope.row.status == '待请款') ||
@@ -137,7 +137,7 @@
               !scope.row.settlementPricechange && scope.row.settlementPrice
             ">{{ scope.row.settlementPrice }}</span>
             <input v-if="scope.row.settlementPricechange" style="width: 60px" v-model="settlementPrice" type="text" />
-            <div v-hasPermission="`report.transportationReport.wuliu`">
+            <div style="display:inline-block;" v-hasPermission="`report.transportationReport.wuliu`">
             <i @click="changesettlementPrice(scope.row)" v-if="
               (scope.row.settlementPricechange &&
                 scope.row.status == '待请款') ||
@@ -163,7 +163,7 @@
             ">{{ scope.row.settlementWeight }}</span>
             <input v-if="scope.row.settlementWeightchange" style="width: 60px" v-model="settlementWeight" type="text" />
             <!--改结算重量-->
-            <div v-hasPermission="`report.transportationReport.wuliu`">
+            <div style="display:inline-block;" v-hasPermission="`report.transportationReport.wuliu`">
             <i @click="changesettlementWeight(scope.row)" v-if="
               (scope.row.settlementWeightchange &&
                 scope.row.status == '待请款') ||
@@ -188,7 +188,7 @@
             ">{{ scope.row.deductionAmount }}</span>
             <input v-if="scope.row.deductionAmountchange" style="width: 60px" v-model="deductionAmount" type="text" />
             <!--改扣款-->
-            <div v-hasPermission="`report.transportationReport.wuliu`">
+            <div style="display:inline-block;" v-hasPermission="`report.transportationReport.wuliu`">
             <i @click="changedeductionAmount(scope.row)" v-if="
               (scope.row.deductionAmountchange &&
                 scope.row.status == '待请款') ||
@@ -210,7 +210,7 @@
             ">{{ scope.row.serviceCharge }}</span>
             <input v-if="scope.row.serviceChargechange" style="width: 60px" v-model="serviceCharge" type="text" />
             <!--改服务费-->
-            <div v-hasPermission="`report.transportationReport.wuliu`">
+            <div style="display:inline-block;" v-hasPermission="`report.transportationReport.wuliu`">
             <i @click="changeserviceCharge(scope.row)" v-if="
               (scope.row.serviceChargechange &&
                 scope.row.status == '待请款') ||

src/views/taskManagement/tranManagementWarehouseInOutTaskAdd.vue

@@ -199,7 +199,6 @@
 						<el-button v-if='dataList.taskTypeKey!=3' class="bg-bottom" type="primary" size="small" @click="supplygoods()">选择货源</el-button>
 					</el-form-item>
 					<el-form-item v-else label="出库任务编号" class="huom">
-						
 						<el-select v-model="dataList1.inOutTaskNo" placeholder="请选择出库任务编号" class="huom" @change="selectinOutTaskNo"
 						filterable clearable>
 						<el-option v-for="item in taskNolist" :key="item.id" :label="item.inOutTaskNo"
@@ -627,6 +626,7 @@
 			supplygoods(){
 				if(this.dataList.taskTypeKey==1||this.dataList.taskTypeKey==3){
 					if(this.dataList.warehouseName){
+						localStorage.setItem('goodsName',this.dataList.goodsName);
 						localStorage.setItem('warehouse',this.dataList.warehouseName);
 						if(this.dataList.taskTypeKey==3){
 							if(this.dataList.moveTaskNo){
@@ -636,7 +636,6 @@
 							if(this.dataList.contractNo){
 								localStorage.setItem('contractNo',this.dataList.contractNo);
 							}
-							localStorage.setItem('goodsName',this.dataList.goodsName);
 						}
             			localStorage.setItem('taskTypeKey',this.dataList.taskTypeKey);
 						localStorage.setItem('warehouseId',this.baseId);

src/views/workNotification/utils/index.js

@@ -33,6 +33,8 @@ export function code2Url (type, code, state,status,message,businessId) {
       return warehousetask(code,state)
       case 'FEIYONGGUANLI':
         return profitable(code,state)  
+    case 'WAREHOUSING':
+      return warehousing(code,state)  
     default:
       return ''
   }
@@ -58,6 +60,17 @@ export function trantask(code, state,message){
   }
    return url
 }
+export function warehousing(code, state){
+  let url = ''
+  switch (code) {
+    
+    // 入库单
+    case 'WAREHOUSING-ORDER-APPROVE':
+      url = 'warehousingOrder'
+      break
+  }
+  return url
+}
 export function warehousetask(code, state){
   let url = ''
   switch (code) {
@@ -711,141 +724,16 @@ export function checkpurchase (code, state) {
       case 'PROCUREMENT-ORDER-APPROVE':
       url = 'purchaseOrderList'
       break
-    default:
-      url = undefined
-  }
-  return url
-}
-
-export function checkPurchase (code, state) {
-  let url = ''
-  switch (code) {
-    // 申请单-备件
-    case 'PURCHASE-SP-APPL-REMIND':
-      url = 'sparepart'
-      break
-    // 申请单-物料
-    case 'PURCHASE-MA-APPL-REMIND':
-      url = 'sparepartMa'
-      break
-    // 询价单-备件
-    case 'PURCHASE-SP-PARITY-SUBMITTED':
-      url = 'parityDetail'
-      break
-    // 询价单-物料
-    case 'PURCHASE-MA-PARITY-SUBMITTED':
-      url = 'parityDetailMa'
-      break
-    case 'PURCHASE-SP-APPL':
-      url = 'appPurDetail'
-      // url = "applDetail";
-      break
-    // 比价单-备件
-    case 'PURCHASE-SP-PARITY':
-      url = 'parityDetail'
-      break
-
-    case 'PURCHASE-SP-PURCHASE-SUBMITTED':
-      url = 'purchasDetail'
-      break
-    case 'PURCHASE-MA-PURCHASE-SUBMITTED':
-      url = 'purchasDetailMa'
-      break
-
-    case 'PURCHASE-SP-PURCHASE-SEND':
-      url = 'purchasDetail'
-      break
-    case 'PURCHASE-MA-PURCHASE-SEND':
-      url = 'purchasDetailMa'
-      break
-
-    case 'PURCHASE-SP-BILL-SUBMITTED':
-      url = 'billDetail'
+      case 'PROCUREMENT-PRICE-APPROVE':
+        url = 'acquisitionManagement'
       break
-    case 'PURCHASE-MA-BILL-SUBMITTED':
-      url = 'billDetailMa'
-      break
-
-    // 采购单-备件
-    case 'PURCHASE-SP-PURCHAS':
-      url = 'purchasDetail'
-      break
-    // 结算单-备件
-    case 'PURCHASE-SP-BILL':
-      url = 'billDetail'
-      break
-    // 申请单_物料
-    case 'PURCHASE-MA-APPL':
-    case 'PURCHASE-MA-APPL14':
-      url = 'appPurDetailMa'
-      // url = "applDetailMa";
-      break
-    // 比价单_物料
-    case 'PURCHASE-MA-PARITY':
-      url = 'parityDetailMa'
-      break
-    // 采购单-物料
-    case 'PURCHASE-MA-PURCHAS':
-      url = 'purchasDetailMa'
-      break
-    // 结算单-物料
-    case 'PURCHASE-MA-BILL':
-      url = 'billDetailMa'
-      break
-    // 申请单-海图
-    case 'PURCHASE-MAP-APPL':
-      url = 'applDetailMap'
-      break
-    // 比价单-海图
-    case 'PURCHASE-MAP-PARITY':
-      url = 'parityDetailMap'
-      break
-    case 'PURCHASE-NAV-APPL-REMIND':
-      url = 'sparepartMap';
-      break;
-    case 'PURCHASE-NAV-PURCHASE-SUBMITTED':
-      url = 'purchasDetailMap';
-      break;
-    case 'PURCHASE-NAV-PARITY-SUBMITTED':
-      url = 'parityDetailMap';
-      break;
-    case 'PURCHASE-NAV-PURCHASE-SEND':
-      url = 'purchasDetailMap';
-      break;
-    case 'PURCHASE-MAP-PURCHAS':
-      url = 'purchasDetailMap';
-      break;
-    case 'PURCHASE-NAV-BILL-SUBMITTED':
-      url = 'billDetailMap';
-      break;
-    case 'PURCHASE-MAP-BILL':
-      url = 'billDetailMap';
-      break;
-    // 2020-07-14
-    case 'PURCHASE-SP-BILL-SUBMIT':
-      url = 'billDetail';
-      break;
-    case 'PURCHASE-SP-BILL-AUDIT':
-      url = 'billDetail';
-      break;
-    case 'PURCHASE-MA-BILL-SUBMIT':
-      url = 'billDetailMa';
-      break;
-    case 'PURCHASE-MA-BILL-AUDIT':
-      url = 'billDetailMa';
-      break;
-    case 'PURCHASE-NAV-BILL-SUBMIT':
-      url = 'billDetailMap';
-      break;
-    case 'PURCHASE-NAV-BILL-AUDIT':
-      url = 'billDetailMap';
-      break;
     default:
       url = undefined
   }
   return url
 }
 
+
 export function sale (code, state) {
   if (code === 'SALE-CLOSE-REPORT') {
     // 销售平仓统计