应收应付费用审核

src/api/kaihe/containerNews/boxInformation.js

@@ -85,7 +85,9 @@ export function getImport(data) {
   return request({
     url: '/shipping/cntrno/importDataTcntrno',
     method: 'post',
-    data: data
+    data: {
+
+    }
   })
 }
 //下载模板

src/views/kaihe/containerNews/boxDistribution/index.vue

@@ -151,8 +151,9 @@
              addressName:row["地点"]
           }
         }
-        if(row[column.label] == 0 || column.label == '地点' || column.label == '附件名称' || column.label == '上传附件'){
+        if( column.label == '地点' || column.label == '附件名称' || column.label == '上传附件'){
         }else{
+          // row[column.label] == 0 ||
           this.$router.push({
             path: "/containerNews/modifyPage",
             query: { data: JSON.stringify(res) },

src/views/kaihe/containerNews/boxInformation/index.vue

@@ -861,11 +861,11 @@
         console.log(fileList)
         console.log(file)
         console.log(fileList.response.fileName)
-        let formData = new window.FormData();
-        formData.append('fileName',JSON.stringify(fileList.response.fileName))
-        formData.append('updateSupport',false)
 
-        getImport(formData).then(res=>{
+        // let formData = new window.FormData();
+        // formData.append('fileName',JSON.stringify())
+
+        getImport(file).then(res=>{
           console.log(res)
         })
 

src/views/kaihe/domesticTrade/myOrder/index.vue

@@ -172,7 +172,7 @@
           <span v-if="item.label == 'createBy'">{{scope.row.createBy}}</span>
           <span v-if="item.label == 'createTime'">{{ (scope.row.createTime).slice(0,10) }}</span>
           <span v-if="item.label == 'loadportName'">{{scope.row.loadportName}}</span>
-          <span v-if="item.label == 'destportName'">{{scope.row.destportName}}</span>
+          <span v-if="item.label == 'moneyStatus'">{{scope.row.moneyStatus}}</span>
         </template>
       </el-table-column>
 <!--      <el-table-column label="订舱号" align="center" prop="fBillno"/>-->
@@ -420,7 +420,7 @@
           },
           {
             surface: "18",
-            label: "destportName",
+            label: "moneyStatus",
             name: "费用状态",
             checked: 0,
             width: 120,

src/views/kaihe/domesticTrade/orderInformation/index.vue

@@ -1050,7 +1050,8 @@
       <el-button type="success" v-if="this.form.fBillstatus == 11" @click="approval">保 存</el-button>
       <el-button type="primary" v-if="this.form.fBillstatus == 11" @click="feeSubmission">费用请核</el-button>
       <el-button type="success" v-if="approVal" @click="addOrUpdateHand(form)">审 批</el-button>
-      <el-button type="primary" v-if="this.form.fBillstatus != 11"@click="addOrUpdateHandle(form)">查看审批</el-button>
+      <el-button type="danger" v-if="form.moneyStatus === 4" @click="revokeTwo">撤销请核</el-button>
+      <el-button type="primary" v-if="this.form.fBillstatus != 11 || this.form.moneyStatus != null && this.form.moneyStatus != 6"@click="addOrUpdateHandle(form)">查看审批</el-button>
     </div>
 <!--    附件查看-->
     <el-dialog
@@ -1157,6 +1158,7 @@ import draggable from 'vuedraggable'
 import Vue from 'vue'
 import AddOrUpdate from '@/views/viewApproval'
 import ApprovalComments from '@/views/startApproval'
+import { revoke, revokeTwo } from '@/api/warehouseBusiness/warehouseInStock'
 Vue.directive('dialogDrag', {
   bind(el, binding, vnode, oldVnode) {
     const dialogHeaderEl = el.querySelector('.el-dialog__header')
@@ -1294,6 +1296,7 @@ export default {
       formDate = {
         fId: JSON.parse(this.$route.query.list).billId
       }
+      console.log(JSON.parse(this.$route.query.list))
       this.approVal = true;
     }else if(this.$route.query.data){
       formDate = JSON.parse(this.$route.query.data)
@@ -1301,6 +1304,7 @@ export default {
     }
     if (formDate) {
       addmodify(formDate).then(response => {
+        console.log(response)
         this.form = response.rows[0]
         this.goodsList = response.rows[0].tWarehousebillsCntrList
         this.estimatedTime = response.rows[0].tVoyageL
@@ -1357,6 +1361,22 @@ export default {
     // this.name()
   },
   methods: {
+    //撤销审批
+    revokeTwo() {
+      let data = {
+        actId: 460,
+        billId: this.form.fId,
+        id: this.form.fId,
+      };
+      revokeTwo(data).then((data) => {
+        if (data.code === 200) {
+          this.msgSuccess("撤销成功");
+          this.open = false;
+          this.getList();
+          this.reset();
+        }
+      });
+    },
     //费用提交审核
     feeSubmission(){
       // if(!this.warehouseDrList){
@@ -1373,6 +1393,8 @@ export default {
       formData.append('tWarehousebillsfeesCr',JSON.stringify(this.warehouseCrList))
       getfee(formData).then(response=>{
         console.log(response)
+        this.$message.success("操作成功")
+        this.modify = true
       })
     },
     cntrWeight(res){
@@ -1549,6 +1571,8 @@ export default {
         let actId = ''
         if(this.form.fBillstatus < 6){
           actId = "410"
+        }else if(this.form.moneyStatus != null && this.form.moneyStatus < 6){
+          actId = "460";
         }else{
           actId = "420";
         }
@@ -1596,7 +1620,9 @@ export default {
       let actId = ''
       if(this.form.fBillstatus < 6){
         actId = "410"
-      }else{
+      }else if(this.form.moneyStatus != null && this.form.moneyStatus < 6){
+        actId = "460";
+      } else{
         actId = "420";
       }
       this.$nextTick(() => {

src/views/morePage/stock/index.vue

@@ -450,7 +450,7 @@ export default {
           });
           break;
         }
-        case "SE": {
+        case "KHDD": {
           this.$router.push({
             path: "/domesticTrade/orderInformation",
             query: { list: JSON.stringify(row) },
@@ -458,6 +458,7 @@ export default {
           break;
         }
         default: {
+          console.log(row)
           return this.$message.error("未知错误，无状态");
         }
       }

src/views/system/auditConfiguration/index.vue

@@ -50,7 +50,7 @@
           <span v-if="scope.row.actId === 320">协议计划费审批流程</span>
           <span v-if="scope.row.actId === 410">下单审批流程</span>
           <span v-if="scope.row.actId === 420">配船审批流程</span>
-<!--          <span v-if="scope.row.actId === 460">凯合费用审批流程</span>-->
+          <span v-if="scope.row.actId === 460">凯合费用审批流程</span>
         </template>
       </el-table-column>
       <el-table-column