货代报关和权限修改 2024-2-01

src/views/exportTrade/EcommerceStocking/components/goodsInfo.vue

@@ -216,7 +216,7 @@
       </template>
       //数量
       <template slot="orderQuantityForm" slot-scope="{type,disabled}">
-        <el-input v-model="goodsForm.orderQuantity" size="small" oninput='this.value=this.value.replace(/[^(\d)]/g,"")'
+        <el-input v-model="goodsForm.orderQuantity" size="small" oninput='this.value=this.value.replace(/[^\d.]/g,"")'
           @change="priceChange(goodsForm)"></el-input>
       </template>
       //折扣
@@ -430,6 +430,9 @@ export default {
           this.findObject(this.tableOption.column, "purchaseAmount").showColumn = true;
           this.findObject(this.tableOption.column, "corpName").hide = false;
           this.findObject(this.tableOption.column, "corpName").showColumn = true;
+          this.findObject(this.tableOption.column, "productPrice").hide = false;
+          this.findObject(this.tableOption.column, "productPrice").showColumn = true;
+          this.findObject(this.tableOption.column, "productPrice").display = true;
       }
     this.getWorkDicts("Thread").then(res => {
       this.ThreadList = res.data.data;
@@ -1334,6 +1337,9 @@ export default {
             this.findObject(this.tableOption.column, "purchaseAmount").showColumn = true;
             this.findObject(this.tableOption.column, "corpName").hide = false;
             this.findObject(this.tableOption.column, "corpName").showColumn = true;
+            this.findObject(this.tableOption.column, "productPrice").hide = false;
+            this.findObject(this.tableOption.column, "productPrice").showColumn = true;
+            this.findObject(this.tableOption.column, "productPrice").display = true;
         }
       if (inSave) {
         this.$nextTick(() => {
@@ -1369,6 +1375,9 @@ export default {
               this.findObject(this.tableOption.column, "purchaseAmount").showColumn = true;
               this.findObject(this.tableOption.column, "corpName").hide = false;
               this.findObject(this.tableOption.column, "corpName").showColumn = true;
+              this.findObject(this.tableOption.column, "productPrice").hide = false;
+              this.findObject(this.tableOption.column, "productPrice").showColumn = true;
+              this.findObject(this.tableOption.column, "productPrice").display = true;
           }
         this.$message.success("重置成功");
         //关闭窗口

src/views/exportTrade/EcommerceStocking/config/customerContact.json

@@ -403,7 +403,9 @@
       "span": 6,
       "disabled": true,
       "overHidden": true,
-      "hide": true
+      "hide": true,
+      "display": false,
+      "showColumn":false
     },
     {
       "label": "单品毛利率",

src/views/exportTrade/customerInquiry/components/goodsInfo.vue

@@ -237,7 +237,7 @@
             //数量
             <template slot="orderQuantityForm" slot-scope="{type,disabled}">
                 <el-input v-model="goodsForm.orderQuantity" size="small"
-                    oninput='this.value=this.value.replace(/[^(\d)]/g,"")' @change="priceChange(goodsForm)">
+                    oninput='this.value=this.value.replace(/[^\d.]/g,"")' @change="priceChange(goodsForm)">
                 </el-input>
             </template>
             //折扣
@@ -414,16 +414,19 @@ export default {
             goodsOption
         );
         if (localStorage.getItem("roleName").indexOf('贸易') == -1 && localStorage.getItem("roleName").indexOf('运营') == -1) {
-          this.findObject(this.tableOption.column, "purchaseCost").hide = false;
-          this.findObject(this.tableOption.column, "purchaseCost").showColumn = true;
-          this.findObject(this.tableOption.column, "partsPrice").hide = false;
-          this.findObject(this.tableOption.column, "partsPrice").showColumn = true;
-          this.findObject(this.tableOption.column, "partsCost").hide = false;
-          this.findObject(this.tableOption.column, "partsCost").showColumn = true;
-          this.findObject(this.tableOption.column, "purchaseAmount").hide = false;
-          this.findObject(this.tableOption.column, "purchaseAmount").showColumn = true;
-          this.findObject(this.tableOption.column, "corpName").hide = false;
-          this.findObject(this.tableOption.column, "corpName").showColumn = true;
+            this.findObject(this.tableOption.column, "purchaseCost").hide = false;
+            this.findObject(this.tableOption.column, "purchaseCost").showColumn = true;
+            this.findObject(this.tableOption.column, "partsPrice").hide = false;
+            this.findObject(this.tableOption.column, "partsPrice").showColumn = true;
+            this.findObject(this.tableOption.column, "partsCost").hide = false;
+            this.findObject(this.tableOption.column, "partsCost").showColumn = true;
+            this.findObject(this.tableOption.column, "purchaseAmount").hide = false;
+            this.findObject(this.tableOption.column, "purchaseAmount").showColumn = true;
+            this.findObject(this.tableOption.column, "corpName").hide = false;
+            this.findObject(this.tableOption.column, "corpName").showColumn = true;
+            this.findObject(this.tableOption.column, "productPrice").hide = false;
+            this.findObject(this.tableOption.column, "productPrice").showColumn = true;
+            this.findObject(this.tableOption.column, "productPrice").display = true;
         }
         this.getWorkDicts("Thread").then(res => {
             this.ThreadList = res.data.data;
@@ -1243,6 +1246,9 @@ export default {
                 this.findObject(this.tableOption.column, "purchaseAmount").showColumn = true;
                 this.findObject(this.tableOption.column, "corpName").hide = false;
                 this.findObject(this.tableOption.column, "corpName").showColumn = true;
+                this.findObject(this.tableOption.column, "productPrice").hide = false;
+                this.findObject(this.tableOption.column, "productPrice").showColumn = true;
+                this.findObject(this.tableOption.column, "productPrice").display = true;
             }
             if (inSave) {
                 this.$nextTick(() => {
@@ -1279,6 +1285,9 @@ export default {
                     this.findObject(this.tableOption.column, "purchaseAmount").showColumn = true;
                     this.findObject(this.tableOption.column, "corpName").hide = false;
                     this.findObject(this.tableOption.column, "corpName").showColumn = true;
+                    this.findObject(this.tableOption.column, "productPrice").hide = false;
+                    this.findObject(this.tableOption.column, "productPrice").showColumn = true;
+                    this.findObject(this.tableOption.column, "productPrice").display = true;
                 }
                 //关闭窗口
                 setTimeout(() => {

src/views/exportTrade/customerInquiry/config/customerContact.json

@@ -377,6 +377,9 @@
             "width": 100,
             "align": "right",
             "span": 6,
+            "hide": true,
+            "showColumn":false,
+            "display": false,
             "disabled": true,
             "overHidden": true
         },

src/views/exportTrade/salesContract/components/goodsInfo.vue

@@ -216,7 +216,7 @@
       </template>
       //数量
       <template slot="orderQuantityForm" slot-scope="{type,disabled}">
-        <el-input v-model="goodsForm.orderQuantity" size="small" oninput='this.value=this.value.replace(/[^(\d)]/g,"")'
+        <el-input v-model="goodsForm.orderQuantity" size="small" oninput='this.value=this.value.replace(/[^\d.]/g,"")'
           @change="priceChange(goodsForm)"></el-input>
       </template>
       //折扣
@@ -429,6 +429,9 @@ export default {
           this.findObject(this.tableOption.column, "purchaseAmount").showColumn = true;
           this.findObject(this.tableOption.column, "corpName").hide = false;
           this.findObject(this.tableOption.column, "corpName").showColumn = true;
+          this.findObject(this.tableOption.column, "productPrice").hide = false;
+          this.findObject(this.tableOption.column, "productPrice").showColumn = true;
+          this.findObject(this.tableOption.column, "productPrice").display = true;
       }
     this.getWorkDicts("Thread").then(res => {
       this.ThreadList = res.data.data;
@@ -1333,6 +1336,9 @@ export default {
             this.findObject(this.tableOption.column, "purchaseAmount").showColumn = true;
             this.findObject(this.tableOption.column, "corpName").hide = false;
             this.findObject(this.tableOption.column, "corpName").showColumn = true;
+            this.findObject(this.tableOption.column, "productPrice").hide = false;
+            this.findObject(this.tableOption.column, "productPrice").showColumn = true;
+            this.findObject(this.tableOption.column, "productPrice").display = true;
         }
       if (inSave) {
         this.$nextTick(() => {
@@ -1368,6 +1374,9 @@ export default {
               this.findObject(this.tableOption.column, "purchaseAmount").showColumn = true;
               this.findObject(this.tableOption.column, "corpName").hide = false;
               this.findObject(this.tableOption.column, "corpName").showColumn = true;
+              this.findObject(this.tableOption.column, "productPrice").hide = false;
+              this.findObject(this.tableOption.column, "productPrice").showColumn = true;
+              this.findObject(this.tableOption.column, "productPrice").display = true;
           }
         this.$message.success("重置成功");
         //关闭窗口

src/views/exportTrade/salesContract/config/customerContact.json

@@ -239,6 +239,7 @@
       "width": 100,
       "align": "right",
       "span": 6,
+
       "overHidden": true
     },
     {
@@ -294,8 +295,8 @@
       "span": 6,
       "hide": true,
       "showColumn":false,
-      "disabled": true,
       "display": false,
+      "disabled": true,
       "overHidden": true
     },
     {
@@ -380,6 +381,9 @@
       "width": 100,
       "align": "right",
       "span": 6,
+      "hide": true,
+      "showColumn":false,
+      "display": false,
       "disabled": true,
       "overHidden": true
     },

src/views/iosBasicData/AirtransportExport/bills/assembly/DocumentCenter.vue

@@ -18,13 +18,14 @@
                                @resetColumn="resetColumnTwo('documentCrud', 'documentOption', 'documentOptionBack', 312.1)"
                                @saveColumn="saveColumnTwo('documentCrud', 'documentOption', 'documentOptionBack', 312.1)" >
                         <template slot="menuLeft">
-                            <el-button type="primary" size="small" icon="el-icon-plus" @click="addbtnfun()">新增单证
+                            <el-button type="primary" size="small" icon="el-icon-plus" :disabled="detailData.seeDisabled" @click="addbtnfun()">新增单证
                             </el-button>
                         </template>
                         <template slot-scope="scope" slot="menu">
-                            <el-button type="text" size="small" @click="printEditing(scope.row)" >编辑</el-button>
-                            <el-button type="text" size="small" @click="printDelete(scope.row)" >
-                                <span style="color: red">删除</span>
+                            <el-button type="text" size="small" :disabled="detailData.seeDisabled" @click="printEditing(scope.row)" >编辑</el-button>
+                            <el-button type="text" size="small" :disabled="detailData.seeDisabled" @click="printDelete(scope.row)" >
+                                <span v-if="detailData.seeDisabled">删除</span>
+                                <span v-else style="color: red">删除</span>
                             </el-button>
                             <el-button type="text" size="small" @click="dialogPreviewfun(scope.row)">打印预览</el-button>
                         </template>
@@ -142,6 +143,10 @@ import reportContainer from "@/views/iosBasicData/report-container/report-contai
             assemblyForm:{
                 type:Object,
                 default:{}
+            },
+            detailData:{
+                type: Object,
+                default: {}
             }
         },
         async created() {

src/views/iosBasicData/AirtransportExport/bills/assembly/EntrustmentLnformation.vue

@@ -455,6 +455,7 @@
                                                   :clearable="true"
                                                   :remote="true"
                                                   :buttonIf="false"
+                                                  :disabled="detailData.seeDisabled"
                                                   :forParameter="{key:'id',label:'code',value:'code',disabled:'status'}"
                                                   @corpFocus="getBunitsListfun"
                                                   @remoteMethod="getBunitsListfun"
@@ -472,6 +473,7 @@
                                                   :selectValue="assemblyForm.freightRateGrade"
                                                   :clearable="true"
                                                   :buttonIf="false"
+                                                  :disabled="detailData.seeDisabled"
                                                   :forParameter="{key:'dictKey',label:'dictValue',value:'dictKey'}"
                                                   @corpFocus="freightRateGradeWorkDictsfun"
                                                   @corpChange="corpChange($event,'freightRateGrade')">
@@ -547,6 +549,7 @@
                                               :selectValue="assemblyForm.waybillType"
                                               :clearable="true"
                                               :buttonIf="false"
+                                              :disabled="detailData.seeDisabled"
                                               :forParameter="{key:'dictKey',label:'dictValue',value:'dictKey'}"
                                               @corpFocus="waybillTypeWorkDictsfun"
                                               @corpChange="corpChange($event,'waybillType')">
@@ -597,6 +600,7 @@
                                               :selectValue="assemblyForm.seaType"
                                               :clearable="true"
                                               :buttonIf="false"
+                                              :disabled="detailData.seeDisabled"
                                               :forParameter="{key:'dictKey',label:'dictValue',value:'dictKey'}"
                                               @corpFocus="seaTypeWorkDictsfun"
                                               @corpChange="corpChange($event,'seaType')">
@@ -1149,6 +1153,9 @@ import {regularFloating, regularInteger} from "@/util/regularJudgment";
             },
             // 同通知人
             notifybyfun(){
+                if (this.detailData.seeDisabled) {
+                    return
+                }
                 this.$set(this.assemblyForm,'hnotifyId',this.assemblyForm.hconsigneeId)
                 this.$set(this.assemblyForm,'hnotifyCnName',this.assemblyForm.hconsigneeCnName)
                 this.$set(this.assemblyForm,'hnotifyEnName',this.assemblyForm.hconsigneeEnName)

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

@@ -12,16 +12,16 @@
                 <el-button size="small" style="margin-right: 8px"
                            :loading="saveLoading" @click="previewDialogfun" >预 览
                 </el-button>
-                <el-button size="small" type="warning" :disabled="!form.id" v-if="form.status == 1"
+                <el-button size="small" type="warning" :disabled="!form.id || detailData.seeDisabled" v-if="form.status == 1"
                            @click.stop="revokeDocumentApproval">撤销单据请核
                 </el-button>
-                <el-button size="small" type="success" :disabled="!form.id" v-if="form.status == 0 || form.status == 4"
+                <el-button size="small" type="success" :disabled="!form.id || detailData.seeDisabled" v-if="form.status == 0 || form.status == 4"
                            @click.stop="DocumentApproval">单据请核
                 </el-button>
                 <!--<el-button  size="small" type="primary" style="margin-right: 8px" v-if="detailData.seeDisabled"-->
                 <!--            :loading="saveLoading" @click="editHandle">编 辑-->
                 <!--</el-button>-->
-                <el-button  size="small" type="primary" style="margin-right: 8px"
+                <el-button  size="small" type="primary" style="margin-right: 8px" :disabled="detailData.seeDisabled"
                             :loading="saveLoading" @click="editCustomer">保 存
                 </el-button>
                 <el-dropdown style="line-height: 0">
@@ -229,7 +229,7 @@
                     <feecenter :assemblyForm="form" :detailData="detailData" :pleasereviewType="pleasereviewType" :pid="form.id" @billsDetailfun="billsDetailfun(form.id)"></feecenter>
                 </el-tab-pane>
                 <el-tab-pane label="单证中心" name="dz">
-                    <document-center ref="documentCenter" :assemblyForm="form" ></document-center>
+                    <document-center ref="documentCenter" :detailData="detailData" :assemblyForm="form" ></document-center>
                 </el-tab-pane>
                 <el-tab-pane label="分单列表" name="fd" v-if="form.billType == 'MM'">
                     <Split-list :detailData="detailData" :assemblyForm="form"
@@ -1074,6 +1074,9 @@ import {
             },
             // 申请B/L NO
             applyforfun(text){
+                if (this.detailData.seeDisabled) {
+                    return;
+                }
                 if (!this.form.id) {
                     this.$message({
                         message: '请先保存数据',

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

@@ -362,9 +362,9 @@
                   </div>
               </template>
               <template slot-scope="scope" slot="menu">
+                  <!--:disabled="saberUserInfo.role_name.indexOf('允许修改他人业务') == -1?saberUserInfo.user_id != scope.row.createUser:false"-->
                   <el-button :type="scope.type" :size="scope.size" icon="el-icon-edit"
-                             :disabled="saberUserInfo.role_name.indexOf('允许修改他人业务') == -1?saberUserInfo.user_id != scope.row.createUser:false"
-                             @click.stop="rowCellfun(scope.row.id, scope.index)">编辑
+                             @click.stop="rowCellfun(scope.row.id, scope.row)">编辑
                   </el-button>
               </template>
 
@@ -387,11 +387,15 @@
               </template>
               <template slot="billNo" slot-scope="scope">
                   <span style="color: #1e9fff;cursor: pointer;width: 100%;overflow:hidden;white-space: nowrap;text-overflow: ellipsis;"
-                        v-if="saberUserInfo.role_name.indexOf('允许修改他人业务') == -1?saberUserInfo.user_id == scope.row.createUser:true"
-                        @click.stop="rowCellfun(scope.row.id, scope.index)" >
+                        @click.stop="rowCellfun(scope.row.id, scope.row)" >
                       {{scope.row.billNo}}
                   </span>
-                  <span v-else >{{scope.row.billNo}}</span>
+                  <!--<span style="color: #1e9fff;cursor: pointer;width: 100%;overflow:hidden;white-space: nowrap;text-overflow: ellipsis;"-->
+                  <!--      v-if="saberUserInfo.role_name.indexOf('允许修改他人业务') == -1?saberUserInfo.user_id == scope.row.createUser:true"-->
+                  <!--      @click.stop="rowCellfun(scope.row.id, scope.row)" >-->
+                  <!--    {{scope.row.billNo}}-->
+                  <!--</span>-->
+                  <!--<span v-else >{{scope.row.billNo}}</span>-->
               </template>
               <template slot="eta" slot-scope="scope">
                   <span>{{scope.row.eta?scope.row.eta.slice(0,10):''}}</span>
@@ -1627,11 +1631,19 @@ import { getDeptTree } from "@/api/system/dept";
             })
         },
         // 编辑详情打开
-        rowCellfun(id,index) {
+        rowCellfun(id,row) {
             this.detailData = {
-                seeDisabled: false,
                 id: id
             };
+            if (row) {
+                if (this.saberUserInfo.role_name.indexOf('admin') == -1?this.saberUserInfo.role_name.indexOf('允许修改他人业务') == -1?this.saberUserInfo.user_id == row.createUser:true:true) {
+                    this.detailData.seeDisabled = false
+                }else {
+                    this.detailData.seeDisabled = true
+                }
+            }else {
+                this.detailData.seeDisabled = false
+            }
             this.isShow = false
             this.$nextTick(()=>{
                 this.$refs.billsDetails.pageLoading = true
@@ -1729,7 +1741,7 @@ import { getDeptTree } from "@/api/system/dept";
           let sumArr = []
           const h = this.$createElement
           // 判断是否有权限
-          if (this.saberUserInfo.role_name.indexOf('允许修改他人业务') != -1) return false
+          if (this.saberUserInfo.role_name.indexOf('admin') != -1?this.saberUserInfo.role_name.indexOf('允许修改他人业务') != -1:false) return false
           // 当前登录人和选择的创建人对比是不是一个人
           for (let item of this.selectionList) {
               if (this.saberUserInfo.user_id != item.createUser) {

src/views/iosBasicData/AirtransportImport/bills/assembly/DocumentCenter.vue

@@ -18,13 +18,14 @@
                                @resetColumn="resetColumnTwo('documentCrud', 'documentOption', 'documentOptionBack', 312.1)"
                                @saveColumn="saveColumnTwo('documentCrud', 'documentOption', 'documentOptionBack', 312.1)" >
                         <template slot="menuLeft">
-                            <el-button type="primary" size="small" icon="el-icon-plus" @click="addbtnfun()">新增单证
+                            <el-button type="primary" size="small" icon="el-icon-plus" :disabled="detailData.seeDisabled" @click="addbtnfun()">新增单证
                             </el-button>
                         </template>
                         <template slot-scope="scope" slot="menu">
-                            <el-button type="text" size="small" @click="printEditing(scope.row)" >编辑</el-button>
-                            <el-button type="text" size="small" @click="printDelete(scope.row)" >
-                                <span style="color: red">删除</span>
+                            <el-button type="text" size="small" :disabled="detailData.seeDisabled" @click="printEditing(scope.row)" >编辑</el-button>
+                            <el-button type="text" size="small" :disabled="detailData.seeDisabled" @click="printDelete(scope.row)" >
+                                <span v-if="detailData.seeDisabled">删除</span>
+                                <span v-else style="color: red">删除</span>
                             </el-button>
                             <el-button type="text" size="small" @click="dialogPreviewfun(scope.row)">打印预览</el-button>
                         </template>
@@ -142,6 +143,10 @@ import reportContainer from "@/views/iosBasicData/report-container/report-contai
             assemblyForm:{
                 type:Object,
                 default:{}
+            },
+            detailData:{
+                type:Object,
+                default: {}
             }
         },
         async created() {

src/views/iosBasicData/AirtransportImport/bills/assembly/EntrustmentLnformation.vue

@@ -275,7 +275,7 @@
                                 <span style="color: #1e9fff">入库日期</span>
                             </span>
                             <el-date-picker v-model="assemblyForm.warehousingDate" clearable style="width: 100%"
-                                            type="date" size="small"
+                                            type="date" size="small" :disabled="detailData.seeDisabled"
                                             value-format="yyyy-MM-dd HH:mm:ss"
                                             placeholder="选择日期">
                             </el-date-picker>
@@ -285,7 +285,7 @@
                                 <span style="color: #1e9fff">出库日期</span>
                             </span>
                             <el-date-picker v-model="assemblyForm.outboundDate" clearable style="width: 100%"
-                                            type="date" size="small"
+                                            type="date" size="small" :disabled="detailData.seeDisabled"
                                             value-format="yyyy-MM-dd HH:mm:ss"
                                             placeholder="选择日期">
                             </el-date-picker>
@@ -459,6 +459,7 @@
                                                   :clearable="true"
                                                   :remote="true"
                                                   :buttonIf="false"
+                                                  :disabled="detailData.seeDisabled"
                                                   :forParameter="{key:'id',label:'code',value:'code',disabled:'status'}"
                                                   @corpFocus="getBunitsListfun"
                                                   @remoteMethod="getBunitsListfun"
@@ -476,6 +477,7 @@
                                                   :selectValue="assemblyForm.freightRateGrade"
                                                   :clearable="true"
                                                   :buttonIf="false"
+                                                  :disabled="detailData.seeDisabled"
                                                   :forParameter="{key:'dictKey',label:'dictValue',value:'dictKey'}"
                                                   @corpFocus="freightRateGradeWorkDictsfun"
                                                   @corpChange="corpChange($event,'freightRateGrade')">
@@ -551,6 +553,7 @@
                                               :selectValue="assemblyForm.waybillType"
                                               :clearable="true"
                                               :buttonIf="false"
+                                              :disabled="detailData.seeDisabled"
                                               :forParameter="{key:'dictKey',label:'dictValue',value:'dictKey'}"
                                               @corpFocus="waybillTypeWorkDictsfun"
                                               @corpChange="corpChange($event,'waybillType')">
@@ -601,6 +604,7 @@
                                               :selectValue="assemblyForm.seaType"
                                               :clearable="true"
                                               :buttonIf="false"
+                                              :disabled="detailData.seeDisabled"
                                               :forParameter="{key:'dictKey',label:'dictValue',value:'dictKey'}"
                                               @corpFocus="seaTypeWorkDictsfun"
                                               @corpChange="corpChange($event,'seaType')">
@@ -1153,6 +1157,9 @@ import {regularFloating, regularInteger} from "@/util/regularJudgment";
             },
             // 同通知人
             notifybyfun(){
+                if (this.detailData.seeDisabled) {
+                    return
+                }
                 this.$set(this.assemblyForm,'hnotifyId',this.assemblyForm.hconsigneeId)
                 this.$set(this.assemblyForm,'hnotifyCnName',this.assemblyForm.hconsigneeCnName)
                 this.$set(this.assemblyForm,'hnotifyEnName',this.assemblyForm.hconsigneeEnName)

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

@@ -12,16 +12,16 @@
                 <el-button size="small" style="margin-right: 8px"
                            :loading="saveLoading" @click="previewDialogfun" >预 览
                 </el-button>
-                <el-button size="small" type="warning" :disabled="!form.id" v-if="form.status == 1"
+                <el-button size="small" type="warning" :disabled="!form.id || detailData.seeDisabled" v-if="form.status == 1"
                            @click.stop="revokeDocumentApproval">撤销单据请核
                 </el-button>
-                <el-button size="small" type="success" :disabled="!form.id" v-if="form.status == 0 || form.status == 4"
+                <el-button size="small" type="success" :disabled="!form.id || detailData.seeDisabled" v-if="form.status == 0 || form.status == 4"
                            @click.stop="DocumentApproval">单据请核
                 </el-button>
                 <!--<el-button  size="small" type="primary" style="margin-right: 8px" v-if="detailData.seeDisabled"-->
                 <!--            :loading="saveLoading" @click="editHandle">编 辑-->
                 <!--</el-button>-->
-                <el-button  size="small" type="primary" style="margin-right: 8px"
+                <el-button  size="small" type="primary" style="margin-right: 8px" :disabled="detailData.seeDisabled"
                             :loading="saveLoading" @click="editCustomer">保 存
                 </el-button>
                 <el-dropdown style="line-height: 0">
@@ -229,7 +229,7 @@
                     <feecenter :assemblyForm="form" :detailData="detailData" :pleasereviewType="pleasereviewType" :pid="form.id" @billsDetailfun="billsDetailfun(form.id)"></feecenter>
                 </el-tab-pane>
                 <el-tab-pane label="单证中心" name="dz">
-                    <document-center ref="documentCenter" :assemblyForm="form" ></document-center>
+                    <document-center ref="documentCenter" :detailData="detailData" :assemblyForm="form" ></document-center>
                 </el-tab-pane>
                 <el-tab-pane label="分单列表" name="fd" v-if="form.billType == 'MM'">
                     <Split-list :detailData="detailData" :assemblyForm="form"

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

@@ -362,9 +362,9 @@
                   </div>
               </template>
               <template slot-scope="scope" slot="menu">
+                  <!--:disabled="saberUserInfo.role_name.indexOf('允许修改他人业务') == -1?saberUserInfo.user_id != scope.row.createUser:false"-->
                   <el-button :type="scope.type" :size="scope.size" icon="el-icon-edit"
-                             :disabled="saberUserInfo.role_name.indexOf('允许修改他人业务') == -1?saberUserInfo.user_id != scope.row.createUser:false"
-                             @click.stop="rowCellfun(scope.row.id, scope.index)">编辑
+                             @click.stop="rowCellfun(scope.row.id, scope.row)">编辑
                   </el-button>
               </template>
 
@@ -387,11 +387,15 @@
               </template>
               <template slot="billNo" slot-scope="scope">
                   <span style="color: #1e9fff;cursor: pointer;width: 100%;overflow:hidden;white-space: nowrap;text-overflow: ellipsis;"
-                        v-if="saberUserInfo.role_name.indexOf('允许修改他人业务') == -1?saberUserInfo.user_id == scope.row.createUser:true"
-                        @click.stop="rowCellfun(scope.row.id, scope.index)" >
+                        @click.stop="rowCellfun(scope.row.id, scope.row)" >
                       {{scope.row.billNo}}
                   </span>
-                  <span v-else >{{scope.row.billNo}}</span>
+                  <!--<span style="color: #1e9fff;cursor: pointer;width: 100%;overflow:hidden;white-space: nowrap;text-overflow: ellipsis;"-->
+                  <!--      v-if="saberUserInfo.role_name.indexOf('允许修改他人业务') == -1?saberUserInfo.user_id == scope.row.createUser:true"-->
+                  <!--      @click.stop="rowCellfun(scope.row.id, scope.row)" >-->
+                  <!--    {{scope.row.billNo}}-->
+                  <!--</span>-->
+                  <!--<span v-else >{{scope.row.billNo}}</span>-->
               </template>
               <template slot="eta" slot-scope="scope">
                   <span>{{scope.row.eta?scope.row.eta.slice(0,10):''}}</span>
@@ -1627,11 +1631,19 @@ import { getDeptTree } from "@/api/system/dept";
             })
         },
         // 编辑详情打开
-        rowCellfun(id,index) {
+        rowCellfun(id,row) {
             this.detailData = {
-                seeDisabled: false,
                 id: id
             };
+            if (row) {
+                if (this.saberUserInfo.role_name.indexOf('admin') == -1?this.saberUserInfo.role_name.indexOf('允许修改他人业务') == -1?this.saberUserInfo.user_id == row.createUser:true:true) {
+                    this.detailData.seeDisabled = false
+                }else {
+                    this.detailData.seeDisabled = true
+                }
+            }else {
+                this.detailData.seeDisabled = false
+            }
             this.isShow = false
             this.$nextTick(()=>{
                 this.$refs.billsDetails.pageLoading = true
@@ -1729,7 +1741,7 @@ import { getDeptTree } from "@/api/system/dept";
           let sumArr = []
           const h = this.$createElement
           // 判断是否有权限
-          if (this.saberUserInfo.role_name.indexOf('允许修改他人业务') != -1) return false
+          if (this.saberUserInfo.role_name.indexOf('admin') != -1?this.saberUserInfo.role_name.indexOf('允许修改他人业务') != -1:false) return false
           // 当前登录人和选择的创建人对比是不是一个人
           for (let item of this.selectionList) {
               if (this.saberUserInfo.user_id != item.createUser) {

src/views/iosBasicData/OceanFreightImport/bills/assembly/DocumentCenter.vue

@@ -18,13 +18,14 @@
                                @resetColumn="resetColumnTwo('documentCrud', 'documentOption', 'documentOptionBack', 312.1)"
                                @saveColumn="saveColumnTwo('documentCrud', 'documentOption', 'documentOptionBack', 312.1)" >
                         <template slot="menuLeft">
-                            <el-button type="primary" size="small" icon="el-icon-plus" @click="addbtnfun()">新增单证
+                            <el-button type="primary" size="small" icon="el-icon-plus" :disabled="detailData.seeDisabled" @click="addbtnfun()">新增单证
                             </el-button>
                         </template>
                         <template slot-scope="scope" slot="menu">
-                            <el-button type="text" size="small" @click="printEditing(scope.row)" >编辑</el-button>
-                            <el-button type="text" size="small" @click="printDelete(scope.row)" >
-                                <span style="color: red">删除</span>
+                            <el-button type="text" size="small" :disabled="detailData.seeDisabled" @click="printEditing(scope.row)" >编辑</el-button>
+                            <el-button type="text" size="small" :disabled="detailData.seeDisabled" @click="printDelete(scope.row)" >
+                                <span v-if="detailData.seeDisabled" style="color: #C0C4CC">删除</span>
+                                <span v-else style="color: red">删除</span>
                             </el-button>
                             <el-button type="text" size="small" @click="dialogPreviewfun(scope.row)">打印预览</el-button>
                         </template>
@@ -142,6 +143,10 @@ import reportContainer from "@/views/iosBasicData/report-container/report-contai
             assemblyForm:{
                 type:Object,
                 default:{}
+            },
+            detailData:{
+                type:Object,
+                default:{}
             }
         },
         async created() {

src/views/iosBasicData/OceanFreightImport/bills/assembly/EntrustmentLnformation.vue

@@ -937,6 +937,10 @@ import {regularFloating, regularInteger} from "@/util/regularJudgment";
             },
             // 通知人添加第二个通知人弹窗
             hnotifyClick(){
+                // 不是自己创建的单子
+                if (this.detailData.seeDisabled) {
+                    return;
+                }
                 this.hnotify2Visible = true
             },
             // 第二通知人弹窗的清除
@@ -1027,6 +1031,9 @@ import {regularFloating, regularInteger} from "@/util/regularJudgment";
             },
             // 同通知人
             notifybyfun(){
+                if (this.detailData.seeDisabled) {
+                    return;
+                }
                 this.$set(this.assemblyForm,'hnotifyId',this.assemblyForm.hconsigneeId)
                 this.$set(this.assemblyForm,'hnotifyCnName',this.assemblyForm.hconsigneeCnName)
                 this.$set(this.assemblyForm,'hnotifyEnName',this.assemblyForm.hconsigneeEnName)
@@ -1037,6 +1044,9 @@ import {regularFloating, regularInteger} from "@/util/regularJudgment";
             },
             // 邮箱跳转
             emailJump(){
+                if (this.detailData.seeDisabled) {
+                    return;
+                }
                 if (!this.assemblyForm.carrierId) {
                     this.$message({
                         message: '请先选择船公司',

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

@@ -31,16 +31,16 @@
                 <el-button size="small" style="margin-right: 8px"
                            :loading="saveLoading" @click="previewDialogfun" >预 览
                 </el-button>
-                <el-button size="small" type="warning" :disabled="!form.id" v-if="form.status == 1"
+                <el-button size="small" type="warning" :disabled="!form.id || detailData.seeDisabled" v-if="form.status == 1"
                            @click.stop="revokeDocumentApproval">撤销单据请核
                 </el-button>
-                <el-button size="small" type="success" :disabled="!form.id" v-if="form.status == 0 || form.status == 4"
+                <el-button size="small" type="success" :disabled="!form.id || detailData.seeDisabled" v-if="form.status == 0 || form.status == 4"
                            @click.stop="DocumentApproval">单据请核
                 </el-button>
                 <!--<el-button  size="small" type="primary" style="margin-right: 8px" v-if="detailData.seeDisabled"-->
                 <!--            :loading="saveLoading" @click="editHandle">编 辑-->
                 <!--</el-button>-->
-                <el-button  size="small" type="primary" style="margin-right: 8px"
+                <el-button  size="small" type="primary" style="margin-right: 8px" :disabled="detailData.seeDisabled"
                             :loading="saveLoading" @click="editCustomer">保 存
                 </el-button>
                 <el-dropdown style="line-height: 0">
@@ -260,7 +260,7 @@
                     <feecenter :assemblyForm="form" :detailData="detailData" :pleasereviewType="pleasereviewType" :pid="form.id" @billsDetailfun="billsDetailfun(form.id)"></feecenter>
                 </el-tab-pane>
                 <el-tab-pane label="单证中心" name="dz">
-                    <document-center ref="documentCenter" :assemblyForm="form" ></document-center>
+                    <document-center ref="documentCenter" :detailData="detailData" :assemblyForm="form" ></document-center>
                 </el-tab-pane>
                 <el-tab-pane label="分单列表" name="fd" v-if="form.billType == 'MM'">
                     <Split-list :detailData="detailData" :assemblyForm="form"
@@ -1124,6 +1124,9 @@ import {editypesList} from "@/api/iosBasicData/editypes";
             },
             // 申请B/L NO
             applyforfun(text){
+                if (this.detailData.seeDisabled) {
+                    return;
+                }
                 if (!this.form.id) {
                     this.$message({
                         message: '请先保存数据',

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

@@ -373,9 +373,9 @@
                   </div>
               </template>
               <template slot-scope="scope" slot="menu">
+                  <!--:disabled="saberUserInfo.role_name.indexOf('允许修改他人业务') == -1?saberUserInfo.user_id != scope.row.createUser:false"-->
                   <el-button :type="scope.type" :size="scope.size" icon="el-icon-edit"
-                             :disabled="saberUserInfo.role_name.indexOf('允许修改他人业务') == -1?saberUserInfo.user_id != scope.row.createUser:false"
-                             @click.stop="rowCellfun(scope.row.id, scope.index)">编辑
+                             @click.stop="rowCellfun(scope.row.id, scope.row)">编辑
                   </el-button>
               </template>
 
@@ -397,12 +397,16 @@
                   </span>
               </template>
               <template slot="billNo" slot-scope="scope">
+                  <!--<span style="color: #1e9fff;cursor: pointer;width: 100%;overflow:hidden;white-space: nowrap;text-overflow: ellipsis;"-->
+                  <!--      v-if="saberUserInfo.role_name.indexOf('允许修改他人业务') == -1?saberUserInfo.user_id == scope.row.createUser:true"-->
+                  <!--      @click.stop="rowCellfun(scope.row.id, scope.index)" >-->
+                  <!--    {{scope.row.billNo}}-->
+                  <!--</span>-->
+                  <!--<span v-else >{{scope.row.billNo}}</span>-->
                   <span style="color: #1e9fff;cursor: pointer;width: 100%;overflow:hidden;white-space: nowrap;text-overflow: ellipsis;"
-                        v-if="saberUserInfo.role_name.indexOf('允许修改他人业务') == -1?saberUserInfo.user_id == scope.row.createUser:true"
-                        @click.stop="rowCellfun(scope.row.id, scope.index)" >
+                        @click.stop="rowCellfun(scope.row.id, scope.row)" >
                       {{scope.row.billNo}}
                   </span>
-                  <span v-else >{{scope.row.billNo}}</span>
               </template>
               <template slot="eta" slot-scope="scope">
                   <span>{{scope.row.eta?scope.row.eta.slice(0,10):''}}</span>
@@ -1653,11 +1657,19 @@ import { getDeptTree } from "@/api/system/dept";
             })
         },
         // 编辑详情打开
-        rowCellfun(id,index) {
+        rowCellfun(id,row) {
             this.detailData = {
-                seeDisabled: false,
-                id: id
-            };
+                id:id
+            }
+            if (row) {
+                if (this.saberUserInfo.role_name.indexOf('admin') == -1?this.saberUserInfo.role_name.indexOf('允许修改他人业务') == -1?this.saberUserInfo.user_id == row.createUser:true:true) {
+                    this.detailData.seeDisabled = false
+                }else {
+                    this.detailData.seeDisabled = true
+                }
+            }else {
+                this.detailData.seeDisabled = false
+            }
             this.isShow = false
             this.$nextTick(()=>{
                 this.$refs.billsDetails.pageLoading = true
@@ -1755,7 +1767,7 @@ import { getDeptTree } from "@/api/system/dept";
           let sumArr = []
           const h = this.$createElement
           // 判断是否有权限
-          if (this.saberUserInfo.role_name.indexOf('允许修改他人业务') != -1) return false
+          if (this.saberUserInfo.role_name.indexOf('admin') != -1?this.saberUserInfo.role_name.indexOf('允许修改他人业务') != -1:false) return false
           // 当前登录人和选择的创建人对比是不是一个人
           for (let item of this.selectionList) {
               if (this.saberUserInfo.user_id != item.createUser) {

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

@@ -123,19 +123,19 @@
                            @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="selectionList.length == 0" @click="DetailAdd"></el-button>
+                                   :disabled="selectionList.length == 0 || detailData.seeDisabled" @click="DetailAdd"></el-button>
                     </template>
                     <template slot-scope="scope" slot="menuLeft">
                         <el-button
                             type="primary" plain
                             size="small"
-                            :disabled="pleasereviewType"
+                            :disabled="pleasereviewType || detailData.seeDisabled"
                             @click.stop="containerscommoditySubmitListfun"
                         >批量保存</el-button>
                         <el-button
                             type="danger" plain
                             size="small"
-                            :disabled="pleasereviewType"
+                            :disabled="pleasereviewType || detailData.seeDisabled"
                             @click.stop="BatchDelete"
                         >批量删除</el-button>
                     </template>
@@ -145,12 +145,12 @@
                             size="mini"
                             type="text"
                             icon="el-icon-edit"
-                            :disabled="pleasereviewType"
+                            :disabled="pleasereviewType || detailData.seeDisabled"
                             @click.stop="editfun(scope.row, scope.index)">
                             编辑
                         </el-button>
                         <el-button type="text" size="small"
-                                   :disabled="pleasereviewType"
+                                   :disabled="pleasereviewType || detailData.seeDisabled"
                                    @click="containerscommodityRemovefun(scope.row.id,scope.index)">删除
                         </el-button>
                     </template>

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

@@ -18,13 +18,14 @@
                                @resetColumn="resetColumnTwo('documentCrud', 'documentOption', 'documentOptionBack', 312.1)"
                                @saveColumn="saveColumnTwo('documentCrud', 'documentOption', 'documentOptionBack', 312.1)" >
                         <template slot="menuLeft">
-                            <el-button type="primary" size="small" icon="el-icon-plus" @click="addbtnfun()">新增单证
+                            <el-button type="primary" size="small" icon="el-icon-plus" :disabled="detailData.seeDisabled" @click="addbtnfun()">新增单证
                             </el-button>
                         </template>
                         <template slot-scope="scope" slot="menu">
-                            <el-button type="text" size="small" @click="printEditing(scope.row)" >编辑</el-button>
-                            <el-button type="text" size="small" @click="printDelete(scope.row)" >
-                                <span style="color: red">删除</span>
+                            <el-button type="text" size="small" :disabled="detailData.seeDisabled" @click="printEditing(scope.row)" >编辑</el-button>
+                            <el-button type="text" size="small" :disabled="detailData.seeDisabled" @click="printDelete(scope.row)" >
+                                <span v-if="detailData.seeDisabled" >删除</span>
+                                <span v-else style="color: red">删除</span>
                             </el-button>
                             <el-button type="text" size="small" @click="dialogPreviewfun(scope.row)">打印预览</el-button>
                         </template>
@@ -142,6 +143,10 @@ import reportContainer from "@/views/iosBasicData/report-container/report-contai
             assemblyForm:{
                 type:Object,
                 default:{}
+            },
+            detailData:{
+                type:Object,
+                default: {}
             }
         },
         async created() {

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

@@ -1174,6 +1174,9 @@ import {regularFloating, regularInteger} from "@/util/regularJudgment";
             },
             // 通知人添加第二个通知人弹窗
             hnotifyClick(){
+                if (this.detailData.seeDisabled) {
+                    return;
+                }
                 this.hnotify2Visible = true
             },
             // 第二通知人弹窗的清除
@@ -1264,6 +1267,9 @@ import {regularFloating, regularInteger} from "@/util/regularJudgment";
             },
             // 同通知人
             notifybyfun(){
+                if (this.detailData.seeDisabled) {
+                    return;
+                }
                 this.$set(this.assemblyForm,'hnotifyId',this.assemblyForm.hconsigneeId)
                 this.$set(this.assemblyForm,'hnotifyCnName',this.assemblyForm.hconsigneeCnName)
                 this.$set(this.assemblyForm,'hnotifyEnName',this.assemblyForm.hconsigneeEnName)
@@ -1274,6 +1280,9 @@ import {regularFloating, regularInteger} from "@/util/regularJudgment";
             },
             // 邮箱跳转
             emailJump(){
+                if (this.detailData.seeDisabled) {
+                    return;
+                }
                 if (!this.assemblyForm.carrierId) {
                     this.$message({
                         message: '请先选择船公司',

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

@@ -2037,7 +2037,6 @@
 
             // 获取币别数据
             bcurrencyGetExratefun(dc){
-                console.log(dc,1963)
                 bcurrencyGetExrate({
                     date:this.assemblyForm.etd?this.assemblyForm.etd.slice(0,10) + ' 00:00:00':dateFormat(new Date(), "yyyy-MM-dd") + ' 00:00:00', // 开船日期
                     dc:dc

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

@@ -31,16 +31,16 @@
                 <el-button size="small" style="margin-right: 8px"
                            :loading="saveLoading" @click="previewDialogfun" >预 览
                 </el-button>
-                <el-button size="small" type="warning" :disabled="!form.id" v-if="form.status == 1"
+                <el-button size="small" type="warning" :disabled="!form.id || detailData.seeDisabled" v-if="form.status == 1"
                            @click.stop="revokeDocumentApproval">撤销单据请核
                 </el-button>
-                <el-button size="small" type="success" :disabled="!form.id" v-if="form.status == 0 || form.status == 4"
+                <el-button size="small" type="success" :disabled="!form.id || detailData.seeDisabled" v-if="form.status == 0 || form.status == 4"
                            @click.stop="DocumentApproval">单据请核
                 </el-button>
                 <!--<el-button  size="small" type="primary" style="margin-right: 8px" v-if="detailData.seeDisabled"-->
                 <!--            :loading="saveLoading" @click="editHandle">编 辑-->
                 <!--</el-button>-->
-                <el-button  size="small" type="primary" style="margin-right: 8px"
+                <el-button  size="small" type="primary" style="margin-right: 8px" :disabled="detailData.seeDisabled"
                             :loading="saveLoading" @click="editCustomer">保 存
                 </el-button>
                 <el-dropdown style="line-height: 0">
@@ -262,7 +262,7 @@
                     <feecenter :assemblyForm="form" :detailData="detailData" :pleasereviewType="pleasereviewType" :pid="form.id" @billsDetailfun="billsDetailfun(form.id)"></feecenter>
                 </el-tab-pane>
                 <el-tab-pane label="单证中心" name="dz">
-                    <document-center ref="documentCenter" :assemblyForm="form" ></document-center>
+                    <document-center ref="documentCenter" :detailData="detailData" :assemblyForm="form" ></document-center>
                 </el-tab-pane>
                 <el-tab-pane label="分单列表" name="fd" v-if="form.billType == 'MM'">
                     <Split-list :detailData="detailData" :assemblyForm="form"

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

@@ -373,10 +373,10 @@
                   </div>
               </template>
               <template slot-scope="scope" slot="menu">
+                  <!--:disabled="saberUserInfo.role_name.indexOf('允许修改他人业务') == -1?saberUserInfo.user_id != scope.row.createUser:false"-->
                   <el-button :type="scope.type" :size="scope.size"
-                             :disabled="saberUserInfo.role_name.indexOf('允许修改他人业务') == -1?saberUserInfo.user_id != scope.row.createUser:false"
                              icon="el-icon-edit"
-                             @click.stop="rowCellfun(scope.row.id, scope.index)">编辑
+                             @click.stop="rowCellfun(scope.row.id, scope.row)">编辑
                   </el-button>
               </template>
 
@@ -399,11 +399,15 @@
               </template>
               <template slot="billNo" slot-scope="scope">
                   <span style="color: #1e9fff;cursor: pointer;width: 100%;overflow:hidden;white-space: nowrap;text-overflow: ellipsis;"
-                        v-if="saberUserInfo.role_name.indexOf('允许修改他人业务') == -1?saberUserInfo.user_id == scope.row.createUser:true"
-                        @click.stop="rowCellfun(scope.row.id, scope.index)" >
+                        @click.stop="rowCellfun(scope.row.id, scope.row)" >
                       {{scope.row.billNo}}
                   </span>
-                  <span v-else >{{scope.row.billNo}}</span>
+                  <!--<span style="color: #1e9fff;cursor: pointer;width: 100%;overflow:hidden;white-space: nowrap;text-overflow: ellipsis;"-->
+                  <!--      v-if="saberUserInfo.role_name.indexOf('允许修改他人业务') == -1?saberUserInfo.user_id == scope.row.createUser:true"-->
+                  <!--      @click.stop="rowCellfun(scope.row.id, scope.row)" >-->
+                  <!--    {{scope.row.billNo}}-->
+                  <!--</span>-->
+                  <!--<span v-else >{{scope.row.billNo}}</span>-->
               </template>
               <template slot="eta" slot-scope="scope">
                   <span>{{scope.row.eta?scope.row.eta.slice(0,10):''}}</span>
@@ -1543,7 +1547,7 @@ import { getDeptTree } from "@/api/system/dept";
             let sumArr = []
             const h = this.$createElement
             // 判断是否有权限
-            if (this.saberUserInfo.role_name.indexOf('允许修改他人业务') != -1) return false
+            if (this.saberUserInfo.role_name.indexOf('admin') != -1?this.saberUserInfo.role_name.indexOf('允许修改他人业务') != -1:false) return false
             // 当前登录人和选择的创建人对比是不是一个人
             for (let item of this.selectionList) {
                 if (this.saberUserInfo.user_id != item.createUser) {
@@ -1676,11 +1680,19 @@ import { getDeptTree } from "@/api/system/dept";
             })
         },
         // 编辑详情打开
-        rowCellfun(id,index) {
+        rowCellfun(id,row) {
             this.detailData = {
-                seeDisabled: false,
                 id: id
             };
+            if (row) {
+                if (this.saberUserInfo.role_name.indexOf('admin') == -1?this.saberUserInfo.role_name.indexOf('允许修改他人业务') == -1?this.saberUserInfo.user_id == row.createUser:true:true) {
+                    this.detailData.seeDisabled = false
+                }else {
+                    this.detailData.seeDisabled = true
+                }
+            }else {
+                this.detailData.seeDisabled = false
+            }
             this.isShow = false
             this.$nextTick(()=>{
                 this.$refs.billsDetails.pageLoading = true

src/views/iosBasicData/reportClose/SEreportClose/assembly/TableDetails.vue

@@ -3,7 +3,6 @@
         <avue-crud :option="option"
                    :table-loading="loading"
                    :data="tableData"
-                   v-model="form"
                    id="out-table"
                    :header-cell-class-name="headerClassName"
                    ref="crud"
@@ -23,16 +22,98 @@
                            @click="oneclickEditingfun">一键编辑
                 </el-button>
             </template>
+            <template slot="sortHeader" slot-scope="scope">
+                <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应付修改') != -1"
+                           type="primary" size="small" icon="el-icon-plus" circle
+                           @click="addCfun">
+                </el-button>
+            </template>
+            <template slot="destinationCountryCnName" slot-scope="{ row }">
+                <search-query v-if="row.edit"
+                              :datalist="destinationCountryData"
+                              :selectValue="row.destinationCountryCnName"
+                              :filterable="true"
+                              :clearable="true"
+                              :remote="true"
+                              :buttonIf="false"
+                              :forParameter="{key:'id',label:'cnName',value:'cnName'}"
+                              @remoteMethod="destinationCountrybcountrysListfun"
+                              @corpChange="corpChange($event,'destinationCountryCnName',row)"
+                              @corpFocus="destinationCountrybcountrysListfun">
+                </search-query>
+                <span v-else >{{row.destinationCountryCnName}}}</span>
+            </template>
+            <template slot="transactionUnit" slot-scope="{ row }">
+                <search-query v-if="row.edit"
+                              :datalist="transactionUnitData"
+                              :selectValue="row.transactionUnit"
+                              :filterable="true"
+                              :clearable="true"
+                              :remote="true"
+                              :buttonIf="false"
+                              :forParameter="{key:'id',label:'cnName',value:'cnName'}"
+                              @remoteMethod="transactionUnitBunitsListfun"
+                              @corpChange="corpChange($event,'transactionUnit',row)"
+                              @corpFocus="transactionUnitBunitsListfun">
+                </search-query>
+                <span v-else >{{row.transactionUnit}}}</span>
+            </template>
+            <template slot="transactionVolume" slot-scope="{ row }">
+                <el-input v-if="row.edit" v-model="row.transactionVolume" size="small"
+                          :controls="false" :precision="0"
+                          placeholder="请输入" @blur="transactionVolumeBlur(row)"></el-input>
+                <span v-else>{{row.transactionVolume}}</span>
+            </template>
+            <template slot="transactionPrice" slot-scope="{ row }">
+                <el-input v-if="row.edit" v-model="row.transactionPrice" size="small"
+                          :controls="false" :precision="0"
+                          placeholder="请输入" @blur="transactionPriceBlur(row)"></el-input>
+                <span v-else>{{row.transactionPrice}}</span>
+            </template>
+            <template slot="totalPrice" slot-scope="{ row }">
+                <el-input v-if="row.edit" v-model="row.totalPrice" size="small"
+                          :controls="false" :precision="0"
+                          placeholder="请输入" @blur="totalPriceBlur(row)"></el-input>
+                <span v-else>{{row.totalPrice}}</span>
+            </template>
+            <template slot="currency" slot-scope="{ row }">
+                <search-query v-if="row.edit"
+                              :datalist="currencyData"
+                              :selectValue="row.currency"
+                              :clearable="true"
+                              :buttonIf="false"
+                              :forParameter="{key:'id',label:'code',value:'code'}"
+                              @corpChange="corpChange($event,'currency',row)"
+                              @corpFocus="currencyRateListfun" >
+                </search-query>
+                <span v-else>{{row.currency}}</span>
+            </template>
+
+
         </avue-crud>
     </div>
 </template>
 
 <script>
+    import SearchQuery from "@/components/iosbasic-data/searchquery.vue";
+    import {bcountrysList} from "@/api/iosBasicData/bcountrys";
+    import {getBunitsList} from "@/api/iosBasicData/bunits";
+    import {getRateList} from "@/api/iosBasicData/rateManagement";
+
     export default {
+        components: {SearchQuery},
         props:{
             disabled:{
                 type:Boolean,
                 default:false,
+            },
+            tableData:{
+                type:Array,
+                default: []
+            },
+            roleName:{
+                type:Array,
+                default:[]
             }
         },
         data(){
@@ -88,7 +169,7 @@
                         },
                         {
                             label: "目的国",
-                            prop: "destinationCountryEnName",
+                            prop: "destinationCountryCnName",
                             overHidden:true,
                         },
                         {
@@ -155,18 +236,95 @@
                 },
                 loading:false,
                 tableData:[],
-                form:{}
+                destinationCountryData:[], // 目的国
+                transactionUnitData:[], // 成交单位
+                currencyData:[], // 币种数据
 
             }
         },
         async created() {
             this.option = await this.getColumnData(this.getColumnName(326.1), this.optionBack);
         },
-        methods:{
+        methods: {
+            // 添加
+            addCfun(){
+                this.tableData.push({
+                    edit:true
+                })
+            },
+            // 一键删除
+            batchDelete(dc){
+                this.$confirm("确定将选择数据删除?", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "warning"
+                }).then(()=>{
+                    let multiList = this.handleSelectionData
+                    let arr = this.tableData
+                    // 获取有id 的数据
+                    const itemsWithId = multiList.filter(item => item.hasOwnProperty('id'));
+                    let arrIds = itemsWithId.map(item=>item.id) // 获取id 数据
+                    // 把选中的删除掉
+                    multiList.forEach((item)=>{
+                        for (let index in arr) {
+                            if (JSON.stringify(item) == JSON.stringify(arr[index])) {
+                                arr.splice(Number(index),1)
+                            }
+                        }
+                    })
+                    // 有id 的处理
+                    if(itemsWithId.length != 0) {
+                        console.log('掉接口删除')
+                        // feecenterRemove(arrIds.join(',')).then(res=>{
+                        //     this.$message.success('操作成功')
+                        //     // this.$emit('billsDetailfun')
+                        // })
+                    }
+                })
+            },
+            // 下拉回调
+            corpChange(value,name,row){
+                // 目的国
+                if (name == 'destinationCountryCnName') {
+                    for (let item of this.destinationCountryData) {
+                        if (item.cnName == value) {
+                            this.$set(row,'destinationCountryId',item.id)
+                            this.$set(row,'destinationCountryCnName',item.cnName)
+                            this.$set(row,'destinationCountryEnName',item.cnName)
+                        }
+                    }
+                }else {
+                    this.$set(row,name,value)
+                }
+            },
+            // 数量失焦
+            transactionVolumeBlur(row){
+                console.log(row,276)
+            },
+
+            // 接口调用 😓😓😓😓😓😓😓😓😓😓😓😓😓😓
+            // 目的国
+            destinationCountrybcountrysListfun(cnName){
+                bcountrysList(1,10,{cnName}).then(res=>{
+                    this.destinationCountryData = res.data.data.records
+                })
+            },
+            // 成交单位
+            transactionUnitBunitsListfun(cnName){
+                getBunitsList(1,10,{cnName}).then(res=>{
+                    this.transactionUnitData = res.data.data.records
+                })
+            },
+            // 币种
+            currencyRateListfun(){
+                getRateList().then(res=>{
+                    this.currencyData = res.data.data.records
+                })
+            },
             // 多选选择的数据
             handleSelectionChange(arr){
-                this.$emit('handleSelectionChange',arr)
-                // this.handleSelectionData = arr
+                // this.$emit('handleSelectionChange',arr)
+                this.handleSelectionData = arr
             },
             //自定义列保存
             async saveColumnTwo(ref, option, optionBack, code) {

src/views/iosBasicData/reportClose/SEreportClose/bgdetails.vue

@@ -503,7 +503,7 @@
                         </basic-container>
                     </el-form>
                     <basic-container>
-                        <table-details></table-details>
+                        <table-details :tableData="form.customsDeclarationGoodsList" :roleName="roleName" ></table-details>
                     </basic-container>
                 </el-tab-pane>
                 <el-tab-pane label="费用信息" name="fy"
@@ -613,15 +613,18 @@
                 this.form.billNoFormat = 'BG-HYCK'
                 this.form.businessTypeCode = 'BGDH'
                 customsdeclarationSubmit(this.form).then(res=>{
-                    console.log(res,627)
-                    this.form = res.data.data
-                    this.customsdeclarationDetailfun(this.form.id)
+                    this.$message.success('操作成功！')
+                    this.customsdeclarationDetailfun(res.data.data.id)
                 })
             },
             // 详情
             customsdeclarationDetailfun(id){
                 customsdeclarationDetail(id).then(res=>{
-                    console.log(res,627)
+                    this.pageLoading = false
+                    this.form = res.data.data
+                    for (let item of this.form.documentsAttached.split(',')) {
+                        this.$set(this.comprehensiveForm,item,item)
+                    }
                 })
             },
             // 下拉回调

src/views/iosBasicData/reportClose/SEreportClose/index.vue

@@ -34,7 +34,7 @@
                 </template>
             </avue-crud>
         </basic-container>
-        <bgdetails ref="details" v-if="!isShow" :detailData="detailData" @goBack="goBack" ></bgdetails>
+        <bgdetails ref="bgdetails" v-if="!isShow" :detailData="detailData" @goBack="goBack" ></bgdetails>
     </div>
 </template>
 
@@ -1063,8 +1063,8 @@
                 };
                 this.isShow = false
                 this.$nextTick(()=>{
-                    this.$refs.billsDetails.pageLoading = true
-                    this.$refs.billsDetails.billsDetailfun(id)
+                    this.$refs.bgdetails.pageLoading = true
+                    this.$refs.bgdetails.customsdeclarationDetailfun(id)
                 })
             },
             // 新增弹窗开启

src/views/iosBasicData/seamends/amendsDetails.vue

@@ -569,6 +569,7 @@ export default {
             },
             selectPrintingDialog:false, // 预览弹窗
             dcDisabled:false, // dc列是否禁用
+            saberUserInfo:{}, // 当前登录人信息
         }
     },
     watch:{
@@ -588,6 +589,8 @@ export default {
     },
     created() {
         this.roleName =  localStorage.getItem('roleName').split(',')
+        // 获取当前登录人个人信息
+        this.saberUserInfo = JSON.parse(localStorage.getItem('saber-userInfo')).content
     },
     methods: {
         // 报表预览
@@ -724,6 +727,9 @@ export default {
             amendsDetail(id).then(res=>{
                 this.pageLoading = false
                 this.form = res.data.data
+                if (this.roleName.indexOf('admin') != -1?this.roleName.indexOf('允许修改他人业务') != -1?this.saberUserInfo.user_id != this.form.createUser:false:false) {
+                    this.buttonDisable = true
+                }
                 this.editType = false // 把编辑状态变成不可编辑状态
                 let arr = ['feeCenterList','feeCenterListC','feeCenterListD']
                 for(let data of arr) {

src/views/iosBasicData/seamends/index.vue

@@ -41,13 +41,12 @@
                       type="text"
                       size="small"
                       icon="el-icon-edit"
-                      :disabled="saberUserInfo.role_name.indexOf('允许修改他人业务') == -1?saberUserInfo.user_id != row.createUser:false"
                       @click.stop="rowEdit(row)">修改
                   </el-button>
+                  <!--:disabled="saberUserInfo.role_name.indexOf('允许修改他人业务') == -1?saberUserInfo.user_id != row.createUser:false"-->
                   <el-button
                       type="text"
                       size="small"
-                      v-if="saberUserInfo.role_name.indexOf('允许修改他人业务') == -1?saberUserInfo.user_id == row.createUser:true"
                       :disabled="row.status == 1 || row.status == 2 || row.status == 3"
                       @click.stop="rowDel(row)"
                       icon="el-icon-delete" >删除
@@ -55,10 +54,8 @@
               </template>
               <template slot="billNo" slot-scope="{ row }">
                   <span style="color: #1e9fff;cursor:pointer;"
-                        v-if="saberUserInfo.role_name.indexOf('允许修改他人业务') == -1?saberUserInfo.user_id == row.createUser:true"
                         @click="rowEdit(row)">{{row.billNo}}
                   </span>
-                  <span v-else >{{row.billNo}}</span>
               </template>
           </avue-crud>
       </basic-container>