Browse Source

货代权限 2024-1-30

caojunjie 1 năm trước cách đây
mục cha
commit
666a968f01

+ 1 - 0
src/views/iosBasicData/AirtransportExport/bills/assembly/feecenter.vue

@@ -1138,6 +1138,7 @@
                     reportCode:val.classifyCode,
                     groupCode:val.groupCode,
                     itemIds:idArr.join(','),
+                    type:'KYCK'
                 }).then(res=>{
                     this.handleReportPreview(val.url,res.data.data.data)
                 })

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 934 - 708
src/views/iosBasicData/AirtransportExport/bills/index.vue


+ 5 - 4
src/views/iosBasicData/AirtransportImport/bills/assembly/feecenter.vue

@@ -1127,7 +1127,7 @@
                     reportCode:this.reportformsObj.classifyCode,
                     groupCode:this.reportformsObj.groupCode,
                     corpIds:row.id,
-                    type:'CYJK'
+                    type:'KYJK'
                 }).then(res=>{
                     this.handleReportPreview(this.reportformsObj.url,res.data.data.data)
                 })
@@ -1144,6 +1144,7 @@
                     reportCode:val.classifyCode,
                     groupCode:val.groupCode,
                     itemIds:idArr.join(','),
+                    type:'KYJK'
                 }).then(res=>{
                     this.handleReportPreview(val.url,res.data.data.data)
                 })
@@ -1170,7 +1171,7 @@
                     }
                     this.$nextTick(()=>{
                         this.$refs.reportformsList.onLoad(page,{
-                            businessType:'CYJK',
+                            businessType:'KYJK',
                             classifyCode:'费用',
                             groupCode:groupCode
                         })
@@ -1181,13 +1182,13 @@
                     getFeeCenterCorpIds({
                         billId:this.assemblyForm.id,
                         dc:dc,
-                        type:'CYJK',
+                        type:'KYJK',
                     }).then(res=>{
                         this.printingLoading = false
                         this.PrintingData = res.data.data
                     })
                     this.reportsListfun({
-                        businessType:'CYJK',
+                        businessType:'KYJK',
                         classifyCode:'费用',
                         groupCode:groupCode
                     })

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 934 - 708
src/views/iosBasicData/AirtransportImport/bills/index.vue


+ 24 - 0
src/views/iosBasicData/ComputationCenter/index.vue

@@ -391,6 +391,8 @@ import {bbusinesstypeList} from "@/api/iosBasicData/bbusinesstype";
                     this.$message.warning("请选择至少一条数据");
                     return;
                 }
+                // 判断是否可以编辑别人业务 true 就没有权限
+                if (this.ModifyOthersfun()) return;
                 this.$confirm("确定将选择数据删除?", {
                     confirmButtonText: "确定",
                     cancelButtonText: "取消",
@@ -425,6 +427,28 @@ import {bbusinesstypeList} from "@/api/iosBasicData/bbusinesstype";
                     })
                 })
             },
+            // 判断是否可以编辑别人业务
+            ModifyOthersfun(){
+                let sumArr = []
+                const h = this.$createElement
+                // 判断是否有权限
+                if (this.saberUserInfo.role_name.indexOf('允许修改他人业务') != -1) return false
+                // 当前登录人和选择的创建人对比是不是一个人
+                for (let item of this.selectionList) {
+                    if (this.saberUserInfo.user_id != item.createUser) {
+                        sumArr.push(h('p', `你没有"允许修改他人业务"权限,请重新选择数据`))
+                    }
+                }
+                if(sumArr.length != 0) {
+                    this.$confirm('提示', {
+                        message:h('div', sumArr),
+                        confirmButtonText: "确定",
+                        cancelButtonText: "取消",
+                        type: "warning"
+                    }).catch(err=>{})
+                    return true
+                }
+            },
             // 新增弹窗确认回调
             rowSave(row, done, loading){
                 console.log('新增弹窗确认回调')

+ 1 - 0
src/views/iosBasicData/OceanFreightImport/bills/assembly/feecenter.vue

@@ -1163,6 +1163,7 @@
                     reportCode:val.classifyCode,
                     groupCode:val.groupCode,
                     itemIds:idArr.join(','),
+                    type:'HYJK'
                 }).then(res=>{
                     this.handleReportPreview(val.url,res.data.data.data)
                 })

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 934 - 707
src/views/iosBasicData/OceanFreightImport/bills/index.vue


+ 1 - 0
src/views/iosBasicData/SeafreightExportF/bills/assembly/feecenter.vue

