Browse Source

查看放箱号 去掉操作列
OW 放箱号租箱 箱号检索加大

Qukatie 1 day ago
parent
commit
09fb644f98

+ 5 - 1
src/views/boxManagement/agentBox/detailsPage.vue

@@ -248,6 +248,9 @@
               <template slot="index" slot-scope="{ row, index }">
                 <span>{{ index + 1 }}</span>
               </template>
+              <template slot="codeSearch">
+                <el-input v-model="query.code" size="small" placeholder="请输入箱号 多个箱号用空格区分" type="textarea" autosize></el-input>
+              </template>
               <template slot="codeForm" slot-scope="{ row }">
                 <el-input
                   v-if="row.$cellEdit"
@@ -1176,7 +1179,7 @@ export default {
         maxHeight: 340,
         calcHeight: 30,
         menuWidth: 60,
-        searchMenuSpan: 18,
+        searchMenuSpan: 12,
         tip: false,
         index: true,
         border: true,
@@ -1199,6 +1202,7 @@ export default {
             label: "箱号",
             prop: "code",
             width: 140,
+            searchSpan: 12,
             searchPlaceholder: "请输入箱号 多个箱号用空格区分",
             search: true,
             overHidden: true

+ 5 - 1
src/views/boxManagement/containerNumber/detailsPage.vue

@@ -306,6 +306,9 @@
           <template slot="index" slot-scope="{ row, index }">
             <span>{{ index + 1 }}</span>
           </template>
+          <template slot="codeSearch">
+            <el-input v-model="query.code" size="small" placeholder="请输入箱号 多个箱号用空格区分" type="textarea" autosize></el-input>
+          </template>
           <template slot="boxCodeForm" slot-scope="{ row }">
             <el-input
               v-if="row.$cellEdit"
@@ -950,7 +953,7 @@ export default {
         maxHeight: 340,
         calcHeight: 30,
         menuWidth: 60,
-        searchMenuSpan: 18,
+        searchMenuSpan: 12,
         tip: false,
         border: true,
         addBtn: false,
@@ -973,6 +976,7 @@ export default {
             label: "箱号",
             prop: "boxCode",
             width: 140,
+            searchSpan: 12,
             searchPlaceholder: "请输入箱号 多个箱号用空格区分",
             search: true,
             cell: true,

+ 12 - 12
src/views/iosBasicData/SeafreightExportF/bills/assembly/EntrustmentLnformation/precontainers.vue

@@ -682,12 +682,12 @@ export default {
   async created() {
     this.option = await this.getColumnData(this.getColumnName(487), this.optionBack);
     this.containerOption = await this.getColumnData(this.getColumnName(488), this.containerOptionBack);
-    isProcurement({ param: "is.occupyNum" }).then(res => {
-      if (res.data.data == 1) {
-        this.containerOption.menu = true;
-        this.isOccupyNum = true;
-      }
-    });
+    // isProcurement({ param: "is.occupyNum" }).then(res => {
+    //   if (res.data.data == 1) {
+    //     this.containerOption.menu = true;
+    //     this.isOccupyNum = true;
+    //   }
+    // });
   },
   methods: {
     sendEdi() {
@@ -1335,9 +1335,9 @@ export default {
        * 一定要执行异步操作,要等接口成功返回,才能执行下一行代码
        */
       const inSave = await this.saveColumnData(this.getColumnName(code), this[option]);
-      if (this.isOccupyNum == true) {
-        this.containerOption.menu = true;
-      }
+      // if (this.isOccupyNum == true) {
+      //   this.containerOption.menu = true;
+      // }
       if (inSave) {
         this.$message.success("保存成功");
         //关闭窗口
@@ -1348,9 +1348,9 @@ export default {
     async resetColumnTwo(ref, option, optionBack, code) {
       this[option] = this[optionBack];
       const inSave = await this.delColumnData(this.getColumnName(code), this[optionBack]);
-      if (this.isOccupyNum == true) {
-        this.containerOption.menu = true;
-      }
+      // if (this.isOccupyNum == true) {
+      //   this.containerOption.menu = true;
+      // }
       if (inSave) {
         this.$message.success("重置成功");
         this.$refs[ref].$refs.dialogColumn.columnBox = false;

+ 13 - 11
src/views/iosBasicData/boxDynamic/components/report.vue

@@ -38,7 +38,7 @@
 
 <script>
 // @ts-nocheck
-import { reportsGetReportDataBox } from "@/api/iosBasicData/reports";
+import { getList,reportsGetReportDataBox } from "@/api/iosBasicData/reports";
 import reportContainer from "./report-container.vue";
 import dicSelect from "@/components/dicSelect/main.vue";
 export default {
@@ -202,17 +202,17 @@ export default {
   },
   methods: {
     openDialog() {
-      //   this.onLoad(this.page, this.query, true);
-      console.log(111)
-      this.rowCell();
+        this.onLoad(this.page, this.query, true);
+      // console.log(111)
+      // this.rowCell();
     },
     // 打印报表获取数据
     rowCell(url, row) {
       let obj = {};
       obj = {
-        id: this.id,
-        reportCode: row.classifyCode,
-        groupCode: row.groupCode,
+        billId: this.id,
+        reportCode: 'OW',
+        groupCode:'动态查询',
         itemIds: this.itemIds,
         type: this.businessValue,
       };
@@ -349,16 +349,18 @@ export default {
     onLoad(page, params = {}, type) {
       this.loading = true;
       params.businessType = this.businessValue;
-      params.classifyCode = this.classifyCode;
-      params.groupCode = this.groupCode;
+      params.classifyCode = 'OW';
+      params.groupCode = '动态查询';
       getList(page.currentPage, page.pageSize, Object.assign(params, this.query))
         .then(res => {
           if (type) {
             if (res.data.data.records.length == 1) {
               this.rowCell(res.data.data.records[0].url, res.data.data.records[0]);
-            } else {
+            } 
+            if (res.data.data.records.length == 0) {
               //报表没数据或者有多个数据时弹窗
-              this.previewDialog = true;
+              // this.previewDialog = true;
+                     return this.$message.error("没配置报表,暂时不能正常使用!");
             }
           }
           this.page.total = res.data.data.total;

+ 4 - 1
src/views/iosBasicData/boxDynamic/index.vue

@@ -63,7 +63,7 @@
     <div style="padding:0 20px 20px 20px;">
       <avue-crud class="diy_table" :option="option" :data="form.tradingBoxItemsList"> </avue-crud>
     </div>
-    <report ref="report" :id="form.id" businessValue="经销商" classifyCode="销售预测" ></report>
+    <report ref="report" :id="form.id" businessValue="OW-N" classifyCode="动态查询" ></report>
   </div>
 </template>
 
@@ -158,6 +158,9 @@ export default {
   created() {},
   methods: {
     openReport(){
+      if(!this.form.id){
+         return this.$message.error("没数据,不允许打开报表!");
+      }
       this.$refs.report.openDialog()
     },
     search() {

+ 11 - 1
src/views/ow/owPut/detailsPage.vue

@@ -271,6 +271,15 @@
               <template slot="index" slot-scope="{ row, index }">
                 <span>{{ index + 1 }}</span>
               </template>
+                <template slot="codeSearch">
+                <el-input
+                  v-model="boxQuery.code"
+                  size="small"
+                  placeholder="请输入箱号 多个箱号用空格区分"
+                  type="textarea"
+                  autosize
+                ></el-input>
+              </template>
               <template slot="codeForm" slot-scope="{ row }">
                 <el-input
                   v-if="row.$cellEdit"
@@ -1770,7 +1779,7 @@ export default {
         maxHeight: 340,
         calcHeight: 30,
         menuWidth: 60,
-        searchMenuSpan: 18,
+        searchMenuSpan: 12,
         tip: false,
         border: true,
         addBtn: false,
@@ -1787,6 +1796,7 @@ export default {
             label: "箱号",
             prop: "code",
             width: 140,
+            searchSpan:12,
             searchPlaceholder: "请输入箱号 多个箱号用空格区分",
             search: true,
             cell: true,

+ 13 - 6
src/views/ow/owTask/detailsPage.vue

@@ -179,6 +179,7 @@
                     :filterable="true"
                     :remote="true"
                     dataName="cnName"
+                    style="width:100%"
                     @selectChange="dicChange('polStationCname', $event)"
                     :disabled="editDisabled || !form.polCname || (fixData && form.whetherEnable == '是')"
                   ></dic-select>
@@ -307,11 +308,7 @@
                 <el-button type="danger" plain size="small" :disabled="editDisabled || selectionList.length == 0" @click="allClick('批量删除')"
                   >批量删除</el-button
                 >
-                <el-button
-                  type="success"
-                  size="small"
-                  :disabled="editDisabled || !form.id || form.tradingBoxItemsList.length == 0"
-                  @click="allClick('导出')"
+                <el-button type="success" size="small" :disabled="!form.id || form.tradingBoxItemsList.length == 0" @click="allClick('导出')"
                   >导出</el-button
                 >
                 <el-button type="primary" size="small" :disabled="editDisabled || selectionList.length == 0" @click="allClick('批量修改POD场站')">
@@ -325,6 +322,15 @@
               <template slot="index" slot-scope="{ row, index }">
                 <span>{{ index + 1 }}</span>
               </template>
+              <template slot="codeSearch">
+                <el-input
+                  v-model="boxQuery.code"
+                  size="small"
+                  placeholder="请输入箱号 多个箱号用空格区分"
+                  type="textarea"
+                  autosize
+                ></el-input>
+              </template>
               <template slot="codeForm" slot-scope="{ row }">
                 <el-input
                   v-if="row.$cellEdit"
@@ -2077,7 +2083,7 @@ export default {
         maxHeight: 340,
         calcHeight: 30,
         menuWidth: 60,
-        searchMenuSpan: 18,
+        searchMenuSpan: 12,
         tip: false,
         border: true,
         addBtn: false,
@@ -2094,6 +2100,7 @@ export default {
             label: "箱号",
             prop: "code",
             width: 140,
+            searchSpan:12,
             searchPlaceholder: "请输入箱号 多个箱号用空格区分",
             search: true,
             cell: true,