福达bug 2024-1-18

src/components/fee-info/main.vue

@@ -12,9 +12,9 @@
           </el-tabs>
           <el-button type="primary" icon="el-icon-plus" size="small" @click.stop="rowAdd" :loading="buttonLoading"
             :disabled="disabled">录入明细</el-button>
-          <el-button type="warning" size="small" @click.stop="billingDetails('收费')" :loading="buttonLoading" :disabled="
-            (financeDisabled && disabled) || selectionList.length == 0
-          " v-if="selectTab === 1&&billingShow">生成账单</el-button>
+          <!--<el-button type="warning" size="small" @click.stop="billingDetails('收费')" :loading="buttonLoading" :disabled="-->
+          <!--  (financeDisabled && disabled) || selectionList.length == 0-->
+          <!--" v-if="selectTab === 1&&billingShow">生成账单</el-button>-->
           <el-button type="warning" size="small" @click.stop="billingDetails('申请')" :loading="buttonLoading" :disabled="
             (financeDisabled && disabled) || selectionList.length == 0
           " v-if="selectTab === 2&&billingShow">申请付费</el-button>

src/views/exportTrade/purchaseContract/index.vue

@@ -255,6 +255,11 @@ export default {
                     prop: "orderNo",
                     overHidden: true
                 },{
+                    label: "采购员",
+                    prop: "buyerName",
+                    hide:true,
+                    overHidden: true
+                },{
                     label: "交货日期",
                     prop: "plannedDeliveryDate",
                     overHidden: true
@@ -656,6 +661,11 @@ export default {
         gainUser().then(res => {
             this.findObject(this.option.column, "createUser").dicData = res.data.data;
         });
+        // 判断是否是采购员 权限
+        if (JSON.parse(localStorage.getItem('saber-userInfo')).content.role_name.indexOf('采购') != -1) {
+            this.findObject(this.procureOption.column, "buyerName").hide = false
+        }
+
         this.option.height = window.innerHeight - 210;
         this.listBYStatusfun() // 获取待采购数据
     },

src/views/financialManagement/billDetails/billDetails.vue

@@ -35,6 +35,9 @@
           :configuration="breakConfiguration"
         ></breakdown-select>
       </template>
+        <template slot="accSysNo" slot-scope="scope">
+            <span style="color: #1e9fff;" @click="Jumpfun(scope.row)">{{scope.row.accSysNo}}</span>
+        </template>
       <template slot-scope="scope" slot="corpId">
         <span>{{ scope.row.corpName }}</span>
       </template>
@@ -115,6 +118,23 @@
       // option.height = window.innerHeight - 200 ;
     },
     methods: {
+      // 点击合同号跳转
+      Jumpfun(row){
+          if (this.$store.getters.xsStatus) {
+              return this.$alert("销售单已存在,请关闭销售单再进行操作", "温馨提示", {
+                  confirmButtonText: "确定",
+                  type: "warning",
+                  callback: action => {
+                      console.log(action);
+                  }
+              });
+          }
+          this.$router.push({
+              path: '/exportTrade/salesContract/index',
+              query: { params: row.srcParentId }
+          });
+          console.log(row,123)
+      },
       rowStyle(data){
         if(_.subtract(data.row.settlementAmount, data.row.amount) < 0){
           return  {

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

@@ -417,14 +417,14 @@
                                               @corpFocus="remoteMethod($event,'vessel')" >
                                 </search-query>
                             </el-form-item>
-                            <el-form-item label="航次" prop="voyageNo" label-width="90px"  >
+                            <el-form-item label="航班号" prop="voyageNo" label-width="90px" >
                             <span slot="label">
-                                <span style="color: #1e9fff">航次</span>
+                                <span style="color: #1e9fff">航班号</span>
                             </span>
                                 <el-input type="age" style="width: 100%;" v-model="assemblyForm.voyageNo"
                                           size="small" autocomplete="off"
                                           :disabled="detailData.seeDisabled || generateBillsfalse"
-                                          clearable placeholder="请选择航次" ></el-input>
+                                          clearable placeholder="请输入航班号" ></el-input>
                             </el-form-item>
                         </div>
                         <el-form-item label="客户约号" prop="corpArgreementNo" label-width="90px">

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

@@ -223,12 +223,12 @@
                                                              @billsDetailfun="billsDetailfun(form.id)">
                                     </entrustment-lnformation>
                                 </el-tab-pane>
-                                <el-tab-pane label="配箱处理" name="second">
-                                    <DistributionBox :assemblyForm="form" :detailData="detailData"
-                                                     :pleasereviewType="pleasereviewType"
-                                                     @billsDetailfun="billsDetailfun(form.id)">
-                                    </DistributionBox>
-                                </el-tab-pane>
+                                <!--<el-tab-pane label="配箱处理" name="second">-->
+                                <!--    <DistributionBox :assemblyForm="form" :detailData="detailData"-->
+                                <!--                     :pleasereviewType="pleasereviewType"-->
+                                <!--                     @billsDetailfun="billsDetailfun(form.id)">-->
+                                <!--    </DistributionBox>-->
+                                <!--</el-tab-pane>-->
                                 <el-tab-pane label="MB/L信息" name="third">
                                     <mbinformation :assemblyForm="form" :detailData="detailData"></mbinformation>
                                 </el-tab-pane>
@@ -355,7 +355,7 @@ import {editypesList} from "@/api/iosBasicData/editypes";
                     billDate:dateFormat(new Date(), "yyyy-MM-dd") + ' 00:00', // 单据日期 默认 当天
                     operatorName:JSON.parse(localStorage.getItem('saber-userInfo')).content.user_name, // OP 默认登录人
                     operatorId:JSON.parse(localStorage.getItem('saber-userInfo')).content.user_id, // OP 默认登录人
-                    businessType:'SE', // 业务类型 默认 海运出口
+                    businessType:'AE', // 业务类型 默认 海运出口
                     billType:'DD', // 单据类型 默认 直单
                     accDeptName:'',// 核算部门 默认登录人的部门
                     issueType:'正本', // 签单方式 默认 正本