Merge remote-tracking branch 'origin/dev' into dev

src/api/iosBasicData/containers.js

@@ -137,6 +137,21 @@ export const luHaiTongApiDetail = (params) => {
     params: params
   })
 }
+export const sldcApiDetail = (params) => {
+    return request({
+        url: '/api/blade-los/sldcApi/detail',
+        method: 'get',
+        params: params
+    })
+}
+export const sldcApisubmit = (params, data) => {
+    return request({
+        url: '/api/blade-los/sldcApi/submit',
+        method: 'post',
+        params: params,
+        data: data
+    })
+}
 // 提取箱信息
 export const verifyData = (params) => {
   return request({
@@ -144,4 +159,4 @@ export const verifyData = (params) => {
     method: 'get',
     params: params
   })
-}
+}

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

@@ -144,7 +144,15 @@
             </span>
         </el-dialog>
 
-
+        <el-dialog append-to-body title="导入场站分箱明细" class="el-dialogDeep" :visible.sync="sldcDialogvisible" width="80%"
+                   :close-on-click-modal="false" :destroy-on-close="true" :close-on-press-escape="false" v-dialog-drag>
+            <import-sldc ref="importSLDC" :sldcData="sldcData"></import-sldc>
+            <span slot="footer" class="dialog-footer">
+                <el-button type="primary" @click="importSldcDialogfun(true)">导入</el-button>
+                <el-button type="primary" @click="importSldcDialogfun(false)">只导箱封号</el-button>
+                <el-button @click="sldcDialogvisible = false">取 消</el-button>
+            </span>
+        </el-dialog>
     </div>
 </template>
 
@@ -158,7 +166,12 @@ import {
     containersEqualDistribution,
     distributionBox,
     containersSubmitList,
-    containersExportContainers, containersImportBoxNo, containersList, luHaiTongApiDetail
+    containersExportContainers,
+    containersImportBoxNo,
+    containersList,
+    luHaiTongApiDetail,
+    sldcApiDetail,
+    sldcApisubmit
 } from "@/api/iosBasicData/containers";
 import { mapGetters } from "vuex";
 import SearchQuery from "@/components/iosbasic-data/searchquery.vue";
@@ -166,11 +179,14 @@ import bports from "@/views/iosBasicData/bports/index.vue";
 import { bportsList } from "@/api/iosBasicData/bports";
 import { getToken } from "@/util/auth";
 import { decryptLhtData } from "@/util/lhtDataDesc";
+import importSldc
+    from "@/views/iosBasicData/SeafreightExportF/bills/assembly/DistributionBox/importSldc.vue";
 import extractBoxInformation
     from "@/views/iosBasicData/SeafreightExportF/bills/assembly/DistributionBox/extractBoxInformation.vue";
 import { billsAdd } from "@/api/iosBasicData/bills";
