zuozhengqing
2024-04-08 37630069ea5db733bd8d20fd6b10b5000fb99eb9
发货单关联发货仓库
3个文件已修改
92 ■■■■ 已修改文件
src/api/sales/salesDetails.js 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/sales/salesDetails/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/sales/salesDetails/shipmentsDialog.vue 82 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/api/sales/salesDetails.js
@@ -96,4 +96,12 @@
    data
  })
}
// 按仓库进行发货
export function getDeliveryPrepareInfoByWarehouse(data) {
  return request({
    url: "/api/salesDetails/getDeliveryPrepareInfoByWarehouse",
    method: "post",
    data
  })
}
src/views/sales/salesDetails/index.vue
@@ -785,7 +785,7 @@
      this.editShipmentsConfig.infomation.saleDetailID = row.id
      this.editShipmentsConfig.infomation.deliverType = row.deliverType ? row.deliverType : 1
      this.editShipmentsConfig.infomation.saleDetailNumber = row.number
      this.editShipmentsConfig.infomation.projectId = row.projectId
      // this.editShipmentsConfig.infomation.projectId = row.projectId
    },
    // 确认发货完成
    async confirmClick(row) {
src/views/sales/salesDetails/shipmentsDialog.vue
@@ -30,13 +30,12 @@
                  </el-radio-group>
                </el-form-item>
              </el-col>
              <el-col :span="24">
              <!-- <el-col :span="24">
                <el-form-item label="关联项目:" prop="projectId">
                  <el-select
                    v-model="editConfig.infomation.projectId"
                    placeholder="请选择"
                    size="mini"
                    :disabled="true"
                  >
                    <el-option
                      v-for="item in projectList"
@@ -47,19 +46,19 @@
                    </el-option>
                  </el-select>
                </el-form-item>
              </el-col>
              <!-- <el-col :span="24">
              </el-col> -->
              <el-col :span="24">
                <el-form-item  label="发货仓库" prop="addressee">
                  <el-select  v-model="value" placeholder="请选择">
                  <el-select  v-model="value" placeholder="请选择" @change="optionsChange">
                    <el-option
                      v-for="item in options"
                      :key="item.value"
                      :label="item.label"
                      :value="item.value">
                      :key="item.warehouseId"
                      :label="item.warehouseName"
                      :value="item">
                    </el-option>
                  </el-select>
                </el-form-item>
              </el-col> -->
              </el-col>
            </el-row>
          </div>
          <div class="product-view" v-if="isCommonShow">
@@ -98,7 +97,7 @@
<script>
import CommonFormTableView from "@/components/makepager/CommonFormTableView"
import { getAllData } from "@/api/client/client"
import { getProjectList,getDeliveryPrepareInfo,confirmOutput } from "@/api/sales/salesDetails"
import { getProjectList,getDeliveryPrepareInfo,confirmOutput,getDeliveryPrepareInfoByWarehouse } from "@/api/sales/salesDetails"
import codeMixin from "@/components/makepager/mixin/codeMixin"
import { getSaleChanceList } from "@/api/sales/salesOpportunity"
import { getDataByType } from "@/api/data"
@@ -211,19 +210,14 @@
          return time.getTime() > Date.now()
        }
      },
      options: [{
        value: '1',
        label: '仓库1--库存不足的情况'
      }, {
        value: '2',
        label: '仓库1--库存充足的情况'
      }],
      options: [],
      value:"",
      shipmentsList:[],
      shipmentsMsg:"",
      dissatisfy:false, // 一次发货-不足
      completely:false, // 多次发货,充足
      isCommonShow:true,
      warehouseId:null,
    }
  },
  mounted(){
@@ -241,6 +235,11 @@
    this.getDeliveryPrepareInfo({
          saleDetailID: this.editCommonConfig.infomation.saleDetailID,
          saleDetailNumber: this.editCommonConfig.infomation.saleDetailNumber
    })
    this.getDeliveryPrepareInfoByWarehouse({
      groupByWarehouse: true,
      saleDetailID: this.editCommonConfig.infomation.saleDetailID,
      saleDetailNumber: this.editCommonConfig.infomation.saleDetailNumber
    })
  },
  watch: {
@@ -291,7 +290,6 @@
      this.$refs[formName].validate((valid) => {
        if (valid) {
          const params = this.saveParams()
          console.log(params,"参数")
          let isShipments=false
          let shipmentsNum=false
          this.shipmentsList.map((item)=>{
@@ -307,8 +305,6 @@
              if(item.outputAmount>item.availableAmount||item.outputAmount>item.leftAmount){
                isShipments=true
              }else if(item.outputAmount===0){
                shipmentsNum=true
              }else if(!item.outputAmount){
                shipmentsNum=true
              }else if(item.leftAmount<=0){
                isShipments=true
@@ -336,7 +332,8 @@
    saveParams() {
      let params = {
        products:[],
        saleDetailNumber:this.editCommonConfig.infomation.saleDetailNumber
        saleDetailNumber:this.editCommonConfig.infomation.saleDetailNumber,
        warehouseId:this.warehouseId
      }
      this.shipmentsList.map((item)=>{
        let obj={
@@ -375,7 +372,6 @@
      var restaurants = []
      if (value === "client") {
        restaurants = this.clientList
        console.log(restaurants, "客户单")
      } else if (value === "chance") {
          restaurants = this.saleChancelist
      } else if (value === "subbill") {
@@ -570,6 +566,9 @@
        pageSize: 100
      }).then((res) => {
        this.projectList = res.data
        // if(res&&res.data.length>0){
        //   this.editConfig.infomation.projectId=res.data[0].projectId
        // }
      })
    },
    // 销售负责人自定义校验规则
@@ -702,7 +701,6 @@
                this.shipmentsList.push(item)
              }
            })
            console.log(portion,"portion2")
            if(portion===0){// 没有产品满足发货条件
              this.completely=false
              this.dissatisfy=true
@@ -720,6 +718,44 @@
          }
        }
      })
    },
    // 按仓库进行发货
    async getDeliveryPrepareInfoByWarehouse(params){
      await getDeliveryPrepareInfoByWarehouse(params).then((res)=>{
        this.options=res.data
      })
    },
    // 选择仓库
    optionsChange(val){
      this.warehouseId=val.warehouseId
      this.productTableList.tableData=val.storeInfoList||[]
          if(this.editConfig.infomation.deliverType===1){
            let portion=0
            this.productTableList.tableData.map((item)=>{
              item.availableAmount=Number(item.availableAmount)
              item.leftAmount=Number(item.leftAmount)
              item.finishAmount=Number(item.finishAmount)
              item.orderAmount=Number(item.orderAmount)
              if(item.availableAmount>=item.leftAmount&&item.availableAmount>0&&item.leftAmount>0){
                portion++
                this.shipmentsList.push(item)
              }
            })
            if(portion===0){// 没有产品满足发货条件
              this.completely=false
              this.dissatisfy=true
              this.shipmentsMsg="可用库存或未发货数量为0或当前可用库存不满足未发货数量,不能完成一次发货"
            }else if(portion>0&&portion<this.productTableList.tableData.length){
              this.dissatisfy=false
              this.completely=true
              this.shipmentsMsg="只能满足部分发货需求,是否确认发货"
              // 部分产品满足发货条件
            }else{
              this.dissatisfy=false
              this.completely=true
              this.shipmentsMsg="能满足发货需求,直接发货吧"
            }
          }
    }
  }
}