件重尺去掉判断

箱轨迹和i其他页面首次进入也页面不调接口

src/views/billM/expenseCenter/index.vue

@@ -111,9 +111,10 @@ export default {
   name: "费用中心",
   data() {
     return {
+      firstPage: false,
       form: {},
       query: {},
-      loading: true,
+      loading: false,
       page: {
         pageSize: 20,
         currentPage: 1,
@@ -340,7 +341,7 @@ export default {
       },
       data: [],
       corpCnNameList: [],
-      saberUserInfo:{}
+      saberUserInfo: {}
     };
   },
   computed: {
@@ -477,6 +478,7 @@ export default {
     },
     searchChange(params, done) {
       console.log(params);
+      this.firstPage = true;
       this.query = params;
       this.page.currentPage = 1;
       this.onLoad(this.page, params);
@@ -499,23 +501,25 @@ export default {
       this.onLoad(this.page, this.query);
     },
     onLoad(page, params = {}) {
-      this.loading = true;
-      feecenterList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
-        const data = res.data.data;
-        this.page.total = data.total;
-        this.data = data.records;
-        for (let item of this.data) {
-          if (item.curCode == "CNY") {
-            this.$set(item, "rmbAmount", item.amount);
-            this.$set(item, "usdAmount", "");
-          } else {
-            this.$set(item, "usdAmount", item.amount);
-            this.$set(item, "rmbAmount", "");
+      if (this.firstPage) {
+        this.loading = true;
+        feecenterList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+          const data = res.data.data;
+          this.page.total = data.total;
+          this.data = data.records;
+          for (let item of this.data) {
+            if (item.curCode == "CNY") {
+              this.$set(item, "rmbAmount", item.amount);
+              this.$set(item, "usdAmount", "");
+            } else {
+              this.$set(item, "usdAmount", item.amount);
+              this.$set(item, "rmbAmount", "");
+            }
           }
-        }
-        this.loading = false;
-        this.selectionClear();
-      });
+          this.loading = false;
+          this.selectionClear();
+        });
+      }
     },
     //自定义列保存
     async saveColumnTwo(ref, option, optionBack, code) {

src/views/boxManagement/boxTrack/index.vue

@@ -44,6 +44,7 @@ export default {
   },
   data() {
     return {
+      firstPage: false,
       detailsOpen: false,
       loading: false,
       search: {
@@ -447,31 +448,34 @@ export default {
     },
     searchChange(params, done) {
       done();
+      this.firstPage=true
       this.page.currentPage = 1;
       this.onLoad(this.page, params);
     },
     onLoad(page, params = {}) {
-      params = {
-        ...params,
-        current: page.currentPage,
-        size: page.pageSize,
-        ...Object.assign(params, this.search)
-      };
-      this.loading = true;
-      getList(params)
-        .then(res => {
-          console.log(res);
-          this.dataList = res.data.data.records;
-          this.page.total = res.data.data.total;
-          this.loading = false;
-          this.$nextTick(() => {
-            this.$refs.crud.doLayout();
-            this.$refs.crud.dicInit();
+      if (this.firstPage) {
+        params = {
+          ...params,
+          current: page.currentPage,
+          size: page.pageSize,
+          ...Object.assign(params, this.search)
+        };
+        this.loading = true;
+        getList(params)
+          .then(res => {
+            console.log(res);
+            this.dataList = res.data.data.records;
+            this.page.total = res.data.data.total;
+            this.loading = false;
+            this.$nextTick(() => {
+              this.$refs.crud.doLayout();
+              this.$refs.crud.dicInit();
+            });
+          })
+          .finally(() => {
+            this.loading = false;
           });
-        })
-        .finally(() => {
-          this.loading = false;
-        });
+      }
     },
 
     //自定义列保存

src/views/boxManagement/containerNumber/components/podBoxCount.vue

@@ -42,13 +42,13 @@ export default {
           {
             label: "POD",
             prop: "port",
-            // width: 140,
+            width: 200,
             overHidden: true
           },
           {
-            label: "点数",
+            label: "箱量",
             prop: "count",
-            // width: 100,
+            width: 100,
             overHidden: true
           }
           // {
@@ -330,4 +330,7 @@ export default {
   text-align: center;
   padding: 4px 0;
 }
+::v-deep .el-dialog__body {
+    padding: 4px 20px !important;
+}
 </style>

src/views/iosBasicData/SeafreightExportF/bills/assembly/DistributionBox/containers.vue

@@ -186,6 +186,7 @@
             placeholder="请输入箱号"
             @input="cntrNoInput(scope.row, 'cntrNo')"
             @change="verifyChange(scope.row, 'cntrNo')"
+            :disabled="scope.row.containerNumber&&assemblyForm.billType != 'MM'"
           ></el-input>
           <span v-else>{{ scope.row.cntrNo }}</span>
         </template>
@@ -1287,13 +1288,13 @@ export default {
     },
     // 全部撤销
     wholeRevokefun() {
-      if (this.assemblyForm.billType != "MM") {
-        for (let item of this.assemblyForm.containersList) {
-          if (item.containerNumber && this.assemblyForm.billType != "MM") {
-            return this.$message.error("放箱号有值，不允许清空");
-          }
-        }
-      }
+      // if (this.assemblyForm.billType != "MM") {
+      //   for (let item of this.assemblyForm.containersList) {
+      //     if (item.containerNumber && this.assemblyForm.billType != "MM") {
+      //       return this.$message.error("放箱号有值，不允许清空");
+      //     }
+      //   }
+      // }
       this.$confirm("是否清除所有数据的件重尺?", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
@@ -1322,9 +1323,9 @@ export default {
       if (this.selectionList.length > 0) {
         let arrids = [];
         for (let item of this.selectionList) {
-          if (item.containerNumber && this.assemblyForm.billType != "MM") {
-            return this.$message.error("放箱号有值，不允许清空");
-          }
+          // if (item.containerNumber && this.assemblyForm.billType != "MM") {
+          //   return this.$message.error("放箱号有值，不允许清空");
+          // }
           arrids.push(item.id);
         }
         if (arrids.length) {

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

@@ -130,7 +130,11 @@
         <el-button type="primary" @click="documentSubmit(false)">保 存</el-button>
       </div>
       <Dispatch-Notice v-if="businesstypeData.reportsType == 'PCTZD'" :documentForm="documentForm"></Dispatch-Notice>
-      <Purchase-Notice ref="purchaseNotice" v-else-if="businesstypeData.reportsType == 'RHTZ'&&documentVisible" :documentForm="documentForm"></Purchase-Notice>
+      <Purchase-Notice
+        ref="purchaseNotice"
+        v-else-if="businesstypeData.reportsType == 'RHTZ' && documentVisible"
+        :documentForm="documentForm"
+      ></Purchase-Notice>
       <BillofLadingDetails
         v-else-if="businesstypeData.reportsType == 'TDXQ' || businesstypeData.reportsType == 'DCWTS'"
         :documentForm="documentForm"
@@ -482,11 +486,14 @@ export default {
         businessType: "HYCK",
         classifyCode: "单证",
         groupCode: row.groupCode == "提单详情(H)" ? "提单详情" : row.groupCode,
-        whetherUrl:1,
+        whetherUrl: 1
       });
       this.$nextTick(() => {
         if (data.length == 1) {
-          this.handleReportPreview(data[0].url, this.documentForm);
+          reportsDetail(data[0].id).then(res => {
+            // this.handleReportPreview(res.data.data.url, data)
+            this.handleReportPreview(res.data.data.url, this.documentForm);
+          });
         } else {
           this.previewDialog = true;
         }
@@ -890,10 +897,10 @@ export default {
       this.$refs.mailComponentRef.formData.fileType = e.formatName;
       this.$refs.mailComponentRef.formData.fileContent = e.data;
     },
-    rowPrint(row,data){
-      reportsDetail(row.id).then(res=>{
-          this.handleReportPreview(res.data.data.url, data)
-      })
+    rowPrint(row, data) {
+      reportsDetail(row.id).then(res => {
+        this.handleReportPreview(res.data.data.url, data);
+      });
     },
     // 预览报表
     handleReportPreview(url, data) {

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

@@ -1015,7 +1015,7 @@
                     clearable
                     type="date"
                     size="small"
-                    :disabled="detailData.seeDisabled || isATD"
+                    :disabled="detailData.seeDisabled"
                     value-format="yyyy-MM-dd"
                     placeholder="选择日期"
                   >

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

@@ -84,7 +84,7 @@
           >{{ $t("btn118n.transferApply") }}
         </el-button>
         <el-button
-          v-if="form.id && form.transferOrderStatus == '已转单'"
+          v-if="form.id && form.transferOrderStatus == '已转单'&&(roleName.includes('admin')||roleName.includes('总部'))"
           size="small"
           type="danger"
           @click.stop="allClick('撤销转单')"

src/views/iosBasicData/bcorps/components/mergeCustomers.vue

@@ -130,7 +130,7 @@ export default {
             this.$emit("importData");
             this.dialogVisible = false;
           })
-          .finally(() => {
+          .catch(() => {
             loading.close();
           });
       });

src/views/iosBasicData/bcorps/detailsPage.vue

@@ -1823,7 +1823,7 @@ export default {
             .then(res => {
               this.getBcorpsDetailfun(this.formData.id);
             })
-            .finally(() => {
+            .catch(() => {
               loading.close();
             });
           res.close();

src/views/ow/owPut/detailsPage.vue

@@ -327,6 +327,11 @@
                   }}
                 </el-tag>
               </template>
+              <template slot="menu" slot-scope="{ row, index }">
+                <el-button v-if="pickIds.filter(item => item == row.id).length" size="small" type="text" @click="rowCancel(row, index)"
+                  >取消</el-button
+                >
+              </template>
               <template slot="index" slot-scope="{ row, index }">
                 <span>{{ index + 1 }}</span>
               </template>
@@ -1938,7 +1943,7 @@ export default {
         refreshBtn: false,
         selection: true,
         align: "center",
-        menu: false,
+        menu: true,
         index: true,
         column: [
           {
@@ -4051,6 +4056,12 @@ export default {
         }
       });
     },
+    rowCancel(row) {
+      let index = this.pickIds.indexOf(row.id);
+      if (index > -1) {
+        this.pickIds.splice(index, 1);
+      }
+    },
     allClick(name) {
       if (name == "一键保存") {
         if (!this.form.tradingBoxItemsList.length) {

src/views/ow/owTask/detailsPage.vue

@@ -569,6 +569,9 @@
                 <span v-else>{{ row.agentName }}</span>
               </tempalte>
               <template slot="menu" slot-scope="{ row, index }">
+                <el-button v-if="pickIds.filter(item => item == row.id).length" size="small" type="text" @click="rowCancel(row, index)"
+                  >取消</el-button
+                >
                 <el-button size="small" type="text" @click="rowBoxEdit(row, index)" :disabled="editDisabled">{{
                   row.$cellEdit ? "保存" : "编辑"
                 }}</el-button>
@@ -2228,7 +2231,7 @@ export default {
         // height: 'auto',
         maxHeight: 340,
         calcHeight: 30,
-        menuWidth: 60,
+        menuWidth: 90,
         searchMenuSpan: 12,
         tip: false,
         border: true,
@@ -4536,6 +4539,12 @@ export default {
         }
       });
     },
+    rowCancel(row) {
+      let index = this.pickIds.indexOf(row.id);
+      if (index > -1) {
+        this.pickIds.splice(index, 1);
+      }
+    },
     allClick(name) {
       if (name == "一键保存") {
         if (!this.form.tradingBoxItemsList.length) {