gitlab上面的wms转移到公司git

charles

2024-08-06 5ecb7958c96d3f0b6d47b79aff7eb306c2cf690f

 src/views/overview/AddOverviewDialog.vue

@@ -1,6 +1,65 @@
<template>
  <div class="add-common">
    <el-dialog
            title="配置字典"
            :visible.sync="dictModel"
            width="60%"
            :destroy-on-close="true"
            :before-close="handlerDictClose">
      <div style="text-align: right;margin: 10px 20px">
        <el-input @input="queryDictList(isSilkMarket?6:0)"  v-model="keyword" style="width: 40%;margin-right: 20px" size="small" placeholder="请输入关键字">
          <i slot="suffix" class="el-input__icon el-icon-search" @click="queryDictList(isSilkMarket?6:0)"></i>
        </el-input>
        <el-button type="primary" size="mini" @click="addDict">新增</el-button>
      </div>
      <el-row type="flex" justify="center" style="height:400px;margin-bottom: 20px">
        <el-col :span="22">
            <el-table :data="isSilkMarket?silkMarketList:dictList" border style="max-height: 364px;overflow-y: auto">
              <el-table-column  label="序号" align="center">
                <template slot-scope="scope">
                  <span>{{scope.$index+1}}</span>
                </template>
              </el-table-column>
              <el-table-column prop="name" label="名称" align="center">
                <template slot-scope="scope">
                  <span v-if="!scope.row.isEdit">{{scope.row.name}}</span>
                  <el-input v-else v-model="scope.row.name" placeholder="请输入"></el-input>
                </template>
              </el-table-column>
              <el-table-column prop="type" label="类型" align="center">
                <template slot-scope="scope">
                  <div>
                    <span v-if="scope.row.type===1">入库类型</span>
                    <span v-else-if="scope.row.type===2">出库类型</span>
                    <span v-else-if="scope.row.type===3">调拨类型</span>
                    <span v-else-if="scope.row.type===4">盘点类型</span>
                    <span v-else-if="scope.row.type===6">原料产地</span>
                  </div>
                  <!--<el-select v-else v-model="scope.row.type">
                    <el-option label="入库类型" :value="1"></el-option>
                    <el-option label="出库类型" :value="2"></el-option>
                    <el-option label="调拨类型" :value="3"></el-option>
                    <el-option label="盘点类型" :value="4"></el-option>
                  </el-select>-->
                </template>
              </el-table-column>
              <el-table-column  label="操作" align="center">
                <template slot-scope="scope">
                  <div v-if="scope.row.isEdit">
                    <el-button type="text" size="mini" @click="saveDict(scope.row)">保存</el-button>
                    <el-button type="text" size="mini" @click="cancelDict()">取消</el-button>
                  </div>
                  <div v-else>
                    <el-button type="text" size="mini" @click="editDict(scope.row,scope.$index)">编辑</el-button>
                    <el-button type="text" size="mini" @click="deleteDict(scope.row.id)">删除</el-button>
                  </div>
                </template>
              </el-table-column>
            </el-table>
        </el-col>
      </el-row>
    </el-dialog>
    <el-dialog
      :title="editCommonConfig.title + '采购入库'"
      :visible.sync="editConfig.visible"
      :width="dialogWidth"
@@ -11,15 +70,13 @@
        <span>{{
          editCommonConfig.title == "查看"
            ? editCommonConfig.title
            : editCommonConfig.title + addName
        }}</span>
            : editCommonConfig.title + addName}}</span>
        <div class="header_btns">
          <span
            class="btn"
            :style="{ cursor: thatCursor, color: thatColor }"
            @click="btnPrint"
            :disabled="true"
          >
            :disabled="true">
            <i class="el-icon-printer"></i>
            <span>打印</span>
          </span>
@@ -28,14 +85,8 @@
            <span>动作</span>
          </span>
          <el-button
            v-if="showEdit"
            :disabled="this.editConfig.infomation.status == 5"
            plain
            size="mini"
            style="margin-left: 15px"
            @click="editClick"
            >编辑</el-button
          >
            v-if="showEdit" :disabled="this.editConfig.infomation.status == 5"
            plain size="mini" style="margin-left: 15px" @click="editClick">编辑</el-button>
        </div>
      </div>
      <!-- 内容 -->
@@ -45,10 +96,8 @@
        :rules="rules"
        label-position="right"
        label-width="120px"
        size="mini"
      >
        size="mini">
        <div>
          <!-- <div>aaa</div> -->
          <StatusCommonView
            :showButton="showButton"
            :isValidateClick="isValidateClick"
@@ -58,45 +107,37 @@
            :showCancel="showCancel"
            @delClick="delClick"
            @validateClick="validateClick"
            @btnCancel="btnCancel"
          />
            @btnCancel="btnCancel"/>
        </div>
        <div class="basic-info">
          <div class="basic-info-view">
            <el-row>
              <el-col :span="12">
                <el-form-item prop="number">
                  <span slot="label"
                    >{{
                  <span slot="label">{{
                      workType == 1
                        ? "入库"
                        : workType == 2
                        ? "出库"
                        : "调拨"
                    }}单号</span
                  >
                        : !workType?"盘点":"调拨"
                    }}单号</span>
                  <el-input
                    style="width: 85%"
                    v-if="
                      editConfig.title == '编辑' ||
                    v-if="editConfig.title == '编辑' ||
                      editConfig.title == '查看' ||
                      (editConfig.title == '新建' &&
                        codenumer &&
                        (explain != '' || isIdDisabled))
                    "
                        codenumer &&(explain != '' || isIdDisabled))"
                    :disabled="editConfig.title != '新建'"
                    v-model="editConfig.infomation.number"
                    placeholder="请输入编码"
                  >
                    placeholder="请输入编码">
                  </el-input>
                  <span
                    v-else-if="editConfig.title == '新建'"
                    style="color: #f56c6c; width: 85%"
                    >请优先配置编码规范
                    style="color: #f56c6c; width: 85%">请优先配置编码规范
                    <el-button type="text" @click="numberClick">
                      配置规范
                    </el-button></span
                  >
                    </el-button>
                  </span>
                </el-form-item>
              </el-col>
              <el-col :span="12">
@@ -106,9 +147,7 @@
                      ? "供应商"
                      : workType == 2
                      ? "客户"
                      : "联系人"
                  }}</span>

                      : "联系人"}}</span>
                  <el-select
                    v-if="workType == 1"
                    v-model="editConfig.infomation.companyName"
@@ -116,17 +155,14 @@
                    size="mini"
                    style="width: 90%"
                    :disabled="!showFooter"
                    @change="companyChange"
                  >
                    @change="companyChange">
                    <el-option
                      v-for="item in supplierOptions"
                      :key="item.SupplierId"
                      :label="item.SupplierName"
                      :value="{
                        value: item.SupplierId,
                        label: item.SupplierName,
                      }"
                    >
                        label: item.SupplierName}">
                    </el-option>
                  </el-select>
                  <el-select
@@ -136,14 +172,12 @@
                    size="mini"
                    style="width: 90%"
                    :disabled="!showFooter"
                    @change="companyChange"
                  >
                    @change="companyChange">
                    <el-option
                      v-for="item in clientOptions"
                      :key="item.ClientId"
                      :label="item.ClientName"
                      :value="{ value: item.ClientId, label: item.ClientName }"
                    >
                      :value="{ value: item.ClientId, label: item.ClientName }">
                    </el-option>
                  </el-select>
                  <el-select
@@ -153,14 +187,12 @@
                    size="mini"
                    style="width: 90%"
                    :disabled="!showFooter"
                    @change="companyChange"
                  >
                    @change="companyChange">
                    <el-option
                      v-for="item in personelOptions"
                      :key="item.id"
                      :label="item.name"
                      :value="{ value: item.id, label: item.name }"
                    >
                      :value="{ value: item.id, label: item.name }">
                    </el-option>
                  </el-select>
                </el-form-item>
@@ -207,7 +239,7 @@
                </el-form-item>
              </el-col>
              <el-col v-if="showOperationType" :span="12">
                <el-form-item label="入库类型" prop="operationTypeId">
                <el-form-item label="业务类型" prop="operationTypeId">
                  <el-select
                    v-model="editConfig.infomation.operationTypeId"
                    placeholder="请选择"
