货代 2023-12-07

src/api/iosBasicData/containers.js

@@ -116,7 +116,7 @@ export const containerscommoditySubmitList = (row) => {
 export const containerscommodityRemove = (ids) => {
   return request({
     url: '/api/blade-los/containerscommodity/remove',
-    method: 'get',
+    method: 'post',
     params: {
       ids
     }

src/views/approveDataH/index.vue

@@ -53,6 +53,11 @@
       </check-schedule>
     </el-dialog>
 
+      <!--<el-dialog append-to-body title="修改数据" class="el-dialogDeep" :visible.sync="checkDialog" width="50%"-->
+      <!--           :close-on-click-modal="false" :destroy-on-close="true" :close-on-press-escape="false" v-dialog-drag>-->
+      <!--    1231312321-->
+      <!--</el-dialog>-->
+
     <el-dialog append-to-body title="审批" class="el-dialogDeep" :visible.sync="checkDialog" width="50%"
       :close-on-click-modal="false" :destroy-on-close="true" :close-on-press-escape="false" v-dialog-drag>
       <check :checkData="checkData" :checkDetail="true" :idList="idList" @operationType="operationTypeFFSQ"
@@ -286,7 +291,7 @@ export default {
           userButtonCell.className = 'stiJsViewerClearAllStyles'
           userButtonCell.appendChild(closeBtn)
 
-          let that=this
+          let that = this
           closeBtn.action = function() {
               console.log(that.$refs.ReportContainer)
               if (that.$refs.reportContainer)

src/views/iosBasicData/SeafreightExportF/bills/assembly/DistributionBox.vue

@@ -67,10 +67,7 @@ export default {
                 this.selectionList = list
                 if (list.length > 0) {
                     this.$refs.PackingBusiness.containersBillsList = this.selectionList[0].containersBillsList
-                    this.$refs.PackingBusiness.containersCommodityList = this.selectionList[0].containersCommodityList.map(item=>{
-                        item.edit = false
-                        return item
-                    })
+                    this.$refs.PackingBusiness.containersCommodityList = this.selectionList[0].containersCommodityList
                 }
             },
             // 分配

src/views/iosBasicData/SeafreightExportF/bills/assembly/DistributionBox/PackingBusiness.vue

@@ -117,9 +117,20 @@
                            @saveColumn="saveColumnTwo('crudDetail', 'optionDetail', 'optionBackDetail', 309.4)" >
                     <template slot="lineNoHeader" slot-scope="scope">
                         <el-button type="primary" size="small" icon="el-icon-plus" circle
-                                   :disabled="detailData.seeDisabled || selectionList.length == 0" @click="DetailAdd"></el-button>
+                                   :disabled="selectionList.length == 0" @click="DetailAdd"></el-button>
+                    </template>
+                    <template slot-scope="scope" slot="menuLeft">
+                        <el-button
+                            type="primary" plain
+                            size="small"
+                            @click.stop="containerscommoditySubmitListfun"
+                        >批量保存</el-button>
+                        <el-button
+                            type="danger" plain
+                            size="small"
+                            @click.stop="BatchDelete"
+                        >批量删除</el-button>
                     </template>
-
                     <template slot-scope="scope" slot="menu">
                         <el-button
                             v-if="!scope.row.$cellEdit"
@@ -129,7 +140,7 @@
                             @click.stop="editfun(scope.row, scope.index)">
                             编辑
                         </el-button>
-                        <el-button type="text" size="small" @click="containerscommodityRemovefun(scope.row,scope.index)">删除</el-button>
+                        <el-button type="text" size="small" @click="containerscommodityRemovefun(scope.row.id,scope.index)">删除</el-button>
                     </template>
                 </avue-crud>
             </el-tab-pane>
@@ -251,7 +262,7 @@
                     viewBtn:false,
                     delBtn:false,
                     editBtn:false,
-                    menuWidth:'100',
+                    menuWidth:'180',
                     cellBtn:true,
                     column:[
                         {
@@ -273,6 +284,7 @@
                             label: "商品HS-CODE",
                             prop: "hscode",
                             labelWidth:100,
+                            width:"120",
                             overHidden:true,
                             cell:true,
                             type:"select",
@@ -291,6 +303,7 @@
                             label: "商品简称",
                             prop: "commodityShName",
                             labelWidth:100,
+                            width:"120",
                             display:false,
                             overHidden:true,
                         },
@@ -298,6 +311,7 @@
                             label: "商品中文名称",
                             prop: "commodityCnName",
                             labelWidth:100,
+                            width:"120",
                             display:false,
                             overHidden:true,
                         },
@@ -305,6 +319,7 @@
                             label: "商品英文名称",
                             prop: "commodityEnName",
                             labelWidth:100,
+                            width:"120",
                             display:false,
                             overHidden:true,
                         },
@@ -312,24 +327,31 @@
                             label: "货物短描",
                             prop: "commodityShortDescr",
                             labelWidth:100,
+                            width:"120",
                             overHidden:true,
+                            cell:true,
                         },
                         {
                             label: "货物描述",
                             prop: "commodityDescr",
                             labelWidth:100,
+                            width:"120",
                             overHidden:true,
+                            cell:true,
                         },
                         {
                             label: "唛头",
                             prop: "marks",
                             labelWidth:100,
+                            width:"120",
                             overHidden:true,
+                            cell:true,
                         },
                         {
                             label: "包装单位",
                             prop: "packingUnit",
                             labelWidth:100,
+                            width:"120",
                             overHidden:true,
                             cell:true,
                             type:"select",
@@ -348,70 +370,89 @@
                             label: "装箱件数",
                             prop: "quantity",
                             labelWidth:100,
+                            width:"120",
                             overHidden:true,
+                            cell:true,
                         },
                         {
                             label: "装箱毛重(KGM)",
                             prop: "grossWeight",
                             labelWidth:100,
+                            width:"120",
                             overHidden:true,
+                            cell:true,
                         },
                         {
                             label: "装箱净重(KGM)",
                             prop: "netWeight",
                             labelWidth:100,
+                            width:"120",
                             overHidden:true,
+                            cell:true,
                         },
                         {
                             label: "装箱体积(CBM)",
                             prop: "measurement",
                             labelWidth:100,
+                            width:"120",
                             overHidden:true,
+                            cell:true,
                         },
                         {
                             label: "是否危险品",
                             prop: "isDangerous",
                             labelWidth:100,
+                            width:"120",
                             overHidden:true,
                             type:"select",
                             dicData:[],
                             props: {
                                 label: "dictValue",
                                 value: "dictKey"
-                            }
+                            },
+                            cell:true,
                         },
                         {
                             label: "危险品分类代码(IMDG CODE)",
                             prop: "dgImdgCode",
                             labelWidth:100,
+                            width:"200",
                             overHidden:true,
                             display:false,
+                            cell:true,
                         },
                         {
                             label: "危险品分类代码名称",
                             prop: "dgImdgName",
                             labelWidth:100,
+                            width:"140",
                             overHidden:true,
                             display:false,
+                            cell:true,
                         },
                         {
                             label: "危险品国际代码",
                             prop: "dgUnCode",
                             labelWidth:100,
+                            width:"120",
                             overHidden:true,
                             display:false,
+                            cell:true,
                         },
                         {
                             label: "危险品名称",
                             prop: "dgCommodityName",
                             labelWidth:100,
+                            width:"120",
                             overHidden:true,
                             display:false,
+                            cell:true,
                         },
                         {
                             label: "危险品包装单位",
                             prop: "dgPackingUnit",
                             labelWidth:100,
+                            width:"120",
                             overHidden:true,
                             display:false,
                             type:"select",
@@ -420,6 +461,7 @@
                                 label: "cnName",
                                 value: "cnName"
                             },
+                            cell:true,
                             remote:true,
                             dicUrl: '/api/blade-los/bunits/list?cnName={{key}}',
                             dicFormatter: (res => {
@@ -430,132 +472,170 @@
                             label: "危险品包装等级",
                             prop: "dgPackingLevel",
                             labelWidth:100,
+                            width:"120",
                             overHidden:true,
                             display:false,
+                            cell:true,
                         },
                         {
                             label: "易燃易爆品闪点",
                             prop: "dgFlashPoint",
                             labelWidth:100,
+                            width:"120",
                             overHidden:true,
                             display:false,
+                            cell:true,
                         },
                         {
                             label: "易燃易爆品闪点单位",
                             prop: "dgFlashPointUnit",
                             labelWidth:100,
+                            width:"140",
                             overHidden:true,
                             display:false,
+                            cell:true,
                         },
                         {
                             label: "危险品联系人",
                             prop: "dgContacts",
                             labelWidth:100,
+                            width:"120",
                             overHidden:true,
                             display:false,
+                            cell:true,
                         },
                         {
                             label: "危险品联系人电话",
                             prop: "dgTel",
                             labelWidth:100,
+                            width:"120",
                             overHidden:true,
                             display:false,
+                            cell:true,
                         },
                         {
                             label: "是否海洋污染物",
                             prop: "dgIsMarinePollutant",
                             labelWidth:100,
+                            width:"120",
                             overHidden:true,
                             type:"select",
                             dicData:[],
                             props: {
                                 label: "dictValue",
                                 value: "dictKey"
-                            }
+                            },
+                            cell:true,
                         },
                         {
                             label: "是否申报数量",
                             prop: "dgIsDeclareQuantity",
                             labelWidth:100,
+                            width:"120",
                             overHidden:true,
                             type:"select",
                             dicData:[],
                             props: {
                                 label: "dictValue",
                                 value: "dictKey"
-                            }
+                            },
+                            cell:true,
                         },
                         {
                             label: "CAS NO",
                             prop: "dgCasNo",
                             labelWidth:100,
+                            width:"120",
                             overHidden:true,
+                            cell:true,
                         },
                         {
                             label: "CAA INFO",
                             prop: "dgCaaInfo",
                             labelWidth:100,
+                            width:"120",
                             overHidden:true,
+                            cell:true,
                         },
                         {
                             label: "DC Weight",
                             prop: "dgDcWeight",
                             labelWidth:100,
+                            width:"120",
                             overHidden:true,
+                            cell:true,
                         },
                         {
                             label: "Emergency温度",
                             prop: "dgEmerTemperature",
                             labelWidth:100,
+                            width:"120",
                             overHidden:true,
+                            cell:true,
                         },
                         {
                             label: "Emergency温度单位",
                             prop: "dgEmerTemperatureUnit",
                             labelWidth:100,
+                            width:"140",
                             overHidden:true,
+                            cell:true,
                         },
                         {
                             label: "Control温度",
                             prop: "dgCtrlTemperature",
                             labelWidth:100,
+                            width:"120",
                             overHidden:true,
+                            cell:true,
                         },
                         {
                             label: "Control温度单位",
                             prop: "dgCtrlTemperatureUnit",
                             labelWidth:100,
+                            width:"120",
                             overHidden:true,
+                            cell:true,
                         },
                         {
                             label: "左超 厘米",
                             prop: "overLeft",
                             labelWidth:100,
+                            width:"120",
                             overHidden:true,
+                            cell:true,
                         },
                         {
                             label: "右超 厘米",
                             prop: "overRight",
                             labelWidth:100,
+                            width:"120",
                             overHidden:true,
+                            cell:true,
                         },
                         {
                             label: "前超 厘米",
                             prop: "overFront",
                             labelWidth:100,
+                            width:"120",
                             overHidden:true,
+                            cell:true,
                         },
                         {
                             label: "后超 厘米",
                             prop: "overBack",
                             labelWidth:100,
+                            width:"120",
                             overHidden:true,
+                            cell:true,
                         },
                         {
                             label: "超高 厘米",
                             prop: "overTop",
                             labelWidth:100,
+                            width:"120",
                             overHidden:true,
+                            cell:true,
                         },
                     ]
                 },
