3个模块 增加毛重，总毛重，净重，总净重的字段+出库明细，入库明细 查看增加6个字段的显示

haoxuan

2024-04-17 6ae7d2b7e369bbb40b8a461b61cbd146a00d3bb7

3个模块 增加毛重，总毛重，净重，总净重的字段+出库明细，入库明细 查看增加6个字段的显示

 src/views/overview/AddOverviewDialog.vue

@@ -9,7 +9,7 @@
      <!-- 头 -->
      <div slot="title" class="dialog-header">
        <span>{{
          editCommonConfig.title === "查看"
          editCommonConfig.title == "查看"
            ? editCommonConfig.title
            : editCommonConfig.title + addName
        }}</span>
@@ -29,7 +29,7 @@
          </span>
          <el-button
            v-if="showEdit"
            :disabled="this.editConfig.infomation.status === 5"
            :disabled="this.editConfig.infomation.status == 5"
            plain
            size="mini"
            style="margin-left: 15px"
@@ -68,9 +68,9 @@
                <el-form-item prop="number">
                  <span slot="label"
                    >{{
                      workType === 1
                      workType == 1
                        ? "入库"
                        : workType === 2
                        : workType == 2
                        ? "出库"
                        : "调拨"
                    }}单号</span
@@ -102,15 +102,15 @@
              <el-col :span="12">
                <el-form-item prop="companyName">
                  <span slot="label">{{
                    workType === 1
                    workType == 1
                      ? "供应商"
                      : workType === 2
                      : workType == 2
                      ? "客户"
                      : "联系人"
                  }}</span>

                  <el-select
                    v-if="workType === 1"
                    v-if="workType == 1"
                    v-model="editConfig.infomation.companyName"
                    placeholder="请选择"
                    size="mini"
@@ -130,7 +130,7 @@
                    </el-option>
                  </el-select>
                  <el-select
                    v-else-if="workType === 2"
                    v-else-if="workType == 2"
                    v-model="editConfig.infomation.companyName"
                    placeholder="请选择"
                    size="mini"
@@ -156,7 +156,7 @@
                    @change="companyChange"
                  >
                    <el-option
                      v-for="item in companyOptions"
                      v-for="item in personelOptions"
                      :key="item.id"
                      :label="item.name"
                      :value="{ value: item.id, label: item.name }"
@@ -166,7 +166,7 @@
                </el-form-item>
              </el-col>
              <!-- <el-col :span="12">
                <el-form-item v-if="workType === 3" label="联系人" prop="contacterName">
                <el-form-item v-if="workType == 3" label="联系人" prop="contacterName">
                  <el-select
                    v-model="editConfig.infomation.contacterName"
                    placeholder="请选择"
@@ -180,7 +180,7 @@
                </el-form-item>
              </el-col>
              <el-col :span="12">
                <el-form-item v-if="workType === 2" label="送货地址" prop="client_name">
                <el-form-item v-if="workType == 2" label="送货地址" prop="client_name">
                  <el-select
                    v-model="editConfig.infomation.memberId"
                    placeholder="请选择"
@@ -246,7 +246,7 @@
              </el-col>
              <el-col :span="12">
                <el-form-item
                  :label="workType === 1 ? '仓库位置' : '从'"
                  :label="workType == 1 ? '仓库位置' : '从'"
                  prop="location"
                >
                  <el-select
@@ -287,7 +287,7 @@
                  </el-select>
                </el-form-item>
              </el-col>
              <el-col :span="12" v-if="workType === 3">
              <el-col :span="12" v-if="workType == 3">
                <el-form-item label="至" prop="toLocation">
                  <el-select
                    @change="toLocationChange"
@@ -462,11 +462,11 @@
              <el-tab-pane
                label="物流信息"
                name="two"
                v-if="this.workType === 2"
                v-if="this.workType == 2"
              ></el-tab-pane>
            </el-tabs>
            <!-- 操作 -->
            <div v-if="activeName === 'first'">
            <div v-if="activeName == 'first'">
              <CommonFormTableView
                ref="tableView"
                :islistingrules="true"
