Browse Source

成本模板 新加字段
OW放 放箱号修改操作流程 选择方式
箱管调箱 放箱号 修改操作流程 选择方式

Qukatie 1 month ago
parent
commit
3a8f832c45

+ 483 - 466
src/components/dicSelect/containerNumber.vue

@@ -1,498 +1,515 @@
 <template>
-    <!-- 中文下拉 -->
-    <div>
-        <div style="display: flex;"  @click="open()">
-            <el-input v-model="value" @input="inputChange" :placeholder="'请选择 ' + placeholder" :disabled="disabled" :size="size" readonly></el-input>
-        </div>
-        <el-dialog :title="titleDialog" :visible.sync="dialogVisible" width="70%" :before-close="false" @closed="closed"
-            append-to-body>
-            <span>
-                <avue-crud v-if="dialogVisible" :option="option" :table-loading="loading" :data="dataList"
-                    :search.sync="query" v-model="form" id="out-table" ref="crud" @row-del="rowDel"
-                    @search-change="searchChange" @search-reset="searchReset" @selection-change="selectionChange"
-                    @on-load="onLoad">
-                </avue-crud>
-            </span>
-            <span slot="footer" class="dialog-footer">
-                <el-button size="small" @click="dialogVisible = false">取 消</el-button>
-                <el-button size="small" type="primary" :disabled="this.selectionList.length != 1" @click="importData">确
-                    定</el-button>
-            </span>
-        </el-dialog>
+  <!-- 中文下拉 -->
+  <div>
+    <div style="display: flex;">
+      <el-input v-model="value" @input="inputChange" :placeholder="'请选择 ' + placeholder" :disabled="true" :size="size" readonly>
+        <el-button slot="prepend" icon="el-icon-search" @click="open()" :disabled="disabled"></el-button>
+      </el-input>
     </div>
+    <el-dialog :title="titleDialog" :visible.sync="dialogVisible" width="70%" :before-close="false" @closed="closed" append-to-body>
+      <span>
+        <avue-crud
+          v-if="dialogVisible"
+          :option="option"
+          :table-loading="loading"
+          :data="dataList"
+          :search.sync="query"
+          v-model="form"
+          id="out-table"
+          ref="crud"
+          @row-del="rowDel"
+          @search-change="searchChange"
+          @search-reset="searchReset"
+          @on-load="onLoad"
+          @current-row-change="handleCurrentRowChange"
+        >
+        </avue-crud>
+      </span>
+      <span slot="footer" class="dialog-footer">
+        <el-button size="small" @click="dialogVisible = false">取 消</el-button>
+        <el-button size="small" type="primary" @click="importData">确 定</el-button>
+      </span>
+    </el-dialog>
+  </div>
 </template>
 
 <script>
 import { getDicinit } from "@/api/dicSelect/index";
