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

yangfeng

2024-03-30 3af70533501f4138536ba01edb4f02a3a8d69f6a

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

 src/views/sales/salesDetails/index.vue

@@ -364,8 +364,7 @@
      },
      {
        label: "订单状态",
        prop: "status",
        default: true, isCallMethod: true, getCallMethod: this.getStatus
        prop: "outsourcingStatus",
      },
      {
        label: "委外供应商",
@@ -482,7 +481,9 @@
        projectId: [{ required: true, message: "请选择项目", trigger: "change" }]
      },
      purchaseStatusList: getDataByType("purchaseStatus"),
      loading: false
      loading: false,
      isRequest: true, //请求
      productDataBottom:{},
    }
  },
  created() {
@@ -650,20 +651,10 @@
        })
    },
    // 获取产品/库存信息
    async getProductInventoryInfo(row) {
      if (this.TabsIndex == 0 || row.status == 1) {
        this.getProductOrderInfo(row)
        // row.products.map((item)=>{
        //   item.purchaseAmount=item.purchaseFinishAmount+"/"+item.purchaseAmount
        //   item.makeAmount=item.makeFinishAmount+"/"+item.makeAmount
        //   item.outsourcingAmount=item.outsourcingFinishAmount+"/"+item.outsourcingAmount

        // })
        // this.productTableList.tableInfomation = row.products || []
      } else {
        if (row.number) {
    async getProductInventoryInfo(number) {
        if (number) {
          this.loading = true
          await getProductInventoryInfo(row.number)
          await getProductInventoryInfo(number)
            .then((res) => {
              console.log(res,"resss")
              this.productTableList.tableInfomation = res.data?.length > 0 ? res.data : []
@@ -674,38 +665,103 @@
              this.loading = false
            })
        }
      }
    },
    // 获取制造信息
    async getProductOrderInfo(number) {
      if (number) {
        if (this.TabsIndex == 0) {
          // 产品信息列表
          this.tableBottomColumn = this.productColumn // 表头
          this.showBottomCol = this.showProductCol  // 动态表头
          this.setBottomList()
        }else if(this.TabsIndex == 1){
          // 发货信息列表
          this.tableBottomColumn = this.inventoryColumn
          this.showBottomCol = this.showInventoryCol
          this.setBottomList()
        }else if (this.TabsIndex == 2) {
          // 制造信息列表
          this.tableBottomColumn = this.makeColumn
          this.showBottomCol = this.showMakeCol
          this.setBottomList()
        
        } else if (this.TabsIndex == 3) {
          // 采购信息列表
          this.tableBottomColumn = this.purchaseColumn
          this.showBottomCol = this.showPurchaseCol
          this.setBottomList()
        }else if (this.TabsIndex == 4) {
          // 委外信息列表
          this.tableBottomColumn = this.outsourceColumn
          this.showBottomCol = this.showOutsourceCol
          this.setBottomList()
        }
        console.log(this.isRequest,'===isRequest')
        if (this.TabsIndex != 1&&this.isRequest == false) {
          this.isRequest = true;
          this.getListValue(this.productDataBottom)
          return true;
        }
        
          if (this.TabsIndex == 1&&this.selectRow.status == 1) {
            this.productTableList.tableInfomation = []
          } 
          console.log(this.selectRow,"看看")
          this.getProductInventoryInfo(number)
          
        this.loading = true
        await getProductOrderInfo(number)
          .then((res) => {
            if (this.TabsIndex == 0) {
              if(res&&res.data){
                res.data.productInfo.map((item=>{
                  item.purchaseAmount=item.purchaseFinishAmount+"/"+item.purchaseAmount
                  item.makeAmount=item.makeFinishAmount+"/"+item.makeAmount
                  item.outsourcingAmount=item.outsourcingFinishAmount+"/"+item.outsourcingAmount
                }))
              }
              this.productTableList.tableInfomation = res.data && res.data.productInfo ? res.data.productInfo : []
            } else if (this.TabsIndex == 1) {
              this.productTableList.tableInfomation = res.data ? res.data : []
            } else if (this.TabsIndex == 2) {
              this.productTableList.tableInfomation = res.data && res.data.makeInfo ? res.data.makeInfo : []
            } else if (this.TabsIndex == 3) {
              this.productTableList.tableInfomation = res.data && res.data.purchaseInfo ? res.data.purchaseInfo : []
            } else if(this.TabsIndex == 4) {
              this.productTableList.tableInfomation = res.data && res.data.outsourcingInfo ? res.data.outsourcingInfo : []
            }
              this.productDataBottom=res;
              this.getListValue(this.productDataBottom)
            this.loading = false
          })
          .catch(() => {
            this.productTableList.tableInfomation = []
            this.loading = false
          })
      }
    },
    getListValue(res){
      if (this.TabsIndex == 0) {
              if(res&&res.data){
                res.data.productInfo.map((item=>{
                  let string1 = "--";
                  let number1 = item.purchaseFinishAmount;
                  let val1=item.purchaseAmount
                  if ((val1 && val1 != 0) || (number1 && number1 != 0)) {
                    let a1 = val1 || val1 == 0 ? val1 : "--";
                    let b1 = number1 || number1 == 0 ? number1 : "--";
                    string1 = b1 + "/" + a1;
                  }
                  item.purchaseAmount=string1
                  let string2 = "--";
                  let number2 = item.makeFinishAmount;
                  let val2=item.makeAmount
                  if ((val2 && val2 != 0) || (number2 && number2 != 0)) {
                    let a2 = val2 || val2 == 0 ? val2 : "--";
                    let b2 = number2 || number2 == 0 ? number2 : "--";
                    string2 = b2 + "/" + a2;
                  }
                  item.makeAmount=string2
                  let string3 = "--";
                  let number3 = item.outsourcingFinishAmount;
                  let val3=item.outsourcingAmount
                  if ((val3 && val3 != 0) || (number3 && number3 != 0)) {
                    let a3 = val3 || val3 == 0 ? val3 : "--";
                    let b3 = number3 || number3 == 0 ? number3 : "--";
                    string3 = b3 + "/" + a3;
                  }
                  item.outsourcingAmount=string3
                }))
              }
              this.productTableList.tableInfomation = res.data && res.data.productInfo ? res.data.productInfo : []
            }  else if (this.TabsIndex == 2) {
              this.productTableList.tableInfomation = res.data && res.data.makeInfo ? res.data.makeInfo : []
            } else if (this.TabsIndex == 3) {
              this.productTableList.tableInfomation = res.data && res.data.purchaseInfo ? res.data.purchaseInfo : []
            } else if(this.TabsIndex == 4) {
              this.productTableList.tableInfomation = res.data && res.data.outsourcingInfo ? res.data.outsourcingInfo : []
      }
    },
    // 搜索
@@ -915,42 +971,12 @@
    //获取当前选中资源的id
    getTab(tab) {
      this.TabsIndex = tab
      if (this.TabsIndex == 0) {
        // 产品信息列表
        this.tableBottomColumn = this.productColumn // 表头
        this.showBottomCol = this.showProductCol  // 动态表头
        this.setBottomList()
        this.getProductInventoryInfo(this.selectRow.number)
      } else if (this.TabsIndex == 1) {
        // 发货信息列表
        this.tableBottomColumn = this.inventoryColumn
        this.showBottomCol = this.showInventoryCol
        this.setBottomList()
        if (this.selectRow.status == 1) {
          this.productTableList.tableInfomation = []
      if (this.TabsIndex == 1) {
        this.isRequest =true;
        } else {
          console.log(this.selectRow,"看看")
          this.getProductInventoryInfo(this.selectRow)
        this.isRequest = false;
        }
      } else if (this.TabsIndex == 2) {
        // 制造信息列表
        this.tableBottomColumn = this.makeColumn
        this.showBottomCol = this.showMakeCol
        this.setBottomList()
        this.getProductOrderInfo(this.selectRow.number)
      } else if (this.TabsIndex == 3) {
        // 采购信息列表
        this.tableBottomColumn = this.purchaseColumn
        this.showBottomCol = this.showPurchaseCol
        this.setBottomList()
        this.getProductOrderInfo(this.selectRow.number)
      }if (this.TabsIndex == 4) {
        // 委外信息列表
        this.tableBottomColumn = this.outsourceColumn
        this.showBottomCol = this.showOutsourceCol
        this.setBottomList()
        this.getProductOrderInfo(this.selectRow.number)
      }
    },
    // 状态
    getStatus(val) {
@@ -959,23 +985,7 @@
    // top 行点击
    tableRowClick(row) {
      this.selectRow = row
      if (this.TabsIndex == 0) {
        this.getProductInventoryInfo(this.selectRow.number)
      } else if (this.TabsIndex == 1) {
        if (this.selectRow.status == 1) {
          this.productTableList.tableInfomation = []
        } else {
          this.getProductInventoryInfo(this.selectRow)
        }
      } else if (this.TabsIndex == 2) {
        this.getProductOrderInfo(this.selectRow.number)
      } else if (this.TabsIndex == 3) {
        // 采购信息
        this.getProductOrderInfo(this.selectRow.number)
      }else if(this.TabsIndex == 4){
        // 委外信息
        this.getProductOrderInfo(this.selectRow.number)
      }
    },
    // 获取项目列表
    async getProjectList() {