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

src/api/V2/statisticalReport/index.js

@@ -106,4 +106,6 @@ export const API_POST_YUNSHUSETPRICE = '/tranProcessInfo/api/setUpTranPrice'
 //汽运请款
 export const API_POST_SUBMITLOGISTICS = '/tranSettlementReport/api/submitLogistics'
 //船运反馈接口
-export const API_POST_EDITTRANTASK = '/tranTaskInfo/api/editTranTask'
+export const API_POST_EDITTRANTASK = '/tranTaskInfo/api/editTranTask'
+//粮食单价编辑
+export const API_POST_EDIT_TRANSETTLEMENT ='/tranSettlementReport/api/editTranSettlementReport'

src/views/contractManagement/salesContractExamine.vue

@@ -64,7 +64,6 @@
         </ws-form-item>
         <ws-form-item  v-if="deptBudgetList.transactionSubject == '合营'" class="readonly" label="合营方" span="1" prop="seller">
           <div class="unchanged">{{ deptBudgetList.jointVentureParties }}</div>
-          
         </ws-form-item>
         <ws-form-item v-if="deptBudgetList.transactionSubject == '合营'" label="合营方电话" span="1" prop="jointPhone">
           <div class="unchanged">{{deptBudgetList.jointPhone}}</div>

src/views/statisticalReport/autoSettlementList.vue

@@ -46,13 +46,18 @@
             " src="../../../public/img/sousuo.png" alt="" /></ws-button> -->
         </el-col>
       </el-row>
-      <!-- <el-row>
-        <div>粮食单价：<span v-if="grainPricetext=='编辑'">{{grainPrice}}</span><el-input></el-input><el-button type="primary" @click="editgrainPrice">{{grainPricetext}}</el-button></div>
-      </el-row> -->
+      <el-row>
+        <div v-hasPermission="`report.transportationReport.wuliu`" style="display:flex;align-items:center;justify-content: flex-start;" v-if="contractNo!='全部合同'&&warehouseList.records.length>0"><div style="width:100px;">粮食单价：</div> <div v-if="grainPricetext=='编辑'">{{grainPrice}}</div><el-input style="margin:0;" v-else v-model="grainPrice"></el-input><el-button style="margin:0 0 0 5px;" type="primary" @click="editgrainPrice">{{grainPricetext}}</el-button></div>
+      </el-row>
       <el-row>
         <div style="color:red">注：审核时，同一运输阶段勾选任意复选框，当前运输阶段下所有条目都通过审核！</div>
       </el-row>
-      <!-- <div>合计 装车净重（吨）：{{totalList.loadingWeight}} 卸车净重（吨）：{{totalList.unloadingWeight}}</div> -->
+      <div v-if="modification.length>0">合计 装车净重（吨）：{{totalList.loadingWeight}} 卸车净重（吨）：{{totalList.unloadingWeight}} 公司承担运损：{{totalList.transportDamage}}
+        损耗：{{totalList.lossWeight}} 实际损耗：{{totalList.actualLoss}} 预计单价：{{totalList.transportPrice}} 结算单价：{{totalList.settlementPrice}}
+        结算重量：{{totalList.settlementWeight}} 货损：{{totalList.cargoDamage}} 扣款：{{totalList.deductionAmount}} 服务费：{{totalList.serviceCharge}}
+        实付金额（元）：{{totalList.amountActuallyPaid}} 合计应付（元）：{{totalList.totalPayable}} 已付金额（元）：{{totalList.amountEdPayable}}
+        未付金额（元）：{{totalList.amountNotPayable}} 已开发票（元）：{{totalList.alreadyInvoice}}
+      </div>
       <el-table class="wenzi" :data="warehouseList.records" style="width: 100%; margin-top: 20px" ref="warehouseList"   @row-click="handleRowClick"
         @selection-change="handleSelectionChange">
         <el-table-column :selectable="selectInit" type="selection" width="55"></el-table-column>
