doctor-admin-components 1.0.13-beta.9 → 1.0.13-beta.91

package/packages/src/views/biz/contractTracing/editBill.vue

@@ -1,19 +1,25 @@
 <template>
   <div class="app-container">
-    <el-dialog
-      :title="$t('contractDetail.editBLInformation')"
-      :visible.sync="open"
-      width="1000px"
-      append-to-body
-    >
+    <el-dialog :title="$t('contractDetail.editBLInformation')" :visible.sync="open" width="1000px" append-to-body>
       <div class="contract">
         <div class="info" id="printPdf">
-          <div class="title">{{ $t("contract.billTip") }}</div>
-          <el-form :model="form" ref="form" size="mini" :rules="rules" label-width="130px">
-            <el-collapse>
-              <el-collapse-item v-if="channel !== 'official-website'">
+          <!-- <div class="title">{{ $t("contract.billTip") }}</div> -->
+          <el-row>
+            <el-col :span="12" v-if="voidFlag" style="padding-bottom: 20px">
+              <span style="font-size: 16px; color: red; font-weight: bold"> 已作废 </span>
+            </el-col>
+            <el-col :span="12" v-else>
+              <div style="padding-bottom: 20px">
+                <span style="font-size: 16px; font-weight: bold"> {{ $t('contractDetail.BLConfirm') + '：' }} </span>
+                <el-switch v-model="confirmFlag" :inactive-text="$t('contractDetail.BL_Not_Confirm')" :active-text="$t('contractDetail.BL_Confirmed')"> </el-switch>
+              </div>
+            </el-col>
+          </el-row>
+          <el-form :disabled="voidFlag" :model="form" ref="form" size="mini" :rules="rules" label-width="130px">
+            <el-collapse v-model="expandItems">
+              <el-collapse-item name="0" v-if="channel !== 'official-website'">
                 <template slot="title">
-                  <el-row style="width: 75%; ">
+                  <el-row style="width: 75%">
                     <el-form-item class="mt20" :label="$t('contract.shipper') + ':'">
                       <el-input v-model="form.shipperCompanyName"></el-input>
                     </el-form-item>
@@ -38,69 +44,42 @@
                   <el-switch v-model="form.shipperFlag" active-text="是" inactive-text="否"></el-switch>
                 </el-form-item>
               </el-collapse-item>
-              <el-collapse-item>
+              <el-collapse-item name="1">
                 <template slot="title">
-                  <el-row style="width: 75%; ">
-                    <el-form-item
-                      class="mt20"
-                      :label="$t('contract.consignee') + ':'"
-                      prop="deliveryCompanyId"
-                    >
+                  <el-row style="width: 75%">
+                    <el-form-item class="mt20" :label="$t('contract.consignee') + ':'" prop="deliveryCompanyId">
                       <el-select
-                        style="width: 80%;"
+                        style="width: 80%"
                         clearable
                         size="mini"
                         v-model="form.deliveryCompanyId"
                         @change="(val) => changeSubCompany(val, 'delivery')"
                         :placeholder="$t('contract.consigneeTip')"
                       >
-                        <el-option
-                          v-for="(item, index) in deliveryCompanyList"
-                          :key="index"
-                          :label="item.companyEnglishName"
-                          :value="item.contractCompanyId"
-                        />
+                        <el-option v-for="(item, index) in deliveryCompanyList" :key="index" :label="item.companyEnglishName" :value="item.contractCompanyId" />
                       </el-select>
-                      <el-button
-                        style="margin-left: 20px;"
-                        type="primary"
-                        size="mini"
-                        @click.stop="handleSubCompany(form.buyerCompanyId, 'delivery')"
-                      >{{ $t('button.addOrModify') }}</el-button>
+                      <el-button style="margin-left: 20px" type="primary" size="mini" @click.stop="handleSubCompany(form.buyerCompanyId, 'delivery')">{{
+                        $t('button.addOrModify')
+                      }}</el-button>
                     </el-form-item>
                   </el-row>
                 </template>
                 <el-form-item :label="$t('contract.taxId') + ':'">
-                  {{
-                  this.form.deliveryCompany
-                  ? this.form.deliveryCompany.taxNumber
-                  : $t('contract.companyTip')
-                  }}
+                  {{ this.form.deliveryCompany ? this.form.deliveryCompany.taxNumber : $t('contract.companyTip') }}
                 </el-form-item>
                 <el-form-item :label="$t('contract.consigneeAddress') + ':'">
-                  {{
-                  this.form.deliveryCompany
-                  ? this.form.deliveryCompany.address
-                  : $t('contract.companyTip')
-                  }}
+                  {{ this.form.deliveryCompany ? this.form.deliveryCompany.address : $t('contract.companyTip') }}
                 </el-form-item>
                 <el-form-item :label="$t('contract.contact') + ':'">
