zuozhengqing
2024-01-03 2e99f3e099c8541808312eae125c7af5a498e122
src/views/overview/AddOverviewDialog.vue
@@ -203,9 +203,10 @@
                </el-form-item>
              </el-col>
              <el-col :span="12">
                <el-form-item v-if="workType !== 1" label="源位置" prop="fromLocationId">
                <el-form-item :label="workType === 1?'仓库位置':'源位置'" prop="location">
                  <el-select
                    v-model="editConfig.infomation.fromLocationId"
                    @change="rootLocationChange"
                    v-model="editConfig.infomation.location"
                    placeholder="请选择"
                    size="mini"
                    style="width: 90%"
@@ -215,13 +216,13 @@
                      v-for="item in toLocationOptions"
                      :key="item.id"
                      :label="item.jointName"
                      :value="item.id"
                      :value="{label:item.jointName,value:item.id}"
                    >
                    </el-option>
                  </el-select>
                </el-form-item>
              </el-col>
              <el-col :span="12">
              <!-- <el-col :span="12">
                <el-form-item v-if="workType !== 2" label="仓库位置" prop="toLocationId">
                  <el-select
                    v-model="editConfig.infomation.toLocationId"
@@ -239,7 +240,7 @@
                    </el-option>
                  </el-select>
                </el-form-item>
              </el-col>
              </el-col> -->
              <el-col :span="12">
                <el-form-item label="负责人" prop="contacterName">
                  <el-select
@@ -297,6 +298,8 @@
            <!-- 操作 -->
            <div v-if="activeName === 'first'">
              <CommonFormTableView
                ref="tableView"
                :islistingrules="true"
                :product-table-list="productTableList"
                :detail-enter="!showFooter"
                @inputContent="inputContent"
@@ -486,7 +489,7 @@
        sourceNumber: [{ required: true, message: "请输入来源单据", trigger: "blur" }],
        operationDate: [{ required: true, message: "请选择日期", trigger: "change" }],
        toLocationId: [{ required: true, message: "请选择仓库位置", trigger: "change" }],
        fromLocationId: [{ required: true, message: "请选择源位置", trigger: "change" }],
        location: [{ required: true, message: "请选择源位置", trigger: "change" }],
        operationTypeId: [{ required: true, message: "请选择入库类型", trigger: "change" }],
        number: [{ required: true, validator: this.validateCheckCode, trigger: ["change", "blur"] }]
      },
@@ -508,7 +511,7 @@
      showButton: true,
      activeName: "first",
      productTableList: {},
      tableData: [],
      tableData:[],
      countId: 0,
      isNoProduct: true, // 添加明细行时是否有产品未选择
      showEdit: false, // 是否显示编辑按钮
@@ -556,6 +559,11 @@
    }
    this.getLogisticCompanyList()
    this.formInfo()
  },
  mounted(){
    setTimeout(() => {
      this.$refs.tableView.setLocationList(this.editConfig.infomation.location.label)
    }, 100);
  },
  methods: {
    formInfo() {
@@ -747,8 +755,54 @@
          if (this.isNoProduct) {
            this.$message.error("请添加明细行或选择产品不能为空")
          } else {
            let requestUrl = this.editConfig.title === "新建" ? addOperation : updateOperation
            let params = this.saveParams()
            if(this.workType===2){
              params.details.map((item)=>{
                item.fromLocationId=item.fromLocationId.value
              })
            }else if(this.workType===3){
              params.details.map((item)=>{
                item.fromLocationId=item.fromLocationId.value
                item.toLocationId=item.toLocationId.value
              })
            }
            // 产品列表解构
            if(this.editConfig.title === "编辑"){
              let arr=[]
              if(this.workType===1){
                params.details.map((item)=>{
                  arr.push({
                    operationId:item.operationId,
                    amount:item.amount,
                    productId:item.productId
                  })
                })
                params.details=arr
              }else if(this.workType===2){
                params.details.map((item)=>{
                  arr.push({
                    operationId:item.operationId,
                    amount:item.amount,
                    fromLocationId:item.fromLocation.id,
                    productId:item.productId,
                  })
                })
                params.details=arr
              }else if(this.workType===3){
                params.details.map((item)=>{
                  arr.push({
                    operationId:item.operationId,
                    amount:item.amount,
                    fromLocationId:item.fromLocation.id,
                    toLocationId:item.toLocation.id,
                    productId:item.productId,
                  })
                })
                params.details=arr
              }
            }
            let requestUrl = this.editConfig.title === "新建" ? addOperation : updateOperation
            // let params = this.saveParams()
            requestUrl({
              ...params
            }).then((res) => {
@@ -794,13 +848,13 @@
        contacterID: contacterID,
        contacterName: contacterName,
        details: this.tableData,
        fromLocationId: data.fromLocationId || 0,
        locationId: data.location.value || 0,
        id: data.id,
        number: data.number || "",
        operationDate: data.operationDate || "",
        operationTypeId: this.showOperationType ? data.operationTypeId : this.editConfig.operationTypeId,
        operationTypeName: this.receiptType,
        sourceNumber: data.sourceNumber || "",
        sourceNumber:data.sourceNumber || "" ,
        status: 3,
        toLocationId: data.toLocationId || 0,
        waybillNumber: data.waybillNumber || "",
@@ -843,16 +897,32 @@
        this.tableData = []
      }
      // this.tableData = this.editConfig.title !== "新建" ? list : []
      this.productTableList = {
        tableData: this.tableData,
        tableColumn: [
      let tableColumnArr=[]
      if(this.workType===1){
        tableColumnArr= [
          { label: "产品", prop: "productName", productName: true, isRequird: true },
          // { label: "说明", prop: "number", input: true },
          // { label: "日期", prop: "amount", date: true, isRequird: true },
          // { label: "截止日期", prop: "price", date: true },
          { label: "数量", prop: "amount", inputFloat: true },
          { label: "计量单位", prop: "unit" }
        ]
      }else if(this.workType===2){
        tableColumnArr = [
          { label: "产品", prop: "productName", productName: true, isRequird: true },
          { label: "从", prop: "fromLocationId", sonLocation: true, isRequird: true },
          { label: "数量", prop: "amount", inputFloat: true },
          { label: "计量单位", prop: "unit" }
        ]
      }else if(this.workType===3){
        tableColumnArr = [
          { label: "产品", prop: "productName", productName: true, isRequird: true },
          { label: "从", prop: "fromLocationId", sonLocation: true, isRequird: true },
          { label: "至", prop: "toLocationId", toLocation: true },
          { label: "数量", prop: "amount", inputFloat: true },
          { label: "计量单位", prop: "unit" }
        ]
      }
      this.productTableList = {
        tableData: this.tableData,
        tableColumn: tableColumnArr
      }
    },
    // 操作输入
@@ -884,7 +954,7 @@
            productId: "",
            amount: 0,
            unit: "",
            productName: ""
            productName: "",
          })
        }
      } else {
@@ -1029,6 +1099,16 @@
          console.error(error)
        }
      }
    },
    // 源位置选择
    rootLocationChange(val){
      this.editConfig.infomation.location=val
      this.productTableList.tableData.map((item)=>{
        console.log(item,"item")
        item.toLocationId={}
        item.fromLocationId={}
      })
      this.$refs.tableView.setLocationList(val.label)
    }
  }
}