Merge branch 'dev' of http://192.168.5.5:10010/r/web/WMS into dev

zuozhengqing

2023-11-10 d3004dd80e5fa80c696eaf2aeff089c5fb01bfe2

 src/views/overview/AddOverviewDialog.vue

@@ -144,7 +144,12 @@
                    style="width: 90%"
                    :disabled="!showFooter"
                  >
                    <el-option v-for="item in toLocationOptions" :key="item.id" :label="item.jointName" :value="item.id">
                    <el-option
                      v-for="item in toLocationOptions"
                      :key="item.id"
                      :label="item.jointName"
                      :value="item.id"
                    >
                    </el-option>
                  </el-select>
                </el-form-item>
@@ -158,7 +163,12 @@
                    style="width: 90%"
                    :disabled="!showFooter"
                  >
                    <el-option v-for="item in toLocationOptions" :key="item.id" :label="item.jointName" :value="item.id">
                    <el-option
                      v-for="item in toLocationOptions"
                      :key="item.id"
                      :label="item.jointName"
                      :value="item.id"
                    >
                    </el-option>
                  </el-select>
                </el-form-item>
@@ -215,6 +225,7 @@
            <el-tabs v-model="activeName" type="card">
              <!-- <el-tab-pane v-if="workType !== 1" label="详情" name="detail"> </el-tab-pane> -->
              <el-tab-pane label="产品" name="first"> </el-tab-pane>
              <el-tab-pane label="发货信息" name="two"></el-tab-pane>
            </el-tabs>
            <!-- 操作 -->
            <div v-if="activeName === 'first'">
@@ -234,6 +245,30 @@
                  </el-table-column>
                </template>
              </CommonFormTableView>
            </div>
            <!-- 发货信息 -->
            <div v-if="activeName==='two'">
              <el-form label-position="left" label-width="80px" :model="shipmentsInfo">
                <el-form-item label="承运商"  style="width: 50%;">
                  <el-select :disabled="!showFooter" v-model="editConfig.infomation.logisticCompanyId" placeholder="请选择" style="width: 100%;">
                    <el-option
                      v-for="item in shipmentsInfo.carrier"
                      :key="item.id"
                      :label="item.name"
                      :value="item.id">
                    </el-option>
                  </el-select>
                </el-form-item>
                <el-form-item label="运单号" style="width: 50%;">
                  <el-input :disabled="!showFooter" v-model="editConfig.infomation.waybillNumber"></el-input>
                </el-form-item>
                <el-form-item label="重量" style="width: 50%;">
                  <el-input :disabled="!showFooter" v-model="editConfig.infomation.weight"></el-input>
                </el-form-item>
                <el-form-item label="物流重量" style="width: 50%;">
                  <el-input :disabled="!showFooter" v-model="editConfig.infomation.logisticWeight"></el-input>
                </el-form-item>
              </el-form>
            </div>
            <!-- 详情 -->
            <!-- <div v-if="activeName === 'detail'">
@@ -275,7 +310,8 @@
  updateOperation,
  updateStatus,
  deleteOperation,
  getListTransfer
  getListTransfer,
  getLogisticCompanyList
} from "@/api/overview/overview"
import { getCompanyList } from "@/api/common/other"
export default {
@@ -346,7 +382,13 @@
      companyObj: {},
      contacterObj: {},
      isValidateClick: false, // 验证是否显示
      operationTypeOptions: [] // 入库类型列表
      operationTypeOptions: [], // 入库类型列表
      shipmentsInfo: {
        carrier:[],
        waybillNumber:'',
        weight:0,
        logisticWeight:0,
      }
    }
  },
  created() {
@@ -359,14 +401,15 @@
    if (this.showOperationType) {
      this.getListTransfer()
    }
    this.getLogisticCompanyList()
  },
  methods: {
    // 获取公司列表
    async getCompanyList() {
      await getCompanyList().then((res) => {
        console.log(res)
        if (res.data.code === 200) {
          this.companyOptions = res.data.data
        if (res.code === 200) {
          this.companyOptions = res.data
        }
      })
    },
@@ -374,7 +417,7 @@
    async getLocationList() {
      await getLocationList({
        keyWord: "",
        jointName:this.editConfig.code,
        jointName: this.editConfig.code,
        page: 0,
        pageSize: 0
      }).then((res) => {
@@ -391,9 +434,9 @@
        page: 0,
        pageSize: 0
      }).then((res) => {
        console.log(res.data.data)
        if (res.data.code === 200) {
          const list = res.data.data.map((item) => {
        console.log(res.data)
        if (res.code === 200) {
          const list = res.data.map((item) => {
            return {
              name: item.name,
              id: item.id
@@ -468,6 +511,13 @@
      this.showFooter = true
      this.setTableForm()
    },
    async getLogisticCompanyList(){
      await getLogisticCompanyList().then((res) => {
        if(res.code===200){
          this.shipmentsInfo.carrier=res.data
        }
      })
    },
    // 保存
    saveClick(formName) {
      this.$refs[formName].validate((valid) => {
@@ -517,7 +567,7 @@
        contacterName = Object.keys(this.contacterObj).length === 0 ? data.contacterName : this.contacterObj.label
      }
      let params = {
        baseOperationType:data.baseOperationType,
        baseOperationType: data.baseOperationType,
        comment: data.comment || "",
        companyID: companyID,
        companyName: companyName,
@@ -532,7 +582,11 @@
        operationTypeName: this.receiptType,
        sourceNumber: data.sourceNumber || "",
        status: 3,
        toLocationId: data.toLocationId || 0
        toLocationId: data.toLocationId || 0,
        waybillNumber:data.waybillNumber||'',
        weight:data.weight||0,
        logisticWeight:data.logisticWeight||0,
        logisticCompanyId:data.logisticCompanyId,
      }
      return params
    },
@@ -589,6 +643,7 @@
    },
    // 新增
    addProductClick(value) {
      console.log(value)
      if (value === "操作") {
        console.log(this.tableData)
        for (let i = 0; i < this.tableData.length; i++) {
@@ -760,10 +815,10 @@
  .el-tabs--card > .el-tabs__header {
    border-bottom: none;
  }
  .el-tabs__item.is-active {
    color: #333;
    background: #f1f3f8;
  }
  // .el-tabs__item.is-active {
  //   color: #333;
  //   background: #f1f3f8;
  // }
  .el-tabs__item {
    height: 30px;
    line-height: 30px;
@@ -773,5 +828,18 @@
  .el-tabs__header {
    margin: 0 0 1px;
  }
  .bottom{
    .el-form{
      // border-top: 1px solid #EBEEF5;
    }
    .el-form-item{
      height: 28px;
      .el-input {
        input{
          height: 28px;
        }
      } 
    }
  }
}
</style>