-                  {{
-                  this.form.deliveryCompany
-                  ? this.form.deliveryCompany.contact
-                  : $t('contract.companyTip')
-                  }}
+                  {{ this.form.deliveryCompany ? this.form.deliveryCompany.contact : $t('contract.companyTip') }}
                 </el-form-item>
                 <el-form-item :label="$t('contract.phoneNumber') + ':'">
                   {{
-                  this.form.deliveryCompany &&
-                  this.form.deliveryCompany.phoneNumber &&
-                  this.form.deliveryCompany.phoneNumber.length > 0
-                  ? this.form.deliveryCompany.phoneNumber.toString()
-                  : this.form.deliveryCompany &&
-                  this.form.deliveryCompany.phoneNumber
-                  ? ''
-                  : $t('contract.companyTip')
+                    this.form.deliveryCompany && this.form.deliveryCompany.phoneNumber && this.form.deliveryCompany.phoneNumber.length > 0
+                      ? this.form.deliveryCompany.phoneNumber.toString()
+                      : this.form.deliveryCompany && this.form.deliveryCompany.phoneNumber
+                      ? ''
+                      : $t('contract.companyTip')
                   }}
                 </el-form-item>
                 <el-form-item :label="$t('contract.email') + ':'">
@@ -108,36 +87,22 @@
                     <el-col :span="20">
                       <div style="white-space: pre-line !important">
                         {{
-                        this.form.deliveryCompany &&
-                        this.form.deliveryCompany.email &&
-                        this.form.deliveryCompany.email.length > 0
-                        ? this.form.deliveryCompany.email
-                        .toString()
-                        .replace(/,/g, '\n ')
-                        : $t('contract.companyTip')
+                          this.form.deliveryCompany && this.form.deliveryCompany.email && this.form.deliveryCompany.email.length > 0
+                            ? this.form.deliveryCompany.email.toString().replace(/,/g, '\n ')
+                            : $t('contract.companyTip')
                         }}
                       </div>
                     </el-col>
                   </el-row>
                 </el-form-item>
-                <el-form-item
-                  label="PAN NO"
-                >{{ this.form.deliveryCompany ? this.form.deliveryCompany.panNo: $t('contract.companyTip')}}</el-form-item>
-                <el-form-item
-                  label="IEC CODE"
-                >{{ this.form.deliveryCompany ? this.form.deliveryCompany.iecCode: $t('contract.companyTip')}}</el-form-item>
-                <el-form-item
-                  label="GST NUMBER"
-                >{{ this.form.deliveryCompany ? this.form.deliveryCompany.gstNumber: $t('contract.companyTip')}}</el-form-item>
+                <el-form-item label="PAN NO">{{ this.form.deliveryCompany ? this.form.deliveryCompany.panNo : $t('contract.companyTip') }}</el-form-item>
+                <el-form-item label="IEC CODE">{{ this.form.deliveryCompany ? this.form.deliveryCompany.iecCode : $t('contract.companyTip') }}</el-form-item>
+                <el-form-item label="GST NUMBER">{{ this.form.deliveryCompany ? this.form.deliveryCompany.gstNumber : $t('contract.companyTip') }}</el-form-item>
               </el-collapse-item>
-              <el-collapse-item>
+              <el-collapse-item name="2">
                 <template slot="title">
-                  <el-row style="width: 75%; ">
-                    <el-form-item
-                      class="mt20"
-                      :label="$t('contract.firstNotifier') + ':'"
-                      prop="notifierCompanyId"
-                    >
+                  <el-row style="width: 75%">
+                    <el-form-item class="mt20" :label="$t('contract.firstNotifier') + ':'" prop="notifierCompanyId">
                       <el-select
                         size="mini"
                         style="width: 80%"
@@ -146,53 +111,30 @@
                         placeholder="Please select"
                         clearable
                       >
-                        <el-option
-                          v-for="(item, index) in notifierCompanyList"
-                          :key="index"
-                          :label="item.companyEnglishName"
-                          :value="item.contractCompanyId"
-                        />
+                        <el-option v-for="(item, index) in notifierCompanyList" :key="index" :label="item.companyEnglishName" :value="item.contractCompanyId" />
                       </el-select>
