Browse Source

修改bug

qukaidi 3 years ago
parent
commit
815a75c0b3
1 changed files with 230 additions and 345 deletions
  1. 230 345
      src/views/importTrade/receipt/detailsPageEdit.vue

+ 230 - 345
src/views/importTrade/receipt/detailsPageEdit.vue

@@ -3,57 +3,34 @@
     <div class="customer-head">
       <div class="customer-back">
         <el-button type="danger" style="border: none;background: none;color: red" icon="el-icon-arrow-left"
-                   @click="backToList">返回列表
+          @click="backToList">返回列表
         </el-button>
       </div>
       <div class="upper_right_button">
-        <el-button type="primary"
-                   size="small"
-                   v-if="viewDisabled"
-                   class="el-button--small-yh "
-                   :loading="buttonLoading"
-                   @click.stop="openEdit()">编辑
+        <el-button type="primary" size="small" v-if="viewDisabled" class="el-button--small-yh " :loading="buttonLoading"
+          @click.stop="openEdit()">编辑
         </el-button>
-        <el-button type="primary"
-                   size="small"
-                   class="el-button--small-yh"
-                   :loading="buttonLoading"
-                   :disabled="!form.id || viewDisabled"
-                   @click.stop="confirmReceipt">
-          {{receiptDisable ?"撤销收货":"确认收货"}}
+        <el-button type="primary" size="small" class="el-button--small-yh" :loading="buttonLoading"
+          :disabled="!form.id || viewDisabled" @click.stop="confirmReceipt">
+          {{ receiptDisable ? "撤销收货" : "确认收货" }}
         </el-button>
 
         <el-dropdown style="padding: 0 8px;line-height: 0">
-          <el-button
-            type="success"
-            :loading="buttonLoading"
-            :disabled="!form.id || viewDisabled"
-            size="small"
-          >
+          <el-button type="success" :loading="buttonLoading" :disabled="!form.id || viewDisabled" size="small">
             业务处理<i class="el-icon-arrow-down el-icon--right"></i>
           </el-button>
           <el-dropdown-menu slot="dropdown">
-            <el-dropdown-item
-              :loading="buttonLoading"
-              :disabled="!form.id  || viewDisabled"
+            <el-dropdown-item :loading="buttonLoading" :disabled="!form.id || viewDisabled"
               @click.native="createData()">创建单据
             </el-dropdown-item>
-            <el-dropdown-item
-              :loading="buttonLoading"
-              :disabled="!form.id  || viewDisabled"
-              @click.native="copyData()">复制单据
+            <el-dropdown-item :loading="buttonLoading" :disabled="!form.id || viewDisabled" @click.native="copyData()">
+              复制单据
             </el-dropdown-item>
           </el-dropdown-menu>
         </el-dropdown>
 
-        <el-button
-          class="el-button--small-yh"
-          type="primary"
-          size="small"
-          :disabled="disabled || receiptDisable || viewDisabled"
-          :loading="buttonLoading"
-          @click="editCustomer"
-        >保存数据
+        <el-button class="el-button--small-yh" type="primary" size="small"
+          :disabled="disabled || receiptDisable || viewDisabled" :loading="buttonLoading" @click="editCustomer">保存数据
         </el-button>
       </div>
     </div>
@@ -61,225 +38,126 @@
       <el-form :model="form" ref="form" label-width="130px" class="demo-ruleForm">
         <trade-card title="基础信息">
           <el-row>
-            <el-col v-for="(item,index) in basicData.column" :key="index" :span="item.span?item.span:8">
+            <el-col v-for="(item, index) in basicData.column" :key="index" :span="item.span ? item.span : 8">
               <el-form-item :label="item.label" :prop="item.prop" :rules="item.rules">
-                <el-date-picker v-if="item.type === 'datetime'" style="width: 100%;" v-model="form[item.prop]" :disabled="receiptDisable || viewDisabled" size="small" type="date" placeholder="请选择日期" value-format="yyyy-MM-dd HH:mm:ss"/>
-                <crop-select
-                  v-else-if="item.prop === 'corpId'"
-                  v-model="form[item.prop]"
-                  corpType="GYS"
-                  :disabled="viewDisabled || receiptDisable"
-                  style="width: 100%"
-                ></crop-select>
-                <user-com
-                  v-else-if="item.prop === 'arrivalContact'"
-                  :disabled="receiptDisable || viewDisabled"
-                  v-model="form[item.prop]"
-                  style="width: 100%"
-                ></user-com>
-                <user-com
-                  v-else-if="item.prop === 'saleman'"
-                  :disabled="receiptDisable || viewDisabled"
-                  v-model="form[item.prop]"
-                  style="width: 100%"
-                ></user-com>
-                <el-select v-else-if="item.prop === 'storageId'" style="width: 100%" :disabled="receiptDisable || viewDisabled" v-model="form[item.prop]" size="small" placeholder="请选择" clearable filterable>
-                  <el-option v-for="(item,index) in storageIdDic" :key="index" :label="item.cname " :value="item.id"></el-option>
+                <el-date-picker v-if="item.type === 'datetime'" style="width: 100%;" v-model="form[item.prop]"
+                  :disabled="receiptDisable || viewDisabled" size="small" type="date" placeholder="请选择日期"
+                  value-format="yyyy-MM-dd HH:mm:ss" />
+                <crop-select v-else-if="item.prop === 'corpId'" v-model="form[item.prop]" corpType="GYS"
+                  :disabled="viewDisabled || receiptDisable" style="width: 100%"></crop-select>
+                <user-com v-else-if="item.prop === 'arrivalContact'" :disabled="receiptDisable || viewDisabled"
+                  v-model="form[item.prop]" style="width: 100%"></user-com>
+                <user-com v-else-if="item.prop === 'saleman'" :disabled="receiptDisable || viewDisabled"
+                  v-model="form[item.prop]" style="width: 100%"></user-com>
+                <el-select v-else-if="item.prop === 'storageId'" style="width: 100%"
+                  :disabled="receiptDisable || viewDisabled" v-model="form[item.prop]" size="small" placeholder="请选择"
+                  clearable filterable>
+                  <el-option v-for="(item, index) in storageIdDic" :key="index" :label="item.cname" :value="item.id">
+                  </el-option>
                 </el-select>