@@ -502,7 +502,7 @@
              </CommonFormTableView>
            </div>
            <!-- 物流信息 -->
            <div v-if="activeName === 'two' && this.workType === 2">
            <div v-if="activeName == 'two' && this.workType == 2">
              <el-form
                :rules="rules2"
                ref="shipmentsInfo"
@@ -590,7 +590,7 @@
              </el-form>
            </div>
            <!-- 详情 -->
            <!-- <div v-if="activeName === 'detail'">
            <!-- <div v-if="activeName == 'detail'">
              <CommonFormTableView
                :product-table-list="detailTableList"
                :detail-enter="!showFooter"
@@ -666,7 +666,7 @@
      },
    },
    workType: {
      type: Number,
      type: [Number,String],
      default: function () {
        // return JSON.parse(window.sessionStorage.getItem('paramsData')).workType|| 1;
        return 1;
@@ -763,8 +763,8 @@
      showCancel: false, // 取消是否可以显示
      list: [],
      pdfParams: {},
      thatCursor: this.workType === 3 ? "no-drop" : "pointer",
      thatColor: this.workType === 3 ? "#ccc" : "#000",
      thatCursor: this.workType == 3 ? "no-drop" : "pointer",
      thatColor: this.workType == 3 ? "#ccc" : "#000",
    };
  },
  created() {
@@ -775,7 +775,7 @@
    this.setDetailTableForm();
    this.getLocationList();
    this.receiptType =
      this.editConfig.title === "查看" || this.editConfig.title === "编辑"
      this.editConfig.title == "查看" || this.editConfig.title == "编辑"
        ? this.editConfig.infomation.operationTypeName
        : this.addName;
    if (this.showOperationType) {
@@ -783,7 +783,7 @@
    }
    this.getLogisticCompanyList();
    this.formInfo();
    if (this.editConfig.title === "查看" || this.editConfig.title === "编辑") {
    if (this.editConfig.title == "查看" || this.editConfig.title == "编辑") {
      setTimeout(() => {
        this.$refs.tableView.setLocationList(
          this.editConfig.infomation.location.label
@@ -794,15 +794,14 @@
  mounted() {},
  methods: {
    setFormItem(val, itemMark, itemName) {
      console.log(val, "===val");
      this.editConfig.infomation[itemMark] = val.id;
      this.editConfig.infomation[itemName] = val.name;
    },
    formInfo() {
      this.objCode.type =
        this.workType === 1
        this.workType == 1
          ? "入库编码"
          : this.workType === 2
          : this.workType == 2
          ? "出库编码"
          : "调拨编码";
      this.objCode.codeStandID = "";
@@ -812,7 +811,7 @@
      this.getRCodeStandardList();
    },
    setStatusList() {
      if (this.editConfig.infomation.status === 5) {
      if (this.editConfig.infomation.status == 5) {
        this.list = [
          { label: "草稿", status: "todo", value: 1 },
          { label: "正在等待", status: "todo", value: 2 },
@@ -832,28 +831,27 @@
    // 获取公司列表
    async getCompanyList() {
      await getPersonnelList().then((res) => {
        if (res.code === 200) {
        if (res.code == 200) {
          this.personelOptions = res.data;
        }
      });
      if (this.workType === 1) {
      if (this.workType == 1) {
        await getSupplierList().then((res) => {
          console.log(res);
          if (res.code === 200) {
          if (res.code == 200) {
            this.supplierOptions = res.data;
          }
        });
      } else if (this.workType === 2) {
      } else if (this.workType == 2) {
        await getClientList().then((res) => {
          console.log(res);
          if (res.code === 200) {
          if (res.code == 200) {
            this.clientOptions = res.data;
          }
        });
      } else {
        await getCompanyList().then((res) => {
          console.log(res);
          if (res.code === 200) {
          if (res.code == 200) {
            this.companyOptions = res.data;
          }
        });
@@ -873,7 +871,7 @@
        pageSize: 0,
      }).then((res) => {
        console.log(res);
        if (res.code === 200) {
        if (res.code == 200) {
          this.formLocationOptions = res.data;
        }
      });
@@ -884,7 +882,7 @@
        pageSize: 0,
      }).then((res) => {
        console.log(res);
        if (res.code === 200) {
        if (res.code == 200) {
          this.toLocationOptions = res.data;
        }
      });
@@ -897,7 +895,7 @@
        pageSize: 0,
      }).then((res) => {
        console.log(res.data);
        if (res.code === 200) {
        if (res.code == 200) {
          const list = res.data.map((item) => {
            return {
              name: item.name,
@@ -911,45 +909,45 @@
    // 设置删除/打印/编辑是否显示
    setBottonView() {
      console.log(this.editConfig.infomation.status);
      if (this.editConfig.title === "新建") {
      if (this.editConfig.title == "新建") {
        this.showButton = false;
        this.showEdit = false;
        this.showFooter = true;
        this.isValidateClick = false;
      } else if (this.editConfig.title === "编辑") {
      } else if (this.editConfig.title == "编辑") {
        this.showButton = true;
        this.showEdit = false;
        this.isDelClick = true;
        this.showFooter = true;
      } else if (
        this.editConfig.title === "查看" &&
        this.editConfig.title == "查看" &&
        this.editConfig.infomation.status !== 4
      ) {
        this.showButton = true;
        this.showEdit = true;
        this.isDelClick = true;
        this.showFooter = false;
        if (this.editConfig.infomation.status === "完成") {
        if (this.editConfig.infomation.status == "完成") {
          this.isValidateClick = false;
        } else if (this.editConfig.infomation.status === 3) {
        } else if (this.editConfig.infomation.status == 3) {
          this.isValidateClick = true;
          this.showCancel = true;
        } else if (this.editConfig.infomation.status === 5) {
        } else if (this.editConfig.infomation.status == 5) {
          this.isCancel = true;
          this.isValidateClick = true;
        } else {
          this.isValidateClick = true;
        }
      } else if (
        this.editConfig.infomation.status === 4 ||
        this.editConfig.infomation.status === "完成"
        this.editConfig.infomation.status == 4 ||
        this.editConfig.infomation.status == "完成"
      ) {
        this.showButton = true;
        this.showEdit = false;
        this.isDelClick = true;
        this.showFooter = false;
        this.isValidateClick = false;
      } else if (this.editConfig.infomation.status === 5) {
      } else if (this.editConfig.infomation.status == 5) {
        this.isCancel = true;
        this.showButton = true;
        this.showEdit = false;
@@ -963,14 +961,14 @@
        this.isValidateClick = true;
        this.showCancel = true;
      }
      if (this.editConfig.title === "新建") {
      if (this.editConfig.title == "新建") {
        this.list[0].status = "active";
      } else {
        this.list.map((item) => {
          console.log(item, this.editConfig.infomation.status, "打印信息");
          if (
            item.value === this.editConfig.infomation.status ||
            item.label === this.editConfig.infomation.status
            item.value == this.editConfig.infomation.status ||
            item.label == this.editConfig.infomation.status
          ) {
            item.status = "active";
          } else {
@@ -992,7 +990,7 @@
    },
    async getLogisticCompanyList() {
      await getLogisticCompanyList().then((res) => {
        if (res.code === 200) {
        if (res.code == 200) {
          this.editConfig.infomation.carrier = res.data;
        }
      });
@@ -1000,11 +998,9 @@
    // 保存
    saveClick() {
      let validArr = [];
      if (this.workType === 2) {
        console.log("出库");
      if (this.workType == 2) {
        validArr = [this.$refs.form.validate()];
      } else {
        console.log("入库");
        validArr = [this.$refs.form.validate()];
      }
      console.log(validArr, "xxx");
@@ -1012,7 +1008,7 @@
        .then((results) => {
          console.log(results, "执行成功", this.tableData);
          for (let i = 0; i < this.tableData.length; i++) {
            if (this.tableData[i].productName.length === 0) {
            if (this.tableData[i].productName.length == 0) {
              this.isNoProduct = true;
              break;
            } else {
@@ -1024,11 +1020,11 @@
          } else {
            let params = this.saveParams();
            let isContinue=false;
            // if(this.workType===2){
            // if(this.workType==2){
            //   params.details.map((item)=>{
            //     item.fromLocationId=item.fromLocationId.value
            //   })
            // }else if(this.workType===3){
            // }else if(this.workType==3){
            //   params.details.map((item)=>{
            //     item.fromLocationId=item.fromLocationId.value
            //     item.toLocationId=item.toLocationId.value
@@ -1036,20 +1032,22 @@
            // }
            // 产品列表解构
            if (
              this.editConfig.title === "编辑" ||
              this.editConfig.title === "查看"
              this.editConfig.title == "编辑" ||
              this.editConfig.title == "查看"
            ) {
              let arr = [];
              if (this.workType === 1) {
              if (this.workType == 1) {
                params.details.map((item) => {
                  arr.push({
                    operationId: item.operationId,
                    amount: item.amount,
                    productId: item.productId,
                    auxiliaryUnit:item.auxiliaryUnit,
                    auxiliaryAmount:item.auxiliaryAmount,
                  });
                });
                params.details = arr;
              } else if (this.workType === 2) {
              } else if (this.workType == 2) {
                params.details.map((item) => {
                  if (item.fromLocationId.value) {
                    arr.push({
@@ -1057,6 +1055,8 @@
                      amount: item.amount,
                      fromLocationId: item.fromLocationId.value,
                      productId: item.productId,
                      auxiliaryUnit:item.auxiliaryUnit,
                      auxiliaryAmount:item.auxiliaryAmount,
                    });
                  } else {
                    arr.push({
@@ -1064,11 +1064,13 @@
                      amount: item.amount,
                      fromLocationId: item.fromLocation.id,
                      productId: item.productId,
                      auxiliaryUnit:item.auxiliaryUnit,
                      auxiliaryAmount:item.auxiliaryAmount,
                    });
                  }
                });
                params.details = arr;
              } else if (this.workType === 3) {
              } else if (this.workType == 3) {
                console.log(params.details, "看看");
                params.details.map((item) => {
                  arr.push({
@@ -1081,6 +1083,8 @@
                      ? item.toLocationId.value
                      : item.toLocation.id,
                    productId: item.productId,
                    auxiliaryUnit:item.auxiliaryUnit,
                    auxiliaryAmount:item.auxiliaryAmount,
                  });
                  // if(item.fromLocationId.value){
                  //   arr.push({
@@ -1102,13 +1106,13 @@
                });
                params.details = arr;
              }
            } else if (this.editConfig.title === "新建") {
            } else if (this.editConfig.title == "新建") {

              if (this.workType === 2) {
              if (this.workType == 2) {
                params.details.map((item) => {
                  item.fromLocationId = item.fromLocationId.value;
                });
              } else if (this.workType === 3) {
              } else if (this.workType == 3) {
                
                params.details.map((item) => {
                  if(!item.fromLocationId||!item.toLocationId){
@@ -1125,14 +1129,14 @@
              }
            }
            let requestUrl =
              this.editConfig.title === "新建" ? addOperation : updateOperation;
              this.editConfig.title == "新建" ? addOperation : updateOperation;
            // let params = this.saveParams()
            requestUrl({
              ...params,
            }).then((res) => {
              this.editConfig.visible = false;
              if (res.code === 200) {
                if (this.editConfig.title === "新建") {
              if (res.code == 200) {
                if (this.editConfig.title == "新建") {
                  this.$message.success("添加成功");
                } else {
                  this.$message.success("编辑成功");
@@ -1154,41 +1158,41 @@
      let companyName = "";
      let contacterID = 0;
      let contacterName = "";
      if (this.editConfig.title === "新建") {
      if (this.editConfig.title == "新建") {
        companyID =
          Object.keys(this.companyObj).length === 0 ? 0 : this.companyObj.value;
          Object.keys(this.companyObj).length == 0 ? 0 : this.companyObj.value;
        companyName =
          Object.keys(this.companyObj).length === 0
          Object.keys(this.companyObj).length == 0
            ? ""
            : this.companyObj.label;
        contacterID =
          Object.keys(this.contacterObj).length === 0
          Object.keys(this.contacterObj).length == 0
            ? 0
            : this.contacterObj.value;
        contacterName =
          Object.keys(this.contacterObj).length === 0
          Object.keys(this.contacterObj).length == 0
            ? ""
            : this.contacterObj.label;
      } else {
        companyID =
          Object.keys(this.companyObj).length === 0
          Object.keys(this.companyObj).length == 0
            ? data.companyID
            : this.companyObj.value;
        companyName =
          Object.keys(this.companyObj).length === 0
          Object.keys(this.companyObj).length == 0
            ? data.companyName
            : this.companyObj.label;
        contacterID =
          Object.keys(this.contacterObj).length === 0
          Object.keys(this.contacterObj).length == 0
            ? data.contacterID
            : this.contacterObj.value;
        contacterName =
          Object.keys(this.contacterObj).length === 0
          Object.keys(this.contacterObj).length == 0
            ? data.contacterName
            : this.contacterObj.label;
      }
      let params = {};
      if (this.workType === 1 || this.workType === 2) {
      if (this.workType == 1 || this.workType == 2) {
        params = {
          baseOperationType: data.baseOperationType,
          comment: data.comment || "",
@@ -1222,7 +1226,7 @@
          custodian: data.custodian || "",
          custodianId: data.custodianId || "",
        };
      } else if (this.workType === 3) {
      } else if (this.workType == 3) {
        params = {
          baseOperationType: data.baseOperationType,
          comment: data.comment || "",
@@ -1264,7 +1268,7 @@
      await deleteOperation(this.editConfig.infomation.id).then((res) => {
        console.log(res);
        this.editConfig.visible = false;
        if (res.code === 200) {
        if (res.code == 200) {
          this.$message.success("删除成功");
          this.$parent.getData();
        }
@@ -1277,21 +1281,14 @@
        this.editConfig.infomation.details &&
        this.editConfig.infomation.details.length > 0
      ) {
        const list = this.editConfig.infomation.details.map((item) => {
          return {
            ...item,
            productName: item.product.name,
            productId: item.product.id,
            unit: item.product.unit,
          };
        });
        const list= this.getTwoTable(this.editConfig.infomation.details,'1')
        this.tableData = list;
      } else {
        this.tableData = [];
      }
      // this.tableData = this.editConfig.title !== "新建" ? list : []
      let tableColumnArr = [];
      if (this.workType === 1) {
      if (this.workType == 1) {
        tableColumnArr = [
          {
            label: "产品名称",
@@ -1304,8 +1301,14 @@
          { label: "产品规格", prop: "specs" },
          { label: "产品型号", prop: "model" },
          { label: "计量单位", prop: "unit" },
          { label: "辅助数量", prop: "auxiliaryAmount",inputFloatValue:true,isInputFloat:'inputFloatAuxiliaryAmount' },
          { label: "辅助单位", prop: "auxiliaryUnit" },
          { label: "毛重", prop: "grossWeight" },
          { label: "总毛重", prop: "totalGrossWeight" },
          { label: "净重", prop: "netWeight" },
          { label: "总净重", prop: "totalNetWeight" }
        ];
      } else if (this.workType === 2) {
      } else if (this.workType == 2) {
        tableColumnArr = [
          {
            label: "产品名称",
@@ -1324,8 +1327,46 @@
            isRequird: true,
          },
          { label: "计量单位", prop: "unit" },
          { label: "辅助数量", prop: "auxiliaryAmount",inputFloatValue:true,isInputFloat:'inputFloatAuxiliaryAmount' },
          { label: "辅助单位", prop: "auxiliaryUnit" },
          { label: "毛重", prop: "grossWeight" },
          { label: "总毛重", prop: "totalGrossWeight" },
          { label: "净重", prop: "netWeight" },
          { label: "总净重", prop: "totalNetWeight" }
        ];
      } else if (this.workType === 3) {
      } else if (this.workType == 3) {
        tableColumnArr = [
          {
            label: "产品名称",
            prop: "productName",
            productName: true,
            isRequird: true,
          },
          { label: "产品编码", prop: "productId" },
          { label: "数量", prop: "amount", inputFloat: true },
          { label: "产品规格", prop: "specs" },
          { label: "产品型号", prop: "model" },
          {
            label: "从",
            prop: "fromLocationId",
            sonLocation: true,
            isRequird: true,
          },
          {
            label: "至",
            prop: "toLocationId",
            toLocation: true,
            isRequird: true,
          },
          { label: "计量单位", prop: "unit" },
          { label: "辅助数量", prop: "auxiliaryAmount",inputFloatValue:true,isInputFloat:'inputFloatAuxiliaryAmount' },
          { label: "辅助单位", prop: "auxiliaryUnit" },
          { label: "毛重", prop: "grossWeight" },
          { label: "总毛重", prop: "totalGrossWeight" },
          { label: "净重", prop: "netWeight" },
          { label: "总净重", prop: "totalNetWeight" }
        ];
      } else if (this.workType == 4) {
        tableColumnArr = [
          {
            label: "产品名称",
@@ -1351,33 +1392,7 @@
          },
          { label: "计量单位", prop: "unit" },
        ];
      } else if (this.workType === 4) {
        tableColumnArr = [
          {
            label: "产品名称",
            prop: "productName",
            productName: true,
            isRequird: true,
          },
          { label: "产品编码", prop: "productId" },
          { label: "数量", prop: "amount", inputFloat: true },
          { label: "产品规格", prop: "specs" },
          { label: "产品型号", prop: "model" },
          {
            label: "从",
            prop: "fromLocationId",
            sonLocation: true,
            isRequird: true,
          },
          {
            label: "至",
            prop: "toLocationId",
            toLocation: true,
            isRequird: true,
          },
          { label: "计量单位", prop: "unit" },
        ];
      } else if (this.workType === 5) {
      } else if (this.workType == 5) {
        tableColumnArr = [
          {
            label: "产品名称",
@@ -1409,22 +1424,96 @@
        tableColumn: tableColumnArr,
      };
    },
    getTwoTable(data,value){
        let list = data.map((res) => {
        let adjunctUnit=''
        let adjunctAmount=''
        let isValue=false
        let moreUnit=null
        let moreUnitList=[]
        if(value==1){
          moreUnit=res.product.moreUnit
          moreUnitList=res.product.moreUnitList
        }else{
          moreUnit=res.moreUnit
          moreUnitList=res.moreUnitList
        }
        if(moreUnit&&moreUnitList){
          if(moreUnitList.length>0){
            for(let j in moreUnitList){
              if(moreUnitList[j].floating){
                isValue=true;
                adjunctUnit=moreUnitList[j].unit
                adjunctAmount=moreUnitList[j].amount
               
                break;
              }
            }
            if(!isValue){
              for(let j in moreUnitList){
                 if(moreUnitList[j].unit){
                  adjunctUnit=moreUnitList[j].unit
                  adjunctAmount=moreUnitList[j].amount
                  break;
                }
              }
            }
          }
        }
        if(value==1){
          return {
            ...res,
            productName: res.product.name,
            productId: res.product.id,
            unit: res.product.unit,
            model:res.product.model,
            specs:res.product.specs,
            auxiliaryUnit:res.auxiliaryUnit,
            auxiliaryAmount:res.auxiliaryAmount,
            inputFloatAuxiliaryAmount:isValue,
            grossWeight:res.product.grossWeight,
            totalGrossWeight:res.totalGrossWeight,
            netWeight:res.product.netWeight, 
            totalNetWeight:res.totalNetWeight,  
          };
        }else{
          return {
            ...res,
            amount: 1,
            productName: res.name,
            productId: res.id,
            auxiliaryUnit:adjunctUnit,
            auxiliaryAmount:adjunctAmount,
            inputFloatAuxiliaryAmount:isValue,
            grossWeight:res.grossWeight,
            totalGrossWeight:res.grossWeight?Number(res.grossWeight)*1:'',
            netWeight:res.netWeight, 
            totalNetWeight:res.netWeight?Number(res.netWeight)*1:'', 
          };
        }
      });
        return list||[];
    },
    // 操作输入
    inputContent(val, prop, row) {
      this.countId = row.countId;
      this.tableData.map((item) => {
        if (item.id === row.id) {
        if (item.id == row.id) {
          item[prop] = val;
          if(prop=='amount'){
            item.totalGrossWeight=item[prop]&&item.grossWeight?Number(item.grossWeight)*Number(item[prop]):''
            item.totalNetWeight=item[prop]&&item.netWeight?Number(item.netWeight)*Number(item[prop]):''
          }
        }
      });
    },
    // 新增
    addProductClick(value) {
      console.log(value);
      // if (value === "操作") {
      // if (value == "操作") {
      //   console.log(this.tableData)
      //   for (let i = 0; i < this.tableData.length; i++) {
      //     if (this.tableData[i].productName.length === 0) {
      //     if (this.tableData[i].productName.length == 0) {
      //       this.isNoProduct = false
      //       break
      //     } else {
@@ -1444,7 +1533,7 @@
      // } else {
      //   console.log(this.detailTableData)
      //   for (let i = 0; i < this.detailTableData.length; i++) {
      //     if (this.detailTableData[i].name.length === 0) {
      //     if (this.detailTableData[i].name.length == 0) {
      //       this.isNoDetail = true
      //       break
      //     } else {
@@ -1479,15 +1568,8 @@
      } else {
        this.tableData = this.tableData.concat(val);
      }
      console.log(this.tableData);
      let list = this.tableData.map((res) => {
        return {
          ...res,
          amount: 1,
          productName: res.name,
          productId: res.id,
        };
      });
      const list= this.getTwoTable(this.tableData,2)
      
      this.tableData = list;
      this.productTableList.tableData = list;
      // this.showSummary.show = true
@@ -1503,7 +1585,7 @@
    },
    // 删除
    handleDelClick(scope, value) {
      if (value === "操作") {
      if (value == "操作") {
        this.tableData.splice(scope.$index, 1);
        this.productTableList.tableData = this.tableData;
        this.$message.success("删除成功！");
@@ -1520,7 +1602,7 @@
      };
    },
    setTableColumn() {
      if (this.workType === "内部调拨") {
      if (this.workType == "内部调拨"||this.workType==3) {
        this.tableColumn = [
          { label: "产品", prop: "name", productName: true, isRequird: true },
          { label: "从", prop: "number", select: true },
@@ -1541,7 +1623,7 @@
    inputDetail(val, prop, row) {
      this.detailId = row.detailId;
      this.detailTableData.map((item) => {
        if (item.detailId === row.detailId) {
        if (item.detailId == row.detailId) {
          item[prop] = val;
        }
      });
@@ -1560,7 +1642,7 @@
      await updateStatus(this.editConfig.infomation.id).then((res) => {
        console.log(res);
        this.editConfig.visible = false;
        if (res.code === 200) {
        if (res.code == 200) {
          this.$message.success("验证成功");
          this.$parent.getData();
        }
@@ -1578,13 +1660,13 @@
          stateCancel(this.editConfig.infomation.id).then((res) => {
            console.log(res);
            this.editConfig.visible = false;
            if (res.code === 200) {
            if (res.code == 200) {
              this.$message.success("取消调拨");
              this.$parent.getData();
            }
          });
          this.list.map((item) => {
            if (item.label === "已取消") {
            if (item.label == "已取消") {
              item.status = "active";
            } else {
              item.status = "todo";
@@ -1600,14 +1682,14 @@
        try {
          let res = await printReceipts(this.editCommonConfig.infomation.id);
          console.log(res);
          if (res.code === 200) {
          if (res.code == 200) {
            console.log(this.editConfig.infomation.baseOperationType, "类型");
            let pdfParams = {
              url: res.data,
              baseOperationType:
                this.editConfig.infomation.baseOperationType || undefined,
              cutAfterWidth:
                this.editConfig.infomation.baseOperationType === 2
                this.editConfig.infomation.baseOperationType == 2
                  ? 50.8
                  : 53.3,
            };