-                      <el-button
-                        style="margin-left: 20px;"
-                        type="primary"
-                        size="mini"
-                        @click.stop="handleSubCompany(form.buyerCompanyId, 'notifier')"
-                      >{{ $t('button.addOrModify') }}</el-button>
+                      <el-button style="margin-left: 20px" type="primary" size="mini" @click.stop="handleSubCompany(form.buyerCompanyId, 'notifier')">{{
+                        $t('button.addOrModify')
+                      }}</el-button>
                     </el-form-item>
                   </el-row>
                 </template>
                 <el-form-item :label="$t('contract.taxId') + ':'">
-                  {{
-                  this.form.notifierCompany
-                  ? this.form.notifierCompany.taxNumber
-                  : $t('contract.companyTip')
-                  }}
+                  {{ this.form.notifierCompany ? this.form.notifierCompany.taxNumber : $t('contract.companyTip') }}
                 </el-form-item>
                 <el-form-item :label="$t('contract.notifierAddress') + ':'">
-                  {{
-                  this.form.notifierCompany
-                  ? this.form.notifierCompany.address
-                  : $t('contract.companyTip')
-                  }}
+                  {{ this.form.notifierCompany ? this.form.notifierCompany.address : $t('contract.companyTip') }}
                 </el-form-item>
                 <el-form-item :label="$t('contract.contact') + ':'">
-                  {{
-                  this.form.notifierCompany
-                  ? this.form.notifierCompany.contact
-                  : $t('contract.companyTip')
-                  }}
+                  {{ this.form.notifierCompany ? this.form.notifierCompany.contact : $t('contract.companyTip') }}
                 </el-form-item>
                 <el-form-item :label="$t('contract.phoneNumber') + ':'">
                   {{
-                  this.form.notifierCompany &&
-                  this.form.notifierCompany.phoneNumber &&
-                  this.form.notifierCompany.phoneNumber.length > 0
-                  ? this.form.notifierCompany.phoneNumber.toString()
-                  : this.form.notifierCompany &&
-                  this.form.notifierCompany.phoneNumber
-                  ? ''
-                  : $t('contract.companyTip')
+                    this.form.notifierCompany && this.form.notifierCompany.phoneNumber && this.form.notifierCompany.phoneNumber.length > 0
+                      ? this.form.notifierCompany.phoneNumber.toString()
+                      : this.form.notifierCompany && this.form.notifierCompany.phoneNumber
+                      ? ''
+                      : $t('contract.companyTip')
                   }}
                 </el-form-item>
                 <el-form-item :label="$t('contract.email') + ':'">
@@ -200,159 +142,95 @@
                     <el-col :span="20">
                       <div style="white-space: pre-line !important">
                         {{
-                        this.form.notifierCompany &&
-                        this.form.notifierCompany.email &&
-                        this.form.notifierCompany.email.length > 0
-                        ? this.form.notifierCompany.email
-                        .toString()
-                        .replace(/,/g, '\n')
-                        : $t('contract.companyTip')
+                          this.form.notifierCompany && this.form.notifierCompany.email && this.form.notifierCompany.email.length > 0
+                            ? this.form.notifierCompany.email.toString().replace(/,/g, '\n')
+                            : $t('contract.companyTip')
                         }}
                       </div>
                     </el-col>
                   </el-row>
                 </el-form-item>
-                <el-form-item
-                  label="PAN NO"
-                >{{ this.form.notifierCompany ? this.form.notifierCompany.panNo: $t('contract.companyTip')}}</el-form-item>
-                <el-form-item
-                  label="IEC CODE"
-                >{{ this.form.notifierCompany ? this.form.notifierCompany.iecCode: $t('contract.companyTip')}}</el-form-item>
-                <el-form-item
-                  label="GST NUMBER"
-                >{{ this.form.notifierCompany ? this.form.notifierCompany.gstNumber: $t('contract.companyTip')}}</el-form-item>
+                <el-form-item label="PAN NO">{{ this.form.notifierCompany ? this.form.notifierCompany.panNo : $t('contract.companyTip') }}</el-form-item>
+                <el-form-item label="IEC CODE">{{ this.form.notifierCompany ? this.form.notifierCompany.iecCode : $t('contract.companyTip') }}</el-form-item>
+                <el-form-item label="GST NUMBER">{{ this.form.notifierCompany ? this.form.notifierCompany.gstNumber : $t('contract.companyTip') }}</el-form-item>
               </el-collapse-item>
-              <el-collapse-item>
+              <el-collapse-item name="3">
                 <template slot="title">
-                  <el-row style="width: 75%; ">
-                    <el-form-item
-                      class="mt20"
-                      :label="$t('contract.secondNotifier') + ':'"
-                    >{{ "TTYY INTERNATIONAL LIMITED" }}</el-form-item>
+                  <el-row style="width: 75%">
+                    <el-form-item class="mt20" :label="$t('contract.secondNotifier') + ':'">{{ 'TTYY INTERNATIONAL LIMITED' }}</el-form-item>
                   </el-row>
                 </template>
                 <el-form-item :label="$t('contract.taxId') + ':'">