-                <el-input type="textarea" v-else-if="(item.prop === 'deliveryRemarks')" v-model="form[item.prop]"  :disabled="receiptDisable || viewDisabled" size="small" autocomplete="off" placeholder="请输入"></el-input>
-                <el-input v-else v-model="form[item.prop]" size="small" :disabled="item.disabled?true:false || receiptDisable || viewDisabled" placeholder="请输入" autocomplete="off"></el-input>
+                <el-input type="textarea" v-else-if="(item.prop === 'deliveryRemarks')" v-model="form[item.prop]"
+                  :disabled="receiptDisable || viewDisabled" size="small" autocomplete="off" placeholder="请输入">
+                </el-input>
+                <el-input v-else v-model="form[item.prop]" size="small"
+                  :disabled="item.disabled ? true : false || receiptDisable || viewDisabled" placeholder="请输入"
+                  autocomplete="off"></el-input>
               </el-form-item>
             </el-col>
           </el-row>
         </trade-card>
         <trade-card title="收货明细">
-          <avue-crud
-            :option="customerContact"
-            v-model="contactsForm"
-            :data="contactsData"
-            ref="crudContact"
-            :cell-style="cellStyle"
-            @row-save="rowSave"
-            @row-click="handleRowClick"
-            @row-update="rowUpdate"
-            @saveColumn="saveColumn"
-            @resetColumn="resetColumn"
-            @row-del="rowDel"
-          >
+          <avue-crud :option="customerContact" v-model="contactsForm" :data="contactsData" ref="crudContact"
+            :cell-style="cellStyle" @row-save="rowSave" @row-click="handleRowClick" @row-update="rowUpdate"
+            @saveColumn="saveColumn" @resetColumn="resetColumn" @row-del="rowDel">
             <template slot-scope="{row}" slot="billNo">
               <span v-if="row.$cellEdit" class="required_fields">*</span>
-              <el-input
-                v-if="row.$cellEdit"
-                v-model="row.billNo"
-                style="width: 90%"
-                placeholder=" "
-                size="small"
-                @change="bingOut(row)"
-              ></el-input>
+              <el-input v-if="row.$cellEdit" v-model="row.billNo" style="width: 90%" placeholder=" " size="small"
+                @change="bingOut(row)"></el-input>
               <span v-else>{{ row.billNo }}</span>
             </template>
             <template slot-scope="{row}" slot="contractNumber">
               <span v-if="row.$cellEdit" class="required_fields">*</span>
-              <el-select
-                v-if="row.$cellEdit"
-                style="width:90% !important;"
-                v-model="row.contractNumber"
-                placeholder=" "
-                size="small"
-                clearable
-                filterable
-              >
-                <el-option
-                  style="width:90%"
-                  v-for="(item,index) in contractDic"
-                  :key="index"
-                  :label="item.orderNo"
-                  @change="sumOrderNo(row)"
-                  :value="item.orderNo"
-                ></el-option>
+              <el-select v-if="row.$cellEdit" style="width:90% !important;" v-model="row.contractNumber" placeholder=" "
+                size="small" clearable filterable>
+                <el-option style="width:90%" v-for="(item, index) in contractDic" :key="index" :label="item.orderNo"
+                  @change="sumOrderNo(row)" :value="item.orderNo"></el-option>
               </el-select>
               <span v-else>{{ row.contractNumber }}</span>
             </template>
             <template slot="priceCategory" slot-scope="{row,index}">
               <span v-if="row.$cellEdit" class="required_fields">*</span>