-import { bcorpstypedefineList } from "@/api/iosBasicData/bcorpstypedefine"
+import { bcorpstypedefineList } from "@/api/iosBasicData/bcorpstypedefine";
 export default {
-    data() {
-        return {
-            dialogVisible: false,
-            options: [],
-            loading: false,
-            data: {},
-            form: {},
-            query: {},
-            page: {
-                pageSize: 10,
-                currentPage: 1,
-                total: 0
-            },
-            dataList: [],
-            selectionList: [],
-            option: {
-                height: 400,
-                calcHeight: 30,
-                tip: false,
-                searchIcon: true,
-                searchIndex: 3,
-                searchShow: true,
-                searchMenuSpan: 18,
-                border: true,
-                index: true,
-                selection: true,
-                header: false,
-                menu: false,
-                column: [
-                   {
-                        label: "放箱号",
-                        prop: "containerNumber",
-                        width: 100,
-                        overHidden: true,
-                        search:true,
-                    },
-                    {
-                        label: "放箱号类型",
-                        prop: "busType",
-                        width: 100,
-                        overHidden: true,
-                    },
-                    {
-                        label: "场站",
-                        prop: "polStationCname",
-                        width: 100,
-                        overHidden: true,
-                    },
-                    {
-                        label: "箱型",
-                        prop: "boxType",
-                        width: 100,
-                        overHidden: true,
-                    },
-                    {
-                        label: "可用箱数",
-                        prop: "remainingNum",
-                        width: 100,
-                        overHidden: true,
-                    },
-                    {
-                        label: "占用箱量",
-                        prop: "occupyNum",
-                        width: 100,
-                        overHidden: true,
-                    },
-                    {
-                        label: "优先等级",
-                        prop: "priorityLevel",
-                        width: 100,
-                        overHidden: true,
-                    },
-                    {
-                        label: "箱管备注",
-                        prop: "boxRemarks",
-                        width: 100,
-                        overHidden: true,
-                    },
-                    {
-                        label: "备注",
-                        prop: "remarks",
-                        width: 100,
-                        overHidden: true,
-                    }
-                ],
-                designer: null,
-            },
-            treeOption: {
-                nodeKey: "id",
-                lazy: true,
-                treeLoad: function (node, resolve) {
-                    const parentId = node.level === 0 ? 0 : node.data.id;
-                },
-                addBtn: false,
-                menu: false,
-                size: "small",
-                props: {
-                    labelText: "标题",
-                    label: "cnName",
-                    value: "id",
-                    children: "children"
-                }
-            },
-            treeData: [],
-            selectWidth: 0,
-            obtained: true,
+  data() {
+    return {
+      quotationObj: null,
+      dialogVisible: false,
+      options: [],
+      loading: false,
+      data: {},
+      form: {},
+      query: {},
+      page: {
+        pageSize: 10,
+        currentPage: 1,
+        total: 0
+      },
+      dataList: [],
+      selectionList: [],
+      option: {
+        height: 400,
+        calcHeight: 30,
+        tip: false,
+        searchIcon: true,
+        searchIndex: 3,
+        searchShow: true,
+        searchMenuSpan: 18,
+        border: true,
+        index: true,
+        // selection: true,
+        highlightCurrentRow: true,
+        header: false,
+        menu: false,
+        column: [
+          {
+            label: "放箱号",
+            prop: "containerNumber",
+            width: 100,
+            overHidden: true,
+            search: true
+          },
+          {
+            label: "放箱号类型",
+            prop: "busType",
+            width: 100,
+            overHidden: true
+          },
+          {
+            label: "场站",
+            prop: "polStationCname",
+            width: 100,
+            overHidden: true
+          },
+          {
+            label: "箱型",
+            prop: "boxType",
+            width: 100,
+            overHidden: true
+          },
+          {
+            label: "可用箱数",
+            prop: "remainingNum",
+            width: 100,
+            overHidden: true
+          },
+          {
+            label: "占用箱量",
+            prop: "occupyNum",
+            width: 100,
+            overHidden: true
+          },
+          {
+            label: "优先等级",
+            prop: "priorityLevel",
+            width: 100,
+            overHidden: true
+          },
+          {
+            label: "箱管备注",
+            prop: "boxRemarks",
+            width: 100,
+            overHidden: true
+          },
+          {
+            label: "备注",
+            prop: "remarks",
+            width: 100,
+            overHidden: true
+          }
+        ],
+        designer: null
+      },
+      treeOption: {
+        nodeKey: "id",
+        lazy: true,
+        treeLoad: function(node, resolve) {
+          const parentId = node.level === 0 ? 0 : node.data.id;
+        },
+        addBtn: false,
+        menu: false,
+        size: "small",
+        props: {
+          labelText: "标题",
+          label: "cnName",
+          value: "id",
+          children: "children"
         }
+      },
+      treeData: [],
+      selectWidth: 0,
+      obtained: true
+    };
+  },
+  props: {
+    activateCreated: {
+      type: Boolean,
+      default: true
     },
-    props: {
-        activateCreated: {
-            type: Boolean,
-            default: true
-        },
-        slotRight: {
-            type: Boolean,
-            default: false
-        },
-        diySlot: {
-            type: Boolean,
-            default: false
-        },
-        key: {
-            type: [String, Number],
-            default: null
-        },
-        label: {
-            type: String,
-            default: ''
-        },
-        rightLabel: {
-            type: String,
-            default: ''
-        },
-        keyValue: {
-            type: [String, Number],
-            default: null
-        },
-        res: {
-            type: String,
-            default: ''
-        },
-        placeholder: {
-            type: String,
-            default: '请输入'
-        },
-        clearable: {
-            type: Boolean,
-            default: true
-        },
-        value: {
-            type: [String, Number],
-            default: ''
-        },
-        method: {
-            type: String,
-            default: 'GET'
-        },
-        url: {
-            type: String,
-            default: ''
-        },
-        dataName: {
-            type: String,
-            default: ''
-        },
-        multiple: {
-            type: Boolean,
-            default: false
-        },
-        filterable: {
-            type: Boolean,
-            default: false
-        },
-        remote: {
-            type: Boolean,
-            default: false
-        },
-        size: {
-            type: String,
-            default: 'small'
-        },
-        disabled: {
-            type: Boolean,
-            default: false
-        },
-        searchShow: {
-            type: Boolean,
-            default: false
-        },
-        treeShow: {
-            type: Boolean,
-            default: false
-        },
-        mockData: {
-            type: Array,
-            default: function () {
-                return [];
-            }
-        },
-        collapseTags: {
-            type: Boolean,
-            default: false
-        },
-        default: {
-            type: Boolean,
-            default: false
-        },
-        defaultValue: {
-            type: String,
-            default: ''
-        },
-        disabledLabel: {
-            type: String,
-            default: ''
-        },
-        dataType: {
-            type: String,
-            default: ''
-        },
-        titleDialog: {
-            type: String,
-            default: '客户'
-        },
-        multipleStrings: {
-            type: Boolean,
-            default: false
-        },
-        type: {
-            type: String,
-            default: 'select'
-        },
+    slotRight: {
+      type: Boolean,
+      default: false
     },
-    model: {
-        prop: "value",
-        event: "selectedValue"
+    diySlot: {
+      type: Boolean,
+      default: false
     },
-    created() {
+    key: {
+      type: [String, Number],
+      default: null
     },
-    mounted() {
-        if (this.activateCreated) {
-            // this.getDicData()
-        } else {
-            this.options = this.mockData
+    label: {
+      type: String,
+      default: ""
+    },
+    rightLabel: {
+      type: String,
+      default: ""
+    },
+    keyValue: {
+      type: [String, Number],
+      default: null
+    },
+    res: {
+      type: String,
+      default: ""
+    },
+    placeholder: {
+      type: String,
+      default: "请输入"
+    },
+    clearable: {
+      type: Boolean,
+      default: true
+    },
+    value: {
+      type: [String, Number],
+      default: ""
+    },
+    method: {
+      type: String,
+      default: "GET"
+    },
+    url: {
+      type: String,
+      default: ""
+    },
+    dataName: {
+      type: String,
+      default: ""
+    },
+    multiple: {
+      type: Boolean,
+      default: false
+    },
+    filterable: {
+      type: Boolean,
+      default: false
+    },
+    remote: {
+      type: Boolean,
+      default: false
+    },
+    size: {
+      type: String,
+      default: "small"
+    },
+    disabled: {
+      type: Boolean,
+      default: false
+    },
+    searchShow: {
+      type: Boolean,
+      default: false
+    },
+    treeShow: {
+      type: Boolean,
+      default: false
+    },
+    mockData: {
+      type: Array,
+      default: function() {
+        return [];
+      }
+    },
+    collapseTags: {
+      type: Boolean,
+      default: false
+    },
+    default: {
+      type: Boolean,
+      default: false
+    },
+    defaultValue: {
+      type: String,
+      default: ""
+    },
+    disabledLabel: {
+      type: String,
+      default: ""
+    },
+    dataType: {
+      type: String,
+      default: ""
+    },
+    titleDialog: {
+      type: String,
+      default: "客户"
+    },
+    multipleStrings: {
+      type: Boolean,
+      default: false
+    },
+    type: {
+      type: String,
+      default: "select"
+    }
+  },
+  model: {
+    prop: "value",
+    event: "selectedValue"
+  },
+  created() {},
+  mounted() {
+    if (this.activateCreated) {
+      // this.getDicData()
+    } else {
+      this.options = this.mockData;
+    }
+    if (this.diySlot) {
+      this.$nextTick(() => {
+        this.selectWidth = this.$refs.mySelect.$el.offsetWidth;
+        this.$refs.mySelect.$el.querySelector(".el-select-dropdown").style.width = `${this.selectWidth}px`;
+      });
+    }
+  },
+  watch: {
+    value: {
+      handler(val, oldVal) {
+        if (this.dataType == "string") {
+          if (val) {
+            if (typeof val == "string") {
+              this.value = val.split(",");
+            }
+          } else {
+            this.value = [];
+          }
         }
-        if (this.diySlot) {
-            this.$nextTick(() => {
-                this.selectWidth = this.$refs.mySelect.$el.offsetWidth;
-                this.$refs.mySelect.$el.querySelector('.el-select-dropdown').style.width = `${this.selectWidth}px`;
-            });
+      },
+      deep: true,
+      immediate: true
+    }
+  },
+  methods: {
+    handleCurrentRowChange(val) {
+      this.quotationObj = val;
+    },
+    visibleChange(status) {
+      if (status) {
+        if (this.options.length == 0) {
+          this.data = {};
+          this.getDicData();
         }
+      }
     },
-    watch: {
-        value: {
-            handler(val, oldVal) {
-                if (this.dataType == 'string') {
-                    if (val) {
-                        if (typeof val == 'string') {
-                            this.value = val.split(',')
-                        }
-                    } else {
-                        this.value = []
-                    }
-                }
-            },
-            deep: true,
-            immediate: true
+    inputChange() {
+      if (this.dataType == "string") {
+        if (this.value && this.value.length) {
+          this.$emit("selectedValue", this.value.join(","));
+        } else {
+          this.$emit("selectedValue", []);
         }
+      } else {
+        this.$emit("selectedValue", this.value);
+      }
     },
-    methods: {
-        visibleChange(status) {
-            if (status) {
-                if (this.options.length == 0) {
-                    this.data = {}
-                    this.getDicData()
-                }
-
-            }
-        },
-        inputChange() {
-            if (this.dataType == 'string') {
-                if (this.value && this.value.length) {
-                    this.$emit('selectedValue', this.value.join(','))
-                } else {
-                    this.$emit('selectedValue', [])
+    open() {
+      //   this.selectionList = [];
+      this.dialogVisible = true;
+      this.quotationObj = null;
+      this.getTree();
+    },
+    // 获取客户类别
+    getTree() {
+      bcorpstypedefineList(1, 50).then(res => {
+        this.treeData = res.data.data.records;
+      });
+    },
+    nodeClick(data) {
+      this.query.corpTypeName = data.cnName;
+      this.onLoad(this.page, this.query);
+    },
+    closed() {
+      this.query = {};
+      this.selectionList = [];
+    },
+    remoteMethod(query) {
+      if (query !== "") {
+        setTimeout(() => {
+          this.data[this.dataName] = query;
+          this.getDicData();
+        }, 200);
+      } else {
+        setTimeout(() => {
+          this.data = this.$options.data().data;
+          this.getDicData();
+        }, 200);
+      }
+    },
+    getDicData() {
+      if (this.url) {
+        this.loading = true;
+        getDicinit(this.method, this.url, this.data)
+          .then(res => {
+            if (this.res) {
+              res.data.data[this.res].forEach(e => {
+                if (this.disabledLabel.split(",").some(item => item == e[this.label])) {
+                  e.disabled = true;
                 }
+              });
+              this.options = res.data.data[this.res];
             } else {
-                this.$emit('selectedValue', this.value)
-            }
-
-        },
-        open() {
-            this.selectionList=[]
-            this.dialogVisible = true
-            this.getTree()
-        },
-        // 获取客户类别
-        getTree() {
-            bcorpstypedefineList(1, 50).then(res => {
-                this.treeData = res.data.data.records
-            })
-        },
-        nodeClick(data) {
-            this.query.corpTypeName = data.cnName
-            this.onLoad(this.page, this.query);
-        },
-        closed() {
-            this.query = {}
-            this.selectionList = []
-        },
-        remoteMethod(query) {
-            if (query !== '') {
-                setTimeout(() => {
-                    this.data[this.dataName] = query
-                    this.getDicData()
-                }, 200);
-            } else {
-                setTimeout(() => {
-                    this.data = this.$options.data().data
-                    this.getDicData()
-                }, 200);
+              res.data.data.forEach(e => {
+                if (this.disabledLabel.split(",").some(item => item == e[this.label])) {
+                  e.disabled = true;
+                }
+              });
+              this.options = res.data.data;
             }
-        },
-        getDicData() {
-            if (this.url) {
-                this.loading = true
-                getDicinit(this.method, this.url, this.data).then(res => {
-                    if (this.res) {
-                        res.data.data[this.res].forEach(e => {
-                            if (this.disabledLabel.split(",").some(item => item == e[this.label])) {
-                                e.disabled = true
-                            }
-                        })
-                        this.options = res.data.data[this.res]
-                    } else {
-                        res.data.data.forEach(e => {
-                            if (this.disabledLabel.split(",").some(item => item == e[this.label])) {
-                                e.disabled = true
-                            }
-                        })
-                        this.options = res.data.data
-                    }
-                }).finally(() => {
-                    this.loading = false;
-                })
-            } else {
-                this.options = this.mockData
+          })
+          .finally(() => {
+            this.loading = false;
+          });
+      } else {
+        this.options = this.mockData;
+      }
+    },
+    IdGetDicData(data) {
+      this.loading = true;
+      getDicinit(this.method, this.url, data)
+        .then(res => {
+          if (this.res) {
+            this.options = res.data.data[this.res];
+          } else {
+            this.options = res.data.data;
+          }
+        })
+        .finally(() => {
+          this.loading = false;
+        });
+    },
+    selectChange(row) {
+      if (this.dataType == "string") {
+        let data = [];
+        let ids = [];
+        let multipleData = [];
+        this.options.forEach(e => {
+          if (row.length) {
+            if (this.keyValue) {
+              row.forEach(item => {
+                if (item == e[this.keyValue]) {
+                  data.push(e[this.label]);
+                  this.$emit("selectChange", data.join(","));
+                }
+              });
             }
-
-        },
-        IdGetDicData(data) {
-            this.loading = true
-            getDicinit(this.method, this.url, data).then(res => {
-                if (this.res) {
-                    this.options = res.data.data[this.res]
-                } else {
-                    this.options = res.data.data
+            if (this.label) {
+              row.forEach(item => {
+                if (item == e[this.label]) {
+                  ids.push(e.id);
+                  data.push(e[this.label]);
+                  if (this.multipleStrings) {
+                    multipleData.push(e);
+                    this.$emit("selectChange", {
+                      ids: ids.join(","),
+                      names: data.join(","),
+                      multipleData: multipleData
+                    });
+                  } else {
+                    this.$emit("selectChange", {
+                      ids: ids.join(","),
+                      names: data.join(",")
+                    });
+                  }
                 }
-            }).finally(() => {
-                this.loading = false;
-            })
-        },
-        selectChange(row) {
-            if (this.dataType == 'string') {
-                let data = []
-                let ids = []
-                let multipleData = []
-                this.options.forEach(e => {
-                    if (row.length) {
-                        if (this.keyValue) {
-                            row.forEach(item => {
-                                if (item == e[this.keyValue]) {
-                                    data.push(e[this.label])
-                                    this.$emit('selectChange', data.join(','))
-                                }
-                            })
-
-                        }
-                        if (this.label) {
-                            row.forEach(item => {
-                                if (item == e[this.label]) {
-                                    ids.push(e.id)
-                                    data.push(e[this.label])
-                                    if (this.multipleStrings) {
-                                        multipleData.push(e)
-                                        this.$emit('selectChange', {
-                                            ids: ids.join(','),
-                                            names: data.join(','),
-                                            multipleData: multipleData
-                                        })
-                                    } else {
-                                        this.$emit('selectChange', {
-                                            ids: ids.join(','),
-                                            names: data.join(','),
-                                        })
-                                    }
-
-                                }
-
-                            })
-                        }
-                    } else {
-                        this.$emit('selectChange', null)
-                    }
-
-                })
-            } else {
-                this.options.forEach(e => {
-                    if (this.keyValue) {
-                        if (row == e[this.keyValue]) {
-                            this.$emit('selectChange', e)
-                        }
-                    }
-                    if (this.label) {
-                        if (row == e[this.label]) {
-                            this.$emit('selectChange', e)
-                        }
-                    }
-                })
+              });
             }
-
-        },
-        clear() {
-            if (this.url) {
-                this.data = this.$options.data().data
-                this.getDicData()
+          } else {
+            this.$emit("selectChange", null);
+          }
+        });
+      } else {
+        this.options.forEach(e => {
+          if (this.keyValue) {
+            if (row == e[this.keyValue]) {
+              this.$emit("selectChange", e);
             }
-            this.$emit('selectChange', null)
-        },
-        importData() {
-            this.dialogVisible = false
-            this.$emit('selectChange', this.selectionList[0])
-        },
-        searchChange(params, done) {
-            this.page.currentPage = 1;
-            this.onLoad(this.page, this.query);
-            done();
-        },
-        selectionChange(list) {
-            this.selectionList = list;
-        },
-        currentChange(currentPage) {
-            this.page.currentPage = currentPage;
-        },
-        sizeChange(pageSize) {
-            this.page.pageSize = pageSize;
-        },
-        refreshChange() {
-            this.onLoad(this.page, this.query);
-        },
-        onLoad(page, params = {}) {
-            let obj = {}
-            obj = {
-                ...Object.assign(params, this.query),
+          }
+          if (this.label) {
+            if (row == e[this.label]) {
+              this.$emit("selectChange", e);
             }
-            this.loading = true
-            getDicinit(this.method, this.url, obj).then(res => {
-                this.dataList = res.data.data
-            }).finally(() => {
-                this.loading = false;
-            })
-        },
+          }
+        });
+      }
+    },
+    clear() {
+      if (this.url) {
+        this.data = this.$options.data().data;
+        this.getDicData();
+      }
+      this.$emit("selectChange", null);
+    },
+    importData() {
+      if (!this.quotationObj) {
+        return this.$message.error("请选择数据");
+      }
+      this.dialogVisible = false;
+      this.$emit("selectChange", this.quotationObj);
+    },
+    searchChange(params, done) {
+      this.page.currentPage = 1;
+      this.onLoad(this.page, this.query);
+      done();
+    },
+    selectionChange(list) {
+      this.selectionList = list;
+    },
+    currentChange(currentPage) {
+      this.page.currentPage = currentPage;
+    },
+    sizeChange(pageSize) {
+      this.page.pageSize = pageSize;
+    },
+    refreshChange() {
+      this.onLoad(this.page, this.query);
+    },
+    onLoad(page, params = {}) {
+      let obj = {};
+      obj = {
+        ...Object.assign(params, this.query)
+      };
+      this.loading = true;
+      getDicinit(this.method, this.url, obj)
+        .then(res => {
+          this.dataList = res.data.data;
+        })
+        .finally(() => {
+          this.loading = false;
+        });
     }
-}
+  }
+};
 </script>
 
 <style lang="scss" scoped>
 /deep/ .el-col-md-8 {
-    width: 24.33333%;
+  width: 24.33333%;
 }
 </style>

+ 12 - 0
src/components/extractionCost/main.vue

@@ -122,6 +122,18 @@ export default {
             overHidden: true
           },
           {
+            label: "船名",
+            prop: "shipCname",
+            width: 90,
+            overHidden: true
+          },
+          {
+            label: "航次",
+            prop: "voyage",
+            width: 90,
+            overHidden: true
+          },
+          {
             label: "运输条款",
             prop: "transportationTerms",
             overHidden: true

+ 4 - 15
src/views/boxManagement/boxAdjustment/components/containerNumber.vue

@@ -300,7 +300,7 @@ export default {
       console.log(val);
       this.dialogVisible = true;
       this.quotationObj = null;
-      this.query.containerNumber = val;
+      // this.query.containerNumber = val;
     },
     handleCurrentRowChange(val) {
       this.quotationObj = val;
@@ -320,25 +320,14 @@ export default {
         polStationEname: this.quotationObj.polCnpolStationEnameame,
         boxTypeQuantityOne: this.quotationObj.boxType,
         boxNumber: this.quotationObj.remainingNum,
-        containerNumber:this.quotationObj.containerNumber
+        containerNumber: this.quotationObj.containerNumber
       };
       if (this.query.containerNumber == this.quotationObj.containerNumber) {
         this.$emit("importData", obj, false);
         this.dialogVisible = false;
       } else {
-        this.$confirm(`查询的放箱号${this.query.containerNumber}和选中的放箱号${this.quotationObj.containerNumber}不一致,是否覆盖放箱号!`, "提示", {
-          confirmButtonText: "是",
-          cancelButtonText: "否",
-          type: "warning"
-        })
-          .then(() => {
-            this.$emit("importData", obj, true);
-            this.dialogVisible = false;
-          })
-          .catch(() => {
-            this.$emit("importData", obj, false);
-            this.dialogVisible = false;
-          });
+        this.$emit("importData", obj, true);
+        this.dialogVisible = false;
       }
     },
     //自定义列保存

+ 5 - 5
src/views/boxManagement/boxAdjustment/detailsPage.vue

@@ -169,10 +169,10 @@
                   v-model="form.containerNumber"
                   placeholder="请输入 放箱号"
                   size="small"
-                  :disabled="editDisabled || form.buxStaus == '已确认'"
+                  :disabled="true"
                 >
                   <el-button
-                    slot="append"
+                    slot="prepend"
                     icon="el-icon-search"
                     :disabled="editDisabled || form.buxStaus == '已确认'"
                     @click="allClick('导入放箱号', form.containerNumber)"
@@ -2120,9 +2120,9 @@ export default {
     allClick(name, row) {
       if (name == "导入放箱号") {
         console.log(row);
-        if (!row) {
-          return this.$message.error("请输入放箱号");
-        }
+        // if (!row) {
+        //   return this.$message.error("请输入放箱号");
+        // }
         this.$refs.container.openDialog(row);
       }
       if (name == "box一键保存") {

+ 12 - 20
src/views/ow/owPut/detailsPage.vue

@@ -77,24 +77,16 @@
                   :url="'/blade-los/putbox/selectContainerNumber?boxType=' + (form.boxTypeQuantityOne ? form.boxTypeQuantityOne : '') + '&polId=' + (form.polId ? form.polId : '') + '&podId=' + (form.podId ? form.podId : '') + '&polStationId=' + (form.polStationId ? form.polStationId : '')"
                   :filterable="true" @selectChange="dicChange('containerNumber', $event)">
                 </dic-select> -->
-                <container-number
-                  v-model="form.containerNumber"
-                  placeholder="放箱号"
-                  label="containerNumber"
-                  :url="
-                    '/blade-los/putbox/selectContainerNumber?boxType=' +
-                      (form.boxTypeQuantityOne ? form.boxTypeQuantityOne : '') +
-                      '&polId=' +
-                      (form.polId ? form.polId : '') +
-                      '&podId=' +
-                      (form.podId ? form.podId : '') +
-                      '&polStationId=' +
-                      (form.polStationId ? form.polStationId : '')
-                  "
-                  @selectChange="dicChange('containerNumber', $event)"
-                  :titleDialog="放箱号"
-                  :disabled="editDisabled || form.whetherEnable == '是'"
-                ></container-number>
+                       <container-number
+                  ref="containerNumberRef"
+                    v-model="form.containerNumber"
+                    placeholder="放箱号"
+                    label="containerNumber"
+                    url="/blade-los/putbox/selectContainerNumber"
+                    @selectChange="dicChange('containerNumber', $event)"
+                    titleDialog="放箱号"
+                    :disabled="editDisabled || form.whetherEnable == '是'"
+                  ></container-number>
               </tempalte>
               <!-- <tempalte slot="polStationCname">
                 <dic-select v-model="form.polStationCname" placeholder="起运港提/送箱场站" key="id" label="cnName" res="records"
@@ -2919,7 +2911,7 @@ export default {
       containerNumberKey: new Date().getTime(),
       deptId: JSON.parse(localStorage.getItem("sysitemData")).deptId,
       fixData: true,
-      expenseApplication:0,
+      expenseApplication: 0
     };
   },
   components: {
@@ -2951,7 +2943,7 @@ export default {
     if (this.detailData.copyId) {
       this.getCopydate(this.detailData.copyId);
     }
-     isProcurement({ param: "expense.application" }).then(res => {
+    isProcurement({ param: "expense.application" }).then(res => {
       if (res.data.data) {
         this.expenseApplication = res.data.data;
       }