瀏覽代碼

货代bug 2024-1-27

caojunjie 1 年之前
父節點
當前提交
813000acb8

+ 1 - 1
src/views/iosBasicData/finstlbills/finstlbillsDetails.vue

@@ -871,7 +871,6 @@
                     this.form.finStlBillsItemsList = this.handleSelectionData.map((item,index)=>{
                         item.lineNo = Number(index) + 1
                         item.pType = item.businessType
-                        item.accBillId = item.id
                         item.accDate = item.billDate
                         if (item.currentStlCurCode == 'CNY') {
                             item.currentStlAmount = item.currentStlAmountRMB
@@ -1063,6 +1062,7 @@
                 obj.approveTimeEnd = this.form.auditDateTo // 审核结束日期
                 finstlbillslistAccBillV1(obj).then(res=>{
                     this.tableData = res.data.data.map((item,index)=>{
+                        item.accBillId = item.id
                         delete item.id
                         item.lineNo = Number(index) + 1
                         this.$set(item,'currentStlCurCode',item.curCode)

+ 27 - 18
src/views/iosBasicData/seamends/amendsDetails.vue

@@ -248,6 +248,7 @@
                 <amends-costdetails :disabled="buttonDisable"
                                     :tableData="form.feeCenterList"
                                     :form="form" :editType="editType"
+                                    :arrangeDisabled="!(roleName.indexOf('admin') != -1 || roleName.indexOf('应收修改') != -1 || roleName.indexOf('应付修改') != -1)"
                                     @addfun="addTablefun"
                                     @oneclickEditingfun="oneclickEditingfun"
                                     @printingCostsfun="printingCostsfun"
@@ -257,28 +258,36 @@
 
             <el-card style="margin-top: 10px">
                 <!--<div style="font-size: 12px;margin-bottom: 5px">已生成账单费用:</div>-->
-                <div style="margin-bottom: 5px;">
-                    <div style="display: inline-block;margin-right: 20px" class="disabledBox fontSize">
-                        <i class="el-icon-coin"></i>
-                        <span>应收费用</span>
+                <div v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应收修改') != -1?true:roleName.indexOf('应收查看') != -1" style="margin-bottom: 5px;">
+                    <div>
+                        <div style="display: inline-block;margin-right: 20px" class="disabledBox fontSize">
+                            <i class="el-icon-coin"></i>
+                            <span>应收费用</span>
+                        </div>
+                        <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应收修改') != -1"
+                                   type="primary" plain size="small"
+                                   :disabled="buttonDisable"
+                                   @click="upwardAddfun('D')">生成amend费用
+                        </el-button>
                     </div>
-                    <el-button type="primary" plain size="small" :disabled="buttonDisable"
-                               @click="upwardAddfun('D')">生成amend费用
-                    </el-button>
+                    <billgenerated :tableData="this.form.feeCenterListD" :handleSelectionData="multipleChoiceDArr"
+                                   @handleSelectionChange="handleSelectionChange($event,'D')"></billgenerated>
                 </div>
-                <billgenerated :tableData="this.form.feeCenterListD" :handleSelectionData="multipleChoiceDArr"
-                               @handleSelectionChange="handleSelectionChange($event,'D')"></billgenerated>
-                <div style="margin-bottom: 5px;">
-                    <div style="display: inline-block;margin-right: 20px" class="disabledBox meetSize">
-                        <i class="el-icon-coin"></i>
-                        <span>应付费用</span>
+                <div v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应付修改') != -1?true:roleName.indexOf('应付查看') != -1" style="margin-bottom: 5px;">
+                    <div>
+                        <div style="display: inline-block;margin-right: 20px" class="disabledBox meetSize">
+                            <i class="el-icon-coin"></i>
+                            <span>应付费用</span>
+                        </div>
+                        <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应付修改') != -1"
+                                   type="primary" plain size="small"
+                                   :disabled="buttonDisable"
+                                   @click="upwardAddfun('C')">生成amend费用
+                        </el-button>
                     </div>
-                    <el-button type="primary" plain size="small" :disabled="buttonDisable"
-                               @click="upwardAddfun('C')">生成amend费用
-                    </el-button>
+                    <billgenerated :tableData="this.form.feeCenterListC" :handleSelectionData="multipleChoiceCArr"
+                                   @handleSelectionChange="handleSelectionChange($event,'C')"></billgenerated>
                 </div>
-                <billgenerated :tableData="this.form.feeCenterListC" :handleSelectionData="multipleChoiceCArr"
-                               @handleSelectionChange="handleSelectionChange($event,'C')"></billgenerated>
             </el-card>
         </div>
 

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

@@ -44,6 +44,7 @@
                               :clearable="true"
                               :remote="true"
                               :buttonIf="false"
+                              :disabled="arrangeDisabled"
                               @corpChange="corpChange($event,'dc',row)"
                               placeholder="请选择收/付">
                 </search-query>
@@ -193,7 +194,12 @@
             disabled:{
                 type:Boolean,
                 default:false
-            }
+            },
+            // 列禁用
+            arrangeDisabled:{
+                type:Boolean,
+                default:false
+            },
         },
         data(){
             return {