@@ -110,6 +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 style="display:inline-block;" v-hasPermission="`report.transportationReport.wuliu`">
             <i @click="changeactualLoss(scope.row)" v-if="
               (scope.row.actualLosschange &&
                 scope.row.status == '待请款') ||
@@ -121,7 +127,7 @@
               (!scope.row.actualLosschange &&
                 scope.row.status == '已驳回')
             " width="17" height="18" style="vertical-align: text-top; position: relative; top: -1px"
-              src="../../../public/img/edit.png" @click="editactualLoss(scope.row)" alt="" />
+              src="../../../public/img/edit.png" @click="editactualLoss(scope.row)" alt="" /></div>
           </template>
         </el-table-column>
         <el-table-column width="120" class="table_td" prop="transportPrice" label="预计单价(元/吨)"></el-table-column>
@@ -131,6 +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 style="display:inline-block;" v-hasPermission="`report.transportationReport.wuliu`">
             <i @click="changesettlementPrice(scope.row)" v-if="
               (scope.row.settlementPricechange &&
                 scope.row.status == '待请款') ||
@@ -145,7 +152,7 @@
                 scope.row.settlementWeight &&
                 scope.row.status == '已驳回')
             " width="17" height="18" style="vertical-align: text-top; position: relative; top: -1px"
-              src="../../../public/img/edit.png" @click="editsettlementPrice(scope.row)" alt="" />
+              src="../../../public/img/edit.png" @click="editsettlementPrice(scope.row)" alt="" /></div>
           </template>
         </el-table-column>
         <el-table-column width="120" class="table_td" prop="settlementWeight" label="结算重量(吨)"><template
@@ -156,6 +163,7 @@
             ">{{ scope.row.settlementWeight }}</span>
             <input v-if="scope.row.settlementWeightchange" style="width: 60px" v-model="settlementWeight" type="text" />
             <!--改结算重量-->
+            <div style="display:inline-block;" v-hasPermission="`report.transportationReport.wuliu`">
             <i @click="changesettlementWeight(scope.row)" v-if="
               (scope.row.settlementWeightchange &&
                 scope.row.status == '待请款') ||
@@ -170,7 +178,7 @@
                 scope.row.settlementWeight &&
                 scope.row.status == '已驳回')
             " width="17" height="18" style="vertical-align: text-top; position: relative; top: -1px"
-              src="../../../public/img/edit.png" @click="editsettlementWeight(scope.row)" alt="" />
+              src="../../../public/img/edit.png" @click="editsettlementWeight(scope.row)" alt="" /></div>
           </template></el-table-column>
           <el-table-column width="120" class="table_td" prop="cargoDamage" label="货损">
           </el-table-column>
@@ -180,6 +188,7 @@
             ">{{ scope.row.deductionAmount }}</span>
             <input v-if="scope.row.deductionAmountchange" style="width: 60px" v-model="deductionAmount" type="text" />
             <!--改扣款-->
+            <div style="display:inline-block;" v-hasPermission="`report.transportationReport.wuliu`">
             <i @click="changedeductionAmount(scope.row)" v-if="
               (scope.row.deductionAmountchange &&
                 scope.row.status == '待请款') ||
@@ -192,7 +201,7 @@
               (!scope.row.deductionAmountchange &&
                 scope.row.status == '已驳回')
             " width="17" height="18" style="vertical-align: text-top; position: relative; top: -1px"
-              src="../../../public/img/edit.png" @click="editdeductionAmount(scope.row)" alt="" />
+              src="../../../public/img/edit.png" @click="editdeductionAmount(scope.row)" alt="" /></div>
           </template></el-table-column>
           <el-table-column width="100" class="table_td" label="服务费(元)" prop="serviceCharge">
             <template slot-scope="scope">
@@ -201,6 +210,7 @@
             ">{{ scope.row.serviceCharge }}</span>
             <input v-if="scope.row.serviceChargechange" style="width: 60px" v-model="serviceCharge" type="text" />
             <!--改服务费-->