-              <goods-select
-                style="width:90% !important;"
-                v-if="row.$cellEdit"
-                v-model="row.priceCategoryNames"
-                @valueName="(value) => valueName(value,row)"
-                :configuration="itemConfiguration"
-              >
+              <goods-select style="width:90% !important;" v-if="row.$cellEdit" v-model="row.priceCategoryNames"
+                @valueName="(value) => valueName(value, row)" :configuration="itemConfiguration">
                 <!-- @valueName="valueName($event,row)"   保留入参情况下,自定义参数-->
               </goods-select>
               <span v-else>{{ row.priceCategoryNames }}</span>
             </template>
             <template slot="cntrNo" slot-scope="{ row }">
               <span v-if="row.$cellEdit" class="required_fields">*</span>
-              <el-input
-                style="width:90%"
-                v-if="row.$cellEdit"
-                v-model="row.cntrNo"
-                placeholder="请输入"
-                size="small"
-              ></el-input>
+              <el-input style="width:90%" v-if="row.$cellEdit" v-model="row.cntrNo" placeholder="请输入" size="small">
+              </el-input>
               <span v-else>{{ row.cntrNo }}</span>
             </template>
             <template slot="billWeight" slot-scope="{ row }">
-              <el-input
-                style="width:90%"
-                v-if="row.$cellEdit"
-                v-model="row.billWeight"
-                placeholder="请输入"
-                size="small"
+              <el-input style="width:90%" v-if="row.$cellEdit" v-model="row.billWeight" placeholder="请输入" size="small"
                 oninput='this.value=this.value.replace(/[^(\d.)]/g,"").replace(/^(\d+)\.(\d\d\d\d\d\d).*$/, "$1.$2")'
-                @input="billWeightChange(row)"
-                @change="totalChange(row.billWeight)"
-              ></el-input>
+                @input="billWeightChange(row)" @change="totalChange(row.billWeight)"></el-input>
               <span v-else>{{ row.billWeight }}</span>
             </template>
             <template slot="invoiceWeight" slot-scope="{ row }">
               <span v-if="row.$cellEdit" class="required_fields">*</span>
-              <el-input
-                style="width:90%"
-                v-if="row.$cellEdit"
-                v-model="row.invoiceWeight"
-                placeholder="请输入"
+              <el-input style="width:90%" v-if="row.$cellEdit" v-model="row.invoiceWeight" placeholder="请输入"
                 size="small"
                 oninput='this.value=this.value.replace(/[^(\d.)]/g,"").replace(/^(\d+)\.(\d\d\d\d\d\d).*$/, "$1.$2")'
-                @change="totalChange(row.invoiceWeight)"
-              ></el-input>
+                @change="totalChange(row.invoiceWeight)"></el-input>
               <span v-else>{{ row.invoiceWeight }}</span>
             </template>
             <template slot="price" slot-scope="{ row }">
-              <el-input
-                v-if="row.$cellEdit"
-                v-model="row.price"
-                placeholder="请输入"
-                size="small"
+              <el-input v-if="row.$cellEdit" v-model="row.price" placeholder="请输入" size="small"
                 oninput='this.value=this.value.replace(/[^(\d.)]/g,"").replace(/^(\d+)\.(\d\d\d\d\d\d).*$/, "$1.$2")'
-                @input="priceChange(row)"
-              ></el-input>
+                @input="priceChange(row)"></el-input>
               <span v-else>{{ row.price }}</span>
             </template>
             <template slot="actualQuantity" slot-scope="{ row }">
               <span v-if="row.$cellEdit" class="required_fields">*</span>
-              <el-input
-                style="width:90%"
-                v-if="row.$cellEdit"
-                v-model="row.actualQuantity"
-                placeholder="请输入"
+              <el-input style="width:90%" v-if="row.$cellEdit" v-model="row.actualQuantity" placeholder="请输入"
                 size="small"
-                oninput='this.value=this.value.replace(/[^(\d.)]/g,"").replace(/^(\d+)\.(\d\d\d\d\d\d).*$/, "$1.$2")'
-              ></el-input>
-              <span v-else>{{ row.actualQuantity | roundNumbers}}</span>
+                oninput='this.value=this.value.replace(/[^(\d.)]/g,"").replace(/^(\d+)\.(\d\d\d\d\d\d).*$/, "$1.$2")'>
+              </el-input>
+              <span v-else>{{ row.actualQuantity | roundNumbers }}</span>
             </template>
             <template slot="contractAmount" slot-scope="{ row }">
-              <el-input
-                v-if="row.$cellEdit"
-                v-model="row.contractAmount"
-                placeholder="请输入"
-                size="small"
-                oninput='this.value=this.value.replace(/[^(\d.)]/g,"").replace(/^(\d+)\.(\d\d\d\d\d\d).*$/, "$1.$2")'
-              ></el-input>
+              <el-input v-if="row.$cellEdit" v-model="row.contractAmount" placeholder="请输入" size="small"
+                oninput='this.value=this.value.replace(/[^(\d.)]/g,"").replace(/^(\d+)\.(\d\d\d\d\d\d).*$/, "$1.$2")'>
+              </el-input>
               <span v-else>{{ row.contractAmount }}</span>
             </template>
             <template slot-scope="{row,index}" slot="menu">
