货代bug 2024-2-18

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

@@ -516,7 +516,7 @@
             :close-on-click-modal="false"
             :before-close="handleClose">
             <span slot="title">
-                <el-button type="primary" size="mini" >导出</el-button>
+                <el-button type="primary" size="mini" @click.stop="exportfun" >导出</el-button>
             </span>
             <div style="padding-bottom: 30px;">
                 <el-table
@@ -619,6 +619,7 @@
     import reportformsList from "@/views/iosBasicData/AirtransportExport/bills/assembly/reportformsList.vue";
     import {getList as reportsList} from "@/api/iosBasicData/reports";
     import {dateFormat} from "@/util/date";
+    import {getToken} from "@/util/auth";
 
     export default {
         components: {reportContainer, SearchQuery,reportformsList},
@@ -690,6 +691,7 @@
                 corpVisible:false, // 往来单位弹窗
                 corpDialog:[], // 往来单位数据
                 dcDialogType:'', // 往来单位弹窗dc判断
+                corpRow:{}, // 往来单位弹窗数据
                 optionD:{},
                 optionDBack:{
                     stripe:true,
@@ -1108,6 +1110,17 @@
             this.paymodeWorkDictsfun() // 获取预付/到付数据
         },
         methods:{
+            // 弹窗导出
+            exportfun(){
+                const routeData = this.$router.resolve({
+                    path: '/api/blade-los/finaccbills/listFeeCountByCorpExport',//跳转目标窗口的地址
+                    query: {
+                        dc: this.corpRow.dc,
+                        corpId:this.corpRow.corpId
+                    }
+                })
+                window.open(routeData.href.slice(1, routeData.href.length) + '&' + `${this.website.tokenHeader}=${getToken()}`);
+            },
             // 费用弹窗里的打印
             dialogPreviewfun(row){
                 if (!this.reportformsObj.id){
@@ -1256,6 +1269,7 @@
                     corpId:row.corpId,
                     dc:row.dc
                 }).then(res=>{
+                    this.corpRow = row
                     this.dcDialogType = row.dc
                     this.corpDialog = res.data.data
                 })
@@ -2536,4 +2550,10 @@
         text-align: center;
         padding: 4px 0;
     }
+    .textoverflow {
+        width: 100%;
+        overflow: hidden;
+        white-space: nowrap;
+        text-overflow: ellipsis;
+    }
 </style>

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

@@ -1830,7 +1830,8 @@ import { getDeptTree } from "@/api/system/dept";
         // 弹窗表格获取数据
         mawbOnLoad(page, params = {}){
             this.mawbloading = true;
-            aeabillsList(page.currentPage, page.pageSize, Object.assign(params, this.mawbQuery)).then(res=>{
+            aeabillsList(page.currentPage, page.pageSize,
+                {...Object.assign(params, this.mawbQuery),businessType:'AE'}).then(res=>{
                 const data = res.data.data;
                 this.mawbPage.total = data.total;
                 this.mawbData = data.records;

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

@@ -516,7 +516,7 @@
             :close-on-click-modal="false"
             :before-close="handleClose">
             <span slot="title">
-                <el-button type="primary" size="mini" >导出</el-button>
+                <el-button type="primary" size="mini" @click.stop="exportfun" >导出</el-button>
             </span>
             <div style="padding-bottom: 30px;">
                 <el-table
@@ -624,6 +624,7 @@
     import reportformsList from "@/views/iosBasicData/AirtransportImport/bills/assembly/reportformsList.vue";
     import {getList as reportsList} from "@/api/iosBasicData/reports";
     import {dateFormat} from "@/util/date";
+    import {getToken} from "@/util/auth";
 
     export default {
         components: {reportContainer, SearchQuery,reportformsList},
@@ -696,6 +697,7 @@
                 corpVisible:false, // 往来单位弹窗
                 corpDialog:[], // 往来单位弹窗数据
                 dcDialogType:'', // 往来单位弹窗dc判断
+                corpRow:{}, // 往来单位弹窗数据
                 optionD:{},
                 optionDBack:{
                     stripe:true,
@@ -1114,6 +1116,17 @@
             this.paymodeWorkDictsfun() // 获取预付/到付数据
         },
         methods:{
+            // 弹窗导出
+            exportfun(){
+                const routeData = this.$router.resolve({
+                    path: '/api/blade-los/finaccbills/listFeeCountByCorpExport',//跳转目标窗口的地址
+                    query: {
+                        dc: this.corpRow.dc,
+                        corpId:this.corpRow.corpId
+                    }
+                })
+                window.open(routeData.href.slice(1, routeData.href.length) + '&' + `${this.website.tokenHeader}=${getToken()}`);
+            },
             // 费用弹窗里的打印
             dialogPreviewfun(row){
                 if (!this.reportformsObj.id){
@@ -1262,6 +1275,7 @@
                     corpId:row.corpId,
                     dc:row.dc
                 }).then(res=>{
+                    this.corpRow = row
                     this.dcDialogType = row.dc
                     this.corpDialog = res.data.data
                 })

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

@@ -1830,7 +1830,8 @@ import { getDeptTree } from "@/api/system/dept";
         // 弹窗表格获取数据
         mawbOnLoad(page, params = {}){
             this.mawbloading = true;
-            aeabillsList(page.currentPage, page.pageSize, Object.assign(params, this.mawbQuery)).then(res=>{
+            aeabillsList(page.currentPage, page.pageSize,
+                {...Object.assign(params, this.mawbQuery),businessType:'AI'}).then(res=>{
                 const data = res.data.data;
                 this.mawbPage.total = data.total;
                 this.mawbData = data.records;

src/views/iosBasicData/ComputationCenter/index.vue

@@ -54,14 +54,14 @@
                 <template slot="menu" slot-scope="{row}">
                     <el-button v-if="tabsValue == 'C' || tabsValue == 'D'"
                                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="settlementfun(row)" >结算
                     </el-button>
                     <el-button v-if="tabsValue == '业务单据' || tabsValue == '已完成'"
                                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 v-if="tabsValue == '业务单据'"
                                type="text" size="small"
                                :disabled="saberUserInfo.role_name.indexOf('允许修改他人业务') == -1?saberUserInfo.user_id != row.createUser:false"

src/views/iosBasicData/ComputationCenter/settlementDetails.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.isCleared == 1"
+                <el-button  size="small" type="warning" plain  style="margin-right: 8px" :disabled="!form.id || editPower" v-if="form.isCleared == 1"
                             :loading="saveLoading" @click="finstlbillsRevokeSettlementfun">撤销结算
                 </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" style="margin-right: 8px" :disabled="form.isCleared == 1" v-if="editSave"
+                <el-button  size="small" type="primary" style="margin-right: 8px" :disabled="form.isCleared == 1 || editPower" v-if="editSave"
                             :loading="saveLoading" @click="editHandle">编 辑
                 </el-button>
                 <el-button  size="small" type="primary" style="margin-right: 8px" :disabled="form.isCleared == 1" v-else
@@ -472,10 +472,14 @@ export default {
                 ],
             },
             roleName:[], // 当前的角色权限
+            saberUserInfo:{}, // 当前登录人信息
+            editPower:false, // 当前是否可以编辑
         }
     },
     created() {
         this.roleName =  localStorage.getItem('roleName').split(',')
+        // 获取当前登录人个人信息
+        this.saberUserInfo = JSON.parse(localStorage.getItem('saber-userInfo')).content
     },
     methods:{
         // 打印
@@ -747,6 +751,11 @@ export default {
             this.pageLoading = true
             finstlbillsDetail(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.finStlBillsItemsList.map(item=>{
                     item.stlTtlAmountNet = Number(item.stlTtlAmount) - (Number(item.stlTtlAmount) * (Number(item.taxRate) + Number(item.surchargeRate)))

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

@@ -447,9 +447,10 @@
                                     <span slot="label">
                                         <span style="color: #1e9fff">毛重(KGS)</span>
                                     </span>
-                                    <el-input step="0.01" style="width: 100%;" v-model="assemblyForm.grossWeight"
+                                    <el-input ref="grossWeightRef" step="0.01" style="width: 100%;" v-model="assemblyForm.grossWeight"
                                               size="small" autocomplete="off"
                                               :disabled="detailData.seeDisabled" @input="floatingInput($event,'grossWeight')"
+                                              @focus="quantityFocus"
                                               clearable placeholder="请输入毛重" ></el-input>
                                 </el-form-item>
                             </el-col>
@@ -459,10 +460,11 @@
                                     <span slot="label">
                                         <span style="color: #1e9fff">尺码(CBM)</span>
                                     </span>
-                                    <el-input step="0.01" style="width: 106%;"
+                                    <el-input ref="measurementRef" step="0.01" style="width: 106%;"
                                               v-model="assemblyForm.measurement"
                                               size="small" autocomplete="off"
                                               :disabled="detailData.seeDisabled" @input="floatingInput($event,'measurement')"
+                                              @focus="quantityFocus"
                                               clearable placeholder="请输入尺码/体积" ></el-input>
                                 </el-form-item>
                             </el-col>
@@ -790,6 +792,8 @@ import {regularFloating, regularInteger} from "@/util/regularJudgment";
                     });
                     this.$nextTick(() => {
                         this.$refs.quantityRef.blur()
+                        this.$refs.grossWeightRef.blur()
+                        this.$refs.measurementRef.blur()
                     })
                     return
                 }

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

@@ -520,7 +520,7 @@
             :close-on-click-modal="false"
             :before-close="handleClose">
             <span slot="title">
-                <el-button type="primary" size="mini" >导出</el-button>
+                <el-button type="primary" size="mini" @click.stop="exportfun" >导出</el-button>
             </span>
             <div style="padding-bottom: 30px;">
                 <el-table
@@ -627,6 +627,7 @@
     import reportformsList from "@/views/iosBasicData/OceanFreightImport/bills/assembly/reportformsList.vue";
     import {getList as reportsList} from "@/api/iosBasicData/reports";
     import {dateFormat} from "@/util/date";
+    import {getToken} from "@/util/auth";
 
     export default {
         components: {reportContainer, SearchQuery,reportformsList},
@@ -700,6 +701,7 @@
                 corpVisible:false, // 往来单位弹窗
                 corpDialog:[], // 往来单位弹窗数据
                 dcDialogType:'', // 往来单位弹窗dc判断
+                corpRow:{}, // 往来单位弹窗数据
                 optionD:{},
                 optionDBack:{
                     stripe:true,
@@ -857,6 +859,7 @@
                     delBtn:false,
                     editBtn:false,
                     menuWidth:'100',
+                    menu:false,
                     column:[
                         {
                             label: "index",
@@ -1137,6 +1140,17 @@
             this.paymodeWorkDictsfun() // 获取预付/到付数据
         },
         methods:{
+            // 弹窗导出
+            exportfun(){
+                const routeData = this.$router.resolve({
+                    path: '/api/blade-los/finaccbills/listFeeCountByCorpExport',//跳转目标窗口的地址
+                    query: {
+                        dc: this.corpRow.dc,
+                        corpId:this.corpRow.corpId
+                    }
+                })
+                window.open(routeData.href.slice(1, routeData.href.length) + '&' + `${this.website.tokenHeader}=${getToken()}`);
+            },
             // 费用弹窗里的打印
             dialogPreviewfun(row){
                 if (!this.reportformsObj.id){
@@ -1285,6 +1299,7 @@
                     corpId:row.corpId,
                     dc:row.dc
                 }).then(res=>{
+                    this.corpRow = row
                     this.dcDialogType = row.dc
                     this.corpDialog = res.data.data
                 })

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

@@ -1858,7 +1858,8 @@ import { getDeptTree } from "@/api/system/dept";
         // 弹窗表格获取数据
         mawbOnLoad(page, params = {}){
             this.mawbloading = true;
-            billsList(page.currentPage, page.pageSize, Object.assign(params, this.mawbQuery)).then(res=>{
+            billsList(page.currentPage, page.pageSize,
+                {...Object.assign(params, this.mawbQuery),businessType:'SI'}).then(res=>{
                 const data = res.data.data;
                 this.mawbPage.total = data.total;
                 this.mawbData = data.records;

src/views/iosBasicData/PaymentApplication/finstlbillsDetails.vue

@@ -13,14 +13,18 @@
                 <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="success" plain  style="margin-right: 8px" :disabled="!form.id" v-if="form.status == '0' || form.status == '4'"
+                <el-button  size="small" type="success" plain  style="margin-right: 8px" :disabled="!form.id || editPower"
+                            v-if="form.status == '0' || form.status == '4'"
                             :loading="saveLoading" @click="editCustomer('申请')">提交申请
                 </el-button>
-                <el-button  size="small" type="warning" plain  style="margin-right: 8px" :disabled="!form.id" v-if="form.status == '1'"
+                <el-button  size="small" type="warning" plain  style="margin-right: 8px" :disabled="!form.id || editPower"
+                            v-if="form.status == '1'"
                             :loading="saveLoading" @click="revokeSettlementApprovefun">撤销申请
                 </el-button>
                 <span v-if="form.status == '3'" style="font-size: 12px;padding-right: 10px;" >审核通过</span>
-                <el-button  size="small" type="primary" style="margin-right: 8px" :disabled="!(form.status == '0' || form.status == '4')" v-if="editSave"
+                <el-button  size="small" type="primary" style="margin-right: 8px"
+                            :disabled="!(form.status == '0' || form.status == '4') || editPower"
+                            v-if="editSave"
                             :loading="saveLoading" @click="editHandle">编 辑
                 </el-button>
                 <el-button  size="small" type="primary" style="margin-right: 8px" :disabled="!(form.status == '0' || form.status == '4')" v-else
@@ -526,10 +530,14 @@
                     ],
                 },
                 roleName:[], // 当前的角色权限
+                saberUserInfo:{}, // 当前登录人信息
+                editPower:false, // 当前是否可以编辑
             }
         },
         created() {
             this.roleName =  localStorage.getItem('roleName').split(',')
+            // 获取当前登录人个人信息
+            this.saberUserInfo = JSON.parse(localStorage.getItem('saber-userInfo')).content
         },
         methods:{
             // 开户账户跳转维护
@@ -822,6 +830,11 @@
                 this.pageLoading = true
                 finstlbillsDetail(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.finStlBillsItemsList.map(item=>{
                         item.stlTtlAmountNet = Number(item.stlTtlAmount) - (Number(item.stlTtlAmount) * (Number(item.taxRate) + Number(item.surchargeRate)))

src/views/iosBasicData/PaymentApplication/index.vue

@@ -43,22 +43,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"
-                             v-if="saberUserInfo.role_name.indexOf('允许修改他人业务') == -1?saberUserInfo.user_id == row.createUser:true"
+                             v-if="saberUserInfo.role_name.indexOf('admin') == -1?saberUserInfo.role_name.indexOf('允许修改他人业务') == -1?saberUserInfo.user_id == row.createUser:true:true"
                              :disabled="row.status == 1 || row.status == 3"
                              @click="rowDel(row)">删除
                   </el-button>
               </template>
               <template slot="billNo" slot-scope="{row}">
                   <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/SeafreightExportF/bills/assembly/EntrustmentLnformation.vue

@@ -545,9 +545,10 @@
                                 <span slot="label">
                                     <span style="color: #1e9fff">毛重(KGS)</span>
                                 </span>
-                                    <el-input step="0.01" style="width: 100%;" v-model="assemblyForm.grossWeight"
+                                    <el-input ref="grossWeightRef" step="0.01" style="width: 100%;" v-model="assemblyForm.grossWeight"
                                               size="small" autocomplete="off"
                                               :disabled="detailData.seeDisabled" @input="floatingInput($event,'grossWeight')"
+                                              @focus="quantityFocus"
                                               clearable placeholder="请输入毛重" ></el-input>
                                 </el-form-item>
                             </el-col>
@@ -557,10 +558,11 @@
                                 <span slot="label">
                                     <span style="color: #1e9fff">尺码(CBM)</span>
                                 </span>
-                                    <el-input step="0.01" style="width: 106%;"
+                                    <el-input ref="measurementRef" step="0.01" style="width: 106%;"
                                               v-model="assemblyForm.measurement"
                                               size="small" autocomplete="off"
                                               :disabled="detailData.seeDisabled" @input="floatingInput($event,'measurement')"
+                                              @focus="quantityFocus"
                                               clearable placeholder="请输入尺码/体积" ></el-input>
                                 </el-form-item>
                             </el-col>
@@ -844,7 +846,6 @@
                             </el-form-item>
                         </el-col>
                     </el-row>
-
                 </el-form>
             </div>
             <span slot="footer" class="dialog-footer">
@@ -986,12 +987,14 @@ import {regularFloating, regularInteger} from "@/util/regularJudgment";
         methods:{
             // 件数聚焦
             quantityFocus(){
-                if (Number(this.assemblyForm.quantity) != Number(this.assemblyForm.waitingBoxList[0].editQuantity)) {
+                if (Number(this.assemblyForm.quantity) != Number(this.assemblyForm.waitingBoxList[0].quantity)) {
                     this.$alert('当前数据已经均分箱量，请撤销之后再修改', '提示', {
                         confirmButtonText: '确定',
                     });
                     this.$nextTick(() => {
                         this.$refs.quantityRef.blur()
+                        this.$refs.grossWeightRef.blur()
+                        this.$refs.measurementRef.blur()
                     })
                     return
                 }

src/views/iosBasicData/SeafreightExportF/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>
@@ -82,7 +101,6 @@ import {
   import {bcntrtypesList} from "@/api/iosBasicData/bcntrtypes";
   import {containersEqualDistribution} from "@/api/iosBasicData/containers";
   import {requiredMessage} from "@/util/messageReminder";
-import {number} from "echarts";
 
   export default {
       components: {SearchQuery},
@@ -159,7 +177,7 @@ import {number} from "echarts";
                 prop: "number",
                 type:"number",
                 width:'120',
-                cell:true,
+                // cell:true,
                 controls:false,
                 precision:0,
             },
@@ -168,7 +186,7 @@ import {number} from "echarts";
               prop: "grossWeight",
               width:'120',
               type:"number",
-              cell:true,
+              // cell:true,
               controls:false,
             },
             {
@@ -184,7 +202,7 @@ import {number} from "echarts";
               prop: "measurement",
               width:'120',
               type:"number",
-              cell:true,
+              // cell:true,
               controls:false,
             },
             {
@@ -287,6 +305,36 @@ 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)
+                }
+            }
+            this.assemblyForm.quantity = quantityNum
+        },
+        // 毛重失焦事件
+        grossWeightBlur(row){
+            let grossWeightNum = 0
+            for (let item of this.assemblyForm.preContainersList) {
+                if (item.grossWeight) {
+                    grossWeightNum += Number(item.grossWeight)
+                }
+            }
+            this.assemblyForm.grossWeight = grossWeightNum
+        },
+        // 尺码失焦事件
+        measurementBlur(row){
+            let measurementNum = 0
+            for (let item of this.assemblyForm.preContainersList) {
+                if (item.measurement) {
+                    measurementNum += Number(item.measurement)
+                }
+            }
+            this.assemblyForm.measurement = measurementNum
+        },
         // 一键编辑
         oneTouchEditefun(){
             for (let item of this.assemblyForm.preContainersList) {
@@ -578,7 +626,13 @@ import {number} from "echarts";
               this.rowUpdate(row,index)
               // this.$set(row,'$cellEdit',false)
           }else {
-              this.$set(row,'$cellEdit',true)
+              if (Number(this.assemblyForm.quantity) != Number(this.assemblyForm.waitingBoxList[0].quantity)) {
+                  this.$alert('当前数据已经均分箱量，请撤销之后再修改', '提示', {
+                      confirmButtonText: '确定',
+                  });
+              }else {
+                  this.$set(row,'$cellEdit',true)
+              }
           }
           // this.$refs.crud.rowEdit(row,index)
       },

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

@@ -531,7 +531,7 @@
             :close-on-click-modal="false"
             :before-close="handleClose">
             <span slot="title">
-                <el-button type="primary" size="mini" >导出</el-button>
+                <el-button type="primary" size="mini" @click.stop="exportfun" >导出</el-button>
             </span>
             <div style="padding-bottom: 30px;">
                 <el-table
@@ -639,6 +639,7 @@
     import {getList as reportsList} from "@/api/iosBasicData/reports";
     import {dateFormat} from "@/util/date";
     import {regularBurdenfloating} from "@/util/regularJudgment";
+    import {getToken} from "@/util/auth";
 
     export default {
         components: {reportContainer, SearchQuery,reportformsList},
@@ -711,6 +712,7 @@
                 corpVisible:false, // 往来单位弹窗
                 corpDialog:[], // 往来单位弹窗数据
                 dcDialogType:'', // 往来单位弹窗dc判断
+                corpRow:{}, // 往来单位弹窗数据
                 optionD:{},
                 optionDBack:{
                     stripe:true,
@@ -1149,6 +1151,17 @@
             this.paymodeWorkDictsfun() // 获取预付/到付数据
         },
         methods:{
+            // 弹窗导出
+            exportfun(){
+                const routeData = this.$router.resolve({
+                    path: '/api/blade-los/finaccbills/listFeeCountByCorpExport',//跳转目标窗口的地址
+                    query: {
+                        dc: this.corpRow.dc,
+                        corpId:this.corpRow.corpId
+                    }
+                })
+                window.open(routeData.href.slice(1, routeData.href.length) + '&' + `${this.website.tokenHeader}=${getToken()}`);
+            },
             // 费用弹窗里的打印
             dialogPreviewfun(row){
                 if (!this.reportformsObj.id){
@@ -1297,6 +1310,7 @@
                     corpId:row.corpId,
                     dc:row.dc
                 }).then(res=>{
+                    this.corpRow = row
                     this.dcDialogType = row.dc
                     this.corpDialog = res.data.data
                 })

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

@@ -1858,7 +1858,8 @@ import { getDeptTree } from "@/api/system/dept";
         // 弹窗表格获取数据
         mawbOnLoad(page, params = {}){
             this.mawbloading = true;
-            billsList(page.currentPage, page.pageSize, Object.assign(params, this.mawbQuery)).then(res=>{
+            billsList(page.currentPage, page.pageSize,
+                {...Object.assign(params, this.mawbQuery),businessType:'SE'}).then(res=>{
                 const data = res.data.data;
                 this.mawbPage.total = data.total;
                 this.mawbData = data.records;

src/views/iosBasicData/aeamends/amendsDetails.vue

@@ -13,11 +13,12 @@
                 <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="success" style="margin-right: 8px" v-if="form.status == 0 || form.status == 4" :disabled="!form.id"
+                <el-button size="small" type="success" style="margin-right: 8px" v-if="form.status == 0 || form.status == 4"
+                           :disabled="!form.id || editPower"
                            :loading="saveLoading" @click="submitforApproval">提交请核
                 </el-button>
                 <el-button  size="small" type="warning" plain
-                            v-if="form.status == 1" :disabled="!form.id"
+                            v-if="form.status == 1" :disabled="!form.id || editPower"
                             :loading="saveLoading" @click="revokepleaseReview">撤销请核
                 </el-button>
                 <span v-if="form.status == 2" style="font-size: 14px;margin-right: 10px;" >审核中</span>
@@ -502,6 +503,7 @@ export default {
             // 是否编辑状态
             editType: false,
             buttonDisable:false, // 按钮的是否禁用
+            editPower:false, // 是否有权限编辑
             DesignreportDialog:false, // 设计报表弹窗
             printingDialog:false, // 打印弹窗
             reportOption: {
@@ -561,7 +563,12 @@ export default {
                 if (oldValue == 1 || oldValue == 2 || oldValue == 3) {
                     this.buttonDisable = true
                 }else {
-                    this.buttonDisable = false
+                    if (this.roleName.indexOf('admin') == -1?this.roleName.indexOf('允许修改他人业务') == -1?this.saberUserInfo.user_id != this.form.createUser:false:false) {
+                        this.buttonDisable = true
+                        this.editPower = true
+                    }else {
+                        this.buttonDisable = false
+                    }
                 }
             },
             deep: false, // 深度监听

src/views/iosBasicData/aeamends/index.vue

@@ -41,23 +41,22 @@
                       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"
-                      :disabled="row.status == 1 || row.status == 2 || row.status == 3 || (saberUserInfo.role_name.indexOf('允许修改他人业务') == -1?saberUserInfo.user_id != row.createUser:false)"
+                      v-if="saberUserInfo.role_name.indexOf('admin') == -1?saberUserInfo.role_name.indexOf('允许修改他人业务') == -1?saberUserInfo.user_id == row.createUser:true:true"
+                      :disabled="row.status == 1 || row.status == 2 || row.status == 3"
                       @click.stop="rowDel(row)"
                       icon="el-icon-delete" >删除
                   </el-button>
               </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>

src/views/iosBasicData/aiamends/amendsDetails.vue

@@ -13,11 +13,12 @@
                 <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="success" style="margin-right: 8px" v-if="form.status == 0 || form.status == 4" :disabled="!form.id"
+                <el-button size="small" type="success" style="margin-right: 8px" v-if="form.status == 0 || form.status == 4"
+                           :disabled="!form.id || editPower"
                            :loading="saveLoading" @click="submitforApproval">提交请核
                 </el-button>
                 <el-button  size="small" type="warning" plain
-                            v-if="form.status == 1" :disabled="!form.id"
+                            v-if="form.status == 1" :disabled="!form.id || editPower"
                             :loading="saveLoading" @click="revokepleaseReview">撤销请核
                 </el-button>
                 <span v-if="form.status == 2" style="font-size: 14px;margin-right: 10px;" >审核中</span>
@@ -515,6 +516,7 @@ export default {
             // 是否编辑状态
             editType: false,
             buttonDisable:false, // 按钮的是否禁用
+            editPower:false, // 是否有权限编辑
             DesignreportDialog:false, // 设计报表弹窗
             printingDialog:false, // 打印弹窗
             reportOption: {
@@ -574,7 +576,12 @@ export default {
                 if (oldValue == 1 || oldValue == 2 || oldValue == 3) {
                     this.buttonDisable = true
                 }else {
-                    this.buttonDisable = false
+                    if (this.roleName.indexOf('admin') == -1?this.roleName.indexOf('允许修改他人业务') == -1?this.saberUserInfo.user_id != this.form.createUser:false:false) {
+                        this.buttonDisable = true
+                        this.editPower = true
+                    }else {
+                        this.buttonDisable = false
+                    }
                 }
             },
             deep: false, // 深度监听

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

@@ -12,7 +12,11 @@
             :row-style="rowStyle"
             :row-class-name="rowClassName" >
             <el-table-column type="selection" width="55" />
-            <el-table-column prop="lineNo" label="行号" width="50px" ></el-table-column>
+            <el-table-column prop="lineNo" label="行号" width="50px" >
+                <template slot-scope="scope">
+                    <span>{{Number(scope.$index) + 1}}</span>
+                </template>
+            </el-table-column>
             <el-table-column label="账单" prop="accStatus" width="60px" >
                 <template slot-scope="{ row }">
                     <span>{{row.accStatus?'是':'否'}}</span>

src/views/iosBasicData/aiamends/index.vue

@@ -41,13 +41,13 @@
                       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"
+                      v-if="saberUserInfo.role_name.indexOf('admin') == -1?saberUserInfo.role_name.indexOf('允许修改他人业务') == -1?saberUserInfo.user_id == row.createUser:true:true"
                       :disabled="row.status == 1 || row.status == 2 || row.status == 3"
                       @click.stop="rowDel(row)"
                       icon="el-icon-delete" >删除
@@ -55,10 +55,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>

src/views/iosBasicData/bcntrtypes/index.vue

@@ -206,7 +206,7 @@ export default {
             label: "海关编码",
             prop: "customsCode",
             width: "180",
-            search: true,
+            // search: true,
             rules: [{
               required: true,
               message: "请输入海关编码",
@@ -241,32 +241,20 @@ export default {
           {
             label: "箱型",
             prop: "cntrType",
-              overHidden:true,
-            // rules: [{
-            //   required: true,
-            //   message: "请输入箱型 GP, HC, COLOAD etc.",
-            //   trigger: "blur"
-            // }]
+            overHidden:true,
+            search: true,
+            searchOrder:1
+
           },
           {
             label: "尺码",
             prop: "cntrSize",
               overHidden:true,
-            // rules: [{
-            //   required: true,
-            //   message: "请输入尺码 V20, V40, COLOAD etc.",
-            //   trigger: "blur"
-            // }]
           },
           {
             label: "皮重 KGS",
             prop: "tareWeight",
               overHidden:true,
-            // rules: [{
-            //   required: true,
-            //   message: "请输入皮重 KGS",
-            //   trigger: "blur"
-            // }]
           },
           {
             label: "净重",

src/views/iosBasicData/bcorps/detailsPage.vue

@@ -269,18 +269,19 @@
               </el-col>
               <el-col :span="8">
                 <el-form-item label="PS规则" prop="psRate">
-                  <!-- <el-input v-model="formData.psRate" placeholder="请输入PS规则" clearable :style="{ width: '100%' }"> -->
+                   <el-input v-model="formData.psRate" placeholder="请输入PS规则"
+                             clearable :style="{ width: '100%' }" @input="psRateValid(formData.psRate)" />
                   <!--<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"
-                                  :selectValue="formData.psRate"
-                                  :filterable="true"
-                                  :clearable="true"
-                                  :buttonIf="false"
-                                  :forParameter="{key:'dictKey',label:'dictValue',value:'dictKey'}"
-                                  @corpChange="psRateChange($event,'psRate')"
-                                  @corpFocus="psRateWorkDictsfun">
-                    </search-query>
+                  <!--  <search-query :datalist="psRateData"-->
+                  <!--                :selectValue="formData.psRate"-->
+                  <!--                :filterable="true"-->
+                  <!--                :clearable="true"-->
+                  <!--                :buttonIf="false"-->
+                  <!--                :forParameter="{key:'dictKey',label:'dictValue',value:'dictKey'}"-->
+                  <!--                @corpChange="psRateChange($event,'psRate')"-->
+                  <!--                @corpFocus="psRateWorkDictsfun">-->
+                  <!--  </search-query>-->
                 </el-form-item>
               </el-col>
               <el-col :span="8">
@@ -300,7 +301,7 @@
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="允许负大于收" prop="psAllowLargeCredit">
+                <el-form-item label="允许付大于收" prop="psAllowLargeCredit">
                   <el-switch v-model="formData.psAllowLargeCredit" size="small" :active-value="1" :inactive-value="0" active-text="开启"
                     inactive-text="关闭"></el-switch>
                 </el-form-item>
@@ -1002,16 +1003,16 @@ export default {
           message: ' ',
           trigger: 'change'
         }],
-        enAddr: [{
-          required: true,
-          message: ' ',
-          trigger: 'change'
-        }],
-        uscc: [{
-          required: true,
-          message: ' ',
-          trigger: 'change'
-        }],
+        // enAddr: [{
+        //   required: true,
+        //   message: ' ',
+        //   trigger: 'change'
+        // }],
+        // uscc: [{
+        //   required: true,
+        //   message: ' ',
+        //   trigger: 'change'
+        // }],
         sourceType: [{
             required: true,
             message: ' ',
@@ -1130,6 +1131,16 @@ export default {
   },
   mounted() { },
   methods: {
+      // ps规则监听输入事件
+      psRateValid(inputContent){
+          let reg = /^(0.\d+|0|1)$/;
+          if (reg.test(inputContent)) {
+              this.formData.psRate = inputContent;
+          } else {
+              if (inputContent != "0.")
+                  this.formData.psRate = "";
+          }
+      },
       // 详情
       getBcorpsDetailfun(id){
           getBcorpsDetail(id).then(res => {

src/views/iosBasicData/finstlbills/finstlbillsDetails.vue

@@ -16,13 +16,14 @@
                 <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.billStatus == 1"
+                <el-button  size="small" type="warning" plain  style="margin-right: 8px" :disabled="!form.id || editPower"
+                            v-if="form.billStatus == 1"
                             :loading="saveLoading" @click="finstlbillsRevokeReconciliationfun">撤销对账
                 </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" style="margin-right: 8px" v-if="editSave" :disabled="submitType"
+                <el-button  size="small" type="primary" style="margin-right: 8px" v-if="editSave" :disabled="submitType || editPower"
                             :loading="saveLoading" @click="editHandle">编 辑
                 </el-button>
                 <el-button  size="small" type="primary" style="margin-right: 8px" v-else :disabled="submitType"
@@ -485,7 +486,7 @@
                     <el-button  size="small" type="danger" style="margin-left: 10px" :disabled="editSave"
                                 :loading="saveLoading" @click="batchDeletefun" >一键删除
                     </el-button>
-                    <el-button  size="small" type="primary" style="margin-left: 10px"
+                    <el-button  size="small" type="primary" style="margin-left: 10px" :disabled="editPower"
                                 :loading="saveLoading" @click="editHandle" >一键编辑
                     </el-button>
                     <el-button  size="small" type="primary" style="margin-right: 8px" :disabled="editSave"
@@ -691,10 +692,14 @@
                 ],
                 submitType:false, // 是否提交
                 roleName:[], // 当前的角色权限
+                saberUserInfo:{}, // 当前登录人信息
+                editPower:false, // 当前是否可以编辑
             }
         },
         created() {
             this.roleName =  localStorage.getItem('roleName').split(',')
+            // 获取当前登录人个人信息
+            this.saberUserInfo = JSON.parse(localStorage.getItem('saber-userInfo')).content
             this.allyesnoWorkDictsfun() // 获取 字典数据
             this.invoiceWorkDictsfun() // 获取 发票的数据
         },
@@ -917,6 +922,11 @@
                 this.pageLoading = true
                 finstlbillsDetail(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
+                    }
                     // 判断是否已经提交过了
                     if(this.form.billStatus == 1) {
                         this.submitType = true

src/views/iosBasicData/finstlbills/index.vue

@@ -43,22 +43,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"
-                             v-if="saberUserInfo.role_name.indexOf('允许修改他人业务') == -1?saberUserInfo.user_id == row.createUser:true"
+                             v-if="saberUserInfo.role_name.indexOf('admin') == -1?saberUserInfo.role_name.indexOf('允许修改他人业务') == -1?saberUserInfo.user_id == row.createUser:true:true"
                              :disabled="row.billStatus == 1"
                              @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="billStatus">
                   <span v-if="row.billStatus == 1" style="color: #7fbb41" >是</span>

src/views/iosBasicData/finvouchers/assembly/fromtableDetails.vue

@@ -169,6 +169,9 @@
             },
             // 辅助核算
             auxiliaryAccountingfun(row){
+                if (!row.accountId) {
+                    return this.$message.warning('请先选择科目代码')
+                }
                 this.$emit("auxiliaryAccountingfun",row)
             },
             // 下拉回调

src/views/iosBasicData/finvouchers/finvouchersitems.vue

@@ -332,12 +332,6 @@
                     return item.id
                 })
                 console.log(arr.join(','))
-
-                // for (let item of this.handleSelectionData) {
-                //     if (item.id) {
-                //
-                //     }
-                // }
             },
             // 大保存
             finvouchersSubmitfun(){
@@ -366,7 +360,6 @@
             },
             // 辅助核算弹窗确认按钮
             auxiliaryDeterminefun(){
-                console.log(this.subjectRow,369)
                 this.auxiliaryVisible = false
             },
             // 下拉回调

src/views/iosBasicData/seamends/amendsDetails.vue

@@ -13,11 +13,12 @@
                 <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="success" style="margin-right: 8px" v-if="form.status == 0 || form.status == 4" :disabled="!form.id"
+                <el-button size="small" type="success" style="margin-right: 8px" v-if="form.status == 0 || form.status == 4"
+                           :disabled="!form.id || editPower"
                            :loading="saveLoading" @click="submitforApproval">提交请核
                 </el-button>
                 <el-button  size="small" type="warning" plain
-                            v-if="form.status == 1" :disabled="!form.id"
+                            v-if="form.status == 1" :disabled="!form.id || editPower"
                             :loading="saveLoading" @click="revokepleaseReview">撤销请核
                 </el-button>
                 <span v-if="form.status == 2" style="font-size: 14px;margin-right: 10px;" >审核中</span>
@@ -519,6 +520,7 @@ export default {
             // 是否编辑状态
             editType: false,
             buttonDisable:false, // 按钮的是否禁用
+            editPower:false, // 是否有权限编辑
             DesignreportDialog:false, // 设计报表弹窗
             printingDialog:false, // 打印弹窗
             reportOption: {
@@ -580,7 +582,12 @@ export default {
                 if (oldValue == 1 || oldValue == 2 || oldValue == 3) {
                     this.buttonDisable = true
                 }else {
-                    this.buttonDisable = false
+                    if (this.roleName.indexOf('admin') == -1?this.roleName.indexOf('允许修改他人业务') == -1?this.saberUserInfo.user_id != this.form.createUser:false:false) {
+                        this.buttonDisable = true
+                        this.editPower = true
+                    }else {
+                        this.buttonDisable = false
+                    }
                 }
             },
             deep: false, // 深度监听
@@ -727,9 +734,6 @@ 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/assembly/billgenerated.vue

@@ -12,7 +12,11 @@
             :row-style="rowStyle"
             :row-class-name="rowClassName" >
             <el-table-column type="selection" width="55" />
-            <el-table-column prop="sort" label="行号" width="50px" ></el-table-column>
+            <el-table-column prop="sort" label="行号" width="50px" >
+                <template slot-scope="scope">
+                    <span>{{Number(scope.$index) + 1}}</span>
+                </template>
+            </el-table-column>
             <el-table-column label="账单" prop="accStatus" width="60px" >
                 <template slot-scope="{ row }">
                     <span>{{row.accStatus?'是':'否'}}</span>

src/views/iosBasicData/seamends/index.vue

@@ -47,6 +47,7 @@
                   <el-button
                       type="text"
                       size="small"
+                      v-if="saberUserInfo.role_name.indexOf('admin') == -1?saberUserInfo.role_name.indexOf('允许修改他人业务') == -1?saberUserInfo.user_id == row.createUser:true:true"
                       :disabled="row.status == 1 || row.status == 2 || row.status == 3"
                       @click.stop="rowDel(row)"
                       icon="el-icon-delete" >删除

src/views/iosBasicData/siamends/amendsDetails.vue

@@ -13,11 +13,12 @@
                 <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="success" style="margin-right: 8px" v-if="form.status == 0 || form.status == 4" :disabled="!form.id"
+                <el-button size="small" type="success" style="margin-right: 8px" v-if="form.status == 0 || form.status == 4"
+                           :disabled="!form.id || editPower"
                            :loading="saveLoading" @click="submitforApproval">提交请核
                 </el-button>
                 <el-button  size="small" type="warning" plain
-                            v-if="form.status == 1" :disabled="!form.id"
+                            v-if="form.status == 1" :disabled="!form.id || editPower"
                             :loading="saveLoading" @click="revokepleaseReview">撤销请核
                 </el-button>
                 <span v-if="form.status == 2" style="font-size: 14px;margin-right: 10px;" >审核中</span>
@@ -495,6 +496,7 @@ export default {
             // 是否编辑状态
             editType: false,
             buttonDisable:false, // 按钮的是否禁用
+            editPower:false, // 是否有权限编辑
             DesignreportDialog:false, // 设计报表弹窗
             printingDialog:false, // 打印弹窗
             reportOption: {
@@ -544,6 +546,7 @@ export default {
                 ]
             },
             dcDisabled:false, // dc 列是否禁用
+            saberUserInfo:{}, // 当前登录人信息
         }
     },
     watch:{
@@ -554,7 +557,12 @@ export default {
                 if (oldValue == 1 || oldValue == 2 || oldValue == 3) {
                     this.buttonDisable = true
                 }else {
-                    this.buttonDisable = false
+                    if (this.roleName.indexOf('admin') == -1?this.roleName.indexOf('允许修改他人业务') == -1?this.saberUserInfo.user_id != this.form.createUser:false:false) {
+                        this.buttonDisable = true
+                        this.editPower = true
+                    }else {
+                        this.buttonDisable = false
+                    }
                 }
             },
             deep: false, // 深度监听
@@ -563,6 +571,8 @@ export default {
     },
     created() {
         this.roleName =  localStorage.getItem('roleName').split(',')
+        // 获取当前登录人个人信息
+        this.saberUserInfo = JSON.parse(localStorage.getItem('saber-userInfo')).content
     },
     methods: {
         // 报表预览
@@ -718,6 +728,7 @@ export default {
         },
         // 向上添加数据
         upwardAddfun(dc) {
+            console.log(this.buttonDisable,733)
             let arr = []
             if (dc == 'D') {
                 arr = this.multipleChoiceDArr

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

@@ -12,7 +12,11 @@
             :row-style="rowStyle"
             :row-class-name="rowClassName" >
             <el-table-column type="selection" width="55" />
-            <el-table-column prop="sort" label="行号" width="50px" ></el-table-column>
+            <el-table-column prop="sort" label="行号" width="50px" >
+                <template slot-scope="scope">
+                    <span>{{Number(scope.$index) + 1}}</span>
+                </template>
+            </el-table-column>
             <el-table-column label="账单" prop="accStatus" width="60px" >
                 <template slot-scope="{ row }">
                     <span>{{row.accStatus?'是':'否'}}</span>

src/views/iosBasicData/siamends/index.vue

@@ -41,13 +41,13 @@
                       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"
+                      v-if="saberUserInfo.role_name.indexOf('admin') == -1?saberUserInfo.role_name.indexOf('允许修改他人业务') == -1?saberUserInfo.user_id == row.createUser:true:true"
                       :disabled="row.status == 1 || row.status == 2 || row.status == 3"
                       @click.stop="rowDel(row)"
                       icon="el-icon-delete" >删除
@@ -55,10 +55,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>