+            <div style="display:inline-block;" v-hasPermission="`report.transportationReport.wuliu`">
             <i @click="changeserviceCharge(scope.row)" v-if="
               (scope.row.serviceChargechange &&
                 scope.row.status == '待请款') ||
@@ -214,6 +224,8 @@
                 scope.row.status == '已驳回')
             " width="17" height="18" style="vertical-align: text-top; position: relative; top: -1px"
               src="../../../public/img/edit.png" @click="editserviceCharge(scope.row)" alt="" />
+            </div>
+            
           </template>
           </el-table-column>
           <el-table-column width="100" class="table_td" label="实付金额(元)" prop="amountActuallyPaid"></el-table-column>
@@ -576,6 +588,19 @@ export default {
     this.showType = this.isShow
   },
   methods: {
+    editgrainPrice(){
+      if(this.grainPricetext=='编辑'){
+        this.grainPricetext='提交'
+      }else{
+        editgrainprice({id:this.warehouseList.records[0].id,flag:7,grainPrice:this.grainPrice}).toPromise().then((response) => {
+          this.$message.success('提交粮食单价成功')
+          this.grainPrice=''
+          this.grainPricetext='编辑'
+          this.getList()
+        })
+        
+      }
+    },
     warehouseNameChange(){
       this.getList()
     },
@@ -585,7 +610,21 @@ export default {
     countTotal(data) {
       var sums={
         loadingWeight:0,
-        unloadingWeight:0
+        unloadingWeight:0,
+        transportDamage:0,
+        lossWeight:0,
+        actualLoss:0,
+        transportPrice:0,
+        settlementPrice:0,
+        settlementWeight:0,
+        cargoDamage:0,
+        deductionAmount:0,
+        serviceCharge:0,
+        amountActuallyPaid:0,
+        totalPayable:0,
+        amountEdPayable:0,
+        amountNotPayable:0,
+        alreadyInvoice:0
       }
         for (let i = 0; i < data.length; i++) {
           if(!isNaN(data[i].loadingWeight)){
@@ -594,7 +633,67 @@ export default {
           if(!isNaN(data[i].unloadingWeight)){
             sums.unloadingWeight+=Number(data[i].unloadingWeight)
           }
+          if(!isNaN(data[i].transportDamage)){
+            sums.transportDamage+=Number(data[i].transportDamage)
+          }
+          if(!isNaN(data[i].lossWeight)){
+            sums.lossWeight+=Number(data[i].lossWeight)
+          }
+          if(!isNaN(data[i].actualLoss)){
+            sums.actualLoss+=Number(data[i].actualLoss)
+          }
+          if(!isNaN(data[i].transportPrice)){
+            sums.transportPrice+=Number(data[i].transportPrice)
+          }
+          if(!isNaN(data[i].settlementPrice)){
+            sums.settlementPrice+=Number(data[i].settlementPrice)
+          }
+          if(!isNaN(data[i].settlementWeight)){
+            sums.settlementWeight+=Number(data[i].settlementWeight)
+          }
+          if(!isNaN(data[i].cargoDamage)){
+            sums.cargoDamage+=Number(data[i].cargoDamage)
+          }
+          if(!isNaN(data[i].deductionAmount)){
+            sums.deductionAmount+=Number(data[i].deductionAmount)
+          }
+          if(!isNaN(data[i].serviceCharge)){
+            sums.serviceCharge+=Number(data[i].serviceCharge)
+          }
+          if(!isNaN(data[i].amountActuallyPaid)){
+            sums.amountActuallyPaid+=Number(data[i].amountActuallyPaid)
+          }
+          if(!isNaN(data[i].totalPayable)){
+            sums.totalPayable+=Number(data[i].totalPayable)
+          }
+          if(!isNaN(data[i].amountEdPayable)){
+            sums.amountEdPayable+=Number(data[i].amountEdPayable)
+          }
+          if(!isNaN(data[i].amountNotPayable)){
+            sums.amountNotPayable+=Number(data[i].amountNotPayable)
+          }
+          if(!isNaN(data[i].alreadyInvoice)){
+            sums.alreadyInvoice+=Number(data[i].alreadyInvoice)
+          }
+          
         }
+        sums.loadingWeight=sums.loadingWeight.toFixed(2)
+        sums.unloadingWeight= sums.unloadingWeight.toFixed(2)
+        sums.transportDamage=sums.transportDamage.toFixed(2)
+        sums.lossWeight=sums.lossWeight.toFixed(2)
+        sums.actualLoss=sums.actualLoss.toFixed(2)
+        sums.transportPrice=sums.transportPrice.toFixed(2)
+        sums.settlementPrice=sums.settlementPrice.toFixed(2)
+        sums.settlementWeight=sums.settlementWeight.toFixed(2)
+        sums.cargoDamage=sums.cargoDamage.toFixed(2)
+        sums.deductionAmount=sums.deductionAmount.toFixed(2)
+        sums.serviceCharge=sums.serviceCharge.toFixed(2)
+        sums.amountActuallyPaid=sums.amountActuallyPaid.toFixed(2)
+        sums.totalPayable=sums.totalPayable.toFixed(2)
+        sums.amountEdPayable=sums.amountEdPayable.toFixed(2)
+        sums.amountNotPayable=sums.amountNotPayable.toFixed(2)
+        sums.alreadyInvoice=sums.alreadyInvoice.toFixed(2)
+
         return sums;
     },
     onChange() {
@@ -1270,10 +1369,7 @@ export default {
       if (this.modification.length == 0) {
         this.$message.warning('请选择要通过的条目')
       } else {
-        var contract = that.modification[0].contractNo
-        
         for (let i = 0; i < this.modification.length; i++) {
-        
           if(this.modification[i].status=='待请款'&&this.modification[i].approveStatus||this.modification[i].status!='待请款'&&this.modification[i].status!='已驳回'){
             this.$message.warning('请选择待请款的条目')
             return
@@ -1282,10 +1378,6 @@ export default {
             this.$message.warning('请选择已卸车的车辆')
             return
           }
-          if(that.modification[i].contractNo != contract){
-            this.$message.warning('请选择相同的合同条目进行请款！')
-            return
-          }
         }
         var arr=this.ArrSet(this.modification,this.contractNo)
         
@@ -1311,10 +1403,10 @@ export default {
       }
     },
     handleSelectionChange(val) {
-      this.modification = val
       if (val.length !== 0) {
         this.totalList = this.countTotal(val)
       }
+      this.modification = val
     },
     handlestatus(status) {
       this.searchType = status
@@ -1407,6 +1499,9 @@ export default {
           }
           this.deptBudgetTotal = response.total
           this.warehouseList = response
+          if(this.warehouseList.records.length>0&&this.contractNo!='全部合同'){
+            this.grainPrice=this.warehouseList.records[0].grainPrice
+          }
         })
       autocontract({
         compId: localStorage.getItem('ws-pf_compId'),

src/views/statisticalReport/shippingList.vue

@@ -559,11 +559,12 @@
         }).then(() => {
           edittrantask({id:this.currecttask.id,shippedWeight:this.taskform.shippedWeight,enclosure:this.taskform.enclosure,tranProcessInfoList:[]}).toPromise().then((response) => {
               this.editshow=false
-              this.taskform={}
               this.$refs.upload.clearFiles()
               this.$message.success('提交成功')
               this.$nextTick(()=>{
-                this.$router.go(0)
+                this.shippedWeight=this.taskform.shippedWeight
+                this.enclosure=this.taskform.enclosure
+                this.taskform={}
               })
             })
             .catch((response) => {
@@ -587,11 +588,12 @@
         }).then(() => {
           edittrantask({id:this.currecttask.id,unloadingWeight:this.taskform.unloadingWeight,unEnclosure:this.taskform.unEnclosure,tranProcessInfoList:[]}).toPromise().then((response) => {
               this.editshow=false
-              this.taskform={}
               this.$refs.upload1.clearFiles()
               this.$message.success('提交成功')
               this.$nextTick(()=>{
-                this.$router.go(0)
+                this.unloadingWeight=this.taskform.unloadingWeight
+                this.unEnclosure=this.taskform.unEnclosure
+                this.taskform={}
               })
             })
             .catch((response) => {

src/views/taskManagement/supplyofgoods.vue

@@ -94,7 +94,7 @@
     fmoney,
     EventBus
   } from 'base-core-lib'
-import { toFixed } from 'xe-utils/methods'
+// import { toFixed } from 'xe-utils/methods'
   export default {
     name: 'viewSpareMoney',
     components: {
@@ -284,7 +284,7 @@ import { toFixed } from 'xe-utils/methods'
          this.num=this.num.toFixed(3)
          console.log(this.multipleSelection1)
           for (let q = 0; q < this.multipleSelection1.length; q++) {
-            this.content=this.content+this.multipleSelection1[q].goodsName+(this.multipleSelection1[q].estimateOutWarehouseWeight?this.multipleSelection1[q].estimateOutWarehouseWeight.toFixed(3):0)+'吨'
+            this.content=this.content+this.multipleSelection1[q].goodsName+(this.multipleSelection1[q].estimateOutWarehouseWeight?Number(this.multipleSelection1[q].estimateOutWarehouseWeight).toFixed(3):0)+'吨'
           }
         for (let i = 0; i < val.length; i++) {
           val[i].select=true
@@ -332,7 +332,7 @@ import { toFixed } from 'xe-utils/methods'
          }
          this.num=this.num.toFixed(3)
           for (let q = 0; q < this.multipleSelection1.length; q++) {
-            this.content=this.content+this.multipleSelection1[q].goodsName+(this.multipleSelection1[q].estimateOutWarehouseWeight?this.multipleSelection1[q].estimateOutWarehouseWeight.toFixed(3):0)+'吨，'
+            this.content=this.content+this.multipleSelection1[q].goodsName+(this.multipleSelection1[q].estimateOutWarehouseWeight?Number(this.multipleSelection1[q].estimateOutWarehouseWeight).toFixed(3):0)+'吨，'
           }
       },
       getList() {

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"
@@ -547,6 +546,9 @@
 					if(localStorage.getItem('warehouseId')){
 						this.baseId=localStorage.getItem('warehouseId')
 					}
+					if(localStorage.getItem('goodsName')){
+						this.dataList.goodsName=localStorage.getItem('goodsName')
+					}
 					getstaff({compId: localStorage.getItem('ws-pf_compId'),warehouseId: this.dataList.warehouseId})
 					.toPromise()
 					.then(response => {
@@ -602,11 +604,12 @@
 					this.dataList.weight=this.dataList.weight.toFixed(3)
 				}else if(this.dataList.taskTypeKey==1||this.dataList.taskTypeKey==3){
 					var supplygoods=JSON.parse(localStorage.getItem('supplygoods1'))
+					
 					if(localStorage.getItem('supplygoodsstatus')&&localStorage.getItem('supplygoodsstatus')==0){
 						for (let i = 0; i < supplygoods.length; i++) {
 							this.goods=this.goods!=''?this.goods+',':''+supplygoods[i].goodsName
-							this.dataList1.weight=Number(this.dataList1.weight)+Number(supplygoods[i].estimateOutWarehouseWeight.toFixed(3))
-							this.dataList.weight=Number(this.dataList.weight)+Number(supplygoods[i].estimateOutWarehouseWeight.toFixed(3))
+							this.dataList1.weight=Number(this.dataList1.weight)+Number(Number(supplygoods[i].estimateOutWarehouseWeight).toFixed(3))
+							this.dataList.weight=Number(this.dataList.weight)+Number(Number(supplygoods[i].estimateOutWarehouseWeight).toFixed(3))
 						}
 					}
 					
@@ -623,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){
@@ -632,7 +636,6 @@
 							if(this.dataList.contractNo){
 								localStorage.setItem('contractNo',this.dataList.contractNo);
 							}
-							
 						}
             			localStorage.setItem('taskTypeKey',this.dataList.taskTypeKey);
 						localStorage.setItem('warehouseId',this.baseId);
@@ -1553,6 +1556,7 @@
 					for (let i = 0; i < data.length; i++) {
 						data[i].sourceId=data[i].id
 					}
+
 				}else{
 					// ||this.dataList1.taskTypeKey == 2&&this.dataList1.inOutType
 					if(this.dataList.taskTypeKey == 1||this.dataList.taskTypeKey == 3||this.dataList.taskTypeKey == 4){

src/views/taskManagement/tranManagementWarehouseInOutTaskAudit.vue

@@ -1082,8 +1082,8 @@
               for (let i = 0; i < supplygoods.length; i++) {
                 console.log(this.goods)
                 this.goods=this.goods!=''?this.goods+',':''+supplygoods[i].goodsName
-                this.dataList1.weight=Number(this.dataList1.weight)+Number(supplygoods[i].estimateOutWarehouseWeight.toFixed(3))
-                this.dataList.weight=Number(this.dataList.weight)+Number(supplygoods[i].estimateOutWarehouseWeight.toFixed(3))
+                this.dataList1.weight=Number(this.dataList1.weight)+Number(Number(supplygoods[i].estimateOutWarehouseWeight).toFixed(3))
+                this.dataList.weight=Number(this.dataList.weight)+Number(Number(supplygoods[i].estimateOutWarehouseWeight).toFixed(3))
               }
             }
           }

src/views/taskManagement/tranManagementWarehouseInOutTaskEdit.vue

@@ -1832,12 +1832,12 @@ export default {
                       this.dataList1.weight =
                       Number(this.dataList1.weight) +
                       Number(
-                        supplygoods[i].estimateOutWarehouseWeight.toFixed(3)
+                        Number(supplygoods[i].estimateOutWarehouseWeight).toFixed(3)
                       )
                     this.dataList.weight =
                       Number(this.dataList.weight) +
                       Number(
-                        supplygoods[i].estimateOutWarehouseWeight.toFixed(3)
+                        Number(supplygoods[i].estimateOutWarehouseWeight).toFixed(3)
                       )
                     }
                     
@@ -1857,10 +1857,10 @@ export default {
                       : '' + supplygoods[i].goodsName
                   this.dataList1.weight =
                     Number(this.dataList1.weight) +
-                    Number(supplygoods[i].estimateOutWarehouseWeight.toFixed(3))
+                    Number(Number(supplygoods[i].estimateOutWarehouseWeight).toFixed(3))
                   this.dataList.weight =
                     Number(this.dataList.weight) +
-                    Number(supplygoods[i].estimateOutWarehouseWeight.toFixed(3))
+                    Number(Number(supplygoods[i].estimateOutWarehouseWeight).toFixed(3))
                 }
               }
             }

src/views/workNotification/utils/index.js

@@ -31,6 +31,10 @@ export function code2Url (type, code, state,status,message,businessId) {
       return trantask(code,state,message)
     case 'WAREHOUSE':
       return warehousetask(code,state)
+      case 'FEIYONGGUANLI':
+        return profitable(code,state)  
+    case 'WAREHOUSING':
+      return warehousing(code,state)  
     default:
       return ''
   }
@@ -56,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) {
@@ -67,6 +82,17 @@ export function warehousetask(code, state){
   }
   return url
 }
+export function profitable(code, state){
+  let url = ''
+  switch (code) {
+    
+    //费用管理
+    case 'FEIYONGGUANLI-APPROVE':
+      url = 'expensemanagementdetails'
+      break
+  }
+  return url
+}
 export function checkNavigation (code, state) {
   // 航海
   let url = ''
@@ -698,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'
-      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'
+      case 'PROCUREMENT-PRICE-APPROVE':
+        url = 'acquisitionManagement'
       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') {
     // 销售平仓统计