-                  {{
-                  "73855725-000-23-0"
-                  }}
+                  {{ '73855725-000-23-0' }}
                 </el-form-item>
                 <el-form-item :label="$t('contract.notifierAddress') + ':'">
-                  {{
-                  "FLAT/RM 07, 12/F, CHEVALIER COMMERCIAL CENTRE, 8 WANG HOI ROAD, KOWLOON BAY"
-                  }}
+                  {{ 'FLAT/RM 07, 12/F, CHEVALIER COMMERCIAL CENTRE, 8 WANG HOI ROAD, KOWLOON BAY' }}
                 </el-form-item>
                 <el-form-item :label="$t('contract.contact') + ':'">
-                  {{
-                  "Ms. Zhou"
-                  }}
+                  {{ 'Ms. Zhou' }}
                 </el-form-item>
                 <el-form-item :label="$t('contract.phoneNumber') + ':'">
-                  {{
-                  "0085221267435"
-                  }}
+                  {{ '00-852 53816912' }}
                 </el-form-item>
-                <el-form-item :label="$t('contract.email') + ':'">{{ "info@tyzltech.com" }}</el-form-item>
+                <el-form-item :label="$t('contract.email') + ':'">{{ 'info@tyzltech.com' }}</el-form-item>
               </el-collapse-item>
             </el-collapse>
 
-            <el-form-item :label="$t('contract.destination') + ':'">
-              {{
-              this.contract && this.contract.destination
-              ? this.contract.destination
-              : ""
-              }}
+            <el-form-item v-if="contract && contract.freightTerms && contract.freightTerms != 'EXW'" :label="$t('contract.destination') + ':'">
+              {{ this.contract && this.contract.destination ? this.contract.destination : '' }}
+            </el-form-item>
+            <el-form-item v-else :label="'EXW Address' + ':'">
+              {{ this.contract && this.contract.exw ? this.contract.exw : '' }}
             </el-form-item>
-            <el-form-item :label="$t('contract.terminal') + ':'" prop="terminal">
-              <el-input
-                v-model="form.terminal"
-                type="textarea"
-                autosize
-                :placeholder="$t('contract.terminalTip')"
-              ></el-input>
+            <el-form-item v-if="contract && contract.freightTerms && contract.freightTerms != 'EXW'" :label="$t('contract.terminal') + ':'" prop="terminal">
+              <el-input v-model="form.terminal" type="textarea" autosize :placeholder="$t('contract.terminalTip')"></el-input>
             </el-form-item>
 
             <el-row class="bl-goods">
-              <el-row
-                v-for="(
-                    buyCompanyBillGood, index
-                  ) in form.buyerCompanyBillGoods"
-                :key="index"
-                class="mt5"
-              >
+              <el-row v-for="(buyCompanyBillGood, index) in form.buyerCompanyBillGoods" :key="index" class="mt5">
                 <el-col :span="4">
-                  <el-form-item
-                    :label="$t('contract.option') + (index + 1)"
-                    :rules="[{ required: true }]"
-                  ></el-form-item>
+                  <el-form-item :label="$t('contract.option') + (index + 1)" :rules="[{ required: true }]"></el-form-item>
                 </el-col>
                 <el-col :span="2">
-                  <div
-                    style="
-                        background-color: darkgrey;
-                        height: 26px;
-                        margin-top: 1px;
-                        text-align: center;
-                        line-height: 28px;
-                        font-size: 14px;
-                        border-radius: 3px;
-                      "
-                  >{{ $t("contract.product") }}</div>
+                  <div style="background-color: darkgrey; height: 26px; margin-top: 1px; text-align: center; line-height: 28px; font-size: 14px; border-radius: 3px">
+                    {{ $t('contract.product') }}
+                  </div>
                 </el-col>
                 <el-col :span="9">
                   <el-form-item
                     label-width="0px"
                     :prop="'buyerCompanyBillGoods.' + index + '.goodsName'"
                     :rules="[
-                        {
-                          required: true,
-                          message: $t('bill.tip1'),
-                          trigger: 'blur',
-                        },
-                      ]"
+                      {
+                        required: true,
+                        message: $t('bill.tip1'),
+                        trigger: 'blur'
+                      }
+                    ]"
                   >
                     <el-select
-                      style="width: 100%;"
+                      style="width: 100%"
                       size="mini"
                       v-model="buyCompanyBillGood.goodsName"