@@ -219,14 +251,13 @@
                      v-for="item in operationTypeOptions"
                      :key="item.id"
                      :label="item.name"
                      :value="item.id"
                    >
                      :value="item.id">
                    </el-option>
                  </el-select>
                </el-form-item>
              </el-col>
              <el-col v-else :span="12">
                <el-form-item label="入库类型">
                <el-form-item label="业务类型">
                  <el-input
                    v-model="receiptType"
                    disabled
@@ -234,8 +265,23 @@
                  ></el-input>
                </el-form-item>
              </el-col>
              <el-col  :span="12">
                <el-form-item :label="inventoryDealerTypeLabel">
                  <el-select
                          v-model="editConfig.infomation.dealerType"
                          placeholder="请选择"
                          size="mini"
                          style="width: 80%"
                          :disabled="!showFooter"
                          filterable
                  >
                    <el-option v-for="dict in dictList" :key="dict.id" :label="dict.name" :value="dict.name"></el-option>
                  </el-select>
                  <el-button style="margin-left: 10px" size="mini" @click="settingDealerType" class="el-icon-setting" type="text"></el-button>
                </el-form-item>
              </el-col>
              <el-col :span="12">
                <el-form-item label="来源单据" prop="sourceNumber">
                <el-form-item label="来源单据">
                  <el-input
                    v-model="editConfig.infomation.sourceNumber"
                    placeholder="例如:PO0032"
@@ -244,9 +290,9 @@
                  ></el-input>
                </el-form-item>
              </el-col>
              <el-col :span="12">
              <el-col :span="12"  v-if="workType==1">
                <el-form-item
                  :label="workType == 1 ? '仓库位置' : '从'"
                  :label="workType == 1? '仓库位置' : '从'"
                  prop="location"
                >
                  <el-select
@@ -261,9 +307,24 @@
                      v-for="item in formLocationOptions"
                      :key="item.id"
                      :label="item.jointName"
                      :value="{ label: item.jointName, value: item.id }"
                      :value="item.id"
                    >
                    </el-option>
                  </el-select>
                </el-form-item>
              </el-col>
              <el-col :span="12"  v-if="!workType">
                <el-form-item
                        label="仓库"
                        prop="warehouseId">
                  <el-select
                          @change="selWarehouse"
                          v-model="editConfig.infomation.warehouseId"
                          placeholder="请选择"
                          size="mini"
                          style="width: 90%"
                  >
                    <el-option v-for="warehouse in warehouseList" :key="warehouse.id" :label="warehouse.name" :value="warehouse.id"></el-option>
                  </el-select>
                </el-form-item>
              </el-col>
@@ -295,13 +356,14 @@
                    placeholder="请选择"
                    size="mini"
                    style="width: 90%"
                    filterable 
                    :disabled="!showFooter"
                  >
                    <el-option
                      v-for="item in toLocationOptions"
                      :key="item.id"
                      :label="item.jointName"
                      :value="{ label: item.jointName, value: item.id }"
                      :value="item.id"
                    >
                    </el-option>
                  </el-select>
@@ -334,9 +396,7 @@
                          'manager',
                          'managerId',
                          'managerObj'
                        )
                    "
                  >
                        )">
                    <el-option
                      v-for="item in personelOptions"
                      :key="item.id"
@@ -421,8 +481,7 @@
                      v-for="item in personelOptions"
                      :key="item.id"
                      :label="item.name"
                      :value="{ value: item.id, label: item.name }"
                    >
                      :value="{ value: item.id, label: item.name }" >
                    </el-option>
                  </el-select>
                </el-form-item>
@@ -441,6 +500,54 @@
                  </el-select>
                </el-form-item>
              </el-col> -->
              <el-col :span="12">
                <el-form-item label="创建人:">
                  <el-input
                          :value="editConfig.infomation.createBy"
                          placeholder="创建人"
                          style="width: 90%"
                          :disabled="true"
                  ></el-input>
                </el-form-item>
              </el-col>
              <el-col :span="12">
                <el-form-item label="创建时间:">
                  <el-input
                          :value="editConfig.infomation.createDate"
                          placeholder="创建时间"
                          style="width: 90%"
                          :disabled="true"
                  ></el-input>
                </el-form-item>
              </el-col>
              <el-col :span="12">
                <el-form-item label="验证人:">
                  <el-input
                          :value="editConfig.infomation.checkBy"
                          placeholder="验证人"
                          style="width: 90%"
                          :disabled="true"
                  ></el-input>
                </el-form-item>
              </el-col>
              <el-col :span="12">
                <el-form-item label="验证时间:">
                  <el-input
                          :value="editConfig.infomation.auditDate"
                          placeholder="验证时间"
                          style="width: 90%"
                          :disabled="true"
                  ></el-input>
                </el-form-item>
              </el-col>
              <el-col :span="12">
                <el-form-item label="庄口:">
                  <el-select @change="selSilkMarket" :disabled="!showFooter" filterable style="width: 80%" v-model="editConfig.infomation.silkMarket ">
                    <el-option v-for="item in silkMarketList" :key="item.ID" :label="item.name" :value="item.code"></el-option>
                  </el-select>
                  <el-button style="margin-left: 10px" size="mini" @click="settingSilkMarket" class="el-icon-setting" type="text"></el-button>
                </el-form-item>
              </el-col>
              <el-col :span="24">
                <el-form-item label="备注" prop="comment">
                  <el-input
@@ -469,6 +576,7 @@
            <div v-if="activeName == 'first'">
              <CommonFormTableView
                ref="tableView"
                :warehouseId="warehouseId"
                :islistingrules="true"
                :addTypeIdMultiple="true"
                :product-table-list="productTableList"
@@ -477,16 +585,112 @@
                @inputContent="inputContent"
                @addProductClick="addProductClick('操作')"
                @getSelectArray="getSelectArray"
                @selSonLocationClick="selSonLocationClick"
                @emptyProductClick="emptyProductClick"
                @clearupProduct="clearupProduct"
                @selLocationClick="selLocationClick"
                @selectProductArray="selectProductArray"
                @deleteItems="deleteItems"
              >
                <template slot="tableButton">
                  <el-table-column label="数量" align="center">
                    <template slot-scope="scope">
                        <el-input size="mini" :disabled="editConfig.title==='查看'" v-model="scope.row.relAmount" @input="changeRelAmount(scope.row)"></el-input>
                    </template>
                  </el-table-column>
                  <el-table-column label="辅助数量" align="center" width="240">
                    <template slot-scope="scope">
                      <div  v-if="Array.isArray(scope.row.moreUnitList)&&scope.row.moreUnitList.length>0">
                        <template v-for="(moreUnitItem,index) in scope.row.moreUnitList">
                          <span style="width: 70px;margin-left: -2px"  v-if="!moreUnitItem.floating">
                            {{doMoreUnitFormat(scope.row.relAmount/moreUnitItem.amount)}}
                            {{index!==scope.row.moreUnitList.length-1?'/':''}}
                          </span>
                          <span v-else>
                            <el-input :disabled="editConfig.title==='查看'"  style="width: 70px;margin-left: 5px" size="mini" v-model="moreUnitItem.floatingValue"></el-input>
                            {{index!==scope.row.moreUnitList.length-1?'/':''}}
                          </span>
                        </template>
                      </div>
                      <span v-else>
                        --
                      </span>
                    </template>
                  </el-table-column>
                  <el-table-column label="辅助单位" align="center">
                    <template slot-scope="scope">
                      <span v-if="Array.isArray(scope.row.moreUnitList)&&scope.row.moreUnitList.length>0">
                        {{scope.row.moreUnitList.map(item=>item.unit).join('/')}}
                      </span>
                      <span v-else>--</span>
                    </template>
                  </el-table-column>
                  <el-table-column label="庄口" align="center" width="120">
                    <template slot-scope="scope">
                      <el-select :disabled="editConfig.title==='查看'" filterable  v-model="scope.row.silkMarket" size="small">
                        <el-option v-for="item in silkMarketList" :key="item.ID" :label="item.name" :value="item.code"></el-option>
                      </el-select>
                    </template>
                  </el-table-column>
                  <el-table-column label="是否结庄" align="center" width="80">
                    <template slot-scope="scope">
                      <el-select v-if="editConfig.title!=='查看'" v-model="scope.row.silkMarketClose" size="small">
                        <el-option label="是" value="是"></el-option>
                        <el-option label="否" value="否"></el-option>
                      </el-select>
                      <span v-else>{{scope.row.silkMarketClose}}</span>
                    </template>
                  </el-table-column>
                  <el-table-column label="差异"  align="center" v-if="!this.workType">
                    <template slot-scope="scope">
                      <span>{{!scope.row.relAmount?0-scope.row.amount:scope.row.relAmount-scope.row.amount}}</span>
                    </template>
                  </el-table-column>
                  <el-table-column label="成本单价" prop="cost" align="center">
                    <template slot-scope="scope">
                      <el-input v-if="editConfig.title!=='查看'" type="number" v-model="scope.row.cost" size="mini"></el-input>
                      <span v-else>{{scope.row.cost}}</span>
                    </template>
                  </el-table-column>
                  <el-table-column label="成本金额" align="center">
                    <template slot-scope="scope">
                      {{(scope.row.cost?scope.row.cost*scope.row.amount:0).toFixed(2)}}
                    </template>
                  </el-table-column>
                  <el-table-column label="销售单价" prop="salePrice" align="center">
                    <template slot-scope="scope">
                      <el-input v-if="editConfig.title!=='查看'" type="number" v-model="scope.row.salePrice" size="mini"></el-input>
                      <span v-else>{{scope.row.salePrice}}</span>
                    </template>
                  </el-table-column>
                  <el-table-column label="销售金额" align="center" >
                    <template slot-scope="scope">
                      {{(scope.row.salePrice?scope.row.salePrice*scope.row.amount:0).toFixed(2)}}
                    </template>
                  </el-table-column>
                  <el-table-column label="毛重" width="100" align="center" prop="grossWeight"></el-table-column>
                  <el-table-column label="总毛重" width="100" align="center" prop="totalGrossWeight"></el-table-column>
                  <el-table-column label="净重" width="100" align="center" prop="netWeight"></el-table-column>
                  <el-table-column label="总净重" width="100" align="center" prop="totalNetWeight"></el-table-column>

                  <el-table-column label="备注" width="100" align="center">
                    <template slot-scope="scope">
                      <el-input placeholder="备注" v-if="editConfig.title!='查看'" v-model="scope.row.remark" size="mini"></el-input>
                      <span v-else>{{scope.row.remark}}</span>
                    </template>
                  </el-table-column>
                  <!--{ label: "毛重", prop: "grossWeight" },
                  { label: "总毛重", prop: "totalGrossWeight" },
                  { label: "净重", prop: "netWeight" },
                  { label: "总净重", prop: "totalNetWeight" }-->

                </template>
                <template v-if="showFooter" slot="tableButton">
                  <!--  fixed="right" -->
                  <el-table-column
                    label="操作"
                    width="60"
                    fixed="right"
                    align="center"
                  >
                    align="center">
                    <template slot-scope="scope">
                      <!-- <div @click="handleDelClick(scope, '操作')">
                        <i class="el-icon-delete"></i>