@@ -1179,6 +1179,7 @@
                     reportCode:val.classifyCode,
                     groupCode:val.groupCode,
                     itemIds:idArr.join(','),
+                    type:'HYCK'
                 }).then(res=>{
                     this.handleReportPreview(val.url,res.data.data.data)
                 })

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 562 - 322
src/views/iosBasicData/SeafreightExportF/bills/index.vue


+ 3 - 1
src/views/iosBasicData/aeamends/assembly/billgenerated.vue

@@ -12,7 +12,9 @@
             :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">{{scope.$index + 1}}</template>
+            </el-table-column>
             <el-table-column label="账单" prop="accStatus" width="60px" >
                 <template slot-scope="{ row }">
                     <span>{{row.accStatus?'是':'否'}}</span>

+ 1 - 2
src/views/iosBasicData/aeamends/index.vue

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

+ 2 - 2
src/views/iosBasicData/bcorps/detailsPage.vue

@@ -523,7 +523,7 @@
               </el-table>
             </el-tab-pane>
             <el-tab-pane label="更名记录" name="gmjl">
-              <el-button type="primary" @click="corpsAttnAdd">新建</el-button>
+              <!--<el-button type="primary" @click="corpsAttnAdd">新建</el-button>-->
               <el-table :data="formData.corpsRenameList" border
                 :header-cell-style="{ background: '#ecf5ff', color: '#232526', fontSize: '12px' }" stripe
                 style="width: 100%">
@@ -579,7 +579,7 @@
               </el-table>
             </el-tab-pane>
             <el-tab-pane label="不良记录" name="bljl">
-              <el-button type="primary" @click="corpsAttnAdd">新</el-button>
+              <el-button type="primary" @click="corpsAttnAdd">新</el-button>
               <el-table :data="formData.corpsBadrecordList" border
                 :header-cell-style="{ background: '#ecf5ff', color: '#232526', fontSize: '12px' }" stripe
                 style="width: 100%">

+ 43 - 4
src/views/iosBasicData/fininvoices/index.vue

@@ -40,10 +40,12 @@
               <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"
                              @click="rowDel(row)">删除
                   </el-button>
               </template>
@@ -56,6 +58,13 @@
               <template slot-scope="{ row }" slot="invoiceDate">
                   {{row.invoiceDate?row.invoiceDate.slice(0,10):''}}
               </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>
       <fininvoicesDetails ref="fininvoicesDetails" :editSave="editSave" v-if="!isShow" @goBack="goBack"></fininvoicesDetails>
@@ -538,12 +547,11 @@ import fininvoicesDetails from "@/views/iosBasicData/fininvoices/fininvoicesDeta
             },
           ]
         },
-        data: []
+        data: [],
+        saberUserInfo:{}, // 当前登录人个人信息
       };
     },
-      watch:{
-
-      },
+    watch:{},
     computed: {
       ...mapGetters(["permission"]),
       permissionList() {
@@ -563,6 +571,8 @@ import fininvoicesDetails from "@/views/iosBasicData/fininvoices/fininvoicesDeta
       }
     },
       async created() {
+          // 获取当前登录人个人信息
+          this.saberUserInfo = JSON.parse(localStorage.getItem('saber-userInfo')).content
           this.option = await this.getColumnData(this.getColumnName(318), this.optionBack);
       },
     methods: {
@@ -636,11 +646,14 @@ import fininvoicesDetails from "@/views/iosBasicData/fininvoices/fininvoicesDeta
             });
           });
       },
+        // 一键删除
       handleDelete() {
         if (this.selectionList.length === 0) {
           this.$message.warning("请选择至少一条数据");
           return;
         }
+        // 判断是否可以编辑别人业务 true 就没有权限
+        if (this.ModifyOthersfun()) return;
         this.$confirm("确定将选择数据删除?", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
@@ -658,6 +671,28 @@ import fininvoicesDetails from "@/views/iosBasicData/fininvoices/fininvoicesDeta
             this.$refs.crud.toggleSelection();
           });
       },