-                      :placeholder="
-                          $t('placeholder.select') +
-                          $t('contract.billCargoName')
-                        "
+                      :placeholder="$t('placeholder.select') + $t('contract.billCargoName')"
                       @change="(val) => changeBillGood(val, index)"
                     >
-                      <el-option
-                        v-for="(i, index) in billGoodsList"
-                        :key="index"
-                        :label="i.goodsName"
-                        :value="i.goodsName"
-                      />
+                      <el-option v-for="(i, index) in billGoodsList" :key="index" :label="i.goodsName" :value="i.goodsName" />
                     </el-select>
                   </el-form-item>
                 </el-col>
                 <el-col :span="2">
-                  <div
-                    style="
-                        background-color: darkgrey;
-                        height: 26px;
-                        margin-top: 1px;
-                        text-align: center;
-                        line-height: 28px;
-                        font-size: 14px;
-                        border-radius: 3px;
-                      "
-                  >{{ $t("contract.hsCode") }}</div>
+                  <div style="background-color: darkgrey; height: 26px; margin-top: 1px; text-align: center; line-height: 28px; font-size: 14px; border-radius: 3px">
+                    {{ $t('contract.hsCode') }}
+                  </div>
                 </el-col>
                 <el-col :span="3">
                   <el-input disabled size="mini" v-model="buyCompanyBillGood.hsCode"></el-input>
                 </el-col>
                 <el-col :span="2">
-                  <el-button
-                    type="text"
-                    size="mini"
-                    class="ml10"
-                    @click="handleBillGoods(form.buyerCompanyId)"
-                    v-if="index === form.buyerCompanyBillGoods.length - 1"
-                  >{{ $t("button.addOrModify") }}</el-button>
+                  <el-button type="text" size="mini" class="ml10" @click="handleBillGoods(form.buyerCompanyId)" v-if="index === form.buyerCompanyBillGoods.length - 1">{{
+                    $t('button.addOrModify')
+                  }}</el-button>
                 </el-col>
                 <el-col :span="1">
                   <el-button
@@ -366,14 +244,7 @@
                   ></el-button>
                 </el-col>
                 <el-col :span="1">
-                  <el-button
-                    v-if="index > 0"
-                    size="mini"
-                    icon="el-icon-minus"
-                    circle
-                    class="ml5"
-                    @click="deleteBillGoods(index)"
-                  ></el-button>
+                  <el-button v-if="index > 0" size="mini" icon="el-icon-minus" circle class="ml5" @click="deleteBillGoods(index)"></el-button>
                 </el-col>
               </el-row>
             </el-row>
@@ -386,34 +257,21 @@
             <el-row>
               <el-col :span="12">
                 <el-form-item :label="$t('contract.shippingMarks') + ':'" prop="shippingMark">
-                  <el-input
-                    v-model="form.shippingMark"
-                    :placeholder="$t('contract.shippingMarksTip')"
-                  ></el-input>
+                  <el-input v-model="form.shippingMark" :placeholder="$t('contract.shippingMarksTip')"></el-input>
                 </el-form-item>
               </el-col>
             </el-row>
 
             <el-form-item :label="$t('contract.remark') + ':'" prop="blRemark">
-              <el-input
-                v-model="form.blRemark"
-                type="textarea"
-                :rows="5"
-                :placeholder="$t('contract.remarkTip')"
-              ></el-input>
+              <el-input v-model="form.blRemark" type="textarea" :rows="5" :placeholder="$t('contract.remarkTip')"></el-input>
             </el-form-item>
             <el-form-item :label="$t('contract.attachments') + ':'" prop="billPictures">
-              <file-upload
-                v-model="form.billPictures"
-                :limit="10"
-                :uploadType="'bill'"
-                :fileType="[]"
-              ></file-upload>
+              <file-upload v-model="form.billPictures" :limit="10" :uploadType="'bill'" :fileType="[]"></file-upload>
             </el-form-item>
           </el-form>
         </div>
-        <div class="footer" v-if="!printModel">
-          <el-button type="primary" @click="submitForm">{{ $t("button.saveDraft") }}</el-button>
+        <div class="footer" v-if="!printModel && !voidFlag">
+          <el-button type="primary" @click="submitForm">{{ $t('button.saveDraft') }}</el-button>
         </div>
       </div>
     </el-dialog>
@@ -423,24 +281,21 @@
     <bill-goods ref="billGoods" @submit="changeBillGoods"></bill-goods>
   </div>
 </template>