-              <el-button
-                type="text"
-                size="small"
-                icon="el-icon-edit"
-                :disabled="receiptDisable  || viewDisabled"
-                @click="rowCell(row,index)"
-              >{{ row.$cellEdit ? '修改完成' : '修改' }}
+              <el-button type="text" size="small" icon="el-icon-edit" :disabled="receiptDisable || viewDisabled"
+                @click="rowCell(row, index)">{{ row.$cellEdit ? '修改完成' : '修改' }}
               </el-button>
-              <el-button
-                type="text"
-                icon="el-icon-delete"
-                size="small"
-                :disabled="receiptDisable  || viewDisabled"
-                @click="rowDel(row,index)"
-              >删除
+              <el-button type="text" icon="el-icon-delete" size="small" :disabled="receiptDisable || viewDisabled"
+                @click="rowDel(row, index)">删除
               </el-button>
             </template>
             <template slot="menuLeft" slot-scope="{size}">
-              <el-button type="primary"
-                         icon="el-icon-plus"
-                         size="small"
-                         :disabled="receiptDisable  || viewDisabled"
-                         @click="commoditySelection"
-              >录入明细
+              <el-button type="primary" icon="el-icon-plus" size="small" :disabled="receiptDisable || viewDisabled"
+                @click="commoditySelection">录入明细
               </el-button>
             </template>
           </avue-crud>
         </trade-card>
         <containerTitle title="附件上传"></containerTitle>
         <basic-container style="margin-bottom: 40px">
-          <avue-crud
-            :option="upLoadOption"
-            v-model="upLoadForm"
-            :data="upLoadData"
-            @row-save="upLoadSave"
-            @row-update="upLoadUpdate"
-            @row-del="upLoadDel"
-          ></avue-crud>
+          <avue-crud :option="upLoadOption" v-model="upLoadForm" :data="upLoadData" @row-save="upLoadSave"
+            @row-update="upLoadUpdate" @row-del="upLoadDel"></avue-crud>
         </basic-container>
       </el-form>
     </div>
 
-    <el-dialog
-      title="导入采购"
-      append-to-body
-      class="el-dialogDeep"
-      :visible.sync="procurementDialog"
-      width="60%"
-      :close-on-click-modal="false"
-      :destroy-on-close="true"
-      :close-on-press-escape="false"
-    >
-      <procurement-detail
-        @closeFun="closeFun"
-       @importProMent="importProMent"
-      >
+    <el-dialog title="导入采购" append-to-body class="el-dialogDeep" :visible.sync="procurementDialog" width="60%"
+      :close-on-click-modal="false" :destroy-on-close="true" :close-on-press-escape="false">
+      <procurement-detail @closeFun="closeFun" @importProMent="importProMent">
       </procurement-detail>
     </el-dialog>
   </div>
@@ -287,7 +165,8 @@
 
 <script>
 import customerContact from "./config/customerContact.json"
