提交箱管，报关

src/api/check/check.js

@@ -1,12 +1,13 @@
 import request from '@/router/axios';
 
-export const auditProcessList = (id,batchNo) => {
+export const auditProcessList = (id,batchNo,times) => {
   return request({
     url: 'api/blade-check/auditproecess/findAuditProcessList',
     method: 'get',
     params: {
       id:id,
-      batchNo:batchNo
+      batchNo:batchNo,
+      times:times
     }
   })
 }

src/components/check/checkSchedule.vue

@@ -61,6 +61,9 @@
       batchNo:{
         type: String
       },
+      times:{
+        type: String
+      },
       choceScheduleFun:{
         type: Function
       }
@@ -98,7 +101,7 @@
     },
     methods:{
       init(){
-        auditProcessList(this.checkId,this.batchNo).then(res =>{
+        auditProcessList(this.checkId,this.batchNo,this.times).then(res =>{
           res.data.data.map((item,index) =>{
             if(item.auditStatus == "A"){
               this.active = index + 2

src/views/boxManagement/buyContainer/detailsPage.vue

@@ -95,7 +95,7 @@
     </trade-card>
     <el-dialog title="导入箱档案" append-to-body :visible.sync="excelBox" width="555px" :close-on-click-modal="false"
                v-dialog-drag>
-      <avue-form :option="excelOption" v-model="excelForm" table-loading="excelLoading"
+      <avue-form v-if="excelBox" :option="excelOption" v-model="excelForm" table-loading="excelLoading"
                  :upload-before="uploadBefore" :upload-after="uploadAfter">
         <template slot="excelTemplate">
           <el-button type="primary" @click="derivation">

src/views/boxManagement/exportShipment/detailsPage.vue

@@ -150,7 +150,7 @@
     </el-dialog>
     <el-dialog title="导入箱档案" append-to-body :visible.sync="excelBox" width="555px" :close-on-click-modal="false"
                v-dialog-drag>
-      <avue-form :option="excelOption" v-model="excelForm" table-loading="excelLoading"
+      <avue-form v-if="excelBox" :option="excelOption" v-model="excelForm" table-loading="excelLoading"
                  :upload-before="uploadBefore" :upload-after="uploadAfter">
         <template slot="excelTemplate">
           <el-button type="primary" @click="derivation">

src/views/boxManagement/importReturnTrip/detailsPage.vue

@@ -149,7 +149,7 @@
     </el-dialog>
     <el-dialog title="导入箱档案" append-to-body :visible.sync="excelBox" width="555px" :close-on-click-modal="false"
                v-dialog-drag>
-      <avue-form :option="excelOption" v-model="excelForm" table-loading="excelLoading"
+      <avue-form v-if="excelBox" :option="excelOption" v-model="excelForm" table-loading="excelLoading"
                  :upload-before="uploadBefore" :upload-after="uploadAfter">
         <template slot="excelTemplate">
           <el-button type="primary" @click="derivation">

src/views/boxManagement/leaseIn/detailsPage.vue

@@ -138,7 +138,7 @@
     </el-dialog>
     <el-dialog title="导入箱档案" append-to-body :visible.sync="excelBox" width="555px" :close-on-click-modal="false"
                v-dialog-drag>
-      <avue-form :option="excelOption" v-model="excelForm" table-loading="excelLoading"
+      <avue-form v-if="excelBox" :option="excelOption" v-model="excelForm" table-loading="excelLoading"
                  :upload-before="uploadBefore" :upload-after="uploadAfter">
         <template slot="excelTemplate">
           <el-button type="primary" @click="derivation">
@@ -780,7 +780,7 @@ export default {
           for (let item of this.selectionList) {
             for (let li of this.selectionList) {
               if (item.rentEndDate !== li.rentEndDate) {
-                return this.$message.error("当前租金期间不一样，请重新选择")
+                return this.$message.error(`${item.code} - ${item.rentEndDate}，选择重复请重新选择`)
               }
             }
           }
@@ -788,6 +788,13 @@ export default {
           const endDate = new Date(date.getFullYear(), date.getMonth() + 1, 0);
           this.formState.rentStartDate = this.selectionList[0].rentEndDate
           this.formState.rentCalculationDate = dateFormat(endDate, "yyyy-MM-dd") + " 23:59:59"
+          if (this.selectionList[0].rentEndDate){
+            let curDate = new Date(this.selectionList[0].rentEndDate);
+            let endDateTime = new Date((curDate/1000+86400)*1000)
+            this.formState.rentStartDate = new Date((curDate/1000+86400)*1000)
+            const endDateTwo = new Date(endDateTime.getFullYear(), endDateTime.getMonth() + 1, 0);
+            this.formState.rentCalculationDate = dateFormat(endDateTwo, "yyyy-MM-dd") + " 23:59:59"
+          }
         }else if(type === '撤销租金'){
           return this.$confirm('此操作将撤销租金并删除费用, 是否继续?', '提示', {
             confirmButtonText: '确定',

src/views/boxManagement/leaseIn/index.vue

@@ -81,6 +81,12 @@ export default {
         searchIndex: 2,
         highlightCurrentRow: true,
         dialogWidth: "70%",
+        showSummary: true,
+        sumColumnList: [{
+          name: 'boxNumber',
+          type: 'sum',
+          decimals:0
+        }],
         column: [{
           label: '系统号',
           prop: 'sysNo',

src/views/boxManagement/leaseOut/detailsPage.vue

@@ -128,7 +128,7 @@
     </el-dialog>
     <el-dialog title="导入箱档案" append-to-body :visible.sync="excelBox" width="555px" :close-on-click-modal="false"
                v-dialog-drag>
-      <avue-form :option="excelOption" v-model="excelForm" table-loading="excelLoading"
+      <avue-form v-if="excelBox" :option="excelOption" v-model="excelForm" table-loading="excelLoading"
                  :upload-before="uploadBefore" :upload-after="uploadAfter">
         <template slot="excelTemplate">
           <el-button type="primary" @click="derivation">
@@ -223,7 +223,7 @@ export default {
       selectionList: [],
       optionStateTwo: {
         menuBtn: false,
-        span: 24,
+        span: 12,
         column: [{
           label: '起租日期',
           prop: 'rentDate',
@@ -770,14 +770,14 @@ export default {
         if (type === '起租') {
           this.optionState = this.optionStateTwo
         }else if (type === '退租') {
-          this.optionState = this.optionStateTwo
+          this.optionState = this.optionStateThree
           this.formState.rentDate = dateFormat(new Date(), "yyyy-MM-dd") + " 23:59:59"
         } else if (type === '计算租金'){
           this.optionState = this.optionStateFour
           for (let item of this.selectionList) {
             for (let li of this.selectionList) {
               if (item.rentEndDate !== li.rentEndDate) {
-                return this.$message.error("当前租金期间不一样，请重新选择")
+                return this.$message.error(`${item.code} - ${item.rentEndDate}，选择重复请重新选择`)
               }
             }
           }
@@ -785,6 +785,13 @@ export default {
           const endDate = new Date(date.getFullYear(), date.getMonth() + 1, 0);
           this.formState.rentStartDate = this.selectionList[0].rentEndDate
           this.formState.rentCalculationDate = dateFormat(endDate, "yyyy-MM-dd") + " 23:59:59"
+          if (this.selectionList[0].rentEndDate){
+            let curDate = new Date(this.selectionList[0].rentEndDate);
+            let endDateTime = new Date((curDate/1000+86400)*1000)
+            this.formState.rentStartDate = new Date((curDate/1000+86400)*1000)
+            const endDateTwo = new Date(endDateTime.getFullYear(), endDateTime.getMonth() + 1, 0);
+            this.formState.rentCalculationDate = dateFormat(endDateTwo, "yyyy-MM-dd") + " 23:59:59"
+          }
         }else if(type === '撤销租金'){
           return this.$confirm('此操作将撤销租金并删除费用, 是否继续?', '提示', {
             confirmButtonText: '确定',

src/views/boxManagement/leaseOut/index.vue

@@ -81,6 +81,12 @@ export default {
         searchIndex: 2,
         highlightCurrentRow: true,
         dialogWidth: "70%",
+        showSummary: true,
+        sumColumnList: [{
+          name: 'boxNumber',
+          type: 'sum',
+          decimals:0
+        }],
         column: [{
           label: '系统号',
           prop: 'sysNo',

src/views/boxManagement/sellingContainers/detailsPage.vue

@@ -94,7 +94,7 @@
     </trade-card>
     <el-dialog title="导入箱档案" append-to-body :visible.sync="excelBox" width="555px" :close-on-click-modal="false"
                v-dialog-drag>
-      <avue-form :option="excelOption" v-model="excelForm" table-loading="excelLoading"
+      <avue-form v-if="excelBox" :option="excelOption" v-model="excelForm" table-loading="excelLoading"
                  :upload-before="uploadBefore" :upload-after="uploadAfter">
         <template slot="excelTemplate">
           <el-button type="primary" @click="derivation">
@@ -141,6 +141,7 @@ import {
 import checkSchedule from "@/components/check/checkSchedule";
 import {selectByName} from "@/api/boxManagement";
 import reportDialog from "@/components/report-dialog/main.vue";
+import {getToken} from "@/util/auth";
 export default {
   name: "detailsPage",
   props: {
@@ -583,6 +584,9 @@ export default {
       loading = true;
       done();
     },
+    derivation() {
+      window.open(`/api/blade-box-tube/tradingBoxRent/export-tradingBox-info?${this.website.tokenHeader}=${getToken()}`);
+    },
     uploadAfter(res, done, loading, column) {
       this.excelBox = false;
       if (typeof res.message === "string") return

src/views/businessManagement/receipt/detailsPageEdit.vue

@@ -1042,7 +1042,6 @@ export default {
     },
     //费用导入触发
     importCost() {
-      console.log('111111')
       // this.advantageProjectForm = this.advantageProjectForm.concat(this.tableDataCost)
       if (this.tableDataCost.length > 0) {
         for (let item in this.tableDataCost) {

src/views/client/detailsPage.vue

@@ -445,7 +445,6 @@ export default {
     //返回列表
     backToList() {
       this.$emit("goBack");
-      console.log(11111)
     }
   }
 };

src/views/exportTrade/customerInquiry/detailsPage.vue

@@ -902,7 +902,7 @@ export default {
   },
   async created() {
     if (this.detailData.id) {
-      // this.getDetail(this.detailData.id);
+      this.getDetail(this.detailData.id);
     }
     // form.portOfLoad
     this.tableOption = await this.getColumnData(
@@ -1022,7 +1022,7 @@ export default {
         }
       } else if (staus == 'portOfLoad') {
         this.$router.push({
-          path: '/basicData/customerManagement/companyMaterial/index'
+          path: '/basicData/portinformation/index'
         })
       } else if (staus == 'cname') {
         this.$router.push({

src/views/exportTrade/salesContract/detailsPage.vue

@@ -1104,7 +1104,7 @@ export default {
       this.$refs.feeInfo.imporData(rows,type)
     },
     khEdit(staus) {
-      if (status == 'kh') {
+      if (staus == 'kh') {
         if (this.form.corpId) {
           this.$router.push({
             path: '/basicData/customerInformation/index',
@@ -1134,7 +1134,7 @@ export default {
         }
       } else if (staus == 'portOfLoad') {
         this.$router.push({
-          path: '/basicData/customerManagement/companyMaterial/index'
+          path: '/basicData/portinformation/index'
         })
       } else if (staus == 'cname') {
         this.$router.push({

src/views/financialManagement/billDetails/configuration/mainList.json

@@ -78,7 +78,8 @@
     },
     {
       "label": "所属公司",
-      "prop": "belongToCorpId",
+      "prop": "company",
+      "searchProp": "companyId",
       "overHidden": true,
       "width": 200,
       "index": 6

src/views/financialManagement/paymentSettle/paymentSettleDetailsPage.vue

@@ -57,6 +57,7 @@
             <el-button type="primary" size="small" :loading="buttonLoading" icon="el-icon-shopping-cart-2"
               :disabled="!financeButton || editDisable" @click="selectPurchase">选择采购合同
             </el-button>
+            <el-button class="el-icon-download" type="info" size="small" :disabled="!form.id" @click="openReport">报表打印</el-button>
           </template>
           <template slot-scope="{ row,index }" slot="menu">
             <el-button type="text" size="small" icon="el-icon-edit" :disabled="!financeButton || editDisable"
@@ -93,6 +94,13 @@
           @importProMent="importProMent">
         </bill-detail>
       </el-dialog>
+      <!--    报表-->
+      <report-dialog
+          :switchDialog="switchDialog"
+          :reportId="form.id"
+          reportName="付款"
+          @onClose="onClose()"
+      />
     </div>
   </div>
 </template>
@@ -108,6 +116,7 @@ import { getlistBankBy as GYSGetBank } from "@/api/basicData/configuration"
 import _ from "lodash";
 import { getUserInfo } from "@/api/system/user";
 import { getCorpDetail } from "@/api/maintenance/overpayment";
+import reportDialog from "@/components/report-dialog/main.vue";
 
 export default {
   name: "paymentDetailsPage",
@@ -119,6 +128,7 @@ export default {
   data() {
     return {
       form: {},
+      switchDialog:false,
       itemsForm: {},
       itemsOption: option,
       billDetailDialog: false,
@@ -359,7 +369,7 @@ export default {
     }
   },
   components: {
-    billDetail
+    billDetail,reportDialog
   },
   created() {
     // 人民币金额默认为0
@@ -418,6 +428,14 @@ export default {
 
   },
   methods: {
+    // 报表
+    openReport() {
+      this.switchDialog = !this.switchDialog;
+    },
+    // 报表关闭
+    onClose(val) {
+      this.switchDialog = val;
+    },
     //选择客户
     returnBack(corpValue) {
       this.corpId = corpValue.id

src/views/financialManagement/receiptSettle/receiptSettleDetailsPage.vue

@@ -121,7 +121,7 @@
             >选择销售合同
             </el-button>
             <el-button
-              v-if="false && form.id"
+                :disabled="!form.id"
               type="info"
               size="small"
               icon="el-icon-printer"
@@ -197,11 +197,10 @@
       @closeDialog="closeDialog"
     ></messagePost>
     <report-dialog
-      :reportId="form.id"
-      :switchDialog="switchDialog"
-      :searchValue="statementData"
-      :reportName="'对账单'"
-      @onClose="onClose()"
+        :switchDialog="switchDialog"
+        :reportId="form.id"
+        reportName="收款"
+        @onClose="onClose()"
     />
   </div>
 </template>

src/views/landTransportation/dispatchingCars/index.vue

@@ -372,7 +372,6 @@ export default {
         this.$message.success("重置成功");
         this.$refs.crud.$refs.dialogColumn.columnBox = false;
         if (this.roleName.indexOf('调度中心业务员') !== -1 || this.roleName.indexOf('调度中心经理') !== -1) {
-          console.log('11111')
           this.findObject(this.option.column, "freight").hide = true
           this.findObject(this.option.column, "freight").showColumn = false
         }

src/views/maintenance/salesPolicy/detailsPageEdit.vue

@@ -584,6 +584,10 @@ export default {
         type:'正常',
         status:1
       };
+      this.findObject(this.basicData.column, "status").disabled = true
+      if (this.roleName.indexOf('admin') !== -1){
+        this.findObject(this.basicData.column, "status").disabled = false
+      }
       this.contactsData = [];
     }
     if (this.detailData.check) {
@@ -610,6 +614,8 @@ export default {
             this.oldBuyFree = this.deepClone(this.contactsDataBuyFree);
             delete this.form.specialItemList;
             delete this.form.presentItemList;
+            console.log(this.form.auditStatus)
+            console.log(this.roleName.indexOf('admin') !== -1)
             if (this.form.auditStatus === 0){
               this.findObject(this.basicData.column, "status").disabled = true
               if (this.roleName.indexOf('admin') !== -1){

src/views/purchase/exportDeclaration/detailsPage.vue

@@ -17,12 +17,25 @@
         </el-button>
         <el-dropdown style="margin-right: 10px">
           <el-button type="primary" size="small">
-            审核处理<i class="el-icon-arrow-down el-icon--right"></i>
+            初审审核<i class="el-icon-arrow-down el-icon--right"></i>
           </el-button>
           <el-dropdown-menu slot="dropdown">
-            <el-dropdown-item @click.native="pleaseCheck" :disabled="!(form.status === 0 || form.status === 4)">请核数据</el-dropdown-item>
-            <el-dropdown-item @click.native="checkScheduleDialog = true,checkId = form.id">审核进度</el-dropdown-item>
-            <el-dropdown-item @click.native="repealCancel" :disabled="!(form.status === 1 || form.status === 5)"
+            <el-dropdown-item @click.native="pleaseCheck" :disabled="!(form.status === 0)">请核数据</el-dropdown-item>
+            <el-dropdown-item @click.native="checkScheduleDialog = true,checkId = form.id,times = 1">审核进度</el-dropdown-item>
+            <el-dropdown-item @click.native="repealCancel" :disabled="!(form.status === 1)"
+                              v-if="!detailData.id">撤销请核
+            </el-dropdown-item>
+            <!--            <el-dropdown-item @click.native="changeApproveOpen">特殊审批</el-dropdown-item>-->
+          </el-dropdown-menu>
+        </el-dropdown>
+        <el-dropdown style="margin-right: 10px">
+          <el-button type="primary" size="small">
+            复审审核<i class="el-icon-arrow-down el-icon--right"></i>
+          </el-button>
+          <el-dropdown-menu slot="dropdown">
+            <el-dropdown-item @click.native="pleaseCheck" :disabled="!(form.status === 4)">请核数据</el-dropdown-item>
+            <el-dropdown-item @click.native="checkScheduleDialog = true,checkId = form.id,times = 2">审核进度</el-dropdown-item>
+            <el-dropdown-item @click.native="repealCancel" :disabled="!(form.status === 5)"
                               v-if="!detailData.id">撤销请核
             </el-dropdown-item>
             <!--            <el-dropdown-item @click.native="changeApproveOpen">特殊审批</el-dropdown-item>-->
@@ -187,7 +200,7 @@
     >
       <check-schedule
           :checkId="checkId"
-          :batchNo="batchNo"
+          :times="times"
           @choceScheduleFun="choceScheduleFun"
       ></check-schedule>
     </el-dialog>
@@ -228,6 +241,7 @@ export default {
       checkScheduleDialog: false,
       checkId: '',
       batchNo: '',
+      times: '',
       breakConfiguration: {
         multipleChoices: false,
         multiple: false,
@@ -320,54 +334,46 @@ export default {
           type: "date",
           format: "yyyy-MM-dd",
           valueFormat: "yyyy-MM-dd HH:mm:ss"
-        }, {
+        },{
           label: '境内收发货人',
-          prop: 'domesticConsigneeShipper'
-        }, {
-          label: '编码',
           prop: 'domesticNo'
         }, {
           label: '海关号',
           prop: 'domesticCustomsNo'
         }, {
           label: '名称',
-          prop: 'domesticName'
-        }, {
+          prop: 'domesticName',
+          span: 12
+        },{
           label: '境外收发货人',
-          prop: 'abroadConsigneeShipper'
-        }, {
-          label: '编码',
           prop: 'abroadNo'
         }, {
           label: '海关号',
           prop: 'abroadCustomsNo'
         }, {
           label: '名称',
-          prop: 'abroadName'
+          prop: 'abroadName',
+          span: 12
         }, {
           label: '生产销售单位',
-          prop: 'consumptionUnit'
-        }, {
-          label: '编码',
           prop: 'consumptionUnitNo'
         }, {
           label: '海关号',
           prop: 'consumptionUnitCustomsNo'
         }, {
           label: '名称',
-          prop: 'consumptionUnitName'
+          prop: 'consumptionUnitName',
+          span: 12
         }, {
           label: '申报单位',
-          prop: 'applicant'
-        }, {
-          label: '编码',
           prop: 'applicantNo'
         }, {
           label: '海关号',
           prop: 'applicantCustomsNo'
         }, {
           label: '名称',
-          prop: 'applicantName'
+          prop: 'applicantName',
+          span: 12
         }, {
           label: '运输方式',
           prop: 'transportType',

src/views/purchase/importDeclaration/detailsPage.vue

@@ -17,12 +17,25 @@
         </el-button>
         <el-dropdown style="margin-right: 10px">
           <el-button type="primary" size="small">
-            审核处理<i class="el-icon-arrow-down el-icon--right"></i>
+            初审审核<i class="el-icon-arrow-down el-icon--right"></i>
           </el-button>
           <el-dropdown-menu slot="dropdown">
-            <el-dropdown-item @click.native="pleaseCheck" :disabled="!(form.status === 0 || form.status === 4)">请核数据</el-dropdown-item>
-            <el-dropdown-item @click.native="checkScheduleDialog = true,checkId = form.id">审核进度</el-dropdown-item>
-            <el-dropdown-item @click.native="repealCancel" :disabled="!(form.status === 1 || form.status === 5)"
+            <el-dropdown-item @click.native="pleaseCheck" :disabled="!(form.status === 0)">请核数据</el-dropdown-item>
+            <el-dropdown-item @click.native="checkScheduleDialog = true,checkId = form.id,times = 1">审核进度</el-dropdown-item>
+            <el-dropdown-item @click.native="repealCancel" :disabled="!(form.status === 1)"
+                              v-if="!detailData.id">撤销请核
+            </el-dropdown-item>
+            <!--            <el-dropdown-item @click.native="changeApproveOpen">特殊审批</el-dropdown-item>-->
+          </el-dropdown-menu>
+        </el-dropdown>
+        <el-dropdown style="margin-right: 10px">
+          <el-button type="primary" size="small">
+            复审审核<i class="el-icon-arrow-down el-icon--right"></i>
+          </el-button>
+          <el-dropdown-menu slot="dropdown">
+            <el-dropdown-item @click.native="pleaseCheck" :disabled="!(form.status === 4)">请核数据</el-dropdown-item>
+            <el-dropdown-item @click.native="checkScheduleDialog = true,checkId = form.id,times = 2">审核进度</el-dropdown-item>
+            <el-dropdown-item @click.native="repealCancel" :disabled="!(form.status === 5)"
                               v-if="!detailData.id">撤销请核
             </el-dropdown-item>
             <!--            <el-dropdown-item @click.native="changeApproveOpen">特殊审批</el-dropdown-item>-->
@@ -187,7 +200,7 @@
     >
       <check-schedule
           :checkId="checkId"
-          :batchNo="batchNo"
+          :times="times"
           @choceScheduleFun="choceScheduleFun"
       ></check-schedule>
     </el-dialog>
@@ -228,6 +241,7 @@ export default {
       checkScheduleDialog: false,
       checkId: '',
       batchNo: '',
+      times: '',
       breakConfiguration: {
         multipleChoices: false,
         multiple: false,

src/views/supplier/detailsPage.vue

@@ -429,7 +429,6 @@ export default {
     //返回列表
     backToList() {
       this.$emit("goBack");
-      console.log(11111)
     }
   }
 };