-  
-  <script>
-import {
-  getBizDealRecord,
-  updateBizDealRecord,
-} from '../../../api/biz/bizDealRecord';
-import { listBizContractCompany } from '../../../api/biz/bizContractCompany';
-import SubCompanyDialog from './subCompanyDialog.vue';
-import BillGoods from './billGoods.vue';
-import { listCompanyBillGoods } from '../../../api/biz/bizCompanyBillGoods';
-import { getBizContract } from '../../../api/biz/bizContract';
-import FileUpload from '../../../components/FileUpload/s3.vue';
+
+<script>
+import { getBizDealRecord, updateBizDealRecord } from '../../../api/biz/bizDealRecord'
+import { listBizContractCompany } from '../../../api/biz/bizContractCompany'
+import SubCompanyDialog from './subCompanyDialog.vue'
+import BillGoods from './billGoods.vue'
+import { listCompanyBillGoods } from '../../../api/biz/bizCompanyBillGoods'
+import { getBizContract, changeBizStatus } from '../../../api/biz/bizContract'
+import FileUpload from '../../../components/FileUpload/s3.vue'
 
 export default {
   name: 'EditBill',
   components: { SubCompanyDialog, BillGoods, FileUpload },
   props: {
-    channel: '',
+    channel: ''
   },
   data() {
     return {
@@ -448,17 +303,22 @@ export default {
       loading: true,
       // 弹出层标题
       title: '',
+      expandItems: ['0', '1', '2'], // 展开指定项
       // 是否显示弹出层
       open: false,
+      // 是否已确认
+      confirmFlag: false,
+      // 是否已作废
+      voidFlag: false,
       // 表单参数
       form: {
         //买家公司提单货物名称
         buyerCompanyBillGoods: [
           {
             goodsName: '',
-            hsCode: '',
-          },
-        ],
+            hsCode: ''
+          }
+        ]
       },
       printModel: false,
       //
@@ -472,136 +332,140 @@ export default {
       //
       dealId: null,
       rules: {
-        deliveryCompanyId: [{ required: true, trigger: 'blur' }],
-        notifierCompanyId: [{ required: true, trigger: 'blur' }],
-        goodsName: [{ required: true, trigger: 'blur' }],
+        deliveryCompanyId: [{ required: true, trigger: 'blur', message: this.$t('bill.tip3') }],
+        notifierCompanyId: [{ required: true, trigger: 'blur', message: this.$t('bill.tip4') }],
+        goodsName: [{ required: true, trigger: 'blur' }]
       },
-      contract: null,
-    };
+      contract: null
+    }
   },
   watch: {
     deliveryCompanyList(newVal, oldVal) {
       if (newVal !== oldVal) {
-        const defaultDeliveryCompany = newVal.find((item) => item.defaultFlag);
+        const defaultDeliveryCompany = newVal.find((item) => item.defaultFlag)
         if (!this.form.deliveryCompanyId && defaultDeliveryCompany) {
-          this.form.deliveryCompanyId =
-            defaultDeliveryCompany.contractCompanyId;
-          this.form.deliveryCompany = defaultDeliveryCompany;
-          this.form.blRemark = defaultDeliveryCompany.bliRemark;
+          this.form.deliveryCompanyId = defaultDeliveryCompany.contractCompanyId
+          this.form.deliveryCompany = defaultDeliveryCompany
+          this.form.blRemark = defaultDeliveryCompany.bliRemark
         } else {
-          const deliveryCompany = newVal.find(
-            (item) => item.contractCompanyId == this.form.deliveryCompanyId
-          );
-          this.form.deliveryCompany = deliveryCompany;
-          this.form.blRemark = deliveryCompany?.bliRemark;
+          const deliveryCompany = newVal.find((item) => item.contractCompanyId == this.form.deliveryCompanyId)
+          this.form.deliveryCompany = deliveryCompany
+          this.form.blRemark = deliveryCompany?.bliRemark
         }
       }
     },
     notifierCompanyList(newVal, oldVal) {
       if (newVal !== oldVal) {
-        const notifierDeliveryCompany = newVal.find((item) => item.defaultFlag);
+        const notifierDeliveryCompany = newVal.find((item) => item.defaultFlag)
         //成交没通知人公司取默认 否则取通知人公司信息
         if (!this.form.notifierCompanyId && notifierDeliveryCompany) {
-          this.form.notifierCompanyId =
-            notifierDeliveryCompany.contractCompanyId;
-          this.form.notifierCompany = notifierDeliveryCompany;
+          this.form.notifierCompanyId = notifierDeliveryCompany.contractCompanyId
+          this.form.notifierCompany = notifierDeliveryCompany
         } else {
-          this.form.notifierCompany = newVal.find(
-            (item) => item.contractCompanyId == this.form.notifierCompanyId
-          );
+          this.form.notifierCompany = newVal.find((item) => item.contractCompanyId == this.form.notifierCompanyId)
         }
       }
-    },
+    }
   },
   created() {},
   methods: {
-    handleEdit(contractId, dealId) {
-      this.getDealRecord(dealId);
-      this.getContract(contractId);
-      this.open = true;
+    async handleEdit(contractId, dealId) {
+      const loading = this.openLoading()
+      try {
+        // 等待异步方法完成
+        await this.getDealRecord(dealId)
+        await this.getContract(contractId)
+        // 异步操作完成后设置open为true
+        this.open = true
+      } catch (error) {
+        console.error('An error occurred:', error)
+        // 你可以在这里处理错误
+      } finally {
+        // 无论成功或失败，关闭loading
+        loading.close()
+      }
     },
     getContract(contractId) {
-      getBizContract(contractId).then((response) => {
-        this.contract = response.data;
-      });
+      // 将整个方法体封装在返回的Promise中
+      return new Promise((resolve, reject) => {
+        getBizContract(contractId)
+          .then((response) => {
+            this.contract = response.data
+            this.confirmFlag = this.contract.blConfirmFlag == '1'
+            this.voidFlag = this.contract.blConfirmFlag == '2'
+            resolve(response) // 异步操作成功，解决Promise
+          })
+          .catch((error) => {
+            reject(error) // 异步操作失败，拒绝Promise
+          })
+      })
     },
     //子公司更新
     changeSubCompanyList() {
-      this.getContractCompanyList(this.form.buyerCompanyId);
+      this.getContractCompanyList(this.form.buyerCompanyId)
     },
     //子组件更新
     changeBillGoods() {
-      this.getCompanyBillGoods(this.form.buyerCompanyId);
+      this.getCompanyBillGoods(this.form.buyerCompanyId)
     },
     //
     handleBillGoods(companyId) {
-      this.$refs.billGoods.handleShow(companyId);
+      this.$refs.billGoods.handleShow(companyId)
     },
     //选中提单货物时
     changeBillGood(val, index) {
-      const billGodd = this.billGoodsList.find((i) => i.goodsName == val);
-      this.form.buyerCompanyBillGoods[index].hsCode = billGodd.hsCode;
+      const billGodd = this.billGoodsList.find((i) => i.goodsName == val)
+      this.form.buyerCompanyBillGoods[index].hsCode = billGodd.hsCode
     },
     //添加提单货物
     addBillGoods() {
       this.form.buyerCompanyBillGoods.push({
         goodsName: '',
-        hsCode: '',
-      });
+        hsCode: ''
+      })
     },
     //删除提单货物
     deleteBillGoods(index) {
-      this.form.buyerCompanyBillGoods.splice(index, 1);
+      this.form.buyerCompanyBillGoods.splice(index, 1)
     },
     //获取公司提单货物
     getCompanyBillGoods(companyId) {
       listCompanyBillGoods({ companyId: companyId }).then((res) => {
-        const billGoodsList = res.rows;
-        this.billGoodsList = billGoodsList;
+        const billGoodsList = res.rows
+        this.billGoodsList = billGoodsList
         if (!this.form.buyerCompanyBillGoods) {
-          const defaultBillGoods =
-            billGoodsList.filter((item) => item.defaultFlag).length > 0
-              ? billGoodsList.filter((item) => item.defaultFlag)[0]
-              : null;
+          const defaultBillGoods = billGoodsList.filter((item) => item.defaultFlag).length > 0 ? billGoodsList.filter((item) => item.defaultFlag)[0] : null
           this.form.buyerCompanyBillGoods.push({
             goodsName: defaultBillGoods.goodsName,
-            hsCode: defaultBillGoods.hsCode,
-          });
+            hsCode: defaultBillGoods.hsCode
+          })
         }
-      });
+      })
     },
     //更改收货人或者通知人公司时 相应显示变更
     changeSubCompany(val, type) {
       if (type == 'delivery') {
-        var deliveryCompany = this.deliveryCompanyList.filter(
-          (item) => item.contractCompanyId == val
-        )[0];
+        var deliveryCompany = this.deliveryCompanyList.filter((item) => item.contractCompanyId == val)[0]
         if (this.form.deliveryCompany?.bliRemark == this.form?.blRemark) {
-          this.form.blRemark = deliveryCompany?.bliRemark;
+          this.form.blRemark = deliveryCompany?.bliRemark
         }
-        this.form.deliveryCompany = deliveryCompany;
+        this.form.deliveryCompany = deliveryCompany
       }
       if (type == 'notifier') {
-        this.form.notifierCompany = this.notifierCompanyList.filter(
-          (item) => item.contractCompanyId == val
-        )[0];
+        this.form.notifierCompany = this.notifierCompanyList.filter((item) => item.contractCompanyId == val)[0]
       }
     },
     //添加或修改
     handleSubCompany(companyId, type) {
-      this.$refs.subCompanyDialog.handleSubCompany(companyId, type);
+      this.$refs.subCompanyDialog.handleSubCompany(companyId, type)
     },
     //获取收货人公司与通知人公司
     getContractCompanyList(companyId) {
       listBizContractCompany({ companyId: companyId }).then((res) => {
-        const contractCompanyList = res.rows;
-        this.deliveryCompanyList = contractCompanyList.filter(
-          (item) => item.companyType == 'delivery'
-        );
-        this.notifierCompanyList = contractCompanyList.filter(
-          (item) => item.companyType == 'notifier'
-        );
-      });
+        const contractCompanyList = res.rows
+        this.deliveryCompanyList = contractCompanyList.filter((item) => item.companyType == 'delivery')
+        this.notifierCompanyList = contractCompanyList.filter((item) => item.companyType == 'notifier')
+      })
     },
     // 表单重置
     reset() {
@@ -676,58 +540,68 @@ export default {
         notifierCompanyId: null,
         shippingMark: null,
         blRemark: null,
-        buyerCompanyBillGoods: null,
-      };
-      this.resetForm('form');
+        buyerCompanyBillGoods: null
+      }
+      this.resetForm('form')
     },
     getDealRecord(dealId) {
-      this.reset();
-      getBizDealRecord(dealId).then((response) => {
-        this.form = response.data;
-        if (this.form.buyerCompanyBillGoods) {
-          this.form.buyerCompanyBillGoods = JSON.parse(
-            this.form.buyerCompanyBillGoods
-          );
-        } else {
-          this.form.buyerCompanyBillGoods = [];
-          this.addBillGoods();
-        }
+      // 将整个方法体封装在返回的Promise中
+      return new Promise((resolve, reject) => {
+        this.reset()
+        getBizDealRecord(dealId)
+          .then((response) => {
+            this.form = response.data
+            if (this.form.buyerCompanyBillGoods) {
+              this.form.buyerCompanyBillGoods = JSON.parse(this.form.buyerCompanyBillGoods)
+            } else {
+              this.form.buyerCompanyBillGoods = []
+              this.addBillGoods()
+            }
 
-        this.getContractCompanyList(this.form.buyerCompanyId);
-        this.getCompanyBillGoods(this.form.buyerCompanyId);
-        this.form.dealRecordDetailList.map((item) => {
-          if (item.imageList) {
-            item.askCover = item.imageList.toString();
-          }
-        });
-        this.form?.billPictures?.forEach((element) => {
-          element.name = element.fileName;
-          element.url = element.generateUrl;
-        });
-      });
+            // 注意: 这里如果 getContractCompanyList 和 getCompanyBillGoods 也是异步的，
+            // 你需要确保它们也被适当地等待
+            this.getContractCompanyList(this.form.buyerCompanyId)
+            this.getCompanyBillGoods(this.form.buyerCompanyId)
+
+            this.form.dealRecordDetailList.map((item) => {
+              if (item.imageList) {
+                item.askCover = item.imageList.toString()
+              }
+            })
+
+            this.form?.billPictures?.forEach((element) => {
+              element.name = element.fileName
+              element.url = element.generateUrl
+            })
+
+            resolve(response) // 异步操作成功，解决Promise
+          })
+          .catch((error) => {
+            reject(error) // 异步操作失败，拒绝Promise
+          })
+      })
     },
     /** 提交按钮 */
     submitForm() {
       this.$refs['form'].validate((valid) => {
         if (valid) {
           if (this.form.dealId != null) {
-            var deal = JSON.parse(JSON.stringify(this.form));
-            deal.buyerCompanyBillGoods = JSON.stringify(
-              deal.buyerCompanyBillGoods
-            );
+            var deal = JSON.parse(JSON.stringify(this.form))
+            deal.buyerCompanyBillGoods = JSON.stringify(deal.buyerCompanyBillGoods)
+            deal.blConfirmFlag = this.confirmFlag
             updateBizDealRecord(deal).then((response) => {
-              this.open = false;
-              this.$modal.msgSuccess('Save Success');
-              this.$emit('edit');
-            });
+              this.open = false
+              this.$modal.msgSuccess('Save Success')
+              this.$emit('edit')
+            })
           }
         }
-      });
-    },
-  },
-};
+      })
+    }
+  }
+}
 </script>
-  <style lang="scss" scoped>
+<style lang="scss" scoped>
 .app-container {
   padding: 0 20px;
 
@@ -785,4 +659,3 @@ export default {
   font-size: 25px; /* 增加箭头大小 */
 }
 </style>
-