添加修改密码，api拦截，bug修改

zuozhengqing

2024-02-05 3c4e059b2c47e3ba22b694805645b008c4276e25

 src/views/overview/AddOverviewDialog.vue

@@ -10,7 +10,7 @@
      <div slot="title" class="dialog-header">
        <span>{{ editCommonConfig.title === "查看" ? editCommonConfig.title : editCommonConfig.title + addName }}</span>
        <div class="header_btns">
          <span class="btn" @click="btnPrint">
          <span class="btn" :style="{ cursor: thatCursor, color: thatColor }" @click="btnPrint" :disabled="true">
            <i class="el-icon-printer"></i>
            <span>打印</span>
          </span>
@@ -18,7 +18,15 @@
            <i class="el-icon-s-tools"></i>
            <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>
          <el-button
            v-if="showEdit"
            :disabled="this.editConfig.infomation.status === 5"
            plain
            size="mini"
            style="margin-left: 15px"
            @click="editClick"
            >编辑</el-button
          >
        </div>
      </div>
      <!-- 内容 -->
@@ -48,9 +56,29 @@
          <div class="basic-info-view">
            <el-row>
              <el-col :span="12">
                <el-form-item prop="number">
                  <span slot="label">{{ workType === 1 ? "入库" : workType === 2 ? "出库" : "调拨" }}单号</span>
                  <el-input
                    style="width: 85%"
                    v-if="
                      editConfig.title == '编辑' ||
                      editConfig.title == '查看' ||
                      (editConfig.title == '新建' && codenumer && (explain != '' || isIdDisabled))
                    "
                    :disabled="editConfig.title != '新建'"
                    v-model="editConfig.infomation.number"
                    placeholder="请输入编码"
                  >
                  </el-input>
                  <span v-else-if="editConfig.title == '新建'" style="color: #f56c6c; width: 85%"
                    >请优先配置编码规范 <el-button type="text" @click="numberClick"> 配置规范 </el-button></span
                  >
                </el-form-item>
              </el-col>
              <el-col :span="12">
                <el-form-item prop="companyName">
                  <span slot="label">{{ workType === 1 ? "供应商" : workType === 2 ? "客户" : "联系人" }}</span>
                  

                  <el-select
                    v-if="workType === 1"
                    v-model="editConfig.infomation.companyName"
@@ -94,7 +122,7 @@
                    :disabled="!showFooter"
                    @change="companyChange"
                  >
                   <el-option
                    <el-option
                      v-for="item in companyOptions"
                      :key="item.id"
                      :label="item.name"
@@ -102,7 +130,6 @@
                    >
                    </el-option>
                  </el-select>
                  
                </el-form-item>
              </el-col>
              <!-- <el-col :span="12">
@@ -175,39 +202,21 @@
                  ></el-input>
                </el-form-item>
              </el-col>
              <el-col :span="12">
                <el-form-item v-if="workType !== 1" label="源位置" prop="fromLocationId">
              <el-col :span="12" >
                <el-form-item :label="workType === 1?'仓库位置':'源位置'" prop="location">
                  <el-select
                    v-model="editConfig.infomation.fromLocationId"
                    @change="rootLocationChange"
                    v-model="editConfig.infomation.location"
                    placeholder="请选择"
                    size="mini"
                    style="width: 90%"
                    :disabled="!showFooter"
                  >
                    <el-option
                      v-for="item in toLocationOptions"
                      v-for="item in formLocationOptions"
                      :key="item.id"
                      :label="item.jointName"
                      :value="item.id"
                    >
                    </el-option>
                  </el-select>
                </el-form-item>
              </el-col>
              <el-col :span="12">
                <el-form-item v-if="workType !== 2" label="仓库位置" prop="toLocationId">
                  <el-select
                    v-model="editConfig.infomation.toLocationId"
                    placeholder="请选择"
                    size="mini"
                    style="width: 90%"
                    :disabled="!showFooter"
                  >
                    <el-option
                      v-for="item in toLocationOptions"
                      :key="item.id"
                      :label="item.jointName"
                      :value="item.id"
                      :value="{label:item.jointName,value:item.id}"
                    >
                    </el-option>
                  </el-select>