@@ -494,9 +698,7 @@
                      <el-button
                        type="text"
                        size="small"
                        @click.stop="handleDelClick(scope, '操作')"
                        >删除</el-button
                      >
                        @click.stop="handleDelClick(scope, '操作')">删除</el-button>
                    </template>
                  </el-table-column>
                </template>
@@ -620,11 +822,8 @@
          size="small"
          @click="saveClick"
          :disabled="!showFooter"
          >保存</el-button
        >
        <el-button size="small" @click="editConfig.visible = false"
          >取消</el-button
        >
          >保存</el-button>
        <el-button size="small" @click="editConfig.visible = false">取消</el-button>
      </div>
    </el-dialog>
  </div>
@@ -644,13 +843,21 @@
  printReceipts,
} from "@/api/overview/overview";
import {
  getLocationProductAmount,
    getDictListApi,
    addDictApi,
    deleteDictApi,
    editDictApi
} from "@/api/operate/inventoryAdjustment"
import {
  getSupplierList,
  getCompanyList,
  getClientList,
} from "@/api/common/other";
// import SimpleSearchInput from "@/components/makepager/SimpleSearchInput"
import { getPersonnelList } from "@/api/product/product";
import { getPersonnelList,getOperationInfoApi,getSilkDictListApi } from "@/api/product/product";
import codeMixin from "@/views/overview/mixin/codeMixin";
import { getWarehouseList } from '@/api/warehouseManage/warehouse.js'
export default {
  name: "AddOverviewDialog",
  mixins: [codeMixin],
@@ -686,9 +893,30 @@
    CommonFormTableView,
    // SimpleSearchInput,
  },
  computed: {},
  computed: {
      inventoryDealerTypeLabel(){
          if(this.workType===1){
              return '入库类型:';
          }else if(this.workType===2){
              return '出库类型:';
          }else if(this.workType===3){
              return '调拨类型:';
          }else {
              return '盘点类型:'
          }
      }
  },
  data() {
    return {
        productIdArray:[],
        keyword:"",
      isSilkMarket:false,
      silkMarketList:[],
      warehouseId:this.editCommonConfig.infomation.warehouseId||0,
      dictModel:false,
      warehouseList:[],
      dictList:[],
      dictAllList:[],
      dialogWidth: "50%",
      editConfig: this.editCommonConfig,
      rules: {
@@ -700,6 +928,9 @@
        ],
        toLocation: [
          { required: true, message: "请选择位置", trigger: "change" },
        ],
        warehouseId: [
            { required: true, message: "请选择仓库", trigger: "change" },
        ],
        location: [
          { required: true, message: "请选择调出位置", trigger: "change" },
@@ -774,7 +1005,14 @@
    this.setTableForm();
    this.setBottonView();
    this.setDetailTableForm();
    this.getLocationList();
    //this.querySilkMarket();
    if(this.workType){
        this.getLocationList();
    }
    this.queryWareHouse();//查询仓库
    this.queryDictList();//查询字典 下拉列表
    this.queryDictList(6);//查询庄口
    //this.queryAllDictList();//表格
    this.receiptType =
      this.editConfig.title == "查看" || this.editConfig.title == "编辑"
        ? this.editConfig.infomation.operationTypeName
@@ -786,25 +1024,203 @@
    this.formInfo();
    if (this.editConfig.title == "查看" || this.editConfig.title == "编辑") {
      setTimeout(() => {
        this.$refs.tableView.setLocationList(
        /*this.$refs.tableView.setLocationList(
          this.editConfig.infomation.location.label
        );
        );*/
      }, 100);
    }
  },
  mounted() {},
  methods: {
      selectProductArray(val){
          this.productIdArray=val.map(item=>item.id);
      },
      deleteItems(){
        if(this.productIdArray.length===0){
            this.$message.warning('请选择您要删除的产品');
        }  else{
            this.tableData=this.tableData.filter(item=>!this.productIdArray.includes(item.id))
            this.productTableList.tableData = this.tableData;
            this.$message.success("删除成功！");
        }
      },
      changeRelAmount(row){
          if(Array.isArray(row.moreUnitList)){
              row.moreUnitList=row.moreUnitList.map(item=>{
                  if(item.floating){
                      item.floatingValue=parseFloat(row.relAmount/item.amount);
                  }
                  return item;
              })
          }
      },
      doMoreUnitFormat(moreUnit){
          let moreUnitStr=moreUnit.toString();
          if(moreUnitStr.length>6){
              return moreUnitStr.substring(0,6);
          }
          return moreUnitStr;
      },
      settingDealerType(){
          this.dictModel=true;
          this.isSilkMarket=false;
      },
      settingSilkMarket(){
        this.dictModel=true;
        this.isSilkMarket=true;
      },
      selSilkMarket(val){
          this.productTableList.tableData.forEach(item=>{
              item.silkMarket=val;
          })
      },
      async querySilkMarket(){
          const {code,data}=await getSilkDictListApi(6);
          if(code===200){
              this.silkMarketList=data;
          }
      },
      selLocationClick(item,prop,index){
          this.tableData.forEach((tItem,i)=>{
              if(index===i){
                  tItem[prop]=item;
              }
          });
          this.productTableList.tableData=JSON.parse(JSON.stringify(this.tableData));
      },
      editDict(row,index){
          const tempList=this.isSilkMarket?this.silkMarketList:this.dictList;
          const flag=tempList.some(item=>item.isEdit);
          if(!flag){
              this.$set(tempList,index,{...row,isEdit:true});
          }else{
              this.$message.warning("请先退出编辑模式，再新增!");
          }
      },
      handlerDictClose(){
        this.dictModel=false;
        this.keyword="";
        this.queryDictList(this.isSilkMarket?6:0);
      },
      cancelDict(){
          this.queryDictList(this.isSilkMarket?6:0);
      },
      addDict(){
        const tempList=this.isSilkMarket?this.silkMarketList:this.dictList;
        const flag=tempList.some(item=>item.isEdit);
        if(!flag){
            let type=parseInt(this.workType);
            if(!this.workType){
                type=4;
            }
            if(this.isSilkMarket){
                type=6;//庄口 材料场地
            }
            tempList.push({name:'',type:type,isEdit:true});
        }else{
            this.$message.warning("请先退出编辑模式，再新增!");
        }
      },
      deleteDict(id){
          this.$confirm('确定要删除字典吗, 是否继续?', '提示', {
              confirmButtonText: '确定',
              cancelButtonText: '取消',
              type: 'warning'
          }).then(async () => {
              const {code}=await deleteDictApi(id);
              if(code===200){
                  this.$message.success("删除字典成功");
                  this.queryDictList(this.isSilkMarket?6:0);
              }else{
                  this.$message.warning("删除字典失败");
              }
          }).catch(() => {});
      },
      async saveDict(row){
        let request=addDictApi;
        if(row.id){//id存在是编辑
            request=editDictApi
        }
        const {code}=await request(row);
        if(code===200){
            this.$message.success(row.id?'编辑字典成功':'添加字典成功');
            this.queryDictList(this.isSilkMarket?6:0);
        }else{
            this.$message.error(row.id?'编辑字典失败':'添加字典失败');
        }
      },
    async queryWareHouse(){
        const {code,data}=await getWarehouseList({page:0,pageSize:0,keyword: ""});
        if(code===200){
            this.warehouseList=data;
        }
    },
   async selWarehouse(val){
       this.tableData=[];
       this.productTableList.tableData=[];
        /*const {code,data}=await getLocationList({
            warehouseId:val,
            type:3,
            page: 1,
            pageSize: 100
        });
        if(code===200){
            this.tableData.forEach(item=>{
                item.fromLocationId=data[0].id;
            });
        }
        this.$refs.tableView.setLocationList(data, "warehouseCode");*/
       this.warehouseId=val;
    },
      //查询字典列表
    async queryDictList(type){
      const params={type:type?type:parseInt(this.workType),keyword:this.keyword};
      if(!this.workType){
          params.type=4;
      }
      const {code,data} =await getDictListApi(params);
      if(code===200){
          if(type){
              this.silkMarketList=data||[];
              this.silkMarketList.map(item=>{
                  item.isEdit=false;
              })
          }else{
              this.dictList=data||[];
              this.dictList.map(item=>{
                  item.isEdit=false;
              })
          }
      }
    },
      //1.查询全部
      async queryAllDictList(){
          const {code,data} =await getDictListApi({type:0});
          if(code===200){
              this.dictAllList=data||[];
              this.dictAllList.map(item=>{
                  item.isEdit=false;
              });
              let type=this.workType;
              if(!this.workType){
                  type=4;
              }
              this.dictList=this.dictAllList.filter(item=>item.type===type);
          }
      },
    setFormItem(val, itemMark, itemName) {
      this.editConfig.infomation[itemMark] = val.id;
      this.editConfig.infomation[itemName] = val.name;
    },
    formInfo() {
      this.objCode.type =
        this.workType == 1
          ? "入库编码"
          : this.workType == 2
          ? "出库编码"
          : "调拨编码";
      this.objCode.type ='盘点编码'
        if(this.workType===1){
            this.objCode.type ='入库编码'
        }else if(this.workType===2){
            this.objCode.type="出库编码";
        }else if (this.workType===3){
            this.objCode.type='调拨编码'
        }
      this.objCode.codeStandID = "";
      if (this.editConfig.infomation.codeStandardID) {
        this.objCode.codeStandID = this.editConfig.infomation.codeStandardID;
@@ -865,26 +1281,31 @@
    },
    // 获取调出位置/仓库位置列表
    async getLocationList() {
        //console.log(this.editConfig.warehouseId);
      await getLocationList({
        type:3,
        keyWord: "",
        jointName: this.editConfig.code,
        warehouseId:parseInt(this.$route.query.warehouseId),
        page: 0,
        pageSize: 0,
      }).then((res) => {
        console.log(res);
        if (res.code == 200) {
          this.formLocationOptions = res.data;
          this.$refs.tableView.setLocationList(this.formLocationOptions, "fromLocation");
          /*if(Array.isArray(res.data)&&res.data.length>0){
             this.editConfig.infomation.location=res.data[0].id;
          }*/
        }
      });
      await getLocationList({
        type:3,
        keyWord: "",
        // jointName: this.editConfig.code,
        page: 0,
        pageSize: 0,
      }).then((res) => {
        console.log(res);
        if (res.code == 200) {
          this.toLocationOptions = res.data;
          this.$refs.tableView.setLocationList(this.toLocationOptions, "toLocation");
        }
      });
    },
@@ -895,7 +1316,6 @@
        page: 0,
        pageSize: 0,
      }).then((res) => {
        console.log(res.data);
        if (res.code == 200) {
          const list = res.data.map((item) => {
            return {
@@ -909,7 +1329,6 @@
    },
    // 设置删除/打印/编辑是否显示
    setBottonView() {
      console.log(this.editConfig.infomation.status);
      if (this.editConfig.title == "新建") {
        this.showButton = false;
        this.showEdit = false;
@@ -996,6 +1415,15 @@
        }
      });
    },
    calcMoreUnitAmount(item ={ moreUnitList:[] } ){
        (item.moreUnitList||[]).forEach(moreUnitItem=>{
            if(!moreUnitItem.floating){
                moreUnitItem.amount=this.doMoreUnitFormat(parseFloat(item.relAmount/moreUnitItem.amount));
            }else{
                moreUnitItem.amount=moreUnitItem.floatingValue;
            }
        });
    },
    // 保存
    saveClick() {
      let validArr = [];
@@ -1004,10 +1432,8 @@
      } else {
        validArr = [this.$refs.form.validate()];
      }
      console.log(validArr, "xxx");
      Promise.all(validArr)
        .then((results) => {
          console.log(results, "执行成功", this.tableData);
          for (let i = 0; i < this.tableData.length; i++) {
            if (this.tableData[i].productName.length == 0) {
              this.isNoProduct = true;
@@ -1019,7 +1445,7 @@
          if (this.isNoProduct) {
            this.$message.error("请添加明细行或选择产品不能为空");
          } else {
            let params = this.saveParams();
            let params =JSON.parse(JSON.stringify(this.settingParams()));
            let isContinue=false;
            // if(this.workType==2){
            //   params.details.map((item)=>{
@@ -1039,62 +1465,97 @@
              let arr = [];
              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,
                    totalNetWeight:item.totalNetWeight,
                    totalGrossWeight:item.totalGrossWeight,
                  });
                   /* (item.moreUnitList||[]).forEach(moreUnitItem=>{
                        if(!moreUnitItem.floating){
                            moreUnitItem.amount=this.doMoreUnitFormat(parseFloat(item.relAmount/moreUnitItem.amount));
                        }
                    });*/
                   this.calcMoreUnitAmount(item);
                  const obj={
                        operationId: item.operationId,
                        amount: item.relAmount,
                        fromLocationId: item.fromLocationId,
                        toLocationId:item.toLocationId,
                        productId: item.productId,
                        auxiliaryUnit:item.auxiliaryUnit,
                        auxiliaryAmount:item.auxiliaryAmount,
                        totalNetWeight:item.totalNetWeight,
                        totalGrossWeight:item.totalGrossWeight,
                        cost:item.cost,
                        salePrice:item.salePrice,
                        remark:item.remark,
                        silkMarket:item.silkMarket||"",
                        silkMarketClose:item.silkMarketClose,
                        moreUnitList:item.moreUnitList
                    };
                  arr.push(obj);
                });
                params.details = arr;
              } else if (this.workType == 2) {
                params.details.map((item) => {
                  if (item.fromLocationId.value) {
                    arr.push({
                      operationId: item.operationId,
                      amount: item.amount,
                      fromLocationId: item.fromLocationId.value,
                      productId: item.productId,
                      auxiliaryUnit:item.auxiliaryUnit,
                      auxiliaryAmount:item.auxiliaryAmount,
                      totalNetWeight:item.totalNetWeight,
                     totalGrossWeight:item.totalGrossWeight,
                    });
                  } else {
                    arr.push({
                      operationId: item.operationId,
                      amount: item.amount,
                      fromLocationId: item.fromLocation.id,
                      productId: item.productId,
                      auxiliaryUnit:item.auxiliaryUnit,
                      auxiliaryAmount:item.auxiliaryAmount,
                      totalNetWeight:item.totalNetWeight,
                     totalGrossWeight:item.totalGrossWeight,
                    });
                  }
                    /*(item.moreUnitList||[]).forEach(moreUnitItem=>{
                        if(!moreUnitItem.floating){
                            moreUnitItem.amount=this.doMoreUnitFormat(parseFloat(item.relAmount/moreUnitItem.amount));
                        }
                    });*/
                    this.calcMoreUnitAmount(item);
                    const obj ={
                        operationId: item.operationId,
                        fromLocationId: item.fromLocation.id,
                        productId: item.productId,
                        auxiliaryUnit:item.auxiliaryUnit,
                        auxiliaryAmount:item.auxiliaryAmount,
                        totalNetWeight:item.totalNetWeight,
                        totalGrossWeight:item.totalGrossWeight,
                        cost:item.cost,
                        salePrice:item.salePrice,
                        remark:item.remark,
                        silkMarket:item.silkMarket||"",
                        silkMarketClose:item.silkMarketClose,
                        moreUnitList:item.moreUnitList
                    }
                    obj.stockAmount=item.amount;
                    obj.amount=item.relAmount;
                    arr.push(obj);
                });
                params.details = arr;
              } else if (this.workType == 3) {
                console.log(params.details, "看看");
                  let flag=params.details.some(item=>item.relAmount>item.amount);
                  if(flag){
                      this.$message.warning('调拨数量不能超过在线库存');
                      return;
                  }
                  flag=params.details.some(item=>item.toLocationId===item.fromLocation.id);
                  if(flag){
                      this.$message.warning('不允许从当前仓库调拨到当前仓库');
                      return;
                  }
                params.details.map((item) => {
                  arr.push({
                    operationId: item.operationId,
                    amount: item.amount,
                    fromLocationId: item.fromLocationId.value
                      ? item.fromLocationId.value
                      : item.fromLocation.id,
                    toLocationId: item.toLocationId.value
                      ? item.toLocationId.value
                      : item.toLocation.id,
                    productId: item.productId,
                    auxiliaryUnit:item.auxiliaryUnit,
                    auxiliaryAmount:item.auxiliaryAmount,
                    totalNetWeight:item.totalNetWeight,
                    totalGrossWeight:item.totalGrossWeight,
                  });
                   /* (item.moreUnitList||[]).forEach(moreUnitItem=>{
                        if(!moreUnitItem.floating){
                            moreUnitItem.amount=this.doMoreUnitFormat(parseFloat(item.relAmount/moreUnitItem.amount));
                        }
                    });*/
                    this.calcMoreUnitAmount(item);
                    const obj={
                        operationId: item.operationId,
                        fromLocationId: item.fromLocation.id,
                        toLocationId: item.toLocationId,
                        productId: item.productId,
                        auxiliaryUnit:item.auxiliaryUnit,
                        auxiliaryAmount:item.auxiliaryAmount,
                        totalNetWeight:item.totalNetWeight,
                        totalGrossWeight:item.totalGrossWeight,
                        cost:item.cost,
                        salePrice:item.salePrice,
                        remark:item.remark,
                        silkMarket:item.silkMarket||"",
                        silkMarketClose:item.silkMarketClose,
                        moreUnitList:item.moreUnitList
                    };
                    obj.stockAmount=item.amount;
                    obj.amount=item.relAmount;
                    arr.push(obj);
                  // if(item.fromLocationId.value){
                  //   arr.push({
                  //     operationId:item.operationId,
@@ -1114,22 +1575,88 @@
                  // }
                });
                params.details = arr;
              }else if(!this.workType){//盘点无业务类型
                  params.details.map((item) => {
                      /*(item.moreUnitList||[]).forEach(moreUnitItem=>{
                          if(!moreUnitItem.floating){
                              moreUnitItem.amount=this.doMoreUnitFormat(parseFloat(item.relAmount/moreUnitItem.amount));
                          }
                      });*/
                      this.calcMoreUnitAmount(item);
                      const obj = {
                          operationId: item.operationId,
                          fromLocationId: item.fromLocation.id,
                          toLocationId: item.toLocationId||0,
                          productId: item.productId,
                          auxiliaryUnit:item.auxiliaryUnit,
                          auxiliaryAmount:item.auxiliaryAmount,
                          totalNetWeight:item.totalNetWeight,
                          totalGrossWeight:item.totalGrossWeight,
                          cost:item.cost,
                          salePrice:item.salePrice,
                          remark:item.remark,
                          silkMarket:item.silkMarket||"",
                          silkMarketClose:item.silkMarketClose,
                          moreUnitList:item.moreUnitList
                      };
                      obj.stockAmount=item.amount;
                      obj.amount=item.relAmount;
                      arr.push(obj);
                  });
                  params.details = arr;
              }
            } else if (this.editConfig.title == "新建") {

              if (this.workType == 2) {
                params.details.map((item) => {
                  item.fromLocationId = item.fromLocationId.value;
              if (this.workType == 2||this.workType==1||!this.workType) {
                  params.details.map((item) => {
                     /* (item.moreUnitList||[]).forEach(moreUnitItem=>{
                          if(!moreUnitItem.floating){
                              moreUnitItem.amount=this.doMoreUnitFormat(parseFloat(item.relAmount/moreUnitItem.amount));
                          }
                      });*/
                      this.calcMoreUnitAmount(item);
                    if(!this.workType){
                        item.toLocationId=item.location.id;
                    }else{
                        item.toLocationId=item.toLocationId||0;
                    }
                    if(this.workType!=1){
                        item.fromLocationId=item.location.id;
                    }
                    if(this.workType!=1){
                        item.stockAmount=item.amount;
                        item.amount=item.relAmount;
                    }else{
                        item.amount=item.relAmount;
                    }
                    item.silkMarket=item.silkMarket||this.editConfig.infomation.silkMarket?this.editConfig.infomation.silkMarket:'';
                    item.silkMarketClose=item.silkMarketClose||'否';
                });
              } else if (this.workType == 3) {
                
                let flag=params.details.some(item=>item.relAmount>item.amount);
                if(flag){
                    this.$message.warning('调拨数量不能超过在线库存');
                    return;
                }
                flag=params.details.some(item=>item.toLocationId===item.location.id);
                if(flag){
                    this.$message.warning('不允许从当前仓库调拨到当前仓库');
                    return;
                }
                params.details.map((item) => {
                   /* (item.moreUnitList||[]).forEach(moreUnitItem=>{
                        if(!moreUnitItem.floating){
                            moreUnitItem.amount=this.doMoreUnitFormat(parseFloat(item.relAmount/moreUnitItem.amount));
                        }
                    });*/
                    this.calcMoreUnitAmount(item);
                    item.fromLocationId = item.location.id;
                    item.stockAmount=item.amount;
                    item.amount=item.relAmount;

                  if(!item.fromLocationId||!item.toLocationId){
                    isContinue=true
                    return true
                  }
                  item.fromLocationId = item.fromLocationId.value;
                  item.toLocationId = item.toLocationId.value;
                });
              }
              if(isContinue){
@@ -1139,7 +1666,6 @@
            }
            let requestUrl =
              this.editConfig.title == "新建" ? addOperation : updateOperation;
            // let params = this.saveParams()
            requestUrl({
              ...params,
            }).then((res) => {
@@ -1160,6 +1686,162 @@
        .catch((error) => {
          console.error("表单校验未通过:", error);
        });
    },
    settingParams(){
        let data = this.editConfig.infomation;
        let companyID = '';
        let companyName = "";
        let contacterID = '';
        let contacterName = "";
        if (this.editConfig.title == "新建") {
            companyID =
                Object.keys(this.companyObj).length == 0 ? '' : this.companyObj.value;
            companyName =
                Object.keys(this.companyObj).length == 0
                    ? ""
                    : this.companyObj.label;
            contacterID =
                Object.keys(this.contacterObj).length == 0
                    ? 0
                    : this.contacterObj.value;
            contacterName =
                Object.keys(this.contacterObj).length == 0
                    ? ""
                    : this.contacterObj.label;
        } else {
            companyID =
                Object.keys(this.companyObj).length == 0
                    ? data.companyID
                    : this.companyObj.value;
            companyName =
                Object.keys(this.companyObj).length == 0
                    ? data.companyName
                    : this.companyObj.label;
            contacterID =
                Object.keys(this.contacterObj).length == 0
                    ? data.contacterID
                    : this.contacterObj.value;
            contacterName =
                Object.keys(this.contacterObj).length == 0
                    ? data.contacterName
                    : this.contacterObj.label;
        }
        let params = {};
        if (this.workType == 1 || this.workType == 2) {
            params = {
                baseOperationType: data.baseOperationType,
                comment: data.comment || "",
                companyID: companyID+'',
                companyName: companyName,
                contacterID: contacterID,
                contacterName: contacterName,
                details: this.productTableList.tableData,
                locationId: data.location || 0,
                id: data.id,
                number: data.number || "",
                operationDate: data.operationDate || "",
                operationTypeId: this.showOperationType
                    ? data.operationTypeId
                    : this.editConfig.operationTypeId,
                operationTypeName: this.receiptType,
                sourceNumber: data.sourceNumber || "",
                status: 3,
                // toLocationId: data.toLocation.value||0,
                waybillNumber: data.waybillNumber || "",
                weight: data.weight || 0,
                logisticWeight: data.logisticWeight || 0,
                logisticCompanyId: data.logisticCompanyId,
                receiverAddr: data.receiverAddr || "",
                receiverName: data.receiverName || "",
                receiverPhone: data.receiverPhone || "",
                manager: data.manager || "",
                managerId: data.managerId || "",
                accountant: data.accountant || "",
                accountantId: data.accountantId || "",
                custodian: data.custodian || "",
                custodianId: data.custodianId || "",
                dealerType:data.dealerType||""
            };
            if(this.workType==1){
                params.toLocationId=data.location || 0;
            }
        } else if (this.workType == 3) {
            params = {
                baseOperationType: data.baseOperationType,
                comment: data.comment || "",
                companyID: companyID+'',
                companyName: companyName,
                contacterID: contacterID,
                contacterName: contacterName,
                details:this.productTableList.tableData,
                locationId: data.location || 0,
                id: data.id,
                number: data.number || "",
                operationDate: data.operationDate || "",
                operationTypeId: this.showOperationType
                    ? data.operationTypeId
                    : this.editConfig.operationTypeId,
                operationTypeName: this.receiptType,
                sourceNumber: data.sourceNumber || "",
                status: 3,
                toLocationId: data.toLocation || 0,
                waybillNumber: data.waybillNumber || "",
                weight: data.weight || 0,
                logisticWeight: data.logisticWeight || 0,
                logisticCompanyId: data.logisticCompanyId,
                receiverAddr: data.receiverAddr || "",
                receiverName: data.receiverName || "",
                receiverPhone: data.receiverPhone || "",
                manager: data.manager || "",
                managerId: data.managerId || "",
                accountant: data.accountant || "",
                accountantId: data.accountantId || "",
                custodian: data.custodian || "",
                custodianId: data.custodianId || "",
                dealerType:data.dealerType||""
            };
        }else if(!this.workType){
            params = {
                baseOperationType:5,
                comment: data.comment || "",
                companyID: companyID+'',
                companyName: companyName,
                contacterID: contacterID,
                contacterName: contacterName,
                details: this.productTableList.tableData,
                // 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 || "",
                status: 3,
                // toLocationId: data.toLocation.value||0,
                waybillNumber: data.waybillNumber || "",
                weight: data.weight || 0,
                logisticWeight: data.logisticWeight || 0,
                logisticCompanyId: data.logisticCompanyId,
                receiverAddr: data.receiverAddr || "",
                receiverName: data.receiverName || "",
                receiverPhone: data.receiverPhone || "",
                manager: data.manager || "",
                managerId: data.managerId || "",
                accountant: data.accountant || "",
                accountantId: data.accountantId || "",
                custodian: data.custodian || "",
                custodianId: data.custodianId || "",
                warehouseId:data.warehouseId ||"",
                dealerType:data.dealerType||""
            };
        }
        if(this.$route.query.warehouseId){
            params.warehouseId=parseInt(this.$route.query.warehouseId);
        }
        params.silkMarket=data.silkMarket||"";
        return params;
    },
    saveParams() {
      let data = this.editConfig.infomation;
@@ -1210,7 +1892,7 @@
          contacterID: contacterID,
          contacterName: contacterName,
          details: this.tableData,
          locationId: data.location.value || 0,
          locationId: data.location || 0,
          id: data.id,
          number: data.number || "",
          operationDate: data.operationDate || "",
@@ -1234,7 +1916,11 @@
          accountantId: data.accountantId || "",
          custodian: data.custodian || "",
          custodianId: data.custodianId || "",
          inventoryDealerType:data.inventoryDealerType||0
        };
        if(this.workType==1){
            params.toLocationId=data.location || 0;
        }
      } else if (this.workType == 3) {
        params = {
          baseOperationType: data.baseOperationType,
@@ -1244,7 +1930,7 @@
          contacterID: contacterID,
          contacterName: contacterName,
          details: this.tableData,
          locationId: data.location.value || 0,
          locationId: data.location|| 0,
          id: data.id,
          number: data.number || "",
          operationDate: data.operationDate || "",
@@ -1254,7 +1940,7 @@
          operationTypeName: this.receiptType,
          sourceNumber: data.sourceNumber || "",
          status: 3,
          toLocationId: data.toLocation.value || 0,
          toLocationId: data.toLocation || 0,
          waybillNumber: data.waybillNumber || "",
          weight: data.weight || 0,
          logisticWeight: data.logisticWeight || 0,
@@ -1268,7 +1954,44 @@
          accountantId: data.accountantId || "",
          custodian: data.custodian || "",
          custodianId: data.custodianId || "",
            inventoryDealerType:data.inventoryDealerType||0
        };
      }else if(!this.workType){
          params = {
              baseOperationType:5,
              comment: data.comment || "",
              companyID: companyID+'',
              companyName: companyName,
              contacterID: contacterID,
              contacterName: contacterName,
              details: this.tableData,
             // 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 || "",
              status: 3,
              // toLocationId: data.toLocation.value||0,
              waybillNumber: data.waybillNumber || "",
              weight: data.weight || 0,
              logisticWeight: data.logisticWeight || 0,
              logisticCompanyId: data.logisticCompanyId,
              receiverAddr: data.receiverAddr || "",
              receiverName: data.receiverName || "",
              receiverPhone: data.receiverPhone || "",
              manager: data.manager || "",
              managerId: data.managerId || "",
              accountant: data.accountant || "",
              accountantId: data.accountantId || "",
              custodian: data.custodian || "",
              custodianId: data.custodianId || "",
              warehouseId:data.warehouseId ||"",
              inventoryDealerType:data.inventoryDealerType||0
          };
      }
      return params;
    },
@@ -1305,18 +2028,26 @@
            min:150,
            productName: true,
            isRequird: true,
            isScanCode:true,
          },
          { label: "产品编码", prop: "productId" },
          { label: "产品规格", prop: "specs" },
          { label: "产品型号", prop: "model" },
          { label: "数量", prop: "amount", inputFloat: true },
            {
                label: "仓库位置",
                prop: "toLocationId",
                sonLocation: true,
                min:140,
                isRequird: true,
            },
          /*{ label: "数量", prop: "relAmount", inputFloat: true },*/
          { label: "计量单位", prop: "unit" },
          { label: "辅助数量", prop: "auxiliaryAmount",inputFloatValue:true,isInputFloat:'inputFloatAuxiliaryAmount' },
          { label: "辅助单位", prop: "auxiliaryUnit" },
          { label: "毛重", prop: "grossWeight" },
          /*{ label: "辅助数量", prop: "auxiliaryAmount",inputFloatValue:true,isInputFloat:'inputFloatAuxiliaryAmount' },
          { label: "辅助单位", prop: "auxiliaryUnit" },*/
          /*{ label: "毛重", prop: "grossWeight" },
          { label: "总毛重", prop: "totalGrossWeight" },
          { label: "净重", prop: "netWeight" },
          { label: "总净重", prop: "totalNetWeight" }
          { label: "总净重", prop: "totalNetWeight" }*/
        ];
      } else if (this.workType == 2) {
        tableColumnArr = [
@@ -1326,6 +2057,7 @@
            min:150,
            productName: true,
            isRequird: true,
              isScanCode:true,
          },
          { label: "产品编码", prop: "productId" },
          { label: "产品规格", prop: "specs" },
@@ -1333,17 +2065,19 @@
          {
            label: "从",
            prop: "fromLocationId",
            sonLocation: true,
            min:120,
           /* sonLocation: true,*/
            isRequird: true,
          },
          { label: "数量", prop: "amount", inputFloat: true },
          { label: "在库数量", prop: "amount" },
          /*{ label: "数量", prop: "relAmount", inputFloat: true },*/
          { label: "计量单位", prop: "unit" },
          { label: "辅助数量", prop: "auxiliaryAmount",inputFloatValue:true,isInputFloat:'inputFloatAuxiliaryAmount' },
          { label: "辅助单位", prop: "auxiliaryUnit" },
          { label: "毛重", prop: "grossWeight" },
          /*{ label: "辅助数量", prop: "auxiliaryAmount",inputFloatValue:true,isInputFloat:'inputFloatAuxiliaryAmount' },
          { label: "辅助单位", prop: "auxiliaryUnit" },*/
          /*{ label: "毛重", prop: "grossWeight" },
          { label: "总毛重", prop: "totalGrossWeight" },
          { label: "净重", prop: "netWeight" },
          { label: "总净重", prop: "totalNetWeight" }
          { label: "总净重", prop: "totalNetWeight" }*/
        ];
      } else if (this.workType == 3) {
        tableColumnArr = [
@@ -1353,6 +2087,7 @@
            min:150,
            productName: true,
            isRequird: true,
              isScanCode:true,
          },
          { label: "产品编码", prop: "productId" },
          { label: "产品规格", prop: "specs" },
@@ -1360,23 +2095,26 @@
          {
            label: "从",
            prop: "fromLocationId",
            sonLocation: true,
            /*sonLocation: true,*/
            min:120,
            isRequird: true,
          },
          {
            label: "至",
            prop: "toLocationId",
              min:120,
            toLocation: true,
            isRequird: true,
          },
          { label: "数量", prop: "amount", inputFloat: true },
            { label: "在库数量", prop: "amount" },
          /*{ label: "数量", prop: "relAmount", inputFloat: true },*/
          { label: "计量单位", prop: "unit" },
          { label: "辅助数量", prop: "auxiliaryAmount",inputFloatValue:true,isInputFloat:'inputFloatAuxiliaryAmount' },
          { label: "辅助单位", prop: "auxiliaryUnit" },
          { label: "毛重", prop: "grossWeight" },
          /*{ label: "辅助数量", prop: "auxiliaryAmount",inputFloatValue:true,isInputFloat:'inputFloatAuxiliaryAmount' },
          { label: "辅助单位", prop: "auxiliaryUnit" },*/
         /* { label: "毛重", prop: "grossWeight" },
          { label: "总毛重", prop: "totalGrossWeight" },
          { label: "净重", prop: "netWeight" },
          { label: "总净重", prop: "totalNetWeight" }
          { label: "总净重", prop: "totalNetWeight" }*/
        ];
      } else if (this.workType == 4) {
        tableColumnArr = [
@@ -1386,6 +2124,7 @@
            min:150,
            productName: true,
            isRequird: true,
              isScanCode:true,
          },
          { label: "产品编码", prop: "productId" },
          { label: "产品规格", prop: "specs" },
@@ -1393,6 +2132,7 @@
          {
            label: "从",
            prop: "fromLocationId",
            min:120,
            sonLocation: true,
            isRequird: true,
          },
@@ -1402,7 +2142,7 @@
            toLocation: true,
            isRequird: true,
          },
          { label: "数量", prop: "amount", inputFloat: true },
          /*{ label: "数量", prop: "amount", inputFloat: true },*/
          { label: "计量单位", prop: "unit" },
        ];
      } else if (this.workType == 5) {
@@ -1413,6 +2153,7 @@
            min:150,
            productName: true,
            isRequird: true,
              isScanCode:true,
          },
          { label: "产品编码", prop: "productId" },
          { label: "产品规格", prop: "specs" },
@@ -1420,6 +2161,7 @@
          {
            label: "从",
            prop: "fromLocationId",
            min:120,
            sonLocation: true,
            isRequird: true,
          },
@@ -1429,14 +2171,52 @@
            toLocation: true,
            isRequird: true,
          },
          { label: "数量", prop: "amount", inputFloat: true },
          /*{ label: "数量", prop: "amount", inputFloat: true },*/
          { label: "计量单位", prop: "unit" },
        ];
      }else{
          tableColumnArr = [
              {
                  label: "产品名称",
                  prop: "productName",
                  min:150,
                  productName: true,
                  isRequird: true,
                  isScanCode:true,
              },
              { label: "产品编码", prop: "productId" },
              { label: "产品规格", prop: "specs" },
              { label: "产品型号", prop: "model" },
              {
                  label: "位置",
                  prop: "fromLocationId",
                  /*sonLocation: true,*/
                  min:120,
                  isRequird: true,
              },
              /*{ label: "盘点数量", prop: "relAmount", inputFloat: true ,min:0},*/
              { label: "库存数量", prop: "amount" },
              { 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" }*/
          ];
      }
      //console.log(this.tableData,'===tableData')
      if(this.workType == 2){
        for(let i in this.tableData){
          this.selSonLocationClick(this.tableData[i].fromLocation.id,'fromLocationId',this.tableData[i],i,3)
        }
      }
      this.productTableList = {
        tableData: this.tableData,
        tableColumn: tableColumnArr,
        selectBox:true
      };
      
    },
    getTwoTable(data,value){
        let list = data.map((res) => {
@@ -1446,11 +2226,11 @@
        let moreUnit=null
        let moreUnitList=[]
        if(value==1){
          moreUnit=res.product.moreUnit
          moreUnit=res.product.moreUnit;
          moreUnitList=res.product.moreUnitList
        }else{
          moreUnit=res.moreUnit
          moreUnitList=res.moreUnitList
          moreUnitList=res.moreUnitList;
        }
        if(moreUnit&&moreUnitList){
          if(moreUnitList.length>0){
@@ -1459,7 +2239,6 @@
                isValue=true;
                adjunctUnit=moreUnitList[j].unit
                adjunctAmount=moreUnitList[j].amount
               
                break;
              }
            }
@@ -1475,15 +2254,36 @@
          }
        }
        if(value==1){
            const moreUnitList=[];
          if(Array.isArray(res.moreUnitList)){
              res.moreUnitList.forEach(item=>{
                  if(item.floating){
                      item.floatingValue=item.amount;
                      moreUnitList.push(item);
                  }
              });
          }
            if(Array.isArray(res.product.moreUnitList)){
                res.product.moreUnitList.forEach((item,index)=>{
                    if(!item.floating){
                        moreUnitList.push(item);
                    }else{
                        let obj={...moreUnitList[index]}
                        obj.amount=item.amount;
                        this.$set(moreUnitList,index,obj);
                    }
                })
            }
          return {
            ...res,
            productName: res.product.name,
            productName: res.product?res.product.name:res.name,
            productId: res.product.id,
            unit: res.product.unit,
            model:res.product.model,
            specs:res.product.specs,
            moreUnit:res.product.moreUnit,
            moreUnitList:res.product.moreUnitList,
              moreUnitList,
            //moreUnitList:res.product.moreUnitList,
            auxiliaryUnit:res.auxiliaryUnit,
            // auxiliaryAmount:res.amount&&adjunctAmount?Number(adjunctAmount)*Number(res.amount):0,
            auxiliaryAmount:res.auxiliaryAmount,
@@ -1497,20 +2297,20 @@
        }else{
          return {
            ...res,
            amount: 1,
            productName: res.name,
            productId: res.id,
            productName: res.productId?(res.productName?res.productName:res.name):res.name,
            productId:  res.productId?res.productId:res.id,
            auxiliaryUnit:adjunctUnit,
            auxiliaryAmount:adjunctAmount?(1/Number(adjunctAmount)).toFixed(2):0,
            auxiliaryAmountInfo:adjunctAmount?Number(adjunctAmount):0,
            inputFloatAuxiliaryAmount:isValue,
            grossWeight:res.grossWeight==0?null:res.grossWeight,
            totalGrossWeight:res.grossWeight?Number(res.grossWeight)*1:null,
            totalGrossWeight:res.grossWeight==0?null:Number(res.grossWeight)*1,
            netWeight:res.netWeight==0?null:res.netWeight, 
            totalNetWeight:res.netWeight?Number(res.netWeight)*1:null, 
            totalNetWeight:res.netWeight==0?null:Number(res.netWeight)*1, 
          };
        }
      });
        console.log(list,'-------')
        return list||[];
    },
    getAuxiligyAmount(unit,unitList){
@@ -1555,10 +2355,29 @@
          if(prop=='amount'){
            item.totalGrossWeight=item[prop]&&item.grossWeight?Number(item.grossWeight)*Number(item[prop]):null
            item.totalNetWeight=item[prop]&&item.netWeight?Number(item.netWeight)*Number(item[prop]):null
            item.auxiliaryAmount=item[prop]&&auxiliaryAmountObject.auxiliaryAmount?(Number(item[prop])/Number(auxiliaryAmountObject.auxiliaryAmount)).toFixed(2):''
            item.auxiliaryAmount=item[prop]&&auxiliaryAmountObject.auxiliaryAmount?(Number(item[prop])/Number(auxiliaryAmountObject.auxiliaryAmount)).toFixed(2):null
          }
        }
      });
    },
    selSonLocationClick(val, prop, row,scope,type){
      if(this.workType == 2){
        if(prop=='fromLocationId'){
         getLocationProductAmount({
            locationId:type==3?val:val.value,
            productId:row.productId
          }).then((res)=>{
            if(res.code==200){
              if(type==3){
                this.$set(this.tableData[scope],'inLibraryAmount',res.data?res.data.amount:0)
              }else{
                this.$set(this.tableData[scope.$index],'inLibraryAmount',res.data?res.data.amount:0)
              }
              this.$forceUpdate()
            }
          })
        }
      }
    },
    // 新增
    addProductClick(value) {
@@ -1612,24 +2431,105 @@
      this.getSelectArray([value],scope.$index)
    },
    // 新增方式修改
    getSelectArray(val, index) {
      debugger
    async getSelectArray(val, index) {
        if(!this.workType){
            if(Array.isArray(val)&&val.length>0){
                val.forEach(item=>{
                    if(item.location){
                        item.fromLocationId=item.location.name;
                    }
                    item.toLocationId=this.editConfig.infomation.toLocation;
                    item.relAmount=1;
                    item.silkMarket=this.editConfig.infomation.silkMarket||"";
                    if(!item.silkMarketClose){
                        item.silkMarketClose='否';
                    }
                });
            }
            //const warehouse=this.warehouseList.find(item=>item.id==this.editConfig.infomation.warehouseId)||{};
           /* const {code,data}=await getLocationList({
                warehouseId: this.editConfig.infomation.warehouseId,
                type:3,
                page: 1,
                pageSize: 100
            });
            if(code===200){
                if(Array.isArray(val)&&val.length>0){
                    val.forEach(item=>{
                        if(Array.isArray(data)&&data.length>0){
                            item.fromLocationId=data[0].name;
                        }else{
                            item.fromLocationId='';
                        }
                        if (!item.amount){
                            item.amount=1;
                        }
                        item.relAmount=1;
                    })
                }
            }*/
        }else{
            if(Array.isArray(val)&&val.length>0){
                val.forEach(item=>{
                    if(this.workType==1){
                        item.fromLocationId=this.editConfig.infomation.location||'';
                        item.toLocationId=this.editConfig.infomation.location||'';
                    }else{
                        if(item.location){
                            item.fromLocationId=item.location.name;
                        }
                        item.toLocationId=this.editConfig.infomation.toLocation;
                    }
                    item.relAmount=1;
                    item.silkMarket=this.editConfig.infomation.silkMarket||"";
                    if(!item.silkMarketClose){
                        item.silkMarketClose='否'
                    }
                });
            }
        }
      if (this.tableData.length == 1 && this.tableData[0].number&&this.tableData[0].number.length == 0) {
        this.tableData = [];
            this.tableData = [];
      }
      if (index < this.tableData.length) {
        this.tableData.splice(index, 1);
        val.map((item, ind) => {
          this.tableData.splice(index + ind, 0, item);
          this.tableData.splice(index + ind, 0, JSON.parse(item));
        });
      } else {
        this.tableData = this.tableData.concat(val);
        val.forEach(item=>{
            let flag=-1;
            this.tableData.forEach((tableItem,index)=>{
               if(this.workType!=1){
                  if(item.id==tableItem.id&&item.location.warehouseId==tableItem.location.warehouseId&&item.location.name==tableItem.location.name){
                      flag=index;
                  }
               } else{
                   if(item.id===tableItem.id){
                       flag=index;
                   }
               }
            });
            if(flag===-1){
                this.tableData.push(item);
            }else{
                this.tableData[flag].amount=parseInt(this.tableData[flag].amount)+parseInt(item.amount);
            }
        });
      }
      const list= this.getTwoTable(this.tableData,2)
      
      const list= this.getTwoTable(this.tableData,2);
      //1.处理浮动的结果
      list.forEach(item=>{
         if(Array.isArray(item.moreUnitList)&&item.moreUnitList.length>0){
             item.moreUnitList.forEach(moreUnitItem=>{
                 if(moreUnitItem.floating){
                     moreUnitItem.floatingValue=parseFloat(1.00/moreUnitItem.amount);
                 }
             })
         }
      });
      this.tableData = list;
      this.productTableList.tableData = list;
      // this.showSummary.show = true
      this.productTableList.tableData = JSON.parse(JSON.stringify(list));
    },
    //  产品清空
    emptyProductClick() {
@@ -1662,7 +2562,7 @@
      if (this.workType == "内部调拨"||this.workType==3) {
        this.tableColumn = [
          { label: "产品", prop: "name", productName: true, isRequird: true },
          { label: "从", prop: "number", select: true },
          { label: "从", prop: "number", select: true,min:120,},
          { label: "至", prop: "amount", select: true },
          { label: "完成", prop: "total", inputFloat: true },
          { label: "计量单位", prop: "total", select: true },
@@ -1670,7 +2570,7 @@
      } else {
        this.tableColumn = [
          { label: "产品", prop: "name", productName: true, isRequird: true },
          { label: "从", prop: "number", select: true },
          { label: "从", prop: "number", select: true , min:120,},
          { label: "完成", prop: "total", inputFloat: true },
          { label: "计量单位", prop: "total", select: true },
        ];
@@ -1738,7 +2638,6 @@
        localStorage.removeItem("pdfParams");
        try {
          let res = await printReceipts(this.editCommonConfig.infomation.id);
          console.log(res);
          if (res.code == 200) {
            console.log(this.editConfig.infomation.baseOperationType, "类型");
            let name=''
@@ -1750,7 +2649,7 @@
              baseOperationType:
                this.editConfig.infomation.baseOperationType || undefined,
              // 1是嘉联
              cutAfterWidth:name=='jialian'?52.6:
              cutAfterWidth:name=='jialian'?53.9:
               (this.editConfig.infomation.baseOperationType == 2
                  ? 50.8
                  : 53.3),
@@ -1770,18 +2669,46 @@
    },
    // 调出位置选择
    rootLocationChange(val) {
      this.editConfig.infomation.location = val;
          if(this.workType==1){
              this.productTableList.tableData.forEach(item=>{
                  item.fromLocationId=val;
                  item.toLocationId=val;
              });
          }
          /*this.locationId=val;
        this.tableData.forEach(item=>{
            item.fromLocationId=val;
            item.toLocationId=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, "fromLocation");
    },
    // 仓库位置选择
    toLocationChange(val) {
      this.editConfig.infomation.toLocation = val;
      this.$refs.tableView.setLocationList(val.label, "toLocation");
        const locationObj=this.toLocationOptions.find(item=>item.id===val);
        this.warehouseId=locationObj.warehouseId;
        if(this.workType==3){
             getLocationList({
                warehouseId:this.warehouseId,
                type:3,
                keyWord: "",
                page: 0,
                pageSize: 0,
            }).then((res) => {
                if (res.code == 200) {
                    //this.toLocationOptions = res.data;
                    this.$refs.tableView.setLocationList(res.data, "toLocation");
                }
            });
        }
        this.tableData.forEach(item=>{
            item.toLocationId=val;
        });
     //this.editConfig.infomation.toLocation = val;
    },
  },
};
@@ -1789,6 +2716,10 @@

<!-- Add "scoped" attribute to limit CSS to this component only -->
<style lang="scss" scoped>
  .more-unit{
    display: flex;
    flex: 1;
  }
.dialog-header {
  display: flex;
  align-items: center;