@@ -564,6 +644,9 @@
                 Detailform:{},
             }
         },
+        comments:{
+
+        },
         async created() {
             this.optionDetail = await this.getColumnData(this.getColumnName(309.4), this.optionBackDetail);
             this.bcommodityListfun()
@@ -617,6 +700,7 @@
                 row.billNo = this.assemblyForm.billNo
                 row.ppId = this.assemblyForm.id
                 row.pid = this.selectionList[0].id
+                row.lineNo = this.selectionList[0].containersCommodityList.length
                 for (let item of this.hscodeData) {
                     if (item.hsCode == row.hscode) {
                         this.$set(row,'commodityShName',item.ncmCode)
@@ -646,6 +730,7 @@
             },
             // 行编辑保存
             addUpdateDetail(row,index,done,loading){
+                row.lineNo = index
                 for (let item of this.hscodeData) {
                     if (item.hsCode == row.hscode) {
                         this.$set(row,'commodityShName',item.ncmCode)
@@ -675,8 +760,20 @@
             },
             // 货物明细批量保存接口
             containerscommoditySubmitListfun(){
-                containerscommoditySubmitList().then(res=>{
-
+                if (this.selectionDetailList.length === 0) {
+                    this.$message.warning("请选择至少一条数据");
+                    return;
+                }
+                this.$confirm("确定将选择数据保存?", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "warning"
+                }).then(()=>{
+                    containerscommoditySubmitList(this.selectionDetailList).then(res=>{
+                        this.$message.success("操作成功!");
+                        this.containersCommodityList = []
+                        this.$emit('billsDetailfun')
+                    })
                 })
             },
             // 编辑
@@ -684,14 +781,25 @@
                 // this.Detailform = row
                 this.$set(row,'$cellEdit',true)
             },
+            BatchDelete(){
+                if (this.selectionDetailList.length === 0) {
+                    this.$message.warning("请选择至少一条数据");
+                    return;
+                }
+                let ids = [];
+                this.selectionDetailList.forEach(ele => {
+                    ids.push(ele.id);
+                });
+                this.containerscommodityRemovefun(ids.join(","))
+            },
             // 箱货物明细删除接口
-            containerscommodityRemovefun(row,index){
+            containerscommodityRemovefun(id,index){
                 this.$confirm("确定将选择数据删除?", {
                     confirmButtonText: "确定",
                     cancelButtonText: "取消",
                     type: "warning"
                 }).then(()=>{
-                    containerscommodityRemove(row.id).then(res=>{
+                    containerscommodityRemove(id).then(res=>{
                         this.$message.success("操作成功!");
                         this.$emit('billsDetailfun')
                     })
@@ -747,6 +855,7 @@
             },
             // 多选
             handleSelectionChange(list){
+                // this.ids = this.selectionDetailList.map()
                 this.selectionDetailList = list
             },
             // 表头样式

src/views/iosBasicData/SeafreightExportF/bills/assembly/feecenter.vue

@@ -106,7 +106,7 @@
                                       @corpChange="corpChange($event,'corpCnName',row)"
                                       @corpFocus="getBcorpsListfun($event,'corpCnName')" >
                         </search-query>
-                        <span v-else >{{row.corpCnName}}</span>
+                        <span v-else style="color: #1e9fff" @click="corpClick">{{row.corpCnName}}</span>
                     </template>
                     <template slot="feeCnName" slot-scope="{ row }">
                         <search-query v-if="row.edit"
@@ -248,7 +248,7 @@
                                       @corpChange="corpChange($event,'corpCnName',row)"
                                       @corpFocus="getBcorpsListfun($event,'corpCnName')" >
                         </search-query>
-                        <span v-else>{{row.corpCnName}}</span>
+                        <span v-else >{{row.corpCnName}}</span>
                     </template>
                     <template slot="feeCnName" slot-scope="{ row }">
                         <search-query v-if="row.edit"
@@ -447,6 +447,18 @@
                 <el-button type="primary" @click="templateExport">导 入</el-button>
             </span>
         </el-dialog>
+
+        <!--往来单位弹窗-->
+        <el-dialog
+            title="提示"
+            :visible.sync="corpVisible"
+            append-to-body
+            width="70%"
+            :before-close="handleClose">
+            <div>
+                123131
+            </div>
+        </el-dialog>
     </div>
 
 </template>
@@ -481,6 +493,7 @@
         },
         data(){
             return {
+                corpVisible:false, // 往来单位弹窗
                 optionD:{},
                 optionDBack:{
                     stripe:true,
@@ -865,6 +878,10 @@
             this.getBcorpsListfun()
         },
         methods:{
+            // 往来单位弹窗开启
+            corpClick(){
+                this.corpVisible = true
+            },
             // 模板导入
             templateExport(){
                 if (this.feesselectionList.length > 0) {

src/views/iosBasicData/SeafreightExportF/bills/assembly/reports.vue

@@ -722,7 +722,7 @@
           options.exports.showExportToDocument = false // 显示导出到文档
           options.toolbar.showParametersButton = true // 显示参数按钮
           options.appearance.bookmarksPrint = true // 书签打印
-          options.toolbar.showPrintButton = false // 打印按钮是否显示   下面直接自定义控制打印弹窗是否开启
+          // options.toolbar.showPrintButton = false // 打印按钮是否显示   下面直接自定义控制打印弹窗是否开启
 
           // printDestination 参数：用于指定报表打印的目标位置，可以是打印机、PDF 文件或者直接打印到浏览器等。
           // Stimulsoft.Viewer.StiPrintDestination.Direct：表示直接打印到打印机，即将报表内容直接发送至打印机进行打印。
@@ -1024,12 +1024,23 @@
         const userButtonCell = buttonsTable.rows[0].insertCell(0)
           // 获取打印按钮的位置
         const buttonsTablePrint = toolbarTable.rows[0].childNodes[0].lastChild // 打印按钮
-        const userButtonPrint = buttonsTablePrint.rows[0] // 打印按钮dom位置
+        const userButtonPrint = buttonsTablePrint.rows[0].childNodes[0] // 打印按钮dom位置
+
+
+          userButtonPrint.addEventListener("click", (event)=>{
+              console.log("打印点击");
+              // event.preventDefault()
+          });
+          userButtonPrint.addEventListener("mouseover", (event) => {
+              console.log("移入打印按钮");
+              console.log(event,1035)
+
+          });
 
         userButtonCell.className = 'stiJsViewerClearAllStyles'
         userButtonCell.appendChild(closeBtn) // 添加关闭节点
 
-        userButtonPrint.prepend(printBtn) // 在 printBtn 节点里最前面增加一个子级节点
+        // userButtonPrint.prepend(printBtn) // 在 printBtn 节点里最前面增加一个子级节点
 
         let that=this
           // 关闭按钮的监听点击
@@ -1038,24 +1049,11 @@
           if (that.$refs.reportContainer)
           that.$refs.reportContainer.hideContainer()
         }
-          // 打印按钮监听
-          printBtn.action = (e)=>{
-              // console.log(document.body,1042)
-              // console.log(viewer.jsObject.controls.toolbar.lastChild.lastChild,1044)
-              // console.log(viewer.jsObject.controls.toolbar,1045)
-              // // stiJsViewerToolBar
-              // viewer.jsObject.controls.toolbar.style.disabled = 'none'
-              // console.log(document.body,1046)
-              // var body = JSON.parse(JSON.stringify(document.body.innerHTML))
-              // document.body.innerHTML = viewer.jsObject.controls.reportPanel.innerHTML
-              // window.print()
-              // window.close()
-              // // viewer.jsObject.controls.toolbar.lastChild.lastChild.style.disabled = 'block'
-              // document.body.innerHTML = body
-              // // console.log(printWinTmp,1047)
-              // // printWinTmp.print()
-              // // printWinTmp.close()
-          }
+
+          // // 打印按钮监听
+          // printBtn.action = (e)=>{
+          //
+          // }
 
       },