+        // 判断是否可以编辑别人业务
+        ModifyOthersfun(){
+            let sumArr = []
+            const h = this.$createElement
+            // 判断是否有权限
+            if (this.saberUserInfo.role_name.indexOf('允许修改他人业务') != -1) return false
+            // 当前登录人和选择的创建人对比是不是一个人
+            for (let item of this.selectionList) {
+                if (this.saberUserInfo.user_id != item.createUser) {
+                    sumArr.push(h('p', `你没有"允许修改他人业务"权限,请重新选择数据`))
+                }
+            }
+            if(sumArr.length != 0) {
+                this.$confirm('提示', {
+                    message:h('div', sumArr),
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "warning"
+                }).catch(err=>{})
+                return true
+            }
+        },
       beforeOpen(done, type) {
         if (["edit", "view"].includes(type)) {
           fininvoicesDetail(this.form.id).then(res => {
@@ -756,4 +791,8 @@ import fininvoicesDetails from "@/views/iosBasicData/fininvoices/fininvoicesDeta
     background: #ecf5ff !important;
     text-align: center;
 }
+.pointerClick {
+    cursor:pointer;
+    color: #1e9fff;
+}
 </style>

+ 36 - 3
src/views/iosBasicData/fininvoicesApplyfor/index.vue

@@ -40,11 +40,12 @@
               <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="row.status == 3"
+                             :disabled="row.status == 3 || (saberUserInfo.role_name.indexOf('允许修改他人业务') == -1?saberUserInfo.user_id != row.createUser:false)"
                              @click="rowDel(row)">删除
                   </el-button>
               </template>
@@ -52,7 +53,11 @@
                   <span>{{scope.row.stlMode?'月结':'票结'}}</span>
               </template>
               <template slot-scope="{ row }" slot="billNo">
-                  <span class="pointerClick" @click="editFun(row)" >{{row.billNo}}</span>
+                  <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):''}}
@@ -560,7 +565,8 @@ import fininvoicesDetails from "@/views/iosBasicData/fininvoicesApplyfor/fininvo
             },
           ]
         },
-        data: []
+        data: [],
+        saberUserInfo:{}, // 当前登录人个人信息
       };
     },
       watch:{
@@ -585,6 +591,8 @@ import fininvoicesDetails from "@/views/iosBasicData/fininvoicesApplyfor/fininvo
       }
     },
       async created() {
+          // 获取当前登录人个人信息
+          this.saberUserInfo = JSON.parse(localStorage.getItem('saber-userInfo')).content
           this.option = await this.getColumnData(this.getColumnName(320), this.optionBack);
       },
     methods: {
@@ -659,11 +667,14 @@ import fininvoicesDetails from "@/views/iosBasicData/fininvoicesApplyfor/fininvo
             });
           });
       },
+        // 批量删除
       handleDelete() {
         if (this.selectionList.length === 0) {
           this.$message.warning("请选择至少一条数据");
           return;
         }
+        // 判断是否可以编辑别人业务 true 就没有权限
+        if (this.ModifyOthersfun()) return;
         // 已经提交请核的提示不让删除
         let sumArr = []
         const h = this.$createElement
@@ -698,6 +709,28 @@ import fininvoicesDetails from "@/views/iosBasicData/fininvoicesApplyfor/fininvo
             this.$refs.crud.toggleSelection();
           });
       },
+      // 判断是否可以编辑别人业务
+      ModifyOthersfun(){
+          let sumArr = []
+          const h = this.$createElement
+          // 判断是否有权限
+          if (this.saberUserInfo.role_name.indexOf('允许修改他人业务') != -1) return false
+          // 当前登录人和选择的创建人对比是不是一个人
+          for (let item of this.selectionList) {
+              if (this.saberUserInfo.user_id != item.createUser) {
+                  sumArr.push(h('p', `你没有"允许修改他人业务"权限,请重新选择数据`))
+              }
+          }
+          if(sumArr.length != 0) {
+              this.$confirm('提示', {
+                  message:h('div', sumArr),
+                  confirmButtonText: "确定",
+                  cancelButtonText: "取消",
+                  type: "warning"
+              }).catch(err=>{})
+              return true
+          }
+      },
       beforeOpen(done, type) {
         if (["edit", "view"].includes(type)) {
           fininvoicesDetail(this.form.id).then(res => {

+ 42 - 6
src/views/iosBasicData/fininvoicesOutput/index.vue

@@ -33,7 +33,10 @@
                   <el-button type="success" size="small" @click="multipleInvoicing" >选择开票</el-button>
               </template>
               <template slot="menu" slot-scope="{row}">
-                  <el-button type="text" size="small" @click="invoicingfun(row)" >开票</el-button>
+                  <el-button type="text" size="small"
+                             :disabled="saberUserInfo.role_name.indexOf('允许修改他人业务') == -1?saberUserInfo.user_id != row.createUser:false"
+                             @click="invoicingfun(row)" >开票
+                  </el-button>
               </template>
           </avue-crud>
           <avue-crud v-show="tabsValue == '销项' || tabsValue == '已完成'"
@@ -73,16 +76,21 @@
               <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="row.status == 3"
+                             :disabled="row.status == 3 || (saberUserInfo.role_name.indexOf('允许修改他人业务') == -1?saberUserInfo.user_id != row.createUser:false)"
                              @click="rowDel(row)">删除
                   </el-button>
               </template>
               <template slot-scope="{ row }" slot="billNo">
-                  <span class="pointerClick" @click="editFun(row)" >{{row.billNo}}</span>
+                  <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):''}}
@@ -713,11 +721,10 @@ import {getRateList} from "@/api/iosBasicData/rateManagement";
         },
         data: [], // 业务单据数据
         applyData:[], // 任务列表数据
