货代ps规则判断 2024-2-19

src/views/approveDataH/index.vue

@@ -56,11 +56,11 @@
                      :disabled="scope.row.auditStatus != 'S'"
                      @click.stop="printWindowfun(scope.row,'HYJK-DJ')">审批
           </el-button>
-          <el-button type="text" size="small" v-if="scope.row.checkType == 'KYCK-DJ'"
+          <el-button type="text" size="small" v-else-if="scope.row.checkType == 'KYCK-DJ'"
                      :disabled="scope.row.auditStatus != 'S'"
                      @click.stop="printWindowfun(scope.row,'KYCK-DJ')">审批
           </el-button>
-          <el-button type="text" size="small" v-if="scope.row.checkType == 'KYJK-DJ'"
+          <el-button type="text" size="small" v-else-if="scope.row.checkType == 'KYJK-DJ'"
                      :disabled="scope.row.auditStatus != 'S'"
                      @click.stop="printWindowfun(scope.row,'KYJK-DJ')">审批
           </el-button>

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

@@ -599,7 +599,7 @@
 
 <script>
     import SearchQuery from "@/components/iosbasic-data/searchquery.vue";
-    import {getBcorpsList} from "@/api/iosBasicData/bcorps";
+    import {getBcorpsDetail, getBcorpsList} from "@/api/iosBasicData/bcorps";
     import {bfeesList} from "@/api/iosBasicData/bfees";
     import {getBunitsPage} from "@/api/iosBasicData/bunits";
     import {bcurrencyGetExrate} from "@/api/iosBasicData/rateManagement";
@@ -1710,7 +1710,7 @@
                 })
             },
             // 客户的回调