@@ -228,6 +237,26 @@
                      :key="item.id"
                      :label="item.name"
                      :value="{ value: item.id, label: item.name }"
                    >
                    </el-option>
                  </el-select>
                </el-form-item>
              </el-col>
              <el-col :span="12" v-if="workType === 3">
                <el-form-item  label="仓库位置" prop="toLocation">
                  <el-select
                    @change="toLocationChange"
                    v-model="editConfig.infomation.toLocation"
                    placeholder="请选择"
                    size="mini"
                    style="width: 90%"
                    :disabled="!showFooter"
                  >
                    <el-option
                      v-for="item in toLocationOptions"
                      :key="item.id"
                      :label="item.jointName"
                      :value="{label:item.jointName,value:item.id}"
                    >
                    </el-option>
                  </el-select>
@@ -265,11 +294,13 @@
            <el-tabs v-model="activeName" type="card">
              <!-- <el-tab-pane v-if="workType !== 1" label="详情" name="detail"> </el-tab-pane> -->
              <el-tab-pane label="产品" name="first"> </el-tab-pane>
              <el-tab-pane label="物流信息" name="two" v-if="this.workType===2"></el-tab-pane>
              <el-tab-pane label="物流信息" name="two" v-if="this.workType === 2"></el-tab-pane>
            </el-tabs>
            <!-- 操作 -->
            <div v-if="activeName === 'first'">
              <CommonFormTableView
                ref="tableView"
                :islistingrules="true"
                :product-table-list="productTableList"
                :detail-enter="!showFooter"
                @inputContent="inputContent"
@@ -287,55 +318,89 @@
              </CommonFormTableView>
            </div>
            <!-- 物流信息 -->
            <div v-if="activeName==='two'&&this.workType===2">
              <el-form 
                label-position="right"  
                :model="shipmentsInfo" 
            <div v-if="activeName === 'two' && this.workType === 2">
              <el-form
                :rules="rules2"
                ref="shipmentsInfo"
                label-position="right"
                :model="editConfig.infomation"
                label-width="120px"
                size="mini"
                style="margin-top: 20px;"
                style="margin-top: 20px"
              >
                <el-col :span="12">
                  <el-form-item label="承运商" >
                    <el-select 
                    size="mini"  :disabled="!showFooter" v-model="editConfig.infomation.logisticCompanyId" placeholder="请选择" style="width: 90%;">
                  <el-form-item label="承运商">
                    <el-select
                      size="mini"
                      :disabled="!showFooter"
                      v-model="editConfig.infomation.logisticCompanyId"
                      placeholder="请选择"
                      style="width: 90%"
                    >
                      <el-option
                        v-for="item in shipmentsInfo.carrier"
                        v-for="item in editConfig.infomation.carrier"
                        :key="item.id"
                        :label="item.name"
                        :value="item.id">
                        :value="item.id"
                      >
                      </el-option>
                    </el-select>
                  </el-form-item>
                </el-col>
                <el-col :span="12">
                  <el-form-item label="运单号" >
                    <el-input style="width: 90%;" :disabled="!showFooter" v-model="editConfig.infomation.waybillNumber"></el-input>
                  <el-form-item label="运单号">
                    <el-input
                      style="width: 90%"
                      :disabled="!showFooter"
                      v-model="editConfig.infomation.waybillNumber"
                    ></el-input>
                  </el-form-item>
                </el-col>
                <el-col :span="12">
                  <el-form-item label="收货人">
                    <el-input style="width: 90%;" :disabled="!showFooter" v-model="editConfig.infomation.receiverName"></el-input>
                    <el-input
                      style="width: 90%"
                      :disabled="!showFooter"
                      v-model="editConfig.infomation.receiverName"
                    ></el-input>
                  </el-form-item>
                </el-col>
                <el-col :span="12">
                  <el-form-item label="联系电话">
                    <el-input style="width: 90%;" :disabled="!showFooter" v-model="editConfig.infomation.receiverPhone"></el-input>
                  <el-form-item label="联系电话" prop="receiverPhone">
                    <el-input
                      style="width: 90%"
                      :disabled="!showFooter"
                      v-model="editConfig.infomation.receiverPhone"
                    ></el-input>
                  </el-form-item>
                </el-col>
                <el-col :span="12">
                  <el-form-item label="收货地址">
                    <el-input style="width: 90%;" :disabled="!showFooter" v-model="editConfig.infomation.receiverAddr"></el-input>
                    <el-input
                      style="width: 90%"
                      :disabled="!showFooter"
                      v-model="editConfig.infomation.receiverAddr"
                    ></el-input>
                  </el-form-item>
                </el-col>
                <el-col :span="12">
                  <el-form-item label="重量">
                    <el-input style="width: 90%;" :disabled="!showFooter" v-model="editConfig.infomation.weight"></el-input>
                    <el-input
                      style="width: 90%"
                      :disabled="!showFooter"
                      type="number"
                      v-model="editConfig.infomation.weight"
                    ></el-input>
                  </el-form-item>
                </el-col>
                <el-col :span="12">
                  <el-form-item label="物流重量">
                    <el-input  style="width: 90%;" :disabled="!showFooter" v-model="editConfig.infomation.logisticWeight"></el-input>
                    <el-input
                      style="width: 90%"
                      :disabled="!showFooter"
                      type="number"
                      v-model="editConfig.infomation.logisticWeight"
                    ></el-input>
                  </el-form-item>
                </el-col>
              </el-form>