+        saberUserInfo:{}, // 当前登录人个人信息
       };
     },
-      watch:{
-
-      },
+    watch:{},
     computed: {
       ...mapGetters(["permission"]),
       permissionList() {
@@ -737,6 +744,8 @@ import {getRateList} from "@/api/iosBasicData/rateManagement";
       }
     },
       async created() {
+          // 获取当前登录人个人信息
+          this.saberUserInfo = JSON.parse(localStorage.getItem('saber-userInfo')).content
           this.applyOption = await this.getColumnData(this.getColumnName(319), this.applyOptionBack);
           this.option = await this.getColumnData(this.getColumnName(319.1), this.optionBack);
           this.getRateListfun()
@@ -762,6 +771,8 @@ import {getRateList} from "@/api/iosBasicData/rateManagement";
               this.$message.warning('请选择要开票的数据')
               return
           }
+          // 判断是否可以编辑别人业务 true 就没有权限
+          if (this.ModifyOthersfun()) return;
           let arrId =  this.applySelectionList.map(item=>{
               return item.id
           })
@@ -814,11 +825,14 @@ import {getRateList} from "@/api/iosBasicData/rateManagement";
             });
           });
       },
+      // 一键删除
       handleDelete() {
         if (this.selectionList.length === 0) {
           this.$message.warning("请选择至少一条数据");
           return;
         }
+        // 判断是否可以编辑别人业务 true 就没有权限
+        if (this.ModifyOthersfun()) return;
         // 已经提交请核的提示不让删除
         let sumArr = []
         const h = this.$createElement
@@ -853,6 +867,28 @@ import {getRateList} from "@/api/iosBasicData/rateManagement";
             this.$refs.crud.toggleSelection();
           });
       },
+        // 判断是否可以编辑别人业务
+        ModifyOthersfun(){
+            let sumArr = []
+            const h = this.$createElement
+            // 判断是否有权限
+            if (this.saberUserInfo.role_name.indexOf('允许修改他人业务') != -1) return false
+            // 当前登录人和选择的创建人对比是不是一个人
+            for (let item of this.selectionList) {
+                if (this.saberUserInfo.user_id != item.createUser) {
+                    sumArr.push(h('p', `你没有"允许修改他人业务"权限,请重新选择数据`))
+                }
+            }
+            if(sumArr.length != 0) {
+                this.$confirm('提示', {
+                    message:h('div', sumArr),
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "warning"
+                }).catch(err=>{})
+                return true
+            }
+        },
         // tabs 切换
         handleClick(){
 

+ 3 - 2
src/views/iosBasicData/seamends/amendsDetails.vue

@@ -377,6 +377,7 @@
             </span>
         </el-dialog>
 
+
         <!--费用打印-->
         <reportContainer ref="reportContainer"></reportContainer>
     </div>
@@ -1208,9 +1209,9 @@ export default {
         handleSelectionChange(arr, dc) {
             if (dc == 'D') {
                 this.multipleChoiceDArr = arr
-            } else {
+            } else if (dc == 'C') {
                 this.multipleChoiceCArr = arr
-            }
+            }else { }
         },
         //返回列表
         backToList() {

+ 6 - 1
src/views/iosBasicData/seamends/assembly/amendsCostdetails.vue

@@ -238,6 +238,11 @@
                 type:Boolean,
                 default:false
             },
+            // 多选的数据
+            handleSelectionData:{
+                type:Array,
+                default:[]
+            }
         },
         data(){
             return {
@@ -394,7 +399,7 @@
                 paymodeData:[], // 预付到付数据
                 unitNoData:[],  // 计算单位数据
                 curCodeData:[],  // 币别数据
-                handleSelectionData:[], // 多选选择的数据
+                // handleSelectionData:[], // 多选选择的数据
                 corpVisible:false, // 往来单位弹窗
                 corpDialog:[], // 往来单位弹窗数据
             }

Một số tệp đã không được hiển thị bởi vì quá nhiều tập tin thay đổi trong này khác