Merge remote-tracking branch 'origin/master'

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

@@ -820,7 +820,7 @@ export default {
         billsGetBillNofun(){
             let billNoFormat = ''
             if (this.form.cargoType == 'dry') {
-                billNoFormat = 'HYJK-PH'
+                billNoFormat = 'HYJK'
             }else if (this.form.cargoType == 'danger') {
                 billNoFormat = 'HYJK-WXP'
             }else if (this.form.cargoType == 'reefer') {

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

@@ -910,6 +910,28 @@ export default {
           });
         }
         // 只有分单不能编辑
+        if (oldValue == "MH") {
+          this.basicData.column.forEach((item, index) => {
+            if (index == 3) {
+              item.forEach(row => {
+                if (row.prop == "mblno") {
+                  row.disabled = true;
+                }
+              });
+            }
+          });
+        } else {
+          this.basicData.column.forEach((item, index) => {
+             if (index == 3) {
+              item.forEach(row => {
+                if (row.prop == "mblno") {
+                  row.disabled = false;
+                }
+              });
+            }
+          });
+        }
+        // 只有分单不能编辑
         // if (oldValue == 'MH') {
         //     this.columnforfun('hblno').disabled = true
         // } else {
@@ -1785,7 +1807,7 @@ export default {
     billsGetBillNofun() {
       let billNoFormat = "";
       if (this.form.cargoType == "dry") {
-        billNoFormat = "HYJK-PH";
+        billNoFormat = "HYJK";
       } else if (this.form.cargoType == "danger") {
         billNoFormat = "HYJK-WXP";
       } else if (this.form.cargoType == "reefer") {
@@ -2580,7 +2602,7 @@ export default {
     billsSubmitfun(status) {
       if (this.form.cargoType == "dry") {
         // 普货
-        this.form.billNoFormat = "HYJK-PH";
+        this.form.billNoFormat = "HYJK";
       } else if (this.form.cargoType == "danger") {
         // 危险品
         this.form.billNoFormat = "HYJK-WXP";

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

@@ -71,7 +71,12 @@
           >{{ $t("btn118n.unlocalApply") }}
         </el-button>
         <el-button
-          v-if="form.id && form.transferOrderStatus == '录入' && form.billType != 'MH' && (roleName.includes('admin') || roleName.includes('总部'))"
+          v-if="
+            form.id &&
+              form.transferOrderStatus == '录入' &&
+              form.billType != 'MH' &&
+              (roleName.includes('admin') || roleName.includes('总部') || roleName.includes('国外费用'))
+          "
           size="small"
           type="info"
           @click.stop="allClick('转单')"
@@ -952,7 +957,7 @@ export default {
           name: "ETD",
           value: "etd"
         },
-         {
+        {
           name: "ATD",
           value: "actualEtd"
         },
@@ -1016,6 +1021,7 @@ export default {
     "form.billType": {
       // 执行方法
       handler(oldValue, newValue) {
+        console.log(oldValue, 11111111111);
         if (oldValue == "MH" || oldValue == "MM") {
           this.basicData.column.forEach(item => {
             if (item.prop == "bookingNo") {
@@ -1036,11 +1042,27 @@ export default {
           });
         }
         // 只有分单不能编辑
-        // if (oldValue == 'MH') {
-        //     this.columnforfun('hblno').disabled = true
-        // } else {
-        //     this.columnforfun('hblno').disabled = false
-        // }
+        if (oldValue == "MH") {
+          this.basicData.column.forEach((item, index) => {
+            if (index == 3) {
+              item.forEach(row => {
+                if (row.prop == "mblno") {
+                  row.disabled = true;
+                }
+              });
+            }
+          });
+        } else {
+          this.basicData.column.forEach((item, index) => {
+             if (index == 3) {
+              item.forEach(row => {
+                if (row.prop == "mblno") {
+                  row.disabled = false;
+                }
+              });
+            }
+          });
+        }
         // 王风刚 2025-02-21 所有分单号都不能手动输入，都可以申请
       },
       deep: true, // 深度监听

src/views/iosBasicData/boxPlan/boxPlan/index.vue

@@ -196,8 +196,8 @@ export default {
             this.query.endDate = null
             return this.$message.error(this.query.year + '年最多有' + this.weekMax + '周');
           } else {
-            this.query.startDate = getWeekRange(this.query.year, this.query.week).start
-            this.query.endDate = getWeekRange(this.query.year, this.query.week).end
+            this.query.startDate = getWeekRange(this.query.year, this.query.week).start+' 00:00:00'
+            this.query.endDate = getWeekRange(this.query.year, this.query.week).end+' 23:59:59'
           }
         } else {
           this.query.startDate = null

src/views/iosBasicData/businessCenter/customerLetter/detailsPage.vue

@@ -199,6 +199,39 @@
                 <el-col span="12">
                   <el-row>
                     <el-col span="12">
+                      <el-form-item label="ETD" prop="etd" :rules="[{ required: true, message: ' ', trigger: 'blur' }]">
+                        <el-date-picker
+                          v-model="form.etd"
+                          type="date"
+                          placeholder="请选择 ETD"
+                          :disabled="editDisabled"
+                          size="small"
+                          format="yyyy-MM-dd"
+                          value-format="yyyy-MM-dd"
+                          style="width: 100%;"
+                          @selectChange="dicChange('ETD', $event)"
+                        >
+                        </el-date-picker>
+                      </el-form-item>
+                    </el-col>
+                    <el-col span="12">
+                      <el-form-item label="订舱日期" prop="bookingDate">
+                        <el-date-picker
+                          v-model="form.bookingDate"
+                          type="date"
+                          placeholder="请选择 订舱日期"
+                          :disabled="editDisabled"
+                          size="small"
+                          format="yyyy-MM-dd"
+                          value-format="yyyy-MM-dd"
+                          style="width: 100%;"
+                        >
+                        </el-date-picker>
+                      </el-form-item>
+                    </el-col>
+                  </el-row>
+                  <el-row>
+                    <el-col span="12">
                       <el-form-item label="起运港" prop="polCnName" :rules="[{ required: true, message: ' ', trigger: 'blur' }]">
                         <dic-select
                           v-model="form.polCnName"
@@ -239,39 +272,6 @@
                   </el-row>
                   <el-row>
                     <el-col span="12">
-                      <el-form-item label="ETD" prop="etd" :rules="[{ required: true, message: ' ', trigger: 'blur' }]">
-                        <el-date-picker
-                          v-model="form.etd"
-                          type="date"
-                          placeholder="请选择 ETD"
-                          :disabled="editDisabled"
-                          size="small"
-                          format="yyyy-MM-dd"
-                          value-format="yyyy-MM-dd"
-                          style="width: 100%;"
-                          @selectChange="dicChange('ETD', $event)"
-                        >
-                        </el-date-picker>
-                      </el-form-item>
-                    </el-col>
-                    <el-col span="12">
-                      <el-form-item label="订舱日期" prop="bookingDate">
-                        <el-date-picker
-                          v-model="form.bookingDate"
-                          type="date"
-                          placeholder="请选择 订舱日期"
-                          :disabled="editDisabled"
-                          size="small"
-                          format="yyyy-MM-dd"
-                          value-format="yyyy-MM-dd"
-                          style="width: 100%;"
-                        >
-                        </el-date-picker>
-                      </el-form-item>
-                    </el-col>
-                  </el-row>
-                  <el-row>
-                    <el-col span="12">
                       <el-form-item label="付款方式" prop="mpaymode" :rules="[{ required: true, message: ' ', trigger: 'blur' }]">
                         <dic-select
                           v-model="form.mpaymode"
@@ -426,6 +426,38 @@
                   </el-row>
                   <el-row>
                     <el-col span="12">
+                      <el-form-item
+                        label="HS CODE"
+                        prop="hscode"
+                      >
+                        <el-input
+                          style="width: 100%;"
+                          v-model="form.hscode"
+                          size="small"
+                          :disabled="editDisabled"
+                          clearable
+                          placeholder="HS CODE"
+                        ></el-input>
+                      </el-form-item>
+                    </el-col>
+                    <el-col span="12">
+                      <el-form-item
+                        label=""
+                        prop="commodityCnName"
+                      >
+                        <el-input
+                          style="width: 100%;"
+                          v-model="form.commodityCnName"
+                          size="small"
+                          :disabled="editDisabled"
+                          clearable
+                          placeholder="英文名称"
+                        ></el-input>
+                      </el-form-item>
+                    </el-col>
+                  </el-row>
+                  <el-row>
+                    <el-col span="12">
                       <el-form-item label="箱属" prop="boxBelongsTo">
                         <dic-select
                           v-model="form.boxBelongsTo"
@@ -500,10 +532,7 @@
                   </el-row>
                   <el-row>
                     <el-col span="8">
-                      <el-form-item
-                        label="联系人"
-                        prop="contact"
-                      >
+                      <el-form-item label="联系人" prop="contact">
                         <el-input
                           style="width: 100%;"
                           size="small"
@@ -1483,11 +1512,11 @@ export default {
     if (this.detailData.type == "new") {
       deptGetDetailPol(this.saberUserInfo.dept_pid.split(",")[0]).then(res => {
         // 装货港
-        this.form.polCnName = res.data.data.polCnName
-        this.form.polEnName = res.data.data.polEnName
-        this.form.polId = res.data.data.polId
-        this.form.polCode = res.data.data.polCode
-        this.form.polNamePrint = res.data.data.polEnName
+        this.form.polCnName = res.data.data.polCnName;
+        this.form.polEnName = res.data.data.polEnName;
+        this.form.polId = res.data.data.polId;
+        this.form.polCode = res.data.data.polCode;
+        this.form.polNamePrint = res.data.data.polEnName;
       });
     }
 

src/views/iosBasicData/financialManagement/reimbursement/detailsPage.vue

@@ -100,7 +100,7 @@
         <el-tab-pane label="文件中心">
           <containerTitle title="上传附件"></containerTitle>
           <c-upload :data="form.filesCenterList" :enumerationValue="76"
-            deleteUrl="/api/blade-los/tradingBoxFiles/remove" display :pId="form.id"
+            deleteUrl="/api/blade-los/filescenter/remove" display :pId="form.id"
             :saveBtn="true" @upDate="upDate"></c-upload>
         </el-tab-pane>
       </el-tabs>

src/views/iosBasicData/financialManagement/reimbursement/index.vue

@@ -103,7 +103,7 @@ export default {
             type: 'select',
             filterable: true,
             remote: true,
-            dicUrl: "/api/blade-user/page?current=1&size=5&corpTypeName=箱东&shortName={{key}}",
+            dicUrl: "/api/blade-user/page?current=1&size=5&realName={{key}}",
             props: {
               label: 'realName',
               value: 'realName',
@@ -115,10 +115,13 @@ export default {
             label: '申请日期',
             prop: 'applicantDate',
             search: true,
+            searchProp: 'applicantDateList',
+            overHidden: true,
             type: "date",
+            searchRange: true,
+            searchDefaultTime: ["00:00:00", "23:59:59"],
             format: "yyyy-MM-dd",
-            valueFormat: "yyyy-MM-dd HH:mm:ss",
-            overHidden: true,
+            valueFormat: "yyyy-MM-dd HH:mm:ss"
           },
           {
             label: '金额',

src/views/iosBasicData/losbfeestemplate/feesTemplateItems.vue

@@ -1135,7 +1135,7 @@ export default {
                             remove({ ids: ids.join(',') })
                         }
                     }
-                    if (this.form.feesTemplateItemsList.filter(item => item.price == 9)) {
+                    if (this.form.feesTemplateItemsList.filter(item => item.price == 0)) {
                         this.$confirm('费用单价为0，是否确认保存?', '提示', {
                             confirmButtonText: '确定',
                             cancelButtonText: '取消',