-            corpChange(value,name,row,dc) {
+            async corpChange(value,name,row,dc) {
                 if (name == 'corpCnName') {
                     if (!value) {
                         this.$set(row,'corpCnName','')
@@ -1738,6 +1738,27 @@
                     }
                     for(let item of this.feeCnNameData) {
                         if (item.cnName == value){
+                            if (value == 'PS') {
+                                // 查询当前客户的 ps规则是否等于零和null
+                                const psres = await getBcorpsDetail(this.assemblyForm.corpId)
+                                if (psres.data.data.psRate) {
+                                    this.$confirm('PS规则为零不能添加费用', {
+                                        confirmButtonText: "确定",
+                                        cancelButtonText: "取消",
+                                        type: "warning"
+                                    })
+                                    this.$set(row,'feeCnName','')
+                                    this.$set(row,'feeEnName','')
+                                    this.$set(row,'feeId','')
+                                    this.$set(row,'feeCode','')
+                                    // 核算要素
+                                    this.$set(row,'elementsId','')
+                                    this.$set(row,'elementsCnName','')
+                                    this.$set(row,'elementsCode','')
+                                    this.$set(row,'elementsEnName','')
+                                    return
+                                }
+                            }
                             this.$set(row,'feeCnName',item.cnName)
                             this.$set(row,'feeEnName',item.enName)
                             this.$set(row,'feeId',item.id)

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

@@ -600,7 +600,7 @@
 
 <script>
     import SearchQuery from "@/components/iosbasic-data/searchquery.vue";
-    import {getBcorpsList} from "@/api/iosBasicData/bcorps";
+    import {getBcorpsDetail, getBcorpsList} from "@/api/iosBasicData/bcorps";
     import {bfeesList} from "@/api/iosBasicData/bfees";
     import {getBunitsPage} from "@/api/iosBasicData/bunits";
     import {bcurrencyGetExrate} from "@/api/iosBasicData/rateManagement";
@@ -1716,7 +1716,7 @@
                 })
             },
             // 客户的回调
-            corpChange(value,name,row,dc) {
+            async corpChange(value,name,row,dc) {
                 if (name == 'corpCnName') {
                     if (!value) {
                         this.$set(row,'corpCnName','')
@@ -1744,6 +1744,27 @@
                     }
                     for(let item of this.feeCnNameData) {
                         if (item.cnName == value){
+                            if (value == 'PS') {
+                                // 查询当前客户的 ps规则是否等于零和null
+                                const psres = await getBcorpsDetail(this.assemblyForm.corpId)
+                                if (psres.data.data.psRate) {
+                                    this.$confirm('PS规则为零不能添加费用', {
+                                        confirmButtonText: "确定",
+                                        cancelButtonText: "取消",
+                                        type: "warning"
+                                    })
+                                    this.$set(row,'feeCnName','')
+                                    this.$set(row,'feeEnName','')
+                                    this.$set(row,'feeId','')
+                                    this.$set(row,'feeCode','')
+                                    // 核算要素
+                                    this.$set(row,'elementsId','')
+                                    this.$set(row,'elementsCnName','')
+                                    this.$set(row,'elementsCode','')
+                                    this.$set(row,'elementsEnName','')
+                                    return
+                                }
+                            }
                             this.$set(row,'feeCnName',item.cnName)
                             this.$set(row,'feeEnName',item.enName)
                             this.$set(row,'feeId',item.id)

src/views/iosBasicData/ComputationCenter/index.vue

@@ -64,16 +64,14 @@
                     <!--:disabled="saberUserInfo.role_name.indexOf('允许修改他人业务') == -1?saberUserInfo.user_id != row.createUser:false"-->
                     <el-button v-if="tabsValue == '业务单据'"
                                type="text" size="small"
-                               :disabled="saberUserInfo.role_name.indexOf('允许修改他人业务') == -1?saberUserInfo.user_id != row.createUser:false"
+                               :disabled="saberUserInfo.role_name.indexOf('admin') == -1?saberUserInfo.role_name.indexOf('允许修改他人业务') == -1?saberUserInfo.user_id != row.createUser:false:false"
                                @click="rowDel(row)" >删除
                     </el-button>
                 </template>
                 <template slot="billNo" slot-scope="{row}">
                   <span class="pointerClick"
-                        v-if="(tabsValue == '业务单据' || tabsValue == '已完成') && (saberUserInfo.role_name.indexOf('允许修改他人业务') == -1?saberUserInfo.user_id == row.createUser:true)"
                         @click="editfun(row)" >{{row.billNo}}
                   </span>
-                  <span v-else>{{row.billNo}}</span>
                 </template>
             </avue-crud>
         </basic-container>

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

@@ -64,6 +64,25 @@
                           @corpFocus="remoteMethod($event,'cntrTypeCode')" >
             </search-query>
         </template>
+        <template slot="number" slot-scope="{ row }">
+            <el-input v-if="row.$cellEdit" style="width: 100%;" v-model="row.number"
+                      size="small" autocomplete="off" min="0" @blur="numberBlur(row)"
+                      clearable placeholder="请输入件数" ></el-input>
+            <span v-else >{{row.number}}</span>
+        </template>
+        <template slot="grossWeight" slot-scope="{ row }">
+            <el-input v-if="row.$cellEdit" style="width: 100%;" v-model="row.grossWeight"
+                      size="small" autocomplete="off" min="0" @blur="grossWeightBlur(row)"
+                      clearable placeholder="请输入毛重" ></el-input>
+            <span v-else >{{row.grossWeight}}</span>
+        </template>
+        <template slot="measurement" slot-scope="{ row }">
+            <el-input v-if="row.$cellEdit" style="width: 100%;" v-model="row.measurement"
+                      size="small" autocomplete="off" min="0" @blur="measurementBlur(row)"
+                      clearable placeholder="请输入尺码" ></el-input>
+            <span v-else >{{row.measurement}}</span>
+        </template>
+
     </avue-crud>
   </basic-container>
 </template>
@@ -159,7 +178,7 @@ import {number} from "echarts";
                 prop: "number",
                 type:"number",
                 width:'120',
-                cell:true,
+                // cell:true,
                 controls:false,
                 precision:0,
             },
@@ -168,7 +187,7 @@ import {number} from "echarts";
               prop: "grossWeight",
               width:'120',
               type:"number",
-              cell:true,
+              // cell:true,
               controls:false,
             },
             {
@@ -184,7 +203,7 @@ import {number} from "echarts";
               prop: "measurement",
               width:'120',
               type:"number",
-              cell:true,
+              // cell:true,
               controls:false,
             },
             {
@@ -287,6 +306,42 @@ import {number} from "echarts";
           this.option = await this.getColumnData(this.getColumnName(309.1), this.optionBack);
       },
       methods: {
+        // 件数失焦事件
+        numberBlur(row){
+            let quantityNum = 0
+            for (let item of this.assemblyForm.preContainersList) {
+                if (item.number) {
+                    quantityNum += Number(item.number)
+                }
+            }
+            if (quantityNum != 0) {
+                this.assemblyForm.quantity = quantityNum
+            }
+        },
+        // 毛重失焦事件
+        grossWeightBlur(row){
+            let grossWeightNum = 0
+            for (let item of this.assemblyForm.preContainersList) {
+                if (item.grossWeight) {
+                    grossWeightNum += Number(item.grossWeight)
+                }
+            }
+            if (grossWeightNum != 0) {
+                this.assemblyForm.grossWeight = grossWeightNum
+            }
+        },
+        // 尺码失焦事件
+        measurementBlur(row){
+            let measurementNum = 0
+            for (let item of this.assemblyForm.preContainersList) {
+                if (item.measurement) {
+                    measurementNum += Number(item.measurement)
+                }
+            }
+            if (measurementNum != 0) {
+                this.assemblyForm.measurement = measurementNum
+            }
+        },
         // 批量保存
         batchSavefun(){
             if (!this.assemblyForm.id) {

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

@@ -603,7 +603,7 @@
 
 <script>
     import SearchQuery from "@/components/iosbasic-data/searchquery.vue";
-    import {getBcorpsList} from "@/api/iosBasicData/bcorps";
+    import {getBcorpsDetail, getBcorpsList} from "@/api/iosBasicData/bcorps";
     import {bfeesList} from "@/api/iosBasicData/bfees";
     import {getBunitsPage} from "@/api/iosBasicData/bunits";
     import {bcurrencyGetExrate} from "@/api/iosBasicData/rateManagement";
@@ -1740,7 +1740,7 @@
                 })
             },
             // 客户的回调
-            corpChange(value,name,row,dc) {
+            async corpChange(value,name,row,dc) {
                 if (name == 'corpCnName') {
                     if (!value) {
                         this.$set(row,'corpCnName','')
@@ -1768,6 +1768,27 @@
                     }
                     for(let item of this.feeCnNameData) {
                         if (item.cnName == value){
+                            if (value == 'PS') {
+                                // 查询当前客户的 ps规则是否等于零和null
+                                const psres = await getBcorpsDetail(this.assemblyForm.corpId)
+                                if (psres.data.data.psRate) {
+                                    this.$confirm('PS规则为零不能添加费用', {
+                                        confirmButtonText: "确定",
+                                        cancelButtonText: "取消",
+                                        type: "warning"
+                                    })
+                                    this.$set(row,'feeCnName','')
+                                    this.$set(row,'feeEnName','')
+                                    this.$set(row,'feeId','')
+                                    this.$set(row,'feeCode','')
+                                    // 核算要素
+                                    this.$set(row,'elementsId','')
+                                    this.$set(row,'elementsCnName','')
+                                    this.$set(row,'elementsCode','')
+                                    this.$set(row,'elementsEnName','')
+                                    return
+                                }
+                            }
                             this.$set(row,'feeCnName',item.cnName)
                             this.$set(row,'feeEnName',item.enName)
                             this.$set(row,'feeId',item.id)

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

@@ -228,7 +228,7 @@
                                                              @billsDetailfun="billsDetailfun(form.id)">
                                     </entrustment-lnformation>
                                 </el-tab-pane>
-                                <el-tab-pane label="配箱处理" name="second">
+                                <el-tab-pane label="配箱信息" name="second">
                                     <DistributionBox :assemblyForm="form" :detailData="detailData"
                                                      :pleasereviewType="pleasereviewType"
                                                      @billsDetailfun="billsDetailfun(form.id)">

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

@@ -313,7 +313,9 @@ import {
                     quantityNum += Number(item.number)
                 }
             }
-            this.assemblyForm.quantity = quantityNum
+            if (quantityNum != 0) {
+                this.assemblyForm.quantity = quantityNum
+            }
         },
         // 毛重失焦事件
         grossWeightBlur(row){
@@ -323,7 +325,9 @@ import {
                     grossWeightNum += Number(item.grossWeight)
                 }
             }
-            this.assemblyForm.grossWeight = grossWeightNum
+            if (grossWeightNum != 0) {
+                this.assemblyForm.grossWeight = grossWeightNum
+            }
         },
         // 尺码失焦事件
         measurementBlur(row){
@@ -333,7 +337,9 @@ import {
                     measurementNum += Number(item.measurement)
                 }
             }
-            this.assemblyForm.measurement = measurementNum
+            if (measurementNum != 0) {
+                this.assemblyForm.measurement = measurementNum
+            }
         },
         // 一键编辑
         oneTouchEditefun(){

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

@@ -614,7 +614,7 @@
 
 <script>
     import SearchQuery from "@/components/iosbasic-data/searchquery.vue";
-    import {getBcorpsList} from "@/api/iosBasicData/bcorps";
+    import {getBcorpsDetail, getBcorpsList} from "@/api/iosBasicData/bcorps";
     import {bfeesList} from "@/api/iosBasicData/bfees";
     import {getBunitsPage} from "@/api/iosBasicData/bunits";
     import {bcurrencyGetExrate} from "@/api/iosBasicData/rateManagement";
@@ -1751,7 +1751,7 @@
                 })
             },
             // 客户的回调
-            corpChange(value,name,row,dc) {
+            async corpChange(value,name,row,dc) {
                 if (name == 'corpCnName') {
                     if (!value) {
                         this.$set(row,'corpCnName','')
@@ -1779,6 +1779,27 @@
                     }
                     for(let item of this.feeCnNameData) {
                         if (item.cnName == value){
+                            if (value == 'PS') {
+                                // 查询当前客户的 ps规则是否等于零和null
+                                const psres = await getBcorpsDetail(this.assemblyForm.corpId)
+                                if (psres.data.data.psRate) {
+                                    this.$confirm('PS规则为零不能添加费用', {
+                                        confirmButtonText: "确定",
+                                        cancelButtonText: "取消",
+                                        type: "warning"
+                                    })
+                                    this.$set(row,'feeCnName','')
+                                    this.$set(row,'feeEnName','')
+                                    this.$set(row,'feeId','')
+                                    this.$set(row,'feeCode','')
+                                    // 核算要素
+                                    this.$set(row,'elementsId','')
+                                    this.$set(row,'elementsCnName','')
+                                    this.$set(row,'elementsCode','')
+                                    this.$set(row,'elementsEnName','')
+                                    return
+                                }
+                            }
                             this.$set(row,'feeCnName',item.cnName)
                             this.$set(row,'feeEnName',item.enName)
                             this.$set(row,'feeId',item.id)

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

@@ -230,7 +230,7 @@
                                                              @billsDetailfun="billsDetailfun(form.id)">
                                     </entrustment-lnformation>
                                 </el-tab-pane>
-                                <el-tab-pane label="配箱处理" name="second">
+                                <el-tab-pane label="配箱信息" name="second">
                                     <DistributionBox :assemblyForm="form" :detailData="detailData"
                                                      :pleasereviewType="pleasereviewType"
                                                      @billsDetailfun="billsDetailfun(form.id)">

src/views/iosBasicData/aeamends/assembly/amendsCostdetails.vue

@@ -204,7 +204,7 @@
 </template>
 
 <script>
-    import {getBcorpsList} from "@/api/iosBasicData/bcorps";
+import {getBcorpsDetail, getBcorpsList} from "@/api/iosBasicData/bcorps";
     import {bfeesList} from "@/api/iosBasicData/bfees";
     import {getBaccelementsList} from "@/api/iosBasicData/baccelements";
     import {bcurrencyGetExrate} from "@/api/iosBasicData/rateManagement";
@@ -480,7 +480,7 @@
                 })
             },
             // 下拉的回调
-            corpChange(value,name,row) {
+            async corpChange(value,name,row) {
                 if (name == 'corpCnName') {
                     if (!value) {
                         this.$set(row,'corpCnName','')
@@ -508,6 +508,27 @@
                     }
                     for(let item of this.feeCnNameData) {
                         if (item.cnName == value){
+                            if (value == 'PS') {
+                                // 查询当前客户的 ps规则是否等于零和null
+                                const psres = await getBcorpsDetail(this.form.corpId)
+                                if (psres.data.data.psRate) {
+                                    this.$confirm('PS规则为零不能添加费用', {
+                                        confirmButtonText: "确定",
+                                        cancelButtonText: "取消",
+                                        type: "warning"
+                                    })
+                                    this.$set(row,'feeCnName','')
+                                    this.$set(row,'feeEnName','')
+                                    this.$set(row,'feeId','')
+                                    this.$set(row,'feeCode','')
+                                    // 核算要素
+                                    this.$set(row,'elementsId','')
+                                    this.$set(row,'elementsCnName','')
+                                    this.$set(row,'elementsCode','')
+                                    this.$set(row,'elementsEnName','')
+                                    return
+                                }
+                            }
                             this.$set(row,'feeCnName',item.cnName)
                             this.$set(row,'feeEnName',item.enName)
                             this.$set(row,'feeId',item.id)

src/views/iosBasicData/aiamends/assembly/amendsCostdetails.vue

@@ -204,7 +204,7 @@
 </template>
 
 <script>
-    import {getBcorpsList} from "@/api/iosBasicData/bcorps";
+import {getBcorpsDetail, getBcorpsList} from "@/api/iosBasicData/bcorps";
     import {bfeesList} from "@/api/iosBasicData/bfees";
     import {getBaccelementsList} from "@/api/iosBasicData/baccelements";
     import {bcurrencyGetExrate} from "@/api/iosBasicData/rateManagement";
@@ -480,7 +480,7 @@
                 })
             },
             // 下拉的回调
-            corpChange(value,name,row) {
+            async corpChange(value,name,row) {
                 if (name == 'corpCnName') {
                     if (!value) {
                         this.$set(row,'corpCnName','')
@@ -508,6 +508,27 @@
                     }
                     for(let item of this.feeCnNameData) {
                         if (item.cnName == value){
+                            if (value == 'PS') {
+                                // 查询当前客户的 ps规则是否等于零和null
+                                const psres = await getBcorpsDetail(this.form.corpId)
+                                if (psres.data.data.psRate) {
+                                    this.$confirm('PS规则为零不能添加费用', {
+                                        confirmButtonText: "确定",
+                                        cancelButtonText: "取消",
+                                        type: "warning"
+                                    })
+                                    this.$set(row,'feeCnName','')
+                                    this.$set(row,'feeEnName','')
+                                    this.$set(row,'feeId','')
+                                    this.$set(row,'feeCode','')
+                                    // 核算要素
+                                    this.$set(row,'elementsId','')
+                                    this.$set(row,'elementsCnName','')
+                                    this.$set(row,'elementsCode','')
+                                    this.$set(row,'elementsEnName','')
+                                    return
+                                }
+                            }
                             this.$set(row,'feeCnName',item.cnName)
                             this.$set(row,'feeEnName',item.enName)
                             this.$set(row,'feeId',item.id)

src/views/iosBasicData/bcorps/detailsPage.vue

@@ -270,7 +270,7 @@
               <el-col :span="8">
                 <el-form-item label="PS规则" prop="psRate">
                    <el-input v-model="formData.psRate" placeholder="请输入PS规则"
-                             clearable :style="{ width: '100%' }" @input="psRateValid(formData.psRate)" />
+                             clearable :style="{ width: '100%' }" @input="psRateValid(formData.psRate)" @blur="psRateBlue" />
                   <!--<el-input-number v-model="formData.psRate" controls-position="right" @change="handleChange" :min="0"-->
                   <!--  :precision="2" :step="1" :style="{ width: '100%' }"></el-input-number>-->
                   <!--  <search-query :datalist="psRateData"-->
@@ -1137,10 +1137,15 @@ export default {
           if (reg.test(inputContent)) {
               this.formData.psRate = inputContent;
           } else {
-              if (inputContent != "0.")
+              if (inputContent != "0.") {
                   this.formData.psRate = "";
+              }
           }
       },
+      // ps 规则失去焦点触发
+      psRateBlue(){
+          this.formData.psRate = Number(this.formData.psRate).toFixed(2);
+      },
       // 详情
       getBcorpsDetailfun(id){
           getBcorpsDetail(id).then(res => {

src/views/iosBasicData/fininvoices/fininvoicesDetails.vue

@@ -7,13 +7,13 @@
                 </el-button>
             </div>
             <div class="add-customer-btn">
-                <el-button  size="small" type="warning" plain  style="margin-right: 8px" :disabled="!form.id" v-if="form.status == 3"
+                <el-button  size="small" type="warning" plain  style="margin-right: 8px" :disabled="!form.id || editPower" v-if="form.status == 3"
                             :loading="saveLoading" @click="fininvoicesRevokeFinInvoicesfun">撤销开票
                 </el-button>
-                <el-button  size="small" type="success" plain  style="margin-right: 8px" :disabled="!form.id" v-else
+                <el-button  size="small" type="success" plain  style="margin-right: 8px" :disabled="!form.id || editPower" v-else
                             :loading="saveLoading" @click="editCustomer('开票')">确认开票
                 </el-button>
-                <el-button  size="small" type="primary" :disabled="statusType" style="margin-right: 8px" v-if="editSave"
+                <el-button  size="small" type="primary" :disabled="statusType || editPower" style="margin-right: 8px" v-if="editSave"
                             :loading="saveLoading" @click="editHandle">编 辑
                 </el-button>
                 <el-button  size="small" type="primary" :disabled="statusType" style="margin-right: 8px" v-else
@@ -640,6 +640,9 @@ export default {
                     {required: true, message: '请输入所属发票币别', trigger: 'blur'},
                 ],
             },
+            roleName:[], // 当前的角色权限
+            saberUserInfo:{}, // 当前登录人信息
+            editPower:false, // 当前是否可以编辑
         }
     },
     props:{
@@ -664,6 +667,9 @@ export default {
         },
     },
     created() {
+        this.roleName =  localStorage.getItem('roleName').split(',')
+        // 获取当前登录人个人信息
+        this.saberUserInfo = JSON.parse(localStorage.getItem('saber-userInfo')).content
         if (!this.form.id) {
             getRateList({current:1,size:30}).then(res=>{
                 for (let item of res.data.data.records) {
@@ -1191,6 +1197,11 @@ export default {
             this.pageLoading = true
             fininvoicesDetail(id).then(res=>{
                 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.editPower = true
+                }else {
+                    this.editPower = false
+                }
                 this.form.businessTypes = this.form.businessTypes?this.form.businessTypes.split(','):[] // 业务类型转换成数组显示
                 this.tableData = this.form.finInvoicesItemsList.map(item=>{
                     if (item.currentCurCode == 'CNY') {

src/views/iosBasicData/fininvoices/index.vue

@@ -40,12 +40,11 @@
               <template slot="menu" slot-scope="{row}">
                   <el-button type="text"
                              size="small"
-                             :disabled="saberUserInfo.role_name.indexOf('允许修改他人业务') == -1?saberUserInfo.user_id != row.createUser:false"
                              @click="editFun(row)">编辑
                   </el-button>
                   <el-button type="text"
                              size="small"
-                             :disabled="saberUserInfo.role_name.indexOf('允许修改他人业务') == -1?saberUserInfo.user_id != row.createUser:false"
+                             :disabled="saberUserInfo.role_name.indexOf('admin') == -1?saberUserInfo.role_name.indexOf('允许修改他人业务') == -1?saberUserInfo.user_id != row.createUser:false:false"
                              @click="rowDel(row)">删除
                   </el-button>
               </template>
@@ -60,10 +59,8 @@
               </template>
               <template slot-scope="{ row }" slot="billNo">
                   <span class="pointerClick"
-                        v-if="saberUserInfo.role_name.indexOf('允许修改他人业务') == -1?saberUserInfo.user_id == row.createUser:true"
                         @click="editFun(row)" >{{row.billNo}}
                   </span>
-                  <span v-else>{{row.billNo}}</span>
               </template>
           </avue-crud>
       </basic-container>

src/views/iosBasicData/fininvoicesApplyfor/fininvoicesDetails.vue

@@ -13,13 +13,13 @@
                 <el-button size="small" style="margin-right: 8px" v-if="roleName.indexOf('admin') != -1"
                            :loading="saveLoading" :disabled="!form.id" @click="DesignreportDialog = true" >报表设计
                 </el-button>
-                <el-button  size="small" type="warning" plain  style="margin-right: 8px" :disabled="!form.id" v-if="form.status == 3"
+                <el-button  size="small" type="warning" plain  style="margin-right: 8px" :disabled="!form.id || editPower" v-if="form.status == 3"
                             :loading="saveLoading" @click="revokeFinInvoicesApprovefun">撤销
                 </el-button>
-                <el-button  size="small" type="success" plain  style="margin-right: 8px" :disabled="!form.id" v-else
+                <el-button  size="small" type="success" plain  style="margin-right: 8px" :disabled="!form.id || editPower" v-else
                             :loading="saveLoading" @click="editCustomer('提交')">提交
                 </el-button>
-                <el-button  size="small" type="primary" :disabled="statusType" style="margin-right: 8px" v-if="editSave"
+                <el-button  size="small" type="primary" :disabled="statusType || editPower" style="margin-right: 8px" v-if="editSave"
                             :loading="saveLoading" @click="editHandle">编 辑
                 </el-button>
                 <el-button  size="small" type="primary" :disabled="statusType" style="margin-right: 8px" v-else
@@ -657,6 +657,8 @@ export default {
                     ],
                 },
                 roleName:[], // 当前的角色权限
+                saberUserInfo:{}, // 当前登录人信息
+                editPower:false, // 当前是否可以编辑
             }
         },
         props:{
@@ -682,6 +684,8 @@ export default {
         },
          created() {
              this.roleName =  localStorage.getItem('roleName').split(',')
+             // 获取当前登录人个人信息
+             this.saberUserInfo = JSON.parse(localStorage.getItem('saber-userInfo')).content
             if (!this.form.id) {
                 getRateList({current:1,size:30}).then(res=>{
                     for (let item of res.data.data.records) {
@@ -1251,6 +1255,11 @@ export default {
                 this.pageLoading = true
                 fininvoicesDetail(id).then(res=>{
                     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.editPower = true
+                    }else {
+                        this.editPower = false
+                    }
                     this.form.businessTypes = this.form.businessTypes?this.form.businessTypes.split(','):[] // 业务类型转换成数组显示
                     this.tableData = this.form.finInvoicesItemsList.map(item=>{
                         if (item.currentCurCode == 'CNY') {

src/views/iosBasicData/fininvoicesApplyfor/index.vue

@@ -40,12 +40,13 @@
               <template slot="menu" slot-scope="{row}">
                   <el-button type="text"
                              size="small"
-                             :disabled="saberUserInfo.role_name.indexOf('允许修改他人业务') == -1?saberUserInfo.user_id != row.createUser:false"
                              @click="editFun(row)">编辑
                   </el-button>
+                  <!--:disabled="saberUserInfo.role_name.indexOf('允许修改他人业务') == -1?saberUserInfo.user_id != row.createUser:false"-->
                   <el-button type="text"
                              size="small"
-                             :disabled="row.status == 3 || (saberUserInfo.role_name.indexOf('允许修改他人业务') == -1?saberUserInfo.user_id != row.createUser:false)"
+                             :disabled="row.status == 3
+                             || (saberUserInfo.role_name.indexOf('admin') == -1?saberUserInfo.role_name.indexOf('允许修改他人业务') == -1?saberUserInfo.user_id != row.createUser:false:false)"
                              @click="rowDel(row)">删除
                   </el-button>
               </template>
@@ -54,10 +55,8 @@
               </template>
               <template slot-scope="{ row }" slot="billNo">
                   <span class="pointerClick"
-                        v-if="saberUserInfo.role_name.indexOf('允许修改他人业务') == -1?saberUserInfo.user_id == row.createUser:true"
                         @click="editFun(row)" >{{row.billNo}}
                   </span>
-                  <span v-else>{{row.billNo}}</span>
               </template>
               <template slot-scope="{ row }" slot="invoiceDate">
                   {{row.invoiceDate?row.invoiceDate.slice(0,10):''}}

src/views/iosBasicData/fininvoicesOutput/fininvoicesDetails.vue

@@ -7,13 +7,13 @@
                 </el-button>
             </div>
             <div class="add-customer-btn">
-                <el-button  size="small" type="warning" plain  style="margin-right: 8px" :disabled="!form.id" v-if="form.status == 3"
+                <el-button  size="small" type="warning" plain  style="margin-right: 8px" :disabled="!form.id || editPower" v-if="form.status == 3"
                             :loading="saveLoading" @click="fininvoicesRevokeFinInvoicesfun">撤销开票
                 </el-button>
-                <el-button  size="small" type="success" plain  style="margin-right: 8px" :disabled="!form.id" v-else
+                <el-button  size="small" type="success" plain  style="margin-right: 8px" :disabled="!form.id || editPower" v-else
                             :loading="saveLoading" @click="editCustomer('开票')">确认开票
                 </el-button>
-                <el-button  size="small" type="primary" :disabled="statusType" style="margin-right: 8px" v-if="editSave"
+                <el-button  size="small" type="primary" :disabled="statusType || editPower" style="margin-right: 8px" v-if="editSave"
                             :loading="saveLoading" @click="editHandle">编 辑
                 </el-button>
                 <el-button  size="small" type="primary" :disabled="statusType" style="margin-right: 8px" v-else
@@ -640,6 +640,9 @@ export default {
                     {required: true, message: '请输入所属发票币别', trigger: 'blur'},
                 ],
             },
+            roleName:[], // 当前的角色权限
+            saberUserInfo:{}, // 当前登录人信息
+            editPower:false, // 当前是否可以编辑
         }
     },
     props:{
@@ -664,6 +667,9 @@ export default {
         },
     },
     created() {
+        this.roleName =  localStorage.getItem('roleName').split(',')
+        // 获取当前登录人个人信息
+        this.saberUserInfo = JSON.parse(localStorage.getItem('saber-userInfo')).content
         if (!this.form.id) {
             getRateList({current:1,size:30}).then(res=>{
                 for (let item of res.data.data.records) {
@@ -1189,6 +1195,11 @@ export default {
             this.pageLoading = true
             fininvoicesDetail(id).then(res=>{
                 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.editPower = true
+                }else {
+                    this.editPower = false
+                }
                 this.form.businessTypes = this.form.businessTypes?this.form.businessTypes.split(','):[] // 业务类型转换成数组显示
                 this.tableData = this.form.finInvoicesItemsList.map(item=>{
                     if (item.currentCurCode == 'CNY') {

src/views/iosBasicData/fininvoicesOutput/index.vue

@@ -76,21 +76,20 @@
               <template slot="menu" slot-scope="{row}">
                   <el-button type="text"
                              size="small"
-                             :disabled="saberUserInfo.role_name.indexOf('允许修改他人业务') == -1?saberUserInfo.user_id != row.createUser:false"
                              @click="editFun(row)">编辑
                   </el-button>
+                  <!--:disabled="saberUserInfo.role_name.indexOf('允许修改他人业务') == -1?saberUserInfo.user_id != row.createUser:false"-->
                   <el-button type="text"
                              size="small"
-                             :disabled="row.status == 3 || (saberUserInfo.role_name.indexOf('允许修改他人业务') == -1?saberUserInfo.user_id != row.createUser:false)"
+                             :disabled="row.status == 3
+                             || (saberUserInfo.role_name.indexOf('admin') == -1?saberUserInfo.role_name.indexOf('允许修改他人业务') == -1?saberUserInfo.user_id != row.createUser:false:false)"
                              @click="rowDel(row)">删除
                   </el-button>
               </template>
               <template slot-scope="{ row }" slot="billNo">
                   <span class="pointerClick"
-                        v-if="saberUserInfo.role_name.indexOf('允许修改他人业务') == -1?saberUserInfo.user_id == row.createUser:true"
                         @click="editFun(row)" >{{row.billNo}}
                   </span>
-                  <span v-else>{{row.billNo}}</span>
               </template>
               <template slot-scope="{ row }" slot="billDate">
                   {{row.billDate?row.billDate.slice(0,10):''}}
@@ -114,6 +113,7 @@ import fininvoicesDetails from "@/views/iosBasicData/fininvoicesOutput/fininvoic
   import {mapGetters} from "vuex";
 import finstlbillsDetails from "@/views/iosBasicData/finstlbills/finstlbillsDetails.vue";
 import {getRateList} from "@/api/iosBasicData/rateManagement";
+import fa from "element-ui/src/locale/lang/fa";
 
   export default {
       components:{finstlbillsDetails, fininvoicesDetails},
@@ -726,6 +726,9 @@ import {getRateList} from "@/api/iosBasicData/rateManagement";
     },
     watch:{},
     computed: {
+        fa() {
+            return fa
+        },
       ...mapGetters(["permission"]),
       permissionList() {
         return {

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

@@ -203,7 +203,7 @@
                                         </el-row>
                                     </el-form-item>
                                 </el-col>
-                                <el-col :span="7">
+                                <el-col :span="5">
                                     <el-form-item label="企业名称:" prop="enterpriseCnName" label-width="80px">
                                         <search-query :datalist="enterpriseData"
                                                       :selectValue="form.enterpriseCnName"
@@ -220,7 +220,7 @@
                                         </search-query>
                                     </el-form-item>
                                 </el-col>
-                                <el-col :span="7">
+                                <el-col :span="5">
                                     <el-form-item label="企业海关编码:" prop="billNo" label-width="100px">
                                         <el-input style="width: 100%;" v-model="form.enterpriseCode"
                                                   size="small" autocomplete="off" :disabled="detailData.seeDisabled"
@@ -228,6 +228,23 @@
                                     </el-form-item>
                                 </el-col>
                                 <el-col :span="4">
+                                    <el-form-item label="所属团队:" prop="enterpriseCnName" label-width="70px">
+                                        <search-query :datalist="teamData"
+                                                      :selectValue="form.teamName"
+                                                      :filterable="true"
+                                                      :clearable="true"
+                                                      :remote="true"
+                                                      :buttonIf="false"
+                                                      :disabled="detailData.seeDisabled"
+                                                      placeholder="请选择所属团队"
+                                                      :forParameter="{key:'id',label:'postName',value:'postName'}"
+                                                      @remoteMethod="postSelectByUserfun"
+                                                      @corpChange="corpChange($event,'teamName')"
+                                                      @corpFocus="postSelectByUserfun">
+                                        </search-query>
+                                    </el-form-item>
+                                </el-col>
+                                <el-col :span="4">
                                     <el-form-item label="订舱号" prop="bookingNo" label-width="70px">
                                         <el-input style="width: 100%;" v-model="form.bookingNo"
                                                   size="small" autocomplete="off" :disabled="detailData.seeDisabled"
@@ -637,6 +654,7 @@
     import reports from "@/views/iosBasicData/SeafreightExportF/bills/assembly/reports.vue";
     import {reportsGetReportData} from "@/api/iosBasicData/reports";
     import {getList as getreportsList} from "@/api/iosBasicData/reports";
+    import { postSelectByUser } from '@/api/iosBasicData/bills'
 
     export default {
         components: {reports, reportformsList, reportContainer, feecenter, SearchQuery,TableDetails},
@@ -689,6 +707,7 @@
                 srcForParameter:{ key:'id', label:'title', value:'title'}, // 来源详情配置项数据
                 declarationMethodData:[], // 申报方式字典数据
                 enterpriseData:[], // 企业数据
+                teamData:[], // 所属团队
                 vesselData:[], // 船名数据
                 tradeMethodData:[], // 贸易条款数据
                 destinationCountryData:[], // 运抵国数据
@@ -752,6 +771,7 @@
             this.form.createUser = this.saberUserInfo.user_id
             this.form.createUserName = this.saberUserInfo.user_name
             this.srcTypeWorkDictsfun() // 业务来源
+            this.postSelectByUserfun() // 所属团队
         },
         methods:{
             // 报表预览
@@ -1300,6 +1320,17 @@
                     this.packingUnitData = res.data.data.records
                 })
             },
+            // 获取所属岗位数据
+            postSelectByUserfun(){
+                postSelectByUser(JSON.parse(localStorage.getItem("saber-userInfo")).content.user_id).then(res=>{
+                    this.teamData = res.data.data
+                    // 判断是否有值，没有的话默认第一个
+                    if (!this.form.teamName) {
+                        this.$set(this.form,'teamId',res.data.data[0].id)
+                        this.$set(this.form,'teamName',res.data.data[0].postName)
+                    }
+                })
+            },
             //返回列表
             backToList() {
                 this.$emit('goBack')

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

@@ -203,7 +203,7 @@
                                         </el-row>
                                     </el-form-item>
                                 </el-col>
-                                <el-col :span="7">
+                                <el-col :span="5">
                                     <el-form-item label="企业名称:" prop="enterpriseCnName" label-width="80px">
                                         <search-query :datalist="enterpriseData"
                                                       :selectValue="form.enterpriseCnName"
@@ -220,7 +220,7 @@
                                         </search-query>
                                     </el-form-item>
                                 </el-col>
-                                <el-col :span="7">
+                                <el-col :span="5">
                                     <el-form-item label="企业海关编码:" prop="billNo" label-width="100px">
                                         <el-input style="width: 100%;" v-model="form.enterpriseCode"
                                                   size="small" autocomplete="off" :disabled="detailData.seeDisabled"
@@ -228,6 +228,23 @@
                                     </el-form-item>
                                 </el-col>
                                 <el-col :span="4">
+                                    <el-form-item label="所属团队:" prop="enterpriseCnName" label-width="70px">
+                                        <search-query :datalist="teamData"
+                                                      :selectValue="form.teamName"
+                                                      :filterable="true"
+                                                      :clearable="true"
+                                                      :remote="true"
+                                                      :buttonIf="false"
+                                                      :disabled="detailData.seeDisabled"
+                                                      placeholder="请选择所属团队"
+                                                      :forParameter="{key:'id',label:'postName',value:'postName'}"
+                                                      @remoteMethod="postSelectByUserfun"
+                                                      @corpChange="corpChange($event,'teamName')"
+                                                      @corpFocus="postSelectByUserfun">
+                                        </search-query>
+                                    </el-form-item>
+                                </el-col>
+                                <el-col :span="4">
                                     <el-form-item label="订舱号" prop="bookingNo" label-width="70px">
                                         <el-input style="width: 100%;" v-model="form.bookingNo"
                                                   size="small" autocomplete="off" :disabled="detailData.seeDisabled"
@@ -636,6 +653,7 @@
     import reports from "@/views/iosBasicData/SeafreightExportF/bills/assembly/reports.vue";
     import {reportsGetReportData} from "@/api/iosBasicData/reports";
     import {getList as getreportsList} from "@/api/iosBasicData/reports";
+    import { postSelectByUser } from '@/api/iosBasicData/bills'
 
     export default {
         components: {reports, reportformsList, reportContainer, feecenter, SearchQuery,TableDetails},
@@ -689,6 +707,7 @@
                 srcForParameter:{ key:'id', label:'title', value:'title'}, // 来源详情配置项数据
                 declarationMethodData:[], // 申报方式字典数据
                 enterpriseData:[], // 企业数据
+                teamData:[], // 所属团队
                 vesselData:[], // 船名数据
                 tradeMethodData:[], // 贸易条款数据
                 destinationCountryData:[], // 运抵国数据
@@ -752,6 +771,7 @@
             this.form.createUser = this.saberUserInfo.user_id
             this.form.createUserName = this.saberUserInfo.user_name
             this.srcTypeWorkDictsfun() // 业务来源
+            this.postSelectByUserfun() // 所属团队
         },
         methods:{
             // 报表预览
@@ -1303,6 +1323,17 @@
                     this.packingUnitData = res.data.data.records
                 })
             },
+            // 获取所属岗位数据
+            postSelectByUserfun(){
+                postSelectByUser(JSON.parse(localStorage.getItem("saber-userInfo")).content.user_id).then(res=>{
+                    this.teamData = res.data.data
+                    // 判断是否有值，没有的话默认第一个
+                    if (!this.form.teamName) {
+                        this.$set(this.form,'teamId',res.data.data[0].id)
+                        this.$set(this.form,'teamName',res.data.data[0].postName)
+                    }
+                })
+            },
             //返回列表
             backToList() {
                 this.$emit('goBack')

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

@@ -772,6 +772,7 @@
             this.form.createUser = this.saberUserInfo.user_id
             this.form.createUserName = this.saberUserInfo.user_name
             this.srcTypeWorkDictsfun() // 业务来源
+            this.postSelectByUserfun() // 所属团队
         },
         methods:{
             // 报表预览
@@ -1326,6 +1327,11 @@
             postSelectByUserfun(){
                 postSelectByUser(JSON.parse(localStorage.getItem("saber-userInfo")).content.user_id).then(res=>{
                     this.teamData = res.data.data
+                    // 判断是否有值，没有的话默认第一个
+                    if (!this.form.teamName) {
+                        this.$set(this.form,'teamId',res.data.data[0].id)
+                        this.$set(this.form,'teamName',res.data.data[0].postName)
+                    }
                 })
             },
             // 预览报表

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

@@ -770,6 +770,7 @@
             this.form.createUser = this.saberUserInfo.user_id
             this.form.createUserName = this.saberUserInfo.user_name
             this.srcTypeWorkDictsfun() // 业务来源
+            this.postSelectByUserfun() // 所属团队
         },
         methods:{
             // 报表预览
@@ -1322,6 +1323,11 @@
             postSelectByUserfun(){
                 postSelectByUser(JSON.parse(localStorage.getItem("saber-userInfo")).content.user_id).then(res=>{
                     this.teamData = res.data.data
+                    // 判断是否有值，没有的话默认第一个
+                    if (!this.form.teamName) {
+                        this.$set(this.form,'teamId',res.data.data[0].id)
+                        this.$set(this.form,'teamName',res.data.data[0].postName)
+                    }
                 })
             },
             //返回列表

src/views/iosBasicData/seamends/assembly/amendsCostdetails.vue

@@ -205,7 +205,7 @@
 </template>
 
 <script>
-    import {getBcorpsList} from "@/api/iosBasicData/bcorps";
+import {getBcorpsDetail, getBcorpsList} from "@/api/iosBasicData/bcorps";
     import {bfeesList} from "@/api/iosBasicData/bfees";
     import {getBaccelementsList} from "@/api/iosBasicData/baccelements";
     import {bcurrencyGetExrate} from "@/api/iosBasicData/rateManagement";
@@ -490,7 +490,7 @@
                 })
             },
             // 下拉的回调
-            corpChange(value,name,row) {
+            async corpChange(value,name,row) {
                 if (name == 'corpCnName') {
                     if (!value) {
                         this.$set(row,'corpCnName','')
@@ -518,6 +518,27 @@
                     }
                     for(let item of this.feeCnNameData) {
                         if (item.cnName == value){
+                            if (value == 'PS') {
+                                // 查询当前客户的 ps规则是否等于零和null
+                                const psres = await getBcorpsDetail(this.form.corpId)
+                                if (psres.data.data.psRate) {
+                                    this.$confirm('PS规则为零不能添加费用', {
+                                        confirmButtonText: "确定",
+                                        cancelButtonText: "取消",
+                                        type: "warning"
+                                    })
+                                    this.$set(row,'feeCnName','')
+                                    this.$set(row,'feeEnName','')
+                                    this.$set(row,'feeId','')
+                                    this.$set(row,'feeCode','')
+                                    // 核算要素
+                                    this.$set(row,'elementsId','')
+                                    this.$set(row,'elementsCnName','')
+                                    this.$set(row,'elementsCode','')
+                                    this.$set(row,'elementsEnName','')
+                                    return
+                                }
+                            }
                             this.$set(row,'feeCnName',item.cnName)
                             this.$set(row,'feeEnName',item.enName)
                             this.$set(row,'feeId',item.id)

src/views/iosBasicData/siamends/assembly/amendsCostdetails.vue

@@ -204,7 +204,7 @@
 </template>
 
 <script>
-    import {getBcorpsList} from "@/api/iosBasicData/bcorps";
+import {getBcorpsDetail, getBcorpsList} from "@/api/iosBasicData/bcorps";
     import {bfeesList} from "@/api/iosBasicData/bfees";
     import {getBaccelementsList} from "@/api/iosBasicData/baccelements";
     import {bcurrencyGetExrate} from "@/api/iosBasicData/rateManagement";
@@ -484,7 +484,7 @@
                 })
             },
             // 下拉的回调
-            corpChange(value,name,row) {
+            async corpChange(value,name,row) {
                 if (name == 'corpCnName') {
                     if (!value) {
                         this.$set(row,'corpCnName','')
@@ -512,6 +512,27 @@
                     }
                     for(let item of this.feeCnNameData) {
                         if (item.cnName == value){
+                            if (value == 'PS') {
+                                // 查询当前客户的 ps规则是否等于零和null
+                                const psres = await getBcorpsDetail(this.form.corpId)
+                                if (psres.data.data.psRate) {
+                                    this.$confirm('PS规则为零不能添加费用', {
+                                        confirmButtonText: "确定",
+                                        cancelButtonText: "取消",
+                                        type: "warning"
+                                    })
+                                    this.$set(row,'feeCnName','')
+                                    this.$set(row,'feeEnName','')
+                                    this.$set(row,'feeId','')
+                                    this.$set(row,'feeCode','')
+                                    // 核算要素
+                                    this.$set(row,'elementsId','')
+                                    this.$set(row,'elementsCnName','')
+                                    this.$set(row,'elementsCode','')
+                                    this.$set(row,'elementsEnName','')
+                                    return
+                                }
+                            }
                             this.$set(row,'feeCnName',item.cnName)
                             this.$set(row,'feeEnName',item.enName)
                             this.$set(row,'feeId',item.id)