@@ -365,7 +430,7 @@
      <!-- 尾 -->
      <div slot="footer" class="dialog-footer">
        <!-- <el-button type="primary" size="small" @click="editConfig.visible = false">保并提交审批</el-button> -->
        <el-button type="primary" size="small" @click="saveClick('form')" :disabled="!showFooter">保存</el-button>
        <el-button type="primary" size="small" @click="saveClick" :disabled="!showFooter">保存</el-button>
        <el-button size="small" @click="editConfig.visible = false">取消</el-button>
      </div>
    </el-dialog>
@@ -385,9 +450,11 @@
  getLogisticCompanyList,
  printReceipts
} from "@/api/overview/overview"
import { getSupplierList,getCompanyList,getClientList } from "@/api/common/other"
import { getSupplierList, getCompanyList, getClientList } from "@/api/common/other"
import codeMixin from "@/views/overview/mixin/codeMixin"
export default {
  name: "AddOverviewDialog",
  mixins: [codeMixin],
  props: {
    editCommonConfig: {
      type: Object,
@@ -402,7 +469,10 @@
    },
    workType: {
      type: Number,
      default: 1
      default: function() {  
        // return JSON.parse(window.sessionStorage.getItem('paramsData')).workType|| 1; 
        return 1; 
      }
    },
    addName: {
      type: String,
@@ -422,24 +492,36 @@
      rules: {
        sourceNumber: [{ required: true, message: "请输入来源单据", trigger: "blur" }],
        operationDate: [{ required: true, message: "请选择日期", trigger: "change" }],
        toLocationId: [{ required: true, message: "请选择仓库位置", trigger: "change" }],
        fromLocationId: [{ required: true, message: "请选择源位置", trigger: "change" }],
        operationTypeId: [{ required: true, message: "请选择入库类型", trigger: "change" }]
        toLocation: [{ required: true, message: "请选择仓库位置", trigger: "change" }],
        location: [{ required: true, message: "请选择源位置", trigger: "change" }],
        operationTypeId: [{ required: true, message: "请选择入库类型", trigger: "change" }],
        number: [{ required: true, validator: this.validateCheckCode, trigger: ["change", "blur"] }]
      },
      rules2: {
        receiverPhone: [
          // {required: true, message: "请输入手机号", trigger: "change" },
          {
            pattern: /^1(3\d|4[5-9]|5[0-35-9]|6[2567]|7[0-8]|8\d|9[0-35-9])\d{8}$/,
            message: "请输入正确的手机号",
            trigger: ["blur", "change"]
          }
        ]
      },
      companyOptions: [], // 公司
      supplierOptions:[],//供应商
      clientOptions:[],//客户
      supplierOptions: [], //供应商
      clientOptions: [], //客户
      memberOptions: [{ id: 1, name: "管理员" }],
      toLocationOptions: [], //  源位置 仓库位置
      formLocationOptions:[],// 源位置
      toLocationOptions: [], // 仓库位置
      showButton: true,
      activeName: "first",
      productTableList: {},
      tableData: [],
      tableData:[],
      countId: 0,
      isNoProduct: true, // 添加明细行时是否有产品未选择
      showEdit: false, // 是否显示编辑按钮
      isDelClick: false, // 删除按钮是否可点击
      isCancel:false, //验证按钮是否可点击
      isCancel: false, //验证按钮是否可点击
      showFooter: false, // 是否显示取消保存
      currentState: "todo", // 当前状态
      detailTableList: {},
@@ -453,13 +535,17 @@
      isValidateClick: false, // 验证是否显示
      operationTypeOptions: [], // 入库类型列表
      shipmentsInfo: {
        carrier:[],
        waybillNumber:'',
        weight:0,
        logisticWeight:0,
        carrier: [],
        waybillNumber: "",
        weight: 0,
        logisticWeight: 0,
        receiverPhone: ""
      },
      showCancel:false, // 取消是否可以显示
      list:[],
      showCancel: false, // 取消是否可以显示
      list: [],
      pdfParams: {},
      thatCursor: this.workType === 3 ? "no-drop" : "pointer",
      thatColor: this.workType === 3 ? "#ccc" : "#000"
    }
  },
  created() {
@@ -469,25 +555,43 @@
    this.setBottonView()
    this.setDetailTableForm()
    this.getLocationList()
    this.receiptType = this.editConfig.title === "查看" ? this.editConfig.infomation.operationTypeName : this.addName
    this.receiptType =
      this.editConfig.title === "查看" || this.editConfig.title === "编辑"
        ? this.editConfig.infomation.operationTypeName
        : this.addName
    if (this.showOperationType) {
      this.getListTransfer()
    }
    this.getLogisticCompanyList()
    this.formInfo()
    if(this.editConfig.title==="查看"||this.editConfig.title==="编辑"){
      setTimeout(() => {
        this.$refs.tableView.setLocationList(this.editConfig.infomation.location.label)
      }, 100);
    }
  },
  mounted(){
  },
  methods: {
    setStatusList(){
      console.log(this.editConfig.infomation,"edit")
      if(this.editConfig.infomation.status===5){
        this.list=[
    formInfo() {
      this.objCode.type = this.workType === 1 ? "入库编码" : this.workType === 2 ? "出库编码" : "调拨编码"
      this.objCode.codeStandID = ""
      if (this.editConfig.infomation.codeStandardID) {
        this.objCode.codeStandID = this.editConfig.infomation.codeStandardID
      }
      this.getRCodeStandardList()
    },
    setStatusList() {
      if (this.editConfig.infomation.status === 5) {
        this.list = [
          { label: "草稿", status: "todo", value: 1 },
          { label: "正在等待", status: "todo", value: 2 },
          { label: "就绪", status: "todo", value: 3 },
          { label: "完成", status: "todo", value: 4 },
          { label: "已取消", status: "todo", value: 5 }
        ]
      }else{
        this.list=[
      } else {
        this.list = [
          { label: "草稿", status: "todo", value: 1 },
          { label: "正在等待", status: "todo", value: 2 },
          { label: "就绪", status: "todo", value: 3 },
@@ -497,34 +601,45 @@
    },
    // 获取公司列表
    async getCompanyList() {
      if(this.workType === 1){
      if (this.workType === 1) {
        await getSupplierList().then((res) => {
          console.log(res)
          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) {
            this.clientOptions = res.data
          }
        })
      }else{
      } else {
        await getCompanyList().then((res) => {
          console.log(res)
          if (res.code === 200) {
            this.companyOptions = res.data
          }
        })
      } 
      }
    },
    // 获取仓库位置列表
    // 获取源位置/仓库位置列表
    async getLocationList() {
      await getLocationList({
        keyWord: "",
        jointName: this.editConfig.code,
        page: 0,
        pageSize: 0
      }).then((res) => {
        console.log(res)
        if (res.code === 200) {
          this.formLocationOptions = res.data
        }
      })
      await getLocationList({
        keyWord: "",
        // jointName: this.editConfig.code,
        page: 0,
        pageSize: 0
      }).then((res) => {
@@ -573,13 +688,13 @@
        this.showFooter = false
        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){
          this.isCancel=true
          this.isValidateClick=true
        }else{
          this.showCancel = true
        } 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 === "完成") {
@@ -589,7 +704,7 @@
        this.showFooter = false
        this.isValidateClick = false
      } else if (this.editConfig.infomation.status === 5) {
        this.isCancel=true
        this.isCancel = true
        this.showButton = true
        this.showEdit = false
        this.showFooter = false
@@ -600,7 +715,7 @@
        this.showEdit = true
        this.showFooter = false
        this.isValidateClick = true
        this.showCancel=true
        this.showCancel = true
      }
      if (this.editConfig.title === "新建") {
        this.list[0].status = "active"
@@ -626,17 +741,27 @@
      this.showFooter = true
      this.setTableForm()
    },
    async getLogisticCompanyList(){
    async getLogisticCompanyList() {
      await getLogisticCompanyList().then((res) => {
        if(res.code===200){
          this.shipmentsInfo.carrier=res.data
        if (res.code === 200) {
          this.editConfig.infomation.carrier = res.data
        }
      })
    },
    // 保存
    saveClick(formName) {
      this.$refs[formName].validate((valid) => {
        if (valid) {
    saveClick() {
      let validArr = []
      if (this.workType === 2) {
        console.log("出库")
        validArr = [this.$refs.form.validate()]
      } else {
        console.log("入库")
        validArr = [this.$refs.form.validate()]
      }
      console.log(validArr, "xxx")
      Promise.all(validArr)
        .then((results) => {
          console.log(results, "执行成功")
          for (let i = 0; i < this.tableData.length; i++) {
            if (this.tableData[i].productName.length === 0) {
              this.isNoProduct = true
@@ -648,21 +773,112 @@
          if (this.isNoProduct) {
            this.$message.error("请添加明细行或选择产品不能为空")
          } else {
            let requestUrl = this.editConfig.title === "新建" ? addOperation : updateOperation
            let params = this.saveParams()
            // if(this.workType===2){
            //   params.details.map((item)=>{
            //     item.fromLocationId=item.fromLocationId.value
            //   })
            // }else if(this.workType===3){
            //   params.details.map((item)=>{
            //     item.fromLocationId=item.fromLocationId.value
            //     item.toLocationId=item.toLocationId.value
            //   })
            // }
            // 产品列表解构
            if(this.editConfig.title === "编辑"||this.editConfig.title === "查看"){
              let arr=[]
              if(this.workType===1){
                params.details.map((item)=>{
                  arr.push({
                    operationId:item.operationId,
                    amount:item.amount,
                    productId:item.productId
                  })
                })
                params.details=arr
              }else if(this.workType===2){
                params.details.map((item)=>{
                  if(item.fromLocationId.value){
                    arr.push({
                      operationId:item.operationId,
                      amount:item.amount,
                      fromLocationId:item.fromLocationId.value,
                      productId:item.productId,
                    })
                  }else{
                    arr.push({
                      operationId:item.operationId,
                      amount:item.amount,
                      fromLocationId:item.fromLocation.id,
                      productId:item.productId,
                    })
                  }
                })
                params.details=arr
              }else if(this.workType===3){
                console.log(params.details,"看看")
                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,
                    })
                  // if(item.fromLocationId.value){
                  //   arr.push({
                  //     operationId:item.operationId,
                  //     amount:item.amount,
                  //     fromLocationId:item.fromLocationId.value,
                  //     toLocationId:item.toLocation.id,
                  //     productId:item.productId,
                  //   })
                  // }else{
                  //   arr.push({
                  //     operationId:item.operationId,
                  //     amount:item.amount,
                  //     fromLocationId:item.fromLocation.id,
                  //     toLocationId:item.toLocation.id,
                  //     productId:item.productId,
                  //   })
                  // }
                })
                params.details=arr
              }
            }else if(this.editConfig.title === "新建"){
              if(this.workType===2){
                params.details.map((item)=>{
                  item.fromLocationId=item.fromLocationId.value
                })
              }else if(this.workType===3){
                params.details.map((item)=>{
                  item.fromLocationId=item.fromLocationId.value
                  item.toLocationId=item.toLocationId.value
                })
              }
            }
            let requestUrl = this.editConfig.title === "新建" ? addOperation : updateOperation
            // let params = this.saveParams()
            requestUrl({
              ...params
            }).then((res) => {
              console.log(res)
              this.editConfig.visible = false
              if (res.code === 200) {
                this.$message.success("添加成功")
                if (this.editConfig.title === "新建") {
                  this.$message.success("添加成功")
                } else {
                  this.$message.success("编辑成功")
                }
                this.$parent.getData()
              }else{
                this.$message.success(res.msg)
              }
            })
          }
        }
      })
        })
        .catch((error) => {
          console.error("表单校验未通过:", error)
        })
    },
    saveParams() {
      let data = this.editConfig.infomation
@@ -681,30 +897,59 @@
        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 = {
        baseOperationType: data.baseOperationType,
        comment: data.comment || "",
        companyID: companyID,
        companyName: companyName,
        contacterID: contacterID,
        contacterName: contacterName,
        details: this.tableData,
        fromLocationId: data.fromLocationId || 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.toLocationId || 0,
        waybillNumber:data.waybillNumber||'',
        weight:data.weight||0,
        logisticWeight:data.logisticWeight||0,
        logisticCompanyId:data.logisticCompanyId,
        receiverAddr:data.receiverAddr||'',
        receiverName:data.receiverName||'',
        receiverPhone:data.receiverPhone||''
      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.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 || ""
        }
      }else if(this.workType===3){
        params = {
          baseOperationType: data.baseOperationType,
          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 || ""
        }
      }
      return params
    },
@@ -738,23 +983,39 @@
        this.tableData = []
      }
      // this.tableData = this.editConfig.title !== "新建" ? list : []
      this.productTableList = {
        tableData: this.tableData,
        tableColumn: [
      let tableColumnArr=[]
      if(this.workType===1){
        tableColumnArr= [
          { label: "产品", prop: "productName", productName: true, isRequird: true },
          // { label: "说明", prop: "number", input: true },
          // { label: "日期", prop: "amount", date: true, isRequird: true },
          // { label: "截止日期", prop: "price", date: true },
          { label: "数量", prop: "amount", inputFloat: true },
          { label: "计量单位", prop: "unit" }
        ]
      }else if(this.workType===2){
        tableColumnArr = [
          { label: "产品", prop: "productName", productName: true, isRequird: true },
          { label: "从", prop: "fromLocationId", sonLocation: true, isRequird: true },
          { label: "数量", prop: "amount", inputFloat: true },
          { label: "计量单位", prop: "unit" }
        ]
      }else if(this.workType===3){
        tableColumnArr = [
          { label: "产品", prop: "productName", productName: true, isRequird: true },
          { label: "从", prop: "fromLocationId", sonLocation: true, isRequird: true },
          { label: "至", prop: "toLocationId", toLocation: true,isRequird: true },
          { label: "数量", prop: "amount", inputFloat: true },
          { label: "计量单位", prop: "unit" }
        ]
      }
      this.productTableList = {
        tableData: this.tableData,
        tableColumn: tableColumnArr
      }
    },
    // 操作输入
    inputContent(val, prop, row) {
      this.countId = row.countId
      this.tableData.map((item) => {
        if (item.countId === row.countId) {
        if (item.id === row.id) {
          item[prop] = val
        }
      })
@@ -779,7 +1040,7 @@
            productId: "",
            amount: 0,
            unit: "",
            productName: ""
            productName: "",
          })
        }
      } else {
@@ -873,50 +1134,72 @@
    },

    // 取消
    btnCancel(){
      this.$confirm('确定取消吗？', '提示', {
        confirmButtonText: '确定',
        cancelButtonText: '取消',
        type: 'warning'
      }).then(() => {
        stateCancel(this.editConfig.infomation.id).then((res) => {
          console.log(res)
          this.editConfig.visible = false
          if (res.code === 200) {
            this.$message.success("取消调拨")
            this.$parent.getData()
          }
        })
        this.list.map((item) => {
          if (item.label==="已取消") {
            item.status = "active"
          } else {
            item.status = "todo"
          }
        })
      }).catch(() => {         
      });
    },
    //打印
    async btnPrint(){
      await printReceipts(this.editCommonConfig.infomation.id).then((res) => {
        console.log(res)
        if (res.code === 200) {
          // this.$message.success("打印成功")
          // const link = document.createElement('a');
          // link.href = res.data;
          // link.download = '出库单.xlsx';
          // link.click();
          this.$router.push({
            name:"previewExcel",
            params:{
              url:res.data,
              baseOperationType:this.editConfig.infomation.baseOperationType||undefined,
              cutAfterWidth:this.editConfig.infomation.baseOperationType===2 ? 50.8 : 53.3
    btnCancel() {
      this.$confirm("确定取消吗？", "提示", {
        confirmButtonText: "确定",
        cancelButtonText: "取消",
        type: "warning"
      })
        .then(() => {
          stateCancel(this.editConfig.infomation.id).then((res) => {
            console.log(res)
            this.editConfig.visible = false
            if (res.code === 200) {
              this.$message.success("取消调拨")
              this.$parent.getData()
            }
          })
          this.list.map((item) => {
            if (item.label === "已取消") {
              item.status = "active"
            } else {
              item.status = "todo"
            }
          })
        })
        .catch(() => {})
    },
    //打印
    async btnPrint() {
      if (this.workType !== 3) {
        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 pdfParams = {
              url: res.data,
              baseOperationType: this.editConfig.infomation.baseOperationType || undefined,
              cutAfterWidth: this.editConfig.infomation.baseOperationType === 2 ? 50.8 : 53.3
            }
            var { href } = this.$router.resolve({
              path: "/overview/previewExcel",
              query: {
                ...pdfParams
              }
            })
            window.open(href, "_blank")
          }
        } catch (error) {
          console.error(error)
        }
      })
      }
    },
    // 源位置选择
    rootLocationChange(val){
      this.editConfig.infomation.location=val
      // this.productTableList.tableData.map((item)=>{
      //   console.log(item,"item")
      //   // item.toLocationId={}
      //   // item.fromLocationId={}
      // })
      this.$refs.tableView.setLocationList(val.label,"fromLocation")
    },
    // 仓库位置选择
    toLocationChange(val){
      this.editConfig.infomation.toLocation=val
      this.$refs.tableView.setLocationList(val.label,"toLocation")
    }
  }
}
@@ -929,20 +1212,26 @@
  align-items: center;
  font-size: 14px;
  color: #333;

  .header_btns {
    margin-left: auto;
    margin-right: 60px;

    .btn {
      cursor: pointer;
    }
    .btn:nth-of-type(2){

    .btn:nth-of-type(2) {
      cursor: no-drop;
      color: #ccc;
    }
  }
}

.content-status {
  display: flex;
}

.basic-info {
  height: calc(100% - 80px);
  overflow: auto;
@@ -955,34 +1244,42 @@
  //   margin-top: 20px;
  // }
}

.purchase-view {
  display: flex;

  .left {
    width: 50%;
  }

  .right {
    width: 50%;
  }
}

.second-label {
  margin-left: 20px;
  border-bottom: 1px solid #d9d9d9;
  margin-bottom: 10px;
}

::v-deep {
  .el-dialog__headerbtn {
    position: absolute;
    top: 15px;
  }

  .el-button {
    &:hover {
      border: 1px solid #dcdfe6;
      color: #333;
    }
  }

  .el-tabs--card > .el-tabs__header {
    border-bottom: none;
  }

  // .el-tabs__item.is-active {
  //   color: #333;
  //   background: #f1f3f8;
@@ -993,20 +1290,24 @@
    font-size: 13px;
    background: #f3f3f3;
  }

  .el-tabs__header {
    margin: 0 0 1px;
  }
  .bottom{
    .el-form{

  .bottom {
    .el-form {
      // border-top: 1px solid #EBEEF5;
    }
    .el-form-item{

    .el-form-item {
      height: 28px;

      .el-input {
        input{
        input {
          height: 28px;
        }
      } 
      }
    }
  }
}