-import {detailReceiptList,
+import {
+  detailReceiptList,
   submitReceiptList,
   removeGoodsItem,
   getStorage,
@@ -296,11 +175,11 @@ import {detailReceiptList,
   repealReceipt
 } from "@/api/importTrade/receipt"
 import upLoadOption from "../../exportTrade/purchaseContract/config/uploadList.json";
-import { isPercentage,roundNumbers } from "@/util/validate";
-import {detailListData } from "@/api/importTrade/purchase";
-import { contrastObj,contrastList } from "@/util/contrastData";
+import { isPercentage, roundNumbers } from "@/util/validate";
+import { detailListData } from "@/api/importTrade/purchase";
+import { contrastObj, contrastList } from "@/util/contrastData";
 import { getOrgOrderNo } from "@/api/importTrade/salesContract"
-import  procurementDetail from "@/components/procurement/purchase";
+import procurementDetail from "@/components/procurement/purchase";
 import _ from "lodash";
 
 export default {
@@ -310,14 +189,14 @@ export default {
       type: Object
     }
   },
-  components:{
+  components: {
     procurementDetail
   },
   filters: {
     isPercentage(val) {
       return isPercentage(val);
     },
-    roundNumbers(val){
+    roundNumbers(val) {
       return roundNumbers(val);
     }
   },
@@ -325,32 +204,32 @@ export default {
     return {
       form: {},
       disabled: false,
-      skip:false,
-      buttonLoading:false,
-      receiptDisable:false,
-      viewDisabled:false,
+      skip: false,
+      buttonLoading: false,
+      receiptDisable: false,
+      viewDisabled: false,
       customerContact: customerContact,
       contactsForm: {},
       contactsData: [],
-      contractDic:[],
-      currencyDic:[],
-      singleton:[],
-      selectKind:-1,
-      itemConfiguration:{
-        multipleChoices:false,
-        multiple:false,
-        disabled:false,
-        searchShow:true,
-        collapseTags:false,
-        placeholder:'请点击右边按钮选择',
-        dicData:[]
+      contractDic: [],
+      currencyDic: [],
+      singleton: [],
+      selectKind: -1,
+      itemConfiguration: {
+        multipleChoices: false,
+        multiple: false,
+        disabled: false,
+        searchShow: true,
+        collapseTags: false,
+        placeholder: '请点击右边按钮选择',
+        dicData: []
       },
       basicData: {
         column: [
           {
             label: '系统号',
             prop: 'sysNo',
-            disabled:true,
+            disabled: true,
             rules: [
               {
                 required: false,
@@ -385,7 +264,7 @@ export default {
           },
           {
             label: '仓库名称',
-            type:'select',
+            type: 'select',
             prop: 'storageId',
             dicData: [],
             rules: [
@@ -395,10 +274,10 @@ export default {
                 trigger: 'blur'
               }
             ]
-          },{
+          }, {
             label: '收货日期',
             prop: 'businessDate',
-            type:'datetime',
+            type: 'datetime',
             rules: [
               {
                 required: false,
@@ -488,31 +367,31 @@ export default {
       },
       //上传文件
       upLoadOption: upLoadOption,
-      upLoadData:[],
-      storageIdDic:[],
-      upLoadForm:{},
+      upLoadData: [],
+      storageIdDic: [],
+      upLoadForm: {},
       loading: false,
       commodityData: false,
       tableData: [],
       //
-      procurementDialog:false,
+      procurementDialog: false,
       //新旧数据对比
-      oldForm:{},
-      oldContactsData:[],
-      oldUpLoadData:[],
+      oldForm: {},
+      oldContactsData: [],
+      oldUpLoadData: [],
     }
   },
   async created() {
     // this.customerContact = await this.getColumnData(this.getColumnName(41), customerContact);
     //币别
-    this.getWorkDicts("currency").then(res =>{
+    this.getWorkDicts("currency").then(res => {
       this.currencyDic = res.data.data
     })
-    getStorage().then(res =>{
+    getStorage().then(res => {
       this.storageIdDic = res.data
     })
 
-    if(this.detailData.view){
+    if (this.detailData.view) {
       this.viewDisabled = true
     }
 
@@ -521,30 +400,30 @@ export default {
       let id = this.detailData.id.replace(/\"/g, "")
       detailReceiptList(id).then(res => {
         this.afterData(res.data.data)
-      }).finally(()=>{
+      }).finally(() => {
         this.buttonLoading = false;
       })
     }
-    if(this.detailData.params){
+    if (this.detailData.params) {
       this.skip = true
       this.buttonLoading = true;
-      detailListData(this.detailData.params.id).then(res =>{
-        console.log(this.detailData.params,res)
+      detailListData(this.detailData.params.id).then(res => {
+        console.log(this.detailData.params, res)
         const orderNoList = [];  //合同号数据
-        this.detailData.params.orderItemIds.forEach((e,i) =>{
-          const item =   res.data.data.itemsVOList[e];
-          item.srcId =  item.id;
-          item.orgOrderNo =  res.data.data.orgOrderNo;
-          item.contractNumber =  res.data.data.orderNo;
+        this.detailData.params.orderItemIds.forEach((e, i) => {
+          const item = res.data.data.itemsVOList[e];
+          item.srcId = item.id;
+          item.orgOrderNo = res.data.data.orgOrderNo;
+          item.contractNumber = res.data.data.orderNo;
           item.exRate = res.data.data.exchangeRate;  //汇率
           item.currency = res.data.data.currency;   //币别
-              orderNoList.push(item.contractNumber)
-          if(item.actualQuantity !== 0){   //如果收过货
+          orderNoList.push(item.contractNumber)
+          if (item.actualQuantity !== 0) {   //如果收过货
             item.actualQuantity = _.subtract(item.orderQuantity, item.actualQuantity); //收货件数 = 采购件数 - 已收件数
-          }else{
-            item.actualQuantity =  item.orderQuantity;
+          } else {
+            item.actualQuantity = item.orderQuantity;
           }
-          item.contractAmount =  item.amount;
+          item.contractAmount = item.amount;
           //码单重量 除以 数量     每个的码单重量
           // item.singleton = {
           //   BQ : _.divide(item.billWeight, item.orderQuantity),
@@ -553,64 +432,67 @@ export default {
           delete item.id
           item.cntrLiang = item.cntrNum
           //如果箱量大于1  则根据箱量生成几条收货单明细  并均分发票重量
-          if(item.cntrLiang > 1){
-            let receiptInvoiceWeight =  item.invoiceWeight/item.cntrLiang;
-            for(let i=0;i<item.cntrLiang;i++){
+          if (item.cntrLiang > 1) {
+            let receiptInvoiceWeight = item.invoiceWeight / item.cntrLiang;
+            let receiptActualQuantity = item.invoiceWeight / item.cntrLiang;
+            let receiptGrossWeight = item.invoiceWeight / item.cntrLiang;
+            for (let i = 0; i < item.cntrLiang; i++) {
               item.invoiceWeight = receiptInvoiceWeight;
-              item.actualQuantity=item.actualQuantity/item.cntrLiang;
+              item.actualQuantity = receiptActualQuantity;
+              item.grossWeight = receiptGrossWeight;
               this.$refs.crudContact.rowCellAdd(item);
             }
-          }else{
+          } else {
             console.log(item)
             this.$refs.crudContact.rowCellAdd(item);
           }
-          
-          this.$refs.crudContact.rowCell(item,this.contactsData.length - 1)
+
+          this.$refs.crudContact.rowCell(item, this.contactsData.length - 1)
         })
-        this.$set(this.form,'orderNo', Array.from(new Set(orderNoList)).join(","))  // 数组去重逗号隔开 那合同总
-        this.$set(this.form,'saleman',res.data.data.salesName)
-        this.$set(this.form,'corpId',res.data.data.corpsName[0].id)
-        this.$set(this.form,'orgOrderNo', res.data.data.orgOrderNo)
+        this.$set(this.form, 'orderNo', Array.from(new Set(orderNoList)).join(","))  // 数组去重逗号隔开 那合同总
+        this.$set(this.form, 'saleman', res.data.data.salesName)
+        this.$set(this.form, 'corpId', res.data.data.corpsName[0].id)
+        this.$set(this.form, 'orgOrderNo', res.data.data.orgOrderNo)
         this.totalChange();  //调用合计 算出重量
-      }).finally(()=>{
+      }).finally(() => {
         this.buttonLoading = false;
       })
     }
   },
   methods: {
     //货物名称 回显
-    valueName(value,row){
-      this.$set(row,"priceCategory",value)
+    valueName(value, row) {
+      this.$set(row, "priceCategory", value)
     },
     //拿到所有明细合同号 去重加逗号放到主表合同号
-    sumOrderNo(row){
-      const contractNumberList =  this.contactsData.map(item =>{return  item.contractNumber})
-      this.$set(this.form,'orderNo', Array.from(new Set(contractNumberList)).join(","))
+    sumOrderNo(row) {
+      const contractNumberList = this.contactsData.map(item => { return item.contractNumber })
+      this.$set(this.form, 'orderNo', Array.from(new Set(contractNumberList)).join(","))
     },
     //合计
-    totalChange(){
-      let invoiceList =  this.contactsData.map(item => {
-        if(item.invoiceWeight){
+    totalChange() {
+      let invoiceList = this.contactsData.map(item => {
+        if (item.invoiceWeight) {
           return parseFloat(item.invoiceWeight);
-        }else return 0
+        } else return 0
       });
-      let billList =  this.contactsData.map(item => {
-        if(item.billWeight){
+      let billList = this.contactsData.map(item => {
+        if (item.billWeight) {
           return parseFloat(item.billWeight);
-        }else return 0
+        } else return 0
       });
-      this.$set(this.form,"invoiceWeight",invoiceList.reduce((n,m) => n + m))
-      this.$set(this.form,"billWeight",billList.reduce((n,m) => n + m))
+      this.$set(this.form, "invoiceWeight", invoiceList.reduce((n, m) => n + m))
+      this.$set(this.form, "billWeight", billList.reduce((n, m) => n + m))
     },
     //提单号带出合同号
-    bingOut(row){
-      getOrgOrderNo(row.billNo).then(res =>{
-        if(res.data){
+    bingOut(row) {
+      getOrgOrderNo(row.billNo).then(res => {
+        if (res.data) {
           this.contractDic = res.data;
-          row.contractNumber =  res.data[0].orderNo;
+          row.contractNumber = res.data[0].orderNo;
           this.sumOrderNo()
         }
-      }).catch(()=>{
+      }).catch(() => {
         row.contractNumber = ''
       })
       // this.selectInventory(row);
@@ -623,7 +505,7 @@ export default {
     },
     //码单重量
     billWeightChange(row) {
-      if (row.billWeight &&  row.price) {
+      if (row.billWeight && row.price) {
         row.contractAmount = _.multiply(row.billWeight, row.price).toFixed(2);
       }
     },
@@ -666,13 +548,13 @@ export default {
           });
           this.contactsData.splice(index, 1);
         }
-      }).finally(()=>{
+      }).finally(() => {
         this.totalChange()
       })
     },
     //导入采购明细
-    importProMent(list){
-      list.forEach((item,index) =>{
+    importProMent(list) {
+      list.forEach((item, index) => {
         item.srcId = item.id;
         item.contractNumber = item.orderNo;
         item.contractAmount = item.amount;
@@ -690,7 +572,7 @@ export default {
       this.sumOrderNo();   //合并合同号
       this.procurementDialog = false;
     },
-    closeFun(){
+    closeFun() {
       this.procurementDialog = false
     },
     //导入采购
@@ -698,16 +580,16 @@ export default {
       this.procurementDialog = true;
     },
     //上传文件保存
-    upLoadSave(row, done, loading){
+    upLoadSave(row, done, loading) {
       this.upLoadData.push(row)
       done()
     },
     //修改附件上传触发
-    upLoadUpdate(row, done){
+    upLoadUpdate(row, done) {
       done(row);
     },
     //删除附件上传触发
-    upLoadDel(row, index,){
+    upLoadDel(row, index,) {
       this.$confirm("确定将选择数据删除?", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
@@ -724,27 +606,27 @@ export default {
     editCustomer(status) {
       this.$refs["form"].validate((valid) => {
         for (let i = 0; i < this.contactsData.length; i++) {
-          if (this.contactsData[i].billNo === (null || "" )) {
+          if (this.contactsData[i].billNo === (null || "")) {
             return this.$message.error(`请输入第${i + 1}行的提单号`);
           }
-          if (this.contactsData[i].contractNumber === (null || "" )) {
+          if (this.contactsData[i].contractNumber === (null || "")) {
             return this.$message.error(`请输入第${i + 1}行的合同号`);
           }
-          if (this.contactsData[i].priceCategory === (null || "" )) {
+          if (this.contactsData[i].priceCategory === (null || "")) {
             return this.$message.error(`请输入第${i + 1}行的货物品种`);
           }
-          if (this.contactsData[i].cntrNo === (null || "" )) {
+          if (this.contactsData[i].cntrNo === (null || "")) {
             return this.$message.error(`请输入第${i + 1}行的箱号`);
           }
-          if (this.contactsData[i].actualQuantity === (null || "" )) {
+          if (this.contactsData[i].actualQuantity === (null || "")) {
             return this.$message.error(`请输入第${i + 1}行的件数`);
           }
-          if (this.contactsData[i].invoiceWeight === (null || "" )) {
+          if (this.contactsData[i].invoiceWeight === (null || "")) {
             return this.$message.error(`请输入第${i + 1}行的发票重量`);
           }
         }
 
-        this.form.billNo =Array.from(new Set(this.contactsData.map(item =>{return item.billNo}))).join(",")
+        this.form.billNo = Array.from(new Set(this.contactsData.map(item => { return item.billNo }))).join(",")
 
         if (valid) {
           let submitDto = {
@@ -754,16 +636,16 @@ export default {
           };
           this.buttonLoading = true;
           submitReceiptList(submitDto).then(res => {
-            if(res.data.success){
+            if (res.data.success) {
               this.$message.success("保存成功!")
               detailReceiptList(res.data.data.id).then(res => {
                 this.afterData(res.data.data)
               })
             }
-          }).finally(()=>{
-            this.buttonLoading =  false;
+          }).finally(() => {
+            this.buttonLoading = false;
           })
-          if(status === true){
+          if (status === true) {
             this.$emit("goBack");
           }
         } else {
@@ -772,84 +654,84 @@ export default {
       });
     },
     //确认收货
-    confirmReceipt(){
-      if(this.verificationData()){
-        if(!this.receiptDisable){
+    confirmReceipt() {
+      if (this.verificationData()) {
+        if (!this.receiptDisable) {
           this.$confirm("是否确认收货?", {
             confirmButtonText: "确定",
             cancelButtonText: "取消",
             type: "warning"
-          }).then(()=>{
-            if(!this.form.storageId){
+          }).then(() => {
+            if (!this.form.storageId) {
               return this.$message.error(`收货时仓库名称不能为空!`);
             }
 
             this.buttonLoading = true;
             this.form.deliveryItemsList = this.contactsData;
-            confirmReceipt(this.form).then(res =>{
-              if(res.data.success){
+            confirmReceipt(this.form).then(res => {
+              if (res.data.success) {
                 this.$message.success("收货成功!")
                 this.afterData(res.data.data)
               }
-            }).finally(()=>{
+            }).finally(() => {
               this.buttonLoading = false;
             })
           })
-        }else{
+        } else {
           this.$confirm("是否撤销收货!", {
             confirmButtonText: "确定",
             cancelButtonText: "取消",
             type: "warning"
-          }).then(()=>{
+          }).then(() => {
             this.buttonLoading = true;
             this.form.deliveryItemsList = this.contactsData;
-            repealReceipt(this.form).then(res =>{
-              if(res.data.success){
+            repealReceipt(this.form).then(res => {
+              if (res.data.success) {
                 this.$message.success("撤销成功!")
                 this.afterData(res.data.data)
               }
-            }).finally(()=>{
+            }).finally(() => {
               this.buttonLoading = false;
             })
           })
         }
       }
     },
-    afterData(data){
+    afterData(data) {
       this.form = data;
-      this.oldForm = Object.assign({},data);
-      this.receiptDisable = data.deliveryStatus === "已收货" ?   true :false
-      if(data.deliveryItemsList){
+      this.oldForm = Object.assign({}, data);
+      this.receiptDisable = data.deliveryStatus === "已收货" ? true : false
+      if (data.deliveryItemsList) {
         this.contactsData = data.deliveryItemsList
         this.oldContactsData = this.deepClone(data.deliveryItemsList)
       }
-      if(data.deliveryFilesList){
+      if (data.deliveryFilesList) {
         this.upLoadData = data.deliveryFilesList
         this.oldUpLoadData = this.deepClone(data.deliveryFilesList)
       }
-      if(this.detailData.status === 'copy'){
+      if (this.detailData.status === 'copy') {
         this.copyData()
       }
     },
-    verificationData(){
-      if(contrastObj(this.form,this.oldForm) || contrastList(this.contactsData,this.oldContactsData)
-        || contrastList(this.upLoadData,this.oldUpLoadData)
-      ){
+    verificationData() {
+      if (contrastObj(this.form, this.oldForm) || contrastList(this.contactsData, this.oldContactsData)
+        || contrastList(this.upLoadData, this.oldUpLoadData)
+      ) {
         this.$confirm("数据发生变化,请先提交保存!", "提示", {
           confirmButtonText: "保存",
           cancelButtonText: "取消",
           type: "warning",
         }).then(() => {
           this.editCustomer()
-        }).catch(()=>{
+        }).catch(() => {
           return false
         })
-      }else{
+      } else {
         return true
       }
     },
-    createData(){
-      if(this.verificationData()){
+    createData() {
+      if (this.verificationData()) {
         this.$confirm("确定创建新的单据吗?", "提示", {
           confirmButtonText: "保存",
           cancelButtonText: "取消",
@@ -864,19 +746,19 @@ export default {
         })
       }
     },
-    copyData(){
-      if(this.verificationData()){
+    copyData() {
+      if (this.verificationData()) {
         this.receiptDisable = false
 
-        delete  this.form.id  //删除id
-        delete  this.form.deliveryStatus
-        this.$set(this.form,"sysNo","")//系统编号
+        delete this.form.id  //删除id
+        delete this.form.deliveryStatus
+        this.$set(this.form, "sysNo", "")//系统编号
 
-        this.contactsData.forEach(item =>{
+        this.contactsData.forEach(item => {
           delete item.id  //删除id
         })
 
-        this.upLoadData.forEach(item =>{
+        this.upLoadData.forEach(item => {
           delete item.id  //删除id
         })
 
@@ -889,44 +771,44 @@ export default {
     //编辑
     async openEdit() {
       //标签页保存key
-      this.inDetailsKey(this.$route.name,this.detailData.lockData);
+      this.inDetailsKey(this.$route.name, this.detailData.lockData);
       //单据是否锁定
-      if(!await this.checkLocks(this.detailData.lockData)){
+      if (!await this.checkLocks(this.detailData.lockData)) {
         this.onLock(this.detailData.lockData); //上锁
         this.viewDisabled = false
-      }else{
+      } else {
         this.$message.warning('此单据已被锁定,请稍后再进行操作!')
       }
     },
     //返回列表
     async backToList() {
       //如果单据已被锁定 并且编辑按钮存在  则直接返回
-      if(this.viewDisabled || !this.detailData.lockData){
+      if (this.viewDisabled || !this.detailData.lockData) {
         this.$emit("goBack");
         return
       }
 
-      if(contrastObj(this.form,this.oldForm) || contrastList(this.contactsData,this.oldContactsData)
-        || contrastList(this.upLoadData,this.oldUpLoadData)
-      ){
+      if (contrastObj(this.form, this.oldForm) || contrastList(this.contactsData, this.oldContactsData)
+        || contrastList(this.upLoadData, this.oldUpLoadData)
+      ) {
         this.$confirm("是否保存当前页面?", "提示", {
           confirmButtonText: "保存",
           cancelButtonText: "取消",
           type: "warning",
         }).then(() => {
           this.editCustomer(true)
-        }).catch(()=>{
+        }).catch(() => {
           this.unLock(this.lockData) //解锁
           this.$emit("goBack");
-        }).finally(()=>{
-          if(this.form.id){
+        }).finally(() => {
+          if (this.form.id) {
             this.unLock(this.detailData.lockData);
             this.leaveDetailsKey(this.$route.name);
           }
         })
-      }else{
+      } else {
         this.$emit("goBack");
-        if(this.form.id){
+        if (this.form.id) {
           this.unLock(this.detailData.lockData);
           this.leaveDetailsKey(this.$route.name);
         }
@@ -964,7 +846,6 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-
 .back-icon {
   line-height: 64px;
   font-size: 20px;
@@ -975,30 +856,34 @@ export default {
 ::v-deep .el-form-item {
   margin-bottom: 0;
 }
-.required_fields{
+
+.required_fields {
   color: #F56C6C;
-  display:inline-block;
+  display: inline-block;
   width: 7%
 }
 
-.upper_right_button{
+.upper_right_button {
   display: flex;
   position: fixed;
   right: 12px;
   top: 47px;
 }
+
 .el-dialogDeep {
   ::v-deep .el-dialog {
     margin: 1vh auto 0 !important;
     padding-bottom: 10px !important;
 
-    .el-dialog__body, .el-dialog__footer {
+    .el-dialog__body,
+    .el-dialog__footer {
       padding-bottom: 0 !important;
       padding-top: 0 !important;
     }
   }
 }
-::v-deep .el-form-item__content{
+
+::v-deep .el-form-item__content {
   line-height: 32px;
 }
 </style>