+
 export default {
-    components: { SearchQuery, bports, extractBoxInformation },
+    components: { SearchQuery, bports, importSldc, extractBoxInformation },
     props: {
         assemblyForm: {},
         detailData: {},
@@ -312,6 +328,9 @@ export default {
             luHaiTongData: [], // 提取请求到解析的数据
             extractDialogvisible: false, // 提取请求到的数据展示
 
+            sldcData:[],
+            sldcDialogvisible: false,
+
         };
     },
     computed: {
@@ -349,6 +368,35 @@ export default {
                 return this.$message.warning('请先进行配箱')
             }
             this.loadingButton = true
+
+            /*
+            var tmp = [{"cntrType":"40HC","cntrTypeExists":true,"sealNo":"CX0289787","gwt":13654,"oldQty":0,"oldVol":0,"index":1,"vol":61,"mblNo":"TAJM50971800","qty":213,"oldGwt":0,"isNewest":true,"cntrNo":"PIDU4035902","selected":true,"status":""},
+                {"cntrType":"40HC","cntrTypeExists":true,"sealNo":"CX0289765","gwt":14419,"oldQty":0,"oldVol":0,"index":2,"vol":61,"mblNo":"TAJM50971800","qty":225,"oldGwt":0,"isNewest":true,"cntrNo":"PIDU4324931","selected":true,"status":""},
+                {"cntrType":"40HC","cntrTypeExists":true,"sealNo":"CX0289787","gwt":13654,"oldQty":0,"oldVol":0,"index":3,"vol":61,"mblNo":"TAJM50971801","qty":213,"oldGwt":0,"isNewest":true,"cntrNo":"PIDU4035902","selected":true,"status":""},
+                {"cntrType":"40HC","cntrTypeExists":true,"sealNo":"CX0289765","gwt":14419,"oldQty":0,"oldVol":0,"index":4,"vol":61,"mblNo":"TAJM50971801","qty":225,"oldGwt":0,"isNewest":true,"cntrNo":"PIDU4324931","selected":true,"status":""},
+                {"cntrType":"40HC","cntrTypeExists":true,"sealNo":"CX0289787","gwt":46,"oldQty":0,"oldVol":0,"index":5,"vol":1,"mblNo":"TAJM50971802","qty":20,"oldGwt":0,"isNewest":true,"cntrNo":"PIDU4035902","selected":true,"status":""},
+                {"cntrType":"40HC","cntrTypeExists":true,"sealNo":"CX0289765","gwt":61,"oldQty":0,"oldVol":0,"index":6,"vol":1,"mblNo":"TAJM50971802","qty":20,"oldGwt":0,"isNewest":true,"cntrNo":"PIDU4324931","selected":true,"status":""}]
+            this.sldcData = tmp
+            this.loadingButton = false
+            this.sldcDialogvisible = true
+            */
+
+            // 使用固定数据
+            sldcApiDetail({
+                id: this.assemblyForm.id,
+                billNo: this.assemblyForm.mblno,
+                station: this.assemblyForm.cyCode
+            }).then(res => {
+                this.loadingButton = false
+                console.log(res)
+                this.sldcData = res.data.data
+                this.sldcDialogvisible = true
+            }).catch(e=>{
+                this.loadingButton = false;
+            })
+
+            // 暂时屏蔽lht
+            return
             luHaiTongApiDetail({
                 billNo: this.assemblyForm.mblno,
                 station: this.assemblyForm.cyCode
@@ -362,6 +410,23 @@ export default {
                 this.extractDialogvisible = true
             })
         },
+        importSldcDialogfun(mode){
+            var rows = this.$refs.importSLDC.selectedRows
+            if(rows.length==0){
+                this.$message.warning('请勾选要导入的箱号！')
+                return
+            }
+
+            sldcApisubmit({
+                mode: mode,
+                id: this.assemblyForm.id,
+                billNo: this.assemblyForm.mblno,
+            }, rows).then(res => {
+                this.loadingButton = false
+                this.sldcDialogvisible = false
+                this.$emit('billsDetailfun')
+            })
+        },
         // 提取箱信息弹窗里的导入
         extractDialogfun() {
             // if (this.assemblyForm.containersList.length != this.luHaiTongData.containerCargoInfos.length) {

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

@@ -0,0 +1,73 @@
+<template>
+    <div>
+        <div>
+            <div style="display: flex;align-items: center;margin-bottom: 10px;">
+                <div style="width: 5px;height: 20px;background: #2d8cf0;margin-right: 8px;border-radius: 2px;"></div>
+<!--                <span style="font-size: 18px;color: #2d8cf0;">箱货动态</span>-->
+            </div>
+            <el-table
+                ref="sldcTable"
+                :data="sldcData"
+                border
+                size="mini"
+                :row-style="{height:'20px',padding:'0px',fontSize:'12px'}"
+                :cell-style="{padding:'0px',fontSize:'12px'}"
+                style="width: 100%"
+                @selection-change="handleSelectionChange">
+                <el-table-column type="selection" width="55">
+                </el-table-column>                <el-table-column prop="status" label="状态" width="64" />
+                <el-table-column prop="mblNo" label="MB/L NO" width="110" />
+                <el-table-column prop="isNewest" label="最新" width="64" >
+                    <template slot-scope="scope">
+                        {{ scope.row.isNewest ? '是' : '' }}
+                    </template>
+                </el-table-column>
+                <el-table-column prop="cntrNo" label="箱号" width="110" />
+                <el-table-column prop="oldCntrType" label="已配箱型" width="64" style="background-color: #00b050"/>
+                <el-table-column prop="oldSealNo" label="封号" width="90" style="background-color: #00b050"/>
+                <el-table-column prop="oldQty" label="件数" width="90"  style="background-color: #00b050"/>
+                <el-table-column prop="oldGwt" label="毛重" width="90"  style="background-color: #00b050"/>
+                <el-table-column prop="oldVol" label="体积" width="90"  style="background-color: #00b050"/>
+                <el-table-column prop="cntrType" label="最新箱型" width="64" style="background-color: #cf9236"/>
+                <el-table-column prop="sealNo" label="封号" width="90"  style="background-color: #cf9236"/>
+                <el-table-column prop="qty" label="件数" width="90"  style="background-color: #cf9236"/>
+                <el-table-column prop="gwt" label="毛重" width="90"  style="background-color: #cf9236"/>
+                <el-table-column prop="vol" label="体积" width="90"  style="background-color: #cf9236"/>
+            </el-table>
+        </div>
+    </div>
+</template>
+
+<script>
+export default {
+    props:{
+        sldcData:{
+            type: Array,
+            default: []
+        },
+    },
+    data(){
+        return {
+            selectedRows: [],
+        }
+    },
+    created(){
+        console.log(this.sldcData)
+    },
+    mounted() {
+        this.selectedRows = []
+        this.sldcData.forEach(row => {
+            this.$refs.sldcTable.toggleRowSelection(row, true);
+        });
+    },
+    methods: {
+        handleSelectionChange(val) {
+            this.selectedRows = val;
+        }
+    },
+}
+</script>
+
+<style scoped>
+
+</style>

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

@@ -40,9 +40,11 @@
       <template slot-scope="scope" slot="menu">
         <el-link type="primary" style="font-size: 12px" icon="el-icon-view" :underline="false"
           @click="addedData(1, scope)">查看详情&nbsp;&nbsp;</el-link>
-        <el-link type="primary" style="font-size: 12px" icon="el-icon-edit" :underline="false" :disabled="disabled"
+<!--          :disabled="disabled"-->
+        <el-link type="primary" style="font-size: 12px" icon="el-icon-edit" :underline="false"
           @click="addedData(2, scope)">编 辑&nbsp;&nbsp;</el-link>
-        <el-link type="primary" style="font-size: 12px" icon="el-icon-delete" :underline="false" :disabled="disabled"
+<!--          :disabled="disabled"-->
+        <el-link type="primary" style="font-size: 12px" icon="el-icon-delete" :underline="false"
           @click="rowDel(scope.row)">删 除</el-link>
         <el-link type="primary" :disabled="scope.row.status == 1"
           @click="handleReportPreview(scope.row.url, scope.row)">预览报表</el-link>

src/views/iosBasicData/SeafreightExportF/bills/billsDetails.vue

@@ -2101,12 +2101,12 @@ export default {
                         }
                         if (item.curCode == 'CNY') {
                             if (Number(item.rmbAmount) == 0 || !item.rmbAmount) {
-                                msgs.push(`应收第${item.$index + 1}行金额不能为0`)
+                                msgs.push(`应付第${item.$index + 1}行金额不能为0`)
                             }
                         }
                         if (item.curCode == 'USD') {
                             if (Number(item.usdAmount) == 0 || !item.usdAmount) {
-                                msgs.push(`应收第${item.$index + 1}行金额不能为0`)
+                                msgs.push(`应付第${item.$index + 1}行金额不能为0`)
                             }
                         }
                     }
@@ -2118,6 +2118,7 @@ export default {
                         })
                         return;
                     }
