报表新加打印记录 租金条款新加保存删除接口

src/api/boxManagement/buyContainer/index.js

@@ -78,6 +78,14 @@ export function submit(data) {
   })
 }
 //明细保存
+export function submitRtList(data) {
+  return request({
+    url: '/api/blade-los/rentterm/submitList',
+    method: 'post',
+    data
+  })
+}
+//明细保存
 export function submitBoxList(data) {
   return request({
     url: '/api/blade-los/tradingboxtype/submitList',

src/api/boxManagement/reports.js

@@ -72,4 +72,11 @@ export const fingenlegGetReportData = (row) => {
     method: 'get',
     params: row
   })
+}
+export const printingUpdate = (row) => {
+  return request({
+    url: '/api/blade-los/tradingBox/update',
+    method: 'get',
+    params: row
+  })
 }

src/components/boxManagement/businessReports.vue

@@ -22,7 +22,7 @@
 </template>
 
 <script>
-import { getList, getDetail, add, update, remove, } from "@/api/boxManagement/reports";
+import { getList, getDetail, add, update, remove,printingUpdate } from "@/api/boxManagement/reports";
 import { reportsGetReportData } from "@/api/boxManagement/reports";
 import { getUserApprovalList } from "@/api/approval/processConfig";
 import { mapGetters } from "vuex";
@@ -600,6 +600,7 @@ export default {
     },
     // 打印报表获取数据
     reportsGetReportDatafun(url, row) {
+      printingUpdate({id:this.id})
       let obj = {}
       if (this.selecList.length || this.type) {
         obj = {

src/components/boxManagement/reports.vue

@@ -45,7 +45,7 @@
 </template>
 
 <script>
-import { getList, reportsDetail, add, update, reportsRemove } from "@/api/boxManagement/reports";
+import { getList, reportsDetail, add, update, reportsRemove,printingUpdate } from "@/api/boxManagement/reports";
 import { getUserApprovalList } from "@/api/approval/processConfig";
 import { mapGetters } from "vuex";
 import { billsDetail } from '@/api/iosBasicData/bills'
@@ -618,6 +618,7 @@ export default {
     },
     // 预览报表
     handleReportPreview(url, row) {
+      printingUpdate({id:this.id})
       console.log(row, 698)
       Stimulsoft.Base.StiLicense.key = '6vJhGtLLLz2GNviWmUTrhSqnOItdDwjBylQzQcAOiHn0s4gy0Fr5YoUZ9V00Y0igCSFQzwEqYBh/N77k4f0fWXTHW5rqeBNLkaurJDenJ9o97TyqHs9HfvINK18Uwzsc/bG01Rq+x3H3Rf+g7AY92gvWmp7VA2Uxa30Q97f61siWz2dE5kdBVcCnSFzC6awE74JzDcJMj8OuxplqB1CYcpoPcOjKy1PiATlC3UsBaLEXsok1xxtRMQ283r282tkh8XQitsxtTczAJBxijuJNfziYhci2jResWXK51ygOOEbVAxmpflujkJ8oEVHkOA/CjX6bGx05pNZ6oSIu9H8deF94MyqIwcdeirCe60GbIQByQtLimfxbIZnO35X3fs/94av0ODfELqrQEpLrpU6FNeHttvlMc5UVrT4K+8lPbqR8Hq0PFWmFrbVIYSi7tAVFMMe2D1C59NWyLu3AkrD3No7YhLVh7LV0Tttr/8FrcZ8xirBPcMZCIGrRIesrHxOsZH2V8t/t0GXCnLLAWX+TNvdNXkB8cF2y9ZXf1enI064yE5dwMs2fQ0yOUG/xornE'
       // Stimulsoft.Base.StiLicense.Key = '6vJhGtLLLz2GNviWmUTrhSqnOItdDwjBylQzQcAOiHkcgIvwL0jnpsDqRpWg5FI5kt2G7A0tYIcUygBh1sPs7plofUOqPB1a4HBIXJB621mau2oiAIj+ysU7gKUXfjn/D5BocmduNB+ZMiDGPxFrAp3PoD0nYNkkWh8r7gBZ1v/JZSXGE3bQDrCQCNSy6mgby+iFAMV8/PuZ1z77U+Xz3fkpbm6MYQXYp3cQooLGLUti7k1TFWrnawT0iEEDJ2iRcU9wLqn2g9UiWesEZtKwI/UmEI2T7nv5NbgV+CHguu6QU4WWzFpIgW+3LUnKCT/vCDY+ymzgycw9A9+HFSzARiPzgOaAuQYrFDpzhXV+ZeX31AxWlnzjDWqpfluygSNPtGul5gyNt2CEoJD1Yom0VN9fvRonYsMsimkFFx2AwyVpPcs+JfVBtpPbTcZscnzUdmiIvxv8Gcin6sNSibM6in/uUKFt3bVgW/XeMYa7MLGF53kvBSwi78poUDigA2n12SmghLR0AHxyEDIgZGOTbNI33GWu7ZsPBeUdGu55R8w='

src/views/ow/owPut/detailsPage.vue

@@ -535,13 +535,13 @@
           <span>{{ index + 1 }}</span>
         </template>
         <template slot="menu" slot-scope="{ row, index }">
-          <el-button size="small" icon="el-icon-edit" type="text" @click="rowEdit(row)">{{ row.$cellEdit ? '保存' : '编辑'
+          <el-button size="small" icon="el-icon-edit" type="text" @click="rowEdit(row, index)">{{ row.$cellEdit ? '保存' : '编辑'
             }}</el-button>
-          <el-button size="small" icon="el-icon-delete" type="text" @click="rowDel(row)">删除</el-button>
+          <el-button size="small" icon="el-icon-delete" type="text" @click="rowDel(row, index)">删除</el-button>
         </template>
       </avue-crud>
       <span slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="rtDialog = false" size="mini">保 存</el-button>
+        <el-button type="primary" @click="rtSubmit" size="mini">保 存</el-button>
       </span>
     </el-dialog>
   </div>
@@ -561,7 +561,8 @@ import {
   renttermRemove,
   copyAgent,
   countRent,
-  revokeCountRent
+  revokeCountRent,
+  submitRtList
 } from "@/api/boxManagement/buyContainer";
 import dicSelect from "@/components/dicSelect/main";
 import checkSchedule from "@/components/checkH/checkSchedule.vue";
@@ -1910,6 +1911,9 @@ export default {
   },
   methods: {
     openRtDialog() {
+      if (!this.form.id) {
+        return this.$message.error("请保存数据");
+      }
       this.rtDialog = true
     },
     getSum() {
@@ -2272,9 +2276,25 @@ export default {
     },
     rtAddRow() {
       this.form.rentTermList.push({
+        pid: this.form.id,
         $cellEdit: true
       })
     },
+    rtSubmit() {
+      const loading = this.$loading({
+        lock: true,
+        text: '加载中',
+        spinner: 'el-icon-loading',
+        background: 'rgba(255,255,255,0.7)'
+      });
+      submitRtList(this.form.rentTermList).then(res => {
+        this.$message.success("保存成功");
+        this.form.rentTermList = res.data.data
+        this.rtDialog = false
+      }).finally(() => {
+        loading.close();
+      })
+    },
     feedAddRow() {
       if (!this.form.id) {
         return this.$message.error("请保存数据");

src/views/ow/owPut/index.vue

@@ -423,6 +423,20 @@ export default {
             width: 100,
             format: "yyyy-MM-dd",
             valueFormat: "yyyy-MM-dd HH:mm:ss"
+          }, 
+          {
+            label: "打印人",
+            prop: "printingPersonName",
+            overHidden: true,
+            width: 80,
+          }, {
+            label: "打印时间",
+            prop: "printingPersonDate",
+            type: "date",
+            overHidden: true,
+            width: 100,
+            format: "yyyy-MM-dd",
+            valueFormat: "yyyy-MM-dd HH:mm:ss",
           }
         ]
       },

src/views/ow/owTask/detailsPage.vue

@@ -230,10 +230,8 @@
                   :disabled="editDisabled">生成租金</el-button>
                 <el-button type="danger" plain size="small" @click="allClick('撤销租金')"
                   :disabled="editDisabled">撤销租金</el-button>
-                  <el-button type="primary" plain size="small" 
-                  :disabled="editDisabled">计算超期箱使费</el-button>
-                <el-button type="warning" plain size="small" 
-                  :disabled="editDisabled">批量导入费用</el-button>
+                <el-button type="primary" plain size="small" :disabled="editDisabled">计算超期箱使费</el-button>
+                <el-button type="warning" plain size="small" :disabled="editDisabled">批量导入费用</el-button>
                 <!-- <el-button type="primary" plain size="small" @click="$refs.printC.openDialog()">打印账单</el-button> -->
               </template>
               <template slot="indexHeader" slot-scope="{row,index}">
@@ -538,13 +536,14 @@
           <span>{{ index + 1 }}</span>
         </template>
         <template slot="menu" slot-scope="{ row, index }">
-          <el-button size="small" icon="el-icon-edit" type="text" @click="rowEdit(row)">{{ row.$cellEdit ? '保存' : '编辑'
-          }}</el-button>
-          <el-button size="small" icon="el-icon-delete" type="text" @click="rowDel(row)">删除</el-button>
+          <el-button size="small" icon="el-icon-edit" type="text" @click="rowEdit(row, index)">{{ row.$cellEdit ? '保存' :
+            '编辑'
+            }}</el-button>
+          <el-button size="small" icon="el-icon-delete" type="text" @click="rowDel(row, index)">删除</el-button>
         </template>
       </avue-crud>
       <span slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="rtDialog = false" size="mini">保 存</el-button>
+        <el-button type="primary" @click="rtSubmit" size="mini">保 存</el-button>
       </span>
     </el-dialog>
   </div>
@@ -564,7 +563,8 @@ import {
   renttermRemove,
   copyAgent,
   countRent,
-  revokeCountRent
+  revokeCountRent,
+  submitRtList
 } from "@/api/boxManagement/buyContainer";
 import dicSelect from "@/components/dicSelect/main";
 import checkSchedule from "@/components/checkH/checkSchedule.vue";
@@ -1921,6 +1921,9 @@ export default {
   },
   methods: {
     openRtDialog() {
+      if (!this.form.id) {
+        return this.$message.error("请保存数据");
+      }
       this.rtDialog = true
     },
     getSum() {
@@ -2283,9 +2286,25 @@ export default {
     },
     rtAddRow() {
       this.form.rentTermList.push({
+        pid: this.form.id,
         $cellEdit: true
       })
     },
+    rtSubmit() {
+      const loading = this.$loading({
+        lock: true,
+        text: '加载中',
+        spinner: 'el-icon-loading',
+        background: 'rgba(255,255,255,0.7)'
+      });
+      submitRtList(this.form.rentTermList).then(res => {
+        this.$message.success("保存成功");
+        this.form.rentTermList = res.data.data
+        this.rtDialog = false
+      }).finally(() => {
+        loading.close();
+      })
+    },
     feedAddRow() {
       if (!this.form.id) {
         return this.$message.error("请保存数据");
@@ -2397,6 +2416,7 @@ export default {
       }
     },
     rowDel(row, index) {
+      console.log(row.id)
       this.$confirm("确定删除数据?", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
@@ -2702,7 +2722,7 @@ export default {
               type: 'warning'
             }).then(() => {
               let obj = {
-                id:this.form.id,
+                id: this.form.id,
                 rentDate: res.data.value
               }
               const loading = this.$loading({
@@ -2734,7 +2754,7 @@ export default {
             spinner: 'el-icon-loading',
             background: 'rgba(255,255,255,0.7)'
           });
-          revokeCountRent({id:this.form.id}).then(res => {
+          revokeCountRent({ id: this.form.id }).then(res => {
             this.$message.success("操作成功！");
             this.getDetail(this.form.id)
           }).finally(() => {

src/views/ow/owTask/index.vue

@@ -101,7 +101,6 @@ export default {
               desc: 'code',
               res: "data.records"
             },
-            index:1,
           },
           {
             label: '启用',
@@ -118,14 +117,12 @@ export default {
               label: '否',
               value: '否',
             }],
-            index:2,
           },
           {
             label: '系统号',
             prop: 'sysNo',
             width: 100,
             overHidden: true,
-            index:3,
           },
           {
             label: '放箱号',
@@ -134,7 +131,6 @@ export default {
             overHidden: true,
             search: true,
             searchOrder: 1,
-            index:4,
           },
           {
             label: '箱号',
@@ -143,14 +139,12 @@ export default {
             overHidden: true,
             search: true,
             searchOrder: 2,
-            index:5,
           },
           {
             label: '内部放箱号',
             prop: 'internalContainerNumber',
             width: 100,
             overHidden: true,
-            index:6,
           },
           {
             label: '起运港',
@@ -169,7 +163,6 @@ export default {
               desc: 'code',
               res: "data.records"
             },
-            index:7,
           },
           {
             label: '目的港',
@@ -188,7 +181,6 @@ export default {
               desc: 'code',
               res: "data.records"
             },
-            index:8,
           },
           {
             label: '起运港提/送箱场站',
@@ -208,7 +200,6 @@ export default {
               desc: 'code',
               res: "data.records"
             },
-            index:9,
           },
           {
             label: '目的港提/送箱场站',
@@ -228,7 +219,6 @@ export default {
               desc: 'code',
               res: "data.records"
             },
-            index:10,
           },
           {
             label: '箱型',
@@ -246,21 +236,18 @@ export default {
               value: "cnName",
               res: "data.records"
             },
-            index:11,
           },
           {
             label: '箱量',
             prop: 'boxNumber',
             width: 80,
             overHidden: true,
-            index:12,
           },
           {
             label: '剩余箱量',
             prop: 'remainingBoxNumber',
             width: 100,
             overHidden: true,
-            index:13,
           },
           // {
           //   label: '场站',
@@ -296,7 +283,6 @@ export default {
               label: "dictValue",
               value: "dictValue"
             },
-            index:14,
           },
           // {
           //   label: '启用',
@@ -325,7 +311,6 @@ export default {
             valueFormat: "yyyy-MM-dd HH:mm:ss",
             width: 100,
             overHidden: true,
-            index:15,
           },
           {
             label: '有效日期止',
@@ -335,7 +320,6 @@ export default {
             valueFormat: "yyyy-MM-dd HH:mm:ss",
             width: 100,
             overHidden: true,
-            index:16,
           },
           {
             label: '有效日期',
@@ -352,14 +336,12 @@ export default {
             searchDefaultTime: ["00:00:00", "23:59:59"],
             format: "yyyy-MM-dd",
             valueFormat: "yyyy-MM-dd HH:mm:ss",
-            index:17,
           },
           {
             label: 'Pickup fee',
             prop: 'pickupFee',
             width: 80,
             overHidden: true,
-            index:18
           },
           {
             label: '收/付',
@@ -380,56 +362,48 @@ export default {
             prop: 'conditions',
             width: 80,
             overHidden: true,
-            index:18,
           },
           {
             label: 'Free day',
             prop: 'freeDay',
             width: 80,
             overHidden: true,
-            index:19,
           },
           {
             label: 'LOLO-POL',
             prop: 'loloPol',
             width: 90,
             overHidden: true,
-            index:20,
           },
           {
             label: 'LOLO-POD',
             prop: 'loloPod',
             width: 90,
             overHidden: true,
-            index:21,
           },
           {
             label: 'DRV',
             prop: 'drv',
             width: 80,
             overHidden: true,
-            index:22,
           },
           {
             label: 'DPP',
             prop: 'dpp',
             width: 80,
             overHidden: true,
-            index:23,
           },
           {
             label: 'The rest as per our agreement',
             prop: 'agreement',
             width: 200,
             overHidden: true,
-            index:24,
           },
           {
             label: "制单人",
             prop: "createUserName",
             overHidden: true,
             width: 80,
-            index:25,
           }, {
             label: "制单日期",
             prop: "createTime",
@@ -438,13 +412,11 @@ export default {
             width: 100,
             format: "yyyy-MM-dd",
             valueFormat: "yyyy-MM-dd HH:mm:ss",
-            index:26,
           }, {
             label: "修改人",
             prop: "updateUserName",
             overHidden: true,
             width: 80,
-            index:27,
           }, {
             label: "修改日期",
             prop: "updateTime",
@@ -453,7 +425,20 @@ export default {
             width: 100,
             format: "yyyy-MM-dd",
             valueFormat: "yyyy-MM-dd HH:mm:ss",
-            index:28,
+          }, 
+          {
+            label: "打印人",
+            prop: "printingPersonName",
+            overHidden: true,
+            width: 80,
+          }, {
+            label: "打印时间",
+            prop: "printingPersonDate",
+            type: "date",
+            overHidden: true,
+            width: 100,
+            format: "yyyy-MM-dd",
+            valueFormat: "yyyy-MM-dd HH:mm:ss",
           }
         ]
       },