+                    console.log("this.verifySymbolStatus",this.verifySymbolStatus)
                     if (this.verifySymbolStatus == 1) {
                         /*
                         let msgsList = []
@@ -2263,6 +2264,8 @@ export default {
                             }
                         });
                         */
+                        console.log("ok1")
+
                         let fldNames = 'hshipperDetails,hconsigneeDetails,hnotifyDetails,mshipperDetails,mconsigneeDetails,mnotifyDetails'.split(",");
                         let fldDescs = '发货人,收货人,通知人,MBL 发货人,MBL 收货人,MBL 通知人'.split(",");
                         let msgsList = []
@@ -2381,6 +2384,8 @@ export default {
                     } else {
                         this.billsSubmitfun(status)
                     }
+                }else{
+                    console.log("this.editCustomer not valid")
                 }
             })
         },

src/views/iosBasicData/SeafreightExportF/bills/index.vue

@@ -1861,6 +1861,9 @@ export default {
         },
         // 判断是否可以编辑别人业务
         ModifyOthersfun() {
+            console.log(this.saberUserInfo.role_name.indexOf(
+                "允许修改他人业务"
+            ) != -1)
             let sumArr = [];
             const h = this.$createElement;
             // 判断是否有权限
@@ -1872,13 +1875,17 @@ export default {
                     : false
             )
                 return false;
+
             // 当前登录人和选择的创建人对比是不是一个人
             for (let item of this.selectionList) {
-                if (this.saberUserInfo.user_id != item.createUser) {
-                    sumArr.push(
-                        h("p", `你没有"允许修改他人业务"权限,请重新选择数据`)
-                    );
+                if (!(this.saberUserInfo.role_name.indexOf("admin") != -1||this.saberUserInfo.role_name.indexOf("允许修改他人业务") != -1)) {
+                    if (this.saberUserInfo.user_id != item.createUser) {
+                        sumArr.push(
+                            h("p", `你没有"允许修改他人业务"权限,请重新选择数据`)
+                        );
+                    }
                 }
+
             }
             if (sumArr.length != 0) {
                 this.$confirm("提示", {

src/views/tirePartsMall/salesManagement/outboundWorkOrder/detailsPage.vue

@@ -297,106 +297,106 @@ export default {
             type: 'sum',
           }],
         column: [
-        //   {
-        //   label: '商品名称',
-        //   prop: 'goodsId',
-        //   disabled: true,
-        //   width: 200,
-        //   overHidden: true,
-        //   hide: true,
-        //   type: 'select',
-        //   remote: true,
-        //   props: {
-        //     label: 'cname',
-        //     value: 'id'
-        //   },
-        //   dicUrl: '/api/blade-sales-part/goodsDesc/list?current=1&size=10&cname={{key}}&enableOrNot=1'
-        // },
-        {
-          label: '商品名称',
-          prop: 'goodsName',
-          disabled: true,
-          width: 200,
-          overHidden: true,
-        }, {
-          label: '商品编码',
-          disabled: true,
-          prop: 'goodsNo',
-          width: 100
-        }, {
-          label: '品牌',
-          prop: 'brandId',
-          disabled: true,
-          width: 100,
-          overHidden: true,
-          type: 'select',
-          props: {
-            label: 'cname',
-            value: 'id'
-          },
-          dicUrl: '/api/blade-sales-part/brandDesc/listAll?type=PP&enableOrNot=1'
-        }, {
-          label: '规格型号',
-          prop: 'propertyName',
-          disabled: true,
-          width: 100
-        }, {
-          label: '花纹',
-          prop: 'pattern',
-          disabled: true,
-          width: 100
-        }, {
-          label: '商品描述',
-          prop: 'goodsDescription',
-          disabled: true,
-        }, {
-          label: '批次号',
-          prop: 'dot',
-          cell: true,
-          type: 'select',
-          disabled: true,
-          dicData: [],
-          props: {
-            label: "dot",
-            value: "dot"
+          //   {
+          //   label: '商品名称',
+          //   prop: 'goodsId',
+          //   disabled: true,
+          //   width: 200,
+          //   overHidden: true,
+          //   hide: true,
+          //   type: 'select',
+          //   remote: true,
+          //   props: {
+          //     label: 'cname',
+          //     value: 'id'
+          //   },
+          //   dicUrl: '/api/blade-sales-part/goodsDesc/list?current=1&size=10&cname={{key}}&enableOrNot=1'
+          // },
+          {
+            label: '商品名称',
+            prop: 'goodsName',
+            disabled: true,
+            width: 200,
+            overHidden: true,
+          }, {
+            label: '商品编码',
+            disabled: true,
+            prop: 'goodsNo',
+            width: 100
+          }, {
+            label: '品牌',
+            prop: 'brandId',
+            disabled: true,
+            width: 100,
+            overHidden: true,
+            type: 'select',
+            props: {
+              label: 'cname',
+              value: 'id'
+            },
+            dicUrl: '/api/blade-sales-part/brandDesc/listAll?type=PP&enableOrNot=1'
+          }, {
+            label: '规格型号',
+            prop: 'propertyName',
+            disabled: true,
+            width: 100
+          }, {
+            label: '花纹',
+            prop: 'pattern',
+            disabled: true,
+            width: 100
+          }, {
+            label: '商品描述',
+            prop: 'goodsDescription',
+            disabled: true,
+          }, {
+            label: '批次号',
+            prop: 'dot',
+            cell: true,
+            type: 'select',
+            disabled: true,
+            dicData: [],
+            props: {
+              label: "dot",
+              value: "dot"
+            },
+            dicUrl: "/api/blade-sales-part/stockDesc/dotList",
+          }, {
+            label: '单位',
+            prop: 'units',
+            type: "select",
+            disabled: true,
+            props: {
+              label: "dictValue",
+              value: "dictValue"
+            },
+            dicUrl: "/api/blade-system/dict-biz/dictionary?code=unit"
+          }, {
+            label: '库存',
+            prop: 'inventory',
+          }, {
+            label: '出库数量',
+            prop: 'goodsNum',
+            disabled: false,
+          }, {
+            label: '发货数量',
+            prop: 'sendNum',
+            cell: true,
+            disabled: false,
+          }, {
+            label: '备注',
+            prop: 'remarks'
           },
-          dicUrl: "/api/blade-sales-part/stockDesc/dotList",
-        }, {
-          label: '单位',
-          prop: 'units',
-          type: "select",
-          disabled: true,
-          props: {
-            label: "dictValue",
-            value: "dictValue"
+          {
+            label: '自有数',
+            prop: 'sendNumHave',
+            overHidden: true,
           },
-          dicUrl: "/api/blade-system/dict-biz/dictionary?code=unit"
-        }, {
-          label: '库存',
-          prop: 'inventory',
-        }, {
-          label: '出库数量',
-          prop: 'goodsNum',
-          disabled: false,
-        }, {
-          label: '发货数量',
-          prop: 'sendNum',
-          cell: true,
-          disabled: false,
-        }, {
-          label: '备注',
-          prop: 'remarks'
-        },
-        {
-          label: '自有数',
-          prop: 'sendNumHave',
-          overHidden: true,
-        },
-        {
-          label: '代采数',
-          prop: 'sendNumFinancing',
-          overHidden: true,
-        }]
+          {
+            label: '代采数',
+            prop: 'sendNumFinancing',
+            overHidden: true,
+          }]
       },
       optionPaymentDetails: {},
       optionPaymentDetailsBack: {
@@ -663,14 +663,16 @@ export default {
           });
           console.log(this.form)
           // 判断处理
-          for (let index in this.form.shipItemsList) {
-            this.form.shipItemsList[index].goodsName = this.form.shipItemsList[index].$goodsId
-            if (Number(this.form.shipItemsList[index].sendNum) > Number(this.form.shipItemsList[index].inventory)) {
-              this.$message.warning(`序号${index + 1}的实际数量不能大于库存`);
-              loading.close();
-              return
-            }
-          }
+          // if (this.form.statusName != '已出库') {
+          //   for (let index in this.form.shipItemsList) {
+          //     this.form.shipItemsList[index].goodsName = this.form.shipItemsList[index].$goodsId
+          //     if (Number(this.form.shipItemsList[index].sendNum) > Number(this.form.shipItemsList[index].inventory)) {
+          //       this.$message.warning(`序号${index + 1}的实际数量不能大于库存`);
+          //       loading.close();
+          //       return
+          //     }
+          //   }
+          // }
           // this.form.shipItemsList.forEach(item => {
           //   item.goodsName = item.$goodsId
           // })
@@ -680,22 +682,22 @@ export default {
             bizTypeName: "FHGD",
             filesList: this.filesList
           }).then(res => {
-              if (res.data.code === 601) {
-                  console.info('11111111111----', res)
-                  if (this.onLoad.id && this.detailData.id) {
-                      console.log(1);
-                      this.refresh(this.onLoad.id, true)
-                      this.$set(this.optionForm, 'disabled', true)
-                  } else if (this.onLoad.id) {
-                      console.log(2);
-                      this.refresh(this.onLoad.id, true)
-                  }
-                  this.$message({
-                      type: "error",
-                      message: res.data.msg
-                  });
-                  return true
+            if (res.data.code === 601) {
+              console.info('11111111111----', res)
+              if (this.onLoad.id && this.detailData.id) {
+                console.log(1);
+                this.refresh(this.onLoad.id, true)
+                this.$set(this.optionForm, 'disabled', true)
+              } else if (this.onLoad.id) {
+                console.log(2);
+                this.refresh(this.onLoad.id, true)
               }
+              this.$message({
+                type: "error",
+                message: res.data.msg
+              });
+              return true
+            }
             this.$message.success("保存成功");
             this.refresh(res.data.data.id)
             loading.close();